From 7fe908c50c8dbc5cc05f571dbe11d66141caacd4 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 14 Nov 2013 09:01:22 -0500
Subject: [PATCH] Cleaning up code to match coding guidelines
---
server/mods-available/remoteaction_core_module.inc.php | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php
index 5ee3fc6..0864953 100644
--- a/server/mods-available/remoteaction_core_module.inc.php
+++ b/server/mods-available/remoteaction_core_module.inc.php
@@ -63,8 +63,8 @@
*/
global $app;
$sql = "UPDATE sys_remoteaction " .
- "SET action_state = '" . $app->dbmaster->quote($state) . "' " .
- "WHERE action_id = " . intval($id);
+ "SET action_state = '" . $app->dbmaster->quote($state) . "' " .
+ "WHERE action_id = " . intval($id);
$app->dbmaster->query($sql);
/*
@@ -80,6 +80,8 @@
/**
* This method searches for scheduled actions and exec then
*/
+
+
private function _execActions() {
global $app;
global $conf;
@@ -96,16 +98,16 @@
* 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";
+ "FROM sys_remoteaction " .
+ "WHERE server_id = " . $server_id . " ".
+ " AND action_id > " . intval($maxid_remote_action) . " ".
+ "ORDER BY action_id";
$actions = $app->dbmaster->queryAllRecords($sql);
/*
@@ -120,7 +122,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 +153,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 +168,8 @@
* we stop executing the actions not to waste more time */
return;
}
-
-
+
+
}
}
}
@@ -187,7 +189,7 @@
exec("aptitude update");
exec("aptitude safe-upgrade -y");
}
-
+
/*
* All well done!
*/
@@ -195,12 +197,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 +218,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 +231,7 @@
*/
chdir("/tmp/ispconfig3_install/install");
exec("touch autoupdate");
-
+
/*
* do some clean-up
*/
@@ -245,5 +247,7 @@
*/
//$this->_actionDone($action['action_id'], 'ok');
}
+
}
+
?>
--
Gitblit v1.9.1