From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).
---
interface/web/mail/mail_domain_catchall_edit.php | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/interface/web/mail/mail_domain_catchall_edit.php b/interface/web/mail/mail_domain_catchall_edit.php
index 93a0635..c3338cc 100644
--- a/interface/web/mail/mail_domain_catchall_edit.php
+++ b/interface/web/mail/mail_domain_catchall_edit.php
@@ -55,17 +55,11 @@
// we will check only users, not admins
if($_SESSION["s"]["user"]["typ"] == 'user') {
-
- // Get the limits of the client
- $client_group_id = $_SESSION["s"]["user"]["default_group"];
- $client = $app->db->queryOneRecord("SELECT limit_mailcatchall FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
-
- // Check if the user may add another mailbox.
- if($client["limit_mailforward"] >= 0) {
- $tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE sys_groupid = $client_group_id and type = 'catchall'");
- if($tmp["number"] >= $client["limit_mailcatchall"]) {
- $app->error($app->tform->wordbook["limit_mailcatchall_txt"]);
- }
+ if(!$app->tform->checkClientLimit('limit_mailcatchall',"type = 'catchall'")) {
+ $app->error($app->tform->wordbook["limit_mailcatchall_txt"]);
+ }
+ if(!$app->tform->checkResellerLimit('limit_mailcatchall',"type = 'catchall'")) {
+ $app->error('Reseller: '.$app->tform->wordbook["limit_mailcatchall_txt"]);
}
}
--
Gitblit v1.9.1