Merge branch 'master' of https://gitlab.mbb.univ-montp1.fr/jlopez/wicopa into develop

action/action_login.php

@@ -39,7 +39,7 @@ if($passcode == 1) {
     $ldap = new LDAPquery();
 
     $ldappasscode = $ldap->verifyPass($login, $pwd);
-    
+
     if($ldappasscode == 1) {
         $_SESSION['username'] = $login;
         $_SESSION['usercode'] = 3;

dao/LDAPquery.php

@@ -16,6 +16,7 @@ class LDAPquery {
 
     public function openConnection() {
         $this->ldaph = ldap_connect(Conf::$LDAP_HOSTNAME);
+
         if(!$this->ldaph) {
             die("Impossible de se connecter au serveur LDAP ".Conf::$LDAP_HOSTNAME);
         }
@@ -47,4 +48,4 @@ class LDAPquery {
         return 0;
     }
 
-}
\ No newline at end of file
+}

inc/conf/Conf.php.sample

@@ -10,7 +10,7 @@ class Conf {
 
         public static $DB_PP         = '';
 
-        // generate an admin password with: echo password|sha1sum|awk '{print $1}';
+        // generate an "admin" password with: echo password|sha1sum|awk '{print $1}';
         public static $KK            = "to_replace_with_your_admin_pass";
 
         public static $LDAP_HOSTNAME = '';