Changeset 72 for trunk/expressoAdmin1_2/inc

Timestamp:

09/24/07 10:22:29 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk/expressoAdmin1_2/inc

Files:

• class.ldap_functions.inc.php (modified) (1 diff)
• class.uiaccounts.inc.php (modified) (5 diffs)
• class.user.inc.php (modified) (4 diffs)

trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php

@@ -769 +769 @@
                                 $result['sn']                                   = $entry[0]['sn'][0];
                                 $result['telephonenumber']              = $entry[0]['telephonenumber'][0];
+                                $result['passwd_expired']               = $entry[0]['phpgwlastpasswdchange'][0];
                                 $result['phpgwaccountstatus']   = $entry[0]['phpgwaccountstatus'][0];
                                 $result['phpgwaccountvisible']  = $entry[0]['phpgwaccountvisible'][0];

trunk/expressoAdmin1_2/inc/class.uiaccounts.inc.php

@@ -256 +256 @@
                                 'lang_lists_permission'                 => lang('Email Lists'),
                                 'lang_aplication_permission'    => lang('Aplication Permission'),       
+                                'lang_search_organization'              => lang('Search Organiztion'),
                                 'lang_organizations'                    => lang('Organizations'),
                                 'lang_sector'                                   => lang('Sector'),
@@ -263 +264 @@
                                 'lang_password'                                 => lang('Password'),
                                 'lang_re-password'                              => lang('Re-Password'),
+                                'lang_passwd_expired'                   => lang('Password expired'),
                                 'lang_changepassword'                   => lang('Change password'),                             
                                 'lang_phone'                                    => lang('Phone'),
@@ -274 +276 @@
                                 'sectors'                                               => $sectors,
                                 'combo_organizations'                   => $sectors,
+                                'passwd_expired_checked'                => 'CHECKED',
                                 'changepassword_checked'                => 'CHECKED',
                                 'phpgwaccountstatus_checked'    => 'CHECKED',
@@ -565 +568 @@
                                 'lang_aplication_permission'    => lang('Aplication Permission'),       
                                 'lang_organizations'                    => lang('Organizations'),
+                                'lang_search_organization'              => lang('Search Organiztion'),
                                 'lang_sector'                                   => lang('Sector'),
                                 'lang_account_lid'                              => lang('Login ID'),
                                 'lang_firstname'                                => lang('First Name'),
                                 'lang_lastname'                                 => lang('Last Name'),
+                                'lang_passwd_expired'                   => lang('Password expired'),
                                 'lang_password'                                 => lang('Password'),
                                 'lang_phone'                                    => lang('Phone'),
@@ -592 +597 @@
                                 'display_tr_default_password'   => $this->functions->check_acl($manager_account_lid,'set_user_default_password') ? '' : 'none',
                                 
+                                'passwd_expired_checked'                => $user_info['passwd_expired'] == '0' ? 'CHECKED' : '',
                                 'changepassword_checked'                => $user_info['changepassword'] == '1' ? 'CHECKED' : '',
                                 'phpgwaccountstatus_checked'    => $user_info['phpgwaccountstatus'] == 'A' ? 'CHECKED' : '',

trunk/expressoAdmin1_2/inc/class.user.inc.php

@@ -89 +89 @@
                                 $user_info['userPassword']                              = '{md5}' . base64_encode(pack("H*",md5($params['password1'])));
                                 
+                                if ($params['passwd_expired'] == '1')
+                                        $user_info['phpgwLastPasswdChange'] = '0';
+                                
                                 // Gerenciar senhas RFC2617
                                 if ($this->current_config['expressoAdmin_userPasswordRFC2617'] == 'true')
@@ -270 +273 @@
                         $dn = 'uid=' . $old_values['uid'] . ',' . strtolower($old_values['context']);
                         $diff = array_diff($new_values, $old_values);
+                        /*
+                        echo '<pre>';
+                        echo '--- OLD: ';
+                        print_r($old_values['passwd_expired']);
+                        echo '<br>--- NEW: ';
+                        print_r($new_values['passwd_expired']);
+                        echo '<br>';
+                        print_r($diff);
+                        return;
+                        */
                         
                         $manager_account_lid = $_SESSION['phpgw_session']['session_lid'];
@@ -339 +352 @@
                                         $ldap_mod_replace['telephonenumber'] = $new_values['telephonenumber'];
                                         $this->db_functions->write_log("alterado telephonenumber do usuario",'',$dn,'','');
+                                }
+                                ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                                // Passwd Expired - Com atributo
+                                if (($old_values['passwd_expired'] != '') && ($new_values['passwd_expired'] == '1'))
+                                {
+                                        $ldap_mod_replace['phpgwlastpasswdchange'] = '0';
+                                        $this->db_functions->write_log("Expirado senha do usuário",'',$dn,'','');
                                 }
                         }
@@ -457 +477 @@
                                         $ldap_remove['telephonenumber'] = array();
                                         $this->db_functions->write_log("removido telephonenumber do usuario",'',$dn,'','');
+                                }
+                                ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                                // Passwd Expired - Sem atributo
+                                if (($old_values['passwd_expired'] == '') && ($new_values['passwd_expired'] == '1'))
+                                {
+                                        $ldap_add['phpgwlastpasswdchange'] = '0';
+                                        $this->db_functions->write_log("Expirado senha do usuário",'',$dn,'','');
+                                }
+                                if (($old_values['passwd_expired'] == '0') && ($new_values['passwd_expired'] == ''))
+                                {
+                                        $ldap_remove['phpgwlastpasswdchange'] = array();
+                                        $this->db_functions->write_log("Removido expiração da senha do usuário",'',$dn,'','');
                                 }
                                 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////