From e4e2a430bbbf2cd9516f4d01f2b49a10ff981d5c Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 27 Jan 2014 10:33:40 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/mail/mail_user_list.php | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/interface/web/mail/mail_user_list.php b/interface/web/mail/mail_user_list.php
index 7e728af..fa26861 100644
--- a/interface/web/mail/mail_user_list.php
+++ b/interface/web/mail/mail_user_list.php
@@ -1,6 +1,6 @@
<?php
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
/******************************************
* Begin Form configuration
@@ -15,9 +15,37 @@
//* Check permissions for module
$app->auth->check_module_permissions('mail');
-$app->uses('listform_actions');
-
-$app->listform_actions->onLoad();
+$app->load('listform_actions');
-?>
\ No newline at end of file
+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();
+ }
+
+}
+
+$list = new list_action;
+$list->SQLOrderBy = 'ORDER BY mail_user.email';
+$list->onLoad();
+
+
+?>
--
Gitblit v1.9.1