Merge pull request #422 from nrundle/bugfix-ldap_connect_deprecated

Replace use of deprecated ldap_connect function with supported one
LibreBooking · Sep 30, 2024 · 11aa388 · 11aa388
2 parents 512c88f + e017fb1
commit 11aa388
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/plugins/Authentication/ActiveDirectory/adLDAP.php b/plugins/Authentication/ActiveDirectory/adLDAP.php
@@ -654,9 +654,9 @@ public function connect()
         // Connect to the AD/LDAP server as the username/password
         $domainController = $this->randomController();
         if ($this->useSSL) {
-            $this->ldapConnection = ldap_connect("ldaps://" . $domainController, $this->adPort);
+            $this->ldapConnection = ldap_connect("ldaps://" . $domainController . ":" . $this->adPort);
         } else {
-            $this->ldapConnection = ldap_connect($domainController, $this->adPort);
+            $this->ldapConnection = ldap_connect("ldap://" . $domainController . ":" . $this->adPort);
         }
 
         // Set some ldap options for talking to AD

diff --git a/plugins/Authentication/Ldap/LDAP2.php b/plugins/Authentication/Ldap/LDAP2.php
@@ -433,7 +433,7 @@ protected function performConnect()
             $this->_config['host'] = $host;
 
             // Attempt a connection.
-            $this->_link = @ldap_connect($host, $this->_config['port']);
+            $this->_link = @ldap_connect($host . ":" . $this->_config['port']);
             if (false === $this->_link) {
                 $current_error = PEAR::raiseError('Could not connect to ' .
                     $host . ':' . $this->_config['port']);