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

This reverts commit 559f5994d0efde045a8e50af7f12c1d3a1c99d84.
---
 .../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, 30 insertions(+), 6 deletions(-)
 create 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 1dcca185a..24ea3d3e1 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,10 +20,7 @@
     <page-vpn-vpnl2tp-users>
         <name>VPN: L2TP: Users</name>
         <patterns>
-            <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>
+            <pattern>vpn_l2tp_users.php*</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 6e1f65e5b..5a548e1a1 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,8 +5,9 @@
             <Users order="20" url="/vpn_l2tp_users.php">
                 <Edit url="/vpn_l2tp_users_edit.php*" visibility="hidden"/>
             </Users>
-            <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"/>
+            <LogFile order="30" VisibleName="Log File" url="/vpn_l2tp_log.php">
+                <Type url="/vpn_l2tp_log.php*" visibility="hidden"/>
+            </LogFile>
         </L2TP>
     </VPN>
 </menu>
diff --git a/net/l2tp/src/www/vpn_l2tp_log.php b/net/l2tp/src/www/vpn_l2tp_log.php
new file mode 100644
index 000000000..9586d5d9e
--- /dev/null
+++ b/net/l2tp/src/www/vpn_l2tp_log.php
@@ -0,0 +1,26 @@
+<?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';
+}