From 88b1261978373f9222236dc0fd4578d0b399afae Mon Sep 17 00:00:00 2001 From: mcrane Date: Thu, 14 May 2009 13:56:51 -0600 Subject: Shellcmd package fix blank record creation --- config/shellcmd/shellcmd.tmp | 94 +++++++++++++++++++-------------------- config/shellcmd/shellcmd.xml | 2 +- config/shellcmd/shellcmd_edit.tmp | 70 ++++++++++++++++------------- pkg_config.7.xml | 4 +- 4 files changed, 88 insertions(+), 82 deletions(-) diff --git a/config/shellcmd/shellcmd.tmp b/config/shellcmd/shellcmd.tmp index cc3a652a..5bb387da 100644 --- a/config/shellcmd/shellcmd.tmp +++ b/config/shellcmd/shellcmd.tmp @@ -64,8 +64,6 @@ include("head.inc");
"; //print_info_box_np("This is an info box."); @@ -107,24 +105,24 @@ include("head.inc"); if (count($a_earlyshellcmd) > 0) { //if (isset($a_earlyshellcmd[0]["command"])) { foreach ($a_earlyshellcmd as $ent) { - echo " \n"; - echo " \n"; - echo " ".$ent['command']." \n"; - echo " \n"; - echo " \n"; if (strlen($ent['command']) > 0) { + echo " \n"; + echo " \n"; + echo " ".$ent['command']." \n"; + echo " \n"; + echo " \n"; echo " earlyshellcmd  \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
\n"; + echo " \n"; + echo " "; } - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "
\n"; - echo " \n"; - echo " "; $i++; } //} @@ -135,24 +133,24 @@ include("head.inc"); if (count($a_shellcmd) > 0) { //if (isset($a_shellcmd[0]["command"])) { foreach ($a_shellcmd as $ent) { - echo " \n"; - echo " \n"; - echo " ".$ent['command']." \n"; - echo " \n"; - echo " \n"; if (strlen($ent['command']) > 0) { - echo " shellcmd  \n"; // + echo " \n"; + echo " \n"; + echo " ".$ent['command']." \n"; + echo " \n"; + echo " \n"; + echo " shellcmd  \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
\n"; + echo " \n"; + echo " "; } - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "
\n"; - echo " \n"; - echo " "; $i++; } //} @@ -163,24 +161,24 @@ include("head.inc"); if (count($a_afterfilterchangeshellcmd) > 0) { //if (isset($a_afterfilterchangeshellcmd[0]["command"])) { foreach ($a_afterfilterchangeshellcmd as $ent) { - echo " \n"; - echo " \n"; - echo " ".$ent['command']." \n"; - echo " \n"; - echo " \n"; if (strlen($ent['command']) > 0) { + echo " \n"; + echo " \n"; + echo " ".$ent['command']." \n"; + echo " \n"; + echo " \n"; echo " afterfilterchangeshellcmd \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
\n"; + echo " \n"; + echo " "; } - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "
\n"; - echo " \n"; - echo " "; $i++; } //} diff --git a/config/shellcmd/shellcmd.xml b/config/shellcmd/shellcmd.xml index 7068512b..0f9469a6 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.2 + 0.3 Settings /usr/local/pkg/shellcmd.inc diff --git a/config/shellcmd/shellcmd_edit.tmp b/config/shellcmd/shellcmd_edit.tmp index 636e5d21..e8a5f5e7 100644 --- a/config/shellcmd/shellcmd_edit.tmp +++ b/config/shellcmd/shellcmd_edit.tmp @@ -32,17 +32,13 @@ require("guiconfig.inc"); require("/usr/local/pkg/shellcmd.inc"); -$a_earlyshellcmd = &$config['system']['earlyshellcmd']; -$a_shellcmd = &$config['system']['shellcmd']; -$a_afterfilterchangeshellcmd = &$config['system']['afterfilterchangeshellcmd']; - $id = $_GET['id']; -if (isset($_POST['id'])) { +if (strlen($_POST['id'])>0) { $id = $_POST['id']; } $type = $_GET['t']; -if (isset($_POST['t'])) { +if (strlen($_POST['t'])>0) { $type = $_POST['t']; } @@ -51,31 +47,28 @@ if ($_GET['act'] == "del") { 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; - //} + $a_earlyshellcmd = &$config['system']['earlyshellcmd']; + 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; - //} + $a_shellcmd = &$config['system']['shellcmd']; + unset($a_shellcmd[$_GET['id']]); + write_config(); + php_sync_package(); + header("Location: shellcmd.php"); + exit; break; case "afterfilterchangeshellcmd": - //if ($a_afterfilterchangeshellcmd[$_GET['id']]) { + // $a_afterfilterchangeshellcmd = &$config['system']['afterfilterchangeshellcmd']; // unset($a_afterfilterchangeshellcmd[$_GET['id']]); // write_config(); // php_sync_package(); // header("Location: shellcmd.php"); // exit; - //} break; default: break; @@ -85,20 +78,23 @@ if ($_GET['act'] == "del") { } //get value for the form edit value -if (isset($id) && $a_shellcmd[$id]) { +if (strlen($id) > 0) { switch (htmlspecialchars($type)) { case "earlyshellcmd": + $a_earlyshellcmd = &$config['system']['earlyshellcmd']; if ($a_earlyshellcmd[$id]) { $pconfig['command'] = $a_earlyshellcmd[$id]['command']; } break; case "shellcmd": + $a_shellcmd = &$config['system']['shellcmd']; if ($a_shellcmd[$id]) { $pconfig['command'] = $a_shellcmd[$id]['command']; } break; case "afterfilterchangeshellcmd": + //$a_afterfilterchangeshellcmd = &$config['system']['afterfilterchangeshellcmd']; //if ($a_afterfilterchangeshellcmd[$id]) { // $pconfig['command'] = $a_afterfilterchangeshellcmd[$id]['command']; //} @@ -118,18 +114,27 @@ if ($_POST) { $ent = array(); $ent['command'] = $_POST['command']; - if (isset($id)) { //if ($a_shellcmd[$id]) { + if (strlen($id)>0) { //update switch (htmlspecialchars($type)) { case "earlyshellcmd": - $a_earlyshellcmd[$id] = $ent; + $a_earlyshellcmd = &$config['system']['earlyshellcmd']; + if ($a_earlyshellcmd[$id]) { + $a_earlyshellcmd[$id] = $ent; + } break; case "shellcmd": - $a_shellcmd[$id] = $ent; + $a_shellcmd = &$config['system']['shellcmd']; + if ($a_shellcmd[$id]) { + $a_shellcmd[$id] = $ent; + } break; case "afterfilterchangeshellcmd": - // $a_afterfilterchangeshellcmd[$id] = $ent; + //$a_afterfilterchangeshellcmd = &$config['system']['afterfilterchangeshellcmd']; + //if ($a_afterfilterchangeshellcmd[$id]) { + // $a_afterfilterchangeshellcmd[$id] = $ent; + //} break; default: break; @@ -140,24 +145,27 @@ if ($_POST) { //add switch (htmlspecialchars($type)) { case "earlyshellcmd": + $a_earlyshellcmd = &$config['system']['earlyshellcmd']; $a_earlyshellcmd[] = $ent; break; case "shellcmd": + $a_shellcmd = &$config['system']['shellcmd']; $a_shellcmd[] = $ent; break; case "afterfilterchangeshellcmd": + //$a_afterfilterchangeshellcmd = &$config['system']['afterfilterchangeshellcmd']; //$a_afterfilterchangeshellcmd[] = $ent; break; default: break; } - + } - + write_config(); php_sync_package(); } - + header("Location: shellcmd.php"); exit; } @@ -266,7 +274,7 @@ function show_advanced_config() {   - + 0) { ?> diff --git a/pkg_config.7.xml b/pkg_config.7.xml index 96e6582f..22b97ac5 100755 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -176,8 +176,8 @@ http://www.pfsense.com/packages/config/shellcmd/shellcmd.xml http://files.pfsense.org/packages/7/All/ - 0.2 - Alpha + 0.3 + Beta 1.2 markjcrane@gmail.com shellcmd.xml -- cgit v1.2.3