From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/nav.php | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/interface/web/nav.php b/interface/web/nav.php
index 773f7d1..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');
@@ -83,12 +87,16 @@
}
} else {
//* Loading Login Module
+ /*
include_once 'login/lib/module.conf.php';
$_SESSION['s']['module'] = $module;
$topnav[] = array( 'title' => 'Login',
'active' => 1);
$module = null;
unset($module);
+ */
+ header('Location: /login/');
+ die();
}
//* Topnavigation
--
Gitblit v1.9.1