From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/vm/openvz_template_edit.php | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/interface/web/vm/openvz_template_edit.php b/interface/web/vm/openvz_template_edit.php
index c074002..c9c2400 100644
--- a/interface/web/vm/openvz_template_edit.php
+++ b/interface/web/vm/openvz_template_edit.php
@@ -38,8 +38,8 @@
* End Form configuration
******************************************/
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
//* Check permissions for module
$app->auth->check_module_permissions('vm');
@@ -50,28 +50,25 @@
$app->load('tform_actions');
class page_action extends tform_actions {
-
+
function onAfterInsert() {
- global $app,$conf;
-
- $guar_ram = $this->dataRecord['ram']*256;
- $burst_ram = $this->dataRecord['ram_burst']*256;
- $sql = "UPDATE openvz_template SET shmpages = '$guar_ram:$guar_ram',vmguarpages = '$guar_ram:$guar_ram', oomguarpages = '$guar_ram:$guar_ram',privvmpages = '$burst_ram:$burst_ram' WHERE template_id = $this->id";
- $app->db->query($sql);
+ global $app, $conf;
+
+ $this->onAfterUpdate();
}
-
+
function onAfterUpdate() {
- global $app,$conf;
-
- $guar_ram = $this->dataRecord['ram']*256;
- $burst_ram = $this->dataRecord['ram_burst']*256;
- $sql = "UPDATE openvz_template SET shmpages = '$guar_ram:$guar_ram',vmguarpages = '$guar_ram:$guar_ram', oomguarpages = '$guar_ram:$guar_ram',privvmpages = '$burst_ram:$burst_ram' WHERE template_id = $this->id";
- $app->db->query($sql);
+ global $app, $conf;
+
+ $guar_ram = $app->functions->intval($this->dataRecord['ram']*256);
+ $burst_ram = $app->functions->intval($this->dataRecord['ram_burst']*256);
+ $sql = "UPDATE openvz_template SET shmpages = ?,vmguarpages = ?, oomguarpages = ?,privvmpages = ? WHERE template_id = ?";
+ $app->db->query($sql, $guar_ram . ':' . $guar_ram, $guar_ram . ':unlimited', $guar_ram . ':' . $guar_ram, $burst_ram . ':' . $burst_ram*1.0625, $this->id);
}
-
+
}
$page = new page_action;
$page->onLoad();
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1