tbrehm
2011-08-25 c8f20307fab78aaf8505db0bbb26d3cf51010286
Fixed bug in remoting lib when clients were created and a bug in openvz actions.
2 files modified
17 ■■■■ changed files
interface/lib/classes/remoting.inc.php 13 ●●●●● patch | view | raw | blame | history
server/mods-available/remoteaction_core_module.inc.php 4 ●●●● patch | view | raw | blame | history
interface/lib/classes/remoting.inc.php
@@ -2132,23 +2132,28 @@
        
        //* Get the SQL query
        $sql = $app->remoting_lib->getSQL($params,'INSERT',0);
        $app->db->query($sql);
        if($app->remoting_lib->errorMessage != '') {
            $this->server->fault('data_processing_error', $app->remoting_lib->errorMessage);
            return false;
        }
        
        $app->db->query($sql);
        $insert_id = $app->db->insertID();
        $this->id = $insert_id;
        $this->dataRecord = $params;
        
        $app->plugin->raiseEvent('client:client:on_after_insert',$this);
        
        /*
        if($app->db->errorMessage != '') {
            $this->server->fault('database_error', $app->db->errorMessage . ' '.$sql);
            return false;
        }
        */
        
        $insert_id = $app->db->insertID();
        //$app->uses('tform');
        //* Save changes to Datalog
        if($app->remoting_lib->formDef["db_history"] == 'yes') {
server/mods-available/remoteaction_core_module.inc.php
@@ -131,18 +131,21 @@
                    if($veid > 0) {
                        exec("vzctl start $veid");
                    }
                    $this->_actionDone($action['action_id'], 'ok');
                }
                if ($action['action_type'] == 'openvz_stop_vm') {
                    $veid = intval($action['action_param']);
                    if($veid > 0) {
                        exec("vzctl stop $veid");
                    }
                    $this->_actionDone($action['action_id'], 'ok');
                }
                if ($action['action_type'] == 'openvz_restart_vm') {
                    $veid = intval($action['action_param']);
                    if($veid > 0) {
                        exec("vzctl restart $veid");
                    }
                    $this->_actionDone($action['action_id'], 'ok');
                }
                if ($action['action_type'] == 'openvz_create_ostpl') {
                    $parts = explode(':',$action['action_param']);
@@ -155,6 +158,7 @@
                        exec("mv ".$template_cache_dir."vzdump-openvz-".$veid."*.tgz ".$template_cache_dir.$template_name.".tar.gz");
                        exec("rm -f ".$template_cache_dir."vzdump-openvz-".$veid."*.log");
                    }
                    $this->_actionDone($action['action_id'], 'ok');
                    /* this action takes so much time,
                    * we stop executing the actions not to waste more time */
                    return;