- Timestamp:
- 09/12/08 11:39:24 (16 years ago)
- Location:
- trunk/expressoAdmin1_2
- Files:
-
- 48 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoAdmin1_2/controller.php
r317 r414 21 21 else 22 22 return $_SESSION['response'] = 'false'; 23 23 24 24 // Load dinamically class file. 25 25 if($app == '$this') -
trunk/expressoAdmin1_2/inc/class.bosectors.inc.php
r396 r414 63 63 64 64 //Escreve no log 65 $this-> functions->write_log2("Setor criado: $dn", '','','',$dn);65 $this->db_functions->write_log("created sector", "$dn"); 66 66 67 67 // Volta para o ListSectors -
trunk/expressoAdmin1_2/inc/class.db_functions.inc.php
r180 r414 106 106 { 107 107 $return['status'] = false; 108 $re turn['msg'] = "Problemas executando a query accounts no Banco de Dados.";108 $result['msg'] = $this->functions->lang('Problems running query on DB') . '.'; 109 109 $db->disconnect(); 110 110 return $return; … … 120 120 { 121 121 $return['status'] = false; 122 $re turn['msg'] = "Problemas executando a query groups no Banco de Dados.";122 $result['msg'] = $this->functions->lang('Problems running query on DB') . '.'; 123 123 $db->disconnect(); 124 124 return $return; … … 142 142 { 143 143 $return['status'] = false; 144 $re turn['msg'] = "Problemas executando a query update id no Banco de Dados.";144 $result['msg'] = $this->functions->lang('Problems running query on DB') . '.'; 145 145 } 146 146 $db->disconnect(); … … 148 148 } 149 149 150 /*151 function increment_id($id, $type)152 {153 $current_config = $_SESSION['phpgw_info']['expresso']['expressoAdmin'];154 if ($current_config['expressoAdmin_nextid_db_host'] != '')155 {156 $this->db->disconnect();157 $host = $current_config['expressoAdmin_nextid_db_host'];158 $port = $current_config['expressoAdmin_nextid_db_port'];159 $name = $current_config['expressoAdmin_nextid_db_name'];160 $user = $current_config['expressoAdmin_nextid_db_user'];161 $pass = $current_config['expressoAdmin_nextid_db_pass'];162 163 $db = new db();164 $db->Halt_On_Error = 'no';165 $db->connect($name, $host, $port, $user, $pass, 'pgsql');166 }167 else168 {169 $db = $this->db;170 }171 172 $sql = "UPDATE phpgw_nextid set id = '".$id."' WHERE appname = '" . $type . "'";173 if (!$db->query($sql))174 {175 $db->disconnect();176 return 'Erro em increment_id:' . pg_last_error();177 }178 else179 {180 $db->disconnect();181 return true;182 }183 }184 */185 186 150 function add_user2group($gidnumber, $uidnumber) 187 151 { … … 190 154 { 191 155 $result['status'] = false; 192 $result['msg'] = 'Erro em add_user2group:' . pg_last_error();156 $result['msg'] = $this->functions->lang('Error on function') . " db_functions->add_user2group.\n" . $this->functions->lang('Server returns') . ': ' . pg_last_error(); 193 157 return $result; 194 158 } … … 203 167 { 204 168 $result['status'] = false; 205 $result['msg'] = 'Erro em add_user2group:' . pg_last_error();169 $result['msg'] = $this->functions->lang('Error on function') . " db_functions->add_user2group.\n" . $this->functions->lang('Server returns') . ': ' . pg_last_error(); 206 170 return $result; 207 171 } … … 217 181 { 218 182 $result['status'] = false; 219 $result['msg'] = 'Erro em add_user2group:' . pg_last_error();183 $result['msg'] = $this->functions->lang('Error on function') . " db_functions->remove_user2group.\n" . $this->functions->lang('Server returns') . ': ' . pg_last_error(); 220 184 return $result; 221 185 } … … 229 193 { 230 194 $result['status'] = false; 231 $result['msg'] = 'Erro em add_user2group:' . pg_last_error();195 $result['msg'] = $this->functions->lang('Error on function') . " db_functions->remove_user2group.\n" . $this->functions->lang('Server returns') . ': ' . pg_last_error(); 232 196 return $result; 233 197 } … … 243 207 { 244 208 $result['status'] = false; 245 $result['msg'] = 'Erro em add_pref_changepassword:' . pg_last_error();209 $result['msg'] = $this->functions->lang('Error on function') . " db_functions->add_pref_changepassword.\n" . $this->functions->lang('Server returns') . ': ' . pg_last_error(); 246 210 return $result; 247 211 } … … 256 220 { 257 221 $result['status'] = false; 258 $result['msg'] = 'Erro em add_pref_changepassword:' . pg_last_error();222 $result['msg'] = $this->functions->lang('Error on function') . " db_functions->add_pref_changepassword.\n" . $this->functions->lang('Server returns') . ': ' . pg_last_error(); 259 223 return $result; 260 224 } … … 270 234 { 271 235 $result['status'] = false; 272 $result['msg'] = 'Erro em add_pref_changepassword:' . pg_last_error();236 $result['msg'] = $this->functions->lang('Error on function') . " db_functions->remove_pref_changepassword.\n" . $this->functions->lang('Server returns') . ': ' . pg_last_error(); 273 237 return $result; 274 238 } … … 282 246 { 283 247 $result['status'] = false; 284 $result['msg'] = 'Erro em remove_pref_changepassword:' . pg_last_error();248 $result['msg'] = $this->functions->lang('Error on function') . " db_functions->remove_pref_changepassword.\n" . $this->functions->lang('Server returns') . ': ' . pg_last_error(); 285 249 return $result; 286 250 } … … 301 265 { 302 266 $result['status'] = false; 303 $result['msg'] = 'Erro em add_id2apps: ' . pg_last_error();267 $result['msg'] = $this->functions->lang('Error on function') . " db_functions->add_id2apps.\n" . $this->functions->lang('Server returns') . ': ' . pg_last_error(); 304 268 return $result; 305 269 } … … 316 280 { 317 281 $result['status'] = false; 318 $result['msg'] = 'Erro em add_id2apps: ' . pg_last_error();282 $result['msg'] = $this->functions->lang('Error on function') . " db_functions->add_id2apps.\n" . $this->functions->lang('Server returns') . ': ' . pg_last_error(); 319 283 return $result; 320 284 } 321 285 else 322 286 { 323 $this->write_log("Ad icionado aplicativo $app ao id",$id,'','','');287 $this->write_log("Added application","$id:$app"); 324 288 } 325 289 } … … 341 305 { 342 306 $result['status'] = false; 343 $result['msg'] = 'Erro em remove_id2apps:' . pg_last_error();307 $result['msg'] = $this->functions->lang('Error on function') . " db_functions->remove_id2apps.\n" . $this->functions->lang('Server returns') . ': ' . pg_last_error(); 344 308 return $result; 345 309 } … … 353 317 { 354 318 $result['status'] = false; 355 $result['msg'] = 'Erro em remove_id2apps:' . pg_last_error();319 $result['msg'] = $this->functions->lang('Error on function') . " db_functions->remove_id2apps.\n" . $this->functions->lang('Server returns') . ': ' . pg_last_error(); 356 320 return $result; 357 321 } 358 322 else 359 323 { 360 $this->write_log("Remov ido aplicativo $app do id",$id,'','','');324 $this->write_log("Removed application from id","$id: $app"); 361 325 } 362 326 } … … 467 431 { 468 432 $result['status'] = false; 469 $result['msg'] = 'Erro em set_user_password: ' . pg_last_error();433 $result['msg'] = $this->functions->lang('Error on function') . " db_functions->set_user_password.\n" . $this->functions->lang('Server returns') . ': ' . pg_last_error(); 470 434 return $result; 471 435 } … … 578 542 } 579 543 580 function write_log($action, $ groupinfo='', $userinfo='', $appinfo='', $msg_log='')581 { 582 $sql = "INSERT INTO phpgw_expressoadmin_log (date, manager, action, groupinfo, userinfo, appinfo, msg) "583 . "VALUES('now','" . $_SESSION['phpgw_info']['expresso']['user']['account_lid'] . "','" . strtolower($action) . "','" . strtolower($ groupinfo) . "','" . strtolower($userinfo) . "','" . strtolower($appinfo) . "','" .strtolower($msg_log) . "')";544 function write_log($action, $about) 545 { 546 $sql = "INSERT INTO phpgw_expressoadmin_log (date, manager, action, userinfo) " 547 . "VALUES('now','" . $_SESSION['phpgw_info']['expresso']['user']['account_lid'] . "','" . strtolower($action) . "','" . strtolower($about) . "')"; 584 548 $this->db->query($sql); 585 549 return; -
trunk/expressoAdmin1_2/inc/class.functions.inc.php
r396 r414 735 735 } 736 736 737 function write_log2($action, $groupinfo='', $userinfo='', $appinfo='', $msg_log='')738 {739 $sql = "INSERT INTO phpgw_expressoadmin_log (date, manager, action, groupinfo, userinfo, appinfo, msg) "740 . "VALUES('now','" . $_SESSION['phpgw_info']['expresso']['user']['account_lid'] . "','" . strtolower($action) . "','" . strtolower($groupinfo) . "','" . strtolower($userinfo) . "','" . strtolower($appinfo) . "','" .strtolower($msg_log) . "')";741 $GLOBALS['phpgw']->db->query($sql);742 return;743 }744 745 737 function lang($key) 746 738 { … … 802 794 /* Retorna verdadeiro se o cpf eh valido */ 803 795 return true; 796 } 797 798 function make_lang($ram_lang) 799 { 800 $a_lang = split("_", $ram_lang); 801 $a_lang_reverse = array_reverse ( $a_lang, true ); 802 array_pop ( $a_lang_reverse ); 803 $a_lang = array_reverse ( $a_lang_reverse, true ); 804 $a_new_lang = implode ( " ", $a_lang ); 805 return lang($a_new_lang); 806 } 807 808 function make_dinamic_lang($template_obj, $block) 809 { 810 $tpl_vars = $template_obj->get_undefined($block); 811 $array_langs = array(); 812 813 foreach ($tpl_vars as $atribute) 814 { 815 $lang = strstr($atribute, 'lang_'); 816 if($lang !== false) 817 { 818 //$template_obj->set_var($atribute, $this->make_lang($atribute)); 819 $array_langs[$atribute] = $this->make_lang($atribute); 820 } 821 } 822 return $array_langs; 804 823 } 805 824 } … … 821 840 $this->sector_leaf = $sector_leaf; 822 841 } 823 } 842 } -
trunk/expressoAdmin1_2/inc/class.group.inc.php
r396 r414 44 44 { 45 45 $return['status'] = false; 46 $return['msg'] = 'Você não tem acesso para criar novos grupos.';46 $return['msg'] = lang('You do not have access to create new groups') . '.'; 47 47 return $return; 48 48 } … … 60 60 { 61 61 $return['status'] = false; 62 $return['msg'] = "Problemas obtendo ID do usuário.\n" . $id['msg'];62 $return['msg'] = lang('Problems getting group ID') . ':' . $next_id['msg']; 63 63 return $return; 64 64 } … … 96 96 $result = $this->db_functions->add_user2group($id, $uidnumber); 97 97 98 $this->db_functions->write_log("Ad icionado usuario $uid ao grupo ".$group_info['cn']." no momento da criação",$dn,$uidnumber,'','');98 $this->db_functions->write_log("Added user to group on user criation", $group_info['cn'] . ": " . $dn); 99 99 } 100 100 } … … 119 119 $return['status'] = false; 120 120 if ($result['error_number'] == '65') 121 $return['msg'] .= "Não foi possível criar este grupo pois os schemas do servidor LDAP estão desatualizados.\n" . 122 "O Administrador deve atualizar o diretório /etc/ldap/schema/ e re-inicializar o ldap.\n". 123 "Uma versão atualizada deste arquivo pode ser encontrada no site:\n" . 121 { 122 $return['msg'] .= lang("It was not possible create the group because the LDAP schemas are not update") . "\n" . 123 lang("The administrator must update the directory /etc/ldap/schema/ and re-start LDAP") . "\n" . 124 lang("A update version of this files can be found here") . ":\n" . 124 125 "www.expressolivre.org -> Downloads -> schema.tgz"; 126 } 125 127 else 126 128 $return['msg'] .= $result['msg']; … … 137 139 if ($return['status'] == true) 138 140 { 139 $this->db_functions->write_log("Cr iado grupo de usuários $dn",'',$dn,'','');141 $this->db_functions->write_log("Created group",$dn); 140 142 } 141 143 … … 149 151 { 150 152 $return['status'] = false; 151 $return['msg'] = 'Você não tem acesso para editar grupos.';153 $return['msg'] = lang('You do not have access to edit groups') . '.'; 152 154 return $return; 153 155 } … … 181 183 { 182 184 $dn = $newrdn . ',' . $newparent; 183 $this->db_functions->write_log('Ren omeado grupo de usuários de '.$old_values['cn']." para $dn.",'',$dn,$old_values['cn'],'');185 $this->db_functions->write_log('Renamed group', $old_values['cn'] . '->' . $dn); 184 186 } 185 187 } … … 192 194 { 193 195 $ldap_mod_replace['sambasid'] = $new_values['sambasid'] . '-' . ((2 * $new_values['gidnumber'])+1001); 194 $this->db_functions->write_log("Alterado dominio samba do grupo $dn para " . $new_values['sambasid'],'',$dn,'',''); 196 $this->db_functions->write_log('modified group samba domain', $dn . ': ' . $old_values['sambasid'] . '->' . $new_values['sambasid']); 197 195 198 } 196 199 … … 200 203 { 201 204 $ldap_mod_replace['description'] = $new_values['description']; 202 $this->db_functions->write_log( "Modificado descrição do grupo $dn",'',$dn,'','');205 $this->db_functions->write_log('modified group description',$dn . ': ' . $old_values['description'] . '->' . $new_values['description'] ); 203 206 } 204 207 … … 209 212 { 210 213 $ldap_mod_replace['mail'] = $new_values['email']; 211 $this->db_functions->write_log( "Modificado E-Mail do grupo $dn",'',$dn,'','');214 $this->db_functions->write_log('modified group email', $dn . ': ' . $old_values['email'] . '->' . $new_values['email']); 212 215 } 213 216 … … 221 224 $return['status'] = false; 222 225 if ($result['error_number'] == '65') 223 $return['msg'] .= "Não foi possível salvar alguns atributos deste grupo pois os schemas do servidor LDAP estão desatualizados.\n" . 224 "O Administrador deve atualizar o diretório /etc/ldap/schema/ e re-inicializar o ldap.\n". 225 "Uma versão atualizada deste arquivo pode ser encontrada no site:\n" . 226 { 227 $return['msg'] .= lang("It was not possible create the group because the LDAP schemas are not update") . "\n" . 228 lang("The administrator must update the directory /etc/ldap/schema/ and re-start LDAP") . "\n" . 229 lang("A update version of this files can be found here") . ":\n" . 226 230 "www.expressolivre.org -> Downloads -> schema.tgz"; 231 } 227 232 else 228 233 $return['msg'] .= $result['msg']; … … 245 250 } 246 251 else 247 $this->db_functions->write_log( "Removido atributos samba do grupo $dn",'',$dn,'','');252 $this->db_functions->write_log('removed group samba attributes',$dn); 248 253 } 249 254 … … 252 257 if (($this->current_config['expressoAdmin_samba_support'] == 'true') && (!$old_values['sambaGroup']) && ($new_values['use_attrs_samba'] == 'on')) 253 258 { 254 //Verifica se o binario para criar as senhas do samba exite.255 259 if (!is_file('/home/expressolivre/mkntpwd')) 256 260 { 257 261 $return['status'] = false; 258 $return['msg'] .= "O arquivo binário /home/expressolivre/mkntpwd não exite.\\nEle é necessário para a criação das senhas usadas pelo SAMBA.\\nInforme o administrador ExpressoLivre sobre isto.\\n"; 262 $return['msg'] .= lang("The file /home/expressolivre/mkntpwd does not exist") . ".\n"; 263 $return['msg'] .= lang("It is necessery to create samba passwords") . ".\n"; 264 $return['msg'] .= lang("Inform your system administrator about this") . ".\n"; 259 265 } 260 266 else … … 271 277 } 272 278 else 273 $this->db_functions->write_log( "Adicionado atributos samba ao grupo $dn",'','','','');279 $this->db_functions->write_log('Added samba attibutes to group',$dn); 274 280 } 275 281 } … … 281 287 { 282 288 $ldap_add['phpgwaccountvisible'] = '-1'; 283 $this->db_functions->write_log(" Adicionado atributo phpgwaccountvisible ao grupo $dn",'','','','');289 $this->db_functions->write_log("added attribute phpgwAccountVisible to group",$dn); 284 290 } 285 291 if ((($new_values['email']) && (!$old_values['email'])) && … … 287 293 { 288 294 $ldap_add['mail'] = $new_values['email']; 289 $this->db_functions->write_log(" Adicionado atributo mail ao grupo $dn",'','','','');295 $this->db_functions->write_log("added attribute mail to group",$dn); 290 296 } 291 297 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// … … 294 300 { 295 301 $result = $this->ldap_functions->add_user_attributes($dn, $ldap_add); 296 297 302 if (!$result['status']) 298 303 { 299 304 $return['status'] = false; 300 305 if ($result['error_number'] == '65') 301 $return['msg'] .= "Não foi possível adicionar alguns atributos deste gruupo pois os schemas do servidor LDAP estão desatualizados.\n" . 302 "O Administrador deve atualizar o diretório /etc/ldap/schema/ e re-inicializar o ldap.\n". 303 "Uma versão atualizada deste arquivo pode ser encontrada no site:\n" . 304 "www.expressolivre.org -> Downloads -> schema.tgz"; 306 { 307 $return['msg'] .= lang("It was not possible create the group because the LDAP schemas are not update") . "\n" . 308 lang("The administrator must update the directory /etc/ldap/schema/ and re-start LDAP") . "\n" . 309 lang("A update version of this files can be found here") . ":\n" . 310 "www.expressolivre.org -> Downloads -> schema.tgz"; 311 } 305 312 else 306 313 $return['msg'] .= $result['msg']; … … 314 321 { 315 322 $ldap_remove['phpgwaccountvisible'] = array(); 316 $this->db_functions->write_log(" Removido atributo phpgwaccountvisible do grupo $dn",'','','','');323 $this->db_functions->write_log("removed attribute phpgwAccountVisible from group",$dn); 317 324 } 318 325 if (((!$new_values['email']) && ($old_values['email'])) && … … 320 327 { 321 328 $ldap_remove['mail'] = array(); 322 $this->db_functions->write_log(" Removido atributo mail do grupo $dn",'','','','');329 $this->db_functions->write_log("removed attribute mail from group",$dn); 323 330 } 324 331 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// … … 355 362 $user = $this->ldap_functions->uidnumber2uid($uidnumber); 356 363 $array_memberUids_add[] = $user; 357 $this->db_functions->write_log("Adicionado usuário $user ao grupo $dn.",$dn,'','',''); 358 } 359 /* 360 else 361 { 362 // O memberUID existe no grupo, mas o usuário não existe no ldap 363 $this->ldap_functions->remove_user2group($new_values['gidnumber'], $uidnumber); 364 }*/ 364 $this->db_functions->write_log("included user to group","$dn: $user"); 365 } 365 366 } 366 367 if (count($array_memberUids_add) > 0) 367 368 $this->ldap_functions->add_user2group($new_values['gidnumber'], $array_memberUids_add); 368 369 } 369 370 370 if (count($remove_users)>0) 371 371 { … … 378 378 $user = $this->ldap_functions->uidnumber2uid($uidnumber); 379 379 $array_memberUids_remove[] = $user; 380 $this->db_functions->write_log(" Removido usuário $user do grupo $dn.",$dn,'','','');380 $this->db_functions->write_log("removed user from group","$dn: $user"); 381 381 } 382 382 } … … 412 412 413 413 foreach ($add_apps as $app => $index) 414 $this->db_functions->write_log(" Adicionado aplicativo $app ao grupo $dn",'',$dn,'','');414 $this->db_functions->write_log("added application to group","$app: $dn"); 415 415 } 416 416 … … 428 428 429 429 foreach ($remove_apps2 as $app => $access) 430 $this->db_functions->write_log(" Removido aplicativo $app do grupo $dn",'',$dn,'','');430 $this->db_functions->write_log("removed application from group","$app: $dn"); 431 431 } 432 432 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// … … 451 451 { 452 452 $return['status'] = false; 453 $return['msg'] = 'Você não tem acesso para excluir grupos.';453 $return['msg'] = lang('You do not have acces to remove groups') . '.'; 454 454 return $return; 455 455 } … … 478 478 if ($return['status'] == true) 479 479 { 480 $this->db_functions->write_log(" Deletado grupo de usuários $cn",'',$cn,'','');480 $this->db_functions->write_log("deleted group","$cn"); 481 481 } 482 482 -
trunk/expressoAdmin1_2/inc/class.imap_functions.inc.php
r396 r414 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; 14 18 15 19 function imap_functions(){ … … 18 22 $this->imap_server = $_SESSION['phpgw_info']['expresso']['email_server']['imapServer']; 19 23 $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']; 20 28 $this->imapDelimiter= $_SESSION['phpgw_info']['expresso']['email_server']['imapDelimiter']; 21 29 $this->imap = imap_open('{'.$this->imap_server.':'.$this->imap_port.'/novalidate-cert}', $this->imap_admin, $this->imap_passwd, OP_HALFOPEN); … … 28 36 { 29 37 $error = imap_errors(); 30 $result['status'] = false; 31 $result['msg'] = 'Erro na funcao imap_function->create(INBOX): ' . $error[0]; 32 return $result; 33 } 34 if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . "Enviados")) 35 { 36 $error = imap_errors(); 37 $result['status'] = false; 38 $result['msg'] = 'Erro na funcao imap_function->create(Enviados): ' . $error[0]; 39 return $result; 40 } 41 if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . "Rascunhos")) 42 { 43 $error = imap_errors(); 44 $result['status'] = false; 45 $result['msg'] = 'Erro na funcao imap_function->create(Rascunho): ' . $error[0]; 46 return $result; 47 } 48 if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . "Lixeira")) 49 { 50 $error = imap_errors(); 51 $result['status'] = false; 52 $result['msg'] = 'Erro na funcao imap_function->create(Lixeira): ' . $error[0]; 53 return $result; 54 } 38 if ($error[0] == 'Mailbox already exists') 39 { 40 $result['status'] = true; 41 } 42 else 43 { 44 $result['status'] = false; 45 $result['msg'] = $this->functions->lang('Error on function') . " imap_functions->create(INBOX) ($uid):" . $error[0]; 46 } 47 return $result; 48 } 49 if ( (!empty($this->imap_sentfolder)) && (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . $this->imap_sentfolder)) ) 50 { 51 $error = imap_errors(); 52 $result['status'] = false; 53 $result['msg'] = $this->functions->lang('Error on function') . " imap_functions->create(".$this->imap_sentfolder."):" . $error[0]; 54 return $result; 55 } 56 if ( (!empty($this->imap_draftsfolder)) && (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . $this->imap_draftsfolder)) ) 57 { 58 $error = imap_errors(); 59 $result['status'] = false; 60 $result['msg'] = $this->functions->lang('Error on function') . " imap_functions->create(".$this->imap_draftsfolder."):" . $error[0]; 61 return $result; 62 } 63 if ( (!empty($this->imap_trashfolder)) && (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . $this->imap_trashfolder)) ) 64 { 65 $error = imap_errors(); 66 $result['status'] = false; 67 $result['msg'] = $this->functions->lang('Error on function') . " imap_functions->create(".$this->imap_trashfolder."):" . $error[0]; 68 return $result; 69 } 70 if (!empty($this->imap_sentfolder)) 71 { 72 if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . $this->imap_spamfolder)) 73 { 74 $error = imap_errors(); 75 $result['status'] = false; 76 $result['msg'] = $this->functions->lang('Error on function') . " imap_functions->create(".$this->imap_spamfolder."):" . $error[0]; 77 return $result; 78 } 79 } 80 55 81 if (!imap_set_quota($this->imap,"user" . $this->imapDelimiter . $uid, ($mailquota*1024))) 56 82 { 57 83 $error = imap_errors(); 58 84 $result['status'] = false; 59 $result['msg'] = 'Erro na funcao imap_function->create(set_quota): '. $error[0];85 $result['msg'] = $this->functions->lang('Error on function') . " imap_functions->create(imap_set_quota):" . $error[0]; 60 86 return $result; 61 87 } … … 100 126 { 101 127 $result['status'] = false; 102 $result['msg'] = "Erro na funcao imap_function->delete_user.\nRetorno do servidor: ". imap_last_error();128 $result['msg'] = $this->functions->lang('Error on function') . " imap_functions->delete_user.\n" . $this->functions->lang('Server returns') . ': ' . imap_last_error(); 103 129 } 104 130 … … 122 148 { 123 149 $result['status'] = false; 124 $result['msg'] = "Erro na funcao imap_function->rename_mailbox.\nRetorno do servidor: ". imap_last_error();150 $result['msg'] = $this->functions->lang('Error on function') . " imap_functions->rename_mailbox.\n" . $this->functions->lang('Server returns') . ': ' . imap_last_error(); 125 151 } 126 152 else … … 138 164 { 139 165 $result['status'] = false; 140 $result['msg'] = 'Você não tem acesso para executar esta operação.';166 $result['msg'] = $this->functions->lang('You do not have access to clean an user inbox'); 141 167 return $result; 142 168 } … … 159 185 if ($return_setacl) 160 186 { 161 //$mbox_stream = imap_open('{'.$this->imap_server.':'.$this->imap_port.$imap_options.'/user="'.$uid.'"}', $this->imap_admin, $this->imap_passwd);162 187 $mbox_stream = imap_open('{'.$this->imap_server.':'.$this->imap_port.$imap_options .'}user'. $this->imapDelimiter . $uid, $this->imap_admin, $this->imap_passwd); 163 188 … … 180 205 { 181 206 $result['status'] = false; 182 $result['msg'] = "Nao foi possivel esvaziar a caixa postal do usuario:\n". imap_last_error();183 } 184 } 185 else 186 { 187 $result['status'] = false; 188 $result['msg'] = "Nao foi possivel modificar a acl do usuario:\n". imap_last_error();207 $result['msg'] = $this->functions->lang('It was not possible clean the users inbox') . ".\n" . $this->functions->lang('Server returns') . ': ' . imap_last_error(); 208 } 209 } 210 else 211 { 212 $result['status'] = false; 213 $result['msg'] = $this->functions->lang('It was not possible to modify the users acl') . ".\n" . $this->functions->lang('Server returns') . ': ' . imap_last_error(); 189 214 } 190 215 return $result; -
trunk/expressoAdmin1_2/inc/class.institutional_accounts.inc.php
r317 r414 34 34 $GLOBALS['phpgw']->js->validate_file('jscode','institutional_accounts','expressoAdmin1_2'); 35 35 $GLOBALS['phpgw']->js->validate_file('modal','modal','expressoAdmin1_2'); 36 37 /* 38 Move this to expressoAdmin.index. 39 $_SESSION['phpgw_info']['expressoAdmin']['user']['preferences']['common']['lang'] = $GLOBALS['phpgw_info']['user']['preferences']['common']['lang']; 40 41 $fn = './expressoAdmin1_2/setup/phpgw_'.$_SESSION['phpgw_info']['expressoAdmin']['user']['preferences']['common']['lang'].'.lang'; 42 if (file_exists($fn)){ 43 $fp = fopen($fn,'r'); 44 while ($data = fgets($fp,16000)){ 45 list($message_id,$app_name,$null,$content) = explode("\t",substr($data,0,-1)); 46 $_SESSION['phpgw_info']['expressoAdmin']['lang'][$message_id] = $content; 47 } 48 fclose($fp); 49 }*/ 36 $GLOBALS['phpgw']->js->validate_file('jscode','expressoadmin','expressoAdmin1_2'); 50 37 } 51 38 } 52 39 53 function make_lang($ram_lang)54 {55 $a_lang = split("_", $ram_lang);56 $a_lang_reverse = array_reverse ( $a_lang, true );57 array_pop ( $a_lang_reverse );58 $a_lang = array_reverse ( $a_lang_reverse, true );59 $a_new_lang = implode ( " ", $a_lang );60 return lang($a_new_lang);61 }62 63 function make_dinamic_lang($template_obj, $block)64 {65 $tpl_vars = $template_obj->get_undefined($block);66 foreach ($tpl_vars as $atribute)67 {68 $lang = strstr($atribute, 'lang_');69 if($lang !== false)70 {71 $template_obj->set_var($atribute, $this->make_lang($atribute));72 }73 }74 }75 76 40 function index() 77 41 { … … 105 69 106 70 /* dinamic load lang */ 107 $ this->make_dinamic_lang($p, 'body');108 $ this->make_dinamic_lang($p, 'institutional_accounts_modal');71 $p->set_var($this->functions->make_dinamic_lang($p, 'body')); 72 $p->set_var($this->functions->make_dinamic_lang($p, 'institutional_accounts_modal')); 109 73 110 74 -
trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php
r396 r414 123 123 { 124 124 $result['status'] = false; 125 $result['msg'] = 'Falha na conexao com o ldap.';125 $result['msg'] = $this->functions->lang('Connection with ldap fail') . "."; 126 126 return $result; 127 127 } … … 148 148 { 149 149 $result['status'] = false; 150 $result['msg'] = 'Este LOGIN não pode ser usado pois é uma conta de sistema.';150 $result['msg'] = $this->functions->lang('This LOGIN can not be used because is a System Account') . "."; 151 151 return $result; 152 152 } … … 197 197 198 198 $result['status'] = false; 199 $ result['msg'] = "LOGIN já está sendo utilizado por:\n" . $users;199 $this->functions->lang('This LOGIN is already used by') . ":\n" . $users; 200 200 return $result; 201 201 } … … 209 209 { 210 210 $result['status'] = false; 211 $result['msg'] = 'LOGIN do usuário já esta sendo usado por um grupo.';211 $result['msg'] = $this->functions->lang('This LOGIN is being used by a group') . "."; 212 212 return $result; 213 213 } … … 255 255 { 256 256 $result['status'] = false; 257 $result['msg'] = 'LOGIN já esta sendo usado por outro usuário em outra organização.';257 $result['msg'] = $this->functions->lang('This LOGIN is already used by a user in another organization') . "."; 258 258 ldap_close($ldap_connection2); 259 259 return $result; … … 277 277 if ($entries[0]['uid'][0] != $uid){ 278 278 $result['status'] = false; 279 $result['msg'] = 'E-MAIL está sendo usado por 1 usuário: ' . $entries[0]['uid'][0]; 280 //ldap_close($ldap_connection); 279 $result['msg'] = $this->functions->lang('Email is being used by 1 user') . ": " . $entries[0]['uid'][0]; 281 280 return $result; 282 281 } … … 284 283 else if ($entries['count'] > 1){ 285 284 $result['status'] = false; 286 $result['msg'] = 'E-MAIL está sendo usado por 2 ou mais usuários.'; 287 //ldap_close($ldap_connection); 285 $result['msg'] = $this->functions->lang('Email is being used by 2 or more users') . "."; 288 286 return $result; 289 287 } … … 297 295 if ($entries[0]['uid'][0] != $uid){ 298 296 $result['status'] = false; 299 $result['msg'] = "E-MAIL alternativo está sendo usado por 1 usuário: " . $entries[0]['uid'][0]; 300 //ldap_close($ldap_connection); 297 $result['msg'] = $this->functions->lang('Alternative email is being used by 1 user') . ": " . $entries[0]['uid'][0]; 301 298 return $result; 302 299 } … … 304 301 else if ($entries['count'] > 1){ 305 302 $result['status'] = false; 306 $result['msg'] = 'E-MAIL alternativo está sendo usado por 2 ou mais usuários.';303 $result['msg'] = $this->functions->lang('Alternative email is being used by 2 or more users') . "."; 307 304 return $result; 308 305 } … … 334 331 { 335 332 $result['status'] = false; 336 $result['msg'] = 'Falha na conexao com o ldap.';333 $result['msg'] = $this->functions->lang('Connection with ldap fail') . "."; 337 334 return $result; 338 335 } … … 389 386 { 390 387 $result['status'] = false; 391 $result['msg'] = 'Falha na conexao com o ldap.';388 $result['msg'] = $this->functions->lang('Connection with ldap fail') . "."; 392 389 return $result; 393 390 } … … 408 405 { 409 406 $result['status'] = false; 410 $result['msg'] = 'Este nome de grupo não pode ser usado pois é um grupo de sistema.';407 $result['msg'] = $this->functions->lang('This group name can not be used because is a System Account') . "."; 411 408 return $result; 412 409 } … … 420 417 { 421 418 $result['status'] = false; 422 $result['msg'] = 'NOME do grupo já está sendo usado.';419 $result['msg'] = $this->functions->lang('This name is already used') . "."; 423 420 return $result; 424 421 } … … 432 429 { 433 430 $result['status'] = false; 434 $result['msg'] = 'NOME do grupo já esta sendo usado por um usuário.';431 $result['msg'] = $this->functions->lang('This grupo name is already used by an user') . "."; 435 432 return $result; 436 433 } … … 456 453 { 457 454 $result['status'] = false; 458 $result['msg'] = 'Falha na conexao com o ldap.';455 $result['msg'] = $this->functions->lang('Connection with ldap fail') . "."; 459 456 return $result; 460 457 } … … 476 473 { 477 474 $result['status'] = false; 478 $result['msg'] = 'Este LOGIN não pode ser usado pois é uma conta de sistema.';475 $result['msg'] = $this->functions->lang('This LOGIN can not be used because is a System Account') . "."; 479 476 return $result; 480 477 } … … 488 485 { 489 486 $result['status'] = false; 490 $result['msg'] = 'LOGIN da lista já está sendo usado.';487 $result['msg'] = $this->functions->lang('This email list LOGIN is already used') . "."; 491 488 return $result; 492 489 } … … 500 497 { 501 498 $result['status'] = false; 502 $result['msg'] = 'E-MAIL da lista já está sendo usado.';499 $result['msg'] = $this->functions->lang('EMAIL is already used') . "."; 503 500 return $result; 504 501 } … … 543 540 return $options; 544 541 } 545 546 //Busca usuários de um contexto e já retorna as options do select;547 /*548 function get_available_users_and_maillist($params)549 {550 $context = $params['context'];551 $recursive = $params['recursive'];552 $justthese = array("cn", "uidNumber");553 $filter="(|(phpgwAccountType=u)(phpgwAccountType=l))";554 555 if ($recursive == 'true')556 $groups_list=ldap_search($this->ldap, $context, $filter, $justthese);557 else558 $groups_list=ldap_list($this->ldap, $context, $filter, $justthese);559 560 $entries = ldap_get_entries($this->ldap, $groups_list);561 562 for ($i=0; $i<$entries["count"]; $i++){563 $u_tmp[$entries[$i]["uidnumber"][0]] = $entries[$i]["cn"][0];564 }565 566 if (count($u_tmp))567 natcasesort($u_tmp);568 569 $i = 0;570 $users = array();571 572 if (count($u_tmp))573 {574 foreach ($u_tmp as $uidnumber => $cn)575 {576 $options .= "<option value=$uidnumber>$cn</option>";577 }578 unset($u_tmp);579 }580 581 return $options;582 }583 */584 542 585 543 //Busca usuários e listas de um contexto e já retorna as options do select; … … 722 680 $result['status'] = false; 723 681 $result['error_number'] = ldap_errno($this->ldap); 724 $result['msg'] = "Erro na funcao ldap_functions->ldap_add_entry ($dn).\nRetorno do servidor:". ldap_errno($this->ldap) . ldap_error($this->ldap);682 $result['msg'] = $this->functions->lang('Error on function') . " ldap_functions->ldap_add_entry ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_errno($this->ldap) . ldap_error($this->ldap); 725 683 } 726 684 else … … 750 708 { 751 709 $result['status'] = false; 752 $result['msg'] = "Erro na funcao ldap_functions->ldap_save_photo ($dn).\nRetorno do servidor:". ldap_error($this->ldap);710 $result['msg'] = $this->functions->lang('Error on function') . " ldap_functions->ldap_save_photo ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($this->ldap); 753 711 } 754 712 … … 768 726 { 769 727 $result['status'] = false; 770 $result['msg'] = "Erro na funcao ldap_functions->ldap_remove_photo ($dn).\nRetorno do servidor:". ldap_error($this->ldap);728 $result['msg'] = $this->functions->lang('Error on function') . " ldap_functions->ldap_remove_photo ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($this->ldap); 771 729 } 772 730 … … 793 751 { 794 752 $result['status'] = false; 795 $result['msg'] = "Erro na funcao ldap_functions->add_user2group ($memberUid).\nRetorno do servidor:". ldap_error($this->ldap);753 $result['msg'] = $this->functions->lang('Error on function') . " ldap_functions->add_user2group ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($this->ldap); 796 754 } 797 755 return $result; … … 808 766 $res = @ldap_mod_del($this->ldap, $group_dn, $attrs); 809 767 810 /*echo 'usuarios recebidos para remocao no ldap';811 echo '<pre>';812 print_r($memberUid);*/813 814 768 if ($res) 815 769 { … … 819 773 { 820 774 $result['status'] = false; 821 $result['msg'] = "Erro na funcao ldap_functions->remove_user2group ($memberUid).\nRetorno do servidor:". ldap_error($this->ldap);775 $result['msg'] = $this->functions->lang('Error on function') . " ldap_functions->remove_user2group ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($this->ldap); 822 776 } 823 777 return $result; … … 829 783 { 830 784 $result['status'] = false; 831 $result['msg'] = "Falha de conexão com o openLDAP.\n\nRetorno do servidor:". ldap_error($ldapMasterConnect);785 $result['msg'] = $this->functions->lang('Ldap connection fail') . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($ldapMasterConnect); 832 786 return $result; 833 787 } … … 850 804 if (ldap_errno($ldapMasterConnect) == '50') 851 805 { 852 $result['msg'] = "Erro na funcao ldap_functions->add_user2maillist.\n" .853 "O usuário utilizado para gravação no LDAP, DEVE ter direito de escrita.\n".854 "O usuário " . $_SESSION['phpgw_info']['expresso']['cc_ldap_server']['acc'] . " não tem este direito.\n".855 "Edite \"Configuração Global do Catálogo\", no módulo Administrador, Catálogo de Endereços e adicione um usuário com direitos de escrita.";806 $result['msg'] = $this->functions->lang('Error on the function') . ' ldap_functions->add_user2maillist' . ".\n" . 807 $this->functions->lang('The user used for record on LPDA, must have write access') . ".\n"; 808 $this->functions->lang('The user') . ' ' . $_SESSION['phpgw_info']['expresso']['cc_ldap_server']['acc'] . ' ' . $this->functions->lang('does not have this access') . ".\n"; 809 $this->functions->lang('Edit Global Catalog Config, in the admin module, and add an user with write access') . ".\n"; 856 810 } 857 811 else 858 $result['msg'] = "Erro na funcao ldap_functions->add_user2maillist.\nRetorno do servidor:". ldap_error($ldapMasterConnect);812 $result['msg'] = $this->functions->lang('Error on function') . " ldap_functions->add_user2maillist ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($ldapMasterConnect); 859 813 } 860 814 … … 878 832 { 879 833 $result['status'] = false; 880 $result['msg'] = "Erro na funcao ldap_functions->add_user2maillist_scp ($dn).\n\nRetorno do servidor:". ldap_error($this->ldap);834 $result['msg'] = $this->functions->lang('Error on function') . " ldap_functions->add_user2maillist_scp ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($this->ldap); 881 835 } 882 836 return $result; … … 888 842 { 889 843 $result['status'] = false; 890 $result['msg'] = "Falha de conexão com o openLDAP.\n\nRetorno do servidor:". ldap_error($ldapMasterConnect);844 $result['msg'] = $this->functions->lang('Ldap connection fail') . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($ldapMasterConnect); 891 845 return $result; 892 846 } … … 909 863 if (ldap_errno($ldapMasterConnect) == '50') 910 864 { 911 $result['msg'] = "Erro na funcao ldap_functions->add_user2maillist.\n" . 912 "O usuário utilizado para gravação no LDAP, DEVE ter direito de escrita.\n". 913 "O usuário " . $_SESSION['phpgw_info']['expresso']['cc_ldap_server']['acc'] . " não tem este direito.\n". 914 "Edite \"Configuração Global do Catálogo\", no módulo Administrador, Catálogo de Endereços e adicione um usuário com direitos de escrita."; 865 866 $return['msg'] = $this->functions->lang('You do not have right to create institutional accounts') . "."; 867 868 $result['msg'] = $this->functions->lang('Error on the function') . ' ldap_functions->add_user2maillist' . ".\n" . 869 $this->functions->lang('The user used for record on LPDA, must have write access') . ".\n"; 870 $this->functions->lang('The user') . ' ' . $_SESSION['phpgw_info']['expresso']['cc_ldap_server']['acc'] . ' ' . $this->functions->lang('does not have this access') . ".\n"; 871 $this->functions->lang('Edit Global Catalog Config, in the admin module, and add an user with write access') . ".\n"; 915 872 } 916 873 else 917 $result['msg'] = "Erro na funcao ldap_functions->add_user2maillist.\nRetorno do servidor:". ldap_error($ldapMasterConnect);874 $result['msg'] = $this->functions->lang('Error on function') . " ldap_functions->add_user2maillist ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($ldapMasterConnect); 918 875 } 919 876 ldap_close($ldapMasterConnect); … … 933 890 { 934 891 $result['status'] = false; 935 $result['msg'] = "Erro na funcao ldap_functions->remove_user2maillist_scp ($dn).\n\nRetorno do servidor:". ldap_error($this->ldap);892 $result['msg'] = $this->functions->lang('Error on function') . " ldap_functions->remove_user2maillist_scp ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($this->ldap); 936 893 } 937 894 return $result; … … 955 912 { 956 913 $result['status'] = false; 957 $result['msg'] = "Erro na funcao ldap_functions->replace_user2maillists ($old_mail).\nRetorno do servidor:". ldap_error($this->ldap);914 $result['msg'] = $this->functions->lang('Error on function') . " ldap_functions->replace_user2maillists ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($this->ldap); 958 915 } 959 916 } … … 1025 982 $result['corporative_information_rg'] = $entry[0]['rg'][0]; 1026 983 $result['corporative_information_rguf'] = $entry[0]['rguf'][0]; 984 $result['corporative_information_description'] = utf8_decode($entry[0]['description'][0]); 1027 985 } 1028 986 … … 1379 1337 { 1380 1338 $return['status'] = false; 1381 $return['msg'] = 'Erro em ldap_funcitons->change_user_context: ' . ldap_error($this->ldap);1339 $return['msg'] = $this->functions->lang('Error on function') . " ldap_functions->change_user_context ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($this->ldap); 1382 1340 } 1383 1341 else … … 1393 1351 $return['status'] = false; 1394 1352 $return['error_number'] = ldap_errno($this->ldap); 1395 $return['msg'] = 'Erro em ldap_funcitons->replace_user_attributes: ' . ldap_error($this->ldap);1353 $return['msg'] = $this->functions->lang('Error on function') . " ldap_functions->replace_user_attributes ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($this->ldap); 1396 1354 } 1397 1355 else 1398 1356 $return['status'] = true; 1399 1357 1358 print_r($return); 1400 1359 return $return; 1401 1360 } … … 1407 1366 $return['status'] = false; 1408 1367 $return['error_number'] = ldap_errno($this->ldap); 1409 $return['msg'] = 'Erro em ldap_funcitons->add_user_attributes: ' . ldap_error($this->ldap);1368 $return['msg'] = $this->functions->lang('Error on function') . " ldap_functions->add_user_attributes ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($this->ldap); 1410 1369 } 1411 1370 else … … 1420 1379 { 1421 1380 $return['status'] = false; 1422 $return['msg'] = 'Erro em ldap_funcitons->remove_user_attributes: ' . ldap_error($this->ldap);1381 $return['msg'] = $this->functions->lang('Error on function') . " ldap_functions->remove_user_attributes ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($this->ldap); 1423 1382 } 1424 1383 else … … 1456 1415 { 1457 1416 $return['status'] = false; 1458 $re turn['msg'] .= 'Você não tem acesso para deletar este usuário.';1417 $result['msg'] = $this->functions->lang('You do not have access to delete this user') . "."; 1459 1418 return $return; 1460 1419 } … … 1481 1440 { 1482 1441 $return['status'] = false; 1483 $re turn['msg'] .= "Erro em ldap_functions->delete_user from group ($dn): ". ldap_error($this->ldap);1442 $result['msg'] = $this->functions->lang('Error on function') . " ldap_functions->delete_user from group ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($this->ldap); 1484 1443 } 1485 1444 } … … 1500 1459 { 1501 1460 $result['status'] = false; 1502 $result['msg'] = "Erro na funcao ldap_functions->delete_user, instutional_accounts.\nRetorno do servidor:". ldap_error($this->ldap);1461 $result['msg'] = $this->functions->lang('Error on function') . " ldap_functions->delete_user, institutional accounts ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($this->ldap); 1503 1462 } 1504 1463 } … … 1514 1473 { 1515 1474 $return['status'] = false; 1516 $re turn['msg'] .= 'Erro ao conectar ao ldap_master: ' . ldap_error($this->ldap);1475 $result['msg'] = $this->functions->lang('Connection with ldap_master fail') . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($this->ldap); 1517 1476 return $return; 1518 1477 } … … 1532 1491 if (ldap_errno($ldapMasterConnect) == '50') 1533 1492 { 1534 $result['msg'] = "Erro na funcao ldap_functions->delete_user.\n" .1535 "O usuário utilizado para gravação no LDAP, DEVE ter direito de escrita.\n".1536 "O usuário " . $_SESSION['phpgw_info']['expresso']['cc_ldap_server']['acc'] . " não tem este direito.\n".1537 "Edite \"Configuração Global do Catálogo\", no módulo Administrador, Catálogo de Endereços e adicione um usuário com direitos de escrita.";1493 $result['msg'] = $this->functions->lang('Error on the function') . ' ldap_functions->add_user2maillist' . ".\n" . 1494 $this->functions->lang('The user used for record on LPDA, must have write access') . ".\n"; 1495 $this->functions->lang('The user') . ' ' . $_SESSION['phpgw_info']['expresso']['cc_ldap_server']['acc'] . ' ' . $this->functions->lang('does not have this access') . ".\n"; 1496 $this->functions->lang('Edit Global Catalog Config, in the admin module, and add an user with write access') . ".\n"; 1538 1497 } 1539 1498 else 1540 $result['msg'] = "Erro na funcao ldap_functions->add_user2maillist.\nRetorno do servidor:". ldap_error($ldapMasterConnect);1499 $result['msg'] = $this->functions->lang('Error on function') . " ldap_functions->delete_user, email lists ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($ldapMasterConnect); 1541 1500 } 1542 1501 } … … 1549 1508 { 1550 1509 $return['status'] = false; 1551 $re turn['msg'] .= 'Erro em ldap_funcitons->delete_user, listas de email: ' . ldap_error($this->ldap);1510 $result['msg'] = $this->functions->lang('Error on function') . " ldap_functions->delete_user, email lists ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($ldapMasterConnect); 1552 1511 } 1553 1512 … … 1580 1539 { 1581 1540 $return['status'] = false; 1582 $re turn['msg'] .= 'Erro em ldap_funcitons->delete_maillist, listas de email: ' . ldap_error($this->ldap);1541 $result['msg'] = $this->functions->lang('Error on function') . " ldap_functions->delete_maillist ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($this->ldap); 1583 1542 } 1584 1543 … … 1599 1558 { 1600 1559 $return['status'] = false; 1601 $re turn['msg'] .= 'Erro em ldap_funcitons->delete_maillist, listas de email: ' . ldap_error($this->ldap);1560 $result['msg'] = $this->functions->lang('Error on function') . " ldap_functions->delete_group ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($this->ldap); 1602 1561 } 1603 1562 … … 1660 1619 { 1661 1620 $return['status'] = false; 1662 $re turn['msg'] .= 'Erro em ldap_funcitons->rename_uid: ' . ldap_error($this->ldap);1621 $result['msg'] = $this->functions->lang('Error on function') . " ldap_functions->rename_uid ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($this->ldap); 1663 1622 } 1664 1623 … … 1797 1756 { 1798 1757 $return['status'] = false; 1799 $re turn['msg'] = "Erro ao adicionar Samba Domain";1758 $result['msg'] = $this->functions->lang('Error on function') . " ldap_functions->add_sambadomain ($dn)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($this->ldap); 1800 1759 } 1801 1760 else … … 1819 1778 { 1820 1779 $return['status'] = false; 1821 $re turn['msg'] .= "Erro em ldap_funcitons->delete_sambadomain ($sambadomainname).\nRetorno do servidor: ". ldap_error($this->ldap);1780 $result['msg'] = $this->functions->lang('Error on function') . " ldap_functions->delete_sambadomain ($sambadomainname)" . ".\n" . $this->functions->lang('Server returns') . ': ' . ldap_error($this->ldap); 1822 1781 } 1823 1782 } … … 1835 1794 { 1836 1795 $return['status'] = 'false'; 1837 $re turn['msg'] = 'Nenhum resultado encontrado.';1796 $result['msg'] = $this->functions->lang('Any result was found') . '.'; 1838 1797 return $return; 1839 1798 } … … 2018 1977 { 2019 1978 $result['status'] = false; 2020 $result['msg'] = $this->functions->lang('Error in function') . ' ldap_functions->save_institutional_accounts: ldap_rename';1979 $result['msg'] = $this->functions->lang('Error on function') . ' ldap_functions->save_institutional_accounts: ldap_rename'; 2021 1980 $result['msg'] .= "\n" . $this->functions->lang('Server return') . ': ' . ldap_error($this->ldap); 2022 1981 } … … 2054 2013 { 2055 2014 $result['status'] = false; 2056 $result['msg'] = $this->functions->lang('Error in function') . ' ldap_functions->save_institutional_accounts: ldap_modify';2015 $result['msg'] = $this->functions->lang('Error on function') . ' ldap_functions->save_institutional_accounts: ldap_modify'; 2057 2016 $result['msg'] .= "\n" . $this->functions->lang('Server return') . ': ' . ldap_error($this->ldap); 2058 2017 } … … 2119 2078 { 2120 2079 $return['status'] = 'false'; 2121 $re turn['msg'] = 'Problemas carregando dados.';2080 $result['msg'] = $this->functions->lang('Problems loading datas') . '.'; 2122 2081 } 2123 2082 else … … 2202 2161 { 2203 2162 $return['status'] = false; 2204 $return['msg'] = $this->functions->lang('Error in function') . " ldap_functions->delete_institutional_accounts: ldap_delete";2163 $return['msg'] = $this->functions->lang('Error on function') . " ldap_functions->delete_institutional_accounts: ldap_delete"; 2205 2164 $return['msg'] .= "\n" . $this->functions->lang('Server return') . ': ' . ldap_error($this->ldap); 2206 2165 return $return; … … 2227 2186 { 2228 2187 $result['status'] = false; 2229 $return['msg'] = $this->functions->lang('Error in function') . " ldap_functions->replace_mail_from_institutional_account.";2188 $return['msg'] = $this->functions->lang('Error on function') . " ldap_functions->replace_mail_from_institutional_account."; 2230 2189 } 2231 2190 } -
trunk/expressoAdmin1_2/inc/class.maillist.inc.php
r355 r414 113 113 if ($return['status'] == true) 114 114 { 115 $this->db_functions->write_log(' Criado lista de email','',$dn,'','');115 $this->db_functions->write_log('created email list',$dn); 116 116 117 117 foreach($params['mailForwardingAddress'] as $index=>$mail) 118 118 { 119 $this->db_functions->write_log(" Adicionado email $mail a lista ".$params['cn']." no momento da criação",$dn,'','','');119 $this->db_functions->write_log("added user on email list creation", $params['cn'].':' . $mail); 120 120 } 121 121 } … … 130 130 { 131 131 $return['status'] = false; 132 $return['msg'] = 'Você não tem acesso para editar listas de email.';132 $return['msg'] = lang('You do not have access to edit email lists') . '.'; 133 133 return $return; 134 134 } … … 158 158 $dn = $newrdn . ',' . $newparent; 159 159 $old_dn = $old_values['uid']; 160 $this->db_functions->write_log(" Renomeado login da lista de $old_dn para $dn",'',$dn,$old_values['uid'],'');160 $this->db_functions->write_log("renamed list login",$old_dn . ' -> ' . $dn); 161 161 } 162 162 } … … 168 168 { 169 169 $ldap_mod_replace['mail'] = $new_values['mail']; 170 $this->db_functions->write_log(' Modificado email da lista para ' . $new_values['mail'],'',$dn,'','');170 $this->db_functions->write_log('modified list email', $dn . ': ' . $old_values['mail'] . '->' . $new_values['mail']); 171 171 } 172 172 if ($new_values['cn'] != $old_values['cn']) 173 173 { 174 174 $ldap_mod_replace['cn'] = $new_values['cn']; 175 $this->db_functions->write_log( "Modificado common name da lista $dn",'',$dn,'','');175 $this->db_functions->write_log('modified list name', $old_values['cn'] . '->' . $new_values['cn']); 176 176 } 177 177 if ($diff['uid']) … … 255 255 foreach($add_users as $index=>$mail) 256 256 { 257 $this->db_functions->write_log(" Adicionado usuario $mail a lista de email $dn",$dn,'','','');257 $this->db_functions->write_log("added user to list", "$dn: $mail"); 258 258 } 259 259 } … … 275 275 foreach($remove_users as $index=>$mail) 276 276 { 277 $this->db_functions->write_log(" Removido usuario $mail da lista de email $dn",$dn,'','','');277 $this->db_functions->write_log("removed user from list", "$dn: $mail"); 278 278 } 279 279 } … … 289 289 { 290 290 $return['status'] = false; 291 $return['msg'] = 'Você não tem acesso para editar SCL de listas de email.';291 $return['msg'] = lang('You do not have access to edit email lists SCL') . '.'; 292 292 return $return; 293 293 } … … 314 314 { 315 315 $ldap_add['participantCanSendMail'] = "TRUE"; 316 $this->db_functions->write_log(" Ativado participantCanSendMail da SCL da lista de email " . $new_values['mail'],'','','','');316 $this->db_functions->write_log("turned on participantCanSendMail",$new_values['mail']); 317 317 } 318 318 if (($new_values['accountRestrictive'] == 'on') && ($old_values['accountRestrictive'] == '')) … … 320 320 $ldap_add['accountRestrictive'] = "mailListRestriction"; 321 321 $ldap_add['accountDeliveryMessage'] = 'OK'; 322 $this->db_functions->write_log(" Ativado mailListRestriction da SCL da lista de email " . $new_values['mail'],'','','','');322 $this->db_functions->write_log("turned on mailListRestriction", $new_values['mail']); 323 323 } 324 324 if (count($ldap_add)) … … 337 337 { 338 338 $ldap_remove['participantCanSendMail'] = array(); 339 $this->db_functions->write_log(" Desativado participantCanSendMail da SCL da lista de email " . $new_values['mail'],'','','','');339 $this->db_functions->write_log("turned off participantCanSendMail",$new_values['mail']); 340 340 } 341 341 if (($new_values['accountRestrictive'] != 'on') && ($old_values['accountRestrictive'] == 'mailListRestriction')) … … 343 343 $ldap_remove['accountRestrictive'] = array(); 344 344 $ldap_remove['accountDeliveryMessage'] = array(); 345 $this->db_functions->write_log(" Desativado restrição (mailListRestriction) da SCL da lista de email " . $new_values['mail'],'','','','');345 $this->db_functions->write_log("turned off mailListRestriction",$new_values['mail']); 346 346 } 347 347 if (count($ldap_remove)) … … 381 381 foreach($add_users as $index=>$mail) 382 382 { 383 $this->db_functions->write_log(" Adicionado usuario $mail da SCP da lista de email $dn",$dn,'','','');383 $this->db_functions->write_log("added user to SCL","$dn: $mail",'','',''); 384 384 } 385 385 } … … 401 401 foreach($add_users as $index=>$mail) 402 402 { 403 $this->db_functions->write_log(" Removido usuario $mail da SCP da lista de email $dn",$dn,'','','');403 $this->db_functions->write_log("removed user from SCL","$dn: $mail",'','',''); 404 404 } 405 405 } … … 427 427 { 428 428 $return['status'] = false; 429 $return['msg'] = 'Você não tem acesso para excluir listas de email.';429 $return['msg'] = lang('You do not have access to delete email lists') . '.'; 430 430 return $return; 431 431 } … … 447 447 if ($return['status'] == true) 448 448 { 449 $this->db_functions->write_log(' Deletado lista de email','',$uid,'','');449 $this->db_functions->write_log('deleted email list',$uid); 450 450 } 451 451 452 452 return $return; 453 453 } 454 455 454 } 456 455 ?> -
trunk/expressoAdmin1_2/inc/class.socomputers.inc.php
r396 r414 42 42 else 43 43 { 44 echo "Erro na escrita no LDAP, funcao so->write_ldap:" . ldap_error($this->ldap_connection);45 44 ldap_close($this->ldap_connection); 46 45 return false; … … 102 101 $result = ldap_delete($this->ldap_connection, $dn); 103 102 ldap_close($this->ldap_connection); 103 $this->functions->write_log('deleted computer',$dn); 104 104 return $result; 105 105 } … … 109 109 $result = ldap_rename($this->ldap_connection, $old_dn, $new_rdn, $new_context, true); 110 110 ldap_close($this->ldap_connection); 111 $this->functions->write_log('rename computer',$old_dn . '->' . $new_rdn); 111 112 return $result; 112 113 } … … 116 117 $result = ldap_mod_add($this->ldap_connection, $dn, $ldap_add_attribute); 117 118 ldap_close($this->ldap_connection); 118 $this->functions->write_log( $GLOBALS['phpgw']->accounts->data['account_lid'], 'add attributes in ldap in email list', $dn,'','','');119 $this->functions->write_log('added ldap attributes from computer',$dn); 119 120 return $result; 120 121 } … … 124 125 $result = ldap_mod_del($this->ldap_connection, $dn, $ldap_remove_attribute); 125 126 ldap_close($this->ldap_connection); 126 //Escreve no log 127 $this->functions->write_log($GLOBALS['phpgw']->accounts->data['account_lid'], 'remove attributes in ldap in email list', $dn,'','',''); 127 $this->functions->write_log('removed ldap attributes from computer',$dn); 128 128 return $result; 129 129 } … … 133 133 $result = ldap_mod_replace($this->ldap_connection, $dn, $ldap_replace_attribute); 134 134 ldap_close($this->ldap_connection); 135 $this->functions->write_log('replace ldap attributes from computer',$dn); 135 136 return $result; 136 137 } -
trunk/expressoAdmin1_2/inc/class.sosectors.inc.php
r396 r414 48 48 if (ldap_add($this->ldap_connection, $dn, $info)) 49 49 { 50 //Escreve no log 51 $this->functions->write_log2($GLOBALS['phpgw']->accounts->data['account_lid'], 'write in ldap', $dn,'','',''); 50 $this->db_functions->write_log("write on ldap", "$dn"); 52 51 ldap_close($this->ldap_connection); 53 52 return true; … … 55 54 else 56 55 { 57 echo 'Erro na escrita no LDAP, funcao write_ldap';56 echo lang('Error written in LDAP, function write_ldap'); 58 57 ldap_close($this->ldap_connection); 59 58 return false; -
trunk/expressoAdmin1_2/inc/class.totalsessions.inc.php
r309 r414 1 1 <?php 2 /************************************************************************** \3 * Expresso Administração 2 /*************************************************************************************\ 3 * Expresso Administração * 4 4 * by Joao Alfredo Knopik Junior (joao.alfredo@gmail.com, jakjr@celepar.pr.gov.br) * 5 * ----------------------------------------------------------------------------------- ------------------*6 * This program is free software; you can redistribute it and/or modify it 7 * under the terms of the GNU General Public License as published by the 8 * Free Software Foundation; either version 2 of the License, or (at your 9 * option) any later version. 10 \************************************************************************** /5 * -----------------------------------------------------------------------------------* 6 * This program is free software; you can redistribute it and/or modify it * 7 * under the terms of the GNU General Public License as published by the * 8 * Free Software Foundation; either version 2 of the License, or (at your * 9 * option) any later version. * 10 \*************************************************************************************/ 11 11 12 12 class totalsessions … … 42 42 $this->template->set_file('template','totalsessions.tpl'); 43 43 $this->template->set_block('template','list','list'); 44 45 $this->template->set_var($this->functions->make_dinamic_lang($this->template, 'list')); 44 46 45 47 $total = $this->get_total_sessions(); 46 48 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
r401 r414 91 91 'bg_color' => $GLOBALS['phpgw_info']['theme']['bg_color'], 92 92 'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], 93 94 93 'accounts_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uiaccounts.list_users'), 95 94 'back_url' => $GLOBALS['phpgw']->link('/expressoAdmin1_2/index.php'), 96 95 'add_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uiaccounts.add_users'), 97 98 96 'create_user_disabled' => $this->functions->check_acl($account_lid,'add_users') ? '' : 'disabled', 99 97 'context' => $raw_context, 100 98 'context_display' => $context_display, 101 'imapDelimiter' => $_SESSION['phpgw_info']['expresso']['email_server']['imapDelimiter'], 102 103 'lang_create_user' => lang('Create User'), 104 'lang_loginid' => lang('LoginID'), 105 'lang_cn' => lang('Name'), 106 'lang_mail' => lang('E-mail'), 107 'lang_edit' => lang('edit'), 108 'lang_rename' => lang('rename'), 109 'lang_delete' => lang('delete'), 110 'lang_search' => lang('Search'), 111 'lang_back' => lang('back'), 112 'lang_contexts' => lang('Contexts') 113 99 'imapDelimiter' => $_SESSION['phpgw_info']['expresso']['email_server']['imapDelimiter'] 114 100 ); 115 101 $p->set_var($var); 116 117 // Save query 102 $p->set_var($this->functions->make_dinamic_lang($p, 'body')); 103 118 104 $p->set_var('query', $GLOBALS['query']); 119 105 … … 251 237 // First ABA 252 238 'display_spam_uid' => 'display:none', 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'), 260 'lang_organizations' => lang('Organizations'), 261 'lang_sector' => lang('Sector'), 262 'lang_account_lid' => lang('Login ID'), 263 'lang_firstname' => lang('First Name'), 264 'lang_lastname' => lang('Last Name'), 265 'lang_password' => lang('Password'), 266 'lang_re-password' => lang('Re-Password'), 267 'lang_passwd_expired' => lang('Password expired'), 268 'lang_changepassword' => lang('Change password'), 269 'lang_phone' => lang('Phone'), 270 'lang_photo' => lang('Photo'), 271 'lang_account_active' => lang('Account Active'), 272 'lang_account_invisible' => lang('Account Invisible'), 273 'lang_never' => lang('never'), 274 'lang_back' => lang('Back'), 275 'lang_save' => lang('Save'), 239 276 240 'sectors' => $combo_manager_org, 277 241 'combo_organizations' => $combo_manager_org, … … 290 254 // Corporative Information 291 255 'display_corporative_information' => $this->functions->check_acl($manager_lid,'manipulate_corporative_information') ? '' : 'none', 292 'lang_employeenumber' => lang('Employee number'),293 'lang_cpf' => lang('cpf'),294 'lang_rg' => lang('rg'),295 'lang_rguf' => lang('rguf'),296 256 297 257 //MAIL 298 'lang_activeemailaccount' => lang('Active email account'),299 'lang_email' => lang('E-mail'),300 'lang_aliasemail' => lang('Alias email'),301 'lang_forwardingemail' => lang('Forwarding email'),302 'lang_email_quota' => lang('Email quota in MB'),303 'lang_onlyforwarding' => lang('Only forwarding'),304 'lang_quote_message' => lang('leave empty for no quota'),305 'lang_email_quota_used' => lang('Quota used in MB'),306 258 'accountstatus_checked' => 'CHECKED', 307 259 'mailquota' => $this->current_config['expressoAdmin_defaultUserQuota'], … … 310 262 'input_mailalternateaddress_fields' => '<input type="text" name="mailalternateaddress[]" id="mailalternateaddress" autocomplete="off" value="{mailalternateaddress}" {disabled} size=30>', 311 263 'input_mailforwardingaddress_fields'=> '<input type="text" name="mailforwardingaddress[]" id="mailforwardingaddress" autocomplete="off" value="{mailforwardingaddress}" {disabled} size=30>', 312 313 //Third ABA 314 'lang_groups' => lang('Groups'), 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'), 319 'lang_add' => lang('Add'), 320 'lang_rem' => lang('Remove'), 321 322 //Fourd ABA 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', 325 326 //Five ABA 264 327 265 'apps' => $applications_list, 328 266 329 267 //SAMBA ABA 330 'lang_samba_config' => lang('Samba Config'),331 'lang_use_attrs_samba' => lang('Use samba attributes'),332 'lang_sambadomain' => lang('Domain'),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'),338 268 'use_attrs_samba_checked' => 'CHECKED', 339 269 'sambadomainname_options' => $sambadomainname_options, … … 342 272 ); 343 273 $t->set_var($var); 274 $t->set_var($this->functions->make_dinamic_lang($t, 'main')); 344 275 $t->pfp('out','main'); 345 276 } … … 470 401 $t->set_block('body','main'); 471 402 472 // ORGANIZATIONS473 /*474 foreach ($contexts as $index=>$context)475 $orgs .= $this->functions->get_organizations($context, $user_info['context']);476 */477 478 403 foreach ($contexts as $index=>$context) 479 404 $combo_manager_org .= $this->functions->get_organizations($context, $user_info['context']); 480 405 $combo_all_orgs = $this->functions->get_organizations($GLOBALS['phpgw_info']['server']['ldap_context'], $user_info['context'], true, true, true); 481 406 482 483 407 // GROUPS. 484 408 if (count($user_info['groups_info']) > 0) … … 491 415 foreach ($array_groups as $gidnumber=>$cn) 492 416 { 493 // Grupo existe no Banco mas não no Ldap, excluimos grupo do Banco.494 /*495 if (!$this->ldap_functions->group_exist($gidnumber))496 {497 $this->db_functions->delete_group($gidnumber);498 $this->db_functions->write_log("expressoAdmin deletou o grupo $gidnumber do banco, pois não existia no ldap.",'','','','');499 continue;500 }501 */502 503 417 // O memberUid do usuário está somente no Banco, então adicionamos o memberUid no Ldap. 504 418 if (is_null($user_info['groups_ldap'][$gidnumber])) … … 649 563 'alert_warning' => "$alert_warning", 650 564 'display_input_account_lid' => 'display:none', 651 'lang_general_information' => lang('General Information'),652 'lang_corporative_information' => lang('Corporative Information'),653 'lang_email_config' => lang('Email Config'),654 'lang_groups_permission' => lang('Groups Permission'),655 'lang_lists_permission' => lang('Email Lists'),656 'lang_aplication_permission' => lang('Aplication Permission'),657 'lang_organizations' => lang('Organizations'),658 'lang_search_organization' => lang('Search Organiztion'),659 'lang_sector' => lang('Sector'),660 'lang_account_lid' => lang('Login ID'),661 'lang_firstname' => lang('First Name'),662 'lang_lastname' => lang('Last Name'),663 'lang_passwd_expired' => lang('Password expired'),664 'lang_password' => lang('Password'),665 'lang_phone' => lang('Phone'),666 'lang_photo' => lang('Photo'),667 'lang_re-password' => lang('Re-Password'),668 'lang_changepassword' => lang('Change password'),669 'lang_account_active' => lang('Account Active'),670 'lang_account_invisible' => lang('Account Invisible'),671 'lang_back' => lang('Back'),672 'lang_save' => lang('Save'),673 674 565 'sectors' => $combo_manager_org, 675 566 'combo_organizations' => $combo_manager_org, 676 567 'combo_all_orgs' => $combo_all_orgs, 677 678 568 'uid' => $user_info['uid'], 679 569 'givenname' => $user_info['givenname'], … … 683 573 'photo_bin' => $photo_bin, 684 574 'disabled_edit_photo' => $disabled_edit_photo, 685 //'display_picture' => $this->functions->check_acl($manager_account_lid,'edit_users_picture') ? '' : 'none',686 575 'display_picture' => $display_picture, 687 688 576 'display_tr_default_password' => $this->functions->check_acl($manager_account_lid,'set_user_default_password') ? '' : 'none', 689 690 577 'passwd_expired_checked' => $user_info['passwd_expired'] == '0' ? 'CHECKED' : '', 691 578 'changepassword_checked' => $user_info['changepassword'] == '1' ? 'CHECKED' : '', … … 694 581 695 582 // Corporative Information 696 'lang_employeenumber' => lang('Employee number'),697 'lang_cpf' => lang('cpf'),698 'lang_rg' => lang('rg'),699 'lang_rguf' => lang('rguf'),700 583 'corporative_information_employeenumber' => $user_info['corporative_information_employeenumber'], 701 584 'corporative_information_cpf' => $user_info['corporative_information_cpf'], 702 585 'corporative_information_rg' => $user_info['corporative_information_rg'], 703 586 'corporative_information_rguf' => $user_info['corporative_information_rguf'], 587 'corporative_information_description' => $user_info['corporative_information_description'], 704 588 705 589 //MAIL 706 590 'disabled_quota_used' => 'disabled', 707 'lang_activeemailaccount' => lang('Active email account'),708 'lang_email' => lang('E-mail'),709 'lang_aliasemail' => lang('Alias email'),710 'lang_forwardingemail' => lang('Forwarding email'),711 'lang_email_quota' => lang('Email quota in MB'),712 'lang_onlyforwarding' => lang('Only forwarding'),713 'lang_email_quota_used' => lang('Quota used in MB'),714 715 591 'accountstatus_checked' => $user_info['accountstatus'] == 'active' ? 'CHECKED' : '', 716 592 'mail' => $user_info['mail'], 717 718 //'mailalternateaddress' => $user_info['mailalternateaddress'],719 //'mailforwardingaddress' => $user_info['mailforwardingaddress'],720 593 'input_mailalternateaddress_fields' => $input_mailalternateaddress_fields, 721 594 'input_mailforwardingaddress_fields'=> $input_mailforwardingaddress_fields, 722 723 595 'deliverymode_checked' => $user_info['deliverymode'] == 'forwardOnly' ? 'CHECKED' : '', 724 725 596 'mailquota' => $user_info['mailquota'], 726 597 'mailquota_used' => $user_info['mailquota_used'], 727 598 728 599 //Third ABA 729 'lang_groups' => lang('Groups'),730 'lang_user_groups' => 'Grupos do Usuário',731 'lang_available_groups' => 'Grupos disponíveis',732 'lang_primary_group' => lang('Primary Group'),733 'lang_add' => lang('Add'),734 'lang_rem' => lang('Remove'),735 600 'ea_select_user_groups_options' => $ea_select_user_groups_options, 736 601 'ea_combo_primary_user_group_options' => $ea_combo_primary_user_group_options, 737 602 738 603 //Fourd ABA 739 'lang_user_mail_lists' => 'O usuário participa destas Listas de E-mail',740 'lang_available_mail_lists' => 'Listas de E-mail disponíveis',741 604 'ea_select_user_maillists_options' => $ea_select_user_maillists_options, 742 605 … … 745 608 746 609 //SAMBA ABA 747 'lang_samba_config' => lang('Samba Config'),748 'lang_use_attrs_samba' => lang('Use samba attributes'),749 'lang_sambadomain' => lang('Domain'),750 'lang_sambaAcctFlags' => lang('AcctFlags'),751 'lang_sambaLogonScript' => lang('Logon Script'),752 'lang_sambaHomeDirectory' => lang('Home Directory'),753 'lang_active_user' => lang('Samba User Active'),754 'lang_desactive_user' => lang('Samba User Desactive'),755 756 610 'userSamba' => $user_info['sambaUser'], 757 611 'sambadomainname_options' => $sambadomainname_options, … … 765 619 ); 766 620 $t->set_var($var); 621 $t->set_var($this->functions->make_dinamic_lang($t, 'main')); 767 622 768 623 // Devo mostrar aba SAMBA ?? … … 911 766 $var = Array( 912 767 'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], 913 'lang_back' => 'Back',914 768 'back_url' => "./index.php?menuaction=expressoAdmin1_2.uiaccounts.edit_user&account_id=$account_id", 915 'lang_loginid' => lang('Login ID'),916 'lang_ip' => lang('IP'),917 'lang_login' => lang('Log IN'),918 'lang_logout' => lang('Log OUT')919 769 ); 920 770 $t->set_var($var); 771 $t->set_var($this->functions->make_dinamic_lang($t, 'body')); 921 772 $t->pfp('out','body'); 922 773 } -
trunk/expressoAdmin1_2/inc/class.uicomputers.inc.php
r309 r414 91 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 'lang_back' => lang('Back'),94 93 'context_display' => $context_display, 95 'lang_computers_uid' => lang('Computer UID'),96 'lang_add_computers' => lang('Create Computers'),97 'lang_description' => lang('Description'),98 'lang_edit' => lang('Edit'),99 'lang_delete' => lang('Delete'),100 'lang_context' => lang('context'),101 'lang_search' => lang('search')102 94 ); 103 95 $p->set_var($var); 96 $p->set_var($this->functions->make_dinamic_lang($p, 'body')); 104 97 105 98 // Save query … … 183 176 $p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); 184 177 $p->set_file(Array('create_email_list' => 'computers_form.tpl')); 178 $p->set_block('create_email_list','body','body'); 185 179 186 180 // Inclue na combo, os usuarios previamente selecionados no caso de um erro na validacao dos dados. … … 224 218 'row_off' => "#EEEEEE", 225 219 'color_bg1' => "#E8F0F0", 226 'lang_back' => lang('Back'), 227 'lang_save' => lang('save'), 228 'lang_search_organization' => lang('Search Organiztion'), 229 'lang_organizations' => lang('Organizations'), 230 'lang_sectors' => lang('Sectors'), 231 'lang_sambadomain' => lang('Domain'), 232 233 'lang_computer_cn' => lang('Computer UID'), 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'), 240 'lang_server' => lang('Server'), 241 'lang_computer_password' => lang('Computer password'), 242 220 243 221 'display_tr_computer_password' => $_POST['sambaAcctFlags'] == '[I ]' ? '' : 'display:none', 244 222 … … 254 232 ); 255 233 $p->set_var($var); 234 $p->set_var($this->functions->make_dinamic_lang($p, 'body')); 256 235 257 236 if ($_POST['sambaAcctFlags'] != '') … … 329 308 $p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); 330 309 $p->set_file(Array('edit_computers' => 'computers_form.tpl')); 310 $p->set_block('edit_computers','body','body'); 331 311 332 312 //O POST esta vazio, oq indica que precisamos recuperar os dados do computador no ldap. … … 370 350 'row_off' => "#EEEEEE", 371 351 'color_bg1' => "#E8F0F0", 372 'lang_back' => lang('Back'),373 'lang_save' => lang('save'),374 'lang_search_organization' => lang('Search Organiztion'),375 'lang_organizations' => lang('Organizations'),376 'lang_sectors' => lang('Sectors'),377 'lang_sambadomain' => lang('Domain'),378 'lang_computer_cn' => lang('Computer UID'),379 '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'),384 'lang_server' => lang('Server'),385 'lang_computer_password' => lang('Computer password'),386 352 387 353 'display_tr_computer_password' => $computer_data['sambaAcctFlags'] == '[I ]' ? '' : 'display:none', … … 398 364 ); 399 365 $p->set_var($var); 366 $p->set_var($this->functions->make_dinamic_lang($p, 'body')); 400 367 401 368 if ($computer_data['sambaAcctFlags'] != '') … … 450 417 'row_off' => "#EEEEEE", 451 418 'color_bg1' => "#E8F0F0", 452 'lang_back' => lang('Back'), 453 'lang_save' => lang('save'), 454 'lang_sectors' => lang('Sectors'), 455 'lang_sambadomain' => lang('Domain'), 456 'lang_computer_cn' => lang('Computer UID'), 457 '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'), 462 'lang_server' => lang('Server'), 463 'lang_computer_password' => lang('Computer password'), 464 419 465 420 // Retorna os valores, quando da um erro na validação. 466 421 'uidnumber' => $_POST['uidnumber'], … … 483 438 'old_sambasid' => $_POST['sambasid'] 484 439 ); 485 $p->set_var($var); 440 $p->set_var($var); 441 $p->set_var($this->functions->make_dinamic_lang($p, 'body')); 486 442 487 443 if ($_POST['sambaAcctFlags'] != '') … … 522 478 function delete_computer() 523 479 { 524 //_debug_array($_GET);525 526 480 $account_lid = $GLOBALS['phpgw']->accounts->data['account_lid']; 527 481 $acl = $this->functions->read_acl($account_lid); … … 542 496 $p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); 543 497 $p->set_file(Array('delete_computer' => 'computers_delete.tpl')); 498 $p->set_block('delete_computer','body','body'); 544 499 545 500 // Get group data … … 550 505 $var = Array( 551 506 'color_bg1' => "#E8F0F0", 552 'lang_back' => lang('Back'),553 'lang_delete' => lang('Delete'),554 'lang_delete_computer' => lang('Do you realy want delete this Computer?'),555 507 'dn' => $email_list_data['dn'], 556 508 'computer_cn' => $computer_data['computer_cn'], … … 561 513 ); 562 514 $p->set_var($var); 515 $p->set_var($this->functions->make_dinamic_lang($p, 'body')); 563 516 $p->pfp('out','delete_computer'); 564 517 } -
trunk/expressoAdmin1_2/inc/class.uidomains.inc.php
r317 r414 63 63 $var = Array( 64 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') 65 'back_url' => $GLOBALS['phpgw']->link('/expressoAdmin1_2/index.php') 71 66 ); 72 67 $p->set_var($var); 68 $p->set_var($this->functions->make_dinamic_lang($p, 'list')); 73 69 74 70 if (!count($sambadomains_info)) … … 128 124 $p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); 129 125 $p->set_file(Array('create_sambadomains' => 'domains_form.tpl')); 126 $p->set_block('create_sambadomains','list','list'); 130 127 131 128 // Seta variaveis utilizadas pelo tpl. … … 136 133 'row_off' => "#EEEEEE", 137 134 'color_bg1' => "#E8F0F0", 138 139 'lang_organizations' => lang('Organizations'),140 'lang_name' => lang('Samba domain name'),141 'lang_sid' => lang('Samba domain SID'),142 'lang_add' => lang('Add'),143 'lang_save' => lang('Save'),144 'lang_back' => lang('Back'),145 146 135 'organizations' => $organizations, 147 136 'sambadomainname' => $_POST['sambadomainname'], … … 151 140 ); 152 141 $p->set_var($var); 153 142 $p->set_var($this->functions->make_dinamic_lang($p, 'list')); 143 154 144 $p->pfp('out','create_sambadomains'); 155 145 } -
trunk/expressoAdmin1_2/inc/class.uigroups.inc.php
r309 r414 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 'context_display' => $context_display, 93 'lang_groups_names' => lang('Groups Names'), 94 'lang_description' => lang('Description'), 95 'lang_add_groups' => lang('Add Groups'), 96 'lang_edit' => lang('Edit'), 97 'lang_delete' => lang('Delete'), 98 'lang_back' => lang('back'), 99 'lang_context' => lang('context'), 100 'lang_search' => lang('search') 91 'context_display' => $context_display 101 92 ); 102 93 $p->set_var($var); 94 $p->set_var($this->functions->make_dinamic_lang($p, 'list')); 103 95 104 96 // Save query … … 196 188 $p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); 197 189 $p->set_file(Array('create_group' => 'groups_form.tpl')); 190 $p->set_block('create_group','list','list'); 198 191 199 192 // Pega combo das organizações e seleciona um dos setores em caso de um erro na validaçao dos dados. … … 232 225 'ldap_context' => $GLOBALS['phpgw_info']['server']['ldap_context'], 233 226 '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 227 'concatenateDomain' => $this->current_config['expressoAdmin_concatenateDomain'], 243 228 '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 229 'apps' => $apps, 250 //'use_attrs_samba_checked' => $this->current_config['expressoAdmin_samba_support'] == 'true' ? 'CHECKED' : '',251 230 'use_attrs_samba_checked' => '', 252 231 'disabled_samba' => 'disabled', … … 259 238 ); 260 239 $p->set_var($var); 261 240 $p->set_var($this->functions->make_dinamic_lang($p, 'list')); 241 262 242 $p->pfp('out','create_group'); 263 243 } … … 288 268 $p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); 289 269 $p->set_file(Array('create_group' => 'groups_form.tpl')); 270 $p->set_block('create_group','list','list'); 290 271 291 272 // Obtem combo das organizações e seleciona a org do grupo. … … 357 338 'type' => 'edit_group', 358 339 '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'),372 340 'gidnumber' => $group_info['gidnumber'], 373 //'manager_context' => $manager_context,374 341 'cn' => $group_info['cn'], 375 342 'user_count' => $user_count, … … 388 355 ); 389 356 $p->set_var($var); 390 357 $p->set_var($this->functions->make_dinamic_lang($p, 'list')); 391 358 $p->pfp('out','create_group'); 392 359 } … … 404 371 { 405 372 $appCSS = ''; 406 /* 'th.activetab407 {408 color:#000000;409 background-color:#D3DCE3;410 border-top-width : 1px;411 border-top-style : solid;412 border-top-color : Black;413 border-left-width : 1px;414 border-left-style : solid;415 border-left-color : Black;416 border-right-width : 1px;417 border-right-style : solid;418 border-right-color : Black;419 }420 421 th.inactivetab422 {423 color:#000000;424 background-color:#E8F0F0;425 border-bottom-width : 1px;426 border-bottom-style : solid;427 border-bottom-color : Black;428 }429 430 .td_left { border-left : 1px solid Gray; border-top : 1px solid Gray; }431 .td_right { border-right : 1px solid Gray; border-top : 1px solid Gray; }432 433 div.activetab{ display:inline; }434 div.inactivetab{ display:none; }';*/435 436 373 return $appCSS; 437 374 } -
trunk/expressoAdmin1_2/inc/class.uilogs.inc.php
r355 r414 53 53 if (($_POST['query_manager_lid'] != '') || ($_POST['query_action'] != '') || ($_POST['query_date'] != '') || ($_POST['query_hour'] != '') || ($_POST['query_other'] != '')) 54 54 { 55 $query = "SELECT manager,date, groupinfo,userinfo,appinfo,msg,action FROM phpgw_expressoadmin_log WHERE";55 $query = "SELECT manager,date,userinfo,action FROM phpgw_expressoadmin_log WHERE"; 56 56 57 57 if ($_POST['query_manager_lid'] != '') … … 86 86 $query .= " userinfo LIKE '%" . $_POST['query_other'] . "%'"; 87 87 $query .= "OR action LIKE '%" . $_POST['query_other'] . "%'"; 88 $query .= "OR groupinfo LIKE '%" . $_POST['query_other'] . "%'";89 $query .= "OR appinfo LIKE '%" . $_POST['query_other'] . "%'";90 $query .= "OR msg LIKE '%" . $_POST['query_other'] . "%'";91 88 $query .= "OR manager LIKE '%" . $_POST['query_other'] . "%'"; 92 89 } … … 112 109 'query_hour' => $_POST['query_hour'], 113 110 'query_other' => $_POST['query_other'], 114 115 'lang_manager_lid' => lang('Manager Login'),116 'lang_date' => lang('Date'),117 'lang_hour' => lang('Hour'),118 'lang_action' => lang('Action'),119 'lang_view' => lang('view'),120 'lang_back' => lang('back'),121 'lang_search' => lang('search'),122 'lang_action' => lang('Action'),123 'lang_other' => lang('Other')124 111 ); 125 112 $p->set_var($var); 126 127 113 $p->set_var($this->functions->make_dinamic_lang($p, 'list')); 114 128 115 if ((!count($logs)) && (($_POST['query_manager_lid'] != '') || ($_POST['query_date'] != '') || ($_POST['query_hour'] != ''))) 129 116 { … … 145 132 146 133 $var = array( 134 'row_date' => $a_day . ' ' . $a_hour[0], 147 135 'row_manager_lid' => $log['manager'], 148 'row_action' => $log['action'], 149 'row_date' => $a_day . ' ' . $a_hour[0], 150 //'row_view' => (!$account['account_lastname']?' ':$account['account_lastname']) 136 'row_action' => lang($log['action']), 137 'row_about' => $log['userinfo'] 151 138 ); 152 139 $p->set_var($var); … … 158 145 $p->pfp('out','list'); 159 146 } 160 161 function view_log()162 {163 $account_lid = $GLOBALS['phpgw']->accounts->data['account_lid'];164 $tmp = $this->functions->read_acl($account_lid);165 $manager_context = $tmp[0]['context'];166 167 // Verifica se o administrador tem acesso.168 if (!$this->functions->check_acl($account_lid,'view_logs'))169 {170 $GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/expressoAdmin1_2/inc/access_denied.php'));171 }172 173 unset($GLOBALS['phpgw_info']['flags']['noheader']);174 unset($GLOBALS['phpgw_info']['flags']['nonavbar']);175 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['expressoAdmin1_2']['title'].' - '.lang('View Log');176 $GLOBALS['phpgw']->common->phpgw_header();177 178 $p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);179 $p->set_file(Array('log' => 'log_form.tpl'));180 181 $query = "SELECT manager,date,groupinfo,userinfo,appinfo,msg,action FROM phpgw_expressoadmin_log";182 $query .= " WHERE date = '".$_GET['date']."'";183 147 184 $GLOBALS['phpgw']->db->query($query);185 while($GLOBALS['phpgw']->db->next_record())186 {187 $log[] = $GLOBALS['phpgw']->db->row();188 }189 190 $tmp = explode(" ", $log[0]['date']);191 $tmp_date = explode("-", $tmp[0]);192 $date = $tmp_date[2] . '/' . $tmp_date[1] . '/' . $tmp_date[0];193 194 $tmp_hour = explode(".", $tmp[1]);195 $hour = $tmp_hour[0];196 197 $var = Array(198 199 'manager_lid' => $log[0]['manager'],200 'date' => $date,201 'hour' => $hour,202 'action' => $log[0]['action'],203 'userinfo' => $log[0]['userinfo'],204 'groupinfo' => $log[0]['groupinfo'],205 'appinfo' => $log[0]['appinfo'],206 'back_url' => './index.php?menuaction=expressoAdmin1_2.uilogs.list_logs',207 208 'color_bg1' => "#E8F0F0",209 'color_bg2' => "#D3DCE3",210 'color_font1' => "#DDDDDD",211 'color_font2' => "#EEEEEE",212 213 'lang_back' => lang('Back'),214 'lang_manager_lid' => lang('Manager Login'),215 'lang_date' => lang('Date'),216 'lang_hour' => lang('Hour'),217 'lang_action' => lang('Action'),218 'lang_userinfo' => lang('User Info'),219 'lang_groupinfo' => lang('Group Info'),220 'lang_appinfo' => lang('App Info')221 );222 223 $p->set_var($var);224 $p->pfp('out','log');225 }226 227 148 function row_action($action,$type,$date) 228 149 { -
trunk/expressoAdmin1_2/inc/class.uimaillists.inc.php
r309 r414 85 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 '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'), 91 'lang_edit' => lang('Edit'), 92 'lang_scl' => 'SCL', 93 'lang_delete' => 'Excluir', 94 'lang_view' => lang('View'), 95 'lang_back' => lang('back'), 96 'lang_context' => lang('context'), 97 'lang_email' => lang('E-mail'), 98 'lang_search' => lang('search') 87 'context_display' => $context_display 99 88 ); 100 89 $p->set_var($var); 101 90 $p->set_var($this->functions->make_dinamic_lang($p, 'list')); 91 102 92 // Save query 103 93 $p->set_var('query', $GLOBALS['query']); … … 196 186 $p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); 197 187 $p->set_file(Array('create_maillist' => 'maillists_form.tpl')); 188 $p->set_block('create_maillist','body','body'); 198 189 199 190 // Obtem combos das organizações. … … 211 202 'accountStatus_checked' => 'CHECKED', 212 203 'restrictionsOnEmailLists' => $this->current_config['expressoAdmin_restrictionsOnEmailLists'], 213 'lang_back' => lang('Back'),214 'lang_save' => lang('save'),215 'lang_maillist_organization'=> lang('Maillist Organization'),216 'lang_search_organization' => lang('Search Organiztion'),217 'lang_search_user' => lang('Search user'),218 'lang_organizations' => lang('Organizations'),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'),223 'lang_add_user' => lang('Add User'),224 'lang_rem_user' => lang('Remove User'),225 'lang_all_users' => lang('Show users from all sub-organizations'),226 204 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.list_maillists'), 227 205 'combo_manager_org' => $combo_manager_org, … … 230 208 ); 231 209 $p->set_var($var); 232 210 $p->set_var($this->functions->make_dinamic_lang($p, 'body')); 233 211 $p->pfp('out','create_maillist'); 234 212 } … … 259 237 $p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); 260 238 $p->set_file(Array('edit_maillist' => 'maillists_form.tpl')); 239 $p->set_block('edit_maillist','body','body'); 261 240 262 241 // Obtem combos das organizações. … … 313 292 'type' => 'edit_maillist', 314 293 '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 294 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.list_maillists'), 329 295 'combo_manager_org' => $combo_manager_org, … … 340 306 ); 341 307 $p->set_var($var); 308 $p->set_var($this->functions->make_dinamic_lang($p, 'body')); 342 309 343 310 $p->pfp('out','edit_maillist'); … … 368 335 // Set o template 369 336 $p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); 370 $p->set_file(Array('sql_maillist' => 'maillists_scl.tpl')); 337 $p->set_file(Array('scl_maillist' => 'maillists_scl.tpl')); 338 $p->set_block('scl_maillist','body','body'); 371 339 372 340 // Pega combo das organizações e seleciona a org da lista. … … 396 364 'ldap_context' => $GLOBALS['phpgw_info']['server']['ldap_context'], 397 365 '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'),408 366 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uimaillists.list_maillists'), 409 367 'combo_org' => $sectors, … … 417 375 ); 418 376 $p->set_var($var); 419 420 $p->pfp('out','sql_maillist'); 377 $p->set_var($this->functions->make_dinamic_lang($p, 'body')); 378 379 $p->pfp('out','scl_maillist'); 421 380 } 422 381 -
trunk/expressoAdmin1_2/inc/class.uisectors.inc.php
r396 r414 68 68 'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], 69 69 'back_url' => $GLOBALS['phpgw']->link('/expressoAdmin1_2/index.php'), 70 'context_display' => $context_display, 71 'lang_context' => lang('context'), 72 'header_name' => lang('SECTORS'), 73 'lang_add_sub_sectors' => lang('Add Sub-Sectors'), 74 'header_edit' => lang('Edit'), 75 'lang_back' => lang('back'), 76 'header_delete' => lang('Delete') 77 ); 78 $p->set_var($var); 70 'context_display' => $context_display 71 ); 72 $p->set_var($var); 73 $p->set_var($this->functions->make_dinamic_lang($p, 'list')); 79 74 80 75 if (!count($sectors_info)) … … 144 139 function add_sector($context='') 145 140 { 146 //_debug_array($_GET);147 //_debug_array($_POST);148 149 141 $manager_lid = $GLOBALS['phpgw']->accounts->data['account_lid']; 150 142 $acl = $this->functions->read_acl($manager_lid); … … 166 158 $p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); 167 159 $p->set_file(Array('create_sector' => 'sectors_form.tpl')); 160 $p->set_block('create_sector','list','list'); 168 161 169 162 // Seta variaveis utilizadas pelo tpl. … … 175 168 'sector' => $_POST['sector'], 176 169 'sector_visible_checked'=> $_POST['sector_visible'] ? 'checked' : '', 177 178 'lang_add' => lang('Add'),179 'lang_save' => lang('Save'),180 'lang_back' => lang('Back'),181 'lang_context' => lang('Context'),182 'lang_sector_name' => lang('Sector name'),183 'lang_occult_ou' => lang('Occult Sector'),184 170 'error_messages' => $_POST['error_messages'] == '' ? '' : "<script type='text/javascript'>alert('".$_POST['error_messages']."')</script>", 185 171 ); 186 172 $p->set_var($var); 173 $p->set_var($this->functions->make_dinamic_lang($p, 'list')); 187 174 188 175 $p->pfp('out','create_sector'); … … 191 178 function edit_sector() 192 179 { 193 //_debug_array($_POST);194 195 180 $account_lid = $GLOBALS['phpgw']->accounts->data['account_lid']; 196 181 $acl = $this->functions->read_acl($account_lid); … … 215 200 $p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); 216 201 $p->set_file(Array('edit_sector' => 'sectors_form.tpl')); 202 $p->set_block('edit_sector','list','list'); 217 203 218 204 if (!$_POST) … … 233 219 'lang_add' => lang('Add'), 234 220 'disable' => 'disabled', 235 'lang_save' => lang('Save'),236 'lang_back' => lang('Back'),237 'lang_context' => lang('Context'),238 'lang_sector_name' => lang('Sector name'),239 'lang_occult_ou' => lang('Occult Sector'),240 221 'error_messages' => $_POST['error_messages'] == '' ? '' : "<script type='text/javascript'>alert('".$_POST['error_messages']."')</script>", 241 222 ); 242 223 $p->set_var($var); 243 224 $p->set_var($this->functions->make_dinamic_lang($p, 'list')); 225 244 226 $p->pfp('out','edit_sector'); 245 227 } … … 247 229 function validate_data_sectors_add() 248 230 { 249 //_debug_array($_POST);250 251 231 $sector_name = $_POST['sector']; 252 232 $context = $_POST['context']; … … 273 253 function delete_sector() 274 254 { 275 //_debug_array($_GET);276 277 255 $account_lid = $GLOBALS['phpgw']->accounts->data['account_lid']; 278 256 $acl = $this->functions->read_acl($account_lid); … … 293 271 $p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); 294 272 $p->set_file(Array('delete_sector' => 'sectors_delete.tpl')); 273 $p->set_block('delete_sector','list','list'); 295 274 296 275 $tmp_sector_name = $_GET['context']; … … 305 284 $sector_subsectors = $this->so->get_sector_subsectors($_GET['context']); 306 285 307 //_debug_array($sector_users);308 //_debug_array($sector_groups);309 //_debug_array($sector_subsectors);310 311 286 $users_list = ''; 312 287 foreach ($sector_users as $user) … … 331 306 $var = Array( 332 307 'color_bg1' => "#E8F0F0", 333 'lang_back' => lang('Back'),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 folling sectors'),339 'lang_obs' => lang('All users, groups and sub-sectors of this sector will be DELETED!'),340 341 308 'manager_context' => $manager_context, 342 309 'dn' => $_GET['context'], … … 350 317 ); 351 318 $p->set_var($var); 319 $p->set_var($this->functions->make_dinamic_lang($p, 'list')); 352 320 $p->pfp('out','delete_sector'); 353 321 } -
trunk/expressoAdmin1_2/inc/class.user.inc.php
r396 r414 269 269 } 270 270 271 $this->db_functions->write_log("cr iado usuario $dn",'','','','');271 $this->db_functions->write_log("created user",$dn); 272 272 } 273 273 … … 307 307 { 308 308 $return['status'] = false; 309 $return['msg'] = 'Você não tem direito de editar informações de usuários.';309 $return['msg'] = lang('You do not have access to edit user informations') . '.'; 310 310 return $return; 311 311 } … … 331 331 { 332 332 $dn = $newrdn . ',' . $newparent; 333 $this->db_functions->write_log(' alterado contexto do usuario' . $new_values['uid'] . ' de: ' . $old_values['context'] . ' para: ' . $new_values['context'],'',$dn,'','');333 $this->db_functions->write_log('modified user context', $dn . ': ' . $old_values['uid'] . '->' . $new_values['context']); 334 334 } 335 335 } … … 342 342 $ldap_mod_replace['givenname'] = $new_values['givenname']; 343 343 $ldap_mod_replace['cn'] = $new_values['givenname'] . ' ' . $new_values['sn']; 344 $this->db_functions->write_log(" alterado givenname do usuario $dn de ".$old_values['givenname']." para ".$new_values['givenname'],'','','','');344 $this->db_functions->write_log("modified first name", "$dn: " . $old_values['givenname'] . "->" . $new_values['givenname']); 345 345 } 346 346 if ($diff['sn']) … … 348 348 $ldap_mod_replace['sn'] = $new_values['sn']; 349 349 $ldap_mod_replace['cn'] = $new_values['givenname'] . ' ' . $new_values['sn']; 350 $this->db_functions->write_log(" altera sn do usuario de ".$old_values['sn']." para ".$new_values['sn'],'','','','');350 $this->db_functions->write_log("modified last name", "$dn: " . $old_values['sn'] . "->" . $new_values['sn']); 351 351 } 352 352 if ($diff['mail']) … … 355 355 $this->ldap_functions->replace_user2maillists($new_values['mail'], $old_values['mail']); 356 356 $this->ldap_functions->replace_mail_from_institutional_account($new_values['mail'], $old_values['mail']); 357 $this->db_functions->write_log("alterado mail do usuario $dn de " . $old_values['mail'] . " para " . $new_values['mail'],'','','',''); 358 } 359 /* 360 if (($diff['mailalternateaddress']) && ($old_values['mailalternateaddress'] != '')) 361 { 362 $ldap_mod_replace['mailalternateaddress'] = $new_values['mailalternateaddress']; 363 $this->db_functions->write_log("alterado mailalternateaddress do usuario",'',$dn,'',''); 364 } 365 if (($diff['mailforwardingaddress']) && ($old_values['mailforwardingaddress'] != '')) 366 { 367 $ldap_mod_replace['mailforwardingaddress'] = $new_values['mailforwardingaddress']; 368 $this->db_functions->write_log("alterado mailforwardingaddress do usuario",'',$dn,'',''); 369 } 370 */ 357 $this->db_functions->write_log("modified user email", "$dn: " . $old_values['mail'] . "->" . $new_values['mail']); 358 } 371 359 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 372 360 // Passwd Expired - Com atributo 373 if (($old_values['passwd_expired'] != '') && ($new_values['passwd_expired'] == '1'))361 if (($old_values['passwd_expired'] != 0) && ($new_values['passwd_expired'] == '1')) 374 362 { 375 363 $ldap_mod_replace['phpgwlastpasswdchange'] = '0'; 376 $this->db_functions->write_log("Expir ado senha do usuário $dn",'','','','');364 $this->db_functions->write_log("Expired user password","$dn"); 377 365 } 378 366 } … … 406 394 } 407 395 408 $this->db_functions->write_log(" alterado password do usuario $dn",'','','','');396 $this->db_functions->write_log("modified user password",$dn); 409 397 } 410 398 } … … 416 404 { 417 405 $ldap_mod_replace['telephonenumber'] = $new_values['telephonenumber']; 418 $this->db_functions->write_log( "alterado telephonenumber do usuario $dn de ".$old_values['telephonenumber']." para ".$new_values['telephonenumber'],'','','','');406 $this->db_functions->write_log('modified user telephonenumber', $dn . ': ' . $old_values['telephonenumber'] . '->' . $new_values['telephonenumber']); 419 407 } 420 408 } … … 432 420 { 433 421 $ldap_atribute = str_replace("corporative_information_", "", $atribute); 434 // REPLACE ATTRS OF CORPORATIVE422 // REPLACE CORPORATIVE ATTRIBUTES 435 423 if (($diff[$atribute]) && ($old_values[$atribute] != '')) 436 424 { 437 425 $ldap_atribute = str_replace("corporative_information_", "", $atribute); 438 $ldap_mod_replace[$ldap_atribute] = $new_values[$atribute];439 $this->db_functions->write_log( "alterado $ldap_atribute do usuario $dn de ".$old_values[$atribute]." para ".$new_values[$atribute],'','','','');440 } 441 //ADD ATTRS OF CORPORATIVE426 $ldap_mod_replace[$ldap_atribute] = utf8_encode($new_values[$atribute]); 427 $this->db_functions->write_log('modified user attribute', $dn . ': ' . $ldap_atribute . ': ' . $old_values[$atribute] . '->' . $new_values[$atribute]); 428 } 429 //ADD CORPORATIVE ATTRIBUTES 442 430 elseif (($old_values[$atribute] == '') && ($new_values[$atribute] != '')) 443 431 { 444 $ldap_add[$ldap_atribute] = $new_values[$atribute];445 $this->db_functions->write_log( "adicionado $ldap_atribute ao usuario $dn de ".$old_values[$atribute]." para ".$new_values[$atribute],'','','','');446 } 447 //REMOVE ATTRS OF CORPORATIVE432 $ldap_add[$ldap_atribute] = utf8_encode($new_values[$atribute]); 433 $this->db_functions->write_log('added user attribute', $dn . ': ' . $ldap_atribute . ': ' . $old_values[$atribute] . '->' . $new_values[$atribute]); 434 } 435 //REMOVE CORPORATIVE ATTRIBUTES 448 436 elseif (($old_values[$atribute] != '') && ($new_values[$atribute] == '')) 449 437 { 450 438 $ldap_remove[$ldap_atribute] = array(); 451 $this->db_functions->write_log( "removido $ldap_atribute do usuario $dn de ".$old_values[$atribute]." para ".$new_values[$atribute],'','','','');439 $this->db_functions->write_log('removed user attribute', $dn . ': ' . $ldap_atribute . ': ' . $old_values[$atribute] . '->' . $new_values[$atribute]); 452 440 } 453 441 } … … 463 451 { 464 452 $ldap_mod_replace['gidnumber'] = $new_values['gidnumber']; 465 $this->db_functions->write_log( "alterado gidnumber do usuario $dn. De:".$old_values['gidnumber']." Para:".$new_values['gidnumber'],'','','','');453 $this->db_functions->write_log('modified user primary group', $dn . ': ' . $old_values['gidnumber'] . '->' . $new_values['gidnumber']); 466 454 } 467 455 … … 471 459 { 472 460 $ldap_mod_replace['sambaPrimaryGroupSID'] = $this->current_config['expressoAdmin_sambaSID'] . '-' . ((2 * $new_values['gidnumber'])+1001); 473 $this->db_functions->write_log( "alterado sambaPrimaryGroupSID do usuario $dn.",'','','','');461 $this->db_functions->write_log('modified user sambaPrimaryGroupSID', $dn); 474 462 } 475 463 … … 477 465 { 478 466 $ldap_mod_replace['sambaacctflags'] = $new_values['sambaacctflags']; 479 $this->db_functions->write_log(" alterado sambaacctflags do usuario $dn",'','','','');467 $this->db_functions->write_log("modified user sambaacctflags",$dn); 480 468 } 481 469 if ($diff['sambalogonscript']) 482 470 { 483 471 $ldap_mod_replace['sambalogonscript'] = $new_values['sambalogonscript']; 484 $this->db_functions->write_log(" alterado sambalogonscript do usuario $dn",'','','','');472 $this->db_functions->write_log("modified user sambalogonscript",$dn); 485 473 } 486 474 if ($diff['sambahomedirectory']) 487 475 { 488 476 $ldap_mod_replace['homedirectory'] = $new_values['sambahomedirectory']; 489 $this->db_functions->write_log(" alterado homedirectory do usuario $dn",'','','','');477 $this->db_functions->write_log("modified user homedirectory",$dn); 490 478 } 491 479 if ($diff['sambadomain']) … … 493 481 $ldap_mod_replace['sambaSID'] = $diff['sambadomain'] . '-' . ((2 * $old_values['uidnumber'])+1000); 494 482 $ldap_mod_replace['sambaPrimaryGroupSID'] = $diff['sambadomain'] . '-' . ((2 * $old_values['gidnumber'])+1001); 495 $this->db_functions->write_log( "alterado dominio samba do usuario $dn para " . $params['sambadomain'],'','','','');483 $this->db_functions->write_log('modified user samba domain', $dn . ': ' . $old_values['sambadomain'] . '->' . $new_values['sambadomain']); 496 484 } 497 485 } … … 509 497 { 510 498 $this->ldap_functions->ldap_remove_photo($dn); 511 $this->db_functions->write_log("remov ido jpegphoto do usuario $dn",'','','','');499 $this->db_functions->write_log("removed user photo",$dn); 512 500 } 513 501 elseif ($_FILES['photo']['name'] != '') … … 517 505 { 518 506 $return['status'] = false; 519 $return['msg'] .= 'Foto do usuário não foi salva, pois excede o tamanho máximo de 10 kb.';507 $return['msg'] .= lang('User photo could not be save because is bigger the 10 kb') . '.'; 520 508 } 521 509 else … … 524 512 { 525 513 $photo_exist = true; 526 $this->db_functions->write_log(" substituido jpegphoto do usuario $dn",'','','','');514 $this->db_functions->write_log("mofified user photo",$dn); 527 515 } 528 516 else 529 517 { 530 518 $photo_exist = false; 531 $this->db_functions->write_log("ad icionado jpegphoto ao usuario $dn",'','','','');519 $this->db_functions->write_log("added user photo",$dn); 532 520 } 533 521 $this->ldap_functions->ldap_save_photo($dn, $_FILES['photo']['tmp_name'], $new_values['photo_exist'], $photo_exist); … … 544 532 { 545 533 $ldap_add['telephonenumber'] = $new_values['telephonenumber']; 546 $this->db_functions->write_log("ad icionado telephonenumber ao usuario $dn",'','','','');534 $this->db_functions->write_log("added user phone",$dn); 547 535 } 548 536 if (($old_values['telephonenumber'] != '') && ($new_values['telephonenumber'] == '')) 549 537 { 550 538 $ldap_remove['telephonenumber'] = array(); 551 $this->db_functions->write_log("remov ido telephonenumber do usuario $dn",'','','','');539 $this->db_functions->write_log("removed user phone",$dn); 552 540 } 553 541 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// … … 556 544 { 557 545 $ldap_add['phpgwlastpasswdchange'] = '0'; 558 $this->db_functions->write_log(" Expirado senha do usuário $dn",'','','','');546 $this->db_functions->write_log("expired user password",$dn); 559 547 } 560 548 if (($old_values['passwd_expired'] == '0') && ($new_values['passwd_expired'] == '')) 561 549 { 562 550 $ldap_remove['phpgwlastpasswdchange'] = array(); 563 $this->db_functions->write_log(" Removido expiração da senha do usuário $dn",'','','','');551 $this->db_functions->write_log("removed expiry from user password",$dn); 564 552 } 565 553 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// … … 568 556 { 569 557 $this->db_functions->add_pref_changepassword($new_values['uidnumber']); 570 $this->db_functions->write_log(" adicionado changepassword ao usuario $dn",'','','','');558 $this->db_functions->write_log("turn on changepassword",$dn); 571 559 } 572 560 if (($old_values['changepassword'] != '') && ($new_values['changepassword'] == '')) 573 561 { 574 562 $this->db_functions->remove_pref_changepassword($new_values['uidnumber']); 575 $this->db_functions->write_log(" removido changepassword do usuario $dn",'','','','');563 $this->db_functions->write_log("turn of changepassword",$dn); 576 564 } 577 565 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// … … 580 568 { 581 569 $ldap_add['phpgwaccountstatus'] = 'A'; 582 $this->db_functions->write_log(" ativado conta do usuario $dn",'','','','');570 $this->db_functions->write_log("turn on user account",$dn); 583 571 } 584 572 if (($old_values['phpgwaccountstatus'] != '') && ($new_values['phpgwaccountstatus'] == '')) 585 573 { 586 574 $ldap_remove['phpgwaccountstatus'] = array(); 587 $this->db_functions->write_log(" desativado conta do usuario $dn",'','','','');575 $this->db_functions->write_log("turn off user account",$dn); 588 576 } 589 577 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// … … 592 580 { 593 581 $ldap_add['phpgwaccountvisible'] = '-1'; 594 $this->db_functions->write_log(" adicionado phpgwaccountvisible ao usuario $dn",'','','','');582 $this->db_functions->write_log("turn on phpgwaccountvisible",$dn); 595 583 } 596 584 if (($old_values['phpgwaccountvisible'] != '') && ($new_values['phpgwaccountvisible'] == '')) 597 585 { 598 586 $ldap_remove['phpgwaccountvisible'] = array(); 599 $this->db_functions->write_log(" removido phpgwaccountvisible ao usuario $dn",'','','','');587 $this->db_functions->write_log("turn off phpgwaccountvisible",$dn); 600 588 } 601 589 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// … … 604 592 { 605 593 $ldap_add['accountstatus'] = 'active'; 606 $this->db_functions->write_log(" ativado conta de email do usuario $dn",'','','','');594 $this->db_functions->write_log("turn on user account email",$dn); 607 595 } 608 596 if (($old_values['accountstatus'] != '') && ($new_values['accountstatus'] == '')) 609 597 { 610 598 $ldap_remove['accountstatus'] = array(); 611 $this->db_functions->write_log("desativado conta de email do usuario $dn",'','','',''); 612 } 613 /* 614 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 615 // MAILALTERNATEADDRESS 616 if (($old_values['mailalternateaddress'] == '') && ($new_values['mailalternateaddress'] != '')) 617 { 618 $ldap_add['mailalternateaddress'] = $new_values['mailalternateaddress']; 619 $this->db_functions->write_log("adicionado mailalternateaddress ao usuario",'',$dn,'',''); 620 } 621 if (($old_values['mailalternateaddress'] != '') && ($new_values['mailalternateaddress'] == '')) 622 { 623 $ldap_remove['mailalternateaddress'] = array(); 624 $this->db_functions->write_log("removido mailalternateaddress ao usuario",'',$dn,'',''); 625 } 626 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 627 // MAILFORWARDINGADDRESS 628 if (($old_values['mailforwardingaddress'] == '') && ($new_values['mailforwardingaddress'] != '')) 629 { 630 $ldap_add['mailforwardingaddress'] = $new_values['mailforwardingaddress']; 631 $this->db_functions->write_log("adicionado mailforwardingaddress ao usuario",'',$dn,'',''); 632 } 633 if (($old_values['mailforwardingaddress'] != '') && ($new_values['mailforwardingaddress'] == '')) 634 { 635 $ldap_remove['mailforwardingaddress'] = array(); 636 $this->db_functions->write_log("removido mailforwardingaddress ao usuario",'',$dn,'',''); 637 } 638 */ 639 599 $this->db_functions->write_log("turn off user account email",$dn); 600 } 640 601 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 641 602 // MAILALTERNATEADDRESS … … 651 612 { 652 613 $ldap_add['mailalternateaddress'][] = $mailalternateaddress; 653 $this->db_functions->write_log("ad icionado mailalternateaddress $mailalternateaddress ao usuario $dn",'',$dn,'','');614 $this->db_functions->write_log("added mailalternateaddress","$dn: $mailalternateaddress"); 654 615 } 655 616 } … … 661 622 { 662 623 $ldap_remove['mailalternateaddress'][] = $mailalternateaddress; 663 $this->db_functions->write_log("remov ido mailalternateaddress $mailalternateaddress do usuario $dn",'',$dn,'','');624 $this->db_functions->write_log("removed mailalternateaddress","$dn: $mailalternateaddress"); 664 625 } 665 626 } … … 679 640 { 680 641 $ldap_add['mailforwardingaddress'][] = $mailforwardingaddress; 681 $this->db_functions->write_log("ad icionado mailforwardingaddress $mailforwardingaddress ao usuario $dn",'',$dn,'','');642 $this->db_functions->write_log("added mailforwardingaddress","$dn: $mailforwardingaddress"); 682 643 } 683 644 } … … 689 650 { 690 651 $ldap_remove['mailforwardingaddress'][] = $mailforwardingaddress; 691 $this->db_functions->write_log("remov ido mailforwardingaddress $mailforwardingaddress do usuario $dn",'',$dn,'','');652 $this->db_functions->write_log("removed mailforwardingaddress","$dn: $mailforwardingaddress"); 692 653 } 693 654 } … … 699 660 { 700 661 $ldap_add['deliverymode'] = 'forwardOnly'; 701 $this->db_functions->write_log("ad icionado forwardOnly ao usuario $dn",'','','','');662 $this->db_functions->write_log("added forwardOnly", $dn); 702 663 } 703 664 if (($old_values['deliverymode'] != '') && ($new_values['deliverymode'] == '')) 704 665 { 705 666 $ldap_remove['deliverymode'] = array(); 706 $this->db_functions->write_log("remov ido forwardOnly ao usuario $dn",'','','','');667 $this->db_functions->write_log("removed forwardOnly", $dn); 707 668 } 708 669 } … … 716 677 { 717 678 $this->imap_functions->change_user_quota($new_values['uid'], $new_values['mailquota']); 718 $this->db_functions->write_log(" alterado cota do usuario $dn",'','','','');679 $this->db_functions->write_log("modified user email quota", $dn); 719 680 } 720 681 } … … 739 700 $ldap_remove['sambaPwdLastSet'] = array(); 740 701 $ldap_remove['sambaPwdMustChange'] = array(); 741 $this->db_functions->write_log("remov ido atributos samba do usuario $dn.",'','','','');702 $this->db_functions->write_log("removed user samba attributes", $dn); 742 703 } 743 704 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// … … 745 706 if (($this->current_config['expressoAdmin_samba_support'] == 'true') && (!$new_values['userSamba']) && ($new_values['use_attrs_samba'] == 'on')) 746 707 { 747 //Verifica se o binario para criar as senhas do samba exite.748 708 if (!is_file('/home/expressolivre/mkntpwd')) 749 709 { 750 710 $return['status'] = false; 751 $return['msg'] .= "O arquivo binário /home/expressolivre/mkntpwd não exite.\\nEle é necessário para a criação das senhas usadas pelo SAMBA.\\nInforme o administrador ExpressoLivre sobre isto.\\n"; 711 $return['msg'] .= lang("The file /home/expressolivre/mkntpwd does not exist") . ".\n"; 712 $return['msg'] .= lang("It is necessery to create samba passwords") . ".\n"; 713 $return['msg'] .= lang("Inform your system administrator about this") . ".\n"; 752 714 } 753 715 else … … 766 728 $ldap_add['sambaPwdLastSet'] = strtotime("now"); 767 729 $ldap_add['sambaPwdMustChange'] = '2147483647'; 768 $this->db_functions->write_log("ad icionado atributos samba ao usuario $dn.",'','','','');730 $this->db_functions->write_log("added user samba attribute", $dn); 769 731 } 770 732 } … … 795 757 $this->db_functions->add_user2group($gidnumber, $new_values['uidnumber']); 796 758 $this->ldap_functions->add_user2group($gidnumber, $user_uid); 797 $this->db_functions->write_log(" adicionado usuario $dn ao grupo $gidnumber.",'','','','');759 $this->db_functions->write_log("inserted user to group", "$dn: $gidnumber"); 798 760 } 799 761 } … … 809 771 $this->db_functions->remove_user2group($gidnumber, $new_values['uidnumber']); 810 772 $this->ldap_functions->remove_user2group($gidnumber, $user_uid); 811 $this->db_functions->write_log("remov ido usuario $dn do grupo $gidnumber.",'','','','');773 $this->db_functions->write_log("removed user from group", "$dn: $gidnumber"); 812 774 } 813 775 } 814 776 } 815 777 } 816 /* GIDNUMBER agora é um atributo samba e pode ser alterado por gerentes com este perfil817 /*818 if ($diff['gidnumber'])819 {820 $ldap_mod_replace['gidnumber'] = $new_values['gidnumber'];821 if (($this->current_config['expressoAdmin_samba_support'] == 'true') && ($new_values['userSamba']) && ($new_values['use_attrs_samba'] == 'on'))822 {823 $ldap_mod_replace['sambaPrimaryGroupSID'] = $this->current_config['expressoAdmin_sambaSID'] . '-' . ((2 * $new_values['gidnumber'])+1001);824 }825 $this->db_functions->write_log("alterado gidnumber do usuario.",'',$dn,'','');826 }827 */828 778 } 829 779 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// … … 843 793 if (count($ldap_add)) 844 794 { 845 echo 'ldap-add<br>';846 print_r($ldap_add);847 795 $result = $this->ldap_functions->add_user_attributes($dn, $ldap_add); 848 796 if (!$result['status']) … … 857 805 if (count($ldap_remove)) 858 806 { 859 echo 'ldap-remove<br>';860 print_r($ldap_remove);861 807 $result = $this->ldap_functions->remove_user_attributes($dn, $ldap_remove); 862 808 if (!$result['status']) … … 886 832 { 887 833 $this->ldap_functions->add_user2maillist($uid, $new_values['mail']); 888 $this->db_functions->write_log("adicionado usuario $dn a maillist $uid.",'','','',''); 889 } 890 } 891 /* 892 echo '<pre>'; 893 print_r($old_values['maillists']); 894 print_r($new_values['maillists']); 895 */ 896 834 $this->db_functions->write_log("inserted user to maillist","$dn: $uid"); 835 } 836 } 837 897 838 if (count($remove_maillists)>0) 898 839 { … … 900 841 { 901 842 $this->ldap_functions->remove_user2maillist($uid, $new_values['mail']); 902 $this->db_functions->write_log("remov ido usuario $dn da maillist $uid.",'','','','');843 $this->db_functions->write_log("removed user from maillist","$dn: $uid"); 903 844 } 904 845 } … … 930 871 931 872 foreach ($add_apps as $app => $index) 932 $this->db_functions->write_log(" Adicionado aplicativo $app ao usuário $dn",'',$dn,'','');873 $this->db_functions->write_log("added application to user","$dn: $app"); 933 874 } 934 875 if (count($remove_apps)>0) … … 945 886 946 887 foreach ($remove_apps2 as $app => $access) 947 $this->db_functions->write_log(" Removido aplicativo $app do usuário $dn",'',$dn,'','');888 $this->db_functions->write_log("removed application to user","$dn: $app"); 948 889 } 949 890 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// … … 976 917 { 977 918 $return['status'] = false; 978 $return['msg'] = 'Senha default já cadastrada!';979 } 980 981 $this->db_functions->write_log(" Setado senha default para $uid",'','','','');919 $return['msg'] = lang('default password already registered') . '!'; 920 } 921 922 $this->db_functions->write_log("inserted default password",$uid); 982 923 983 924 return $return; … … 997 938 { 998 939 $return['status'] = false; 999 $return['msg'] = 'Senha default NÃO cadastrada!';1000 } 1001 1002 $this->db_functions->write_log(" Retornado senha default de $uid",'','','','');940 $return['msg'] = lang('default password not registered') . '!'; 941 } 942 943 $this->db_functions->write_log("returned user password",$uid); 1003 944 1004 945 return $return; … … 1039 980 $return['msg'] .= $result_ldap['msg']; 1040 981 } 1041 $this->db_functions->write_log('delet ado usuario ' . $user_info['uid'],'','','','');982 $this->db_functions->write_log('deleted user', $user_info['uid']); 1042 983 } 1043 984 } … … 1055 996 { 1056 997 $return['status'] = false; 1057 $return['msg'] .= 'Você não tem acesso para deletar este usuário.';998 $return['msg'] .= lang('You do not have access to delete user') . '.'; 1058 999 return $return; 1059 1000 } 1060 1001 1061 // Check if the new_uid alrteadyis in use.1002 // Check if the new_uid is in use. 1062 1003 if ( ! $this->ldap_functions->check_rename_new_uid($params['new_uid']) ) 1063 1004 { 1064 1005 $return['status'] = false; 1065 $return['msg'] = 'Novo login já está em uso.';1006 $return['msg'] = lang('New login already in use') . '.'; 1066 1007 return $return; 1067 1008 } … … 1095 1036 { 1096 1037 $return['status'] = false; 1097 $return['msg'] = "A renomeação de usuários só permitida com o cyrus versão 2.2 ou superior,"; 1098 $return['msg'] .= "\ne com a opção 'allowusermoves: yes' configurado no imapd.conf."; 1038 $return['msg'] = "The rename user is only permitted with cyrus 2.2 or higher,"; 1039 $return['msg'] .= "\nand with the option 'allowusermoves: yes' set in imapd.conf."; 1040 1041 1099 1042 return $return; 1100 1043 } … … 1105 1048 { 1106 1049 $return['status'] = false; 1107 $return['msg'] = "Erro ao renomear usuário no LDAP. Processo abortado.";1050 $return['msg'] = lang("Error rename user in LDAP") . '.'; 1108 1051 return $return; 1109 1052 } … … 1117 1060 1118 1061 $return['status'] = false; 1119 $return['msg'] = "Erro ao renomear usuário no Cyrus. Processo abortado.";1062 $return['msg'] = lang("Erro rename user in Cyrus") . '.'; 1120 1063 return $return; 1121 1064 } … … 1154 1097 else 1155 1098 { 1099 $return['msg'] .= $result['msg'] . lang("Error renome sieve script") . '.'; 1100 } 1101 $sieve->sieve_logout(); 1102 } 1103 else 1104 { 1156 1105 $return['status'] = false; 1157 $return['msg'] .= $result['msg'] . "Erro ao renomear script sieve, falha no envio do novo script." . 1158 "\nCaixa postal e login alterados."; 1159 } 1160 $sieve->sieve_logout(); 1161 } 1162 else 1163 { 1164 $return['status'] = false; 1165 $return['msg'] .= $result['msg'] . "Erro ao renomear script sieve, falha no Login." . 1166 "\nCaixa postal e login alterados."; 1106 $return['msg'] .= $result['msg'] . lang("Error renome sieve script") . '.'; 1167 1107 } 1168 1108 … … 1170 1110 $this->ldap_functions->set_user_password($new_uid, $user_password); 1171 1111 1172 $this->db_functions->write_log("ren omeado login do usuario $uid para $new_uid.",'','','','');1112 $this->db_functions->write_log("renamed user", "$uid -> $new_uid"); 1173 1113 1174 1114 $return['exec_return'] = ""; -
trunk/expressoAdmin1_2/index.php
r317 r414 49 49 50 50 /* save lang and session */ 51 /*52 if (!empty($GLOBALS['phpgw_info']['expresso']))53 {54 $_SESSION['phpgw_info']['expresso'] = $GLOBALS['phpgw_info']['expresso'];55 }*/56 57 51 if (empty($_SESSION['phpgw_info']['expressoAdmin']['lang'])) 58 52 { -
trunk/expressoAdmin1_2/js/jscode/expressoadmin.js
r379 r414 8 8 * option) any later version. * 9 9 \************************************************************************************/ 10 11 function load_lang(){ 12 cExecute ('$this/inc/load_lang', handler_load_lang); 13 } 14 15 var global_langs = new Array(); 16 17 function handler_load_lang(data) 18 { 19 global_langs = eval(data); 20 } 21 22 function get_lang(key_raw) 23 { 24 key = key_raw.replace(/ /g,"_"); 25 key = key.replace(/-/g,""); 26 lang = eval("global_langs."+key.toLowerCase()); 27 28 if (typeof(lang)=='undefined') 29 return key_raw + '*'; 30 else 31 return lang; 32 } 10 33 11 34 function emailSuggestion_expressoadmin(use_suggestion_in_logon_script, concatenateDomain) … … 141 164 campo.value = vr.substr( 0, tam - 1 ); 142 165 } 166 load_lang(); -
trunk/expressoAdmin1_2/js/jscode/groups.js
r309 r414 7 7 8 8 if (document.forms[0].cn.value == ''){ 9 alert( 'Campo NOME do grupo está vazio.');9 alert(get_lang('NAME field is empty') + '.'); 10 10 return; 11 11 } 12 12 13 13 if (document.forms[0].description.value == ''){ 14 alert( 'Campo DESCRIÇÃO está vazio.');14 alert(get_lang('DESCRIPTION field is empty') + '.'); 15 15 return; 16 16 } … … 21 21 if ( (cn_tmp.length < 3) || ((cn_tmp[0] != 'grupo') && (cn_tmp[0] != 'smb')) ){ 22 22 alert( 23 'O campo NOME do grupo está incompleto.\n' +24 'O nome do grupo deve ser formado assim:\n' +25 'grupo-ORGANIZACAO-NOME_DO_GRUPO.\n' +26 'Ex:grupo-celepar-rh.');23 get_lang('NAME field is incomplete') + '.\n' + 24 get_lang('the name field must be formed like') + ':\n' + 25 get_lang('group') + '-' + get_lang('organization') + '-' + get_lang('group name') + '.\n' + 26 get_lang('eg') + ': ' + 'grupo-celepar-rh.'); 27 27 return; 28 28 } … … 33 33 34 34 if(!reCn.test(document.forms[0].cn.value)){ 35 alert( 'Campo NOME DO GRUPO comtém caracteres não permitidos.');35 alert(get_lang('NAME field contains characters not allowed') + '.'); 36 36 document.forms[0].cn.focus(); 37 37 return; … … 39 39 40 40 if(!reDesc.test(document.forms[0].description.value)){ 41 alert( 'Campo DESCRIÇÃO comtém caracteres não permitidos.');41 alert(get_lang('DESCRIPTION field contains characters not allowed') + '.'); 42 42 document.forms[0].description.focus(); 43 43 return; … … 47 47 if ( (document.forms[0].email.value != '') && (!reEmail.test(document.forms[0].email.value)) ) 48 48 { 49 alert( "Campo E-mail não é válido.");49 alert(get_lang('EMAIL field is empty') + '.'); 50 50 return false; 51 51 } … … 90 90 alert(data.msg); 91 91 else{ 92 alert( 'Grupo criado com êxito!');92 alert(get_lang('Group sucess created') + '.'); 93 93 location.href="./index.php?menuaction=expressoAdmin1_2.uigroups.list_groups"; 94 94 } … … 107 107 alert(data.msg); 108 108 else{ 109 alert( 'Grupo salvo com êxito!!');109 alert(get_lang('Group sucess saved') + '.'); 110 110 location.href="./index.php?menuaction=expressoAdmin1_2.uigroups.list_groups"; 111 111 } … … 156 156 if ((recursive) && (document.forms[0].ldap_context.value == document.getElementById('ea_combo_org_groups').value)) 157 157 { 158 alert( 'Nao é possível selecionar todos os usuários da organização raiz.')158 alert(get_lang('It is not allow select all users from the root organization') + '.'); 159 159 document.getElementById('ea_check_allUsers').checked = false; 160 160 … … 241 241 clearTimeout(finderTimeout); 242 242 var oWait = document.getElementById("ea_span_searching"); 243 oWait.innerHTML = 'Buscando...';243 oWait.innerHTML = get_lang('Searching') + '...'; 244 244 var finderTimeout = setTimeout("optionFinder('"+obj.id+"')",500); 245 245 } … … 270 270 function delete_group(cn, gidnumber) 271 271 { 272 if (confirm( "Realmente deletar Grupo "+ cn + " ??"))272 if (confirm(get_lang('Do you really want delete the group') + ' ' + cn + " ??")) 273 273 { 274 274 var handler_delete_group = function(data) … … 277 277 alert(data.msg); 278 278 else 279 alert( 'Grupo deletado com êxito!!');279 alert(get_lang('Group success deleted') + '.'); 280 280 281 281 location.href="./index.php?menuaction=expressoAdmin1_2.uigroups.list_groups"; -
trunk/expressoAdmin1_2/js/jscode/maillists.js
r317 r414 4 4 document.forms[0].uid.value = document.forms[0].uid.value.toLowerCase(); 5 5 document.forms[0].old_uid.value = document.forms[0].old_uid.value.toLowerCase(); 6 6 7 7 if (document.forms[0].uid.value == ''){ 8 alert( 'Campo LOGIN da lista está vazio.');8 alert(get_lang('LOGIN field is empty') + '.'); 9 9 return; 10 10 } 11 11 12 12 if (document.forms[0].cn.value == ''){ 13 alert( 'Campo NOME da lista está vazio.');13 alert(get_lang('NAME field is empty') + '.'); 14 14 return; 15 15 } … … 20 20 if ((uid_tmp.length < 3) || (uid_tmp[0] != 'lista')){ 21 21 alert( 22 'O campo LOGIN da lista está incompleto.\n' +23 'O nome da lista deve ser formado assim:\n' +24 'lista-ORGANIZACAO-NOME_DA_LISTA.\n' +25 'Ex:lista-celepar-rh.');22 get_lang('LOGIN field is incomplete') + '.\n' + 23 get_lang('the login field must be formed like') + ':\n' + 24 get_lang('list') + '-' + get_lang('organization') + '-' + get_lang('listname') + '.\n' + 25 get_lang('eg') + ': ' + 'lista-celepar-rh.'); 26 26 return; 27 27 } … … 29 29 30 30 if (document.forms[0].uid.value.split(" ").length > 1){ 31 alert( 'Campo LOGIN comtém espaços.');31 alert(get_lang('LOGIN field contains characters not allowed') + '.'); 32 32 document.forms[0].uid.focus(); 33 33 return; … … 35 35 36 36 if (document.forms[0].mail.value == ''){ 37 alert( 'Campo E-MAIL da lista está vazio.');37 alert(get_lang('EMAIL field is empty') + '.'); 38 38 document.forms[0].mail.focus(); 39 39 return; … … 41 41 var reEmail = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/; 42 42 if(!reEmail.test(document.forms[0].mail.value)){ 43 alert( "Campo E-mail não é válido.");43 alert(get_lang('Email field is not valid') + '.'); 44 44 return false; 45 45 } … … 47 47 select_userInMaillist = document.getElementById('ea_select_usersInMaillist'); 48 48 if (select_userInMaillist.options.length == 0){ 49 alert( 'Nenhum usuário faz parte da lista.');49 alert(get_lang('Any user is in the list') + '.'); 50 50 return; 51 51 } … … 95 95 alert(data.msg); 96 96 else{ 97 alert( 'Lista de emails criada com êxito!');97 alert(get_lang('Email list sucess created') + '.'); 98 98 location.href="./index.php?menuaction=expressoAdmin1_2.uimaillists.list_maillists"; 99 99 } … … 112 112 alert(data.msg); 113 113 else{ 114 alert( 'Lista de emails salva com êxito!!');114 alert(get_lang('Email list sucess saved') + '.'); 115 115 location.href="./index.php?menuaction=expressoAdmin1_2.uimaillists.list_maillists"; 116 116 } … … 137 137 alert(data.msg); 138 138 else 139 alert( 'Sending Control List salva com êxito!!');139 alert(get_lang('SCL sucess saved') + '.'); 140 140 location.href="./index.php?menuaction=expressoAdmin1_2.uimaillists.list_maillists"; 141 141 return; … … 185 185 if ((recursive) && (document.forms[0].ldap_context.value == document.getElementById('ea_combo_org_maillists').value)) 186 186 { 187 alert( 'Nao é possível selecionar todos os usuários da organização raiz.')187 alert(get_lang('It is not allow select all users from the root organization') + '.'); 188 188 document.getElementById('ea_check_allUsers').checked = false; 189 189 … … 325 325 clearTimeout(finderTimeout); 326 326 var oWait = document.getElementById("ea_span_searching"); 327 oWait.innerHTML = 'Buscando...';327 oWait.innerHTML = get_lang('Searching') + '...'; 328 328 finderTimeout = setTimeout("optionFinder('"+obj.id+"')",500); 329 329 } … … 358 358 function delete_maillist(uid, uidnumber) 359 359 { 360 if (confirm("Realmente deletar Lista " + uid + " ??")) 360 if (confirm(get_lang('Do you really want delete the email list') + ' ' + uid + " ??")) 361 361 362 { 362 363 var handler_delete_maillist = function(data) … … 365 366 alert(data.msg); 366 367 else 367 alert( 'Lista de email deletada com êxito!!');368 alert(get_lang('Email list success deleted') + '.'); 368 369 369 370 location.href="./index.php?menuaction=expressoAdmin1_2.uimaillists.list_maillists"; -
trunk/expressoAdmin1_2/js/jscode/managers.js
r317 r414 2 2 function copy_manager(manager) 3 3 { 4 if (!(new_manager = prompt( "Digite o login do novo gerente:","")))4 if (!(new_manager = prompt(get_lang('Type new managers login') + ':',""))) 5 5 { 6 6 return; … … 12 12 location.reload(); 13 13 else 14 alert( 'Erro ao copiar gerente.');14 alert(get_lang('Error at copy manager') + '.'); 15 15 } 16 16 cExecute ('$this.db_functions.copy_manager&manager='+manager+'&new_manager='+new_manager, handler_copy_manager); -
trunk/expressoAdmin1_2/js/jscode/users.js
r355 r414 8 8 9 9 if (document.forms[0].uid.value == ''){ 10 alert( 'Campo LOGIN está vazio.');10 alert(get_lang('LOGIN field is empty') + '.'); 11 11 return; 12 12 } 13 13 else if (document.forms[0].uid.value.length < document.forms[0].minimumSizeLogin.value){ 14 alert( 'Campo LOGIN deve ter mais que '+document.forms[0].minimumSizeLogin.value+' caracteres.');14 alert(get_lang('LOGIN field must be bigger than') + ' ' + document.forms[0].minimumSizeLogin.value + ' ' + get_lang('characters') + '.'); 15 15 return; 16 16 } … … 22 22 var reUid = /^([a-zA-Z0-9_\-])+$/; 23 23 if(!reUid.test(document.forms[0].uid.value)){ 24 alert('Campo LOGIN comtém caracteres não permitidos.'); 25 document.forms[0].account_lid.focus(); 24 alert(get_lang('LOGIN field contains characters not allowed') + '.'); 26 25 return; 27 26 } … … 29 28 //PASSWORD's 30 29 if (document.forms[0].password1.value == ''){ 31 alert( 'Campo SENHA está vazio.');30 alert(get_lang('Password field is empty') + '.'); 32 31 return; 33 32 } 34 33 if (document.forms[0].password2.value == ''){ 35 alert( 'Campo RE-SENHA está vazio.');34 alert(get_lang('Re-Password field is empty') + '.'); 36 35 return; 37 36 } … … 39 38 40 39 if (document.forms[0].password1.value != document.forms[0].password2.value){ 41 alert( 'Campo SENHA e RE-SENHA são diferentes.');40 alert(get_lang('Password and Re-Password are different') + '.'); 42 41 return; 43 42 } … … 50 49 if(!re_employeenumber.test(document.forms[0].corporative_information_employeenumber.value)) 51 50 { 52 alert( 'Campo matrícula contém caracteres não permitidos. Somente números são permitidos.');51 alert(get_lang('EmployeeNumber contains characters not allowed') + '. ' + get_lang('Only numbers are allowed') + '.'); 53 52 document.forms[0].corporative_information_employeenumber.focus(); 54 53 return; … … 56 55 } 57 56 58 /* Validation cpf is in php now.59 /*60 if (document.forms[0].corporative_information_cpf.value != "")61 {62 var re_cpf = /^([0-9])+$/;63 64 if(!re_cpf.test(document.forms[0].corporative_information_cpf.value))65 {66 alert('Campo cpf contém caracteres não permitidos. Somente números são permitidos');67 document.forms[0].corporative_information_employeenumber.focus();68 return;69 }70 71 if (! validarCPF(document.forms[0].corporative_information_cpf.value) )72 {73 alert("Campo CPF invalido.");74 document.forms[0].corporative_information_cpf.focus();75 return;76 }77 }*/78 79 57 //MAIL 80 58 document.forms[0].mail.value = document.forms[0].mail.value.toLowerCase(); 81 59 if (document.forms[0].mail.value == ''){ 82 alert( 'Campo E-MAIL está vazio.');60 alert(get_lang('Email field is empty') + '.'); 83 61 return; 84 62 } 85 63 var reEmail = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/; 86 64 if(!reEmail.test(document.forms[0].mail.value)){ 87 alert( "Campo E-mail não é válido.");65 alert(get_lang('Email field is not valid') + '.'); 88 66 return false; 89 67 } … … 92 70 var reGivenname = /^[a-zA-Z0-9 \-\.]+$/; 93 71 if(!reGivenname.test(document.forms[0].givenname.value)){ 94 alert( 'Primeiro Nome contém caracteres inválidos.');72 alert(get_lang('First name field contains characters not allowed') + '.'); 95 73 return false; 96 74 } 97 75 else if (document.forms[0].givenname.value == ''){ 98 alert( 'Campo PRIMEIRO NOME está vazio.');76 alert(get_lang('First name field is empty') + '.'); 99 77 return; 100 78 } … … 103 81 var reSn = /^[a-zA-Z0-9 \-\.]+$/; 104 82 if(!reSn.test(document.forms[0].sn.value)){ 105 alert( 'Último Nome contém caracteres inválidos.');83 alert(get_lang('Last name field contains characters not allowed') + '.'); 106 84 return false; 107 85 } 108 86 else if (document.forms[0].sn.value == ''){ 109 alert( 'Campo ÚLTIMO NOME está vazio.');87 alert(get_lang('Last name field is empty') + '.'); 110 88 return; 111 89 } … … 117 95 if (!reg_tel.exec(document.forms[0].telephonenumber.value)) 118 96 { 119 alert( 'Campo Telefone incorreto.');97 alert(get_lang('Phone field is incorrect') + '.'); 120 98 return; 121 99 } … … 124 102 //FORWAR ONLY 125 103 if ((document.forms[0].deliverymode.checked) && (document.forms[0].mailforwardingaddress.value == '')){ 126 alert( 'Campo E-MAIL DE ENCAMINHAMENTO está vazio.');104 alert(get_lang('Forward email is empty') + '.'); 127 105 return; 128 106 } … … 130 108 // Email Quota 131 109 if (document.forms[0].mailquota.value == ''){ 132 alert( 'Usuário sem COTA.');110 alert(get_lang('User without email quota') + '.'); 133 111 return; 134 112 } … … 136 114 //GROUPS 137 115 if (document.getElementById('ea_select_user_groups').length < 1){ 138 alert( 'Nenhum GRUPO selecionado.');116 alert(get_lang('User is not in any group') + '.'); 139 117 return; 140 118 } … … 143 121 if (document.getElementById('tabcontent6').style.display != 'none'){ 144 122 if ((document.forms[0].sambalogonscript.value == '') && (!document.forms[0].sambalogonscript.disabled)){ 145 alert( 'Script de logon do usuário está vazio.');123 alert(get_lang('Logon script is empty') + '.'); 146 124 return; 147 125 } 148 126 if ((document.forms[0].sambahomedirectory.value == '') && (!document.forms[0].sambahomedirectory.disabled)){ 149 alert( 'Diretório Home do usuário está vazio.');127 alert(get_lang('Users home directory is empty') + '.'); 150 128 return; 151 129 } … … 187 165 document.getElementById('mailforwardingaddress').disabled = false; 188 166 document.getElementById('mailalternateaddress').disabled = false; 167 document.getElementById('passwd_expired').disabled = false; 189 168 document.getElementById('accountstatus').disabled = false; 190 169 document.getElementById('deliverymode').disabled = false; … … 225 204 alert(data.msg); 226 205 else 227 alert( 'Usuário criado com êxito!');206 alert(get_lang('User sucess created') + '.'); 228 207 229 208 location.href="./index.php?menuaction=expressoAdmin1_2.uiaccounts.list_users"; … … 244 223 } 245 224 else{ 246 alert( 'Usuário salvo com êxito!!');225 alert(get_lang('User sucess saved') + '.'); 247 226 } 248 227 location.href="./index.php?menuaction=expressoAdmin1_2.uiaccounts.list_users"; … … 467 446 alert(data.msg); 468 447 else 469 alert( 'Senha default cadastrada com êxito!!');448 alert(get_lang('Default password sucess saved') + '.'); 470 449 return; 471 450 } … … 480 459 alert(data.msg); 481 460 else 482 alert( 'Senha do usuário retornado com êxito!!');461 alert(get_lang('Users password sucess returned') + '.'); 483 462 return; 484 463 } … … 488 467 function delete_user(uid, uidnumber) 489 468 { 490 if (confirm( "Realmente deseja deletar o usuário " + uid + " ??"))469 if (confirm(get_lang("Do you really want delete the user") + " " + uid + "?")) 491 470 { 492 471 var handler_delete_user = function(data) … … 495 474 alert(data.msg); 496 475 else 497 alert( 'Usuário deletado com êxito!!');476 alert(get_lang('User sucess deleted') + '.'); 498 477 499 478 location.href="./index.php?menuaction=expressoAdmin1_2.uiaccounts.list_users"; … … 511 490 var reUid = /^([a-zA-Z0-9_\-])+$/; 512 491 513 new_uid = prompt( "Alterar login do usuário " + uid + " para: ", uid);492 new_uid = prompt(get_lang('Rename users login from') + ': ' + uid + " " + get_lang("to") + ': ', uid); 514 493 515 494 if(!reUid.test(new_uid)){ 516 alert( 'Campo LOGIN comtém caracteres não permitidos.');495 alert(get_lang('LOGIN field contains characters not allowed') + '.'); 517 496 document.forms[0].account_lid.focus(); 518 497 return; … … 547 526 alert(data.msg); 548 527 else{ 549 alert( "Usuário renomeado com êxito!\n" + data.exec_return);528 alert(get_lang('User login sucess renamed') + "\n" + data.exec_return); 550 529 location.href="./index.php?menuaction=expressoAdmin1_2.uiaccounts.list_users"; 551 530 } … … 563 542 clearTimeout(finderTimeout_maillist); 564 543 var oWait = document.getElementById("ea_span_searching_maillist"); 565 oWait.innerHTML = 'Buscando...';544 oWait.innerHTML = get_lang('Searching') + '...'; 566 545 finderTimeout_maillist = setTimeout("optionFinder_maillist('"+obj.id+"')",500); 567 546 } … … 597 576 clearTimeout(finderTimeout_group); 598 577 var oWait = document.getElementById("ea_span_searching_group"); 599 oWait.innerHTML = 'Buscando...';578 oWait.innerHTML = get_lang('Searching') + '...'; 600 579 finderTimeout_group = setTimeout("optionFinder_group('"+obj.id+"')",500); 601 580 } … … 655 634 function empty_inbox(uid) 656 635 { 657 var action = "Limpado INBOX do usuario";636 var action = get_lang('Cleanned user mailbox'); 658 637 var handler_write_log = function(){} 659 638 var handler_empty_inbox = function(data) … … 663 642 else{ 664 643 cExecute ('$this.user.write_log_from_ajax&_action='+action+'&userinfo='+uid, handler_write_log); 665 alert( "Esvaziados '" + data.inbox_size + "' MB da caixa postal do usuário");644 alert(get_lang('Emptied ') + data.inbox_size + ' ' + get_lang('MB from user inbox')); 666 645 document.getElementById('mailquota_used').value = data.mailquota_used; 667 646 } … … 702 681 } 703 682 704 /*705 function search_organization(key)706 {707 var organizations = document.getElementById('ea_combo_org_info');708 var RegExp_org = new RegExp("\\b"+key, "i");709 710 for(i = 0; i < organizations.length; i++)711 {712 if (RegExp_org.test(organizations[i].text))713 {714 organizations[i].selected = true;715 return;716 }717 }718 }*/719 720 683 function search_organization(key, element) 721 684 { -
trunk/expressoAdmin1_2/js/modal/modal.js
r317 r414 191 191 return; 192 192 } 193 193 /* 194 194 function load_lang(){ 195 195 cExecute ('$this/js/modal/inc/load_lang', handler_load_lang); … … 213 213 return key_raw + '*'; 214 214 } 215 } 215 }*/ 216 216 217 217 function make_msg(msg, type) … … 291 291 292 292 add_css(); 293 load_lang();293 //load_lang(); -
trunk/expressoAdmin1_2/setup/setup.inc.php
r64 r414 13 13 $setup_info['expressoAdmin1_2']['title'] = 'ExpressoAdmin 1.2'; 14 14 /* Ao incrementar versão, não esquecer de declarar função do tables_update.inc.php*/ 15 $setup_info['expressoAdmin1_2']['version'] = '1.2 50';15 $setup_info['expressoAdmin1_2']['version'] = '1.261'; 16 16 $setup_info['expressoAdmin1_2']['app_order'] = 1; 17 17 $setup_info['expressoAdmin1_2']['tables'][] = 'phpgw_expressoadmin'; -
trunk/expressoAdmin1_2/setup/tables_current.inc.php
r68 r414 51 51 'manager' => array('type' => 'varchar','precision' => 50,'nullable' => false), 52 52 'action' => array('type' => 'varchar','precision' => 255,'nullable' => false), 53 'userinfo' => array('type' => 'varchar','precision' => 255,'nullable' => false), 54 'groupinfo' => array('type' => 'varchar','precision' => 255,'nullable' => false), 55 'appinfo' => array('type' => 'varchar','precision' => 255,'nullable' => false), 56 'msg' => array('type' => 'varchar','precision' => 255,'nullable' => false) 53 'userinfo' => array('type' => 'varchar','precision' => 255,'nullable' => false) 57 54 ), 58 55 'pk' => array(), -
trunk/expressoAdmin1_2/setup/tables_update.inc.php
r131 r414 44 44 return $GLOBALS['setup_info']['expressoAdmin1_2']['currentver']; 45 45 } 46 47 $test[] = '1.261'; 48 function expressoAdmin1_2_upgrade1_261() 49 { 50 $GLOBALS['phpgw_setup']->oProc->DropColumn('phpgw_expressoadmin_log','','appinfo'); 51 $GLOBALS['phpgw_setup']->oProc->DropColumn('phpgw_expressoadmin_log','','groupinfo'); 52 $GLOBALS['phpgw_setup']->oProc->DropColumn('phpgw_expressoadmin_log','','msg'); 53 } 46 54 47 55 ?> -
trunk/expressoAdmin1_2/templates/default/accesslog.tpl
r2 r414 16 16 <tr bgcolor="{th_bg}" align="center"> 17 17 <td width="20%">{lang_loginid}</td> 18 <td width="20%">{lang_ip }</td>18 <td width="20%">{lang_ip_address}</td> 19 19 <td width="30%">{lang_login}</td> 20 20 <td width="30%">{lang_logout}</td> -
trunk/expressoAdmin1_2/templates/default/accounts.tpl
r309 r414 29 29 <tr bgcolor="{th_bg}"> 30 30 <td width="20%">{lang_loginid}</td> 31 <td width="30%">{lang_ cn}</td>31 <td width="30%">{lang_name}</td> 32 32 <td width="30%">{lang_mail}</td> 33 33 <td width="5%">{lang_edit}</td> -
trunk/expressoAdmin1_2/templates/default/accounts_form.tpl
r379 r414 30 30 <th id="tab3" class="activetab" style="display:{display_emailconfig}" onclick="javascript:tab.display(3);"><a href="#" tabindex="0" accesskey="3" onfocus="tab.display(3);" onclick="tab.display(3); return(false);">{lang_email_config}</a></th> 31 31 <th id="tab4" class="activetab" style="display:{display_groups}" onclick="javascript:tab.display(4);"><a href="#" tabindex="0" accesskey="4" onfocus="tab.display(4);" onclick="tab.display(4); return(false);">{lang_groups_permission}</a></th> 32 <th id="tab5" class="activetab" style="display:{display_emaillists}" onclick="javascript:tab.display(5);"><a href="#" tabindex="0" accesskey="5" onfocus="tab.display(5);" onclick="tab.display(5); return(false);">{lang_ lists_permission}</a></th>32 <th id="tab5" class="activetab" style="display:{display_emaillists}" onclick="javascript:tab.display(5);"><a href="#" tabindex="0" accesskey="5" onfocus="tab.display(5);" onclick="tab.display(5); return(false);">{lang_email_lists}</a></th> 33 33 <th id="tab6" class="activetab" style="display:{display_applications}" onclick="javascript:tab.display(6);"><a href="#" tabindex="0" accesskey="6" onfocus="tab.display(6);" onclick="tab.display(6); return(false);">{lang_aplication_permission}</a></th> 34 34 <th id="tab7" class="activetab" style="display:{display_samba_suport}" onclick="javascript:tab.display(7);"><a href="#" tabindex="0" accesskey="7" onfocus="tab.display(7);" onclick="tab.display(7); return(false);">{lang_samba_config}</a></th> … … 51 51 52 52 <tr bgcolor={row_on}> 53 <td>{lang_ account_lid}:</td>53 <td>{lang_login_id}:</td> 54 54 <td> 55 55 <table border="0" style="{display_input_account_lid}"><tr><td> … … 96 96 97 97 <tr bgcolor={row_on}> 98 <td colspan="2">{lang_passw d_expired}:</td>98 <td colspan="2">{lang_password_expired}:</td> 99 99 <td><input type="checkbox" {passwd_expired_checked} {disabled} name="passwd_expired" id="passwd_expired" value="1"</td> 100 100 </tr> 101 101 102 102 <tr bgcolor={row_off}> 103 <td colspan="2">{lang_change password}:</td>103 <td colspan="2">{lang_change_password}:</td> 104 104 <td><input type="checkbox" {changepassword_checked} {disabled} name="changepassword" id="changepassword" value="1"</td> 105 105 </tr> … … 111 111 112 112 <tr bgcolor={row_off}> 113 <td colspan="2">{lang_ account_invisible}:</td>113 <td colspan="2">{lang_do_not_show_this_account_in_the_contact_center}:</td> 114 114 <td><input type="checkbox" {phpgwaccountvisible_checked} {disabled} name="phpgwaccountvisible" id="phpgwaccountvisible" value="1"</td> 115 115 </tr> … … 125 125 <table width="60%" border="0" cellspacing="4" cellpading="0"> 126 126 <tr bgcolor={row_on}> 127 <td>{lang_employee number}:</td>127 <td>{lang_employee_number}:</td> 128 128 <td><input type="text" name="corporative_information_employeenumber" autocomplete="off" value="{corporative_information_employeenumber}" size="30"></td> 129 129 </tr> … … 140 140 <td><input type="text" name="corporative_information_rguf" autocomplete="off" value="{corporative_information_rguf}" size="30"></td> 141 141 </tr> 142 <tr bgcolor={row_on}> 143 <td>{lang_description}:</td> 144 <td><input type="text" name="corporative_information_description" autocomplete="off" value="{corporative_information_description}" size="90"></td> 145 </tr> 142 146 </table> 143 147 </div> … … 147 151 <table width="60%" border="0" cellspacing="4" cellpading="0"> 148 152 <tr bgcolor={row_off}> 149 <td>{lang_active emailaccount}:</td>153 <td>{lang_active_email_account}:</td> 150 154 <td><input type="checkbox" {accountstatus_checked} {disabled} name="accountstatus" id="accountstatus" value="1"</td> 151 155 </tr> … … 157 161 158 162 <tr bgcolor={row_off}> 159 <td>{lang_alias email}:</td>163 <td>{lang_alias_email}:</td> 160 164 <td id="td_input_mailalternateaddress"> 161 165 {input_mailalternateaddress_fields} … … 166 170 167 171 <tr bgcolor={row_on}> 168 <td>{lang_forwarding email}:</td>172 <td>{lang_forwarding_email}:</td> 169 173 <td id="td_input_mailforwardingaddress"> 170 174 {input_mailforwardingaddress_fields} … … 175 179 176 180 <tr bgcolor={row_off}> 177 <td>{lang_only forwarding}:</td>181 <td>{lang_only_forwarding}:</td> 178 182 <td><input type="checkbox" {deliverymode_checked} {disabled} name="deliverymode" id="deliverymode" value="1"</td> 179 183 </tr> 180 184 181 185 <tr bgcolor={row_on}> 182 <td>{lang_email_quota }:</td>186 <td>{lang_email_quota_in_MB}:</td> 183 187 <td><input type="text" name="mailquota" autocomplete="off" value="{mailquota}" {changequote_disabled} {disabled} size=10></td> 184 188 </tr> 185 189 186 190 <tr bgcolor={row_off}> 187 <td>{lang_ email_quota_used}:</td>191 <td>{lang_quota_used_in_mb}:</td> 188 192 <td><input type="text" name="mailquota_used" id="mailquota_used" value="{mailquota_used}" disabled size=10></td> 189 193 </tr> … … 215 219 <button type="button" {disable_group} onClick="javascript:add_user2group();"><img src="expressoAdmin1_2/templates/default/images/add.png" style="vertical-align: middle;" > {lang_add}</button> 216 220 <br><br> 217 <button type="button" {disable_group} onClick="javascript:remove_user2group();"><img src="expressoAdmin1_2/templates/default/images/rem.png" style="vertical-align: middle;" > {lang_rem }</button>221 <button type="button" {disable_group} onClick="javascript:remove_user2group();"><img src="expressoAdmin1_2/templates/default/images/rem.png" style="vertical-align: middle;" > {lang_remove}</button> 218 222 </td> 219 223 … … 265 269 <tr> 266 270 <td width="40%" align="center"> 267 <br>{lang_ user_mail_lists}:<br><br>271 <br>{lang_the_user_is_part_of_this_e-mail_lists}:<br><br> 268 272 <select id="ea_select_user_maillists" size="13" style="width: 400px" multiple name="maillists[]">{ea_select_user_maillists_options}</select> 269 273 </td> … … 275 279 <button type="button" {disabled} onClick="javascript:add_user2maillist();"><img src="expressoAdmin1_2/templates/default/images/add.png" style="vertical-align: middle;" > {lang_add}</button> 276 280 <br><br> 277 <button type="button" {disabled} onClick="javascript:remove_user2maillist();"><img src="expressoAdmin1_2/templates/default/images/rem.png" style="vertical-align: middle;" > {lang_rem }</button>281 <button type="button" {disabled} onClick="javascript:remove_user2maillist();"><img src="expressoAdmin1_2/templates/default/images/rem.png" style="vertical-align: middle;" > {lang_remove}</button> 278 282 </td> 279 283 … … 294 298 <tr> 295 299 <td> 296 Procurar lista:<br>300 {lang_search_e-mail_list}:<br> 297 301 <input {disabled} id="ea_input_searchMailList" size="35" autocomplete="off" onkeyup="javascript:optionFinderTimeout_maillist(this)"><br> 298 302 <font color="red"><span id="ea_span_searching_maillist"> <span></font> … … 325 329 <table width="60%" border="0" cellspacing="4" cellpading="0"> 326 330 <tr bgcolor={row_on}> 327 <td>{lang_use_ attrs_samba}:</td>331 <td>{lang_use_samba_attributes}:</td> 328 332 <td><input {use_attrs_samba_checked} {disabled_samba} name="use_attrs_samba" type="checkbox" id="use_attrs_samba" onChange="javascript:use_samba_attrs(this.checked)"></td> 329 333 </tr> 330 334 <tr bgcolor={row_off}> 331 <td>{lang_ sambaAcctFlags}:</td>335 <td>{lang_account_type}:</td> 332 336 <td> 333 337 <select {disabled_samba} name="sambaacctflags"> … … 338 342 </tr> 339 343 <tr bgcolor={row_on}> 340 <td>{lang_ sambadomain}:</td>344 <td>{lang_domain}:</td> 341 345 <td> 342 346 <select {disabled_samba} name="sambadomain" id="ea_combo_sambadomains"> … … 346 350 </tr> 347 351 <tr bgcolor={row_off}> 348 <td>{lang_ sambaLogonScript}:</td>352 <td>{lang_logon_script}:</td> 349 353 <td><input {disabled_samba} type="text" name="sambalogonscript" autocomplete="off" value="{sambalogonscript}" size="30"></td> 350 354 </tr> 351 355 <tr bgcolor={row_on}> 352 <td>{lang_ sambaHomeDirectory}:</td>356 <td>{lang_home_directory}:</td> 353 357 <td> 354 358 <input {disabled_samba} type="text" name="sambahomedirectory" autocomplete="off" value="{sambahomedirectory}" size="30"> -
trunk/expressoAdmin1_2/templates/default/computers.tpl
r309 r414 6 6 <td align="left" width="25%"> 7 7 <form name="form" method="POST" action="{add_action}"> 8 <input type="submit" value="{lang_ add_computers}" style="{add_computers_disabled}">8 <input type="submit" value="{lang_create_computers}" style="{add_computers_disabled}"> 9 9 <input type="button" value="{lang_back}" onClick="document.location.href='{back_url}'"> 10 10 </form> … … 26 26 <table border="0" width="90%"> 27 27 <tr bgcolor="{th_bg}"> 28 <td width="20%" align="center">{lang_computer s_uid}</td>28 <td width="20%" align="center">{lang_computer_uid}</td> 29 29 <td width="60%" align="center">{lang_description}</td> 30 30 <td width="6%" align="center">{lang_edit}</td> -
trunk/expressoAdmin1_2/templates/default/computers_delete.tpl
r2 r414 1 <!-- BEGIN body --> 1 2 <form name="form" method="POST" action="{delete_action}"> 2 3 <input type="hidden" name="computer_dn" value="{computer_dn}"> … … 12 13 <td align="center"> 13 14 <font size="5"> 14 {lang_d elete_computer}15 {lang_do_you_really_want_delete_this_computer}? 15 16 </font> 16 17 <font size="5" color="red"> … … 37 38 </table> 38 39 </form> 40 <!-- END body --> -
trunk/expressoAdmin1_2/templates/default/computers_form.tpl
r309 r414 1 <!-- BEGIN body --> 1 2 <table border="0" width="90%" align="center"> 2 3 <tr> … … 45 46 46 47 <tr bgcolor={row_off}> 47 <td>{lang_ sambadomain}:</td>48 <td>{lang_domain}:</td> 48 49 <td> 49 50 <select {disabled_samba} name="sambasid"> … … 54 55 55 56 <tr bgcolor={row_off}> 56 <td width="25%">{lang_computer_ cn}:</td>57 <td width="25%">{lang_computer_uid}:</td> 57 58 <td> 58 59 <input name="computer_cn" size="25" value="{computer_cn}" {disabled} autocomplete="off"> … … 73 74 74 75 <tr id="tr_computer_password" bgcolor={row_on} style="{display_tr_computer_password}"> 75 <td width="25%">{lang_ computer_password}:</td>76 <td width="25%">{lang_password}:</td> 76 77 <td> 77 78 <input type="password" name="computer_password" size="25" {disabled} autocomplete="off"> … … 79 80 </tr> 80 81 <tr bgcolor={row_on}> 81 <td width="25%">{lang_ computer_description}:</td>82 <td width="25%">{lang_description}:</td> 82 83 <td> 83 84 <input name="computer_description" size="60" value="{computer_description}" {disabled} autocomplete="off"> … … 115 116 } 116 117 </script> 118 <!-- END body --> -
trunk/expressoAdmin1_2/templates/default/domains.tpl
r27 r414 14 14 <table border="0" width="75%" align="center"> 15 15 <tr bgcolor="{th_bg}"> 16 <td width="30%">{lang_samba domainsname}</td>16 <td width="30%">{lang_samba_domains_name}</td> 17 17 <td width="70%">{lang_sambaSID}</td> 18 18 <td width="1%">{lang_delete}</td> -
trunk/expressoAdmin1_2/templates/default/domains_form.tpl
r27 r414 11 11 12 12 <tr bgcolor={row_off}> 13 <td>{lang_ name}:</td>13 <td>{lang_samba_domain_name}:</td> 14 14 <td><input type="text" autocomplete="off" name="sambadomainname" value="{sambadomainname}"></td> 15 15 </tr> 16 16 17 17 <tr bgcolor={row_on}> 18 <td>{lang_s id}:</td>18 <td>{lang_samba_domain_sid}:</td> 19 19 <td><input type="text" autocomplete="off" size=45 name="sambasid" value="{sambasid}"></td> 20 20 </tr> -
trunk/expressoAdmin1_2/templates/default/groups_form.tpl
r309 r414 1 <!-- BEGIN list --> 1 2 <table border="0" width="90%" align="center"> 2 3 <tr> … … 38 39 <table border="0"> 39 40 <tr bgcolor={row_on}> 40 <td> Usar atributos Samba:</td>41 <td>{lang_use_samba_attributes}:</td> 41 42 <td> 42 43 <input type="checkbox" {use_attrs_samba_checked} name="use_attrs_samba" onChange="javascript:use_samba_attrs(this.checked)"> … … 44 45 </tr> 45 46 <tr> 46 <td> Domínio:</td>47 <td>{lang_domain}:</td> 47 48 <td> 48 49 <select {disabled_samba} name="sambasid" id="ea_combo_sambadomains"> … … 53 54 </table> 54 55 </div> 55 Ocultar este grupo no Expresso? <input type="checkbox" {phpgwaccountvisible_checked} name="phpgwaccountvisible"><br>56 {lang_do_not_show_this_group}? <input type="checkbox" {phpgwaccountvisible_checked} name="phpgwaccountvisible"><br> 56 57 57 58 <b>{lang_group_users} (<font color=red>{user_count}</font>):</b><br> … … 63 64 <button type="button" onClick="javascript:add_user2group();"><img src="expressoAdmin1_2/templates/default/images/add.png" style="vertical-align: middle;" > {lang_add_user}</button> 64 65 <br><br> 65 <button type="button" onClick="javascript:remove_user2group();"><img src="expressoAdmin1_2/templates/default/images/rem.png" style="vertical-align: middle;" > {lang_rem _user}</button>66 <button type="button" onClick="javascript:remove_user2group();"><img src="expressoAdmin1_2/templates/default/images/rem.png" style="vertical-align: middle;" > {lang_remove_user}</button> 66 67 </td> 67 68 68 69 <td valign="bottom" bgcolor="#DDDDDD"> 69 Organizações:<br>70 {lang_organizations}:<br> 70 71 <select name="org_context" id="ea_combo_org_groups" onchange="javascript:get_available_users(this.value, ea_check_allUsers.checked);">{combo_all_orgs}</select> 71 72 72 73 <br> 73 <input type="checkbox" name="ea_check_allUsers" id="ea_check_allUsers" onclick="javascript:get_available_users(org_context.value, this.checked);">{lang_ all_users}.74 <input type="checkbox" name="ea_check_allUsers" id="ea_check_allUsers" onclick="javascript:get_available_users(org_context.value, this.checked);">{lang_show_users_from_all_sub-organizations}. 74 75 <br><br> 75 76 76 Procurar usuário:<br>77 {lang_search_user}:<br> 77 78 <input id="ea_input_searchUser" size="35" autocomplete="off" onkeyup="javascript:optionFinderTimeout(this)"><br> 78 79 79 80 <font color="red"><span id="ea_span_searching"> </span></font> 80 81 <br> 81 <b> Usuários:</b>82 <b>{lang_users}:</b> 82 83 <select id="ea_select_available_users" style="width: 400px" multiple size="13"></select> 83 84 </td> … … 105 106 </tr> 106 107 </table> 108 <!-- END list --> -
trunk/expressoAdmin1_2/templates/default/logs.tpl
r309 r414 62 62 <table border="0" width="90%"> 63 63 <tr bgcolor="{th_bg}"> 64 <td width="10%" align="center">{lang_date}</td> 64 65 <td width="10%" align="center">{lang_manager_lid}</td> 65 66 <td width="35%" align="center">{lang_action}</td> 66 <td width="35%" align="center">{lang_date}</td> 67 <td width="5%" align="center">{lang_view}</td> 67 <td width="35%" align="center">{lang_about}</td> 68 68 </tr> 69 69 {rows} … … 73 73 <!-- BEGIN row --> 74 74 <tr bgcolor="{tr_color}"> 75 <td width="10%" align="center" NOWRAP>{row_date}</td> 75 76 <td width="10%" align="center">{row_manager_lid}</td> 76 <td width="35%" align="center">{row_action}</td> 77 <td width="35%" align="center">{row_date}</td> 78 <td width="5%" align="center">{row_view}</td> 77 <td width="35%" align="left">{row_action}</td> 78 <td width="5%" align="center">{row_about}</td> 79 79 </tr> 80 80 <!-- END row --> -
trunk/expressoAdmin1_2/templates/default/maillists.tpl
r309 r414 26 26 <table border="0" width="95%"> 27 27 <tr bgcolor="{th_bg}"> 28 <td width="20%">{lang_email_lists_ uid}</td>28 <td width="20%">{lang_email_lists_logins}</td> 29 29 <td width="40%">{lang_email_lists_names}</td> 30 30 <td width="40%">{lang_email}</td> -
trunk/expressoAdmin1_2/templates/default/maillists_form.tpl
r309 r414 1 <!-- BEGIN body --> 1 2 <table border="0" width="90%" align="center"> 2 3 <tr> … … 29 30 <select id="ea_combo_org_info" name="context" onchange="javascript:sinc_combos_org(this.value, ea_check_allUsers.checked);">{combo_manager_org}</select><br> 30 31 31 {lang_maillist_ uid}: <font color="blue">Ex: lista-celepar-rh</font>32 {lang_maillist_login}: <font color="blue">Ex: lista-celepar-rh</font> 32 33 <input id="ea_maillist_uid" name="uid" size="35" value="{uid}" autocomplete="off" onblur="javascript:emailSuggestion_maillist();"><br> 33 34 … … 38 39 <input name="cn" size="60" value="{cn}" autocomplete="off"><br> 39 40 40 Lista de E-mail está ativa: <input type="checkbox" {accountStatus_checked} name="accountStatus"><br>41 Ocultar Lista de E-mail??: <input type="checkbox" {phpgwAccountVisible_checked} name="phpgwAccountVisible"><br>41 {lang_e-mail_list_is_active}: <input type="checkbox" {accountStatus_checked} name="accountStatus"><br> 42 {lang_do_not_show_this_e-mail_list}??: <input type="checkbox" {phpgwAccountVisible_checked} name="phpgwAccountVisible"><br> 42 43 43 44 <b>{lang_maillist_users} (<font color=red>{user_count}</font>):</b><br> … … 49 50 <button type="button" onClick="javascript:add_user2maillist();"><img src="expressoAdmin1_2/templates/default/images/add.png" style="vertical-align: middle;" > {lang_add_user}</button> 50 51 <br><br> 51 <button type="button" onClick="javascript:remove_user2maillist();"><img src="expressoAdmin1_2/templates/default/images/rem.png" style="vertical-align: middle;" > {lang_rem _user}</button>52 <button type="button" onClick="javascript:remove_user2maillist();"><img src="expressoAdmin1_2/templates/default/images/rem.png" style="vertical-align: middle;" > {lang_remove_user}</button> 52 53 </td> 53 54 … … 60 61 <select name="org_context" id="ea_combo_org_maillists" onchange="javascript:get_available_users(this.value, ea_check_allUsers.checked);">{combo_all_orgs}</select> 61 62 <br> 62 <input type="checkbox" name="ea_check_allUsers" id="ea_check_allUsers" onclick="javascript:get_available_users(org_context.value, this.checked);">{lang_ all_users}.63 <input type="checkbox" name="ea_check_allUsers" id="ea_check_allUsers" onclick="javascript:get_available_users(org_context.value, this.checked);">{lang_show_users_from_all_sub-organizations}. 63 64 <br><br> 64 65 … … 68 69 <font color="red"><span id="ea_span_searching"> </span></font> 69 70 <br> 70 <b> Usuários:</b>71 <b>{lang_users}:</b> 71 72 <select id="ea_select_available_users" style="width:400px; height:200px" multiple size="13"></select> 72 73 </td> … … 84 85 </tr> 85 86 </table> 87 <!-- END body --> -
trunk/expressoAdmin1_2/templates/default/maillists_scl.tpl
r309 r414 1 <!-- BEGIN body --> 1 2 <table border="0" width="90%" align="center"> 2 3 <tr> … … 21 22 <tr> 22 23 <td width="25%" valign="bottom" bgcolor="#DDDDDD"> 23 Email da Lista:<br><b><span style="color:red;">{mail}<span></b><br><br>24 Aplicar controle de envio a esta lista ?<input type="checkbox" {accountRestrictive_checked} name="accountRestrictive"><br>25 Participantes da lista podem enviar email? <input type="checkbox" {participantCanSendMail_checked} name="participantCanSendMail"><br>24 {lang_e-mail_list}:<br><b><span style="color:red;">{mail}<span></b><br><br> 25 {lang_apply_send_control_list_to_this_list}?<input type="checkbox" {accountRestrictive_checked} name="accountRestrictive"><br> 26 {lang_participants_from_the_list_can_send_e-mail_to_this_list}? <input type="checkbox" {participantCanSendMail_checked} name="participantCanSendMail"><br> 26 27 <br> 27 <b> Usuários que podem enviar email para esta lista:</b><br>28 <b>{lang_users_who_can_send_e-mail_to_this_list}:</b><br> 28 29 <select id="ea_select_users_SCL_Maillist" name="members[]" style="width:400px; height:200px" multiple size="13">{ea_select_users_SCL_Maillist}</select> 29 30 </td> … … 33 34 <button type="button" onClick="javascript:add_user2scl_maillist();"><img src="expressoAdmin1_2/templates/default/images/add.png" style="vertical-align: middle;" > {lang_add_user}</button> 34 35 <br><br> 35 <button type="button" onClick="javascript:remove_user2scl_maillist();"><img src="expressoAdmin1_2/templates/default/images/rem.png" style="vertical-align: middle;" > {lang_rem _user}</button>36 <button type="button" onClick="javascript:remove_user2scl_maillist();"><img src="expressoAdmin1_2/templates/default/images/rem.png" style="vertical-align: middle;" > {lang_remove_user}</button> 36 37 </td> 37 38 38 39 <td valign="bottom" bgcolor="#DDDDDD"> 39 Organizações:<br>40 {lang_organizations}:<br> 40 41 <select name="org_context" id="ea_combo_org_maillists" onchange="javascript:get_available_users(this.value, ea_check_allUsers.checked);">{combo_org}</select> 41 42 42 43 <br> 43 <input type="checkbox" name="ea_check_allUsers" id="ea_check_allUsers" onclick="javascript:get_available_users(org_context.value, this.checked);">{lang_all_users}. 44 <input type="checkbox" name="ea_check_allUsers" id="ea_check_allUsers" onclick="javascript:get_available_users(org_context.value, this.checked);"> 45 {lang_show_users_from_all_sub-organizations}. 44 46 <br><br> 45 47 46 Procurar usuário:<br>48 {lang_search_user}:<br> 47 49 <input id="ea_input_searchUser" size="35" autocomplete="off" onkeyup="javascript:optionFinderTimeout(this)"><br> 48 50 49 51 <font color="red"><span id="ea_span_searching"> </span></font> 50 52 <br> 51 <b> Usuários:</b>53 <b>{lang_users}:</b> 52 54 <select id="ea_select_available_users" style="width:400px; height:200px" multiple size="13"></select> 53 55 </td> … … 65 67 </tr> 66 68 </table> 69 <!-- END body --> -
trunk/expressoAdmin1_2/templates/default/managers_form.tpl
r317 r414 102 102 <td><input type="checkbox" name="acl_manipulate_corporative_information" value="268435456" {acl_manipulate_corporative_information}></td> 103 103 </tr> 104 105 104 <tr bgcolor="{color_font2}" align='right'> 106 105 <td>{lang_view_user}:</td> 107 106 <td><input type="checkbox" name="acl_view_users" value="33554432" {acl_view_users}></td> 108 109 107 <td>{lang_add_institutional_accounts}:</td> 110 108 <td><input type="checkbox" name="acl_add_institutional_accounts" value="4294967296" {acl_add_institutional_accounts}></td> … … 113 111 <td>{lang_edit_users_picture}:</td> 114 112 <td><input type="checkbox" name="acl_edit_users_picture" value="536870912" {acl_edit_users_picture}></td> 115 116 113 <td>{lang_edit_institutional_accounts}:</td> 117 114 <td><input type="checkbox" name="acl_edit_institutional_accounts" value="8589934592" {acl_edit_institutional_accounts}></td> … … 120 117 <td>{lang_edit_users_phonenumber}:</td> 121 118 <td><input type="checkbox" name="acl_edit_users_phonenumber" value="2147483648" {acl_edit_users_phonenumber}></td> 122 123 119 <td>{lang_remove_institutional_accounts}:</td> 124 120 <td><input type="checkbox" name="acl_remove_institutional_accounts" value="17179869184" {acl_remove_institutional_accounts}></td> 125 121 </tr> 126 127 122 <tr bgcolor="{color_font1}" align='right'> 128 123 <td>{lang_change_users_password}:</td> -
trunk/expressoAdmin1_2/templates/default/sectors.tpl
r309 r414 19 19 <table border="0" width="55%" align="center"> 20 20 <tr bgcolor="{th_bg}"> 21 <td>{ header_name}</td>21 <td>{lang_name}</td> 22 22 <td>{lang_add_sub_sectors}</td> 23 <td>{ header_edit}</td>24 <td>{ header_delete}</td>23 <td>{lang_edit}</td> 24 <td>{lang_delete}</td> 25 25 </tr> 26 26 {rows} -
trunk/expressoAdmin1_2/templates/default/sectors_delete.tpl
r2 r414 1 <!-- BEGIN list --> 1 2 <form name="form" method="POST" action="{action}"> 2 3 <input type="hidden" name="dn" value="{dn}"> … … 13 14 <td align="center"> 14 15 <font size="5"> 15 {lang_d elete_sector}16 {lang_do_you_realy_want_delete_this_sector}? 16 17 </font> 17 18 <font size="5" color="red"> … … 24 25 <td align="left"> 25 26 <font size="3" color="red"> 26 {lang_ obs}27 {lang_all_users_groups_and_sub-sectors_from_this_sector_will_be_delete} 27 28 </font> 28 29 </td> … … 31 32 <td align="left"> 32 33 <font size="3"> 33 {lang_ content_the_users}:34 {lang_users_from_the_ou}: 34 35 </font> 35 36 <br> … … 42 43 <td align="left"> 43 44 <font size="3"> 44 {lang_ content_the_groups}:45 {lang_groups_from_the_ou}: 45 46 </font> 46 47 <br> … … 53 54 <td align="left"> 54 55 <font size="3"> 55 {lang_ content_the_sectors}:56 {lang_sectors_from_the_ou}: 56 57 </font> 57 58 <br> … … 60 61 </td> 61 62 </tr> 62 63 63 64 64 <tr> … … 70 70 </table> 71 71 </form> 72 <!-- END list --> -
trunk/expressoAdmin1_2/templates/default/sectors_form.tpl
r396 r414 19 19 <tr> 20 20 <td> 21 {lang_ occult_ou}:21 {lang_do_not_show_this_sector}: 22 22 </td> 23 23 <td>
Note: See TracChangeset
for help on using the changeset viewer.