").append(b.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},b.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){b.fn[t]=function(e){return this.on(t,e)}}),b.each(["get","post"],function(e,n){b[n]=function(e,r,i,o){return b.isFunction(r)&&(o=o||i,i=r,r=t),b.ajax({url:e,type:n,dataType:o,data:r,success:i})}}),b.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Nn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":b.parseJSON,"text xml":b.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Mn(Mn(e,b.ajaxSettings),t):Mn(b.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,u,l,c,p=b.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?b(f):b.event,h=b.Deferred(),g=b.Callbacks("once memory"),m=p.statusCode||{},y={},v={},x=0,T="canceled",N={readyState:0,getResponseHeader:function(e){var t;if(2===x){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===x?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return x||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return x||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>x)for(t in e)m[t]=[m[t],e[t]];else N.always(e[N.status]);return this},abort:function(e){var t=e||T;return l&&l.abort(t),k(0,t),this}};if(h.promise(N).complete=g.add,N.success=N.done,N.error=N.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=b.trim(p.dataType||"*").toLowerCase().match(w)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?80:443))==(mn[3]||("http:"===mn[1]?80:443)))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=b.param(p.data,p.traditional)),qn(An,p,n,N),2===x)return N;u=p.global,u&&0===b.active++&&b.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Cn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(b.lastModified[o]&&N.setRequestHeader("If-Modified-Since",b.lastModified[o]),b.etag[o]&&N.setRequestHeader("If-None-Match",b.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&N.setRequestHeader("Content-Type",p.contentType),N.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)N.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,N,p)===!1||2===x))return N.abort();T="abort";for(i in{success:1,error:1,complete:1})N[i](p[i]);if(l=qn(jn,p,n,N)){N.readyState=1,u&&d.trigger("ajaxSend",[N,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){N.abort("timeout")},p.timeout));try{x=1,l.send(y,k)}catch(C){if(!(2>x))throw C;k(-1,C)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,C=n;2!==x&&(x=2,s&&clearTimeout(s),l=t,a=i||"",N.readyState=e>0?4:0,r&&(w=_n(p,N,r)),e>=200&&300>e||304===e?(p.ifModified&&(T=N.getResponseHeader("Last-Modified"),T&&(b.lastModified[o]=T),T=N.getResponseHeader("etag"),T&&(b.etag[o]=T)),204===e?(c=!0,C="nocontent"):304===e?(c=!0,C="notmodified"):(c=Fn(p,w),C=c.state,y=c.data,v=c.error,c=!v)):(v=C,(e||!C)&&(C="error",0>e&&(e=0))),N.status=e,N.statusText=(n||C)+"",c?h.resolveWith(f,[y,C,N]):h.rejectWith(f,[N,C,v]),N.statusCode(m),m=t,u&&d.trigger(c?"ajaxSuccess":"ajaxError",[N,p,c?y:v]),g.fireWith(f,[N,C]),u&&(d.trigger("ajaxComplete",[N,p]),--b.active||b.event.trigger("ajaxStop")))}return N},getScript:function(e,n){return b.get(e,t,n,"script")},getJSON:function(e,t,n){return b.get(e,t,n,"json")}});function _n(e,n,r){var i,o,a,s,u=e.contents,l=e.dataTypes,c=e.responseFields;for(s in c)s in r&&(n[c[s]]=r[s]);while("*"===l[0])l.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in u)if(u[s]&&u[s].test(o)){l.unshift(s);break}if(l[0]in r)a=l[0];else{for(s in r){if(!l[0]||e.converters[s+" "+l[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==l[0]&&l.unshift(a),r[a]):t}function Fn(e,t){var n,r,i,o,a={},s=0,u=e.dataTypes.slice(),l=u[0];if(e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u[1])for(i in e.converters)a[i.toLowerCase()]=e.converters[i];for(;r=u[++s];)if("*"!==r){if("*"!==l&&l!==r){if(i=a[l+" "+r]||a["* "+r],!i)for(n in a)if(o=n.split(" "),o[1]===r&&(i=a[l+" "+o[0]]||a["* "+o[0]])){i===!0?i=a[n]:a[n]!==!0&&(r=o[0],u.splice(s--,0,r));break}if(i!==!0)if(i&&e["throws"])t=i(t);else try{t=i(t)}catch(c){return{state:"parsererror",error:i?c:"No conversion from "+l+" to "+r}}}l=r}return{state:"success",data:t}}b.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return b.globalEval(e),e}}}),b.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),b.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=o.head||b("head")[0]||o.documentElement;return{send:function(t,i){n=o.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var On=[],Bn=/(=)\?(?=&|$)|\?\?/;b.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=On.pop()||b.expando+"_"+vn++;return this[e]=!0,e}}),b.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,u=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return u||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=b.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,u?n[u]=n[u].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||b.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,On.push(o)),s&&b.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}b.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=b.ajaxSettings.xhr(),b.support.cors=!!Rn&&"withCredentials"in Rn,Rn=b.support.ajax=!!Rn,Rn&&b.ajaxTransport(function(n){if(!n.crossDomain||b.support.cors){var r;return{send:function(i,o){var a,s,u=n.xhr();if(n.username?u.open(n.type,n.url,n.async,n.username,n.password):u.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)u[s]=n.xhrFields[s];n.mimeType&&u.overrideMimeType&&u.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)u.setRequestHeader(s,i[s])}catch(l){}u.send(n.hasContent&&n.data||null),r=function(e,i){var s,l,c,p;try{if(r&&(i||4===u.readyState))if(r=t,a&&(u.onreadystatechange=b.noop,$n&&delete Pn[a]),i)4!==u.readyState&&u.abort();else{p={},s=u.status,l=u.getAllResponseHeaders(),"string"==typeof u.responseText&&(p.text=u.responseText);try{c=u.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,l)},n.async?4===u.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},b(e).unload($n)),Pn[a]=r),u.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+x+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n,r,i=this.createTween(e,t),o=Yn.exec(t),a=i.cur(),s=+a||0,u=1,l=20;if(o){if(n=+o[2],r=o[3]||(b.cssNumber[e]?"":"px"),"px"!==r&&s){s=b.css(i.elem,e,!0)||n||1;do u=u||".5",s/=u,b.style(i.elem,e,s+r);while(u!==(u=i.cur()/a)&&1!==u&&--l)}i.unit=r,i.start=s,i.end=o[1]?s+(o[1]+1)*n:n}return i}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=b.now()}function Zn(e,t){b.each(t,function(t,n){var r=(Qn[t]||[]).concat(Qn["*"]),i=0,o=r.length;for(;o>i;i++)if(r[i].call(e,t,n))return})}function er(e,t,n){var r,i,o=0,a=Gn.length,s=b.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;for(;u>a;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),1>o&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:b.extend({},t),opts:b.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=b.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)l.tweens[n].run(1);return t?s.resolveWith(e,[l,t]):s.rejectWith(e,[l,t]),this}}),c=l.props;for(tr(c,l.opts.specialEasing);a>o;o++)if(r=Gn[o].call(l,e,c,l.opts))return r;return Zn(l,c),b.isFunction(l.opts.start)&&l.opts.start.call(e,l),b.fx.timer(b.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function tr(e,t){var n,r,i,o,a;for(i in e)if(r=b.camelCase(i),o=t[r],n=e[i],b.isArray(n)&&(o=n[1],n=e[i]=n[0]),i!==r&&(e[r]=n,delete e[i]),a=b.cssHooks[r],a&&"expand"in a){n=a.expand(n),delete e[r];for(i in n)i in e||(e[i]=n[i],t[i]=o)}else t[r]=o}b.Animation=b.extend(er,{tweener:function(e,t){b.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,u,l,c,p,f=this,d=e.style,h={},g=[],m=e.nodeType&&nn(e);n.queue||(c=b._queueHooks(e,"fx"),null==c.unqueued&&(c.unqueued=0,p=c.empty.fire,c.empty.fire=function(){c.unqueued||p()}),c.unqueued++,f.always(function(){f.always(function(){c.unqueued--,b.queue(e,"fx").length||c.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[d.overflow,d.overflowX,d.overflowY],"inline"===b.css(e,"display")&&"none"===b.css(e,"float")&&(b.support.inlineBlockNeedsLayout&&"inline"!==un(e.nodeName)?d.zoom=1:d.display="inline-block")),n.overflow&&(d.overflow="hidden",b.support.shrinkWrapBlocks||f.always(function(){d.overflow=n.overflow[0],d.overflowX=n.overflow[1],d.overflowY=n.overflow[2]}));for(i in t)if(a=t[i],Vn.exec(a)){if(delete t[i],u=u||"toggle"===a,a===(m?"hide":"show"))continue;g.push(i)}if(o=g.length){s=b._data(e,"fxshow")||b._data(e,"fxshow",{}),"hidden"in s&&(m=s.hidden),u&&(s.hidden=!m),m?b(e).show():f.done(function(){b(e).hide()}),f.done(function(){var t;b._removeData(e,"fxshow");for(t in h)b.style(e,t,h[t])});for(i=0;o>i;i++)r=g[i],l=f.createTween(r,m?s[r]:0),h[r]=s[r]||b.style(e,r),r in s||(s[r]=l.start,m&&(l.end=l.start,l.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}b.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(b.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?b.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=b.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){b.fx.step[e.prop]?b.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[b.cssProps[e.prop]]||b.cssHooks[e.prop])?b.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},b.each(["toggle","show","hide"],function(e,t){var n=b.fn[t];b.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),b.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=b.isEmptyObject(e),o=b.speed(t,n,r),a=function(){var t=er(this,b.extend({},e),o);a.finish=function(){t.stop(!0)},(i||b._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=b.timers,a=b._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&b.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=b._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=b.timers,a=r?r.length:0;for(n.finish=!0,b.queue(this,e,[]),i&&i.cur&&i.cur.finish&&i.cur.finish.call(this),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}b.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){b.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),b.speed=function(e,t,n){var r=e&&"object"==typeof e?b.extend({},e):{complete:n||!n&&t||b.isFunction(e)&&e,duration:e,easing:n&&t||t&&!b.isFunction(t)&&t};return r.duration=b.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in b.fx.speeds?b.fx.speeds[r.duration]:b.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){b.isFunction(r.old)&&r.old.call(this),r.queue&&b.dequeue(this,r.queue)},r},b.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},b.timers=[],b.fx=rr.prototype.init,b.fx.tick=function(){var e,n=b.timers,r=0;for(Xn=b.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||b.fx.stop(),Xn=t},b.fx.timer=function(e){e()&&b.timers.push(e)&&b.fx.start()},b.fx.interval=13,b.fx.start=function(){Un||(Un=setInterval(b.fx.tick,b.fx.interval))},b.fx.stop=function(){clearInterval(Un),Un=null},b.fx.speeds={slow:600,fast:200,_default:400},b.fx.step={},b.expr&&b.expr.filters&&(b.expr.filters.animated=function(e){return b.grep(b.timers,function(t){return e===t.elem}).length}),b.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){b.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,b.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},b.offset={setOffset:function(e,t,n){var r=b.css(e,"position");"static"===r&&(e.style.position="relative");var i=b(e),o=i.offset(),a=b.css(e,"top"),s=b.css(e,"left"),u=("absolute"===r||"fixed"===r)&&b.inArray("auto",[a,s])>-1,l={},c={},p,f;u?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),b.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(l.top=t.top-o.top+p),null!=t.left&&(l.left=t.left-o.left+f),"using"in t?t.using.call(e,l):i.css(l)}},b.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===b.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),b.nodeName(e[0],"html")||(n=e.offset()),n.top+=b.css(e[0],"borderTopWidth",!0),n.left+=b.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-b.css(r,"marginTop",!0),left:t.left-n.left-b.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||o.documentElement;while(e&&!b.nodeName(e,"html")&&"static"===b.css(e,"position"))e=e.offsetParent;return e||o.documentElement})}}),b.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);b.fn[e]=function(i){return b.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?b(a).scrollLeft():o,r?o:b(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return b.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}b.each({Height:"height",Width:"width"},function(e,n){b.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){b.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return b.access(this,function(n,r,i){var o;return b.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?b.css(n,r,s):b.style(n,r,i,s)},n,a?i:t,a,null)}})}),e.jQuery=e.$=b,"function"==typeof define&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return b})})(window);
\ No newline at end of file
diff --git a/assets/js/jquery/jquery.min.js b/assets/js/jquery/jquery.min.js
old mode 100644
new mode 100755
diff --git a/assets/lib/APIHelpers.class.php b/assets/lib/APIHelpers.class.php
index 030318aa..d4256ead 100644
--- a/assets/lib/APIHelpers.class.php
+++ b/assets/lib/APIHelpers.class.php
@@ -1,10 +1,11 @@
cssPath = $cssFilesPath;
+ }
+ }
+
+ public function addFile($cssFilePath)
+ {
+ $this->cssPath[] = $cssFilePath;
+ }
+
+ public function minify()
+ {
+ $allCss = array();
+ if (empty($this->cssPath)) {
+ echo "No CSS was added";
+ exit;
+ }
+
+ foreach ($this->cssPath as $css) {
+ $bits = explode(".", $css);
+ $ext = $bits[count($bits) - 1];
+ if ($ext !== "css") {
+ echo "Only CSS allowed";
+ exit;
+ }
+ $filename = basename($css);
+ $css = file_get_contents($css);
+ $css = preg_replace("/\s{2,}/", "", $css);
+ $css = str_replace(array("\n", ', ', ': ', '; ', ' > ', ' }', '} ', ';}', '{ ', ' {'), array('', ',', ':', ';', '>', '}', '}', '}', '{', '{'), $css);
+ $css = preg_replace('/\/\*.*?\*\//s', '', $css);
+
+ $allCss[] = '/* ' . $filename . ' */' . "\n" . $css;
+ }
+
+ return implode("\n", $allCss);
+ }
+}
diff --git a/assets/lib/Formatter/HtmlFormatter.php b/assets/lib/Formatter/HtmlFormatter.php
old mode 100755
new mode 100644
index 9d26711b..38fd666f
--- a/assets/lib/Formatter/HtmlFormatter.php
+++ b/assets/lib/Formatter/HtmlFormatter.php
@@ -6,6 +6,7 @@
*/
class HtmlFormatter
{
+
/**
* @param string $string
* @param bool $decode
diff --git a/assets/lib/Formatter/SqlFormatter.php b/assets/lib/Formatter/SqlFormatter.php
old mode 100755
new mode 100644
index 5e91217e..ccc0a963
--- a/assets/lib/Formatter/SqlFormatter.php
+++ b/assets/lib/Formatter/SqlFormatter.php
@@ -795,7 +795,8 @@ protected static function getNextToken($string, $previous = null)
if ($string[0] === '-' || $string[0] === '#') {
$last = strpos($string, "\n");
$type = self::TOKEN_TYPE_COMMENT;
- } else { // Comment until closing comment tag
+ } else {
+// Comment until closing comment tag
$last = strpos($string, "*/", 2) + 2;
$type = self::TOKEN_TYPE_BLOCK_COMMENT;
}
@@ -833,7 +834,7 @@ protected static function getNextToken($string, $previous = null)
} // Non-quoted variable name
else {
preg_match('/^(' . $string[0] . '[a-zA-Z0-9\._\$]+)/', $string, $matches);
- if ($matches) {
+ if (!empty($matches)) {
$ret[self::TOKEN_VALUE] = $matches[1];
}
}
@@ -973,7 +974,7 @@ protected static function tokenize($string)
}
// See if the token is already cached
- if ($cacheKey && isset(self::$token_cache[$cacheKey])) {
+ if ($cacheKey !== false && isset(self::$token_cache[$cacheKey])) {
// Retrieve from cache
$token = self::$token_cache[$cacheKey];
$token_length = strlen($token[self::TOKEN_VALUE]);
@@ -985,7 +986,7 @@ protected static function tokenize($string)
self::$cache_misses++;
// If the token is shorter than the max length, store it in cache
- if ($cacheKey && $token_length < self::$max_cachekey_size) {
+ if ($cacheKey !== false && $token_length < self::$max_cachekey_size) {
self::$token_cache[$cacheKey] = $token;
}
}
@@ -1044,7 +1045,8 @@ public static function format($string, $highlight = true)
// Get highlighted token if doing syntax highlighting
if ($highlight) {
$highlighted = self::highlightToken($token);
- } else { // If returning raw text
+ } else {
+// If returning raw text
$highlighted = $token[self::TOKEN_VALUE];
}
diff --git a/assets/lib/Helpers/Assets.php b/assets/lib/Helpers/Assets.php
old mode 100644
new mode 100755
index bead2df5..73829d61
--- a/assets/lib/Helpers/Assets.php
+++ b/assets/lib/Helpers/Assets.php
@@ -73,13 +73,15 @@ public function registerJQuery()
$output = '';
$plugins = $this->modx->pluginEvent;
//файл проверяется чтобы определить новую админку
- if ((array_search('ManagerManager', $plugins['OnDocFormRender']) === false) || !file_exists(MODX_MANAGER_PATH . 'media/script/jquery/jquery.min.js')) {
- $output .= $this->registerScript('jQuery', array(
+ if (file_exists(MODX_MANAGER_PATH . 'media/script/jquery/jquery.min.js') || array_search('ManagerManager', $plugins['OnDocFormRender']) !== false) {
+ return $output;
+ }
+
+ $output .= $this->registerScript('jQuery', array(
'src' => 'assets/js/jquery/jquery-1.9.1.min.js',
'version' => '1.9.1'
));
- $output .= '';
- }
+ $output .= '';
return $output;
}
diff --git a/assets/lib/Helpers/Collection.php b/assets/lib/Helpers/Collection.php
old mode 100755
new mode 100644
index b2ea16e0..a68ddc37
--- a/assets/lib/Helpers/Collection.php
+++ b/assets/lib/Helpers/Collection.php
@@ -65,7 +65,7 @@ public function filter(Closure $callback)
public function forAll(Closure $p)
{
foreach ($this->data as $key => $element) {
- if ( ! $p($key, $element)) {
+ if (! $p($key, $element)) {
return false;
}
}
@@ -231,7 +231,7 @@ public function current()
*/
public function remove($key)
{
- if ( ! isset($this->data[$key]) && ! array_key_exists($key, $this->data)) {
+ if (! isset($this->data[$key]) && ! array_key_exists($key, $this->data)) {
return null;
}
$removed = $this->data[$key];
@@ -280,7 +280,7 @@ public function offsetGet($offset)
*/
public function offsetSet($offset, $value)
{
- if ( ! isset($offset)) {
+ if (! isset($offset)) {
return $this->add($value);
}
$this->set($offset, $value);
@@ -381,7 +381,7 @@ public function reduce(Closure $callback, $initial = null)
*/
public function max($key)
{
- return $this->reduce(function($result, $item) use ($key) {
+ return $this->reduce(function ($result, $item) use ($key) {
return (is_null($result) || $item[$key] > $result) ? $item[$key] : $result;
});
}
@@ -394,7 +394,7 @@ public function max($key)
*/
public function min($key)
{
- return $this->reduce(function($result, $item) use ($key) {
+ return $this->reduce(function ($result, $item) use ($key) {
return (is_null($result) || $item[$key] < $result) ? $item[$key] : $result;
});
}
@@ -452,4 +452,5 @@ public function reverse()
{
return $this->create(array_reverse($this->data));
}
+
}
diff --git a/assets/lib/Helpers/Config.php b/assets/lib/Helpers/Config.php
old mode 100755
new mode 100644
index b0c96675..e8166c21
--- a/assets/lib/Helpers/Config.php
+++ b/assets/lib/Helpers/Config.php
@@ -1,31 +1,37 @@
setConfig($cfg);
}
- $this->fs = \Helpers\FS::getInstance();
+ $this->fs = FS::getInstance();
}
/**
* @param $path
* @return $this
*/
- public function setPath($path) {
+ public function setPath($path)
+ {
$this->path = $path;
return $this;
@@ -63,7 +69,7 @@ public function loadConfig($name)
if ($this->fs->checkFile($configFile)) {
$json = file_get_contents(MODX_BASE_PATH . $configFile);
- $config = array_merge($config, \jsonHelper::jsonDecode($json, array('assoc' => true), true));
+ $config = array_merge($config, jsonHelper::jsonDecode($json, array('assoc' => true), true));
}
}
@@ -86,10 +92,10 @@ public function getConfig()
* @param array $cfg массив настроек
* @return int результат сохранения настроек
*/
- public function setConfig($cfg)
+ public function setConfig($cfg, $overwrite = false)
{
if (is_array($cfg)) {
- $this->_cfg = array_merge($this->_cfg, $cfg);
+ $this->_cfg = $overwrite ? $cfg : array_merge($this->_cfg, $cfg);
$ret = count($this->_cfg);
} else {
$ret = false;
@@ -98,9 +104,14 @@ public function setConfig($cfg)
return $ret;
}
+ /**
+ * @param $name
+ * @param null $def
+ * @return mixed
+ */
public function getCFGDef($name, $def = null)
{
- return \APIhelpers::getkey($this->_cfg, $name, $def);
+ return APIhelpers::getkey($this->_cfg, $name, $def);
}
/**
@@ -112,18 +123,19 @@ public function getCFGDef($name, $def = null)
*/
public function loadArray($arr, $sep = ',')
{
-
- if (is_scalar($arr)) {
- $out = \jsonHelper::jsonDecode($arr, array('assoc' => true));
- if (is_null($out) && $sep) {
- $out = array_filter(explode($sep, $arr));
- }
-
- return $out;
- } elseif (is_array($arr)) {
- return $arr;
- } else {
- return array();
+ switch (gettype($arr)) {
+ case 'string':
+ $out = jsonHelper::jsonDecode($arr, array('assoc' => true));
+ if (!is_array($out)) {
+ $out = $sep ? array_filter(explode($sep, $arr)) : array();
+ }
+ break;
+ case 'array':
+ $out = $arr;
+ break;
+ default:
+ $out = array();
}
+ return $out;
}
}
diff --git a/assets/lib/Helpers/FS.php b/assets/lib/Helpers/FS.php
old mode 100644
new mode 100755
index b7423eb2..67310ae8
--- a/assets/lib/Helpers/FS.php
+++ b/assets/lib/Helpers/FS.php
@@ -143,7 +143,7 @@ public function checkDir($path)
/**
* @param $file
- * @param bool $format
+ * @param bool|array $format
* @return int|string
*/
public function fileSize($file, $format = false)
@@ -152,12 +152,14 @@ public function fileSize($file, $format = false)
if ($this->checkFile($file)) {
$out = filesize(MODX_BASE_PATH . $this->relativePath($file));
}
- if ($format) {
- $types = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
+
+ if($format === true) $format = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
+ if (is_array($format)) {
$size = $out > 0 ? floor(log($out, 1024)) : 0;
- $out = number_format($out / pow(1024, $size), 2, '.', ',') . ' ' . $types[$size];
+ $type = isset($format[$size]) ? ' '.$format[$size] : '';
+ $out = number_format($out / pow(1024, $size), 2, '.', ',') . $type;
}
-
+
return $out;
}
@@ -290,8 +292,9 @@ public function relativePath($path, $owner = null)
if (is_null($owner)) {
$owner = MODX_BASE_PATH;
}
+ $path = str_replace('\\', '/', $path);
if (!(empty($path) || !is_scalar($path)) && !preg_match("/^http(s)?:\/\/\w+/", $path)) {
- $path = trim(preg_replace("#^" . $owner . "#", '', $path), '/');
+ $path = trim(preg_replace("#^" . preg_quote($owner) . "#", '', $path), DIRECTORY_SEPARATOR);
} else {
$path = '';
}
diff --git a/assets/lib/Helpers/Mailer.php b/assets/lib/Helpers/Mailer.php
old mode 100755
new mode 100644
index b60d77f9..397fa01b
--- a/assets/lib/Helpers/Mailer.php
+++ b/assets/lib/Helpers/Mailer.php
@@ -1,6 +1,12 @@
modx = $modx;
- $modx->loadExtension('MODxMailer');
- $this->mail = $modx->mail;
- $this->config = $cfg;
- $this->debug = $debug;
+ $this->noemail = (bool)(isset($cfg['noemail']) ? $cfg['noemail'] : 0);
+ if (!$this->noemail) {
+ $this->mail = new MODxMailer();
+ if (method_exists('MODxMailer', 'init')) {
+ $this->mail->init($modx);
+ }
+ $this->config = $cfg;
+ $this->debug = $debug;
+ $this->applyMailConfig();
+ }
}
/**
@@ -39,7 +61,7 @@ public function __construct(\DocumentParser $modx, $cfg, $debug = false)
*/
public function addAddressToMailer($type, $addr)
{
- if (!empty($addr)) {
+ if (!$this->noemail && !empty($addr)) {
$a = array_filter(array_map('trim', explode(',', $addr)));
foreach ($a as $address) {
switch ($type) {
@@ -67,9 +89,13 @@ public function addAddressToMailer($type, $addr)
*/
public function attachFiles($filelist = array())
{
- $contentType = "application/octetstream";
- foreach ($filelist as $file) {
- $this->mail->AddAttachment($file['filepath'], $file['filename'], "base64", $contentType);
+ if (!$this->noemail) {
+ $contentType = "application/octetstream";
+ foreach ($filelist as $file) {
+ if (is_file($file['filepath']) && is_readable($file['filepath'])) {
+ $this->mail->AddAttachment($file['filepath'], $file['filename'], "base64", $contentType);
+ }
+ }
}
return $this;
@@ -82,21 +108,13 @@ public function attachFiles($filelist = array())
public function send($report)
{
//если отправлять некуда или незачем, то делаем вид, что отправили
- if (!$this->getCFGDef('to') || $this->getCFGDef('noemail')) {
+ if (!$this->getCFGDef('to') || $this->noemail) {
return true;
} elseif (empty($report)) {
return false;
}
- $this->mail->IsHTML($this->getCFGDef('isHtml', 1));
- $this->mail->From = $this->getCFGDef('from', $this->modx->config['site_name']);
- $this->mail->FromName = $this->getCFGDef('fromName', $this->modx->config['emailsender']);
- $this->mail->Subject = $this->getCFGDef('subject');
- $this->mail->Body = $report;
- $this->addAddressToMailer("replyTo", $this->getCFGDef('replyTo'));
- $this->addAddressToMailer("to", $this->getCFGDef('to'));
- $this->addAddressToMailer("cc", $this->getCFGDef('cc'));
- $this->addAddressToMailer("bcc", $this->getCFGDef('bcc'));
+ $this->mail->Body = $this->getCFGDef('isHtml', 1) ? $this->mail->msgHTML($report, MODX_BASE_PATH) : $report;
$result = $this->mail->send();
if ($result) {
@@ -107,6 +125,124 @@ public function send($report)
return $result;
}
+ /**
+ * @param $report
+ * @return bool
+ */
+ public function toQueue($report)
+ {
+ //если отправлять некуда или незачем, то делаем вид, что отправили
+ if (!$this->getCFGDef('to') || $this->noemail) {
+ return true;
+ } elseif (empty($report)) {
+ return false;
+ }
+
+ $this->mail->Body = $this->getCFGDef('isHtml', 1) ? $this->mail->msgHTML($report, MODX_BASE_PATH) : $report;
+
+ $this->Body = $this->modx->removeSanitizeSeed($this->mail->Body);
+ $this->Subject = $this->modx->removeSanitizeSeed($this->mail->Subject);
+ try {
+ $result = $this->mail->preSend() && $this->saveMessage();
+ } catch (phpmailerException $e) {
+ $this->mail->SetError($e->getMessage());
+
+ $result = false;
+ }
+
+ if ($result) {
+ $this->mail->ClearAllRecipients();
+ $this->mail->ClearAttachments();
+ $result = $this->getFileName();
+ }
+
+ return $result;
+ }
+
+ /**
+ * @param string $path
+ * @return bool
+ */
+ public function setQueuePath($path = '')
+ {
+ if (!empty($path)) {
+ $this->queuePath = $path;
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * @return mixed
+ */
+ protected function saveMessage()
+ {
+ $data = serialize(array(
+ "header" => $this->mail->getMIMEHeader(),
+ "body" => $this->mail->getMIMEBody(),
+ "config" => $this->config
+ ));
+ $file = $this->getFileName();
+ FS::getInstance()->makeDir($this->queuePath);
+ $result = @file_put_contents(MODX_BASE_PATH . $this->queuePath . $file, $data) !== false;
+ if ($result) {
+ $result = $file;
+ }
+
+ return $result;
+ }
+
+ /**
+ * @return string
+ */
+ protected function getFileName()
+ {
+ return $this->mail->getMessageID() . '.eml';
+ }
+
+ /**
+ * @param $file
+ * @return bool
+ */
+ public function fromQueue($file)
+ {
+ $result = false;
+ $dir = MODX_BASE_PATH . $this->queuePath;
+ $fs = FS::getInstance();
+ if ($fs->checkFile($dir)) {
+ $message = unserialize(file_get_contents($dir . $file));
+ $this->config = $message['config'];
+ $this->applyMailConfig();
+ $this->mail->setMIMEHeader($message['header'])->setMIMEBody($message['body']);
+ unset($message);
+ $result = $this->mail->postSend();
+ if ($result) {
+ $this->mail->setMIMEBody()->setMIMEHeader();
+ FS::getInstance()->unlink($dir . $file);
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ * @return $this
+ */
+ protected function applyMailConfig()
+ {
+ $this->mail->IsHTML($this->getCFGDef('isHtml', 1));
+ $this->mail->From = $this->getCFGDef('from', $this->modx->config['emailsender']);
+ $this->mail->FromName = $this->getCFGDef('fromName', $this->modx->config['site_name']);
+ $this->mail->Subject = $this->getCFGDef('subject');
+ $this->addAddressToMailer("replyTo", $this->getCFGDef('replyTo'));
+ $this->addAddressToMailer("to", $this->getCFGDef('to'));
+ $this->addAddressToMailer("cc", $this->getCFGDef('cc'));
+ $this->addAddressToMailer("bcc", $this->getCFGDef('bcc'));
+
+ return $this;
+ }
+
/**
* @param string $param
* @param mixed $default
diff --git a/assets/lib/Helpers/PHPThumb.php b/assets/lib/Helpers/PHPThumb.php
old mode 100755
new mode 100644
index cc08f7f8..508c8924
--- a/assets/lib/Helpers/PHPThumb.php
+++ b/assets/lib/Helpers/PHPThumb.php
@@ -74,10 +74,15 @@ public function optimize($file, $type = 'jpg')
*/
private function setOptions($options)
{
- $options = strtr($options, Array("," => "&", "_" => "=", '{' => '[', '}' => ']'));
+ $options = strtr($options, array("," => "&", "_" => "=", '{' => '[', '}' => ']'));
parse_str($options, $params);
+ if (!is_array($params)) {
+ $params = array();
+ }
+
foreach ($params as $key => $value) {
$this->thumb->setParameter($key, $value);
}
}
+
}
diff --git a/assets/lib/Helpers/Video.php b/assets/lib/Helpers/Video.php
old mode 100755
new mode 100644
index 05c0fd61..315826d1
--- a/assets/lib/Helpers/Video.php
+++ b/assets/lib/Helpers/Video.php
@@ -419,4 +419,5 @@ public static function RunTest($links = null)
. "
Картинка: " . $v->getImage() . "
\n";
}
}
+
}
diff --git a/assets/lib/MODxAPI/MODx.php b/assets/lib/MODxAPI/MODx.php
index 96b21682..207de94f 100644
--- a/assets/lib/MODxAPI/MODx.php
+++ b/assets/lib/MODxAPI/MODx.php
@@ -3,12 +3,14 @@
include_once(MODX_BASE_PATH . 'assets/snippets/DocLister/lib/jsonHelper.class.php');
include_once(MODX_BASE_PATH . 'assets/snippets/DocLister/lib/DLCollection.class.php');
+use \Doctrine\Common\Cache\Cache;
/**
* Class MODxAPIhelpers
*/
class MODxAPIhelpers
{
+
/**
* @param $email
* @param bool $dns
@@ -88,7 +90,7 @@ abstract class MODxAPI extends MODxAPIhelpers
protected $default_field = array();
/**
- * @var null
+ * @var null|integer|string
*/
protected $id = null;
@@ -142,6 +144,8 @@ abstract class MODxAPI extends MODxAPIhelpers
*/
private $_table = array();
+ private $cache = false;
+
/**
* MODxAPI constructor.
* @param DocumentParser $modx
@@ -157,6 +161,7 @@ public function __construct(DocumentParser $modx, $debug = false)
$this->setDebug($debug);
$this->_decodedFields = new DLCollection($this->modx);
+ $this->cache = isset($this->modx->cache) && $this->modx->cache instanceof Cache;
}
/**
@@ -186,6 +191,25 @@ public function getDefaultFields()
return $this->default_field;
}
+ /**
+ * @param $value
+ * @return int|mixed|string
+ */
+ protected function getTime($value)
+ {
+ $value = trim($value);
+ if (!empty($value)) {
+ if (!is_numeric($value)) {
+ $value = (int)strtotime($value);
+ }
+ if (!empty($value)) {
+ $value += $this->modxConfig('server_offset_time');
+ }
+ }
+
+ return $value;
+ }
+
/**
* @param string $name
* @param null $default
@@ -253,8 +277,7 @@ final public function escape($value)
*/
final public function invokeEvent($name, $data = array(), $flag = false)
{
- $flag = (isset($flag) && $flag != '') ? (bool)$flag : false;
- if ($flag) {
+ if ((bool)$flag === true) {
$this->modx->invokeEvent($name, $data);
}
@@ -488,8 +511,11 @@ final protected function Uset($key, $id = '')
* @param array $data
* @return $this
*/
- public function store($data = array()) {
- if (is_array($data)) $this->store = $data;
+ public function store($data = array())
+ {
+ if (is_array($data)) {
+ $this->store = $data;
+ }
return $this;
}
@@ -500,9 +526,10 @@ public function store($data = array()) {
* @param string $key
* @return MODxAPI
*/
- public function rollback($key = '') {
+ public function rollback($key = '')
+ {
if (!empty($key) && isset($this->store[$key])) {
- $this->set($key,$this->store[$key]);
+ $this->set($key, $this->store[$key]);
} else {
$this->fromArray($this->store);
}
@@ -516,7 +543,8 @@ public function rollback($key = '') {
* @param $key
* @return bool
*/
- public function isChanged($key) {
+ public function isChanged($key)
+ {
$flag = !isset($this->store[$key]) || (isset($this->store[$key]) && $this->store[$key] != $this->field[$key]);
return $flag;
@@ -723,7 +751,7 @@ public function checkUnique($table, $field, $PK = 'id')
if ($where != '') {
$sql = $this->query("SELECT `" . $this->escape($PK) . "` FROM " . $this->makeTable($table) . " WHERE " . $where);
$id = $this->modx->db->getValue($sql);
- if (is_null($id) || (!$this->newDoc && $id == $this->getID())) {
+ if (!$id || (!$this->newDoc && $id == $this->getID())) {
$flag = true;
} else {
$flag = false;
@@ -789,11 +817,11 @@ public function issetField($key)
abstract public function edit($id);
/**
- * @param null $fire_events
+ * @param bool $fire_events
* @param bool $clearCache
* @return mixed
*/
- abstract public function save($fire_events = null, $clearCache = false);
+ abstract public function save($fire_events = false, $clearCache = false);
/**
* @param $ids
@@ -1033,4 +1061,34 @@ protected function encodeFields()
return $this;
}
+
+ /**
+ * @param mixed $data
+ * @param string $key
+ * @return bool
+ */
+ protected function saveToCache($data, $key)
+ {
+ $out = false;
+ if ($this->cache) {
+ $out = $this->modx->cache->save($key, $data, 0);
+ }
+
+ return $out;
+ }
+
+ /**
+ * @param string $key
+ * @return mixed
+ */
+ protected function loadFromCache($key)
+ {
+ $out = false;
+ if ($this->cache) {
+ $out = $this->modx->cache->fetch($key);
+ }
+
+ return $out;
+ }
+
}
diff --git a/assets/lib/MODxAPI/autoTable.abstract.php b/assets/lib/MODxAPI/autoTable.abstract.php
old mode 100755
new mode 100644
index 23deca4d..3ea788bf
--- a/assets/lib/MODxAPI/autoTable.abstract.php
+++ b/assets/lib/MODxAPI/autoTable.abstract.php
@@ -71,12 +71,20 @@ public function edit($id)
}
/**
- * @param null $fire_events
+ * @param bool $fire_events
* @param bool $clearCache
* @return bool|null|void
*/
- public function save($fire_events = null, $clearCache = false)
+ public function save($fire_events = false, $clearCache = false)
{
+ foreach ($this->jsonFields as $field) {
+ if ($this->get($field) === null
+ && isset($this->default_field[$field])
+ && is_array($this->default_field[$field]))
+ {
+ $this->set($field, $this->default_field[$field]);
+ }
+ }
$fld = $this->encodeFields()->toArray();
foreach ($this->default_field as $key => $value) {
if ($this->newDoc && $this->get($key) === null && $this->get($key) !== $value) {
@@ -110,11 +118,11 @@ public function save($fire_events = null, $clearCache = false)
/**
* @param $ids
- * @param null $fire_events
+ * @param bool $fire_events
* @return $this
* @throws Exception
*/
- public function delete($ids, $fire_events = null)
+ public function delete($ids, $fire_events = false)
{
$_ids = $this->cleanIDs($ids, ',');
if (is_array($_ids) && $_ids != array()) {
diff --git a/assets/lib/MODxAPI/modManagers.php b/assets/lib/MODxAPI/modManagers.php
old mode 100644
new mode 100755
index e72d314b..536f201a
--- a/assets/lib/MODxAPI/modManagers.php
+++ b/assets/lib/MODxAPI/modManagers.php
@@ -11,15 +11,15 @@ class modManagers extends MODxAPI
*/
protected $default_field = array(
'user' => array(
- 'username' => "",
- 'password' => "",
+ 'username' => '',
+ 'password' => '',
),
'attribute' => array(
- 'fullname' => "",
+ 'fullname' => '',
'role' => 0,
- 'email' => "",
- 'phone' => "",
- 'mobilephone' => "",
+ 'email' => '',
+ 'phone' => '',
+ 'mobilephone' => '',
'blocked' => 0,
'blockeduntil' => 0,
'blockedafter' => 0,
@@ -27,17 +27,19 @@ class modManagers extends MODxAPI
'lastlogin' => 0,
'thislogin' => 0,
'failedlogincount' => 0,
- 'sessionid' => "",
+ 'sessionid' => '',
'dob' => 0,
- 'gender' => "",
- 'country' => "",
- 'state' => "",
- 'city' => "",
- 'street' => "",
- 'zip' => "",
- 'fax' => "",
- 'photo' => "",
- 'comment' => ""
+ 'gender' => 0,
+ 'country' => '',
+ 'state' => '',
+ 'city' => '',
+ 'street' => '',
+ 'zip' => '',
+ 'fax' => '',
+ 'photo' => '',
+ 'comment' => '',
+ 'createdon' => 0,
+ 'editedon' => 0
),
'hidden' => array(
'internalKey'
@@ -51,6 +53,11 @@ class modManagers extends MODxAPI
protected $groupIds = array();
protected $mgrPermissions = array();
+ /**
+ * @var integer
+ */
+ private $rememberTime;
+
/**
* MODxAPI constructor.
* @param DocumentParser $modx
@@ -59,10 +66,26 @@ class modManagers extends MODxAPI
*/
public function __construct(DocumentParser $modx, $debug = false)
{
+ $this->setRememberTime(60 * 60 * 24 * 365 * 5);
parent::__construct($modx, $debug);
$this->modx->loadExtension('phpass');
}
+ /**
+ * @param $val
+ * @return $this
+ */
+ protected function setRememberTime($val){
+ $this->rememberTime = (int)$val;
+ return $this;
+ }
+
+ /**
+ * @return integer
+ */
+ public function getRememberTime(){
+ return $this->rememberTime;
+ }
/**
* @param $key
@@ -97,6 +120,18 @@ protected function findUser($data)
return $find;
}
+ /**
+ * @param array $data
+ * @return $this
+ */
+ public function create($data = array())
+ {
+ parent::create($data);
+ $this->set('createdon', time());
+
+ return $this;
+ }
+
/**
* @param $id
* @return $this
@@ -111,6 +146,7 @@ public function edit($id)
if (!$find = $this->findUser($id)) {
$this->id = null;
} else {
+ $this->set('editedon', time());
$result = $this->query("
SELECT * from {$this->makeTable('user_attributes')} as attribute
LEFT JOIN {$this->makeTable('manager_users')} as user ON user.id=attribute.internalKey
@@ -148,6 +184,15 @@ public function set($key, $value)
case 'sessionid':
session_regenerate_id(false);
$value = session_id();
+ if ($mid = $this->modx->getLoginUserID('mgr')) {
+ $this->modx->db->query("UPDATE {$this->makeTable('active_user_locks')} SET `sid`='{$value}' WHERE `internalKey`={$mid}");
+ $this->modx->db->query("UPDATE {$this->makeTable('active_user_sessions')} SET `sid`='{$value}' WHERE `internalKey`={$mid}");
+ $this->modx->db->query("UPDATE {$this->makeTable('active_users')} SET `sid`='{$value}' WHERE `internalKey`={$mid}");
+ }
+ break;
+ case 'editedon':
+ case 'createdon':
+ $value = $this->getTime($value);
break;
}
$this->field[$key] = $value;
@@ -204,7 +249,7 @@ public function save($fire_events = false, $clearCache = false)
if(!$this->get('role')) {
$this->log['UniqueEmail'] = 'Wrong manager role
' . print_r($this->get('role'), true) . '';
}
-
+
$this->set('sessionid', '');
$fld = $this->toArray();
foreach ($this->default_field['user'] as $key => $value) {
@@ -253,7 +298,7 @@ public function save($fire_events = false, $clearCache = false)
if ($value == '' || !$this->isChanged($key)) {
continue;
}
- $result = $this->query("SELECT `setting_value` FROM {$this->makeTable('web_user_settings')} WHERE `user` = '{$this->id}' AND `setting_name` = '{$key}'");
+ $result = $this->query("SELECT `setting_value` FROM {$this->makeTable('user_settings')} WHERE `user` = '{$this->id}' AND `setting_name` = '{$key}'");
if ($this->modx->db->getRecordCount($result) > 0) {
$this->query("UPDATE {$this->makeTable('user_settings')} SET `setting_value` = '{$value}' WHERE `user` = '{$this->id}' AND `setting_name` = '{$key}';");
} else {
@@ -271,7 +316,7 @@ public function save($fire_events = false, $clearCache = false)
), $fire_events);
}
- if ($this->groupIds) {
+ if (!empty($this->groupIds)) {
$this->setUserGroups($this->id, $this->groupIds);
}
// TODO
@@ -325,7 +370,7 @@ public function delete($ids, $fire_events = false)
/**
* @param int $id
- * @param bool $fulltime
+ * @param bool|integer $fulltime
* @param string $cookieName
* @param bool $fire_events
* @return bool
@@ -439,9 +484,9 @@ public function testAuth($id, $password, $blocker, $fire_events = false)
/**
* @param string $cookieName
- * @param null $fire_events
+ * @param bool $fire_events
*/
- public function logOut($cookieName = 'modx_remember_manager', $fire_events = null)
+ public function logOut($cookieName = 'modx_remember_manager', $fire_events = false)
{
if (!$uid = $this->modx->getLoginUserID('mgr')) {
return;
@@ -464,6 +509,7 @@ public function logOut($cookieName = 'modx_remember_manager', $fire_events = nul
*
* @param string $directive ('start' or 'destroy')
* @param string $cookieName
+ * @param bool|integer $remember
* @return modUsers
* @author Raymond Irving
* @author Scotty Delicious
@@ -474,7 +520,7 @@ protected function SessionHandler($directive, $cookieName, $remember = true)
{
switch ($directive) {
case 'start':
- if ($this->getID()) {
+ if ($this->getID() !== null) {
$_SESSION['usertype'] = 'manager';
$_SESSION['mgrShortname'] = $this->get('username');
$_SESSION['mgrFullname'] = $this->get('fullname');
@@ -487,15 +533,16 @@ protected function SessionHandler($directive, $cookieName, $remember = true)
$_SESSION['mgrRole'] = $this->get('role');
$_SESSION['mgrPermissions'] = $this->mgrPermissions;
$_SESSION['mgrDocgroups'] = $this->getDocumentGroups();
- if ($remember) {
+ $_SESSION['mgrToken'] = md5($this->get('sessionid'));
+ if (!empty($remember)) {
$this->setAutoLoginCookie($cookieName, $remember);
}
}
break;
case 'destroy':
- if (isset($_SESSION['webValidated'])) {
+ if (isset($_SESSION['mgrValidated'])) {
unset($_SESSION['usertype']);
- unset($_SESSION['webShortname']);
+ unset($_SESSION['mgrShortname']);
unset($_SESSION['mgrFullname']);
unset($_SESSION['mgrEmail']);
unset($_SESSION['mgrValidated']);
@@ -505,13 +552,13 @@ protected function SessionHandler($directive, $cookieName, $remember = true)
unset($_SESSION['mgrLogincount']);
unset($_SESSION['mgrDocgroups']);
unset($_SESSION['mgrPermissions']);
-
- setcookie($cookieName, '', time() - 60, '/');
+ unset($_SESSION['mgrToken']);
+ setcookie($cookieName, '', time() - 60, MODX_BASE_URL);
} else {
if (isset($_COOKIE[session_name()])) {
- setcookie(session_name(), '', time() - 60, '/');
+ setcookie(session_name(), '', time() - 60, MODX_BASE_URL);
}
- setcookie($cookieName, '', time() - 60, '/');
+ setcookie($cookieName, '', time() - 60, MODX_BASE_URL);
session_destroy();
}
break;
@@ -532,17 +579,17 @@ public function isSecure()
/**
* @param $cookieName
- * @param bool $remember
+ * @param bool|integer $remember
* @return $this
*/
public function setAutoLoginCookie($cookieName, $remember = true)
{
- if (!empty($cookieName) && $this->getID()) {
+ if (!empty($cookieName) && $this->getID() !== null) {
$secure = $this->isSecure();
- $remember = is_bool($remember) ? (60 * 60 * 24 * 365 * 5) : (int)$remember;
+ $remember = is_bool($remember) ? $this->getRememberTime() : (int)$remember;
$cookieValue = $this->get('username');
$cookieExpires = time() + $remember;
- setcookie($cookieName, $cookieValue, $cookieExpires, '/', '', $secure, true);
+ setcookie($cookieName, $cookieValue, $cookieExpires, MODX_BASE_URL, '', $secure, true);
}
return $this;
@@ -582,10 +629,12 @@ public function getUserGroups($userID = 0)
$member_groups = $this->makeTable('member_groups');
$membergroup_names = $this->makeTable('membergroup_names');
- $sql = "SELECT `ugn`.`name` FROM {$member_groups} as `ug`
+ $rs = $this->query("SELECT `ug`.`user_group`, `ugn`.`name` FROM {$member_groups} as `ug`
INNER JOIN {$membergroup_names} as `ugn` ON `ugn`.`id`=`ug`.`user_group`
- WHERE `ug`.`member` = " . $user->getID();
- $out = $this->modx->db->getColumn('name', $this->query($sql));
+ WHERE `ug`.`member` = " . $user->getID());
+ while ($row = $this->modx->db->getRow($rs)) {
+ $out[$row['user_group']] = $row['name'];
+ }
}
unset($user);
@@ -610,6 +659,10 @@ public function setUserGroups($userID = 0, $groupIds = array())
foreach ($groupIds as $gid) {
$this->query("REPLACE INTO {$this->makeTable('member_groups')} (`user_group`, `member`) VALUES ('{$gid}', '{$uid}')");
}
+ if (!$this->newDoc) {
+ $groupIds = empty($groupIds) ? '0' : implode(',', $groupIds);
+ $this->query("DELETE FROM {$this->makeTable('member_groups')} WHERE `member`={$uid} AND `user_group` NOT IN ({$groupIds})");
+ }
}
unset($user);
$this->groupIds = array();
diff --git a/assets/lib/MODxAPI/modResource.php b/assets/lib/MODxAPI/modResource.php
index 55c83d5f..7966dddd 100644
--- a/assets/lib/MODxAPI/modResource.php
+++ b/assets/lib/MODxAPI/modResource.php
@@ -44,8 +44,6 @@ class modResource extends MODxAPI
'publishedby' => 0,
'menutitle' => '',
'donthit' => 0,
- 'haskeywords' => 0,
- 'hasmetatags' => 0,
'privateweb' => 0,
'privatemgr' => 0,
'content_dispo' => 0,
@@ -152,6 +150,8 @@ class modResource extends MODxAPI
* @var DLCollection
*/
private $managerUsers = null;
+ /** @var array группы документов */
+ protected $groupIds = array();
/**
* modResource constructor.
@@ -190,8 +190,10 @@ public function toArrayTV($render = false)
$tvTPL = APIHelpers::getkey($this->tvTpl, $tpl, array());
foreach ($tvTPL as $item) {
if (isset($this->tvid[$item]) && !array_key_exists($this->tvid[$item], $out)) {
- $out[$this->tvid[$item]] = $this->get($this->tvid[$item]);
+ $value = $this->get($this->tvid[$item]);
+ $out[$this->tvid[$item]] = empty($value) ? $this->tvd[$this->tvid[$item]] : $value;
}
+
}
if ($render) {
foreach ($out as $key => $val) {
@@ -307,7 +309,7 @@ public function get($key)
$tvTPL = APIHelpers::getkey($this->tvTpl, $tpl, array());
$tvID = APIHelpers::getkey($this->tv, $key, 0);
if (in_array($tvID, $tvTPL) && is_null($out)) {
- $out = APIHelpers::getkey($this->tvd[$key], 'value', null);
+ $out = APIHelpers::getkey($this->tvd, $key, null);
}
}
@@ -433,25 +435,6 @@ protected function findUserBy($data)
return $find;
}
- /**
- * @param $value
- * @return int|mixed|string
- */
- protected function getTime($value)
- {
- $value = trim($value);
- if (!empty($value)) {
- if (!is_numeric($value)) {
- $value = (int)strtotime($value);
- }
- if (!empty($value)) {
- $value += $this->modxConfig('server_offset_time');
- }
- }
-
- return $value;
- }
-
/**
* @param array $data
* @return $this
@@ -461,7 +444,7 @@ public function create($data = array())
$this->close();
$fld = array();
foreach ($this->tvd as $name => $tv) {
- $fld[$name] = $tv['value'];
+ $fld[$name] = $tv;
};
$this->store($fld);
@@ -509,7 +492,7 @@ public function edit($id)
/**
* @param bool $fire_events
* @param bool $clearCache
- * @return bool|null|void
+ * @return bool|null
*/
public function save($fire_events = false, $clearCache = false)
{
@@ -536,7 +519,7 @@ public function save($fire_events = false, $clearCache = false)
$this->invokeEvent('OnBeforeDocFormSave', array(
'mode' => $this->newDoc ? "new" : "upd",
- 'id' => $this->id ? $this->id : '',
+ 'id' => isset($this->id) ? $this->id : '',
'doc' => $this->toArray(),
'docObj' => $this
), $fire_events);
@@ -603,9 +586,9 @@ public function save($fire_events = false, $clearCache = false)
}
}
- $_deleteTVs = $_updateTVs = $_insertTVs = array();
+ $_deleteTVs = $_insertTVs = array();
foreach ($fld as $key => $value) {
- if (empty($this->tv[$key]) || !$this->isChanged($key)) {
+ if (empty($this->tv[$key]) || !$this->isChanged($key) || !$this->belongsToTemplate($this->tv[$key])) {
continue;
} elseif ($value === '') {
$_deleteTVs[] = $this->tv[$key];
@@ -614,29 +597,14 @@ public function save($fire_events = false, $clearCache = false)
}
}
- if (!$this->newDoc && !empty($_insertTVs)) {
- $ids = implode(',', array_keys($_insertTVs));
- $result = $this->query("SELECT `tmplvarid` FROM {$this->makeTable('site_tmplvar_contentvalues')} WHERE `contentid`={$this->id} AND `tmplvarid` IN ({$ids})");
- $existedTVs = $this->modx->db->getColumn('tmplvarid', $result);
- foreach ($existedTVs as $id) {
- $_updateTVs[$id] = $_insertTVs[$id];
- unset($_insertTVs[$id]);
- }
- }
-
- if (!empty($_updateTVs)) {
- foreach ($_updateTVs as $id => $value) {
- $this->query("UPDATE {$this->makeTable('site_tmplvar_contentvalues')} SET `value` = '{$value}' WHERE `contentid` = {$this->id} AND `tmplvarid` = {$id}");
- }
- }
-
if (!empty($_insertTVs)) {
$values = array();
foreach ($_insertTVs as $id => $value) {
$values[] = "({$this->id}, {$id}, '{$value}')";
}
$values = implode(',', $values);
- $this->query("INSERT into {$this->makeTable('site_tmplvar_contentvalues')} (`contentid`,`tmplvarid`,`value`) VALUES {$values}");
+ $this->query("INSERT INTO {$this->makeTable('site_tmplvar_contentvalues')} (`contentid`,`tmplvarid`,`value`) VALUES {$values} ON DUPLICATE KEY UPDATE
+ `value` = VALUES(`value`)");
}
if (!empty($_deleteTVs)) {
@@ -648,9 +616,13 @@ public function save($fire_events = false, $clearCache = false)
$this->mode = $this->newDoc ? "new" : "upd";
$this->newDoc = false;
}
+
+ if (!empty($this->groupIds)) {
+ $this->setDocumentGroups($this->id, $this->groupIds);
+ }
$this->invokeEvent('OnDocFormSave', array(
'mode' => $this->mode,
- 'id' => $this->id,
+ 'id' => isset($this->id) ? $this->id : '',
'doc' => $this->toArray(),
'docObj' => $this
), $fire_events);
@@ -663,6 +635,17 @@ public function save($fire_events = false, $clearCache = false)
return $this->id;
}
+ /**
+ * @param $tvId
+ * @return bool
+ */
+ protected function belongsToTemplate($tvId)
+ {
+ $template = $this->get('template');
+
+ return isset($this->tvTpl[$template]) && in_array($tvId, $this->tvTpl[$template]);
+ }
+
/**
* @param $ids
* @return $this
@@ -820,14 +803,18 @@ public function issetField($key)
*/
protected function get_TV($reload = false)
{
- if (empty($this->modx->_TVnames) || $reload) {
- $result = $this->query('SELECT `id`,`name`,`type` FROM ' . $this->makeTable('site_tmplvars'));
+ $this->modx->_TVnames = $this->loadFromCache('_TVnames');
+ if ($this->modx->_TVnames === false || empty($this->modx->_TVnames) || $reload) {
+ $this->modx->_TVnames = array();
+ $result = $this->query('SELECT `id`,`name`,`default_text`,`type` FROM ' . $this->makeTable('site_tmplvars'));
while ($row = $this->modx->db->GetRow($result)) {
$this->modx->_TVnames[$row['name']] = array(
- "id" => $row['id'],
- "type" => $row['type']
+ "id" => $row['id'],
+ "type" => $row['type'],
+ "default" => $row['default_text']
);
}
+ $this->saveToCache($this->modx->_TVnames, '_TVnames');
}
$arrayTypes = array('checkbox', 'listbox-multiple');
$arrayTVs = array();
@@ -838,7 +825,9 @@ protected function get_TV($reload = false)
$arrayTVs[] = $name;
}
}
- if (empty($this->tvaFields)) $this->tvaFields = $arrayTVs;
+ if (empty($this->tvaFields)) {
+ $this->tvaFields = $arrayTVs;
+ }
$this->loadTVTemplate()->loadTVDefault(array_values($this->tv));
return $this;
@@ -849,11 +838,14 @@ protected function get_TV($reload = false)
*/
protected function loadTVTemplate()
{
- $q = $this->query("SELECT `tmplvarid`, `templateid` FROM " . $this->makeTable('site_tmplvar_templates'));
- $q = $this->modx->db->makeArray($q);
- $this->tvTpl = array();
- foreach ($q as $item) {
- $this->tvTpl[$item['templateid']][] = $item['tmplvarid'];
+ $this->tvTpl = $this->loadFromCache('_tvTpl');
+ if ($this->tvTpl === false) {
+ $q = $this->query("SELECT `tmplvarid`, `templateid` FROM " . $this->makeTable('site_tmplvar_templates'));
+ $this->tvTpl = array();
+ while ($item = $this->modx->db->getRow($q)) {
+ $this->tvTpl[$item['templateid']][] = $item['tmplvarid'];
+ }
+ $this->saveToCache($this->tvTpl, '_tvTpl');
}
return $this;
@@ -866,14 +858,10 @@ protected function loadTVTemplate()
protected function loadTVDefault(array $tvId = array())
{
if (is_array($tvId) && !empty($tvId)) {
- $tbl_site_tmplvars = $this->makeTable('site_tmplvars');
- $fields = 'id,name,default_text as value,display,display_params,type';
- $implodeTvId = implode(',', $tvId);
- $rs = $this->query("SELECT {$fields} FROM {$tbl_site_tmplvars} WHERE id IN({$implodeTvId})");
- $rows = $this->modx->db->makeArray($rs);
$this->tvd = array();
- foreach ($rows as $item) {
- $this->tvd[$item['name']] = $item;
+ foreach ($tvId as $id) {
+ $name = $this->tvid[$id];
+ $this->tvd[$name] = $this->modx->_TVnames[$name]['default'];
}
}
@@ -1024,7 +1012,7 @@ public function encodeField($field, $store = false)
if ($this->isEncodableField($field)) {
$data = $this->get($field);
if ($this->isTVarrayField($field)) {
- $out = is_array($data) ? implode('||', $data) : $data;
+ $out = is_array($data) ? implode('||', $data) : (string)$data;
} else {
$out = json_encode($data);
}
@@ -1074,4 +1062,57 @@ public function markAllDecode()
return $this;
}
+
+ /**
+ * @param int $docId
+ */
+ public function getDocumentGroups($docId = 0)
+ {
+ $out = array();
+ $doc = $this->switchObject($docId);
+ if (null !== $doc->getID()) {
+ $doc_groups = $this->makeTable('document_groups');
+ $docgroup_names = $this->makeTable('documentgroup_names');
+
+ $rs = $this->query("SELECT `dg`.`document_group`, `dgn`.`name` FROM {$doc_groups} as `dg` INNER JOIN {$docgroup_names} as `dgn` ON `dgn`.`id`=`dg`.`document_group`
+ WHERE `dg`.`document` = " . $doc->getID());
+ while ($row = $this->modx->db->getRow($rs)) {
+ $out[$row['document_group']] = $row['name'];
+ }
+
+ }
+ unset($doc);
+
+ return $out;
+ }
+
+ /**
+ * @param int $docId
+ * @param array $groupIds
+ * @return $this
+ */
+ public function setDocumentGroups($docId = 0, $groupIds = array())
+ {
+ if (!is_array($groupIds)) {
+ return $this;
+ }
+ if ($this->newDoc && $docId == 0) {
+ $this->groupIds = $groupIds;
+ } else {
+ $doc = $this->switchObject($docId);
+ if ($id = $doc->getID()) {
+ foreach ($groupIds as $gid) {
+ $this->query("REPLACE INTO {$this->makeTable('document_groups')} (`document_group`, `document`) VALUES ('{$gid}', '{$id}')");
+ }
+ if (!$this->newDoc) {
+ $groupIds = empty($groupIds) ? '0' : implode(',', $groupIds);
+ $this->query("DELETE FROM {$this->makeTable('document_groups')} WHERE `document`={$id} AND `document_group` NOT IN ({$groupIds})");
+ }
+ }
+ unset($doc);
+ $this->groupIds = array();
+ }
+
+ return $this;
+ }
}
diff --git a/assets/lib/MODxAPI/modUsers.php b/assets/lib/MODxAPI/modUsers.php
index db8fc9e1..a5a8bcbb 100644
--- a/assets/lib/MODxAPI/modUsers.php
+++ b/assets/lib/MODxAPI/modUsers.php
@@ -11,34 +11,36 @@ class modUsers extends MODxAPI
*/
protected $default_field = array(
'user' => array(
- 'username' => null,
- 'password' => null,
- 'cachepwd' => null
+ 'username' => '',
+ 'password' => '',
+ 'cachepwd' => ''
),
'attribute' => array(
- 'fullname' => null,
- 'role' => null,
- 'email' => null,
- 'phone' => null,
- 'mobilephone' => null,
- 'blocked' => null,
- 'blockeduntil' => null,
- 'blockedafter' => null,
- 'logincount' => null,
- 'lastlogin' => null,
- 'thislogin' => null,
- 'failedlogincount' => null,
- 'sessionid' => null,
- 'dob' => null,
- 'gender' => null,
- 'country' => null,
- 'state' => null,
- 'city' => null,
- 'street' => null,
- 'zip' => null,
- 'fax' => null,
- 'photo' => null,
- 'comment' => null
+ 'fullname' => '',
+ 'role' => '',
+ 'email' => '',
+ 'phone' => '',
+ 'mobilephone' => '',
+ 'blocked' => 0,
+ 'blockeduntil' => 0,
+ 'blockedafter' => 0,
+ 'logincount' => 0,
+ 'lastlogin' => 0,
+ 'thislogin' => 0,
+ 'failedlogincount' => 0,
+ 'sessionid' => '',
+ 'dob' => 0,
+ 'gender' => 0,
+ 'country' => '',
+ 'state' => '',
+ 'city' => '',
+ 'street' => '',
+ 'zip' => '',
+ 'fax' => '',
+ 'photo' => '',
+ 'comment' => '',
+ 'createdon' => 0,
+ 'editedon' => 0
),
'hidden' => array(
'internalKey'
@@ -51,14 +53,51 @@ class modUsers extends MODxAPI
protected $givenPassword = '';
protected $groupIds = array();
+ /**
+ * @var integer
+ */
+ private $rememberTime;
+
+ /**
+ * MODxAPI constructor.
+ * @param DocumentParser $modx
+ * @param bool $debug
+ * @throws Exception
+ */
+ public function __construct(DocumentParser $modx, $debug = false)
+ {
+ $this->setRememberTime(60 * 60 * 24 * 365 * 5);
+ parent::__construct($modx, $debug);
+ }
+
+ /**
+ * @param $val
+ * @return $this
+ */
+ protected function setRememberTime($val)
+ {
+ $this->rememberTime = (int)$val;
+ return $this;
+ }
+
+ /**
+ * @return integer
+ */
+ public function getRememberTime()
+ {
+ return $this->rememberTime;
+ }
+
/**
* @param $key
* @return bool
*/
public function issetField($key)
{
- return (array_key_exists($key, $this->default_field['user']) || array_key_exists($key,
- $this->default_field['attribute']) || in_array($key, $this->default_field['hidden']));
+ return (array_key_exists($key, $this->default_field['user']) || array_key_exists(
+ $key,
+ $this->default_field['attribute']
+ ) || in_array($key, $this->default_field['hidden']));
}
/**
@@ -84,6 +123,18 @@ protected function findUser($data)
return $find;
}
+ /**
+ * @param array $data
+ * @return $this
+ */
+ public function create($data = array())
+ {
+ parent::create($data);
+ $this->set('createdon', time());
+
+ return $this;
+ }
+
/**
* @param $id
* @return $this
@@ -98,13 +149,8 @@ public function edit($id)
if (!$find = $this->findUser($id)) {
$this->id = null;
} else {
- $result = $this->query("
- SELECT * from {$this->makeTable('web_user_attributes')} as attribute
- LEFT JOIN {$this->makeTable('web_users')} as user ON user.id=attribute.internalKey
- WHERE BINARY {$find}='{$this->escape($id)}'
- ");
- $this->field = $this->modx->db->getRow($result);
-
+ $this->set('editedon', time());
+ $this->editQuery($find, $id);
$this->id = empty($this->field['internalKey']) ? null : $this->get('internalKey');
$this->store($this->toArray());
unset($this->field['id']);
@@ -115,6 +161,20 @@ public function edit($id)
return $this;
}
+ /**
+ * @param string $find
+ * @param string $id
+ */
+ protected function editQuery($find, $id)
+ {
+ $result = $this->query("
+ SELECT * from {$this->makeTable('web_user_attributes')} as attribute
+ LEFT JOIN {$this->makeTable('web_users')} as user ON user.id=attribute.internalKey
+ WHERE BINARY {$find}='{$this->escape($id)}'
+ ");
+ $this->field = $this->modx->db->getRow($result);
+ }
+
/**
* @param string $key
* @param $value
@@ -131,6 +191,15 @@ public function set($key, $value)
case 'sessionid':
session_regenerate_id(false);
$value = session_id();
+ if ($mid = $this->modx->getLoginUserID('mgr')) {
+ $this->modx->db->query("UPDATE {$this->makeTable('active_user_locks')} SET `sid`='{$value}' WHERE `internalKey`={$mid}");
+ $this->modx->db->query("UPDATE {$this->makeTable('active_user_sessions')} SET `sid`='{$value}' WHERE `internalKey`={$mid}");
+ $this->modx->db->query("UPDATE {$this->makeTable('active_users')} SET `sid`='{$value}' WHERE `internalKey`={$mid}");
+ }
+ break;
+ case 'editedon':
+ case 'createdon':
+ $value = $this->getTime($value);
break;
}
$this->field[$key] = $value;
@@ -156,15 +225,19 @@ public function getPassword($pass)
public function save($fire_events = false, $clearCache = false)
{
if ($this->get('email') == '' || $this->get('username') == '' || $this->get('password') == '') {
- $this->log['EmptyPKField'] = 'Email, username or password is empty
' . print_r($this->toArray(),
- true) . '
';
+ $this->log['EmptyPKField'] = 'Email, username or password is empty
' . print_r(
+ $this->toArray(),
+ true
+ ) . '
';
return false;
}
if (!$this->checkUnique('web_users', 'username')) {
- $this->log['UniqueUsername'] = 'username not unique
' . print_r($this->get('username'),
- true) . '';
+ $this->log['UniqueUsername'] = 'username not unique
' . print_r(
+ $this->get('username'),
+ true
+ ) . '';
return false;
}
@@ -188,8 +261,10 @@ public function save($fire_events = false, $clearCache = false)
if ($this->newDoc) {
$SQL = "INSERT into {$this->makeTable('web_users')} SET " . implode(', ', $this->set['user']);
} else {
- $SQL = "UPDATE {$this->makeTable('web_users')} SET " . implode(', ',
- $this->set['user']) . " WHERE id = " . $this->id;
+ $SQL = "UPDATE {$this->makeTable('web_users')} SET " . implode(
+ ', ',
+ $this->set['user']
+ ) . " WHERE id = " . $this->id;
}
$this->query($SQL);
}
@@ -198,26 +273,9 @@ public function save($fire_events = false, $clearCache = false)
$this->id = $this->modx->db->getInsertId();
}
- foreach ($this->default_field['attribute'] as $key => $value) {
- $tmp = $this->get($key);
- if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {
- $this->field[$key] = $value;
- }
- $this->Uset($key, 'attribute');
- unset($fld[$key]);
- }
- if (!empty($this->set['attribute'])) {
- if ($this->newDoc) {
- $this->set('internalKey', $this->id)->Uset('internalKey', 'attribute');
- $SQL = "INSERT into {$this->makeTable('web_user_attributes')} SET " . implode(', ',
- $this->set['attribute']);
- } else {
- $SQL = "UPDATE {$this->makeTable('web_user_attributes')} SET " . implode(', ',
- $this->set['attribute']) . " WHERE internalKey = " . $this->getID();
- }
- $this->query($SQL);
- }
+ $this->saveQuery($fld);
unset($fld['id']);
+
foreach ($fld as $key => $value) {
if ($value == '' || !$this->isChanged($key)) {
continue;
@@ -239,9 +297,11 @@ public function save($fire_events = false, $clearCache = false)
'username' => $this->get('username')
), $fire_events);
}
-
- if ($this->groupIds) $this->setUserGroups($this->id, $this->groupIds);
-
+
+ if (!empty($this->groupIds)) {
+ $this->setUserGroups($this->id, $this->groupIds);
+ }
+
$this->invokeEvent('OnWebSaveUser', array(
'userObj' => $this,
'mode' => $this->newDoc ? "new" : "upd",
@@ -256,6 +316,36 @@ public function save($fire_events = false, $clearCache = false)
return $this->id;
}
+ /**
+ * @param array $fld
+ */
+ protected function saveQuery(array &$fld)
+ {
+ foreach ($this->default_field['attribute'] as $key => $value) {
+ $tmp = $this->get($key);
+ if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {
+ $this->field[$key] = $value;
+ }
+ $this->Uset($key, 'attribute');
+ unset($fld[$key]);
+ }
+ if (!empty($this->set['attribute'])) {
+ if ($this->newDoc) {
+ $this->set('internalKey', $this->id)->Uset('internalKey', 'attribute');
+ $SQL = "INSERT into {$this->makeTable('web_user_attributes')} SET " . implode(
+ ', ',
+ $this->set['attribute']
+ );
+ } else {
+ $SQL = "UPDATE {$this->makeTable('web_user_attributes')} SET " . implode(
+ ', ',
+ $this->set['attribute']
+ ) . " WHERE internalKey = " . $this->getID();
+ }
+ $this->query($SQL);
+ }
+ }
+
/**
* @param $ids
* @param bool $fire_events
@@ -264,10 +354,7 @@ public function save($fire_events = false, $clearCache = false)
public function delete($ids, $fire_events = false)
{
if ($this->edit($ids)) {
- $flag = $this->query("
- DELETE user,attribute FROM {$this->makeTable('web_user_attributes')} as attribute
- LEFT JOIN {$this->makeTable('web_users')} as user ON user.id=attribute.internalKey
- WHERE attribute.internalKey='{$this->escape($this->getID())}'");
+ $flag = $this->deleteQuery();
$this->query("DELETE FROM {$this->makeTable('web_user_settings')} WHERE webuser='{$this->getID()}'");
$this->query("DELETE FROM {$this->makeTable('web_groups')} WHERE webuser='{$this->getID()}'");
$this->invokeEvent('OnWebDeleteUser', array(
@@ -285,9 +372,17 @@ public function delete($ids, $fire_events = false)
return $flag;
}
+ protected function deleteQuery()
+ {
+ return $this->query("
+ DELETE user,attribute FROM {$this->makeTable('web_user_attributes')} as attribute
+ LEFT JOIN {$this->makeTable('web_users')} as user ON user.id=attribute.internalKey
+ WHERE attribute.internalKey='{$this->escape($this->getID())}'");
+ }
+
/**
* @param int $id
- * @param bool $fulltime
+ * @param bool|integer $fulltime
* @param string $cookieName
* @param bool $fire_events
* @return bool
@@ -350,8 +445,7 @@ public function testAuth($id, $password, $blocker, $fire_events = false)
}
$flag = $pluginFlag = false;
- if (
- (null !== $tmp->getID()) && (!$blocker || ($blocker && !$tmp->checkBlock($id)))
+ if ((null !== $tmp->getID()) && (!$blocker || ($blocker && !$tmp->checkBlock($id)))
) {
$eventResult = $this->getInvokeEventResult('OnWebAuthentication', array(
'userObj' => $this,
@@ -377,7 +471,7 @@ public function testAuth($id, $password, $blocker, $fire_events = false)
}
/**
- * @param bool $fulltime
+ * @param bool|integer $fulltime
* @param string $cookieName
* @return bool
*/
@@ -385,20 +479,21 @@ public function AutoLogin($fulltime = true, $cookieName = 'WebLoginPE', $fire_ev
{
$flag = false;
if (isset($_COOKIE[$cookieName])) {
- $cookie = explode('|', $_COOKIE[$cookieName], 3);
+ $cookie = explode('|', $_COOKIE[$cookieName], 4);
if (isset($cookie[0], $cookie[1], $cookie[2]) && strlen($cookie[0]) == 32 && strlen($cookie[1]) == 32) {
+ if (!$fulltime && isset($cookie[4])) {
+ $fulltime = (int)$cookie[4];
+ }
$this->close();
$q = $this->modx->db->query("SELECT id FROM " . $this->makeTable('web_users') . " WHERE md5(username)='{$this->escape($cookie[0])}'");
$id = $this->modx->db->getValue($q);
- if (
- $this->edit($id)
- && null !== $this->getID()
- && $this->get('password') == $cookie[1]
- && $this->get('sessionid') == $cookie[2]
+ if ($this->edit($id)
+ && null !== $this->getID()
+ && $this->get('password') == $cookie[1]
+ && $this->get('sessionid') == $cookie[2]
&& !$this->checkBlock($this->getID())
) {
$flag = $this->authUser($this->getID(), $fulltime, $cookieName, $fire_events);
-
}
}
}
@@ -408,9 +503,9 @@ public function AutoLogin($fulltime = true, $cookieName = 'WebLoginPE', $fire_ev
/**
* @param string $cookieName
- * @param null $fire_events
+ * @param bool $fire_events
*/
- public function logOut($cookieName = 'WebLoginPE', $fire_events = null)
+ public function logOut($cookieName = 'WebLoginPE', $fire_events = false)
{
if (!$uid = $this->modx->getLoginUserID('web')) {
return;
@@ -431,6 +526,7 @@ public function logOut($cookieName = 'WebLoginPE', $fire_events = null)
*
* @param string $directive ('start' or 'destroy')
* @param string $cookieName
+ * @param bool|integer $remember
* @return modUsers
* @author Raymond Irving
* @author Scotty Delicious
@@ -441,7 +537,7 @@ protected function SessionHandler($directive, $cookieName, $remember = true)
{
switch ($directive) {
case 'start':
- if ($this->getID()) {
+ if ($this->getID() !== null) {
$_SESSION['webShortname'] = $this->get('username');
$_SESSION['webFullname'] = $this->get('fullname');
$_SESSION['webEmail'] = $this->get('email');
@@ -455,7 +551,7 @@ protected function SessionHandler($directive, $cookieName, $remember = true)
$_SESSION['webUsrConfigSet'] = array();
$_SESSION['webUserGroupNames'] = $this->getUserGroups();
$_SESSION['webDocgroups'] = $this->getDocumentGroups();
- if ($remember) {
+ if (!empty($remember)) {
$this->setAutoLoginCookie($cookieName, $remember);
}
}
@@ -476,12 +572,12 @@ protected function SessionHandler($directive, $cookieName, $remember = true)
unset($_SESSION['webUserGroupNames']);
unset($_SESSION['webDocgroups']);
- setcookie($cookieName, '', time() - 60, '/');
+ setcookie($cookieName, '', time() - 60, MODX_BASE_URL);
} else {
if (isset($_COOKIE[session_name()])) {
- setcookie(session_name(), '', time() - 60, '/');
+ setcookie(session_name(), '', time() - 60, MODX_BASE_URL);
}
- setcookie($cookieName, '', time() - 60, '/');
+ setcookie($cookieName, '', time() - 60, MODX_BASE_URL);
session_destroy();
}
break;
@@ -502,18 +598,18 @@ public function isSecure()
/**
* @param $cookieName
- * @param bool $remember
+ * @param bool|integer $remember
* @return $this
*/
public function setAutoLoginCookie($cookieName, $remember = true)
{
- if (!empty($cookieName) && $this->getID()) {
+ if (!empty($cookieName) && $this->getID() !== null) {
$secure = $this->isSecure();
- $remember = is_bool($remember) ? (60 * 60 * 24 * 365 * 5) : (int)$remember;
+ $remember = is_bool($remember) ? $this->getRememberTime() : (int)$remember;
$cookieValue = array(md5($this->get('username')), $this->get('password'), $this->get('sessionid'), $remember);
$cookieValue = implode('|', $cookieValue);
$cookieExpires = time() + $remember;
- setcookie($cookieName, $cookieValue, $cookieExpires, '/', '', $secure, true);
+ setcookie($cookieName, $cookieValue, $cookieExpires, MODX_BASE_URL, '', $secure, true);
}
return $this;
@@ -535,7 +631,6 @@ public function getDocumentGroups($userID = 0)
INNER JOIN {$webgroup_access} as `uga` ON `uga`.`webgroup`=`ug`.`webgroup`
WHERE `ug`.`webuser` = " . $user->getID();
$out = $this->modx->db->getColumn('documentgroup', $this->query($sql));
-
}
unset($user);
@@ -554,10 +649,12 @@ public function getUserGroups($userID = 0)
$web_groups = $this->makeTable('web_groups');
$webgroup_names = $this->makeTable('webgroup_names');
- $sql = "SELECT `ugn`.`name` FROM {$web_groups} as `ug`
+ $rs = $this->query("SELECT `ug`.`webgroup`, `ugn`.`name` FROM {$web_groups} as `ug`
INNER JOIN {$webgroup_names} as `ugn` ON `ugn`.`id`=`ug`.`webgroup`
- WHERE `ug`.`webuser` = " . $user->getID();
- $out = $this->modx->db->getColumn('name', $this->query($sql));
+ WHERE `ug`.`webuser` = " . $user->getID());
+ while ($row = $this->modx->db->getRow($rs)) {
+ $out[$row['webgroup']] = $row['name'];
+ }
}
unset($user);
@@ -571,7 +668,9 @@ public function getUserGroups($userID = 0)
*/
public function setUserGroups($userID = 0, $groupIds = array())
{
- if (!is_array($groupIds)) return $this;
+ if (!is_array($groupIds)) {
+ return $this;
+ }
if ($this->newDoc && $userID == 0) {
$this->groupIds = $groupIds;
} else {
@@ -580,6 +679,10 @@ public function setUserGroups($userID = 0, $groupIds = array())
foreach ($groupIds as $gid) {
$this->query("REPLACE INTO {$this->makeTable('web_groups')} (`webgroup`, `webuser`) VALUES ('{$gid}', '{$uid}')");
}
+ if (!$this->newDoc) {
+ $groupIds = empty($groupIds) ? '0' : implode(',', $groupIds);
+ $this->query("DELETE FROM {$this->makeTable('web_groups')} WHERE `webuser`={$uid} AND `webgroup` NOT IN ({$groupIds})");
+ }
}
unset($user);
$this->groupIds = array();
diff --git a/assets/lib/Module/Action.php b/assets/lib/Module/Action.php
old mode 100755
new mode 100644
index eea27058..f06b6189
--- a/assets/lib/Module/Action.php
+++ b/assets/lib/Module/Action.php
@@ -179,4 +179,5 @@ public static function getClassTable()
{
return self::$classTable;
}
+
}
diff --git a/assets/lib/Module/Helper.php b/assets/lib/Module/Helper.php
old mode 100755
new mode 100644
index 04b49314..14d23f85
--- a/assets/lib/Module/Helper.php
+++ b/assets/lib/Module/Helper.php
@@ -152,4 +152,5 @@ public static function readFileLine($path, $callback, array $callbackParams = ar
return array('line' => $i, 'add' => $total);
}
+
}
diff --git a/assets/lib/SimpleTab/controller.abstract.php b/assets/lib/SimpleTab/controller.abstract.php
old mode 100755
new mode 100644
index fdff0153..544b36a9
--- a/assets/lib/SimpleTab/controller.abstract.php
+++ b/assets/lib/SimpleTab/controller.abstract.php
@@ -171,4 +171,5 @@ public function getLanguageCode()
return isset($modx_lang_attribute) ? $modx_lang_attribute : null;
}
+
}
diff --git a/assets/lib/SimpleTab/plugin.class.php b/assets/lib/SimpleTab/plugin.class.php
index 78cba82d..0b9b6638 100644
--- a/assets/lib/SimpleTab/plugin.class.php
+++ b/assets/lib/SimpleTab/plugin.class.php
@@ -65,8 +65,11 @@ public function __construct($modx, $lang_attribute = 'en')
$this->params['template'] = is_array($doc) ? end($doc) : null;
}
//overload plugin and class properties
- $_params = $modx->parseProperties('&template=;;' . $this->params['template'] . ' &id=;;' . $this->params['id'],
- $modx->event->activePlugin, 'plugin');
+ $_params = $modx->parseProperties(
+ '&template=;;' . $this->params['template'] . ' &id=;;' . $this->params['id'],
+ $modx->event->activePlugin,
+ 'plugin'
+ );
foreach ($_params as $key => $value) {
if (property_exists($this, $key)) {
$this->$key = $value;
@@ -99,8 +102,10 @@ public function checkPermissions()
$templates = isset($this->params['templates']) ? explode(',', $this->params['templates']) : false;
$roles = isset($this->params['roles']) ? explode(',', $this->params['roles']) : false;
- $tplFlag = ($this->checkTemplate && !$templates || ($templates && !in_array($this->params['template'],
- $templates)));
+ $tplFlag = ($this->checkTemplate && !$templates || ($templates && !in_array(
+ $this->params['template'],
+ $templates
+ )));
$documents = isset($this->params['documents']) ? explode(',', $this->params['documents']) : false;
$docFlag = ($this->checkId && $tplFlag) ? !($documents && in_array($this->params['id'], $documents)) : $tplFlag;
@@ -184,8 +189,10 @@ public function render()
if ($output !== false) {
$ph = $this->getTplPlaceholders();
$ph['js'] = $this->renderJS($this->jsListDefault, $ph) . $this->renderJS($this->jsListCustom, $ph);
- $ph['styles'] = $this->renderJS($this->cssListDefault, $ph) . $this->renderJS($this->cssListCustom,
- $ph);
+ $ph['styles'] = $this->renderJS($this->cssListDefault, $ph) . $this->renderJS(
+ $this->cssListCustom,
+ $ph
+ );
$output = $this->DLTemplate->parseChunk('@CODE:' . $output, $ph);
}
@@ -250,4 +257,5 @@ public function registerEvents($events = array(), $eventsType = '6')
}
}
}
+
}
diff --git a/assets/lib/SimpleTab/table.abstract.php b/assets/lib/SimpleTab/table.abstract.php
index 7fb61675..dd2d57f4 100644
--- a/assets/lib/SimpleTab/table.abstract.php
+++ b/assets/lib/SimpleTab/table.abstract.php
@@ -129,7 +129,7 @@ public function deleteThumb($url, $cache = false)
if ($cache) {
return;
}
- $thumbsCache = \APIhelpers::getkey($this->params,'thumbsCache',$this->thumbsCache);
+ $thumbsCache = \APIhelpers::getkey($this->params, 'thumbsCache', $this->thumbsCache);
$thumb = $thumbsCache . $url;
if ($this->fs->checkFile($thumb)) {
$this->deleteThumb($thumb, true);
@@ -138,7 +138,7 @@ public function deleteThumb($url, $cache = false)
/**
* @param $ids
- * @param null $fire_events
+ * @param bool $fire_events
* @return $this
*/
public function delete($ids, $fire_events = false)
@@ -152,7 +152,7 @@ public function delete($ids, $fire_events = false)
/**
* @param $ids
* @param $rid
- * @param null $fire_events
+ * @param bool $fire_events
* @return $this
*/
public function deleteAll($ids, $rid, $fire_events = false)
@@ -207,27 +207,51 @@ public function reorder($source, $target, $point, $rid, $orderDir)
/* more refactoring needed */
if ($targetIndex < $sourceIndex) {
if (($point == 'top' && $orderDir == 'asc') || ($point == 'bottom' && $orderDir == 'desc')) {
- $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`+1", $table,
- "`{$this->indexName}`>={$targetIndex} AND `{$this->indexName}`<{$sourceIndex} AND `{$this->rfName}`={$rid}");
- $rows = $this->modx->db->update("`{$this->indexName}`={$targetIndex}", $table,
- "`{$this->pkName}`={$sourceId}");
+ $this->modx->db->update(
+ "`{$this->indexName}`=`{$this->indexName}`+1",
+ $table,
+ "`{$this->indexName}`>={$targetIndex} AND `{$this->indexName}`<{$sourceIndex} AND `{$this->rfName}`={$rid}"
+ );
+ $rows = $this->modx->db->update(
+ "`{$this->indexName}`={$targetIndex}",
+ $table,
+ "`{$this->pkName}`={$sourceId}"
+ );
} elseif (($point == 'bottom' && $orderDir == 'asc') || ($point == 'top' && $orderDir == 'desc')) {
- $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`+1", $table,
- "`{$this->indexName}`>{$targetIndex} AND `{$this->indexName}`<{$sourceIndex} AND `{$this->rfName}`={$rid}");
- $rows = $this->modx->db->update("`{$this->indexName}`=1+{$targetIndex}", $table,
- "`{$this->pkName}`={$sourceId}");
+ $this->modx->db->update(
+ "`{$this->indexName}`=`{$this->indexName}`+1",
+ $table,
+ "`{$this->indexName}`>{$targetIndex} AND `{$this->indexName}`<{$sourceIndex} AND `{$this->rfName}`={$rid}"
+ );
+ $rows = $this->modx->db->update(
+ "`{$this->indexName}`=1+{$targetIndex}",
+ $table,
+ "`{$this->pkName}`={$sourceId}"
+ );
}
} else {
if (($point == 'bottom' && $orderDir == 'asc') || ($point == 'top' && $orderDir == 'desc')) {
- $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`-1", $table,
- "`{$this->indexName}`<={$targetIndex} AND `{$this->indexName}`>={$sourceIndex} AND `{$this->rfName}`={$rid}");
- $rows = $this->modx->db->update("`{$this->indexName}`={$targetIndex}", $table,
- "`{$this->pkName}`={$sourceId}");
+ $this->modx->db->update(
+ "`{$this->indexName}`=`{$this->indexName}`-1",
+ $table,
+ "`{$this->indexName}`<={$targetIndex} AND `{$this->indexName}`>={$sourceIndex} AND `{$this->rfName}`={$rid}"
+ );
+ $rows = $this->modx->db->update(
+ "`{$this->indexName}`={$targetIndex}",
+ $table,
+ "`{$this->pkName}`={$sourceId}"
+ );
} elseif (($point == 'top' && $orderDir == 'asc') || ($point == 'bottom' && $orderDir == 'desc')) {
- $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`-1", $table,
- "`{$this->indexName}`<{$targetIndex} AND `{$this->indexName}`>={$sourceIndex} AND `{$this->rfName}`={$rid}");
- $rows = $this->modx->db->update("`{$this->indexName}`=-1+{$targetIndex}", $table,
- "`{$this->pkName}`={$sourceId}");
+ $this->modx->db->update(
+ "`{$this->indexName}`=`{$this->indexName}`-1",
+ $table,
+ "`{$this->indexName}`<{$targetIndex} AND `{$this->indexName}`>={$sourceIndex} AND `{$this->rfName}`={$rid}"
+ );
+ $rows = $this->modx->db->update(
+ "`{$this->indexName}`=-1+{$targetIndex}",
+ $table,
+ "`{$this->pkName}`={$sourceId}"
+ );
}
}
@@ -272,6 +296,9 @@ public function getParams()
*/
public function setParams($params = array())
{
- if (is_array($params)) $this->params = $params;
+ if (is_array($params)) {
+ $this->params = $params;
+ }
}
+
}
diff --git a/assets/lib/class.modxRTEbridge.php b/assets/lib/class.modxRTEbridge.php
old mode 100644
new mode 100755
index 1a554dae..f32d9b65
--- a/assets/lib/class.modxRTEbridge.php
+++ b/assets/lib/class.modxRTEbridge.php
@@ -1,6 +1,6 @@
modxRTEbridge)) $modx->modxRTEbridge = array();
-
+
// Init language before bridge so bridge can alter translations via $this->setLang()
$this->initLang($basePath);
@@ -72,11 +72,11 @@ public function __construct($editorKey = NULL, $bridgeConfig=array(), $tvOptions
// Modx default WYSIWYG-params
$modxParamsArr = array(
- 'theme', 'skin', 'entermode', 'element_format', 'schema', 'css_selectors',
+ 'theme', 'skin', 'skintheme', 'entermode', 'element_format', 'schema', 'css_selectors',
'custom_plugins', 'custom_buttons1', 'custom_buttons2', 'custom_buttons3', 'custom_buttons4',
'template_docs', 'template_chunks'
);
-
+
// Add defaultCheckbox-Values for user-settings
$settingsRows = array();
include($basePath . 'gsettings/gsettings.rows.inc.php');
@@ -87,7 +87,7 @@ public function __construct($editorKey = NULL, $bridgeConfig=array(), $tvOptions
$this->modxParams[$param . '_useglobal'] = !empty($editorConfig[$useGlobalName]) || (isset($editorConfig[$useGlobalName]) && is_null($editorConfig[$useGlobalName])) ? '1' : '0';
}
}
-
+
// Add custom settings from bridge
foreach ($this->gSettingsCustom as $param => $row) {
if (!in_array($param, $modxParamsArr)) $modxParamsArr[] = $param;
@@ -123,6 +123,7 @@ public function __construct($editorKey = NULL, $bridgeConfig=array(), $tvOptions
$this->pluginParams['editorVersion'] = isset($bridgeConfig['editorVersion']) ? $bridgeConfig['editorVersion'] : 'No editorVersion set';
$this->pluginParams['editorLogo'] = isset($bridgeConfig['editorLogo']) ? $bridgeConfig['editorLogo'] : '';
$this->pluginParams['skinsDirectory'] = isset($bridgeConfig['skinsDirectory']) && !empty($bridgeConfig['skinsDirectory']) ? trim($bridgeConfig['skinsDirectory'], "/") . "/" : '';
+ $this->pluginParams['skinthemeDirectory'] = isset($bridgeConfig['skinthemeDirectory']) && !empty($bridgeConfig['skinthemeDirectory']) ? trim($bridgeConfig['skinthemeDirectory'], "/") . "/" : '';
$this->pluginParams['base_path'] = $basePath;
$this->pluginParams['base_url'] = $baseUrl;
}
@@ -232,7 +233,7 @@ public function getEditorScript()
// Allows bridging elements+TV-options etc before looping
$this->renderBridgeParams('initBridge');
-
+
// Now loop through tvs
foreach ($this->pluginParams['elements'] as $selector) {
@@ -266,18 +267,19 @@ public function getEditorScript()
// Loop through tvs
$output .= file_get_contents("{$this->pluginParams['base_path']}tpl/tpl.{$this->editorKey}.init.html") ."\n";
$output = $modx->parseText($output, $ph);
+ $output = str_replace('\\', '/', $output);
}
} else {
- // No elements given - create Config-Object only
+ // No elements given - create Config-Object only
$this->theme = $this->tvOptions['theme'];
$this->initTheme('noselector');
$this->renderBridgeParams('noselector');
-
+
// Prepare config output
$ph = $this->prepareDefaultPlaceholders();
$ph = array_merge($ph, $this->customPlaceholders, $this->mergeParamArrays()); // Big list..
-
+
if (!defined($this->editorKey . '_INIT_CONFIG_' . $this->theme)) {
define($this->editorKey . '_INIT_CONFIG_' . $this->theme, 1);
$output .= file_get_contents("{$this->pluginParams['base_path']}tpl/tpl.{$this->editorKey}.config.html") ."\n";
@@ -303,23 +305,27 @@ public function getEditorScript()
/**
* @return array
*/
- public function prepareDefaultPlaceholders($selector='')
+ public function prepareDefaultPlaceholders($selector='', $render=true)
{
global $modx;
- $ph['configString'] = $this->renderConfigString();
- $ph['configRawString'] = $this->renderConfigRawString();
+ if($render) {
+ $ph['configString'] = $this->renderConfigString();
+ $ph['configRawString'] = $this->renderConfigRawString();
+ }
$ph['editorKey'] = $this->editorKey;
$ph['themeKey'] = $this->theme;
$ph['selector'] = $selector;
$ph['documentIdentifier'] = $modx->documentIdentifier;
+ $ph['base_path'] = MODX_BASE_PATH;
+ $ph['base_url'] = MODX_BASE_URL;
$ph['manager_path'] = MGR_DIR;
$ph['site_manager_url'] = MODX_MANAGER_URL;
$ph['which_browser'] = !empty($modx->config['which_browser']) ? $modx->config['which_browser'] : 'mcpuk';
return $ph;
}
-
+
// Init/load theme
public function initTheme($selector)
{
@@ -328,7 +334,7 @@ public function initTheme($selector)
$this->theme = isset($this->tvOptions[$selector]['theme']) ? $this->tvOptions[$selector]['theme'] : $this->theme;
// Load theme for user or webuser
- if ($modx->isBackend() || (intval($_GET['quickmanagertv']) == 1 || isset($_SESSION['mgrValidated']))) {
+ if ($modx->isBackend() || ((int)$_GET['quickmanagertv'] == 1 || isset($_SESSION['mgrValidated']))) {
// User is logged into Manager
// Load base first to assure Modx settings like entermode, editor_css_path are given set, can be overwritten in custom theme
include("{$this->pluginParams['base_path']}theme/theme.{$this->editorKey}.base.inc.php");
@@ -344,7 +350,7 @@ public function initTheme($selector)
$this->pluginParams['language'] = !isset($this->pluginParams['language']) ? $this->lang('lang_code') : $this->pluginParams['language'];
}
}
-
+
// Call bridge-functions and receive optional bridged-values
// $selector = "initBridge" allows executing bridging function without modifying $this->themeConfig
public function renderBridgeParams($selector)
@@ -372,7 +378,10 @@ public function renderBridgeParams($selector)
// Renders String for initialization via JS
public function renderConfigString()
{
+ global $modx;
+
$config = array();
+ $defaultPhs = $this->prepareDefaultPlaceholders('',false);
// Build config-string as per themeConfig
$raw = '';
@@ -382,6 +391,8 @@ public function renderConfigString()
$value = $this->determineValue($key, $conf);
if ($value === NULL) { continue; }; // Skip none-allowed empty settings
+ $value = is_string($value) ? $modx->parseText($value, $defaultPhs) : $value; // Allow default-placeholders like [+which_browser+] in theme-param-values
+
// Escape quotes
if (!is_array($value) && strpos($value, "'") !== false && !in_array($conf['type'], array('raw','object','obj')) )
$value = str_replace("'", "\\'", $value);
@@ -437,8 +448,8 @@ public function renderConfigRawString()
return $raw;
}
-
- // Get final value of editor-config
+
+ // Get final value of editor-config
public function determineValue($key, $conf=NULL)
{
if($conf == NULL) { $conf = $this->themeConfig[$key]; };
@@ -517,6 +528,9 @@ public function getModxSettings()
// Prepare setting "skin"
$ph['skin_options'] = $this->getSkinNames();
+ // Prepare setting "skin-theme"
+ $ph['skintheme_options'] = $this->getSkinThemeNames();
+
// Prepare setting "entermode_options"
$entermode = !empty($ph[$this->editorKey . '_entermode']) ? $ph[$this->editorKey . '_entermode'] : 'p';
$ph['entermode_options'] = '
';
@@ -568,9 +582,9 @@ public function getModxSettings()
if ($row == NULL) {
continue;
}; // Skip disabled config-settings
-
+
$row = array_merge($this->langArr, $row);
-
+
$row['name'] = $this->editorKey . '_' . $name;
$row['editorKey'] = $this->editorKey;
$row['title'] = $this->lang($row['title']);
@@ -579,7 +593,7 @@ public function getModxSettings()
// Prepare displaying of default values
$row['default'] = isset($this->gSettingsDefaultValues[$name]) ? '
' . $this->lang('default') . '' . $this->gSettingsDefaultValues[$name] . '' : '';
-
+
// Prepare Default-Checkboxes for user-settings
if(in_array($modx->manager->action, array(11,12)) && isset($row['defaultCheckbox']) && $row['defaultCheckbox']) {
$useGlobalName = $name . '_useglobal';
@@ -589,7 +603,7 @@ public function getModxSettings()
} else {
$row['defaultCheckbox'] = '';
}
-
+
// Nested parsing
$output = $settingsRowTpl;
$bt=md5('');
@@ -598,7 +612,7 @@ public function getModxSettings()
$output = $this->parsePlaceholders($output, $row); // Replace general translations
$output = $this->parsePlaceholders($output, $ph); // Replace values / settings
}
-
+
$ph['rows'] .= $output . "\n";
};
@@ -611,12 +625,12 @@ public function getModxSettings()
return $settingsBody;
}
-
+
public function parsePlaceholders($content, $ph) {
foreach($ph as $key=>$value) $content = str_replace('[+'.$key.'+]', $value, $content);
return $content;
}
-
+
// Replace all translation-placeholders
public function replaceTranslations($output)
{
@@ -652,10 +666,12 @@ public function getThemeNames()
}
foreach (glob("{$themeDir}*") as $file) {
- $file = str_replace('\\', '/', $file);
+ //$file = str_replace('\\', '/', $file);
$file = str_replace($themeDir, '', $file);
$file = str_replace('theme.' . $this->editorKey . '.', '', $file);
+ if(in_array($file,array('index.html'))) continue;
+
$theme = trim(str_replace('.inc.php', '', $file));
if ($theme == 'base') continue; // Why should user select base-theme?
$label = $this->lang("theme_{$theme}", true) ? $this->lang("theme_{$theme}") : $theme; // Get optional translation or show raw themeKey
@@ -689,7 +705,7 @@ public function getSkinNames()
break;
}
foreach (glob("{$skinDir}*", GLOB_ONLYDIR) as $dir) {
- $dir = str_replace('\\', '/', $dir);
+ //$dir = str_replace('\\', '/', $dir);
$skin_name = substr($dir, strrpos($dir, '/') + 1);
$skins[$skin_name][] = 'default';
$styles = glob("{$dir}/ui_*.css");
@@ -714,6 +730,36 @@ public function getSkinNames()
return is_array($option) ? implode("\n", $option) : '';
}
+ public function getSkinThemeNames()
+ {
+ global $modx;
+ $params = $this->pluginParams;
+
+ $themeDir = "{$params['base_path']}{$params['skinthemeDirectory']}";
+
+ switch ($modx->manager->action) {
+ case '11':
+ case '12':
+ case '119':
+ $selected = $this->selected(empty($params[$this->editorKey . '_skintheme']));
+ $option[] = '
';
+ break;
+ }
+
+ foreach (glob("{$themeDir}*") as $theme) {
+ //$file = str_replace('\\', '/', $file);
+ $theme = str_replace($themeDir, '', $theme);
+
+ if(in_array($theme,array('index.html'))) continue;
+
+ $selected = $this->selected($theme == $this->modxParams['skintheme']);
+
+ $option[] = '
";
+ }
+
+ return isset($option) && is_array($option) ? implode("\n", $option) : '';
+ }
+
public function selected($cond = false)
{
if ($cond !== false) return ' selected="selected"';
@@ -766,14 +812,14 @@ public function initLang($basePath)
public function mergeParamArrays()
{
$p = array();
- foreach($this->pluginParams as $param=>$value) { $p['pp.'.$param] = is_array($value) ? join(',',$value) : $value; };
- foreach($this->modxParams as $param=>$value) { $p['mp.'.$param] = is_array($value) ? join(',',$value) : $value; };
+ foreach($this->pluginParams as $param=>$value) { $p['pp.'.$param] = is_array($value) ? implode(',',$value) : $value; };
+ foreach($this->modxParams as $param=>$value) { $p['mp.'.$param] = is_array($value) ? implode(',',$value) : $value; };
foreach($this->themeConfig as $param=>$arr) {
if (isset($arr['force'])) $p['tc.' . $param] = $arr['force'];
elseif (isset($arr['bridged'])) $p['tc.' . $param] = $arr['bridged'];
else $p['tc.' . $param] = $arr['value'];
};
- foreach($this->gSettingsDefaultValues as $param=>$value) { $p['gd.'.$param] = is_array($value) ? join(',',$value) : $value; };
+ foreach($this->gSettingsDefaultValues as $param=>$value) { $p['gd.'.$param] = is_array($value) ? implode(',',$value) : $value; };
foreach($this->langArr as $param=>$value) { $p['l.'.$param] = $value; };
return $p;
}
@@ -820,14 +866,14 @@ public function parseEditableIds($source, $attrContentEditable=false)
{
if(!isset($_SESSION['mgrValidated'])) return $source;
$attrContentEditable = $attrContentEditable == true ? ' contenteditable="true"' : '';
-
+
$matchPhs = '~\[\*#(.*?)\*\]~'; // match [*#content*] / content
preg_match_all($matchPhs, $source, $editableIds);
-
+
$this->setEditableIds($editableIds);
-
+
$source = preg_replace($matchPhs, '
[*$1*]
', $source);
-
+
return $source;
}
@@ -895,7 +941,7 @@ public function renderDebugMessages($placeholderArr) {
if($this->debug)
{
$output .= "
-
-
-
-
-
-
- [+onManagerMainFrameHeaderHTMLBlock+]
-
-
-
-
-
-
-
- [+store_name+] [+v+]
-
-
-
-
-
-