и выровнять пробелы +// содержит ошибку: делает перевод строки после запятой в строке в кавычках +public string function formatJsonString(str) { + var fjson = ''; + var pos = 0; + var strLen = len(arguments.str); + var indentStr = ' '; // Adjust Indent Token If you Like (замыкающий пробел - для выравнивания при пробелах после запятой) + var newLine = '
'; // Adjust New Line Token If you Like
+ + for (var i=1; i<=strLen; i++) { //fix: <= + var char = mid(arguments.str,i,1); + + if (char == '}' || char == ']') { + fjson &= newLine; + pos = pos - 1; + + for (var j=1; j <= pos; j++) { + fjson &= indentStr; + } + } + + fjson &= char; + + if (char == '{' || char == '[' || char == ',') { + fjson &= newLine; + + if (char == '{' || char == '[') { + pos = pos + 1; + } + + for (var k=1; k <= pos; k++) { + fjson &= indentStr; + } + } + } + + return fjson; +} +request.formatJsonString = formatJsonString; +//нужна еще функция, которая сериализует структуру как pretty printed json. См. https://github.com/bennadel/JsonSerializer.cfc (все не совсем просто, например, не заранее не определен формат даты) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/inc/menu.cfm b/inc/menu.cfm new file mode 100644 index 0000000..5b13946 --- /dev/null +++ b/inc/menu.cfm @@ -0,0 +1,58 @@ + + + + + + + + + +

Реестры

+ + + + + + + + + + + + + + + + + + + + + + ---> + + +

+ + \ No newline at end of file diff --git a/index.cfm b/index.cfm new file mode 100644 index 0000000..5398d53 --- /dev/null +++ b/index.cfm @@ -0,0 +1,7 @@ +

PAYG REPORT

+Установление сессии. +Если валидной сессии нет, отправляем браузер за аутентификацией к IDP. +Получаем в токене данные пользователя и время жизни, кладем в сессию. +По истечении установленного времени (скажем, половины срока жизни токена) идем к IDP за рефрешем +Сертификат открытого ключа можно каждый раз получать от IDP. +Запрос к IDP идет только для освежения сессии, а не на каждый запрос. Логаут на IDP не проверяется при каждом запросе. diff --git a/js/jquery.min.js b/js/jquery.min.js new file mode 100644 index 0000000..ee02337 --- /dev/null +++ b/js/jquery.min.js @@ -0,0 +1,4 @@ +/*! jQuery v1.7.1 jquery.com | jquery.org/license */ +(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"":"")+""),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){if(c!=="border")for(;g=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c

a",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="

"+""+"

",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="

",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="

",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")}; +f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;le&&i.push({elem:this,matches:d.slice(e)});for(j=0;j0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^$]*$)/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="

";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/",""],legend:[1,"

","

"],thead:[1,"","

"],tr:[2,"","

"],td:[3,"","

"],col:[2,"","

"],area:[1,"",""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div

","

"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function() +{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("

").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); \ No newline at end of file diff --git a/js/jquery.searchabledropdown.js b/js/jquery.searchabledropdown.js new file mode 100644 index 0000000..0ffa594 --- /dev/null +++ b/js/jquery.searchabledropdown.js @@ -0,0 +1,3 @@ +/* JQuery Searchable DropDown Plugin | Copyright (c) 2012 xhaggi */ +/*modidfed 14.11.2016|18.01.2018 by msyu - display:inline-block, padding-top: 0 for chrome; BUG: maxListSize IS IGNORED, use instead maxMultiMatch; chrome highlighted position correction;*/ +(function($){var B=register("searchable");B.defaults={maxListSize:100,maxMultiMatch:50,exactMatch:false,wildcards:true,ignoreCase:true,warnMultiMatch:"top {0} matches ...",warnNoMatch:"no matches ...",latency:200,zIndex:"auto"};B.execute=function(g,h){var j=null;var k=null;var l=null;if($.browser.msie&&parseInt(jQuery.browser.version)<7)return this;if(this.nodeName!="SELECT"||this.size>1)return this;var m=$(this);var n={index:-1,options:null};var o="lang";var p=false;$.browser.chrome=/chrome/.test(navigator.userAgent.toLowerCase());if($.browser.chrome)$.browser.safari=false;if($.meta){g=$.extend({},options,m.data())}var q=$("

");var r=$("

");var t=$("");var u=$(" id=#ATTRIBUTES.id# value="#ATTRIBUTES.value#" checked="checked" disabled="disabled" #attr#="#structFind(ATTRIBUTES,attr)#"/> \ No newline at end of file diff --git a/lib/controls/column.cfm b/lib/controls/column.cfm new file mode 100644 index 0000000..47cf2d8 --- /dev/null +++ b/lib/controls/column.cfm @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/controls/column_head.cfm b/lib/controls/column_head.cfm new file mode 100644 index 0000000..f189b06 --- /dev/null +++ b/lib/controls/column_head.cfm @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#ATTRIBUTES.title# + \ No newline at end of file diff --git a/lib/controls/combo.cfm b/lib/controls/combo.cfm new file mode 100644 index 0000000..13e2832 --- /dev/null +++ b/lib/controls/combo.cfm @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if (isArray(sel)) { + for(i=1; i <= ArrayLen(sel); i++){ + if (sel[i]==key) {return true;} + } + return false; + } else { //считаем, что из сложных типов тут бывает только массив + if (!isSimpleValue(sel)) {return false;} + /*return (sel == key);*/ + return listFind(sel,key); + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #preserveSingleQuotes(ATTRIBUTES.queryString)# + + + + + + + + + + + + + + + + + + + + + + select * from qSel where #ATTRIBUTES.key# in (#selectedList#)1=0 + + + +

#attr#="#structFind(ATTRIBUTES,attr)#"> + +

#Evaluate(ATTRIBUTES.display)#

+ + + + + + + +

+ + + + + + + + + + + + diff --git a/lib/controls/date.cfm b/lib/controls/date.cfm new file mode 100644 index 0000000..b6a3f6f --- /dev/null +++ b/lib/controls/date.cfm @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + id=#ATTRIBUTES.id# value="#dateFormat(value, ATTRIBUTES.format)#" size="#ATTRIBUTES.size#" disabled="disabled" #attr#="#structFind(ATTRIBUTES,attr)#"/> \ No newline at end of file diff --git a/lib/controls/datetime.cfm b/lib/controls/datetime.cfm new file mode 100644 index 0000000..5b1f4fa --- /dev/null +++ b/lib/controls/datetime.cfm @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id=#ATTRIBUTES.id# value="#value#" size="#ATTRIBUTES.size#" disabled="disabled" #attr#="#structFind(ATTRIBUTES,attr)#"/> \ No newline at end of file diff --git a/lib/controls/detail_buttons.cfm b/lib/controls/detail_buttons.cfm new file mode 100644 index 0000000..1484050 --- /dev/null +++ b/lib/controls/detail_buttons.cfm @@ -0,0 +1,18 @@ + + \ No newline at end of file diff --git a/lib/controls/grid_head.cfm b/lib/controls/grid_head.cfm new file mode 100644 index 0000000..55090e8 --- /dev/null +++ b/lib/controls/grid_head.cfm @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + +

\ No newline at end of file diff --git a/lib/controls/link_add.cfm b/lib/controls/link_add.cfm new file mode 100644 index 0000000..b6fbf5b --- /dev/null +++ b/lib/controls/link_add.cfm @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/lib/controls/link_del.cfm b/lib/controls/link_del.cfm new file mode 100644 index 0000000..bd911e9 --- /dev/null +++ b/lib/controls/link_del.cfm @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/lib/controls/link_edit.cfm b/lib/controls/link_edit.cfm new file mode 100644 index 0000000..eccea83 --- /dev/null +++ b/lib/controls/link_edit.cfm @@ -0,0 +1,9 @@ + + + + + + + + +title="#ATTRIBUTES.title_edit#" class="edit"title="#ATTRIBUTES.title_view#" class="view"> \ No newline at end of file diff --git a/lib/controls/link_view.cfm b/lib/controls/link_view.cfm new file mode 100644 index 0000000..4cf9e70 --- /dev/null +++ b/lib/controls/link_view.cfm @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/lib/controls/link_view_edit.cfm b/lib/controls/link_view_edit.cfm new file mode 100644 index 0000000..e676a5a --- /dev/null +++ b/lib/controls/link_view_edit.cfm @@ -0,0 +1,9 @@ + + + + + + + + +title="#ATTRIBUTES.title_edit#" class="edit"title="#ATTRIBUTES.title_view#" class="view"> \ No newline at end of file diff --git a/lib/controls/menu_item.cfm b/lib/controls/menu_item.cfm new file mode 100644 index 0000000..6c4a45d --- /dev/null +++ b/lib/controls/menu_item.cfm @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + +

#ATTRIBUTES.label#

\ No newline at end of file diff --git a/lib/controls/nowbutton.cfm b/lib/controls/nowbutton.cfm new file mode 100644 index 0000000..a142ece --- /dev/null +++ b/lib/controls/nowbutton.cfm @@ -0,0 +1,6 @@ + + + + + + + + + + + + #colAttr#="#structFind(column,colAttr)#" + > + + /> + + + + + + #ATTRIBUTES.titleMap[column.field].title# + + + + + + + + + + + + + только как плейсхолдер для атрибутов, а поле будет получено от колонки ---> + + #tdAttr#="#structFind(td,tdAttr)#" + + > + #ATTRIBUTES.query[td.field][currentRow]# + #column.formatter(ATTRIBUTES.query[column.field][currentRow])# + + + + + + +

+ + + + + +/** +* Sorts an array of structures based on a key in the structures. +* +* @param aofS Array of structures. +* @param key Key to sort by. +* @param sortOrder Order to sort by, asc or desc. +* @param sortType Text, textnocase, or numeric. +* @param delim Delimiter used for temporary data storage. Must not exist in data. Defaults to a period. +* @return Returns a sorted array. +* @author Nathan Dintenfass (nathan@changemedia.com) +* @version 1, December 10, 2001 +*/ +function arrayOfStructsSort(aOfS,key){ + //by default we'll use an ascending sort + var sortOrder = "asc"; + //by default, we'll use a textnocase sort + var sortType = "textnocase"; + //by default, use ascii character 30 as the delim + var delim = "."; + //make an array to hold the sort stuff + var sortArray = arraynew(1); + //make an array to return + var returnArray = arraynew(1); + //grab the number of elements in the array (used in the loops) + var count = arrayLen(aOfS); + //make a variable to use in the loop + var ii = 1; + //if there is a 3rd argument, set the sortOrder + if(arraylen(arguments) GT 2) + sortOrder = arguments[3]; + //if there is a 4th argument, set the sortType + if(arraylen(arguments) GT 3) + sortType = arguments[4]; + //if there is a 5th argument, set the delim + if(arraylen(arguments) GT 4) + delim = arguments[5]; + //loop over the array of structs, building the sortArray + for(ii = 1; ii lte count; ii = ii + 1) + sortArray[ii] = aOfS[ii][key] & delim & ii; + //now sort the array + arraySort(sortArray,sortType,sortOrder); + //now build the return array + for(ii = 1; ii lte count; ii = ii + 1) + returnArray[ii] = aOfS[listLast(sortArray[ii],delim)]; + //return the array + return returnArray; +} + \ No newline at end of file diff --git a/lib/controls/td.cfm b/lib/controls/td.cfm new file mode 100644 index 0000000..cc35634 --- /dev/null +++ b/lib/controls/td.cfm @@ -0,0 +1,15 @@ + + + + + + + + + \ No newline at end of file diff --git a/lib/controls/text.cfm b/lib/controls/text.cfm new file mode 100644 index 0000000..7ae2117 --- /dev/null +++ b/lib/controls/text.cfm @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + id=#ATTRIBUTES.id# value="#value#" size="#ATTRIBUTES.size#" disabled="disabled" #attr#="#structFind(ATTRIBUTES,attr)#"/> \ No newline at end of file diff --git a/lib/controls/th.cfm b/lib/controls/th.cfm new file mode 100644 index 0000000..c185f90 --- /dev/null +++ b/lib/controls/th.cfm @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/lib/controls/time.cfm b/lib/controls/time.cfm new file mode 100644 index 0000000..b8dca04 --- /dev/null +++ b/lib/controls/time.cfm @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + id=#ATTRIBUTES.id# value="#timeFormat(value, ATTRIBUTES.format)#" size="#ATTRIBUTES.size#" disabled="disabled" #attr#="#structFind(ATTRIBUTES,attr)#"/> \ No newline at end of file diff --git a/lib/data/bean.cfm b/lib/data/bean.cfm new file mode 100644 index 0000000..223a222 --- /dev/null +++ b/lib/data/bean.cfm @@ -0,0 +1,401 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select count(*) as cnt + from #ATTRIBUTES.table# + where 1=1 + + AND #key.field#= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + update #ATTRIBUTES.table# set + + + + , + #param.field#= + + + where 1=1 + + AND #key.field#= + + + + + + insert into #ATTRIBUTES.table# + ( + + + + , + #param.field# + + + ) + values + ( + + + , + + + + ) + + + + returning #thistag.params[autoIncrementKeyIndex].field# as id; + ; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select + + + + #param.field#, + + from #ATTRIBUTES.table# + where 1=1 + + /*#sqlType(key.type)#*/ + AND #key.field#= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + //readonly может транслироваться в pass! + function translateMode(readonly) { + if (readonly) { + return "read"; + } else { + return ""; + } + } + diff --git a/lib/data/bean.cfm.bak b/lib/data/bean.cfm.bak new file mode 100644 index 0000000..55ded28 --- /dev/null +++ b/lib/data/bean.cfm.bak @@ -0,0 +1,400 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select count(*) as cnt + from #ATTRIBUTES.table# + where 1=1 + + AND #key.field#= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + update #ATTRIBUTES.table# set + + + + , + #param.field#= + + + where 1=1 + + AND #key.field#= + + + + + + insert into #ATTRIBUTES.table# + ( + + + + , + #param.field# + + + ) + values + ( + + + , + + + + ); + + + + select LASTVAL() as id; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select + + + + #param.field#, + + from #ATTRIBUTES.table# + where 1=1 + + /*#sqlType(key.type)#*/ + AND #key.field#= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + //readonly может транслироваться в pass! + function translateMode(readonly) { + if (readonly) { + return "read"; + } else { + return ""; + } + } + diff --git a/lib/data/bk/bean.cfm b/lib/data/bk/bean.cfm new file mode 100644 index 0000000..eda4170 --- /dev/null +++ b/lib/data/bk/bean.cfm @@ -0,0 +1,398 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select count(*) as cnt + from #ATTRIBUTES.table# + where 1=1 + + AND #key.field#= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + update #ATTRIBUTES.table# set + + + + , + #param.field#= + + + where 1=1 + + AND #key.field#= + + + + + + insert into #ATTRIBUTES.table# + ( + + + + , + #param.field# + + + ) + values + ( + + + , + + + + ) + + + + returning #thistag.params[autoIncrementKeyIndex].field# as id; + ; + + + + + + + + + + + + + + + + + + + + + + + + + + + + select + + + + #param.field#, + + from #ATTRIBUTES.table# + where 1=1 + + /*#sqlType(key.type)#*/ + AND #key.field#= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + //readonly может транслироваться в pass! + function translateMode(readonly) { + if (readonly) { + return "read"; + } else { + return ""; + } + } + diff --git a/lib/data/bk/bean.cfm.bak b/lib/data/bk/bean.cfm.bak new file mode 100644 index 0000000..2a2d6f0 --- /dev/null +++ b/lib/data/bk/bean.cfm.bak @@ -0,0 +1,398 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select count(*) as cnt + from #ATTRIBUTES.table# + where 1=1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + update #ATTRIBUTES.table# set + + + + , + #param.field#= + + + where 1=1 + + AND #key.field#= + + + + + + insert into #ATTRIBUTES.table# + ( + + + + , + #param.field# + + + ) + values + ( + + + , + + + + ) + + + + returning #thistag.params[autoIncrementKeyIndex].field# as id; + ; + + + + + + + + + + + + + + + + + + + + + + + + + + + + select + + + + #param.field#, + + from #ATTRIBUTES.table# + where 1=1 + + /*#sqlType(key.type)#*/ + AND #key.field#= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + //readonly может транслироваться в pass! + function translateMode(readonly) { + if (readonly) { + return "read"; + } else { + return ""; + } + } + diff --git a/lib/data/bk/field.cfm b/lib/data/bk/field.cfm new file mode 100644 index 0000000..23430c2 --- /dev/null +++ b/lib/data/bk/field.cfm @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/data/bk/field_set.cfm b/lib/data/bk/field_set.cfm new file mode 100644 index 0000000..9f1691b --- /dev/null +++ b/lib/data/bk/field_set.cfm @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/data/bk/param.cfm b/lib/data/bk/param.cfm new file mode 100644 index 0000000..402ddeb --- /dev/null +++ b/lib/data/bk/param.cfm @@ -0,0 +1,305 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/data/del.cfm b/lib/data/del.cfm new file mode 100644 index 0000000..dbfb149 --- /dev/null +++ b/lib/data/del.cfm @@ -0,0 +1,297 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #preserveSingleQuotes(ATTRIBUTES.checkQuery)# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #queryPart# + + + delete from #ATTRIBUTES.entity# where /**/ + + + AND + + #condition.expression#= + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ +
+

+ + + + + +

#ATTRIBUTES.denyMessage#

+
+ + + + +

#ATTRIBUTES.denyMessage#

+
+ + + + +

#dep.title#

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

	#fld.title#
+ > +	+ + #fld.formatter(dep.query[fld.name][currentRow])# + + #dep.query[fld.name][currentRow]# + +	+ > +

+ +

#dep.denyMessage# (#dep.query.recordCount#)

+ + + + + #cfcatch.message# #cfcatch.detail# #cfcatch.tagcontext[1].template# line #cfcatch.tagcontext[1].line#/> + + + + #ATTRIBUTES.denyMessage# + + + + + + + + + + + + + + + + + + +

+ + +

+ + + + + #markup# + + + + \ No newline at end of file diff --git a/lib/data/del_condition.cfm b/lib/data/del_condition.cfm new file mode 100644 index 0000000..5cae40c --- /dev/null +++ b/lib/data/del_condition.cfm @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/data/dep_field.cfm b/lib/data/dep_field.cfm new file mode 100644 index 0000000..0d065da --- /dev/null +++ b/lib/data/dep_field.cfm @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/data/dep_param.cfm b/lib/data/dep_param.cfm new file mode 100644 index 0000000..7084ec2 --- /dev/null +++ b/lib/data/dep_param.cfm @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/lib/data/dependency.cfm b/lib/data/dependency.cfm new file mode 100644 index 0000000..19322dc --- /dev/null +++ b/lib/data/dependency.cfm @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select + + + , #field.expression# + + from + + #from.expression# + + where + + + AND + #condition.expression#= + + order by + + + , #order.expression# + + + + + + diff --git a/lib/data/dependency_condition.cfm b/lib/data/dependency_condition.cfm new file mode 100644 index 0000000..1b668ba --- /dev/null +++ b/lib/data/dependency_condition.cfm @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/lib/data/dependency_field.cfm b/lib/data/dependency_field.cfm new file mode 100644 index 0000000..4a3c282 --- /dev/null +++ b/lib/data/dependency_field.cfm @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/data/dependency_from.cfm b/lib/data/dependency_from.cfm new file mode 100644 index 0000000..83fbd4f --- /dev/null +++ b/lib/data/dependency_from.cfm @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/lib/data/dependency_order_by.cfm b/lib/data/dependency_order_by.cfm new file mode 100644 index 0000000..48b990d --- /dev/null +++ b/lib/data/dependency_order_by.cfm @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/lib/data/field.cfm b/lib/data/field.cfm new file mode 100644 index 0000000..8fa07da --- /dev/null +++ b/lib/data/field.cfm @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/data/field_set.cfm b/lib/data/field_set.cfm new file mode 100644 index 0000000..b990b40 --- /dev/null +++ b/lib/data/field_set.cfm @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/data/param.cfm b/lib/data/param.cfm new file mode 100644 index 0000000..2433014 --- /dev/null +++ b/lib/data/param.cfm @@ -0,0 +1,354 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/data/status.cfc b/lib/data/status.cfc new file mode 100644 index 0000000..6e956c5 --- /dev/null +++ b/lib/data/status.cfc @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/data/submit_collection.cfm b/lib/data/submit_collection.cfm new file mode 100644 index 0000000..bc1c10b --- /dev/null +++ b/lib/data/submit_collection.cfm @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/data/submit_param.cfm b/lib/data/submit_param.cfm new file mode 100644 index 0000000..799a3ec --- /dev/null +++ b/lib/data/submit_param.cfm @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/detail_page_info.cfc b/lib/detail_page_info.cfc new file mode 100644 index 0000000..1a0d1e8 --- /dev/null +++ b/lib/detail_page_info.cfc @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/dispatch_detail.cfm b/lib/dispatch_detail.cfm new file mode 100644 index 0000000..30bffcd --- /dev/null +++ b/lib/dispatch_detail.cfm @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/encodingUtils.cfc b/lib/encodingUtils.cfc new file mode 100644 index 0000000..0a5cf2f --- /dev/null +++ b/lib/encodingUtils.cfc @@ -0,0 +1,283 @@ +component { + + public any function init() { + variables.utcBaseDate = createObject( 'java', 'java.util.Date' ).init( javacast( 'int', 0 ) ); + variables.ECParameterSpecCache = { }; + } + + function convertDateToUnixTimestamp( required date dateToConvert ) { + return dateDiff( 's', utcBaseDate, parseDateTime( dateToConvert ) ); + } + + function convertUnixTimestampToDate( required numeric timestamp ) { + return dateAdd( 's', timestamp, utcBaseDate ); + } + + function base64UrlToBinary( base64url ) { + var base64 = base64url.replace( '-', '+', 'all' ).replace( '_', '/', 'all' ); + var padded = base64 & repeatString( '=', 4 - ( len( base64 ) % 4 ) ); + return binaryDecode( padded, 'base64' ); + } + + function binaryToBase64Url( source ) { + return binaryEncode( source, 'base64' ) + .replace( '+', '-', 'all' ) + .replace( '/', '_', 'all' ) + .replace( '=', '', 'all' ); + } + + /** + * The INTEGER encoding for DER consists of a 02 tag a length encoding of the value + * and then a signed, minimum sized, big endian encoding of the encoded number. + * + * - https://stackoverflow.com/questions/54718741/how-to-der-encode-an-ecdsa-signature + */ + function derEncodeIntegerBytes( byteArray ) { + // first remove any padding + for ( var i = 1; i <= arrayLen( byteArray ); i++ ) { + if ( byteArray[ i ] != 0 ) break; + } + var unpadded = arraySlice( byteArray, i ); + + // add sign if negative + if ( unpadded[ 1 ] < 0 ) { + unpadded.prepend( 0 ); + } + + // if len > 127 the length encoding will be wrong, but that won't happen for the supported signature sizes + var derEncoded = [ 2, unpadded.len() ]; + + derEncoded.append( unpadded, true ); + + return derEncoded; + } + + + /** + * The SEQUENCE encoding is simply a tag set to the byte value 30, the + * length encoding and then the concatenation of the two INTEGER + * structures. + * + * https://stackoverflow.com/questions/54718741/how-to-der-encode-an-ecdsa-signature + * + * Also see: + * https://crypto.stackexchange.com/questions/57731/ecdsa-signature-rs-to-asn1-der-encoding-question + */ + function convertP1363ToDER( signature ) { + var split = len( signature ) / 2; + var r = derEncodeIntegerBytes( arraySlice( signature, 1, split ) ); + var s = derEncodeIntegerBytes( arraySlice( signature, split + 1, split ) ); + + var DERSignature = [ 48 ]; + + var length = r.len() + s.len(); + + if ( length > 255 ) { + throw( + type = 'jwtcfml.InvalidSignature', + message = 'Invalid P1363 key.', + detail = 'The P1363 signature is too long.' + ); + } + + /* + The length is simply a single byte if it is smaller than 128 (or hex 80) + of the size. If it is larger then it is two byte: one byte set to 81, + which indicates that one length byte will follow, and one byte + containing the actual value. + + https://stackoverflow.com/questions/54718741/how-to-der-encode-an-ecdsa-signature + */ + if ( length > 127 ) { + DERSignature.append( -127 ); + length -= 256; + } + DERSignature.append( length ); + + DERSignature.append( r, true ); + DERSignature.append( s, true ); + + return javacast( 'byte[]', DERSignature ); + } + + function convertDERtoP1363( required any signature, required string algorithm ) { + // extract the two integers from the DER signature + // assuming a 02 tag byte followed by a single length byte since we should not see + // anything larger in the supported algorithms + var start = 3; + while ( signature[ start ] != 2 ) start++; + var r = arraySlice( signature, start + 2, signature[ start + 1 ] ); + var s = arraySlice( signature, start + 2 + r.len() + 2 ); + + if ( r[ 1 ] == 0 ) r = arraySlice( r, 2 ); + if ( s[ 1 ] == 0 ) s = arraySlice( s, 2 ); + + var lengthMap = { + ES256: 32, + ES384: 48, + ES512: 64 + }; + + var P1363Signature = [ ]; + + for ( var i = 1; i <= lengthMap[ algorithm ] - r.len(); i++ ) P1363Signature.append( 0 ); + P1363Signature.append( r, true ); + + for ( var i = 1; i <= lengthMap[ algorithm ] - s.len(); i++ ) P1363Signature.append( 0 ); + P1363Signature.append( s, true ); + + return javacast( 'byte[]', P1363Signature ); + } + + function parsePEMEncodedKey( required string pemKey ) { + if ( reFind( '^-----BEGIN (RSA|EC) (PARAMETERS|PRIVATE)', pemKey ) ) { + throw( + type = 'jwtcfml.InvalidPrivateKey', + message = 'Invalid private key format.', + detail = 'Please encode your private key in PKCS8 format, e.g.: `openssl pkcs8 -topk8 -nocrypt -in privatekey.pem -out privatekey.pk8' + ) + } + + var binaryKey = binaryDecode( + trim( pemKey ).reReplace( '-----[A-Z\s]+-----', '', 'all' ).reReplace( '[\r\n]', '', 'all' ), + 'base64' + ); + + if ( find( '-----BEGIN CERTIFICATE-----', pemKey ) ) { + var bis = createObject( 'java', 'java.io.ByteArrayInputStream' ).init( binaryKey ); + return createObject( 'java', 'java.security.cert.CertificateFactory' ) + .getInstance( 'X.509' ) + .generateCertificate( bis ) + .getPublicKey(); + } + + if ( find( '-----BEGIN PUBLIC KEY-----', pemKey ) ) { + var publicKeySpec = createObject( 'java', 'java.security.spec.X509EncodedKeySpec' ).init( binaryKey ); + try { + return createObject( 'java', 'java.security.KeyFactory' ) + .getInstance( 'RSA' ) + .generatePublic( publicKeySpec ); + } catch ( any e ) { + } + try { + return createObject( 'java', 'java.security.KeyFactory' ) + .getInstance( 'EC' ) + .generatePublic( publicKeySpec ); + } catch ( any e ) { + } + } + + if ( find( '-----BEGIN PRIVATE KEY-----', pemKey ) ) { + var privateKeySpec = createObject( 'java', 'java.security.spec.PKCS8EncodedKeySpec' ).init( binaryKey ); + try { + return createObject( 'java', 'java.security.KeyFactory' ) + .getInstance( 'RSA' ) + .generatePrivate( privateKeySpec ); + } catch ( any e ) { + } + try { + return createObject( 'java', 'java.security.KeyFactory' ) + .getInstance( 'EC' ) + .generatePrivate( privateKeySpec ); + } catch ( any e ) { + } + } + + throw( + type = 'jwtcfml.InvalidPEMKey', + message = 'Invalid PEM key.', + detail = 'Please ensure you are using an RSA or EC public or private key or certificate.' + ) + } + + function parseJWK( required struct jwk ) { + if ( jwk.kty == 'RSA' ) { + if ( jwk.keyExists( 'd' ) ) { + try { + var bigInts = bigIntegers( jwk, [ 'n', 'e', 'd', 'p', 'q', 'dp', 'dq', 'qi' ] ); + var keySpec = createObject( 'java', 'java.security.spec.RSAPrivateCrtKeySpec' ).init( + bigInts.n, + bigInts.e, + bigInts.d, + bigInts.p, + bigInts.q, + bigInts.dp, + bigInts.dq, + bigInts.qi + ); + var kf = createObject( 'java', 'java.security.KeyFactory' ).getInstance( 'RSA' ); + return kf.generatePrivate( keySpec ); + } catch ( any e ) { + } + + try { + var bigInts = bigIntegers( jwk, [ 'n', 'd' ] ); + var keySpec = createObject( 'java', 'java.security.spec.RSAPrivateKeySpec' ).init( + bigInts.n, + bigInts.d + ); + var kf = createObject( 'java', 'java.security.KeyFactory' ).getInstance( 'RSA' ); + return kf.generatePrivate( keySpec ); + } catch ( any e ) { + } + } else { + try { + var bigInts = bigIntegers( jwk, [ 'n', 'e' ] ); + var ks = createObject( 'java', 'java.security.spec.RSAPublicKeySpec' ).init( bigInts.n, bigInts.e ); + var kf = createObject( 'java', 'java.security.KeyFactory' ).getInstance( 'RSA' ); + return kf.generatePublic( ks ); + } catch ( any e ) { + } + } + } + + if ( jwk.kty == 'EC' ) { + var kf = createObject( 'java', 'java.security.KeyFactory' ).getInstance( 'EC' ); + var ECParameterSpec = getECParameterSpec( jwk.crv ); + + if ( jwk.keyExists( 'd' ) ) { + var bigInts = bigIntegers( jwk, [ 'd' ] ); + var ks = createObject( 'java', 'java.security.spec.ECPrivateKeySpec' ).init( + bigInts.d, + ECParameterSpec + ); + return kf.generatePrivate( ks ); + } else { + var bigInts = bigIntegers( jwk, [ 'x', 'y' ] ); + var ECPoint = createObject( 'java', 'java.security.spec.ECPoint' ).init( bigInts.x, bigInts.y ); + var ks = createObject( 'java', 'java.security.spec.ECPublicKeySpec' ).init( ECPoint, ECParameterSpec ); + return kf.generatePublic( ks ); + } + } + + throw( + type = 'jwtcfml.InvalidJWK', + message = 'Invalid JWK key.', + detail = 'Please ensure you are using an valid JWK RSA or EC public or private key.' + ) + } + + private function bigIntegers( jwk, keys ) { + var bigInts = { }; + for ( var key in keys ) { + bigInts[ key ] = createObject( 'java', 'java.math.BigInteger' ).init( 1, base64UrlToBinary( jwk[ key ] ) ); + } + return bigInts; + } + + private function getECParameterSpec( crv ) { + if ( !variables.ECParameterSpecCache.keyExists( crv ) ) { + var kpg = createObject( 'java', 'java.security.KeyPairGenerator' ).getInstance( 'EC' ); + var ecgp = createObject( 'java', 'java.security.spec.ECGenParameterSpec' ).init( + 'secp#crv.listLast( '-' )#r1' + ); + kpg.initialize( ecgp ); + variables.ECParameterSpecCache[ crv ] = kpg + .generateKeyPair() + .getPublic() + .getParams(); + } + return variables.ECParameterSpecCache[ crv ]; + } + +} diff --git a/lib/filter_build.cf_ b/lib/filter_build.cf_ new file mode 100644 index 0000000..146c197 --- /dev/null +++ b/lib/filter_build.cf_ @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #item# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/filter_build.cfm b/lib/filter_build.cfm new file mode 100644 index 0000000..fb35c56 --- /dev/null +++ b/lib/filter_build.cfm @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + AND #listGetAt(fltr.expression,i,"?")##fltr.field# = <> <= < >= > ILIKE NOT ILIKE ILIKE NOT ILIKE IN () = #fltr.field# + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/filter_page_info.cfc b/lib/filter_page_info.cfc new file mode 100644 index 0000000..ea82758 --- /dev/null +++ b/lib/filter_page_info.cfc @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/lib/filter_rebuild.cfm b/lib/filter_rebuild.cfm new file mode 100644 index 0000000..e69de29 diff --git a/lib/filter_settings.cfm b/lib/filter_settings.cfm new file mode 100644 index 0000000..4d6089d --- /dev/null +++ b/lib/filter_settings.cfm @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/filterparam.cfm b/lib/filterparam.cfm new file mode 100644 index 0000000..af5607c --- /dev/null +++ b/lib/filterparam.cfm @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if (!IsSimpleValue(val)){ + if (isArray(val)) { + return (arrayLen(val) == 0); + } + return false; + } + return ((val==def) OR (val=="")); + + + + + + ", ",,,")/> + + diff --git a/lib/form_page_info.cfc b/lib/form_page_info.cfc new file mode 100644 index 0000000..5d0d6ac --- /dev/null +++ b/lib/form_page_info.cfc @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/generic_page_info.cfc b/lib/generic_page_info.cfc new file mode 100644 index 0000000..08c50d3 --- /dev/null +++ b/lib/generic_page_info.cfc @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/init_settings.cfm b/lib/init_settings.cfm new file mode 100644 index 0000000..f51c235 --- /dev/null +++ b/lib/init_settings.cfm @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/jwt.cfc b/lib/jwt.cfc new file mode 100644 index 0000000..e86a066 --- /dev/null +++ b/lib/jwt.cfc @@ -0,0 +1,262 @@ +component { + + variables.algorithmMap = { + HS256: 'HmacSHA256', + HS384: 'HmacSHA384', + HS512: 'HmacSHA512', + RS256: 'SHA256withRSA', + RS384: 'SHA384withRSA', + RS512: 'SHA512withRSA', + ES256: 'SHA256withECDSA', + ES384: 'SHA384withECDSA', + ES512: 'SHA512withECDSA' + }; + + public any function init() { + variables.encodingUtils = new encodingUtils(); + variables.jss = createObject( 'java', 'java.security.Signature' ); + variables.messageDigest = createObject( 'java', 'java.security.MessageDigest' ); + return this; + } + + public string function encode( + required struct payload, + required any key, + required string algorithm, + struct headers = { } + ) { + if ( !algorithmMap.keyExists( algorithm ) ) { + throw( + type = 'jwtcfml.InvalidAlgorithm', + message = 'Invalid JWT Algorithm.', + detail = 'The passed in algorithm is not supported.' + ); + } + + var header = { }; + header.append( headers ); + header.append( { + 'typ': 'JWT', + 'alg': algorithm + } ); + + var duplicatedPayload = duplicate( payload ); + for ( var claim in [ 'iat', 'exp', 'nbf' ] ) { + if ( duplicatedPayload.keyExists( claim ) && isDate( duplicatedPayload[ claim ] ) ) { + duplicatedPayload[ claim ] = encodingUtils.convertDateToUnixTimestamp( duplicatedPayload[ claim ] ); + } + } + + var stringToSignParts = [ + encodingUtils.binaryToBase64Url( charsetDecode( serializeJSON( header ), 'utf-8' ) ), + encodingUtils.binaryToBase64Url( charsetDecode( serializeJSON( duplicatedPayload ), 'utf-8' ) ) + ]; + var stringToSign = stringToSignParts.toList( '.' ); + + return stringToSign & '.' & encodingUtils.binaryToBase64Url( sign( stringToSign, key, algorithm ) ); + } + + public struct function decode( + required string token, + any key, + any algorithms = [ ], + struct claims = { }, + boolean verify = true + ) { + var parts = listToArray( token, '.' ); + + if ( arrayLen( parts ) != 3 ) { + throw( + type = 'jwtcfml.InvalidToken', + message = 'Invalid JWT.', + detail = 'The passed in token does not have three `.` delimited parts.' + ); + } + + algorithms = isArray( algorithms ) ? algorithms : [ algorithms ]; + + var decoded = { + header: deserializeJSON( charsetEncode( encodingUtils.base64UrlToBinary( parts[ 1 ] ), 'utf-8' ) ), + payload: deserializeJSON( charsetEncode( encodingUtils.base64UrlToBinary( parts[ 2 ] ), 'utf-8' ) ) + }; + + if ( verify ) { + if ( + !algorithms.find( decoded.header.alg ) || + !algorithmMap.keyExists( decoded.header.alg ) + ) { + throw( + type = 'jwtcfml.InvalidAlgorithm', + message = 'Unsupported or invalid algorithm', + detail = 'The passed in token does not have an algorithm declaration or its declared algorithm (#decoded.header.alg#) does not match the specified algorithms of #serializeJSON( algorithms )#.' + ); + } + + var stringToSign = parts[ 1 ] & '.' & parts[ 2 ]; + var signature = encodingUtils.base64UrlToBinary( parts[ 3 ] ); + + if ( + !verifySignature( + stringToSign, + key, + signature, + decoded.header.alg + ) + ) { + throw( + type = 'jwtcfml.InvalidSignature', + message = 'Signature is Invalid', + detail = 'The signature of the passed in token is invalid.' + ); + } + + var baseClaims = { + 'exp': true, + 'nbf': true + }; + baseClaims.append( claims ); + verifyClaims( decoded.payload, baseClaims ); + } + + for ( var claim in [ 'iat', 'exp', 'nbf' ] ) { + if ( decoded.payload.keyExists( claim ) ) { + decoded.payload[ claim ] = encodingUtils.convertUnixTimestampToDate( decoded.payload[ claim ] ); + } + } + + return decoded.payload; + } + + public struct function getHeader( required string token ) { + return deserializeJSON( charsetEncode( encodingUtils.base64UrlToBinary( listFirst( token, '.' ) ), 'utf-8' ) ); + } + + public function parsePEMEncodedKey( required string pemKey ) { + return encodingUtils.parsePEMEncodedKey( pemKey ); + } + + public function parseJWK( required struct jwk ) { + return encodingUtils.parseJWK( jwk ); + } + + private function sign( message, key, algorithm ) { + if ( left( algorithm, 1 ) == 'H' ) { + var sig = binaryDecode( + hmac( + message, + key, + algorithmMap[ algorithm ], + 'utf-8' + ), + 'hex' + ); + } else { + if ( isSimpleValue( key ) ) { + key = encodingUtils.parsePEMEncodedKey( key ); + } else if ( isStruct( key ) ) { + key = encodingUtils.parseJWK( key ); + } + + var jssInstance = variables.jss.getInstance( algorithmMap[ algorithm ] ); + jssInstance.initSign( key ); + jssInstance.update( charsetDecode( message, 'utf-8' ) ); + var sig = jssInstance.sign(); + if ( left( algorithm, 1 ) == 'E' ) { + sig = encodingUtils.convertDERtoP1363( sig, algorithm ); + } + } + return sig; + } + + private function verifySignature( message, key, signature, algorithm ) { + if ( left( algorithm, 1 ) == 'H' ) { + var sig = binaryDecode( + hmac( + message, + key, + algorithmMap[ algorithm ], + 'utf-8' + ), + 'hex' + ); + return MessageDigest.isEqual( signature, sig ); + } + + if ( left( algorithm, 1 ) == 'E' ) { + signature = encodingUtils.convertP1363ToDER( signature ); + } + + if ( isSimpleValue( key ) ) { + key = encodingUtils.parsePEMEncodedKey( key ); + } else if ( isStruct( key ) ) { + key = encodingUtils.parseJWK( key ); + } + + var jssInstance = variables.jss.getInstance( algorithmMap[ algorithm ] ); + jssInstance.initVerify( key ); + jssInstance.update( charsetDecode( message, 'utf-8' ) ); + return jssInstance.verify( signature ); + } + + private function verifyClaims( payload, claims ) { + if ( + structKeyExists( payload, 'exp' ) + && !verifyDateClaim( payload.exp, claims.exp, -1 ) + ) { + throw( + type = 'jwtcfml.ExpiredSignature', + message = 'Token has expired', + detail = 'The passed in token has expired.' + ); + } + + if ( + structKeyExists( payload, 'nbf' ) + && !verifyDateClaim( payload.nbf, claims.nbf, 1 ) + ) { + throw( + type = 'jwtcfml.NotBeforeException', + message = 'Token is not valid', + detail = 'The passed in token has not yet become valid.' + ); + } + + + + if ( structKeyExists( claims, 'iss' ) ) { + if ( !structKeyExists( payload, 'iss' ) || compare( payload.iss, claims.iss ) != 0 ) { + throw( + type = 'jwtcfml.InvalidIssuer', + message = 'Token has an invalid issuer', + detail = 'The passed in token either does not specify an issuer or the claimed issuer is not valid.' + ); + } + } + + if ( structKeyExists( claims, 'aud' ) ) { + var audArray = isArray( claims.aud ) ? claims.aud : [ claims.aud ]; + if ( !structKeyExists( payload, 'aud' ) || !audArray.find( payload.aud ) ) { + throw( + type = 'jwtcfml.InvalidAudience', + message = 'Token has an invalid audience', + detail = 'The passed in token either does not specify an audience or the claimed audience is not valid.' + ); + } + } + } + + private function verifyDateClaim( payloadDate, claim, failState ) { + var pd = encodingUtils.convertUnixTimestampToDate( payloadDate ); + var cd = claim; + if ( !isBoolean( cd ) || cd ) { + if ( isNumeric( cd ) ) { + cd = encodingUtils.convertUnixTimestampToDate( cd ); + } else if ( !isDate( cd ) ) { + cd = now(); + } + return dateCompare( pd, cd ) != failState; + } + return true; + } + +} diff --git a/lib/location.cfm b/lib/location.cfm new file mode 100644 index 0000000..06ceafe --- /dev/null +++ b/lib/location.cfm @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/lib/ls_catch.cfm b/lib/ls_catch.cfm new file mode 100644 index 0000000..918f958 --- /dev/null +++ b/lib/ls_catch.cfm @@ -0,0 +1,24 @@ + + + + + + + Ошибка при обращении к базе данных. Возможно, программа некорректно сформировала условия фильтра или сортировки. В качестве временной меры попробуйте сбросить условия фильтра и сортировки. Просьба сообщить об ошибке администратору.
+ #ATTRIBUTES.catch.message#
+ #ATTRIBUTES.catch.detail#
+ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/ls_page_info.cfc b/lib/ls_page_info.cfc new file mode 100644 index 0000000..32e352c --- /dev/null +++ b/lib/ls_page_info.cfc @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/lib/menu_item.cfm b/lib/menu_item.cfm new file mode 100644 index 0000000..632e78a --- /dev/null +++ b/lib/menu_item.cfm @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + +

#ATTRIBUTES.label#

\ No newline at end of file diff --git a/lib/mimetype_icon.cfm b/lib/mimetype_icon.cfm new file mode 100644 index 0000000..6128b1a --- /dev/null +++ b/lib/mimetype_icon.cfm @@ -0,0 +1,11 @@ + + +

+ \ No newline at end of file diff --git a/lib/oauth2.cfc b/lib/oauth2.cfc new file mode 100644 index 0000000..41fa80d --- /dev/null +++ b/lib/oauth2.cfc @@ -0,0 +1,193 @@ +/** +* @displayname oauth2 +* @output false +* @hint The oauth2 object. +* @author Matt Gifford +* @website https://www.monkehworks.com +* @purpose A ColdFusion Component to manage authentication using the OAuth2 protocol. +**/ +component accessors="true"{ + + property name="client_id" type="string"; + property name="client_secret" type="string"; + property name="authEndpoint" type="string"; + property name="accessTokenEndpoint" type="string"; + property name="redirect_uri" type="string"; + property name="PKCE" type="struct"; + + /** + * I return an initialized oauth2 object instance. + * @client_id The client ID for your application. + * @client_secret The client secret for your application. + * @authEndpoint The URL endpoint that handles the authorisation. + * @accessTokenEndpoint The URL endpoint that handles retrieving the access token. + * @redirect_uri The URL to redirect the user back to following authentication. + **/ + public oauth2 function init( + required string client_id, + required string client_secret, + required string authEndpoint, + required string accessTokenEndpoint, + required string redirect_uri + ){ + setClient_id( arguments.client_id ); + setClient_secret( arguments.client_secret ); + setAuthEndpoint( arguments.authEndpoint ); + setAccessTokenEndpoint( arguments.accessTokenEndpoint ); + setRedirect_uri( arguments.redirect_uri ); + return this; + } + + /** + * I return the URL as a string which we use to redirect the user for authentication. | + * The method will handle the client_id and redirect_uri values for you. Anything else you need to send to the provider in the URL can be sent via the parameters argument. + * @parameters A structure containing key / value pairs of data to be included in the URL string. + **/ + public string function buildRedirectToAuthURL( struct parameters={} ) { + var objAuthBuilder = new utils.authStringBuilder( + authEndpoint = getAuthEndpoint(), + client_id = getClient_id(), + redirect_uri = getRedirect_uri() + ); + return objAuthBuilder.withParams( arguments.parameters ).get(); + } + + /** + * I return an instance of the authStringBuilder class. The actual link string is generated by then calling the .get() method on the class object. + * The method will handle the client_id and redirect_uri values for you. Anything else you need to send to the provider in the URL can be sent via the parameters argument. + * @parameters A structure containing key / value pairs of data to be included in the URL string. + **/ + public authStringBuilder function buildRedirectToAuthURLWithBuilder( struct parameters={} ) { + var objAuthBuilder = new utils.authStringBuilder( + authEndpoint = getAuthEndpoint(), + client_id = getClient_id(), + redirect_uri = getRedirect_uri() + ); + return objAuthBuilder.withParams( arguments.parameters ); + } + + /** + * I make the HTTP request to obtain the access token. + * @code The code returned from the authentication request. + * @formfields An optional array of structs for the provider requirements to add new form fields. + * @headers An optional array of structs to add custom headers to the request if required. + **/ + public struct function makeAccessTokenRequest( + required string code, + array formfields = [], + array headers = [] + ){ + var stuResponse = {}; + var httpService = new http(); + httpService.setMethod( "post" ); + httpService.setCharset( "utf-8" ); + httpService.setUrl( getAccessTokenEndpoint() ); + if( arrayLen( arguments.headers ) ){ + for( var item in arguments.headers ){ + httpService.addParam( type="header", name=item[ 'name' ], value=item[ 'value' ] ); + } + } + httpService.addParam( type="formfield", name="client_id", value=getClient_id() ); + httpService.addParam( type="formfield", name="client_secret", value=getClient_secret() ); + httpService.addParam( type="formfield", name="code", value=arguments.code ); + httpService.addParam( type="formfield", name="redirect_uri", value=getRedirect_uri() ); + httpService.addParam( type="formfield", name="grant_type", value='authorization_code' ); + if( arrayLen( arguments.formfields ) ){ + for( var item in arguments.formfields ){ + httpService.addParam( type="formfield", name=item[ 'name' ], value=item[ 'value' ] ); + } + } + var result = httpService.send().getPrefix(); + if( '200' == result.ResponseHeader[ 'Status_Code' ] ) { + stuResponse.success = true; + stuResponse.content = result.FileContent; + } else { + stuResponse.success = false; + stuResponse.content = result.Statuscode; + } + //dump(var=formfields,label="form fields"); + return stuResponse; + } + + /** + * I make the HTTP request to refresh the access token. + * @refresh_token The refresh_token returned from the accessTokenRequest request. + **/ + public struct function refreshAccessTokenRequest( + required string refresh_token, + array formfields = [], + array headers = [] + ){ + var stuResponse = {}; + var httpService = new http(); + httpService.setMethod( "post" ); + httpService.setCharset( "utf-8" ); + httpService.setUrl( getAccessTokenEndpoint() ); + httpService.addParam( type="header", name="Content-Type", value="application/x-www-form-urlencoded" ); + if( arrayLen( arguments.headers ) ){ + for( var item in arguments.headers ){ + httpService.addParam( type="header", name=item[ 'name' ], value=item[ 'value' ] ); + } + } + httpService.addParam( type="formfield", name="client_id", value=getClient_id() ); + httpService.addParam( type="formfield", name="client_secret", value=getClient_secret() ); + httpService.addParam( type="formfield", name="refresh_token", value=arguments.refresh_token ); + httpService.addParam( type="formfield", name="grant_type", value="refresh_token" ); + if( arrayLen( arguments.formfields ) ){ + for( var item in arguments.formfields ){ + httpService.addParam( type="formfield", name=item[ 'name' ], value=item[ 'value' ] ); + } + } + var result = httpService.send().getPrefix(); + if( '200' == result.ResponseHeader[ 'Status_Code' ] ) { + stuResponse.success = true; + stuResponse.content = result.FileContent; + } else { + stuResponse.success = false; + stuResponse.content = result.Statuscode; + } + return stuResponse; + } + + /** + * I return a string containing any extra URL parameters to concatenate and pass through when authenticating. + * @argScope A structure containing key / value pairs of data to be included in the URL string. + **/ + public string function buildParamString( struct argScope={} ) { + var strURLParam = '?'; + if( structCount( arguments.argScope ) ) { + var intCount = 1; + for( var key in arguments.argScope ) { + if( listLen( strURLParam ) && intCount > 1 ) { + strURLParam = strURLParam & '&'; + } + strURLParam = strURLParam & lcase( key ) & '=' & trim( arguments.argScope[ key ] ); + intCount++; + } + } + return strURLParam; + } + + /** + * Returns the properties as a struct + */ + public struct function getMemento(){ + var result = {}; + for( var thisProp in getMetaData( this ).properties ){ + if( structKeyExists( variables, thisProp[ 'name' ] ) ){ + result[ thisProp[ 'name' ] ] = variables[ thisProp[ 'name' ] ]; + } + } + return result; + } + + /** + * Generates a struct containing the code verifier and code challenge + * values for use with the PKCE extension. + */ + public struct function generatePKCE(){ + var objPKCE = new utils.deps.pkce.pkce(); + return objPKCE.generatePKCE(); + } + +} \ No newline at end of file diff --git a/lib/order_build.cfm b/lib/order_build.cfm new file mode 100644 index 0000000..bda0f97 --- /dev/null +++ b/lib/order_build.cfm @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/prepare_detail.cfm b/lib/prepare_detail.cfm new file mode 100644 index 0000000..d84a00a --- /dev/null +++ b/lib/prepare_detail.cfm @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/prepare_filter.cfm b/lib/prepare_filter.cfm new file mode 100644 index 0000000..5282f5c --- /dev/null +++ b/lib/prepare_filter.cfm @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/prepare_form.cfm b/lib/prepare_form.cfm new file mode 100644 index 0000000..baccc32 --- /dev/null +++ b/lib/prepare_form.cfm @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/prepare_ls.cfm b/lib/prepare_ls.cfm new file mode 100644 index 0000000..01a6e05 --- /dev/null +++ b/lib/prepare_ls.cfm @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/rest_api_helper.cfc b/lib/rest_api_helper.cfc new file mode 100644 index 0000000..23221d9 --- /dev/null +++ b/lib/rest_api_helper.cfc @@ -0,0 +1,396 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/settings.cfm b/lib/settings.cfm new file mode 100644 index 0000000..c7e5784 --- /dev/null +++ b/lib/settings.cfm @@ -0,0 +1,216 @@ + + + + + + +Разрешение конфликта версий при обновлении софта +Конфликт версий: код требует параметр, отсутствующий в сохраненной версии. Например, одна версия фильтра сохранила свои настройки, +а другая, более новая, пытается прочесть несуществующий ключ. +Другой вариант - несуществующее поле (убранное в очередной версии) - этот конфликт проявится только при запросе к БД. +Варианты решения +- создание параметра с дефолтными значениями при запросе (во все запросы добавить значения по умолчанию). Недостаток - возможно создание помойки +- контроль номера версии. Выглядит сложным в сопровождении +*** Возможно, это была плохая идея - разрешить доступ по длинному ключу. Когда доставали и записывали целиком объект, было меньше возможностей для ошибок +---> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select settings from usr where usr_id='#request.usr_id#' + + + + + + Err: + #cfcatch.message# + + + + + + + + + + + + + + + + + + select count(*) as cnt from usr_serrings where usr_id= + + + + + + + insert int usr_settings (usr_id, settings) + values(, ) + + + + update usr_settings + set settings= + where usr_id= + + + + + + + diff --git a/lib/silent.cfm b/lib/silent.cfm new file mode 100644 index 0000000..7f2f6f2 --- /dev/null +++ b/lib/silent.cfm @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/lib/sortparam.cfm b/lib/sortparam.cfm new file mode 100644 index 0000000..1648d2b --- /dev/null +++ b/lib/sortparam.cfm @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/track.cfm b/lib/track.cfm new file mode 100644 index 0000000..169d97d --- /dev/null +++ b/lib/track.cfm @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/upload.cfm b/lib/upload.cfm new file mode 100644 index 0000000..7d9c22e --- /dev/null +++ b/lib/upload.cfm @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/utils/authStringBuilder.cfc b/lib/utils/authStringBuilder.cfc new file mode 100644 index 0000000..990f047 --- /dev/null +++ b/lib/utils/authStringBuilder.cfc @@ -0,0 +1,142 @@ +component { + + property name="authEndpoint" type="string" default=""; + property name="client_id" type="string" default=""; + property name="redirect_uri" type="string" default=""; + property name="response_type" type="string" default="code"; + property name="state" type="string" default=""; + + property name="PKCECodeChallenge" type="string" default=""; + property name="PKCECodeChallengeMethod" type="string" default="S256"; + property name="PKCECodeVerifier" type="string" default=""; + + public authStringBuilder function init( + required string authEndpoint, + required string client_id, + required string redirect_uri, + string response_type = 'code' + ){ + setAuthEndpoint( arguments.authEndpoint ); + setClientId( arguments.client_id ); + setRedirectURI( arguments.redirect_uri ); + setResponseType( arguments.response_type ); + return this; + } + + public void function setAuthEndpoint( required string authEndpoint ){ + variables.authEndpoint = arguments.authEndpoint; + } + + public void function setClientId( required string client_id ){ + variables.params[ 'client_id' ] = arguments.client_id; + } + + public void function setRedirectURI( required string redirect_uri ){ + variables.params[ 'redirect_uri' ] = arguments.redirect_uri; + } + + public void function setResponseType( required string response_type ){ + variables.params[ 'response_type' ] = arguments.response_type; + } + + public void function setPKCECodeChallenge( required string code_challenge ){ + variables.params[ 'code_challenge' ] = arguments.code_challenge; + } + + public void function setPKCECodeChallengeMethod( required string code_challenge_method ){ + variables.params[ 'code_challenge_method' ] = arguments.code_challenge_method; + } + + public void function setPKCECodeVerifier( required string code_verifier ){ + variables.params[ 'code_verifier' ] = arguments.code_verifier; + } + + + + public authStringBuilder function withAuthEndpoint( + required string authEndpoint + ){ + setAuthEndpoint( arguments.authEndpoint ); + return this; + } + + public authStringBuilder function withClientId( + required string client_id + ){ + setClientId( arguments.client_id ); + return this; + } + + public authStringBuilder function withResponseType( + required string response_type + ){ + setResponseType( arguments.response_type ); + return this; + } + + public authStringBuilder function withRedirectURI( + required string redirect_uri + ){ + setRedirectURI( arguments.redirect_uri ); + return this; + } + + public authStringBuilder function withState( + required string state + ){ + variables.params[ 'state' ] = arguments.state; + return this; + } + + public authStringBuilder function withPKCE( + required string code_challenge, + required string code_challenge_method, + required string code_verifier + ){ + setPKCECodeChallenge( arguments.code_challenge ); + setPKCECodeChallengeMethod( arguments.code_challenge_method ); + setPKCECodeVerifier( arguments.code_verifier ); + return this; + } + + public authStringBuilder function withParams( required struct parameters ){ + for( var item in arguments.parameters ){ + variables.params[ item ] = arguments.parameters[ item ]; + } + return this; + } + + + public string function get(){ + var stuParams = duplicate( variables.params ); + structDelete( stuParams, 'code_verifier' ); + return variables.authEndpoint & buildParamString( argScope = stuParams ); + } + + /** + * Returns a struct representation of the params values stored in variables.params. + */ + public struct function paramsMemento(){ + return variables.params; + } + + /** + * I return a string containing any extra URL parameters to concatenate and pass through when authenticating. + * @argScope A structure containing key / value pairs of data to be included in the URL string. + **/ + public string function buildParamString( struct argScope={} ) { + var strURLParam = '?'; + if( structCount( arguments.argScope ) ) { + var intCount = 1; + for( var key in arguments.argScope ) { + if( listLen( strURLParam ) && intCount > 1 ) { + strURLParam = strURLParam & '&'; + } + strURLParam = strURLParam & lcase( key ) & '=' & trim( arguments.argScope[ key ] ); + intCount++; + } + } + return strURLParam; + } + +} \ No newline at end of file diff --git a/style/web.css b/style/web.css new file mode 100644 index 0000000..3463337 --- /dev/null +++ b/style/web.css @@ -0,0 +1,321 @@ +/*common elements*/ +html, body { + margin: 0; + padding: 0; + border: none; + height: 100%; +} +body, table, tr, td, th, input, select, textarea, button, form, ul, li, p { + font-size: 11px; + font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif; + color:black; +} +form {margin: 0;padding:0;} +p {margin: 0.5em;} +table {border-collapse: collapse;} +img {border: none; margin: 0; vertical-align: middle;} +a, a:link, a:visited {color: #111111; text-decoration: underline;} +a:hover {color: #ff7600; text-decoration: underline;} + + +/* form elements */ +input {color: black; padding: 0 0.3em; } +input:read-only {color:#555; background-color:#f0f0f0;} +input:disabled {color:#555; background-color:#f0f0f0;} +select:disabled {color:#555;} +select option[disabled] { color:#ddd;} + +.detail .td input[type="text"]:disabled {border:1px solid #aaa; color:#555;} +.textbox-disabled {display:inline-block; border: 1px solid #aaa; color:#555; background-color:#f0f0f0; padding:.1em;} + +/*layout*/ + +div.vspacer {height:5px;} + +ul#mainmenu { + list-style-type:none; + padding:0; + margin:0; + display:block; + width:100%; +} +ul#mainmenu li { + text-align:right; + vertical-align:baseline; + padding:.2em 15px .2em 0 ; + margin:.3em 0; + background: url('../img/sarrow.gif') center right no-repeat; + font-size:120%; + font-weight:normal; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; + line-height: 1.1em; +} +ul#mainmenu li a{/*display:block;*/color:#cde;text-decoration:none;} +ul#mainmenu li a:hover{text-decoration:underline;} +ul#mainmenu li.selected {color: /*#4682b4;*/ #fa6 /*#00f*/;} +ul#mainmenu li.menu-item-ext {background: url('../img/external.gif') center right no-repeat;} +ul#mainmenu li.menu-item-noaction {background: none; color: #777;} +ul#mainmenu li.menu-title { + color: #111; + background:none white; + margin:.5em 0 0 0; + /*font-weight: bold;*/ + /*border:1px solid #ccc;*/ +} + +.page {display:table; table-layout: fixed; width:100%; height:100%;} + +.page-main {display:table-row; height:100%;} + +.page-footer {display:table-row; height:1px;} + +.menu {display:table-cell; width:150px; padding:0 0 0 .5em; background-color: #012; -border:1px solid red;} + +.content {display:table-cell; height:100%; vertical-align:top; padding: 3px;} + +.header {display:block; /*background:url('../img/portlet_dot.gif') center left no-repeat; padding-left:33px;*/ line-height: 21px; font-family: Verdana, Tahoma, sans-serif;} + +.control-bar {display:table; width:100%; color:/*#559*/white; /*border:1px solid #ccc;*/ height:19px; } +.header .control-bar a:link, .header .control-bar a:visited {color:white; padding: .2em .5em;} +.header .control-bar a:hover {background:white;color:#f90; padding: .2em .5em;} + +.title {display:table-cell; padding:1px 12px; vertical-align:middle; font-size:110%; background-color:#aaa/*#ccc*//*rgb(117,147,156)*/; /*color:#fa6;*/ border: 1px solid #bbb; border-right:none;} +.title b {color:#026;} + +.main-controls {display:table-cell; padding:0 7px; text-align:right; vertical-align: middle; background-color:#aaa/*rgb(117,147,156)*/; border: 1px solid #bbb; border-left:none;} + +.footer {height:21px; line-height: 21px; background-color:#e0e0e0; border:1px solid #bbb; text-align: right; vertical-align: middle; padding:0 3px;} + + +.table {display:table;} +.tr {display:table-row;} +.td, .th {display:table-cell; padding: 0 0.5em; vertical-align:top;} + + +.detail { + display:table; + width:100%; + margin: 3px 0; + border:1px solid #ddd; + border-collapse: collapse; +} +.detail .tr{ + line-height: 1.5em; +} +.detail .th { + display:table-cell; + text-align:right; + background-color:#e0e0e0; + padding:0.35em 0.5em; + border:none; + /*color: #5f5f5f;*/ + font-weight:normal; + vertical-align:top; + /*border:1px solid red;*/ +} +.detail .td { + display:table-cell; + background-color:#e7e7e7; + padding:0.2em 0.5em; + border:1px solid #ddd; + vertical-align:baseline; +} +.detail .td input, .detail .td select, .detail .td img, .detail .td button, .detail .td div, .detail .td span { + vertical-align: baseline; + margin: 0 0.3em; +} + +.detail .td label { + vertical-align: baseline; + margin: 0 0.3em 0 0; + line-height:normal; +} + +.detail .td input[type="checkbox"] { + vertical-align: top; margin: 0 0 0 0.3em; +} + +/*.detail .td input[type="text"] { + width: 97%; +}*/ + +.detail .td textarea { + color: black; + width: 97%; + margin-left: 0.2em; + padding: 0.2em 0.5em; +} +/***hack*/ +.detail .td a img {vertical-align:text-bottom;} + +.filter {background-color: #f7f7f7;} +.disabled, tr.disabled td, tr.disabled th {color: #888;} +.plate {background-color:#f0f0f0; padding:.1em; border:1px solid #ddd;} + +button, .button, .content a.button:link { + background: #fafafa; + -background: -webkit-linear-gradient(top, #fafafa 0%, #f4f4f4 40%,#e5e5e5 100%); + background:-webkit-linear-gradient(top, #dde 0%, #cde 40%,#bcd 100%); + border: 1px solid #aad; + padding: 1px 10px; + color: #black; + border-radius: 3px; + box-shadow: 0 1px 1px #ddd; + } + +button:disabled, .button:disabled, .maincontrol:disabled { + background: #fafafa; + background: -webkit-linear-gradient(top, #fafafa 0%,#f4f4f4 40%,#e5e5e5 100%); + border-color: #aaa; + color: #999; + box-shadow: none; +} + +button:not(:disabled):hover, +.button:not(:disabled):hover, +.maincontrol:not(:disabled):hover +{ + background: #fefefe; + background: -webkit-linear-gradient(top, #fefefe 0%,#f8f8f8 40%,#e9e9e9 100%); + box-shadow: 0 1px 3px rgba(7, 7, 7, 0.35); + border: 1px solid #aaa; + color: #ff7600; +} + +button:not(:disabled):active, .button:not(:disabled):active { + background: #f4f4f4; + background: -webkit-linear-gradient(top, #f4f4f4 0%,#efefef 40%,#dcdcdc 100%); + box-shadow: inset 0 1px 3px rgba(7, 7, 7, 0.35); +} + +button.maincontrol { + /*background-color:#c3c82f; + background:-webkit-linear-gradient(top, #cd6 0%, #cd6 40%,#bc5 100%);*/ + -background-color:#6fa0f0; + background-color:#6fa0f0; + background:-webkit-linear-gradient(top, #dde 0%, #cde 40%,#bcd 100%); + color: black; +} + +button.maincontrol:hover { + +} + + +/*не совсем аккуратно, при нажатии выглядит чуть иначе, чем кнопка*/ +.content button a, .content button a:link, .content button a:visited {color: #790; text-decoration:none; cursor:default;} +.content button:hover a, .content button:active {color: #ff7600; text-decoration:none; cursor:default;} +.content button.maincontrol a, .content button.maincontrol a:link,.content button.maincontrol a:visited {color: black;} +.content button.maincontrol:hover a, .content button.maincontrol:active a {color: #ff7600;} + +.submitnew { + background-image:url('../img/new.gif'); + width:13px; height:13px; border:none; padding:0; color:transparent; cursor:pointer; +} +.submitsave { + background-image:url('../img/save.gif'); + width:14px; height:14px; border:none; padding:0; color:transparent; cursor:pointer; +} +.submitdel { + background-image:url('../img/del.gif'); + width:13px; height:13px; border:none; padding:0; color:transparent; cursor:pointer; +} +.submitminus { + background-image:url('../img/minus.gif'); + width:13px; height:13px; border:none; padding:0; color:transparent; cursor:pointer; +} + +.content a, .content a:link, .content a:visited {color: #1111ee; text-decoration: none;} +.content a:hover {color: #ff7600; text-decoration: underline;} +.content h4 {margin-block-end: .5em;} +.content i {color:#555;} + +.cell {border: 1px solid #ddd; width:100%; padding: 0.2em;} + +.l, td.l, th.l{text-align: left;} +.r, td.r, th.r{text-align: right;} +.c, td.c, th.c{text-align: center;} +.nw {white-space: nowrap;} +.b {font-weight:bold;} +.i {font-style:italic;} +.wide {min-width:100%} +.wh100 {width:100%; height:100%;} +.table {display:table} +.tcell {display:table-cell} +.mid {vertical-align:middle} /*используется для заполнения ячейки таблицы якорем a href*/ + +.err {color: red;} +.warn {color: #f80;} + +a.up {background: url('../img/up.gif') center right no-repeat; padding-right: 7px;} +a.add {background: url('../img/add.gif') center right no-repeat; width:13px; height:13px; display:inline-block;} +a.edit {background: url('../img/edit.gif') center right no-repeat; width:13px; height:13px; display:inline-block;} +a.view {background: url('../img/view.gif') center right no-repeat; width:13px; height:13px; display:inline-block;} +a.del {background: url('../img/del.gif') center right no-repeat; width:13px; height:13px; display:inline-block;} + + +/* worktable classes */ + +table.worktable {border-collapse:separate; border-spacing:0; border-left:1px solid #ddd;} + +table.worktable th, +table.worktable td { + border-bottom: thin solid #ddd; + border-right: thin solid #ddd; +} +table.worktable thead th, +table.worktable thead td { + box-shadow: 0 -1px 0 0 #ddd; +} +table.worktable thead { + top: 0; + left: 0; + position: sticky; + z-index: 1; +} + +table.worktable td p {margin:0;} + +table.worktable thead tr td, table.worktable tr th{padding: 3px; background-color: #999;} + +table.worktable tr {height: 1.7em; background-color: white;} + +table.worktable tr td {padding:0.1em 0.3em; height:2em;} + +table.worktable tr:hover, table.worktable tr td:hover {background-color:#e5e5e5;} + +table.worktable th {font-weight:500; color:white;} + +/*double borders - not tested with border-collapse:separate*/ +table.worktable tbody tr td.lbd, +table.worktable thead tr td.lbd + {border-left: double #ccc;} + +table.worktable tbody tr td.rbd, +table.worktable thead tr td.rbd + {border-right: double #ccc;} + +table.worktable tbody tr td.tbd, +table.worktable thead tr td.tbd, +table.worktable tbody tr.tbd td, +table.worktable thead tr.tbd td + {border-top: double #ccc;} + +table.worktable tbody tr td.bbd, +table.worktable thead tr td.bbd, +table.worktable tbody tr.bbd td, +table.worktable thead tr.bbd td + {border-bottom: double #ccc;} + +table.worktable tr.hist {background-color: #f6f6f6;} +table.worktable tr.hist:hover, table.worktable tr.hist:hover td, table.worktable tr.comment:hover{background-color:#efefef;} +table.worktable tr.hist td.marked {background: #ddf5c0;} +table.worktable tr.hist:hover td.marked{background-color:#d0f0b9;} + + +@media print { + #mainmenu, .menu, .page-footer, .control-bar, .noprint {display:none;} +} + + +