From a7796bec1be01b51f400e9a3a698535b12b636aa Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 11 Feb 2016 13:44:27 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/tools/lib/module.conf.php | 51 ++++++++++++++++++++-------------------------------
1 files changed, 20 insertions(+), 31 deletions(-)
diff --git a/interface/web/tools/lib/module.conf.php b/interface/web/tools/lib/module.conf.php
index 10855fe..617ab0b 100644
--- a/interface/web/tools/lib/module.conf.php
+++ b/interface/web/tools/lib/module.conf.php
@@ -2,25 +2,26 @@
global $conf;
-$module['name'] = 'tools';
-$module['title'] = 'top_menu_tools';
-$module['template'] = 'module.tpl.htm';
-$module['startpage'] = 'tools/index.php';
+$module['name'] = 'tools';
+$module['title'] = 'top_menu_tools';
+$module['template'] = 'module.tpl.htm';
+$module['startpage'] = 'tools/index.php';
$module['tab_width'] = '60';
+$module['order'] = '80';
//**** Change User password
$items = array();
-$items[] = array( 'title' => 'Password and Language',
- 'target' => 'content',
- 'link' => 'tools/user_settings.php',
- 'html_id' => 'user_settings');
+$items[] = array( 'title' => 'Password and Language',
+ 'target' => 'content',
+ 'link' => 'tools/user_settings.php',
+ 'html_id' => 'user_settings');
$module['nav'][] = array( 'title' => 'User Settings',
- 'open' => 1,
- 'items' => $items);
+ 'open' => 1,
+ 'items' => $items);
unset($items);
@@ -28,30 +29,18 @@
$items = array();
$items[] = array( 'title' => 'Interface',
- 'target' => 'content',
- 'link' => 'tools/interface_settings.php',
- 'html_id' => 'interface_settings');
+ 'target' => 'content',
+ 'link' => 'tools/interface_settings.php',
+ 'html_id' => 'interface_settings');
-include_once(ISPC_WEB_PATH.'/tools/lib/interface.d/tpl_' . $_SESSION['s']['user']['app_theme'] . '.menu.php');
-
-$module['nav'][] = array( 'title' => 'Interface',
- 'open' => 1,
- 'items' => $items);
+if(file_exists(ISPC_WEB_PATH.'/tools/lib/interface.d/tpl_' . $_SESSION['s']['user']['app_theme'] . '.menu.php')) include_once ISPC_WEB_PATH.'/tools/lib/interface.d/tpl_' . $_SESSION['s']['user']['app_theme'] . '.menu.php';
+
+$module['nav'][] = array( 'title' => 'Interface',
+ 'open' => 1,
+ 'items' => $items);
unset($items);
-//**** Load additional menu items
-$menu_dir = ISPC_WEB_PATH.'/tools/lib/menu.d';
-if (is_dir($menu_dir)) {
- if ($dh = opendir($menu_dir)) {
- //** Go through all files in the menu dir
- while (($file = readdir($dh)) !== false) {
- if ($file != '.' && $file != '..' && substr($file, -9, 9) == '.menu.php' && $file != 'dns_resync.menu.php') {
- include_once($menu_dir . '/' . $file);
- }
- }
- }
-}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1