From e942cfab4d189d1dd58e9f16ecb7f01e2adbc8c3 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 02 Jan 2012 07:51:32 -0500
Subject: [PATCH] Fixed website permission settings,
---
server/mods-available/remoteaction_core_module.inc.php | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php
index 678b4be..49294f4 100644
--- a/server/mods-available/remoteaction_core_module.inc.php
+++ b/server/mods-available/remoteaction_core_module.inc.php
@@ -95,7 +95,7 @@
* stop a service, a admin stopped some days before! To avoid this, we ignore
* the status (it is only for the interface to show) and use our own maxid
*/
- include_once (dirname(__FILE__) . "/../lib/remote_action.inc.php");
+ include_once (SCRIPT_PATH."/lib/remote_action.inc.php");
/*
* Get all actions this server should execute
@@ -119,30 +119,35 @@
* we stop executing the actions not to waste more time */
return;
}
+
if ($action['action_type'] == 'ispc_update') {
/* do the update */
- $this->_doIspCUpdate($action);
+ // Update function has been removed
+ // $this->_doIspCUpdate($action);
/* this action takes so much time,
* we stop executing the actions not to waste more time */
- return;
+ $this->_actionDone($action['action_id'], 'ok');
}
if ($action['action_type'] == 'openvz_start_vm') {
$veid = intval($action['action_param']);
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 +160,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;
@@ -239,4 +245,4 @@
//$this->_actionDone($action['action_id'], 'ok');
}
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1