From b6f89a32d8d38f023c17c47e722c3f52eb9e5ad2 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 11 Sep 2014 17:45:32 +0200
Subject: Make LDAP extension and Net_LDAP3 lib optional in installer check

---
 installer/check.php | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/installer/check.php b/installer/check.php
index 6974d3720..709a334b6 100644
--- a/installer/check.php
+++ b/installer/check.php
@@ -25,6 +25,7 @@ $optional_php_exts = array(
     'Mcrypt'    => 'mcrypt',
     'Intl'      => 'intl',
     'Exif'      => 'exif',
+    'LDAP'      => 'ldap',
 );
 
 $required_libs = array(
@@ -32,11 +33,14 @@ $required_libs = array(
     'Auth_SASL' => 'pear.php.net',
     'Net_SMTP'  => 'pear.php.net',
     'Net_IDNA2' => 'pear.php.net',
-    'Net_LDAP3' => 'git.kolab.org',
     'Mail_mime' => 'pear.php.net',
     'Mail_mimeDecode' => 'pear.php.net',
 );
 
+$optional_libs = array(
+    'Net_LDAP3' => 'git.kolab.org',
+);
+
 $ini_checks = array(
     'file_uploads'                  => 1,
     'session.auto_start'            => 0,
@@ -68,6 +72,7 @@ $source_urls = array(
     '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',
+    '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',
@@ -77,7 +82,9 @@ $source_urls = array(
     '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) . '" />';
@@ -164,7 +171,6 @@ if (empty($found_db_driver)) {
 <?php
 
 foreach ($required_libs as $classname => $vendor) {
-    @include_once $file;
     if (class_exists($classname)) {
         $RCI->pass($classname);
     }
@@ -174,6 +180,15 @@ foreach ($required_libs as $classname => $vendor) {
     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 />";
+}
 
 ?>
 
-- 
cgit v1.2.3