diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-12-21 20:08:00 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-12-21 20:08:00 +0100 |
| commit | d9358c26da6737044a3c10893e7b954176b205d2 (patch) | |
| tree | 69be68f104f4e7bf2627debce6faa83b95ab60c3 /phpBB | |
| parent | 235d2069e0e7cecfd51d4eed5c875cc865f35486 (diff) | |
| download | forums-d9358c26da6737044a3c10893e7b954176b205d2.tar forums-d9358c26da6737044a3c10893e7b954176b205d2.tar.gz forums-d9358c26da6737044a3c10893e7b954176b205d2.tar.bz2 forums-d9358c26da6737044a3c10893e7b954176b205d2.tar.xz forums-d9358c26da6737044a3c10893e7b954176b205d2.zip | |
[ticket/11997] Add clean_url() method to path_helper
This method will get rid of unnecessary . and .. in URLs.
PHPBB3-11997
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/path_helper.php | 23 |
2 files changed, 24 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 4c9c3323f7..aea13f7679 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2777,7 +2777,7 @@ function redirect($url, $return = false, $disable_cd_check = false) $url = (!empty($dir) ? $dir . '/' : '') . $url; $url = generate_board_url() . '/' . $url; } - $url = $phpbb_filesystem->clean_path($url); + $url = $phpbb_path_helper->clean_url($url);; } } diff --git a/phpBB/phpbb/path_helper.php b/phpBB/phpbb/path_helper.php index f6587fa101..cd4c20bb7d 100644 --- a/phpBB/phpbb/path_helper.php +++ b/phpBB/phpbb/path_helper.php @@ -207,4 +207,27 @@ class path_helper return generate_board_url() . $url; } + + /** + * Eliminates useless . and .. components from specified URL + * + * @param string $url URL to clean + * + * @return string Cleaned URL + */ + public function clean_url($url) + { + $delimiter_position = strpos($url, '://'); + // URL should contain :// but it shouldn't start with it. + // Do not clean URLs that do not fit these constraints. + if (empty($delimiter_position)) + { + return $url; + } + $scheme = substr($url, 0, $delimiter_position) . '://'; + // Add length of URL delimiter to position + $path = substr($url, $delimiter_position + 3); + + return $scheme . $this->filesystem->clean_path($path); + } } |