diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-07-08 18:48:32 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-07-08 18:48:32 +0200 |
| commit | b13293947140408b634a71085efd7e255f507377 (patch) | |
| tree | 9573e13930000dbbb1f5edcc0ec931d6482555f5 /phpBB/phpbb | |
| parent | 91f5d59f69f6257eed1bb86f43c35d614aa06533 (diff) | |
| parent | e3e236da72f9bb8985fcecc25758c98559f76179 (diff) | |
| download | forums-b13293947140408b634a71085efd7e255f507377.tar forums-b13293947140408b634a71085efd7e255f507377.tar.gz forums-b13293947140408b634a71085efd7e255f507377.tar.bz2 forums-b13293947140408b634a71085efd7e255f507377.tar.xz forums-b13293947140408b634a71085efd7e255f507377.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/12834' into develop-ascraeus
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/viewonline_helper.php | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/phpBB/phpbb/viewonline_helper.php b/phpBB/phpbb/viewonline_helper.php index 3fc33119a3..b722f9d911 100644 --- a/phpBB/phpbb/viewonline_helper.php +++ b/phpBB/phpbb/viewonline_helper.php @@ -18,6 +18,17 @@ namespace phpbb; */ class viewonline_helper { + /** @var \phpbb\filesystem */ + protected $filesystem; + + /** + * @param \phpbb\filesystem $filesystem + */ + public function __construct(\phpbb\filesystem $filesystem) + { + $this->filesystem = $filesystem; + } + /** * Get user page * @@ -26,7 +37,13 @@ class viewonline_helper */ public function get_user_page($session_page) { - preg_match('#^([./\\]*+[a-z0-9/_-]+)#i', $session_page, $on_page); + $session_page = $this->filesystem->clean_path($session_page); + if (strpos($session_page, './') === 0) + { + $session_page = substr($session_page, 2); + } + + preg_match('#^((\.\./)*([a-z0-9/_-]+))#i', $session_page, $on_page); if (empty($on_page)) { $on_page[1] = ''; |