Merge pull request #1036 from doktornotor/patch-9

7 files changed, 186 insertions, 167 deletions

diff --git a/config/widget-havp/havp_alerts.inc b/config/widget-havp/havp_alerts.inc
index ecbfe897..3aeb1016 100644
--- a/config/widget-havp/havp_alerts.inc
+++ b/config/widget-havp/havp_alerts.inc
@@ -12,4 +12,4 @@ $havp_alerts = get_havp_alerts($havp_alerts_logfile, $nentries);
 /* AJAX related routines */
 handle_havp_ajax($havp_alerts_logfile, $nentries = 5);
 
-?>
\ No newline at end of file
+?>
diff --git a/config/widget-havp/havp_alerts.inc.php b/config/widget-havp/havp_alerts.inc.php
index c0810b83..81be9d3b 100644
--- a/config/widget-havp/havp_alerts.inc.php
+++ b/config/widget-havp/havp_alerts.inc.php
@@ -1,52 +1,76 @@
-<?
+<?php
+/*
+	havp_alerts.inc.php
+	part of pfSense (https://www.pfSense.org/)
+	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:
+
+	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.
+*/
 function get_havp_alerts($havp_alerts, $nentries, $tail = 20) {
 	global $config, $g;
 	$logarr = "";
 	/* Always do a reverse tail, to be sure we're grabbing the 'end' of the alerts. */
 	exec("/usr/bin/tail -r -n {$tail} {$havp_alerts}", $logarr);
-	
+
 	$havpalerts = array();
-	
 	$counter = 0;
-	
+
 	foreach ($logarr as $logent) {
-		if($counter >= $nentries)
+		if ($counter >= $nentries) {
 			break;
-
+		}
 		$alert = parse_havp_alert_line($logent);
 		if ($alert != "") {
 			$counter++;
 			$havpalerts[] = $alert;
 		}
-
 	}
-	/* Since the rules are in reverse order, flip them around if needed based on the user's preference */
+	/* Since the rules are in reverse order, flip them around if needed, based on the user's preference */
 	return isset($config['syslog']['reverse']) ? $havpalerts : array_reverse($havpalerts);
 }
 
-
-
-
 function parse_havp_alert_line($line) {
+	global $g;
 	$log_split = "";
-	
-	preg_match("/^(\d+\/\d+\/\d+)\s+(\d+:\d+:\d+)\s+(\d+.\d+.\d+.\d+)\s+\w+\s+\d+\s+(https?:\/\/([0-9a-z-]+\.)+([a-z]{2,3}|aero|coop|jobs|mobi|museum|name|travel)(:[0-9]{1,5})?(\/[^ ]*)?)\s+[0-9+]+\s+\w+\s+\w+:\s+([\S]+)$/U", $line, $log_split);
 
-  list($all, $alert['date'], $alert['time'], $alert['lanip'], $alert['url'], $alert['dontcare1'], $alert['dontcare2'], $alert['dontcare3'], $alert['query'],
-    $alert['virusname']) = $log_split;
+	// FIXME: Obviously incomplete TLD list at the moment, plus the whole thing is completely whacky...
+	preg_match("/^(\d+\/\d+\/\d+)\s+(\d+:\d+:\d+)\s+(\d+.\d+.\d+.\d+)\s+\w+\s+\d+\s+(https?:\/\/([0-9a-z-]+\.)+([a-z]{2,3}|aero|coop|jobs|mobi|museum|name|travel)(:[0-9]{1,5})?(\/[^ ]*)?)\s+[0-9+]+\s+\w+\s+\w+:\s+([\S]+)$/U", $line, $log_split);
 
+	list($all, $alert['date'], $alert['time'], $alert['lanip'], $alert['url'], $alert['dontcare1'], $alert['dontcare2'], $alert['dontcare3'], $alert['query'], $alert['virusname']) = $log_split;
 	$usableline = true;
 
-	if(trim($alert['url']) == "")
+	if (trim($alert['url']) == "") {
 		$usableline = false;
-	if(trim($alert['virusname']) == "")
+	}
+	if (trim($alert['virusname']) == "") {
 		$usableline = false;
-
-	if($usableline == true) {
+	}
+	if ($usableline == true) {
 		return $alert;
 	} else {
-		if($g['debug']) {
-			log_error("There was a error parsing line: $line.   Please report to mailing list or forum.");
+		if ($g['debug']) {
+			log_error("There was a error parsing line: $line.");
 		}
 		return "";
 	}
@@ -54,32 +78,24 @@ function parse_havp_alert_line($line) {
 
 /* AJAX specific handlers */
 function handle_havp_ajax($havp_alerts_logfile, $nentries = 5, $tail = 50) {
-	if($_GET['lastsawtime'] or $_POST['lastsawtime']) {
-		if($_GET['lastsawtime'])
+	if ($_GET['lastsawtime'] or $_POST['lastsawtime']) {
+		if ($_GET['lastsawtime']) {
 			$lastsawtime = $_GET['lastsawtime'];
-		if($_POST['lastsawtime'])
+		}
+		if ($_POST['lastsawtime']) {
 			$lastsawtime = $_POST['lastsawtime'];
-		/*  compare lastsawrule's time stamp to alert logs.
-		 *  afterwards return the newer records so that client
-                 *  can update AJAX interface screen.
-		 */
+		}
+		// Compare last seen rule's time stamp with alert logs.
+		// Afterwards, return the newer records so that client can update AJAX interface screen.
 		$new_rules = "";
 		$time_regex = "";
-		
+
 		$havp_alerts = get_havp_alerts($havp_alerts_logfile, $nentries);
 		foreach($havp_alerts as $log_row) {
-		  preg_match("/^([0-9][0-9])\/([0-9][0-9])\/([0-9][0-9][0-9][0-9])$/U",$log_row['date'] , $time_regex);
-#			$time_regex = "";"/^([0-9][0-9])\/([0-9][0-9])\/([0-9][0-9][0-9][0-9])\s+([0-9][0-9]:[0-9][0-9]:[0-9][0-9])$/U"
-	//		preg_match("/.*([0-9][0-9]:[0-9][0-9]:[0-9][0-9]).*/", $log_row['date'] . " " .  $log_row['time'], $time_regex);
+			preg_match("/^([0-9][0-9])\/([0-9][0-9])\/([0-9][0-9][0-9][0-9])$/U", $log_row['date'], $time_regex);
 			$row_time = strtotime($time_regex[2] . "/" . $time_regex[1] . "/" . $time_regex[3] . " " . $log_row['time']);
-     // $myfile = "/testfile.txt";
-     // $fh = fopen($myfile,'a') or die("can't open file");
-     // $stringdata = $lastsawtime . "-" . $row_time . "\n";
-    //  fwrite($fh, $stringdata);
-    //  fclose($fh);
 
-			if($row_time > $lastsawtime  and $lastsawtime > 0) {
-			  
+			if ($row_time > $lastsawtime and $lastsawtime > 0) {
 				$new_rules .= "{$log_row['url']}||{$log_row['virusname']}||" . time() . "||{$log_row['date']}||{$log_row['time']}||" . "\n";
 			}
 		}
@@ -87,4 +103,5 @@ function handle_havp_ajax($havp_alerts_logfile, $nentries = 5, $tail = 50) {
 		exit;
 	}
 }
-?>
\ No newline at end of file
+
+?>
diff --git a/config/widget-havp/havp_alerts.js b/config/widget-havp/havp_alerts.js
index 110e3998..ae97ab2f 100644
--- a/config/widget-havp/havp_alerts.js
+++ b/config/widget-havp/havp_alerts.js
@@ -1,3 +1,31 @@
+/*
+	havp_alerts.js
+	part of pfSense (https://www.pfSense.org/)
+	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:
+
+	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.
+*/
 
 havplastsawtime = '<?php echo time(); ?>';
 var havplines = Array();
@@ -7,10 +35,11 @@ var havpisBusy = false;
 var havpisPaused = false;
 
 <?php
-	if(isset($config['syslog']['reverse']))
+	if (isset($config['syslog']['reverse'])) {
 		echo "var isReverse = true;\n";
-	else
+	} else {
 		echo "var isReverse = false;\n";
+	}
 ?>
 
 if (typeof getURL == 'undefined') {
@@ -21,13 +50,12 @@ if (typeof getURL == 'undefined') {
 			if (typeof callback.operationComplete == 'function')
 				callback = callback.operationComplete;
 		} catch (e) {}
-			if (typeof callback != 'function')
-				throw 'No callback function for getURL';
+		if (typeof callback != 'function')
+			throw 'No callback function for getURL';
 		var http_request = null;
 		if (typeof XMLHttpRequest != 'undefined') {
-		    http_request = new XMLHttpRequest();
-		}
-		else if (typeof ActiveXObject != 'undefined') {
+			http_request = new XMLHttpRequest();
+		} else if (typeof ActiveXObject != 'undefined') {
 			try {
 				http_request = new ActiveXObject('Msxml2.XMLHTTP');
 			} catch (e) {
@@ -40,9 +68,11 @@ if (typeof getURL == 'undefined') {
 			throw 'Both getURL and XMLHttpRequest are undefined';
 		http_request.onreadystatechange = function() {
 			if (http_request.readyState == 4) {
-				callback( { success : true,
-				  content : http_request.responseText,
-				  contentType : http_request.getResponseHeader("Content-Type") } );
+				callback({
+					success: true,
+					content: http_request.responseText,
+					contentType: http_request.getResponseHeader("Content-Type")
+				});
 			}
 		}
 		http_request.open('GET', url, true);
@@ -51,27 +81,28 @@ if (typeof getURL == 'undefined') {
 }
 
 function havp_alerts_fetch_new_rules() {
-	if(havpisPaused)
+	if (havpisPaused)
 		return;
-	if(havpisBusy)
+	if (havpisBusy)
 		return;
 	havpisBusy = true;
 	getURL('widgets/helpers/havp_alerts_helper.php?lastsawtime=' + havplastsawtime, havp_alerts_fetch_new_rules_callback);
 }
+
 function havp_alerts_fetch_new_rules_callback(callback_data) {
-	if(havpisPaused)
+	if (havpisPaused)
 		return;
 
 	var data_split;
 	var new_data_to_add = Array();
 	var data = callback_data.content;
 	data_split = data.split("\n");
-	for(var x=0; x<data_split.length-1; x++) {
+	for (var x = 0; x < data_split.length - 1; x++) {
 		/* loop through rows */
 		row_split = data_split[x].split("||");
 		var line = '';
-		line +=  '<td width="25%"  class="listr">' + row_split[4] + '<br> ' + row_split[3]  + '</td>';
-		line += '<td width="75%"  class="listr">' + row_split[0] + '<br>' + row_split[1] + '</td>';
+		line += '<td width="25%" class="listr">' + row_split[4] + '<br/> ' + row_split[3] + '</td>';
+		line += '<td width="75%" class="listr">' + row_split[0] + '<br/>' + row_split[1] + '</td>';
 		havplastsawtime = row_split[2];
 		new_data_to_add[new_data_to_add.length] = line;
 	}
@@ -79,11 +110,10 @@ function havp_alerts_fetch_new_rules_callback(callback_data) {
 	havpisBusy = false;
 }
 
-
 function havp_alerts_update_div_rows(data) {
-	if(havpisPaused)
+	if (havpisPaused)
 		return;
-		
+
 	var isIE = navigator.appName.indexOf('Microsoft') != -1;
 	var isSafari = navigator.userAgent.indexOf('Safari') != -1;
 	var isOpera = navigator.userAgent.indexOf('Opera') != -1;
@@ -94,51 +124,44 @@ function havp_alerts_update_div_rows(data) {
 		showanim = 0;
 	}
 	//alert(data.length);
-	for(var x=0; x<data.length; x++) {
+	for (var x = 0; x < data.length; x++) {
 		var numrows = rows.length;
-		/*    if reverse logging is enabled we need to show the
-		 *    records in a reverse order with new items appearing
-		 *    on the top
-		 */
-		if(isReverse == false) {
+		// If reverse logging is enabled we need to show the records
+		// in a reverse order with new items appearing on the top.
+		if (isReverse == false) {
 			for (var i = 1; i < numrows; i++) {
 				nextrecord = i + 1;
-				if(nextrecord < numrows)
+				if (nextrecord < numrows)
 					rows[i].innerHTML = rows[nextrecord].innerHTML;
 			}
 		} else {
 			for (var i = numrows; i > 0; i--) {
 				nextrecord = i + 1;
-				if(nextrecord < numrows)
+				if (nextrecord < numrows)
 					rows[nextrecord].innerHTML = rows[i].innerHTML;
 			}
 		}
 		var item = document.getElementById('havp-firstrow');
-		if(x == data.length-1) 
-    {
+		if (x == data.length - 1) {
 			/* nothing */
 			showanim = false;
-		} 
-    else 
-    {
+		} else {
 			showanim = false;
 		}
-		if (showanim) 
-    {
-	//		item.style.display = 'none';
+		if (showanim) {
+			//item.style.display = 'none';
 			item.innerHTML = data[x];
-	//		new Effect.Appear(item);
-		}
-     else 
-     {
+			//new Effect.Appear(item);
+		} else {
 			item.innerHTML = data[x];
 		}
 	}
 	/* rechedule AJAX interval */
 	//havptimer = setInterval('havp_alerts_fetch_new_rules()', havpupdateDelay);
 }
+
 function havp_alerts_toggle_pause() {
-	if(havpisPaused) {
+	if (havpisPaused) {
 		havpisPaused = false;
 		havp_alerts_fetch_new_rules();
 	} else {
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++;
 	}
diff --git a/config/widget-havp/widget-havp.inc b/config/widget-havp/widget-havp.inc
deleted file mode 100644
index 61713f24..00000000
--- a/config/widget-havp/widget-havp.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-function widget_havp_uninstall() {
-	unlink("/usr/local/www/includes/havp_alerts.inc.php");
-	unlink("/usr/local/www/widgets/helpers/havp_alerts_helper.php");
-	unlink("/usr/local/www/widgets/include/havp_alerts.inc");
-	unlink("/usr/local/www/widgets/javascript/havp_alerts.js");
-	unlink("/usr/local/www/widgets/widgets/havp_alerts.widget.php");
-}
-
-?>
\ No newline at end of file
diff --git a/config/widget-havp/widget-havp.xml b/config/widget-havp/widget-havp.xml
index f99d99de..dc405119 100644
--- a/config/widget-havp/widget-havp.xml
+++ b/config/widget-havp/widget-havp.xml
@@ -4,82 +4,66 @@
 <packagegui>
 	<copyright>
 	<![CDATA[
-/* $Id$	*/
-/* ========================================================================== */
+/* $Id$ */
+/* ====================================================================================== */
 /*
-    widget-havp.xml
-    part of pfSense (http://www.pfSense.com)
-    Copyright (C) 2009 Jim Pingle
-    All	rights reserved.
-
-    Based on m0n0wall (http://m0n0.ch/wall)
-    Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
-    All	rights reserved.
-									      */
-/* ========================================================================== */
+	widget-havp.xml
+	part of pfSense (https://www.pfSense.org/)
+	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.
+*/
+/* ====================================================================================== */
 	]]>
 	</copyright>
 	<description>HAVP alerts widget add-on for Dashboard package</description>
 	<requirements>Dashboard package and HAVP</requirements>
-	<faq>Currently there are no FAQ	items provided.</faq>
 	<name>widget-havp</name>
-	<version>0.1</version>
+	<version>0.1.1</version>
 	<title>Widget - HAVP</title>
-	<include_file>/usr/local/pkg/widget-havp.inc</include_file>
-	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/widget-havp/widget-havp.inc</item>
-	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/includes/</prefix>
-		<chmod>0644</chmod>
 		<item>https://packages.pfsense.org/packages/config/widget-havp/havp_alerts.inc.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/widgets/helpers/</prefix>
-		<chmod>0644</chmod>
 		<item>https://packages.pfsense.org/packages/config/widget-havp/havp_alerts_helper.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/widgets/include/</prefix>
-		<chmod>0644</chmod>
 		<item>https://packages.pfsense.org/packages/config/widget-havp/havp_alerts.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/widgets/javascript/</prefix>
-		<chmod>0644</chmod>
 		<item>https://packages.pfsense.org/packages/config/widget-havp/havp_alerts.js</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/widgets/widgets/</prefix>
-		<chmod>0644</chmod>
 		<item>https://packages.pfsense.org/packages/config/widget-havp/havp_alerts.widget.php</item>
 	</additional_files_needed>
-	<custom_php_deinstall_command>
-		widget_havp_uninstall();
-	</custom_php_deinstall_command>
 </packagegui>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index edae173d..56ff8523 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1246,7 +1246,7 @@
 		<descr>Dashboard widget for HAVP alerts.</descr>
 		<category>System</category>
 		<config_file>https://packages.pfsense.org/packages/config/widget-havp/widget-havp.xml</config_file>
-		<version>0.1</version>
+		<version>0.1.1</version>
 		<status>BETA</status>
 		<required_version>2.2</required_version>
 		<configurationfile>widget-havp.xml</configurationfile>