From 097dbc68700c0c15e78d3643f1f478269f13f1ac Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 10 Apr 2012 04:39:36 -0400
Subject: [PATCH] - Improved member attribute detection with fallback in create_group()
---
installer/check.php | 94 ++++++++++++++++++++++++++++++----------------
1 files changed, 61 insertions(+), 33 deletions(-)
diff --git a/installer/check.php b/installer/check.php
index e75c814..0ce428a 100644
--- a/installer/check.php
+++ b/installer/check.php
@@ -1,41 +1,69 @@
<form action="index.php" method="get">
<?php
-$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',
+$required_php_exts = array(
+ 'PCRE' => 'pcre',
+ 'DOM' => 'dom',
+ 'Session' => 'session',
+ 'XML' => 'xml',
+ 'JSON' => 'json'
);
-$required_libs = array('PEAR' => 'PEAR.php', 'MDB2' => 'MDB2.php',
- 'Net_SMTP' => 'Net/SMTP.php', 'Mail_mime' => 'Mail/mime.php',
- 'iilConnection' => 'lib/imap.inc');
+$optional_php_exts = array(
+ 'FileInfo' => 'fileinfo',
+ 'Libiconv' => 'iconv',
+ 'Multibyte' => 'mbstring',
+ 'OpenSSL' => 'openssl',
+ 'Mcrypt' => 'mcrypt',
+ 'Intl' => 'intl',
+ 'Exif' => 'exif',
+);
-$supported_dbs = array('MySQL' => 'mysql', 'MySQLi' => 'mysqli',
- 'PostgreSQL' => 'pgsql', 'SQLite (v2)' => 'sqlite');
+$required_libs = array(
+ 'PEAR' => 'PEAR.php',
+ 'MDB2' => 'MDB2.php',
+ 'Net_SMTP' => 'Net/SMTP.php',
+ 'Net_IDNA2' => 'Net/IDNA2.php',
+ 'Mail_mime' => 'Mail/mime.php',
+);
-$ini_checks = array('file_uploads' => 1, 'session.auto_start' => 0,
- 'zend.ze1_compatibility_mode' => 0, 'mbstring.func_overload' => 0,
- 'suhosin.session.encrypt' => 0);
+$supported_dbs = array(
+ 'MySQL' => 'mysql',
+ 'MySQLi' => 'mysqli',
+ 'PostgreSQL' => 'pgsql',
+ 'SQLite (v2)' => 'sqlite',
+);
-$optional_checks = array('date.timezone' => '-NOTEMPTY-');
+$ini_checks = array(
+ 'file_uploads' => 1,
+ 'session.auto_start' => 0,
+ 'zend.ze1_compatibility_mode' => 0,
+ 'mbstring.func_overload' => 0,
+ 'suhosin.session.encrypt' => 0,
+);
+
+$optional_checks = array(
+ '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',
+ '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',
- 'PEAR' => 'http://pear.php.net',
- 'MDB2' => 'http://pear.php.net/package/MDB2',
- 'Net_SMTP' => 'http://pear.php.net/package/Net_SMTP',
+ '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) . '" />';
@@ -44,7 +72,7 @@
<h3>Checking PHP version</h3>
<?php
-define('MIN_PHP_VERSION', '5.2.0');
+define('MIN_PHP_VERSION', '5.2.1');
if (version_compare(PHP_VERSION, MIN_PHP_VERSION, '>=')) {
$RCI->pass('Version', 'PHP ' . PHP_VERSION . ' detected');
} else {
@@ -53,14 +81,14 @@
?>
<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 {
@@ -76,7 +104,7 @@
<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);
}
@@ -97,7 +125,7 @@
<?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);
}
@@ -132,7 +160,7 @@
?>
<h3>Checking php.ini/.htaccess settings</h3>
-<p class="hint">The following settings are <em>required</em> to run RoundCube:</p>
+<p class="hint">The following settings are <em>required</em> to run Roundcube:</p>
<?php
@@ -183,7 +211,7 @@
<?php
if ($RCI->failures) {
- echo '<p class="warning">Sorry but your webserver does not meet the requirements for RoundCube!<br />
+ 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>';
}
--
Gitblit v1.9.1