Settings

From ab5647f7cd6be472d62284e4fa81dd0e61b54769 Mon Sep 17 00:00:00 2001 From: mcrane Date: Thu, 14 May 2009 03:55:28 -0600 Subject: Shellcmd package fix edit, update wording remove afterfilterchangeshellcmd for now --- config/shellcmd/shellcmd.tmp | 161 +++++++++++++++++------------------ config/shellcmd/shellcmd.xml | 4 +- config/shellcmd/shellcmd_edit.tmp | 173 +++++++++++++++++++++++++------------- 3 files changed, 198 insertions(+), 140 deletions(-) (limited to 'config/shellcmd') diff --git a/config/shellcmd/shellcmd.tmp b/config/shellcmd/shellcmd.tmp index 66e32c44..cc3a652a 100644 --- a/config/shellcmd/shellcmd.tmp +++ b/config/shellcmd/shellcmd.tmp @@ -32,18 +32,8 @@ require("/usr/local/pkg/shellcmd.inc"); $a_earlyshellcmd = &$config['system']['earlyshellcmd']; $a_shellcmd = &$config['system']['shellcmd']; -$a_afterfilterchangeshellcmd = &$config['system']['afterfilterchangeshellcmd']; - -if ($_GET['act'] == "del") { - if ($_GET['type'] == 'cmd') { - if ($a_shellcmd[$_GET['id']]) { - unset($a_shellcmd[$_GET['id']]); - write_config(); - header("Location: shellcmd.php"); - exit; - } - } -} +//$a_afterfilterchangeshellcmd = &$config['system']['afterfilterchangeshellcmd']; + include("head.inc"); @@ -74,10 +64,7 @@ include("head.inc");

"; @@ -89,7 +76,7 @@ if ($config_change == 1) { @@ -99,8 +86,8 @@ if ($config_change == 1) {

- shellcmd controls the commands that are started when the sytems is booted up. + The shellcmd utility is used to manage commands on system startup.

- - + +

command

type

Command

Type

@@ -118,78 +105,92 @@ if ($config_change == 1) { $i = 0; if (count($a_earlyshellcmd) > 0) { - foreach ($a_earlyshellcmd as $ent) { - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " "; - $i++; - } + //if (isset($a_earlyshellcmd[0]["command"])) { + foreach ($a_earlyshellcmd as $ent) { + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " "; + $i++; + } + //} } $i = 0; if (count($a_shellcmd) > 0) { - foreach ($a_shellcmd as $ent) { - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " "; - $i++; - } + //if (isset($a_shellcmd[0]["command"])) { + foreach ($a_shellcmd as $ent) { + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " "; + $i++; + } + //} } - - + + /* $i = 0; if (count($a_afterfilterchangeshellcmd) > 0) { - foreach ($a_afterfilterchangeshellcmd as $ent) { - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " "; - $i++; - } + //if (isset($a_afterfilterchangeshellcmd[0]["command"])) { + foreach ($a_afterfilterchangeshellcmd as $ent) { + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " "; + $i++; + } + //} + } + */ ?> - +

\n"; - echo " ".$ent['command']." \n"; - echo "

\n"; - echo " earlyshellcmd \n"; - echo "

\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "

\n"; - echo "

\n"; + echo " ".$ent['command']." \n"; + echo "

\n"; + if (strlen($ent['command']) > 0) { + echo " earlyshellcmd \n"; + } + echo "

\n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "

\n"; + echo "

\n"; - echo " ".$ent['command']." \n"; - echo "

\n"; - echo " shellcmd \n"; - echo "

\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "

\n"; - echo "

\n"; + echo " ".$ent['command']." \n"; + echo "

\n"; + if (strlen($ent['command']) > 0) { + echo " shellcmd \n"; // + } + echo "

\n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "

\n"; + echo "

\n"; - echo " ".$ent['command']." \n"; - echo "

\n"; - echo " afterfilterchangeshellcmd \n"; - echo "

\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "

\n"; - echo "

\n"; + echo " ".$ent['command']." \n"; + echo "

\n"; + if (strlen($ent['command']) > 0) { + echo " afterfilterchangeshellcmd \n"; + } + echo "

\n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "

\n"; + echo "

@@ -202,7 +203,7 @@ if ($config_change == 1) { - +

diff --git a/config/shellcmd/shellcmd.xml b/config/shellcmd/shellcmd.xml index 7e5af996..7068512b 100644 --- a/config/shellcmd/shellcmd.xml +++ b/config/shellcmd/shellcmd.xml @@ -41,7 +41,7 @@ Describe your package requirements here Currently there are no FAQ items provided. Shellcmd Settings - 0.1 + 0.2 Settings /usr/local/pkg/shellcmd.inc @@ -59,7 +59,7 @@ Settings - /packages/shellcmd.php + /packages/shellcmd/shellcmd.php diff --git a/config/shellcmd/shellcmd_edit.tmp b/config/shellcmd/shellcmd_edit.tmp index 904c6008..636e5d21 100644 --- a/config/shellcmd/shellcmd_edit.tmp +++ b/config/shellcmd/shellcmd_edit.tmp @@ -47,59 +47,117 @@ if (isset($_POST['t'])) { } if ($_GET['act'] == "del") { - if ($_GET['type'] == 'cmd') { - if ($a_shellcmd[$_GET['id']]) { - unset($a_shellcmd[$_GET['id']]); - write_config(); - php_sync_package(); - header("Location: shellcmd.php"); - exit; - } - } + if ($_GET['type'] == 'cmd') { + + switch (htmlspecialchars($type)) { + case "earlyshellcmd": + //if ($a_earlyshellcmd[$_GET['id']]) { + unset($a_earlyshellcmd[$_GET['id']]); + write_config(); + php_sync_package(); + header("Location: shellcmd.php"); + exit; + //} + break; + case "shellcmd": + //if ($a_shellcmd[$_GET['id']]) { + unset($a_shellcmd[$_GET['id']]); + write_config(); + php_sync_package(); + header("Location: shellcmd.php"); + exit; + //} + break; + case "afterfilterchangeshellcmd": + //if ($a_afterfilterchangeshellcmd[$_GET['id']]) { + // unset($a_afterfilterchangeshellcmd[$_GET['id']]); + // write_config(); + // php_sync_package(); + // header("Location: shellcmd.php"); + // exit; + //} + break; + default: + break; + } + + } } +//get value for the form edit value if (isset($id) && $a_shellcmd[$id]) { - $pconfig['command'] = $a_shellcmd[$id]['command']; + switch (htmlspecialchars($type)) { + case "earlyshellcmd": + if ($a_earlyshellcmd[$id]) { + $pconfig['command'] = $a_earlyshellcmd[$id]['command']; + } + break; + case "shellcmd": + if ($a_shellcmd[$id]) { + $pconfig['command'] = $a_shellcmd[$id]['command']; + } + break; + case "afterfilterchangeshellcmd": + //if ($a_afterfilterchangeshellcmd[$id]) { + // $pconfig['command'] = $a_afterfilterchangeshellcmd[$id]['command']; + //} + break; + default: + break; + } - } if ($_POST) { unset($input_errors); - $pconfig = $_POST; if (!$input_errors) { + if (strlen($_POST['command']) > 0) { + $ent = array(); + $ent['command'] = $_POST['command']; - $ent = array(); - $ent['command'] = $_POST['command']; - - if (isset($id) && $a_shellcmd[$id]) { - //update - $a_shellcmd[$id] = $ent; - } - else { - //add - switch (htmlspecialchars($type)) { - case "earlyshellcmd": - $a_earlyshellcmd[] = $ent; - break; - case "shellcmd": - $a_shellcmd[] = $ent; - break; - case "afterfilterchangeshellcmd": - $a_afterfilterchangeshellcmd[] = $ent; - break; - default: - break; - } + if (isset($id)) { //if ($a_shellcmd[$id]) { + //update + switch (htmlspecialchars($type)) { + case "earlyshellcmd": + $a_earlyshellcmd[$id] = $ent; + break; + case "shellcmd": + $a_shellcmd[$id] = $ent; + break; + case "afterfilterchangeshellcmd": + // $a_afterfilterchangeshellcmd[$id] = $ent; + break; + default: + break; + } + + } + else { + //add + switch (htmlspecialchars($type)) { + case "earlyshellcmd": + $a_earlyshellcmd[] = $ent; + break; + case "shellcmd": + $a_shellcmd[] = $ent; + break; + case "afterfilterchangeshellcmd": + //$a_afterfilterchangeshellcmd[] = $ent; + break; + default: + break; + } + + } + + write_config(); + php_sync_package(); } - write_config(); - php_sync_package(); - header("Location: shellcmd.php"); exit; } @@ -119,7 +177,7 @@ function show_advanced_config() { -

shellcmd: Edit

Shellcmd: Edit

@@ -152,9 +210,16 @@ function show_advanced_config() { - +

- + + + + + + - - - - - - +

type	Command	+ +
Type	\n"; @@ -163,38 +228,30 @@ function show_advanced_config() { case "earlyshellcmd": echo " \n"; echo " \n"; - echo " \n"; + //echo " \n"; break; case "shellcmd": echo " \n"; echo " \n"; - echo " \n"; + //echo " \n"; break; case "afterfilterchangeshellcmd": - echo " \n"; - echo " \n"; - echo " \n"; + //echo " \n"; + //echo " \n"; + //echo " \n"; break; default: echo " \n"; echo " \n"; echo " \n"; - echo " \n"; + //echo " \n"; break; } echo " \n"; ?> - -
command	-