Fix #931

Author: cdujeu

core/src/plugins/access.fs/class.fsAccessDriver.php

@@ -169,14 +169,11 @@ public function disableArchiveBrowsingContributions(&$contribNode)
         // Cannot use zip features on FTP !
         // Remove "compress" action
         $actionXpath=new DOMXPath($contribNode->ownerDocument);
-        $compressNodeList = $actionXpath->query('action[@name="compress"]', $contribNode);
+        $compressNodeList = $actionXpath->query('action[@name="compress"]|action[@name="compress_ui"]|action[@name="download_all"]', $contribNode);
         if(!$compressNodeList->length) return ;
-        $compressNode = $compressNodeList->item(0);
-        $contribNode->removeChild($compressNode);
-        $compressNodeList = $actionXpath->query('action[@name="compress_ui"]', $contribNode);
-        if(!$compressNodeList->length) return ;
-        $compressNode = $compressNodeList->item(0);
-        $contribNode->removeChild($compressNode);
+        foreach($compressNodeList as $compressNodeAction){
+            $contribNode->removeChild($compressNodeAction);
+        }
         // Disable "download" if selection is multiple
         $nodeList = $actionXpath->query('action[@name="download"]/gui/selectionContext', $contribNode);
         $selectionNode = $nodeList->item(0);

core/src/plugins/access.fs/fsActions.xml

@@ -291,14 +291,20 @@
             <rightsContext noUser="true" userLogged="only" read="true" write="false" adminOnly=""/>
             <processing>
                 <clientCallback prepareModal="true"><![CDATA[
-                        var dm = ajaxplorer.getContextHolder();
+                        var dm = pydio.getContextHolder();
                         dm._selectedNodes = $A([dm.getRootNode()]);
                         dm._bEmpty = dm._bDir = true; dm._bFile = false;
                         dm.publish("selection_changed", dm);
                         window.setTimeout(function(){
                             pydio.getController().fireAction("download");
                         }, 200);
                 ]]></clientCallback>
+                <clientListener name="init"><![CDATA[
+                    if(!pydio.Parameters.get('zipEnabled') || !pydio.Parameters.get('multipleFilesDownloadEnabled')){
+                        pydio.Controller.getActionByName("download_all").hide();
+                        pydio.Controller.actions["delete"]("download_all");
+                    }
+                ]]></clientListener>
             </processing>
         </action>
 		<action name="compress">