mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-03 07:18:08 +02:00
Code Issues Releases Wiki Activity

Some xenophobia

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@8612 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof
2008-06-06 11:28:55 +00:00
parent 8822747b91
commit 4dddc3a130
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/includes/functions.php
View File

@@ -1773,7 +1773,10 @@ function redirect($url, $return = false)
} }
else if (!empty($url_parts['scheme']) && !empty($url_parts['host'])) else if (!empty($url_parts['scheme']) && !empty($url_parts['host']))
{ {
// Full URL if ($url_parts['host'] !== $user->host)
{
$url = generate_board_url(true);
}
} }
else if ($url[0] == '/') else if ($url[0] == '/')
{ {
@@ -1987,11 +1990,14 @@ function meta_refresh($time, $url)
global $template; global $template;
$url = redirect($url, true); $url = redirect($url, true);
$url = str_replace('&', '&', $url);
// For XHTML compatibility we change back & to & // For XHTML compatibility we change back & to &
$template->assign_vars(array( $template->assign_vars(array(
'META' => '<meta http-equiv="refresh" content="' . $time . ';url=' . str_replace('&', '&amp;', $url) . '" />') 'META' => '<meta http-equiv="refresh" content="' . $time . ';url=' . $url . '" />')
); );
return $url;
} }
//Form validation //Form validation
@@ -2283,7 +2289,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
return; return;
} }
meta_refresh(3, $redirect); $redirect = meta_refresh(3, $redirect);
trigger_error($message . '<br /><br />' . sprintf($l_redirect, '<a href="' . $redirect . '">', '</a>')); trigger_error($message . '<br /><br />' . sprintf($l_redirect, '<a href="' . $redirect . '">', '</a>'));
} }