Merge branch 'master' into phpunit

* master:
  added option to disable reverse DNS lookups

conf/dokuwiki.php

@@ -158,6 +158,7 @@ $conf['renderer_xhtml'] = 'xhtml';       //renderer to use for main page generat
 $conf['readdircache'] = 0;               //time cache in second for the readdir operation, 0 to deactivate.
 
 /* Network Settings */
+$conf['dnslookups'] = 1;                 //disable to disallow IP to hostname lookups
 // Proxy setup - if your Server needs a proxy to access the web set these
 $conf['proxy']['host']    = '';
 $conf['proxy']['port']    = '';

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);
 

lib/plugins/config/lang/en/lang.php

@@ -177,6 +177,9 @@ $lang['renderer_xhtml']   = 'Renderer to use for main (xhtml) wiki output';
 $lang['renderer__core']   = '%s (dokuwiki core)';
 $lang['renderer__plugin'] = '%s (plugin)';
 
+/* Network Options */
+$lang['dnslookups'] = 'DokuWiki will lookup hostnames for remote IP addresses of users editing pages. If you have a slow or non working DNS server or don\'t want this feature, disable this option';
+
 /* Proxy Options */
 $lang['proxy____host']    = 'Proxy servername';
 $lang['proxy____port']    = 'Proxy port';

lib/plugins/config/settings/config.metadata.php

@@ -207,6 +207,7 @@ $meta['renderer_xhtml'] = array('renderer','_format' => 'xhtml','_choices' => ar
 $meta['readdircache'] = array('numeric');
 
 $meta['_network']    = array('fieldset');
+$meta['dnslookups']  = array('onoff');
 $meta['proxy____host'] = array('string','_pattern' => '#^(|[a-z0-9\-\.+]+)$#i');
 $meta['proxy____port'] = array('numericopt');
 $meta['proxy____user'] = array('string');