mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 14:00:31 +02:00
some test code, hopefully working for all occassions where we are using the functions...
git-svn-id: file:///svn/phpbb/trunk@6487 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -1478,7 +1478,7 @@ function generate_board_url($without_script_path = false)
|
||||
/**
|
||||
* Redirects the user to another page then exits the script nicely
|
||||
*/
|
||||
function redirect($url)
|
||||
function redirect($url, $return = false)
|
||||
{
|
||||
global $db, $cache, $config, $user;
|
||||
|
||||
@@ -1554,6 +1554,17 @@ function redirect($url)
|
||||
}
|
||||
}
|
||||
|
||||
// Make sure no linebreaks are there... to prevent http response splitting for PHP < 4.4.2
|
||||
if (strpos(urldecode($url), "\n") !== false || strpos(urldecode($url), "\r") !== false || strpos($url, ';') !== false || strpos($url, generate_board_url()) !== 0)
|
||||
{
|
||||
trigger_error('Tried to redirect to potentially insecure url.', E_USER_ERROR);
|
||||
}
|
||||
|
||||
if ($return)
|
||||
{
|
||||
return $url;
|
||||
}
|
||||
|
||||
// Redirect via an HTML form for PITA webservers
|
||||
if (@preg_match('#Microsoft|WebSTAR|Xitami#', getenv('SERVER_SOFTWARE')))
|
||||
{
|
||||
@@ -1670,6 +1681,8 @@ function meta_refresh($time, $url)
|
||||
{
|
||||
global $template;
|
||||
|
||||
$url = redirect($url, true);
|
||||
|
||||
$template->assign_vars(array(
|
||||
'META' => '<meta http-equiv="refresh" content="' . $time . ';url=' . $url . '" />')
|
||||
);
|
||||
|
Reference in New Issue
Block a user