From 42539643c396f9d8865dcf9a51b13dc869709d16 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Wed, 13 Aug 2014 07:16:50 -0400 Subject: [PATCH] Merge remote-tracking branch 'ispc/stable-3.0.5' into stable-3.0.5 --- server/plugins-available/firewall_plugin.inc.php | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/server/plugins-available/firewall_plugin.inc.php b/server/plugins-available/firewall_plugin.inc.php index 186e9b9..2cca769 100644 --- a/server/plugins-available/firewall_plugin.inc.php +++ b/server/plugins-available/firewall_plugin.inc.php @@ -76,29 +76,31 @@ global $app, $conf; //* load the server configuration options - $app->uses('getconf'); - $server_config = $app->getconf->get_server_config($conf['server_id'], 'server'); - if($server_config['firewall'] == 'ufw') { - $this->ufw_update($event_name, $data); - } else { - $this->bastille_update($event_name, $data); + if(!$data['mirrored']) { + $app->uses('getconf'); + $server_config = $app->getconf->get_server_config($conf['server_id'], 'server'); + if($server_config['firewall'] == 'ufw') { + $this->ufw_update($event_name, $data); + } else { + $this->bastille_update($event_name, $data); + } } - } public function delete($event_name, $data) { global $app, $conf; //* load the server configuration options - $app->uses('getconf'); - $server_config = $app->getconf->get_server_config($conf['server_id'], 'server'); + if(!$data['mirrored']) { + $app->uses('getconf'); + $server_config = $app->getconf->get_server_config($conf['server_id'], 'server'); - if($server_config['firewall'] == 'ufw') { - $this->ufw_delete($event_name, $data); - } else { - $this->bastille_delete($event_name, $data); + if($server_config['firewall'] == 'ufw') { + $this->ufw_delete($event_name, $data); + } else { + $this->bastille_delete($event_name, $data); + } } - } private function ufw_update($event_name, $data) { -- Gitblit v1.9.1