diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-02 15:55:22 -0700 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-02 15:55:22 -0700 |
| commit | 4fd99a7b2e8cfad9a7836649fc7eafcdd2a7a4b5 (patch) | |
| tree | 8b8821a578ba111095acaeffda47767985c96385 /phpBB/phpbb | |
| parent | 67f89cc319998ee0feb5dba013a3bac452f1d4b7 (diff) | |
| parent | 918ffc10e173bed411a27ba627aa01f1b1c4fa51 (diff) | |
| download | forums-4fd99a7b2e8cfad9a7836649fc7eafcdd2a7a4b5.tar forums-4fd99a7b2e8cfad9a7836649fc7eafcdd2a7a4b5.tar.gz forums-4fd99a7b2e8cfad9a7836649fc7eafcdd2a7a4b5.tar.bz2 forums-4fd99a7b2e8cfad9a7836649fc7eafcdd2a7a4b5.tar.xz forums-4fd99a7b2e8cfad9a7836649fc7eafcdd2a7a4b5.zip | |
Merge pull request #1102 from imkingdavid/ticket/11215
[ticket/11215] Correct paths when path info is used for controller access
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 74410ddfd1..4d240f9380 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -36,6 +36,12 @@ class phpbb_controller_helper protected $user; /** + * Request object + * @var phpbb_request + */ + protected $request; + + /** * phpBB root path * @var string */ @@ -55,10 +61,11 @@ class phpbb_controller_helper * @param string $phpbb_root_path phpBB root path * @param string $php_ext PHP extension */ - public function __construct(phpbb_template $template, phpbb_user $user, $phpbb_root_path, $php_ext) + public function __construct(phpbb_template $template, phpbb_user $user, phpbb_request_interface $request, $phpbb_root_path, $php_ext) { $this->template = $template; $this->user = $user; + $this->request = $request; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; } @@ -102,22 +109,16 @@ class phpbb_controller_helper $route = substr($route, 0, $route_delim); } - if (is_array($params) && !empty($params)) - { - $params = array_merge(array( - 'controller' => $route, - ), $params); - } - else if (is_string($params) && $params) - { - $params = 'controller=' . $route . (($is_amp) ? '&' : '&') . $params; - } - else - { - $params = array('controller' => $route); - } + $request_uri = $this->request->variable('REQUEST_URI', '', false, phpbb_request::SERVER); + $script_name = $this->request->variable('SCRIPT_NAME', '', false, phpbb_request::SERVER); + + // If the app.php file is being used (no rewrite) keep it in the URL. + // Otherwise, don't include it. + $route_prefix = $this->phpbb_root_path; + $parts = explode('/', $script_name); + $route_prefix .= strpos($request_uri, $script_name) === 0 ? array_pop($parts) . '/' : ''; - return append_sid($this->phpbb_root_path . 'app.' . $this->php_ext . $route_params, $params, $is_amp, $session_id); + return append_sid($route_prefix . "$route" . $route_params, $params, $is_amp, $session_id); } /** |