From 22c91099a17a134ed90cd94223baf9c92ba106f4 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 30 Mar 2016 09:03:02 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'
---
install/install.php | 1 +
interface/web/nav.php | 6 +++++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/install/install.php b/install/install.php
index 6334c28..b17336d 100644
--- a/install/install.php
+++ b/install/install.php
@@ -445,6 +445,7 @@
swriteln('Configuring Bastille Firewall');
$inst->configure_bastille_firewall();
$conf['services']['firewall'] = true;
+ $conf['bastille']['installed'] = true;
}
//* Configure Fail2ban
diff --git a/interface/web/nav.php b/interface/web/nav.php
index 8a49edd..68ceb89 100644
--- a/interface/web/nav.php
+++ b/interface/web/nav.php
@@ -69,7 +69,11 @@
$web_servers = $app->db->queryOneRecord("SELECT COUNT(*) as cnt FROM server WHERE web_server = 1 AND active = 1");
if($web_servers['cnt'] == 0) continue;
}
-
+ if($mt == 'vm'){
+ $vm_servers = $app->db->queryOneRecord("SELECT COUNT(*) AS cnt FROM server WHERE vserver_server = 1 AND active = 1");
+ if($vm_servers['cnt'] == 0) continue;
+ }
+
include_once $mt.'/lib/module.conf.php';
$language = (isset($_SESSION['s']['user']['language']))?$_SESSION['s']['user']['language']:$conf['language'];
$app->load_language_file('web/'.$mt.'/lib/'.$language.'.lng');
--
Gitblit v1.9.1