makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17296] Reduce complexity of relative paths on adm pages

Browse source 
PHPBB3-17296
This commit is contained in:
Marc Alexander 2024-03-07 20:57:19 +01:00
parent 763c6f625f
commit bda99e1c35
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/adm/index.php
View file

@ -61,8 +61,8 @@ $template->set_custom_style(array(
), ),
), $phpbb_admin_path . 'style'); ), $phpbb_admin_path . 'style');
$template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets'); $template->assign_var('T_ASSETS_PATH', $phpbb_path_helper->update_web_root_path($phpbb_root_path . 'assets'));
$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style'); $template->assign_var('T_TEMPLATE_PATH', $phpbb_path_helper->update_web_root_path($phpbb_root_path . 'style'));
// Instantiate new module // Instantiate new module
$module = new p_master(); $module = new p_master();

16
phpBB/phpbb/path_helper.php
View file

@ -39,6 +39,9 @@ class path_helper
/** @var string */ /** @var string */
protected $web_root_path; protected $web_root_path;
/** @var bool Flag whether we're in adm path */
protected $in_adm_path = false;
/** /**
* Constructor * Constructor
* *
@ -117,7 +120,13 @@ class path_helper
$path = substr($path, 8); $path = substr($path, 8);
} }
return $this->filesystem->clean_path($web_root_path . $path); $path = $this->filesystem->clean_path($web_root_path . $path);
// Further clean path if we're in adm
if ($this->in_adm_path && strpos($path, $this->phpbb_root_path . $this->adm_relative_path) === 0)
{
$path = substr($path, strlen($this->phpbb_root_path . $this->adm_relative_path));
}
} }
return $path; return $path;
@ -181,6 +190,11 @@ class path_helper
return $this->web_root_path = $this->filesystem->clean_path('./../' . $this->phpbb_root_path); return $this->web_root_path = $this->filesystem->clean_path('./../' . $this->phpbb_root_path);
} }
if ($path_info === '/' && defined('ADMIN_START') && preg_match('/\/' . preg_quote($this->adm_relative_path, '/') . 'index\.' . $this->php_ext . '$/', $script_name))
{
$this->in_adm_path = true;
}
/* /*
* If the path info is empty (single /), then we're not using * If the path info is empty (single /), then we're not using
* a route like app.php/foo/bar * a route like app.php/foo/bar