mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-04 15:57:45 +02:00
Code Issues Releases Wiki Activity

[ticket/12099] Deduplicate path generation

Browse Source 
PHPBB3-12099
This commit is contained in:
Joas Schilling
2014-06-09 00:48:02 +02:00
parent 638d43d6fe
commit edc5908e48
1 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
phpBB/phpbb/path_helper.php
View File

@@ -174,30 +174,17 @@ class path_helper
$corrections = substr_count($path_info, '/'); $corrections = substr_count($path_info, '/');
/* /*
* If the script name (e.g. phpBB/app.php) exists in the * If the script name (e.g. phpBB/app.php) does not exists in the
* requestUri (e.g. phpBB/app.php/foo/template), then we * requestUri (e.g. phpBB/app.php/foo/template), then we are rewriting
* are have a non-rewritten URL. * the URL. So we must reduce the slash count by 1.
*/ */
if (strpos($request_uri, $script_name) === 0) if (strpos($request_uri, $script_name) !== 0)
{ {
/* $corrections--;
* Append ../ to the end of the phpbb_root_path as many times
* as / exists in path_info
*/
$this->web_root_path = $this->filesystem->clean_path(str_repeat('../', $corrections) . $this->phpbb_root_path);
}
else
{
/*
* If we're here it means we're at a re-written path, so we must
* correct the relative path for web URLs. We must append ../
* to the end of the root path as many times as / exists in path_info
* less one time (because the script, e.g. /app.php, doesn't exist in
* the URL)
*/
$this->web_root_path = $this->filesystem->clean_path(str_repeat('../', $corrections - 1) . $this->phpbb_root_path);
} }
// Prepend ../ to the phpbb_root_path as many times as / exists in path_info
$this->web_root_path = $this->filesystem->clean_path(str_repeat('../', $corrections) . $this->phpbb_root_path);
return $this->web_root_path; return $this->web_root_path;
} }