From c1fcaed2ee8f05a5030fe4e8e211ca4eae7a9489 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Tue, 11 Jun 2013 11:44:57 -0400
Subject: [PATCH] - Fixed FS#2921 - RBL list field in server config can not be empty.
---
interface/web/mail/mail_user_list.php | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/interface/web/mail/mail_user_list.php b/interface/web/mail/mail_user_list.php
index c2b7bcc..fcbbaa7 100644
--- a/interface/web/mail/mail_user_list.php
+++ b/interface/web/mail/mail_user_list.php
@@ -12,15 +12,40 @@
* End Form configuration
******************************************/
-// Checking module permissions
-if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
- header("Location: ../index.php");
- exit;
+//* Check permissions for module
+$app->auth->check_module_permissions('mail');
+
+$app->load('listform_actions');
+
+
+class list_action extends listform_actions {
+
+ function onShow() {
+ global $app,$conf;
+
+ $app->uses('getconf');
+ $global_config = $app->getconf->get_global_config('mail');
+
+ if($global_config['mailboxlist_webmail_link'] == 'y') {
+ $app->tpl->setVar('mailboxlist_webmail_link',1);
+ } else {
+ $app->tpl->setVar('mailboxlist_webmail_link',0);
+ }
+
+ if($global_config["enable_custom_login"] == "y") {
+ $app->tpl->setVar("enable_custom_login", 1);
+ } else {
+ $app->tpl->setVar("enable_custom_login", 0);
+ }
+
+ parent::onShow();
+ }
+
}
-$app->uses('listform_actions');
-
-$app->listform_actions->onLoad();
+$list = new list_action;
+$list->SQLOrderBy = 'ORDER BY email';
+$list->onLoad();
?>
\ No newline at end of file
--
Gitblit v1.9.1