tbrehm
2011-06-29 9c930e0ba5b3ad3535a3435c2d19b26b2871d615
VM module: IP was not freed when VM is deleted.
VM module: Error in SQL query to select a template.
3 files modified
18 ■■■■ changed files
interface/web/vm/openvz_vm_del.php 8 ●●●●● patch | view | raw | blame | history
interface/web/vm/openvz_vm_edit.php 8 ●●●●● patch | view | raw | blame | history
server/plugins-available/openvz_plugin.inc.php 2 ●●● patch | view | raw | blame | history
interface/web/vm/openvz_vm_del.php
@@ -49,6 +49,14 @@
$app->load('tform_actions');
class page_action extends tform_actions {
    function onAfterDelete() {
        global $app, $conf;
        //* Release all IP addresses which are assigned to this VM
        $app->db->query("UPDATE openvz_ip SET vm_id = 0 WHERE vm_id = '".$this->id."'");
    }
    
}
interface/web/vm/openvz_vm_edit.php
@@ -183,14 +183,6 @@
        
    }
    
    function onAfterDelete() {
        global $app, $conf;
        //* Release all IP addresses which are assigned to this VM
        $app->db->query("UPDATE openvz_ip SET vm_id = 0 WHERE vm_id = '".$this->id."'");
    }
    function applyTemplate() {
        global $app, $conf;
        
server/plugins-available/openvz_plugin.inc.php
@@ -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);