makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-26 11:58:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change redirection logic to match the RFC better in those cases before redirect() is available to us

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6154 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Graham Eames 2006-07-07 20:47:25 +00:00
parent 97cd5b1c3d
commit 63dbf43693
3 changed files with 64 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
phpBB/common.php
View file

@ -111,7 +111,33 @@ require($phpbb_root_path . 'config.' . $phpEx);
if (!defined('PHPBB_INSTALLED')) if (!defined('PHPBB_INSTALLED'))
{ {
header('Location: install/index.' . $phpEx); // Redirect the user to the installer
// We have to generate a full HTTP/1.1 header here since we can't guarantee to have any of the information
// available as used by the redirect function
$server_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME');
$server_port = (!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT');
$secure = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 1 : 0;
$script_name = (!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : getenv('PHP_SELF');
if (!$script_name)
{
$script_name = (!empty($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI'] : getenv('REQUEST_URI');
}
// Replace backslashes and doubled slashes (could happen on some proxy setups)
$script_name = str_replace(array('\\', '//'), '/', $script_name);
$script_path = trim(dirname($script_name));
$script_path = rtrim($script_patch, '/');
$url = (($secure) ? 'https://' : 'http://') . $server_name;
if ($server_port && (($secure && $server_port <> 443) || (!$secure && $server_port <> 80)))
{
$url .= ':' . $server_port;
}
$url .= $script_path . '/install/index.' . $phpEx;
header('Location: ' . $url);
exit; exit;
} }

33
phpBB/install/index.php
View file

@ -372,6 +372,39 @@ class module
return (isset($lang[$this->module->page_title])) ? $lang[$this->module->page_title] : $this->module->page_title; return (isset($lang[$this->module->page_title])) ? $lang[$this->module->page_title] : $this->module->page_title;
} }
/**
* Generate an HTTP/1.1 header to redirect the user to another page
* This is used during the installation when we do not have a database available to call the normal redirect function
* @param string $page The page to redirect to relative to the installer root path
*/
function redirect($page)
{
$server_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME');
$server_port = (!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT');
$secure = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 1 : 0;
$script_name = (!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : getenv('PHP_SELF');
if (!$script_name)
{
$script_name = (!empty($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI'] : getenv('REQUEST_URI');
}
// Replace backslashes and doubled slashes (could happen on some proxy setups)
$script_name = str_replace(array('\\', '//'), '/', $script_name);
$script_path = trim(dirname($script_name));
$url = (($secure) ? 'https://' : 'http://') . $server_name;
if ($server_port && (($secure && $server_port <> 443) || (!$secure && $server_port <> 80)))
{
$url .= ':' . $server_port;
}
$url .= $script_path . '/' . $page;
header('Location: ' . $url);
exit;
}
/** /**
* Generate the navigation tabs * Generate the navigation tabs
*/ */

12
phpBB/install/install_install.php
View file

@ -537,8 +537,7 @@ class install_install extends module
{ {
// Someone's been silly and tried calling this page direct // Someone's been silly and tried calling this page direct
// So we send them back to the start to do it again properly // So we send them back to the start to do it again properly
header('Location: index.' . $phpEx . '?mode=install'); $this->p_master->redirect("index?mode=install");
exit;
} }
$s_hidden_fields = ($img_imagick) ? '<input type="hidden" name="img_imagick" value="' . addslashes($img_imagick) . '" />' : ''; $s_hidden_fields = ($img_imagick) ? '<input type="hidden" name="img_imagick" value="' . addslashes($img_imagick) . '" />' : '';
@ -696,8 +695,7 @@ class install_install extends module
{ {
// Someone's been silly and tried calling this page direct // Someone's been silly and tried calling this page direct
// So we send them back to the start to do it again properly // So we send them back to the start to do it again properly
header('Location: index.' . $phpEx . '?mode=install'); $this->p_master->redirect("index?mode=install");
exit;
} }
$s_hidden_fields = ($img_imagick) ? '<input type="hidden" name="img_imagick" value="' . addslashes($img_imagick) . '" />' : ''; $s_hidden_fields = ($img_imagick) ? '<input type="hidden" name="img_imagick" value="' . addslashes($img_imagick) . '" />' : '';
@ -841,8 +839,7 @@ class install_install extends module
{ {
// Someone's been silly and tried calling this page direct // Someone's been silly and tried calling this page direct
// So we send them back to the start to do it again properly // So we send them back to the start to do it again properly
header('Location: index.' . $phpEx . '?mode=install'); $this->p_master->redirect("index?mode=install");
exit;
} }
$s_hidden_fields = ($img_imagick) ? '<input type="hidden" name="img_imagick" value="' . addslashes($img_imagick) . '" />' : ''; $s_hidden_fields = ($img_imagick) ? '<input type="hidden" name="img_imagick" value="' . addslashes($img_imagick) . '" />' : '';
@ -925,8 +922,7 @@ class install_install extends module
{ {
// Someone's been silly and tried calling this page direct // Someone's been silly and tried calling this page direct
// So we send them back to the start to do it again properly // So we send them back to the start to do it again properly
header('Location: index.' . $phpEx . '?mode=install'); $this->p_master->redirect("index?mode=install");
exit;
} }
$cookie_domain = ($server_name != '') ? $server_name : (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'); $cookie_domain = ($server_name != '') ? $server_name : (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME');