Bernd Wurst commited on 2013-03-04 13:57:53
Zeige 2 geänderte Dateien mit 11 Einfügungen und 4 Löschungen.
... | ... |
@@ -39,17 +39,23 @@ beachtet. Subdomains können grundsätzlich nur durch Administratoren eingericht |
39 | 39 |
<h4>Ihre Domains sind momentan wie folgt konfiguriert:</h4> |
40 | 40 |
|
41 | 41 |
<table> |
42 |
- <tr><th>Domainname</th><th>Einstellung</th><th></th></tr> |
|
42 |
+ <tr><th>Domainname</th><th>Einstellung</th><th></th><th></th></tr> |
|
43 | 43 |
'); |
44 | 44 |
|
45 | 45 |
foreach ($domains AS $id => $dom) { |
46 |
+ $trextra = ''; |
|
47 |
+ $extra = ''; |
|
46 | 48 |
$type = maildomain_type($dom['type']); |
47 | 49 |
$edit = html_form('vmail_domainchange', 'domainchange', '', html_select('type', array('virtual' => 'Webinterface-Verwaltung', 'auto' => '.courier-Dateien', 'none' => 'keine E-Mails empfangen'), $dom['type']).' <input type="hidden" name="id" value="'.$id.'" /><input type="submit" value="ändern" />'); |
48 | 50 |
if ($dom['type'] == 'manual') |
49 | 51 |
$edit = 'Kann nur von Admins geändert werden'; |
50 | 52 |
if (domain_has_vmail_accounts($id)) |
51 | 53 |
$edit = 'Keine Änderung möglich, so lange noch '.internal_link("vmail", "E-Mail-Konten").' für diese Domain eingerichtet sind.'; |
52 |
- output("<tr><td>{$dom['name']}</td><td>{$type}</td><td>{$edit}</td></tr>\n"); |
|
54 |
+ if ($dom['mailserver_lock']) { |
|
55 |
+ $trextra = ' style="background-color: #faa;"'; |
|
56 |
+ $extra = '<strong>Mailserver-Sperre aktiv!</strong>'; |
|
57 |
+ } |
|
58 |
+ output("<tr{$trextra}><td>{$dom['name']}</td><td>{$type}</td><td>{$edit}</td><td style=\"border: none;\">{$extra}</td></tr>\n"); |
|
53 | 59 |
if (array_key_exists($id, $subdomains)) { |
54 | 60 |
foreach ($subdomains[$id] AS $subdom) { |
55 | 61 |
$type = maildomain_type($subdom['type']); |
... | ... |
@@ -439,7 +439,7 @@ function domainsettings($only_domain=NULL) { |
439 | 439 |
$subdomains = array(); |
440 | 440 |
|
441 | 441 |
// Domains |
442 |
- $result = db_query("SELECT d.id, CONCAT_WS('.',d.domainname,d.tld) AS name, d.mail, m.id AS m_id, v.id AS v_id FROM kundendaten.domains AS d LEFT JOIN mail.virtual_mail_domains AS v ON (d.id=v.domain AND v.hostname IS NULL) LEFT JOIN mail.custom_mappings AS m ON (d.id=m.domain AND m.subdomain IS NULL) WHERE d.useraccount={$uid} OR m.uid={$uid} ORDER BY CONCAT_WS('.',d.domainname,d.tld);"); |
|
442 |
+ $result = db_query("SELECT d.id, CONCAT_WS('.',d.domainname,d.tld) AS name, d.mail, d.mailserver_lock, m.id AS m_id, v.id AS v_id FROM kundendaten.domains AS d LEFT JOIN mail.virtual_mail_domains AS v ON (d.id=v.domain AND v.hostname IS NULL) LEFT JOIN mail.custom_mappings AS m ON (d.id=m.domain AND m.subdomain IS NULL) WHERE d.useraccount={$uid} OR m.uid={$uid} ORDER BY CONCAT_WS('.',d.domainname,d.tld);"); |
|
443 | 443 |
|
444 | 444 |
while ($mydom = mysql_fetch_assoc($result)) { |
445 | 445 |
if (! array_key_exists($mydom['id'], $domains)) { |
... | ... |
@@ -447,7 +447,8 @@ function domainsettings($only_domain=NULL) { |
447 | 447 |
$mydom['mail'] = 'virtual'; |
448 | 448 |
$domains[$mydom['id']] = array( |
449 | 449 |
"name" => $mydom['name'], |
450 |
- "type" => $mydom['mail'] |
|
450 |
+ "type" => $mydom['mail'], |
|
451 |
+ "mailserver_lock" => $mydom['mailserver_lock'] |
|
451 | 452 |
); |
452 | 453 |
if ($only_domain && $only_domain == $mydom['id']) |
453 | 454 |
return $domains[$only_domain]; |
454 | 455 |