From 0881e608f880b5b8060e54dbf9eba7e234eee8c6 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 5 Dec 2007 16:34:38 +0000 Subject: wonderful, another change... now come slap me to death... conquering mars. git-svn-id: file:///svn/phpbb/trunk@8269 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 8620134311..6f1d5964f5 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2837,6 +2837,7 @@ function phpbb_checkdnsrr($host, $type = '') return NULL; } + // @exec('nslookup -retry=1 -timout=1 -type=' . escapeshellarg($type) . ' ' . escapeshellarg($host), $output); @exec('nslookup -type=' . escapeshellarg($type) . ' ' . escapeshellarg($host), $output); // If output is empty, the nslookup failed -- cgit v1.2.1 From f988177cb353dc6249829242a8d241e0b8cd21c8 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Mon, 10 Dec 2007 18:35:28 +0000 Subject: Late fix for #16174 git-svn-id: file:///svn/phpbb/trunk@8273 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 6f1d5964f5..bf00beb2e1 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2050,11 +2050,11 @@ function check_form_key($form_name, $timespan = false, $return_page = '', $trigg if ($timespan === false) { // we enforce a minimum value of half a minute here. - $timespan = 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 = $config['form_token_mintime']; + $minimum_time = (int) $config['form_token_mintime']; } if (isset($_POST['creation_time']) && isset($_POST['form_token'])) -- cgit v1.2.1