HTML edits to fix table layout in Firefox and Chrome.

3 files changed, 82 insertions, 51 deletions

diff --git a/config/snort/snort_alerts.php b/config/snort/snort_alerts.php
index 65ebffc1..98a58863 100755
--- a/config/snort/snort_alerts.php
+++ b/config/snort/snort_alerts.php
@@ -252,18 +252,30 @@ if ($pconfig['arefresh'] == 'on')
 	<tr>
 	<td width="100%" colspan="2">
 	<table id="myTable" style="table-layout: fixed;" width="100%" class="sortable" border="1" cellpadding="0" cellspacing="0">
-	<thead>
-		<th class="listhdrr" width="8%" align="center" axis="date"><?php echo gettext("DATE"); ?></th>
-		<th class="listhdrr" width="18em" align="center" axis="number"><?php echo gettext("PRI"); ?></th>
-		<th class="listhdrr" width="38em" align="center"axis="string"><?php echo gettext("PROTO"); ?></th>
-		<th class="listhdrr" width="10%" axis="string"><?php echo gettext("CLASS"); ?></th>
-		<th class="listhdrr" width="14%" axis="string"><?php echo gettext("SRC"); ?></th>
-		<th class="listhdrr" width="8%" align="center" axis="string"><?php echo gettext("SPORT"); ?></th>
-		<th class="listhdrr" width="14%" axis="string"><?php echo gettext("DST"); ?></th>
-		<th class="listhdrr" width="8%" align="center" axis="string"><?php echo gettext("DPORT"); ?></th>
-		<th class="listhdrr" width="9%" axis="string"><?php echo gettext("SID"); ?></th>
-		<th class="listhdrr" axis="string"><?php echo gettext("DESCRIPTION"); ?></th>
-	</thead>
+		<colgroup>
+			<col width="9%" align="center" axis="date">
+			<col width="45" align="center" axis="number">
+			<col width="65" align="center" axis="string">
+			<col width="10%" axis="string">
+			<col width="13%" align="center" axis="string">
+			<col width="8%" align="center" axis="string">
+			<col width="13%" align="center" axis="string">
+			<col width="8%" align="center" axis="string">
+			<col width="9%" align="center" axis="number">
+			<col axis="string">
+		</colgroup>
+		<thead>
+			<th class="listhdrr" axis="date"><?php echo gettext("DATE"); ?></th>
+			<th class="listhdrr" axis="number"><?php echo gettext("PRI"); ?></th>
+			<th class="listhdrr" axis="string"><?php echo gettext("PROTO"); ?></th>
+			<th class="listhdrr" axis="string"><?php echo gettext("CLASS"); ?></th>
+			<th class="listhdrr" axis="string"><?php echo gettext("SRC"); ?></th>
+			<th class="listhdrr" axis="string"><?php echo gettext("SPORT"); ?></th>
+			<th class="listhdrr" axis="string"><?php echo gettext("DST"); ?></th>
+			<th class="listhdrr" axis="string"><?php echo gettext("DPORT"); ?></th>
+			<th class="listhdrr" axis="number"><?php echo gettext("SID"); ?></th>
+			<th class="listhdrr" axis="string"><?php echo gettext("DESCRIPTION"); ?></th>
+		</thead>
 	<tbody>
 	<?php
 
@@ -321,15 +333,15 @@ if (file_exists("/var/log/snort/snort_{$if_real}{$snort_uuid}/alert")) {
 			$alert_class = $fields[11];
 
 			echo "<tr>
-				<td class='listr' width='8%' align='center'>{$alert_date}<br/>{$alert_time}</td>
-				<td class='listr' width='18em' align='center'>{$alert_priority}</td>
-				<td class='listr' width='38em' align='center'>{$alert_proto}</td>
-				<td class='listr' width='10%'>{$alert_class}</td>
-				<td class='listr' width='13%' align='center' style=\"word-break:break-all;\">{$alert_ip_src}</td>
-				<td class='listr' width='8%' align='center'>{$alert_src_p}</td>
-				<td class='listr' width='13%' align='center' style=\"word-break:break-all;\">{$alert_ip_dst}</td>
-				<td class='listr' width='8%' align='center'>{$alert_dst_p}</td>
-				<td class='listr' width='9%' align='center'>{$alert_sid_str}<br/>{$sidsupplink}</td>
+				<td class='listr' align='center'>{$alert_date}<br/>{$alert_time}</td>
+				<td class='listr' align='center'>{$alert_priority}</td>
+				<td class='listr' align='center'>{$alert_proto}</td>
+				<td class='listr' style=\"word-wrap:break-word;\">{$alert_class}</td>
+				<td class='listr' align='center'>{$alert_ip_src}</td>
+				<td class='listr' align='center'>{$alert_src_p}</td>
+				<td class='listr' align='center'>{$alert_ip_dst}</td>
+				<td class='listr' align='center'>{$alert_dst_p}</td>
+				<td class='listr' align='center'>{$alert_sid_str}<br/>{$sidsupplink}</td>
 				<td class='listr' style=\"word-wrap:break-word;\">{$alert_descr}</td>
 				</tr>\n";
 
diff --git a/config/snort/snort_blocked.php b/config/snort/snort_blocked.php
index a726e9ad..6feca97b 100644
--- a/config/snort/snort_blocked.php
+++ b/config/snort/snort_blocked.php
@@ -184,11 +184,17 @@ if ($pconfig['brefresh'] == 'on')
 			<tr>
 				<td colspan="2">
 				<table id="sortabletable1" style="table-layout: fixed;" class="sortable" width="100%" border="0" cellpadding="2" cellspacing="0">
+					<colgroup>
+						<col width="5%" align="center" axis="number">
+						<col width="15%" align="center" axis="string">
+						<col width="70%" align="left" axis="string">
+						<col width="10%" align="center">
+					</colgroup>
 					<thead>
-						<th class='listhdr' width="5%" class="listhdrr" align="center" axis="number">#</th>
-						<th class='listhdr' width="15%" class="listhdrr" align="center" axis="string"><?php echo gettext("IP"); ?></th>
-						<th class='listhdr' width="70%" class="listhdrr" axis="string"><?php echo gettext("Alert Description"); ?></th>
-						<th class='listhdr' width="10%" class="listhdrr" align="center"><?php echo gettext("Remove"); ?></th>
+						<th class="listhdrr" axis="number">#</th>
+						<th class="listhdrr" axis="string"><?php echo gettext("IP"); ?></th>
+						<th class="listhdrr" axis="string"><?php echo gettext("Alert Description"); ?></th>
+						<th class="listhdrr"><?php echo gettext("Remove"); ?></th>
 					</thead>
 				<tbody>
 			<?php
@@ -245,10 +251,10 @@ if ($pconfig['brefresh'] == 'on')
 
 				/* use one echo to do the magic*/
 					echo "<tr>
-						<td width='5%' align=\"center\" valign=\"middle\" class=\"listr\">{$counter}</td>
-						<td width='15%' valign=\"middle\" class=\"listr\">{$blocked_ip}</td>
-						<td width='70%' valign=\"middle\" class=\"listr\">{$blocked_desc}</td>
-						<td width='10%' align=\"center\" valign=\"middle\" class=\"listr\"><a href='snort_blocked.php?todelete=" . trim(urlencode($blocked_ip)) . "'>
+						<td align=\"center\" valign=\"middle\" class=\"listr\">{$counter}</td>
+						<td valign=\"middle\" class=\"listr\">{$blocked_ip}</td>
+						<td valign=\"middle\" class=\"listr\">{$blocked_desc}</td>
+						<td align=\"center\" valign=\"middle\" class=\"listr\"><a href='snort_blocked.php?todelete=" . trim(urlencode($blocked_ip)) . "'>
 						<img title=\"" . gettext("Delete host from Blocked Table") . "\" border=\"0\" name='todelete' id='todelete' alt=\"Delete host from Blocked Table\" src=\"../themes/{$g['theme']}/images/icons/icon_x.gif\"></a></td>
 					</tr>\n";
 			}
diff --git a/config/snort/snort_rules.php b/config/snort/snort_rules.php
index bd31473c..c5ccb018 100755
--- a/config/snort/snort_rules.php
+++ b/config/snort/snort_rules.php
@@ -465,23 +465,35 @@ h += 96;
 			</tr>
 			<tr>
 				<td>
-					<table class="tabcont" style="table-layout: fixed;" width="100%" border="0" cellpadding="0" cellspacing="0">
-						<tr id="frheader">
-							<td width="12px" class="list" align="left">&nbsp;</td>
-							<td width="9%" class="listhdrr" align="center"><?php echo gettext("SID"); ?></td>
-							<td width="7%" class="listhdrr" align="center"><?php echo gettext("Proto"); ?></td>
-							<td width="14%" class="listhdrr" align="center"><?php echo gettext("Source"); ?></td>
-							<td width="11%" class="listhdrr" align="center"><?php echo gettext("Port"); ?></td>
-							<td width="14%" class="listhdrr" align="center"><?php echo gettext("Destination"); ?></td>
-							<td width="11%" class="listhdrr" align="center"><?php echo gettext("Port"); ?></td>
-							<td class="listhdrr" align="center"><?php echo gettext("Message"); ?></td>
-							<td width="18px" class="list" align="right"><a href="javascript: void(0)"
+					<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="9%" align="center" axis="number">
+							<col width="60" align="center" axis="string">
+							<col width="14%" align="center" axis="string">
+							<col width="11%" align="center" axis="string">
+							<col width="14%" align="center" axis="string">
+							<col width="11%" align="center" axis="string">
+							<col axis="string">
+							<col width="22" align="right" valign="middle">
+						</colgroup>
+						<thead>
+							<th class="list">&nbsp;</th>
+							<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("Destination"); ?></th>
+							<th class="listhdrr"><?php echo gettext("Port"); ?></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></td>
-						</tr>
+							title="<?php echo gettext("Click to view full text of all the category rules"); ?>" width="17" height="17" border="0"></a></th>
+						</thead>
+						<tbody>
 
 					<?php
 						foreach ($rules_map as $k1 => $rulem) {
@@ -527,37 +539,37 @@ h += 96;
 								$destination_port = truncate($rule_content[6], 10); //destination port field
 								$message = snort_get_msg($v['rule']);
 
-						echo "<tr><td width=\"12px\" class=\"listt\" align=\"left\" valign=\"middle\"> $textss
+						echo "<tr><td class=\"listt\" align=\"left\" valign=\"middle\"> $textss
 								<a href='?id={$id}&openruleset={$currentruleset}&act=toggle&ids={$sid}'>
 								<img src=\"../themes/{$g['theme']}/images/icons/{$iconb}\"
 								width=\"11\" height=\"11\" border=\"0\"  
 								title='" . gettext("Click to toggle enabled/disabled state") . "'></a>
 								$textse
 							       </td>
-							       <td width=\"9%\" class=\"listlr\" align=\"center\">
+							       <td class=\"listlr\" align=\"center\">
 									{$textss}{$sid}{$textse}
 							       </td>
-							       <td width=\"7%\" class=\"listlr\" align=\"center\">
+							       <td class=\"listlr\" align=\"center\">
 									{$textss}{$protocol}{$textse}
 							       </td>
-							       <td width=\"14%\" class=\"listlr\" align=\"center\">
+							       <td class=\"listlr\" align=\"center\">
 									{$srcspan}{$source}{$textse}
 							       </td>
-							       <td width=\"11%\" class=\"listlr\" align=\"center\">
+							       <td class=\"listlr\" align=\"center\">
 									{$srcprtspan}{$source_port}{$textse}
 							       </td>
-							       <td width=\"14%\" class=\"listlr\" align=\"center\">
+							       <td class=\"listlr\" align=\"center\">
 									{$dstspan}{$destination}{$textse}
 							       </td>
-							       <td width=\"11%\" class=\"listlr\" align=\"center\">
+							       <td class=\"listlr\" align=\"center\">
 								       {$dstprtspan}{$destination_port}{$textse}
 							       </td>
 								<td class=\"listbg\" style=\"word-wrap:break-word; whitespace:pre-line;\"><font color=\"white\"> 
 									{$textss}{$message}{$textse}
 							       </td>";
 						?>
-								<td width="18px" align="right" valign="middle" nowrap class="listt">
-									<a href="javascript: void(0)"
+								<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>
@@ -568,6 +580,7 @@ h += 96;
 						}
 						unset($rulem, $v);
 						?>
+					    </tbody>
 					</table>
 				</td>
 			</tr>