From 65b835dfed1508156673fb1dfd8e97147df8c1ff Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Mon, 27 Nov 2017 07:20:20 +0100
Subject: [PATCH] security/clamav: reworked menu, added logviewer (#392)

---
 security/clamav/Makefile                       |  2 +-
 .../app/models/OPNsense/ClamAV/Menu/Menu.xml   |  5 ++++-
 security/clamav/src/www/diag_logs_clamav.php   | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 security/clamav/src/www/diag_logs_clamav.php

diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 9b05b8679..9078b7c06 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		clamav
-PLUGIN_VERSION=		1.2
+PLUGIN_VERSION=		1.3
 PLUGIN_COMMENT=		Antivirus engine for detecting malicious threats
 PLUGIN_DEPENDS=		clamav
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/Menu/Menu.xml b/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/Menu/Menu.xml
index f5e43ec53..f0e79b797 100644
--- a/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/Menu/Menu.xml
+++ b/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/Menu/Menu.xml
@@ -1,5 +1,8 @@
 <menu>
   <Services>
-    <ClamAV cssClass="fa fa-stethoscope" url="/ui/clamav/general/index" />
+    <ClamAV cssClass="fa fa-stethoscope">
+      <Configuration order="10" url="/ui/clamav/general/index"/>
+      <LogFile VisibleName="Log File" order="20" url="/diag_logs_clamav.php"/>
+    </ClamAV>
   </Services>
 </menu>
diff --git a/security/clamav/src/www/diag_logs_clamav.php b/security/clamav/src/www/diag_logs_clamav.php
new file mode 100644
index 000000000..22523a7a4
--- /dev/null
+++ b/security/clamav/src/www/diag_logs_clamav.php
@@ -0,0 +1,18 @@
+<?php
+
+$type = 'clamd';
+if (isset($_GET['type']) && ($_GET['type'] === 'clamd' || $_GET['type'] === 'freshclam')) {
+    $type = $_GET['type'];
+}
+
+$logfile = "/var/log/clamav/{$type}.log";
+$logclog = false;
+$logsplit = 2;
+
+$logpills = array();
+$logpills[] = array(gettext('Clamd'), true, '/diag_logs_clamav.php?type=clamd');
+$logpills[] = array(gettext('Freshclam'), false, '/diag_logs_clamav.php?type=freshclam');
+
+$service_hook = 'clamav';
+
+require_once 'diag_logs_template.inc';