From 3d852798e81dbfa7579932325a26339681c26df7 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 12 Feb 2018 06:42:33 +0000
Subject: [PATCH] security/clamav: fix more bugs with log viewer

Now we have enough to call it 1.5.
---
 security/clamav/Makefile                           |  3 +--
 .../mvc/app/models/OPNsense/ClamAV/ACL/ACL.xml     |  1 +
 .../mvc/app/models/OPNsense/ClamAV/Menu/Menu.xml   | 14 ++++++++------
 security/clamav/src/www/diag_logs_clamav.php       |  5 +----
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 4ef729eae..5c8bd80c6 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		clamav
-PLUGIN_VERSION=		1.4
-PLUGIN_REVISION=	1
+PLUGIN_VERSION=		1.5
 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/ACL/ACL.xml b/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/ACL/ACL.xml
index 1edb10b18..d6f8c6065 100644
--- a/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/ACL/ACL.xml
+++ b/security/clamav/src/opnsense/mvc/app/models/OPNsense/ClamAV/ACL/ACL.xml
@@ -4,6 +4,7 @@
       <patterns>
          <pattern>ui/clamav/*</pattern>
          <pattern>api/clamav/*</pattern>
+         <pattern>diag_logs_clamav.php*</pattern>
       </patterns>
    </page-services-clamav>
 </acl>
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 f0e79b797..f7c31c2bf 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,8 +1,10 @@
 <menu>
-  <Services>
-    <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>
+    <Services>
+        <ClamAV cssClass="fa fa-stethoscope">
+            <Configuration order="10" url="/ui/clamav/general/index"/>
+            <Log VisibleName="Log File" order="20" url="/diag_logs_clamav.php?type=clamd">
+                <More url="/diag_logs_clamav.php*" visibility="hidden"/>
+            </Log>
+        </ClamAV>
+    </Services>
 </menu>
diff --git a/security/clamav/src/www/diag_logs_clamav.php b/security/clamav/src/www/diag_logs_clamav.php
index e5bec47fa..2341184d8 100644
--- a/security/clamav/src/www/diag_logs_clamav.php
+++ b/security/clamav/src/www/diag_logs_clamav.php
@@ -7,10 +7,7 @@ if (isset($_GET['type']) && ($_GET['type'] === 'clamd' || $_GET['type'] === 'fre
 
 $logfile = "/var/log/clamav/{$type}.log";
 $logclog = false;
-
-if ($type == 'clamd') {
-    $logsplit = 2;
-}
+$logsplit = 5;
 
 $logpills = array();
 $logpills[] = array(gettext('Clamd'), true, '/diag_logs_clamav.php?type=clamd');