diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-02-27 15:11:07 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-02-27 15:11:07 +0000 |
| commit | 19c7d7b88172915572e93f2643e34d5f1a79344c (patch) | |
| tree | 13f8d0b414aa8fd22ed0be0746b507e2a2749524 /phpBB | |
| parent | 38c636deb5feafef9aec5b70d0594ab330cb427e (diff) | |
| download | forums-19c7d7b88172915572e93f2643e34d5f1a79344c.tar forums-19c7d7b88172915572e93f2643e34d5f1a79344c.tar.gz forums-19c7d7b88172915572e93f2643e34d5f1a79344c.tar.bz2 forums-19c7d7b88172915572e93f2643e34d5f1a79344c.tar.xz forums-19c7d7b88172915572e93f2643e34d5f1a79344c.zip | |
and the API
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8409 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index a220bd33c6..2e3da4c204 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -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 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; @@ -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. $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'])) { @@ -2103,7 +2099,7 @@ function check_form_key($form_name, $timespan = false, $return_page = '', $trigg $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 : ''; |