From 3cebc3a5fc5a6e76b80f712fc4f7a48c2c92d61e Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 10 Jul 2009 07:33:29 -0400
Subject: [PATCH] Fixed: FS#776 - Client's limits do not apply for it's own client  Improved client and reseller limit checks

---
 interface/web/mail/mail_forward_edit.php |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/interface/web/mail/mail_forward_edit.php b/interface/web/mail/mail_forward_edit.php
index efc83da..1f3c8db 100644
--- a/interface/web/mail/mail_forward_edit.php
+++ b/interface/web/mail/mail_forward_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_mailforward 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 = 'forward'");
-				if($tmp["number"] >= $client["limit_mailforward"]) {
-					$app->error($app->tform->wordbook["limit_mailforward_txt"]);
-				}
+			if(!$app->tform->checkClientLimit('limit_mailforward',"type = 'forward'")) {
+				$app->error($app->tform->wordbook["limit_mailforward_txt"]);
+			}
+			if(!$app->tform->checkResellerLimit('limit_mailforward',"type = 'forward'")) {
+				$app->error('Reseller: '.$app->tform->wordbook["limit_mailforward_txt"]);
 			}
 		}
 		

--
Gitblit v1.9.1