From 32cd3552bd2617d5f0272a37c515c0e84933bed9 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 05 Jan 2012 07:00:53 -0500
Subject: [PATCH] Fixed: FS#1903 - Email - domain set as domain alias cannot be offered for mailbox creation
---
interface/web/mail/mail_user_edit.php | 3 ++-
server/conf/awstats_index.php.master | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index 814668b..f57a4e8 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/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)) {
diff --git a/server/conf/awstats_index.php.master b/server/conf/awstats_index.php.master
index ddcc5a1..e2b0c0c 100644
--- a/server/conf/awstats_index.php.master
+++ b/server/conf/awstats_index.php.master
@@ -27,7 +27,7 @@
$month = date("n");
$year = date("Y");
-
+
if (date("d") == 1)
{
$month = date("m")-1;
--
Gitblit v1.9.1