Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-31 dbf57dddf7ef07a0168ad0c1d64de0735a9c5804

 server/plugins-available/network_settings_plugin.inc.php

@@ -110,7 +110,7 @@
                  /*
                   * don't insert the main-ip again!
                   */
                  if ($rec['ip_address'] != $server_config['ip_address'])
                  if ($rec['ip_address'] != $server_config['ip_address'] && filter_var($rec['ip_address'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4))
                  {
                     $ip_records[$n] = array(
                        'id' => $n,
@@ -188,7 +188,7 @@
                  /*
                   * don't insert the main-ip again!
                   */
                  if ($rec['ip_address'] != $server_config['ip_address'])
                  if ($rec['ip_address'] != $server_config['ip_address'] && filter_var($rec['ip_address'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4))
                  {
                     $ip_records[$n] = array(
                        'id' => $n,