Merge pull request #758 from SunStroke74/patch-4

7 files changed, 119 insertions, 5 deletions

diff --git a/config/havp/antivirus.php b/config/havp/antivirus.php
index b292c921..0d66a6b3 100644
--- a/config/havp/antivirus.php
+++ b/config/havp/antivirus.php
@@ -204,6 +204,7 @@ if (pfsense_version_A() == '1') {
 	$tab_array[] = array(gettext("General page"), true, "antivirus.php");
 	$tab_array[] = array(gettext("HTTP proxy"), false, "pkg_edit.php?xml=havp.xml&id=0");
 	$tab_array[] = array(gettext("Settings"), false, "pkg_edit.php?xml=havp_avset.xml&id=0");
+	$tab_array[] = array(gettext("Log"), false, "havp_log.php");
 
 	display_top_tabs($tab_array);
 ?>
diff --git a/config/havp/havp.xml b/config/havp/havp.xml
index 47611030..3e12f5bb 100644
--- a/config/havp/havp.xml
+++ b/config/havp/havp.xml
@@ -55,6 +55,10 @@
                         <text>Settings</text>
                         <url>/pkg_edit.php?xml=havp_avset.xml&amp;id=0</url>
                 </tab>
+                <tab>
+                        <text>Log</text>
+                        <url>/havp_log.php</url>
+                </tab>
         </tabs>
         <fields>
                 <field>
@@ -302,4 +306,4 @@
         <custom_php_deinstall_command>
 		havp_deinstall();
         </custom_php_deinstall_command>
-</packagegui>
\ No newline at end of file
+</packagegui>
diff --git a/config/havp/havp_avset.xml b/config/havp/havp_avset.xml
index 3d4372f4..1b0d5c5d 100644
--- a/config/havp/havp_avset.xml
+++ b/config/havp/havp_avset.xml
@@ -23,6 +23,10 @@
                         <url>/pkg_edit.php?xml=havp_avset.xml&amp;id=0</url>
                         <active/>
                 </tab>
+                <tab>
+                        <text>Log</text>
+                        <url>/havp_log.php</url>
+                </tab>
         </tabs>
         <fields>
                 <field>
@@ -104,4 +108,4 @@
         </custom_php_install_command>
         <custom_php_deinstall_command>
         </custom_php_deinstall_command>
-</packagegui>
\ No newline at end of file
+</packagegui>
diff --git a/config/havp/havp_log.php b/config/havp/havp_log.php
new file mode 100644
index 00000000..60c02fbf
--- /dev/null
+++ b/config/havp/havp_log.php
@@ -0,0 +1,105 @@
+<?php
+/* $Id$ */
+/*
+	havp_log.php
+	Copyright (C) 2014 Andrew Nikitin <andrey.b.nikitin@gmail.com>.
+	Copyright (C) 2005 Bill Marquette <bill.marquette@gmail.com>.
+	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
+	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("guiconfig.inc");
+
+if (file_exists("/usr/local/pkg/havp.inc"))
+   require_once("/usr/local/pkg/havp.inc");
+else echo "No havp.inc found";
+
+$nentries = $config['syslog']['nentries'];
+if (!$nentries)
+	$nentries = 50;
+
+if ($_POST['clear']) 
+	file_put_contents(HVDEF_HAVP_ERRORLOG, '');
+
+function dump_havp_errorlog($logfile, $tail) {
+	global $g, $config;
+	$sor = isset($config['syslog']['reverse']) ? "-r" : "";
+	$logarr = "";
+	$grepline = "  ";
+	if (is_dir($logfile)) {
+		$logarr = array("File $logfile is a directory.");
+	} elseif(file_exists($logfile) && filesize($logfile) == 0) {
+		$logarr = array(" ... Log file is empty.");
+	} else {
+		exec("cat " . escapeshellarg($logfile) . "{$grepline} | /usr/bin/tail {$sor} -n " . escapeshellarg($tail), $logarr);
+	}
+	foreach ($logarr as $logent) {
+			$logent = preg_split("/\s+/", $logent, 3);
+			echo "<tr valign=\"top\">\n";
+			$entry_date_time = htmlspecialchars($logent[0] . " " .  $logent[1]);
+			$entry_text = htmlspecialchars($logent[2]);
+			echo "<td class=\"listlr nowrap\" width=\"130\">{$entry_date_time}</td>\n";
+			echo "<td class=\"listr\">{$entry_text}</td>\n";
+			echo "</tr>\n";
+	}
+}
+
+$pgtitle = "Antivirus: HAVP log";
+include("head.inc");
+
+?>
+
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("fbegin.inc"); ?>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr><td>
+<?php
+	$tab_array = array();
+	$tab_array[] = array(gettext("General page"), false, "antivirus.php");
+	$tab_array[] = array(gettext("HTTP proxy"), false, "pkg_edit.php?xml=havp.xml&amp;id=0");
+	$tab_array[] = array(gettext("Settings"), false, "pkg_edit.php?xml=havp_avset.xml&amp;id=0");
+	$tab_array[] = array(gettext("Log"), true, "havp_log.php");
+	display_top_tabs($tab_array);
+?>
+  </td></tr>
+  <tr>
+    <td>
+	<div id="mainarea">
+		<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
+		  <tr>
+			<td colspan="2" class="listtopic">
+			  <?php printf(gettext("Last %s HAVP log entries"), $nentries);?></td>
+		  </tr>
+		  <?php dump_havp_errorlog(HVDEF_HAVP_ERRORLOG, $nentries); ?>
+		<tr><td><br/>
+		<form action="havp_log.php" method="post">
+			<input name="clear" type="submit" class="formbtn" value="<?=gettext("Clear log"); ?>" /></form></td></tr>
+		</table>
+	</div>
+	</td>
+  </tr>
+</table>
+<?php include("fend.inc"); ?>
+</body>
+</html>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index d3e252b8..a877c529 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1059,7 +1059,7 @@
 			<ports_after>security/clamav</ports_after>
 		</build_pbi>
 		<build_options>CLAMAVUSER=havp;CLAMAVGROUP=havp</build_options>
-		<version>0.91_3 pkg v1.02</version>
+		<version>0.91_3 pkg v1.03</version>
 		<status>BETA</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/havp/havp.xml</config_file>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 0798e6a7..44fc7aa3 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1394,7 +1394,7 @@
 		<depends_on_package_pbi>havp-0.91_1-i386.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/www/havp</build_port_path>
 		<build_options>CLAMAVUSER=havp;CLAMAVGROUP=havp</build_options>
-		<version>0.91_1 pkg v1.02</version>
+		<version>0.91_1 pkg v1.03</version>
 		<status>BETA</status>
 		<required_version>1.2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/havp/havp.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index a121543b..bd76a4ce 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1381,7 +1381,7 @@
 		<depends_on_package_pbi>havp-0.91_1-amd64.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/www/havp</build_port_path>
 		<build_options>CLAMAVUSER=havp;CLAMAVGROUP=havp</build_options>
-		<version>0.91_1 pkg v1.02</version>
+		<version>0.91_1 pkg v1.03</version>
 		<status>BETA</status>
 		<required_version>1.2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/havp/havp.xml</config_file>