Changeset 73
- Timestamp:
- 09/25/07 08:53:01 (17 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 15 edited
-
expressoAdmin1_2/inc/class.uicomputers.inc.php (modified) (4 diffs)
-
expressoAdmin1_2/inc/class.uigroups.inc.php (modified) (3 diffs)
-
expressoAdmin1_2/inc/class.uimaillists.inc.php (modified) (5 diffs)
-
expressoAdmin1_2/js/jscode/computers.js (added)
-
expressoAdmin1_2/js/jscode/groups.js (modified) (1 diff)
-
expressoAdmin1_2/js/jscode/maillists.js (modified) (1 diff)
-
expressoAdmin1_2/setup/phpgw_pt-br.lang (modified) (previous)
-
expressoAdmin1_2/templates/default/computers_form.tpl (modified) (1 diff)
-
expressoAdmin1_2/templates/default/groups_form.tpl (modified) (1 diff)
-
expressoAdmin1_2/templates/default/maillists_form.tpl (modified) (2 diffs)
-
expressoMail1_2/js/search.js (modified) (9 diffs)
-
instant_messenger/inc/class.Ujabber.inc.php (modified) (1 diff)
-
instant_messenger/js/im_functions.js (modified) (2 diffs)
-
instant_messenger/js/im_images.js (modified) (1 diff)
-
instant_messenger/setup/phpgw_pt-br.lang (modified) (previous)
-
instant_messenger/templates/default/images/wait.gif (added)
-
preferences/setup/phpgw_pt-br.lang (modified) (previous)
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoAdmin1_2/inc/class.uicomputers.inc.php
r64 r73 40 40 $c->read_repository(); 41 41 $this->current_config = $c->config_data; 42 43 if(!@is_object($GLOBALS['phpgw']->js)) 44 { 45 $GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript'); 46 } 47 $GLOBALS['phpgw']->js->validate_file('jscode','computers','expressoAdmin1_2');#diretorio, arquivo.js, aplicacao 42 48 } 43 49 … … 220 226 'lang_back' => lang('Back'), 221 227 'lang_save' => lang('save'), 228 'lang_search_organization' => lang('Search Organiztion'), 229 'lang_organizations' => lang('Organizations'), 222 230 'lang_sectors' => lang('Sectors'), 223 231 'lang_sambadomain' => lang('Domain'), … … 358 366 'old_computer_context' => $computer_data['context'], 359 367 'old_sambasid' => $computer_data['sambasid'], 368 369 'row_on' => "#DDDDDD", 370 'row_off' => "#EEEEEE", 371 '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 387 'display_tr_computer_password' => $computer_data['sambaAcctFlags'] == '[I ]' ? '' : 'display:none', 388 389 'computer_cn' => $computer_data['computer_cn'], 390 'computer_dn' => $computer_data['dn'], 391 'computer_description' => $computer_data['computer_description'], 392 'combo_sectors' => $sectors, 393 'sambadomainname_options' => $sambadomainname_options, 394 395 // LINKS 396 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uicomputers.list_computers'), 397 'form_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uicomputers.validade_computers_data_edit') 398 ); 399 $p->set_var($var); 400 401 if ($computer_data['sambaAcctFlags'] != '') 402 { 403 switch($computer_data['sambaAcctFlags']) 404 { 405 case '[W ]': 406 $p->set_var('active_workstation_selected', 'selected'); 407 break; 408 case '[DW ]': 409 $p->set_var('desactive_workstation_selected', 'selected'); 410 break; 411 case '[I ]': 412 $p->set_var('trust_account_selected', 'selected'); 413 break; 414 case '[S ]': 415 $p->set_var('server_selected', 'selected'); 416 break; 417 } 418 } 419 } 420 else // DEMAIS VEZES 421 { 422 // Pega combo das organizações e seleciona um dos setores em caso de um erro na validaçao dos dados. 423 foreach ($manager_contexts as $index=>$context) 424 $sectors .= $this->functions->get_organizations($context, trim(strtolower($_POST['sector_context']))); 425 //$sectors = $this->functions->get_organizations($manager_contexts); 426 427 // Cria combo de dominios do samba 428 if ($this->current_config['expressoAdmin_samba_support'] == 'true') 429 { 430 $a_sambadomains = $this->db_functions->get_sambadomains_list(); 431 $sambadomainname_options = ''; 432 if (count($a_sambadomains)) 433 { 434 foreach ($a_sambadomains as $a_sambadomain) 435 { 436 if ($a_sambadomain['samba_domain_sid'] == $_POST['sambasid']) 437 $sambadomainname_options .= "<option value='" . $a_sambadomain['samba_domain_sid'] . "' SELECTED>" . $a_sambadomain['samba_domain_name'] . "</option>"; 438 else 439 $sambadomainname_options .= "<option value='" . $a_sambadomain['samba_domain_sid'] . "'>" . $a_sambadomain['samba_domain_name'] . "</option>"; 440 } 441 } 442 } 443 444 $var = Array( 445 // LINKS 446 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uicomputers.list_computers'), 447 'form_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uicomputers.validade_computers_data_edit'), 360 448 361 449 'row_on' => "#DDDDDD", … … 374 462 'lang_server' => lang('Server'), 375 463 'lang_computer_password' => lang('Computer password'), 376 377 'display_tr_computer_password' => $computer_data['sambaAcctFlags'] == '[I ]' ? '' : 'display:none',378 379 'computer_cn' => $computer_data['computer_cn'],380 'computer_dn' => $computer_data['dn'],381 'computer_description' => $computer_data['computer_description'],382 'combo_sectors' => $sectors,383 'sambadomainname_options' => $sambadomainname_options,384 385 // LINKS386 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uicomputers.list_computers'),387 'form_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uicomputers.validade_computers_data_edit')388 );389 $p->set_var($var);390 391 if ($computer_data['sambaAcctFlags'] != '')392 {393 switch($computer_data['sambaAcctFlags'])394 {395 case '[W ]':396 $p->set_var('active_workstation_selected', 'selected');397 break;398 case '[DW ]':399 $p->set_var('desactive_workstation_selected', 'selected');400 break;401 case '[I ]':402 $p->set_var('trust_account_selected', 'selected');403 break;404 case '[S ]':405 $p->set_var('server_selected', 'selected');406 break;407 }408 }409 }410 else // DEMAIS VEZES411 {412 // Pega combo das organizações e seleciona um dos setores em caso de um erro na validaçao dos dados.413 foreach ($manager_contexts as $index=>$context)414 $sectors .= $this->functions->get_organizations($context, trim(strtolower($_POST['sector_context'])));415 //$sectors = $this->functions->get_organizations($manager_contexts);416 417 // Cria combo de dominios do samba418 if ($this->current_config['expressoAdmin_samba_support'] == 'true')419 {420 $a_sambadomains = $this->db_functions->get_sambadomains_list();421 $sambadomainname_options = '';422 if (count($a_sambadomains))423 {424 foreach ($a_sambadomains as $a_sambadomain)425 {426 if ($a_sambadomain['samba_domain_sid'] == $_POST['sambasid'])427 $sambadomainname_options .= "<option value='" . $a_sambadomain['samba_domain_sid'] . "' SELECTED>" . $a_sambadomain['samba_domain_name'] . "</option>";428 else429 $sambadomainname_options .= "<option value='" . $a_sambadomain['samba_domain_sid'] . "'>" . $a_sambadomain['samba_domain_name'] . "</option>";430 }431 }432 }433 434 $var = Array(435 // LINKS436 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uicomputers.list_computers'),437 'form_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uicomputers.validade_computers_data_edit'),438 439 'row_on' => "#DDDDDD",440 'row_off' => "#EEEEEE",441 'color_bg1' => "#E8F0F0",442 'lang_back' => lang('Back'),443 'lang_save' => lang('save'),444 'lang_sectors' => lang('Sectors'),445 'lang_sambadomain' => lang('Domain'),446 'lang_computer_cn' => lang('Computer UID'),447 'lang_computer_description' => lang('Description'),448 'lang_computer_type' => lang('Computer Type'),449 'lang_active_workstation' => lang('WorkStation Active'),450 'lang_desactive_workstation' => lang('WorkStation Desactive'),451 'lang_trust_account' => lang('Trust Account'),452 'lang_server' => lang('Server'),453 'lang_computer_password' => lang('Computer password'),454 464 455 465 // Retorna os valores, quando da um erro na validação. -
trunk/expressoAdmin1_2/inc/class.uigroups.inc.php
r64 r73 234 234 'lang_back' => lang('Back'), 235 235 'lang_save' => lang('save'), 236 'lang_group_organization' => lang('Group Organization'), 237 'lang_search_organization' => lang('Search Organiztion'), 236 238 'lang_org' => lang('Organizations'), 237 239 'lang_group_name' => lang('group name'), … … 318 320 319 321 $opt_tmp_users = '<option value="-1" disabled>----------------------------- Usuários ---------------------------- </option>'."\n"; 320 $opt_tmp_unknow = '<option value="-1" disabled>------------ -------- Usuários não encontrados ------------------</option>'."\n";322 $opt_tmp_unknow = '<option value="-1" disabled>------------ Usuários não encontrados no BD, somente no LDAP ------------</option>'."\n"; 321 323 $ea_select_usersInGroup = $unknow != '' ? $opt_tmp_unknow . $unknow . $opt_tmp_users . $users : $opt_tmp_users . $users; 322 324 } … … 350 352 'lang_back' => lang('Back'), 351 353 'lang_save' => lang('save'), 354 'lang_group_organization' => lang('Group Organization'), 355 'lang_search_organization' => lang('Search Organiztion'), 352 356 'lang_org' => lang('Organizations'), 353 357 'lang_group_name' => lang('group name'), -
trunk/expressoAdmin1_2/inc/class.uimaillists.inc.php
r64 r73 201 201 'lang_back' => lang('Back'), 202 202 'lang_save' => lang('save'), 203 'lang_maillist_organization'=> lang('Maillist Organization'), 204 'lang_search_organization' => lang('Search Organiztion'), 203 205 'lang_org' => lang('Organizations'), 204 206 'lang_maillist_uid' => lang('Maillist login'), … … 248 250 249 251 // Usuarios da lista. 252 $user_count = 0; 250 253 if (count($maillist_info['members_info']) > 0) 251 254 { … … 259 262 foreach ($array_users as $uidnumber=>$cn) 260 263 { 264 $user_count++; 261 265 if ($array_users_type[$uidnumber] == 'u') 262 266 { … … 295 299 'lang_back' => lang('Back'), 296 300 'lang_save' => lang('save'), 301 'lang_maillist_organization'=> lang('Maillist Organization'), 302 'lang_search_organization' => lang('Search Organiztion'), 297 303 'lang_org' => lang('Organizations'), 298 304 'lang_maillist_uid' => lang('Maillist login'), … … 309 315 'mail' => $maillist_info['mail'], 310 316 'cn' => $maillist_info['cn'], 317 'user_count' => $user_count, 311 318 'accountStatus_checked' => $maillist_info['accountStatus'] == 'active' ? 'CHECKED' : '', 312 319 'phpgwAccountVisible_checked' => $maillist_info['phpgwAccountVisible'] == '-1' ? 'CHECKED' : '', -
trunk/expressoAdmin1_2/js/jscode/groups.js
r47 r73 367 367 } 368 368 } 369 370 function search_organization(key) 371 { 372 var organizations = document.getElementById('ea_combo_org_info'); 373 var RegExp_org = new RegExp("\\b"+key, "i"); 374 375 for(i = 0; i < organizations.length; i++) 376 { 377 if (RegExp_org.test(organizations[i].text)) 378 { 379 organizations[i].selected = true; 380 return; 381 } 382 } 383 } -
trunk/expressoAdmin1_2/js/jscode/maillists.js
r23 r73 366 366 } 367 367 } 368 369 function search_organization(key) 370 { 371 var organizations = document.getElementById('ea_combo_org_info'); 372 var RegExp_org = new RegExp("\\b"+key, "i"); 373 374 for(i = 0; i < organizations.length; i++) 375 { 376 if (RegExp_org.test(organizations[i].text)) 377 { 378 organizations[i].selected = true; 379 return; 380 } 381 } 382 } -
trunk/expressoAdmin1_2/templates/default/computers_form.tpl
r27 r73 30 30 31 31 <table border=0 width=100%> 32 <tr bgcolor={row_off}> 33 <td>{lang_search_organization}:</td> 34 <td><input type="text" id="organization_search" autocomplete="off" size=20 onKeyUp="javascript:search_organization(this.value);"></td> 35 </tr> 36 32 37 <tr bgcolor={row_on}> 33 38 <td> 34 {lang_ sectors}:39 {lang_organizations}: 35 40 </td> 36 41 <td> 37 <select name="sector_context" {disabled} {combo_sectors}42 <select id="ea_combo_org_info" name="sector_context" {disabled} {combo_sectors} 38 43 </td> 39 44 </tr> -
trunk/expressoAdmin1_2/templates/default/groups_form.tpl
r47 r73 23 23 <tr> 24 24 <td width="25%" bgcolor="#DDDDDD"> 25 Organização do Grupo:<br> 25 {lang_search_organization}:<br> 26 <input type="text" id="organization_search" autocomplete="off" size=20 onKeyUp="javascript:search_organization(this.value);" onBlur="javascript:sinc_combos_org(context.value, ea_check_allUsers.checked); get_available_sambadomains(context.value, '{type}')"> 27 <br> 28 {lang_group_organization}:<br> 26 29 <select id="ea_combo_org_info" name="context" onchange="javascript:sinc_combos_org(this.value, ea_check_allUsers.checked); get_available_sambadomains(this.value, '{type}')">{combo_manager_org}</select><br> 27 30 {lang_group_name}: <font color="blue">Ex: grupo-celepar-rh</font> -
trunk/expressoAdmin1_2/templates/default/maillists_form.tpl
r23 r73 22 22 <tr> 23 23 <td width="25%" bgcolor="#DDDDDD"> 24 Organização da Lista:<br> 25 <select name="context" onchange="javascript:sinc_combos_org(this.value, ea_check_allUsers.checked);">{combo_org}</select><br> 24 {lang_search_organization}:<br> 25 <input type="text" id="organization_search" autocomplete="off" size=20 onKeyUp="javascript:search_organization(this.value);" onBlur="javascript:sinc_combos_org(context.value, ea_check_allUsers.checked);"> 26 <br> 27 {lang_maillist_organization}:<br> 28 <select id="ea_combo_org_info" name="context" onchange="javascript:sinc_combos_org(this.value, ea_check_allUsers.checked);">{combo_org}</select><br> 26 29 {lang_maillist_uid}: <font color="blue">Ex: lista-celepar-rh</font> 27 30 <input name="uid" size="35" value="{uid}" autocomplete="off"><br> … … 36 39 Ocultar Lista de E-mail ??: <input type="checkbox" {phpgwAccountVisible_checked} name="phpgwAccountVisible"><br> 37 40 38 <b>{lang_maillist_users} :</b><br>41 <b>{lang_maillist_users} (<font color=red>{user_count}</font>):</b><br> 39 42 <select id="ea_select_usersInMaillist" name="members[]" style="width:400px; height:200px" multiple size="13">{ea_select_usersInMaillist}</select> 40 43 </td> -
trunk/expressoMail1_2/js/search.js
r72 r73 161 161 // Form resultado; 162 162 searchE.prototype.mount_result = function(data){ 163 164 163 //This func returns the most recent date 165 164 function date_comp(a,b) … … 168 167 data1 = data1[0].substr(0, data1[0].indexOf('--')) 169 168 with ( data1 ) 170 data1 = Date.UTC(substr( -4), substr(-7, 2), substr(0, 2));169 data1 = Date.UTC(substr(6), substr(3, 2), substr(0, 2)); 171 170 var data2 = b.match(/\d{2}\/\d{2}\/\d{4}--\d+? \w*b--\d*$/g); 172 171 data2 = data2[0].substr(0, data2[0].indexOf('--')) 173 with ( data2 ) 174 data2 = Date.UTC(substr( -4), substr(-7, 2), substr(0, 2));172 with ( data2 ) 173 data2 = Date.UTC(substr(6), substr(3, 2), substr(0, 2)); 175 174 return data2 - data1; 176 175 } 176 177 177 var nw_array = new Array; 178 178 data = data.substr(2, data.length - 4); … … 180 180 var cont = parseInt(0); 181 181 var_tmp.sort(date_comp); 182 183 182 for(var i=0; i < var_tmp.length; i++){ 184 183 if(var_tmp[i] != ""){ … … 187 186 } 188 187 } 189 190 188 var table = document.createElement("TABLE"); 191 189 table.id = "table_result"; … … 236 234 if( j <= 4){ 237 235 if( j == 0){ 238 td.style.width = " 10%";236 td.style.width = "20%"; 239 237 var nm_box = aux[0].split(cyrus_delimiter); 240 238 var td1 = nm_box.pop(); … … 247 245 if( j == 1){ 248 246 var subject_encode = url_encode(aux[2]); 249 td.width = "2 5%";247 td.width = "20%"; 250 248 var td1 = '<div style="width:100%;overflow:hidden">'+aux[1]+"</div>"; 251 249 } 252 250 if( j == 2){ 253 251 var subject_encode = url_encode(aux[2]); 254 td.width = "4 5%";252 td.width = "40%"; 255 253 var td1 = '<div style="width:100%;overflow:hidden"><a href=javascript:void(0) onclick=EsearchE.open_msg(\"' + url_encode(mailbox) + '\",\"' + uid_msg + '\",\"' + subject_encode + '\")>' + aux[2] +'</a></div>'; 256 254 … … 275 273 } 276 274 table.appendChild(tbody); 275 277 276 search_tabs += 1; 278 277 var border_id = create_border(get_lang("Search Results"), "search_" + search_tabs); … … 284 283 var table_element = document.createElement("TABLE"); 285 284 var tbody_element = document.createElement("TBODY"); 285 table_element.border = 1; 286 286 table_element.setAttribute("id", "table_message_header_box"); 287 287 table_element.className = "table_message_header_box"; … … 289 289 tr_element.className = "message_header"; 290 290 td_element1 = document.createElement("TD"); 291 td_element1.setAttribute("width", " 10%");291 td_element1.setAttribute("width", "20%"); 292 292 td_element1.align = "left"; 293 293 td_element1.innerHTML = get_lang("Folder"); 294 294 td_element2 = document.createElement("TD"); 295 td_element2.setAttribute("width", " 35%");295 td_element2.setAttribute("width", "20%"); 296 296 td_element2.align = "left"; 297 297 td_element2.innerHTML = get_lang("Who"); 298 298 td_element3 = document.createElement("TD"); 299 td_element3.setAttribute("width", " 35%");299 td_element3.setAttribute("width", "40%"); 300 300 td_element3.align = "left"; 301 301 td_element3.innerHTML = get_lang("Subject"); -
trunk/instant_messenger/inc/class.Ujabber.inc.php
r72 r73 10 10 { 11 11 $return = null; 12 13 if($_SESSION['phpgw_info']['instant_messenger']['IM_disconnect']) 14 { 15 $_SESSION['phpgw_info']['instant_messenger']['IM_disconnect'] = false; 16 return "disconnected"; 17 } 12 18 13 19 $_SESSION['phpgw_info']['instant_messenger']['timeClient'] = time(); -
trunk/instant_messenger/js/im_functions.js
r72 r73 35 35 try 36 36 { 37 var data = XMLdata.documentElement; 38 if ( data.hasChildNodes() ) 39 { 40 data = data.firstChild; 41 if ( data.nodeType == 3 && data.nodeValue == 'disconnected' ) 42 { 43 document.getElementById('div_contacts').innerHTML = '<a href="javascript:void(0);" onclick="javascript:IM.reconnect();">'+_this.get_lang("Re-connect Expresso Messenger ?")+'</a>'; 44 _this.ImgStatus('unavailable'); 45 statusFlag = 'unavailable'; 46 clearTimeout(_awayTimer); 47 return false; 48 } 49 } 50 37 51 if( !_this.userPrefe ) 38 52 { … … 61 75 XMLTools.request('$this.Ujabber.listen', 'GET', handler); 62 76 }; 77 78 IM.prototype.reconnect = function() 79 { 80 var _this = this; 81 var handler_reconnect = function(XMLdata) 82 { 83 if ( XMLdata.documentElement.firstChild.nodeValue == 'true' ) 84 { 85 document.getElementById('div_contacts').innerHTML = '<div><img src="' + img_wait.src + '" width="25px" heigth="25px" style="float:left;margin:3px "/>'; 86 document.getElementById('div_contacts').innerHTML += '<font style="color:#0000FF;float:left;margin:9px 5px">' + _this.get_lang("Wait a moment !!") + '</font></div>'; 87 _this.listen(); 88 _this.requireContacts(); 89 _this.Vcard(); 90 _this.count_Vcard = 0; 91 _this.ImgStatus('available'); 92 statusFlag = 'available'; 93 _awayTimer = setTimeout("IM.setAway()", parseInt(IM_Preferences.im_timer_xa) * 60000 ); 94 }else{ 95 document.getElementById('div_contacts').innerHTML = '<a href="javascript:void(0);" onclick="javascript:IM.reconnect();">'+_this.get_lang("Re-connect Expresso Messenger ?")+'</a>'; 96 _this.ImgStatus('unavailable'); 97 statusFlag = 'unavailable'; 98 return false; 99 } 100 }; 101 XMLTools.__RETURN_MODE__ = 'XML'; 102 XMLTools.request('$this.Ujabber.reconnect', 'GET', handler_reconnect); 103 }; 63 104 64 105 /* -
trunk/instant_messenger/js/im_images.js
r64 r73 32 32 var img_dnd = new Image(); 33 33 img_dnd.src = im_path + "templates/default/images/dnd.gif"; 34 var img_wait = new Image(); 35 img_wait.src = im_path + "templates/default/images/wait.gif";
Note: See TracChangeset
for help on using the changeset viewer.
