From 7e48bdf4e952f7b700e64e4cd8cb190bfc630ef9 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Wed, 31 Oct 2012 07:42:05 -0400
Subject: [PATCH] Fixed: Follow-up to commit r3623 - entered all missing german and english entries for datalog status - excluded some more tables from status display - inserted the info-display code to the relevant templates
---
interface/web/sites/web_vhost_subdomain_edit.php | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/interface/web/sites/web_vhost_subdomain_edit.php b/interface/web/sites/web_vhost_subdomain_edit.php
index 62e351a..56ba15d 100644
--- a/interface/web/sites/web_vhost_subdomain_edit.php
+++ b/interface/web/sites/web_vhost_subdomain_edit.php
@@ -252,7 +252,7 @@
$domain_select .= " selected";
$selected_domain = $domain['domain'];
}
- $domain_select .= ">" . $domain['domain'] . "</option>\r\n";
+ $domain_select .= ">" . $app->functions->idn_decode($domain['domain']) . "</option>\r\n";
}
}
else {
@@ -288,7 +288,6 @@
$this->dataRecord["ipv6_address"] = $parent_domain["ipv6_address"];
$this->dataRecord["client_group_id"] = $parent_domain["client_group_id"];
$this->dataRecord["vhost_type"] = 'name';
- $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];
$this->parent_domain_record = $parent_domain;
@@ -328,6 +327,8 @@
if($check && $check['cnt'] > 0) {
$app->tform->errorMessage .= $app->tform->lng("web_folder_unique_txt")."<br>";
}
+ } else {
+ $this->dataRecord["domain"] = $this->dataRecord["domain"].'.'.$parent_domain["domain"];
}
if($_SESSION["s"]["user"]["typ"] != 'admin') {
--
Gitblit v1.9.1