Changeset 5371

Timestamp:

01/12/12 13:33:33 (12 years ago)

Author:

brunocosta

Message:

Ticket #2299 - Pega a msg para o usuário no atributo "usrworkleaveobs" no LDAP

Location:

branches/2.3/phpgwapi

Files:

• inc/class.auth_ldap.inc.php (modified) (3 diffs)
• templates/default/login_default.php (modified) (1 diff)

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

@@ -56 +56 @@
                         }
                         /* find the dn for this uid, the uid is not always in the dn */
-                        $attributes     = array('uid','dn','givenName','sn','mail','uidNumber','gidNumber','usercertificate');
+                        $attributes     = array('uid','dn','givenName','sn','mail','uidNumber','gidNumber','usercertificate','usrworkleaveobs');
                         $filter = $GLOBALS['phpgw_info']['server']['ldap_search_filter'] ? $GLOBALS['phpgw_info']['server']['ldap_search_filter'] : '(uid=%user)';
                         $filter = str_replace(array('%user','%domain'),array($username,$GLOBALS['phpgw_info']['user']['domain']),$filter);
@@ -96 +96 @@
                                 }
                                 /* try to bind as the user with user suplied password */
-                                if (@ldap_bind($ldap, $userDN, $passwd))
+                                
+                                if($allValues[0]['usrworkleaveobs'])
+                                        $GLOBALS['usrworkleaveobs'] = $allValues[0]['usrworkleaveobs'][0];
+                                
+                                if (@ldap_bind($ldap, $userDN, $passwd))
                                 {
                                         if ($GLOBALS['phpgw_info']['server']['account_repository'] != 'ldap')
@@ -124 +128 @@
                                 }else{
                                     if(ldap_errno($ldap) == 53)
-                                        return 0;
+                                            return 0;
+                                    }
                                 }
-                        }
                         /* dn not found or password wrong */
                         return False;

branches/2.3/phpgwapi/templates/default/login_default.php

@@ -32 +32 @@
                                 
                         case 97:
-                                return '<font color="FF0000">' . lang('Account blocked, please contact the system administrator.') . '</font>';
+                                return '<font color="FF0000">' . $GLOBALS['usrworkleaveobs']?$GLOBALS['usrworkleaveobs']:lang('Account blocked, please contact the system administrator.') . '</font>';
                         case 98:
                                 return '<font color="FF0000">' . lang('Account is expired') . '</font>';