From a5b276444c1e2fa9c960131723ffd6955fb92f48 Mon Sep 17 00:00:00 2001
From: karailiev <karailiev@ispconfig3>
Date: Tue, 11 Aug 2009 15:20:21 -0400
Subject: [PATCH] ticket 827 For some reason till has made the version number not to load when no user is logged in. Due to ajax login the version number remains not loaded even after login until the whole page is reloaded. I didn't find any comment why is this done, so I revert it.
---
interface/web/admin/lib/module.conf.php | 150 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 102 insertions(+), 48 deletions(-)
diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php
index 7ee168e..98f828f 100644
--- a/interface/web/admin/lib/module.conf.php
+++ b/interface/web/admin/lib/module.conf.php
@@ -1,103 +1,157 @@
<?php
-$module["name"] = "admin";
-$module["title"] = "System";
-$module["template"] = "module.tpl.htm";
-$module["startpage"] = "admin/users_list.php";
-$module["tab_width"] = '60';
+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",
+$items[] = array( 'title' => 'Add user',
'target' => 'content',
'link' => 'admin/users_edit.php');
-$items[] = array( 'title' => "Edit user",
+$items[] = array( 'title' => 'Edit user',
'target' => 'content',
'link' => 'admin/users_list.php');
-$module["nav"][] = array( 'title' => 'Users',
+$module['nav'][] = array( 'title' => 'CP Users',
'open' => 1,
'items' => $items);
-// aufr�umen
+// cleanup
unset($items);
-$items[] = array( 'title' => "Add group",
+$items[] = array( 'title' => 'Add group',
'target' => 'content',
'link' => 'admin/groups_edit.php');
-$items[] = array( 'title' => "Edit group",
+$items[] = array( 'title' => 'Edit group',
'target' => 'content',
'link' => 'admin/groups_list.php');
-$module["nav"][] = array( 'title' => 'Groups',
+$module['nav'][] = array( 'title' => 'Groups',
'open' => 1,
'items' => $items);
-// aufr�umen
+// 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' => 'Server Config',
+ 'target' => 'content',
+ 'link' => 'admin/server_config_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');
+
+
+$items[] = array( 'title' => 'Interface Config',
+ 'target' => 'content',
+ 'link' => 'admin/system_config_edit.php?id=1');
+
+$module['nav'][] = array( 'title' => 'System',
+ 'open' => 1,
+ 'items' => $items);
+// cleanup
unset($items);
-$items[] = array( 'title' => "Add user",
- 'target' => 'content',
- 'link' => 'admin/dbsync_edit.php');
-$items[] = array( 'title' => "Edit user",
+$items[] = array( 'title' => 'Firewall',
'target' => 'content',
- 'link' => 'admin/dbsync_list.php');
+ 'link' => 'admin/firewall_list.php');
+
+$module['nav'][] = array( 'title' => 'Firewall',
+ 'open' => 1,
+ 'items' => $items);
+
+
+// cleanup
+unset($items);
+
+
+$items[] = array( 'title' => 'Repositories',
+ 'target' => 'content',
+ 'link' => 'admin/software_repo_list.php');
+
+$items[] = array( 'title' => 'Packages',
+ 'target' => 'content',
+ 'link' => 'admin/software_package_list.php');
+
+$items[] = array( 'title' => 'Updates',
+ 'target' => 'content',
+ 'link' => 'admin/software_update_list.php');
+
+$module['nav'][] = array( 'title' => 'Software',
+ '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' => "Sync. Now",
+$items[] = array( 'title' => 'Merge',
'target' => 'content',
- 'link' => 'admin/dbsync_cron.php');
+ 'link' => 'admin/language_complete.php');
-$module["nav"][] = array( 'title' => 'DB Sync.',
+$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
+// cleanup
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"]);
+$modules = explode(',', $_SESSION['s']['user']['modules']);
if(is_array($modules)) {
foreach($modules as $mt) {
- if(is_file($mt."/lib/admin.conf.php")) {
+ if(is_file($mt.'/lib/admin.conf.php')) {
$options = array();
- include_once($conf["rootpath"]."/web/".$mt."/lib/admin.conf.php");
+ include_once(ISPC_WEB_PATH."/$mt/lib/admin.conf.php");
if(is_array($options)) {
foreach($options as $opt) {
- $module["nav"][] = $opt;
+ $module['nav'][] = $opt;
}
}
}
}
}
-
-
-
?>
\ No newline at end of file
--
Gitblit v1.9.1