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 | 69 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 15 deletions(-)
diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php
index ebdd404..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
@@ -126,6 +126,45 @@
* we stop executing the actions not to waste more time */
return;
}
+ 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']);
+ $veid = intval($parts[0]);
+ $template_cache_dir = '/vz/template/cache/';
+ $template_name = escapeshellcmd($parts[1]);
+ if($veid > 0 && $template_name != '' && is_dir($template_cache_dir)) {
+ $command = "vzdump --suspend --compress --stdexcludes --dumpdir $template_cache_dir $veid";
+ exec($command);
+ 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;
+ }
+
+
}
}
}
@@ -134,19 +173,19 @@
/*
* Do the update
*/
- exec("aptitude update");
- exec("aptitude upgrade -y");
-
- //TODO : change this when distribution information has been integrated into server record
- if(file_exists('/etc/gentoo-release')) {
- exec("glsa-check -f --nocolor affected");
- }
- else {
- exec("aptitude update");
- exec("aptitude safe-upgrade -y");
- }
-
- /*
+ exec("aptitude update");
+ exec("aptitude safe-upgrade -y");
+
+ //TODO : change this when distribution information has been integrated into server record
+ if(file_exists('/etc/gentoo-release')) {
+ exec("glsa-check -f --nocolor affected");
+ }
+ else {
+ exec("aptitude update");
+ exec("aptitude safe-upgrade -y");
+ }
+
+ /*
* All well done!
*/
$this->_actionDone($action['action_id'], 'ok');
@@ -204,4 +243,4 @@
//$this->_actionDone($action['action_id'], 'ok');
}
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1