From dedf5feaa2cf3072e90ac2bf2ef3885facd2e1a6 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sun, 20 Dec 2015 04:39:34 -0500
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
---
interface/web/nav.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/interface/web/nav.php b/interface/web/nav.php
index 6475daa..8a49edd 100644
--- a/interface/web/nav.php
+++ b/interface/web/nav.php
@@ -74,7 +74,7 @@
$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 +83,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