Changeset 1180

Timestamp:

02/07/07 17:57:55 (6 years ago)

Author:

drazzib

Message:

2007-02-07 Damien Raude-Morvan <drazzib@…>
* Fix ticket #298 : php-ldap module is lowercase in Dependencies array, update Dependencies::check() calls.

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/classes/Authenticators/AuthenticatorLDAP.php (modified) (2 diffs)
• wifidog/classes/Dependencies.php (modified) (1 diff)

trunk/wifidog-auth/CHANGELOG

@@ +1 @@
+2007-02-07 Damien Raude-Morvan <drazzib@drazzib.com>
+        * Fix ticket #298 : php-ldap module is lowercase in Dependencies array, update Dependencies::check() calls.
+
 2007-02-05 Damien Raude-Morvan <drazzib@drazzib.com>
         * Try to fix ticket #295 and #297 by including parent class (Content.php) in File.php.

trunk/wifidog-auth/wifidog/classes/Authenticators/AuthenticatorLDAP.php

@@ -156 +156 @@
                 $rtval = true;
 
-                if (Dependencies::check("LDAP", $errmsg)) {
+                // Check if php-ldap extension is loaded
+                if (Dependencies::check("ldap", $errmsg)) {
                 if ($connect = @ldap_connect($ldap_server)) {
                     // if connected to ldap server
@@ -241 +242 @@
                 $password = $db->EscapeString($password);
 
-                if (Dependencies::check("LDAP", $errmsg)) {
+                // Check if php-ldap extension is loaded
+                if (Dependencies::check("ldap", $errmsg)) {
                 if ($this->checkLdapUser($username, $password, $this->mldap_hostname, $this->mldap_o, $this->mldap_filter, $errmsg)) {
                         //LDAP Authentication Successful

trunk/wifidog-auth/wifidog/classes/Dependencies.php

@@ -242 +242 @@
                 // Are we checking for a PHP extension or a PHP library?
                 if (self::$_components[$component]["type"] == "phpExtension") {
+                    // Warning : extension_loaded(string) is case sensitive
                     $_returnValue = extension_loaded($component);
                 }