summaryrefslogtreecommitdiffstats
path: root/admin/WebConsole/includes/restfunctions.php
diff options
context:
space:
mode:
authorJavier Sánchez Parra <jsanchez@soleta.eu>2020-02-25 13:39:42 +0100
committerOpenGnSys Support Team <soporte-og@soleta.eu>2020-06-02 12:32:36 +0200
commit33b0ef211fb764156072431c55bc46779aee3c1d (patch)
treeaad36578bf8121d37ed50797b3f5bfb9a87db0c6 /admin/WebConsole/includes/restfunctions.php
parentcf47830e36e7831509ce621feb00a577ce5e753b (diff)
#915 Add new case to command shell/run (web)
I tried to delete a cache image but the character "*" of the command was missing so the command fails. Command received: "rm -r /opt/opengnsys/cache/opt/opengnsys/images/test." Command expected: "rm -r /opt/opengnsys/cache/opt/opengnsys/images/test.*" This command adds a new case to the call shell/run. This new case is needed because in the case of deleting a image from the cache the web only has to delete the last character of the string instead of last two characters.
Diffstat (limited to 'admin/WebConsole/includes/restfunctions.php')
-rw-r--r--admin/WebConsole/includes/restfunctions.php22
1 files changed, 15 insertions, 7 deletions
diff --git a/admin/WebConsole/includes/restfunctions.php b/admin/WebConsole/includes/restfunctions.php
index 274ca708..adf09b2e 100644
--- a/admin/WebConsole/includes/restfunctions.php
+++ b/admin/WebConsole/includes/restfunctions.php
@@ -116,6 +116,17 @@ function shell($case, $string_ips, $command) {
$ips = explode(';',$string_ips);
switch ($case) {
+ case 1:
+ $data = array(OG_REST_PARAM_CLIENTS => $ips,
+ OG_REST_PARAM_RUN => $command,
+ OG_REST_PARAM_ECHO => true);
+ $command = OG_REST_CMD_RUN;
+ break;
+ default:
+ case 2:
+ $data = array(OG_REST_PARAM_CLIENTS => $ips);
+ $command = OG_REST_CMD_OUTPUT;
+ break;
case 3:
$decoded_cmds = rawurldecode(substr($command, 4));
$command = substr($decoded_cmds, 0, -2);
@@ -124,16 +135,13 @@ function shell($case, $string_ips, $command) {
OG_REST_PARAM_ECHO => false);
$command = OG_REST_CMD_RUN;
break;
- case 1:
+ case 4:
+ $decoded_cmds = rawurldecode(substr($command, 4));
+ $command = substr($decoded_cmds, 0, -1);
$data = array(OG_REST_PARAM_CLIENTS => $ips,
OG_REST_PARAM_RUN => $command,
- OG_REST_PARAM_ECHO => true);
+ OG_REST_PARAM_ECHO => false);
$command = OG_REST_CMD_RUN;
- break;
- default:
- case 2:
- $data = array(OG_REST_PARAM_CLIENTS => $ips);
- $command = OG_REST_CMD_OUTPUT;
}
$result = common_request($command, POST,