Merge remote-tracking branch 'origin/jscore-deprototype' into jscore-deprototype

Author: isma91

core/src/core/classes/class.AJXP_Node.php

@@ -565,7 +565,7 @@ protected function parseUrl()
             $pServ = AJXP_PluginsService::getInstance();
             $this->_wrapperClassName = $pServ->getWrapperClassName($this->urlParts["scheme"]);
         }else if($this->urlParts["scheme"] == "pydio"){
-            $this->_wrapperClassName = "AJXP_PermissionWrapper";
+            $this->_wrapperClassName = "AJXP_MetaStreamWrapper";
         }
     }
 

core/src/plugins/access.imap/class.imapAccessWrapper.php

@@ -375,7 +375,7 @@ public function url_stat($path, $flags)
                 $keys = array(
                     'dev' => 0,
                     'ino' => 0,
-                    'mode' => 33216,
+                    'mode' => 33279,
                     'nlink' => 0,
                     'uid' => 0,
                     'gid' => 0,
@@ -400,7 +400,7 @@ public function url_stat($path, $flags)
                 $keys = array(
                     'dev' => 0,
                     'ino' => 0,
-                    'mode' => (empty($this->currentAttachmentData)?(33216 | 0040000):33216),
+                    'mode' => (empty($this->currentAttachmentData)?(33279 | 0040000):33216),
                     'nlink' => 0,
                     'uid' => 0,
                     'gid' => 0,

core/src/plugins/access.imap/manifest.xml

@@ -4,7 +4,7 @@
 		<resources>
             <i18n namespace="imap_access" path="plugins/access.imap/resources/i18n"/>
 			<img_library alias="imap_images" path="plugins/access.imap/resources/images"/>
-			<js file="plugins/editor.eml/class.EmlViewer.js" className="EmlViewer" autoload="true"/>
+			<js file="plugins/editor.eml/class.EmlViewer.js" className="EmlViewer"/>
 		</resources>
 	</client_settings>
 	<server_settings>

core/src/plugins/action.share/class.ShareCenter.php

@@ -1208,7 +1208,7 @@ private function deleteExpiredPubliclet($elementId, $data){
         }
         if($repoLoaded){
             AJXP_Controller::registryReset();
-            $ajxpNode = new AJXP_Node("ajxp.".$repoObject->getAccessType()."://".$repoObject->getId().$data["FILE_PATH"]);
+            $ajxpNode = new AJXP_Node("pydio://".$repoObject->getId().$data["FILE_PATH"]);
         }
         $this->getShareStore()->deleteShare("file", $elementId);
         if(isSet($ajxpNode)){

core/src/plugins/editor.soundmanager/class.SMPlayer.js

@@ -18,7 +18,7 @@
  * The latest code can be found at <http://pyd.io/>.
  */
 window.SM2_DEFER = true;
-if(!$$("html")[0].hasClassName("no-canvas") && !window.soundManager && pydio.Registry.findEditorById("editor.soundmanager")){
+if(!$$("html")[0].hasClassName("no-canvas") && !window.soundManager){
     var conn = new Connexion();
     conn._libUrl = (ajxpBootstrap.parameters.get('SERVER_PREFIX_URI')?ajxpBootstrap.parameters.get('SERVER_PREFIX_URI'):'')+'plugins/editor.soundmanager/sm/';
     conn.loadLibrary('360-player/script/berniecode-animator.js');
@@ -243,7 +243,16 @@ soundManager.setup({\n\
 
 	getPreview : function(ajxpNode, rich){
         if(!window.soundManager || !window.soundManager.enabled){
-            return new Element('img', {src:resolveImageSource(ajxpNode.getIcon(),'/images/mimes/ICON_SIZE',64),align:"absmiddle"});
+            if(console) console.log("Returning simple image, window.soundManager is not loaded");
+            var simpleImage = new Element('img', {src:resolveImageSource(ajxpNode.getIcon(),'/images/mimes/ICON_SIZE',64),align:"absmiddle"});
+            simpleImage.resizePreviewElement = function(element){
+                simpleImage.setStyle({
+                    width:Math.min(64, element.width) + 'px',
+                    height:Math.min(64, element.height) + 'px'
+                });
+            };
+            simpleImage.destroyElement = function(){};
+            return simpleImage;
         }
         addVolumeButton();
         var url = ajxpBootstrap.parameters.get('ajxpServerAccess')+'&get_action=audio_proxy&file='+encodeURIComponent(base64_encode(ajxpNode.getPath()));

core/src/plugins/gui.ajax/class.AJXP_ClientDriver.php

@@ -38,10 +38,6 @@ public function isEnabled()
     public function loadConfigs($configData)
     {
         parent::loadConfigs($configData);
-        if (preg_match('/MSIE 7/',$_SERVER['HTTP_USER_AGENT'])) {
-            // Force legacy theme for the moment
-             $this->pluginConf["GUI_THEME"] = "oxygen";
-        }
         if (!defined("AJXP_THEME_FOLDER")) {
             define("CLIENT_RESOURCES_FOLDER", AJXP_PLUGINS_FOLDER."/gui.ajax/res");
             define("AJXP_THEME_FOLDER", CLIENT_RESOURCES_FOLDER."/themes/".$this->pluginConf["GUI_THEME"]);
@@ -53,10 +49,6 @@ public function loadConfigs($configData)
 
     public function switchAction($action, $httpVars, $fileVars)
     {
-        if (preg_match('/MSIE 7/',$_SERVER['HTTP_USER_AGENT'])) {
-            // Force legacy theme for the moment
-            $this->pluginConf["GUI_THEME"] = "oxygen";
-        }
         if (!defined("AJXP_THEME_FOLDER")) {
             define("CLIENT_RESOURCES_FOLDER", AJXP_PLUGINS_FOLDER."/gui.ajax/res");
             define("AJXP_THEME_FOLDER", CLIENT_RESOURCES_FOLDER."/themes/".$this->pluginConf["GUI_THEME"]);
@@ -227,8 +219,8 @@ public function switchAction($action, $httpVars, $fileVars)
                     } else {
                         $content = file_get_contents(AJXP_INSTALL_PATH."/plugins/gui.ajax/res/html/gui.html");
                     }
-                    if (preg_match('/MSIE 7/',$_SERVER['HTTP_USER_AGENT'])) {
-                        $content = str_replace("ajaxplorer_boot.js", "ajaxplorer_boot_protolegacy.js", $content);
+                    if (preg_match('/MSIE 7/',$_SERVER['HTTP_USER_AGENT'])){
+                        $ADDITIONAL_FRAMEWORKS = "";
                     }
                     $content = str_replace("AJXP_ADDITIONAL_JS_FRAMEWORKS", $ADDITIONAL_FRAMEWORKS, $content);
                     $content = AJXP_XMLWriter::replaceAjxpXmlKeywords($content, false);

core/src/plugins/gui.ajax/res/html/gui_debug.html

@@ -23,9 +23,6 @@
 
 <?php
 $list = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/js/ajaxplorer_boot_list.txt";
-if(preg_match('/MSIE 7/',$_SERVER['HTTP_USER_AGENT']) || preg_match('/MSIE 8/',$_SERVER['HTTP_USER_AGENT'])){
-$list = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/js/ajaxplorer_boot_protolegacy_list.txt";
-}
 $lines = file($list);
 foreach ($lines as $line){
 	print("<script language=\"javascript\" type=\"text/javascript\" src=\"".CLIENT_RESOURCES_FOLDER."/".trim($line)."\"></script>\n");

core/src/plugins/gui.ajax/res/js/ajaxplorer_boot_protolegacy.js

@@ -27,18 +27,18 @@ var LangUtils = (function () {
     LangUtils.parseUrl = function parseUrl(data) {
         var matches = $A();
         //var e=/((http|ftp):\/)?\/?([^:\/\s]+)((\/\w+)*\/)([\w\-\.]+\.[^#?\s]+)(#[\w\-]+)?/;
-        var detect = /(((ajxp\.)(\w+)):\/)?\/?([^:\/\s]+)((\/\w+)*\/)(.*)(#[\w\-]+)?/g;
+        var detect = /(pydio:\/)?\/?([^:\/\s]+)((\/\w+)*\/)(.*)(#[\w\-]+)?/g;
         var results = data.match(detect);
         if (results && results.length) {
-            var e = /^((ajxp\.(\w+)):\/)?\/?([^:\/\s]+)((\/\w+)*\/)(.*)(#[\w\-]+)?$/;
+            var e = /^((pydio):\/)?\/?([^:\/\s]+)((\/\w+)*\/)(.*)(#[\w\-]+)?$/;
             for (var i = 0; i < results.length; i++) {
                 if (results[i].match(e)) {
                     matches.push({ url: RegExp['$&'],
                         protocol: RegExp.$2,
-                        host: RegExp.$4,
-                        path: RegExp.$5,
-                        file: RegExp.$7,
-                        hash: RegExp.$8 });
+                        host: RegExp.$3,
+                        path: RegExp.$4,
+                        file: RegExp.$6,
+                        hash: RegExp.$7 });
                 }
             }
         }