From 1f3ef70e4a16ef5c8c6bf1a2a885b56c840dd4f7 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Wed, 14 Oct 2015 13:26:20 +0200
Subject: Add more logs to the 'Real Time' tab

---
 config/squid3/34/squid_monitor.php | 99 +++++++++++++++++++++++++++++++++++---
 1 file changed, 91 insertions(+), 8 deletions(-)

(limited to 'config/squid3/34/squid_monitor.php')

diff --git a/config/squid3/34/squid_monitor.php b/config/squid3/34/squid_monitor.php
index 80e15a64..b08372f1 100755
--- a/config/squid3/34/squid_monitor.php
+++ b/config/squid3/34/squid_monitor.php
@@ -130,13 +130,13 @@ include("head.inc");
 			</table>
 			</form>
 
-			<!-- Squid Table -->
+			<!-- Squid Access Table -->
 			<table width="100%" border="0" cellpadding="0" cellspacing="0">
 				<tbody>
 				<tr><td>
 					<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
 						<tr>
-							<td colspan="6" class="listtopic" align="center"><?=gettext("Squid Logs"); ?></td>
+							<td colspan="6" class="listtopic" align="center"><?=gettext("Squid - Access Logs"); ?></td>
 						</tr>
 						<tbody id="squidView">
 							<script type="text/javascript">
@@ -148,6 +148,23 @@ include("head.inc");
 				</td></tr>
 				</tbody>
 			</table>
+			<!-- Squid Cache Table -->
+			<table width="100%" border="0" cellpadding="0" cellspacing="0">
+				<tbody>
+				<tr><td>
+					<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td colspan="2" class="listtopic" align="center"><?=gettext("Squid - Cache Logs"); ?></td>
+						</tr>
+						<tbody id="squidCacheView">
+							<script type="text/javascript">
+								showLog('squidCacheView', 'squid_monitor_data.php', 'squid_cache');
+							</script>
+						</tbody>
+					</table>
+				</td></tr>
+				</tbody>
+			</table>
 <?php if ($_REQUEST["menu"] != "reverse") {?>
 			<!-- SquidGuard Table -->
 			<table width="100%" border="0" cellpadding="0" cellspacing="0">
@@ -159,7 +176,6 @@ include("head.inc");
 						</tr>
 						<tbody id="sguardView">
 							<script type="text/javascript">
-								// Call function to show squidGuard log
 								showLog('sguardView', 'squid_monitor_data.php', 'sguard');
 							</script>
 						</tbody>
@@ -167,18 +183,85 @@ include("head.inc");
 				</td></tr>
 				</tbody>
 			</table>
-			<!-- clamav Table -->
+			<!-- C-ICAP Virus Table -->
+			<table width="100%" border="0" cellpadding="0" cellspacing="0">
+				<tbody>
+				<tr><td>
+					<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td colspan="6" class="listtopic" align="center"><?=gettext("C-ICAP - Virus Logs"); ?></td>
+						</tr>
+						<tbody id="CICIAPVirusView">
+							<script type="text/javascript">
+								showLog('CICIAPVirusView', 'squid_monitor_data.php', 'cicap_virus');
+							</script>
+						</tbody>
+					</table>
+				</td></tr>
+				</tbody>
+			</table>
+			<!-- C-ICAP Access Table -->
+			<table width="100%" border="0" cellpadding="0" cellspacing="0">
+				<tbody>
+				<tr><td>
+					<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td colspan="2" class="listtopic" align="center"><?=gettext("C-ICAP - Access Logs"); ?></td>
+						</tr>
+						<tbody id="CICAPAccessView">
+							<script type="text/javascript">
+								showLog('CICAPAccessView', 'squid_monitor_data.php', 'cicap_access');
+							</script>
+						</tbody>
+					</table>
+				</td></tr>
+				</tbody>
+			</table>
+			<!-- C-ICAP Server Table -->
+			<table width="100%" border="0" cellpadding="0" cellspacing="0">
+				<tbody>
+				<tr><td>
+					<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td colspan="2" class="listtopic" align="center"><?=gettext("C-ICAP - Server Logs"); ?></td>
+						</tr>
+						<tbody id="CICAPServerView">
+							<script type="text/javascript">
+								showLog('CICAPServerView', 'squid_monitor_data.php', 'cicap_server');
+							</script>
+						</tbody>
+					</table>
+				</td></tr>
+				</tbody>
+			</table>
+			<!-- freshclam Table -->
+			<table width="100%" border="0" cellpadding="0" cellspacing="0">
+				<tbody>
+				<tr><td>
+					<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td colspan="1" class="listtopic" align="center"><?=gettext("ClamAV - freshclam Logs"); ?></td>
+						</tr>
+						<tbody id="freshclamView">
+							<script type="text/javascript">
+								showLog('freshclamView', 'squid_monitor_data.php', 'freshclam');
+							</script>
+						</tbody>
+					</table>
+				</td></tr>
+				</tbody>
+			</table>
+			<!-- clamd Table -->
 			<table width="100%" border="0" cellpadding="0" cellspacing="0">
 				<tbody>
 				<tr><td>
 					<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
 						<tr>
-							<td colspan="6" class="listtopic" align="center"><?=gettext("clamav Logs"); ?></td>
+							<td colspan="1" class="listtopic" align="center"><?=gettext("ClamAV - clamd Logs"); ?></td>
 						</tr>
-						<tbody id="clamView">
+						<tbody id="clamdView">
 							<script type="text/javascript">
-								// Call function to show squidGuard log
-								showLog('clamView', 'squid_monitor_data.php', 'clamav');
+								showLog('clamdView', 'squid_monitor_data.php', 'clamd');
 							</script>
 						</tbody>
 					</table>
-- 
cgit v1.2.3


From b65d0c259ba92a4f6f99633dace1bbdadc581679 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Wed, 14 Oct 2015 14:34:35 +0200
Subject: Fix XHTML validation

---
 config/squid3/34/squid_monitor.php | 55 ++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 20 deletions(-)

(limited to 'config/squid3/34/squid_monitor.php')

diff --git a/config/squid3/34/squid_monitor.php b/config/squid3/34/squid_monitor.php
index b08372f1..4bc65b15 100755
--- a/config/squid3/34/squid_monitor.php
+++ b/config/squid3/34/squid_monitor.php
@@ -93,7 +93,7 @@ include("head.inc");
 	</td></tr>
 	<tr><td>
 		<div id="mainarea" style="padding-top: 0px; padding-bottom: 0px; ">
-			<form id="paramsForm" name="paramsForm" method="post">
+			<form id="paramsForm" name="paramsForm" method="post" action="">
 			<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="6">
 				<tbody>
 				<tr>
@@ -135,14 +135,15 @@ include("head.inc");
 				<tbody>
 				<tr><td>
 					<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
-						<tr>
+						<thead><tr>
 							<td colspan="6" class="listtopic" align="center"><?=gettext("Squid - Access Logs"); ?></td>
-						</tr>
+						</tr></thead>
 						<tbody id="squidView">
+						<tr><td>
 							<script type="text/javascript">
-								// Call function to show squid log
 								showLog('squidView', 'squid_monitor_data.php', 'squid');
 							</script>
+						</td></tr>
 						</tbody>
 					</table>
 				</td></tr>
@@ -153,13 +154,15 @@ include("head.inc");
 				<tbody>
 				<tr><td>
 					<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
-						<tr>
+						<thead><tr>
 							<td colspan="2" class="listtopic" align="center"><?=gettext("Squid - Cache Logs"); ?></td>
-						</tr>
+						</tr></thead>
 						<tbody id="squidCacheView">
+						<tr><td>
 							<script type="text/javascript">
 								showLog('squidCacheView', 'squid_monitor_data.php', 'squid_cache');
 							</script>
+						</td></tr>
 						</tbody>
 					</table>
 				</td></tr>
@@ -171,13 +174,15 @@ include("head.inc");
 				<tbody>
 				<tr><td>
 					<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
-						<tr>
+						<thead><tr>
 							<td colspan="5" class="listtopic" align="center"><?=gettext("SquidGuard Logs"); ?></td>
-						</tr>
+						</tr></thead>
 						<tbody id="sguardView">
+						<tr><td>
 							<script type="text/javascript">
 								showLog('sguardView', 'squid_monitor_data.php', 'sguard');
 							</script>
+						</td></tr>
 						</tbody>
 					</table>
 				</td></tr>
@@ -188,13 +193,15 @@ include("head.inc");
 				<tbody>
 				<tr><td>
 					<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
-						<tr>
+						<thead><tr>
 							<td colspan="6" class="listtopic" align="center"><?=gettext("C-ICAP - Virus Logs"); ?></td>
-						</tr>
+						</tr></thead>
 						<tbody id="CICIAPVirusView">
+						<tr><td>
 							<script type="text/javascript">
 								showLog('CICIAPVirusView', 'squid_monitor_data.php', 'cicap_virus');
 							</script>
+						</td></tr>
 						</tbody>
 					</table>
 				</td></tr>
@@ -205,13 +212,15 @@ include("head.inc");
 				<tbody>
 				<tr><td>
 					<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
-						<tr>
+						<thead><tr>
 							<td colspan="2" class="listtopic" align="center"><?=gettext("C-ICAP - Access Logs"); ?></td>
-						</tr>
+						</tr></thead>
 						<tbody id="CICAPAccessView">
+						<tr><td>
 							<script type="text/javascript">
 								showLog('CICAPAccessView', 'squid_monitor_data.php', 'cicap_access');
 							</script>
+						</td></tr>
 						</tbody>
 					</table>
 				</td></tr>
@@ -222,13 +231,15 @@ include("head.inc");
 				<tbody>
 				<tr><td>
 					<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
-						<tr>
+						<thead><tr>
 							<td colspan="2" class="listtopic" align="center"><?=gettext("C-ICAP - Server Logs"); ?></td>
-						</tr>
+						</tr></thead>
 						<tbody id="CICAPServerView">
+						<tr><td>
 							<script type="text/javascript">
 								showLog('CICAPServerView', 'squid_monitor_data.php', 'cicap_server');
 							</script>
+						</td></tr>
 						</tbody>
 					</table>
 				</td></tr>
@@ -239,13 +250,15 @@ include("head.inc");
 				<tbody>
 				<tr><td>
 					<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
-						<tr>
+						<thead><tr>
 							<td colspan="1" class="listtopic" align="center"><?=gettext("ClamAV - freshclam Logs"); ?></td>
-						</tr>
+						</tr></thead>
 						<tbody id="freshclamView">
+						<tr><td>
 							<script type="text/javascript">
 								showLog('freshclamView', 'squid_monitor_data.php', 'freshclam');
 							</script>
+						</td></tr>
 						</tbody>
 					</table>
 				</td></tr>
@@ -256,13 +269,15 @@ include("head.inc");
 				<tbody>
 				<tr><td>
 					<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
-						<tr>
+						<thead><tr>
 							<td colspan="1" class="listtopic" align="center"><?=gettext("ClamAV - clamd Logs"); ?></td>
-						</tr>
+						</tr></thead>
 						<tbody id="clamdView">
-							<script type="text/javascript">
+						<tr><td>
+							<div><script type="text/javascript">
 								showLog('clamdView', 'squid_monitor_data.php', 'clamd');
-							</script>
+							</script></div>
+						</td></tr>
 						</tbody>
 					</table>
 				</td></tr>
-- 
cgit v1.2.3


From 0b788eefbb4eca975ec507bab0cff519e4f72b1c Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Wed, 14 Oct 2015 14:35:37 +0200
Subject: Nuke unwanted div tag

---
 config/squid3/34/squid_monitor.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config/squid3/34/squid_monitor.php')

diff --git a/config/squid3/34/squid_monitor.php b/config/squid3/34/squid_monitor.php
index 4bc65b15..f178bacc 100755
--- a/config/squid3/34/squid_monitor.php
+++ b/config/squid3/34/squid_monitor.php
@@ -274,9 +274,9 @@ include("head.inc");
 						</tr></thead>
 						<tbody id="clamdView">
 						<tr><td>
-							<div><script type="text/javascript">
+							<script type="text/javascript">
 								showLog('clamdView', 'squid_monitor_data.php', 'clamd');
-							</script></div>
+							</script>
 						</td></tr>
 						</tbody>
 					</table>
-- 
cgit v1.2.3


From bd2c369be01a5c5dca9f76c1c34b33ef381225da Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Wed, 14 Oct 2015 22:17:09 +0200
Subject: Use consistent case in tabs name

---
 config/squid3/34/squid_monitor.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config/squid3/34/squid_monitor.php')

diff --git a/config/squid3/34/squid_monitor.php b/config/squid3/34/squid_monitor.php
index f178bacc..840d9a60 100755
--- a/config/squid3/34/squid_monitor.php
+++ b/config/squid3/34/squid_monitor.php
@@ -74,7 +74,7 @@ include("head.inc");
 			$tab_array[] = array(gettext("Web Servers"), false, "/pkg.php?xml=squid_reverse_peer.xml");
 			$tab_array[] = array(gettext("Mappings"), false, "/pkg.php?xml=squid_reverse_uri.xml");
 			$tab_array[] = array(gettext("Redirects"), false, "/pkg.php?xml=squid_reverse_redir.xml");
-			$tab_array[] = array(gettext("Real time"), true, "/squid_monitor.php?menu=reverse");
+			$tab_array[] = array(gettext("Real Time"), true, "/squid_monitor.php?menu=reverse");
 			$tab_array[] = array(gettext("Sync"), false, "/pkg_edit.php?xml=squid_reverse_sync.xml");
 		} else {
 			$tab_array[] = array(gettext("General"), false, "/pkg_edit.php?xml=squid.xml&amp;id=0");
@@ -85,7 +85,7 @@ include("head.inc");
 			$tab_array[] = array(gettext("Traffic Mgmt"), false, "/pkg_edit.php?xml=squid_traffic.xml&amp;id=0");
 			$tab_array[] = array(gettext("Authentication"), false, "/pkg_edit.php?xml=squid_auth.xml&amp;id=0");
 			$tab_array[] = array(gettext("Users"), false, "/pkg.php?xml=squid_users.xml");
-			$tab_array[] = array(gettext("Real time"), true, "/squid_monitor.php");
+			$tab_array[] = array(gettext("Real Time"), true, "/squid_monitor.php");
 			$tab_array[] = array(gettext("Sync"), false, "/pkg_edit.php?xml=squid_sync.xml");
 		}
 		display_top_tabs($tab_array);
-- 
cgit v1.2.3