From c8f20307fab78aaf8505db0bbb26d3cf51010286 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 25 Aug 2011 14:33:58 +0000
Subject: [PATCH] Fixed bug in remoting lib when clients were created and a bug
in openvz actions.
---
interface/lib/classes/remoting.inc.php | 13 +++++++++----
.../mods-available/remoteaction_core_module.inc.php | 4 ++++
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php
index 1c9717672d..8684a2a62e 100644
--- a/interface/lib/classes/remoting.inc.php
+++ b/interface/lib/classes/remoting.inc.php
@@ -2132,23 +2132,28 @@ class remoting {
//* 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') {
diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php
index 678b4befa1..d9af3a7d6a 100644
--- a/server/mods-available/remoteaction_core_module.inc.php
+++ b/server/mods-available/remoteaction_core_module.inc.php
@@ -131,18 +131,21 @@ class remoteaction_core_module {
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 @@ class remoteaction_core_module {
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;
--
GitLab