Shellcmd package fix edit, update wording remove afterfilterchangeshellcmd for now

1 files changed, 81 insertions, 80 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>