From 0837aff0727c2653cca8c7e515d79d4c2a2f5093 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 06 Jul 2008 08:50:58 -0400
Subject: [PATCH] - Fetchmail limits of Client were not obeyed.
---
interface/web/mail/mail_get_edit.php | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/interface/web/mail/mail_get_edit.php b/interface/web/mail/mail_get_edit.php
index de97422..c17ae06 100644
--- a/interface/web/mail/mail_get_edit.php
+++ b/interface/web/mail/mail_get_edit.php
@@ -50,9 +50,47 @@
class page_action extends tform_actions {
+ function onShowNew() {
+ global $app, $conf;
+
+ // 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_fetchmail 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 transport.
+ if($client["limit_fetchmail"] >= 0) {
+ $tmp = $app->db->queryOneRecord("SELECT count(mailget_id) as number FROM mail_get WHERE sys_groupid = $client_group_id");
+ if($tmp["number"] >= $client["limit_fetchmail"]) {
+ $app->error($app->tform->wordbook["limit_fetchmail_txt"]);
+ }
+ }
+ }
+
+ parent::onShowNew();
+ }
+
function onSubmit() {
global $app, $conf;
+ // Check the client limits, if user is not the admin
+ if($_SESSION["s"]["user"]["typ"] != 'admin') { // if user is not admin
+ // Get the limits of the client
+ $client_group_id = $_SESSION["s"]["user"]["default_group"];
+ $client = $app->db->queryOneRecord("SELECT limit_fetchmail 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 transport.
+ if($this->id == 0 && $client["limit_fetchmail"] >= 0) {
+ $tmp = $app->db->queryOneRecord("SELECT count(mailget_id) as number FROM mail_get WHERE sys_groupid = $client_group_id");
+ if($tmp["number"] >= $client["limit_fetchmail"]) {
+ $app->tform->errorMessage .= $app->tform->wordbook["limit_fetchmail_txt"]."<br>";
+ }
+ unset($tmp);
+ }
+ } // end if user is not admin
+
// Set the server ID according to the selected destination
$tmp = $app->db->queryOneRecord("SELECT server_id FROM mail_user WHERE email = '".addslashes($this->dataRecord["destination"])."'");
$this->dataRecord["server_id"] = $tmp["server_id"];
--
Gitblit v1.9.1