From bf2f39ea6d2b49c7495a43cca19ab18f27f8292e Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 29 Sep 2008 09:02:02 -0400
Subject: [PATCH] - #1485290: Fix unread counter when displaying cached massage in preview panel - remove some empty lines in app.js
---
installer/check.php | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/installer/check.php b/installer/check.php
index fdab9f5..a314ff7 100644
--- a/installer/check.php
+++ b/installer/check.php
@@ -1,20 +1,22 @@
<form action="index.php" method="get">
<?php
-$required_php_exts = array('PCRE' => 'pcre', 'Session' => 'session', 'Sockets' => 'sockets');
+$required_php_exts = array('PCRE' => 'pcre', 'DOM' => 'dom', 'Session' => 'session');
$optional_php_exts = array('FileInfo' => 'fileinfo', 'Libiconv' => 'iconv',
- 'Multibyte' => 'mbstring', 'OpenSSL' => 'openssl', 'Mcrypt' => 'mcrypt', 'GD' => 'gd');
+ 'Multibyte' => 'mbstring', 'OpenSSL' => 'openssl', 'Mcrypt' => 'mcrypt',
+ 'GD' => 'gd');
-$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');
+$required_libs = array('PEAR' => 'PEAR.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');
$ini_checks = array('file_uploads' => 1, 'session.auto_start' => 0,
- 'magic_quotes_gpc' => 0, 'magic_quotes_sybase' => 0,
- 'zlib.output_compression' => 0);
+ 'magic_quotes_gpc' => 0, 'magic_quotes_sybase' => 0,
+ 'zend.ze1_compatibility_mode' => 0);
$source_urls = array(
'Sockets' => 'http://www.php.net/manual/en/ref.sockets.php',
@@ -29,22 +31,22 @@
'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'
+ 'Mail_mime' => 'http://pear.php.net/package/Mail_mime',
+ 'DOM' => 'http://www.php.net/manual/en/intro.dom.php'
);
-echo '<input type="hidden" name="_step" value="' . ($RCI->configured ? 2 : 3) . '" />';
+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.0');
+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>
@@ -55,8 +57,7 @@
foreach ($required_php_exts AS $name => $ext) {
if (extension_loaded($ext)) {
$RCI->pass($name);
- }
- else {
+ } else {
$_ext = $prefix . $ext . '.' . PHP_SHLIB_SUFFIX;
$msg = @dl($_ext) ? 'Could be loaded. Please add in php.ini' : '';
$RCI->fail($name, $msg, $source_urls[$name]);
@@ -66,7 +67,7 @@
?>
-<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> but recommended to get the best performance:</p>
<?php
foreach ($optional_php_exts AS $name => $ext) {
@@ -115,9 +116,6 @@
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]);
}
@@ -145,10 +143,11 @@
<?php
-if ($RCI->failures)
+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>';
-
+ 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