mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 05:20:56 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github-asperous/ticket/9975' into develop

Browse Source 
* github-asperous/ticket/9975:
  [ticket/9975] Moved a few E_USER_ERROR errors to /language

Conflicts:
	phpBB/includes/user.php
This commit is contained in:
Nils Adermann
2013-04-24 19:16:46 +02:00
parent b3497d955f 9f545a7f6b
commit b8c2bf6ce4
7 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/functions.php
View File

@@ -2733,7 +2733,7 @@ function redirect($url, $return = false, $disable_cd_check = false)
// 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)
{
trigger_error('Tried to redirect to potentially insecure url.', E_USER_ERROR);
trigger_error('INSECURE_REDIRECT', E_USER_ERROR);
}
// Now, also check the protocol and for a valid url the last time...
@@ -2742,7 +2742,7 @@ function redirect($url, $return = false, $disable_cd_check = false)
if ($url_parts === false || empty($url_parts['scheme']) || !in_array($url_parts['scheme'], $allowed_protocols))
{
trigger_error('Tried to redirect to potentially insecure url.', E_USER_ERROR);
trigger_error('INSECURE_REDIRECT', E_USER_ERROR);
}
if ($return)
@@ -4184,7 +4184,7 @@ function phpbb_checkdnsrr($host, $type = 'MX')
// Handler, header and footer
/**
* Error and message handler, call with trigger_error if reqd
* Error and message handler, call with trigger_error if read
*/
function msg_handler($errno, $msg_text, $errfile, $errline)
{