Changeset 26
- Timestamp:
- 05/11/07 14:07:14 (17 years ago)
- Location:
- trunk/instant_messenger
- Files:
-
- 6 edited
-
docs/change_log.txt (modified) (1 diff)
-
inc/class.Ujabber.inc.php (modified) (3 diffs)
-
js/im_functions.js (modified) (1 diff)
-
js/im_preferences.js (modified) (7 diffs)
-
js/im_win.js (modified) (2 diffs)
-
setup/phpgw_pt-br.lang (modified) (previous)
Legend:
- Unmodified
- Added
- Removed
-
trunk/instant_messenger/docs/change_log.txt
r24 r26 7 7 - Vcard, corrigido para a visualização de caracteres e acentos. 8 8 9 10/05/2007 [0.001] 10 - Busca de ids no ldap 11 - O envio de autorização, está dentro do menu do botão direito, quando clicado em cima do 12 nome do contato. 13 - A montagem da lista de contatos é feito direto no elemento da página. 14 - Correção para cadastro dos contatos com acentos. -
trunk/instant_messenger/inc/class.Ujabber.inc.php
r24 r26 55 55 56 56 for($i=0; $i < count($contacts); $i++){ 57 $group_users[] = strtolower( $contacts[$i]['group']).";".$contacts[$i]['name'].";".$contacts[$i]['jid'].";".$contacts[$i]['subscription'].";".$contacts[$i]['online'];57 $group_users[] = strtolower(urldecode($contacts[$i]['group'])).";".urldecode($contacts[$i]['name']).";".$contacts[$i]['jid'].";".$contacts[$i]['subscription'].";".$contacts[$i]['online']; 58 58 } 59 59 … … 168 168 { 169 169 $newcontact = "<item jid='$pJid'"; 170 $newcontact .= ($pName) ? " name='" . $pName. "'" : '';171 $newcontact .= (($pGroup) ? "><group>" . $pGroup. "</group>\n</item" : "/") . ">";170 $newcontact .= ($pName) ? " name='" . urlencode($pName) . "'" : ''; 171 $newcontact .= (($pGroup) ? "><group>" . urlencode($pGroup) . "</group>\n</item" : "/") . ">"; 172 172 173 173 if($this->sendIq('set', $addid, NULL, NULL, "jabber:iq:roster", $newcontact)){ … … 204 204 { 205 205 $updatecontact = "<item jid='$pJid'"; 206 $updatecontact .= ($pName) ? " name='" . $pName. "'" : '';207 $updatecontact .= (($pGroup) ? "><group>" . $pGroup. "</group>\n</item" : "/") . ">";206 $updatecontact .= ($pName) ? " name='" . urlencode($pName) . "'" : ''; 207 $updatecontact .= (($pGroup) ? "><group>" . urlencode($pGroup) . "</group>\n</item" : "/") . ">"; 208 208 209 209 if($this->sendIq('set', $upid, NULL, NULL, "jabber:iq:roster", $updatecontact)){ -
trunk/instant_messenger/js/im_functions.js
r24 r26 89 89 var div_agroups = document.getElementById("all_groups"); 90 90 91 if(document.getElementById("img_" + pList[i].group.rm_space()) == null ){92 div_agroups.innerHTML += '<img id="img_' + pList[i].group.rm_space() + '" src="' + img_group_open.src + '" onclick="javascript:IM.visible_group(\'' + pList[i].group.rm_space() + '\')" style="margin-left:16px;">';93 div_agroups.innerHTML += '<b>' + pList[i].group+ '</b></br>';94 95 if( pList[i].group.rm_space() != 'sem_grupo'){91 if(document.getElementById("img_" + decodeURI(pList[i].group.rm_space())) == null ){ 92 div_agroups.innerHTML += '<img id="img_' + decodeURI(pList[i].group.rm_space()) + '" src="' + img_group_open.src + '" onclick="javascript:IM.visible_group(\'' + decodeURI(pList[i].group.rm_space()) + '\')" style="margin-left:16px;">'; 93 div_agroups.innerHTML += '<b>' + decodeURI(pList[i].group) + '</b></br>'; 94 95 if(decodeURI(pList[i].group.rm_space()) != 'sem_grupo'){ 96 96 var div_group = document.createElement('DIV'); 97 div_group.id = pList[i].group.rm_space();97 div_group.id = decodeURI(pList[i].group.rm_space()); 98 98 if(pList[i].subscription.rm_space() == "both") 99 div_group.innerHTML = '<div id="' + pList[i].jid + '" nuncontact="'+ i +'" onmouseover="this.className=\'contato_hover\'" onmouseout="this.className=\'\'" onmousedown="javascript:IM.action_button(event, \''+pList[i].online + '\', \'' + pList[i].jid + '\' ,false);" style="cursor:pointer;padding-left:32px;"><img src="' + ((pList[i].online) == parseInt(1) ? img_online.src : img_offline.src) + '">' + pList[i].name+ '</div><span id="_span_' + pList[i].jid + '" class="menu_im"></span>';99 div_group.innerHTML += '<div id="' + pList[i].jid + '" nuncontact="'+ i +'" onmouseover="this.className=\'contato_hover\'" onmouseout="this.className=\'\'" onmousedown="javascript:IM.action_button(event, \''+pList[i].online + '\', \'' + pList[i].jid + '\' ,false);" style="cursor:pointer;padding-left:32px;"><img src="' + ((pList[i].online) == parseInt(1) ? img_online.src : img_offline.src) + '">' + decodeURI(pList[i].name) + '</div><span id="_span_' + pList[i].jid + '" class="menu_im"></span>'; 100 100 else 101 div_group.innerHTML = '<div id="' + pList[i].jid + '" nuncontact="'+ i +'" onmouseover="this.className=\'contato_hover\'" onmouseout="this.className=\'\'" onmousedown="javascript:IM.action_button(event, \''+parseInt(0)+'\', \'' + pList[i].jid + '\' ,true);" style="cursor:pointer;padding-left:32px;"><img src="' + img_wait_auth.src + '">' + pList[i].name+ '</div><span id="_span_' + pList[i].jid + '" class="menu_im"></span>';101 div_group.innerHTML += '<div id="' + pList[i].jid + '" nuncontact="'+ i +'" onmouseover="this.className=\'contato_hover\'" onmouseout="this.className=\'\'" onmousedown="javascript:IM.action_button(event, \''+parseInt(0)+'\', \'' + pList[i].jid + '\' ,true);" style="cursor:pointer;padding-left:32px;"><img src="' + img_wait_auth.src + '">' + decodeURI(pList[i].name) + '</div><span id="_span_' + pList[i].jid + '" class="menu_im"></span>'; 102 102 div_agroups.appendChild(div_group); 103 103 }else{ 104 104 var div_group = document.createElement('DIV'); 105 div_group.id = pList[i].group.rm_space();106 div_group.innerHTML = '<div id="'+pList[i].jid+'" onclick=Preferences.updateLoad("'+i+'") style="cursor:pointer;padding-left:32px;">'+107 '<img src="'+img_not_authorized.src+'">'+pList[i].jid+'</div>';105 div_group.id = decodeURI(pList[i].group.rm_space()); 106 div_group.innerHTML += '<div id="'+pList[i].jid+'" onclick=Preferences.updateLoad("'+i+'") style="cursor:pointer;padding-left:32px;">'+ 107 '<img src="'+img_not_authorized.src+'">'+pList[i].jid+'</div>'; 108 108 div_agroups.appendChild(div_group); 109 109 } 110 110 }else{ 111 111 112 if( pList[i].group.rm_space() != 'sem_grupo'){113 var div_group = document.getElementById( pList[i].group.rm_space());112 if(decodeURI(pList[i].group.rm_space()) != 'sem_grupo'){ 113 var div_group = document.getElementById(decodeURI(pList[i].group.rm_space())); 114 114 if(pList[i].subscription.rm_space() == "both") 115 div_group.innerHTML += '<div id="' + pList[i].jid + '" nuncontact="'+ i +'" onmouseover="this.className=\'contato_hover\'" onmouseout="this.className=\'\'" onmousedown="javascript:IM.action_button(event, \''+pList[i].online + '\', \'' + pList[i].jid + '\',false);" style="cursor:pointer;padding-left:32px;"><img src="' + ((pList[i].online) == parseInt(1) ? img_online.src : img_offline.src) + '">' + pList[i].name+ '</div><span id="_span_' + pList[i].jid + '" class="menu_im"></span>';115 div_group.innerHTML += '<div id="' + pList[i].jid + '" nuncontact="'+ i +'" onmouseover="this.className=\'contato_hover\'" onmouseout="this.className=\'\'" onmousedown="javascript:IM.action_button(event, \''+pList[i].online + '\', \'' + pList[i].jid + '\',false);" style="cursor:pointer;padding-left:32px;"><img src="' + ((pList[i].online) == parseInt(1) ? img_online.src : img_offline.src) + '">' + decodeURI(pList[i].name) + '</div><span id="_span_' + pList[i].jid + '" class="menu_im"></span>'; 116 116 else 117 div_group.innerHTML = '<div id="' + pList[i].jid + '" nuncontact="'+ i +'" onmouseover="this.className=\'contato_hover\'" onmouseout="this.className=\'\'" onmousedown="javascript:IM.action_button(event, \''+parseInt(0)+'\', \'' + pList[i].jid + '\',true);" style="cursor:pointer;padding-left:32px;"><img src="' + img_wait_auth.src + '">' + pList[i].name+ '</div><span id="_span_' + pList[i].jid + '" class="menu_im"></span>';117 div_group.innerHTML += '<div id="' + pList[i].jid + '" nuncontact="'+ i +'" onmouseover="this.className=\'contato_hover\'" onmouseout="this.className=\'\'" onmousedown="javascript:IM.action_button(event, \''+parseInt(0)+'\', \'' + pList[i].jid + '\',true);" style="cursor:pointer;padding-left:32px;"><img src="' + img_wait_auth.src + '">' + decodeURI(pList[i].name) + '</div><span id="_span_' + pList[i].jid + '" class="menu_im"></span>'; 118 118 div_agroups.appendChild(div_group); 119 119 }else{ 120 var div_group = document.getElementById( pList[i].group.rm_space());120 var div_group = document.getElementById(decodeURI(pList[i].group.rm_space())); 121 121 div_group.innerHTML += '<div id="'+pList[i].jid+'" onclick=Preferences.updateLoad("'+i+'") style="cursor:pointer;padding-left:32px;">'+ 122 122 '<img src="'+img_not_authorized.src+'">'+pList[i].jid+'</div>'; -
trunk/instant_messenger/js/im_preferences.js
r24 r26 99 99 } 100 100 } 101 var name = url_encode(encodeURI(text1.value)); 102 var group = url_encode(encodeURI(text2.value)); 101 103 if(pFunc == 'divAddUser_im') 102 cIM.cExecute("$this.Ujabber.AddNewContacts",handler_add_contact,"email="+text0.value+"&name="+ text1.value+"&group="+text2.value+"&subscription=none");104 cIM.cExecute("$this.Ujabber.AddNewContacts",handler_add_contact,"email="+text0.value+"&name="+name+"&group="+group+"&subscription=none"); 103 105 else 104 cIM.cExecute("$this.Ujabber.AddNewContacts",handler_add_contact,"email="+text0.value+"&name="+ text1.value+"&group="+text2.value+"&subscription=to");106 cIM.cExecute("$this.Ujabber.AddNewContacts",handler_add_contact,"email="+text0.value+"&name="+name+"&group="+group+"&subscription=to"); 105 107 }else{ 106 108 alert("Informe todos os campos!"); … … 122 124 123 125 for(var i=1; i < IM.array_users.length; i++){ 124 if( IM.array_users[i].name!= ""){125 opt = new Option( IM.array_users[i].name,IM.array_users[i].jid, false, false);126 if(decodeURI(IM.array_users[i].name) != ""){ 127 opt = new Option(decodeURI(IM.array_users[i].name),IM.array_users[i].jid, false, false); 126 128 sel_contact.options[sel_contact.length] = opt; 127 129 }else{ … … 143 145 for(var j=1 ; j < IM.array_users.length; j++){ 144 146 var name = IM.array_users[j].jid.substr(0,IM.array_users[j].jid.indexOf('@')); 145 if( IM.array_users[j].name== in_el || name == in_el){147 if(decodeURI(IM.array_users[j].name) == in_el || name == in_el){ 146 148 var handler_remove_contact = function(data){ 147 149 if(!data){ … … 175 177 sel_contact.options[sel_contact.length] = opt; 176 178 for(var i=0; i < IM.array_users.length; i++){ 177 opt = new Option( IM.array_users[i].name,IM.array_users[i].jid, false, false);179 opt = new Option(decodeURI(IM.array_users[i].name),IM.array_users[i].jid, false, false); 178 180 sel_contact.options[sel_contact.length] = opt; 179 181 } … … 184 186 for(var i=0; i < IM.array_users.length; i++){ 185 187 if(IM.array_users[i].jid == pJid){ 186 if(confirm("Excluir o contato " + IM.array_users[i].name+ "?")){188 if(confirm("Excluir o contato " + decodeURI(IM.array_users[i].name) + "?")){ 187 189 var handler_remove_contact = function(data){ 188 190 if(!data){ … … 220 222 for(var i=1; i < IM.array_users.length; i++){ 221 223 if(IM.array_users[i].jid == pJid){ 222 name = IM.array_users[i].name;223 group = IM.array_users[i].group;224 name = decodeURI(IM.array_users[i].name); 225 group = decodeURI(IM.array_users[i].group); 224 226 } 225 227 } … … 228 230 if(pType){ 229 231 var act = prompt("Digite um apelido para :" + pJid , name); 230 name = act; 232 name = url_encode(encodeURI(act)); 233 group = url_encode(encodeURI(group)); 231 234 }else{ 232 235 var act = prompt("Digite um novo grupo para : " + name, group); 233 group = act; 236 group = url_encode(encodeURI(act)); 237 name = url_encode(encodeURI(name)); 234 238 } 235 239 if((act != null) && (act != "")){ -
trunk/instant_messenger/js/im_win.js
r24 r26 902 902 { 903 903 if ( document.title=="......................" ) 904 document.title = "New Message!";904 document.title = IM.get_lang('New Message!'); 905 905 else 906 906 document.title = "......................"; … … 913 913 if ( newMessageTimer ) clearTimeout(newMessageTimer); 914 914 } 915 915 916 }, 916 917
Note: See TracChangeset
for help on using the changeset viewer.
