Commit 341ef717 authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge branch 'master_fixes' into 'master'

Master Fixes

Change for vmail-uid/gid settings in subdomains and aliasdomains
parents 3b42f0e8 cbc0d672
......@@ -897,8 +897,8 @@ CREATE TABLE `mail_user` (
`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 '',
......
......@@ -100,7 +100,7 @@ class mail_plugin {
$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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment