Skip to content

Commit e0467ce

Browse files
author
Marius Burkard
committed
Merge branch '6320-fix-email-backup-stats' into 'develop'
Changed 'Client Limit'-check and fixed styling Closes #6320 See merge request ispconfig/ispconfig3!1593
2 parents 6095f99 + 89a12ae commit e0467ce

File tree

1 file changed

+20
-40
lines changed

1 file changed

+20
-40
lines changed

‎interface/web/mail/lib/module.conf.php‎

Lines changed: 20 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -13,56 +13,49 @@
1313
//**** Email accounts menu
1414
$items = array();
1515

16-
if($app->auth->get_client_limit($userid, 'maildomain') != 0)
17-
{
16+
if($app->auth->get_client_limit($userid, 'maildomain') != 0) {
1817
$items[] = array( 'title' => 'Domain',
1918
'target' => 'content',
2019
'link' => 'mail/mail_domain_list.php',
2120
'html_id' => 'mail_domain_list');
2221
}
2322

24-
if($app->auth->get_client_limit($userid, 'mailaliasdomain') != 0)
25-
{
23+
if($app->auth->get_client_limit($userid, 'mailaliasdomain') != 0) {
2624
$items[] = array( 'title' => 'Domain Alias',
2725
'target' => 'content',
2826
'link' => 'mail/mail_aliasdomain_list.php',
2927
'html_id' => 'mail_aliasdomain_list');
3028
}
3129

32-
if($app->auth->get_client_limit($userid, 'mailbox') != 0)
33-
{
30+
if($app->auth->get_client_limit($userid, 'mailbox') != 0) {
3431
$items[] = array( 'title' => 'Email Mailbox',
3532
'target' => 'content',
3633
'link' => 'mail/mail_user_list.php',
3734
'html_id' => 'mail_user_list');
3835
}
3936

40-
if($app->auth->get_client_limit($userid, 'mailalias') != 0)
41-
{
37+
if($app->auth->get_client_limit($userid, 'mailalias') != 0) {
4238
$items[] = array( 'title' => 'Email Alias',
4339
'target' => 'content',
4440
'link' => 'mail/mail_alias_list.php',
4541
'html_id' => 'mail_alias_list');
4642
}
4743

48-
if($app->auth->get_client_limit($userid, 'mailforward') != 0)
49-
{
44+
if($app->auth->get_client_limit($userid, 'mailforward') != 0) {
5045
$items[] = array( 'title' => 'Email Forward',
5146
'target' => 'content',
5247
'link' => 'mail/mail_forward_list.php',
5348
'html_id' => 'mail_forward_list');
5449
}
5550

56-
if($app->auth->get_client_limit($userid, 'mailcatchall') != 0)
57-
{
51+
if($app->auth->get_client_limit($userid, 'mailcatchall') != 0) {
5852
$items[] = array( 'title' => 'Email Catchall',
5953
'target' => 'content',
6054
'link' => 'mail/mail_domain_catchall_list.php',
6155
'html_id' => 'mail_domain_catchall_list');
6256
}
6357

64-
if(! $app->auth->is_admin() && $app->auth->get_client_limit($userid, 'mail_wblist') != 0)
65-
{
58+
if(! $app->auth->is_admin() && $app->auth->get_client_limit($userid, 'mail_wblist') != 0) {
6659
$items[] = array( 'title' => 'Email Whitelist',
6760
'target' => 'content',
6861
'link' => 'mail/mail_whitelist_list.php',
@@ -74,8 +67,7 @@
7467
'link' => 'mail/mail_blacklist_list.php',
7568
'html_id' => 'mail_blacklist_list');
7669

77-
if($app->auth->get_client_limit($userid, 'mailrouting') != 0)
78-
{
70+
if($app->auth->get_client_limit($userid, 'mailrouting') != 0) {
7971
$items[] = array( 'title' => 'Email Routing',
8072
'target' => 'content',
8173
'link' => 'mail/mail_transport_list.php',
@@ -84,8 +76,7 @@
8476

8577
}
8678

87-
if(count($items) && $app->system->has_service($userid, 'mail'))
88-
{
79+
if(count($items) && $app->system->has_service($userid, 'mail')) {
8980
$module['nav'][] = array( 'title' => 'Email Accounts',
9081
'open' => 1,
9182
'items' => $items);
@@ -94,16 +85,14 @@
9485
//**** Mailinglist menu
9586
$items = array();
9687

97-
if($app->auth->get_client_limit($userid, 'mailmailinglist') != 0)
98-
{
88+
if($app->auth->get_client_limit($userid, 'mailmailinglist') != 0) {
9989
$items[] = array( 'title' => 'Mailing List',
10090
'target' => 'content',
10191
'link' => 'mail/mail_mailinglist_list.php',
10292
'html_id' => 'mail_mailinglist_list');
10393
}
10494

105-
if(count($items) && $app->system->has_service($userid, 'mail'))
106-
{
95+
if(count($items) && $app->system->has_service($userid, 'mail')) {
10796
$module['nav'][] = array( 'title' => 'Mailing List',
10897
'open' => 1,
10998
'items' => $items);
@@ -112,8 +101,7 @@
112101
//**** Spamfilter menu
113102
$items = array();
114103

115-
if($app->auth->get_client_limit($userid, 'spamfilter_wblist') != 0)
116-
{
104+
if($app->auth->get_client_limit($userid, 'spamfilter_wblist') != 0) {
117105
$items[] = array( 'title' => 'Whitelist',
118106
'target' => 'content',
119107
'link' => 'mail/spamfilter_whitelist_list.php',
@@ -125,8 +113,7 @@
125113
'html_id' => 'spamfilter_blacklist_list');
126114
}
127115

128-
if($app->auth->is_admin())
129-
{
116+
if($app->auth->is_admin()) {
130117
$items[] = array( 'title' => 'User / Domain',
131118
'target' => 'content',
132119
'link' => 'mail/spamfilter_users_list.php',
@@ -142,8 +129,7 @@
142129
// 'link' => 'mail/spamfilter_config_list.php');
143130
}
144131

145-
if(count($items))
146-
{
132+
if(count($items)) {
147133
$module['nav'][] = array( 'title' => 'Spamfilter',
148134
'open' => 1,
149135
'items' => $items);
@@ -152,8 +138,7 @@
152138
//**** Fetchmail menu
153139
$items = array();
154140

155-
if($app->auth->get_client_limit($userid, 'fetchmail') != 0)
156-
{
141+
if($app->auth->get_client_limit($userid, 'fetchmail') != 0) {
157142
$items[] = array( 'title' => 'Fetchmail',
158143
'target' => 'content',
159144
'link' => 'mail/mail_get_list.php',
@@ -168,24 +153,21 @@
168153
if ($app->system->has_service($userid, 'xmpp')) {
169154
$items = array();
170155

171-
if($app->auth->get_client_limit($userid, 'xmpp_domain') != 0)
172-
{
156+
if($app->auth->get_client_limit($userid, 'xmpp_domain') != 0) {
173157
$items[] = array( 'title' => 'XMPP Domain',
174158
'target' => 'content',
175159
'link' => 'mail/xmpp_domain_list.php',
176160
'html_id' => 'xmpp_domain_list');
177161
}
178162

179-
if($app->auth->get_client_limit($userid, 'xmpp_user') != 0)
180-
{
163+
if($app->auth->get_client_limit($userid, 'xmpp_user') != 0) {
181164
$items[] = array( 'title' => 'XMPP Account',
182165
'target' => 'content',
183166
'link' => 'mail/xmpp_user_list.php',
184167
'html_id' => 'xmpp_user_list');
185168
}
186169

187-
if(count($items))
188-
{
170+
if(count($items)) {
189171
$module['nav'][] = array( 'title' => 'Jabber / XMPP',
190172
'open' => 1,
191173
'items' => $items);
@@ -207,8 +189,7 @@
207189
'link' => 'mail/mail_user_stats.php',
208190
'html_id' => 'mail_user_stats');
209191

210-
if($app->auth->get_client_limit($userid, 'backup') == 'y')
211-
{
192+
if($app->auth->get_client_limit($userid, 'mail_backup') != 'n') {
212193
$items[] = array (
213194
'title' => 'Backup Stats',
214195
'target' => 'content',
@@ -223,8 +204,7 @@
223204

224205
//**** Global filters menu
225206
$items = array();
226-
if($app->auth->is_admin())
227-
{
207+
if($app->auth->is_admin()) {
228208
$items[] = array( 'title' => 'Postfix Whitelist',
229209
'target' => 'content',
230210
'link' => 'mail/mail_whitelist_list.php',

0 commit comments

Comments
 (0)