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

---
 .../OPNsense/Dnscryptproxy/Menu/Menu.xml      |  6 +++---
 .../src/www/diag_logs_dnscrypt.php            | 19 -------------------
 2 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 dns/dnscrypt-proxy/src/www/diag_logs_dnscrypt.php

diff --git a/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Menu/Menu.xml b/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Menu/Menu.xml
index 0ab98a781..85a2595e1 100644
--- a/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Menu/Menu.xml
+++ b/dns/dnscrypt-proxy/src/opnsense/mvc/app/models/OPNsense/Dnscryptproxy/Menu/Menu.xml
@@ -2,9 +2,9 @@
     <Services>
         <DNSCrypt-Proxy cssClass="fa fa-lock fa-fw">
             <Configuration url="/ui/dnscryptproxy/general/index" order="10"/>
-            <Log VisibleName="Log File" url="/diag_logs_dnscrypt.php?type=dnscrypt-proxy" order="20">
-                <More url="/diag_logs_dnscrypt.php*" visibility="hidden"/>
-            </Log>
+            <GeneralLog VisibleName="Log / General" order="20" url="/ui/diagnostics/log/dnscrypt-proxy/dnscrypt-proxy"/>
+            <QueryLog VisibleName="Log / Queries" order="30"  url="/ui/diagnostics/log/dnscrypt-proxy/query"/>
+            <NXLog VisibleName="Log / NX" order="40" url="/ui/diagnostics/log/dnscrypt-proxy/nx"/>            
         </DNSCrypt-Proxy>
     </Services>
 </menu>
diff --git a/dns/dnscrypt-proxy/src/www/diag_logs_dnscrypt.php b/dns/dnscrypt-proxy/src/www/diag_logs_dnscrypt.php
deleted file mode 100644
index 9128d9964..000000000
--- a/dns/dnscrypt-proxy/src/www/diag_logs_dnscrypt.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-$type = 'dnscrypt-proxy';
-if (isset($_GET['type']) && ($_GET['type'] === 'dnscrypt-proxy' || $_GET['type'] === 'query' || $_GET['type'] === 'nx')) {
-    $type = $_GET['type'];
-}
-
-$logfile = "/var/log/dnscrypt-proxy/{$type}.log";
-$logclog = false;
-$logsplit = 2;
-
-$logpills = array();
-$logpills[] = array(gettext('General'), true, '/diag_logs_dnscrypt.php?type=dnscrypt-proxy');
-$logpills[] = array(gettext('Queries'), false, '/diag_logs_dnscrypt.php?type=query');
-$logpills[] = array(gettext('NX'), false, '/diag_logs_dnscrypt.php?type=nx');
-
-$service_hook = 'dnscrypt-proxy';
-
-require_once 'diag_logs_template.inc';