Cleaned up variable names and comments

pydio · Jul 20, 2016 · f9dd3d8 · f9dd3d8
1 parent 6df570b
commit f9dd3d8
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/core/src/plugins/action.compression/class.PluginCompression.php b/core/src/plugins/action.compression/class.PluginCompression.php
@@ -45,9 +45,9 @@ public function receiveAction($action, $httpVars, $fileVars)
         $currentDirPath = rtrim($currentDirPath, "/") . "/";
         $currentDirUrl = $userSelection->currentBaseUrl().$currentDirPath;
 
-        # Multi-platform function taken from stackoverflow
-        # http://stackoverflow.com/questions/12424787/how-to-check-if-a-shell-command-exists-from-php
-        # Check that a command exists on the system for use with shell_exec
+        // Multi-platform function taken from stackoverflow
+        // http://stackoverflow.com/questions/12424787/how-to-check-if-a-shell-command-exists-from-php
+        // Check that a command exists on the system for use with shell_exec
         function command_exists ($command) {
         $whereIsCommand = (PHP_OS == 'WINNT') ? 'where' : 'which';
         $process = proc_open(
@@ -161,27 +161,27 @@ function command_exists ($command) {
                     }
                     if ($archiveFormat == ".tar.gz") {
                         if (command_exists("pigz")) {
-                            $tarcommand = "tar -I pigz -cf ";
+                            $tarCommand = "tar -I pigz -cf ";
                         } else {
-                            $tarcommand = "tar -czf ";
+                            $tarCommand = "tar -czf ";
                         }
                     } elseif ($archiveFormat == ".tar.bz2") {
                         if (command_exists("lbzip2")) {
-                            $tarcommand = "tar -I lbzip2 -cf ";
+                            $tarCommand = "tar -I lbzip2 -cf ";
                         } elseif (command_exists("pbzip2")) {
-                            $tarcommand = "tar -I pbzip2 -cf ";
+                            $tarCommand = "tar -I pbzip2 -cf ";
                         } else {
-                            $tarcommand = "tar -cjf ";
+                            $tarCommand = "tar -cjf ";
                         }
                     } elseif ($archiveFormat == ".tar") {
-                        $tarcommand = "tar -cf ";
+                        $tarCommand = "tar -cf ";
                     } else {
                         file_put_contents($progressExtractFileName, "Error : " . $messages["compression.15"]);
                         throw new AJXP_Exception($messages["compression.15"]);
                     }
-                    $changedircommand = "cd " . AJXP_MetaStreamWrapper::getRealFSReference($currentDirUrl) . " && ";
-                    $finalcommand = $changedircommand . $tarcommand . escapeshellarg($archiveName) . " " . implode(" ", $FolderNames) . " " . implode(" ", $FileNames);
-                    shell_exec($finalcommand);
+                    $changeDirCommand = "cd " . AJXP_MetaStreamWrapper::getRealFSReference($currentDirUrl) . " && ";
+                    $compressCommand = $changeDirCommand . $tarCommand . escapeshellarg($archiveName) . " " . implode(" ", $FolderNames) . " " . implode(" ", $FileNames);
+                    shell_exec($compressCommand);
                  } else {
                     // If tar command is not found, compress with PHP Phar instead
                     try {
@@ -315,25 +315,25 @@ function command_exists ($command) {
             if (command_exists("tar")) {
                 if ($pathInfoCurrentAllPydioPath == "gz") {
                     if (command_exists("pigz")) {
-                        $tarcommand = "tar -I pigz -xf ";
+                        $tarCommand = "tar -I pigz -xf ";
                     } else {
-                        $tarcommand = "tar -xzf ";
+                        $tarCommand = "tar -xzf ";
                     }
                 } elseif ($pathInfoCurrentAllPydioPath == "bz2") {
                     if (command_exists("lbzip2")) {
-                        $tarcommand = "tar -I lbzip2 -xf ";
+                        $tarCommand = "tar -I lbzip2 -xf ";
                     } elseif (command_exists("pbzip2")) {
-                        $tarcommand = "tar -I pbzip2 -xf ";
+                        $tarCommand = "tar -I pbzip2 -xf ";
                     } else {
-                        $tarcommand = "tar -xjf ";
+                        $tarCommand = "tar -xjf ";
                     }
                 } elseif ($pathInfoCurrentAllPydioPath == "tar") {
-                    $tarcommand = "tar -xf ";
+                    $tarCommand = "tar -xf ";
                 } else {
                     file_put_contents($progressExtractFileName, "Error : " . $messages["compression.15"]);
                     throw new AJXP_Exception($messages["compression.15"]);
                 }
-                $extractCommand = $tarcommand . escapeshellarg(AJXP_MetaStreamWrapper::getRealFSReference($currentDirUrl . $fileArchive)) . " -C " . escapeshellarg(AJXP_MetaStreamWrapper::getRealFSReference($currentDirUrl . $onlyFileName));
+                $extractCommand = $tarCommand . escapeshellarg(AJXP_MetaStreamWrapper::getRealFSReference($currentDirUrl . $fileArchive)) . " -C " . escapeshellarg(AJXP_MetaStreamWrapper::getRealFSReference($currentDirUrl . $onlyFileName));
                 shell_exec($extractCommand);
             } else {
                 // If tar command is not found, extract using PHP Phar instead