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

and the API

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8409 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2008-02-27 15:11:07 +00:00
parent 38c636deb5
commit 19c7d7b881
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/functions.php
View file

@ -2082,7 +2082,7 @@ function add_form_key($form_name)
* @param bool $trigger If true, the function will triger an error when encountering an invalid form * @param bool $trigger If true, the function will triger an error when encountering an invalid form
* @param int $minimum_time The minimum acceptable age for a submitted form in seconds * @param int $minimum_time The minimum acceptable age for a submitted form in seconds
*/ */
function check_form_key($form_name, $timespan = false, $return_page = '', $trigger = false, $minimum_time = false) function check_form_key($form_name, $timespan = false, $return_page = '', $trigger = false)
{ {
global $config, $user; global $config, $user;
@ -2091,10 +2091,6 @@ function check_form_key($form_name, $timespan = false, $return_page = '', $trigg
// 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 ($minimum_time === false)
{
$minimum_time = (int) $config['form_token_mintime'];
}
if (isset($_POST['creation_time']) && isset($_POST['form_token'])) if (isset($_POST['creation_time']) && isset($_POST['form_token']))
{ {
@ -2103,7 +2099,7 @@ function check_form_key($form_name, $timespan = false, $return_page = '', $trigg
$diff = (time() - $creation_time); $diff = (time() - $creation_time);
if (($diff >= $minimum_time) && (($diff <= $timespan) || $timespan == -1)) if (($diff <= $timespan) || $timespan === -1)
{ {
$token_sid = ($user->data['user_id'] == ANONYMOUS && !empty($config['form_token_sid_guests'])) ? $user->session_id : ''; $token_sid = ($user->data['user_id'] == ANONYMOUS && !empty($config['form_token_sid_guests'])) ? $user->session_id : '';