From c4485fa99cee7c12be528ff44d5f255a7f09df77 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Tue, 30 Oct 2012 08:50:47 -0400
Subject: [PATCH] Fixed: IE8 did not like some of the javascript
---
interface/web/sites/web_vhost_subdomain_edit.php | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/interface/web/sites/web_vhost_subdomain_edit.php b/interface/web/sites/web_vhost_subdomain_edit.php
index c96c69c..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;
@@ -304,7 +303,7 @@
$sql = "SELECT domain_id, domain FROM domain WHERE domain_id = " . $app->functions->intval($this->dataRecord['sel_domain']);
if ($_SESSION["s"]["user"]["typ"] != 'admin') {
- $sql .= "AND sys_groupid =" . $client_group_id;
+ $sql .= " AND sys_groupid =" . $client_group_id;
}
$domain_check = $app->db->queryOneRecord($sql);
if(!$domain_check) {
@@ -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