1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00

Merge remote-tracking branch 'nickvergessen/ticket/12834' into develop-ascraeus

This commit is contained in:
Marc Alexander
2014-07-08 18:48:32 +02:00
3 changed files with 29 additions and 6 deletions

View File

@@ -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] = '';