Changeset 2353
- Timestamp:
- 03/26/10 14:03:39 (14 years ago)
- Location:
- branches/2.1/expressoAdmin1_2
- Files:
-
- 3 edited
-
inc/class.uiaccounts.inc.php (modified) (9 diffs)
-
js/jscode/institutional_accounts.js (modified) (2 diffs)
-
js/jscode/shared_accounts.js (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/2.1/expressoAdmin1_2/inc/class.uiaccounts.inc.php
r2349 r2353 1 1 <?php 2 2 /***********************************************************************************\ 3 * Expresso Administra ￜￜo *3 * Expresso Administração * 4 4 * by Joao Alfredo Knopik Junior (joao.alfredo@gmail.com, jakjr@celepar.pr.gov.br) * 5 5 * ----------------------------------------------------------------------------------* … … 261 261 $t->set_block('body','main'); 262 262 263 // Pega combo das organiza ￜￜes e seleciona, caso seja um post, o setor que o usuario selecionou.263 // Pega combo das organizações e seleciona, caso seja um post, o setor que o usuario selecionou. 264 264 foreach ($manager_contexts as $index=>$context) 265 265 $combo_manager_org .= $this->functions->get_organizations($context); … … 389 389 $GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/expressoAdmin1_2/inc/access_denied.php')); 390 390 } 391 // SOMENTE ALTERA ￜￜO DE SENHA391 // SOMENTE ALTERAÇÃO DE SENHA 392 392 if ((!$this->functions->check_acl($manager_account_lid,'edit_users')) && ($this->functions->check_acl($manager_account_lid,'change_users_password'))) 393 393 { … … 395 395 $disabled_password = ''; 396 396 } 397 // SOMENTE ALTERA ￜￜO DOS ATRIBUTOS SAMBA397 // SOMENTE ALTERAÇÃO DOS ATRIBUTOS SAMBA 398 398 if ((!$this->functions->check_acl($manager_account_lid,'edit_users')) && ($this->functions->check_acl($manager_account_lid,'edit_sambausers_attributes'))) 399 399 { … … 401 401 $disabled_samba = ''; 402 402 } 403 // SOMENTE ALTERA ￜￜO DE TELEFONE403 // SOMENTE ALTERAÇÃO DE TELEFONE 404 404 if ((!$this->functions->check_acl($manager_account_lid,'edit_users')) && ($this->functions->check_acl($manager_account_lid,'edit_users_phonenumber'))) 405 405 { … … 454 454 if (strlen($user_info['corporative_information_cpf']) == 11) 455 455 { 456 // Compat ï¿œvel com o php4.456 // Compatível com o php4. 457 457 //$cpf_tmp = str_split($user_info['corporative_information_cpf'], 3); 458 458 $cpf_tmp[0] = $user_info['corporative_information_cpf'][0] . $user_info['corporative_information_cpf'][1] . $user_info['corporative_information_cpf'][2]; … … 495 495 foreach ($array_groups as $gidnumber=>$cn) 496 496 { 497 // O memberUid do usu ï¿œrio estï¿œ somente no Banco, entï¿œo adicionamos o memberUid no Ldap.497 // O memberUid do usuário está somente no Banco, então adicionamos o memberUid no Ldap. 498 498 if (is_null($user_info['groups_ldap'][$gidnumber])) 499 499 { … … 518 518 } 519 519 520 // O memberUid do usu ï¿œrio estï¿œsomente no Ldap.520 // O memberUid do usuário está somente no Ldap. 521 521 $groups_db = array_flip($user_info['groups']); 522 522 foreach ($user_info['groups_ldap'] as $gidnumber=>$cn) … … 527 527 $this->ldap_functions->remove_user2group($gidnumber, $user_info['uid']); 528 528 if ($alert_warning == '') 529 $alert_warning = "O expressoAdmin corrigiu as seguintes inconsist ï¿œncias:\\n";530 $alert_warning .= "Removido atributo memberUid do usu ï¿œrio do grupo $cn.\\n";529 $alert_warning = "O expressoAdmin corrigiu as seguintes inconsistências:\\n"; 530 $alert_warning .= "Removido atributo memberUid do usuário do grupo $cn.\\n"; 531 531 */ 532 532 $ea_select_user_groups_options .= "<option value=" . $gidnumber . ">" . $cn . " [".lang('only on ldap')."]</option>"; -
branches/2.1/expressoAdmin1_2/js/jscode/institutional_accounts.js
r2349 r2353 113 113 var RegExp_name = new RegExp("\\b"+oText.value, "i"); 114 114 115 //Inclui usu ï¿œrio comeï¿œando com a pesquisa115 //Inclui usuário começando com a pesquisa 116 116 for(i = 0; i < select_available_users_clone.length; i++){ 117 117 if ( RegExp_name.test(select_available_users_clone[i].text) || (select_available_users_clone[i].value == -1) ) … … 243 243 Element('mail').value = data.mail; 244 244 Element('desc').value = data.description; 245 //Necessario, pois o IE6 tem um bug que n ï¿œo exibe as novas opￜￜes se o innerHTML estava vazio245 //Necessario, pois o IE6 tem um bug que nao exibe as novas opcoes se o innerHTML estava vazio 246 246 Element('ea_select_owners').innerHTML = ' ' + data.owners; 247 247 Element('ea_select_owners').outerHTML = Element('ea_select_owners').outerHTML; -
branches/2.1/expressoAdmin1_2/js/jscode/shared_accounts.js
r2349 r2353 135 135 var RegExp_name = new RegExp("\\b"+oText.value, "i"); 136 136 137 //Inclui usu ï¿œrio comeï¿œando com a pesquisa137 //Inclui usuario comecando com a pesquisa 138 138 for(i = 0; i < select_available_users_clone.length; i++){ 139 139 if ( RegExp_name.test(select_available_users_clone[i].text) || (select_available_users_clone[i].value == -1) ) … … 211 211 select_owners.options[i--] = null; 212 212 } 213 //Nova chamada a "Element" ï¿œ Necessï¿œria devido a um bug do ie com select213 //Nova chamada a "Element" eh Necessaria devido a um bug do ie com select 214 214 select_owners = Element('ea_select_owners'); 215 215 if(select_owners.options.length > 0 ){ … … 283 283 Element('quota_used_field').style.display = 'inline'; 284 284 Element('desc').value = data.description; 285 //Necessario, pois o IE6 tem um bug que n ï¿œo exibe as novas opￜￜes se o innerHTML estava vazio285 //Necessario, pois o IE6 tem um bug que nao exibe as novas opcoes se o innerHTML estava vazio 286 286 Element('ea_select_owners').innerHTML = ' ' + data.owners_options; 287 287 Element('ea_select_owners').outerHTML = Element('ea_select_owners').outerHTML;
Note: See TracChangeset
for help on using the changeset viewer.
