Migration of connect function

ltb-project · Jul 12, 2024 · 657f23a · 657f23a
1 parent ff60e46
commit 657f23a
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/htdocs/checkpassword.php b/htdocs/checkpassword.php
@@ -27,7 +27,7 @@
     require __DIR__ . '/../vendor/autoload.php';
 
     # Connect to LDAP
-    $ldap_connection = \Ltb\Ldap::connect($ldap_url, $ldap_starttls, $dn, $password, $ldap_network_timeout);
+    $ldap_connection = $ldapInstance->connect();
 
     $ldap = $ldap_connection[0];
     $result = $ldap_connection[1];

diff --git a/htdocs/display.php b/htdocs/display.php
@@ -54,7 +54,7 @@
     require_once("../lib/date.inc.php");
 
     # Connect to LDAP
-    $ldap_connection = \Ltb\Ldap::connect($ldap_url, $ldap_starttls, $ldap_binddn, $ldap_bindpw, $ldap_network_timeout);
+    $ldap_connection = $ldapInstance->connect();
 
     $ldap = $ldap_connection[0];
     $result = $ldap_connection[1];

diff --git a/htdocs/index.php b/htdocs/index.php
@@ -48,6 +48,20 @@
                            $mail_smtp_timeout
                        );
 
+#==============================================================================
+# LDAP Config
+#==============================================================================
+$ldapInstance = new \Ltb\Ldap(
+                                 $ldap_url,
+                                 $ldap_starttls,
+                                 isset($ldap_binddn) ? $ldap_binddn : null,
+                                 isset($ldap_bindpw) ? $ldap_bindpw : null,
+                                 isset($ldap_network_timeout) ? $ldap_network_timeout : null,
+                                 $ldap_base,
+                                 null,
+                                 isset($ldap_krb5ccname) ? $ldap_krb5ccname : null
+                             );
+
 #==============================================================================
 # Smarty
 #==============================================================================

diff --git a/htdocs/lockaccount.php b/htdocs/lockaccount.php
@@ -19,7 +19,7 @@
     require __DIR__ . '/../vendor/autoload.php';
 
     # Connect to LDAP
-    $ldap_connection = \Ltb\Ldap::connect($ldap_url, $ldap_starttls, $ldap_binddn, $ldap_bindpw, $ldap_network_timeout);
+    $ldap_connection = $ldapInstance->connect();
 
     $ldap = $ldap_connection[0];
     $result = $ldap_connection[1];

diff --git a/htdocs/resetpassword.php b/htdocs/resetpassword.php
@@ -37,7 +37,7 @@
     require_once("../lib/hook.inc.php");
 
     # Connect to LDAP
-    $ldap_connection = \Ltb\Ldap::connect($ldap_url, $ldap_starttls, $ldap_binddn, $ldap_bindpw, $ldap_network_timeout);
+    $ldap_connection = $ldapInstance->connect();
 
     $ldap = $ldap_connection[0];
     $result = $ldap_connection[1];

diff --git a/htdocs/unlockaccount.php b/htdocs/unlockaccount.php
@@ -26,7 +26,7 @@
     require __DIR__ . '/../vendor/autoload.php';
 
     # Connect to LDAP
-    $ldap_connection = \Ltb\Ldap::connect($ldap_url, $ldap_starttls, $ldap_binddn, $ldap_bindpw, $ldap_network_timeout);
+    $ldap_connection = $ldapInstance->connect();
 
     $ldap = $ldap_connection[0];
     $result = $ldap_connection[1];