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

---
 .../mvc/app/models/OPNsense/L2TP/ACL/ACL.xml  |  5 +++-
 .../app/models/OPNsense/L2TP/Menu/Menu.xml    |  5 ++--
 net/l2tp/src/www/vpn_l2tp_log.php             | 26 -------------------
 3 files changed, 6 insertions(+), 30 deletions(-)
 delete mode 100644 net/l2tp/src/www/vpn_l2tp_log.php

diff --git a/net/l2tp/src/opnsense/mvc/app/models/OPNsense/L2TP/ACL/ACL.xml b/net/l2tp/src/opnsense/mvc/app/models/OPNsense/L2TP/ACL/ACL.xml
index 24ea3d3e1..1dcca185a 100644
--- a/net/l2tp/src/opnsense/mvc/app/models/OPNsense/L2TP/ACL/ACL.xml
+++ b/net/l2tp/src/opnsense/mvc/app/models/OPNsense/L2TP/ACL/ACL.xml
@@ -20,7 +20,10 @@
     <page-vpn-vpnl2tp-users>
         <name>VPN: L2TP: Users</name>
         <patterns>
-            <pattern>vpn_l2tp_users.php*</pattern>
+            <pattern>ui/diagnostics/log/core/l2tps/*</pattern>
+            <pattern>api/diagnostics/log/core/l2tps/*</pattern>
+            <pattern>ui/diagnostics/log/core/vpn/*</pattern>
+            <pattern>api/diagnostics/log/core/vpn/*</pattern>
         </patterns>
     </page-vpn-vpnl2tp-users>
 </acl>
diff --git a/net/l2tp/src/opnsense/mvc/app/models/OPNsense/L2TP/Menu/Menu.xml b/net/l2tp/src/opnsense/mvc/app/models/OPNsense/L2TP/Menu/Menu.xml
index 5a548e1a1..6e1f65e5b 100644
--- a/net/l2tp/src/opnsense/mvc/app/models/OPNsense/L2TP/Menu/Menu.xml
+++ b/net/l2tp/src/opnsense/mvc/app/models/OPNsense/L2TP/Menu/Menu.xml
@@ -5,9 +5,8 @@
             <Users order="20" url="/vpn_l2tp_users.php">
                 <Edit url="/vpn_l2tp_users_edit.php*" visibility="hidden"/>
             </Users>
-            <LogFile order="30" VisibleName="Log File" url="/vpn_l2tp_log.php">
-                <Type url="/vpn_l2tp_log.php*" visibility="hidden"/>
-            </LogFile>
+            <LogFile VisibleName="Log / L2TP Logins" order="50" url="/ui/diagnostics/log/core/l2tps"/>
+            <LogFile VisibleName="Log / Raw" order="50" url="/ui/diagnostics/log/core/vpn"/>
         </L2TP>
     </VPN>
 </menu>
diff --git a/net/l2tp/src/www/vpn_l2tp_log.php b/net/l2tp/src/www/vpn_l2tp_log.php
deleted file mode 100644
index 9586d5d9e..000000000
--- a/net/l2tp/src/www/vpn_l2tp_log.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-if (htmlspecialchars($_POST['mode'])) {
-    $mode = htmlspecialchars($_POST['mode']);
-} elseif (htmlspecialchars($_GET['mode'])) {
-    $mode = htmlspecialchars($_GET['mode']);
-} else {
-    $mode = 'login';
-}
-
-$logtype = 'l2tp';
-$logclog = true;
-
-$logpills = array();
-$logpills[] = array(gettext('L2TP Logins'), $mode != 'raw', '/vpn_l2tp_log.php');
-$logpills[] = array(gettext('L2TP Raw'), $mode == 'raw', '/vpn_l2tp_log.php?mode=raw');
-
-$service_hook = 'l2tpd';
-
-if ($mode != 'raw') {
-    $logfile = '/var/log/vpn.log';
-    require_once 'vpn_l2tp_log.inc';
-} else {
-    $logfile = '/var/log/l2tps.log';
-    require_once 'diag_logs_template.inc';
-}