From afb67b22984e4037b2011b1955c9dc2ff88531df Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Thu, 3 Sep 2015 00:09:14 +0200
Subject: widget-havp code style and fixes

- Update copyright header
- Code style and XHTML fixes
---
 config/widget-havp/havp_alerts.widget.php | 60 +++++++++++++++++--------------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/config/widget-havp/havp_alerts.widget.php b/config/widget-havp/havp_alerts.widget.php
index f8265d11..20b53b0e 100644
--- a/config/widget-havp/havp_alerts.widget.php
+++ b/config/widget-havp/havp_alerts.widget.php
@@ -1,30 +1,34 @@
 <?php
 /*
-    havp_alerts.widget.php
-    Copyright (C) 2009 Michael Liberman , Jim Pingle
+	havp_alerts.widget.php
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2009 Michael Liberman
+	Copyright (C) 2009 Jim Pingle
+	Copyright (C) 2015 ESF, LLC
+	All rights reserved.
 
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
+	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.
+	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.
+	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.
+	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.
 */
-global $config, $g;
+global $config;
 
 ?>
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
@@ -39,25 +43,27 @@ if (is_array($havp_alerts)) {
  	foreach ($havp_alerts as $alert) { ?>
 
 	<?php
-		if(isset($config['syslog']['reverse'])) {
+		if (isset($config['syslog']['reverse'])) {
 			/* honour reverse logging setting */
-			if($counter == 0)
+			if ($counter == 0) {
 				$activerow = " id=\"havp-firstrow\"";
-			else
+			} else {
 				$activerow = "";
+			}
 
 		} else {
 			/* non-reverse logging */
-			if($counter == count($havp_alerts) - 1)
+			if ($counter == count($havp_alerts) - 1) {
 				$activerow = " id=\"havp-firstrow\"";
-			else
+			} else {
 				$activerow = "";
+			}
 		}
 	?>
 
 		<tr class="havp-alert-entry" <?php echo $activerow; ?>>
-			<td width="25%" class="listr"><?= $alert["time"] . "<br>" . $alert["date"]?></td>
-			<td width="75%" class="listr"><?= $alert["url"] . "<br>" . $alert["virusname"] ?></td>
+			<td width="25%" class="listr"><?= $alert["time"] . "<br/>" . $alert["date"]?></td>
+			<td width="75%" class="listr"><?= $alert["url"] . "<br/>" . $alert["virusname"] ?></td>
 		</tr>
 <?php 		$counter++;
 	}
-- 
cgit v1.2.3