change default value of ldap_tls to 0. It will be detected anyway, but starting with...

diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php
index 4621297595d30f54dc48da2d1f9f3ad142bda08f..373c5b48417a2df643b3944ca87a937a7eb4808f 100644 (file)
--- a/apps/user_ldap/lib/configuration.php
+++ b/apps/user_ldap/lib/configuration.php
@@ -377,7 +377,7 @@ class Configuration {
                        'ldap_groupfilter_groups'           => '',
                        'ldap_display_name'                 => 'displayName',
                        'ldap_group_display_name'           => 'cn',
-                       'ldap_tls'                          => 1,
+                       'ldap_tls'                          => 0,
                        'ldap_nocase'                       => 0,
                        'ldap_quota_def'                    => '',
                        'ldap_quota_attr'                   => '',

diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index eaec35819818fe7e5f2bda448286d4cf806f7e90..7bb5752352fbd72599df004f499be743957e406f 100644 (file)
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -165,6 +165,9 @@ class Wizard extends LDAPUtility {
        public function countInBaseDN() {
                // we don't need to provide a filter in this case
                $total = $this->countEntries(null, 'objects');
+               if($total === false) {
+                       throw new \Exception('invalid results received');
+               }
                $this->result->addChange('ldap_test_base', $total);
                return $this->result;
        }