From e55c5bf38e336cab2881b47c4c82a55bc8afe11a Mon Sep 17 00:00:00 2001 From: xaver <xaver@ispconfig3> Date: Fri, 09 Sep 2011 19:33:52 -0400 Subject: [PATCH] Added part of #1594, hope last part, last ereg functions replaced --- server/plugins-available/openvz_plugin.inc.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/plugins-available/openvz_plugin.inc.php b/server/plugins-available/openvz_plugin.inc.php index a9c630e..ac9e0aa 100644 --- a/server/plugins-available/openvz_plugin.inc.php +++ b/server/plugins-available/openvz_plugin.inc.php @@ -1,7 +1,7 @@ <?php /* -Copyright (c) 2009, Till Brehm, projektfarm Gmbh +Copyright (c) 2011, Till Brehm, projektfarm Gmbh All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -77,7 +77,7 @@ return; } - $tmp = $app->db->queryOneRecord("SELECT template_file FROM openvz_ostemplate WHERE ostemplate_id = ".$vm['ostemplate_id']); + $tmp = $app->db->queryOneRecord("SELECT template_file FROM openvz_ostemplate WHERE ostemplate_id = ".$data['new']['ostemplate_id']); $ostemplate = escapeshellcmd($tmp['template_file']); unset($tmp); @@ -143,6 +143,7 @@ return; } + exec("vzctl stop $veid"); exec("vzctl destroy $veid"); $app->log("Destroying OpenVZ VM: vzctl destroy $veid",LOGLEVEL_DEBUG); -- Gitblit v1.9.1