From 942b77c6996d7531cd66f02ae157a0f46e0509b6 Mon Sep 17 00:00:00 2001 From: andrevv Date: Wed, 5 Jan 2011 18:38:03 +0200 Subject: [PATCH] adding of user & roles permissions by andrevv --- ipf/admin/app.php | 47 ++- ipf/admin/media/js/extra/checkall.js | 24 ++ ipf/admin/media/js/extra/jquery.js | 167 ++++++++++ ipf/admin/model.php | 174 ++++++----- ipf/admin/views.php | 286 ++++++++++-------- ipf/application.php | 9 +- ipf/auth/app.php | 176 ++++++++++- ipf/auth/forms/widget/permissions.php | 13 + ipf/auth/models.yml | 14 +- ipf/auth/models/Permission.php | 10 +- ipf/auth/models/Role.php | 52 +++- ipf/auth/models/User.php | 184 +++++++---- ipf/auth/models/_generated/BasePermission.php | 5 +- ipf/auth/models/_generated/BaseRole.php | 6 +- .../models/_generated/BaseRolePermission.php | 8 +- .../models/_generated/BaseUserPermission.php | 8 +- ipf/auth/models/_generated/BaseUserRole.php | 8 +- ipf/cli.php | 11 +- ipf/form/extra/addjs.php | 21 ++ ipf/form/extra/checkgroup.php | 51 ++++ ipf/form/extra/widget/checkboxgroupinput.php | 30 ++ ipf/form/extra/widget/checkboxinput.php | 18 ++ ipf/project.php | 17 +- 23 files changed, 1054 insertions(+), 285 deletions(-) create mode 100644 ipf/admin/media/js/extra/checkall.js create mode 100644 ipf/admin/media/js/extra/jquery.js create mode 100644 ipf/auth/forms/widget/permissions.php create mode 100644 ipf/form/extra/addjs.php create mode 100644 ipf/form/extra/checkgroup.php create mode 100644 ipf/form/extra/widget/checkboxgroupinput.php create mode 100644 ipf/form/extra/widget/checkboxinput.php diff --git a/ipf/admin/app.php b/ipf/admin/app.php index 528ed03..d74e91a 100644 --- a/ipf/admin/app.php +++ b/ipf/admin/app.php @@ -35,4 +35,49 @@ class IPF_Admin_App extends IPF_Application{ return new IPF_HTTP_Response_Redirect(IPF_HTTP_URL_urlForView('IPF_Admin_Views_Login')); } -} \ No newline at end of file + static function GetAppModelFromSlugs($lapp, $lmodel) + { + foreach (IPF_Project::getInstance()->appList() as $app) + { + if ($app->getSlug() == $lapp) + { + foreach($app->modelList() as $m) + { + if (strtolower($m) == $lmodel) + return array('app' => $app, 'modelname' => $m); + } + } + } + + return null; + } + + static function GetAdminModelPermissions($adminModel, $request, $lapp, $lmodel) + { + $adminPerms = $adminModel->getPerms($request); + + if (!count($adminPerms)) + return false; + + $am = self::GetAppModelFromSlugs($lapp, $lmodel); + + if ($am === null) + return false; + + $app = $am['app']; + $m = $am['modelname']; + + if ($m !== $adminModel->modelName) + return false; + + $perms = array(); + + foreach (IPF_Auth_App::checkPermissions($request, $app, $m, $adminPerms) as $permName=>$permValue) + { + if ($permValue) + $perms[] = $permName; + } + + return $perms; + } +} diff --git a/ipf/admin/media/js/extra/checkall.js b/ipf/admin/media/js/extra/checkall.js new file mode 100644 index 0000000..b52f82a --- /dev/null +++ b/ipf/admin/media/js/extra/checkall.js @@ -0,0 +1,24 @@ +$(function(){ + var index=0; + $('.checkgroup').each(function(){ + var master=$(this).closest('ul'); + if (!master.hasClass('checkgroup_master')){ + var id='chkgm_'+index; + ++index; + master.addClass('checkgroup_master').attr('id', id); + master.before( + '
' + ); + } + }); + $('.checkbtn').click(function(){ + var button=$(this); + var check=button.hasClass('checkall'); + $(button.attr('rel')+' .checkgroup').each(function(){ + $(this).attr('checked',check); + }); + return false; + }); +}); \ No newline at end of file diff --git a/ipf/admin/media/js/extra/jquery.js b/ipf/admin/media/js/extra/jquery.js new file mode 100644 index 0000000..2bd4cbb --- /dev/null +++ b/ipf/admin/media/js/extra/jquery.js @@ -0,0 +1,167 @@ +/*! + * jQuery JavaScript Library v1.4.4 + * http://jquery.com/ + * + * Copyright 2010, John Resig + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * Copyright 2010, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * + * Date: Thu Nov 11 19:04:53 2010 -0500 + */ +(function(E,B){function ka(a,b,d){if(d===B&&a.nodeType===1){d=a.getAttribute("data-"+b);if(typeof d==="string"){try{d=d==="true"?true:d==="false"?false:d==="null"?null:!c.isNaN(d)?parseFloat(d):Ja.test(d)?c.parseJSON(d):d}catch(e){}c.data(a,b,d)}else d=B}return d}function U(){return false}function ca(){return true}function la(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function Ka(a){var b,d,e,f,h,l,k,o,x,r,A,C=[];f=[];h=c.data(this,this.nodeType?"events":"__events__");if(typeof h==="function")h= +h.events;if(!(a.liveFired===this||!h||!h.live||a.button&&a.type==="click")){if(a.namespace)A=RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)");a.liveFired=this;var J=h.live.slice(0);for(k=0;kd)break;a.currentTarget=f.elem;a.data=f.handleObj.data;a.handleObj=f.handleObj;A=f.handleObj.origHandler.apply(f.elem,arguments);if(A===false||a.isPropagationStopped()){d=f.level;if(A===false)b=false;if(a.isImmediatePropagationStopped())break}}return b}}function Y(a,b){return(a&&a!=="*"?a+".":"")+b.replace(La, +"`").replace(Ma,"&")}function ma(a,b,d){if(c.isFunction(b))return c.grep(a,function(f,h){return!!b.call(f,h,f)===d});else if(b.nodeType)return c.grep(a,function(f){return f===b===d});else if(typeof b==="string"){var e=c.grep(a,function(f){return f.nodeType===1});if(Na.test(b))return c.filter(b,e,!d);else b=c.filter(b,e)}return c.grep(a,function(f){return c.inArray(f,b)>=0===d})}function na(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var e=c.data(a[d++]),f=c.data(this, +e);if(e=e&&e.events){delete f.handle;f.events={};for(var h in e)for(var l in e[h])c.event.add(this,h,e[h][l],e[h][l].data)}}})}function Oa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function oa(a,b,d){var e=b==="width"?a.offsetWidth:a.offsetHeight;if(d==="border")return e;c.each(b==="width"?Pa:Qa,function(){d||(e-=parseFloat(c.css(a,"padding"+this))||0);if(d==="margin")e+=parseFloat(c.css(a, +"margin"+this))||0;else e-=parseFloat(c.css(a,"border"+this+"Width"))||0});return e}function da(a,b,d,e){if(c.isArray(b)&&b.length)c.each(b,function(f,h){d||Ra.test(a)?e(a,h):da(a+"["+(typeof h==="object"||c.isArray(h)?f:"")+"]",h,d,e)});else if(!d&&b!=null&&typeof b==="object")c.isEmptyObject(b)?e(a,""):c.each(b,function(f,h){da(a+"["+f+"]",h,d,e)});else e(a,b)}function S(a,b){var d={};c.each(pa.concat.apply([],pa.slice(0,b)),function(){d[this]=a});return d}function qa(a){if(!ea[a]){var b=c("<"+ +a+">").appendTo("body"),d=b.css("display");b.remove();if(d==="none"||d==="")d="block";ea[a]=d}return ea[a]}function fa(a){return c.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var t=E.document,c=function(){function a(){if(!b.isReady){try{t.documentElement.doScroll("left")}catch(j){setTimeout(a,1);return}b.ready()}}var b=function(j,s){return new b.fn.init(j,s)},d=E.jQuery,e=E.$,f,h=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,l=/\S/,k=/^\s+/,o=/\s+$/,x=/\W/,r=/\d/,A=/^<(\w+)\s*\/?>(?:<\/\1>)?$/, +C=/^[\],:{}\s]*$/,J=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,w=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,I=/(?:^|:|,)(?:\s*\[)+/g,L=/(webkit)[ \/]([\w.]+)/,g=/(opera)(?:.*version)?[ \/]([\w.]+)/,i=/(msie) ([\w.]+)/,n=/(mozilla)(?:.*? rv:([\w.]+))?/,m=navigator.userAgent,p=false,q=[],u,y=Object.prototype.toString,F=Object.prototype.hasOwnProperty,M=Array.prototype.push,N=Array.prototype.slice,O=String.prototype.trim,D=Array.prototype.indexOf,R={};b.fn=b.prototype={init:function(j, +s){var v,z,H;if(!j)return this;if(j.nodeType){this.context=this[0]=j;this.length=1;return this}if(j==="body"&&!s&&t.body){this.context=t;this[0]=t.body;this.selector="body";this.length=1;return this}if(typeof j==="string")if((v=h.exec(j))&&(v[1]||!s))if(v[1]){H=s?s.ownerDocument||s:t;if(z=A.exec(j))if(b.isPlainObject(s)){j=[t.createElement(z[1])];b.fn.attr.call(j,s,true)}else j=[H.createElement(z[1])];else{z=b.buildFragment([v[1]],[H]);j=(z.cacheable?z.fragment.cloneNode(true):z.fragment).childNodes}return b.merge(this, +j)}else{if((z=t.getElementById(v[2]))&&z.parentNode){if(z.id!==v[2])return f.find(j);this.length=1;this[0]=z}this.context=t;this.selector=j;return this}else if(!s&&!x.test(j)){this.selector=j;this.context=t;j=t.getElementsByTagName(j);return b.merge(this,j)}else return!s||s.jquery?(s||f).find(j):b(s).find(j);else if(b.isFunction(j))return f.ready(j);if(j.selector!==B){this.selector=j.selector;this.context=j.context}return b.makeArray(j,this)},selector:"",jquery:"1.4.4",length:0,size:function(){return this.length}, +toArray:function(){return N.call(this,0)},get:function(j){return j==null?this.toArray():j<0?this.slice(j)[0]:this[j]},pushStack:function(j,s,v){var z=b();b.isArray(j)?M.apply(z,j):b.merge(z,j);z.prevObject=this;z.context=this.context;if(s==="find")z.selector=this.selector+(this.selector?" ":"")+v;else if(s)z.selector=this.selector+"."+s+"("+v+")";return z},each:function(j,s){return b.each(this,j,s)},ready:function(j){b.bindReady();if(b.isReady)j.call(t,b);else q&&q.push(j);return this},eq:function(j){return j=== +-1?this.slice(j):this.slice(j,+j+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(N.apply(this,arguments),"slice",N.call(arguments).join(","))},map:function(j){return this.pushStack(b.map(this,function(s,v){return j.call(s,v,s)}))},end:function(){return this.prevObject||b(null)},push:M,sort:[].sort,splice:[].splice};b.fn.init.prototype=b.fn;b.extend=b.fn.extend=function(){var j,s,v,z,H,G=arguments[0]||{},K=1,Q=arguments.length,ga=false; +if(typeof G==="boolean"){ga=G;G=arguments[1]||{};K=2}if(typeof G!=="object"&&!b.isFunction(G))G={};if(Q===K){G=this;--K}for(;K0))if(q){var s=0,v=q;for(q=null;j=v[s++];)j.call(t,b);b.fn.trigger&&b(t).trigger("ready").unbind("ready")}}},bindReady:function(){if(!p){p=true;if(t.readyState==="complete")return setTimeout(b.ready,1);if(t.addEventListener){t.addEventListener("DOMContentLoaded",u,false);E.addEventListener("load",b.ready,false)}else if(t.attachEvent){t.attachEvent("onreadystatechange",u);E.attachEvent("onload", +b.ready);var j=false;try{j=E.frameElement==null}catch(s){}t.documentElement.doScroll&&j&&a()}}},isFunction:function(j){return b.type(j)==="function"},isArray:Array.isArray||function(j){return b.type(j)==="array"},isWindow:function(j){return j&&typeof j==="object"&&"setInterval"in j},isNaN:function(j){return j==null||!r.test(j)||isNaN(j)},type:function(j){return j==null?String(j):R[y.call(j)]||"object"},isPlainObject:function(j){if(!j||b.type(j)!=="object"||j.nodeType||b.isWindow(j))return false;if(j.constructor&& +!F.call(j,"constructor")&&!F.call(j.constructor.prototype,"isPrototypeOf"))return false;for(var s in j);return s===B||F.call(j,s)},isEmptyObject:function(j){for(var s in j)return false;return true},error:function(j){throw j;},parseJSON:function(j){if(typeof j!=="string"||!j)return null;j=b.trim(j);if(C.test(j.replace(J,"@").replace(w,"]").replace(I,"")))return E.JSON&&E.JSON.parse?E.JSON.parse(j):(new Function("return "+j))();else b.error("Invalid JSON: "+j)},noop:function(){},globalEval:function(j){if(j&& +l.test(j)){var s=t.getElementsByTagName("head")[0]||t.documentElement,v=t.createElement("script");v.type="text/javascript";if(b.support.scriptEval)v.appendChild(t.createTextNode(j));else v.text=j;s.insertBefore(v,s.firstChild);s.removeChild(v)}},nodeName:function(j,s){return j.nodeName&&j.nodeName.toUpperCase()===s.toUpperCase()},each:function(j,s,v){var z,H=0,G=j.length,K=G===B||b.isFunction(j);if(v)if(K)for(z in j){if(s.apply(j[z],v)===false)break}else for(;H
a";var f=d.getElementsByTagName("*"),h=d.getElementsByTagName("a")[0],l=t.createElement("select"), +k=l.appendChild(t.createElement("option"));if(!(!f||!f.length||!h)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(h.getAttribute("style")),hrefNormalized:h.getAttribute("href")==="/a",opacity:/^0.55$/.test(h.style.opacity),cssFloat:!!h.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:k.selected,deleteExpando:true,optDisabled:false,checkClone:false, +scriptEval:false,noCloneEvent:true,boxModel:null,inlineBlockNeedsLayout:false,shrinkWrapBlocks:false,reliableHiddenOffsets:true};l.disabled=true;c.support.optDisabled=!k.disabled;b.type="text/javascript";try{b.appendChild(t.createTextNode("window."+e+"=1;"))}catch(o){}a.insertBefore(b,a.firstChild);if(E[e]){c.support.scriptEval=true;delete E[e]}try{delete b.test}catch(x){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function r(){c.support.noCloneEvent= +false;d.detachEvent("onclick",r)});d.cloneNode(true).fireEvent("onclick")}d=t.createElement("div");d.innerHTML="";a=t.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var r=t.createElement("div");r.style.width=r.style.paddingLeft="1px";t.body.appendChild(r);c.boxModel=c.support.boxModel=r.offsetWidth===2;if("zoom"in r.style){r.style.display="inline";r.style.zoom= +1;c.support.inlineBlockNeedsLayout=r.offsetWidth===2;r.style.display="";r.innerHTML="
";c.support.shrinkWrapBlocks=r.offsetWidth!==2}r.innerHTML="
t
";var A=r.getElementsByTagName("td");c.support.reliableHiddenOffsets=A[0].offsetHeight===0;A[0].style.display="";A[1].style.display="none";c.support.reliableHiddenOffsets=c.support.reliableHiddenOffsets&&A[0].offsetHeight===0;r.innerHTML="";t.body.removeChild(r).style.display= +"none"});a=function(r){var A=t.createElement("div");r="on"+r;var C=r in A;if(!C){A.setAttribute(r,"return;");C=typeof A[r]==="function"}return C};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=f=h=null}})();var ra={},Ja=/^(?:\{.*\}|\[.*\])$/;c.extend({cache:{},uuid:0,expando:"jQuery"+c.now(),noData:{embed:true,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:true},data:function(a,b,d){if(c.acceptData(a)){a=a==E?ra:a;var e=a.nodeType,f=e?a[c.expando]:null,h= +c.cache;if(!(e&&!f&&typeof b==="string"&&d===B)){if(e)f||(a[c.expando]=f=++c.uuid);else h=a;if(typeof b==="object")if(e)h[f]=c.extend(h[f],b);else c.extend(h,b);else if(e&&!h[f])h[f]={};a=e?h[f]:h;if(d!==B)a[b]=d;return typeof b==="string"?a[b]:a}}},removeData:function(a,b){if(c.acceptData(a)){a=a==E?ra:a;var d=a.nodeType,e=d?a[c.expando]:a,f=c.cache,h=d?f[e]:e;if(b){if(h){delete h[b];d&&c.isEmptyObject(h)&&c.removeData(a)}}else if(d&&c.support.deleteExpando)delete a[c.expando];else if(a.removeAttribute)a.removeAttribute(c.expando); +else if(d)delete f[e];else for(var l in a)delete a[l]}},acceptData:function(a){if(a.nodeName){var b=c.noData[a.nodeName.toLowerCase()];if(b)return!(b===true||a.getAttribute("classid")!==b)}return true}});c.fn.extend({data:function(a,b){var d=null;if(typeof a==="undefined"){if(this.length){var e=this[0].attributes,f;d=c.data(this[0]);for(var h=0,l=e.length;h-1)return true;return false},val:function(a){if(!arguments.length){var b=this[0];if(b){if(c.nodeName(b,"option")){var d=b.attributes.value;return!d||d.specified?b.value:b.text}if(c.nodeName(b,"select")){var e=b.selectedIndex;d=[];var f=b.options;b=b.type==="select-one"; +if(e<0)return null;var h=b?e:0;for(e=b?e+1:f.length;h=0;else if(c.nodeName(this,"select")){var A=c.makeArray(r);c("option",this).each(function(){this.selected=c.inArray(c(this).val(),A)>=0});if(!A.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true}, +attr:function(a,b,d,e){if(!a||a.nodeType===3||a.nodeType===8)return B;if(e&&b in c.attrFn)return c(a)[b](d);e=a.nodeType!==1||!c.isXMLDoc(a);var f=d!==B;b=e&&c.props[b]||b;var h=Ta.test(b);if((b in a||a[b]!==B)&&e&&!h){if(f){b==="type"&&Ua.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");if(d===null)a.nodeType===1&&a.removeAttribute(b);else a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&& +b.specified?b.value:Va.test(a.nodeName)||Wa.test(a.nodeName)&&a.href?0:B;return a[b]}if(!c.support.style&&e&&b==="style"){if(f)a.style.cssText=""+d;return a.style.cssText}f&&a.setAttribute(b,""+d);if(!a.attributes[b]&&a.hasAttribute&&!a.hasAttribute(b))return B;a=!c.support.hrefNormalized&&e&&h?a.getAttribute(b,2):a.getAttribute(b);return a===null?B:a}});var X=/\.(.*)$/,ia=/^(?:textarea|input|select)$/i,La=/\./g,Ma=/ /g,Xa=/[^\w\s.|`]/g,Ya=function(a){return a.replace(Xa,"\\$&")},ua={focusin:0,focusout:0}; +c.event={add:function(a,b,d,e){if(!(a.nodeType===3||a.nodeType===8)){if(c.isWindow(a)&&a!==E&&!a.frameElement)a=E;if(d===false)d=U;else if(!d)return;var f,h;if(d.handler){f=d;d=f.handler}if(!d.guid)d.guid=c.guid++;if(h=c.data(a)){var l=a.nodeType?"events":"__events__",k=h[l],o=h.handle;if(typeof k==="function"){o=k.handle;k=k.events}else if(!k){a.nodeType||(h[l]=h=function(){});h.events=k={}}if(!o)h.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem, +arguments):B};o.elem=a;b=b.split(" ");for(var x=0,r;l=b[x++];){h=f?c.extend({},f):{handler:d,data:e};if(l.indexOf(".")>-1){r=l.split(".");l=r.shift();h.namespace=r.slice(0).sort().join(".")}else{r=[];h.namespace=""}h.type=l;if(!h.guid)h.guid=d.guid;var A=k[l],C=c.event.special[l]||{};if(!A){A=k[l]=[];if(!C.setup||C.setup.call(a,e,r,o)===false)if(a.addEventListener)a.addEventListener(l,o,false);else a.attachEvent&&a.attachEvent("on"+l,o)}if(C.add){C.add.call(a,h);if(!h.handler.guid)h.handler.guid= +d.guid}A.push(h);c.event.global[l]=true}a=null}}},global:{},remove:function(a,b,d,e){if(!(a.nodeType===3||a.nodeType===8)){if(d===false)d=U;var f,h,l=0,k,o,x,r,A,C,J=a.nodeType?"events":"__events__",w=c.data(a),I=w&&w[J];if(w&&I){if(typeof I==="function"){w=I;I=I.events}if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(f in I)c.event.remove(a,f+b)}else{for(b=b.split(" ");f=b[l++];){r=f;k=f.indexOf(".")<0;o=[];if(!k){o=f.split(".");f=o.shift();x=RegExp("(^|\\.)"+ +c.map(o.slice(0).sort(),Ya).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(A=I[f])if(d){r=c.event.special[f]||{};for(h=e||0;h=0){a.type=f=f.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[f]&&c.each(c.cache,function(){this.events&&this.events[f]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType=== +8)return B;a.result=B;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(e=d.nodeType?c.data(d,"handle"):(c.data(d,"__events__")||{}).handle)&&e.apply(d,b);e=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+f]&&d["on"+f].apply(d,b)===false){a.result=false;a.preventDefault()}}catch(h){}if(!a.isPropagationStopped()&&e)c.event.trigger(a,b,e,true);else if(!a.isDefaultPrevented()){var l;e=a.target;var k=f.replace(X,""),o=c.nodeName(e,"a")&&k=== +"click",x=c.event.special[k]||{};if((!x._default||x._default.call(d,a)===false)&&!o&&!(e&&e.nodeName&&c.noData[e.nodeName.toLowerCase()])){try{if(e[k]){if(l=e["on"+k])e["on"+k]=null;c.event.triggered=true;e[k]()}}catch(r){}if(l)e["on"+k]=l;c.event.triggered=false}}},handle:function(a){var b,d,e,f;d=[];var h=c.makeArray(arguments);a=h[0]=c.event.fix(a||E.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;if(!b){e=a.type.split(".");a.type=e.shift();d=e.slice(0).sort();e=RegExp("(^|\\.)"+ +d.join("\\.(?:.*\\.)?")+"(\\.|$)")}a.namespace=a.namespace||d.join(".");f=c.data(this,this.nodeType?"events":"__events__");if(typeof f==="function")f=f.events;d=(f||{})[a.type];if(f&&d){d=d.slice(0);f=0;for(var l=d.length;f-1?c.map(a.options,function(e){return e.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},Z=function(a,b){var d=a.target,e,f;if(!(!ia.test(d.nodeName)||d.readOnly)){e=c.data(d,"_change_data");f=xa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",f);if(!(e===B||f===e))if(e!=null||f){a.type="change";a.liveFired= +B;return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:Z,beforedeactivate:Z,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return Z.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return Z.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,"_change_data",xa(a))}},setup:function(){if(this.type=== +"file")return false;for(var a in V)c.event.add(this,a+".specialChange",V[a]);return ia.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return ia.test(this.nodeName)}};V=c.event.special.change.filters;V.focus=V.beforeactivate}t.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(e){e=c.event.fix(e);e.type=b;return c.event.trigger(e,null,e.target)}c.event.special[b]={setup:function(){ua[b]++===0&&t.addEventListener(a,d,true)},teardown:function(){--ua[b]=== +0&&t.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,e,f){if(typeof d==="object"){for(var h in d)this[b](h,e,d[h],f);return this}if(c.isFunction(e)||e===false){f=e;e=B}var l=b==="one"?c.proxy(f,function(o){c(this).unbind(o,l);return f.apply(this,arguments)}):f;if(d==="unload"&&b!=="one")this.one(d,e,f);else{h=0;for(var k=this.length;h0?this.bind(b,d,e):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});E.attachEvent&&!E.addEventListener&&c(E).bind("unload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}}); +(function(){function a(g,i,n,m,p,q){p=0;for(var u=m.length;p0){F=y;break}}y=y[g]}m[p]=F}}}var d=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,f=Object.prototype.toString,h=false,l=true;[0,0].sort(function(){l=false;return 0});var k=function(g,i,n,m){n=n||[];var p=i=i||t;if(i.nodeType!==1&&i.nodeType!==9)return[];if(!g||typeof g!=="string")return n;var q,u,y,F,M,N=true,O=k.isXML(i),D=[],R=g;do{d.exec("");if(q=d.exec(R)){R=q[3];D.push(q[1]);if(q[2]){F=q[3]; +break}}}while(q);if(D.length>1&&x.exec(g))if(D.length===2&&o.relative[D[0]])u=L(D[0]+D[1],i);else for(u=o.relative[D[0]]?[i]:k(D.shift(),i);D.length;){g=D.shift();if(o.relative[g])g+=D.shift();u=L(g,u)}else{if(!m&&D.length>1&&i.nodeType===9&&!O&&o.match.ID.test(D[0])&&!o.match.ID.test(D[D.length-1])){q=k.find(D.shift(),i,O);i=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]}if(i){q=m?{expr:D.pop(),set:C(m)}:k.find(D.pop(),D.length===1&&(D[0]==="~"||D[0]==="+")&&i.parentNode?i.parentNode:i,O);u=q.expr?k.filter(q.expr, +q.set):q.set;if(D.length>0)y=C(u);else N=false;for(;D.length;){q=M=D.pop();if(o.relative[M])q=D.pop();else M="";if(q==null)q=i;o.relative[M](y,q,O)}}else y=[]}y||(y=u);y||k.error(M||g);if(f.call(y)==="[object Array]")if(N)if(i&&i.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&k.contains(i,y[g])))n.push(u[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&n.push(u[g]);else n.push.apply(n,y);else C(y,n);if(F){k(F,p,n,m);k.uniqueSort(n)}return n};k.uniqueSort=function(g){if(w){h= +l;g.sort(w);if(h)for(var i=1;i0};k.find=function(g,i,n){var m;if(!g)return[];for(var p=0,q=o.order.length;p":function(g,i){var n,m=typeof i==="string",p=0,q=g.length;if(m&&!/\W/.test(i))for(i=i.toLowerCase();p=0))n||m.push(u);else if(n)i[q]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},CHILD:function(g){if(g[1]==="nth"){var i=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=i[1]+(i[2]||1)-0;g[3]=i[3]-0}g[0]=e++;return g},ATTR:function(g,i,n, +m,p,q){i=g[1].replace(/\\/g,"");if(!q&&o.attrMap[i])g[1]=o.attrMap[i];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,i,n,m,p){if(g[1]==="not")if((d.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,i);else{g=k.filter(g[3],i,n,true^p);n||m.push.apply(m,g);return false}else if(o.match.POS.test(g[0])||o.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled=== +true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,i,n){return!!k(n[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"=== +g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},setFilters:{first:function(g,i){return i===0},last:function(g,i,n,m){return i===m.length-1},even:function(g,i){return i%2===0},odd:function(g,i){return i%2===1},lt:function(g,i,n){return in[3]-0},nth:function(g,i,n){return n[3]- +0===i},eq:function(g,i,n){return n[3]-0===i}},filter:{PSEUDO:function(g,i,n,m){var p=i[1],q=o.filters[p];if(q)return q(g,n,i,m);else if(p==="contains")return(g.textContent||g.innerText||k.getText([g])||"").indexOf(i[3])>=0;else if(p==="not"){i=i[3];n=0;for(m=i.length;n=0}},ID:function(g,i){return g.nodeType===1&&g.getAttribute("id")===i},TAG:function(g,i){return i==="*"&&g.nodeType===1||g.nodeName.toLowerCase()=== +i},CLASS:function(g,i){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(i)>-1},ATTR:function(g,i){var n=i[1];n=o.attrHandle[n]?o.attrHandle[n](g):g[n]!=null?g[n]:g.getAttribute(n);var m=n+"",p=i[2],q=i[4];return n==null?p==="!=":p==="="?m===q:p==="*="?m.indexOf(q)>=0:p==="~="?(" "+m+" ").indexOf(q)>=0:!q?m&&n!==false:p==="!="?m!==q:p==="^="?m.indexOf(q)===0:p==="$="?m.substr(m.length-q.length)===q:p==="|="?m===q||m.substr(0,q.length+1)===q+"-":false},POS:function(g,i,n,m){var p=o.setFilters[i[2]]; +if(p)return p(g,n,i,m)}}},x=o.match.POS,r=function(g,i){return"\\"+(i-0+1)},A;for(A in o.match){o.match[A]=RegExp(o.match[A].source+/(?![^\[]*\])(?![^\(]*\))/.source);o.leftMatch[A]=RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[A].source.replace(/\\(\d+)/g,r))}var C=function(g,i){g=Array.prototype.slice.call(g,0);if(i){i.push.apply(i,g);return i}return g};try{Array.prototype.slice.call(t.documentElement.childNodes,0)}catch(J){C=function(g,i){var n=0,m=i||[];if(f.call(g)==="[object Array]")Array.prototype.push.apply(m, +g);else if(typeof g.length==="number")for(var p=g.length;n";n.insertBefore(g,n.firstChild);if(t.getElementById(i)){o.find.ID=function(m,p,q){if(typeof p.getElementById!=="undefined"&&!q)return(p=p.getElementById(m[1]))?p.id===m[1]||typeof p.getAttributeNode!=="undefined"&&p.getAttributeNode("id").nodeValue===m[1]?[p]:B:[]};o.filter.ID=function(m,p){var q=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&q&&q.nodeValue===p}}n.removeChild(g); +n=g=null})();(function(){var g=t.createElement("div");g.appendChild(t.createComment(""));if(g.getElementsByTagName("*").length>0)o.find.TAG=function(i,n){var m=n.getElementsByTagName(i[1]);if(i[1]==="*"){for(var p=[],q=0;m[q];q++)m[q].nodeType===1&&p.push(m[q]);m=p}return m};g.innerHTML="";if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")o.attrHandle.href=function(i){return i.getAttribute("href",2)};g=null})();t.querySelectorAll&& +function(){var g=k,i=t.createElement("div");i.innerHTML="

";if(!(i.querySelectorAll&&i.querySelectorAll(".TEST").length===0)){k=function(m,p,q,u){p=p||t;m=m.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!u&&!k.isXML(p))if(p.nodeType===9)try{return C(p.querySelectorAll(m),q)}catch(y){}else if(p.nodeType===1&&p.nodeName.toLowerCase()!=="object"){var F=p.getAttribute("id"),M=F||"__sizzle__";F||p.setAttribute("id",M);try{return C(p.querySelectorAll("#"+M+" "+m),q)}catch(N){}finally{F|| +p.removeAttribute("id")}}return g(m,p,q,u)};for(var n in g)k[n]=g[n];i=null}}();(function(){var g=t.documentElement,i=g.matchesSelector||g.mozMatchesSelector||g.webkitMatchesSelector||g.msMatchesSelector,n=false;try{i.call(t.documentElement,"[test!='']:sizzle")}catch(m){n=true}if(i)k.matchesSelector=function(p,q){q=q.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(p))try{if(n||!o.match.PSEUDO.test(q)&&!/!=/.test(q))return i.call(p,q)}catch(u){}return k(q,null,null,[p]).length>0}})();(function(){var g= +t.createElement("div");g.innerHTML="
";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){o.order.splice(1,0,"CLASS");o.find.CLASS=function(i,n,m){if(typeof n.getElementsByClassName!=="undefined"&&!m)return n.getElementsByClassName(i[1])};g=null}}})();k.contains=t.documentElement.contains?function(g,i){return g!==i&&(g.contains?g.contains(i):true)}:t.documentElement.compareDocumentPosition? +function(g,i){return!!(g.compareDocumentPosition(i)&16)}:function(){return false};k.isXML=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false};var L=function(g,i){for(var n,m=[],p="",q=i.nodeType?[i]:i;n=o.match.PSEUDO.exec(g);){p+=n[0];g=g.replace(o.match.PSEUDO,"")}g=o.relative[g]?g+"*":g;n=0;for(var u=q.length;n0)for(var h=d;h0},closest:function(a,b){var d=[],e,f,h=this[0];if(c.isArray(a)){var l,k={},o=1;if(h&&a.length){e=0;for(f=a.length;e-1:c(h).is(e))d.push({selector:l,elem:h,level:o})}h= +h.parentNode;o++}}return d}l=cb.test(a)?c(a,b||this.context):null;e=0;for(f=this.length;e-1:c.find.matchesSelector(h,a)){d.push(h);break}else{h=h.parentNode;if(!h||!h.ownerDocument||h===b)break}d=d.length>1?c.unique(d):d;return this.pushStack(d,"closest",a)},index:function(a){if(!a||typeof a==="string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var d=typeof a==="string"?c(a,b||this.context): +c.makeArray(a),e=c.merge(this.get(),d);return this.pushStack(!d[0]||!d[0].parentNode||d[0].parentNode.nodeType===11||!e[0]||!e[0].parentNode||e[0].parentNode.nodeType===11?e:c.unique(e))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a, +2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a, +b){c.fn[a]=function(d,e){var f=c.map(this,b,d);Za.test(a)||(e=d);if(e&&typeof e==="string")f=c.filter(e,f);f=this.length>1?c.unique(f):f;if((this.length>1||ab.test(e))&&$a.test(a))f=f.reverse();return this.pushStack(f,a,bb.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return b.length===1?c.find.matchesSelector(b[0],a)?[b[0]]:[]:c.find.matches(a,b)},dir:function(a,b,d){var e=[];for(a=a[b];a&&a.nodeType!==9&&(d===B||a.nodeType!==1||!c(a).is(d));){a.nodeType===1&& +e.push(a);a=a[b]}return e},nth:function(a,b,d){b=b||1;for(var e=0;a;a=a[d])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var za=/ jQuery\d+="(?:\d+|null)"/g,$=/^\s+/,Aa=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Ba=/<([\w:]+)/,db=/\s]+\/)>/g,P={option:[1, +""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]};P.optgroup=P.option;P.tbody=P.tfoot=P.colgroup=P.caption=P.thead;P.th=P.td;if(!c.support.htmlSerialize)P._default=[1,"div
","
"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d= +c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==B)return this.empty().append((this[0]&&this[0].ownerDocument||t).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this}, +wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})}, +prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b, +this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,e;(e=this[d])!=null;d++)if(!a||c.filter(a,[e]).length){if(!b&&e.nodeType===1){c.cleanData(e.getElementsByTagName("*"));c.cleanData([e])}e.parentNode&&e.parentNode.removeChild(e)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild); +return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,e=this.ownerDocument;if(!d){d=e.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(za,"").replace(fb,'="$1">').replace($,"")],e)[0]}else return this.cloneNode(true)});if(a===true){na(this,b);na(this.find("*"),b.find("*"))}return b},html:function(a){if(a===B)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(za,""):null; +else if(typeof a==="string"&&!Ca.test(a)&&(c.support.leadingWhitespace||!$.test(a))&&!P[(Ba.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Aa,"<$1>");try{for(var b=0,d=this.length;b0||e.cacheable||this.length>1?h.cloneNode(true):h)}k.length&&c.each(k,Oa)}return this}});c.buildFragment=function(a,b,d){var e,f,h;b=b&&b[0]?b[0].ownerDocument||b[0]:t;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===t&&!Ca.test(a[0])&&(c.support.checkClone||!Da.test(a[0]))){f=true;if(h=c.fragments[a[0]])if(h!==1)e=h}if(!e){e=b.createDocumentFragment();c.clean(a,b,e,d)}if(f)c.fragments[a[0]]=h?e:1;return{fragment:e,cacheable:f}};c.fragments={};c.each({appendTo:"append", +prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var e=[];d=c(d);var f=this.length===1&&this[0].parentNode;if(f&&f.nodeType===11&&f.childNodes.length===1&&d.length===1){d[b](this[0]);return this}else{f=0;for(var h=d.length;f0?this.clone(true):this).get();c(d[f])[b](l);e=e.concat(l)}return this.pushStack(e,a,d.selector)}}});c.extend({clean:function(a,b,d,e){b=b||t;if(typeof b.createElement==="undefined")b=b.ownerDocument|| +b[0]&&b[0].ownerDocument||t;for(var f=[],h=0,l;(l=a[h])!=null;h++){if(typeof l==="number")l+="";if(l){if(typeof l==="string"&&!eb.test(l))l=b.createTextNode(l);else if(typeof l==="string"){l=l.replace(Aa,"<$1>");var k=(Ba.exec(l)||["",""])[1].toLowerCase(),o=P[k]||P._default,x=o[0],r=b.createElement("div");for(r.innerHTML=o[1]+l+o[2];x--;)r=r.lastChild;if(!c.support.tbody){x=db.test(l);k=k==="table"&&!x?r.firstChild&&r.firstChild.childNodes:o[1]===""&&!x?r.childNodes:[];for(o=k.length- +1;o>=0;--o)c.nodeName(k[o],"tbody")&&!k[o].childNodes.length&&k[o].parentNode.removeChild(k[o])}!c.support.leadingWhitespace&&$.test(l)&&r.insertBefore(b.createTextNode($.exec(l)[0]),r.firstChild);l=r.childNodes}if(l.nodeType)f.push(l);else f=c.merge(f,l)}}if(d)for(h=0;f[h];h++)if(e&&c.nodeName(f[h],"script")&&(!f[h].type||f[h].type.toLowerCase()==="text/javascript"))e.push(f[h].parentNode?f[h].parentNode.removeChild(f[h]):f[h]);else{f[h].nodeType===1&&f.splice.apply(f,[h+1,0].concat(c.makeArray(f[h].getElementsByTagName("script")))); +d.appendChild(f[h])}return f},cleanData:function(a){for(var b,d,e=c.cache,f=c.event.special,h=c.support.deleteExpando,l=0,k;(k=a[l])!=null;l++)if(!(k.nodeName&&c.noData[k.nodeName.toLowerCase()]))if(d=k[c.expando]){if((b=e[d])&&b.events)for(var o in b.events)f[o]?c.event.remove(k,o):c.removeEvent(k,o,b.handle);if(h)delete k[c.expando];else k.removeAttribute&&k.removeAttribute(c.expando);delete e[d]}}});var Ea=/alpha\([^)]*\)/i,gb=/opacity=([^)]*)/,hb=/-([a-z])/ig,ib=/([A-Z])/g,Fa=/^-?\d+(?:px)?$/i, +jb=/^-?\d/,kb={position:"absolute",visibility:"hidden",display:"block"},Pa=["Left","Right"],Qa=["Top","Bottom"],W,Ga,aa,lb=function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){if(arguments.length===2&&b===B)return this;return c.access(this,a,b,true,function(d,e,f){return f!==B?c.style(d,e,f):c.css(d,e)})};c.extend({cssHooks:{opacity:{get:function(a,b){if(b){var d=W(a,"opacity","opacity");return d===""?"1":d}else return a.style.opacity}}},cssNumber:{zIndex:true,fontWeight:true,opacity:true, +zoom:true,lineHeight:true},cssProps:{"float":c.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,d,e){if(!(!a||a.nodeType===3||a.nodeType===8||!a.style)){var f,h=c.camelCase(b),l=a.style,k=c.cssHooks[h];b=c.cssProps[h]||h;if(d!==B){if(!(typeof d==="number"&&isNaN(d)||d==null)){if(typeof d==="number"&&!c.cssNumber[h])d+="px";if(!k||!("set"in k)||(d=k.set(a,d))!==B)try{l[b]=d}catch(o){}}}else{if(k&&"get"in k&&(f=k.get(a,false,e))!==B)return f;return l[b]}}},css:function(a,b,d){var e,f=c.camelCase(b), +h=c.cssHooks[f];b=c.cssProps[f]||f;if(h&&"get"in h&&(e=h.get(a,true,d))!==B)return e;else if(W)return W(a,b,f)},swap:function(a,b,d){var e={},f;for(f in b){e[f]=a.style[f];a.style[f]=b[f]}d.call(a);for(f in b)a.style[f]=e[f]},camelCase:function(a){return a.replace(hb,lb)}});c.curCSS=c.css;c.each(["height","width"],function(a,b){c.cssHooks[b]={get:function(d,e,f){var h;if(e){if(d.offsetWidth!==0)h=oa(d,b,f);else c.swap(d,kb,function(){h=oa(d,b,f)});if(h<=0){h=W(d,b,b);if(h==="0px"&&aa)h=aa(d,b,b); +if(h!=null)return h===""||h==="auto"?"0px":h}if(h<0||h==null){h=d.style[b];return h===""||h==="auto"?"0px":h}return typeof h==="string"?h:h+"px"}},set:function(d,e){if(Fa.test(e)){e=parseFloat(e);if(e>=0)return e+"px"}else return e}}});if(!c.support.opacity)c.cssHooks.opacity={get:function(a,b){return gb.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var d=a.style;d.zoom=1;var e=c.isNaN(b)?"":"alpha(opacity="+b*100+")",f= +d.filter||"";d.filter=Ea.test(f)?f.replace(Ea,e):d.filter+" "+e}};if(t.defaultView&&t.defaultView.getComputedStyle)Ga=function(a,b,d){var e;d=d.replace(ib,"-$1").toLowerCase();if(!(b=a.ownerDocument.defaultView))return B;if(b=b.getComputedStyle(a,null)){e=b.getPropertyValue(d);if(e===""&&!c.contains(a.ownerDocument.documentElement,a))e=c.style(a,d)}return e};if(t.documentElement.currentStyle)aa=function(a,b){var d,e,f=a.currentStyle&&a.currentStyle[b],h=a.style;if(!Fa.test(f)&&jb.test(f)){d=h.left; +e=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;h.left=b==="fontSize"?"1em":f||0;f=h.pixelLeft+"px";h.left=d;a.runtimeStyle.left=e}return f===""?"auto":f};W=Ga||aa;if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=a.offsetHeight;return a.offsetWidth===0&&b===0||!c.support.reliableHiddenOffsets&&(a.style.display||c.css(a,"display"))==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var mb=c.now(),nb=/)<[^<]*)*<\/script>/gi, +ob=/^(?:select|textarea)/i,pb=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,qb=/^(?:GET|HEAD)$/,Ra=/\[\]$/,T=/\=\?(&|$)/,ja=/\?/,rb=/([?&])_=[^&]*/,sb=/^(\w+:)?\/\/([^\/?#]+)/,tb=/%20/g,ub=/#.*$/,Ha=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!=="string"&&Ha)return Ha.apply(this,arguments);else if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var f=a.slice(e,a.length);a=a.slice(0,e)}e="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b=== +"object"){b=c.param(b,c.ajaxSettings.traditional);e="POST"}var h=this;c.ajax({url:a,type:e,dataType:"html",data:b,complete:function(l,k){if(k==="success"||k==="notmodified")h.html(f?c("
").append(l.responseText.replace(nb,"")).find(f):l.responseText);d&&h.each(d,[l.responseText,k,l])}});return this},serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&& +!this.disabled&&(this.checked||ob.test(this.nodeName)||pb.test(this.type))}).map(function(a,b){var d=c(this).val();return d==null?null:c.isArray(d)?c.map(d,function(e){return{name:b.name,value:e}}):{name:b.name,value:d}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,e){if(c.isFunction(b)){e=e||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:e})}, +getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,e){if(c.isFunction(b)){e=e||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:e})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return new E.XMLHttpRequest},accepts:{xml:"application/xml, text/xml",html:"text/html", +script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},ajax:function(a){var b=c.extend(true,{},c.ajaxSettings,a),d,e,f,h=b.type.toUpperCase(),l=qb.test(h);b.url=b.url.replace(ub,"");b.context=a&&a.context!=null?a.context:b;if(b.data&&b.processData&&typeof b.data!=="string")b.data=c.param(b.data,b.traditional);if(b.dataType==="jsonp"){if(h==="GET")T.test(b.url)||(b.url+=(ja.test(b.url)?"&":"?")+(b.jsonp||"callback")+"=?");else if(!b.data|| +!T.test(b.data))b.data=(b.data?b.data+"&":"")+(b.jsonp||"callback")+"=?";b.dataType="json"}if(b.dataType==="json"&&(b.data&&T.test(b.data)||T.test(b.url))){d=b.jsonpCallback||"jsonp"+mb++;if(b.data)b.data=(b.data+"").replace(T,"="+d+"$1");b.url=b.url.replace(T,"="+d+"$1");b.dataType="script";var k=E[d];E[d]=function(m){if(c.isFunction(k))k(m);else{E[d]=B;try{delete E[d]}catch(p){}}f=m;c.handleSuccess(b,w,e,f);c.handleComplete(b,w,e,f);r&&r.removeChild(A)}}if(b.dataType==="script"&&b.cache===null)b.cache= +false;if(b.cache===false&&l){var o=c.now(),x=b.url.replace(rb,"$1_="+o);b.url=x+(x===b.url?(ja.test(b.url)?"&":"?")+"_="+o:"")}if(b.data&&l)b.url+=(ja.test(b.url)?"&":"?")+b.data;b.global&&c.active++===0&&c.event.trigger("ajaxStart");o=(o=sb.exec(b.url))&&(o[1]&&o[1].toLowerCase()!==location.protocol||o[2].toLowerCase()!==location.host);if(b.dataType==="script"&&h==="GET"&&o){var r=t.getElementsByTagName("head")[0]||t.documentElement,A=t.createElement("script");if(b.scriptCharset)A.charset=b.scriptCharset; +A.src=b.url;if(!d){var C=false;A.onload=A.onreadystatechange=function(){if(!C&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){C=true;c.handleSuccess(b,w,e,f);c.handleComplete(b,w,e,f);A.onload=A.onreadystatechange=null;r&&A.parentNode&&r.removeChild(A)}}}r.insertBefore(A,r.firstChild);return B}var J=false,w=b.xhr();if(w){b.username?w.open(h,b.url,b.async,b.username,b.password):w.open(h,b.url,b.async);try{if(b.data!=null&&!l||a&&a.contentType)w.setRequestHeader("Content-Type", +b.contentType);if(b.ifModified){c.lastModified[b.url]&&w.setRequestHeader("If-Modified-Since",c.lastModified[b.url]);c.etag[b.url]&&w.setRequestHeader("If-None-Match",c.etag[b.url])}o||w.setRequestHeader("X-Requested-With","XMLHttpRequest");w.setRequestHeader("Accept",b.dataType&&b.accepts[b.dataType]?b.accepts[b.dataType]+", */*; q=0.01":b.accepts._default)}catch(I){}if(b.beforeSend&&b.beforeSend.call(b.context,w,b)===false){b.global&&c.active--===1&&c.event.trigger("ajaxStop");w.abort();return false}b.global&& +c.triggerGlobal(b,"ajaxSend",[w,b]);var L=w.onreadystatechange=function(m){if(!w||w.readyState===0||m==="abort"){J||c.handleComplete(b,w,e,f);J=true;if(w)w.onreadystatechange=c.noop}else if(!J&&w&&(w.readyState===4||m==="timeout")){J=true;w.onreadystatechange=c.noop;e=m==="timeout"?"timeout":!c.httpSuccess(w)?"error":b.ifModified&&c.httpNotModified(w,b.url)?"notmodified":"success";var p;if(e==="success")try{f=c.httpData(w,b.dataType,b)}catch(q){e="parsererror";p=q}if(e==="success"||e==="notmodified")d|| +c.handleSuccess(b,w,e,f);else c.handleError(b,w,e,p);d||c.handleComplete(b,w,e,f);m==="timeout"&&w.abort();if(b.async)w=null}};try{var g=w.abort;w.abort=function(){w&&Function.prototype.call.call(g,w);L("abort")}}catch(i){}b.async&&b.timeout>0&&setTimeout(function(){w&&!J&&L("timeout")},b.timeout);try{w.send(l||b.data==null?null:b.data)}catch(n){c.handleError(b,w,null,n);c.handleComplete(b,w,e,f)}b.async||L();return w}},param:function(a,b){var d=[],e=function(h,l){l=c.isFunction(l)?l():l;d[d.length]= +encodeURIComponent(h)+"="+encodeURIComponent(l)};if(b===B)b=c.ajaxSettings.traditional;if(c.isArray(a)||a.jquery)c.each(a,function(){e(this.name,this.value)});else for(var f in a)da(f,a[f],b,e);return d.join("&").replace(tb,"+")}});c.extend({active:0,lastModified:{},etag:{},handleError:function(a,b,d,e){a.error&&a.error.call(a.context,b,d,e);a.global&&c.triggerGlobal(a,"ajaxError",[b,a,e])},handleSuccess:function(a,b,d,e){a.success&&a.success.call(a.context,e,d,b);a.global&&c.triggerGlobal(a,"ajaxSuccess", +[b,a])},handleComplete:function(a,b,d){a.complete&&a.complete.call(a.context,b,d);a.global&&c.triggerGlobal(a,"ajaxComplete",[b,a]);a.global&&c.active--===1&&c.event.trigger("ajaxStop")},triggerGlobal:function(a,b,d){(a.context&&a.context.url==null?c(a.context):c.event).trigger(b,d)},httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===1223}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"), +e=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(e)c.etag[b]=e;return a.status===304},httpData:function(a,b,d){var e=a.getResponseHeader("content-type")||"",f=b==="xml"||!b&&e.indexOf("xml")>=0;a=f?a.responseXML:a.responseText;f&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b==="json"||!b&&e.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&e.indexOf("javascript")>=0)c.globalEval(a);return a}}); +if(E.ActiveXObject)c.ajaxSettings.xhr=function(){if(E.location.protocol!=="file:")try{return new E.XMLHttpRequest}catch(a){}try{return new E.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}};c.support.ajax=!!c.ajaxSettings.xhr();var ea={},vb=/^(?:toggle|show|hide)$/,wb=/^([+\-]=)?([\d+.\-]+)(.*)$/,ba,pa=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b,d){if(a||a===0)return this.animate(S("show", +3),a,b,d);else{d=0;for(var e=this.length;d=0;e--)if(d[e].elem===this){b&&d[e](true);d.splice(e,1)}});b||this.dequeue();return this}});c.each({slideDown:S("show",1),slideUp:S("hide",1),slideToggle:S("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){c.fn[a]=function(d,e,f){return this.animate(b, +d,e,f)}});c.extend({speed:function(a,b,d){var e=a&&typeof a==="object"?c.extend({},a):{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};e.duration=c.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in c.fx.speeds?c.fx.speeds[e.duration]:c.fx.speeds._default;e.old=e.complete;e.complete=function(){e.queue!==false&&c(this).dequeue();c.isFunction(e.old)&&e.old.call(this)};return e},easing:{linear:function(a,b,d,e){return d+e*a},swing:function(a,b,d,e){return(-Math.cos(a* +Math.PI)/2+0.5)*e+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||c.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a=parseFloat(c.css(this.elem,this.prop));return a&&a>-1E4?a:0},custom:function(a,b,d){function e(l){return f.step(l)} +var f=this,h=c.fx;this.startTime=c.now();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;this.pos=this.state=0;e.elem=this.elem;if(e()&&c.timers.push(e)&&!ba)ba=setInterval(h.tick,h.interval)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true; +this.custom(this.cur(),0)},step:function(a){var b=c.now(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var e in this.options.curAnim)if(this.options.curAnim[e]!==true)d=false;if(d){if(this.options.overflow!=null&&!c.support.shrinkWrapBlocks){var f=this.elem,h=this.options;c.each(["","X","Y"],function(k,o){f.style["overflow"+o]=h.overflow[k]})}this.options.hide&&c(this.elem).hide();if(this.options.hide|| +this.options.show)for(var l in this.options.curAnim)c.style(this.elem,l,this.options.orig[l]);this.options.complete.call(this.elem)}return false}else{a=b-this.startTime;this.state=a/this.options.duration;b=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||b](this.state,a,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a= +c.timers,b=0;b-1;e={};var x={};if(o)x=f.position();l=o?x.top:parseInt(l,10)||0;k=o?x.left:parseInt(k,10)||0;if(c.isFunction(b))b=b.call(a,d,h);if(b.top!=null)e.top=b.top-h.top+l;if(b.left!=null)e.left=b.left-h.left+k;"using"in b?b.using.call(a, +e):f.css(e)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),e=Ia.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.css(a,"marginTop"))||0;d.left-=parseFloat(c.css(a,"marginLeft"))||0;e.top+=parseFloat(c.css(b[0],"borderTopWidth"))||0;e.left+=parseFloat(c.css(b[0],"borderLeftWidth"))||0;return{top:d.top-e.top,left:d.left-e.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||t.body;a&&!Ia.test(a.nodeName)&& +c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(e){var f=this[0],h;if(!f)return null;if(e!==B)return this.each(function(){if(h=fa(this))h.scrollTo(!a?e:c(h).scrollLeft(),a?e:c(h).scrollTop());else this[d]=e});else return(h=fa(f))?"pageXOffset"in h?h[a?"pageYOffset":"pageXOffset"]:c.support.boxModel&&h.document.documentElement[d]||h.document.body[d]:f[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase(); +c.fn["inner"+b]=function(){return this[0]?parseFloat(c.css(this[0],d,"padding")):null};c.fn["outer"+b]=function(e){return this[0]?parseFloat(c.css(this[0],d,e?"margin":"border")):null};c.fn[d]=function(e){var f=this[0];if(!f)return e==null?null:this;if(c.isFunction(e))return this.each(function(l){var k=c(this);k[d](e.call(this,l,k[d]()))});if(c.isWindow(f))return f.document.compatMode==="CSS1Compat"&&f.document.documentElement["client"+b]||f.document.body["client"+b];else if(f.nodeType===9)return Math.max(f.documentElement["client"+ +b],f.body["scroll"+b],f.documentElement["scroll"+b],f.body["offset"+b],f.documentElement["offset"+b]);else if(e===B){f=c.css(f,d);var h=parseFloat(f);return c.isNaN(h)?f:h}else return this.css(d,typeof e==="string"?e:e+"px")}})})(window); \ No newline at end of file diff --git a/ipf/admin/model.php b/ipf/admin/model.php index 968b02e..68e0b1f 100644 --- a/ipf/admin/model.php +++ b/ipf/admin/model.php @@ -344,8 +344,15 @@ class IPF_Admin_Model{ } // Views Function - public function AddItem($request, $lapp, $lmodel){ - if ($request->method == 'POST'){ + public function AddItem($request, $lapp, $lmodel) + { + $perms = IPF_Admin_App::GetAdminModelPermissions($this, $request, $lapp, $lmodel); + + if ($perms === false || !in_array('view', $perms) || !in_array('add', $perms)) + return new IPF_HTTP_Response_NotFound(); + + if ($request->method == 'POST') + { $this->_beforeAdd(new $this->model()); $data = $request->POST+$request->FILES; $form = $this->_getAddForm($this->model, &$data, array('user_fields'=>$this->fields())); @@ -376,7 +383,7 @@ class IPF_Admin_Model{ 'form'=>$form, 'inlineInstances'=>$this->inlineInstances, 'lapp'=>$lapp, - 'perms'=>$this->getPerms($request), + 'perms'=>$perms, 'lmodel'=>$lmodel, 'admin_title' => IPF::get('admin_title'), 'indexpage_url'=>IPF::get('indexpage_url','/'), @@ -384,8 +391,48 @@ class IPF_Admin_Model{ return IPF_Shortcuts::RenderToResponse($this->_getAddTemplate(), $context, $request); } - public function EditItem($request, $lapp, $lmodel, $o){ - if ($request->method == 'POST'){ + public function DeleteItem($request, $lapp, $lmodel, $o) + { + $perms = IPF_Admin_App::GetAdminModelPermissions($this, $request, $lapp, $lmodel); + + if ($perms === false || !in_array('view', $perms) || !in_array('delete', $perms)) + return new IPF_HTTP_Response_NotFound(); + + if ($request->method == 'POST') + { + AdminLog::logAction($request, $o, AdminLog::DELETION); + $o->delete(); + $url = @$request->POST['ipf_referrer']; + if ($url=='') + $url = IPF_HTTP_URL_urlForView('IPF_Admin_Views_ListItems', array($lapp, $lmodel)); + return new IPF_HTTP_Response_Redirect($url); + } + $context = array( + 'page_title'=>'Delete '.$this->modelName, + 'classname'=>$this->verbose_name(), + 'object'=>$o, + 'lapp'=>$lapp, + 'lmodel'=>$lmodel, + 'affected'=>array(), + 'ipf_referrer'=>@$request->GET['ipf_referrer'], + 'admin_title' => IPF::get('admin_title'), + 'indexpage_url'=>IPF::get('indexpage_url','/'), + ); + return IPF_Shortcuts::RenderToResponse('admin/delete.html', $context, $request); + } + + public function EditItem($request, $lapp, $lmodel, $o) + { + $perms = IPF_Admin_App::GetAdminModelPermissions($this, $request, $lapp, $lmodel); + + if ($perms === false || !in_array('view', $perms)) + return new IPF_HTTP_Response_NotFound(); + + if ($request->method == 'POST') + { + if (!in_array('change', $perms)) + return new IPF_HTTP_Response_NotFound(); + $this->_beforeEdit($o); $data = $request->POST+$request->FILES; $form = $this->_getEditForm($o,&$data,array('user_fields'=>$this->fields())); @@ -427,7 +474,7 @@ class IPF_Admin_Model{ 'form'=>$form, 'inlineInstances'=>$this->inlineInstances, 'lapp'=>$lapp, - 'perms'=>$this->getPerms($request), + 'perms'=>$perms, 'lmodel'=>$lmodel, 'admin_title' => IPF::get('admin_title'), 'indexpage_url'=>IPF::get('indexpage_url','/'), @@ -435,29 +482,64 @@ class IPF_Admin_Model{ return IPF_Shortcuts::RenderToResponse($this->_getChangeTemplate(), $context, $request); } - public function DeleteItem($request, $lapp, $lmodel, $o){ - if ($request->method == 'POST'){ - AdminLog::logAction($request, $o, AdminLog::DELETION); - $o->delete(); - $url = @$request->POST['ipf_referrer']; + public function ListItems($request, $lapp, $lmodel) + { + $perms = IPF_Admin_App::GetAdminModelPermissions($this, $request, $lapp, $lmodel); + + if ($perms === false || !in_array('view', $perms)) + return new IPF_HTTP_Response_NotFound(); + + $this->ListItemsQuery(); + $this->_GetFilters($request); + if (!$this->_ListSearchQuery($request)) + $this->_ListFilterQuery($request); + $this->ListItemsHeader(); + + $currentPage = (int)@$request->GET['page']; + + $url = ''; + foreach ($request->GET as $k=>$v){ + if ($k=='page') + continue; if ($url=='') - $url = IPF_HTTP_URL_urlForView('IPF_Admin_Views_ListItems', array($lapp, $lmodel)); - return new IPF_HTTP_Response_Redirect($url); + $url = '?'; + else + $url .= '&'; + $url .= $k.'='.$v; } + if ($url=='') + $pager_url = '?page={%page_number}'; + else + $pager_url = $url.'&page={%page_number}'; + + $pager = new IPF_ORM_Pager_LayoutArrows( + new IPF_ORM_Pager($this->q, $currentPage, $this->perPage), + new IPF_ORM_Pager_Range_Sliding(array('chunk' => 10)), + $pager_url + ); + $pager->setTemplate('{%page} '); + $pager->setSelectedTemplate('{%page} '); + $objects = $pager->getPager()->execute(); + $context = array( - 'page_title'=>'Delete '.$this->modelName, + 'orderable'=>$this->_orderable(), + 'page_title'=>$this->page_title(), + 'header'=>$this->header, + 'objects'=>$objects, + 'pager'=>$pager, 'classname'=>$this->verbose_name(), - 'object'=>$o, + 'perms'=>$perms, + 'filters'=>$this->filters, + 'admin_title' => IPF::get('admin_title'), + 'is_search' => $this->_isSearch(), + 'search_value' => $this->search_value, 'lapp'=>$lapp, 'lmodel'=>$lmodel, - 'affected'=>array(), - 'ipf_referrer'=>@$request->GET['ipf_referrer'], - 'admin_title' => IPF::get('admin_title'), 'indexpage_url'=>IPF::get('indexpage_url','/'), ); - return IPF_Shortcuts::RenderToResponse('admin/delete.html', $context, $request); + return IPF_Shortcuts::RenderToResponse('admin/items.html', $context, $request); } - + protected function _ListFilterQuery($request){ foreach($this->filters as $f){ $f->FilterQuery($request,$this->q); @@ -531,58 +613,6 @@ class IPF_Admin_Model{ return method_exists($this, 'list_order'); } - public function ListItems($request, $lapp, $lmodel){ - $this->ListItemsQuery(); - $this->_GetFilters($request); - if (!$this->_ListSearchQuery($request)) - $this->_ListFilterQuery($request); - $this->ListItemsHeader(); - - $currentPage = (int)@$request->GET['page']; - - $url = ''; - foreach ($request->GET as $k=>$v){ - if ($k=='page') - continue; - if ($url=='') - $url = '?'; - else - $url .= '&'; - $url .= $k.'='.$v; - } - if ($url=='') - $pager_url = '?page={%page_number}'; - else - $pager_url = $url.'&page={%page_number}'; - - $pager = new IPF_ORM_Pager_LayoutArrows( - new IPF_ORM_Pager($this->q, $currentPage, $this->perPage), - new IPF_ORM_Pager_Range_Sliding(array('chunk' => 10)), - $pager_url - ); - $pager->setTemplate('{%page} '); - $pager->setSelectedTemplate('{%page} '); - $objects = $pager->getPager()->execute(); - - $context = array( - 'orderable'=>$this->_orderable(), - 'page_title'=>$this->page_title(), - 'header'=>$this->header, - 'objects'=>$objects, - 'pager'=>$pager, - 'classname'=>$this->verbose_name(), - 'perms'=>$this->getPerms($request), - 'filters'=>$this->filters, - 'admin_title' => IPF::get('admin_title'), - 'is_search' => $this->_isSearch(), - 'search_value' => $this->search_value, - 'lapp'=>$lapp, - 'lmodel'=>$lmodel, - 'indexpage_url'=>IPF::get('indexpage_url','/'), - ); - return IPF_Shortcuts::RenderToResponse('admin/items.html', $context, $request); - } - function page_title(){ return $this->verbose_name().' List'; } diff --git a/ipf/admin/views.php b/ipf/admin/views.php index a663d9f..852ebe0 100644 --- a/ipf/admin/views.php +++ b/ipf/admin/views.php @@ -11,17 +11,20 @@ function IPF_Admin_Views_Index($request, $match){ $models = new IPF_Template_ContextVars(); $models_found = false; foreach($app->modelList() as $m){ - $ma = IPF_Admin_Model::getModelAdmin($m); if ($ma!==null){ $perms = $ma->getPerms($request); if (array_search('view', $perms)!==false){ - $models[] = new IPF_Template_ContextVars(array( - 'name'=>$ma->verbose_name(), - 'path'=>strtolower($m), - 'perms'=>$perms, - )); - $models_found = true; + $user_perms = IPF_Auth_App::checkPermissions($request, $app, $m, array('view')); + if ($user_perms['view']) + { + $models[] = new IPF_Template_ContextVars(array( + 'name'=>$ma->verbose_name(), + 'path'=>strtolower($m), + 'perms'=>$perms, + )); + $models_found = true; + } } } } @@ -53,175 +56,208 @@ function IPF_Admin_Views_Index($request, $match){ return IPF_Shortcuts::RenderToResponse('admin/index.html', $context, $request); } - - -function IPF_Admin_Views_ListItems($request, $match){ +function IPF_Admin_Views_ListItems($request, $match) +{ $ca = IPF_Admin_App::checkAdminAuth($request); if ($ca!==true) return $ca; $lapp = $match[1]; $lmodel = $match[2]; - foreach (IPF_Project::getInstance()->appList() as $app){ - foreach($app->modelList() as $m){ - if (strtolower($m)==$lmodel){ - $ma = IPF_Admin_Model::getModelAdmin($m); - if ($ma===null) - return new IPF_HTTP_Response_NotFound(); - return $ma->ListItems($request, $lapp, $lmodel); - } - } + + $am = IPF_Admin_App::GetAppModelFromSlugs($lapp, $lmodel); + + if ($am !== null) + { + $app = $am['app']; + $m = $am['modelname']; + + $ma = IPF_Admin_Model::getModelAdmin($m); + + if ($ma !== null) + return $ma->ListItems($request, $lapp, $lmodel); } + + return new IPF_HTTP_Response_NotFound(); } -function IPF_Admin_Views_Reorder($request, $match){ +function IPF_Admin_Views_AddItem($request, $match) +{ $ca = IPF_Admin_App::checkAdminAuth($request); if ($ca!==true) return $ca; - if ($request->method != 'POST') - return new IPF_HTTP_Response_NotFound(); - - if (!isset($request->POST['ids'])) - return new IPF_HTTP_Response_NotFound(); - - if (!isset($request->POST['prev_ids'])) - return new IPF_HTTP_Response_NotFound(); - - if (!isset($request->POST['drop_id'])) - return new IPF_HTTP_Response_NotFound(); - $lapp = $match[1]; $lmodel = $match[2]; + + $am = IPF_Admin_App::GetAppModelFromSlugs($lapp, $lmodel); + + if ($am !== null) + { + $app = $am['app']; + $m = $am['modelname']; - foreach (IPF_Project::getInstance()->appList() as $app){ - foreach($app->modelList() as $m){ - if (strtolower($m)==$lmodel){ - $ma = IPF_Admin_Model::getModelAdmin($m); - if ($ma===null) - return new IPF_HTTP_Response_NotFound(); - - if (method_exists($ma, 'list_order')) - $ord_field = $ma->list_order(); - else - return new IPF_HTTP_Response_NotFound(); - - $ids = explode(',',(string)$request->POST['ids']); - $prev_ids = explode(',',(string)$request->POST['prev_ids']); - $drop_id = $request->POST['drop_id']; - - $o = new $m(); - $o->_reorder($ids, $ord_field, $drop_id, $prev_ids); - return new IPF_HTTP_Response_Json("Ok"); - } - } + $ma = IPF_Admin_Model::getModelAdmin($m); + + if ($ma !== null) + return $ma->AddItem($request, $lapp, $lmodel); } - return new IPF_HTTP_Response_Json("Cannot find model"); + + return new IPF_HTTP_Response_NotFound(); } -function IPF_Admin_Views_EditItem($request, $match){ +function IPF_Admin_Views_EditItem($request, $match) +{ $ca = IPF_Admin_App::checkAdminAuth($request); if ($ca!==true) return $ca; $lapp = $match[1]; $lmodel = $match[2]; $id = $match[3]; - foreach (IPF_Project::getInstance()->appList() as $app){ - foreach($app->modelList() as $m){ - if (strtolower($m)==$lmodel){ - $ma = IPF_Admin_Model::getModelAdmin($m); - if ($ma===null) - return new IPF_HTTP_Response_NotFound(); - $o = new $m(); - $item = $o->getTable()->find($id); - return $ma->EditItem($request, $lapp, $lmodel, &$item); - } + + $am = IPF_Admin_App::GetAppModelFromSlugs($lapp, $lmodel); + + if ($am !== null) + { + $app = $am['app']; + $m = $am['modelname']; + + $ma = IPF_Admin_Model::getModelAdmin($m); + + if ($ma !== null) + { + $o = new $m(); + $item = $o->getTable()->find($id); + + return $ma->EditItem($request, $lapp, $lmodel, &$item); } } + + return new IPF_HTTP_Response_NotFound(); } -function IPF_Admin_Views_DeleteItem($request, $match){ +function IPF_Admin_Views_DeleteItem($request, $match) +{ $ca = IPF_Admin_App::checkAdminAuth($request); if ($ca!==true) return $ca; $lapp = $match[1]; $lmodel = $match[2]; $id = $match[3]; - foreach (IPF_Project::getInstance()->appList() as $app){ - foreach($app->modelList() as $m){ - if (strtolower($m)==$lmodel){ - $ma = IPF_Admin_Model::getModelAdmin($m); - if ($ma===null) - return new IPF_HTTP_Response_NotFound(); - $o = new $m(); - $item = $o->getTable()->find($id); - return $ma->DeleteItem($request, $lapp, $lmodel, &$item); - } - } + + $am = IPF_Admin_App::GetAppModelFromSlugs($lapp, $lmodel); + + if ($am !== null) + { + $app = $am['app']; + $m = $am['modelname']; + + $ma = IPF_Admin_Model::getModelAdmin($m); + + if ($ma !== null) + { + $o = new $m(); + $item = $o->getTable()->find($id); + + return $ma->DeleteItem($request, $lapp, $lmodel, &$item); + } } + + return new IPF_HTTP_Response_NotFound(); } - -function IPF_Admin_Views_AddItem($request, $match){ +function IPF_Admin_Views_Reorder($request, $match) +{ $ca = IPF_Admin_App::checkAdminAuth($request); if ($ca!==true) return $ca; + if ($request->method != 'POST' || !isset($request->POST['ids']) || !isset($request->POST['prev_ids']) || !isset($request->POST['drop_id'])) + return new IPF_HTTP_Response_NotFound(); + $lapp = $match[1]; $lmodel = $match[2]; - foreach (IPF_Project::getInstance()->appList() as $app){ - foreach($app->modelList() as $m){ - if (strtolower($m)==$lmodel){ - $ma = IPF_Admin_Model::getModelAdmin($m); - if ($ma===null) - return new IPF_HTTP_Response_NotFound(); - return $ma->AddItem($request, $lapp, $lmodel); - } - } + + $am = IPF_Admin_App::GetAppModelFromSlugs($lapp, $lmodel); + + if ($am !== null) + { + $app = $am['app']; + $m = $am['modelname']; + + $user_perms = IPF_Auth_App::checkPermissions($request, $app, $m, array('view', 'change')); + $ma = ($user_perms['view'] && $user_perms['change']) ? IPF_Admin_Model::getModelAdmin($m) : null; + + if ($ma !==null && method_exists($ma, 'list_order')) + { + $ord_field = $ma->list_order(); + + $ids = explode(',',(string)$request->POST['ids']); + $prev_ids = explode(',',(string)$request->POST['prev_ids']); + $drop_id = $request->POST['drop_id']; + + $o = new $m(); + $o->_reorder($ids, $ord_field, $drop_id, $prev_ids); + + return new IPF_HTTP_Response_Json("Ok"); + } } + + return new IPF_HTTP_Response_Json("Cannot find model"); } -function IPF_Admin_Views_ChangePassword($request, $match){ +function IPF_Admin_Views_ChangePassword($request, $match) +{ $ca = IPF_Admin_App::checkAdminAuth($request); if ($ca!==true) return $ca; $lapp = 'auth'; $lmodel = 'user'; $id = $match[1]; - foreach (IPF_Project::getInstance()->appList() as $app){ - foreach($app->modelList() as $m){ - if (strtolower($m)==$lmodel){ - $ma = IPF_Admin_Model::getModelAdmin($m); - if ($ma===null) - return new IPF_HTTP_Response_NotFound(); - $o = new $m(); - $user = $o->getTable()->find($id); - - if ($request->method == 'POST'){ - $form = new IPF_Auth_Forms_ChangePassword($request->POST); - if ($form->isValid()) { - $user->setPassword($form->cleaned_data['password1']); - $user->save(); - $url = IPF_HTTP_URL_urlForView('IPF_Admin_Views_ListItems', array($lapp, $lmodel)); - return new IPF_HTTP_Response_Redirect($url); - } + + $am = IPF_Admin_App::GetAppModelFromSlugs($lapp, $lmodel); + + if ($am !== null) + { + $app = $am['app']; + $m = $am['modelname']; + + $ma = IPF_Admin_Model::getModelAdmin($m); + + if ($ma !== null) + { + $o = new $m(); + $user = $o->getTable()->find($id); + + if ($request->method == 'POST') + { + $form = new IPF_Auth_Forms_ChangePassword($request->POST); + + if ($form->isValid()) + { + $user->setPassword($form->cleaned_data['password1']); + $user->save(); + + return new IPF_HTTP_Response_Redirect(IPF_HTTP_URL_urlForView('IPF_Admin_Views_ListItems', array($lapp, $lmodel))); } - else - $form = new IPF_Auth_Forms_ChangePassword(); - $context = array( - 'page_title'=>'Change Password: '.$user->username, - 'classname'=>'User', - 'object'=>$user, - 'form'=>$form, - 'lapp'=>$lapp, - 'lmodel'=>$lmodel, - 'admin_title' => IPF::get('admin_title'), - 'indexpage_url'=>IPF::get('indexpage_url','/'), - ); - return IPF_Shortcuts::RenderToResponse('admin/changepassword.html', $context, $request); } + else $form = new IPF_Auth_Forms_ChangePassword(); + + $context = array( + 'page_title'=>'Change Password: '.$user->username, + 'classname'=>'User', + 'object'=>$user, + 'form'=>$form, + 'lapp'=>$lapp, + 'lmodel'=>$lmodel, + 'admin_title' => IPF::get('admin_title'), + 'indexpage_url'=>IPF::get('indexpage_url','/'), + ); + + return IPF_Shortcuts::RenderToResponse('admin/changepassword.html', $context, $request); } } + + return new IPF_HTTP_Response_NotFound(); } - function IPF_Admin_Views_Login($request, $match){ $success_url = ''; if (!empty($request->REQUEST['next'])) @@ -399,17 +435,15 @@ function IPF_Admin_Views_FileBrowser($request, $match){ return IPF_Shortcuts::RenderToResponse('admin/filebrowser.html', $context, $request); } -function IPF_Admin_Views_FileBrowserRename($request, $match){ +function IPF_Admin_Views_FileBrowserRename($request, $match) +{ $ca = IPF_Admin_App::checkAdminAuth($request); if ($ca!==true) return $ca; $old_name = @$request->POST['old_value']; $name = @$request->POST['value']; - $curr_dir = @$request->POST['curr_dir']; +// $curr_dir = @$request->POST['curr_dir']; if ($name=='') - $name==$old_name; - else - $name = $name; + $name=$old_name; return new IPF_HTTP_Response($name); } - diff --git a/ipf/application.php b/ipf/application.php index 9716be1..52e488a 100644 --- a/ipf/application.php +++ b/ipf/application.php @@ -50,6 +50,11 @@ abstract class IPF_Application{ public function getTitle(){ return $this->name; } + + public function getPath() + { + return $this->path; + } public function getSlug(){ $e = explode('_',$this->name); @@ -61,7 +66,7 @@ abstract class IPF_Application{ return; return IPF_ORM::createTablesFromModels($this->path.'models'); } - + public function generateModels(){ IPF_ORM::generateModelsFromYaml($this->path.'models.yml', $this->path.'models'); } @@ -71,4 +76,4 @@ abstract class IPF_Application{ return; IPF_ORM::loadModels($this->path.'models'); } -} \ No newline at end of file +} diff --git a/ipf/auth/app.php b/ipf/auth/app.php index 5511bae..001b141 100644 --- a/ipf/auth/app.php +++ b/ipf/auth/app.php @@ -1,13 +1,14 @@ array('User','Role') + 'models'=>self::ArePermissionsEnabled(true) ? array('User', 'Role',) : array('User'), )); } - + static function login($request, $user){ $request->user = $user; $request->session->clear(); @@ -24,4 +25,167 @@ class IPF_Auth_App extends IPF_Application{ $request->session->clear(); $request->session->setData('logout_time', gmdate('Y-m-d H:i:s')); } -} \ No newline at end of file + + static function createPermissionsFromModels(array $pathesToModels) + { + $baseAdmin = new IPF_Admin_Model(); + $basePerms = $baseAdmin->getPerms(); + $permsTable = IPF_ORM::getTable('Permission'); + $appList = IPF_Project::getInstance()->appList(); + + $permissions = array(); + + foreach ($pathesToModels as $path) + { + foreach (IPF_ORM::filterInvalidModels(IPF_ORM::loadModels($path)) as $modelName) + { + $adminModel = IPF_Admin_Model::getModelAdmin($modelName); + + if ($adminModel) + { + $perms = method_exists($adminModel, 'getPerms') ? $adminModel->getPerms(null) : $basePerms; + + foreach ($appList as $app) + { + if (in_array($modelName, $app->modelList()) && (!method_exists($app, 'NoPermsFor') || !in_array($modelName, $app->NoPermsFor()))) + { + foreach ($perms as $permName) + $permissions[] = get_class($app).'|'.$modelName.'|'.$permName; + } + } + } + } + } + + print "COLLECTED PERMS:\n----\n".implode("\n", $permissions)."\n----\n"; + + if (count($permissions)) + { + $existingPerms = array(); + + foreach ($permsTable->findAll() as $model) + $existingPerms[] = $model->name; + + print "EXISTING PERMS:\n----\n".implode("\n",$existingPerms)."\n----\n"; + + if (count($existingPerms)) + { + $toDel = array_diff($existingPerms, $permissions); + + print "2DEL:\n----\n".implode("\n",$toDel)."\n----\n"; + + if (count($toDel)) + { + $permsTable->createQuery() + ->delete() + ->where("name in ('".implode("','", $toDel)."')") + ->execute(); + } + + $toAdd = array_diff($permissions, $existingPerms); + } + else // first time + { + // *** FIX: previously, the following models haven't "onDelete: CASCADE" constrain *** + print "DROP RolePermission, UserRole, UserPermission\n"; + $export = IPF_ORM_Manager::connection()->export; + $export->dropTable(IPF_ORM::getTable('RolePermission')->getTableName()); + $export->dropTable(IPF_ORM::getTable('UserRole')->getTableName()); + $export->dropTable(IPF_ORM::getTable('UserPermission')->getTableName()); + $auth_app = new IPF_Auth_App(); + $auth_app->createTablesFromModels(); + // *** FIX *** + + $toAdd = $permissions; + } + + print "2ADD:\n----\n".implode("\n",$toAdd)."\n----\n"; + + foreach ($toAdd as $name) + { + $model = new Permission(); + $model->name = $name; + $model->save(); + } + } + else + { + print "REMOVE ALL\n"; + + $permsTable->createQuery()->delete()->execute(); // no women, no cry... + } + } + + static function ArePermissionsEnabled($use_hack=false) + { + if ($use_hack) + { + $path = str_replace('app.php','',__FILE__); + require_once($path.'models/_generated/BasePermission.php'); + require_once($path.'models/Permission.php'); + } + + return IPF_ORM_Query::create()->from('Permission')->count() ? true : false; + } + + static function checkPermissions($request, $app, $modelName, array $perms) + { + $count = count($perms); + + if (!$count) + return array(); + + $permissions = array_combine($perms, array_fill(0, $count, false)); + + if ($request->user->isAnonymous() || !($request->user->is_staff || $request->user->is_superuser)) + return $permissions; + + if ($request->user->is_superuser || !self::ArePermissionsEnabled()) + return array_combine($perms, array_fill(0, $count, true)); + + $user_permissions = array(); + + foreach ($request->user->Permissions as $up) + $user_permissions[] = $up->name; + + foreach ($request->user->Roles as $role) + { + foreach ($role->Permissions as $rp) + { + if (!in_array($rp->name, $user_permissions)) + $user_permissions[] = $rp->name; + } + } + + if (!count($user_permissions)) + return $permissions; + + $prefix = get_class($app).'|'.$modelName.'|'; + + foreach ($permissions as $permName=>&$permValue) + { + $permissionValue = $prefix.$permName; + + foreach ($user_permissions as $user_permission_value) + { + if ($permissionValue == $user_permission_value) + { + $permValue = true; + break; + } + } + } + + return $permissions; + } + + static function GetHumanNameOfPermission($permissionName) + { + $parts = explode('|', $permissionName); + $appName = $parts[0]; + $app = new $appName(); + $admin = IPF_Admin_Model::getModelAdmin($parts[1]); + + return $app->getTitle().' | '.$admin->verbose_name().' | '.ucfirst($parts[2]); + } +} diff --git a/ipf/auth/forms/widget/permissions.php b/ipf/auth/forms/widget/permissions.php new file mode 100644 index 0000000..736cbf9 --- /dev/null +++ b/ipf/auth/forms/widget/permissions.php @@ -0,0 +1,13 @@ +name); + } +} diff --git a/ipf/auth/models/Role.php b/ipf/auth/models/Role.php index 8e50ebd..6f6c3e9 100644 --- a/ipf/auth/models/Role.php +++ b/ipf/auth/models/Role.php @@ -1,9 +1,53 @@ name; + } +} -} \ No newline at end of file +class AdminRole extends IPF_Admin_Model +{ + public function list_display() + { + return array( + 'name', + ); + } + + public function fields() + { + return array( + 'name', + 'Permissions', + ); + } + + function _searchFields() + { + return array( + 'name', + ); + } + + protected function _getForm($model_obj, $data, $extra) + { + $extra['model'] = $model_obj; + $extra['checkgroup_fields'] = array( + 'Permissions' => array('widget'=>'IPF_Auth_Forms_Widget_Permissions'), + ); + return new IPF_Form_Extra_CheckGroup($data, $extra); + } + + protected function _setupForm($form) + { + IPF_Form_Extra_CheckGroup::SetupForm($form); + } + + public function page_title() { return 'Group'; } + public function verbose_name() { return 'Group'; } +} + +IPF_Admin_Model::register('Role','AdminRole'); diff --git a/ipf/auth/models/User.php b/ipf/auth/models/User.php index 6bedd6c..9ec946a 100644 --- a/ipf/auth/models/User.php +++ b/ipf/auth/models/User.php @@ -1,67 +1,140 @@ fields['email']->label = 'E-mail'; + + $this->fields['is_active']->label = 'Active'; + $this->fields['is_staff']->label = 'Staff status'; + $this->fields['is_superuser']->label = 'Superuser status'; - protected function _setupForm($form){ - $form->fields['username']->help_text = 'Required. 32 characters or less. Alphanumeric characters only (letters, digits and underscores).'; - $form->fields['password']->help_text = "Use '[algo]$[salt]$[hexdigest]' or use the change password form."; + $this->fields['is_active']->help_text = 'Designates whether this user should be treated as active. Unselect this instead of deleting accounts.'; + $this->fields['is_staff']->help_text = 'Designates whether the user can log into this admin site.'; + $this->fields['is_superuser']->help_text = 'Designates that this user has all permissions without explicitly assigning them.'; - $form->fields['email']->label = 'E-mail'; + $this->fields['username']->help_text = 'Required. 32 characters or less. Alphanumeric characters only (letters, digits and underscores).'; - $form->fields['is_active']->label = 'Active'; - $form->fields['is_staff']->label = 'Staff status'; - $form->fields['is_superuser']->label = 'Superuser status'; + if (!$this->model->id) + { + unset($this->fields['password']); + + $this->fields['password1'] = new IPF_Form_Field_Varchar(array( + 'label' => 'Password', + 'required' => true, + 'max_length' => 32, + 'widget' => 'IPF_Form_Widget_PasswordInput' + )); + + $this->fields['password2'] = new IPF_Form_Field_Varchar(array( + 'label' => 'Password (again)', + 'required' => true, + 'max_length' => 32, + 'widget' => 'IPF_Form_Widget_PasswordInput', + 'help_text' => 'Enter the same password as above, for verification.' + )); + + $account = array('username', 'password1', 'password2'); + } + else + { + $this->fields['password']->help_text = "Use '[algo]$[salt]$[hexdigest]' or use the change password form."; + + $account = array('username', 'password'); + } + + if (IPF_Auth_App::ArePermissionsEnabled()) + { + $this->fields['Roles']->label = 'Groups'; + $this->fields['Roles']->help_text = 'In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in.'; - $form->fields['is_active']->help_text = 'Designates whether this user should be treated as active. Unselect this instead of deleting accounts.'; - $form->fields['is_staff']->help_text = 'Designates whether the user can log into this admin site.'; - $form->fields['is_superuser']->help_text = 'Designates that this user has all permissions without explicitly assigning them.'; + parent::SetupForm($this); + } + else + { + $this->fields['Permissions']->widget = new IPF_Form_Widget_HiddenInput(); + $this->fields['Roles']->widget = new IPF_Form_Widget_HiddenInput(); + } - $form->field_groups = array( - array('fields'=>array('username', 'password')), - array('fields'=>array('email', 'first_name', 'last_name'), 'label'=>'Personal info'), - array('fields'=>array('is_active', 'is_staff', 'is_superuser'), 'label'=>'Permissions'), + $this->field_groups = array( + array('fields' => $account), + array('fields' => array('email', 'first_name', 'last_name'), 'label' => 'Personal info'), + array('fields' => array('is_active', 'is_staff', 'is_superuser','Permissions','Roles'), 'label' => 'Permissions'), ); } - - public function AddItem($request, $lapp, $lmodel){ - if ($request->method == 'POST'){ - $form = new IPF_Auth_Forms_UserCreation($request->POST); - if ($form->isValid()) { - $user = User::createUser( - $form->cleaned_data['username'], - $form->cleaned_data['password1'], - $form->cleaned_data['email'], - $form->cleaned_data['first_name'], - $form->cleaned_data['last_name'], - $form->cleaned_data['is_active'], - $form->cleaned_data['is_staff'], - $form->cleaned_data['is_superuser'] - ); - AdminLog::logAction($request, $user, AdminLog::ADDITION); - $url = IPF_HTTP_URL_urlForView('IPF_Admin_Views_ListItems', array($lapp, $lmodel)); - return new IPF_HTTP_Response_Redirect($url); + + function isValid() + { + $ok = parent::isValid(); + + if ($ok===true && !$this->model->id) + { + if ($this->cleaned_data['password1'] != $this->cleaned_data['password2']) + { + $this->is_valid = false; + $this->errors['password2'][] = "The two password fields didn't match."; + + return false; } + + $this->cleaned_data['password'] = User::SetPassword2($this->cleaned_data['password1']); } - else - $form = new IPF_Auth_Forms_UserCreation(); - $context = array( - 'page_title'=>'Add '.$this->modelName, - 'classname'=>$this->modelName, - 'form'=>$form, - 'lapp'=>$lapp, - 'lmodel'=>$lmodel, - 'perms'=>array('add'), - 'mode'=>'add', - 'admin_title' => IPF::get('admin_title'), - ); - return IPF_Shortcuts::RenderToResponse('admin/change.html', $context, $request); + + return $ok; } } +class AdminUser extends IPF_Admin_Model +{ + public function list_display() + { + return array( + 'username', + 'email', + 'is_active', + 'is_staff', + 'is_superuser', + 'created_at', + ); + } + + public function fields() + { + return array( + 'username', + 'password', + 'email', + 'first_name', + 'last_name', + 'is_active', + 'is_staff', + 'is_superuser', + 'Permissions', + 'Roles', + ); + } + + function _searchFields() + { + return array( + 'username', + 'email', + ); + } + + protected function _getForm($model_obj, $data, $extra) + { + $extra['model'] = $model_obj; + $extra['checkgroup_fields'] = array( + 'Permissions' => array('widget'=>'IPF_Auth_Forms_Widget_Permissions'), + 'Roles' => array(), + ); + return new IPFAuthAdminUserForm($data, $extra); + } +} class User extends BaseUser { @@ -85,7 +158,8 @@ class User extends BaseUser return $name; } - static function createUser($username, $password=null, $email=null, $first_name=null, $last_name=null, $is_active=false, $is_staff=false, $is_superuser=false){ + static function createUser($username, $password=null, $email=null, $first_name=null, $last_name=null, $is_active=false, $is_staff=false, $is_superuser=false) + { $user = new User(); $user->username = $username; @@ -126,9 +200,13 @@ class User extends BaseUser $this->password = UNUSABLE_PASSWORD; } - function setPassword($raw_password){ + static function SetPassword2($raw_password){ $salt = IPF_Utils::randomString(5); - $this->password = 'sha1:'.$salt.':'.sha1($salt.$raw_password); + return 'sha1:'.$salt.':'.sha1($salt.$raw_password); + } + + function setPassword($raw_password){ + $this->password = self::SetPassword2($raw_password); } function checkPassword($password){ diff --git a/ipf/auth/models/_generated/BasePermission.php b/ipf/auth/models/_generated/BasePermission.php index 4be9891..683a3b6 100644 --- a/ipf/auth/models/_generated/BasePermission.php +++ b/ipf/auth/models/_generated/BasePermission.php @@ -20,6 +20,9 @@ abstract class BasePermission extends IPF_ORM_Record $this->hasMany('User as Users', array('refClass' => 'UserPermission', 'local' => 'permission_id', 'foreign' => 'user_id')); + $this->hasMany('Role as Roles', array('refClass' => 'RolePermission', + 'local' => 'permission_id', + 'foreign' => 'role_id')); $this->hasMany('RolePermission', array('local' => 'id', 'foreign' => 'permission_id')); @@ -27,4 +30,4 @@ abstract class BasePermission extends IPF_ORM_Record $this->hasMany('UserPermission', array('local' => 'id', 'foreign' => 'permission_id')); } -} \ No newline at end of file +} diff --git a/ipf/auth/models/_generated/BaseRole.php b/ipf/auth/models/_generated/BaseRole.php index 6486330..cf1f9fe 100644 --- a/ipf/auth/models/_generated/BaseRole.php +++ b/ipf/auth/models/_generated/BaseRole.php @@ -20,6 +20,10 @@ abstract class BaseRole extends IPF_ORM_Record $this->hasMany('User as Users', array('refClass' => 'UserRole', 'local' => 'role_id', 'foreign' => 'user_id')); + $this->hasMany('Permission as Permissions', array('refClass' => 'RolePermission', + 'local' => 'role_id', + 'foreign' => 'permission_id')); + $this->hasMany('RolePermission', array('local' => 'id', 'foreign' => 'role_id')); @@ -27,4 +31,4 @@ abstract class BaseRole extends IPF_ORM_Record $this->hasMany('UserRole', array('local' => 'id', 'foreign' => 'role_id')); } -} \ No newline at end of file +} diff --git a/ipf/auth/models/_generated/BaseRolePermission.php b/ipf/auth/models/_generated/BaseRolePermission.php index 807bb5b..2cef6dd 100644 --- a/ipf/auth/models/_generated/BaseRolePermission.php +++ b/ipf/auth/models/_generated/BaseRolePermission.php @@ -19,9 +19,11 @@ abstract class BaseRolePermission extends IPF_ORM_Record public function setUp() { $this->hasOne('Role', array('local' => 'role_id', - 'foreign' => 'id')); + 'foreign' => 'id', + 'onDelete' => 'CASCADE')); $this->hasOne('Permission', array('local' => 'permission_id', - 'foreign' => 'id')); + 'foreign' => 'id', + 'onDelete' => 'CASCADE')); } -} \ No newline at end of file +} diff --git a/ipf/auth/models/_generated/BaseUserPermission.php b/ipf/auth/models/_generated/BaseUserPermission.php index 988247a..738077c 100644 --- a/ipf/auth/models/_generated/BaseUserPermission.php +++ b/ipf/auth/models/_generated/BaseUserPermission.php @@ -19,9 +19,11 @@ abstract class BaseUserPermission extends IPF_ORM_Record public function setUp() { $this->hasOne('User', array('local' => 'user_id', - 'foreign' => 'id')); + 'foreign' => 'id', + 'onDelete' => 'CASCADE')); $this->hasOne('Permission', array('local' => 'permission_id', - 'foreign' => 'id')); + 'foreign' => 'id', + 'onDelete' => 'CASCADE')); } -} \ No newline at end of file +} diff --git a/ipf/auth/models/_generated/BaseUserRole.php b/ipf/auth/models/_generated/BaseUserRole.php index 363ff01..adb583b 100644 --- a/ipf/auth/models/_generated/BaseUserRole.php +++ b/ipf/auth/models/_generated/BaseUserRole.php @@ -19,9 +19,11 @@ abstract class BaseUserRole extends IPF_ORM_Record public function setUp() { $this->hasOne('User', array('local' => 'user_id', - 'foreign' => 'id')); + 'foreign' => 'id', + 'onDelete' => 'CASCADE')); $this->hasOne('Role', array('local' => 'role_id', - 'foreign' => 'id')); + 'foreign' => 'id', + 'onDelete' => 'CASCADE')); } -} \ No newline at end of file +} diff --git a/ipf/cli.php b/ipf/cli.php index 2abaacd..00e2132 100644 --- a/ipf/cli.php +++ b/ipf/cli.php @@ -5,7 +5,7 @@ class IPF_Cli{ protected $commands; public function __construct(){ - $this->commands = array('help','sql','buildmodels','buildcontribmodels','syncdb', 'createsuperuser'); + $this->commands = array('help','sql','buildmodels','buildcontribmodels','syncdb', 'createsuperuser', 'syncperms'); } protected function usage(&$args){ @@ -33,6 +33,12 @@ class IPF_Cli{ print "Create Tables From Model Classes\n"; IPF_Project::getInstance()->createTablesFromModels(); } + + protected function syncperms(&$args) + { + print "Create/Update Permissions From Model Classes\n"; + IPF_Project::getInstance()->createPermissionsFromModels(); + } protected function buildmodels(&$args){ print "Build All Model Classses\n"; @@ -44,7 +50,6 @@ class IPF_Cli{ IPF_Project::getInstance()->generateContribModels(); } - protected function createSuperUser(&$args){ print "Create SuperUser\n"; @@ -88,4 +93,4 @@ class IPF_Cli{ print "Unknown command: '".$args[1]."'\n"; $this->usage($args); } -} \ No newline at end of file +} diff --git a/ipf/form/extra/addjs.php b/ipf/form/extra/addjs.php new file mode 100644 index 0000000..d00bb74 --- /dev/null +++ b/ipf/form/extra/addjs.php @@ -0,0 +1,21 @@ +add_js[] = ''; + + if (array_key_exists('add_js', $extra) && is_array($extra['add_js'])) + $this->add_js = array_merge($this->add_js, $extra['add_js']); + } + + public function render_commonjs() + { + return implode('', $this->add_js); + } +} \ No newline at end of file diff --git a/ipf/form/extra/checkgroup.php b/ipf/form/extra/checkgroup.php new file mode 100644 index 0000000..e9b0d26 --- /dev/null +++ b/ipf/form/extra/checkgroup.php @@ -0,0 +1,51 @@ +checkgroup_fields = $extra['checkgroup_fields']; + } + + static function SetupForm($form, $checkgroup_fields=null) + { + if (!$checkgroup_fields) + $checkgroup_fields = &$form->checkgroup_fields; + + foreach ($checkgroup_fields as $fieldName=>&$params) + { + $field = $form->fields[$fieldName]; + + if (array_key_exists('label', $params)) + $field->label = $params['label']; + + $widget = null; + if (array_key_exists('widget', $params)) + $widget = $params['widget']; + if (!$widget) + $widget = 'IPF_Form_Extra_Widget_CheckboxGroupInput'; + + $field->widget = new $widget(array( + 'choices' => $field->widget->choices, + )); + + if (array_key_exists('class', $field->widget->attrs) && $field->widget->attrs['class']) + $field->widget->attrs['class'] .= ' checkgroup'; + else $field->widget->attrs['class'] = 'checkgroup'; + } + } + + public function render_commonjs() + { + if (count($this->checkgroup_fields)) + $result = ''; + else $result = ''; + + return implode('', $this->add_js).$result; + } +} diff --git a/ipf/form/extra/widget/checkboxgroupinput.php b/ipf/form/extra/widget/checkboxgroupinput.php new file mode 100644 index 0000000..cca37f1 --- /dev/null +++ b/ipf/form/extra/widget/checkboxgroupinput.php @@ -0,0 +1,30 @@ +buildAttrs($extra_attrs); + $output[] = '
    '; + $choices = array_merge($this->choices, $choices); + $i=0; + $base_id = $final_attrs['id']; + foreach ($choices as $option_label=>$option_value) + { + $final_attrs['id'] = $base_id.'_'.$i; + $final_attrs['value'] = htmlspecialchars($option_value, ENT_COMPAT, 'UTF-8'); + $field = new IPF_Form_Extra_Widget_CheckboxInput($final_attrs); + $rendered = $field->render($name.'[]', in_array($option_value, $value), array('value'=>$option_value)); + $output[] = sprintf( + '

    • ', + $rendered, htmlspecialchars($option_label, ENT_COMPAT, 'UTF-8') + ); + $i++; + } + $output[] = '
'; + return new IPF_Template_SafeString(implode("\n", $output), true); + } +} diff --git a/ipf/form/extra/widget/checkboxinput.php b/ipf/form/extra/widget/checkboxinput.php new file mode 100644 index 0000000..79a0a26 --- /dev/null +++ b/ipf/form/extra/widget/checkboxinput.php @@ -0,0 +1,18 @@ +apps as $appname=>&$app) + { + if (substr($appname,0,4)=='IPF_') + $pathes[] = $this->getApp($appname)->getPath().'models'; + } + + $pathes[] = IPF::get('project_path').DIRECTORY_SEPARATOR.'models'; + + return IPF_Auth_App::createPermissionsFromModels($pathes); + } public function generateSql(){ $sql = ''; @@ -119,4 +134,4 @@ final class IPF_Project{ $this->router = new IPF_Router(); $this->router->dispatch(IPF_HTTP_URL::getAction()); } -} \ No newline at end of file +} -- 2.49.0