From 7fe908c50c8dbc5cc05f571dbe11d66141caacd4 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 14 Nov 2013 09:01:22 -0500
Subject: [PATCH] Cleaning up code to match coding guidelines
---
interface/web/mail/lib/module.conf.php | 232 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 116 insertions(+), 116 deletions(-)
diff --git a/interface/web/mail/lib/module.conf.php b/interface/web/mail/lib/module.conf.php
index 731fa91..45e06f2 100644
--- a/interface/web/mail/lib/module.conf.php
+++ b/interface/web/mail/lib/module.conf.php
@@ -2,150 +2,150 @@
$userid=$app->auth->get_user_id();
-$module['name'] = 'mail';
-$module['title'] = 'top_menu_email';
-$module['template'] = 'module.tpl.htm';
-$module['startpage'] = 'mail/mail_domain_list.php';
+$module['name'] = 'mail';
+$module['title'] = 'top_menu_email';
+$module['template'] = 'module.tpl.htm';
+$module['startpage'] = 'mail/mail_domain_list.php';
$module['tab_width'] = '';
//**** Email accounts menu
$items = array();
-if($app->auth->get_client_limit($userid,'maildomain') != 0)
+if($app->auth->get_client_limit($userid, 'maildomain') != 0)
{
- $items[] = array( 'title' => 'Domain',
- 'target' => 'content',
- 'link' => 'mail/mail_domain_list.php',
- 'html_id' => 'mail_domain_list');
-}
-
-if($app->auth->get_client_limit($userid,'mailaliasdomain') != 0)
-{
- $items[] = array( 'title' => 'Domain Alias',
- 'target' => 'content',
- 'link' => 'mail/mail_aliasdomain_list.php',
- 'html_id' => 'mail_aliasdomain_list');
+ $items[] = array( 'title' => 'Domain',
+ 'target' => 'content',
+ 'link' => 'mail/mail_domain_list.php',
+ 'html_id' => 'mail_domain_list');
}
-if($app->auth->get_client_limit($userid,'mailbox') != 0)
+if($app->auth->get_client_limit($userid, 'mailaliasdomain') != 0)
{
- $items[] = array( 'title' => 'Email Mailbox',
- 'target' => 'content',
- 'link' => 'mail/mail_user_list.php',
- 'html_id' => 'mail_user_list');
+ $items[] = array( 'title' => 'Domain Alias',
+ 'target' => 'content',
+ 'link' => 'mail/mail_aliasdomain_list.php',
+ 'html_id' => 'mail_aliasdomain_list');
}
-if($app->auth->get_client_limit($userid,'mailalias') != 0)
+if($app->auth->get_client_limit($userid, 'mailbox') != 0)
{
- $items[] = array( 'title' => 'Email Alias',
- 'target' => 'content',
- 'link' => 'mail/mail_alias_list.php',
- 'html_id' => 'mail_alias_list');
+ $items[] = array( 'title' => 'Email Mailbox',
+ 'target' => 'content',
+ 'link' => 'mail/mail_user_list.php',
+ 'html_id' => 'mail_user_list');
}
-if($app->auth->get_client_limit($userid,'mailforward') != 0)
+if($app->auth->get_client_limit($userid, 'mailalias') != 0)
{
- $items[] = array( 'title' => 'Email Forward',
- 'target' => 'content',
- 'link' => 'mail/mail_forward_list.php',
- 'html_id' => 'mail_forward_list');
+ $items[] = array( 'title' => 'Email Alias',
+ 'target' => 'content',
+ 'link' => 'mail/mail_alias_list.php',
+ 'html_id' => 'mail_alias_list');
}
-if($app->auth->get_client_limit($userid,'mailcatchall') != 0)
+if($app->auth->get_client_limit($userid, 'mailforward') != 0)
{
- $items[] = array( 'title' => 'Email Catchall',
- 'target' => 'content',
- 'link' => 'mail/mail_domain_catchall_list.php',
- 'html_id' => 'mail_domain_catchall_list');
+ $items[] = array( 'title' => 'Email Forward',
+ 'target' => 'content',
+ 'link' => 'mail/mail_forward_list.php',
+ 'html_id' => 'mail_forward_list');
}
-if($app->auth->get_client_limit($userid,'mailrouting') != 0)
+if($app->auth->get_client_limit($userid, 'mailcatchall') != 0)
{
- $items[] = array( 'title' => 'Email Routing',
- 'target' => 'content',
- 'link' => 'mail/mail_transport_list.php',
- 'html_id' => 'mail_transport_list');
+ $items[] = array( 'title' => 'Email Catchall',
+ 'target' => 'content',
+ 'link' => 'mail/mail_domain_catchall_list.php',
+ 'html_id' => 'mail_domain_catchall_list');
+}
+
+if($app->auth->get_client_limit($userid, 'mailrouting') != 0)
+{
+ $items[] = array( 'title' => 'Email Routing',
+ 'target' => 'content',
+ 'link' => 'mail/mail_transport_list.php',
+ 'html_id' => 'mail_transport_list');
}
if(count($items))
{
- $module['nav'][] = array( 'title' => 'Email Accounts',
- 'open' => 1,
- 'items' => $items);
+ $module['nav'][] = array( 'title' => 'Email Accounts',
+ 'open' => 1,
+ 'items' => $items);
}
//**** Mailinglist menu
$items = array();
-if($app->auth->get_client_limit($userid,'mailmailinglist') != 0)
+if($app->auth->get_client_limit($userid, 'mailmailinglist') != 0)
{
- $items[] = array( 'title' => 'Mailing List',
- 'target' => 'content',
- 'link' => 'mail/mail_mailinglist_list.php',
- 'html_id' => 'mail_mailinglist_list');
+ $items[] = array( 'title' => 'Mailing List',
+ 'target' => 'content',
+ 'link' => 'mail/mail_mailinglist_list.php',
+ 'html_id' => 'mail_mailinglist_list');
}
if(count($items))
{
- $module['nav'][] = array( 'title' => 'Mailing List',
- 'open' => 1,
- 'items' => $items);
+ $module['nav'][] = array( 'title' => 'Mailing List',
+ 'open' => 1,
+ 'items' => $items);
}
//**** Spamfilter menu
$items = array();
-if($app->auth->get_client_limit($userid,'spamfilter_wblist') != 0)
+if($app->auth->get_client_limit($userid, 'spamfilter_wblist') != 0)
{
- $items[] = array( 'title' => 'Whitelist',
- 'target' => 'content',
- 'link' => 'mail/spamfilter_whitelist_list.php',
- 'html_id' => 'spamfilter_whitelist_list');
-
- $items[] = array( 'title' => 'Blacklist',
- 'target' => 'content',
- 'link' => 'mail/spamfilter_blacklist_list.php',
- 'html_id' => 'spamfilter_blacklist_list');
+ $items[] = array( 'title' => 'Whitelist',
+ 'target' => 'content',
+ 'link' => 'mail/spamfilter_whitelist_list.php',
+ 'html_id' => 'spamfilter_whitelist_list');
+
+ $items[] = array( 'title' => 'Blacklist',
+ 'target' => 'content',
+ 'link' => 'mail/spamfilter_blacklist_list.php',
+ 'html_id' => 'spamfilter_blacklist_list');
}
if($app->auth->is_admin()) {
- $items[] = array( 'title' => 'User / Domain',
- 'target' => 'content',
- 'link' => 'mail/spamfilter_users_list.php',
- 'html_id' => 'spamfilter_users_list');
+ $items[] = array( 'title' => 'User / Domain',
+ 'target' => 'content',
+ 'link' => 'mail/spamfilter_users_list.php',
+ 'html_id' => 'spamfilter_users_list');
- $items[] = array( 'title' => 'Policy',
- 'target' => 'content',
- 'link' => 'mail/spamfilter_policy_list.php',
- 'html_id' => 'spamfilter_policy_list');
+ $items[] = array( 'title' => 'Policy',
+ 'target' => 'content',
+ 'link' => 'mail/spamfilter_policy_list.php',
+ 'html_id' => 'spamfilter_policy_list');
-// $items[] = array( 'title' => 'Server Settings',
-// 'target' => 'content',
-// 'link' => 'mail/spamfilter_config_list.php');
+ // $items[] = array( 'title' => 'Server Settings',
+ // 'target' => 'content',
+ // 'link' => 'mail/spamfilter_config_list.php');
}
if(count($items))
{
- $module['nav'][] = array( 'title' => 'Spamfilter',
- 'open' => 1,
- 'items' => $items);
+ $module['nav'][] = array( 'title' => 'Spamfilter',
+ 'open' => 1,
+ 'items' => $items);
}
//**** Fetchmail menu
$items = array();
-if($app->auth->get_client_limit($userid,'fetchmail') != 0)
+if($app->auth->get_client_limit($userid, 'fetchmail') != 0)
{
- $items[] = array( 'title' => 'Fetchmail',
- 'target' => 'content',
- 'link' => 'mail/mail_get_list.php',
- 'html_id' => 'mail_get_list');
-
- $module['nav'][] = array( 'title' => 'Fetchmail',
- 'open' => 1,
- 'items' => $items);
+ $items[] = array( 'title' => 'Fetchmail',
+ 'target' => 'content',
+ 'link' => 'mail/mail_get_list.php',
+ 'html_id' => 'mail_get_list');
+
+ $module['nav'][] = array( 'title' => 'Fetchmail',
+ 'open' => 1,
+ 'items' => $items);
}
@@ -156,52 +156,52 @@
//** Email Quotas
$items[] = array( 'title' => 'Mailbox quota',
- 'target' => 'content',
- 'link' => 'mail/user_quota_stats.php',
- 'html_id' => 'user_quota_stats');
+ 'target' => 'content',
+ 'link' => 'mail/user_quota_stats.php',
+ 'html_id' => 'user_quota_stats');
-$items[] = array( 'title' => 'Mailbox traffic',
- 'target' => 'content',
- 'link' => 'mail/mail_user_stats.php',
- 'html_id' => 'mail_user_stats');
+$items[] = array( 'title' => 'Mailbox traffic',
+ 'target' => 'content',
+ 'link' => 'mail/mail_user_stats.php',
+ 'html_id' => 'mail_user_stats');
-$module['nav'][] = array( 'title' => 'Statistics',
- 'open' => 1,
- 'items' => $items);
+$module['nav'][] = array( 'title' => 'Statistics',
+ 'open' => 1,
+ 'items' => $items);
//**** Global filters menu
$items = array();
if($_SESSION['s']['user']['typ'] == 'admin') {
- $items[] = array( 'title' => 'Postfix Whitelist',
- 'target' => 'content',
- 'link' => 'mail/mail_whitelist_list.php',
- 'html_id' => 'mail_whitelist_list');
+ $items[] = array( 'title' => 'Postfix Whitelist',
+ 'target' => 'content',
+ 'link' => 'mail/mail_whitelist_list.php',
+ 'html_id' => 'mail_whitelist_list');
- $items[] = array( 'title' => 'Postfix Blacklist',
- 'target' => 'content',
- 'link' => 'mail/mail_blacklist_list.php',
- 'html_id' => 'mail_blacklist_list');
+ $items[] = array( 'title' => 'Postfix Blacklist',
+ 'target' => 'content',
+ 'link' => 'mail/mail_blacklist_list.php',
+ 'html_id' => 'mail_blacklist_list');
- $items[] = array( 'title' => 'Content Filter',
- 'target' => 'content',
- 'link' => 'mail/mail_content_filter_list.php',
- 'html_id' => 'mail_content_filter_list');
+ $items[] = array( 'title' => 'Content Filter',
+ 'target' => 'content',
+ 'link' => 'mail/mail_content_filter_list.php',
+ 'html_id' => 'mail_content_filter_list');
- $items[] = array( 'title' => 'Relay Recipients',
- 'target' => 'content',
- 'link' => 'mail/mail_relay_recipient_list.php',
- 'html_id' => 'mail_relay_recipient_list');
+ $items[] = array( 'title' => 'Relay Recipients',
+ 'target' => 'content',
+ 'link' => 'mail/mail_relay_recipient_list.php',
+ 'html_id' => 'mail_relay_recipient_list');
- $module['nav'][] = array( 'title' => 'Global Filters',
- 'open' => 1,
- 'items' => $items);
+ $module['nav'][] = array( 'title' => 'Global Filters',
+ 'open' => 1,
+ 'items' => $items);
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1