Changeset 72 for trunk/expressoAdmin1_2
- Timestamp:
- 09/24/07 10:22:29 (17 years ago)
- Location:
- trunk/expressoAdmin1_2
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php
r69 r72 769 769 $result['sn'] = $entry[0]['sn'][0]; 770 770 $result['telephonenumber'] = $entry[0]['telephonenumber'][0]; 771 $result['passwd_expired'] = $entry[0]['phpgwlastpasswdchange'][0]; 771 772 $result['phpgwaccountstatus'] = $entry[0]['phpgwaccountstatus'][0]; 772 773 $result['phpgwaccountvisible'] = $entry[0]['phpgwaccountvisible'][0]; -
trunk/expressoAdmin1_2/inc/class.uiaccounts.inc.php
r64 r72 256 256 'lang_lists_permission' => lang('Email Lists'), 257 257 'lang_aplication_permission' => lang('Aplication Permission'), 258 'lang_search_organization' => lang('Search Organiztion'), 258 259 'lang_organizations' => lang('Organizations'), 259 260 'lang_sector' => lang('Sector'), … … 263 264 'lang_password' => lang('Password'), 264 265 'lang_re-password' => lang('Re-Password'), 266 'lang_passwd_expired' => lang('Password expired'), 265 267 'lang_changepassword' => lang('Change password'), 266 268 'lang_phone' => lang('Phone'), … … 274 276 'sectors' => $sectors, 275 277 'combo_organizations' => $sectors, 278 'passwd_expired_checked' => 'CHECKED', 276 279 'changepassword_checked' => 'CHECKED', 277 280 'phpgwaccountstatus_checked' => 'CHECKED', … … 565 568 'lang_aplication_permission' => lang('Aplication Permission'), 566 569 'lang_organizations' => lang('Organizations'), 570 'lang_search_organization' => lang('Search Organiztion'), 567 571 'lang_sector' => lang('Sector'), 568 572 'lang_account_lid' => lang('Login ID'), 569 573 'lang_firstname' => lang('First Name'), 570 574 'lang_lastname' => lang('Last Name'), 575 'lang_passwd_expired' => lang('Password expired'), 571 576 'lang_password' => lang('Password'), 572 577 'lang_phone' => lang('Phone'), … … 592 597 'display_tr_default_password' => $this->functions->check_acl($manager_account_lid,'set_user_default_password') ? '' : 'none', 593 598 599 'passwd_expired_checked' => $user_info['passwd_expired'] == '0' ? 'CHECKED' : '', 594 600 'changepassword_checked' => $user_info['changepassword'] == '1' ? 'CHECKED' : '', 595 601 'phpgwaccountstatus_checked' => $user_info['phpgwaccountstatus'] == 'A' ? 'CHECKED' : '', -
trunk/expressoAdmin1_2/inc/class.user.inc.php
r69 r72 89 89 $user_info['userPassword'] = '{md5}' . base64_encode(pack("H*",md5($params['password1']))); 90 90 91 if ($params['passwd_expired'] == '1') 92 $user_info['phpgwLastPasswdChange'] = '0'; 93 91 94 // Gerenciar senhas RFC2617 92 95 if ($this->current_config['expressoAdmin_userPasswordRFC2617'] == 'true') … … 270 273 $dn = 'uid=' . $old_values['uid'] . ',' . strtolower($old_values['context']); 271 274 $diff = array_diff($new_values, $old_values); 275 /* 276 echo '<pre>'; 277 echo '--- OLD: '; 278 print_r($old_values['passwd_expired']); 279 echo '<br>--- NEW: '; 280 print_r($new_values['passwd_expired']); 281 echo '<br>'; 282 print_r($diff); 283 return; 284 */ 272 285 273 286 $manager_account_lid = $_SESSION['phpgw_session']['session_lid']; … … 339 352 $ldap_mod_replace['telephonenumber'] = $new_values['telephonenumber']; 340 353 $this->db_functions->write_log("alterado telephonenumber do usuario",'',$dn,'',''); 354 } 355 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 356 // Passwd Expired - Com atributo 357 if (($old_values['passwd_expired'] != '') && ($new_values['passwd_expired'] == '1')) 358 { 359 $ldap_mod_replace['phpgwlastpasswdchange'] = '0'; 360 $this->db_functions->write_log("Expirado senha do usuário",'',$dn,'',''); 341 361 } 342 362 } … … 457 477 $ldap_remove['telephonenumber'] = array(); 458 478 $this->db_functions->write_log("removido telephonenumber do usuario",'',$dn,'',''); 479 } 480 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 481 // Passwd Expired - Sem atributo 482 if (($old_values['passwd_expired'] == '') && ($new_values['passwd_expired'] == '1')) 483 { 484 $ldap_add['phpgwlastpasswdchange'] = '0'; 485 $this->db_functions->write_log("Expirado senha do usuário",'',$dn,'',''); 486 } 487 if (($old_values['passwd_expired'] == '0') && ($new_values['passwd_expired'] == '')) 488 { 489 $ldap_remove['phpgwlastpasswdchange'] = array(); 490 $this->db_functions->write_log("Removido expiração da senha do usuário",'',$dn,'',''); 459 491 } 460 492 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -
trunk/expressoAdmin1_2/js/jscode/users.js
r64 r72 546 546 finderTimeout_maillist = setTimeout("optionFinder_maillist('"+obj.id+"')",500); 547 547 } 548 function optionFinder_maillist(id) { 548 function optionFinder_maillist(id) { 549 549 var oWait = document.getElementById("ea_span_searching_maillist"); 550 550 var oText = document.getElementById(id); … … 681 681 return true; 682 682 } 683 684 function search_organization(key) 685 { 686 var organizations = document.getElementById('ea_combo_org_info'); 687 var RegExp_org = new RegExp("\\b"+key, "i"); 688 689 for(i = 0; i < organizations.length; i++) 690 { 691 if (RegExp_org.test(organizations[i].text)) 692 { 693 organizations[i].selected = true; 694 return; 695 } 696 } 697 } -
trunk/expressoAdmin1_2/templates/default/accounts_form.tpl
r64 r72 41 41 <table width="90%" border="0" cellspacing="4"> 42 42 <tr bgcolor={row_on}> 43 <td>{lang_search_organization}:</td> 44 <td><input type="text" id="organization_search" autocomplete="off" size=20 onKeyUp="javascript:search_organization(this.value);" onBlur="javascript:sinc_combos_org(context.value); get_available_groups(context.value); get_available_maillists(context.value); get_available_sambadomains(context.value, '{type}')"></td> 45 </tr> 46 47 <tr bgcolor={row_off}> 43 48 <td>{lang_organizations}:</td> 44 49 <td><select {disabled} id="ea_combo_org_info" name="context" onchange="javascript:sinc_combos_org(this.value); get_available_groups(this.value); get_available_maillists(this.value); get_available_sambadomains(this.value, '{type}')">{sectors}</select></td> 45 50 </tr> 46 51 47 <tr bgcolor={row_o ff}>52 <tr bgcolor={row_on}> 48 53 <td>{lang_account_lid}:</td> 49 54 <td> … … 57 62 </tr> 58 63 59 <tr bgcolor={row_o n}>64 <tr bgcolor={row_off}> 60 65 <td width="15%">{lang_firstname}:</td> 61 66 <td width="35%"><input type="text" name="givenname" value="{givenname}" autocomplete="off" {disabled} size=42></input> </td> … … 89 94 </td> 90 95 </tr> 91 92 <tr bgcolor={row_off}> 93 <td colspan="2">{lang_changepassword}:</td> 96 97 <tr bgcolor={row_on}> 98 <td colspan="2">{lang_passwd_expired}:</td> 99 <td><input type="checkbox" {passwd_expired_checked} {disabled} name="passwd_expired" id="passwd_expired" value="1"</td> 100 </tr> 101 102 <tr bgcolor={row_off}> 103 <td colspan="2">{lang_changepassword}:</td> 94 104 <td><input type="checkbox" {changepassword_checked} {disabled} name="changepassword" id="changepassword" value="1"</td> 95 105 </tr>
Note: See TracChangeset
for help on using the changeset viewer.