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

[ticket/9975] Moved a few E_USER_ERROR errors to /language

Browse Source 
There were a few error messages that a user could experience that would, previously, be without any the ability to be localized. There are some more E_USER_ERRORs that I did not change to a constant, for example the error message that is displayed if there aren't any folders in /language.

PHPBB3-9975
This commit is contained in:
asperous
2013-04-23 09:55:36 -07:00
parent ab628cbdb9
commit 9f545a7f6b
8 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
View File

@@ -270,7 +270,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
$response = '';
if (false == ($fs = @fsockopen($host, $port, $errno, $errstr, 10)))
{
trigger_error('Could not open socket', E_USER_ERROR);
trigger_error('RECAPTCHA_SOCKET_ERROR', E_USER_ERROR);
}
fwrite($fs, $http_request);

6
phpBB/includes/functions.php
View File

@@ -2731,7 +2731,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...
@@ -2740,7 +2740,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)
@@ -4182,7 +4182,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)
{

2
phpBB/includes/user.php
View File

@@ -215,7 +215,7 @@ class phpbb_user extends phpbb_session
if (!$this->style)
{
trigger_error('Could not get style data', E_USER_ERROR);
trigger_error('STYLE_NOT_FOUND', E_USER_ERROR);
}
// Now parse the cfg file and cache it