From ba747c0be201755bed0e36e02edfb85d31f5214f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 30 May 2007 10:11:32 -0400
Subject: [PATCH] Enhanced getmail support and the installer.

---
 interface/web/mail/lib/module.conf.php |  235 ++++++++++++++++++++++++++++------------------------------
 1 files changed, 113 insertions(+), 122 deletions(-)

diff --git a/interface/web/mail/lib/module.conf.php b/interface/web/mail/lib/module.conf.php
index a7c7e1c..5cf7455 100644
--- a/interface/web/mail/lib/module.conf.php
+++ b/interface/web/mail/lib/module.conf.php
@@ -1,123 +1,114 @@
-<?php
-$module = array (
-  'name' => 'mail',
-  'title' => 'Email',
-  'template' => 'module.tpl.htm',
-  'navframe_page' => '',
-  'startpage' => 'mail/mail_domain_list.php',
-  'tab_width' => '',
-  'nav' => 
-  array (
-    0 => 
-    array (
-      'title' => 'Email Accounts',
-      'open' => 1,
-      'items' => 
-      array (
-        0 => 
-        array (
-          'title' => 'Domain',
-          'target' => 'content',
-          'link' => 'mail/mail_domain_list.php',
-        ),
-        3 => 
-        array (
-          'title' => 'Email Mailbox',
-          'target' => 'content',
-          'link' => 'mail/mail_user_list.php',
-        ),
-        4 => 
-        array (
-          'title' => 'Email Alias',
-          'target' => 'content',
-          'link' => 'mail/mail_alias_list.php',
-        ),
-        5 => 
-        array (
-          'title' => 'Email Forward',
-          'target' => 'content',
-          'link' => 'mail/mail_forward_list.php',
-        ),
-        6 => 
-        array (
-          'title' => 'Email Catchall',
-          'target' => 'content',
-          'link' => 'mail/mail_domain_catchall_list.php',
-        ),
-        7 => 
-        array (
-          'title' => 'Email Routing',
-          'target' => 'content',
-          'link' => 'mail/mail_transport_list.php',
-        ),
-      ),
-    ),
-    1 => 
-    array (
-      'title' => 'Email Filter',
-      'open' => 1,
-      'items' => 
-      array (
-        0 => 
-        array (
-          'title' => 'Whitelist',
-          'target' => 'content',
-          'link' => 'mail/mail_whitelist_list.php',
-        ),
-        1 => 
-        array (
-          'title' => 'Blacklist',
-          'target' => 'content',
-          'link' => 'mail/mail_blacklist_list.php',
-        ),
-      ),
-    ),
-    2 => 
-    array (
-      'title' => 'Spamfilter',
-      'open' => 1,
-      'items' => 
-      array (
-        0 => 
-        array (
-          'title' => 'Whitelist',
-          'target' => 'content',
-          'link' => 'mail/spamfilter_whitelist_list.php',
-        ),
-        1 => 
-        array (
-          'title' => 'Blacklist',
-          'target' => 'content',
-          'link' => 'mail/spamfilter_blacklist_list.php',
-        ),
-        2 => 
-        array (
-          'title' => 'User',
-          'target' => 'content',
-          'link' => 'mail/spamfilter_users_list.php',
-        ),
-        3 => 
-        array (
-          'title' => 'Policy',
-          'target' => 'content',
-          'link' => 'mail/spamfilter_policy_list.php',
-        ),
-      ),
-    ),
-    3 => 
-    array (
-      'title' => 'Fetchmail',
-      'open' => 1,
-      'items' => 
-      array (
-        0 => 
-        array (
-          'title' => 'Fetchmail',
-          'target' => 'content',
-          'link' => 'mail/mail_get_list.php',
-        ),
-      ),
-    ),
-  ),
-)
+<?php
+
+$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",
+				  'target' 	=> 'content',
+				  'link'	=> 'mail/mail_domain_list.php');
+
+$items[] = array( 'title' 	=> "Email Mailbox",
+				  'target' 	=> 'content',
+				  'link'	=> 'mail/mail_user_list.php');
+
+$items[] = array( 'title' 	=> "Email Alias",
+				  'target' 	=> 'content',
+				  'link'	=> 'mail/mail_alias_list.php');			  
+
+$items[] = array( 'title' 	=> "Email Forward",
+				  'target' 	=> 'content',
+				  'link'	=> 'mail/mail_forward_list.php');
+
+$items[] = array( 'title' 	=> "Email Catchall",
+				  'target' 	=> 'content',
+				  'link'	=> 'mail/mail_domain_catchall_list.php');
+
+$items[] = array( 'title' 	=> "Email Routing",
+				  'target' 	=> 'content',
+				  'link'	=> 'mail/mail_transport_list.php');
+
+$module["nav"][] = array(	'title'	=> 'Email Accounts',
+							'open' 	=> 1,
+							'items'	=> $items);
+
+// aufr�umen
+unset($items);
+
+/*
+	Spamfilter menu
+*/
+
+$items[] = array( 'title' 	=> "Whitelist",
+				  'target' 	=> 'content',
+				  'link'	=> 'mail/spamfilter_whitelist_list.php');
+
+$items[] = array( 'title' 	=> "Blacklist",
+				  'target' 	=> 'content',
+				  'link'	=> 'mail/spamfilter_blacklist_list.php');
+
+if($_SESSION["s"]["user"]["typ"] == 'admin') {
+
+	$items[] = array( 	'title' 	=> "User / Domain",
+				  		'target' 	=> 'content',
+				  		'link'	=> 'mail/spamfilter_users_list.php');
+
+	$items[] = array( 	'title' 	=> "Policy",
+				  		'target' 	=> 'content',
+				  		'link'	=> 'mail/spamfilter_policy_list.php');
+}
+
+$module["nav"][] = array(	'title'	=> 'Spamfilter',
+							'open' 	=> 1,
+							'items'	=> $items);
+
+// aufr�umen
+unset($items);
+
+/*
+	Fetchmail menu
+*/
+
+
+$items[] = array( 'title' 	=> "Fetchmail",
+				  'target' 	=> 'content',
+				  'link'	=> 'mail/mail_get_list.php');
+
+
+$module["nav"][] = array(	'title'	=> 'Fetchmail',
+							'open' 	=> 1,
+							'items'	=> $items);
+
+// aufr�umen
+unset($items);
+
+/*
+	Global filters menu
+*/
+
+if($_SESSION["s"]["user"]["typ"] == 'admin') {
+
+	$items[] = array( 'title' 	=> "Whitelist",
+				  	'target' 	=> 'content',
+				  	'link'	=> 'mail/mail_whitelist_list.php');
+
+	$items[] = array( 'title' 	=> "Blacklist",
+				 	 'target' 	=> 'content',
+				  	 'link'	=> 'mail/mail_blacklist_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