Changeset 309 for trunk/expressoAdmin1_2/inc
- Timestamp:
- 06/10/08 16:40:13 (16 years ago)
- Location:
- trunk/expressoAdmin1_2/inc
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoAdmin1_2/inc/access_denied.php
r283 r309 20 20 21 21 $var = Array( 22 'lang_access_denied' => lang('You don\'t have access to this module.'),22 'lang_access_denied' => lang('You dont have access to this module.'), 23 23 'lang_back' => lang('Back'), 24 24 'back_url' => $GLOBALS['phpgw']->link('/expressoAdmin1_2/index.php') -
trunk/expressoAdmin1_2/inc/class.imap_functions.inc.php
r233 r309 12 12 var $imap_server; 13 13 var $imap_port; 14 var $imap_trashfolder;15 var $imap_sentfolder;16 var $imap_draftsfolder;17 var $imap_spamfolder;18 14 19 15 function imap_functions(){ … … 22 18 $this->imap_server = $_SESSION['phpgw_info']['expresso']['email_server']['imapServer']; 23 19 $this->imap_port = $_SESSION['phpgw_info']['expresso']['email_server']['imapPort']; 24 $this->imap_trashfolder = $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultTrashFolder'];25 $this->imap_sentfolder = $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultSentFolder'];26 $this->imap_draftsfolder = $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultDraftsFolder'];27 $this->imap_spamfolder = $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultSpamFolder'];28 29 20 $this->imapDelimiter= $_SESSION['phpgw_info']['expresso']['email_server']['imapDelimiter']; 30 31 21 $this->imap = imap_open('{'.$this->imap_server.':'.$this->imap_port.'/novalidate-cert}', $this->imap_admin, $this->imap_passwd, OP_HALFOPEN); 32 22 $this->functions = new functions; … … 42 32 return $result; 43 33 } 44 if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . $this->imap_sentfolder))34 if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . "Enviados")) 45 35 { 46 36 $error = imap_errors(); 47 37 $result['status'] = false; 48 $result['msg'] = "Erro na funcao imap_function->create($this->imap_sentfolder): ". $error[0];38 $result['msg'] = 'Erro na funcao imap_function->create(Enviados): ' . $error[0]; 49 39 return $result; 50 40 } 51 if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . $this->imap_draftsfolder))41 if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . "Rascunhos")) 52 42 { 53 43 $error = imap_errors(); 54 44 $result['status'] = false; 55 $result['msg'] = "Erro na funcao imap_function->create($this->imap_draftsfolder): ". $error[0];45 $result['msg'] = 'Erro na funcao imap_function->create(Rascunho): ' . $error[0]; 56 46 return $result; 57 47 } 58 if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . $this->imap_trashfolder))48 if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . "Lixeira")) 59 49 { 60 50 $error = imap_errors(); 61 51 $result['status'] = false; 62 $result['msg'] = "Erro na funcao imap_function->create($this->imap_trashfolder): ". $error[0];52 $result['msg'] = 'Erro na funcao imap_function->create(Lixeira): ' . $error[0]; 63 53 return $result; 64 54 } 65 if ($this->imap_spamfolder != "")66 if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . $this->imap_spamfolder))67 {68 $error = imap_errors();69 $result['status'] = false;70 $result['msg'] = "Erro na funcao imap_function->create($this->imap_spamfolder): " . $error[0];71 return $result;72 }73 74 75 55 if (!imap_set_quota($this->imap,"user" . $this->imapDelimiter . $uid, ($mailquota*1024))) 76 56 { -
trunk/expressoAdmin1_2/inc/class.totalsessions.inc.php
r283 r309 36 36 function show_total_sessions() 37 37 { 38 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Total sessions');38 $GLOBALS['phpgw_info']['flags']['app_header'] = 'ExpressoAdmin - '.lang('Total Sessions'); 39 39 $GLOBALS['phpgw']->common->phpgw_header(); 40 40 echo parse_navbar(); … … 45 45 $total = $this->get_total_sessions(); 46 46 47 $this->template->set_var('lang_total', lang(' Totalsessions'));48 $this->template->set_var('lang_back', lang(' Back'));47 $this->template->set_var('lang_total', lang('totalsessions')); 48 $this->template->set_var('lang_back', lang('back')); 49 49 $this->template->set_var('back_url', $GLOBALS['phpgw']->link('/expressoAdmin1_2/index.php')); 50 50 $this->template->set_var('total', $total); -
trunk/expressoAdmin1_2/inc/class.uiaccounts.inc.php
r283 r309 92 92 'bg_color' => $GLOBALS['phpgw_info']['theme']['bg_color'], 93 93 'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], 94 94 95 'accounts_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uiaccounts.list_users'), 95 96 'back_url' => $GLOBALS['phpgw']->link('/expressoAdmin1_2/index.php'), … … 101 102 'imapDelimiter' => $_SESSION['phpgw_info']['expresso']['email_server']['imapDelimiter'], 102 103 103 'lang_create_user' => lang('Create user'),104 'lang_loginid' => lang('Login '),104 'lang_create_user' => lang('Create User'), 105 'lang_loginid' => lang('LoginID'), 105 106 'lang_cn' => lang('Name'), 106 107 'lang_mail' => lang('E-mail'), 107 'lang_edit' => lang('Edit'), 108 'lang_rename' => lang('Rename'), 108 'lang_edit' => lang('edit'), 109 'lang_rename' => lang('rename'), 110 'lang_delete' => lang('delete'), 109 111 'lang_search' => lang('Search'), 110 'lang_back' => lang('Back'), 111 'lang_contexts' => lang('Contexts'), 112 'lang_delete_user' => lang('Delete user?'), 113 'lang_delete' => lang('Delete'), 114 'lang_sucess' => lang('User deleted successfully!'), 115 'lang_rename_user' => lang('Rename user'), 116 'lang_rename_success' => lang('User renamed successfully!'), 117 'login_field_contains_not_allowed' => lang('Login field contains invalid characters'), 118 'lang_to' => lang('to:') 112 'lang_back' => lang('back'), 113 'lang_contexts' => lang('Contexts') 114 119 115 ); 120 116 $p->set_var($var); … … 169 165 170 166 if ($can_rename) 171 $p->set_var('row_rename',"<a href='#' onClick='javascript:rename_user(\"".$account['account_lid']."\",\"".$account['account_id']."\");'> ".lang('Rename')."</a>");167 $p->set_var('row_rename',"<a href='#' onClick='javascript:rename_user(\"".$account['account_lid']."\",\"".$account['account_id']."\");'>Renomear</a>"); 172 168 else 173 169 $p->set_var('row_rename',' '); … … 175 171 if ($can_delete) 176 172 { 177 $p->set_var('row_delete',"<a href='#' onClick='javascript:delete_user(\"".$account['account_lid']."\",\"".$account['account_id']."\");'> ".lang('Delete')."</a>");173 $p->set_var('row_delete',"<a href='#' onClick='javascript:delete_user(\"".$account['account_lid']."\",\"".$account['account_id']."\");'>Excluir</a>"); 178 174 } 179 175 else … … 217 213 $t->set_file(array("body" => "accounts_form.tpl")); 218 214 $t->set_block('body','main'); 219 220 215 221 216 // Pega combo das organizações e seleciona, caso seja um post, o setor que o usuario selecionou. … … 245 240 // Valores default. 246 241 $var = Array( 247 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uiaccounts.list_users'),248 'photo_bin' => $GLOBALS['phpgw_info']['server']['webserver_url'].'/expressoAdmin1_2/templates/default/images/photo_celepar.png',249 242 'row_on' => "#DDDDDD", 250 243 'row_off' => "#EEEEEE", 251 244 'color_bg1' => "#E8F0F0", 245 //'manager_context' => $manager_context, 252 246 'type' => 'create_user', 247 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uiaccounts.list_users'), 253 248 'display_samba_suport' => $this->current_config['expressoAdmin_samba_support'] == 'true' ? '' : 'none', 254 'disabled_access_button' => 'disabled', 255 'display_access_records' => 'none', 249 'disabled_access_button'=> 'disabled', 256 250 257 251 // First ABA 258 252 'display_spam_uid' => 'display:none', 259 'lang_general_information' => lang('General information'),260 'lang_corporative_information' => lang('Corporative information'),261 'lang_email_config' => lang('E-mail config'),262 'lang_groups_permission' => lang('Group permissions'),263 'lang_lists_permission' => lang('E -mail lists'),264 'lang_aplication_permission' => lang('Application permissions'),265 'lang_search_organization' => lang('Search organization'),253 'lang_general_information' => lang('General Information'), 254 'lang_corporative_information' => lang('Corporative Information'), 255 'lang_email_config' => lang('Email Config'), 256 'lang_groups_permission' => lang('Groups Permission'), 257 'lang_lists_permission' => lang('Email Lists'), 258 'lang_aplication_permission' => lang('Aplication Permission'), 259 'lang_search_organization' => lang('Search Organiztion'), 266 260 'lang_organizations' => lang('Organizations'), 267 261 'lang_sector' => lang('Sector'), 268 'lang_account_lid' => lang('Login'),269 'lang_firstname' => lang('First name'),270 'lang_lastname' => lang('Last name'),262 'lang_account_lid' => lang('Login ID'), 263 'lang_firstname' => lang('First Name'), 264 'lang_lastname' => lang('Last Name'), 271 265 'lang_password' => lang('Password'), 272 'lang_re-password' => lang('Re-password'),266 'lang_re-password' => lang('Re-Password'), 273 267 'lang_passwd_expired' => lang('Password expired'), 274 268 'lang_changepassword' => lang('Change password'), 275 269 'lang_phone' => lang('Phone'), 276 270 'lang_photo' => lang('Photo'), 277 'lang_account_active' => lang(' Enabled account'),278 'lang_account_invisible' => lang(' Hidden account'),279 'lang_never' => lang('Never'),271 'lang_account_active' => lang('Account Active'), 272 'lang_account_invisible' => lang('Account Invisible'), 273 'lang_never' => lang('never'), 280 274 'lang_back' => lang('Back'), 281 275 'lang_save' => lang('Save'), … … 286 280 'changepassword_checked' => 'CHECKED', 287 281 'phpgwaccountstatus_checked' => 'CHECKED', 282 'photo_bin' => $GLOBALS['phpgw_info']['server']['webserver_url'].'/expressoAdmin1_2/templates/default/images/photo_celepar.png', 288 283 'display_picture' => $this->functions->check_acl($manager_lid,'edit_users_picture') ? '' : 'none', 289 284 'display_tr_default_password' => 'none', … … 296 291 'display_corporative_information' => $this->functions->check_acl($manager_lid,'manipulate_corporative_information') ? '' : 'none', 297 292 'lang_employeenumber' => lang('Employee number'), 298 'lang_cpf' => lang('CPF'),299 'lang_rg' => lang('RG'),300 'lang_rguf' => lang('RG UF'),293 'lang_cpf' => lang('cpf'), 294 'lang_rg' => lang('rg'), 295 'lang_rguf' => lang('rguf'), 301 296 302 297 //MAIL 303 'lang_activeemailaccount' => lang('Active e -mail account'),298 'lang_activeemailaccount' => lang('Active email account'), 304 299 'lang_email' => lang('E-mail'), 305 'lang_aliasemail' => lang('E-mail alias'),306 'lang_forwardingemail' => lang('Forwarding e -mail'),307 'lang_email_quota' => lang('E-mail quota in MB'),300 'lang_aliasemail' => lang('Alias email'), 301 'lang_forwardingemail' => lang('Forwarding email'), 302 'lang_email_quota' => lang('Email quota in MB'), 308 303 'lang_onlyforwarding' => lang('Only forwarding'), 309 'lang_quote_message' => lang(' Leave empty for no quota'),310 'lang_email_quota_used' => lang(' Used quotain MB'),304 'lang_quote_message' => lang('leave empty for no quota'), 305 'lang_email_quota_used' => lang('Quota used in MB'), 311 306 'accountstatus_checked' => 'CHECKED', 312 307 'mailquota' => $this->current_config['expressoAdmin_defaultUserQuota'], … … 318 313 //Third ABA 319 314 'lang_groups' => lang('Groups'), 320 'lang_user_groups' => lang('Selected user groups'),321 'lang_available_groups' => lang('Available groups'),322 'lang_listGroups' => lang('List groups'),323 'lang_primary_group' => lang('Primary group'),315 'lang_user_groups' => 'Grupos do Usuário', 316 'lang_available_groups' => 'Grupos disponíveis', 317 'lang_listGroups' => lang('ListGroups'), 318 'lang_primary_group' => lang('Primary Group'), 324 319 'lang_add' => lang('Add'), 325 320 'lang_rem' => lang('Remove'), 326 321 327 322 //Fourd ABA 328 'lang_user_mail_lists' => lang('Selected e-mail lists'),329 'lang_available_mail_lists' => lang('Available e-mail lists'),323 'lang_user_mail_lists' => 'O usuário participa destas Listas de E-mail', 324 'lang_available_mail_lists' => 'Listas de E-mail disponíveis', 330 325 331 326 //Five ABA … … 333 328 334 329 //SAMBA ABA 335 'lang_samba_config' => lang('Samba config'),336 'lang_use_attrs_samba' => lang('Use Samba attributes'),330 'lang_samba_config' => lang('Samba Config'), 331 'lang_use_attrs_samba' => lang('Use samba attributes'), 337 332 'lang_sambadomain' => lang('Domain'), 338 'lang_sambaAcctFlags' => lang('Samba account flags'),339 'lang_sambaLogonScript' => lang('Logon script'),340 'lang_sambaHomeDirectory' => lang('Home directory'),341 'lang_active_user' => lang('Enabled Samba user'),342 'lang_desactive_user' => lang('Disabled Samba user'),333 'lang_sambaAcctFlags' => lang('AcctFlags'), 334 'lang_sambaLogonScript' => lang('Logon Script'), 335 'lang_sambaHomeDirectory' => lang('Home Directory'), 336 'lang_active_user' => lang('Samba User Active'), 337 'lang_desactive_user' => lang('Samba User Desactive'), 343 338 'use_attrs_samba_checked' => 'CHECKED', 344 339 'sambadomainname_options' => $sambadomainname_options, 345 340 'sambalogonscript' => $this->current_config['expressoAdmin_defaultLogonScript'] != '' ? $this->current_config['expressoAdmin_defaultLogonScript'] : '', 346 341 'use_suggestion_in_logon_script' => $this->current_config['expressoAdmin_defaultLogonScript'] == '' ? 'true' : 'false', 347 348 'login_field_empty' => lang('Login field is empty'),349 'login_field_must_have' => lang('Login field must have more than'),350 'characters' => lang('characters'),351 'password_field_empty' => lang('Password field is empty'),352 're-pass_field_empty' => lang('Re-password field is empty'),353 'pass_re-pass_diferents' => lang('Password and Re-password are differentes'),354 'register_field_contains_not_allowed' => lang('Field register contains invalid characters. Only numbers are allowed'),355 'cpf_field_not_allowed' => lang('Field CPF contains invalid characters. Only numbers are allowed'),356 'email_field_empty' => lang('Email field is empty'),357 'first_name_empty' => lang('First name field is empty'),358 'first_name_not_valid' => lang('First name field is invalid'),359 'last_name_empty' => lang('Last name field is empty'),360 'last_name_not_valid' => lang('Last name field is not valid'),361 'telephone_empty' => lang('Telephone field is empty'),362 'redirect_email_empty' => lang('Redirect email field is empty'),363 'without_quota' => lang('User without quota'),364 'no_group_selected' => lang('No groups selected'),365 'user_logon_script_empty' => lang('User logon script is empty'),366 'user_home_path_empty' => lang('User home path is empty'),367 'user_successfully_created' => lang('User successfully created!'),368 'user_successfully_saved' => lang('User successfully saved!'),369 'default_password_registered' => lang('Default password successfully registered'),370 'user_password_returned_with_success' => lang('User password returned with success'),371 'user_deleted_with_success' => lang('User deleted successfully!'),372 'login_field_contains_not_allowed' => lang('Login field contains not allowed characters'),373 'page_not_found' => lang('Page Not Found!'),374 'type_name_new_manager' => lang('Type in the new managers name'),375 'email_field_not_valid' => lang('E-mail field is invalid'),376 'searching' => lang('Searching...'),377 'delete_the_list' => lang('Delete list '),378 'delete_the_group' => lang('Delete group '),379 'cpf_invalid_field' => lang('Invalid CPF field'),380 'incorrect_telephone_field' => lang('Incorrect Telephone Field'),381 'change_user_login' => lang('Change user login'),382 'to' => lang('to'),383 'removed' => lang('removed'),384 'lang_search_group' => lang('Search group'),385 'lang_search_list' => lang('Search list'),386 'lang_clear_inbox_user' => lang('Clear'),387 'lang_inbox_user' => lang('User inbox'),388 'display_tr_inbox_user' => 'none',389 'lang_access_records' => lang('Show access records'),390 'cpf_field_invalid' => lang('CPF field is invalid')391 342 ); 392 343 $t->set_var($var); … … 471 422 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 472 423 473 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit user');424 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit User'); 474 425 $GLOBALS['phpgw']->common->phpgw_header(); 475 426 … … 517 468 518 469 if ($alert_warning == '') 519 $alert_warning = lang("The ExpressoAdmin fixed the following inconsistencies:\n");470 $alert_warning = "O expressoAdmin corrigiu as seguintes inconsistências:\\n"; 520 471 $alert_warning .= "Incluido atributo memberUid do usuário no grupo:\\n$cn - gidnumber: $gidnumber."; 521 472 } … … 656 607 'alert_warning' => "$alert_warning", 657 608 'display_input_account_lid' => 'display:none', 658 'lang_general_information' => lang('General information'),659 'lang_corporative_information' => lang('Corporative information'),660 'lang_email_config' => lang('E-mail config'),661 'lang_groups_permission' => lang('Group permissions'),662 'lang_lists_permission' => lang('E-mail lists'),663 'lang_aplication_permission' => lang('Ap plication permissions'),609 'lang_general_information' => lang('General Information'), 610 'lang_corporative_information' => lang('Corporative Information'), 611 'lang_email_config' => lang('Email Config'), 612 'lang_groups_permission' => lang('Groups Permission'), 613 'lang_lists_permission' => lang('Email Lists'), 614 'lang_aplication_permission' => lang('Aplication Permission'), 664 615 'lang_organizations' => lang('Organizations'), 665 'lang_search_organization' => lang('Search organization'),616 'lang_search_organization' => lang('Search Organiztion'), 666 617 'lang_sector' => lang('Sector'), 667 'lang_account_lid' => lang('Login'),668 'lang_firstname' => lang('First name'),669 'lang_lastname' => lang('Last name'),618 'lang_account_lid' => lang('Login ID'), 619 'lang_firstname' => lang('First Name'), 620 'lang_lastname' => lang('Last Name'), 670 621 'lang_passwd_expired' => lang('Password expired'), 671 622 'lang_password' => lang('Password'), 672 623 'lang_phone' => lang('Phone'), 673 624 'lang_photo' => lang('Photo'), 674 'lang_re-password' => lang('Re-password'),625 'lang_re-password' => lang('Re-Password'), 675 626 'lang_changepassword' => lang('Change password'), 676 'lang_account_active' => lang('Enabled account'),677 'lang_account_invisible' => lang('Hidden account'),627 'lang_account_active' => lang('Account Active'), 628 'lang_account_invisible' => lang('Account Invisible'), 678 629 'lang_back' => lang('Back'), 679 630 'lang_save' => lang('Save'), 680 'lang_delete_photo' => lang('Delete photo'),681 631 682 632 'sectors' => $combo_manager_org, … … 703 653 // Corporative Information 704 654 'lang_employeenumber' => lang('Employee number'), 705 'lang_cpf' => lang('CPF'), 706 'lang_rg' => lang('RG'), 707 'lang_rguf' => lang('RG UF'), 708 'cpf_field_invalid' => lang('CPF field is invalid'), 709 655 'lang_cpf' => lang('cpf'), 656 'lang_rg' => lang('rg'), 657 'lang_rguf' => lang('rguf'), 710 658 'corporative_information_employeenumber' => $user_info['corporative_information_employeenumber'], 711 659 'corporative_information_cpf' => $user_info['corporative_information_cpf'], … … 715 663 //MAIL 716 664 'disabled_quota_used' => 'disabled', 717 'lang_activeemailaccount' => lang('Active e -mail account'),665 'lang_activeemailaccount' => lang('Active email account'), 718 666 'lang_email' => lang('E-mail'), 719 'lang_aliasemail' => lang('E-mail alias'),720 'lang_forwardingemail' => lang('Forwarding e -mail'),721 'lang_email_quota' => lang('E-mail quota in MB'),667 'lang_aliasemail' => lang('Alias email'), 668 'lang_forwardingemail' => lang('Forwarding email'), 669 'lang_email_quota' => lang('Email quota in MB'), 722 670 'lang_onlyforwarding' => lang('Only forwarding'), 723 'lang_email_quota_used' => lang('Used quota in MB'), 724 'lang_clear_inbox_user' => lang('Clear'), 725 'lang_inbox_user' => lang('User inbox'), 726 'display_tr_inbox_user' => '', 727 671 'lang_email_quota_used' => lang('Quota used in MB'), 728 672 729 673 'accountstatus_checked' => $user_info['accountstatus'] == 'active' ? 'CHECKED' : '', … … 733 677 //'mailforwardingaddress' => $user_info['mailforwardingaddress'], 734 678 'input_mailalternateaddress_fields' => $input_mailalternateaddress_fields, 735 'input_mailforwardingaddress_fields' 679 'input_mailforwardingaddress_fields'=> $input_mailforwardingaddress_fields, 736 680 737 681 'deliverymode_checked' => $user_info['deliverymode'] == 'forwardOnly' ? 'CHECKED' : '', 682 738 683 'mailquota' => $user_info['mailquota'], 739 684 'mailquota_used' => $user_info['mailquota_used'], … … 741 686 //Third ABA 742 687 'lang_groups' => lang('Groups'), 743 'lang_user_groups' => lang('Selected user groups'),744 'lang_available_groups' => lang('Available groups'),745 'lang_primary_group' => lang('Primary group'),688 'lang_user_groups' => 'Grupos do Usuário', 689 'lang_available_groups' => 'Grupos disponíveis', 690 'lang_primary_group' => lang('Primary Group'), 746 691 'lang_add' => lang('Add'), 747 692 'lang_rem' => lang('Remove'), … … 750 695 751 696 //Fourd ABA 752 'lang_user_mail_lists' => lang('Selected e-mail lists'),753 'lang_available_mail_lists' => lang('Available e-mail lists'),697 'lang_user_mail_lists' => 'O usuário participa destas Listas de E-mail', 698 'lang_available_mail_lists' => 'Listas de E-mail disponíveis', 754 699 'ea_select_user_maillists_options' => $ea_select_user_maillists_options, 755 700 … … 758 703 759 704 //SAMBA ABA 760 'lang_samba_config' => lang('Samba config'),761 'lang_use_attrs_samba' => lang('Use Samba attributes'),705 'lang_samba_config' => lang('Samba Config'), 706 'lang_use_attrs_samba' => lang('Use samba attributes'), 762 707 'lang_sambadomain' => lang('Domain'), 763 'lang_sambaAcctFlags' => lang(' Samba account flags'),764 'lang_sambaLogonScript' => lang('Logon script'),765 'lang_sambaHomeDirectory' => lang('Home directory'),766 'lang_active_user' => lang('Enabled Samba user'),767 'lang_desactive_user' => lang(' Disabled Samba user'),708 'lang_sambaAcctFlags' => lang('AcctFlags'), 709 'lang_sambaLogonScript' => lang('Logon Script'), 710 'lang_sambaHomeDirectory' => lang('Home Directory'), 711 'lang_active_user' => lang('Samba User Active'), 712 'lang_desactive_user' => lang('Samba User Desactive'), 768 713 769 714 'userSamba' => $user_info['sambaUser'], … … 775 720 'sambahomedirectory' => $user_info['homedirectory'], 776 721 'defaultLogonScript' => $this->current_config['expressoAdmin_defaultLogonScript'], 777 'use_suggestion_in_logon_script' => $this->current_config['expressoAdmin_defaultLogonScript'] == '' ? 'true' : 'false', 778 779 'login_field_empty' => lang('Login field is empty'), 780 'password_field_empty' => lang('Password field is empty'), 781 're-pass_field_empty' => lang('Re-password field is empty'), 782 'pass_re-pass_diferents' => lang('Password and Re-password are differentes'), 783 'register_field_contains_not_allowed' => lang('Field register contains invalid characters. Only numbers are allowed'), 784 'cpf_field_not_allowed' => lang('Field CPF contains invalid characters. Only numbers are allowed'), 785 'email_field_empty' => lang('Email field is empty'), 786 'first_name_empty' => lang('First name field is empty'), 787 'first_name_not_valid' => lang('First name field is invalid'), 788 'last_name_empty' => lang('Last name field is empty'), 789 'last_name_not_valid' => lang('Last name field is not valid'), 790 'telephone_empty' => lang('Telephone field is empty'), 791 'redirect_email_empty' => lang('Redirect email field is empty'), 792 'without_quota' => lang('User without quota'), 793 'no_group_selected' => lang('No groups selected'), 794 'user_logon_script_empty' => lang('User logon script is empty'), 795 'user_home_path_empty' => lang('User home path is empty'), 796 'user_successfully_created' => lang('User successfully created!'), 797 'user_successfully_saved' => lang('User successfully saved!'), 798 'default_password_registered' => lang('Default password successfully registered'), 799 'user_password_returned_with_success' => lang('User password returned with success'), 800 'user_deleted_with_success' => lang('User deleted successfully!'), 801 'login_field_contains_not_allowed' => lang('Login field contains invalid characters'), 802 'page_not_found' => lang('Page Not Found!'), 803 'type_name_new_manager' => lang('Type in the new managers name'), 804 'email_field_not_valid' => lang('E-mail field is invalid'), 805 'searching' => lang('Searching...'), 806 'delete_the_list' => lang('Delete list '), 807 'delete_the_group' => lang('Delete group '), 808 'cpf_invalid_field' => lang('Invalid CPF field'), 809 'incorrect_telephone_field' => lang('Incorrect Telephone Field'), 810 'change_user_login' => lang('Change user login'), 811 'to' => lang('to'), 812 'user_renamed_success' => lang('User renamed with success!'), 813 'removed' => lang('removed'), 814 'mb_from_the_user_mailbox' => lang('mb_from_the_user_mailbox'), 815 'cleaning_users_inbox' => lang('Cleaning users inbox'), 816 'lang_insert_password_default' => lang('Insert default password'), 817 'lang_restore_user_password' => lang('Restore user password'), 818 'lang_access_records' => lang('Show access records'), 819 'lang_search_group' => lang('Search group'), 820 'lang_search_list' => lang('Search list') 722 'use_suggestion_in_logon_script' => $this->current_config['expressoAdmin_defaultLogonScript'] == '' ? 'true' : 'false' 821 723 ); 822 823 724 $t->set_var($var); 824 725 … … 968 869 $var = Array( 969 870 'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], 970 'lang_back' => lang('Back'),871 'lang_back' => 'Back', 971 872 'back_url' => "./index.php?menuaction=expressoAdmin1_2.uiaccounts.edit_user&account_id=$account_id", 972 'lang_loginid' => lang('Login '),873 'lang_loginid' => lang('Login ID'), 973 874 'lang_ip' => lang('IP'), 974 'lang_login' => lang('Log in'),975 'lang_logout' => lang('Log out')875 'lang_login' => lang('Log IN'), 876 'lang_logout' => lang('Log OUT') 976 877 ); 977 878 $t->set_var($var); -
trunk/expressoAdmin1_2/inc/class.uicomputers.inc.php
r283 r309 89 89 'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], 90 90 'add_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uicomputers.add_computer'), 91 'add_computers_disabled' => $this->functions->check_acl($manager_lid,'create_computers') ? '' : 'display:none',91 'add_computers_disabled' => $this->functions->check_acl($manager_lid,'create_computers') ? '' : 'display:none', 92 92 'back_url' => $GLOBALS['phpgw']->link('/expressoAdmin1_2/index.php'), 93 93 'lang_back' => lang('Back'), 94 94 'context_display' => $context_display, 95 95 'lang_computers_uid' => lang('Computer UID'), 96 'lang_add_computers' => lang('Create computer'),96 'lang_add_computers' => lang('Create Computers'), 97 97 'lang_description' => lang('Description'), 98 98 'lang_edit' => lang('Edit'), 99 99 'lang_delete' => lang('Delete'), 100 'lang_context' => lang('Context'),101 'lang_search' => lang('Search')100 'lang_context' => lang('context'), 101 'lang_search' => lang('search') 102 102 ); 103 103 $p->set_var($var); … … 177 177 unset($GLOBALS['phpgw_info']['flags']['noheader']); 178 178 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 179 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create computer');179 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create Computers'); 180 180 $GLOBALS['phpgw']->common->phpgw_header(); 181 181 … … 224 224 'row_off' => "#EEEEEE", 225 225 'color_bg1' => "#E8F0F0", 226 227 226 'lang_back' => lang('Back'), 228 'lang_save' => lang('Save'),229 'lang_search_organization' => lang('Search organization'),227 'lang_save' => lang('save'), 228 'lang_search_organization' => lang('Search Organiztion'), 230 229 'lang_organizations' => lang('Organizations'), 231 230 'lang_sectors' => lang('Sectors'), 232 231 'lang_sambadomain' => lang('Domain'), 232 233 233 'lang_computer_cn' => lang('Computer UID'), 234 234 'lang_computer_description' => lang('Description'), 235 'lang_computer_type' => lang('Computer type'), 236 'lang_active_workstation' => lang('Enabled workstation'), 237 'lang_desactive_workstation' => lang('Disabled worksation'), 238 'lang_trust_account' => lang('Trust account'), 235 'lang_computer_type' => lang('Computer Type'), 236 237 'lang_active_workstation' => lang('WorkStation Active'), 238 'lang_desactive_workstation' => lang('WorkStation Desactive'), 239 'lang_trust_account' => lang('Trust Account'), 239 240 'lang_server' => lang('Server'), 240 241 'lang_computer_password' => lang('Computer password'), … … 322 323 unset($GLOBALS['phpgw_info']['flags']['noheader']); 323 324 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 324 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit computer');325 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit Computer'); 325 326 $GLOBALS['phpgw']->common->phpgw_header(); 326 327 … … 370 371 'color_bg1' => "#E8F0F0", 371 372 'lang_back' => lang('Back'), 372 'lang_save' => lang('Save'),373 'lang_search_organization' => lang('Search organization'),373 'lang_save' => lang('save'), 374 'lang_search_organization' => lang('Search Organiztion'), 374 375 'lang_organizations' => lang('Organizations'), 375 376 'lang_sectors' => lang('Sectors'), … … 377 378 'lang_computer_cn' => lang('Computer UID'), 378 379 'lang_computer_description' => lang('Description'), 379 'lang_computer_type' => lang('Computer type'),380 'lang_active_workstation' => lang('Enabled workstation'),381 'lang_desactive_workstation' => lang('Disabled worksation'),382 'lang_trust_account' => lang('Trust account'),380 'lang_computer_type' => lang('Computer Type'), 381 'lang_active_workstation' => lang('WorkStation Active'), 382 'lang_desactive_workstation' => lang('WorkStation Desactive'), 383 'lang_trust_account' => lang('Trust Account'), 383 384 'lang_server' => lang('Server'), 384 385 'lang_computer_password' => lang('Computer password'), … … 450 451 'color_bg1' => "#E8F0F0", 451 452 'lang_back' => lang('Back'), 452 'lang_save' => lang('Save'),453 'lang_save' => lang('save'), 453 454 'lang_sectors' => lang('Sectors'), 454 455 'lang_sambadomain' => lang('Domain'), 455 456 'lang_computer_cn' => lang('Computer UID'), 456 457 'lang_computer_description' => lang('Description'), 457 'lang_computer_type' => lang('Computer type'),458 'lang_active_workstation' => lang(' Enabled workstation'),459 'lang_desactive_workstation' => lang('Disabled worksation'),460 'lang_trust_account' => lang('Trust account'),458 'lang_computer_type' => lang('Computer Type'), 459 'lang_active_workstation' => lang('WorkStation Active'), 460 'lang_desactive_workstation' => lang('WorkStation Desactive'), 461 'lang_trust_account' => lang('Trust Account'), 461 462 'lang_server' => lang('Server'), 462 463 'lang_computer_password' => lang('Computer password'), … … 535 536 unset($GLOBALS['phpgw_info']['flags']['noheader']); 536 537 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 537 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Delete computer');538 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Delete Computer'); 538 539 $GLOBALS['phpgw']->common->phpgw_header(); 539 540 … … 551 552 'lang_back' => lang('Back'), 552 553 'lang_delete' => lang('Delete'), 553 'lang_delete_computer' => lang('Do you realy want to delete this computer?'),554 'lang_delete_computer' => lang('Do you realy want delete this Computer?'), 554 555 'dn' => $email_list_data['dn'], 555 556 'computer_cn' => $computer_data['computer_cn'], -
trunk/expressoAdmin1_2/inc/class.uidomains.inc.php
r283 r309 49 49 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 50 50 51 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Samba domains');51 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Samba Domains'); 52 52 $GLOBALS['phpgw']->common->phpgw_header(); 53 53 … … 59 59 60 60 $sambadomains_info = $this->db->get_sambadomains_list(); 61 //_debug_array($sambadomains_info); 62 63 $var = Array( 64 'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], 65 'back_url' => $GLOBALS['phpgw']->link('/expressoAdmin1_2/index.php'), 66 'lang_sambadomainsname' => lang('Samba domains name'), 67 'lang_sambaSID' => lang('sambaSID'), 68 'lang_add' => lang('Add'), 69 'lang_delete' => lang('Delete'), 70 'lang_back' => lang('back') 71 ); 72 $p->set_var($var); 61 73 62 74 if (!count($sambadomains_info)) … … 82 94 83 95 $var = Array( 84 'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'],85 'back_url' => $GLOBALS['phpgw']->link('/expressoAdmin1_2/index.php'),86 'lang_sambadomainsname' => lang('Samba domain name'),87 'lang_sambaSID' => lang('Samba domain SID'),88 'lang_delete' => lang('Delete'),89 'lang_back' => lang('Back'),90 96 'action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uidomains.add'), 91 'input_add' => '<input type="submit" value="' . lang('Create Samba domain') . '">'97 'input_add' => '<input type="submit" value="' . lang('Add Samba Domains') . '">' 92 98 ); 93 99 $p->set_var($var); … … 116 122 unset($GLOBALS['phpgw_info']['flags']['noheader']); 117 123 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 118 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang(' Create Samba domain');124 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Add Samba Domain'); 119 125 $GLOBALS['phpgw']->common->phpgw_header(); 120 126 … … 134 140 'lang_name' => lang('Samba domain name'), 135 141 'lang_sid' => lang('Samba domain SID'), 142 'lang_add' => lang('Add'), 136 143 'lang_save' => lang('Save'), 137 144 'lang_back' => lang('Back'), … … 152 159 if ($_POST['sambadomainname'] == '') 153 160 { 154 $_POST['error_messages'] = lang('Samba domain name is empty') . '.';161 $_POST['error_messages'] = lang('Samba domains name is empty') . '.'; 155 162 ExecMethod('expressoAdmin1_2.uidomains.add'); 156 163 return; … … 159 166 if ($_POST['sambasid'] == '') 160 167 { 161 $_POST['error_messages'] = lang('Samba domainSID is empty') . '.';168 $_POST['error_messages'] = lang('Samba SID is empty') . '.'; 162 169 ExecMethod('expressoAdmin1_2.uidomains.add'); 163 170 return; … … 167 174 if ($this->db->exist_domain_name_sid($_POST['sambadomainname'], $_POST['sambasid'])) 168 175 { 169 $_POST['error_messages'] = lang('Samba domain name or SID already exist s') . '.';176 $_POST['error_messages'] = lang('Samba domain name or SID already exist') . '.'; 170 177 ExecMethod('expressoAdmin1_2.uidomains.add'); 171 178 return; -
trunk/expressoAdmin1_2/inc/class.uigroups.inc.php
r283 r309 89 89 'add_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uigroups.add_groups'), 90 90 'add_group_disabled' => $this->functions->check_acl($account_lid,'add_groups') ? '' : 'disabled', 91 //'context' => $context, 91 92 'context_display' => $context_display, 92 93 'lang_groups_names' => lang('Group name'), 93 'lang_groups_names' => lang('Groups Names'), 94 94 'lang_description' => lang('Description'), 95 'lang_add_groups' => lang(' Create group'),95 'lang_add_groups' => lang('Add Groups'), 96 96 'lang_edit' => lang('Edit'), 97 97 'lang_delete' => lang('Delete'), 98 'lang_delete_group' => lang('Delete group?'), 99 'lang_back' => lang('Back'), 100 'lang_context' => lang('Context'), 101 'lang_users' => lang('Users'), 102 'lang_search' => lang('Search') 98 'lang_back' => lang('back'), 99 'lang_context' => lang('context'), 100 'lang_search' => lang('search') 103 101 ); 104 102 $p->set_var($var); … … 112 110 $groups_info = $this->functions->get_list('groups', $GLOBALS['query'], $contexts); 113 111 } 114 115 if (!count($groups_info) && $GLOBALS['query'] != '') 112 $total = count($groups_info); 113 114 if (!count($total) && $GLOBALS['query'] != '') 116 115 { 117 116 $p->set_var('message',lang('No matches found')); 118 117 } 119 else if ( count($groups_info))118 else if ($total) 120 119 { 121 120 if ($this->functions->check_acl($account_lid,'edit_groups')) … … 149 148 if ($can_delete) 150 149 { 151 $p->set_var('delete_link',"<a href='#' onClick='javascript:delete_group(\"".$group['cn']."\",\"".$group['gidnumber']."\");'> ".lang('Delete')."</a>");150 $p->set_var('delete_link',"<a href='#' onClick='javascript:delete_group(\"".$group['cn']."\",\"".$group['gidnumber']."\");'>Excluir</a>"); 152 151 } 153 152 else … … 160 159 } 161 160 $p->parse('rows','row_empty',True); 161 $p->set_var($var); 162 162 163 163 if (! $GLOBALS['phpgw']->acl->check('group_access',4,'admin')) … … 190 190 unset($GLOBALS['phpgw_info']['flags']['noheader']); 191 191 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 192 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create group');192 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create Group'); 193 193 $GLOBALS['phpgw']->common->phpgw_header(); 194 194 … … 232 232 'ldap_context' => $GLOBALS['phpgw_info']['server']['ldap_context'], 233 233 'ufn_ldap_context' => ldap_dn2ufn($GLOBALS['phpgw_info']['server']['ldap_context']), 234 'lang_back' => lang('Back'), 235 'lang_save' => lang('save'), 236 'lang_group_organization' => lang('Group Organization'), 237 'lang_search_organization' => lang('Search Organiztion'), 238 'lang_org' => lang('Organizations'), 239 'lang_group_name' => lang('group name'), 240 'lang_description' => lang('Description'), 241 'lang_email' => lang('E-mail'), 234 242 'concatenateDomain' => $this->current_config['expressoAdmin_concatenateDomain'], 235 243 'defaultDomain' => $this->current_config['expressoAdmin_defaultDomain'], 244 'lang_group_users' => lang('Group users'), 245 'lang_applications' => lang('Applications'), 246 'lang_add_user' => lang('Add User'), 247 'lang_rem_user' => lang('Remove User'), 248 'lang_all_users' => lang('Select users from all sub-organizations'), 249 'apps' => $apps, 250 //'use_attrs_samba_checked' => $this->current_config['expressoAdmin_samba_support'] == 'true' ? 'CHECKED' : '', 236 251 'use_attrs_samba_checked' => '', 237 252 'disabled_samba' => 'disabled', … … 241 256 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uigroups.list_groups'), 242 257 'combo_manager_org' => $combo_manager_org, 243 'combo_all_orgs' => $combo_all_orgs, 244 'apps' => $apps, 245 246 'lang_back' => lang('Back'), 247 'lang_save' => lang('Save'), 248 'lang_group_organization' => lang('Group organization'), 249 'lang_search_organization' => lang('Search organization'), 250 'lang_group_name' => lang('Group name'), 251 'lang_description' => lang('Description'), 252 'lang_email' => lang('E-mail'), 253 'lang_users' => lang('Available users'), 254 'lang_organization' => lang('Organizations'), 255 'lang_group_users' => lang('Selected users'), 256 'lang_applications' => lang('Applications'), 257 'lang_add_user' => lang('Add user'), 258 'lang_search_user' => lang('Search user'), 259 'lang_domain' => lang('Samba domain'), 260 'lang_rem_user' => lang('Remove user'), 261 'lang_invisible_group' => lang('Hidden group'), 262 'lang_all_users' => lang('Show users from all sub-organizations'), 263 'group_name_field_is_empty' => lang('Group name field is empty'), 264 'description_field_is_empty' => lang('Description field is empty'), 265 'group_name_field_not_allowed' => lang('Group name field contains invalid characters'), 266 'description_field_not_allowed' => lang('Description field contains invalid characters'), 267 'group_successfully_created' => lang('Group successfully created!'), 268 'not_possible_select_all_users' => lang('It is impossible to create a group with all organization users'), 269 'field_email_is_invalid' => lang('E-mail field is invalid'), 270 'lang_samba_attributes' => lang('Use Samba attributes'), 271 'field_name_is_incomplete' => lang("The group's name field is incomplete. The group's name must be in the following format: grupo-organization-name. Ex: grupo-celepar-rh") 258 'combo_all_orgs' => $combo_all_orgs 272 259 ); 273 260 $p->set_var($var); … … 295 282 unset($GLOBALS['phpgw_info']['flags']['noheader']); 296 283 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 297 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit group');284 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit Group'); 298 285 $GLOBALS['phpgw']->common->phpgw_header(); 299 286 … … 315 302 if ($user_data['uidnumber']) 316 303 { 317 $array_users[$user_data['uidnumber']] = $user_data['cn'];318 $array_users_uid[$user_data['uidnumber']] = $uid;319 $array_users_type[$user_data['uidnumber']] = $user_data['type'];320 }304 $array_users[$user_data['uidnumber']] = $user_data['cn']; 305 $array_users_uid[$user_data['uidnumber']] = $uid; 306 $array_users_type[$user_data['uidnumber']] = $user_data['type']; 307 } 321 308 else 322 309 { … … 366 353 // Seta variaveis utilizadas pelo tpl. 367 354 $var = Array( 368 'restrictionsOnGroup' => $this->current_config['expressoAdmin_restrictionsOnGroup'], 355 'color_bg1' => "#E8F0F0", 356 'color_bg2' => "#D3DCE3", 357 'type' => 'edit_group', 358 'ldap_context' => $GLOBALS['phpgw_info']['server']['ldap_context'], 359 'lang_back' => lang('Back'), 360 'lang_save' => lang('save'), 361 'lang_group_organization' => lang('Group Organization'), 362 'lang_search_organization' => lang('Search Organiztion'), 363 'lang_org' => lang('Organizations'), 364 'lang_group_name' => lang('group name'), 365 'lang_description' => lang('Description'), 366 'lang_email' => lang('E-mail'), 367 'lang_group_users' => lang('Group users'), 368 'lang_applications' => lang('Applications'), 369 'lang_add_user' => lang('Add User'), 370 'lang_rem_user' => lang('Remove User'), 371 'lang_all_users' => lang('Select users from all sub-organizations'), 369 372 'gidnumber' => $group_info['gidnumber'], 373 //'manager_context' => $manager_context, 370 374 'cn' => $group_info['cn'], 371 375 'user_count' => $user_count, … … 381 385 'combo_manager_org' => $combo_manager_org, 382 386 'combo_all_orgs' => $combo_all_orgs, 383 'ea_select_usersInGroup' => $ea_select_usersInGroup, 384 'color_bg1' => "#E8F0F0", 385 'color_bg2' => "#D3DCE3", 386 'type' => 'edit_group', 387 'ldap_context' => $GLOBALS['phpgw_info']['server']['ldap_context'], 388 389 'lang_back' => lang('Back'), 390 'lang_save' => lang('Save'), 391 'lang_group_organization' => lang('Group organization'), 392 'lang_search_organization' => lang('Search organization'), 393 'lang_group_name' => lang('Group name'), 394 'lang_description' => lang('Description'), 395 'lang_email' => lang('E-mail'), 396 'lang_group_users' => lang('Selected users'), 397 'lang_applications' => lang('Applications'), 398 'lang_add_user' => lang('Add user'), 399 'lang_rem_user' => lang('Remove user'), 400 'lang_search_user' => lang('Search user'), 401 'lang_domain' => lang('Domain'), 402 'lang_invisible_group' => lang('Hidden group'), 403 'lang_users' => lang('Available users'), 404 'lang_organization' => lang('Organizations'), 405 'lang_all_users' => lang('Show users from all sub-organizations'), 406 'group_name_field_is_empty' => lang('Group name field is empty'), 407 'description_field_is_empty' => lang('Description field is empty'), 408 'group_name_field_not_allowed' => lang('Group name field contains invalid characters'), 409 'description_field_not_allowed' => lang('Description field contains invalid characters'), 410 'group_successfully_saved' => lang('Group successfully saved!'), 411 'not_possible_select_all_users' => lang('It is impossible to create a group with all organization users'), 412 'group_successfully_deleted' => lang('Group successfully deleted!'), 413 'field_email_is_invalid' => lang('E-mail field is invalid'), 414 'lang_samba_attributes' => lang('Use Samba attributes'), 415 'field_name_is_incomplete' => lang("The group's name field is incomplete. The group's name must be in the following format: grupo-organization-name. Ex: grupo-celepar-rh") 387 'ea_select_usersInGroup' => $ea_select_usersInGroup 416 388 ); 417 389 $p->set_var($var); -
trunk/expressoAdmin1_2/inc/class.uilogs.inc.php
r283 r309 113 113 'query_other' => $_POST['query_other'], 114 114 115 'lang_manager_lid' => lang(' Login'),115 'lang_manager_lid' => lang('Manager Login'), 116 116 'lang_date' => lang('Date'), 117 117 'lang_hour' => lang('Hour'), 118 118 'lang_action' => lang('Action'), 119 'lang_view' => lang('View'),120 'lang_back' => lang('Back'),121 'lang_search' => lang(' Search'),119 'lang_view' => lang('view'), 120 'lang_back' => lang('back'), 121 'lang_search' => lang('search'), 122 122 'lang_action' => lang('Action'), 123 123 'lang_other' => lang('Other') … … 137 137 $this->nextmatchs->template_alternate_row_color($p); 138 138 139 $tmp = explode(" ", $log['date']);140 $tmp_date = explode("-", $tmp[0]);141 $date = $tmp_date[2] . '/' . $tmp_date[1] . '/' . $tmp_date[0];142 $tmp_hour = explode(".", $tmp[1]);143 $hour = $tmp_hour[0];144 145 139 $var = array( 146 140 'row_manager_lid' => $log['manager'], 147 141 'row_action' => $log['action'], 148 'row_date' => $date." ".$hour,149 'row_view' => $this->row_action('view','log',$log['date'])142 'row_date' => $log['date'], 143 //'row_view' => (!$account['account_lastname']?' ':$account['account_lastname']) 150 144 ); 151 145 $p->set_var($var); 146 $p->set_var('row_view',$this->row_action('view','log',$log['date'])); 152 147 $p->parse('rows','row',True); 153 148 } … … 210 205 211 206 'lang_back' => lang('Back'), 212 'lang_manager_lid' => lang(' Login'),207 'lang_manager_lid' => lang('Manager Login'), 213 208 'lang_date' => lang('Date'), 214 209 'lang_hour' => lang('Hour'), 215 210 'lang_action' => lang('Action'), 216 'lang_userinfo' => lang('User information'),217 'lang_groupinfo' => lang('Group information'),218 'lang_appinfo' => lang('App lication information')211 'lang_userinfo' => lang('User Info'), 212 'lang_groupinfo' => lang('Group Info'), 213 'lang_appinfo' => lang('App Info') 219 214 ); 220 215 -
trunk/expressoAdmin1_2/inc/class.uimaillists.inc.php
r283 r309 70 70 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 71 71 72 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('E -mail lists');72 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Email Lists'); 73 73 $GLOBALS['phpgw']->common->phpgw_header(); 74 74 … … 81 81 // Seta as variaveis padroes. 82 82 $var = Array( 83 'add_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.add_maillists'),84 83 'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], 85 84 'back_url' => $GLOBALS['phpgw']->link('/expressoAdmin1_2/index.php'), 85 'add_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.add_maillists'), 86 86 'add_email_lists_disabled' => $this->functions->check_acl($manager_lid,'add_maillists') ? '' : 'disabled', 87 87 'context_display' => $context_display, 88 89 'lang_email_lists_uid' => lang('E-mail list names'), 90 'lang_email_lists_names' => lang('E-mail list descriptions'), 91 'lang_add_email_lists' => lang('Create e-mail list'), 88 'lang_email_lists_uid' => lang('Email Lists Logins'), 89 'lang_email_lists_names' => lang('Email Lists Names'), 90 'lang_add_email_lists' => lang('Add Email Lists'), 92 91 'lang_edit' => lang('Edit'), 93 'lang_scl' => lang('SCL'),94 'lang_delete' => lang('Delete'),92 'lang_scl' => 'SCL', 93 'lang_delete' => 'Excluir', 95 94 'lang_view' => lang('View'), 96 'lang_back' => lang('Back'),97 'lang_context' => lang('Context'),95 'lang_back' => lang('back'), 96 'lang_context' => lang('context'), 98 97 'lang_email' => lang('E-mail'), 99 'lang_delete_list' => lang('Delete e-mail list?'), 100 'lang_delete_list_success' => lang('E-mail list successfully deleted!'), 101 'lang_search' => lang('Search') 98 'lang_search' => lang('search') 102 99 ); 103 100 $p->set_var($var); … … 111 108 $maillists_info = $this->functions->get_list('maillists', $GLOBALS['query'], $manager_contexts); 112 109 } 113 114 if (!count($maillists_info) && $GLOBALS['query'] != '') 110 $total = count($maillists_info); 111 112 if (!count($total) && $GLOBALS['query'] != '') 115 113 { 116 114 $p->set_var('message',lang('No matches found')); 117 115 } 118 else if ( count($maillists_info))116 else if ($total) 119 117 { 120 118 if ($this->functions->check_acl($manager_lid,'edit_maillists')) … … 152 150 } 153 151 154 if ( $can_edit_scl)152 if ( ($can_edit_scl) && ($this->current_config['expressoAdmin_scl']) ) 155 153 { 156 154 $p->set_var('scl_link',$this->row_action('scl','maillists',$maillist['uidnumber'],$maillist['uid'])); … … 163 161 if ($can_delete) 164 162 { 165 $p->set_var('delete_link',"<a href='#' onClick='javascript:delete_maillist(\"".$maillist['uid']."\",\"".$maillist['uidnumber']."\");'> ".lang('Delete')."</a>");163 $p->set_var('delete_link',"<a href='#' onClick='javascript:delete_maillist(\"".$maillist['uid']."\",\"".$maillist['uidnumber']."\");'>Excluir</a>"); 166 164 } 167 165 else … … 192 190 unset($GLOBALS['phpgw_info']['flags']['noheader']); 193 191 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 194 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create e-mail list');192 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create Email List'); 195 193 $GLOBALS['phpgw']->common->phpgw_header(); 196 194 … … 206 204 // Seta variaveis utilizadas pelo tpl. 207 205 $var = Array( 208 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.list_maillists'),209 206 'color_bg1' => "#E8F0F0", 210 207 'color_bg2' => "#D3DCE3", 211 208 'type' => 'create_maillist', 212 209 'ldap_context' => $GLOBALS['phpgw_info']['server']['ldap_context'], 210 'uid' => 'lista-', 213 211 'accountStatus_checked' => 'CHECKED', 214 212 'restrictionsOnEmailLists' => $this->current_config['expressoAdmin_restrictionsOnEmailLists'], 215 'combo_manager_org' => $combo_manager_org,216 'combo_all_orgs' => $combo_all_orgs,217 'defaultDomain' => $this->current_config['expressoAdmin_defaultDomain'],218 'combo_org' => $sectors,219 213 'lang_back' => lang('Back'), 220 'lang_save' => lang(' Save'),221 'lang_maillist_organization' => lang('E-mail list organization'),222 'lang_search_organization' => lang('Search organization'),214 'lang_save' => lang('save'), 215 'lang_maillist_organization'=> lang('Maillist Organization'), 216 'lang_search_organization' => lang('Search Organiztion'), 223 217 'lang_search_user' => lang('Search user'), 224 'lang_users' => lang('Users'),225 218 'lang_organizations' => lang('Organizations'), 226 'lang_maillist_uid' => lang('E-maillist login'),227 'lang_maillist_mail' => lang('E-mail list address'),228 'lang_maillist_name' => lang('E-maillist name'),229 'lang_maillist_users' => lang('E-maillist users'),219 'lang_maillist_uid' => lang('Maillist login'), 220 'lang_maillist_mail' => lang('Maillist Mail'), 221 'lang_maillist_name' => lang('Maillist name'), 222 'lang_maillist_users' => lang('Maillist users'), 230 223 'lang_add_user' => lang('Add User'), 231 224 'lang_rem_user' => lang('Remove User'), 232 225 'lang_all_users' => lang('Show users from all sub-organizations'), 233 'login_field_has_spaces' => lang('Login field has spaces'), 234 'list_email_field_is_empty' => lang('E-mail list address field is empty'), 235 'lang_list_name_field_is_empty' => lang('E-mail list name is empty'), 236 'no_user_is_part_of_the_list' => lang('No user is member of the list!'), 237 'email_list_successfully_created' => lang('E-mail list successfully created!'), 238 'field_email_is_invalid' => lang('E-mail list address is invalid'), 239 'lang_email_list_empty' => lang('The e-mail list is empty'), 240 'lang_hide_email_list' => lang('Hide e-mail list'), 241 'it_is_not_possible_select_users' => lang('It is impossible to create an e-mail list with all organization users'), 242 'login_field_incomplete' => lang("The lists' name field is incomplete. The lists' name must be in the following format: lista-organization-name. Ex: lista-celepar-rh") 226 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.list_maillists'), 227 'combo_manager_org' => $combo_manager_org, 228 'combo_all_orgs' => $combo_all_orgs, 229 'defaultDomain' => $this->current_config['expressoAdmin_defaultDomain'] 243 230 ); 244 245 231 $p->set_var($var); 246 232 … … 267 253 unset($GLOBALS['phpgw_info']['flags']['noheader']); 268 254 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 269 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit e-mail list');255 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit Email Lists'); 270 256 $GLOBALS['phpgw']->common->phpgw_header(); 271 257 … … 309 295 if ($mail_not_found != '') 310 296 { 311 $opt_tmp_mail_not_found = '<option value="-1" disabled>-------------------- '.lang('E-mails not found').' ------------------ </option>'."\n";297 $opt_tmp_mail_not_found = '<option value="-1" disabled>-------------------- E-mails não encontrados ------------------ </option>'."\n"; 312 298 $ea_select_usersInMaillist .= $opt_tmp_mail_not_found . $mail_not_found; 313 299 } 314 300 if ($lists != '') 315 301 { 316 $opt_tmp_lists = '<option value="-1" disabled>------------------------------ '.lang('Lists').' ------------------------------ </option>'."\n";302 $opt_tmp_lists = '<option value="-1" disabled>------------------------------ Listas ------------------------------ </option>'."\n"; 317 303 $ea_select_usersInMaillist .= $opt_tmp_lists . $lists; 318 304 } 319 $opt_tmp_users = '<option value="-1" disabled>----------------------------- '.lang('Users').' ---------------------------- </option>'."\n";305 $opt_tmp_users = '<option value="-1" disabled>----------------------------- Usuários ---------------------------- </option>'."\n"; 320 306 $ea_select_usersInMaillist .= $opt_tmp_users . $users; 321 307 } … … 323 309 // Seta variaveis utilizadas pelo tpl. 324 310 $var = Array( 325 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.list_maillists'),326 311 'color_bg1' => "#E8F0F0", 327 312 'color_bg2' => "#D3DCE3", 328 313 'type' => 'edit_maillist', 329 314 'ldap_context' => $GLOBALS['phpgw_info']['server']['ldap_context'], 315 'lang_back' => lang('Back'), 316 'lang_save' => lang('save'), 317 'lang_maillist_organization' => lang('Maillist Organization'), 318 'lang_search_organization' => lang('Search Organiztion'), 319 'lang_search_user' => lang('Search user'), 320 'lang_organizations' => lang('Organizations'), 321 'lang_maillist_uid' => lang('Maillist login'), 322 'lang_maillist_mail' => lang('Maillist Mail'), 323 'lang_maillist_name' => lang('Maillist name'), 324 'lang_maillist_users' => lang('Maillist users'), 325 'lang_add_user' => lang('Add User'), 326 'lang_rem_user' => lang('Remove User'), 327 'lang_all_users' => lang('Select users from all sub-organizations'), 328 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.list_maillists'), 330 329 'combo_manager_org' => $combo_manager_org, 331 330 'combo_all_orgs' => $combo_all_orgs, … … 338 337 'phpgwAccountVisible_checked' => $maillist_info['phpgwAccountVisible'] == '-1' ? 'CHECKED' : '', 339 338 'ea_select_usersInMaillist' => $ea_select_usersInMaillist, 340 'defaultDomain' => $this->current_config['expressoAdmin_defaultDomain'], 341 'restrictionsOnEmailLists' => $this->current_config['expressoAdmin_restrictionsOnEmailLists'], 342 'lang_back' => lang('Back'), 343 'lang_save' => lang('Save'), 344 'lang_maillist_organization' => lang('E-mail list organization'), 345 'lang_search_organization' => lang('Search organization'), 346 'lang_search_user' => lang('Search user'), 347 'lang_organizations' => lang('Organizations'), 348 'lang_maillist_uid' => lang('E-mail list login'), 349 'lang_maillist_mail' => lang('E-mail list address'), 350 'lang_maillist_name' => lang('E-mail list name'), 351 'lang_maillist_users' => lang('E-mail list users'), 352 'lang_users' => lang('Users'), 353 'lang_add_user' => lang('Add User'), 354 'lang_rem_user' => lang('Remove User'), 355 'lang_email_list_empty' => lang('The e-mail list is empty'), 356 'lang_hide_email_list' => lang('Hide e-mail list'), 357 'email_list_successfully_saved' => lang('E-mail list successfully saved!'), 358 'lang_all_users' => lang('Show users from all sub-organizations'), 359 'login_field_incomplete' => lang("The lists' name field is incomplete. The lists' name must be in the following format: lista-organization-name. Ex: lista-celepar-rh") 339 'defaultDomain' => $this->current_config['expressoAdmin_defaultDomain'] 360 340 ); 361 341 $p->set_var($var); … … 383 363 unset($GLOBALS['phpgw_info']['flags']['noheader']); 384 364 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 385 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit sending control list');365 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit Sending Control List'); 386 366 $GLOBALS['phpgw']->common->phpgw_header(); 387 367 … … 416 396 'ldap_context' => $GLOBALS['phpgw_info']['server']['ldap_context'], 417 397 'dn' => $maillist_info['dn'], 398 'lang_back' => lang('Back'), 399 'lang_save' => lang('save'), 400 'lang_org' => lang('Organizations'), 401 'lang_maillist_uid' => lang('Maillist login'), 402 'lang_maillist_mail' => lang('Maillist Mail'), 403 'lang_maillist_name' => lang('Maillist name'), 404 'lang_maillist_users' => lang('Maillist users'), 405 'lang_add_user' => lang('Add User'), 406 'lang_rem_user' => lang('Remove User'), 407 'lang_all_users' => lang('Show users from all sub-organizations'), 418 408 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.list_maillists'), 419 409 'combo_org' => $sectors, … … 423 413 'cn' => $maillist_info['cn'], 424 414 'accountRestrictive_checked' => $maillist_info['accountRestrictive'] == 'mailListRestriction' ? 'CHECKED' : '', 425 'participantCanSendMail_checked' => $maillist_info['participantCanSendMail'] == 'TRUE' ? 'CHECKED' : '', 426 'ea_select_users_SCL_Maillist' => $ea_select_users_SCL_Maillist, 427 'lang_back' => lang('Back'), 428 'lang_save' => lang('Save'), 429 'lang_org' => lang('Organizations'), 430 'lang_maillist_uid' => lang('E-mail list login'), 431 'lang_maillist_mail' => lang('E-mail list address'), 432 'lang_maillist_name' => lang('E-mail list name'), 433 'lang_maillist_users' => lang('E-mail list users'), 434 'lang_add_user' => lang('Add user'), 435 'lang_rem_user' => lang('Remove user'), 436 'lang_apply_scl' => lang('Apply send control to this list?'), 437 'lang_list_email' => lang('List e-mail'), 438 'lang_members_send' => lang('List members can send e-mail?'), 439 'lang_allowed_send_email' => lang('Users allowed to send e-mail to the list'), 440 'lang_organization' => lang('Organizations'), 441 'lang_search_user' => lang('Search user'), 442 'lang_users' => lang('Users'), 443 'sending_control_list_successfully_saved' => lang('Sending control list sucessfully saved!'), 444 'lang_all_users' => lang('Show users from all sub-organizations') 415 'participantCanSendMail_checked'=> $maillist_info['participantCanSendMail'] == 'TRUE' ? 'CHECKED' : '', 416 'ea_select_users_SCL_Maillist' => $ea_select_users_SCL_Maillist 445 417 ); 446 418 $p->set_var($var); -
trunk/expressoAdmin1_2/inc/class.uimanagers.inc.php
r283 r309 58 58 // Imprime o NavBar 59 59 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 60 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang(' Managers');60 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('List Managers'); 61 61 $GLOBALS['phpgw']->common->phpgw_header(); 62 62 … … 115 115 $p->set_var('link_edit',$this->row_action('edit','edit_managers',$array_managers[manager_lid],$array_managers[context])); 116 116 $p->set_var('link_delete',$this->row_action('delete','delete_managers',$array_managers[manager_lid],$array_managers[context])); 117 $p->set_var('link_copy',"<a href='#' onClick='javascript:copy_manager(\"".$array_managers['manager_lid']."\");'> ".lang('Copy')."</a>");117 $p->set_var('link_copy',"<a href='#' onClick='javascript:copy_manager(\"".$array_managers['manager_lid']."\");'>Copiar</a>"); 118 118 $p->fp('rows','row',True); 119 119 } … … 141 141 // Imprime o NavBar 142 142 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 143 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang(' Create manager');143 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Add Managers'); 144 144 $GLOBALS['phpgw']->common->phpgw_header(); 145 145 … … 180 180 'context' => $_POST['context'], 181 181 'app_list' => $applications_list, 182 'manager_created' => lang('Manager successfully created!'),183 182 'options_contexts' => $options_context 184 183 ); … … 280 279 // Imprime o NavBar 281 280 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 282 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit Manager ');281 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit Managers'); 283 282 $GLOBALS['phpgw']->common->phpgw_header(); 284 283 … … 305 304 'type' => "edit", 306 305 'display_manager_select' => 'none', 307 'input_manager_lid_disabled' 306 'input_manager_lid_disabled'=> 'disabled', 308 307 'error_messages' => $_POST['error_messages'] == '' ? '' : '<script language="JavaScript1.3">alert("'.$_POST['error_messages'].'");</script>', 309 308 'manager_lid' => $_POST['manager_lid'], 310 309 'hidden_manager_lid' => $_POST['manager_lid'], 311 310 'context' => $_POST['context'], 312 'manager_salved' => lang('Manager successfully salved!'),311 313 312 'input_context_fields' => $input_context_fields, 314 313 'options_contexts' => $options_context, 314 315 315 'hidden_manager_lid' => $hidden_manager_lid, 316 316 'app_list' => $applications_list … … 340 340 echo $p->fp('out','form'); 341 341 } 342 342 343 343 function make_lang($ram_lang) 344 344 { -
trunk/expressoAdmin1_2/inc/class.uisectors.inc.php
r283 r309 69 69 'back_url' => $GLOBALS['phpgw']->link('/expressoAdmin1_2/index.php'), 70 70 'context_display' => $context_display, 71 'lang_context' => lang(' Context'),72 'header_name' => lang('S ector name'),73 'lang_add_sub_sectors' => lang('Create sub-sectors'),71 'lang_context' => lang('context'), 72 'header_name' => lang('SECTORS'), 73 'lang_add_sub_sectors' => lang('Add Sub-Sectors'), 74 74 'header_edit' => lang('Edit'), 75 'lang_back' => lang('Back'),75 'lang_back' => lang('back'), 76 76 'header_delete' => lang('Delete') 77 77 ); … … 134 134 if (! $GLOBALS['phpgw']->acl->check('group_access',4,'admin')) 135 135 { 136 $p->set_var('input_add','<input type="submit" value="' . lang(' Create sector') . '">');136 $p->set_var('input_add','<input type="submit" value="' . lang('Add Sectors') . '">'); 137 137 } 138 138 … … 160 160 unset($GLOBALS['phpgw_info']['flags']['noheader']); 161 161 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 162 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create sector');162 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create Sector'); 163 163 $GLOBALS['phpgw']->common->phpgw_header(); 164 164 … … 174 174 'context' => $context == '' ? $GLOBALS['phpgw_info']['server']['ldap_context'] : $context, 175 175 'sector' => $_POST['sector'], 176 'sector_visible_checked' 176 'sector_visible_checked'=> $_POST['sector_visible'] ? 'checked' : '', 177 177 178 178 'lang_add' => lang('Add'), … … 181 181 'lang_context' => lang('Context'), 182 182 'lang_sector_name' => lang('Sector name'), 183 'lang_occult_ou' => lang('Hidden sector'),183 'lang_occult_ou' => lang('Occult Sector'), 184 184 'error_messages' => $_POST['error_messages'] == '' ? '' : "<script type='text/javascript'>alert('".$_POST['error_messages']."')</script>", 185 185 ); … … 209 209 unset($GLOBALS['phpgw_info']['flags']['noheader']); 210 210 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 211 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit sector');211 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit Sector'); 212 212 $GLOBALS['phpgw']->common->phpgw_header(); 213 213 … … 229 229 'context' => $context == '' ? $manager_context : $context, 230 230 'sector' => $_POST['sector'] == '' ? $sector_name : $_POST['sector'], 231 'sector_visible_checked' 231 'sector_visible_checked'=> $_POST['sector_visible'] ? 'checked' : '', 232 232 233 233 'lang_add' => lang('Add'), … … 237 237 'lang_context' => lang('Context'), 238 238 'lang_sector_name' => lang('Sector name'), 239 'lang_occult_ou' => lang('Hidden sector'),239 'lang_occult_ou' => lang('Occult Sector'), 240 240 'error_messages' => $_POST['error_messages'] == '' ? '' : "<script type='text/javascript'>alert('".$_POST['error_messages']."')</script>", 241 241 ); … … 255 255 if ($sector_name == '') 256 256 { 257 $_POST['error_messages'] = lang('Sector name is empty ');257 $_POST['error_messages'] = lang('Sector name is empty.'); 258 258 ExecMethod('expressoAdmin1_2.uisectors.add_sector'); 259 259 return; … … 287 287 unset($GLOBALS['phpgw_info']['flags']['noheader']); 288 288 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 289 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Delete sector');289 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Delete Sectors'); 290 290 $GLOBALS['phpgw']->common->phpgw_header(); 291 291 … … 333 333 'lang_back' => lang('Back'), 334 334 'lang_delete' => lang('Delete'), 335 'lang_delete_sector' => lang('Do you realy want todelete this sector?'),336 'lang_content_the_users' => lang(' Users'),337 'lang_content_the_groups' => lang(' Groups'),338 'lang_content_the_sectors' => lang(' Sub-sectors'),339 'lang_obs' => lang('All users, groups and sub-sectors of this sector will be deleted!'),335 'lang_delete_sector' => lang('Do you realy want delete this sector?'), 336 'lang_content_the_users' => lang('Content the folling users'), 337 'lang_content_the_groups' => lang('Content the folling groups'), 338 'lang_content_the_sectors' => lang('Content the folling sectors'), 339 'lang_obs' => lang('All users, groups and sub-sectors of this sector will be DELETED!'), 340 340 341 341 'manager_context' => $manager_context, -
trunk/expressoAdmin1_2/inc/class.user.inc.php
r283 r309 488 488 else 489 489 { 490 if ($new_values['photo_exist']) 491 { 492 $photo_exist = true; 493 $this->db_functions->write_log("substituido jpegphoto do usuario",'',$dn,'',''); 494 } 495 else 496 { 497 $photo_exist = false; 498 $this->db_functions->write_log("adicionado jpegphoto ao usuario",'',$dn,'',''); 499 } 500 $this->ldap_functions->ldap_save_photo($dn, $_FILES['photo']['tmp_name'], $new_values['photo_exist'], $photo_exist); 490 if ($new_values['photo_exist']) 491 { 492 $photo_exist = true; 493 $this->db_functions->write_log("substituido jpegphoto do usuario",'',$dn,'',''); 494 } 495 else 496 { 497 $photo_exist = false; 498 $this->db_functions->write_log("adicionado jpegphoto ao usuario",'',$dn,'',''); 499 } 500 $this->ldap_functions->ldap_save_photo($dn, $_FILES['photo']['tmp_name'], $new_values['photo_exist'], $photo_exist); 501 } 501 502 } 502 }503 503 } 504 504
Note: See TracChangeset
for help on using the changeset viewer.