Fix #1180: Unpatch the path for zip files before we check against the content fiter path

ghecquet · ghecquet · commit f1e4da525e6b · 2016-07-08T13:28:19.000+02:00
diff --git a/core/src/core/classes/class.AJXP_MetaStreamWrapper.php b/core/src/core/classes/class.AJXP_MetaStreamWrapper.php
@@ -124,7 +124,7 @@ protected static function translateScheme($url, $crtInstance = null){
                 if (!empty($baseDir) || $baseDir != "/") {
                     $crtPath = parse_url($url, PHP_URL_PATH);
                     $crtBase = basename($crtPath);
-                    if (!empty($crtPath) && $crtPath != "/" && $crtBase != $contentFilter->getUniquePath() && $crtBase != ".ajxp_meta") {
+                    if (!empty($crtPath) && $crtPath != "/" && fsAccessWrapper::unPatchPathForBaseDir($crtBase) != $contentFilter->getUniquePath() && $crtBase != ".ajxp_meta") {
                         throw new Exception("Cannot find file " . $crtBase);
                     }
                     // Prepend baseDir in path

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ protected static function translateScheme($url, $crtInstance = null){`
`124`	`124`	`if (!empty($baseDir) \|\| $baseDir != "/") {`
`125`	`125`	`$crtPath = parse_url($url, PHP_URL_PATH);`
`126`	`126`	`$crtBase = basename($crtPath);`
`127`		`- if (!empty($crtPath) && $crtPath != "/" && $crtBase != $contentFilter->getUniquePath() && $crtBase != ".ajxp_meta") {`
	`127`	`+ if (!empty($crtPath) && $crtPath != "/" && fsAccessWrapper::unPatchPathForBaseDir($crtBase) != $contentFilter->getUniquePath() && $crtBase != ".ajxp_meta") {`
`128`	`128`	`throw new Exception("Cannot find file " . $crtBase);`
`129`	`129`	`}`
`130`	`130`	`// Prepend baseDir in path`