Check only for active records when performing a duplicate check for mailbox...

tbrehm

2009-08-02 7acef043f2231a6f06967a5eea48a55c95fea6cf

Check only for active records when performing a duplicate check for mailboxes / aliases / forwarders

 interface/web/mail/mail_alias_edit.php

@@ -120,8 +120,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);
        

 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);
        

 interface/web/mail/mail_user_edit.php

@@ -182,7 +182,7 @@
            $this->dataRecord["gid"] = $mail_config["mailuser_gid"];
            
            //* Check if there is no alias or forward with this address
            $tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE source = '".$app->db->quote($this->dataRecord["email"])."'");
            $tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE active = 'y' AND source = '".$app->db->quote($this->dataRecord["email"])."'");
            if($tmp['number'] > 0) $app->tform->errorMessage .= $app->tform->lng("duplicate_alias_or_forward_txt")."<br>";
            unset($tmp);