From 3cdb9a8fdc13ceb9de7a32b6fd989b76bafb45af Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 08 Jun 2011 04:58:27 -0400
Subject: [PATCH] Fixed: FS#1642 - Adding new content filters breaks header_checks, body_checks etc.
---
server/plugins-available/network_settings_plugin.inc.php | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/server/plugins-available/network_settings_plugin.inc.php b/server/plugins-available/network_settings_plugin.inc.php
index 4b06006..16b553b 100644
--- a/server/plugins-available/network_settings_plugin.inc.php
+++ b/server/plugins-available/network_settings_plugin.inc.php
@@ -97,7 +97,7 @@
$network_tpl->setVar('broadcast',$this->broadcast($server_config['ip_address'],$server_config['netmask']));
$network_tpl->setVar('network',$this->network($server_config['ip_address'],$server_config['netmask']));
- $records = $app->db->queryAllRecords("SELECT ip_address FROM server_ip WHERE server_id = ".intval($conf['server_id']) . ' order by ip_address');
+ $records = $app->db->queryAllRecords("SELECT ip_address FROM server_ip WHERE server_id = ".intval($conf['server_id']) . ' ORDER BY server_ip_id ASC');
$ip_records = array();
$additionl_ip_records = 0;
$n = 0;
@@ -129,6 +129,8 @@
* main-server) because the LAST IP in the list is the IP mysql uses
* to determine the host, the user is logging in from.
*/
+ /*
+ // Disabled this part as it causes problems on multiserver setups
if ($additionl_ip_records != 0)
{
$swap['ip_address'] = $ip_records[$n-1]['ip_address'];
@@ -149,6 +151,7 @@
$network_tpl->setVar('broadcast',$this->broadcast($swap['ip_address'],$swap['netmask']));
$network_tpl->setVar('network',$this->network($swap['ip_address'],$swap['netmask']));
}
+ */
$network_tpl->setVar('additionl_ip_records',$additionl_ip_records);
$network_tpl->setLoop('interfaces',$ip_records);
@@ -235,7 +238,7 @@
}
} else {
- $app->log('Network configuration disabled in server settings.',LOGLEVEL_WARN);
+ $app->log('Network configuration disabled in server settings.',LOGLEVEL_DEBUG);
}
}
--
Gitblit v1.9.1