Changeset 3388
- Timestamp:
- 10/21/10 13:55:55 (14 years ago)
- Location:
- branches/2.2/expressoMail1_2
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/expressoMail1_2/inc/class.ldap_functions.inc.php
r3163 r3388 88 88 $ID = $params['ID']; 89 89 90 if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['extended_info']) 91 $extendedinfo=true; 92 else 93 $extendedinfo=false; 94 90 95 $search_for = explode(" ",$search_for); 91 96 $aux=""; … … 113 118 $contacts_result['field'] = $field; 114 119 $contacts_result['ID'] = $ID; 115 116 120 // follow the referral 117 121 $this->ldapConnect(true); … … 121 125 if (($field != 'null') && ($ID != 'null')) 122 126 { 123 $filter="(& (&(|(phpgwAccountType=u)(phpgwAccountType=g)(phpgwAccountType=l)(phpgwAccountType=i)(phpgwAccountType=s))(mail=*)) (|(cn=*$search_for*)(mail=*$search_for*)) (!(phpgwaccountvisible=-1)) )"; 127 $filter="(& (&(|(phpgwAccountType=u)(phpgwAccountType=g)(phpgwAccountType=l))(mail=*)) (|(cn=*$search_for*)(mail=*$search_for*)) (!(phpgwaccountvisible=-1)) )"; 128 if($extendedinfo) 124 129 $justthese = array("cn", "mail", "telephoneNumber", "mobile", "phpgwAccountVisible", "uid", "employeeNumber", "ou"); 130 else 131 $justthese = array("cn", "mail", "telephoneNumber", "mobile", "phpgwAccountVisible", "uid"); 125 132 } 126 133 else 127 134 { 128 135 $filter="(& (phpgwAccountType=u)(cn=*$search_for*) (!(phpgwaccountvisible=-1)) )"; 136 if($extendedinfo) 129 137 $justthese = array("cn", "mail", "telephoneNumber", "mobile", "phpgwAccountVisible","jpegPhoto", "uid", "employeeNumber", "ou"); 138 else 139 $justthese = array("cn", "mail", "telephoneNumber", "mobile", "phpgwAccountVisible","jpegPhoto", "uid"); 130 140 } 131 141 $sr=@ldap_search($this->ds, $this->ldap_context, $filter, $justthese, 0, $this->max_result + 1); … … 178 188 $this->ldapConnect(true,$i); 179 189 $filter="(|(cn=*$search_for*)(mail=*$search_for*))"; 190 if($extendedinfo) 180 191 $justthese = array("cn", "mail", "telephoneNumber", "mobile", "phpgwAccountVisible", "uid","employeeNumber", "ou"); 192 else 193 $justthese = array("cn", "mail", "telephoneNumber", "mobile", "phpgwAccountVisible", "uid"); 181 194 $sr=@ldap_search($this->ds, $this->ldap_context, $filter, $justthese, 0, $this->max_result+1); 182 195 if(!$sr) … … 305 318 $contacts_result = array(); 306 319 $contacts_result["cn"] = $cn; 307 list ($contacts_result["mail"], $contacts_result["phone"], $contacts_result["mobile"], $contacts_result["uid"], $contacts_result["jpegphoto"]) = split ('%', $info); 320 if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['extended_info']) 321 $extendedinfo=true; 322 else 323 $extendedinfo=false; 324 325 list ($contacts_result["mail"], $contacts_result["phone"], $contacts_result["mobile"], $contacts_result["uid"], $contacts_result["jpegphoto"], $contacts_result["employeenumber"], $contacts_result["ou"]) = split ('%', $info); 308 326 309 327 if ($contacts_result['jpegphoto']) … … 320 338 } 321 339 } 340 //verifica de existe o celular do funcionario ($contacts_result["mobile"]), se nao, $phoneUser fica vazia; 341 342 $mobileUser = $contacts_result["mobile"]; 343 if($mobileUser && !$voipMobile) { 344 $phoneUser .= " / $mobileUser"; 345 } 346 $empNumber = $contacts_result["employeenumber"]; 347 if($empNumber) { 348 $empNumber = "$empNumber - "; 349 } 350 $ou = $contacts_result["ou"]; 351 if($ou) { 352 $ou = "<br/>$ou" ; 353 } 354 322 355 // Begin: nickname, firstname and lastname for QuickAdd. 323 356 $fn = $contacts_result["cn"]; … … 337 370 '</td>' . 338 371 '<td class="cc">' . 339 '<span name="cn">' . $ contacts_result['cn'] . '</span>' . '<br>' .340 '<a title="'.$ this->functions->getLang("Write message").'" onClick="javascript:QuickSearchUser.create_new_message(\''.$contacts_result["cn"].'\', \''.$contacts_result["mail"].'\')">' .372 '<span name="cn">' . $empNumber . $contacts_result['cn'] . '</span>' . '<br>' . 373 '<a title="'.$functions->getLang("Write message").'" onClick="javascript:QuickSearchUser.create_new_message(\''.$contacts_result["cn"].'\', \''.$contacts_result["mail"].'\')">' . 341 374 '<font color=blue>' . 342 375 '<span name="mail">' . $contacts_result['mail'] . '</span></a></font>'. … … 344 377 '<br>' . 345 378 $phoneUser . 379 $ou . 346 380 '</td>' . 347 381 '</tr>'; … … 402 436 return $organizations; 403 437 } 404 405 438 //Busca usuarios de um contexto e ja retorna as options do select - usado por template serpro; 406 439 function search_users($params) … … 468 501 $catalog = $params['catalog']; 469 502 $error = False; 503 if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['extended_info']) 504 $extendedinfo=true; 505 else 506 $extendedinfo=false; 507 470 508 471 509 $this->ldapConnect(true,$catalog); … … 476 514 if ($catalog == 0){ 477 515 //os atributos "employeeNumber" e "ou" foram adicionado ao vetor de busca; 516 if($extendedinfo) 478 517 $justthese = array("cn", "mail", "phpgwaccounttype", "phpgwAccountVisible", "employeeNumber", "ou"); 518 else 519 $justthese = array("cn", "mail", "phpgwaccounttype", "phpgwAccountVisible"); 520 479 521 $filter="(&(|(phpgwAccountType=u)(phpgwAccountType=l))(cn=".$cn."))"; 480 522 //$user_context = "ou=".$params['organization'].",".$this->ldap_context; 481 523 }else { 482 524 //os atributos "employeeNumber" e "ou" foram adicionado ao vetor de busca; 525 if($extendedinfo) 483 526 $justthese = array("cn", "mail", "employeeNumber", "ou"); 527 else 528 $justthese = array("cn", "mail"); 484 529 $filter="(&(objectClass=".$this->object_class.")(cn=".$cn."))"; 485 530 //$user_context = $this->branch."=".$params['organization'].",".$external_srcs[$catalog]['dn']; … … 765 810 $filter="(&(phpgwAccountType=u)(mail=" . $params['email'] . "))"; 766 811 $ldap_context = $_SESSION['phpgw_info']['expressomail']['ldap_server']['dn']; 767 $justthese = array("cn","uid","telephoneNumber","jpegPhoto","mobile"); 812 if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['extended_info']) 813 $extendedinfo=true; 814 else 815 $extendedinfo=false; 816 817 if($extendedinfo) 818 $justthese = array("cn","uid","telephoneNumber","jpegPhoto","mobile","ou","employeeNumber"); 819 else 820 $justthese = array("cn","uid","telephoneNumber","jpegPhoto","mobile"); 768 821 769 822 // Follow the referral … … 784 837 "type" => "global", 785 838 "mobile" => @ldap_get_values($ds, $entry, "mobile"), 786 "telefone" => @ldap_get_values($ds, $entry, "telephonenumber") 839 "telefone" => @ldap_get_values($ds, $entry, "telephonenumber"), 840 "ou" => @ldap_get_values($ds, $entry, "ou"), 841 "employeeNumber" => @ldap_get_values($ds, $entry, "employeeNumber") 787 842 ); 788 843 -
branches/2.2/expressoMail1_2/inc/hook_settings.inc.php
r3365 r3388 92 92 create_check_box('Preview message text within a tool-tip box','preview_msg_tip','this exhibits a sample of message within a tool-tip box'); 93 93 94 create_check_box('View extended information about users','extended_info','This exhibits employeenumber and ou from LDAP in searchs'); 94 95 95 96 create_check_box('Save deleted messages in trash folder?','save_deleted_msg','When delete message, send it automatically to trash folder'); -
branches/2.2/expressoMail1_2/index.php
r3366 r3388 86 86 $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['imap_max_folders'] = $current_config['expressoMail_imap_max_folders']; 87 87 $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['max_email_per_page'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['max_email_per_page'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['max_email_per_page'] : "50"; 88 $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['extended_info'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['extended_info']?$_SESSION['phpgw_info']['user']['preferences']['expressoMail']['extended_info'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['extended_info']:'0'; 88 89 $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['from_to_sent'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['from_to_sent'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['from_to_sent'] : "0"; 89 90 $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['auto_create_local'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['auto_create_local'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['auto_create_local'] : "0"; -
branches/2.2/expressoMail1_2/js/InfoContact.js
r1445 r3388 81 81 cn = cn.toString().substring(0,30) + "..."; 82 82 83 var phoneUser = data.telefone; 83 var phoneUser; 84 85 data.telefone ? phoneUser = data.telefone : phoneUser ="<br />"; 86 87 data.mobile ? phoneUser += "<br /> "+data.mobile : phoneUser += "<br />"; 88 89 data.employeeNumber ? employeeNumber = data.employeeNumber : employeeNumber =""; 90 91 data.ou ? ou = data.ou : ou = ""; 92 93 94 84 95 if(preferences.voip_enabled && phoneUser) { 85 96 phoneUser = "<a title=\""+get_lang("Call to Comercial Number")+"\" href=\"#\" onclick=\"InfoContact.connectVoip('"+phoneUser+"', 'com')\">"+phoneUser+"</a>"; … … 89 100 } 90 101 91 Element("card_cc_td").innerHTML = "<table cellpadding=0 cellspacing=0 border=0 height='100%' width='100%'><tr><td width='70' height='93' style='padding-top:5px;padding-left:6px' align='center' valign='center'>"+ 92 "<img src='./inc/show_img.php?email="+data.email+"'></td><td style='padding-left:2px' align='left' valign='top'>"+ 93 "<br><img align='center' src='templates/"+template+"/images/"+(data.type)+"_catalog.png'><font size=1 color=BLACK> <b>"+get_lang("Sender's Information")+"</b></font>"+ 94 _this.verifyIM(data.uid,data.email)+ 95 "<br><img align='center' src='templates/"+template+"/images/phone.gif'> <font size=1 color=BLACK>"+(phoneUser ? phoneUser : get_lang("None") )+"</font>"+ 96 "</td></tr><tr><td valign='top' align='center' colspan='2'>"+ 97 "<font size=1 color=BLACK>"+cn+"</font>"+ 98 "<br><span title='"+get_lang("Write message")+"' style='cursor:pointer' onclick='InfoContact.sendMail(\""+cn+"\",\""+data.email+"\")'><font size=1 color=DARKBLUE><u>"+data.email+"</u></font></span>"+ 102 Element("card_cc_td").innerHTML = 103 "<table cellpadding=0 cellspacing=0 border=0 height='100%' width='100%'><tr>"+ 104 "<td style='padding-top:4px' align='center' valign='center' colspan ='2'><img src='templates/"+template+"/images/"+(data.type)+"_catalog.png' /><font size=1 color=BLACK> <b>"+get_lang("Sender's Information")+"</b></font>"+_this.verifyIM(data.uid,data.email)+"</td></tr>"+ 105 106 "<tr><td align='center' width='70' height='93' style='padding-left:6px' align='center' valign='center'>"+ 107 "<img style='float:left' src='./inc/show_img.php?email="+data.email+"'></td>"+ 108 "<td style='padding-left:2px' align='left' valign='top'>"+ 109 "<br><img style='float:left'align='center' src='templates/"+template+"/images/phone.gif' /> <font size=1 color=BLACK>"+(phoneUser ? phoneUser : get_lang("None") )+"</font><br />"+ 110 "<font size=1 color=BLACK>"+employeeNumber+"<br/>"+cn+"</font>"+ 111 "<br/>"+ou+"</td></tr>"+ 112 113 "<tr><td style='padding-bottom:4px' align='center' valign='center' colspan ='2'><span title='"+get_lang("Write message")+"' style='cursor:pointer' onclick='InfoContact.sendMail(\""+cn+"\",\""+data.email+"\")'><font size=1 color=DARKBLUE><u>"+data.email+"</u></font></span>"+ 99 114 "</td></tr></table>"; 100 115 … … 153 168 154 169 if ( !window.IM || !document.getElementById('myStatus') ) 155 return " <br/><br/>";170 return ""; 156 171 157 172 var status = IM.infoContact(uid); -
branches/2.2/expressoMail1_2/js/doiMenuData.js
r3182 r3388 139 139 function openListUsers(border_id) { 140 140 connector.loadScript("QuickCatalogSearch"); 141 if (typeof(QuickCatalogSearch) == 'undefined'){ 142 setTimeout('openListUsers('+border_id+')',500); 143 return false; 144 } 141 145 QuickCatalogSearch.showCatalogList(border_id); 142 146 } -
branches/2.2/expressoMail1_2/setup/phpgw_pt-br.lang
r3380 r3388 611 611 Automaticaly create Default local folders? expressoMail1_2 pt-br Criar automáticamente pastas locais padrão? 612 612 Enable this option if you want to automaticaly create the Inbox, Draft, Trash and Sent folders expressoMail1_2 pt-br Ative essa opção para que as pastas Caixa de entrada, Lixeira, Enviada e Rascunhos sejam criadas automáticamente no arquivamento local. 613 View extended information about users? expressoMail1_2 pt-br Ver informações extendidas nas buscas por usuários?
Note: See TracChangeset
for help on using the changeset viewer.