Merge pull request #1018 from doktornotor/patch-12

5 files changed, 383 insertions, 606 deletions

diff --git a/config/shellcmd/shellcmd.inc b/config/shellcmd/shellcmd.inc
index 04cbf3d6..113b645c 100644
--- a/config/shellcmd/shellcmd.inc
+++ b/config/shellcmd/shellcmd.inc
@@ -1,14 +1,11 @@
 <?php
-/* $Id$ */
-/*
-/* ========================================================================== */
-/*
-    shellcmd.inc
-    Copyright (C) 2008 Mark J Crane
-    All rights reserved.
-                                                                              */
-/* ========================================================================== */
 /*
+	shellcmd.inc
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2008 Mark J Crane
+	Copyright (C) 2015 ESF, LLC
+	All rights reserved.
+
 	Redistribution and use in source and binary forms, with or without
 	modification, are permitted provided that the following conditions are met:
 
@@ -30,58 +27,278 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
+function shellcmd_install_command() {
+	global $config;
+
+	/* Remove garbage left over by previous broken package versions */
+	unlink_if_exists("/usr/local/etc/rc.d/shellcmd.sh");
+	if (is_dir("/usr/local/www/packages/shellcmd")) {
+		mwexec("/bin/rm -rf /usr/local/www/packages/shellcmd/");
+	}
+
+	shellcmd_import_config();
+	shellcmd_sync_package();
+
+}
+
 
-require_once("services.inc");
-
-if (!function_exists("pkg_is_service_running")) {
-	function pkg_is_service_running($servicename)
-	{
-	    exec("/bin/ps ax | awk '{ print $5 }'", $psout);
-	    array_shift($psout);
-	    foreach($psout as $line) {
-		$ps[] = trim(array_pop(explode(' ', array_pop(explode('/', $line)))));
-	    }
-	    if(is_service_running($servicename, $ps) or is_process_running($servicename) ) {
-		return true;
-	    }
-	    else {
-		return false;
-	    }
+function shellcmd_delete_php_command() {
+	global $config;
+
+	/* When 'Delete item' is clicked in Shellcmd Settings */
+	if ($_GET['act'] == "del") {
+
+		/* System earlyshellcmd commands */
+		$a_earlyshellcmd = &$config['system']['earlyshellcmd'];
+		if (!is_array($a_earlyshellcmd)) {
+			$a_earlyshellcmd = array();
+		}
+		/* Shellcmd package commands */
+		$a_shellcmd_config = &$config['installedpackages']['shellcmdsettings']['config'];
+		if (!is_array($a_shellcmd_config)) {
+			$a_shellcmd_config = array();
+		}
+
+		/* First check for a couple of special cases that we do NOT want deleted */
+		/* TODO: Create a function for these checks */
+		$pkg = '';
+		/* pfBlockerNG - function to restore archived aliastables on nanobsd (see pfblockerng.inc) */
+		$pfbcmd = "/usr/local/pkg/pfblockerng/pfblockerng.sh";
+		/* If the entry exists in system config ... */
+		if (in_array($pfbcmd, $a_earlyshellcmd)) {
+			$cnta = 0;
+			/* ... but does not exist in package config ... */
+			foreach ($a_shellcmd_config as $item => $value) {
+				if (in_array($pfbcmd, $value)) {
+					$cnta++;
+				}
+			}
+			/* ... the user has deleted this protected entry. */
+			if ($cnta === 0) {
+				$pkg .= "[pfBlockerNG]";
+				/* Force reimport. */
+				shellcmd_forced_restore($pkg);
+			}
+		}
+		/* System Patches auto-apply patch feature (see patches.inc) */
+		$spcmd = "/usr/local/bin/php -f /usr/local/bin/apply_patches.php";
+		if (in_array($spcmd, $a_earlyshellcmd)) {
+			$cntb = 0;
+			foreach ($a_shellcmd_config as $item => $value) {
+				if (in_array($spcmd, $value)) {
+					$cntb++;
+				}
+			}
+			if ($cntb === 0) {
+				$pkg .= "[System Patches]";
+				shellcmd_forced_restore($pkg);
+			}
+		}
+
+		/* Otherwise, sync package and system configuration normally */
+		shellcmd_sync_package();
 	}
 }
 
-function shellcmd_sync_package()
-{
 
-	global $config;   
-	//synch shellcmd tab
-	//configure_shellcmd();
-	//$handle = popen("/usr/local/etc/rc.d/shellcmd.sh stop", "r");
-	//pclose($handle);
-	//$handle = popen("/usr/local/etc/rc.d/shellcmd.sh start", "r");
-	//pclose($handle);
+/* Force restore of protected (early)shellcmds from system config */
+function shellcmd_forced_restore($pkg) {
+	log_error("[shellcmd] Refused to delete {$pkg} earlyshellcmd. Use {$pkg} to configure this entry.");
+	shellcmd_import_config();
+	write_config("[shellcmd] Restore of {$pkg} earlyshellcmd forced.");
+	/* Send the user back to settings */
+	header("Location: pkg.php?xml=shellcmd.xml");
+	exit;
 
 }
-    
 
-function shellcmd_install_command()
-{
 
+function shellcmd_sync_package() {
 	global $config;
 	conf_mount_rw();
-	shellcmd_sync_package();
-	conf_mount_ro();
+
+	$cmd = '';
+	$cmdtype = '';
+	$a_shellcmd = array();
+	$a_earlyshellcmd = array();
+	/* afterfilterchangeshellcmd is NOT treated as an array, it's a string! */
+	/* See /etc/inc/xmlparse.inc and /etc/inc/xmlreader.inc */
+	$afterfilterchangeshellcmd = '';
+	$a_shellcmd_config = &$config['installedpackages']['shellcmdsettings']['config'];
+	if (!is_array($a_shellcmd_config)) {
+		$a_shellcmd_config = array();
+	}
+	$i = 0;
+	/* When an item is added to shellcmd package configuration, make sure */
+	/* we add corresponding entry to $config['system'] as well */
+	foreach ($a_shellcmd_config as $item) {
+		/* Get the command from package configuration here */
+		$cmd = $a_shellcmd_config[$i]['cmd'];
+		/* Lets see what type of command we are adding first... */
+		$cmdtype = $a_shellcmd_config[$i]['cmdtype'];
+		/* shellcmd */
+		if ($cmdtype == "shellcmd") {
+			$a_shellcmd[] = $cmd;
+			$i++;
+		/* earlyshellcmd */
+		} elseif ($cmdtype == "earlyshellcmd") {
+			$a_earlyshellcmd[] = $cmd;
+			$i++;
+		/* afterfilterchangeshellcmd */
+		} elseif ($cmdtype == "afterfilterchangeshellcmd") {
+			$afterfilterchangeshellcmd = $cmd;
+			$i++;
+		/* Either disabled, or possibly someone messing with config.xml manually?! */
+		} else {
+			$i++;
+		}
+	}
+
+	/* Write the new system configuration to config.xml from scratch when done */
+	unset($config['system']['shellcmd']);
+	$config['system']['shellcmd'] = $a_shellcmd;
+	unset($config['system']['earlyshellcmd']);
+	$config['system']['earlyshellcmd'] = $a_earlyshellcmd;
+	unset($config['system']['afterfilterchangeshellcmd']);
+	$config['system']['afterfilterchangeshellcmd'] = $afterfilterchangeshellcmd;
+	write_config("[shellcmd] Successfully (re)synced shellcmd configuration.");
 
 }
 
 
-function shellcmd_deinstall_command()
-{
+function shellcmd_import_config() {
+	global $config;
 
-	conf_mount_rw();
-	$handle = popen("/usr/local/etc/rc.d/shellcmd.sh stop", "r");
-	//unlink_if_exists("/usr/local/etc/rc.d/shellcmd.sh");
-	conf_mount_ro();
+	$shellcmd_config = &$config['installedpackages']['shellcmdsettings']['config'];
+	if (!is_array($shellcmd_config)) {
+		$shellcmd_config = array();
+	}
+
+	$i = 0;
+
+	/* First, preserve any disabled items */
+	$a_shellcmd_config = &$shellcmd_config;
+	foreach ($a_shellcmd_config as $item => $value) {
+		$cmd = $value['cmd'];
+		$cmdtype = $value['cmdtype'];
+		$description = $value['description'];
+		if ($cmdtype == "disabled") {
+			$shellcmd_config[$i]['cmd'] = $cmd;
+			$shellcmd_config[$i]['cmdtype'] = "disabled";
+			$shellcmd_config[$i]['description'] = $description ?: "Imported disabled item ({$i})";
+			$i++;
+		}
+	}
+
+	/* Import earlyshellcmd entries which were either created by previous package versions, */
+	/* or manually, or added by some other package(s) (if there are any in config.xml) */
+	/* Two currently known special cases are handled here - System Patches and pfBlockerNG */
+	if (is_array($config['system']['earlyshellcmd'])) {
+		$earlyshellcmds = &$config['system']['earlyshellcmd'];
+		$pfbcmd = "/usr/local/pkg/pfblockerng/pfblockerng.sh";
+		$spcmd = "/usr/local/bin/php -f /usr/local/bin/apply_patches.php";
+		foreach ($earlyshellcmds as $earlyshellcmd) {
+			/* pfBlockerNG - function to restore archived aliastables on nanobsd (see pfblockerng.inc) */
+			if (stristr($earlyshellcmd, "{$pfbcmd}")) {
+				$shellcmd_config[$i]['cmd'] = $earlyshellcmd;
+				$shellcmd_config[$i]['cmdtype'] = "earlyshellcmd";
+				$shellcmd_config[$i]['description'] = "pfBlockerNG default earlyshellcmd. DO NOT EDIT/DELETE!";
+				$i++;
+			/* System Patches auto-apply patch feature (see patches.inc) */
+			} elseif (stristr($earlyshellcmd, "{$spcmd}")) {
+				$shellcmd_config[$i]['cmd'] = $earlyshellcmd;
+				$shellcmd_config[$i]['cmdtype'] = "earlyshellcmd";
+				$shellcmd_config[$i]['description'] = "System Patches default earlyshellcmd. DO NOT EDIT/DELETE!";
+				$i++;
+			/* Other manually added earlyshellcmd entries */
+			} else {
+				$shellcmd_config[$i]['cmd'] = $earlyshellcmd;
+				$shellcmd_config[$i]['cmdtype'] = "earlyshellcmd";
+				$shellcmd_config[$i]['description'] = $shellcmd_config[$i]['description'] ?: "Imported earlyshellcmd ({$i})";
+				$i++;
+			}
+
+		}
+	}
+	/* Import shellcmd entries which were created manually (if there are any in config.xml) */
+	if (is_array($config['system']['shellcmd'])) {
+		$shellcmds = &$config['system']['shellcmd'];
+		foreach ($shellcmds as $shellcmd) {
+			$shellcmd_config[$i]['cmd'] = $shellcmd;
+			$shellcmd_config[$i]['cmdtype'] = "shellcmd";
+			$shellcmd_config[$i]['description'] = $shellcmd_config[$i]['description'] ?: "Imported shellcmd ({$i})";
+			$i++;
+		}
+	}
+
+	/* Import afterfilterchangeshellcmd entry which was created manually (if there is any in config.xml) */
+	/* afterfilterchangeshellcmd is NOT treated as an array, it's a string! See /etc/inc/xmlparse.inc and /etc/inc/xmlreader.inc */
+	if ($config['system']['afterfilterchangeshellcmd'] != '') {
+		$shellcmd_config[$i]['cmd'] = $config['system']['afterfilterchangeshellcmd'];
+		$shellcmd_config[$i]['cmdtype'] = "afterfilterchangeshellcmd";
+		$shellcmd_config[$i]['description'] = $shellcmd_config[$i]['description'] ?: "Imported afterfilterchangeshellcmd";
+		$i++;
+	}
+
+	/* Write the new config.xml when import is finished */
+	write_config("[shellcmd] Successfully imported package configuration from config.xml.");
+
+}
+
+function shellcmd_validate_input($post, &$input_errors) {
+	global $config;
+	$a_shellcmd = &$config['system']['shellcmd'];
+	if (!is_array($a_shellcmd)) {
+		$a_shellcmd = array();
+	}
+	$a_earlyshellcmd = &$config['system']['earlyshellcmd'];
+	if (!is_array($a_earlyshellcmd)) {
+		$a_earlyshellcmd = array();
+	}
+	$a_shellcmd_config = &$config['installedpackages']['shellcmdsettings']['config'];
+	if (!is_array($a_shellcmd_config)) {
+		$a_shellcmd_config = array();
+	}
+	/* afterfilterchangeshellcmd is NOT an array */
+	$afterfilterchangeshellcmd = $config['system']['afterfilterchangeshellcmd'];
+
+	/* Make sure we don't add the same command twice as it's just pointless */
+	if (($post['cmd']) != '') {
+		$id = $post['id'];
+		if ($post['cmdtype'] == "shellcmd") {
+			if (in_array($post['cmd'], $a_shellcmd)) {
+				/* Allow changing description */
+				if ((($post['cmd']) == $a_shellcmd_config[$id]['cmd']) && (($post['cmdtype']) == $a_shellcmd_config[$id]['cmdtype'])) {
+					return;
+				} else {
+					$input_errors[] = "{$post['cmd']} already exists as shellcmd.";
+				}
+			}
+		}
+		if ($post['cmdtype'] == "earlyshellcmd") {
+			if (in_array($post['cmd'], $a_earlyshellcmd)) {
+				/* Allow changing description */
+				if ((($post['cmd']) == $a_shellcmd_config[$id]['cmd']) && (($post['cmdtype']) == $a_shellcmd_config[$id]['cmdtype'])) {
+					return;
+				} else {
+					$input_errors[] = "{$post['cmd']} already exists as earlyshellcmd.";
+				}
+			}
+		}
+		/* Only ONE item of this type may be configured */
+		if ($post['cmdtype'] == "afterfilterchangeshellcmd") {
+			// Not yet configured, OK
+			if ($afterfilterchangeshellcmd == '') {
+				return;
+			// Allow changing description
+			} elseif ((($post['cmd']) == $a_shellcmd_config[$id]['cmd']) && (($post['cmdtype']) == $a_shellcmd_config[$id]['cmdtype'])) {
+				return;
+			// Tired of input validation... Needs something better in future.
+			} else {
+				$input_errors[] = "Only ONE afterfilterchangeshellcmd may be configured! Delete the existing entry and try again!";
+			}
+		}
+	}
 
 }
 
diff --git a/config/shellcmd/shellcmd.php b/config/shellcmd/shellcmd.php
deleted file mode 100644
index fd386910..00000000
--- a/config/shellcmd/shellcmd.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-/* $Id$ */
-/*
-	shellcmd.php
-	Copyright (C) 2008 Mark J Crane
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require("guiconfig.inc");
-require("/usr/local/pkg/shellcmd.inc");
-
-$a_earlyshellcmd = &$config['system']['earlyshellcmd'];
-$a_shellcmd = &$config['system']['shellcmd'];
-//$a_afterfilterchangeshellcmd = &$config['system']['afterfilterchangeshellcmd'];
-
-include("head.inc");
-
-?>
-
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php include("fbegin.inc"); ?>
-<p class="pgtitle">Shellcmd: Settings</p>
-
-<div id="mainlevel">
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr><td class="tabnavtbl">
-<?php
-			
-	$tab_array = array();
-	$tab_array[] = array(gettext("Settings"), false, "/packages/shellcmd/shellcmd.php");
- 	display_top_tabs($tab_array);
- 	
-?>
-</td></tr>
-</table>
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-   <tr>
-     <td class="tabcont" >
-
-<form action="shellcmd.php" method="post" name="iform" id="iform">
-<?php 
-
-//if ($savemsg) print_info_box($savemsg); 
-//if (file_exists($d_hostsdirty_path)): echo"<p>";
-//print_info_box_np("This is an info box.");
-//echo"<br />";
-//endif; 
-
-?>
-  	<table width="100%" border="0" cellpadding="6" cellspacing="0">              
-      <tr>
-        <td><p><!--<span class="vexpl"><span class="red"><strong>shellcmd<br></strong></span>-->
-            The shellcmd utility is used to manage commands on system startup. 
-            <br /><br />
-            <!--For more information see: <a href='http://www.' target='_blank'>http://www.</a>-->
-            </p></td>
-      </tr>
-    </table>
-    <br />
-    
-    <table width="100%" border="0" cellpadding="0" cellspacing="0">
-    <tr>
-      <td width="50%" class="listhdrr">Command</td>
-      <td width="30%" class="listhdrr">Type</td>
-      <td width="10%" class="list">
-
-        <table border="0" cellspacing="0" cellpadding="1">
-          <tr>
-            <td width="17"></td>
-            <td valign="middle"><a href="shellcmd_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
-          </tr>
-        </table>
-
-      </td>
-	</tr>
-
-
-<?php 
-    
-    $categories = array("earlyshellcmd","shellcmd");
-    //$categories = array("earlyshellcmd","shellcmd","afterfilterchangeshellcmd");
-	
-	foreach ($categories as $category) {
-		$i = 0;
-		// dynamically create the category config name
-		$category_config = "a_".$category;
-		if (count($$category_config) > 0) {
-			foreach ($$category_config as $ent) { 
-				// previous versions of shellcmd stored the command in an additional <command>-xmltag, this unnests this for backwards compatibility
-				if (is_array($ent)) { $ent = $ent['command']; }
-
-				echo "  <tr>\n";
-				echo "	<td class=\"listr\" ondblclick=\"document.location='shellcmd_edit.php?t=".$category."&id=".$i."';\">\n";
-				echo "	  ".$ent."\n";
-				echo "	</td>\n";
-				echo "	<td class=\"listbg\" ondblclick=\"document.location='shellcmd_edit.php?t=".$category."&id=".$i."';\">\n";
-				echo "	  ".$category."\n";
-				echo "	</td>\n";
-				echo "	<td valign=\"middle\" nowrap class=\"list\">\n";
-				echo "	  <table border=\"0\" cellspacing=\"0\" cellpadding=\"1\">\n";
-				echo "		<tr>\n";
-				echo "		  <td valign=\"middle\"><a href=\"shellcmd_edit.php?t=".$category."&id=".$i."\"><img src=\"/themes/".$g['theme']."/images/icons/icon_e.gif\" width=\"17\" height=\"17\" border=\"0\"></a></td>\n";
-				echo "		  <td><a href=\"shellcmd_edit.php?t=".$category."&type=cmd&act=del&id=".$i."\" onclick=\"return confirm('Do you really want to delete this?')\"><img src=\"/themes/".$g['theme']."/images/icons/icon_x.gif\" width=\"17\" height=\"17\" border=\"0\"></a></td>\n";
-				echo "		</tr>\n";
-				echo "	 </table>\n";
-				echo "	</td>\n";
-				echo "  </tr>";
-				$i++; 
-			}
-		}
-	}
-
-
-?>
-
-    <tr>
-      <td class="list" colspan="2"></td>
-      <td class="list">          
-        <table border="0" cellspacing="0" cellpadding="1">
-          <tr>
-            <td width="17"></td>
-            <td valign="middle"><a href="shellcmd_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
-          </tr>
-        </table>
-		  </td>
-     </tr>
-
-
-     <tr>
-       <td class="list" colspan="3"></td>
-       <td class="list"></td>
-     </tr>
-     </table>
-     
-</form>
-
-
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-
-</td>
-</tr>
-</table>
-
-</div>
-
-
-<?php include("fend.inc"); ?>
-</body>
-</html>
diff --git a/config/shellcmd/shellcmd.xml b/config/shellcmd/shellcmd.xml
index 094c3d30..f6b34ee4 100644
--- a/config/shellcmd/shellcmd.xml
+++ b/config/shellcmd/shellcmd.xml
@@ -1,115 +1,157 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE packagegui SYSTEM "./schema/packages.dtd">
-<?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
-        <copyright>
-        <![CDATA[
+	<copyright>
+<![CDATA[
 /* $Id$ */
-/* ========================================================================== */
+/* ====================================================================================== */
 /*
-    shellcmd.xml
-    Copyright (C) 2008 Mark J Crane
-    All rights reserved.
-                                                                              */
-/* ========================================================================== */
+	shellcmd.xml
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2008 Mark J Crane
+	Copyright (C) 2015 ESF, LLC
+	All rights reserved.
+*/
+/* ====================================================================================== */
 /*
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
 
-     1. Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
 
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
 
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-                                                                              */
-/* ========================================================================== */
-        ]]>
-        </copyright>
-    <description>Shellcmd</description>
-    <requirements>Describe your package requirements here</requirements>
-    <faq>Currently there are no FAQ items provided.</faq>
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+/* ====================================================================================== */
+	]]>
+	</copyright>
 	<name>Shellcmd Settings</name>
-	<version>0.4</version>
-	<title>Settings</title>
+	<version>1.0</version>
+	<title>Shellcmd Settings</title>
 	<include_file>/usr/local/pkg/shellcmd.inc</include_file>
+	<aftersaveredirect>/pkg.php?xml=shellcmd.xml</aftersaveredirect>
+	<addedit_string>[shellcmd] Successfully created/modified custom (early)shellcmd.</addedit_string>
+	<delete_string>[shellcmd] Successfully deleted custom (early)shellcmd.</delete_string>
 	<menu>
 		<name>Shellcmd</name>
-		<tooltiptext>shellcmd settings.</tooltiptext>
 		<section>Services</section>
 		<configfile>shellcmd.xml</configfile>
-		<url>/packages/shellcmd/shellcmd.php</url>
+		<url>/pkg.php?xml=shellcmd.xml</url>
 	</menu>
 	<tabs>
 		<tab>
 			<text>Settings</text>
-			<url>/pkg_edit.php?xml=shellcmd.xml&amp;id=0</url>
+			<url>/pkg.php?xml=shellcmd.xml</url>
 			<active/>
 		</tab>
-		<tab>
-			<text>Settings</text>
-			<url>/packages/shellcmd/shellcmd.php</url>
-			<active/>
-		</tab>		
 	</tabs>
-	<configpath>installedpackages->package->$packagename->configuration->shellcmd</configpath>
+	<configpath>['installedpackages']['shellcmdsettings']['config']</configpath>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
-		<chmod>0755</chmod>		
-		<item>https://packages.pfsense.org/packages/config/shellcmd/shellcmd.xml</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>0755</chmod>		
 		<item>https://packages.pfsense.org/packages/config/shellcmd/shellcmd.inc</item>
 	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/www/packages/shellcmd/</prefix>
-		<chmod>0755</chmod>		
-		<item>https://packages.pfsense.org/packages/config/shellcmd/shellcmd.php</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/www/packages/shellcmd/</prefix>
-		<chmod>0755</chmod>		
-		<item>https://packages.pfsense.org/packages/config/shellcmd/shellcmd_edit.php</item>
-	</additional_files_needed>			
+	<adddeleteeditpagefields>
+		<columnitem>
+			<fielddescr>Command</fielddescr>
+			<fieldname>cmd</fieldname>
+		</columnitem>
+		<columnitem>
+			<fielddescr>Shellcmd Type</fielddescr>
+			<fieldname>cmdtype</fieldname>
+		</columnitem>
+		<columnitem>
+			<fielddescr>Description</fielddescr>
+			<fieldname>description</fieldname>
+		</columnitem>
+	<addtext>Add a new (early)shellcmd entry</addtext>
+	<edittext>Edit this (early)shellcmd entry</edittext>
+	<deletetext>Delete this (early)shellcmd entry</deletetext>
+	</adddeleteeditpagefields>
 	<fields>
 		<field>
-			<fielddescr>Variable One</fielddescr>
-			<fieldname>var1</fieldname>
-			<description>Enter the variable one here.</description>
+			<type>listtopic</type>
+			<fieldname>none</fieldname>
+			<name>Shellcmd Configuration</name>
+		</field>
+		<field>
+			<fielddescr>Command</fielddescr>
+			<fieldname>cmd</fieldname>
 			<type>input</type>
+			<size>60</size>
+			<description>Enter the command to run.</description>
+			<required/>
+		</field>
+		<field>
+			<fielddescr>Shellcmd Type</fielddescr>
+			<fieldname>cmdtype</fieldname>
+			<type>select</type>
+				<options>
+					<option>
+						<name>shellcmd</name>
+						<value>shellcmd</value>
+					</option>
+					<option>
+						<name>earlyshellcmd</name>
+						<value>earlyshellcmd</value>
+					</option>
+					<option>
+						<name>afterfilterchangeshellcmd</name>
+						<value>afterfilterchangeshellcmd</value>
+					</option>
+					<option>
+						<name>disabled</name>
+						<value>disabled</value>
+					</option>
+				</options>
+			<description>
+				<![CDATA[
+				Choose the shellcmd type.<br /><br />
+				<strong>shellcmd</strong> will run the command specified towards the end of the boot process.<br />
+				<strong>earlyshellcmd</strong> will run the command specified at the beginning of the boot process.<br />
+				<strong>afterfilterchangeshellcmd</strong> will run after each filter_configure() call.
+				See <a href="https://github.com/pfsense/pfsense/blob/master/etc/inc/filter.inc">filter.inc source code</a> for "documentation".
+				<span class="errmsg">N.B.: Only one entry of this type can be configured!</span><br />
+				<strong>disabled</strong> will save the command in package configuration but it will NOT run on boot.<br /><br />
+				See <a href="https://doc.pfsense.org/index.php/Executing_commands_at_boot_time">Executing commands at boot time</a> for detailed explanation.
+				]]>
+			</description>
+			<required/>
 		</field>
 		<field>
-			<fielddescr>Variable Two</fielddescr>
-			<fieldname>var1</fieldname>
-			<description>Enter the variable one here.</description>
+			<fielddescr>Description</fielddescr>
+			<fieldname>description</fieldname>
+			<description>Enter a description for this command.</description>
 			<type>input</type>
+			<typehint>(This is for your reference only.)</typehint>
+			<size>60</size>
 		</field>
-	</fields>	
-	<custom_add_php_command>
-	</custom_add_php_command>
+	</fields>
+	<custom_php_install_command>
+		shellcmd_import_config();
+	</custom_php_install_command>
 	<custom_php_resync_config_command>
 		shellcmd_sync_package();
 	</custom_php_resync_config_command>
-	<custom_delete_php_command>    
-		shellcmd_sync_package();
+	<custom_delete_php_command>
+		shellcmd_delete_php_command();
 	</custom_delete_php_command>
-	<custom_php_install_command>
-		shellcmd_install_command();
-	</custom_php_install_command>
-	<custom_php_deinstall_command>
-		shellcmd_deinstall_command();
-	</custom_php_deinstall_command>
+	<custom_php_validation_command>
+		shellcmd_validate_input($_POST, $input_errors);
+	</custom_php_validation_command>
 </packagegui>
diff --git a/config/shellcmd/shellcmd_edit.php b/config/shellcmd/shellcmd_edit.php
deleted file mode 100644
index 5ae466d5..00000000
--- a/config/shellcmd/shellcmd_edit.php
+++ /dev/null
@@ -1,303 +0,0 @@
-<?php 
-/* $Id$ */
-/*
-
-	shellcmd_edit.php
-	Copyright (C) 2008 Mark J Crane
-	All rights reserved.
-	
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-	
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-*/
-
-require("guiconfig.inc");
-require("/usr/local/pkg/shellcmd.inc");
-
-
-$id = $_GET['id'];
-if (strlen($_POST['id'])>0) {
-	$id = $_POST['id'];
-}
-
-$type = $_GET['t'];
-if (strlen($_POST['t'])>0) {
-	$type = $_POST['t'];
-}
-
-if ($_GET['act'] == "del") {
-	if ($_GET['type'] == 'cmd') {
-
-		switch (htmlspecialchars($type)) {
-		case "earlyshellcmd":
-			$a_earlyshellcmd = &$config['system']['earlyshellcmd'];
-			unset($a_earlyshellcmd[$_GET['id']]);
-			write_config();
-			shellcmd_sync_package();
-			header("Location: shellcmd.php");
-			exit;
-			break;
-		case "shellcmd":
-			$a_shellcmd = &$config['system']['shellcmd'];
-			unset($a_shellcmd[$_GET['id']]);
-			write_config();
-			shellcmd_sync_package();
-			header("Location: shellcmd.php");
-			exit;
-			break;
-		case "afterfilterchangeshellcmd":
-			//  $a_afterfilterchangeshellcmd = &$config['system']['afterfilterchangeshellcmd'];
-			//	unset($a_afterfilterchangeshellcmd[$_GET['id']]);
-			//	write_config();
-			//	shellcmd_sync_package();
-			//	header("Location: shellcmd.php");
-			//	exit;
-			break;					
-		default:
-			break;	
-		}
-
-	}
-}
-
-//get value for the form edit value
-if (strlen($id) > 0) {
-
-	switch (htmlspecialchars($type)) {
-	case "earlyshellcmd":
-		$a_earlyshellcmd = &$config['system']['earlyshellcmd'];
-		if ($a_earlyshellcmd[$id]) {
-			$pconfig['command'] = $a_earlyshellcmd[$id];
-		}
-		break;
-	case "shellcmd":
-		$a_shellcmd = &$config['system']['shellcmd'];
-		if ($a_shellcmd[$id]) {
-			$pconfig['command'] = $a_shellcmd[$id];
-		}
-		break;
-	case "afterfilterchangeshellcmd":
-		//$a_afterfilterchangeshellcmd = &$config['system']['afterfilterchangeshellcmd'];
-		//if ($a_afterfilterchangeshellcmd[$id]) {
-		//	$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'];
-
-}
-
-if ($_POST) {
-
-	unset($input_errors);
-  
-	if (!$input_errors) {
-		if (strlen($_POST['command']) > 0) {
-			
-			$ent = $_POST['command'];
-
-			if (strlen($id)>0) {
-				//update
-				
-				switch (htmlspecialchars($type)) {
-				case "earlyshellcmd":
-					$a_earlyshellcmd = &$config['system']['earlyshellcmd'];
-					if ($a_earlyshellcmd[$id]) {
-						$a_earlyshellcmd[$id] = $ent;
-					}
-					break;
-				case "shellcmd":
-					$a_shellcmd = &$config['system']['shellcmd'];
-					if ($a_shellcmd[$id]) {
-						$a_shellcmd[$id] = $ent;
-					}
-					break;
-				case "afterfilterchangeshellcmd":
-					//$a_afterfilterchangeshellcmd = &$config['system']['afterfilterchangeshellcmd'];
-					//if ($a_afterfilterchangeshellcmd[$id]) {
-					//	$a_afterfilterchangeshellcmd[$id] = $ent;
-					//}
-					break;					
-				default:
-					break;	
-				}
-					
-			}			
-			else {
-				//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();
-			shellcmd_sync_package();
-		}
-
-		header("Location: shellcmd.php");
-		exit;
-	}
-}
-
-include("head.inc");
-
-?>
-
-<script type="text/javascript" language="JavaScript">
-
-function show_advanced_config() {
-	document.getElementById("showadvancedbox").innerHTML='';
-	aodiv = document.getElementById('showadvanced');
-	aodiv.style.display = "block";
-</script>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php include("fbegin.inc"); ?>
-<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">
-<?php
-			
-	$tab_array = array();
-	$tab_array[] = array(gettext("Settings"), false, "/packages/shellcmd/shellcmd.php");
-	display_top_tabs($tab_array);
- 	
-?>
-</td></tr>
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-   <tr>
-     <td class="tabcont" >
-
-	<!--
-  	<table width="100%" border="0" cellpadding="6" cellspacing="0">              
-      <tr>
-        <td><p><span class="vexpl"><span class="red"><strong>shellcmd<br>
-            </strong></span>
-            </p></td>
-      </tr>
-    </table>
-    -->
-    <br />
-
-
-        <form action="shellcmd_edit.php" method="post" name="iform" id="iform">
-            <table width="100%" border="0" cellpadding="6" cellspacing="0">		         
-            <tr>
-              <td width="25%" valign="top" class="vncellreq">Command</td>
-              <td width="75%" class="vtable">
-                <input name="command" type="text" class="formfld" id="command" size="40" value="<?=htmlspecialchars($pconfig['command']);?>">
-              </td>
-            </tr>
-
-			<tr>
-              <td width="25%" valign="top" class="vncellreq">Type</td>
-              <td width="75%" class="vtable">
-				<?php                
-				echo "              <select name='t' class='formfld'>\n";
-				echo "                <option></option>\n";
-				switch (htmlspecialchars($type)) {
-				case "earlyshellcmd":
-					echo "              <option value='earlyshellcmd' selected='yes'>earlyshellcmd</option>\n";
-					echo "              <option value='shellcmd'>shellcmd</option>\n";
-					//echo "              <option value='afterfilterchangeshellcmd'>afterfilterchangeshellcmd</option>\n";
-					break;
-				case "shellcmd":
-					echo "              <option value='earlyshellcmd'>earlyshellcmd</option>\n";
-					echo "              <option value='shellcmd' selected='yes'>shellcmd</option>\n";
-					//echo "              <option value='afterfilterchangeshellcmd'>afterfilterchangeshellcmd</option>\n";
-					break;
-				case "afterfilterchangeshellcmd":
-					//echo "              <option value='earlyshellcmd'>earlyshellcmd</option>\n";
-					//echo "              <option value='shellcmd'>shellcmd</option>\n";
-					//echo "              <option value='afterfilterchangeshellcmd' selected='yes'>afterfilterchangeshellcmd</option>\n";
-					break;					
-				default:
-					echo "              <option value=''></option>\n";				
-					echo "              <option value='earlyshellcmd'>earlyshellcmd</option>\n";
-					echo "              <option value='shellcmd'>shellcmd</option>\n";
-					//echo "              <option value='afterfilterchangeshellcmd'>afterfilterchangeshellcmd</option>\n";
-					break;	
-				}
-				echo "              </select>\n";
-				?>
-              </td>
-            </tr>
-			
-
-            <!--
-            <tr>
-              <td width="25%" valign="top" class="vncellreq">Description</td>
-              <td width="75%" class="vtable"> 
-                <input name="description" type="text" class="formfld" id="description" size="40" value="<?=htmlspecialchars($pconfig['description']);?>">
-                <br><span class="vexpl">Enter the description here.<br></span>
-              </td>
-            </tr>
-            -->
-            
-            <tr>
-              <td valign="top">&nbsp;</td>
-              <td>
-                <?php if (strlen($id)>0) { ?>
-                  <input name="id" type="hidden" value="<?=$id;?>">
-                <?php }; ?>			  
-                <input name="Submit" type="submit" class="formbtn" value="Save"> <input class="formbtn" type="button" value="Cancel" onclick="history.back()">
-              </td>
-            </tr>
-            </table>
-        </form>
-
-      <br>
-      <br>
-      <br>
-      <br>
-      <br>
-      <br>
-
-     </td>
-   </tr>
-</table>
-
-</div>
-
-<?php include("fend.inc"); ?>
-</body>
-</html>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 2cee8c90..abd6a714 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1281,7 +1281,7 @@
 		<descr>The shellcmd utility is used to manage commands on system startup.</descr>
 		<category>Services</category>
 		<config_file>https://packages.pfsense.org/packages/config/shellcmd/shellcmd.xml</config_file>
-		<version>0.6</version>
+		<version>1.0</version>
 		<status>Beta</status>
 		<required_version>2.2</required_version>
 		<maintainer>markjcrane@gmail.com</maintainer>