diff options
Diffstat (limited to 'config/shellcmd/shellcmd_edit.tmp')
| -rw-r--r-- | config/shellcmd/shellcmd_edit.tmp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/config/shellcmd/shellcmd_edit.tmp b/config/shellcmd/shellcmd_edit.tmp index e8a5f5e7..8c49048f 100644 --- a/config/shellcmd/shellcmd_edit.tmp +++ b/config/shellcmd/shellcmd_edit.tmp @@ -84,24 +84,27 @@ if (strlen($id) > 0) { case "earlyshellcmd": $a_earlyshellcmd = &$config['system']['earlyshellcmd']; if ($a_earlyshellcmd[$id]) { - $pconfig['command'] = $a_earlyshellcmd[$id]['command']; + $pconfig['command'] = $a_earlyshellcmd[$id]; } break; case "shellcmd": $a_shellcmd = &$config['system']['shellcmd']; if ($a_shellcmd[$id]) { - $pconfig['command'] = $a_shellcmd[$id]['command']; + $pconfig['command'] = $a_shellcmd[$id]; } break; case "afterfilterchangeshellcmd": //$a_afterfilterchangeshellcmd = &$config['system']['afterfilterchangeshellcmd']; //if ($a_afterfilterchangeshellcmd[$id]) { - // $pconfig['command'] = $a_afterfilterchangeshellcmd[$id]['command']; + // $pconfig['command'] = $a_afterfilterchangeshellcmd[$id]; //} break; default: break; - } + } + + // previous version of shellcmd wrapped all commands in a <command>-xmltag, unnesting this for backwards compatibility + if (is_array($pconfig['command'])) $pconfig['command'] = $pconfig['command']['command']; } @@ -111,8 +114,8 @@ if ($_POST) { if (!$input_errors) { if (strlen($_POST['command']) > 0) { - $ent = array(); - $ent['command'] = $_POST['command']; + + $ent = $_POST['command']; if (strlen($id)>0) { //update @@ -188,7 +191,6 @@ function show_advanced_config() { <p class="pgtitle">Shellcmd: Edit</p> <?php if ($input_errors) print_input_errors($input_errors); ?> - <div id="mainlevel"> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td class="tabnavtbl"> |