makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13052] Remove additional parameter from check_form_key()

Browse source 
PHPBB3-13052
This commit is contained in:
Joas Schilling 2014-09-09 19:46:27 +02:00
parent 12398d65fd
commit 047728e3d4
1 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/includes/functions.php
View file

@ -2577,20 +2577,17 @@ function add_form_key($form_name)
/** /**
* Check the form key. Required for all altering actions not secured by confirm_box * Check the form key. Required for all altering actions not secured by confirm_box
* @param string $form_name The name of the form; has to match the name used in add_form_key, otherwise no restrictions apply *
* @param int $timespan The maximum acceptable age for a submitted form in seconds. Defaults to the config setting. * @param string $form_name The name of the form; has to match the name used
* @param string $return_page The address for the return link * in add_form_key, otherwise no restrictions apply
* @param bool $trigger If true, the function will triger an error when encountering an invalid form * @return bool True, if the form key was valid, false otherwise
*/ */
function check_form_key($form_name, $timespan = false, $return_page = '', $trigger = false) function check_form_key($form_name)
{ {
global $config, $user; global $config, $user;
if ($timespan === false)
{
// we enforce a minimum value of half a minute here. // we enforce a minimum value of half a minute here.
$timespan = ($config['form_token_lifetime'] == -1) ? -1 : max(30, $config['form_token_lifetime']); $timespan = ($config['form_token_lifetime'] == -1) ? -1 : max(30, $config['form_token_lifetime']);
}
if (isset($_POST['creation_time']) && isset($_POST['form_token'])) if (isset($_POST['creation_time']) && isset($_POST['form_token']))
{ {
@ -2612,11 +2609,6 @@ function check_form_key($form_name, $timespan = false, $return_page = '', $trigg
} }
} }
if ($trigger)
{
trigger_error($user->lang['FORM_INVALID'] . $return_page);
}
return false; return false;
} }