Merge dev-IRAP branch into dev-LATMOS branch

Etienne Pallier
2 parents d8bc3d31 3fcb34d9
Showing 3 changed files with 6 additions and 6 deletions Show diff stats
doc/Labinvent Documentation.docx
doc/Labinvent Documentation.pdf
src/Model/Table/LdapConnectionsTable.php
@@ -226,7 +226,8 @@ class LdapConnectionsTable extends AppTable
                     Quand on n'utilise pas $just_these, la fonction ldap_search() retourne TOUS les attributs disponibles, 
                     donc c'est le comportement qu'on veut ici.
                     */
-                    $results = ldap_search($ldapConnection, $this->baseDn, $filter, $just_these) or die("Could not search to LDAP server  response was: " . ldap_error($ldapConnection) );
+                    $results = ldap_search($ldapConnection, $this->baseDn, $filter, $just_these) 
+                        or die("Could not search to LDAP server  response was: " . ldap_error($ldapConnection) );
                     $info = ldap_get_entries($ldapConnection, $results);
                     //echo $info["count"]." entries returned\n";
                     return $info;
@@ -389,14 +390,13 @@ class LdapConnectionsTable extends AppTable
                     //$binddn .= ','.$this->baseDn;
                     // Connection
-                    $ldapConnection = ldap_connect($this->host, $this->port) or die("Could not connect to $this->host (port $this->port)");
+                    $ldapConnection = ldap_connect($this->host, $this->port) 
+                        or die("Could not connect to $this->host (port $this->port)");
                     if ($ldapConnection) {
-                        
                         ldap_set_option($ldapConnection, LDAP_OPT_PROTOCOL_VERSION, 3);
-                        
                         // Binding optionnel
-                        if ($this->ldap_authentified) $ldapbind = ldap_bind($ldapConnection, $this->bindDn, $this->bindPass) or die("Could not bind to LDAP server.". ldap_error($ldapConnection) );
-                        
+                        if ($this->ldap_authentified) $ldapbind = ldap_bind($ldapConnection, $this->bindDn, $this->bindPass) 
+                            or die("Could not bind to LDAP server.". ldap_error($ldapConnection) );
                         $search = $this->getUserAttributes($user_login, $ldapConnection, $filter, $just_these);
                         if ($search === false) die("Could not get user attributes from LDAP server, response was: " . ldap_error($ldapConnection) );
                         return $search[0];