From 6ad1e4080e9cd8e10ab9ec1e876debece7ae6512 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Thu, 29 Sep 2011 07:33:17 -0400
Subject: [PATCH] - Remove hidden iframe after file upload.
---
server/mods-available/remoteaction_core_module.inc.php | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php
index 678b4be..1f6ab09 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
@@ -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;
@@ -239,4 +243,4 @@
//$this->_actionDone($action['action_id'], 'ok');
}
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1