Changeset 283 for trunk/expressoAdmin1_2/inc
- Timestamp:
- 05/21/08 16:40:23 (16 years ago)
- Location:
- trunk/expressoAdmin1_2/inc
- Files:
-
- 14 edited
-
access_denied.php (modified) (1 diff)
-
class.bocomputers.inc.php (modified) (2 diffs)
-
class.functions.inc.php (modified) (2 diffs)
-
class.maillist.inc.php (modified) (1 diff)
-
class.totalsessions.inc.php (modified) (2 diffs)
-
class.uiaccounts.inc.php (modified) (21 diffs)
-
class.uicomputers.inc.php (modified) (9 diffs)
-
class.uidomains.inc.php (modified) (8 diffs)
-
class.uigroups.inc.php (modified) (11 diffs)
-
class.uilogs.inc.php (modified) (3 diffs)
-
class.uimaillists.inc.php (modified) (15 diffs)
-
class.uimanagers.inc.php (modified) (7 diffs)
-
class.uisectors.inc.php (modified) (11 diffs)
-
class.user.inc.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoAdmin1_2/inc/access_denied.php
r2 r283 20 20 21 21 $var = Array( 22 'lang_access_denied' => lang('You dont have access to this module.'),22 'lang_access_denied' => lang('You don\'t 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.bocomputers.inc.php
r64 r283 84 84 } 85 85 $computer_info['sambaNTPassword'] = exec('/home/expressolivre/mkntpwd -L '.$_POST['computer_password']); 86 $computer_info['sambaLMPassword'] = exec('/home/expressolivre/mkntpwd -N '.$_POST['computer_password']); 86 87 } 87 88 … … 149 150 { 150 151 $computer_mod_replace['sambaNTPassword'] = exec('/home/expressolivre/mkntpwd -L '.$_POST['computer_password']); 152 $computer_mod_replace['sambaLMPassword'] = exec('/home/expressolivre/mkntpwd -N '.$_POST['computer_password']); 151 153 } 152 154 -
trunk/expressoAdmin1_2/inc/class.functions.inc.php
r208 r283 288 288 289 289 // Make a array read humam 290 // Last acl: 536.870.912290 // Last acl: 1.073.741.824 291 291 function make_array_acl($acl) 292 292 { … … 321 321 "acl_empty_user_inbox", 322 322 "acl_manipulate_corporative_information", 323 "acl_edit_users_picture" 323 "acl_edit_users_picture", 324 "acl_edit_scl_email_lists" 324 325 ); 325 326 -
trunk/expressoAdmin1_2/inc/class.maillist.inc.php
r208 r283 283 283 { 284 284 // Verifica o acesso do gerente 285 if (!$this->functions->check_acl($_SESSION['phpgw_session']['session_lid'], 'edit_ maillists'))286 { 287 $return['status'] = false; 288 $return['msg'] = 'Você não tem acesso para editar listas de email.';285 if (!$this->functions->check_acl($_SESSION['phpgw_session']['session_lid'], 'edit_scl_email_lists')) 286 { 287 $return['status'] = false; 288 $return['msg'] = 'Você não tem acesso para editar SCL de listas de email.'; 289 289 return $return; 290 290 } -
trunk/expressoAdmin1_2/inc/class.totalsessions.inc.php
r2 r283 36 36 function show_total_sessions() 37 37 { 38 $GLOBALS['phpgw_info']['flags']['app_header'] = 'ExpressoAdmin - '.lang('Total Sessions');38 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.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('Total sessions')); 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
r233 r283 92 92 'bg_color' => $GLOBALS['phpgw_info']['theme']['bg_color'], 93 93 'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], 94 95 94 'accounts_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uiaccounts.list_users'), 96 95 'back_url' => $GLOBALS['phpgw']->link('/expressoAdmin1_2/index.php'), … … 102 101 'imapDelimiter' => $_SESSION['phpgw_info']['expresso']['email_server']['imapDelimiter'], 103 102 104 'lang_create_user' => lang('Create User'),105 'lang_loginid' => lang('Login ID'),103 'lang_create_user' => lang('Create user'), 104 'lang_loginid' => lang('Login'), 106 105 'lang_cn' => lang('Name'), 107 106 'lang_mail' => lang('E-mail'), 108 'lang_edit' => lang('edit'), 109 'lang_rename' => lang('rename'), 110 'lang_delete' => lang('delete'), 107 'lang_edit' => lang('Edit'), 108 'lang_rename' => lang('Rename'), 111 109 'lang_search' => lang('Search'), 112 'lang_back' => lang('back'), 113 'lang_contexts' => lang('Contexts') 114 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:') 115 119 ); 116 120 $p->set_var($var); … … 165 169 166 170 if ($can_rename) 167 $p->set_var('row_rename',"<a href='#' onClick='javascript:rename_user(\"".$account['account_lid']."\",\"".$account['account_id']."\");'> Renomear</a>");171 $p->set_var('row_rename',"<a href='#' onClick='javascript:rename_user(\"".$account['account_lid']."\",\"".$account['account_id']."\");'>".lang('Rename')."</a>"); 168 172 else 169 173 $p->set_var('row_rename',' '); … … 171 175 if ($can_delete) 172 176 { 173 $p->set_var('row_delete',"<a href='#' onClick='javascript:delete_user(\"".$account['account_lid']."\",\"".$account['account_id']."\");'> Excluir</a>");177 $p->set_var('row_delete',"<a href='#' onClick='javascript:delete_user(\"".$account['account_lid']."\",\"".$account['account_id']."\");'>".lang('Delete')."</a>"); 174 178 } 175 179 else … … 213 217 $t->set_file(array("body" => "accounts_form.tpl")); 214 218 $t->set_block('body','main'); 215 $var = array( 216 217 'login_field_empty' => lang('Login field is empty'), 218 'login_field_must_have' => lang('Login field must have more than characters '), 219 'characters' => lang(' characters'), 220 'login_field_contains_not_allowed' => lang('Login field contains characters not allowed. characters'), 221 'password_field_empty' => lang('Password field is empty'), 222 're-pass_field_empty' => lang('Re-Password field is empty'), 223 'pass_re-pass_diferents' => lang('Password and Re-Password are differentes'), 224 'register_field_contains_not_allowed' => lang('Field register contains characters not allowed. Numbers are only allowed.'), 225 'cpf_field_not_allowed' => lang('Field cpf contains characters not allowed. Numbers are only allowed.'), 226 'email_field_empty' => lang('Email field is empty.'), 227 'first_name_empty' => lang('First name field is empty'), 228 'last_name_empty' => lang('Last name field is empty'), 229 'telephone_empty' => lang('Telphone field is empty'), 230 'redirect_email_empty' => lang('Redirect email field is empty'), 231 'without_quota' => lang('User without quota'), 232 'no_group_selected' => lang('No groups selected'), 233 'user_logon_script_empty' => lang('User logon script is empty'), 234 'user_home_path_empty' => lang('User home path is empty'), 235 'user_successfully_created' => lang('User successfully created!'), 236 'user_successfully_saved' => lang('User successfully saved!'), 237 'default_password_successfully_registered_cadastre' => lang('Default password successfully registered in cadastre'), 238 'user_password_returned_with_success' => lang('User password returned with success'), 239 'user_deleted_with_success' => lang('User deleted with success'), 240 'login_field_contains_not_allowed' => lang('Login field contains not allowed characters'), 241 'page_not_found' => lang('Page Not Found!'), 242 'type_name_new_manager' => lang('Type the name of the new manager'), 243 'list_login_field_incomplete' => lang('The List LOGIN field is incomplete\nThe name of the list must be created like this:\nlist-ORGANIZATION-NAME_OF_LIST.\nEx: lista-celepar-rh.'), 244 'email_field_not_valid' => lang('Email field is not valid'), 245 'searching' => lang('Searching...'), 246 'delete_the_list' => lang('Delete the list '), 247 'group_name_field_incomplete' => lang('The group NAME field is incomplete.\nThe group name must be created like this:\ngroup-ORGANIZATION-NAME_OF_GROUP.\nEx: grupo-celepar-rh.'), 248 'delete_the_group' => lang('Delete the group '), 249 'cpf_invalid_field' => lang('Invalid cpf field'), 250 'email_field_not_valid' => lang('Invalid E-mail field'), 251 'incorrect_telephone_field' => lang('Incorrect Telephone Field'), 252 'delete_the_user' => lang('Delete the user '), 253 'change_user_login' => lang('Change user login'), 254 'to' => lang('to'), 255 'user_renamed_success' => lang('user_renamed_success'), 256 'removed' => lang('removed'), 257 'mb_from_the_user_mailbox' => lang('mb_from_the_user_mailbox'), 258 'cleaning_users_inbox' => lang('cleaning_users_inbox') 259 ); 260 $t->set_var($var); 219 261 220 262 221 // Pega combo das organizações e seleciona, caso seja um post, o setor que o usuario selecionou. … … 286 245 // Valores default. 287 246 $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', 288 249 'row_on' => "#DDDDDD", 289 250 'row_off' => "#EEEEEE", 290 251 'color_bg1' => "#E8F0F0", 291 //'manager_context' => $manager_context,292 252 'type' => 'create_user', 293 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uiaccounts.list_users'),294 253 'display_samba_suport' => $this->current_config['expressoAdmin_samba_support'] == 'true' ? '' : 'none', 295 'disabled_access_button'=> 'disabled', 254 'disabled_access_button' => 'disabled', 255 'display_access_records' => 'none', 296 256 297 257 // First ABA 298 258 'display_spam_uid' => 'display:none', 299 'lang_general_information' => lang('General Information'),300 'lang_corporative_information' => lang('Corporative Information'),301 'lang_email_config' => lang('Email Config'),302 'lang_groups_permission' => lang('Group s Permission'),303 'lang_lists_permission' => lang('E mail Lists'),304 'lang_aplication_permission' => lang('Aplication Permission'),305 'lang_search_organization' => lang('Search Organiztion'),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'), 306 266 'lang_organizations' => lang('Organizations'), 307 267 'lang_sector' => lang('Sector'), 308 'lang_account_lid' => lang('Login ID'),309 'lang_firstname' => lang('First Name'),310 'lang_lastname' => lang('Last Name'),268 'lang_account_lid' => lang('Login'), 269 'lang_firstname' => lang('First name'), 270 'lang_lastname' => lang('Last name'), 311 271 'lang_password' => lang('Password'), 312 'lang_re-password' => lang('Re-Password'),272 'lang_re-password' => lang('Re-password'), 313 273 'lang_passwd_expired' => lang('Password expired'), 314 274 'lang_changepassword' => lang('Change password'), 315 275 'lang_phone' => lang('Phone'), 316 276 'lang_photo' => lang('Photo'), 317 'lang_account_active' => lang(' Account Active'),318 'lang_account_invisible' => lang(' Account Invisible'),319 'lang_never' => lang('never'),277 'lang_account_active' => lang('Enabled account'), 278 'lang_account_invisible' => lang('Hidden account'), 279 'lang_never' => lang('Never'), 320 280 'lang_back' => lang('Back'), 321 281 'lang_save' => lang('Save'), … … 326 286 'changepassword_checked' => 'CHECKED', 327 287 'phpgwaccountstatus_checked' => 'CHECKED', 328 'photo_bin' => $GLOBALS['phpgw_info']['server']['webserver_url'].'/expressoAdmin1_2/templates/default/images/photo_celepar.png',329 288 'display_picture' => $this->functions->check_acl($manager_lid,'edit_users_picture') ? '' : 'none', 330 289 'display_tr_default_password' => 'none', … … 337 296 'display_corporative_information' => $this->functions->check_acl($manager_lid,'manipulate_corporative_information') ? '' : 'none', 338 297 'lang_employeenumber' => lang('Employee number'), 339 'lang_cpf' => lang('cpf'),340 'lang_rg' => lang('rg'),341 'lang_rguf' => lang('rguf'),298 'lang_cpf' => lang('CPF'), 299 'lang_rg' => lang('RG'), 300 'lang_rguf' => lang('RG UF'), 342 301 343 302 //MAIL 344 'lang_activeemailaccount' => lang('Active e mail account'),303 'lang_activeemailaccount' => lang('Active e-mail account'), 345 304 'lang_email' => lang('E-mail'), 346 'lang_aliasemail' => lang('Alias email'),347 'lang_forwardingemail' => lang('Forwarding e mail'),348 'lang_email_quota' => lang('Email quota in MB'),305 'lang_aliasemail' => lang('E-mail alias'), 306 'lang_forwardingemail' => lang('Forwarding e-mail'), 307 'lang_email_quota' => lang('E-mail quota in MB'), 349 308 'lang_onlyforwarding' => lang('Only forwarding'), 350 'lang_quote_message' => lang(' leave empty for no quota'),351 'lang_email_quota_used' => lang(' Quota usedin MB'),309 'lang_quote_message' => lang('Leave empty for no quota'), 310 'lang_email_quota_used' => lang('Used quota in MB'), 352 311 'accountstatus_checked' => 'CHECKED', 353 312 'mailquota' => $this->current_config['expressoAdmin_defaultUserQuota'], … … 359 318 //Third ABA 360 319 'lang_groups' => lang('Groups'), 361 'lang_user_groups' => 'Grupos do Usuário',362 'lang_available_groups' => 'Grupos disponíveis',363 'lang_listGroups' => lang('ListGroups'),364 'lang_primary_group' => lang('Primary Group'),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'), 365 324 'lang_add' => lang('Add'), 366 325 'lang_rem' => lang('Remove'), 367 326 368 327 //Fourd ABA 369 'lang_user_mail_lists' => 'O usuário participa destas Listas de E-mail',370 'lang_available_mail_lists' => 'Listas de E-mail disponíveis',328 'lang_user_mail_lists' => lang('Selected e-mail lists'), 329 'lang_available_mail_lists' => lang('Available e-mail lists'), 371 330 372 331 //Five ABA … … 374 333 375 334 //SAMBA ABA 376 'lang_samba_config' => lang('Samba Config'),377 'lang_use_attrs_samba' => lang('Use samba attributes'),335 'lang_samba_config' => lang('Samba config'), 336 'lang_use_attrs_samba' => lang('Use Samba attributes'), 378 337 'lang_sambadomain' => lang('Domain'), 379 'lang_sambaAcctFlags' => lang('AcctFlags'),380 'lang_sambaLogonScript' => lang('Logon Script'),381 'lang_sambaHomeDirectory' => lang('Home Directory'),382 'lang_active_user' => lang('Samba User Active'),383 'lang_desactive_user' => lang('Samba User Desactive'),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'), 384 343 'use_attrs_samba_checked' => 'CHECKED', 385 344 'sambadomainname_options' => $sambadomainname_options, 386 345 'sambalogonscript' => $this->current_config['expressoAdmin_defaultLogonScript'] != '' ? $this->current_config['expressoAdmin_defaultLogonScript'] : '', 387 346 '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') 388 391 ); 389 392 $t->set_var($var); … … 468 471 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 469 472 470 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit User');473 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit user'); 471 474 $GLOBALS['phpgw']->common->phpgw_header(); 472 475 … … 514 517 515 518 if ($alert_warning == '') 516 $alert_warning = "O expressoAdmin corrigiu as seguintes inconsistências:\\n";519 $alert_warning = lang("The ExpressoAdmin fixed the following inconsistencies:\n"); 517 520 $alert_warning .= "Incluido atributo memberUid do usuário no grupo:\\n$cn - gidnumber: $gidnumber."; 518 521 } … … 653 656 'alert_warning' => "$alert_warning", 654 657 'display_input_account_lid' => 'display:none', 655 'lang_general_information' => lang('General Information'),656 'lang_corporative_information' => lang('Corporative Information'),657 'lang_email_config' => lang('Email Config'),658 'lang_groups_permission' => lang('Groups Permission'),659 'lang_lists_permission' => lang('Email Lists'),660 'lang_aplication_permission' => lang('Ap lication Permission'),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('Application permissions'), 661 664 'lang_organizations' => lang('Organizations'), 662 'lang_search_organization' => lang('Search Organiztion'),665 'lang_search_organization' => lang('Search organization'), 663 666 'lang_sector' => lang('Sector'), 664 'lang_account_lid' => lang('Login ID'),665 'lang_firstname' => lang('First Name'),666 'lang_lastname' => lang('Last Name'),667 'lang_account_lid' => lang('Login'), 668 'lang_firstname' => lang('First name'), 669 'lang_lastname' => lang('Last name'), 667 670 'lang_passwd_expired' => lang('Password expired'), 668 671 'lang_password' => lang('Password'), 669 672 'lang_phone' => lang('Phone'), 670 673 'lang_photo' => lang('Photo'), 671 'lang_re-password' => lang('Re-Password'),674 'lang_re-password' => lang('Re-password'), 672 675 'lang_changepassword' => lang('Change password'), 673 'lang_account_active' => lang('Account Active'),674 'lang_account_invisible' => lang('Account Invisible'),676 'lang_account_active' => lang('Enabled account'), 677 'lang_account_invisible' => lang('Hidden account'), 675 678 'lang_back' => lang('Back'), 676 679 'lang_save' => lang('Save'), 680 'lang_delete_photo' => lang('Delete photo'), 677 681 678 682 'sectors' => $combo_manager_org, … … 699 703 // Corporative Information 700 704 'lang_employeenumber' => lang('Employee number'), 701 'lang_cpf' => lang('cpf'), 702 'lang_rg' => lang('rg'), 703 'lang_rguf' => lang('rguf'), 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 704 710 'corporative_information_employeenumber' => $user_info['corporative_information_employeenumber'], 705 711 'corporative_information_cpf' => $user_info['corporative_information_cpf'], … … 709 715 //MAIL 710 716 'disabled_quota_used' => 'disabled', 711 'lang_activeemailaccount' => lang('Active e mail account'),717 'lang_activeemailaccount' => lang('Active e-mail account'), 712 718 'lang_email' => lang('E-mail'), 713 'lang_aliasemail' => lang('Alias email'),714 'lang_forwardingemail' => lang('Forwarding e mail'),715 'lang_email_quota' => lang('Email quota in MB'),719 'lang_aliasemail' => lang('E-mail alias'), 720 'lang_forwardingemail' => lang('Forwarding e-mail'), 721 'lang_email_quota' => lang('E-mail quota in MB'), 716 722 'lang_onlyforwarding' => lang('Only forwarding'), 717 'lang_email_quota_used' => lang('Quota used in MB'), 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 718 728 719 729 'accountstatus_checked' => $user_info['accountstatus'] == 'active' ? 'CHECKED' : '', … … 723 733 //'mailforwardingaddress' => $user_info['mailforwardingaddress'], 724 734 'input_mailalternateaddress_fields' => $input_mailalternateaddress_fields, 725 'input_mailforwardingaddress_fields' => $input_mailforwardingaddress_fields,735 'input_mailforwardingaddress_fields' => $input_mailforwardingaddress_fields, 726 736 727 737 'deliverymode_checked' => $user_info['deliverymode'] == 'forwardOnly' ? 'CHECKED' : '', 728 729 738 'mailquota' => $user_info['mailquota'], 730 739 'mailquota_used' => $user_info['mailquota_used'], … … 732 741 //Third ABA 733 742 'lang_groups' => lang('Groups'), 734 'lang_user_groups' => 'Grupos do Usuário',735 'lang_available_groups' => 'Grupos disponíveis',736 'lang_primary_group' => lang('Primary Group'),743 'lang_user_groups' => lang('Selected user groups'), 744 'lang_available_groups' => lang('Available groups'), 745 'lang_primary_group' => lang('Primary group'), 737 746 'lang_add' => lang('Add'), 738 747 'lang_rem' => lang('Remove'), … … 741 750 742 751 //Fourd ABA 743 'lang_user_mail_lists' => 'O usuário participa destas Listas de E-mail',744 'lang_available_mail_lists' => 'Listas de E-mail disponíveis',752 'lang_user_mail_lists' => lang('Selected e-mail lists'), 753 'lang_available_mail_lists' => lang('Available e-mail lists'), 745 754 'ea_select_user_maillists_options' => $ea_select_user_maillists_options, 746 755 … … 749 758 750 759 //SAMBA ABA 751 'lang_samba_config' => lang('Samba Config'),752 'lang_use_attrs_samba' => lang('Use samba attributes'),760 'lang_samba_config' => lang('Samba config'), 761 'lang_use_attrs_samba' => lang('Use Samba attributes'), 753 762 'lang_sambadomain' => lang('Domain'), 754 'lang_sambaAcctFlags' => lang(' AcctFlags'),755 'lang_sambaLogonScript' => lang('Logon Script'),756 'lang_sambaHomeDirectory' => lang('Home Directory'),757 'lang_active_user' => lang('Samba User Active'),758 'lang_desactive_user' => lang(' Samba User Desactive'),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'), 759 768 760 769 'userSamba' => $user_info['sambaUser'], … … 766 775 'sambahomedirectory' => $user_info['homedirectory'], 767 776 'defaultLogonScript' => $this->current_config['expressoAdmin_defaultLogonScript'], 768 'use_suggestion_in_logon_script' => $this->current_config['expressoAdmin_defaultLogonScript'] == '' ? 'true' : 'false' 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') 769 821 ); 822 770 823 $t->set_var($var); 771 824 … … 915 968 $var = Array( 916 969 'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], 917 'lang_back' => 'Back',970 'lang_back' => lang('Back'), 918 971 'back_url' => "./index.php?menuaction=expressoAdmin1_2.uiaccounts.edit_user&account_id=$account_id", 919 'lang_loginid' => lang('Login ID'),972 'lang_loginid' => lang('Login'), 920 973 'lang_ip' => lang('IP'), 921 'lang_login' => lang('Log IN'),922 'lang_logout' => lang('Log OUT')974 'lang_login' => lang('Log in'), 975 'lang_logout' => lang('Log out') 923 976 ); 924 977 $t->set_var($var); -
trunk/expressoAdmin1_2/inc/class.uicomputers.inc.php
r73 r283 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' 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 Computers'),96 'lang_add_computers' => lang('Create computer'), 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 Computers');179 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create computer'); 180 180 $GLOBALS['phpgw']->common->phpgw_header(); 181 181 … … 224 224 'row_off' => "#EEEEEE", 225 225 'color_bg1' => "#E8F0F0", 226 226 227 'lang_back' => lang('Back'), 227 'lang_save' => lang('save'),228 'lang_search_organization' => lang('Search Organiztion'),228 'lang_save' => lang('Save'), 229 'lang_search_organization' => lang('Search organization'), 229 230 'lang_organizations' => lang('Organizations'), 230 231 'lang_sectors' => lang('Sectors'), 231 232 '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 237 'lang_active_workstation' => lang('WorkStation Active'), 238 'lang_desactive_workstation' => lang('WorkStation Desactive'), 239 'lang_trust_account' => lang('Trust Account'), 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'), 240 239 'lang_server' => lang('Server'), 241 240 'lang_computer_password' => lang('Computer password'), … … 323 322 unset($GLOBALS['phpgw_info']['flags']['noheader']); 324 323 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 325 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit Computer');324 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit computer'); 326 325 $GLOBALS['phpgw']->common->phpgw_header(); 327 326 … … 371 370 'color_bg1' => "#E8F0F0", 372 371 'lang_back' => lang('Back'), 373 'lang_save' => lang('save'),374 'lang_search_organization' => lang('Search Organiztion'),372 'lang_save' => lang('Save'), 373 'lang_search_organization' => lang('Search organization'), 375 374 'lang_organizations' => lang('Organizations'), 376 375 'lang_sectors' => lang('Sectors'), … … 378 377 'lang_computer_cn' => lang('Computer UID'), 379 378 'lang_computer_description' => lang('Description'), 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'),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'), 384 383 'lang_server' => lang('Server'), 385 384 'lang_computer_password' => lang('Computer password'), … … 451 450 'color_bg1' => "#E8F0F0", 452 451 'lang_back' => lang('Back'), 453 'lang_save' => lang('save'),452 'lang_save' => lang('Save'), 454 453 'lang_sectors' => lang('Sectors'), 455 454 'lang_sambadomain' => lang('Domain'), 456 455 'lang_computer_cn' => lang('Computer UID'), 457 456 'lang_computer_description' => lang('Description'), 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'),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'), 462 461 'lang_server' => lang('Server'), 463 462 'lang_computer_password' => lang('Computer password'), … … 536 535 unset($GLOBALS['phpgw_info']['flags']['noheader']); 537 536 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 538 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Delete Computer');537 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Delete computer'); 539 538 $GLOBALS['phpgw']->common->phpgw_header(); 540 539 … … 552 551 'lang_back' => lang('Back'), 553 552 'lang_delete' => lang('Delete'), 554 'lang_delete_computer' => lang('Do you realy want delete this Computer?'),553 'lang_delete_computer' => lang('Do you realy want to delete this computer?'), 555 554 'dn' => $email_list_data['dn'], 556 555 'computer_cn' => $computer_data['computer_cn'], -
trunk/expressoAdmin1_2/inc/class.uidomains.inc.php
r33 r283 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);73 61 74 62 if (!count($sambadomains_info)) … … 94 82 95 83 $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'), 96 90 'action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uidomains.add'), 97 'input_add' => '<input type="submit" value="' . lang('Add Samba Domains') . '">'91 'input_add' => '<input type="submit" value="' . lang('Create Samba domain') . '">' 98 92 ); 99 93 $p->set_var($var); … … 122 116 unset($GLOBALS['phpgw_info']['flags']['noheader']); 123 117 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 124 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang(' Add Samba Domain');118 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create Samba domain'); 125 119 $GLOBALS['phpgw']->common->phpgw_header(); 126 120 … … 140 134 'lang_name' => lang('Samba domain name'), 141 135 'lang_sid' => lang('Samba domain SID'), 142 'lang_add' => lang('Add'),143 136 'lang_save' => lang('Save'), 144 137 'lang_back' => lang('Back'), … … 159 152 if ($_POST['sambadomainname'] == '') 160 153 { 161 $_POST['error_messages'] = lang('Samba domain sname is empty') . '.';154 $_POST['error_messages'] = lang('Samba domain name is empty') . '.'; 162 155 ExecMethod('expressoAdmin1_2.uidomains.add'); 163 156 return; … … 166 159 if ($_POST['sambasid'] == '') 167 160 { 168 $_POST['error_messages'] = lang('Samba SID is empty') . '.';161 $_POST['error_messages'] = lang('Samba domain SID is empty') . '.'; 169 162 ExecMethod('expressoAdmin1_2.uidomains.add'); 170 163 return; … … 174 167 if ($this->db->exist_domain_name_sid($_POST['sambadomainname'], $_POST['sambasid'])) 175 168 { 176 $_POST['error_messages'] = lang('Samba domain name or SID already exist ') . '.';169 $_POST['error_messages'] = lang('Samba domain name or SID already exists') . '.'; 177 170 ExecMethod('expressoAdmin1_2.uidomains.add'); 178 171 return; -
trunk/expressoAdmin1_2/inc/class.uigroups.inc.php
r233 r283 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,92 91 'context_display' => $context_display, 93 'lang_groups_names' => lang('Groups Names'), 92 93 'lang_groups_names' => lang('Group name'), 94 94 'lang_description' => lang('Description'), 95 'lang_add_groups' => lang(' Add Groups'),95 'lang_add_groups' => lang('Create group'), 96 96 'lang_edit' => lang('Edit'), 97 97 'lang_delete' => lang('Delete'), 98 'lang_back' => lang('back'), 99 'lang_context' => lang('context'), 100 'lang_search' => lang('search') 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') 101 103 ); 102 104 $p->set_var($var); … … 110 112 $groups_info = $this->functions->get_list('groups', $GLOBALS['query'], $contexts); 111 113 } 112 $total = count($groups_info); 113 114 if (!count($total) && $GLOBALS['query'] != '') 114 115 if (!count($groups_info) && $GLOBALS['query'] != '') 115 116 { 116 117 $p->set_var('message',lang('No matches found')); 117 118 } 118 else if ( $total)119 else if (count($groups_info)) 119 120 { 120 121 if ($this->functions->check_acl($account_lid,'edit_groups')) … … 148 149 if ($can_delete) 149 150 { 150 $p->set_var('delete_link',"<a href='#' onClick='javascript:delete_group(\"".$group['cn']."\",\"".$group['gidnumber']."\");'> Excluir</a>");151 $p->set_var('delete_link',"<a href='#' onClick='javascript:delete_group(\"".$group['cn']."\",\"".$group['gidnumber']."\");'>".lang('Delete')."</a>"); 151 152 } 152 153 else … … 159 160 } 160 161 $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'),242 234 'concatenateDomain' => $this->current_config['expressoAdmin_concatenateDomain'], 243 235 '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' : '',251 236 'use_attrs_samba_checked' => '', 252 237 'disabled_samba' => 'disabled', … … 257 242 'combo_manager_org' => $combo_manager_org, 258 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'), 259 263 'group_name_field_is_empty' => lang('Group name field is empty'), 260 264 'description_field_is_empty' => lang('Description field is empty'), 261 'group_name_field_not_allowed' => lang('Group Name field contains characters not allowed.'),262 'description_field_not_allowed' => lang('Description field contain d characters not allowed.'),265 'group_name_field_not_allowed' => lang('Group name field contains invalid characters'), 266 'description_field_not_allowed' => lang('Description field contains invalid characters'), 263 267 'group_successfully_created' => lang('Group successfully created!'), 264 'group_successfully_saved' => lang('Group successfully saved!'), 265 'not_possible_select_all_users' => lang('It is not possible to select all the users of the organization root.'), 266 'group_successfully_deleted' => lang('Group successfully deleted!'), 267 'field_email_is_invalid' => lang('The field E-Mail is invalid'), 268 'delete_group' => lang('Delte group '), 269 'field_name_is_incomplete' => lang('The field NAME of the group is incomplete.\n 270 The group\'s name must be formated like this:\n 271 group-ORGANIZATION-GROUP_NAME.\n 272 Ex: grupo-celepar-rh') 273 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") 274 272 ); 275 273 $p->set_var($var); … … 297 295 unset($GLOBALS['phpgw_info']['flags']['noheader']); 298 296 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 299 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit Group');297 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit group'); 300 298 $GLOBALS['phpgw']->common->phpgw_header(); 301 299 … … 315 313 foreach ($group_info['memberuid_info'] as $uid=>$user_data) 316 314 { 315 if ($user_data['uidnumber']) 316 { 317 317 $array_users[$user_data['uidnumber']] = $user_data['cn']; 318 318 $array_users_uid[$user_data['uidnumber']] = $uid; 319 319 $array_users_type[$user_data['uidnumber']] = $user_data['type']; 320 320 } 321 else 322 { 323 $array_users[$uid] = $user_data['cn']; 324 } 325 } 321 326 natcasesort($array_users); 327 322 328 foreach ($array_users as $uidnumber=>$cn) 323 329 { … … 360 366 // Seta variaveis utilizadas pelo tpl. 361 367 $var = Array( 362 'color_bg1' => "#E8F0F0", 363 'color_bg2' => "#D3DCE3", 364 'type' => 'edit_group', 365 'ldap_context' => $GLOBALS['phpgw_info']['server']['ldap_context'], 366 'lang_back' => lang('Back'), 367 'lang_save' => lang('save'), 368 'lang_group_organization' => lang('Group Organization'), 369 'lang_search_organization' => lang('Search Organiztion'), 370 'lang_org' => lang('Organizations'), 371 'lang_group_name' => lang('group name'), 372 'lang_description' => lang('Description'), 373 'lang_email' => lang('E-mail'), 374 'lang_group_users' => lang('Group users'), 375 'lang_applications' => lang('Applications'), 376 'lang_add_user' => lang('Add User'), 377 'lang_rem_user' => lang('Remove User'), 378 'lang_all_users' => lang('Select users from all sub-organizations'), 368 'restrictionsOnGroup' => $this->current_config['expressoAdmin_restrictionsOnGroup'], 379 369 'gidnumber' => $group_info['gidnumber'], 380 //'manager_context' => $manager_context,381 370 'cn' => $group_info['cn'], 382 371 'user_count' => $user_count, … … 392 381 'combo_manager_org' => $combo_manager_org, 393 382 'combo_all_orgs' => $combo_all_orgs, 394 'ea_select_usersInGroup' => $ea_select_usersInGroup 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") 395 416 ); 396 417 $p->set_var($var); -
trunk/expressoAdmin1_2/inc/class.uilogs.inc.php
r2 r283 113 113 'query_other' => $_POST['query_other'], 114 114 115 'lang_manager_lid' => lang(' ManagerLogin'),115 'lang_manager_lid' => lang('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 139 145 $var = array( 140 146 'row_manager_lid' => $log['manager'], 141 147 'row_action' => $log['action'], 142 'row_date' => $log['date'],143 //'row_view' => (!$account['account_lastname']?' ':$account['account_lastname'])148 'row_date' => $date." ".$hour, 149 'row_view' => $this->row_action('view','log',$log['date']) 144 150 ); 145 151 $p->set_var($var); 146 $p->set_var('row_view',$this->row_action('view','log',$log['date']));147 152 $p->parse('rows','row',True); 148 153 } … … 205 210 206 211 'lang_back' => lang('Back'), 207 'lang_manager_lid' => lang(' ManagerLogin'),212 'lang_manager_lid' => lang('Login'), 208 213 'lang_date' => lang('Date'), 209 214 'lang_hour' => lang('Hour'), 210 215 'lang_action' => lang('Action'), 211 'lang_userinfo' => lang('User Info'),212 'lang_groupinfo' => lang('Group Info'),213 'lang_appinfo' => lang('App Info')216 'lang_userinfo' => lang('User information'), 217 'lang_groupinfo' => lang('Group information'), 218 'lang_appinfo' => lang('Application information') 214 219 ); 215 220 -
trunk/expressoAdmin1_2/inc/class.uimaillists.inc.php
r233 r283 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('E-mail 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'), 83 84 'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], 84 85 '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 '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'), 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'), 91 92 'lang_edit' => lang('Edit'), 92 'lang_scl' => 'SCL',93 'lang_delete' => 'Excluir',93 'lang_scl' => lang('SCL'), 94 'lang_delete' => lang('Delete'), 94 95 'lang_view' => lang('View'), 95 'lang_back' => lang('back'),96 'lang_context' => lang('context'),96 'lang_back' => lang('Back'), 97 'lang_context' => lang('Context'), 97 98 'lang_email' => lang('E-mail'), 98 'lang_search' => lang('search') 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') 99 102 ); 100 103 $p->set_var($var); … … 108 111 $maillists_info = $this->functions->get_list('maillists', $GLOBALS['query'], $manager_contexts); 109 112 } 110 $total = count($maillists_info); 111 112 113 if (!count($total) && $GLOBALS['query'] != '') 113 114 if (!count($maillists_info) && $GLOBALS['query'] != '') 114 115 { 115 116 $p->set_var('message',lang('No matches found')); 116 117 } 117 else if ( $total)118 else if (count($maillists_info)) 118 119 { 119 120 if ($this->functions->check_acl($manager_lid,'edit_maillists')) … … 125 126 $can_delete = True; 126 127 } 128 if ($this->functions->check_acl($manager_lid,'edit_scl_email_lists')) 129 { 130 $can_edit_scl = True; 131 } 132 127 133 128 134 foreach($maillists_info as $maillist) … … 140 146 { 141 147 $p->set_var('edit_link',$this->row_action('edit','maillists',$maillist['uidnumber'],$maillist['uid'])); 148 } 149 else 150 { 151 $p->set_var('edit_link',' '); 152 } 153 154 if ($can_edit_scl) 155 { 142 156 $p->set_var('scl_link',$this->row_action('scl','maillists',$maillist['uidnumber'],$maillist['uid'])); 143 157 } 144 158 else 145 159 { 146 $p->set_var('edit_link',' ');147 160 $p->set_var('scl_link',' '); 148 161 } … … 150 163 if ($can_delete) 151 164 { 152 $p->set_var('delete_link',"<a href='#' onClick='javascript:delete_maillist(\"".$maillist['uid']."\",\"".$maillist['uidnumber']."\");'> Excluir</a>");165 $p->set_var('delete_link',"<a href='#' onClick='javascript:delete_maillist(\"".$maillist['uid']."\",\"".$maillist['uidnumber']."\");'>".lang('Delete')."</a>"); 153 166 } 154 167 else … … 179 192 unset($GLOBALS['phpgw_info']['flags']['noheader']); 180 193 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 181 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create Email List');194 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create e-mail list'); 182 195 $GLOBALS['phpgw']->common->phpgw_header(); 183 196 … … 193 206 // Seta variaveis utilizadas pelo tpl. 194 207 $var = Array( 208 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.list_maillists'), 195 209 'color_bg1' => "#E8F0F0", 196 210 'color_bg2' => "#D3DCE3", 197 211 'type' => 'create_maillist', 198 212 'ldap_context' => $GLOBALS['phpgw_info']['server']['ldap_context'], 199 'uid' => 'lista-',200 213 'accountStatus_checked' => 'CHECKED', 201 214 '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, 202 219 'lang_back' => lang('Back'), 203 'lang_save' => lang(' save'),204 'lang_maillist_organization' => lang('Maillist Organization'),205 'lang_search_organization' => lang('Search Organiztion'),220 'lang_save' => lang('Save'), 221 'lang_maillist_organization' => lang('E-mail list organization'), 222 'lang_search_organization' => lang('Search organization'), 206 223 'lang_search_user' => lang('Search user'), 224 'lang_users' => lang('Users'), 207 225 'lang_organizations' => lang('Organizations'), 208 'lang_maillist_uid' => lang('Maillist login'),209 'lang_maillist_mail' => lang('Maillist Mail'),210 'lang_maillist_name' => lang('Maillist name'),211 'lang_maillist_users' => lang('Maillist users'),226 'lang_maillist_uid' => lang('E-mail list login'), 227 'lang_maillist_mail' => lang('E-mail list address'), 228 'lang_maillist_name' => lang('E-mail list name'), 229 'lang_maillist_users' => lang('E-mail list users'), 212 230 'lang_add_user' => lang('Add User'), 213 231 'lang_rem_user' => lang('Remove User'), 214 232 'lang_all_users' => lang('Show users from all sub-organizations'), 215 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.list_maillists'),216 'combo_manager_org' => $combo_manager_org,217 'combo_all_orgs' => $combo_all_orgs,218 'defaultDomain' => $this->current_config['expressoAdmin_defaultDomain'],219 'combo_org' => $sectors,220 233 'login_field_has_spaces' => lang('Login field has spaces'), 221 'list_email_field_is_empty' => lang('List e-mail field is empty'), 222 'no_user_is_part_of_the_list' => lang('No user is part of the list'), 223 'email_list_successfully_created' => lang('E-Mail list successfully created!'), 224 'email_list_successfully_saved' => lang('E-Mail list successfully saved!'), 225 'sending_control_list_successfully_saved' => lang('Sending control list sucessfully saved!'), 226 'it_is_not_possible_select_users' => lang('It is not possible to select all the users of the organization root'), 227 'email_list_successfully_deleted' => lang('E-Mail list successfully deleted'), 228 'login_field_incomplete' => lang('The LOGIN field is incomplete.\n The list name must be in the following format:\n 229 list-ORGANIZATION-LIST_NAME.\n Ex: lista-celepar-rh'), 230 'field_email_is_invalid' => lang('Field E-mail is invalid'), 231 'delete_list' =>('Delete list') 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") 232 243 ); 233 244 … … 256 267 unset($GLOBALS['phpgw_info']['flags']['noheader']); 257 268 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 258 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit Email Lists');269 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit e-mail list'); 259 270 $GLOBALS['phpgw']->common->phpgw_header(); 260 271 … … 298 309 if ($mail_not_found != '') 299 310 { 300 $opt_tmp_mail_not_found = '<option value="-1" disabled>-------------------- E-mails não encontrados ------------------ </option>'."\n";311 $opt_tmp_mail_not_found = '<option value="-1" disabled>-------------------- '.lang('E-mails not found').' ------------------ </option>'."\n"; 301 312 $ea_select_usersInMaillist .= $opt_tmp_mail_not_found . $mail_not_found; 302 313 } 303 314 if ($lists != '') 304 315 { 305 $opt_tmp_lists = '<option value="-1" disabled>------------------------------ Listas ------------------------------ </option>'."\n";316 $opt_tmp_lists = '<option value="-1" disabled>------------------------------ '.lang('Lists').' ------------------------------ </option>'."\n"; 306 317 $ea_select_usersInMaillist .= $opt_tmp_lists . $lists; 307 318 } 308 $opt_tmp_users = '<option value="-1" disabled>----------------------------- Usuários ---------------------------- </option>'."\n";319 $opt_tmp_users = '<option value="-1" disabled>----------------------------- '.lang('Users').' ---------------------------- </option>'."\n"; 309 320 $ea_select_usersInMaillist .= $opt_tmp_users . $users; 310 321 } … … 312 323 // Seta variaveis utilizadas pelo tpl. 313 324 $var = Array( 325 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.list_maillists'), 314 326 'color_bg1' => "#E8F0F0", 315 327 'color_bg2' => "#D3DCE3", 316 328 'type' => 'edit_maillist', 317 329 'ldap_context' => $GLOBALS['phpgw_info']['server']['ldap_context'], 318 'lang_back' => lang('Back'),319 'lang_save' => lang('save'),320 'lang_maillist_organization' => lang('Maillist Organization'),321 'lang_search_organization' => lang('Search Organiztion'),322 'lang_search_user' => lang('Search user'),323 'lang_organizations' => lang('Organizations'),324 'lang_maillist_uid' => lang('Maillist login'),325 'lang_maillist_mail' => lang('Maillist Mail'),326 'lang_maillist_name' => lang('Maillist name'),327 'lang_maillist_users' => lang('Maillist users'),328 'lang_add_user' => lang('Add User'),329 'lang_rem_user' => lang('Remove User'),330 'lang_all_users' => lang('Select users from all sub-organizations'),331 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.list_maillists'),332 330 'combo_manager_org' => $combo_manager_org, 333 331 'combo_all_orgs' => $combo_all_orgs, … … 340 338 'phpgwAccountVisible_checked' => $maillist_info['phpgwAccountVisible'] == '-1' ? 'CHECKED' : '', 341 339 'ea_select_usersInMaillist' => $ea_select_usersInMaillist, 342 'defaultDomain' => $this->current_config['expressoAdmin_defaultDomain'] 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") 343 360 ); 344 361 $p->set_var($var); … … 366 383 unset($GLOBALS['phpgw_info']['flags']['noheader']); 367 384 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 368 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit Sending Control List');385 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit sending control list'); 369 386 $GLOBALS['phpgw']->common->phpgw_header(); 370 387 … … 399 416 'ldap_context' => $GLOBALS['phpgw_info']['server']['ldap_context'], 400 417 'dn' => $maillist_info['dn'], 401 'lang_back' => lang('Back'),402 'lang_save' => lang('save'),403 'lang_org' => lang('Organizations'),404 'lang_maillist_uid' => lang('Maillist login'),405 'lang_maillist_mail' => lang('Maillist Mail'),406 'lang_maillist_name' => lang('Maillist name'),407 'lang_maillist_users' => lang('Maillist users'),408 'lang_add_user' => lang('Add User'),409 'lang_rem_user' => lang('Remove User'),410 'lang_all_users' => lang('Show users from all sub-organizations'),411 418 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.list_maillists'), 412 419 'combo_org' => $sectors, … … 416 423 'cn' => $maillist_info['cn'], 417 424 'accountRestrictive_checked' => $maillist_info['accountRestrictive'] == 'mailListRestriction' ? 'CHECKED' : '', 418 'participantCanSendMail_checked'=> $maillist_info['participantCanSendMail'] == 'TRUE' ? 'CHECKED' : '', 419 'ea_select_users_SCL_Maillist' => $ea_select_users_SCL_Maillist 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') 420 445 ); 421 446 $p->set_var($var); -
trunk/expressoAdmin1_2/inc/class.uimanagers.inc.php
r208 r283 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(' ListManagers');60 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('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']."\");'> Copiar</a>");117 $p->set_var('link_copy',"<a href='#' onClick='javascript:copy_manager(\"".$array_managers['manager_lid']."\");'>".lang('Copy')."</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(' Add Managers');143 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Create manager'); 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!'), 182 183 'options_contexts' => $options_context 183 184 ); … … 279 280 // Imprime o NavBar 280 281 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 281 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit Manager s');282 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Edit Manager'); 282 283 $GLOBALS['phpgw']->common->phpgw_header(); 283 284 … … 304 305 'type' => "edit", 305 306 'display_manager_select' => 'none', 306 'input_manager_lid_disabled' => 'disabled',307 'input_manager_lid_disabled' => 'disabled', 307 308 'error_messages' => $_POST['error_messages'] == '' ? '' : '<script language="JavaScript1.3">alert("'.$_POST['error_messages'].'");</script>', 308 309 'manager_lid' => $_POST['manager_lid'], 309 310 'hidden_manager_lid' => $_POST['manager_lid'], 310 311 'context' => $_POST['context'], 311 312 'manager_salved' => lang('Manager successfully salved!'), 312 313 'input_context_fields' => $input_context_fields, 313 314 '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 343 /*344 function validate()345 {346 return 'OK';347 348 $accounts = CreateObject('phpgwapi.accounts');349 $errors = array();350 351 352 // verifica se o manager existe. caso retorne 1 existe e eh uma conta de usuario.353 $manager_lid_exists = $accounts->exists($_POST['ea_select_managers']);354 if ($manager_lid_exists != 1)355 {356 $_POST['error_messages'] = lang("Manager LID don't exist.");357 if ($_POST['type'] == 'add')358 $this->add_managers();359 elseif ($_POST['type'] == 'edit')360 $this->edit_managers();361 return;362 }363 364 365 // Verifica se o contexto existe.366 $dn = $GLOBALS['phpgw_info']['server']['ldap_root_dn'];367 $passwd = $GLOBALS['phpgw_info']['server']['ldap_root_pw'];368 $ldap_conn = ldap_connect($GLOBALS['phpgw_info']['server']['ldap_host']);369 ldap_set_option($ldap_conn, LDAP_OPT_PROTOCOL_VERSION, 3);370 ldap_set_option($ldap_conn, LDAP_OPT_REFERRALS, 0);371 ldap_bind($ldap_conn,$dn,$passwd);372 373 $contexts = split("%", $_POST['context']);374 375 foreach ($contexts as $index=>$context)376 {377 $sr=@ldap_list($ldap_conn, $context, "cn=*");378 if (!$sr)379 {380 $_POST['error_messages'] = lang("Context don't exist") . ": $context";381 ldap_close($ldap_conn);382 if ($_POST['type'] == 'add')383 $this->add_managers();384 elseif ($_POST['type'] == 'edit')385 $this->edit_managers();386 return;387 }388 }389 390 if ($_POST['type'] == 'add')391 {392 //Verifica se ja existe o manager com aquele contexto cadastrado393 $query = "SELECT manager_lid FROM phpgw_expressoadmin WHERE manager_lid = '" . $_POST['ea_select_manager'] . "' AND context = '" . $_POST['context'] . "'";394 $GLOBALS['phpgw']->db->query($query);395 $num_registros = 0;396 while($GLOBALS['phpgw']->db->next_record())397 {398 $tmp[] = $GLOBALS['phpgw']->db->row();399 $num_registros++;400 }401 if ($num_registros != 0)402 {403 $_POST['error_messages'] = lang('Este Gerente, neste contexto já exite !!');404 $this->add_managers();405 return;406 }407 }408 409 if ($_POST['type'] == 'add')410 ExecMethod('expressoAdmin1_2.bomanagers.add_managers');411 elseif ($_POST['type'] == 'edit')412 ExecMethod('expressoAdmin1_2.bomanagers.edit_managers');413 414 return true;415 }416 */417 342 418 343 function make_lang($ram_lang) -
trunk/expressoAdmin1_2/inc/class.uisectors.inc.php
r64 r283 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 ECTORS'),73 'lang_add_sub_sectors' => lang('Add Sub-Sectors'),71 'lang_context' => lang('Context'), 72 'header_name' => lang('Sector name'), 73 'lang_add_sub_sectors' => lang('Create 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(' Add Sectors') . '">');136 $p->set_var('input_add','<input type="submit" value="' . lang('Create sector') . '">'); 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' => $_POST['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('Occult Sector'),183 'lang_occult_ou' => lang('Hidden 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' => $_POST['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('Occult Sector'),239 'lang_occult_ou' => lang('Hidden 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 Sectors');289 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('Delete sector'); 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 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 follingsectors'),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 to delete 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!'), 340 340 341 341 'manager_context' => $manager_context, -
trunk/expressoAdmin1_2/inc/class.user.inc.php
r208 r283 480 480 elseif ($_FILES['photo']['name'] != '') 481 481 { 482 483 if ($_FILES['photo']['size'] > 10000) 484 { 485 $return['status'] = false; 486 $return['msg'] .= 'Foto do usuário não foi salva, pois excede o tamanho máximo de 10 kb.'; 487 } 488 else 489 { 482 490 if ($new_values['photo_exist']) 483 491 { … … 492 500 $this->ldap_functions->ldap_save_photo($dn, $_FILES['photo']['tmp_name'], $new_values['photo_exist'], $photo_exist); 493 501 } 502 } 494 503 } 495 504
Note: See TracChangeset
for help on using the changeset viewer.
