bernd commited on 2009-09-12 08:59:54
Zeige 1 geänderte Dateien mit 7 Einfügungen und 0 Löschungen.
git-svn-id: https://svn.schokokeks.org/repos/tools/webinterface/trunk@1465 87cf0b9e-d624-0410-a070-f6ee81989793
... | ... |
@@ -42,6 +42,12 @@ function change_mailaccount($id, $arr) |
42 | 42 |
if (isset($arr['account'])) |
43 | 43 |
{ |
44 | 44 |
list($local, $domain) = explode('@', $arr['account'], 2); |
45 |
+ if ($domain == config('masterdomain')) |
|
46 |
+ { |
|
47 |
+ $values['domain'] = "NULL"; |
|
48 |
+ } |
|
49 |
+ else |
|
50 |
+ { |
|
45 | 51 |
$domain = new Domain( (string) $domain); |
46 | 52 |
if ($domain->id == NULL) |
47 | 53 |
array_push($conditions, "domain=NULL"); |
... | ... |
@@ -50,6 +56,7 @@ function change_mailaccount($id, $arr) |
50 | 56 |
$domain->ensure_userdomain(); |
51 | 57 |
array_push($conditions, "domain={$domain->id}"); |
52 | 58 |
} |
59 |
+ } |
|
53 | 60 |
array_push($conditions, "local='".mysql_real_escape_string($local)."'"); |
54 | 61 |
} |
55 | 62 |
if (isset($arr['mailbox'])) |
56 | 63 |