From: Andrey Kutejko <andy128k@gmail.com>
Date: Sun, 14 Dec 2014 14:19:03 +0000 (+0200)
Subject: cleanup
X-Git-Tag: 0.6~118
X-Git-Url: https://git.andy128k.dev/?a=commitdiff_plain;h=50d8a06d2ec582a8ebd003425b66870cb8f13841;p=ipf.git

cleanup
---

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