diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-04-23 12:34:17 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-04-23 12:34:17 +0200 |
| commit | 3891d3ec0d32f09040f0c0a13889c01db23783ae (patch) | |
| tree | e42d344cd92950e3d5ce0e63d8e1949fff93ff55 /inc | |
| parent | f77b4d4f96b5465f08cb42f7b536842e371d629e (diff) | |
| parent | 22ef1e32c51ac82df8d6a03e1e95876100e8f6c1 (diff) | |
| download | rpg-3891d3ec0d32f09040f0c0a13889c01db23783ae.tar.gz rpg-3891d3ec0d32f09040f0c0a13889c01db23783ae.tar.bz2 | |
Merge branch 'master' into phpunit
* master:
added option to disable reverse DNS lookups
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/common.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/inc/common.php b/inc/common.php index 22a315901..6ea536c44 100644 --- a/inc/common.php +++ b/inc/common.php @@ -676,10 +676,15 @@ function clientismobile(){ /** * Convert one or more comma separated IPs to hostnames * + * If $conf['dnslookups'] is disabled it simply returns the input string + * * @author Glen Harris <astfgl@iamnota.org> * @returns a comma separated list of hostnames */ function gethostsbyaddrs($ips){ + global $conf; + if(!$conf['dnslookups']) return $ips; + $hosts = array(); $ips = explode(',',$ips); |