(legacy) move single used code, fix csrf issue, and further cleanups in firewall log code

src/www/diag_logs_filter_dynamic.php

@@ -39,7 +39,7 @@ $nentries = 50;
 /* AJAX related routines */
 handle_ajax($nentries, $nentries + 20);
 
-if ($_POST['clear']) {
+if (isset($_POST['clear'])) {
 	clear_log_file($filter_logfile);
 }
 

src/www/diag_logs_filter_summary.php

@@ -70,7 +70,7 @@ function stat_block($summary, $stat, $num) {
 	$total = 0;
 	$numentries = 0;
 	for ($i=0; $i < $num; $i++) {
-		if ($k[$i]) {
+		if (isset($k[$i])) {
 			$total += $summary[$stat][$k[$i]];
 			$numentries++;
 			$outstr = $k[$i];
@@ -101,7 +101,7 @@ function pie_block($summary, $stat, $num) {
 	print "\n<script type=\"text/javascript\">\n";
 	print "//<![CDATA[\n";
 	for ($i=0; $i < $num; $i++) {
-		if ($k[$i]) {
+		if (isset($k[$i])) {
 			$total += $summary[$stat][$k[$i]];
 			$numentries++;
 			print "var d{$stat}{$i} = [];\n";
@@ -118,7 +118,7 @@ function pie_block($summary, $stat, $num) {
 	print "	new Proto.Chart($('piechart{$stat}'),\n";
 	print "	[\n";
 	for ($i=0; $i < $num; $i++) {
-		if ($k[$i]) {
+		if (isset($k[$i])) {
 			print "		{ data: d{$stat}{$i}, label: \"{$k[$i]}\"}";
 			if (!(($i == ($numentries - 1)) && ($leftover <= 0)))
 				print ",\n";
@@ -143,20 +143,17 @@ function pie_block($summary, $stat, $num) {
 }
 
 foreach ($filterlog as $fe) {
-	$specialfields = array('srcport', 'dstport');
 	foreach (array_keys($fields) as $field) {
-		if (!in_array($field, $specialfields))
+		if (isset($fe[$field])) {
+			if (!isset($summary[$field])) {
+				$summary[$field] = array(); 
+			}
+			if (!isset($summary[$field][$fe[$field]])) {
+				$summary[$field][$fe[$field]] = 0;
+			}
 			$summary[$field][$fe[$field]]++;
 		}
-	/* Handle some special cases */
-	if ($fe['srcport'])
-		$summary['srcport'][$fe['proto'].'/'.$fe['srcport']]++;
-	else
-		$summary['srcport'][$fe['srcport']]++;
-	if ($fe['dstport'])
-		$summary['dstport'][$fe['proto'].'/'.$fe['dstport']]++;
-	else
-		$summary['dstport'][$fe['dstport']]++;
+	}
 }
 
 include("head.inc"); ?>

src/www/easyrule.php

-<?php
-/*
-	Copyritgh (C) 2014 Deciso B.V.
-	Copyright (C) 2009-2010 Jim Pingle (jpingle@gmail.com)
-	Originally Sponsored By Anathematic @ pfSense Forums
-	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.
-*/
-
-
-$pgtitle = gettext("Firewall: EasyRule");
-require_once("guiconfig.inc");
-require_once("easyrule.inc");
-require_once("filter.inc");
-
-$retval = 0;
-$message = "";
-$specialsrcdst = explode(" ", "any pptp pppoe l2tp openvpn");
-
-if ($_GET && isset($_GET['action'])) {
-	switch ($_GET['action']) {
-		case 'block':
-			/* Check that we have a valid host */
-			easyrule_parse_block($_GET['int'], $_GET['src'], $_GET['ipproto']);
-			break;
-		case 'pass':
-			easyrule_parse_pass($_GET['int'], $_GET['proto'], $_GET['src'], $_GET['dst'], $_GET['dstport'], $_GET['ipproto']);
-			break;
-	}
-}
-
-if(stristr($retval, "error") == true)
-    $message = $retval;
-
-include("head.inc"); ?>
-
-
-<body link="#000000" vlink="#000000" alink="#000000">
-<?php include("fbegin.inc"); ?>
-
-<section class="page-content-main">
-	<div class="container-fluid col-xs-12 col-sm-10 col-md-9">
-		<div class="row">
-		    <section class="col-xs-12">
-
-<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
-
-<?php if ($message) { ?>
-<br />
-<?=gettext("Message"); ?>: <?php echo $message; ?>
-<br />
-<?php } else { ?>
-<?=gettext("This is the Easy Rule status page, mainly used to display errors when adding rules. " .
-"If you are seeing this, there apparently was not an error, and you navigated to the " .
-"page directly without telling it what to do"); ?>.<br /><br />
-<?=gettext("This page is meant to be called from the block/pass buttons on the Firewall Logs page"); ?>, <a href="diag_logs_filter.php"><?=gettext("Status"); ?> &gt; <?=gettext("System Logs, " .
-"Firewall Tab"); ?></a>.
-<br />
-<?php } ?>
-		    </section>
-		</div>
-	</div>
-</section>
-
-<?php include("foot.inc"); ?>