From 7bce72dd8ffc5a1e072d9d51cd4e40ede7258d3d Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 07 Apr 2016 12:26:40 -0400
Subject: [PATCH] Fixed: Issue #3693 Choose better default customer numbers for clients of resellers.
---
server/plugins-available/firewall_plugin.inc.php | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/server/plugins-available/firewall_plugin.inc.php b/server/plugins-available/firewall_plugin.inc.php
index 186e9b9..d3538cc 100644
--- a/server/plugins-available/firewall_plugin.inc.php
+++ b/server/plugins-available/firewall_plugin.inc.php
@@ -38,7 +38,7 @@
public function onInstall() {
global $conf;
- if($conf['bastille']['installed'] = true && $conf['services']['firewall'] == true) {
+ if($conf['bastille']['installed'] == true && $conf['services']['firewall'] == true) {
return true;
} else {
return false;
@@ -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