diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-10-18 16:26:54 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-10-18 16:26:54 +0200 |
| commit | c84268d2f9a758a3bcc570acc60c01e1185eeb14 (patch) | |
| tree | 8bc8cf71e885194bcaccc766bf699f120c0e0d73 /phpBB/includes/functions.php | |
| parent | bd4408875784294987c806bf123a121a84ab8363 (diff) | |
| parent | b283df8241c3d8fc5f2684e37d8a0f237df39c4f (diff) | |
| download | forums-c84268d2f9a758a3bcc570acc60c01e1185eeb14.tar forums-c84268d2f9a758a3bcc570acc60c01e1185eeb14.tar.gz forums-c84268d2f9a758a3bcc570acc60c01e1185eeb14.tar.bz2 forums-c84268d2f9a758a3bcc570acc60c01e1185eeb14.tar.xz forums-c84268d2f9a758a3bcc570acc60c01e1185eeb14.zip | |
Merge remote-tracking branch 'p/ticket/10848' into develop-olympus
* p/ticket/10848:
[ticket/10848] Move include up.
[ticket/10848] Add phpbb_ prefix.
[ticket/10848] Redirect from adm to installer correctly.
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ca58220619..65d8be32ad 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1176,6 +1176,36 @@ else } } +/** +* Eliminates useless . and .. components from specified path. +* +* @param string $path Path to clean +* @return string Cleaned path +*/ +function phpbb_clean_path($path) +{ + $exploded = explode('/', $path); + $filtered = array(); + foreach ($exploded as $part) + { + if ($part === '.' && !empty($filtered)) + { + continue; + } + + if ($part === '..' && !empty($filtered) && $filtered[sizeof($filtered) - 1] !== '..') + { + array_pop($filtered); + } + else + { + $filtered[] = $part; + } + } + $path = implode('/', $filtered); + return $path; +} + if (!function_exists('htmlspecialchars_decode')) { /** |