From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/mail/lib/module.conf.php | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/interface/web/mail/lib/module.conf.php b/interface/web/mail/lib/module.conf.php
index 7f828d1..ca7d177 100644
--- a/interface/web/mail/lib/module.conf.php
+++ b/interface/web/mail/lib/module.conf.php
@@ -7,6 +7,7 @@
$module['template'] = 'module.tpl.htm';
$module['startpage'] = 'mail/mail_domain_list.php';
$module['tab_width'] = '';
+$module['order'] = '40';
//**** Email accounts menu
@@ -151,7 +152,7 @@
//**** XMPP Menu
$items = array();
-if($app->auth->get_client_limit($userid, 'xmppdomain') != 0)
+if($app->auth->get_client_limit($userid, 'xmpp_domain') != 0)
{
$items[] = array( 'title' => 'XMPP Domain',
'target' => 'content',
@@ -159,12 +160,12 @@
'html_id' => 'xmpp_domain_list');
}
-if($app->auth->get_client_limit($userid, 'xmppaccount') != 0)
+if($app->auth->get_client_limit($userid, 'xmpp_user') != 0)
{
$items[] = array( 'title' => 'XMPP Account',
'target' => 'content',
- 'link' => 'mail/xmpp_account_list.php',
- 'html_id' => 'xmpp_account_list');
+ 'link' => 'mail/xmpp_user_list.php',
+ 'html_id' => 'xmpp_user_list');
}
if(count($items))
--
Gitblit v1.9.1