Skip to content

refactor custom_mi_command handling for consistent command display #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dariusstefan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor custom_mi_command handling for consistent command display #348

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions web/common/tools/tviewer/apply_changes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
if (file_exists("../../../../config/tools/".get_tool_path($module_id)."/tviewer.inc.php"))
require_once("../../../../config/tools/".get_tool_path($module_id)."/tviewer.inc.php");

$command=$custom_config[$module_id][$_SESSION[$module_id]['submenu_item_id']]['custom_mi_command'];
$custom_mi_command=$custom_config[$module_id][$_SESSION[$module_id]['submenu_item_id']]['custom_mi_command'];

/*
* custom_mi_command may be given either as:
Expand All @@ -46,18 +46,24 @@
* - an array: array("command", array("param1"=>"value1", ...)) to pass
* named params (the second element may be omitted for no params).
*/
if (is_array($command)) {
$params = isset($command[1]) ? $command[1] : NULL;
$command = $command[0];
} elseif (strpos($command, " ")) {
$params = explode(" ", $command);
if (is_array($custom_mi_command)) {
$params = isset($custom_mi_command[1]) ? $custom_mi_command[1] : NULL;
$command = $custom_mi_command[0];
} elseif (strpos($custom_mi_command, " ")) {
$params = explode(" ", $custom_mi_command);
$command = array_shift($params);
} else {
$params = NULL;
$command = $custom_mi_command;
}

$display_command = $command;
if (!empty($params)) {
$display_command .= " " . json_encode($params);
}

?>
<fieldset><legend>Sending MI command: <?=$command?></legend>
<fieldset><legend>Sending MI command: <?=htmlspecialchars($display_command)?></legend>
<br>
<?php

Expand Down