Fixed: FS#1903 - Email - domain set as domain alias cannot be offered for m...

tbrehm

2012-01-05 32cd3552bd2617d5f0272a37c515c0e84933bed9

Fixed: FS#1903 - Email - domain set as domain alias cannot be offered for mailbox creation

 interface/web/mail/mail_user_edit.php

@@ -75,7 +75,8 @@
        $app->tpl->setVar("email_local_part",$email_parts[0]);
        
        // Getting Domains of the user
        $sql = "SELECT domain, server_id FROM mail_domain WHERE ".$app->tform->getAuthSQL('r').' ORDER BY domain';
        // $sql = "SELECT domain, server_id FROM mail_domain WHERE ".$app->tform->getAuthSQL('r').' ORDER BY domain';
        $sql = "SELECT domain, server_id 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 = '';
        if(is_array($domains)) {

 server/conf/awstats_index.php.master

@@ -27,7 +27,7 @@

        $month = date("n");
        $year = date("Y");

		
        if (date("d") == 1)
        {
                $month = date("m")-1;