From 8b5ccd302bd1497de721a25e4ce086bebf95173f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 08 Jun 2008 15:32:42 -0400
Subject: [PATCH] Fixed a problem with the logout when the php session has ended.
---
interface/web/admin/lib/module.conf.php | 272 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 153 insertions(+), 119 deletions(-)
diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php
index d1261e4..b6d4384 100644
--- a/interface/web/admin/lib/module.conf.php
+++ b/interface/web/admin/lib/module.conf.php
@@ -1,120 +1,154 @@
-<?php
-
-$module["name"] = "admin";
-$module["title"] = "System";
-$module["template"] = "module.tpl.htm";
-$module["startpage"] = "admin/users_list.php";
-$module["tab_width"] = '60';
-
-
-$items[] = array( 'title' => "Add user",
- 'target' => 'content',
- 'link' => 'admin/users_edit.php');
-
-$items[] = array( 'title' => "Edit user",
- 'target' => 'content',
- 'link' => 'admin/users_list.php');
-
-
-$module["nav"][] = array( 'title' => 'Users',
- 'open' => 1,
- 'items' => $items);
-
-
-// aufr�umen
-unset($items);
-
-$items[] = array( 'title' => "Add group",
- 'target' => 'content',
- 'link' => 'admin/groups_edit.php');
-
-$items[] = array( 'title' => "Edit group",
- 'target' => 'content',
- 'link' => 'admin/groups_list.php');
-
-
-$module["nav"][] = array( 'title' => 'Groups',
- 'open' => 1,
- 'items' => $items);
-
-
-// aufr�umen
-unset($items);
-
-$items[] = array( 'title' => "Add server",
- 'target' => 'content',
- 'link' => 'admin/server_edit.php');
-
-$items[] = array( 'title' => "Edit server",
- 'target' => 'content',
- 'link' => 'admin/server_list.php');
-
-
-$module["nav"][] = array( 'title' => 'Servers',
- 'open' => 1,
- 'items' => $items);
-
-
-// aufr�umen
-unset($items);
-
-$items[] = array( 'title' => "Add user",
- 'target' => 'content',
- 'link' => 'admin/dbsync_edit.php');
-
-$items[] = array( 'title' => "Edit user",
- 'target' => 'content',
- 'link' => 'admin/dbsync_list.php');
-
-
-$items[] = array( 'title' => "Sync. Now",
- 'target' => 'content',
- 'link' => 'admin/dbsync_cron.php');
-
-$module["nav"][] = array( 'title' => 'DB Sync.',
- 'open' => 1,
- 'items' => $items);
-
-
-// aufr�umen
-unset($items);
-
-$items[] = array( 'title' => "Add user",
- 'target' => 'content',
- 'link' => 'admin/filesync_edit.php');
-
-$items[] = array( 'title' => "Edit user",
- 'target' => 'content',
- 'link' => 'admin/filesync_list.php');
-
-
-$module["nav"][] = array( 'title' => 'File Sync.',
- 'open' => 1,
- 'items' => $items);
-
-
-// aufr�umen
-unset($items);
-
-
-
-// Getting the admin options from other modules
-$modules = explode(',',$_SESSION["s"]["user"]["modules"]);
-if(is_array($modules)) {
- foreach($modules as $mt) {
- if(is_file($mt."/lib/admin.conf.php")) {
- $options = array();
- include_once($conf["rootpath"]."/web/".$mt."/lib/admin.conf.php");
- if(is_array($options)) {
- foreach($options as $opt) {
- $module["nav"][] = $opt;
- }
- }
- }
- }
-}
-
-
-
-
+<?php
+
+global $conf;
+
+$module['name'] = 'admin';
+$module['title'] = 'System';
+$module['template'] = 'module.tpl.htm';
+$module['startpage'] = 'admin/users_list.php';
+$module['tab_width'] = '60';
+
+
+$items[] = array( 'title' => 'Add user',
+ 'target' => 'content',
+ 'link' => 'admin/users_edit.php');
+
+$items[] = array( 'title' => 'Edit user',
+ 'target' => 'content',
+ 'link' => 'admin/users_list.php');
+
+
+$module['nav'][] = array( 'title' => 'CP Users',
+ 'open' => 1,
+ 'items' => $items);
+
+
+// cleanup
+unset($items);
+
+$items[] = array( 'title' => 'Add group',
+ 'target' => 'content',
+ 'link' => 'admin/groups_edit.php');
+
+$items[] = array( 'title' => 'Edit group',
+ 'target' => 'content',
+ 'link' => 'admin/groups_list.php');
+
+
+$module['nav'][] = array( 'title' => 'Groups',
+ 'open' => 1,
+ 'items' => $items);
+
+
+// cleanup
+unset($items);
+/*
+$items[] = array( 'title' => 'Add server',
+ 'target' => 'content',
+ 'link' => 'admin/server_edit.php');
+*/
+$items[] = array( 'title' => 'Edit server',
+ 'target' => 'content',
+ 'link' => 'admin/server_list.php');
+/*
+$items[] = array( 'title' => 'Add Server IP',
+ 'target' => 'content',
+ 'link' => 'admin/server_ip_edit.php');
+*/
+$items[] = array( 'title' => 'Edit Server IP',
+ 'target' => 'content',
+ 'link' => 'admin/server_ip_list.php');
+
+
+$module['nav'][] = array( 'title' => 'Servers',
+ 'open' => 1,
+ 'items' => $items);
+
+
+// cleanup
+unset($items);
+
+$items[] = array( 'title' => 'Add user',
+ 'target' => 'content',
+ 'link' => 'admin/dbsync_edit.php');
+
+$items[] = array( 'title' => 'Edit user',
+ 'target' => 'content',
+ 'link' => 'admin/dbsync_list.php');
+
+
+$items[] = array( 'title' => 'Sync. Now',
+ 'target' => 'content',
+ 'link' => 'admin/dbsync_cron.php');
+
+$module['nav'][] = array( 'title' => 'DB Sync.',
+ 'open' => 1,
+ 'items' => $items);
+
+
+// cleanup
+unset($items);
+
+
+
+$items[] = array( 'title' => 'Languages',
+ 'target' => 'content',
+ 'link' => 'admin/language_list.php');
+
+$items[] = array( 'title' => 'New Language',
+ 'target' => 'content',
+ 'link' => 'admin/language_add.php');
+
+$items[] = array( 'title' => 'Export',
+ 'target' => 'content',
+ 'link' => 'admin/language_export.php');
+
+$items[] = array( 'title' => 'Import',
+ 'target' => 'content',
+ 'link' => 'admin/language_import.php');
+
+$module['nav'][] = array( 'title' => 'Language Editor',
+ 'open' => 1,
+ 'items' => $items);
+
+
+// aufr�umen
+unset($items);
+
+/*
+$items[] = array( 'title' => 'Add user',
+ 'target' => 'content',
+ 'link' => 'admin/filesync_edit.php');
+
+$items[] = array( 'title' => 'Edit user',
+ 'target' => 'content',
+ 'link' => 'admin/filesync_list.php');
+
+
+$module['nav'][] = array( 'title' => 'File Sync.',
+ 'open' => 1,
+ 'items' => $items);
+
+
+// aufr�umen
+unset($items);
+*/
+
+
+// Getting the admin options from other modules
+$modules = explode(',', $_SESSION['s']['user']['modules']);
+if(is_array($modules)) {
+ foreach($modules as $mt) {
+ if(is_file($mt.'/lib/admin.conf.php')) {
+ $options = array();
+ include_once(ISPC_WEB_PATH."/$mt/lib/admin.conf.php");
+ if(is_array($options)) {
+ foreach($options as $opt) {
+ $module['nav'][] = $opt;
+ }
+ }
+ }
+ }
+}
+
?>
\ No newline at end of file
--
Gitblit v1.9.1