Shellcmd package fix edit, update wording remove afterfilterchangeshellcmd for now

4 files changed, 201 insertions, 143 deletions

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");
 <form action="shellcmd.php" method="post" name="iform" id="iform">
 <?php 
 
-if ($config_change == 1) {
-    write_config();
-    $config_change = 0;  
-}
+
 
 //if ($savemsg) print_info_box($savemsg); 
 //if (file_exists($d_hostsdirty_path)): echo"<p>";
@@ -89,7 +76,7 @@ if ($config_change == 1) {
   	<table width="100%" border="0" cellpadding="6" cellspacing="0">              
       <tr>
         <td><p><!--<span class="vexpl"><span class="red"><strong>shellcmd<br></strong></span>-->
-            shellcmd controls the commands that are started when the sytems is booted up.
+            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>
@@ -99,8 +86,8 @@ if ($config_change == 1) {
     
     <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="50%" class="listhdrr">Command</td>
+      <td width="30%" class="listhdrr">Type</td>
       <td width="10%" class="list">
 
         <table border="0" cellspacing="0" cellpadding="1">
@@ -118,78 +105,92 @@ if ($config_change == 1) {
     
     $i = 0;
     if (count($a_earlyshellcmd) > 0) {
-		foreach ($a_earlyshellcmd as $ent) {
-			echo "  <tr>\n";
-			echo "	<td class=\"listr\" ondblclick=\"document.location='shellcmd_edit.php?id=".$i."';\">\n";
-			echo "	  ".$ent['command']."&nbsp;\n";
-			echo "	</td>\n";
-			echo "	<td class=\"listr\" ondblclick=\"document.location='shellcmd_edit.php?id=".$i."';\">\n";
-			echo "	  earlyshellcmd&nbsp;\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=earlyshellcmd&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?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++; 
-		}
+		//if (isset($a_earlyshellcmd[0]["command"])) {
+			foreach ($a_earlyshellcmd as $ent) {
+				echo "  <tr>\n";
+				echo "	<td class=\"listr\" ondblclick=\"document.location='shellcmd_edit.php?id=".$i."';\">\n";
+				echo "	  ".$ent['command']."&nbsp;\n";
+				echo "	</td>\n";
+				echo "	<td class=\"listbg\" ondblclick=\"document.location='shellcmd_edit.php?id=".$i."';\">\n";
+				if (strlen($ent['command']) > 0) {
+					echo "	  earlyshellcmd &nbsp;\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=earlyshellcmd&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=earlyshellcmd&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++; 
+			}
+		//}
     }
 
     
     $i = 0;
     if (count($a_shellcmd) > 0) {
-		foreach ($a_shellcmd as $ent) {
-			echo "  <tr>\n";
-			echo "	<td class=\"listr\" ondblclick=\"document.location='shellcmd_edit.php?id=".$i."';\">\n";
-			echo "	  ".$ent['command']."&nbsp;\n";
-			echo "	</td>\n";			
-			echo "	<td class=\"listr\" ondblclick=\"document.location='shellcmd_edit.php?id=".$i."';\">\n";
-			echo "	  shellcmd&nbsp;\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=shellcmd&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?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++; 
-		}
+		//if (isset($a_shellcmd[0]["command"])) {
+			foreach ($a_shellcmd as $ent) {
+				echo "  <tr>\n";
+				echo "	<td class=\"listr\" ondblclick=\"document.location='shellcmd_edit.php?id=".$i."';\">\n";
+				echo "	  ".$ent['command']."&nbsp;\n";
+				echo "	</td>\n";			
+				echo "	<td class=\"listbg\" ondblclick=\"document.location='shellcmd_edit.php?id=".$i."';\">\n";
+				if (strlen($ent['command']) > 0) {
+					echo "	  shellcmd &nbsp;\n"; //<font color="#FFFFFF">
+				}
+				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=shellcmd&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=shellcmd&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++; 
+			}
+		//}
     }
- 
-    
+
+    /*
     $i = 0;
     if (count($a_afterfilterchangeshellcmd) > 0) {
-		foreach ($a_afterfilterchangeshellcmd as $ent) {
-			echo "  <tr>\n";
-			echo "	<td class=\"listr\" ondblclick=\"document.location='shellcmd_edit.php?id=".$i."';\">\n";
-			echo "	  ".$ent['command']."&nbsp;\n";
-			echo "	</td>\n";
-			echo "	<td class=\"listr\" ondblclick=\"document.location='shellcmd_edit.php?id=".$i."';\">\n";
-			echo "	  afterfilterchangeshellcmd&nbsp;\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=afterfilterchangeshellcmd&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?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++; 
-		}
+		//if (isset($a_afterfilterchangeshellcmd[0]["command"])) {
+			foreach ($a_afterfilterchangeshellcmd as $ent) {
+				echo "  <tr>\n";
+				echo "	<td class=\"listr\" ondblclick=\"document.location='shellcmd_edit.php?id=".$i."';\">\n";
+				echo "	  ".$ent['command']."&nbsp;\n";
+				echo "	</td>\n";
+				echo "	<td class=\"listr\" ondblclick=\"document.location='shellcmd_edit.php?id=".$i."';\">\n";
+				if (strlen($ent['command']) > 0) {
+					echo "	  afterfilterchangeshellcmd&nbsp;\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=afterfilterchangeshellcmd&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=afterfilterchangeshellcmd&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="7"></td>
+      <td class="list" colspan="2"></td>
       <td class="list">          
         <table border="0" cellspacing="0" cellpadding="1">
           <tr>
@@ -202,7 +203,7 @@ if ($config_change == 1) {
 
 
      <tr>
-       <td class="list" colspan="8"></td>
+       <td class="list" colspan="3"></td>
        <td class="list"></td>
      </tr>
      </table>
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 @@
     <requirements>Describe your package requirements here</requirements>
     <faq>Currently there are no FAQ items provided.</faq>
 	<name>Shellcmd Settings</name>
-	<version>0.1</version>
+	<version>0.2</version>
 	<title>Settings</title>
 	<include_file>/usr/local/pkg/shellcmd.inc</include_file>
 	<menu>
@@ -59,7 +59,7 @@
 		</tab>
 		<tab>
 			<text>Settings</text>
-			<url>/packages/shellcmd.php</url>
+			<url>/packages/shellcmd/shellcmd.php</url>
 			<active/>
 		</tab>		
 	</tabs>
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() {
 
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("fbegin.inc"); ?>
-<p class="pgtitle">shellcmd: Edit</p>
+<p class="pgtitle">Shellcmd: Edit</p>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 
 
@@ -152,9 +210,16 @@ function show_advanced_config() {
 
 
         <form action="shellcmd_edit.php" method="post" name="iform" id="iform">
-            <table width="100%" border="0" cellpadding="6" cellspacing="0">		
+            <table width="100%" border="0" cellpadding="6" cellspacing="0">		         
             <tr>
-              <td width="25%" valign="top" class="vncellreq">type</td>
+              <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";
@@ -163,38 +228,30 @@ function show_advanced_config() {
 				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";
+					//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";
+					//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";
+					//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";
+					//echo "              <option value='afterfilterchangeshellcmd'>afterfilterchangeshellcmd</option>\n";
 					break;	
 				}
 				echo "              </select>\n";
 				?>
-                <input name="type" type="text" class="formfld" id="minute" size="40" value="<?=htmlspecialchars($pconfig['type']);?>">
-              </td>
-            </tr> 
-          
-            <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>
@@ -209,10 +266,10 @@ function show_advanced_config() {
             <tr>
               <td valign="top">&nbsp;</td>
               <td>
-                <input name="Submit" type="submit" class="formbtn" value="Save"> <input class="formbtn" type="button" value="Cancel" onclick="history.back()">
-                <?php if (isset($id) && $a_shellcmd[$id]): ?>
+                <?php if (isset($id)) { ?>
                   <input name="id" type="hidden" value="<?=$id;?>">
-                <?php endif; ?>
+                <?php }; ?>			  
+                <input name="Submit" type="submit" class="formbtn" value="Save"> <input class="formbtn" type="button" value="Cancel" onclick="history.back()">
               </td>
             </tr>
             </table>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 804adbb0..96e6582f 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -171,12 +171,12 @@
     <package>
       <name>Shellcmd</name>
       <website/>
-      <descr>The shellcmd utility is used to manage commands on a system startup.</descr>
+      <descr>The shellcmd utility is used to manage commands on system startup.</descr>
       <category>Services</category>
       <pkginfolink></pkginfolink>
       <config_file>http://www.pfsense.com/packages/config/shellcmd/shellcmd.xml</config_file>
       <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
-      <version>0.1</version>
+      <version>0.2</version>
       <status>Alpha</status>
       <required_version>1.2</required_version>
       <maintainer>markjcrane@gmail.com</maintainer>
@@ -231,7 +231,7 @@
       <descr>OpenBGPD is a FREE implementation of the Border Gateway Protocol, Version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol.</descr>
       <category>NET</category>
       <config_file>http://www.pfsense.com/packages/config/openbgpd/openbgpd.xml</config_file>
-      <version>0.5</version>
+      <version>0.4</version>
       <status>STABLE</status>
       <required_version>1.3</required_version>
       <configurationfile>openbgpd.xml</configurationfile>