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/mail/lib/module.conf.php | 113 +++++++++++++++++++++++++++++---------------------------
1 files changed, 58 insertions(+), 55 deletions(-)
diff --git a/interface/web/mail/lib/module.conf.php b/interface/web/mail/lib/module.conf.php
index 5cf7455..5a6fa82 100644
--- a/interface/web/mail/lib/module.conf.php
+++ b/interface/web/mail/lib/module.conf.php
@@ -1,114 +1,117 @@
<?php
-$module["name"] = "mail";
-$module["title"] = "Email";
-$module["template"] = "module.tpl.htm";
-$module["startpage"] = "mail/mail_domain_list.php";
-$module["tab_width"] = '';
+$module['name'] = 'mail';
+$module['title'] = 'Email';
+$module['template'] = 'module.tpl.htm';
+$module['startpage'] = 'mail/mail_domain_list.php';
+$module['tab_width'] = '';
-/*
- Email accounts menu
-*/
-$items[] = array( 'title' => "Domain",
+//**** Email accounts menu
+$items = array();
+
+$items[] = array( 'title' => 'Domain',
'target' => 'content',
'link' => 'mail/mail_domain_list.php');
-$items[] = array( 'title' => "Email Mailbox",
+$items[] = array( 'title' => 'Email Mailbox',
'target' => 'content',
'link' => 'mail/mail_user_list.php');
-$items[] = array( 'title' => "Email Alias",
+$items[] = array( 'title' => 'Email Alias',
'target' => 'content',
'link' => 'mail/mail_alias_list.php');
-$items[] = array( 'title' => "Email Forward",
+$items[] = array( 'title' => 'Email Forward',
'target' => 'content',
'link' => 'mail/mail_forward_list.php');
-$items[] = array( 'title' => "Email Catchall",
+$items[] = array( 'title' => 'Email Catchall',
'target' => 'content',
'link' => 'mail/mail_domain_catchall_list.php');
-$items[] = array( 'title' => "Email Routing",
+$items[] = array( 'title' => 'Email Routing',
'target' => 'content',
'link' => 'mail/mail_transport_list.php');
-$module["nav"][] = array( 'title' => 'Email Accounts',
+$module['nav'][] = array( 'title' => 'Email Accounts',
'open' => 1,
'items' => $items);
-// aufr�umen
-unset($items);
+//**** Spamfilter menu
+$items = array();
-/*
- Spamfilter menu
-*/
-
-$items[] = array( 'title' => "Whitelist",
+$items[] = array( 'title' => 'Whitelist',
'target' => 'content',
'link' => 'mail/spamfilter_whitelist_list.php');
-$items[] = array( 'title' => "Blacklist",
+$items[] = array( 'title' => 'Blacklist',
'target' => 'content',
'link' => 'mail/spamfilter_blacklist_list.php');
-if($_SESSION["s"]["user"]["typ"] == 'admin') {
+if($_SESSION['s']['user']['typ'] == 'admin') {
- $items[] = array( 'title' => "User / Domain",
+ $items[] = array( 'title' => 'User / Domain',
'target' => 'content',
- 'link' => 'mail/spamfilter_users_list.php');
+ 'link' => 'mail/spamfilter_users_list.php');
- $items[] = array( 'title' => "Policy",
+ $items[] = array( 'title' => 'Policy',
'target' => 'content',
- 'link' => 'mail/spamfilter_policy_list.php');
+ 'link' => 'mail/spamfilter_policy_list.php');
+
+ $items[] = array( 'title' => 'Server Settings',
+ 'target' => 'content',
+ 'link' => 'mail/spamfilter_config_list.php');
}
-$module["nav"][] = array( 'title' => 'Spamfilter',
+$module['nav'][] = array( 'title' => 'Spamfilter',
'open' => 1,
'items' => $items);
-// aufr�umen
-unset($items);
+//**** Fetchmail menu
+$items = array();
-/*
- Fetchmail menu
-*/
-
-
-$items[] = array( 'title' => "Fetchmail",
+$items[] = array( 'title' => 'Fetchmail',
'target' => 'content',
'link' => 'mail/mail_get_list.php');
-$module["nav"][] = array( 'title' => 'Fetchmail',
+$module['nav'][] = array( 'title' => 'Fetchmail',
'open' => 1,
'items' => $items);
-// aufr�umen
-unset($items);
+//**** Statistics menu
+$items = array();
-/*
- Global filters menu
-*/
+$items[] = array( 'title' => 'Mailbox traffic',
+ 'target' => 'content',
+ 'link' => 'mail/mail_user_stats.php');
-if($_SESSION["s"]["user"]["typ"] == 'admin') {
- $items[] = array( 'title' => "Whitelist",
- 'target' => 'content',
- 'link' => 'mail/mail_whitelist_list.php');
+$module['nav'][] = array( 'title' => 'Statistics',
+ 'open' => 1,
+ 'items' => $items);
+
+
+//**** Global filters menu
+$items = array();
+if($_SESSION['s']['user']['typ'] == 'admin') {
- $items[] = array( 'title' => "Blacklist",
- 'target' => 'content',
- 'link' => 'mail/mail_blacklist_list.php');
+ $items[] = array( 'title' => 'Postfix Whitelist',
+ 'target' => 'content',
+ 'link' => 'mail/mail_whitelist_list.php');
- $module["nav"][] = array( 'title' => 'Global Filters',
+ $items[] = array( 'title' => 'Postfix Blacklist',
+ 'target' => 'content',
+ 'link' => 'mail/mail_blacklist_list.php');
+
+ $items[] = array( 'title' => 'Content Filter',
+ 'target' => 'content',
+ 'link' => 'mail/mail_content_filter_list.php');
+
+ $module['nav'][] = array( 'title' => 'Global Filters',
'open' => 1,
'items' => $items);
-
- // aufr�umen
- unset($items);
}
-
?>
\ No newline at end of file
--
Gitblit v1.9.1