From 1ec27d7366ac58df1d2d8cfc426be2c33d9cfa2c Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 14 Jun 2016 04:18:29 -0400
Subject: [PATCH] Merge branch 'florian030/ispconfig3-master' into stable-3.1
---
interface/web/sites/web_vhost_domain_edit.php | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/interface/web/sites/web_vhost_domain_edit.php b/interface/web/sites/web_vhost_domain_edit.php
index c166660..2b1c0eb 100644
--- a/interface/web/sites/web_vhost_domain_edit.php
+++ b/interface/web/sites/web_vhost_domain_edit.php
@@ -219,8 +219,9 @@
//* 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 = ($web_config[$server_id]['enable_ip_wildcard'] == 'y')?"<option value='*'>*</option>":"";
+ //$ip_select = ($web_config[$server_id]['enable_ip_wildcard'] == 'y')?"<option value='*'>*</option>":"";
//$ip_select = "";
+ $ip_select = "<option value=''></option>";
if(is_array($ips)) {
foreach( $ips as $ip) {
$selected = ($ip["ip_address"] == $this->dataRecord["ipv6_address"])?'SELECTED':'';
@@ -1341,8 +1342,12 @@
// Letsencrypt can not be activated before the website has been created
// So we deactivate it here and add a datalog update in onAfterInsert
if(isset($this->dataRecord['ssl_letsencrypt']) && $this->dataRecord['ssl_letsencrypt'] == 'y' && isset($this->dataRecord['ssl']) && $this->dataRecord['ssl'] == 'y') {
+ // Disable letsencrypt and ssl temporarily
$this->dataRecord['ssl_letsencrypt'] = 'n';
$this->dataRecord['ssl'] = 'n';
+ // Prevent that the datalog history gets written
+ $app->tform->formDef['db_history'] = 'no';
+ // Set variable that we check in onAfterInsert
$this->_letsencrypt_on_insert = true;
}
}
@@ -1418,13 +1423,13 @@
}
if(isset($this->dataRecord['folder_directive_snippets'])) $app->db->query("UPDATE web_domain SET folder_directive_snippets = ? WHERE domain_id = ?", $this->dataRecord['folder_directive_snippets'], $this->id);
- // Add a datalog update with letsencrypt enabled (see also onBeforeInsert)
+ // Add a datalog insert without letsencrypt and then an update with letsencrypt enabled (see also onBeforeInsert)
if($this->_letsencrypt_on_insert == true) {
- $tmp = $web_rec;
- $tmp['ssl_letsencrypt'] = 'y';
- $tmp['ssl'] = 'y';
- $app->db->datalogUpdate('web_domain', $tmp, 'domain_id', $this->id);
- unset($tmp);
+ $new_data_record = $app->tform->getDataRecord($this->id);
+ $app->tform->datalogSave('INSERT', $this->id, array(), $new_data_record);
+ $new_data_record['ssl_letsencrypt'] = 'y';
+ $new_data_record['ssl'] = 'y';
+ $app->db->datalogUpdate('web_domain', $new_data_record, 'domain_id', $this->id);
}
}
@@ -1455,9 +1460,13 @@
$this->dataRecord["domain"] = $rec['domain'];
}
if(isset($this->dataRecord["ip_address"]) && $rec['ip_address'] != $this->dataRecord["ip_address"] && $rec['sys_perm_group'] != 'riud') {
+ //* Add a error message and switch back to old server
+ $app->tform->errorMessage .= $app->lng('The IP can not be changed. Please ask your Administrator if you want to change the IPv4-Address.');
$this->dataRecord["ip_address"] = $rec['ip_address'];
}
if(isset($this->dataRecord["ipv6_address"]) && $rec['ipv6_address'] != $this->dataRecord["ipv6_address"] && $rec['sys_perm_group'] != 'riud') {
+ //* Add a error message and switch back to old server
+ $app->tform->errorMessage .= $app->lng('The IP can not be changed. Please ask your Administrator if you want to change the IPv6-Address.');
$this->dataRecord["ipv6_address"] = $rec['ipv6_address'];
}
unset($rec);
--
Gitblit v1.9.1