diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:37 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:37 +0100 |
| commit | 2ba97da524f73f3a7244cd68b7f3daee7a1933a6 (patch) | |
| tree | 2e01d3c01b99ebc51d1495c9de991690b6ed9ff5 /phpBB/includes/functions.php | |
| parent | aa4495b8ad0cf90c2b3f655441ccfee49701282d (diff) | |
| parent | 7ecd17a99310df2fecea2967ec6f97bb6b63a2e3 (diff) | |
| download | forums-2ba97da524f73f3a7244cd68b7f3daee7a1933a6.tar forums-2ba97da524f73f3a7244cd68b7f3daee7a1933a6.tar.gz forums-2ba97da524f73f3a7244cd68b7f3daee7a1933a6.tar.bz2 forums-2ba97da524f73f3a7244cd68b7f3daee7a1933a6.tar.xz forums-2ba97da524f73f3a7244cd68b7f3daee7a1933a6.zip | |
Merge commit 'release-3.0.0'
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 8620134311..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'])) @@ -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 |