From 6a00b4e599f724cbc9a12927c8a0446ef5621028 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 23 Dec 2015 12:21:09 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/sites/web_vhost_domain_edit.php | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/interface/web/sites/web_vhost_domain_edit.php b/interface/web/sites/web_vhost_domain_edit.php
index a4a5a39..6dcd7a3 100644
--- a/interface/web/sites/web_vhost_domain_edit.php
+++ b/interface/web/sites/web_vhost_domain_edit.php
@@ -218,7 +218,7 @@
//* Fill the IPv6 select field with the IP addresses that are allowed for this client
$sql = "SELECT ip_address FROM server_ip WHERE server_id IN ? AND ip_type = 'IPv6' AND (client_id = 0 OR client_id=?)";
$ips = $app->db->queryAllRecords($sql, explode(',', $client['web_servers']), $_SESSION['s']['user']['client_id']);
- $ip_select = "<option value=''></option>";
+ $ip_select = ($web_config[$server_id]['enable_ip_wildcard'] == 'y')?"<option value='*'>*</option>":"";
//$ip_select = "";
if(is_array($ips)) {
foreach( $ips as $ip) {
@@ -647,7 +647,10 @@
//* we are editing a existing record
$app->tpl->setVar("edit_disabled", 1);
$app->tpl->setVar('fixed_folder', 'y');
- if($this->_vhostdomain_type == 'domain') $app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]);
+ if($this->_vhostdomain_type == 'domain') {
+ $app->tpl->setVar("server_id_value", $this->dataRecord["server_id"]);
+ $app->tpl->setVar("document_root", $this->dataRecord["document_root"]);
+ }
else $app->tpl->setVar('server_id_value', $parent_domain['server_id']);
} else {
$app->tpl->setVar("edit_disabled", 0);
--
Gitblit v1.9.1