From 887838da08c56265145400a4513a51c7cc79ec5b Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 06 Aug 2012 13:57:14 -0400
Subject: [PATCH] Fix double HTML entities escaping in forward message header
---
installer/check.php | 203 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 148 insertions(+), 55 deletions(-)
diff --git a/installer/check.php b/installer/check.php
index 33264a0..4428bb8 100644
--- a/installer/check.php
+++ b/installer/check.php
@@ -1,62 +1,103 @@
+<form action="index.php" method="get">
<?php
-$docroot = realpath(dirname(__FILE__) . '/../');
-$include_path = $docroot . '/program/lib' . PATH_SEPARATOR . $docroot . '/program' . PATH_SEPARATOR . ini_get('include_path');
-set_include_path($include_path);
-
-$required_php_exts = array('PCRE' => 'pcre', 'Session' => 'session', 'Sockets' => 'sockets');
-
-$optional_php_exts = array('FileInfo' => 'fileinfo', 'Libiconv' => 'iconv', 'Multibyte' => 'mbstring', 'OpenSSL' => 'openssl');
-
-$required_libs = array('PEAR' => 'PEAR.php', 'DB' => 'DB.php', 'MDB2' => 'MDB2.php',
- 'Net_SMTP' => 'Net/SMTP.php', 'Mail_mime' => 'Mail/mime.php', 'iilConnection' => 'lib/imap.inc');
-
-$supported_dbs = array('MySQL' => 'mysql', 'MySQLi' => 'mysqli',
- 'PostgreSQL' => 'pgsql', 'SQLite (v2)' => 'sqlite');
-
-$source_urls = array(
- 'Sockets' => 'http://www.php.net/manual/en/ref.sockets.php',
- 'Session' => 'http://www.php.net/manual/en/ref.session.php',
- 'PCRE' => 'http://www.php.net/manual/en/ref.pcre.php',
- 'FileInfo' => 'http://www.php.net/manual/en/ref.fileinfo.php',
- 'Libiconv' => 'http://www.php.net/manual/en/ref.iconv.php',
- 'Multibyte' => 'http://www.php.net/manual/en/ref.mbstring.php',
- 'OpenSSL' => 'http://www.php.net/manual/en/ref.openssl.php',
- 'PEAR' => 'http://pear.php.net',
- 'MDB2' => 'http://pear.php.net/package/MDB2',
- 'Net_SMTP' => 'http://pear.php.net/package/Net_SMTP',
- 'Mail_mime' => 'http://pear.php.net/package/Mail_mime'
+$required_php_exts = array(
+ 'PCRE' => 'pcre',
+ 'DOM' => 'dom',
+ 'Session' => 'session',
+ 'XML' => 'xml',
+ 'JSON' => 'json'
);
-?>
+$optional_php_exts = array(
+ 'FileInfo' => 'fileinfo',
+ 'Libiconv' => 'iconv',
+ 'Multibyte' => 'mbstring',
+ 'OpenSSL' => 'openssl',
+ 'Mcrypt' => 'mcrypt',
+ 'Intl' => 'intl',
+ 'Exif' => 'exif',
+);
-<form action="index.php" method="get">
-<input type="hidden" name="_step" value="2" />
+$required_libs = array(
+ 'PEAR' => 'PEAR.php',
+ 'MDB2' => 'MDB2.php',
+ 'Net_SMTP' => 'Net/SMTP.php',
+ 'Net_IDNA2' => 'Net/IDNA2.php',
+ 'Mail_mime' => 'Mail/mime.php',
+);
+
+$supported_dbs = array(
+ 'MySQL' => 'mysql',
+ 'MySQLi' => 'mysqli',
+ 'PostgreSQL' => 'pgsql',
+ 'SQLite (v2)' => 'sqlite',
+);
+
+$ini_checks = array(
+ 'file_uploads' => 1,
+ 'session.auto_start' => 0,
+ 'zend.ze1_compatibility_mode' => 0,
+ 'mbstring.func_overload' => 0,
+ 'suhosin.session.encrypt' => 0,
+ 'magic_quotes_runtime' => 0,
+ 'magic_quotes_sybase' => 0,
+);
+
+$optional_checks = array(
+ // required for utils/modcss.inc, should we require this?
+ 'allow_url_fopen' => 1,
+ 'date.timezone' => '-NOTEMPTY-',
+);
+
+$source_urls = array(
+ 'Sockets' => 'http://www.php.net/manual/en/book.sockets.php',
+ 'Session' => 'http://www.php.net/manual/en/book.session.php',
+ 'PCRE' => 'http://www.php.net/manual/en/book.pcre.php',
+ 'FileInfo' => 'http://www.php.net/manual/en/book.fileinfo.php',
+ 'Libiconv' => 'http://www.php.net/manual/en/book.iconv.php',
+ 'Multibyte' => 'http://www.php.net/manual/en/book.mbstring.php',
+ 'Mcrypt' => 'http://www.php.net/manual/en/book.mcrypt.php',
+ 'OpenSSL' => 'http://www.php.net/manual/en/book.openssl.php',
+ 'JSON' => 'http://www.php.net/manual/en/book.json.php',
+ 'DOM' => 'http://www.php.net/manual/en/book.dom.php',
+ 'Intl' => 'http://www.php.net/manual/en/book.intl.php',
+ 'Exif' => 'http://www.php.net/manual/en/book.exif.php',
+ 'PEAR' => 'http://pear.php.net',
+ 'MDB2' => 'http://pear.php.net/package/MDB2',
+ 'Net_SMTP' => 'http://pear.php.net/package/Net_SMTP',
+ 'Mail_mime' => 'http://pear.php.net/package/Mail_mime',
+ 'Net_IDNA2' => 'http://pear.php.net/package/Net_IDNA2',
+);
+
+echo '<input type="hidden" name="_step" value="' . ($RCI->configured ? 3 : 2) . '" />';
+?>
<h3>Checking PHP version</h3>
<?php
-if (phpversion() > 4.3) {
- $RCI->pass('Version', 'PHP ' . phpversion() . ' detected');
+define('MIN_PHP_VERSION', '5.2.1');
+if (version_compare(PHP_VERSION, MIN_PHP_VERSION, '>=')) {
+ $RCI->pass('Version', 'PHP ' . PHP_VERSION . ' detected');
+} else {
+ $RCI->fail('Version', 'PHP Version ' . MIN_PHP_VERSION . ' or greater is required ' . PHP_VERSION . ' detected');
}
-else {
- $RCI->fail('Version', 'PHP Version 4.3.1 or greater is required');
-}
-
?>
<h3>Checking PHP extensions</h3>
-<p class="hint">The following modules/extensions are <em>required</em> to run RoundCube:</p>
+<p class="hint">The following modules/extensions are <em>required</em> to run Roundcube:</p>
<?php
-
+
+// get extensions location
+$ext_dir = ini_get('extension_dir');
+
$prefix = (PHP_SHLIB_SUFFIX === 'dll') ? 'php_' : '';
-foreach ($required_php_exts AS $name => $ext) {
+foreach ($required_php_exts as $name => $ext) {
if (extension_loaded($ext)) {
$RCI->pass($name);
- }
- else {
- $_ext = $prefix . $ext . '.' . PHP_SHLIB_SUFFIX;
- $msg = @dl($_ext) ? 'Could be loaded. Please add in php.ini' : '';
+ } else {
+ $_ext = $ext_dir . '/' . $prefix . $ext . '.' . PHP_SHLIB_SUFFIX;
+ $msg = @is_readable($_ext) ? 'Could be loaded. Please add in php.ini' : '';
$RCI->fail($name, $msg, $source_urls[$name]);
}
echo '<br />';
@@ -64,16 +105,16 @@
?>
-<p class="hint">These extensions are <em>optional</em> but recommended to get the best performance:</p>
+<p class="hint">The next couple of extensions are <em>optional</em> and recommended to get the best performance:</p>
<?php
-foreach ($optional_php_exts AS $name => $ext) {
+foreach ($optional_php_exts as $name => $ext) {
if (extension_loaded($ext)) {
$RCI->pass($name);
}
else {
- $_ext = $prefix . $ext . '.' . PHP_SHLIB_SUFFIX;
- $msg = @dl($_ext) ? 'Could be loaded. Please add in php.ini' : '';
+ $_ext = $ext_dir . '/' . $prefix . $ext . '.' . PHP_SHLIB_SUFFIX;
+ $msg = @is_readable($_ext) ? 'Could be loaded. Please add in php.ini' : '';
$RCI->na($name, $msg, $source_urls[$name]);
}
echo '<br />';
@@ -88,13 +129,13 @@
<?php
$prefix = (PHP_SHLIB_SUFFIX === 'dll') ? 'php_' : '';
-foreach ($supported_dbs AS $database => $ext) {
+foreach ($supported_dbs as $database => $ext) {
if (extension_loaded($ext)) {
$RCI->pass($database);
}
else {
- $_ext = $prefix . $ext . '.' . PHP_SHLIB_SUFFIX;
- $msg = @dl($_ext) ? 'Could be loaded. Please add in php.ini' : 'Not installed';
+ $_ext = $ext_dir . '/' . $prefix . $ext . '.' . PHP_SHLIB_SUFFIX;
+ $msg = @is_readable($_ext) ? 'Could be loaded. Please add in php.ini' : 'Not installed';
$RCI->na($database, $msg, $source_urls[$database]);
}
echo '<br />';
@@ -113,19 +154,71 @@
if (class_exists($classname)) {
$RCI->pass($classname);
}
- else if ($classname == 'DB' || ($classname == 'MDB2' && class_exists('DB'))) {
- $RCI->na($classname, 'Use ' . ($classname == 'DB' ? 'MDB2' : 'DB') . ' instead');
- }
else {
$RCI->fail($classname, "Failed to load $file", $source_urls[$classname]);
}
echo "<br />";
}
-if ($RCI->failures)
- echo '<p class="warning">Sorry but your webserver does not meet the requirements for RoundCube!<br />
- Please install the missing modules according to the above check results.</p>';
+?>
+
+<h3>Checking php.ini/.htaccess settings</h3>
+<p class="hint">The following settings are <em>required</em> to run Roundcube:</p>
+
+<?php
+
+foreach ($ini_checks as $var => $val) {
+ $status = ini_get($var);
+ if ($val === '-NOTEMPTY-') {
+ if (empty($status)) {
+ $RCI->fail($var, "cannot be empty and needs to be set");
+ } else {
+ $RCI->pass($var);
+ }
+ echo '<br />';
+ continue;
+ }
+ if ($status == $val) {
+ $RCI->pass($var);
+ } else {
+ $RCI->fail($var, "is '$status', should be '$val'");
+ }
+ echo '<br />';
+}
+?>
+
+<p class="hint">The following settings are <em>optional</em> and recommended:</p>
+
+<?php
+
+foreach ($optional_checks as $var => $val) {
+ $status = ini_get($var);
+ if ($val === '-NOTEMPTY-') {
+ if (empty($status)) {
+ $RCI->optfail($var, "Could be set");
+ } else {
+ $RCI->pass($var);
+ }
+ echo '<br />';
+ continue;
+ }
+ if ($status == $val) {
+ $RCI->pass($var);
+ } else {
+ $RCI->optfail($var, "is '$status', could be '$val'");
+ }
+ echo '<br />';
+}
+?>
+
+<?php
+
+if ($RCI->failures) {
+ echo '<p class="warning">Sorry but your webserver does not meet the requirements for Roundcube!<br />
+ Please install the missing modules or fix the php.ini settings according to the above check results.<br />
+ Hint: only checks showing <span class="fail">NOT OK</span> need to be fixed.</p>';
+}
echo '<p><br /><input type="submit" value="NEXT" ' . ($RCI->failures ? 'disabled' : '') . ' /></p>';
?>
--
Gitblit v1.9.1