Changeset 5118 for branches/2.3/phpgwapi/inc/class.sessions.inc.php

Timestamp:

10/26/11 08:59:42 (13 years ago)

Author:

brunocosta

Message:

Ticket #2299 - Trata o erro 53 do LDAP na autenticação do usuário.

File:

• branches/2.3/phpgwapi/inc/class.sessions.inc.php (modified) (1 diff)

branches/2.3/phpgwapi/inc/class.sessions.inc.php

@@ -487 +487 @@
                         $this->account_id = $GLOBALS['phpgw']->accounts->name2id($this->account_lid);
 
+                        $ldapAuth = $GLOBALS['phpgw']->auth->authenticate($this->account_lid, $this->passwd, $this->passwd_type);
+
                         if (($blocked = $this->login_blocked($login,$user_ip)) ||       // too many unsuccessful attempts
                                 $GLOBALS['phpgw_info']['server']['global_denied_users'][$this->account_lid] ||
-                                !$GLOBALS['phpgw']->auth->authenticate($this->account_lid, $this->passwd, $this->passwd_type) ||
+                                !$ldapAuth ||
                                 $this->account_id && $GLOBALS['phpgw']->accounts->get_type($this->account_id) == 'g')
                         {
-                                $this->reason = $blocked ? 'blocked, too many attempts' : 'bad login or password';
-                                $this->cd_reason = $blocked ? 99 : 5;
-
-                                $this->log_access($this->reason,$login,$user_ip,0);     // log unsuccessfull login
-                                return False;
+                                if($ldapAuth === 0){
+                                          $this->reason = 'Ldap blocked';
+                                          $this->cd_reason = 97;
+                                          return False;
+                                }else{
+                                        $this->reason = $blocked ? 'blocked, too many attempts' : 'bad login or password';
+                                        $this->cd_reason = $blocked ? 99 : 5;
+                                        $this->log_access($this->reason,$login,$user_ip,0);     // log unsuccessfull login
+                                        return False;
+                                }
                         }
                         // Só verifica tempo de inatividade do usuário, caso esteja configurado no Administrador.