SMPlayer canvas overlays button. Left it open.

Cross direct download links with minisite rights
pydio · Sep 3, 2014 · b86d6d3 · b86d6d3
1 parent d3522b0
commit b86d6d3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/core/src/plugins/action.share/class.ShareCenter.php b/core/src/plugins/action.share/class.ShareCenter.php
@@ -1000,7 +1000,7 @@ public static function loadMinisite($data, $hash = '')
             $_SESSION["CURRENT_MINISITE"] = $hash;
         }
 
-        if(isSet($_GET["dl"]) && isSet($_GET["file"])){
+        if(isSet($_GET["dl"]) && isSet($_GET["file"]) && (!isSet($data["DOWNLOAD_DISABLED"]) || $data["DOWNLOAD_DISABLED"] === false)){
             ConfService::switchRootDir($repository);
             ConfService::loadRepositoryDriver();
             AJXP_PluginsService::deferBuildingRegistry();

diff --git a/core/src/plugins/action.share/manifest.xml b/core/src/plugins/action.share/manifest.xml
@@ -475,11 +475,11 @@
                     <clientCallback dialogOpenForm="share_current_url" dialogSkipButtons="true" prepareModal="true">
                         <dialogOnOpen><![CDATA[
                             modal.getForm().down("#crt-page-url").setValue(document.location.href);
-                            if(!ajaxplorer.getContextHolder().isEmpty()){
+                            if(!ajaxplorer.getContextHolder().isEmpty() && ajaxplorer.getActionBar().getActionByName("download")){
                                 var tpl = new Template('<div style="font-size: 16px; padding-top:15px; text-align:left;">#{title} <a href="#{link}" target="_blank" class="icon-link" style="font-size: 0.8em;"></a></div><input type="text" value="#{link}" style="width: 98%;">');
                                 var node = ajaxplorer.getContextHolder().getUniqueNode();
                                 var editors = ajaxplorer.findEditorsForMime(node.getAjxpMime(), true);
-                                if(editors.length){
+                                if(editors.length && Class.getByName(editors[0].editorClass)){
                                     var staticClass = Class.getByName(editors[0].editorClass).prototype;
                                     if(staticClass.getRESTPreviewLinks){
                                         var links = staticClass.getRESTPreviewLinks(node);

diff --git a/core/src/plugins/editor.soundmanager/sm_preview_player.css b/core/src/plugins/editor.soundmanager/sm_preview_player.css
@@ -28,7 +28,7 @@
 }
 
 .ui360-vis.ui360-vis-retracted, .ui360-vis.ui360-vis-retracted .sm2-360ui, .sm2-inline-list .ui360-vis.ui360-vis-retracted {
-    height: 100px;
+    /*height: 100px;*/
 }
 
 .ui360-micro{