extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-18 11:21:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

"fix concat to allow filenames containing \"..\""

Browse Source
This commit is contained in:
Ralf Becker 2009-03-24 17:19:38 +00:00
parent 3927555c22
commit cc9d7445c3
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpgwapi/inc/class.egw_vfs.inc.php
View File

@ -1004,14 +1004,12 @@ class egw_vfs extends vfs_stream_wrapper
$url = ($relative === '' || $relative[0] == '/' ? $url.$relative : $url.'/'.$relative); $url = ($relative === '' || $relative[0] == '/' ? $url.$relative : $url.'/'.$relative);
// now normalize the path (remove "/something/..") // now normalize the path (remove "/something/..")
while (strpos($url,'..') !== false) while (strpos($url,'/../') !== false)
{ {
list($a,$b) = explode('..',$url,2); list($a,$b) = explode('/../',$url,2);
$a = explode('/',$a); $a = explode('/',$a);
array_pop($a); array_pop($a);
array_pop($a);
$b = explode('/',$b); $b = explode('/',$b);
if ($b[0] === '') array_shift($b);
$url = implode('/',array_merge($a,$b)); $url = implode('/',array_merge($a,$b));
} }
return $url.($query ? '?'.$query : ''); return $url.($query ? '?'.$query : '');