From c97e95bd035486c613fd1d860aa8ceaced1f0e21 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 16 Oct 2015 21:15:59 +0200
Subject: [PATCH] openvpn: small include fix and log conversion

---
 .../app/models/OPNsense/Base/Menu/Menu.xml    |  2 +-
 src/www/diag_logs_auth.php                    |  2 +-
 src/www/diag_logs_ipsec.php                   |  2 +-
 src/www/diag_logs_ntpd.php                    |  2 +-
 src/www/diag_logs_openvpn.php                 | 19 +++++++------------
 src/www/diag_logs_relayd.php                  |  2 +-
 src/www/diag_logs_tabs.inc                    |  2 --
 src/www/vpn_openvpn_export.php                |  1 +
 src/www/vpn_openvpn_export_shared.php         |  1 +
 9 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
index b648a0b5e..afa8af808 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -59,7 +59,6 @@
             <DHCP url="/diag_logs_dhcp.php"/>
             <PPP url="/diag_logs_ppp.php"/>
             <VPN url="/diag_logs_vpn.php*"/>
-            <OpenVPN url="/diag_logs_openvpn.php"/>
             <Proxy url="/diag_logs_proxy.php">
                 <ProxyActions url="/diag_logs_proxy.php?*"/>
             </Proxy>
@@ -295,6 +294,7 @@
                 <Edit url="/vpn_openvpn_export.php?*"/>
             </ClientExport>
             <ClientSharedKeyExport VisibleName="Shared Key Export" url="/vpn_openvpn_export_shared.php"/>
+            <Log VisibleName="Log File" url="/diag_logs_openvpn.php"/>
             <Server VisibleName="Server Settings" url="/vpn_openvpn_server.php">
                 <Edit url="/vpn_openvpn_server.php?*"/>
             </Server>
diff --git a/src/www/diag_logs_auth.php b/src/www/diag_logs_auth.php
index e0ab03f4e..7af2792db 100644
--- a/src/www/diag_logs_auth.php
+++ b/src/www/diag_logs_auth.php
@@ -66,7 +66,7 @@ include("head.inc");
 							<table class="table table-striped table-sort">
 								<tr><td colspan="2"><strong><?= sprintf(gettext('Last %s Portal Auth log entries'), $nentries); ?></strong></td></tr>
 								<?php dump_clog($portal_logfile, $nentries, true); ?>
-								<tr><td>
+								<tr><td colspan="2">
 									<form action="diag_logs_auth.php" method="post">
 										<input name="clear" type="submit" class="btn" value="<?= gettext("Clear log");?>" />
 									</form>
diff --git a/src/www/diag_logs_ipsec.php b/src/www/diag_logs_ipsec.php
index afe8e6941..2fc92befe 100644
--- a/src/www/diag_logs_ipsec.php
+++ b/src/www/diag_logs_ipsec.php
@@ -68,7 +68,7 @@ include("head.inc");
 									<table class="table table-striped table-sort">
 										<tr><td colspan="2"><strong><?= sprintf(gettext("Last %s IPsec log entries"),$nentries);?></strong></td></tr>
 										<?php dump_clog($ipsec_logfile, $nentries); ?>
-										<tr><td>
+										<tr><td colspan="2">
 											<form action="diag_logs_ipsec.php" method="post">
 												<input name="clear" type="submit" class="btn" value="<?= gettext("Clear log");?>" />
 											</form>
diff --git a/src/www/diag_logs_ntpd.php b/src/www/diag_logs_ntpd.php
index b4f46f0bd..79f803574 100644
--- a/src/www/diag_logs_ntpd.php
+++ b/src/www/diag_logs_ntpd.php
@@ -69,7 +69,7 @@ include("head.inc");
 									<table class="table table-striped table-sort">
 										<tr><td colspan="2"><strong><?= sprintf(gettext("Last %s NTP log entries"), $nentries);?></strong></td></tr>
 										<?php dump_clog($ntpd_logfile, $nentries); ?>
-										<tr><td>
+										<tr><td colspan="2">
 											<form action="diag_logs_ntpd.php" method="post">
 												<input name="clear" type="submit" class="btn" value="<?= gettext("Clear log");?>" />
 											</form>
diff --git a/src/www/diag_logs_openvpn.php b/src/www/diag_logs_openvpn.php
index 77f2cacff..685cc6e93 100644
--- a/src/www/diag_logs_openvpn.php
+++ b/src/www/diag_logs_openvpn.php
@@ -34,7 +34,7 @@ require_once("services.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 
-$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("OpenVPN"));
+$pgtitle = array(gettext('Services'), gettext('OpenVPN'), gettext('Log File'));
 
 $openvpn_logfile = '/var/log/openvpn.log';
 
@@ -64,27 +64,22 @@ include("head.inc");
 
 			    <section class="col-xs-12">
 
-
-					<? include('diag_logs_tabs.inc'); ?>
-
-
 						<div class="tab-content content-box col-xs-12">
-					    <div class="container-fluid">
-
-							<p><?php printf(gettext("Last %s OpenVPN log entries"),$nentries)?></p>
 
 								 <div class="table-responsive">
 									<table class="table table-striped table-sort">
+										<tr><td colspan="2"><strong><?= sprintf(gettext("Last %s OpenVPN log entries"),$nentries)?></strong></td></tr>
 										 <?php dump_clog($openvpn_logfile, $nentries); ?>
+										<tr><td colspan="2">
+											<form action="diag_logs_openvpn.php" method="post">
+												<input name="clear" type="submit" class="btn" value="<?= gettext("Clear log");?>" />
+											</form>
+										</td></tr>
 									</table>
 								 </div>
 
-								<form action="diag_logs_openvpn.php" method="post">
-									<input name="clear" type="submit" class="btn" value="<?= gettext("Clear log");?>" />
-								</form>
 
 						</div>
-				    </div>
 			    </section>
 			</div>
 		</div>
diff --git a/src/www/diag_logs_relayd.php b/src/www/diag_logs_relayd.php
index 6fd5f0b12..d178c33ac 100644
--- a/src/www/diag_logs_relayd.php
+++ b/src/www/diag_logs_relayd.php
@@ -70,7 +70,7 @@ include("head.inc");
 									<table class="table table-striped table-sort">
 										<tr><td colspan="2"><strong><?= sprintf(gettext('Last %s Load Balancer log entries'), $nentries);?></strong></td></tr>
 										 <?php dump_clog($relayd_logfile, $nentries); ?>
-										<tr><td>
+										<tr><td colspan="2">
 											<form action="diag_logs_relayd.php" method="post">
 												<input name="clear" type="submit" class="btn" value="<?= gettext("Clear log");?>" />
 											</form>
diff --git a/src/www/diag_logs_tabs.inc b/src/www/diag_logs_tabs.inc
index 1af11b4bf..517589937 100644
--- a/src/www/diag_logs_tabs.inc
+++ b/src/www/diag_logs_tabs.inc
@@ -31,10 +31,8 @@ $tab_array = array();
 $tab_array[] = array(gettext("System"), $active_tab == "/diag_logs.php", "diag_logs.php");
 $tab_array[] = array(gettext("Firewall"), $active_tab == "/diag_logs_filter.php", "diag_logs_filter.php");
 $tab_array[] = array(gettext("DHCP"), $active_tab == "/diag_logs_dhcp.php", "diag_logs_dhcp.php");
-$tab_array[] = array(gettext("Portal Auth"), $active_tab == "/diag_logs_auth.php", "diag_logs_auth.php");
 $tab_array[] = array(gettext("PPP"), $active_tab == "/diag_logs_ppp.php", "diag_logs_ppp.php");
 $tab_array[] = array(gettext("VPN"), $active_tab == "/diag_logs_vpn.php", "diag_logs_vpn.php");
-$tab_array[] = array(gettext("OpenVPN"), $active_tab == "/diag_logs_openvpn.php", "diag_logs_openvpn.php");
 $tab_array[] = array(gettext("Proxy"), $active_tab == "/diag_logs_proxy.php", "diag_logs_proxy.php?type=cache");
 $tab_array[] = array(gettext("Settings"), $active_tab == "/diag_logs_settings.php", "diag_logs_settings.php");
 display_top_tabs($tab_array);
diff --git a/src/www/vpn_openvpn_export.php b/src/www/vpn_openvpn_export.php
index 74214dab4..eca0645ce 100644
--- a/src/www/vpn_openvpn_export.php
+++ b/src/www/vpn_openvpn_export.php
@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("openvpn.inc");
+require_once("services.inc");
 require_once("filter.inc");
 require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
diff --git a/src/www/vpn_openvpn_export_shared.php b/src/www/vpn_openvpn_export_shared.php
index ef86c54f6..2ab566679 100644
--- a/src/www/vpn_openvpn_export_shared.php
+++ b/src/www/vpn_openvpn_export_shared.php
@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("openvpn.inc");
+require_once("services.inc");
 require_once("filter.inc");
 require_once("pfsense-utils.inc");
 require_once("interfaces.inc");