diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-05-14 02:39:17 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-05-14 02:39:17 +0200 |
| commit | be1c5503443c305dd7f0064631dd73e37673fd7a (patch) | |
| tree | e87335a34bbf1e8cee0bd27ae1e012853cd0ea52 /phpBB/includes/functions.php | |
| parent | 39770de9213758929c33250a829fcdc53e434ac5 (diff) | |
| parent | 99482e95557026e9562825cda8eebe61ed880c01 (diff) | |
| download | forums-be1c5503443c305dd7f0064631dd73e37673fd7a.tar forums-be1c5503443c305dd7f0064631dd73e37673fd7a.tar.gz forums-be1c5503443c305dd7f0064631dd73e37673fd7a.tar.bz2 forums-be1c5503443c305dd7f0064631dd73e37673fd7a.tar.xz forums-be1c5503443c305dd7f0064631dd73e37673fd7a.zip | |
Merge branch 'ticket/bantu/9598' into develop-olympus
* ticket/bantu/9598:
[ticket/9598] checkdnsrr() is now available on Windows with PHP 5.3 or later. Change if block order to always call checkdnsrr() if the function is available.
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 4f52c7c2ce..c88e434b4b 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3409,13 +3409,14 @@ function phpbb_checkdnsrr($host, $type = '') { $type = (!$type) ? 'MX' : $type; - if (DIRECTORY_SEPARATOR == '\\') + // Call checkdnsrr() if available. This is also the case on Windows with PHP 5.3 or later. + if (function_exists('checkdnsrr')) + { + // The dot indicates to search the DNS root (helps those having DNS prefixes on the same domain) + return checkdnsrr($host . '.', $type); + } + else if (DIRECTORY_SEPARATOR == '\\' && function_exists('exec')) { - if (!function_exists('exec')) - { - return NULL; - } - // @exec('nslookup -retry=1 -timout=1 -type=' . escapeshellarg($type) . ' ' . escapeshellarg($host), $output); @exec('nslookup -type=' . escapeshellarg($type) . ' ' . escapeshellarg($host) . '.', $output); @@ -3441,11 +3442,6 @@ function phpbb_checkdnsrr($host, $type = '') return false; } - else if (function_exists('checkdnsrr')) - { - // The dot indicates to search the DNS root (helps those having DNS prefixes on the same domain) - return (checkdnsrr($host . '.', $type)) ? true : false; - } return NULL; } |