From 341ef7175af7c8f21d27262b58da8f5bc2c06ef0 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 08 Jul 2014 08:44:59 -0400
Subject: [PATCH] Merge branch 'master_fixes' into 'master'
---
install/sql/ispconfig3.sql | 4 ++--
server/plugins-available/mail_plugin.inc.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 54ac567..6fad9ef 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -897,8 +897,8 @@
`login` varchar(255) NOT NULL default '',
`password` varchar(255) NOT NULL default '',
`name` varchar(255) NOT NULL default '',
- `uid` int(11) unsigned NOT NULL default '5000',
- `gid` int(11) unsigned NOT NULL default '5000',
+ `uid` int(11) NOT NULL default '5000',
+ `gid` int(11) NOT NULL default '5000',
`maildir` varchar(255) NOT NULL default '',
`quota` bigint(20) NOT NULL default '-1',
`cc` varchar(255) NOT NULL default '',
diff --git a/server/plugins-available/mail_plugin.inc.php b/server/plugins-available/mail_plugin.inc.php
index 424ee62..81ba6ce 100644
--- a/server/plugins-available/mail_plugin.inc.php
+++ b/server/plugins-available/mail_plugin.inc.php
@@ -100,7 +100,7 @@
$email_parts = explode('@',$data['new']['email']);
$webdomain = $app->db->queryOneRecord("SELECT domain_id, server_id, system_user, parent_domain_id FROM web_domain WHERE domain = '".$app->db->quote($email_parts[1])."'");
if ($webdomain) {
- while ($webdomain['parent_domain_id'] != 0) {
+ while (($webdomain['system_user'] == null) && ($webdomain['parent_domain_id'] != 0)) {
$webdomain = $app->db->queryOneRecord("SELECT domain_id, server_id, system_user, parent_domain_id FROM web_domain WHERE domain_id = '".$webdomain['parent_domain_id']."'");
}
$app->log($data['new']['server_id'].' == '.$webdomain['server_id'],LOGLEVEL_DEBUG);
--
Gitblit v1.9.1