From b6f89a32d8d38f023c17c47e722c3f52eb9e5ad2 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 11 Sep 2014 11:45:32 -0400
Subject: [PATCH] Make LDAP extension and Net_LDAP3 lib optional in installer check
---
installer/check.php | 100 +++++++++++++++++++++++++++++++-------------------
1 files changed, 62 insertions(+), 38 deletions(-)
diff --git a/installer/check.php b/installer/check.php
index 14fc4f0..709a334 100644
--- a/installer/check.php
+++ b/installer/check.php
@@ -1,6 +1,6 @@
<?php
-if (!class_exists('rcube_install') || !is_object($RCI)) {
+if (!class_exists('rcmail_install', false) || !is_object($RCI)) {
die("Not allowed! Please open installer/index.php instead.");
}
@@ -25,13 +25,20 @@
'Mcrypt' => 'mcrypt',
'Intl' => 'intl',
'Exif' => 'exif',
+ 'LDAP' => 'ldap',
);
$required_libs = array(
- 'PEAR' => 'PEAR.php',
- 'Net_SMTP' => 'Net/SMTP.php',
- 'Net_IDNA2' => 'Net/IDNA2.php',
- 'Mail_mime' => 'Mail/mime.php',
+ 'PEAR' => 'pear.php.net',
+ 'Auth_SASL' => 'pear.php.net',
+ 'Net_SMTP' => 'pear.php.net',
+ 'Net_IDNA2' => 'pear.php.net',
+ 'Mail_mime' => 'pear.php.net',
+ 'Mail_mimeDecode' => 'pear.php.net',
+);
+
+$optional_libs = array(
+ 'Net_LDAP3' => 'git.kolab.org',
);
$ini_checks = array(
@@ -42,12 +49,13 @@
'suhosin.session.encrypt' => 0,
'magic_quotes_runtime' => 0,
'magic_quotes_sybase' => 0,
- 'date.timezone' => '-NOTEMPTY-',
);
$optional_checks = array(
// required for utils/modcss.inc, should we require this?
'allow_url_fopen' => 1,
+ 'date.timezone' => '-VALID-',
+ 'register_globals' => 0, // #1489157
);
$source_urls = array(
@@ -64,16 +72,19 @@
'Intl' => 'http://www.php.net/manual/en/book.intl.php',
'Exif' => 'http://www.php.net/manual/en/book.exif.php',
'PDO' => 'http://www.php.net/manual/en/book.pdo.php',
- 'pdo_mysql' => 'http://www.php.net/manual/en/book.pdo-mysql.php',
- 'pdo_pgsql' => 'http://www.php.net/manual/en/book.pdo-pgsql.php',
- 'pdo_sqlite' => 'http://www.php.net/manual/en/book.pdo-sqlite.php',
- 'pdo_sqlite2' => 'http://www.php.net/manual/en/book.pdo-sqlite.php',
- 'pdo_sqlsrv' => 'http://www.php.net/manual/en/book.pdo-sqlsrv.php',
- 'pdo_dblib' => 'http://www.php.net/manual/en/book.pdo-dblib.php',
+ 'LDAP' => 'http://www.php.net/manual/en/book.ldap.php',
+ 'pdo_mysql' => 'http://www.php.net/manual/en/ref.pdo-mysql.php',
+ 'pdo_pgsql' => 'http://www.php.net/manual/en/ref.pdo-pgsql.php',
+ 'pdo_sqlite' => 'http://www.php.net/manual/en/ref.pdo-sqlite.php',
+ 'pdo_sqlite2' => 'http://www.php.net/manual/en/ref.pdo-sqlite.php',
+ 'pdo_sqlsrv' => 'http://www.php.net/manual/en/ref.pdo-sqlsrv.php',
+ 'pdo_dblib' => 'http://www.php.net/manual/en/ref.pdo-dblib.php',
'PEAR' => 'http://pear.php.net',
'Net_SMTP' => 'http://pear.php.net/package/Net_SMTP',
'Mail_mime' => 'http://pear.php.net/package/Mail_mime',
+ 'Mail_mimeDecode' => 'http://pear.php.net/package/Mail_mimeDecode',
'Net_IDNA2' => 'http://pear.php.net/package/Net_IDNA2',
+ 'Net_LDAP3' => 'http://git.kolab.org/pear/Net_LDAP3',
);
echo '<input type="hidden" name="_step" value="' . ($RCI->configured ? 3 : 2) . '" />';
@@ -82,7 +93,7 @@
<h3>Checking PHP version</h3>
<?php
-define('MIN_PHP_VERSION', '5.2.1');
+define('MIN_PHP_VERSION', '5.3.7');
if (version_compare(PHP_VERSION, MIN_PHP_VERSION, '>=')) {
$RCI->pass('Version', 'PHP ' . PHP_VERSION . ' detected');
} else {
@@ -137,13 +148,8 @@
$prefix = (PHP_SHLIB_SUFFIX === 'dll') ? 'php_' : '';
foreach ($RCI->supported_dbs as $database => $ext) {
if (extension_loaded($ext)) {
- // MySQL driver requires PHP >= 5.3 (#1488875)
- if ($ext == 'pdo_mysql' && version_compare(PHP_VERSION, '5.3.0', '<')) {
- $RCI->fail($database, 'PHP >= 5.3 required');
- }
- else {
- $RCI->pass($database);
- }
+ $RCI->pass($database);
+ $found_db_driver = true;
}
else {
$_ext = $ext_dir . '/' . $prefix . $ext . '.' . PHP_SHLIB_SUFFIX;
@@ -151,6 +157,9 @@
$RCI->na($database, $msg, $source_urls[$ext]);
}
echo '<br />';
+}
+if (empty($found_db_driver)) {
+ $RCI->failures++;
}
?>
@@ -161,17 +170,25 @@
<?php
-foreach ($required_libs as $classname => $file) {
- @include_once $file;
+foreach ($required_libs as $classname => $vendor) {
if (class_exists($classname)) {
$RCI->pass($classname);
}
else {
- $RCI->fail($classname, "Failed to load $file", $source_urls[$classname]);
+ $RCI->fail($classname, "Failed to load class $classname from $vendor", $source_urls[$classname]);
}
echo "<br />";
}
+foreach ($optional_libs as $classname => $vendor) {
+ if (class_exists($classname)) {
+ $RCI->pass($classname);
+ }
+ else {
+ $RCI->na($classname, "Recommended to install $classname from $vendor", $source_urls[$classname]);
+ }
+ echo "<br />";
+}
?>
@@ -185,23 +202,15 @@
if ($val === '-NOTEMPTY-') {
if (empty($status)) {
$RCI->fail($var, "empty value detected");
- } else if ($var == 'date.timezone') {
- try {
- $tz = new DateTimeZone($status);
- $RCI->pass($var);
- }
- catch (Exception $e) {
- $RCI->fail($var, "invalid value detected: $status");
- }
- } else {
+ }
+ else {
$RCI->pass($var);
}
- echo '<br />';
- continue;
}
- if ($status == $val) {
+ else if (filter_var($status, FILTER_VALIDATE_BOOLEAN) == $val) {
$RCI->pass($var);
- } else {
+ }
+ else {
$RCI->fail($var, "is '$status', should be '$val'");
}
echo '<br />';
@@ -223,9 +232,24 @@
echo '<br />';
continue;
}
- if ($status == $val) {
+ if ($val === '-VALID-') {
+ if ($var == 'date.timezone') {
+ try {
+ $tz = new DateTimeZone($status);
+ $RCI->pass($var);
+ }
+ catch (Exception $e) {
+ $RCI->optfail($var, empty($status) ? "not set" : "invalid value detected: $status");
+ }
+ }
+ else {
+ $RCI->pass($var);
+ }
+ }
+ else if (filter_var($status, FILTER_VALIDATE_BOOLEAN) == $val) {
$RCI->pass($var);
- } else {
+ }
+ else {
$RCI->optfail($var, "is '$status', could be '$val'");
}
echo '<br />';
--
Gitblit v1.9.1