Changeset 41
- Timestamp:
- 07/09/07 17:15:11 (17 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/calendar/doc/change_log.txt
r36 r41 2 2 módulo Agenda de Eventos, e a partir da versão 29/11/2006 [0.9.17] 3 3 Nilton Emilio Buhrer Neto. 4 5 04/07/2007 - [0.9.2] 6 - Correção de bug referente ao envio de mensagens pela Agenda. Houve uma modificação 7 na maneira de se enviar emails pelo módulo, porém apresentou problemas. Agora está ok. 8 Onde pegava valores de configuração da $_SESSION foi alterado para pegar do $_GLOBALS. 9 10 02/07/2007 - [0.9.2] 11 - Adicionado suporte ao espanhol. 4 12 5 13 05/06/2007 - [0.9.2] -
trunk/calendar/inc/class.bocalendar.inc.php
r36 r41 2699 2699 $mail = new PHPMailer(); 2700 2700 $mail->IsSMTP(); 2701 /* 2701 2702 $mail->Host = $_SESSION['phpgw_info']['expressomail']['email_server']['smtpServer']; 2702 2703 $mail->Port = $_SESSION['phpgw_info']['expressomail']['email_server']['smtpPort']; … … 2704 2705 $mail->FromName = $_SESSION['phpgw_info']['expressomail']['user']['fullname']; 2705 2706 $mail->IsHTML(true); 2706 2707 */ 2708 $boemailadmin = CreateObject('emailadmin.bo'); 2709 $emailadmin_profile = $boemailadmin->getProfileList(); 2710 $emailadmin = $boemailadmin->getProfile($emailadmin_profile[0]['profileID']); 2711 $mail->Host = $emailadmin['smtpServer']; 2712 $mail->Port = $emailadmin['smtpPort']; 2713 $mail->From = $GLOBALS['phpgw']->preferences->values['email']; 2714 $mail->FromName = $GLOBALS['phpgw_info']['user']; 2715 $mail->IsHTML(true); 2716 2707 2717 // Aqui é enviado o email 2708 2718 foreach($to_notify as $userid => $statusid) -
trunk/calendar/inc/class.uipublicview.inc.php
r2 r41 990 990 .'</head><body>' 991 991 .'<div id="divAppboxHeader">' 992 . 'Agenda Semanal de Eventos'992 .lang('weekly agenda of events') 993 993 .'</div><div id="divAppbox" align="center" >'; 994 994 995 995 if(!$account_name){ 996 echo '<font color="GREEN" size="+1"> Digite o login do usuário para acessar Agenda Pública.</font></center></div>';996 echo '<font color="GREEN" size="+1">'.lang('it types login of the user to have access public agenda').'</font></center></div>'; 997 997 return True; 998 998 } … … 1002 1002 1003 1003 if(!$accountId){ 1004 echo '<font color="RED" size="+1"> Esse usuário não existe.</font></center></div>';1004 echo '<font color="RED" size="+1">'.lang('this user does not exist').'</font></center></div>'; 1005 1005 return True; 1006 1006 } … … 1018 1018 } 1019 1019 else { 1020 echo '<font color="RED" size="+1"> Esse usuário não possui Agenda Pública.</font></center></div>';1020 echo '<font color="RED" size="+1">'.lang('it types login of the user to have access public agenda').'</font></center></div>'; 1021 1021 } 1022 1022 -
trunk/expressoAdmin1_2/docs/change_log.txt
r36 r41 3 3 Joao Alfredo Knopik Junior. 4 4 5 02/07/2007 - [1.222] 6 - Adicionado suporte ao espanhol. 5 7 6 8 27/02/2007 - [1.21] -
trunk/expressoMail1_2/docs/change_log.txt
r37 r41 79 79 - Corrigido problema ao montar lista de mensagens, quando alguma delas tinha no campo "Para", caracteres especiais. 80 80 - Modificada a implementação da Busca rápida de Detalhes do Remetente da Mensagem, para preparar a integração com os demais serviços. 81 82 09/07/2007 - [1.2033] 83 - Corrigido problema na funcionalidade filtros, que não permitia adicionar filtro quando se definia tamanho máximo de mensagem. 84 - Corrigido problema no campo "Responder Para", quando esse possuía formato HTML. 85 - Modificado link do botão Cancelar, do template das preferências. 86 - Corrigido problema na busca rápida. -
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r37 r41 54 54 $mbox_stream = $this->open_mbox($folder); 55 55 56 switch($sort_box_type) { 57 56 switch($sort_box_type){ 58 57 case 'SORTFROM': 59 $sort_array_msg = $this->imap_sortfrom($mbox_stream, $sort_box_reverse, $folder);60 break;58 $sort_array_msg = $this->imap_sortfrom($mbox_stream, $sort_box_reverse, $folder); 59 break; 61 60 case 'SORTSUBJECT': 62 $sort_array_msg = imap_sort($mbox_stream, SORTSUBJECT, $sort_box_reverse, SE_UID);63 break;61 $sort_array_msg = imap_sort($mbox_stream, SORTSUBJECT, $sort_box_reverse, SE_UID); 62 break; 64 63 case 'SORTARRIVAL': 65 $sort_array_msg = imap_sort($mbox_stream, SORTARRIVAL, $sort_box_reverse, SE_UID);66 break;64 $sort_array_msg = imap_sort($mbox_stream, SORTARRIVAL, $sort_box_reverse, SE_UID); 65 break; 67 66 case 'SORTSIZE': 68 $sort_array_msg = imap_sort($mbox_stream, SORTSIZE, $sort_box_reverse, SE_UID); 69 break; 70 case 'UNSEEN': 71 $sort_array_msg = imap_search($mbox_stream,"UNSEEN", SE_UID); // nao lidas 72 break; 73 case 'ANSWERED': 74 $sort_array_msg = imap_search($mbox_stream,"ANSWERED", SE_UID); // repondidas 75 break; 76 case 'SEEN': 77 $sort_array_msg = imap_search($mbox_stream,"SEEN", SE_UID); // lidas 78 break; 79 case 'FLAGGED': 80 $sort_array_msg = imap_search($mbox_stream,"FLAGGED", SE_UID); // importantes 81 break; 82 case 'ALL': 83 $sort_array_msg = imap_search($mbox_stream,SORTARRIVAL,$sort_box_reverse, SE_UID); // Todas 84 break; 67 $sort_array_msg = imap_sort($mbox_stream, SORTSIZE, $sort_box_reverse, SE_UID); 68 break; 85 69 } 86 70 … … 342 326 { 343 327 $personal_reply_to = imap_mime_header_decode($tmp_reply_to->personal); 344 $return['reply_to'] .= '"' . $personal_reply_to[0]->text . '"'; 345 $return['reply_to'] .= " "; 346 $return['reply_to'] .= "<"; 347 $return['reply_to'] .= $reply_to[0]->mailbox . "@" . $reply_to[0]->host; 348 $return['reply_to'] .= ">"; 328 if(!empty($personal_reply_to[0]->text)) { 329 $return['reply_to'] .= '"' . $personal_reply_to[0]->text . '"'; 330 $return['reply_to'] .= " "; 331 $return['reply_to'] .= "<"; 332 $return['reply_to'] .= $reply_to[0]->mailbox . "@" . $reply_to[0]->host; 333 $return['reply_to'] .= ">"; 334 } 335 else { 336 $return['reply_to'] .= $reply_to[0]->mailbox . "@" . $reply_to[0]->host; 337 } 349 338 } 350 339 else -
trunk/expressoMail1_2/index.php
r37 r41 4 4 'nonavbar' => False, 5 5 'currentapp' => 'expressoMail1_2', 6 'update_version' => '1.203 14',6 'update_version' => '1.2033', 7 7 'enable_nextmatchs_class' => True 8 8 ); -
trunk/expressoMail1_2/js/draw_api.js
r40 r41 410 410 span_T.style.height = "10"; 411 411 span_options.style.fontSize = "12"; 412 span_options.width = "50%"; 412 413 span_options.innerHTML = 413 414 '<span title="'+get_lang("Delete")+'" style="margin-left:8px" class="message_options" onclick=delete_msgs(\'null\',\'selected\',\'null\')>'+get_lang("Delete")+'</span> | '+ 414 415 '<span title="'+get_lang("Move")+'" class="message_options" onclick=wfolders.makeWindow(\"\",\"move_to\")>'+get_lang("Move")+'</span> | '+ 415 416 '<span title="'+get_lang("Print")+'" class="message_options" onclick=print_all()>'+get_lang("Print")+'</span> | '+ 416 '<span title="'+get_lang("Export")+'" class="message_options" onclick="export_all_selected_msgs()">'+get_lang("Export")+'</span> | '+ 417 '<select onchange="listByFlag(this.value)">'+ 418 '<option value="SORTARRIVAL" '+(sort_box_type == 'SORTARRIVAL' ? 'selected':'')+'>Todas</option>'+ 419 '<option value="UNSEEN" '+(sort_box_type == 'UNSEEN' ? 'selected':'')+'>Não Lidas</option>'+ 420 '<option value="SEEN" '+(sort_box_type == 'SEEN' ? 'selected':'')+'>Lidas</option>'+ 421 '<option value="ANSWERED" '+(sort_box_type == 'ANSWERED' ? 'selected':'')+'>Respondidas/Encaminhadas</option>'+ 422 '<option value="FLAGGED" '+(sort_box_type == 'FLAGGED' ? 'selected':'')+'>Importantes</option>'+ 423 '</select>'; 417 '<span title="'+get_lang("Export")+'" class="message_options" onclick="export_all_selected_msgs()">'+get_lang("Export")+'</span>'; 424 418 var span_D = document.createElement("TD"); 425 419 span_R.appendChild(span_D); … … 437 431 alternate_border(0); 438 432 resizeWindow(); 439 440 433 Element('main_table').style.display = ''; 441 434 span_T.style.visibility = 'visible'; … … 684 677 default: 685 678 type_name = get_lang("Date"); 679 sort_box_type = 'SORTARRIVAL'; 686 680 break; 687 681 } 688 682 689 Element("message_header_"+ (sort_box_type.lastIndexOf("SORT") != "-1" ? sort_box_type : "SORTARRIVAL")).innerHTML = "<B>"+type_name+"</B><img src ='templates/default/images/arrow_"+(sort_box_reverse == 1 ? 'desc' : 'asc')+"endant.gif'>";683 Element("message_header_"+sort_box_type).innerHTML = "<B>"+type_name+"</B><img src ='templates/default/images/arrow_"+(sort_box_reverse == 1 ? 'desc' : 'asc')+"endant.gif'>"; 690 684 } 691 685 function draw_message(info_msg, ID){ … … 2131 2125 div_address_full.style.display=''; 2132 2126 } 2133 function listByFlag(flag_type){2134 sort_box_type = flag_type;2135 cExecute ("$this.imap_functions.get_range_msgs2&folder="+current_folder+"&msg_range_begin=1&msg_range_end="+preferences.max_email_per_page+"&sort_box_type="+flag_type+"&sort_box_reverse="+sort_box_reverse+"", handler_draw_box);2136 } -
trunk/expressoMail1_2/js/filter.js
r2 r41 402 402 } 403 403 404 if(LTrim(Element("field1").value) == "" && LTrim(Element("field2").value) == "" && LTrim(Element("field3").value) == ""){ 404 if(LTrim(Element("field1").value) == "" && LTrim(Element("field2").value) == "" && LTrim(Element("field3").value) == "" && Element("field4").value == "") 405 { 405 406 alert(get_lang("It defines criteria for the fields From, To and Subject with more than 3 characters!")); 406 407 return false; 407 408 } 408 409 if((LTrim(Element("field1").value).length <= 3) && (LTrim(Element("field2").value).length <= 3) && (LTrim(Element("field3").value).length <= 3 )){409 410 if((LTrim(Element("field1").value).length <= 3) && (LTrim(Element("field2").value).length <= 3) && (LTrim(Element("field3").value).length <= 3 && Element("field4").value == "")){ 410 411 alert(get_lang("It defines criteria for the fields From, To and Subject with more than 3 characters!")); 411 412 return false; -
trunk/instant_messenger/inc/class.Ujabber.inc.php
r33 r41 2 2 /************************************************************* 3 3 * Classe Jabber - Expresso * 4 * ------------------------------------------------------- * 5 * 4 * ------------------------------------------------------- * 5 * Com Autenticação no Servidor Jabber * 6 6 * Rodrigo Souza - rodsouza@celepar.pr.gov.br * 7 7 * Alexandre Correia - alexandrecorreia@celepar.pr.gov.br * … … 16 16 private $server = "localhost"; 17 17 private $port = "5222"; 18 18 19 19 private $username = false; 20 20 private $password = false; 21 21 private $resource = false; 22 22 23 23 private $jid = false; 24 24 private $email = ""; 25 25 private $contacts = ""; 26 26 27 27 private $log_error_file = 'erro.log'; 28 28 29 29 function __construct() 30 30 { 31 31 32 32 $this->username = $_SESSION['phpgw_info']['instant_messenger']['user']; 33 33 $this->password = $_SESSION['phpgw_info']['instant_messenger']['passwd']; … … 36 36 $this->resource = $_SESSION['phpgw_info']['instant_messenger']['resource_jabber']; 37 37 $this->jid = $this->username."@".$this->server . "/" . $this->resource; 38 38 39 39 parent :: __construct($this->jid, $this->password, $this->port); 40 41 } 42 40 41 } 42 43 43 function __destruct() 44 44 { … … 55 55 $group_users = array(); 56 56 $group_nusers = array(); 57 57 58 58 for($i=0; $i < count($contacts); $i++){ 59 $group_users[] = strtolower(urldecode($contacts[$i]['group'])).";".urldecode($contacts[$i]['name']).";".$contacts[$i]['jid'].";".$contacts[$i]['subscription'].";".$contacts[$i]['online']; 60 } 61 59 $group_users[] = strtolower(urldecode($contacts[$i]['group'])).";".urldecode($contacts[$i]['name']).";".$contacts[$i]['jid'].";".$contacts[$i]['subscription'].";".$contacts[$i]['online']; 60 } 61 62 62 // VCARD - PESSOAL 63 63 $VCARD_P = $this->getVcard($this->username."@".$this->server); 64 64 65 65 $group_nusers[0]['VCARD_FN'] = $VCARD_P[0]['FN']; 66 $group_nusers[0]['VCARD_NICKNAME'] = $VCARD_P[0]['NICKNAME']; 66 $group_nusers[0]['VCARD_NICKNAME'] = $VCARD_P[0]['NICKNAME']; 67 67 $group_nusers[0]['VCARD_ORGNAME'] = $VCARD_P[0]['ORGNAME']; 68 $group_nusers[0]['VCARD_ORGUNIT'] = $VCARD_P[0]['ORGUNIT']; 69 $group_nusers[0]['VCARD_ROLE'] = $VCARD_P[0]['ROLE']; 70 $group_nusers[0]['VCARD_BDAY'] = $VCARD_P[0]['BDAY']; 68 $group_nusers[0]['VCARD_ORGUNIT'] = $VCARD_P[0]['ORGUNIT']; 69 $group_nusers[0]['VCARD_ROLE'] = $VCARD_P[0]['ROLE']; 70 $group_nusers[0]['VCARD_BDAY'] = $VCARD_P[0]['BDAY']; 71 71 $group_nusers[0]['VCARD_DESC'] = $VCARD_P[0]['DESC']; 72 $group_nusers[0]['VCARD_JID'] = $VCARD_P[0]['JID']; 73 72 $group_nusers[0]['VCARD_JID'] = $VCARD_P[0]['JID']; 73 74 74 unset($VCARD_P); 75 natcasesort($group_users); 75 natcasesort($group_users); 76 76 $i=1; 77 77 78 78 // VCARD / CONTATOS - USUARIOS 79 79 80 80 foreach($group_users as $tmp){ 81 81 $aux = explode(";",$tmp); … … 86 86 $group_nusers[$i]['online'] = $aux[4]; 87 87 $aux_jid = explode("@",$aux[2]); 88 88 89 89 $VCARD_U = $this->getVcard($aux_jid[0]."@".$this->server); 90 90 91 91 $group_nusers[$i]['VCARD_FN'] = $VCARD_U[0]['FN']; 92 92 $group_nusers[$i]['VCARD_NICKNAME'] = $VCARD_U[0]['NICKNAME']; … … 97 97 $group_nusers[$i]['VCARD_DESC'] = $VCARD_U[0]['DESC']; 98 98 $group_nusers[$i]['VCARD_JID'] = $VCARD_U[0]['JID']; 99 99 100 100 unset($VCARD_U); 101 $i++; 102 } 103 101 $i++; 102 } 103 104 104 return $group_nusers; 105 105 } … … 108 108 * Contacts - Update - Add - Remove 109 109 */ 110 110 111 111 function UpdateContacts() 112 112 { … … 118 118 usleep(50000); 119 119 $result = $this->readSocketFromServer(); 120 120 121 121 if(count($result['iq'][1]['#']['query'][0]['#']['item']) > 0){ 122 122 $array_contacts = $result['iq'][1]['#']['query'][0]['#']['item']; 123 123 } 124 124 125 125 $j = 0; 126 126 127 127 // Consulta no Servidor Jabber; 128 128 if(count($array_contacts) > 0 ){ … … 130 130 { 131 131 $array_return[$j]['subscription'] = $array_contacts[$i]['@']['subscription']; 132 $array_return[$j]['name'] = $array_contacts[$i]['@']['name']; 132 $array_return[$j]['name'] = $array_contacts[$i]['@']['name']; 133 133 $array_return[$j]['jid'] = $array_contacts[$i]['@']['jid']; 134 134 $array_return[$j]['group'] = $array_contacts[$i]['#']['group']['0']['#']; 135 $aux_jid = explode("@",$array_return[$j]['jid']); 136 135 $aux_jid = explode("@",$array_return[$j]['jid']); 136 137 137 $array_return[$j]['online'] = ($this->Last_access_User(trim($aux_jid[0]."@".$this->server))) ? 1:0; 138 $j++; 139 } 140 } 141 138 $j++; 139 } 140 } 141 142 142 // Consulta no Bd Postgres; 143 143 $db_im = new db_im(); 144 144 $array_db = $db_im->get_contacts_im(NULL,$this->jid); 145 145 146 146 if(count($array_db) > 0 ) 147 147 { … … 158 158 return $array_return; 159 159 } 160 160 161 161 function AddNewContacts($pUser) 162 162 { … … 165 165 $pName = $pUser['name']; 166 166 $pGroup = $pUser['group']; 167 167 168 168 if(trim($jid[0]) != trim($this->username)){ 169 169 $addid = ( $addid ) ? $addid : "adduser_" . time(); … … 173 173 $newcontact .= ($pName) ? " name='" . urlencode($pName) . "'" : ''; 174 174 $newcontact .= (($pGroup) ? "><group>" . urlencode($pGroup) . "</group>\n</item" : "/") . ">"; 175 175 176 176 if($this->sendIq('set', $addid, NULL, NULL, "jabber:iq:roster", $newcontact)){ 177 177 // Bd; … … 180 180 $this->Subscribe($pJid); 181 181 } 182 $this->AcceptRequest($request = array("jid" => $pJid,"subscription" => $pUser['subscription'])); 182 $this->AcceptRequest($request = array("jid" => $pJid,"subscription" => $pUser['subscription'])); 183 183 return true; 184 184 }else{ … … 195 195 } 196 196 } 197 197 198 198 function UpdateUser($pUser) 199 199 { … … 201 201 $pName = $pUser['name']; 202 202 $pGroup = $pUser['group']; 203 203 204 204 $upid = ( $upid ) ? $upid : "updateuser_" . time(); 205 205 … … 222 222 } 223 223 } 224 224 225 225 function RosterRemoveUser($pUser) 226 226 { … … 233 233 $db_im->delete_contacts($pJid,$this->jid); 234 234 if(!$this->sendIq('set',$pId,NULL,NULL,"jabber:iq:roster","<item jid='$pJid' subscription='remove'/>")){ 235 return false; 235 return false; 236 236 } 237 237 return true; … … 241 241 } 242 242 } 243 243 244 244 /* 245 245 * Vcard 246 246 */ 247 247 248 248 function getVcard($pJid) 249 249 { … … 252 252 $id = $id_n[0]; 253 253 254 $this->sendIq('get',$id,$pJid,NULL,"vcard-temp","<vCard xmlns='vcard-temp'/>"); 254 $this->sendIq('get',$id,$pJid,NULL,"vcard-temp","<vCard xmlns='vcard-temp'/>"); 255 255 usleep(50000); 256 256 $result = $this->readSocketFromServer(); 257 257 258 258 if( trim($result['iq'][0]['@']['type']) === trim("result") ){ 259 259 260 260 $arr = $result['iq'][0]['#']['vCard'][0]['#']; 261 261 262 262 // vCard 263 263 $array_vcard[0]['FN'] = urldecode($arr['FN']['0']['#']); 264 264 $array_vcard[0]['NICKNAME'] = urldecode($arr['NICKNAME']['0']['#']); 265 265 $array_vcard[0]['ORGNAME'] = urldecode($arr['ORG']['0']['#']['ORGNAME']['0']['#']); 266 $array_vcard[0]['ORGUNIT'] = urldecode($arr['ORG']['0']['#']['ORGUNIT']['0']['#']); 267 $array_vcard[0]['ROLE'] = urldecode($arr['ROLE']['0']['#']); 266 $array_vcard[0]['ORGUNIT'] = urldecode($arr['ORG']['0']['#']['ORGUNIT']['0']['#']); 267 $array_vcard[0]['ROLE'] = urldecode($arr['ROLE']['0']['#']); 268 268 $array_vcard[0]['BDAY'] = urldecode($arr['BDAY']['0']['#']); 269 269 $array_vcard[0]['DESC'] = urldecode($arr['DESC']['0']['#']); … … 274 274 $array_vcard[0]['NICKNAME'] = $id; 275 275 $array_vcard[0]['ORGNAME'] = ""; 276 $array_vcard[0]['ORGUNIT'] = ""; 277 $array_vcard[0]['ROLE'] = ""; 276 $array_vcard[0]['ORGUNIT'] = ""; 277 $array_vcard[0]['ROLE'] = ""; 278 278 $array_vcard[0]['BDAY'] = ""; 279 279 $array_vcard[0]['DESC'] = ""; 280 280 $array_vcard[0]['JID'] = $pJid; 281 281 } 282 282 283 283 return $array_vcard; 284 284 } … … 291 291 $xmlVcard = ""; 292 292 293 // Vcard 293 // Vcard 294 294 $xmlVcard = "<iq id='$id' type='set'>"; 295 $xmlVcard .= "<vCard xmlns='vcard-temp'>"; 295 $xmlVcard .= "<vCard xmlns='vcard-temp'>"; 296 296 $xmlVcard .= "<FN>".urlencode($pVcard[0])."</FN>"; 297 $xmlVcard .= "<NICKNAME>".urlencode($pVcard[1])."</NICKNAME>"; 297 $xmlVcard .= "<NICKNAME>".urlencode($pVcard[1])."</NICKNAME>"; 298 298 $xmlVcard .= "<ORG>"; 299 299 $xmlVcard .= "<ORGNAME>".urlencode($pVcard[2])."</ORGNAME>"; … … 302 302 $xmlVcard .= "<ROLE>".urlencode($pVcard[4])."</ROLE>"; 303 303 $xmlVcard .= "<BDAY>".urlencode($pVcard[5])."</BDAY>"; 304 $xmlVcard .= "<DESC>".urlencode($pVcard[6])."</DESC>"; 304 $xmlVcard .= "<DESC>".urlencode($pVcard[6])."</DESC>"; 305 305 $xmlVcard .= "</vCard></iq>"; 306 306 307 307 if(!$this->SendPacket($xmlVcard)) 308 308 return false; 309 309 return true; 310 310 311 311 } 312 312 … … 327 327 { 328 328 $array_message[$j]['from'] = $array_return1['message'][$i]['@']['from']; 329 $array_message[$j]['to'] = $array_return1['message'][$i]['@']['to']; 329 $array_message[$j]['to'] = $array_return1['message'][$i]['@']['to']; 330 330 $array_message[$j]['body'] = urldecode(($array_return1['message'][$i]['#']['body'][0]['#'])); 331 331 $time = explode("T",$array_return1['message'][$i]['#']['x'][0]['@']['stamp']); … … 335 335 // Carregando a hora; 336 336 $array_message[$j]['timestamp'] = ($h - 4 ).":".$m.":".$s; 337 $j++; 337 $j++; 338 338 } 339 339 340 340 return $array_message; 341 341 } 342 342 343 343 function SendMessage($pSendMessage) 344 344 { … … 348 348 $content = array( 349 349 "subject" => $pSendMessage['subject'] ? $pSendMessage['subject'] : "", 350 "thread" => $pSendMessage['thread'] ? $pSendMessage['thread'] : "", 350 "thread" => $pSendMessage['thread'] ? $pSendMessage['thread'] : "", 351 351 "body" => $pSendMessage['body'] ? urlencode((trim(preg_replace('/^<br>|<br>$/', '', $pSendMessage['body'])))) : "" 352 352 ); 353 353 $payload = ""; 354 354 355 355 if ($to && is_array($content)) 356 356 { … … 395 395 396 396 /* 397 * Log - 398 */ 399 400 397 * Log - 398 */ 399 400 401 401 /* 402 402 * Verifica os acessos de cada contato no servidor; 403 403 */ 404 404 405 405 function Last_access_User($pJid) 406 406 { 407 $id = "last_" . time(); 407 $id = "last_" . time(); 408 408 $result = array(); 409 409 $this->sendIq('get',$id,$pJid,NULL,'jabber:iq:last'); 410 410 411 411 usleep(50000); 412 412 $result = $this->readSocketFromServer(); 413 413 414 414 $time_offline = $result['iq'][0]['#']['query'][0]['@']['seconds']; 415 415 return $this->time_off_line($time_offline); 416 416 417 417 } 418 418 419 419 function time_off_line($pTime) 420 420 { … … 423 423 return TRUE; 424 424 else 425 return FALSE; 425 return FALSE; 426 426 } 427 427 428 428 /* 429 * Permissão - Autorizar / Negar ; 429 * Permissão - Autorizar / Negar ; 430 430 */ 431 431 432 432 function AcceptRequest($pRequest) 433 433 { 434 $jid = explode("@",$pRequest['jid']); 434 $jid = explode("@",$pRequest['jid']); 435 435 $pToJid = $jid[0]."@".$this->server; 436 436 … … 443 443 return $this->SubscriptionAcceptRequest($pToJid); 444 444 }else{ 445 return false; 445 return false; 446 446 } 447 447 }else{ … … 474 474 } 475 475 476 // TESTE 477 478 function encode(&$item, $val = 'encode') 479 { 480 switch( gettype($item) ) 481 { 482 case 'object' : 483 $item = get_object_vars($item); 484 encode($item); 485 break; 486 case 'array' : 487 array_walk_recursive($item, 'encode'); 476 // TESTE 477 478 function encode(&$item, $val = 'encode') 479 { 480 switch( gettype($item) ) 481 { 482 case 'object' : 483 $item = get_object_vars($item); 484 encode($item); 488 485 break; 489 default : $item = utf8_encode($item); 490 } 491 } 486 case 'array' : 487 array_walk_recursive($item, 'encode'); 488 break; 489 default : $item = utf8_encode($item); 490 } 491 } 492 492 } 493 493 ?> -
trunk/instant_messenger/inc/class.contacts_im.inc.php
r36 r41 29 29 foreach($db_acls as $tmp) 30 30 $search_groups .= "(gidNumber=".$tmp['acl_account'].")"; 31 31 32 32 // Busca Grupos 33 33 $groups = $this->ldap->list_groups_ldap($search_groups); 34 35 $search_uids = "|"; 36 foreach($groups as $tmp){ 37 $members = $tmp['members']; 38 foreach($members as $mb) 39 $search_uids .= "(uid=".$mb.")"; 34 35 if($groups) 36 { 37 $search_uids = "|"; 38 foreach($groups as $tmp){ 39 $members = $tmp['members']; 40 foreach($members as $mb) 41 $search_uids .= "(uid=".$mb.")"; 42 } 43 44 $uids_members = $this->ldap->list_users_ldap($search_uids); 45 46 foreach($uids_members as $tmp) 47 $uids[] = $tmp; 40 48 } 41 42 $uids_members = $this->ldap->list_users_ldap($search_uids); 43 44 foreach($uids_members as $tmp) 45 $uids[] = $tmp; 46 47 return $uids; 49 50 if(count($uids) > 0) 51 return $uids; 52 else 53 return 0; 48 54 49 55 } … … 72 78 unset($result); 73 79 } 74 80 75 81 if(count($return) > 0) 76 82 return $return; -
trunk/instant_messenger/inc/class.db_im.inc.php
r36 r41 117 117 $result[] = $this->db->row(); 118 118 119 if(count($result) > 0) 119 if(count($result) > 0){ 120 120 return unserialize($result[0]['preference_value']); 121 else121 }else{ 122 122 return "ch_time:true;ch_offline:true;ch_contacts:false;rd_nm:true;rd_al:false;rd_ch:false"; 123 } 123 124 124 125 } -
trunk/instant_messenger/inc/class.ldap_im.inc.php
r33 r41 107 107 function list_groups_ldap($search) 108 108 { 109 109 110 110 if( $this->conn ){ 111 $filter = "(&(".$search.")( phpgwAccountType=g))";111 $filter = "(&(".$search.")(objectClass=posixGroup))"; 112 112 $justthese = array("gidnumber","cn","memberuid"); 113 113 $search = ldap_search($this->conn,$this->ldap_context, $filter, $justthese); 114 114 $entry = ldap_get_entries($this->conn,$search); 115 115 } 116 116 117 117 if($entry['count'] > 0){ 118 118 $i = 0; … … 120 120 foreach($entry as $tmpg){ 121 121 if($tmpg['gidnumber'] != ""){ 122 $result_groups[$i]['gidnumber'] = $tmpg['gidnumber'][0]; 123 array_shift($tmpg['memberuid']); 124 foreach($tmpg['memberuid'] as $tmp) 125 $result_groups[$i]['members'][] = $tmp; 126 $i++; 122 if(array_key_exists("memberuid", $tmpg)){ 123 $result_groups[$i]['gidnumber'] = $tmpg['gidnumber'][0]; 124 @array_shift($tmpg['memberuid']); 125 foreach($tmpg['memberuid'] as $tmp) 126 $result_groups[$i]['members'][] = $tmp; 127 $i++; 128 } 127 129 } 128 130 } 131 } 132 133 if(count($result_groups) > 0 ){ 129 134 return $result_groups; 135 }else{ 136 return 0; 130 137 } 131 return 0;132 138 } 133 139 -
trunk/instant_messenger/js/im_preferences.js
r33 r41 120 120 else 121 121 subscription = "to"; 122 if(text3) 122 if(text3){ 123 123 var email = text3.value + "@" + text0.value.substr((text0.value.indexOf('@')+1),text0.value.length); 124 else124 }else{ 125 125 var email = text0.value; 126 } 126 127 cIM.cExecute("$this.Ujabber.AddNewContacts",handler_add_contact,"email="+email+"&name="+name+"&group="+group+"&subscription="+subscription); 127 128 }else{ -
trunk/instant_messenger/js/im_templates.js
r36 r41 53 53 "<tr><td colspan='2'><input type='button' value='"+IM.get_lang('Add')+"' onclick='Preferences.Add_user(\"divAddUser_im\")'></td></tr>"+ 54 54 "</table>" 55 _this.conf_form("divAddUser",5 00,250,form_add_user,":: " + IM.get_lang('Add New Contact') + " - Expresso ::");55 _this.conf_form("divAddUser",520,270,form_add_user,":: " + IM.get_lang('Add New Contact') + " - Expresso ::"); 56 56 } 57 57 -
trunk/phpgwapi/inc/class.preferences.inc.php
r2 r41 164 164 foreach($data as $key => $val) 165 165 { 166 if (empty($val)) 167 continue; 166 168 if (!is_array($val) && strstr($val,'$$') !== False) 167 169 {
Note: See TracChangeset
for help on using the changeset viewer.