Changeset 27285 for extensions/Ldap_Login/class.ldap.php

Timestamp:

Feb 9, 2014, 5:53:56 PM (10 years ago)

Author:

22decembre

Message:

added function load_default_config
use_ssl -> ld_use_ssl

File:

• extensions/Ldap_Login/class.ldap.php (modified) (4 diffs)

extensions/Ldap_Login/class.ldap.php

@@ -1 +1 @@
 <?php
+global $conf;
 class Ldap {
-
         var $cnx;
         var $config;
@@ -41 +41 @@
         }
         
-        function load_config()
+        public function load_default_config()
         {
-                // init to defaults
                 $this->config['host'] = 'localhost';
                 $this->config['basedn'] = 'ou=people,dc=example,dc=com'; // racine !
@@ -55 +54 @@
                 $this->config['advertise_admin_new_ldapuser'] = False;
                 $this->config['send_password_by_mail_ldap'] = False;
-                
-                echo $this->config['send_password_by_mail_ldap'];
-                // fetch the actual config
-                $x = @file_get_contents( LDAP_LOGIN_PATH.'data.dat' );
-                if ($x!==false)
+        }
+        
+        function load_config() {
+                // first we load the base config
+                $conf_file = @file_get_contents( LDAP_LOGIN_PATH.'data.dat' );
+                if ($conf_file!==false)
                 {
-                        $c = unserialize($x);
-                        // do some more tests here
-                        $this->config = $c;
+                        $this->config = unserialize($conf_file);
                 }
         }
@@ -85 +83 @@
 
         public function ldap_conn(){
-
-                if ($this->config['use_ssl'] == 1){
+                if ($this->config['ld_use_ssl'] == 1){
                         if (empty($this->config['port'])){
                                 $this->config['uri'] = 'ldaps://'.$this->config['host'];