Add a check if he user try to compress an empty folder to avoid some …

…problems...
pydio · Oct 16, 2015 · d13c601 · d13c601
1 parent 7d82c50
commit d13c601
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/core/src/plugins/action.compression/class.PluginCompression.php b/core/src/plugins/action.compression/class.PluginCompression.php
@@ -73,8 +73,8 @@ public function receiveAction($action, $httpVars, $fileVars)
                 throw new AJXP_Exception($messages["compression.16"]);
             }
             $typeArchive = $httpVars["type_archive"];
-            //if we can run in background we do it ConfService::backgroundActionsSupported() && !ConfService::currentContextIsCommandLine()
-            if (1 == 2) {
+            //if we can run in background we do it
+            if (ConfService::backgroundActionsSupported() && !ConfService::currentContextIsCommandLine()) {
                 $archivePath = $currentDirPath.$archiveName;
                 file_put_contents($progressCompressionFileName, $messages["compression.5"]);
                 AJXP_Controller::applyActionInBackground($repository->getId(), "compression", $httpVars);
@@ -113,6 +113,10 @@ public function receiveAction($action, $httpVars, $fileVars)
                         array_push($tabFilesNames, substr($file->getPathname(), $currentDirUrlLength));
                     }
                 }
+                //WE STOP IF IT'S JUST AN EMPTY FOLDER OR NO FILES
+                if (empty($tabFilesNames)) {
+                    throw new AJXP_Exception($messages["compression.17"]);
+                }
                 try {
                     $tmpArchiveName = tempnam(AJXP_Utils::getAjxpTmpDir(), "tar-compression") . ".tar";
                     $archive = new PharData($tmpArchiveName);