From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/nav.php | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/interface/web/nav.php b/interface/web/nav.php
index 6475daa..68ceb89 100644
--- a/interface/web/nav.php
+++ b/interface/web/nav.php
@@ -69,12 +69,16 @@
$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');
$active = ($module['name'] == $_SESSION['s']['module']['name']) ? 1 : 0;
- $topnav[$module['order']] = array( 'title' => $app->lng($module['title']),
+ $topnav[$module['order'].'-'.$module['name']] = array( 'title' => $app->lng($module['title']),
'active' => $active,
'module' => $module['name']);
}
@@ -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