From 2df8c0b83de9efd560e109aae65fe18182f8dc3d Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sun, 23 Aug 2015 08:48:43 -0400
Subject: [PATCH] better regex for ipv4
---
interface/lib/plugins/vm_openvz_plugin.inc.php | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/interface/lib/plugins/vm_openvz_plugin.inc.php b/interface/lib/plugins/vm_openvz_plugin.inc.php
index dcd2df7..7cbf843 100644
--- a/interface/lib/plugins/vm_openvz_plugin.inc.php
+++ b/interface/lib/plugins/vm_openvz_plugin.inc.php
@@ -94,7 +94,10 @@
}
// Set the IP address
- if(isset($this->dataRecord['ip_address'])) $app->db->query("UPDATE openvz_ip SET vm_id = ? WHERE ip_address = ?", $this->id, $this->dataRecord['ip_address']);
+ if(isset($this->dataRecord['ip_address'])) {
+ $app->db->query("UPDATE openvz_ip SET vm_id = 0 WHERE vm_id = ?", $this->id);
+ $app->db->query("UPDATE openvz_ip SET vm_id = ? WHERE ip_address = ?", $this->id, $this->dataRecord['ip_address']);
+ }
// Create the OpenVZ config file and store it in config field
$this->makeOpenVZConfig();
@@ -132,9 +135,11 @@
$sql .= "io_priority = ?, ";
$sql .= "nameserver = ?, ";
$sql .= "create_dns = ?, ";
- $sql .= "capability = ? ";
+ $sql .= "capability = ?, ";
+ $sql .= "features = ?, ";
+ $sql .= "iptables = ? ";
$sql .= "WHERE vm_id = ?";
- $app->db->query($sql, $tpl['diskspace'], $tpl['ram'], $tpl['ram_burst'], $tpl['cpu_units'], $tpl['cpu_num'], $tpl['cpu_limit'], $tpl['io_priority'], $tpl['nameserver'], $tpl['create_dns'], $tpl['capability'], $this->id);
+ $app->db->query($sql, $tpl['diskspace'], $tpl['ram'], $tpl['ram_burst'], $tpl['cpu_units'], $tpl['cpu_num'], $tpl['cpu_limit'], $tpl['io_priority'], $tpl['nameserver'], $tpl['create_dns'], $tpl['capability'], $tpl['features'], $tpl['iptables'], $this->id);
}
@@ -193,6 +198,8 @@
$tpl->setVar('ip_address', $vm['ip_address']);
$tpl->setVar('nameserver', $vm['nameserver']);
$tpl->setVar('capability', $vm['capability']);
+ $tpl->setVar('features', $vm['features']);
+ $tpl->setVar('iptables', $vm['iptables']);
$tmp = $app->db->queryOneRecord("SELECT template_file FROM openvz_ostemplate WHERE ostemplate_id = ?", $app->functions->intval($vm['ostemplate_id']));
$tpl->setVar('ostemplate', $tmp['template_file']);
@@ -245,7 +252,7 @@
"server_id" => $server_id,
"zone" => $dns_soa_id,
"name" => $hostname,
- "type" => 'A',
+ "type" => @(preg_match("/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/", $ip_address))?'A':'AAAA',
"data" => $ip_address,
"aux" => '0',
"ttl" => '3600',
--
Gitblit v1.9.1