From 6db27748d01ef709bf61a35314a56c565545bb7f Mon Sep 17 00:00:00 2001 From: ftimme <ft@falkotimme.com> Date: Mon, 11 Jun 2012 06:35:30 -0400 Subject: [PATCH] - Added CC and BCC senders to mail function. - Bugfix: changed "Return-Path: $form" to Return-Path: $from. --- interface/web/mail/mail_forward_edit.php | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/interface/web/mail/mail_forward_edit.php b/interface/web/mail/mail_forward_edit.php index 1f3c8db..b8c8d92 100644 --- a/interface/web/mail/mail_forward_edit.php +++ b/interface/web/mail/mail_forward_edit.php @@ -74,7 +74,8 @@ $app->tpl->setVar("email_local_part",$email_parts[0]); // Getting Domains of the user - $sql = "SELECT domain FROM mail_domain WHERE ".$app->tform->getAuthSQL('r'); + //$sql = "SELECT domain FROM mail_domain WHERE ".$app->tform->getAuthSQL('r').' ORDER BY domain'; + $sql = "SELECT domain FROM mail_domain WHERE domain NOT IN (SELECT SUBSTR(source,2) FROM mail_forwarding WHERE type = 'aliasdomain') AND ".$app->tform->getAuthSQL('r')." ORDER BY domain"; $domains = $app->db->queryAllRecords($sql); $domain_select = ''; foreach( $domains as $domain) { @@ -117,8 +118,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