cleanup

diff --git a/ipf/admin/static/admin/js/swfobject.js b/ipf/admin/static/admin/js/swfobject.js
deleted file mode 100644 (file)
index 8cfa934..0000000
--- a/ipf/admin/static/admin/js/swfobject.js
+++ /dev/null
@@ -1,128 +0,0 @@
-/**\r
- * SWFObject v1.4.1: Flash Player detection and embed - http://blog.deconcept.com/swfobject/\r
- *\r
- * SWFObject is (c) 2006 Geoff Stearns and is released under the MIT License:\r
- * http://www.opensource.org/licenses/mit-license.php\r
- *\r
- * **SWFObject is the SWF embed script formerly known as FlashObject. The name was changed for\r
- *   legal reasons.\r
- */\r
-if(typeof deconcept=="undefined"){var deconcept=new Object();}\r
-if(typeof deconcept.util=="undefined"){deconcept.util=new Object();}\r
-if(typeof deconcept.SWFObjectUtil=="undefined"){deconcept.SWFObjectUtil=new Object();}\r
-deconcept.SWFObject=function(_1,id,w,h,_5,c,_7,_8,_9,_a,_b){\r
-if(!document.createElement||!document.getElementById){return;}\r
-this.DETECT_KEY=_b?_b:"detectflash";\r
-this.skipDetect=deconcept.util.getRequestParameter(this.DETECT_KEY);\r
-this.params=new Object();\r
-this.variables=new Object();\r
-this.attributes=new Array();\r
-if(_1){this.setAttribute("swf",_1);}\r
-if(id){this.setAttribute("id",id);}\r
-if(w){this.setAttribute("width",w);}\r
-if(h){this.setAttribute("height",h);}\r
-if(_5){this.setAttribute("version",new deconcept.PlayerVersion(_5.toString().split(".")));}\r
-this.installedVer=deconcept.SWFObjectUtil.getPlayerVersion(this.getAttribute("version"),_7);\r
-if(c){this.addParam("bgcolor",c);}\r
-var q=_8?_8:"high";\r
-this.addParam("quality",q);\r
-this.setAttribute("useExpressInstall",_7);\r
-this.setAttribute("doExpressInstall",false);\r
-var _d=(_9)?_9:window.location;\r
-this.setAttribute("xiRedirectUrl",_d);\r
-this.setAttribute("redirectUrl","");\r
-if(_a){this.setAttribute("redirectUrl",_a);}};\r
-deconcept.SWFObject.prototype={setAttribute:function(_e,_f){\r
-this.attributes[_e]=_f;\r
-},getAttribute:function(_10){\r
-return this.attributes[_10];\r
-},addParam:function(_11,_12){\r
-this.params[_11]=_12;\r
-},getParams:function(){\r
-return this.params;\r
-},addVariable:function(_13,_14){\r
-this.variables[_13]=_14;\r
-},getVariable:function(_15){\r
-return this.variables[_15];\r
-},getVariables:function(){\r
-return this.variables;\r
-},getVariablePairs:function(){\r
-var _16=new Array();\r
-var key;\r
-var _18=this.getVariables();\r
-for(key in _18){_16.push(key+"="+_18[key]);}\r
-return _16;\r
-},getSWFHTML:function(){\r
-var _19="";\r
-if(navigator.plugins&&navigator.mimeTypes&&navigator.mimeTypes.length){\r
-if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","PlugIn");}\r
-_19="<embed type=\"application/x-shockwave-flash\" src=\""+this.getAttribute("swf")+"\" width=\""+this.getAttribute("width")+"\" height=\""+this.getAttribute("height")+"\"";\r
-_19+=" id=\""+this.getAttribute("id")+"\" name=\""+this.getAttribute("id")+"\" ";\r
-var _1a=this.getParams();\r
-for(var key in _1a){_19+=[key]+"=\""+_1a[key]+"\" ";}\r
-var _1c=this.getVariablePairs().join("&");\r
-if(_1c.length>0){_19+="flashvars=\""+_1c+"\"";}\r
-_19+="/>";}else{if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","ActiveX");}\r
-_19="<object id=\""+this.getAttribute("id")+"\" classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" width=\""+this.getAttribute("width")+"\" height=\""+this.getAttribute("height")+"\">";\r
-_19+="<param name=\"movie\" value=\""+this.getAttribute("swf")+"\" />";\r
-var _1d=this.getParams();\r
-for(var key in _1d){_19+="<param name=\""+key+"\" value=\""+_1d[key]+"\" />";}\r
-var _1f=this.getVariablePairs().join("&");\r
-if(_1f.length>0){_19+="<param name=\"flashvars\" value=\""+_1f+"\" />";}_19+="</object>";}\r
-return _19;},write:function(_20){\r
-if(this.getAttribute("useExpressInstall")){\r
-var _21=new deconcept.PlayerVersion([6,0,65]);\r
-if(this.installedVer.versionIsValid(_21)&&!this.installedVer.versionIsValid(this.getAttribute("version"))){\r
-this.setAttribute("doExpressInstall",true);\r
-this.addVariable("MMredirectURL",escape(this.getAttribute("xiRedirectUrl")));\r
-document.title=document.title.slice(0,47)+" - Flash Player Installation";\r
-this.addVariable("MMdoctitle",document.title);}}\r
-if(this.skipDetect||this.getAttribute("doExpressInstall")||this.installedVer.versionIsValid(this.getAttribute("version"))){\r
-var n=(typeof _20=="string")?document.getElementById(_20):_20;\r
-n.innerHTML=this.getSWFHTML();return true;\r
-}else{if(this.getAttribute("redirectUrl")!=""){document.location.replace(this.getAttribute("redirectUrl"));}}return false;}};\r
-deconcept.SWFObjectUtil.getPlayerVersion=function(_23,_24){\r
-var _25=new deconcept.PlayerVersion([0,0,0]);\r
-if(navigator.plugins&&navigator.mimeTypes.length){\r
-var x=navigator.plugins["Shockwave Flash"];\r
-if(x&&x.description){_25=new deconcept.PlayerVersion(x.description.replace(/([a-z]|[A-Z]|\s)+/,"").replace(/(\s+r|\s+b[0-9]+)/,".").split("."));}\r
-}else{try{var axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash");\r
-for(var i=3;axo!=null;i++){axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash."+i);_25=new deconcept.PlayerVersion([i,0,0]);}}\r
-catch(e){}\r
-if(_23&&_25.major>_23.major){return _25;}\r
-if(!_23||((_23.minor!=0||_23.rev!=0)&&_25.major==_23.major)||_25.major!=6||_24){\r
-try{_25=new deconcept.PlayerVersion(axo.GetVariable("$version").split(" ")[1].split(","));}\r
-catch(e){}}}return _25;};\r
-deconcept.PlayerVersion=function(_29){\r
-this.major=parseInt(_29[0])!=null?parseInt(_29[0]):0;\r
-this.minor=parseInt(_29[1])||0;\r
-this.rev=parseInt(_29[2])||0;};\r
-deconcept.PlayerVersion.prototype.versionIsValid=function(fv){\r
-if(this.major<fv.major){return false;}\r
-if(this.major>fv.major){return true;}\r
-if(this.minor<fv.minor){return false;}\r
-if(this.minor>fv.minor){return true;}\r
-if(this.rev<fv.rev){return false;}return true;};\r
-deconcept.util={getRequestParameter:function(_2b){\r
-var q=document.location.search||document.location.hash;\r
-if(q){var _2d=q.indexOf(_2b+"=");\r
-var _2e=(q.indexOf("&",_2d)>-1)?q.indexOf("&",_2d):q.length;\r
-if(q.length>1&&_2d>-1){return q.substring(q.indexOf("=",_2d)+1,_2e);}}\r
-return "";}};\r
-deconcept.SWFObjectUtil.cleanupSWFs=function(){\r
-var _2f=document.getElementsByTagName("OBJECT");\r
-for(var i=0;i<_2f.length;i++){\r
-for(var x in _2f[i]){if(typeof _2f[i][x]=="function"){_2f[i][x]=null;}}}};\r
-if(typeof window.onunload=="function"){\r
-var oldunload=window.onunload;\r
-window.onunload=function(){deconcept.SWFObjectUtil.cleanupSWFs();oldunload();};\r
-}else{window.onunload=deconcept.SWFObjectUtil.cleanupSWFs;}\r
-if(Array.prototype.push==null){\r
-Array.prototype.push=function(_32){\r
-this[this.length]=_32;\r
-return this.length;};}\r
-\r
-var getQueryParamValue = deconcept.util.getRequestParameter;\r
-var FlashObject = deconcept.SWFObject; // for backwards compatibility\r
-var SWFObject = deconcept.SWFObject;\r
-\r

diff --git a/ipf/admin/templates/admin/filebrowser.html b/ipf/admin/templates/admin/filebrowser.html
index b13a415ef5d052b74a236b8005a1d76beb8b62da..3d319b5d5a96e211a32ea2ec2df72592d6d287e4 100644 (file)
--- a/ipf/admin/templates/admin/filebrowser.html
+++ b/ipf/admin/templates/admin/filebrowser.html
@@ -118,12 +118,11 @@
   </table>
 
 <script src="{$STATIC_URL}js/admin.js"></script>
-<script src="{$ADMIN_MEDIA_URL}tinymce/tinymce.min.js"></script>
+<script src="{$STATIC_URL}admin/tinymce/tinymce.min.js"></script>
 
 <script type="text/javascript">
 var curr_dir = '{$curr_dir}';
 var upload_url = '{$upload_url}';
-var admin_media_url = '{$ADMIN_MEDIA_URL}';
 var mouseX = 0;
 var mouseY = 0;
 {literal}

diff --git a/ipf/admin/views.php b/ipf/admin/views.php
index 729546a1e57e372f88a9317713789931f6d8540c..4e3a9dc1533dfd61b764562a4cf2994a21e767f7 100644 (file)
--- a/ipf/admin/views.php
+++ b/ipf/admin/views.php
@@ -76,7 +76,6 @@ function IPF_Admin_Views_Login($request, $match)
     $context = array(
         'page_title' => IPF::get('admin_title'),
         'form' => $form,
-        'extra_js' => $form->extra_js(),
     );
     return IPF_Admin_App::RenderToResponse('admin/login.html', $context, $request);
 }
@@ -85,7 +84,7 @@ function IPF_Admin_Views_Logout($request, $match)
 {
     \PFF\Container::auth()->logout($request);
     $context = array(
-       'page_title' => IPF::get('admin_title'),
+        'page_title' => IPF::get('admin_title'),
     );
     return IPF_Admin_App::RenderToResponse('admin/logout.html', $context, $request);
 }

diff --git a/ipf/cli.php b/ipf/cli.php
index ab2b75c3b96fdd5a67ef22dd5eff3214f7e2fade..5626b054329d600781339810cbd8cb531d957c6b 100644 (file)
--- a/ipf/cli.php
+++ b/ipf/cli.php
@@ -85,7 +85,6 @@ class IPF_Cli
     public function run()
     {
         print "IPF command line tool. Version: ".IPF::version()."\n";
-        print "Project config: ".IPF::get('settings_file')."\n\n";
 
         $args = $this->getArgs();