From 39049f8b03c09313f322702ce487c63b48b72bc9 Mon Sep 17 00:00:00 2001 From: Evgeny Gryaznov Date: Fri, 21 Nov 2008 15:32:01 +0000 Subject: [PATCH] [ban] disable ban completely if turned off, ban any address, show previos ban if already in the list git-svn-id: https://webim.svn.sourceforge.net/svnroot/webim/trunk@194 c66351dc-e62f-0410-b875-e3a5c0b9693f --- src/messenger/js/users.js | 14 ++++++++++---- src/messenger/webim/js/brws.js | 2 +- src/messenger/webim/js/users.js | 2 +- src/messenger/webim/operator/ban.php | 6 ++---- src/messenger/webim/operator/update.php | 11 +++++++---- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/messenger/js/users.js b/src/messenger/js/users.js index 3dde6f6a..5e235aaa 100644 --- a/src/messenger/js/users.js +++ b/src/messenger/js/users.js @@ -120,9 +120,9 @@ var HtmlGenerationUtils = { } return HtmlGenerationUtils.generateOneRowTable(gen); }, - banCell: function(id){ + banCell: function(id,banid){ return ''+ - HtmlGenerationUtils.popupLink( webimRoot+'/operator/ban.php?thread='+id, localized[2], "ban"+id, ''+localized[2]+'', 550, 440, null)+ + HtmlGenerationUtils.popupLink( webimRoot+'/operator/ban.php?'+(banid ? 'id='+banid : 'thread='+id), localized[2], "ban"+id, ''+localized[2]+'', 550, 440, null)+ ''; } }; @@ -155,7 +155,7 @@ Class.inherit( Ajax.ThreadListUpdater, Ajax.Base, { }, updateThread: function(node) { - var id, stateid, vstate, canview = false, canopen = false, ban = null; + var id, stateid, vstate, canview = false, canopen = false, canban = false, ban = null, banid = null; for( var i = 0; i < node.attributes.length; i++ ) { var attr = node.attributes[i]; @@ -169,8 +169,12 @@ Class.inherit( Ajax.ThreadListUpdater, Ajax.Base, { canopen = true; else if( attr.nodeName == "canview" ) canview = true; + else if( attr.nodeName == "canban" ) + canban = true; else if( attr.nodeName == "ban" ) ban = attr.nodeValue; + else if( attr.nodeName == "banid" ) + banid = attr.nodeValue; } function setcell(_table, row,id,pcontent) { @@ -201,7 +205,9 @@ Class.inherit( Ajax.ThreadListUpdater, Ajax.Base, { etc = ''+NodeUtils.getNodeValue(node,"reason")+''; } - etc += HtmlGenerationUtils.banCell(id); + if(canban) { + etc += HtmlGenerationUtils.banCell(id,banid); + } etc = HtmlGenerationUtils.generateOneRowTable(etc); var startRow = CommonUtils.getRow(stateid, this.t); diff --git a/src/messenger/webim/js/brws.js b/src/messenger/webim/js/brws.js index 64167317..8d057fd7 100644 --- a/src/messenger/webim/js/brws.js +++ b/src/messenger/webim/js/brws.js @@ -1 +1 @@ -var myAgent="";var sk=0;var myRealAgent="";function tk(){var uk=["\u006f\160er\u0061","m\u0073\u0069\145","\163a\u0066\141\u0072\151","firef\u006f\170","n\145\u0074\u0073\143a\160\145","\u006d\u006fz\u0069lla"];var oj=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';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);xi+='\074/\164d\076<\057\164d\u003e';if(bi){xi+='';xi+=si.ki(link,localized[0],"ImCe\156\u0074\145r"+id,'\074\151m\147\u0020sr\143\075"'+st+'\u002fi\u006dag\u0065\u0073\u002ft\142li\143\u006c\u0073\160\u0065ak\u002e\147i\146"\040\u0077i\u0064t\u0068\u003d"\061\065"\040\u0068\145\151\u0067\u0068\164\u003d"1\u0035" bo\u0072de\u0072="0"\040\141\154\164\u003d"'+localized[0]+'"\076',01200,0740,null);xi+='<\057\u0074d\076';wi++;} if(ai){xi+='';xi+=si.ki(link+"\046v\151\u0065wo\u006e\u006c\u0079=\u0074ru\u0065",localized[1],"\u0049\u006d\u0043\u0065n\164e\u0072"+id,'\074\u0069\u006d\u0067 \163\u0072\143="'+st+'\057\151m\141\147e\163\u002ft\u0062\154i\143lr\145a\144\056gif"\040\167\u0069d\u0074\150="\0615"\u0020\150e\u0069ght="\061\065" \u0062or\144\145\u0072\075"\u0030"\u0020\141\154t\075"'+localized[1]+'"\076',0x280,0740,null);xi+='\074/\164\144\076';wi++;} if(ct!=""){xi+='\074/tr>\074\164\u0072\u003e<\164\144\u0020\u0063\154\141s\u0073="\146\151rstme\u0073\163\141g\145"\u0020al\151\147n\u003d"r\u0069\u0067h\164"\040\143ols\160\u0061\156\u003d"'+wi+'">\074\141\u0020h\u0072\145f="\152\u0061v\u0061sc\u0072ipt:\166\157\u0069\u0064\0500\u0029"\040t\151\164\u006ce="'+ct+'" o\156\u0063l\151\u0063\153\075"a\u006ce\162\u0074\u0028t\150\u0069\u0073.\164\u0069\164\u006ce\u0029\073\u0072\145\u0074urn f\141\u006c\u0073\145;">';xi+=ct.length>036?ct.substring(0,0x1e)+'.\056\056':ct;xi+='<\u002fa><\057\u0074d>';} return si.di(xi);} ,yi:function(id){return'<\u0074\144 \u0077i\144\u0074\u0068="\u0033\060"\u0020\141\u006c\u0069\u0067\156="\u0063e\156\u0074\145\162">'+si.ki(st+'\u002f\157\160\u0065\u0072\141t\157\162/\142a\156.\160\150p?\u0074\150r\u0065\u0061\u0064\075'+id,localized[2],"\142a\156"+id,'\u003ci\u006d\147\040\u0073\162\143="'+st+'\u002f\u0069\u006d\u0061g\u0065\u0073\057\u0062\u0061\156.\147\u0069f"\u0020\167id\u0074\150\u003d"\061\u0035" \u0068eigh\164\075"15"\u0020b\157r\144\145\u0072\u003d"\060"\u0020al\164="'+localized[2]+'">',0x226,0670,null)+'=fj.rowIndex)){si.ui(this.t,ji.rowIndex+1);this.t.deleteRow(ji.rowIndex);this._i[id]=null;ji=null;} if(ji==null){ji=this.t.insertRow(ej.rowIndex+1);si.ii(this.t,ej.rowIndex+2);ji.id="t\u0068\162"+id;this._i[id]=new Array(lj,pj,sj);ls.insertCell(ji,"\156\141m\145","\u0074ab\u006ce",null,036,si.ei(jj,this.pq.agentservl,id,ai,bi,ci,ct,sj!='\143h\141t'));si.ti(ji);ls.insertCell(ji,"\143ontid","\164\141bl\145","ce\u006et\u0065\162",null,kj);si.ti(ji);ls.insertCell(ji,"state","\u0074ab\u006ce","\u0063\u0065\156\u0074e\u0072",null,tj);si.ti(ji);ls.insertCell(ji,"\u006f\160","t\u0061\u0062l\145","c\u0065nt\145\162",null,oj);si.ti(ji);ls.insertCell(ji,"\164\u0069\155\145","\164a\u0062\154\u0065","c\145\u006e\u0074e\u0072",null,this.gj(lj));si.ti(ji);ls.insertCell(ji,"\u0077ai\u0074","\164ab\154\145","\u0063\u0065nt\u0065\u0072",null,(sj!='c\150a\164'?this.gj(pj):'\u002d'));si.ti(ji);ls.insertCell(ji,"etc","\u0074\141\142le","ce\u006eter",null,dj);if(sj=='w\141\u0069\164'||sj=='p\u0072i\157')return true;} else{this._i[id]=new Array(lj,pj,sj);hj(this.t,ji,"n\141\u006d\145",si.ei(jj,this.pq.agentservl,id,ai,bi,ci,ct,sj!='\143\u0068at'));hj(this.t,ji,"cont\u0069d",kj);hj(this.t,ji,"\u0073\164a\u0074\145",tj);hj(this.t,ji,"\157\u0070",oj);hj(this.t,ji,"\164\151m\u0065",this.gj(lj));hj(this.t,ji,"\u0077\u0061\151t",(sj!='c\150\u0061t'?this.gj(pj):'\055'));hj(this.t,ji,"\u0065\164c",dj);} return false;} ,aj:function(){function bj(t,id,cj){var ej=t.rows[id];var fj=t.rows[id+"end"];if(ej==null||fj==null)return;var vj=fj.cells["\163ta\u0074u\163"];if(vj==null)return;vj.innerHTML=(ej.rowIndex+1==fj.rowIndex)?cj:"";vj.height=(ej.rowIndex+1==fj.rowIndex)?(27+3):012;} bj(this.t,"\167\141it",this.pq.noclients);bj(this.t,"p\162io",this.pq.noclients);bj(this.t,"\u0063\u0068\u0061t",this.pq.noclients);} ,gj:function(wj){var xj=Math.floor(((new Date()).getTime()-wj-this.mj)/01750);var yj=Math.floor(xj/(55+5));var zj="";xj=xj%074;if(xj<(8+2))xj="\u0030"+xj;if(yj>=0x3c){var $j=Math.floor(yj/(41+19));yj=yj%074;if(yj<012)yj="0"+yj;zj=$j+"\u003a";} return zj+yj+"\u003a"+xj;} ,_j:function(){for(var i in this._i){if(this._i[i]!=null){var value=this._i[i];var ji=ls.os("\164\150\162"+i,this.t);if(ji!=null){function hj(ds,ji,id,ij){var ws=ls.fs(id,ji,ds);if(ws)ws.innerHTML=ij;} hj(this.t,ji,"\164i\155\u0065",this.gj(value[0]));hj(this.t,ji,"\167\u0061it",(value[2]!='cha\u0074'?this.gj(value[1]):'-'));} } } } ,hu:function(mk){var nk=false;if(mk.tagName=='\164\150r\145ads'){var qk=qs.ks(mk,"t\u0069\155\145");var rk=qs.ks(mk,"\u0072e\166\151si\u006f\u006e");if(qk)this.mj=(new Date()).getTime()-qk;if(rk)this.pq.$i=rk;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';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);xi+='\074/\164d\076<\057\164d\u003e';if(bi){xi+='';xi+=si.ki(link,localized[0],"ImCe\156\u0074\145r"+id,'\074\151m\147\u0020sr\143\075"'+st+'\u002fi\u006dag\u0065\u0073\u002ft\142li\143\u006c\u0073\160\u0065ak\u002e\147i\146"\040\u0077i\u0064t\u0068\u003d"\061\065"\040\u0068\145\151\u0067\u0068\164\u003d"1\u0035" bo\u0072de\u0072="0"\040\141\154\164\u003d"'+localized[0]+'"\076',01200,0740,null);xi+='<\057\u0074d\076';wi++;} if(ai){xi+='';xi+=si.ki(link+"\046v\151\u0065wo\u006e\u006c\u0079=\u0074ru\u0065",localized[1],"\u0049\u006d\u0043\u0065n\164e\u0072"+id,'\074\u0069\u006d\u0067 \163\u0072\143="'+st+'\057\151m\141\147e\163\u002ft\u0062\154i\143lr\145a\144\056gif"\040\167\u0069d\u0074\150="\0615"\u0020\150e\u0069ght="\061\065" \u0062or\144\145\u0072\075"\u0030"\u0020\141\154t\075"'+localized[1]+'"\076',0x280,0740,null);xi+='\074/\164\144\076';wi++;} if(ct!=""){xi+='\074/tr>\074\164\u0072\u003e<\164\144\u0020\u0063\154\141s\u0073="\146\151rstme\u0073\163\141g\145"\u0020al\151\147n\u003d"r\u0069\u0067h\164"\040\143ols\160\u0061\156\u003d"'+wi+'">\074\141\u0020h\u0072\145f="\152\u0061v\u0061sc\u0072ipt:\166\157\u0069\u0064\0500\u0029"\040t\151\164\u006ce="'+ct+'" o\156\u0063l\151\u0063\153\075"a\u006ce\162\u0074\u0028t\150\u0069\u0073.\164\u0069\164\u006ce\u0029\073\u0072\145\u0074urn f\141\u006c\u0073\145;">';xi+=ct.length>036?ct.substring(0,0x1e)+'.\056\056':ct;xi+='<\u002fa><\057\u0074d>';} return si.di(xi);} ,yi:function(id,zi){return'<\u0074\144 \u0077i\144\u0074\u0068="\u0033\060"\u0020\141\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";