From 7acef043f2231a6f06967a5eea48a55c95fea6cf Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 02 Aug 2009 02:07:15 -0400
Subject: [PATCH] Check only for active records when performing a duplicate check for mailboxes / aliases / forwarders
---
interface/web/mail/mail_forward_edit.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/web/mail/mail_forward_edit.php b/interface/web/mail/mail_forward_edit.php
index f89cd36..33f86f5 100644
--- a/interface/web/mail/mail_forward_edit.php
+++ b/interface/web/mail/mail_forward_edit.php
@@ -117,8 +117,8 @@
unset($this->dataRecord["email_local_part"]);
unset($this->dataRecord["email_domain"]);
- //* Check if there is no mailbox with this address
- $tmp = $app->db->queryOneRecord("SELECT count(mailuser_id) as number FROM mail_user WHERE email = '".$app->db->quote($this->dataRecord["source"])."'");
+ //* Check if there is no active mailbox with this address
+ $tmp = $app->db->queryOneRecord("SELECT count(mailuser_id) as number FROM mail_user WHERE postfix = 'y' AND email = '".$app->db->quote($this->dataRecord["source"])."'");
if($tmp['number'] > 0) $app->tform->errorMessage .= $app->tform->lng("duplicate_mailbox_txt")."<br>";
unset($tmp);
--
Gitblit v1.9.1