From c9d4ef4e593bde5a12d3eaa19b44ea5829866004 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 05 May 2014 02:25:31 -0400
Subject: [PATCH] Merge branch 'stable-3.0.5' into 'stable-3.0.5'
---
interface/web/admin/remote_action_ispcupdate.php | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/interface/web/admin/remote_action_ispcupdate.php b/interface/web/admin/remote_action_ispcupdate.php
index 3abcd71..32bf0c4 100644
--- a/interface/web/admin/remote_action_ispcupdate.php
+++ b/interface/web/admin/remote_action_ispcupdate.php
@@ -27,8 +27,10 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+//die('Function has been removed.');
+
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
//* Check permissions for module
$app->auth->check_module_permissions('admin');
@@ -43,11 +45,12 @@
//* load language file
$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_remote_action.lng';
-include($lng_file);
+include $lng_file;
/*
* We need a list of all Servers
*/
+
$sysServers = $app->db->queryAllRecords("SELECT server_id, server_name FROM server order by server_name");
$dropDown = "<option value='*'>" . $wb['select_all_server'] . "</option>";
foreach ($sysServers as $server) {
@@ -60,7 +63,9 @@
/*
* If the user wants to do the action, write this to our db
*/
-if (isset($_POST['server_select'])) {
+
+//* Note: Disabled post action
+if (1 == 0 && isset($_POST['server_select'])) {
$server = $_POST['server_select'];
$servers = array();
if ($server == '*') {
@@ -74,21 +79,21 @@
$servers[] = $_POST['server_select'];
}
foreach ($servers as $serverId) {
- $sql = "INSERT INTO sys_remoteaction (server_id, tstamp, action_type, action_param, action_status, response) " .
- "VALUES (".
- (int)$serverId . ", " .
- time() . ", " .
- "'ispc_update', " .
- "'', " .
- "'pending', " .
- "''" .
- ")";
+ $sql = "INSERT INTO sys_remoteaction (server_id, tstamp, action_type, action_param, action_state, response) " .
+ "VALUES (".
+ $app->functions->intval($serverId) . ", " .
+ time() . ", " .
+ "'ispc_update', " .
+ "'', " .
+ "'pending', " .
+ "''" .
+ ")";
$app->db->query($sql);
}
$msg = $wb['action_scheduled'];
}
-$app->tpl->setVar('msg',$msg);
+$app->tpl->setVar('msg', $msg);
$app->tpl->setVar($wb);
@@ -96,4 +101,4 @@
$app->tpl->pparse();
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1