From 8d65bbf4f15956b7ccdfed0c391d245f28ba26b4 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 28 Nov 2019 22:05:01 +0100
Subject: [PATCH] bind/log: switch to new log view
 https://github.com/opnsense/plugins/issues/1593

---
 .../app/models/OPNsense/Bind/Menu/Menu.xml    |  6 +++---
 dns/bind/src/www/diag_logs_bind.php           | 19 -------------------
 2 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 dns/bind/src/www/diag_logs_bind.php

diff --git a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Menu/Menu.xml b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Menu/Menu.xml
index 9a396fa52..13b24d1e0 100644
--- a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Menu/Menu.xml
+++ b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Menu/Menu.xml
@@ -2,9 +2,9 @@
   <Services>
     <BIND cssClass="fa fa-tags">
       <Configuration url="/ui/bind/general/index" order="10"/>
-      <Log VisibleName="Log File" url="/diag_logs_bind.php?type=named" order="20">
-        <More url="/diag_logs_bind.php*" visibility="hidden"/>
-      </Log>
+      <GeneralLog VisibleName="Log / General" order="20" url="/ui/diagnostics/log/named/named"/>
+      <QueryLog VisibleName="Log / Queries" order="30"  url="/ui/diagnostics/log/named/query"/>
+      <BlockedLog VisibleName="Log / Blocked" order="40" url="/ui/diagnostics/log/named/rpz"/>
     </BIND>
   </Services>
 </menu>
diff --git a/dns/bind/src/www/diag_logs_bind.php b/dns/bind/src/www/diag_logs_bind.php
deleted file mode 100644
index 9ae33c35c..000000000
--- a/dns/bind/src/www/diag_logs_bind.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-$type = 'named';
-if (isset($_GET['type']) && ($_GET['type'] === 'named' || $_GET['type'] === 'query' || $_GET['type'] === 'rpz')) {
-    $type = $_GET['type'];
-}
-
-$logfile = "/var/log/named/{$type}.log";
-$logclog = false;
-$logsplit = 2;
-
-$logpills = array();
-$logpills[] = array(gettext('General'), true, '/diag_logs_bind.php?type=named');
-$logpills[] = array(gettext('Queries'), false, '/diag_logs_bind.php?type=query');
-$logpills[] = array(gettext('Blocked'), false, '/diag_logs_bind.php?type=rpz');
-
-$service_hook = 'named';
-
-require_once 'diag_logs_template.inc';