From afee192d2a77afa1c11d25156d0a44df94e19aed Mon Sep 17 00:00:00 2001
From: A. Täffner <darkalex@firesplash.de>
Date: Sat, 23 Jan 2016 07:30:37 -0500
Subject: [PATCH] fixed the cronjob and noticed a bug in ISPC but not able to report as FlySpray is offline
---
server/mods-available/remoteaction_core_module.inc.php | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php
index 5ee3fc6..807de50 100644
--- a/server/mods-available/remoteaction_core_module.inc.php
+++ b/server/mods-available/remoteaction_core_module.inc.php
@@ -62,10 +62,8 @@
* First set the state
*/
global $app;
- $sql = "UPDATE sys_remoteaction " .
- "SET action_state = '" . $app->dbmaster->quote($state) . "' " .
- "WHERE action_id = " . intval($id);
- $app->dbmaster->query($sql);
+ $sql = "UPDATE sys_remoteaction SET action_state = ? WHERE action_id = ?";
+ $app->dbmaster->query($sql, $state, $id);
/*
* Then save the maxid for the next time...
@@ -80,6 +78,8 @@
/**
* This method searches for scheduled actions and exec then
*/
+
+
private function _execActions() {
global $app;
global $conf;
@@ -96,17 +96,13 @@
* 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 (SCRIPT_PATH."/lib/remote_action.inc.php");
+ include_once SCRIPT_PATH."/lib/remote_action.inc.php";
/*
* Get all actions this server should execute
*/
- $sql = "SELECT action_id, action_type, action_param " .
- "FROM sys_remoteaction " .
- "WHERE server_id = " . $server_id . " ".
- " AND action_id > " . intval($maxid_remote_action) . " ".
- "ORDER BY action_id";
- $actions = $app->dbmaster->queryAllRecords($sql);
+ $sql = "SELECT action_id, action_type, action_param FROM sys_remoteaction WHERE server_id = ? AND action_id > ? ORDER BY action_id";
+ $actions = $app->dbmaster->queryAllRecords($sql, $server_id, $maxid_remote_action);
/*
* process all actions
@@ -120,7 +116,7 @@
* we stop executing the actions not to waste more time */
return;
}
-
+
if ($action['action_type'] == 'ispc_update') {
/* do the update */
// Update function has been removed
@@ -151,7 +147,7 @@
$this->_actionDone($action['action_id'], 'ok');
}
if ($action['action_type'] == 'openvz_create_ostpl') {
- $parts = explode(':',$action['action_param']);
+ $parts = explode(':', $action['action_param']);
$veid = intval($parts[0]);
$template_cache_dir = '/vz/template/cache/';
$template_name = escapeshellcmd($parts[1]);
@@ -166,8 +162,8 @@
* we stop executing the actions not to waste more time */
return;
}
-
-
+
+
}
}
}
@@ -187,7 +183,7 @@
exec("aptitude update");
exec("aptitude safe-upgrade -y");
}
-
+
/*
* All well done!
*/
@@ -195,12 +191,12 @@
}
private function _doIspCUpdate($action) {
-
+
// Ensure that this code is not executed twice as this would cause a loop in case of a failure
$this->_actionDone($action['action_id'], 'ok');
-
+
/*
- * Get the version-number of the newest version
+ * Get the version-number of the newest version
*/
$new_version = @file_get_contents('http://www.ispconfig.org/downloads/ispconfig3_version.txt');
$new_version = trim($new_version);
@@ -216,10 +212,10 @@
/* delete the old files (if there are any...) */
exec("rm /tmp/ISPConfig-" . $new_version . ".tar.gz");
exec("rm /tmp/ispconfig3_install -R");
-
+
/* get the newest version */
exec("wget http://www.ispconfig.org/downloads/ISPConfig-" . $new_version . ".tar.gz");
-
+
/* extract the files */
exec("tar xvfz ISPConfig-" . $new_version . ".tar.gz");
@@ -229,7 +225,7 @@
*/
chdir("/tmp/ispconfig3_install/install");
exec("touch autoupdate");
-
+
/*
* do some clean-up
*/
@@ -245,5 +241,7 @@
*/
//$this->_actionDone($action['action_id'], 'ok');
}
+
}
+
?>
--
Gitblit v1.9.1