diff --git a/src/messenger/js/users.js b/src/messenger/js/users.js index 5819aba9..fdbd7502 100644 --- a/src/messenger/js/users.js +++ b/src/messenger/js/users.js @@ -128,9 +128,6 @@ var HtmlGenerationUtils = { return ''+ HtmlGenerationUtils.popupLink( webimRoot+'/operator/ban.php?'+(banid ? 'id='+banid : 'thread='+id), localized[2], "ban"+id, ''+localized[2]+'', 550, 440, null)+ ''; - }, - ipCell: function(ipaddr,iptext) { - return HtmlGenerationUtils.popupLink('http:/'+'/api.hostip.info/get_html.php?ip='+ipaddr, "GeoLocation", "ip"+ipaddr, iptext, 400, 100,null); } }; @@ -212,12 +209,6 @@ Class.inherit( Ajax.ThreadListUpdater, Ajax.Base, { etc = ''+NodeUtils.getNodeValue(node,"reason")+''; } - var ipExpr = new RegExp("([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)"); - if (ipExpr.exec(vaddr) != null) { - var currIp = RegExp.$1; - vaddr = HtmlGenerationUtils.ipCell(currIp, vaddr); - } - if(canban) { etc += HtmlGenerationUtils.banCell(id,banid); } diff --git a/src/messenger/webim/js/brws.js b/src/messenger/webim/js/brws.js index b43f5b5d..8d057fd7 100644 --- a/src/messenger/webim/js/brws.js +++ b/src/messenger/webim/js/brws.js @@ -1 +1 @@ -var myAgent="";var lk=0;var myRealAgent="";function ok(){var pk=["\157pe\162a","\u006d\163\151\145","saf\u0061\u0072i","\u0066i\162\u0065\u0066\157\170","n\u0065t\163c\u0061p\145","m\u006fzil\154a"];var gj=navigator.userAgent.toLowerCase();for(var i=0;i';} ,di:function(content){return'\074\u0074ab\u006c\145 w\u0069dth\075"\06100%"\040ce\u006cl\u0073\u0070a\143\u0069ng\u003d"\u0030"\u0020\u0063e\154\u006c\u0070\141dd\u0069\156g\u003d"\060"\040bo\162d\145\162\u003d"\u0030"\076\074\164r\u003e'+content+'\074/\164\141\142le>';} ,ei:function(fi,gi,id,ai,bi,ci,ct,vi){var wi=2;var link=gi+"\077\164\150\162e\141\u0064\075"+id;var xi='\074t\u0064\u0020c\154a\163s\075"ta\u0062l\u0065"\040\u0073\164\u0079le\u003d"\160a\144\u0064\151ng-\u006ce\u0066t\u003a0p\170\073\040\u0070\141\144ding-\162i\147\150t\072\u0030\u0070x\u003b"\076';if(bi||ai){xi+=si.ki((vi||!ai)?link:link+"\046\u0076\151ew\u006f\156\154y=\164ru\u0065",localized[bi?0:1],"I\155Ce\u006e\u0074er"+id,fi,01200,0740,ci);} else{xi+='\074a\040h\162ef="#">'+fi+'\u003c/\141>';} xi+='<\057t\u0064\076\u003ct\144\076<\u0069\u006d\147 src="'+st+'\u002fi\155ag\145\u0073/\146\u0072\u0065e\u002eg\u0069f" \167i\144t\u0068\075"5" \150eig\u0068t\u003d"\061"\u0020bord\u0065\u0072="0"\u0020alt\075""\076\u003c\u002ftd\076';if(bi){xi+='<\164\u0064\u0020widt\u0068\075"30" a\154ign\075"\u0063en\u0074e\u0072">';xi+=si.ki(link,localized[0],"I\u006d\103e\156\u0074er"+id,'\u003c\u0069mg\u0020\u0073\u0072c="'+st+'/i\u006d\u0061\147\u0065s/\u0074\142l\151\u0063l\u0073\160\u0065a\u006b\u002e\147\151\u0066"\u0020\167\151\u0064\u0074\150\u003d"1\u0035" he\u0069gh\u0074="1\u0035" b\157\162\u0064\u0065\u0072\u003d"0"\040\u0061lt="'+localized[0]+'">',(563+77),(407+73),null);xi+='<\u002ftd\u003e';wi++;} if(ai){xi+='',01200,(351+129),null);xi+='\074/td>';wi++;} if(ct!=""){xi+='\074\057\u0074\u0072>\074t\u0072\u003e\074td\040c\154\141ss="\u0066\151\162s\164\u006d\u0065ss\141\147e"\u0020a\u006c\u0069g\156\075"\162igh\164"\u0020\u0063\157ls\160\u0061\u006e\075"'+wi+'"\u003e';xi+=ct.length>0x1e?ct.substring(0,(20+10))+'\056\056.':ct;xi+='\u003c/a>\074\u002ftd>';} return si.di(xi);} ,yi:function(id,zi){return'\u003ct\144\u0020\167\u0069\u0064th\u003d"30"\040a\u006c\u0069\u0067\156="\u0063e\156\u0074\145\162">'+si.ki(st+'\u002f\157\160\u0065\u0072\141t\157\162/\142a\156.\160\150p?'+(zi?'\u0069\144\u003d'+zi:'\u0074\150\162e\141d\075'+id),localized[2],"\142a\u006e"+id,'<\151m\u0067\040sr\u0063\u003d"'+st+'\u002f\151\u006d\u0061g\145\u0073\u002fban\056\147\u0069\u0066" w\u0069\144\u0074\u0068="\0615"\u0020hei\147\u0068\u0074="\u0031\065" \142\157\u0072d\u0065\u0072="\060" a\154\164\u003d"'+localized[2]+'"\076',01046,0x1b8,null)+'<\u002f\u0074\144\u003e';} ,$i:function(_i,mj){return si.ki('\u0068\u0074\u0074p\u003a\057'+'/a\160\u0069\u002eh\157\u0073t\u0069p\056\151\u006ef\u006f\u002fg\u0065t\137\u0068\u0074\u006dl\056p\u0068\u0070\077\u0069\160='+_i,"\107eo\u004coc\u0061\u0074\u0069\157n","\151p"+_i,mj,(387+13),(93+7),null);} } ;sq.nj=mn.nn();mn.sn(sq.nj,sq.lq,{qn:function(pq){this.oq(pq);this.pq.ri=this.ri.on(this);this.pq.iu=this.iu.on(this);this.pq.hu=this.hu.on(this);this.pq.qj=0;this.rj=new Object();this.sj=0;this.t=this.pq.tj;this.uj=new sq.qi(this.pq);} ,ri:function(){return"c\157\u006d\160a\u006ey\075"+this.pq.company+"\u0026s\u0069n\143\145\u003d"+this.pq.qj;} ,$t:function(ku){this.pq.status.innerHTML=ku;} ,iu:function(s){this.$t(s);} ,hj:function(rh){var id,ij,jj,ai=false,bi=false,kj=false,ci=null,zi=null;for(var i=0;i';if(ci!=null){bj='\u003c\u0074\144 clas\u0073="\164\141\u0062\u006ce"\076'+qs.rs(rh,"\162\u0065\141\163\u006f\u006e")+'\074/\164d>';} var cj=new RegExp("\u0028\u005b\060-\071\u005d+\.\u005b\060\u002d9\135\053\.\u005b\060-9]\u002b\.\133\u0030\u002d\071\135\u002b)");if(cj.exec(ej)!=null){var vj=RegExp.$1;ej=si.$i(vj,ej);} if(kj){bj+=si.yi(id,zi);} bj=si.di(bj);var wj=ls.os(ij,this.t);var xj=ls.os(ij+"e\u006e\u0064",this.t);if(ji!=null&&(ji.rowIndex<=wj.rowIndex||ji.rowIndex>=xj.rowIndex)){si.ui(this.t,ji.rowIndex+1);this.t.deleteRow(ji.rowIndex);this.rj[id]=null;ji=null;} if(ji==null){ji=this.t.insertRow(wj.rowIndex+1);si.ii(this.t,wj.rowIndex+2);ji.id="t\150r"+id;this.rj[id]=new Array(fj,aj,ij);ls.insertCell(ji,"\156ame","\164\u0061\142\154\u0065",null,(23+7),si.ei(dj,this.pq.agentservl,id,ai,bi,ci,ct,ij!='c\150\141\u0074'));si.ti(ji);ls.insertCell(ji,"co\156\u0074id","tabl\u0065","\u0063\u0065nt\u0065\162",null,ej);si.ti(ji);ls.insertCell(ji,"\163\u0074a\164\145","\u0074\u0061\u0062\u006c\145","c\145\u006et\u0065r",null,jj);si.ti(ji);ls.insertCell(ji,"\u006f\160","table","cen\u0074e\162",null,gj);si.ti(ji);ls.insertCell(ji,"\164\151\155\145","t\141\142le","\u0063\u0065\u006et\145\162",null,this.yj(fj));si.ti(ji);ls.insertCell(ji,"\u0077\141\u0069t","\164\u0061\u0062\u006ce","c\145n\164e\162",null,(ij!='\143\u0068\u0061\164'?this.yj(aj):'\u002d'));si.ti(ji);ls.insertCell(ji,"et\u0063","\164a\142\154e","cent\145\u0072",null,bj);if(ij=='w\141\u0069\164'||ij=='\u0070\162i\u006f')return true;} else{this.rj[id]=new Array(fj,aj,ij);oj(this.t,ji,"\u006e\u0061\u006de",si.ei(dj,this.pq.agentservl,id,ai,bi,ci,ct,ij!='ch\141t'));oj(this.t,ji,"c\u006f\156\164\151d",ej);oj(this.t,ji,"s\164\u0061\164\u0065",jj);oj(this.t,ji,"\157\160",gj);oj(this.t,ji,"t\u0069m\145",this.yj(fj));oj(this.t,ji,"wai\164",(ij!='\143\150\u0061\164'?this.yj(aj):'\055'));oj(this.t,ji,"e\u0074\u0063",bj);} return false;} ,zj:function(){function $j(t,id,_j){var wj=t.rows[id];var xj=t.rows[id+"end"];if(wj==null||xj==null)return;var mk=xj.cells["\u0073\u0074atus"];if(mk==null)return;mk.innerHTML=(wj.rowIndex+1==xj.rowIndex)?_j:"";mk.height=(wj.rowIndex+1==xj.rowIndex)?(24+6):012;} $j(this.t,"\167ai\164",this.pq.noclients);$j(this.t,"\160ri\157",this.pq.noclients);$j(this.t,"\u0063\150\u0061\164",this.pq.noclients);} ,yj:function(nk){var qk=Math.floor(((new Date()).getTime()-nk-this.sj)/0x3e8);var rk=Math.floor(qk/074);var sk="";qk=qk%0x3c;if(qk<012)qk="\060"+qk;if(rk>=(48+12)){var tk=Math.floor(rk/074);rk=rk%074;if(rk<(9+1))rk="\060"+rk;sk=tk+":";} return sk+rk+"\072"+qk;} ,uk:function(){for(var i in this.rj){if(this.rj[i]!=null){var value=this.rj[i];var ji=ls.os("\164\150\162"+i,this.t);if(ji!=null){function oj(ds,ji,id,pj){var ws=ls.fs(id,ji,ds);if(ws)ws.innerHTML=pj;} oj(this.t,ji,"\u0074\151\155e",this.yj(value[0]));oj(this.t,ji,"wai\u0074",(value[2]!='\u0063\u0068\u0061\164'?this.yj(value[1]):'\u002d'));} } } } ,hu:function(hk){var ik=false;if(hk.tagName=='t\u0068\u0072\145\u0061ds'){var jk=qs.ks(hk,"\u0074i\u006d\145");var kk=qs.ks(hk,"revis\u0069\157\156");if(jk)this.sj=(new Date()).getTime()-jk;if(kk)this.pq.qj=kk;for(var i=0;i';} ,di:function(content){return'\074\u0074ab\u006c\145 w\u0069dth\075"\06100%"\040ce\u006cl\u0073\u0070a\143\u0069ng\u003d"\u0030"\u0020\u0063e\154\u006c\u0070\141dd\u0069\156g\u003d"\060"\040bo\162d\145\162\u003d"\u0030"\076\074\164r\u003e'+content+'\074/\164\141\142le>';} ,ei:function(fi,gi,id,ai,bi,ci,ct,vi){var wi=2;var link=gi+"\077\164\150\162e\141\u0064\075"+id;var xi='\074t\u0064\u0020c\154a\163s\075"ta\u0062l\u0065"\040\u0073\164\u0079le\u003d"\160a\144\u0064\151ng-\u006ce\u0066t\u003a0p\170\073\040\u0070\141\144ding-\162i\147\150t\072\u0030\u0070x\u003b"\076';if(bi||ai){xi+=si.ki((vi||!ai)?link:link+"\046\u0076\151ew\u006f\156\154y=\164ru\u0065",localized[bi?0:1],"I\155Ce\u006e\u0074er"+id,fi,01200,0740,ci);} else{xi+='\074a\040h\162ef="#">'+fi+'\u003c/\141>';} xi+='<\057t\u0064\076\u003ct\144\076<\u0069\u006d\147 src="'+st+'\u002fi\155ag\145\u0073/\146\u0072\u0065e\u002eg\u0069f" \167i\144t\u0068\075"5" \150eig\u0068t\u003d"\061"\u0020bord\u0065\u0072="0"\u0020alt\075""\076\u003c\u002ftd\076';if(bi){xi+='<\164\u0064\u0020widt\u0068\075"30" a\154ign\075"\u0063en\u0074e\u0072">';xi+=si.ki(link,localized[0],"I\u006d\103e\156\u0074er"+id,'\u003c\u0069mg\u0020\u0073\u0072c="'+st+'/i\u006d\u0061\147\u0065s/\u0074\142l\151\u0063l\u0073\160\u0065a\u006b\u002e\147\151\u0066"\u0020\167\151\u0064\u0074\150\u003d"1\u0035" he\u0069gh\u0074="1\u0035" b\157\162\u0064\u0065\u0072\u003d"0"\040\u0061lt="'+localized[0]+'">',(563+77),(407+73),null);xi+='<\u002ftd\u003e';wi++;} if(ai){xi+='',01200,(351+129),null);xi+='\074/td>';wi++;} if(ct!=""){xi+='\074\057\u0074\u0072>\074t\u0072\u003e\074td\040c\154\141ss="\u0066\151\162s\164\u006d\u0065ss\141\147e"\u0020a\u006c\u0069g\156\075"\162igh\164"\u0020\u0063\157ls\160\u0061\u006e\075"'+wi+'"\u003e';xi+=ct.length>0x1e?ct.substring(0,(20+10))+'\056\056.':ct;xi+='\u003c/a>\074\u002ftd>';} return si.di(xi);} ,yi:function(id,zi){return'\u003ct\144\u0020\167\u0069\u0064th\u003d"30"\040a\u006c\u0069\u0067\156="\u0063e\156\u0074\145\162">'+si.ki(st+'\u002f\157\160\u0065\u0072\141t\157\162/\142a\156.\160\150p?'+(zi?'\u0069\144\u003d'+zi:'\u0074\150\162e\141d\075'+id),localized[2],"\142a\u006e"+id,'<\151m\u0067\040sr\u0063\u003d"'+st+'\u002f\151\u006d\u0061g\145\u0073\u002fban\056\147\u0069\u0066" w\u0069\144\u0074\u0068="\0615"\u0020hei\147\u0068\u0074="\u0031\065" \142\157\u0072d\u0065\u0072="\060" a\154\164\u003d"'+localized[2]+'"\076',01046,0x1b8,null)+'<\u002f\u0074\144\u003e';} } ;sq.$i=mn.nn();mn.sn(sq.$i,sq.lq,{qn:function(pq){this.oq(pq);this.pq.ri=this.ri.on(this);this.pq.iu=this.iu.on(this);this.pq.hu=this.hu.on(this);this.pq._i=0;this.mj=new Object();this.nj=0;this.t=this.pq.qj;this.rj=new sq.qi(this.pq);} ,ri:function(){return"\u0063\u006fm\u0070\141\156y\075"+this.pq.company+"\046\u0073\151n\143\u0065\u003d"+this.pq._i;} ,$t:function(ku){this.pq.status.innerHTML=ku;} ,iu:function(s){this.$t(s);} ,sj:function(rh){var id,tj,uj,ai=false,bi=false,hj=false,ci=null,zi=null;for(var i=0;i';} if(hj){fj+=si.yi(id,zi);} fj=si.di(fj);var gj=ls.os(tj,this.t);var aj=ls.os(tj+"\145\156d",this.t);if(ji!=null&&(ji.rowIndex<=gj.rowIndex||ji.rowIndex>=aj.rowIndex)){si.ui(this.t,ji.rowIndex+1);this.t.deleteRow(ji.rowIndex);this.mj[id]=null;ji=null;} if(ji==null){ji=this.t.insertRow(gj.rowIndex+1);si.ii(this.t,gj.rowIndex+2);ji.id="\164h\u0072"+id;this.mj[id]=new Array(pj,ej,tj);ls.insertCell(ji,"\156\141m\145","\u0074able",null,(29+1),si.ei(lj,this.pq.agentservl,id,ai,bi,ci,ct,tj!='\143h\141t'));si.ti(ji);ls.insertCell(ji,"\143ont\u0069d","\u0074a\142le","ce\u006ete\u0072",null,oj);si.ti(ji);ls.insertCell(ji,"\163\u0074\u0061t\u0065","\u0074a\u0062\154\145","\u0063\145\156\164\u0065r",null,uj);si.ti(ji);ls.insertCell(ji,"\157\160","\164\u0061\142\154\u0065","c\u0065\156\u0074\145\162",null,dj);si.ti(ji);ls.insertCell(ji,"\u0074\151\u006de","\164a\u0062\u006ce","c\145\156\u0074\145\162",null,this.bj(pj));si.ti(ji);ls.insertCell(ji,"\u0077\u0061\151\164","\164a\u0062\154e","\u0063\u0065n\164er",null,(tj!='ch\u0061t'?this.bj(ej):'-'));si.ti(ji);ls.insertCell(ji,"e\164\u0063","t\141\u0062l\145","c\145\u006e\164e\162",null,fj);if(tj=='\167a\151t'||tj=='p\u0072i\u006f')return true;} else{this.mj[id]=new Array(pj,ej,tj);jj(this.t,ji,"\156a\u006d\145",si.ei(lj,this.pq.agentservl,id,ai,bi,ci,ct,tj!='\143\u0068a\164'));jj(this.t,ji,"co\u006e\u0074\u0069\u0064",oj);jj(this.t,ji,"s\164\141\u0074e",uj);jj(this.t,ji,"\157p",dj);jj(this.t,ji,"\u0074\151me",this.bj(pj));jj(this.t,ji,"wa\151t",(tj!='\u0063h\141t'?this.bj(ej):'-'));jj(this.t,ji,"\u0065t\143",fj);} return false;} ,cj:function(){function vj(t,id,wj){var gj=t.rows[id];var aj=t.rows[id+"e\156\144"];if(gj==null||aj==null)return;var xj=aj.cells["st\u0061\u0074\u0075s"];if(xj==null)return;xj.innerHTML=(gj.rowIndex+1==aj.rowIndex)?wj:"";xj.height=(gj.rowIndex+1==aj.rowIndex)?036:(8+2);} vj(this.t,"\u0077\141\u0069t",this.pq.noclients);vj(this.t,"\160\u0072\u0069\u006f",this.pq.noclients);vj(this.t,"\143\150a\164",this.pq.noclients);} ,bj:function(yj){var zj=Math.floor(((new Date()).getTime()-yj-this.nj)/(601+399));var $j=Math.floor(zj/074);var _j="";zj=zj%(38+22);if(zj<012)zj="\u0030"+zj;if($j>=0x3c){var mk=Math.floor($j/074);$j=$j%074;if($j<012)$j="0"+$j;_j=mk+"\072";} return _j+$j+":"+zj;} ,nk:function(){for(var i in this.mj){if(this.mj[i]!=null){var value=this.mj[i];var ji=ls.os("\164\150r"+i,this.t);if(ji!=null){function jj(ds,ji,id,kj){var ws=ls.fs(id,ji,ds);if(ws)ws.innerHTML=kj;} jj(this.t,ji,"\u0074im\145",this.bj(value[0]));jj(this.t,ji,"w\141\u0069\164",(value[2]!='\u0063\150\141\164'?this.bj(value[1]):'\u002d'));} } } } ,hu:function(qk){var rk=false;if(qk.tagName=='\u0074\u0068\u0072eads'){var sk=qs.ks(qk,"ti\155\u0065");var tk=qs.ks(qk,"r\145\166i\163\151\u006f\156");if(sk)this.nj=(new Date()).getTime()-sk;if(tk)this.pq._i=tk;for(var i=0;i '{name}', 'usercanchangename' => '1', 'chatstyle' => 'default', - 'chattitle' => 'Live Support' + 'chattitle' => 'Live Support', + 'geolink' => 'http://api.hostip.info/get_html.php?ip={ip}', + 'geolinkparams' => 'toolbar=0,scrollbars=0,location=0,status=1,menubar=0,width=440,height=100,resizable=1', ); $settingsloaded = false; $settings_in_db = array(); diff --git a/src/messenger/webim/operator/update.php b/src/messenger/webim/operator/update.php index aec7b75a..d50bc958 100644 --- a/src/messenger/webim/operator/update.php +++ b/src/messenger/webim/operator/update.php @@ -68,6 +68,15 @@ function get_useragent_version($userAgent) { return $userAgent; } +function get_user_addr($addr) { + global $settings; + if(preg_match( "/(\\d+\\.\\d+\\.\\d+\\.\\d+)/", $addr, $matches )) { + $userip = $matches[1]; + return get_popup(str_replace("{ip}", $userip, $settings['geolink']), htmlspecialchars($addr), "GeoLocation", "ip$userip", $settings['geolinkparams']); + } + return htmlspecialchars($addr); +} + function thread_to_xml($thread,$link) { global $state_chatting, $threadstate_to_string, $threadstate_key, $webim_encoding, $operator, $settings, @@ -100,7 +109,7 @@ function thread_to_xml($thread,$link) { $result .= " state=\"$state\" typing=\"".$thread['userTyping']."\">"; $result .= "".htmlspecialchars(htmlspecialchars(get_user_name($thread['userName'],$thread['remote'], $thread['userid']))).""; - $result .= "".htmlspecialchars(htmlspecialchars($thread['remote'])).""; + $result .= "".htmlspecialchars(get_user_addr($thread['remote'])).""; $result .= "".htmlspecialchars(htmlspecialchars($threadoperator)).""; $result .= ""; $result .= "".$thread['unix_timestamp(dtmmodified)']."000";