From ef63bc68307fce52d4fd1c03f853ee7fb5775720 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 13 Jun 2016 08:35:56 +0200
Subject: [PATCH] logs: always load services.inc, loading plugins.inc in
 template too

---
 src/www/diag_logs_dhcp.php     | 1 -
 src/www/diag_logs_gateways.php | 1 -
 src/www/diag_logs_ipsec.php    | 1 -
 src/www/diag_logs_ntpd.php     | 1 -
 src/www/diag_logs_proxy.php    | 1 -
 src/www/diag_logs_resolver.php | 1 -
 src/www/diag_logs_template.inc | 1 +
 7 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/www/diag_logs_dhcp.php b/src/www/diag_logs_dhcp.php
index 7a1b6ac84..95fd0fb5b 100644
--- a/src/www/diag_logs_dhcp.php
+++ b/src/www/diag_logs_dhcp.php
@@ -9,7 +9,6 @@ function clear_hook()
 	services_dhcpd_configure();
 }
 
-require_once 'services.inc';
 $service_hook = 'dhcpd';
 
 require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs_gateways.php b/src/www/diag_logs_gateways.php
index 6256d31f8..85398bb39 100644
--- a/src/www/diag_logs_gateways.php
+++ b/src/www/diag_logs_gateways.php
@@ -3,7 +3,6 @@
 $logfile = '/var/log/gateways.log';
 $logclog = true;
 
-require_once 'services.inc';
 $service_hook = 'apinger';
 
 require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs_ipsec.php b/src/www/diag_logs_ipsec.php
index 84f352425..dc4bf8f05 100644
--- a/src/www/diag_logs_ipsec.php
+++ b/src/www/diag_logs_ipsec.php
@@ -3,7 +3,6 @@
 $logfile = '/var/log/ipsec.log';
 $logclog = true;
 
-require_once 'services.inc';
 $service_hook = 'ipsec';
 
 require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs_ntpd.php b/src/www/diag_logs_ntpd.php
index 3f9cf8a1e..57859ee90 100644
--- a/src/www/diag_logs_ntpd.php
+++ b/src/www/diag_logs_ntpd.php
@@ -3,7 +3,6 @@
 $logfile = '/var/log/ntpd.log';
 $logclog = true;
 
-require_once 'services.inc';
 $service_hook = 'ntpd';
 
 require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs_proxy.php b/src/www/diag_logs_proxy.php
index 9c5a90bb3..89596d008 100644
--- a/src/www/diag_logs_proxy.php
+++ b/src/www/diag_logs_proxy.php
@@ -13,7 +13,6 @@ $logpills[] = array(gettext('Cache'), true, '/diag_logs_proxy.php?type=cache');
 $logpills[] = array(gettext('Access'), false, '/diag_logs_proxy.php?type=access');
 $logpills[] = array(gettext('Store'), false, '/diag_logs_proxy.php?type=store');
 
-require_once 'services.inc';
 $service_hook = 'squid';
 
 require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs_resolver.php b/src/www/diag_logs_resolver.php
index d001e867c..f7af2288a 100644
--- a/src/www/diag_logs_resolver.php
+++ b/src/www/diag_logs_resolver.php
@@ -3,7 +3,6 @@
 $logfile = '/var/log/resolver.log';
 $logclog = true;
 
-require_once 'services.inc';
 $service_hook = array('dnsmasq', 'unbound');
 
 require_once 'diag_logs_template.inc';
diff --git a/src/www/diag_logs_template.inc b/src/www/diag_logs_template.inc
index de71aaf72..9befd56c7 100644
--- a/src/www/diag_logs_template.inc
+++ b/src/www/diag_logs_template.inc
@@ -33,6 +33,7 @@ require_once("guiconfig.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 require_once("plugins.inc");
+require_once 'services.inc';
 
 /* expects $logfile to point to the system path */
 /* expects $logclog to be true or false */