Use $_POST for config changes and add misc fixes and improvements.

1 files changed, 140 insertions, 189 deletions

diff --git a/config/snort/snort_rules.php b/config/snort/snort_rules.php
index afc764fc..158999f9 100755
--- a/config/snort/snort_rules.php
+++ b/config/snort/snort_rules.php
@@ -37,38 +37,28 @@ global $g, $rebuild_rules;
 
 $snortdir = SNORTDIR;
 $rules_map = array();
+$categories = array();
 $pconfig = array();
 
 if (!is_array($config['installedpackages']['snortglobal']['rule']))
 	$config['installedpackages']['snortglobal']['rule'] = array();
 $a_rule = &$config['installedpackages']['snortglobal']['rule'];
 
-$id = $_GET['id'];
-if (isset($_POST['id']))
+if (isset($_POST['id']) && is_numericint($_POST['id']))
 	$id = $_POST['id'];
+elseif (isset($_GET['id']) && is_numericint($_GET['id']))
+	$id = htmlspecialchars($_GET['id']);
+
 if (is_null($id)) {
-        header("Location: /snort/snort_interfaces.php");
-        exit;
+	header("Location: /snort/snort_interfaces.php");
+	exit;
 }
 
-if (isset($id) && $a_rule[$id]) {
+if (isset($id) && isset($a_rule[$id])) {
 	$pconfig['interface'] = $a_rule[$id]['interface'];
 	$pconfig['rulesets'] = $a_rule[$id]['rulesets'];
 }
 
-function truncate($string, $length) {
-
-	/********************************
-	 * This function truncates the  *
-	 * passed string to the length  *
-	 * specified adding ellipsis if *
-	 * truncation was necessary.    *
-	 ********************************/
-	if (strlen($string) > $length)
-		$string = substr($string, 0, ($length - 2)) . "...";
-	return $string; 
-}
-
 function add_title_attribute($tag, $title) {
 
 	/********************************
@@ -102,15 +92,19 @@ function add_title_attribute($tag, $title) {
 }
 
 /* convert fake interfaces to real */
-$if_real = snort_get_real_interface($pconfig['interface']);
+$if_real = get_real_interface($pconfig['interface']);
 $snort_uuid = $a_rule[$id]['uuid'];
 $snortcfgdir = "{$snortdir}/snort_{$snort_uuid}_{$if_real}";
 $snortdownload = $config['installedpackages']['snortglobal']['snortdownload'];
+$snortcommunitydownload = $config['installedpackages']['snortglobal']['snortcommunityrules'] == 'on' ? 'on' : 'off';
 $emergingdownload = $config['installedpackages']['snortglobal']['emergingthreats'];
 $etprodownload = $config['installedpackages']['snortglobal']['emergingthreats_pro'];
-$categories = explode("||", $pconfig['rulesets']);
 
-// add the standard rules files to the categories list
+// Add any previously saved rules files to the categories array
+if (!empty($pconfig['rulesets']))
+	$categories = explode("||", $pconfig['rulesets']);
+
+// add the standard rules files to the categories array
 $categories[] = "custom.rules";
 $categories[] = "decoder.rules";
 $categories[] = "preprocessor.rules";
@@ -121,20 +115,19 @@ if ($a_rule[$id]['autoflowbitrules'] == 'on')
 	$categories[] = "Auto-Flowbit Rules";
 natcasesort($categories);
 
-if ($_GET['openruleset'])
-	$currentruleset = $_GET['openruleset'];
-else if ($_POST['openruleset'])
+if (isset($_POST['openruleset']))
 	$currentruleset = $_POST['openruleset'];
+elseif (isset($_GET['openruleset']))
+	$currentruleset = htmlspecialchars($_GET['openruleset']);
 else
-	$currentruleset = $categories[0];
+	$currentruleset = $categories[key($categories)];
 
 /* One last sanity check -- if the rules directory is empty, default to loading custom rules */
 $tmp = glob("{$snortdir}/rules/*.rules");
 if (empty($tmp))
 	$currentruleset = "custom.rules";
 
-$ruledir = "{$snortdir}/rules";
-$rulefile = "{$ruledir}/{$currentruleset}";
+$rulefile = "{$snortdir}/rules/{$currentruleset}";
 if ($currentruleset != 'custom.rules') {
 	// Read the current rules file into our rules map array.
 	// If it is the auto-flowbits file, set the full path.
@@ -157,13 +150,11 @@ if ($currentruleset != 'custom.rules') {
 $enablesid = snort_load_sid_mods($a_rule[$id]['rule_sid_on']);
 $disablesid = snort_load_sid_mods($a_rule[$id]['rule_sid_off']);
 
-if ($_GET['act'] == "toggle" && $_GET['ids'] && !empty($rules_map)) {
-
-	// Get the GID tag embedded in the clicked rule icon.
-	$gid = $_GET['gid'];
+if ($_POST['toggle'] && is_numeric($_POST['sid']) && is_numeric($_POST['gid']) && !empty($rules_map)) {
 
-	// Get the SID tag embedded in the clicked rule icon.
-	$sid= $_GET['ids'];
+	// Get the GID:SID tags embedded in the clicked rule icon.
+	$gid = $_POST['gid'];
+	$sid = $_POST['sid'];
 
 	// See if the target SID is in our list of modified SIDs,
 	// and toggle it back to default if present; otherwise,
@@ -207,11 +198,9 @@ if ($_GET['act'] == "toggle" && $_GET['ids'] && !empty($rules_map)) {
 	/* Update the config.xml file. */
 	write_config();
 
-	$_GET['openruleset'] = $currentruleset;
 	$anchor = "rule_{$gid}_{$sid}";
 }
-
-if ($_GET['act'] == "disable_all" && !empty($rules_map)) {
+elseif ($_POST['disable_all'] && !empty($rules_map)) {
 
 	// Mark all rules in the currently selected category "disabled".
 	foreach (array_keys($rules_map) as $k1) {
@@ -248,13 +237,8 @@ if ($_GET['act'] == "disable_all" && !empty($rules_map)) {
 		unset($a_rule[$id]['rule_sid_off']);
 
 	write_config();
-
-	$_GET['openruleset'] = $currentruleset;
-	header("Location: /snort/snort_rules.php?id={$id}&openruleset={$currentruleset}");
-	exit;
 }
-
-if ($_GET['act'] == "enable_all" && !empty($rules_map)) {
+elseif ($_POST['enable_all'] && !empty($rules_map)) {
 
 	// Mark all rules in the currently selected category "enabled".
 	foreach (array_keys($rules_map) as $k1) {
@@ -290,13 +274,8 @@ if ($_GET['act'] == "enable_all" && !empty($rules_map)) {
 		unset($a_rule[$id]['rule_sid_off']);
 
 	write_config();
-
-	$_GET['openruleset'] = $currentruleset;
-	header("Location: /snort/snort_rules.php?id={$id}&openruleset={$currentruleset}");
-	exit;
 }
-
-if ($_GET['act'] == "resetcategory" && !empty($rules_map)) {
+elseif ($_POST['resetcategory'] && !empty($rules_map)) {
 
 	// Reset any modified SIDs in the current rule category to their defaults.
 	foreach (array_keys($rules_map) as $k1) {
@@ -334,13 +313,8 @@ if ($_GET['act'] == "resetcategory" && !empty($rules_map)) {
 		unset($a_rule[$id]['rule_sid_off']);
 
 	write_config();
-
-	$_GET['openruleset'] = $currentruleset;
-	header("Location: /snort/snort_rules.php?id={$id}&openruleset={$currentruleset}");
-	exit;
 }
-
-if ($_GET['act'] == "resetall" && !empty($rules_map)) {
+elseif ($_POST['resetall'] && !empty($rules_map)) {
 
 	// Remove all modified SIDs from config.xml and save the changes.
 	unset($a_rule[$id]['rule_sid_on']);
@@ -348,23 +322,20 @@ if ($_GET['act'] == "resetall" && !empty($rules_map)) {
 
 	/* Update the config.xml file. */
 	write_config();
-
-	$_GET['openruleset'] = $currentruleset;
-	header("Location: /snort/snort_rules.php?id={$id}&openruleset={$currentruleset}");
-	exit;
 }
-
-if ($_POST['clear']) {
+else if ($_POST['cancel']) {
+	$pconfig['customrules'] = base64_decode($a_rule[$id]['customrules']);
+}
+elseif ($_POST['clear']) {
 	unset($a_rule[$id]['customrules']);
 	write_config();
 	$rebuild_rules = true;
 	snort_generate_conf($a_rule[$id]);
 	$rebuild_rules = false;
-	header("Location: /snort/snort_rules.php?id={$id}&openruleset={$currentruleset}");
-	exit;
+	$pconfig['customrules'] = '';
 }
-
-if ($_POST['submit']) {
+elseif ($_POST['save']) {
+	$pconfig['customrules'] = $_POST['customrules'];
 	if ($_POST['customrules'])
 		$a_rule[$id]['customrules'] = base64_encode($_POST['customrules']);
 	else
@@ -385,11 +356,12 @@ if ($_POST['submit']) {
 		$input_errors[] = "Custom rules have errors:\n {$error}";
 	}
 	else {
-		header("Location: /snort/snort_rules.php?id={$id}&openruleset={$currentruleset}");
-		exit;
+		/* Soft-restart Snort to live-load new rules */
+		snort_reload_config($a_rule[$id]);
+		$savemsg = gettext("Custom rules validated successfully and have been saved to the Snort configuration files. ");
+		$savemsg .= gettext("Any active Snort process on this interface has been signalled to live-load the new rules.");
 	}
 }
-
 else if ($_POST['apply']) {
 	/* Save new configuration */
 	write_config();
@@ -404,29 +376,18 @@ else if ($_POST['apply']) {
 
 	/* Soft-restart Snort to live-load new rules */
 	snort_reload_config($a_rule[$id]);
-
-	/* Return to this same page */
-	header("Location: /snort/snort_rules.php?id={$id}&openruleset={$currentruleset}");
-	exit;
-}
-else if ($_POST['cancel']) {
-
-	/* Return to this same page */
-	header("Location: /snort/snort_rules.php?id={$id}");
-	exit;
 }
 
 require_once("guiconfig.inc");
 include_once("head.inc");
 
-$if_friendly = snort_get_friendly_interface($pconfig['interface']);
+$if_friendly = convert_friendly_interface_to_friendly_descr($a_rule[$id]['interface']);
 $pgtitle = gettext("Snort: Interface {$if_friendly} - Rules: {$currentruleset}");
 ?>
 
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php
 include("fbegin.inc");
-if ($pfsense_stable == 'yes'){echo '<p class="pgtitle">' . $pgtitle . '</p>';}
 
 /* Display message */
 if ($input_errors) {
@@ -440,6 +401,10 @@ if ($savemsg) {
 ?>
 
 <form action="/snort/snort_rules.php" method="post" name="iform" id="iform">
+<input type='hidden' name='id' id='id' value='<?=$id;?>'/>
+<input type='hidden' name='openruleset' id='openruleset' value='<?=$currentruleset;?>'/>
+<input type='hidden' name='sid' id='sid' value=''/>
+<input type='hidden' name='gid' id='gid' value=''/>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 	<tr><td>
 	<?php
@@ -447,12 +412,13 @@ if ($savemsg) {
 		$tab_array[0] = array(gettext("Snort Interfaces"), true, "/snort/snort_interfaces.php");
 		$tab_array[1] = array(gettext("Global Settings"), false, "/snort/snort_interfaces_global.php");
 		$tab_array[2] = array(gettext("Updates"), false, "/snort/snort_download_updates.php");
-		$tab_array[3] = array(gettext("Alerts"), false, "/snort/snort_alerts.php");
+		$tab_array[3] = array(gettext("Alerts"), false, "/snort/snort_alerts.php?instance={$id}");
 		$tab_array[4] = array(gettext("Blocked"), false, "/snort/snort_blocked.php");
-		$tab_array[5] = array(gettext("Whitelists"), false, "/snort/snort_interfaces_whitelist.php");
+		$tab_array[5] = array(gettext("Pass Lists"), false, "/snort/snort_passlist.php");
 		$tab_array[6] = array(gettext("Suppress"), false, "/snort/snort_interfaces_suppress.php");
-		$tab_array[7] = array(gettext("Sync"), false, "/pkg_edit.php?xml=snort/snort_sync.xml");
-		display_top_tabs($tab_array);
+		$tab_array[7] = array(gettext("IP Lists"), false, "/snort/snort_ip_list_mgmt.php");
+		$tab_array[8] = array(gettext("Sync"), false, "/pkg_edit.php?xml=snort/snort_sync.xml");
+		display_top_tabs($tab_array,true);
 		echo '</td></tr>';
 		echo '<tr><td class="tabnavtbl">';
 		$menu_iface=($if_friendly?substr($if_friendly,0,5)." ":"Iface ");
@@ -461,9 +427,10 @@ if ($savemsg) {
 		$tab_array[] = array($menu_iface . gettext("Categories"), false, "/snort/snort_rulesets.php?id={$id}");
 		$tab_array[] = array($menu_iface . gettext("Rules"), true, "/snort/snort_rules.php?id={$id}");
 		$tab_array[] = array($menu_iface . gettext("Variables"), false, "/snort/snort_define_servers.php?id={$id}");
-		$tab_array[] = array($menu_iface . gettext("Preprocessors"), false, "/snort/snort_preprocessors.php?id={$id}");
+		$tab_array[] = array($menu_iface . gettext("Preprocs"), false, "/snort/snort_preprocessors.php?id={$id}");
 		$tab_array[] = array($menu_iface . gettext("Barnyard2"), false, "/snort/snort_barnyard.php?id={$id}");
-		display_top_tabs($tab_array);
+		$tab_array[] = array($menu_iface . gettext("IP Rep"), false, "/snort/snort_ip_reputation.php?id={$id}");
+		display_top_tabs($tab_array, true);
 	?>
 	</td></tr>
 	<tr><td><div id="mainarea">
@@ -471,20 +438,21 @@ if ($savemsg) {
 			<tr>
 				<td class="listtopic"><?php echo gettext("Available Rule Categories"); ?></td>
 			</tr>
-
 			<tr>
 				<td class="vncell" height="30px"><strong><?php echo gettext("Category:"); ?></strong>&nbsp;&nbsp;<select id="selectbox" name="selectbox" class="formselect" onChange="go()">
 					<?php
 					foreach ($categories as $value) {
-						if ($snortdownload != 'on' && substr($value, 0, 6) == "snort_")
+						if ($snortdownload != 'on' && substr($value, 0, mb_strlen(VRT_FILE_PREFIX)) == VRT_FILE_PREFIX)
+							continue;
+						if ($emergingdownload != 'on' && substr($value, 0, mb_strlen(ET_OPEN_FILE_PREFIX)) == ET_OPEN_FILE_PREFIX)
 							continue;
-						if ($emergingdownload != 'on' && substr($value, 0, 8) == "emerging")
+						if ($etprodownload != 'on' && substr($value, 0, mb_strlen(ET_PRO_FILE_PREFIX)) == ET_PRO_FILE_PREFIX)
 							continue;
-						if ($etprodownload != 'on' && substr($value, 0, 6) == "etpro-")
+						if ($snortcommunitydownload != 'on' && substr($value, 0, mb_strlen(GPL_FILE_PREFIX)) == GPL_FILE_PREFIX)
 							continue;
 						if (empty($value))
 							continue;
-						echo "<option value='?id={$id}&openruleset={$value}' ";
+						echo "<option value='{$value}' ";
 						if ($value == $currentruleset)
 							echo "selected";
 						echo ">{$value}</option>\n";
@@ -493,21 +461,18 @@ if ($savemsg) {
 					</select>&nbsp;&nbsp;&nbsp;<?php echo gettext("Select the rule category to view"); ?>
 				</td>
 			</tr>
-
 		<?php if ($currentruleset == 'custom.rules'): ?>
 			<tr>
 				<td class="listtopic"><?php echo gettext("Defined Custom Rules"); ?></td>
 			</tr>
 			<tr>
 				<td valign="top" class="vtable">
-					<input type='hidden' name='openruleset' value='custom.rules'>
-					<input type='hidden' name='id' value='<?=$id;?>'>
 					<textarea wrap="soft" cols="90" rows="40" name="customrules"><?=base64_decode($a_rule[$id]['customrules']);?></textarea>
 				</td>
 			</tr>
 			<tr>
 				<td>
-					<input name="submit" type="submit" class="formbtn" id="submit" value="<?php echo gettext(" Save "); ?>" title=" <?php echo gettext("Save custom rules"); ?>"/>&nbsp;&nbsp;
+					<input name="save" type="submit" class="formbtn" id="save" value="<?php echo gettext(" Save "); ?>" title=" <?php echo gettext("Save custom rules"); ?>"/>&nbsp;&nbsp;
 					<input name="cancel" type="submit" class="formbtn" id="cancel" value="<?php echo gettext("Cancel"); ?>" title="<?php echo gettext("Cancel changes and return to last page"); ?>"/>&nbsp;&nbsp;
 					<input name="clear" type="submit" class="formbtn" id="clear" value="<?php echo gettext("Clear"); ?>" onclick="return confirm('<?php echo gettext("This will erase all custom rules for the interface.  Are you sure?"); ?>')" title="<?php echo gettext("Deletes all custom rules"); ?>"/>
 				</td>
@@ -520,43 +485,50 @@ if ($savemsg) {
 				<td class="vncell">
 					<table width="100%" align="center" border="0" cellpadding="0" cellspacing="0">
 						<tr>
-							<td rowspan="4" width="48%" valign="middle"><input type="submit" name="apply" id="apply" value="<?php echo gettext("Apply"); ?>" class="formbtn" 
-							title="<?php echo gettext("Click to rebuild the rules with your changes"); ?>"/>
-							<input type='hidden' name='id' value='<?=$id;?>'/>
-							<input type='hidden' name='openruleset' value='<?=$currentruleset;?>'/><br/><br/>
+							<td rowspan="5" width="48%" valign="middle"><input type="submit" name="apply" id="apply" value="<?php echo gettext("Apply"); ?>" class="formbtn" 
+							title="<?php echo gettext("Click to rebuild the rules with your changes"); ?>"/><br/><br/>
 							<span class="vexpl"><span class="red"><strong><?php echo gettext("Note: ") . "</strong></span>" . 
-							gettext("Snort must be restarted to activate any rule enable/disable changes made on this tab."); ?></span></td>
-							<td class="vexpl" valign="middle"><?php echo "<a href='?id={$id}&openruleset={$currentruleset}&act=resetcategory'>
-							<img src=\"../themes/{$g['theme']}/images/icons/icon_x.gif\" width=\"15\" height=\"15\" 
+							gettext("When finished, click APPLY to save and send any SID enable/disable changes made on this tab to Snort."); ?></span></td>
+							<td class="vexpl" valign="middle"><?php echo "<input type='image' name='resetcategory[]' 
+							src=\"../themes/{$g['theme']}/images/icons/icon_x.gif\" width=\"15\" height=\"15\" 
 							onmouseout='this.src=\"../themes/{$g['theme']}/images/icons/icon_x.gif\"' 
 							onmouseover='this.src=\"../themes/{$g['theme']}/images/icons/icon_x_mo.gif\"' border='0' 
-							title='" . gettext("Click to remove enable/disable changes for rules in the selected category only") . "'></a>"?>
+							title='" . gettext("Click to remove enable/disable changes for rules in the selected category only") . "'/>"?>
 							&nbsp;&nbsp;<?php echo gettext("Remove Enable/Disable changes in the current Category"); ?></td>
 						</tr>
 						<tr>
-							<td class="vexpl" valign="middle"><?php echo "<a href='?id={$id}&openruleset={$currentruleset}&act=resetall'> 
-							<img src=\"../themes/{$g['theme']}/images/icons/icon_x.gif\" width=\"15\" height=\"15\" 
+							<td class="vexpl" valign="middle"><?php echo "<input type='image' name='resetall[]'  
+							src=\"../themes/{$g['theme']}/images/icons/icon_x.gif\" width=\"15\" height=\"15\" 
 							onmouseout='this.src=\"../themes/{$g['theme']}/images/icons/icon_x.gif\"' 
 							onmouseover='this.src=\"../themes/{$g['theme']}/images/icons/icon_x_mo.gif\"' border='0' 
-							title='" . gettext("Click to remove all enable/disable changes for rules in all categories") . "'></a>"?>
+							title='" . gettext("Click to remove all enable/disable changes for rules in all categories") . "'/>"?>
 							&nbsp;&nbsp;<?php echo gettext("Remove all Enable/Disable changes in all Categories"); ?></td>
 						</tr>
 						<tr>
-							<td class="vexpl" valign="middle"><?php echo "<a href='?id={$id}&openruleset={$currentruleset}&act=disable_all'> 
-							<img src=\"../themes/{$g['theme']}/images/icons/icon_x.gif\" width=\"15\" height=\"15\" 
+							<td class="vexpl" valign="middle"><?php echo "<input type='image' name='disable_all[]'  
+							src=\"../themes/{$g['theme']}/images/icons/icon_x.gif\" width=\"15\" height=\"15\" 
 							onmouseout='this.src=\"../themes/{$g['theme']}/images/icons/icon_x.gif\"' 
 							onmouseover='this.src=\"../themes/{$g['theme']}/images/icons/icon_x_mo.gif\"' border='0' 
-							title='" . gettext("Click to disable all rules in the selected category") . "'></a>"?>
+							title='" . gettext("Click to disable all rules in the selected category") . "'/>"?>
 							&nbsp;&nbsp;<?php echo gettext("Disable all rules in the current Category"); ?></td>
 						</tr>
 						<tr>
-							<td class="vexpl" valign="middle"><?php echo "<a href='?id={$id}&openruleset={$currentruleset}&act=enable_all'> 
-							<img src=\"../themes/{$g['theme']}/images/icons/icon_plus.gif\" width=\"15\" height=\"15\" 
+							<td class="vexpl" valign="middle"><?php echo "<input type='image' name='enable_all[]'  
+							src=\"../themes/{$g['theme']}/images/icons/icon_plus.gif\" width=\"15\" height=\"15\" 
 							onmouseout='this.src=\"../themes/{$g['theme']}/images/icons/icon_plus.gif\"' 
 							onmouseover='this.src=\"../themes/{$g['theme']}/images/icons/icon_plus_mo.gif\"' border='0' 
-							title='" . gettext("Click to enable all rules in the selected category") . "'></a>"?>
+							title='" . gettext("Click to enable all rules in the selected category") . "'/>"?>
 							&nbsp;&nbsp;<?php echo gettext("Enable all rules in the current Category"); ?></td>
 						</tr>
+						<tr>
+							<td class="vexpl" valign="middle"><a href="javascript: void(0)" 
+							onclick="wopen('snort_rules_edit.php?id=<?=$id;?>&openruleset=<?=$currentruleset;?>','FileViewer',800,600)">
+							<img src="../themes/<?= $g['theme']; ?>/images/icons/icon_service_restart.gif" width="15" height="15" <?php
+							echo "onmouseover='this.src=\"../themes/{$g['theme']}/images/icons/icon_services_restart_mo.gif\"' 
+							onmouseout='this.src=\"../themes/{$g['theme']}/images/icons/icon_service_restart.gif\"' ";?>				
+							title="<?php echo gettext("Click to view full text of all the category rules"); ?>" width="17" height="17" border="0"></a>
+							&nbsp;&nbsp;<?php echo gettext("View full file contents for the current Category"); ?></td>
+						</tr>
 						<?php if ($currentruleset == 'Auto-Flowbit Rules'): ?>
 						<tr>
 							<td colspan="3">&nbsp;</td>
@@ -564,14 +536,13 @@ if ($savemsg) {
 						<tr>
 							<td colspan="3" class="vexpl" align="center"><?php echo "<span class=\"red\"><b>" . gettext("WARNING: ") . "</b></span>" . 
 							gettext("You should not disable flowbit rules!  Add Suppress List entries for them instead by ") . 
-							"<a href='snort_rules_flowbits.php?id={$id}&openruleset={$currentruleset}&returl=" . urlencode($_SERVER['PHP_SELF']) . "' title=\"" . gettext("Add Suppress List entry for Flowbit Rule") . "\">" . 
+							"<a href='snort_rules_flowbits.php?id={$id}' title=\"" . gettext("Add Suppress List entry for Flowbit Rule") . "\">" . 
 							gettext("clicking here") . ".</a>";?></td>
 						</tr>
 						<?php endif;?>
 					</table>
 				</td>
 			</tr>
-
 			<tr>
 				<td class="listtopic"><?php echo gettext("Selected Category's Rules"); ?></td>
 			</tr>
@@ -579,18 +550,18 @@ if ($savemsg) {
 				<td>
 
 				<?php if ($currentruleset != 'decoder.rules' && $currentruleset != 'preprocessor.rules'): ?>
+
 					<table id="myTable" class="sortable" style="table-layout: fixed;" width="100%" border="0" cellpadding="0" cellspacing="0">
 						<colgroup>
-							<col width="15" align="left" valign="middle">
+							<col width="14" align="left" valign="middle">
 							<col width="6%" align="center" axis="number">
-							<col width="8%" align="center" axis="number">
-							<col width="54" align="center" axis="string">
+							<col width="9%" align="center" axis="number">
+							<col width="52" align="center" axis="string">
 							<col width="14%" align="center" axis="string">
-							<col width="11%" align="center" axis="string">
+							<col width="10%" align="center" axis="string">
 							<col width="14%" align="center" axis="string">
-							<col width="11%" align="center" axis="string">
+							<col width="10%" align="center" axis="string">
 							<col axis="string">
-							<col width="22" align="right" valign="middle">
 						</colgroup>
 						<thead>
 						   <tr>
@@ -599,20 +570,13 @@ if ($savemsg) {
 							<th class="listhdrr"><?php echo gettext("SID"); ?></th>
 							<th class="listhdrr"><?php echo gettext("Proto"); ?></th>
 							<th class="listhdrr"><?php echo gettext("Source"); ?></th>
-							<th class="listhdrr"><?php echo gettext("Port"); ?></th>
+							<th class="listhdrr"><?php echo gettext("SPort"); ?></th>
 							<th class="listhdrr"><?php echo gettext("Destination"); ?></th>
-							<th class="listhdrr"><?php echo gettext("Port"); ?></th>
+							<th class="listhdrr"><?php echo gettext("DPort"); ?></th>
 							<th class="listhdrr"><?php echo gettext("Message"); ?></th>
-							<th class="list"><a href="javascript: void(0)" 
-							onclick="wopen('snort_rules_edit.php?id=<?=$id;?>&openruleset=<?=$currentruleset;?>','FileViewer',800,600)">
-							<img src="../themes/<?= $g['theme']; ?>/images/icons/icon_service_restart.gif" <?php
-							echo "onmouseover='this.src=\"../themes/{$g['theme']}/images/icons/icon_services_restart_mo.gif\"' 
-							onmouseout='this.src=\"../themes/{$g['theme']}/images/icons/icon_service_restart.gif\"' ";?>				
-							title="<?php echo gettext("Click to view full text of all the category rules"); ?>" width="17" height="17" border="0"></a></th>
 						   </tr>
 						</thead>
 						<tbody>
-
 					<?php
 						$counter = $enable_cnt = $disable_cnt = 0;
 						foreach ($rules_map as $k1 => $rulem) {
@@ -660,51 +624,47 @@ if ($savemsg) {
 								$dstspan = add_title_attribute($textss, $rule_content[5]);
 								$dstprtspan = add_title_attribute($textss, $rule_content[6]);
 
-								$protocol = $rule_content[1]; //protocol field
-								$source = truncate($rule_content[2], 14); //source field
-								$source_port = truncate($rule_content[3], 10); //source port field
-								$destination = truncate($rule_content[5], 14); //destination field
-								$destination_port = truncate($rule_content[6], 10); //destination port field
-								$message = snort_get_msg($v['rule']);
-
-						echo "<tr><td class=\"listt\" align=\"left\" valign=\"middle\"> $textss
-								<a id=\"rule_{$gid}_{$sid}\" href='?id={$id}&openruleset={$currentruleset}&act=toggle&gid={$gid}&ids={$sid}'>
-								<img src=\"../themes/{$g['theme']}/images/icons/{$iconb}\"
-								width=\"11\" height=\"11\" border=\"0\"  
-								title='{$title}'></a>
-								$textse
+								$protocol = $rule_content[1];         //protocol field
+								$source = $rule_content[2];           //source field
+								$source_port = $rule_content[3];      //source port field
+								$destination = $rule_content[5];      //destination field
+								$destination_port = $rule_content[6]; //destination port field
+								$message = snort_get_msg($v['rule']); // description field
+								$sid_tooltip = gettext("View the raw text for this rule");
+
+								echo "<tr><td class=\"listt\" align=\"left\" valign=\"middle\" sorttable_customkey=\"\">{$textss}
+								<a id=\"rule_{$gid}_{$sid}\" href=''><input type=\"image\" onClick=\"document.getElementById('sid').value='{$sid}';
+								document.getElementById('gid').value='{$gid}';\" 
+								src=\"../themes/{$g['theme']}/images/icons/{$iconb}\" width=\"11\" height=\"11\" border=\"0\"  
+								title='{$title}' name=\"toggle[]\"/></a>{$textse}
 							       </td>
-							       <td class=\"listlr\" align=\"center\">
+							       <td class=\"listr\" align=\"center\" ondblclick=\"wopen('snort_rules_edit.php?id={$id}&openruleset={$currentruleset}&sid={$sid}&gid={$gid}','FileViewer',800,600);\">
 									{$textss}{$gid}{$textse}
 							       </td>
-							       <td class=\"listlr\" align=\"center\">
-									{$textss}{$sid}{$textse}
+							       <td class=\"listr\" align=\"center\" ondblclick=\"wopen('snort_rules_edit.php?id={$id}&openruleset={$currentruleset}&sid={$sid}&gid={$gid}','FileViewer',800,600);\">
+									<a href=\"javascript: void(0)\" 
+									onclick=\"wopen('snort_rules_edit.php?id={$id}&openruleset={$currentruleset}&sid={$sid}&gid={$gid}','FileViewer',800,600);\" 
+									title='{$sid_tooltip}'>{$textss}{$sid}{$textse}</a>
 							       </td>
-							       <td class=\"listlr\" align=\"center\">
+							       <td class=\"listr\" style=\"text-align:center;\" ondblclick=\"wopen('snort_rules_edit.php?id={$id}&openruleset={$currentruleset}&sid={$sid}&gid={$gid}','FileViewer',800,600);\">
 									{$textss}{$protocol}{$textse}
 							       </td>
-							       <td class=\"listlr\" align=\"center\">
+							       <td class=\"listr\" style=\"overflow: hidden; text-overflow: ellipsis; text-align:center;\" nowrap ondblclick=\"wopen('snort_rules_edit.php?id={$id}&openruleset={$currentruleset}&sid={$sid}&gid={$gid}','FileViewer',800,600);\">
 									{$srcspan}{$source}</span>
 							       </td>
-							       <td class=\"listlr\" align=\"center\">
+							       <td class=\"listr\" style=\"overflow: hidden; text-overflow: ellipsis; text-align:center;\" nowrap ondblclick=\"wopen('snort_rules_edit.php?id={$id}&openruleset={$currentruleset}&sid={$sid}&gid={$gid}','FileViewer',800,600);\">
 									{$srcprtspan}{$source_port}</span>
 							       </td>
-							       <td class=\"listlr\" align=\"center\">
+							       <td class=\"listr\" style=\"overflow: hidden; text-overflow: ellipsis; text-align:center;\" nowrap ondblclick=\"wopen('snort_rules_edit.php?id={$id}&openruleset={$currentruleset}&sid={$sid}&gid={$gid}','FileViewer',800,600);\">
 									{$dstspan}{$destination}</span>
 							       </td>
-							       <td class=\"listlr\" align=\"center\">
+							       <td class=\"listr\" style=\"overflow: hidden; text-overflow: ellipsis; text-align:center;\" nowrap ondblclick=\"wopen('snort_rules_edit.php?id={$id}&openruleset={$currentruleset}&sid={$sid}&gid={$gid}','FileViewer',800,600);\">
 								       {$dstprtspan}{$destination_port}</span>
 							       </td>
-								<td class=\"listbg\" style=\"word-wrap:break-word; whitespace:pre-line;\"><font color=\"white\"> 
-									{$textss}{$message}{$textse}</font>
+								<td class=\"listbg\" style=\"word-wrap:break-word; whitespace:pre-line;\" ondblclick=\"wopen('snort_rules_edit.php?id={$id}&openruleset={$currentruleset}&sid={$sid}&gid={$gid}','FileViewer',800,600);\">
+									{$textss}{$message}{$textse}
 							       </td>";
 						?>
-								<td align="right" valign="middle" nowrap class="listt">
-									<a href="javascript: void(0)" 
-									onclick="wopen('snort_rules_edit.php?id=<?=$id;?>&openruleset=<?=$currentruleset;?>&ids=<?=$sid;?>&gid=<?=$gid;?>','FileViewer',800,600)">
-									<img src="../themes/<?= $g['theme']; ?>/images/icons/icon_right.gif" 
-									title="<?php echo gettext("Click to view the entire rule text"); ?>" width="17" height="17" border="0"></a>
-								</td>
 							</tr>
 						<?php
 								$counter++;
@@ -725,7 +685,6 @@ if ($savemsg) {
 							<col width="22%" align="center" axis="string">
 							<col width="15%" align="center" axis="string">
 							<col align="left" axis="string">
-							<col width="22" align="right" valign="middle">
 						</colgroup>
 						<thead>
 						   <tr>
@@ -735,12 +694,6 @@ if ($savemsg) {
 							<th class="listhdrr"><?php echo gettext("Classification"); ?></th>
 							<th class="listhdrr"><?php echo gettext("IPS Policy"); ?></th>
 							<th class="listhdrr"><?php echo gettext("Message"); ?></th>
-							<th class="list"><a href="javascript: void(0)" 
-							onclick="wopen('snort_rules_edit.php?id=<?=$id;?>&openruleset=<?=$currentruleset;?>','FileViewer',800,600)">
-							<img src="../themes/<?= $g['theme']; ?>/images/icons/icon_service_restart.gif" <?php
-							echo "onmouseover='this.src=\"../themes/{$g['theme']}/images/icons/icon_services_restart_mo.gif\"' 
-							onmouseout='this.src=\"../themes/{$g['theme']}/images/icons/icon_service_restart.gif\"' ";?>				
-							title="<?php echo gettext("Click to view full text of all the category rules"); ?>" width="17" height="17" border="0"></a></th>
 						   </tr>
 						</thead>
 						<tbody>
@@ -788,35 +741,30 @@ if ($savemsg) {
 										else
 											$policy = "none";
 
-										echo "<tr><td class=\"listt\" align=\"left\" valign=\"middle\"> $textss
-										<a id=\"rule_{$sid}\" href='?id={$id}&openruleset={$currentruleset}&act=toggle&ids={$sid}&gid={$gid}'>
-										<img src=\"../themes/{$g['theme']}/images/icons/{$iconb}\"
-										width=\"11\" height=\"11\" border=\"0\"  
-										title='{$title}'></a>
-										$textse
-								       		</td>
-									       <td class=\"listlr\" align=\"center\">
+										echo "<tr><td class=\"listt\" align=\"left\" valign=\"middle\" sorttable_customkey=\"\">{$textss}
+										<input type=\"image\" onClick=\"document.getElementById('sid').value='{$sid}';
+										document.getElementById('gid').value='{$gid}';\" 
+										src=\"../themes/{$g['theme']}/images/icons/{$iconb}\" width=\"11\" height=\"11\" border=\"0\"  
+										title='{$title}' name=\"toggle[]\"/>{$textse}
+							       			</td>
+									       <td class=\"listr\" align=\"center\" ondblclick=\"wopen('snort_rules_edit.php?id={$id}&openruleset={$currentruleset}&sid={$sid}&gid={$gid}','FileViewer',800,600);\">
 											{$textss}{$gid}{$textse}
 									       </td>
-									       <td class=\"listlr\" align=\"center\">
-											{$textss}{$sid}{$textse}
-										</td>
-										<td class=\"listlr\" align=\"center\">
+									       <td class=\"listr\" align=\"center\" ondblclick=\"wopen('snort_rules_edit.php?id={$id}&openruleset={$currentruleset}&sid={$sid}&gid={$gid}','FileViewer',800,600);\">
+											<a href=\"javascript: void(0)\" 
+											onclick=\"wopen('snort_rules_edit.php?id={$id}&openruleset={$currentruleset}&sid={$sid}&gid={$gid}','FileViewer',800,600);\" 
+											title='{$sid_tooltip}'>{$textss}{$sid}{$textse}</a>
+									       </td>
+										<td class=\"listr\" align=\"center\" ondblclick=\"wopen('snort_rules_edit.php?id={$id}&openruleset={$currentruleset}&sid={$sid}&gid={$gid}','FileViewer',800,600);\">
 											{$textss}{$classtype}</span>
 							       			</td>
-							       			<td class=\"listlr\" align=\"center\">
+							       			<td class=\"listr\" align=\"center\" ondblclick=\"wopen('snort_rules_edit.php?id={$id}&openruleset={$currentruleset}&sid={$sid}&gid={$gid}','FileViewer',800,600);\">
 								       			{$textss}{$policy}</span>
 								       		</td>
-										<td class=\"listbg\" style=\"word-wrap:break-word; whitespace:pre-line;\"><font color=\"white\"> 
-											{$textss}{$message}{$textse}</font>
+										<td class=\"listbg\" style=\"word-wrap:break-word; whitespace:pre-line;\" ondblclick=\"wopen('snort_rules_edit.php?id={$id}&openruleset={$currentruleset}&sid={$sid}&gid={$gid}','FileViewer',800,600);\">
+											{$textss}{$message}{$textse}
 							       			</td>";
 									?>
-										<td align="right" valign="middle" nowrap class="listt">
-											<a href="javascript: void(0)" 
-											onclick="wopen('snort_rules_edit.php?id=<?=$id;?>&openruleset=<?=$currentruleset;?>&ids=<?=$sid;?>&gid=<?=$gid;?>','FileViewer',800,600)">
-											<img src="../themes/<?= $g['theme']; ?>/images/icons/icon_right.gif" 
-											title="<?php echo gettext("Click to view the entire rule text"); ?>" width="17" height="17" border="0"></a>
-										</td>
 									   	</tr>
 							<?php
 										$counter++;
@@ -826,7 +774,9 @@ if ($savemsg) {
 							?>
 						</tbody>
 					</table>
+
 				<?php endif;?>
+
 				</td>
 			</tr>
 			<tr>
@@ -875,10 +825,11 @@ if ($savemsg) {
 <script language="javascript" type="text/javascript">
 function go()
 {
-    var box = document.iform.selectbox;
-    destination = box.options[box.selectedIndex].value;
-    if (destination) 
-		location.href = destination;
+    var box = document.getElementById("selectbox");
+    var ruleset = box.options[box.selectedIndex].value;
+    if (ruleset) 
+	document.getElementById("openruleset").value = ruleset;
+    document.getElementById("iform").submit();
 }
 
 function wopen(url, name, w, h)