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

"fixed handling of query parts in dirname and basename"

Browse Source
This commit is contained in:
Ralf Becker 2009-04-27 11:49:50 +00:00
parent b52d29b7a7
commit a8bf31c274
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -973,6 +973,7 @@ class egw_vfs extends vfs_stream_wrapper
*/ */
static function basename($path) static function basename($path)
{ {
list($path,$query) = explode('?',$path); // remove query
$parts = explode('/',$path); $parts = explode('/',$path);
return array_pop($parts); return array_pop($parts);
@ -986,6 +987,8 @@ class egw_vfs extends vfs_stream_wrapper
*/ */
static function dirname($url) static function dirname($url)
{ {
list($url,$query) = explode('?',$url,2); // strip the query first, as it can contain slashes
if ($url == '/' || $url[0] != '/' && parse_url($url,PHP_URL_PATH) == '/') if ($url == '/' || $url[0] != '/' && parse_url($url,PHP_URL_PATH) == '/')
{ {
//error_log(__METHOD__."($url) returning FALSE: already in root!"); //error_log(__METHOD__."($url) returning FALSE: already in root!");
@ -998,7 +1001,6 @@ class egw_vfs extends vfs_stream_wrapper
{ {
array_push($parts,''); // scheme://host is wrong (no path), has to be scheme://host/ array_push($parts,''); // scheme://host is wrong (no path), has to be scheme://host/
} }
list(,$query) = explode('?',$url,2);
//error_log(__METHOD__."($url)=".implode('/',$parts).($query ? '?'.$query : '')); //error_log(__METHOD__."($url)=".implode('/',$parts).($query ? '?'.$query : ''));
return implode('/',$parts).($query ? '?'.$query : ''); return implode('/',$parts).($query ? '?'.$query : '');
} }