Fix line endings... autocrlf is your friend.

author: jim-p <jimp@pfsense.org> 2012-05-09 10:36:24 -0400
committer: jim-p <jimp@pfsense.org> 2012-05-09 10:36:24 -0400
commit: 67bd3501856774b34b3c94e6cb17faa2def3802f (patch)
tree: 385de86cbd73ead6b5d3ded07b507f3dfb582653
parent: ca6a8106bf3092480a6036ac351aaa6e34931d07 (diff)
download: pfsense-packages-67bd3501856774b34b3c94e6cb17faa2def3802f.tar.gz
pfsense-packages-67bd3501856774b34b3c94e6cb17faa2def3802f.tar.bz2
pfsense-packages-67bd3501856774b34b3c94e6cb17faa2def3802f.zip
2 files changed, 351 insertions, 351 deletions
diff --git a/config/squid-reverse/squid_monitor.php b/config/squid-reverse/squid_monitor.php
index d8f5240b..da293358 100644
--- a/config/squid-reverse/squid_monitor.php
+++ b/config/squid-reverse/squid_monitor.php
@@ -1,162 +1,162 @@
-<?php
-/* $Id$ */
-/* ========================================================================== */
-/*
-    squid_monitor.php
-    part of pfSense (http://www.pfSense.com)
-    Copyright (C) 2012 ccesario @ pfsense forum
-    All rights reserved.
-
-/* ========================================================================== */
-/*
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-     1. Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
-
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-                                                                              */
-/* ========================================================================== */
-
-require_once("/etc/inc/util.inc");
-require_once("/etc/inc/functions.inc");
-require_once("/etc/inc/pkg-utils.inc");
-require_once("/etc/inc/globals.inc");
-require_once("guiconfig.inc");
-
-$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
-if(strstr($pfSversion, "1.2"))
-        $one_two = true;
-
-$pgtitle = "Status: Proxy Monitor";
-include("head.inc");
-?>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-
-<?php include("fbegin.inc"); ?>
-
-<?php if($one_two): ?>
-
-	<p class="pgtitle"><?=$pgtitle?></font></p>
-
-<?php endif; ?>
-
-<?php if ($savemsg) print_info_box($savemsg); ?>
-
-<!-- Function to call programs logs -->
-<script language="JavaScript">
-	function showLog(content,url,program)
-    {
-		new PeriodicalExecuter(function(pe) {
-			new Ajax.Updater(content, url, { 
-									method: 'post', 
-									asynchronous: true, 
-									evalScripts: true, 
-									parameters: { 	maxlines: $('maxlines').getValue(), 
-			   										strfilter: $('strfilter').getValue(), 
-													program: program } 
-			}) 
-		}, 1)
-	}
-</script>
-
-
-<div id="mainarea" style="padding-top: 0px; padding-bottom: 0px; ">
-	<form id="paramsForm" name="paramsForm" method="post">
-		<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="6">
-			<tbody>
-				<tr>
-					<td width="22%" valign="top" class="vncellreq">Max lines:</td>
-					<td width="78%" class="vtable">
-						<select name="maxlines" id="maxlines">
-							<option value="5">5 lines</option>
-							<option value="10" selected="selected">10 lines</option>
-							<option value="15">15 lines</option>
-							<option value="20">20 lines</option>
-							<option value="25">25 lines</option>
-							<option value="30">30 lines</option>
-						</select>
-						<br/>
-						<span class="vexpl">
-						   Max. lines to be displayed.
-						</span>
-					</td>
-				</tr>
-				<tr>
-					<td width="22%" valign="top" class="vncellreq">String filter:</td>
-					<td width="78%" class="vtable">
-						<input name="strfilter" type="text" class="formfld search" id="strfilter" size="50" value="">
-						<br/>
-						<span class="vexpl">
-						   Enter the string filter: eg. username or ip addr or url.	
-						</span>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-	</form>
-
-	<!-- Squid 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"><center><?=gettext("Squid Logs"); ?><center></td>
-						</tr>
-						<tbody id="squidView">
-							<script language="JavaScript">
-								// Call function to show squid log
-								showLog('squidView', 'squid_monitor_data.php','squid');
-							</script>
-						</tbody>
-					</table>
-				</td>
-			</tr>
-		</tbody>
-	</table>
-
-	<!-- SquidGuard 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="5" class="listtopic"><center><?=gettext("SquidGuard Logs"); ?><center></td>
-						</tr>
-						<tbody id="sguardView">
-							<script language="JavaScript">
-								// Call function to show squidGuard log
-								showLog('sguardView', 'squid_monitor_data.php','sguard');
-							</script>
-						</tbody>
-					</table>
-				</td>
-			</tr>
-		</tbody>
-	</table>
-</div>
-
-<?php
-include("fend.inc");
-?>
-
-</body>
-</html>
+<?php
+/* $Id$ */
+/* ========================================================================== */
+/*
+    squid_monitor.php
+    part of pfSense (http://www.pfSense.com)
+    Copyright (C) 2012 ccesario @ pfsense forum
+    All rights reserved.
+
+/* ========================================================================== */
+/*
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+     1. Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
+
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+                                                                              */
+/* ========================================================================== */
+
+require_once("/etc/inc/util.inc");
+require_once("/etc/inc/functions.inc");
+require_once("/etc/inc/pkg-utils.inc");
+require_once("/etc/inc/globals.inc");
+require_once("guiconfig.inc");
+
+$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
+if(strstr($pfSversion, "1.2"))
+        $one_two = true;
+
+$pgtitle = "Status: Proxy Monitor";
+include("head.inc");
+?>
+
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+
+<?php include("fbegin.inc"); ?>
+
+<?php if($one_two): ?>
+
+	<p class="pgtitle"><?=$pgtitle?></font></p>
+
+<?php endif; ?>
+
+<?php if ($savemsg) print_info_box($savemsg); ?>
+
+<!-- Function to call programs logs -->
+<script language="JavaScript">
+	function showLog(content,url,program)
+    {
+		new PeriodicalExecuter(function(pe) {
+			new Ajax.Updater(content, url, { 
+									method: 'post', 
+									asynchronous: true, 
+									evalScripts: true, 
+									parameters: { 	maxlines: $('maxlines').getValue(), 
+			   										strfilter: $('strfilter').getValue(), 
+													program: program } 
+			}) 
+		}, 1)
+	}
+</script>
+
+
+<div id="mainarea" style="padding-top: 0px; padding-bottom: 0px; ">
+	<form id="paramsForm" name="paramsForm" method="post">
+		<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="6">
+			<tbody>
+				<tr>
+					<td width="22%" valign="top" class="vncellreq">Max lines:</td>
+					<td width="78%" class="vtable">
+						<select name="maxlines" id="maxlines">
+							<option value="5">5 lines</option>
+							<option value="10" selected="selected">10 lines</option>
+							<option value="15">15 lines</option>
+							<option value="20">20 lines</option>
+							<option value="25">25 lines</option>
+							<option value="30">30 lines</option>
+						</select>
+						<br/>
+						<span class="vexpl">
+						   Max. lines to be displayed.
+						</span>
+					</td>
+				</tr>
+				<tr>
+					<td width="22%" valign="top" class="vncellreq">String filter:</td>
+					<td width="78%" class="vtable">
+						<input name="strfilter" type="text" class="formfld search" id="strfilter" size="50" value="">
+						<br/>
+						<span class="vexpl">
+						   Enter the string filter: eg. username or ip addr or url.	
+						</span>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+	</form>
+
+	<!-- Squid 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"><center><?=gettext("Squid Logs"); ?><center></td>
+						</tr>
+						<tbody id="squidView">
+							<script language="JavaScript">
+								// Call function to show squid log
+								showLog('squidView', 'squid_monitor_data.php','squid');
+							</script>
+						</tbody>
+					</table>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+
+	<!-- SquidGuard 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="5" class="listtopic"><center><?=gettext("SquidGuard Logs"); ?><center></td>
+						</tr>
+						<tbody id="sguardView">
+							<script language="JavaScript">
+								// Call function to show squidGuard log
+								showLog('sguardView', 'squid_monitor_data.php','sguard');
+							</script>
+						</tbody>
+					</table>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+</div>
+
+<?php
+include("fend.inc");
+?>
+
+</body>
+</html>
diff --git a/config/squid-reverse/squid_monitor_data.php b/config/squid-reverse/squid_monitor_data.php
index 0e9d900a..12d2a34a 100644
--- a/config/squid-reverse/squid_monitor_data.php
+++ b/config/squid-reverse/squid_monitor_data.php
@@ -1,189 +1,189 @@
-<?php 
-/* $Id$ */
-/* ========================================================================== */
-/*
-    squid_monitor.php
-    part of pfSense (http://www.pfSense.com)
-    Copyright (C) 2012 ccesario @ pfsense forum
-    All rights reserved.
-
-/* ========================================================================== */
-/*
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-     1. Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
-
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-                                                                              */
-/* ========================================================================== */
-
-# ------------------------------------------------------------------------------
-# Defines 
-# ------------------------------------------------------------------------------
-require_once("guiconfig.inc");
-
-# ------------------------------------------------------------------------------
-# Requests
-# ------------------------------------------------------------------------------
-if ($_POST) {
-	# Actions
-    switch (strtolower($_POST['program'])) {
-       case 'squid':
-            showSquid();            
-       break;
-       case 'sguard';
-            showSGuard();
-       break;
-    }
-}
-
-# ------------------------------------------------------------------------------
-# Functions
-# ------------------------------------------------------------------------------
-
-// From SquidGuard Package
-function html_autowrap($cont)
-{
-	# split strings
-	$p     = 0;
-	$pstep = 25;
-	$str   = $cont;
-	$cont = '';
-	for ( $p = 0; $p < strlen($str); $p += $pstep ) {
-		$s = substr( $str, $p, $pstep );
-		if ( !$s ) break;
-			$cont .= $s . "<wbr/>";
-	}
-	return $cont;
-}
-
-
-// Show Squid Logs
-function showSquid() {
-    // Define log file
-    $squid_log='/var/squid/logs/access.log';
-
-	echo "<tr valign=\"top\">\n";    
-	echo "<td class=\"listhdrr\">".gettext("Date")."</td>\n";
-	echo "<td class=\"listhdrr\">".gettext("IP")."</td>\n";
-	echo "<td class=\"listhdrr\">".gettext("Status")."</td>\n";
-	echo "<td class=\"listhdrr\">".gettext("Address")."</td>\n";
-	echo "<td class=\"listhdrr\">".gettext("User")."</td>\n";
-	echo "<td class=\"listhdrr\">".gettext("Destination")."</td>\n";
-	echo "</tr>\n";
-
-    // Get Data from form post
-    $lines = $_POST['maxlines'];
-    $filter = $_POST['strfilter'];
-
-
-    // Get logs based in filter expression 
-    if($filter != "") {
-        exec("tail -r -n $lines $squid_log | php -q parser_squid_log.php | grep -i ". escapeshellarg(htmlspecialchars($filter)), $logarr); 
-    }
-    else {
-        exec("tail -r -n $lines $squid_log | php -q parser_squid_log.php", $logarr);
-    }
-
-    // Print lines
-    foreach ($logarr as $logent) { 
-        // Split line by space delimiter
-		$logline  = preg_split("/\s+/", $logent);
-
-        // Apply date format to first line
-        //$logline[0] = date("d.m.Y H:i:s",$logline[0]);
-
-        // Word wrap the URL 
-        $logline[7] = htmlentities($logline[7]);
-        $logline[7] = html_autowrap($logline[7]);
-
-        // Remove /(slash) in destination row
-		$logline_dest =  preg_split("/\//", $logline[9]);
-
-        // Apply filter and color
-		// Need validate special chars
-		if ($filter != "")
-            $logline = preg_replace("/$filter/i","<spam><font color='red'>$filter</font></span>",$logline);
-
-
-		echo "<tr valign=\"top\">\n";
-		echo "<td class=\"listlr\" nowrap>{$logline[0]} {$logline[1]}</td>\n";
-		echo "<td class=\"listr\">{$logline[3]}</td>\n";
-		echo "<td class=\"listr\">{$logline[4]}</td>\n";
-        echo "<td class=\"listr\" width=\"*\">{$logline[7]}</td>\n";
-		echo "<td class=\"listr\">{$logline[8]}</td>\n";
-		echo "<td class=\"listr\">{$logline_dest[1]}</td>\n";
-		echo "</tr>\n";
-    }
-}
-
-// Show SquidGuard Logs
-function showSGuard() {
-    // Define log file
-    $sguard_log='/var/squidGuard/log/block.log';
-
-	echo "<tr valign=\"top\">\n";
-	echo "<td class=\"listhdrr\">".gettext("Date-Time")."</td>\n";
-	echo "<td class=\"listhdrr\">".gettext("ACL")."</td>\n";
-	echo "<td class=\"listhdrr\">".gettext("Address")."</td>\n";
-	echo "<td class=\"listhdrr\">".gettext("Host")."</td>\n";
-	echo "<td class=\"listhdrr\">".gettext("User")."</td>\n";
-	echo "</tr>\n";
-
-    // Get Data from form post
-    $lines = $_POST['maxlines'];
-    $filter = $_POST['strfilter'];
-
-    // Get logs based in filter expression
-    if($filter != "") {
-        exec("tail -r -n $lines $sguard_log | grep -i ". escapeshellarg(htmlspecialchars($filter)), $logarr);
-    }
-    else {
-        exec("tail -r -n $lines $sguard_log", $logarr);
-    }
-
-
-    // Print lines
-    foreach ($logarr as $logent) { 
-        // Split line by space delimiter
-	    $logline  = preg_split("/\s+/", $logent);
-
-        // Apply time format
-        $logline[0] = date("d.m.Y", strtotime($logline[0]));   
-
-    	// Word wrap the URL 
-        $logline[4] = htmlentities($logline[4]);
-        $logline[4] = html_autowrap($logline[4]);
-
-
-        // Apply filter color
-		// Need validate special chars
-        if ($filter != "")
-            $logline = preg_replace("/$filter/","<spam><font color='red'>$filter</font></span>",$logline);
-
-        echo "<tr>\n";
-        echo "<td class=\"listlr\" nowrap>{$logline[0]} {$logline[1]}</td>\n";
-        echo "<td class=\"listr\">{$logline[3]}</td>\n";
-		echo "<td class=\"listr\" width=\"*\">{$logline[4]}</td>\n";
-        echo "<td class=\"listr\">{$logline[5]}</td>\n";
-        echo "<td class=\"listr\">{$logline[6]}</td>\n";
-        echo "</tr>\n";
-    }
-}
-
-?>
+<?php 
+/* $Id$ */
+/* ========================================================================== */
+/*
+    squid_monitor.php
+    part of pfSense (http://www.pfSense.com)
+    Copyright (C) 2012 ccesario @ pfsense forum
+    All rights reserved.
+
+/* ========================================================================== */
+/*
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+     1. Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
+
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+                                                                              */
+/* ========================================================================== */
+
+# ------------------------------------------------------------------------------
+# Defines 
+# ------------------------------------------------------------------------------
+require_once("guiconfig.inc");
+
+# ------------------------------------------------------------------------------
+# Requests
+# ------------------------------------------------------------------------------
+if ($_POST) {
+	# Actions
+    switch (strtolower($_POST['program'])) {
+       case 'squid':
+            showSquid();            
+       break;
+       case 'sguard';
+            showSGuard();
+       break;
+    }
+}
+
+# ------------------------------------------------------------------------------
+# Functions
+# ------------------------------------------------------------------------------
+
+// From SquidGuard Package
+function html_autowrap($cont)
+{
+	# split strings
+	$p     = 0;
+	$pstep = 25;
+	$str   = $cont;
+	$cont = '';
+	for ( $p = 0; $p < strlen($str); $p += $pstep ) {
+		$s = substr( $str, $p, $pstep );
+		if ( !$s ) break;
+			$cont .= $s . "<wbr/>";
+	}
+	return $cont;
+}
+
+
+// Show Squid Logs
+function showSquid() {
+    // Define log file
+    $squid_log='/var/squid/logs/access.log';
+
+	echo "<tr valign=\"top\">\n";    
+	echo "<td class=\"listhdrr\">".gettext("Date")."</td>\n";
+	echo "<td class=\"listhdrr\">".gettext("IP")."</td>\n";
+	echo "<td class=\"listhdrr\">".gettext("Status")."</td>\n";
+	echo "<td class=\"listhdrr\">".gettext("Address")."</td>\n";
+	echo "<td class=\"listhdrr\">".gettext("User")."</td>\n";
+	echo "<td class=\"listhdrr\">".gettext("Destination")."</td>\n";
+	echo "</tr>\n";
+
+    // Get Data from form post
+    $lines = $_POST['maxlines'];
+    $filter = $_POST['strfilter'];
+
+
+    // Get logs based in filter expression 
+    if($filter != "") {
+        exec("tail -r -n $lines $squid_log | php -q parser_squid_log.php | grep -i ". escapeshellarg(htmlspecialchars($filter)), $logarr); 
+    }
+    else {
+        exec("tail -r -n $lines $squid_log | php -q parser_squid_log.php", $logarr);
+    }
+
+    // Print lines
+    foreach ($logarr as $logent) { 
+        // Split line by space delimiter
+		$logline  = preg_split("/\s+/", $logent);
+
+        // Apply date format to first line
+        //$logline[0] = date("d.m.Y H:i:s",$logline[0]);
+
+        // Word wrap the URL 
+        $logline[7] = htmlentities($logline[7]);
+        $logline[7] = html_autowrap($logline[7]);
+
+        // Remove /(slash) in destination row
+		$logline_dest =  preg_split("/\//", $logline[9]);
+
+        // Apply filter and color
+		// Need validate special chars
+		if ($filter != "")
+            $logline = preg_replace("/$filter/i","<spam><font color='red'>$filter</font></span>",$logline);
+
+
+		echo "<tr valign=\"top\">\n";
+		echo "<td class=\"listlr\" nowrap>{$logline[0]} {$logline[1]}</td>\n";
+		echo "<td class=\"listr\">{$logline[3]}</td>\n";
+		echo "<td class=\"listr\">{$logline[4]}</td>\n";
+        echo "<td class=\"listr\" width=\"*\">{$logline[7]}</td>\n";
+		echo "<td class=\"listr\">{$logline[8]}</td>\n";
+		echo "<td class=\"listr\">{$logline_dest[1]}</td>\n";
+		echo "</tr>\n";
+    }
+}
+
+// Show SquidGuard Logs
+function showSGuard() {
+    // Define log file
+    $sguard_log='/var/squidGuard/log/block.log';
+
+	echo "<tr valign=\"top\">\n";
+	echo "<td class=\"listhdrr\">".gettext("Date-Time")."</td>\n";
+	echo "<td class=\"listhdrr\">".gettext("ACL")."</td>\n";
+	echo "<td class=\"listhdrr\">".gettext("Address")."</td>\n";
+	echo "<td class=\"listhdrr\">".gettext("Host")."</td>\n";
+	echo "<td class=\"listhdrr\">".gettext("User")."</td>\n";
+	echo "</tr>\n";
+
+    // Get Data from form post
+    $lines = $_POST['maxlines'];
+    $filter = $_POST['strfilter'];
+
+    // Get logs based in filter expression
+    if($filter != "") {
+        exec("tail -r -n $lines $sguard_log | grep -i ". escapeshellarg(htmlspecialchars($filter)), $logarr);
+    }
+    else {
+        exec("tail -r -n $lines $sguard_log", $logarr);
+    }
+
+
+    // Print lines
+    foreach ($logarr as $logent) { 
+        // Split line by space delimiter
+	    $logline  = preg_split("/\s+/", $logent);
+
+        // Apply time format
+        $logline[0] = date("d.m.Y", strtotime($logline[0]));   
+
+    	// Word wrap the URL 
+        $logline[4] = htmlentities($logline[4]);
+        $logline[4] = html_autowrap($logline[4]);
+
+
+        // Apply filter color
+		// Need validate special chars
+        if ($filter != "")
+            $logline = preg_replace("/$filter/","<spam><font color='red'>$filter</font></span>",$logline);
+
+        echo "<tr>\n";
+        echo "<td class=\"listlr\" nowrap>{$logline[0]} {$logline[1]}</td>\n";
+        echo "<td class=\"listr\">{$logline[3]}</td>\n";
+		echo "<td class=\"listr\" width=\"*\">{$logline[4]}</td>\n";
+        echo "<td class=\"listr\">{$logline[5]}</td>\n";
+        echo "<td class=\"listr\">{$logline[6]}</td>\n";
+        echo "</tr>\n";
+    }
+}
+
+?>
author	jim-p <jimp@pfsense.org>	2012-05-09 10:36:24 -0400
committer	jim-p <jimp@pfsense.org>	2012-05-09 10:36:24 -0400
commit	67bd3501856774b34b3c94e6cb17faa2def3802f (patch)
tree	385de86cbd73ead6b5d3ded07b507f3dfb582653
parent	ca6a8106bf3092480a6036ac351aaa6e34931d07 (diff)
download	pfsense-packages-67bd3501856774b34b3c94e6cb17faa2def3802f.tar.gz pfsense-packages-67bd3501856774b34b3c94e6cb17faa2def3802f.tar.bz2 pfsense-packages-67bd3501856774b34b3c94e6cb17faa2def3802f.zip