Menu "Download" with PowerFS failed if accent in parent folder

Nanomani · Nanomani · commit fe912cae6d02 · 2015-04-02T15:58:34.000+02:00
diff --git a/core/src/plugins/action.powerfs/class.PowerFSController.php b/core/src/plugins/action.powerfs/class.PowerFSController.php
@@ -99,7 +99,7 @@ public function switchAction($action, $httpVars, $fileVars)
 
             case "postcompress_download":
 
-                $archive = AJXP_Utils::getAjxpTmpDir().DIRECTORY_SEPARATOR.$httpVars["ope_id"]."_".$httpVars["archive_name"];
+                $archive = AJXP_Utils::getAjxpTmpDir().DIRECTORY_SEPARATOR.$httpVars["ope_id"]."_".AJXP_Utils::sanitize(AJXP_Utils::decodeSecureMagic($httpVars["archive_name"]), AJXP_SANITIZE_FILENAME);
                 $fsDriver = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("access");
                 if (is_file($archive)) {
                     register_shutdown_function("unlink", $archive);
@@ -161,7 +161,6 @@ public function switchAction($action, $httpVars, $fileVars)
                     }
                 }
                 $cmdSeparator = ((PHP_OS == "WIN32" || PHP_OS == "WINNT" || PHP_OS == "Windows")? "&" : ";");
-                //$archiveName = SystemTextEncoding::fromUTF8($httpVars["archive_name"]);
                 if (!$compressLocally) {
                     $archiveName = AJXP_Utils::getAjxpTmpDir().DIRECTORY_SEPARATOR.$httpVars["ope_id"]."_".$archiveName;
                 }

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public function switchAction($action, $httpVars, $fileVars)`
`99`	`99`
`100`	`100`	`case "postcompress_download":`
`101`	`101`
`102`		`- $archive = AJXP_Utils::getAjxpTmpDir().DIRECTORY_SEPARATOR.$httpVars["ope_id"]."_".$httpVars["archive_name"];`
	`102`	`+ $archive = AJXP_Utils::getAjxpTmpDir().DIRECTORY_SEPARATOR.$httpVars["ope_id"]."_".AJXP_Utils::sanitize(AJXP_Utils::decodeSecureMagic($httpVars["archive_name"]), AJXP_SANITIZE_FILENAME);`
`103`	`103`	`$fsDriver = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("access");`
`104`	`104`	`if (is_file($archive)) {`
`105`	`105`	`register_shutdown_function("unlink", $archive);`
`@@ -161,7 +161,6 @@ public function switchAction($action, $httpVars, $fileVars)`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`	`$cmdSeparator = ((PHP_OS == "WIN32" \|\| PHP_OS == "WINNT" \|\| PHP_OS == "Windows")? "&" : ";");`
`164`		`- //$archiveName = SystemTextEncoding::fromUTF8($httpVars["archive_name"]);`
`165`	`164`	`if (!$compressLocally) {`
`166`	`165`	`$archiveName = AJXP_Utils::getAjxpTmpDir().DIRECTORY_SEPARATOR.$httpVars["ope_id"]."_".$archiveName;`
`167`	`166`	`}`