From 437541b9f788412880a21a22725f7650886c8cf7 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Thu, 28 Jun 2018 14:24:56 +0200
Subject: [PATCH] FEAT #7926 applet controller terminate
---
modules/content_management/applet_controller.php | 7 +++++++
src/app/contentManagement/controllers/JnlpController.php | 6 ++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/modules/content_management/applet_controller.php b/modules/content_management/applet_controller.php
index 066504d4696..fec70dbb902 100755
--- a/modules/content_management/applet_controller.php
+++ b/modules/content_management/applet_controller.php
@@ -357,6 +357,13 @@ if (!empty($_REQUEST['action'])
);
createXML('ERROR', $result);
}
+ } elseif ($_REQUEST['action'] == 'terminate') {
+ if (file_exists($file)) {
+ unset($_SESSION['cm_applet'][$_SESSION['user']['UserId']][$_REQUEST['idApplet']]);
+ unlink($file);
+ }
+
+ createXML('SUCCESS', ['END_MESSAGE' => 'Terminate ok']);
} elseif ($_REQUEST['action'] == 'sendPsExec') {
$pathToPsExec = 'modules/content_management/dist/PsExec.exe';
if (file_exists($pathToPsExec)) {
diff --git a/src/app/contentManagement/controllers/JnlpController.php b/src/app/contentManagement/controllers/JnlpController.php
index 436a494fb3f..6e9992c0077 100644
--- a/src/app/contentManagement/controllers/JnlpController.php
+++ b/src/app/contentManagement/controllers/JnlpController.php
@@ -278,15 +278,13 @@ class JnlpController
}
}
- $result = ['END_MESSAGE' => 'Update ok'];
- $xmlResponse = JnlpController::generateResponse(['type' => 'SUCCESS', 'data' => $result]);
+ $xmlResponse = JnlpController::generateResponse(['type' => 'SUCCESS', 'data' => ['END_MESSAGE' => 'Update ok']]);
} elseif ($data['action'] == 'terminate') {
if (file_exists("{$tmpPath}{$GLOBALS['userId']}_maarchCM_{$aArgs['jnlpUniqueId']}.lck")) {
unlink("{$tmpPath}{$GLOBALS['userId']}_maarchCM_{$aArgs['jnlpUniqueId']}.lck");
}
- $result = ['END_MESSAGE' => 'Terminate ok'];
- $xmlResponse = JnlpController::generateResponse(['type' => 'SUCCESS', 'data' => $result]);
+ $xmlResponse = JnlpController::generateResponse(['type' => 'SUCCESS', 'data' => ['END_MESSAGE' => 'Terminate ok']]);
} else {
$result = [
'STATUS' => 'ko',
--
GitLab