Changeset 81
- Timestamp:
- 10/10/07 14:29:38 (17 years ago)
- Location:
- trunk
- Files:
-
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoAdmin1_2/inc/class.bosectors.inc.php
r64 r81 46 46 $sector_info['objectClass'][1] = 'organizationalUnit'; 47 47 $sector_info['objectClass'][2] = 'phpgwAccount'; 48 49 $systemName = $GLOBALS['phpgw_info']['server']['system_name']; 50 if ($systemName != '') 51 $sector_info['phpgwSystem'] = strtolower($systemName); 48 52 49 53 if ($_POST['sector_visible']) -
trunk/expressoAdmin1_2/inc/class.functions.inc.php
r64 r81 411 411 412 412 $justthese = array("dn"); 413 $filter = "( ou=*)";413 $filter = "(&(ou=*)(phpgwSystem=celepar))"; 414 414 415 415 foreach ($contexts as $context) … … 428 428 foreach ($a_sectors as $context) 429 429 { 430 // Necessário, pq em uma busca com ldapsearch ou=*, traz tb o próprio ou.431 /*432 if (strtolower($dn) == $contexts[0])433 continue;434 */435 436 430 $array_dn = ldap_explode_dn ( $context, 1 ); 437 431 -
trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php
r72 r81 774 774 $result['accountstatus'] = $entry[0]['accountstatus'][0]; 775 775 $result['mail'] = $entry[0]['mail'][0]; 776 $result['mailalternateaddress'] = $entry[0]['mailalternateaddress'] [0];777 $result['mailforwardingaddress']= $entry[0]['mailforwardingaddress'] [0];776 $result['mailalternateaddress'] = $entry[0]['mailalternateaddress']; 777 $result['mailforwardingaddress']= $entry[0]['mailforwardingaddress']; 778 778 $result['deliverymode'] = $entry[0]['deliverymode'][0]; 779 779 $result['userPasswordRFC2617'] = $entry[0]['userpasswordrfc2617'][0]; -
trunk/expressoAdmin1_2/inc/class.uiaccounts.inc.php
r72 r81 307 307 'changequote_disabled' => $this->functions->check_acl($manager_lid,'change_users_quote') ? '' : 'readonly', 308 308 'imapDelimiter' => $_SESSION['phpgw_info']['expresso']['email_server']['imapDelimiter'], 309 'input_mailalternateaddress_fields' => '<input type="text" name="mailalternateaddress[]" id="mailalternateaddress" autocomplete="off" value="{mailalternateaddress}" {disabled} size=30>', 310 'input_mailforwardingaddress_fields'=> '<input type="text" name="mailforwardingaddress[]" id="mailforwardingaddress" autocomplete="off" value="{mailforwardingaddress}" {disabled} size=30>', 309 311 310 312 //Third ABA … … 530 532 } 531 533 } 534 } 535 536 // Mail Alternate & Forwarding 537 if (is_array($user_info['mailalternateaddress'])) 538 { 539 for ($i = 0; $i < $user_info['mailalternateaddress']['count']; $i++) 540 { 541 if ($i > 0) 542 $input_mailalternateaddress_fields .= '<br>'; 543 $input_mailalternateaddress_fields .= '<input type="text" name="mailalternateaddress[]" id="mailalternateaddress" autocomplete="off" value="'.$user_info['mailalternateaddress'][$i].'" {disabled} size=30>'; 544 } 545 } 546 else 547 { 548 $input_mailalternateaddress_fields = '<input type="text" name="mailalternateaddress[]" id="mailalternateaddress" autocomplete="off" value="" {disabled} size=30>'; 549 } 550 551 if (is_array($user_info['mailforwardingaddress'])) 552 { 553 for ($i = 0; $i < $user_info['mailforwardingaddress']['count']; $i++) 554 { 555 if ($i > 0) 556 $input_mailforwardingaddress_fields .= '<br>'; 557 $input_mailforwardingaddress_fields .= '<input type="text" name="mailforwardingaddress[]" id="mailforwardingaddress" autocomplete="off" value="'.$user_info['mailforwardingaddress'][$i].'" {disabled} size=30>'; 558 } 559 } 560 else 561 { 562 $input_mailforwardingaddress_fields = '<input type="text" name="mailforwardingaddress[]" id="mailforwardingaddress" autocomplete="off" value="" {disabled} size=30>'; 532 563 } 533 564 … … 624 655 'accountstatus_checked' => $user_info['accountstatus'] == 'active' ? 'CHECKED' : '', 625 656 'mail' => $user_info['mail'], 626 'mailalternateaddress' => $user_info['mailalternateaddress'], 627 'mailforwardingaddress' => $user_info['mailforwardingaddress'], 657 658 //'mailalternateaddress' => $user_info['mailalternateaddress'], 659 //'mailforwardingaddress' => $user_info['mailforwardingaddress'], 660 'input_mailalternateaddress_fields' => $input_mailalternateaddress_fields, 661 'input_mailforwardingaddress_fields'=> $input_mailforwardingaddress_fields, 662 628 663 'deliverymode_checked' => $user_info['deliverymode'] == 'forwardOnly' ? 'CHECKED' : '', 629 664 -
trunk/expressoAdmin1_2/inc/class.uimanagers.inc.php
r64 r81 18 18 'delete_managers' => True, 19 19 'edit_managers' => True, 20 'copy_managers' => True,21 20 'validate' => True 22 21 ); … … 398 397 } 399 398 400 function copy_managers()401 {402 403 404 405 /*406 echo '<pre>';407 print_r($_GET);408 $manager_lid = $_GET['manager_lid'];409 410 //Pego ACL do gerente411 $manager = $this->functions->read_acl($manager_lid);412 //Cria vetor da ACL413 $manager_acl = $this->functions->make_array_acl($manager[0]['acl']);414 415 //Pesquisa no Banco e pega os valores dos apps.416 $query = "SELECT * FROM phpgw_expressoadmin_apps WHERE manager_lid = '" . $manager_lid . "' AND context = '" . $_GET['context'] . "'";417 $GLOBALS['phpgw']->db->query($query);418 $i=0;419 $manager[0]['apps'] = array();420 while($GLOBALS['phpgw']->db->next_record())421 {422 $tmp[$i] = $GLOBALS['phpgw']->db->row();423 $_POST['applications_list'][$tmp[$i]['app']] = 1;424 $manager[0]['apps'][$tmp[$i]['app']] = 1;425 $i++;426 }427 428 print_r($manager);429 430 */431 }432 433 399 function make_lang($ram_lang) 434 400 { -
trunk/expressoAdmin1_2/inc/class.user.inc.php
r72 r81 111 111 112 112 // Cria user_info no caso de ter alias e forwarding email. 113 if ($params['mailalternateaddress'] != '') 114 $user_info['mailAlternateAddress'] = $params['mailalternateaddress']; 115 116 if ($params['mailforwardingaddress'] != '') 117 $user_info['mailForwardingAddress'] = $params['mailforwardingaddress']; 113 foreach ($params['mailalternateaddress'] as $index=>$mailalternateaddress) 114 { 115 if ($mailalternateaddress != '') 116 $user_info['mailAlternateAddress'][] = $mailalternateaddress; 117 } 118 119 foreach ($params['mailforwardingaddress'] as $index=>$mailforwardingaddress) 120 { 121 if ($mailforwardingaddress != '') 122 $user_info['mailForwardingAddress'][] = $mailforwardingaddress; 123 } 118 124 119 125 if ($params['deliverymode']) … … 273 279 $dn = 'uid=' . $old_values['uid'] . ',' . strtolower($old_values['context']); 274 280 $diff = array_diff($new_values, $old_values); 281 275 282 /* 276 283 echo '<pre>'; 277 284 echo '--- OLD: '; 278 print_r($old_values ['passwd_expired']);285 print_r($old_values); 279 286 echo '<br>--- NEW: '; 280 print_r($new_values ['passwd_expired']);287 print_r($new_values); 281 288 echo '<br>'; 282 print_r($diff);283 return;284 289 */ 285 290 286 291 $manager_account_lid = $_SESSION['phpgw_session']['session_lid']; 287 292 if ((!$this->functions->check_acl($manager_account_lid,'edit_users')) && … … 338 343 $this->db_functions->write_log("alterado mail do usuario",'',$dn,'',''); 339 344 } 345 /* 340 346 if (($diff['mailalternateaddress']) && ($old_values['mailalternateaddress'] != '')) 341 347 { … … 348 354 $this->db_functions->write_log("alterado mailforwardingaddress do usuario",'',$dn,'',''); 349 355 } 356 */ 350 357 if (($diff['telephonenumber']) && ($old_values['telephonenumber'] != '')) 351 358 { … … 460 467 461 468 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 462 // ADD o uREMOVE some attributes469 // ADD or REMOVE some attributes 463 470 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 464 471 … … 546 553 if (($old_values['accountstatus'] == '') && ($new_values['accountstatus'] != '')) 547 554 { 548 echo '<pre>';549 print_r($old_values);550 555 $ldap_add['accountstatus'] = 'active'; 551 556 $this->db_functions->write_log("ativado conta de email do usuario",'',$dn,'',''); … … 556 561 $this->db_functions->write_log("desativado conta de email do usuario",'',$dn,'',''); 557 562 } 563 /* 558 564 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 559 565 // MAILALTERNATEADDRESS … … 580 586 $this->db_functions->write_log("removido mailforwardingaddress ao usuario",'',$dn,'',''); 581 587 } 588 */ 589 590 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 591 // MAILALTERNATEADDRESS 592 if (!$new_values['mailalternateaddress']) 593 $new_values['mailalternateaddress'] = array(); 594 if (!$old_values['mailalternateaddress']) 595 $old_values['mailalternateaddress'] = array(); 596 $add_mailalternateaddress = array_diff($new_values['mailalternateaddress'], $old_values['mailalternateaddress']); 597 $remove_mailalternateaddress = array_diff($old_values['mailalternateaddress'], $new_values['mailalternateaddress']); 598 foreach ($add_mailalternateaddress as $index=>$mailalternateaddress) 599 { 600 if ($mailalternateaddress != '') 601 { 602 $ldap_add['mailalternateaddress'][] = $mailalternateaddress; 603 $this->db_functions->write_log("adicionado mailalternateaddress $mailalternateaddress ao usuario $dn",'',$dn,'',''); 604 } 605 } 606 foreach ($remove_mailalternateaddress as $index=>$mailalternateaddress) 607 { 608 if ($mailalternateaddress != '') 609 { 610 if ($index !== 'count') 611 { 612 $ldap_remove['mailalternateaddress'][] = $mailalternateaddress; 613 $this->db_functions->write_log("removido mailalternateaddress $mailalternateaddress do usuario $dn",'',$dn,'',''); 614 } 615 } 616 } 617 618 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 619 // MAILFORWARDINGADDRESS 620 if (!$new_values['mailforwardingaddress']) 621 $new_values['mailforwardingaddress'] = array(); 622 if (!$old_values['mailforwardingaddress']) 623 $old_values['mailforwardingaddress'] = array(); 624 $add_mailforwardingaddress = array_diff($new_values['mailforwardingaddress'], $old_values['mailforwardingaddress']); 625 $remove_mailforwardingaddress = array_diff($old_values['mailforwardingaddress'], $new_values['mailforwardingaddress']); 626 foreach ($add_mailforwardingaddress as $index=>$mailforwardingaddress) 627 { 628 if ($mailforwardingaddress != '') 629 { 630 $ldap_add['mailforwardingaddress'][] = $mailforwardingaddress; 631 $this->db_functions->write_log("adicionado mailforwardingaddress $mailforwardingaddress ao usuario $dn",'',$dn,'',''); 632 } 633 } 634 foreach ($remove_mailforwardingaddress as $index=>$mailforwardingaddress) 635 { 636 if ($mailforwardingaddress != '') 637 { 638 if ($index !== 'count') 639 { 640 $ldap_remove['mailforwardingaddress'][] = $mailforwardingaddress; 641 $this->db_functions->write_log("removido mailforwardingaddress $mailforwardingaddress do usuario $dn",'',$dn,'',''); 642 } 643 } 644 } 645 646 echo '<pre>'; 647 print_r($add_mailalternateaddress); 648 print_r($remove_mailalternateaddress); 649 echo '---<br>'; 650 print_r($new_values['mailforwardingaddress']); 651 print_r($add_mailforwardingaddress); 652 print_r($remove_mailforwardingaddress); 653 654 582 655 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 583 656 // Delivery Mode … … 723 796 if (count($ldap_add)) 724 797 { 798 echo 'ldap-add<br>'; 725 799 print_r($ldap_add); 726 800 $result = $this->ldap_functions->add_user_attributes($dn, $ldap_add); … … 736 810 if (count($ldap_remove)) 737 811 { 812 echo 'ldap-remove<br>'; 813 print_r($ldap_remove); 738 814 $result = $this->ldap_functions->remove_user_attributes($dn, $ldap_remove); 739 815 if (!$result['status']) -
trunk/expressoAdmin1_2/js/jscode/groups.js
r73 r81 210 210 select_usersInGroup.innerHTML = 'lixo' + new_options + select_usersInGroup.innerHTML; 211 211 select_usersInGroup.outerHTML = select_usersInGroup.outerHTML; 212 document.getElementById('ea_input_searchUser').value = ""; 212 213 } 213 214 } -
trunk/expressoAdmin1_2/js/jscode/maillists.js
r73 r81 233 233 select_usersInMaillist.innerHTML = 'lixo' + new_options + select_usersInMaillist.innerHTML; 234 234 select_usersInMaillist.outerHTML = select_usersInMaillist.outerHTML; 235 document.getElementById('ea_input_searchUser').value = ""; 235 236 } 236 237 } -
trunk/expressoAdmin1_2/js/jscode/users.js
r72 r81 696 696 } 697 697 } 698 699 function add_input_mailalternateaddress() 700 { 701 var input = document.createElement("INPUT"); 702 input.size = 30; 703 input.name = "mailalternateaddress[]"; 704 input.setAttribute("autocomplete","off"); 705 document.getElementById("td_input_mailalternateaddress").appendChild(document.createElement("br")); 706 document.getElementById("td_input_mailalternateaddress").appendChild(input); 707 } 708 709 function add_input_mailforwardingaddress() 710 { 711 var input = document.createElement("INPUT"); 712 input.size = 30; 713 input.name = "mailforwardingaddress[]"; 714 input.setAttribute("autocomplete","off"); 715 document.getElementById("td_input_mailforwardingaddress").appendChild(document.createElement("br")); 716 document.getElementById("td_input_mailforwardingaddress").appendChild(input); 717 } -
trunk/expressoAdmin1_2/templates/default/accounts_form.tpl
r72 r81 158 158 <tr bgcolor={row_off}> 159 159 <td>{lang_aliasemail}:</td> 160 <td><input type="text" name="mailalternateaddress" id="mailalternateaddress" autocomplete="off" value="{mailalternateaddress}" {disabled} size=30></td> 160 <td id="td_input_mailalternateaddress"> 161 {input_mailalternateaddress_fields} 162 <!--<input type="text" name="mailalternateaddress[]" id="mailalternateaddress" autocomplete="off" value="{mailalternateaddress}" {disabled} size=30>--> 163 <span style="cursor:pointer" onclick="javascript:add_input_mailalternateaddress();"> +</span> 164 </td> 161 165 </tr> 162 166 163 167 <tr bgcolor={row_on}> 164 168 <td>{lang_forwardingemail}:</td> 165 <td><input type="text" name="mailforwardingaddress" id="mailforwardingaddress" autocomplete="off" value="{mailforwardingaddress}" {disabled} size=30></td> 169 <td id="td_input_mailforwardingaddress"> 170 {input_mailforwardingaddress_fields} 171 <!--<input type="text" name="mailforwardingaddress[]" id="mailforwardingaddress" autocomplete="off" value="{mailforwardingaddress}" {disabled} size=30>--> 172 <span style="cursor:pointer" onclick="javascript:add_input_mailforwardingaddress();"> +</span> 173 </td> 166 174 </tr> 167 175 -
trunk/instant_messenger/js/im_functions.js
r77 r81 353 353 else 354 354 var nickname = from; 355 356 if(nickname.indexOf('@') != -1) 357 nickname = nickname.substr(0,nickname.indexOf('@')); 355 358 356 359 var win = document.getElementById(from + '_chatMessages'); … … 442 445 nickname = nickname.substr(0,nickname.indexOf('|')); 443 446 nickname = nickname.substr(nickname.indexOf(':') + 1 , nickname.length); 444 nickname = (func.trim(nickname) != "") ? nickname : IM_Preferences.jid; 447 nickname = (func.trim(nickname) != "") ? nickname : IM_Preferences.jid; 448 if(nickname.indexOf('@') != -1) 449 nickname = nickname.substr(0,nickname.indexOf('@')); 445 450 } 446 451 -
trunk/instant_messenger/js/im_preferences.js
r76 r81 114 114 text1.value = ""; 115 115 text2.value = ""; 116 116 117 if(pFunc != 'divAddUser_im') 117 118 { … … 131 132 } 132 133 } 133 134 else 135 { 136 Templates.Status_AddUser(); 137 setTimeout("Templates.Status_AddUser();",3000); 138 } 134 139 if( IM.UsersNot.length == 0 ) 135 140 im_win.windowClose('divFormAuthUser_im'); … … 219 224 for(var i in pJids) 220 225 { 221 var opt = new Option(pJids[i] , pJids[i], false, true);226 var opt = new Option(pJids[i].substr(0,pJids[i].indexOf('@')), pJids[i], false, true); 222 227 sel_box[sel_box.length] = opt; 223 228 } … … 401 406 var Nvcard = new Array('FN','NICKNAME','ORGNAME','ORGUNIT','ROLE','BDAY','DESC'); 402 407 var vcard = ""; 408 var new_vcard = ""; 403 409 var value = ""; 404 410 for(var i in Nvcard) … … 409 415 document.getElementById('span_nickname').innerHTML = "<b>" + nn.substring(0,15) + "</b>"; 410 416 } 411 417 412 418 value = document.getElementById(Nvcard[i]).value; 419 new_vcard += '<'+Nvcard[i]+'>'+value+'</'+Nvcard[i]+'>'; 413 420 value = (func.trim(value) != "") ? value : ""; 414 421 vcard += value + "_vkrd_"; 415 422 } 416 423 424 document.getElementById("vcard_" + this.jid).innerHTML = new_vcard; 417 425 vcard = vcard.substr(0,vcard.length - 6 ); 418 426 419 427 var handler_vcard_add = function(XMLdata) 420 428 { … … 422 430 XMLTools.request('$this.Ujabber.newVcard','POST',handler_vcard_add,"vcard="+escape(vcard)); 423 431 alert('Informações Cadastradas / Adicionadas !!!'); 432 im_win.windowClose('divInfoUser_im'); 424 433 } 425 434 -
trunk/instant_messenger/js/im_templates.js
r70 r81 57 57 _this.conf_form("divUpdateUser",300,110,parse_XmlXsl(_XmlupdUser,'upd_user.xsl'),":: " + IM.get_lang('Add New Contact') + " - Expresso ::"); 58 58 } 59 60 Templates.prototype.Status_AddUser = function() 61 { 62 if( document.getElementById('im_status_add') != null ) 63 if( document.getElementById('im_status_add').innerHTML != "" ) 64 document.getElementById('im_status_add').innerHTML = ""; 65 else 66 document.getElementById('im_status_add').innerHTML = IM.get_lang('Contact Add') + ' ... !!!'; 67 } 59 68 60 69 /* … … 66 75 var _this = this; 67 76 var _XmlDelUser = '<deluser>' + 68 '<body lang1="'+IM.get_lang('Contact')+'" lang2="'+IM.get_lang('Remove')+'" />' +77 '<body lang1="'+IM.get_lang('Contact')+'" lang2="'+IM.get_lang('Remove')+'" lang3="'+IM.get_lang('close')+'"/>' + 69 78 '</deluser>'; 70 79 … … 113 122 '<DESC>' + IM.get_lang('Status') + '</DESC>' + 114 123 '<SAVE>' +IM.get_lang('save') + '</SAVE>' + 124 '<CLOSE>' +IM.get_lang('close') + '</CLOSE>' + 115 125 '</getlang>' + 116 126 '</info_user>'; -
trunk/instant_messenger/js/im_win.js
r77 r81 118 118 this.windowMinimize(pId + '_im'); 119 119 120 main_menu_head.innerHTML += '<span id="span_menu_pref" style="float: left; " onmousedown="IM.menu_preferences(event ,\'menu_preferences\'); document.oncontextmenu = new Function(\'return false\');"></span>';120 main_menu_head.innerHTML += '<span id="span_menu_pref" style="float: left;cursor: pointer;" onmousedown="IM.menu_preferences(event ,\'menu_preferences\'); document.oncontextmenu = new Function(\'return false\');"></span>'; 121 121 122 122 var br3 = func.newEl('br'); -
trunk/instant_messenger/xsl/add_user.xsl
r55 r81 44 44 <td colspan="2"> 45 45 <input type="button" value="{@lang4}" onclick="javascript:IM_Preferences.Add_user('divAddUser_im');" /> 46 <input type="button" value="Fechar" onclick="javascript:im_win.windowClose('divAddUser_im');"/> 47 <span id="im_status_add" style="color:#f00;font-weight:bold;margin-left:10px;"></span> 46 48 </td> 47 49 </tr> -
trunk/instant_messenger/xsl/del_user.xsl
r55 r81 12 12 <div style="margin-top:3px"> 13 13 <select id="sel_contact"></select> 14 <span style="margin-left:7px"><input type="button" value="{@lang2}" onclick="javascript:IM_Preferences.RemoveContact()" /></span> 14 <span style="margin-left:7px"> 15 <input type="button" value="{@lang2}" onclick="javascript:IM_Preferences.RemoveContact()" /> 16 <input type="button" value="{@lang3}" onclick="javascript:im_win.windowClose('divDelUser_im');"/> 17 </span> 15 18 </div> 16 19 </div> -
trunk/instant_messenger/xsl/information_user.xsl
r60 r81 90 90 <table border="0" cellpading="1" cellspacing="2" width="100%"> 91 91 <tr> 92 <td><input type="button" value="{getlang/SAVE}" onclick="javascript:IM_Preferences.vCardAdd();" /></td> 92 <td> 93 <input type="button" value="{getlang/SAVE}" onclick="javascript:IM_Preferences.vCardAdd();" /> 94 <input type="button" value="{getlang/CLOSE}" onclick="javascript:im_win.windowClose('divInfoUser_im');"/> 95 </td> 93 96 </tr> 94 97 </table>
Note: See TracChangeset
for help on using the changeset viewer.