From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/vm/openvz_vm_edit.php | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/interface/web/vm/openvz_vm_edit.php b/interface/web/vm/openvz_vm_edit.php
index 07f6aaa..6926588 100644
--- a/interface/web/vm/openvz_vm_edit.php
+++ b/interface/web/vm/openvz_vm_edit.php
@@ -161,7 +161,8 @@
//* Fill the IPv4 select field with the IP addresses that are allowed for this client
//$sql = "SELECT ip_address FROM server_ip WHERE server_id = ".$client['default_webserver']." AND ip_type = 'IPv4' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")";
if(isset($this->dataRecord["server_id"])) {
- $vm_server_id = $app->functions->intval($this->dataRecord["server_id"]);
+// $vm_server_id = $app->functions->intval($this->dataRecord["server_id"]);
+ $vm_server_id = $app->functions->intval($this->dataRecord["vm_id"]);
} else {
$tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE vserver_server = 1 AND mirror_server_id = 0 ORDER BY server_name LIMIT 0,1');
$vm_server_id = $app->functions->intval($tmp['server_id']);
@@ -178,6 +179,19 @@
$app->tpl->setVar("ip_address", $ip_select);
unset($tmp);
unset($ips);
+
+ //* Additional IPs
+ $sql="SELECT * FROM openvz_ip WHERE reserved = 'n' AND ((vm_id = ? AND additional='y') OR vm_id = 0) AND server_id = ?";
+ $additional_ips = $app->db->queryAllRecords($sql, $this->id, $vm_server_id);
+ foreach ($additional_ips as $idx => $rec) {
+ $temp .= "<input type='hidden' id='id".$idx."' name='additional_ip[".$idx."]' name='additional_ip[".$idx."]' value='0'>";
+ $used = @($rec['additional']=='y')?'CHECKED':'';
+ $temp .= "<input type='checkbox' value='".$rec['ip_address']."' id='id".$idx."' name='additional_ip[".$idx."]' ".$used."> ".$rec['ip_address']."<br>";
+ }
+ $app->tpl->setVar("additional_ip", $temp);
+ unset($used);
+ unset($temp);
+ unset($additional_ips);
if($this->id > 0) {
//* we are editing a existing record
--
Gitblit v1.9.1