From 52fb58b3da83effeb14b22ad6bab9f68a936bc36 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Fri, 4 Sep 2015 07:11:44 +0000
Subject: [PATCH] (legacy) crashreport PHP Warning:  Illegal string offset
 'nentries' in /usr/local/www/diag_....

---
 src/www/diag_logs.php          | 7 ++++---
 src/www/diag_logs_auth.php     | 7 ++++---
 src/www/diag_logs_dhcp.php     | 7 ++++---
 src/www/diag_logs_gateways.php | 7 ++++---
 src/www/diag_logs_ipsec.php    | 7 ++++---
 src/www/diag_logs_ntpd.php     | 7 ++++---
 src/www/diag_logs_openvpn.php  | 7 ++++---
 src/www/diag_logs_ppp.php      | 7 ++++---
 src/www/diag_logs_proxy.php    | 7 ++++---
 src/www/diag_logs_relayd.php   | 7 ++++---
 src/www/diag_logs_resolver.php | 7 ++++---
 src/www/diag_logs_routing.php  | 7 ++++---
 src/www/diag_logs_vpn.php      | 8 +++++---
 src/www/diag_logs_wireless.php | 7 ++++---
 14 files changed, 57 insertions(+), 42 deletions(-)

diff --git a/src/www/diag_logs.php b/src/www/diag_logs.php
index 6b71c55b3..2a3beacb1 100644
--- a/src/www/diag_logs.php
+++ b/src/www/diag_logs.php
@@ -34,12 +34,13 @@ require_once("interfaces.inc");
 
 $system_logfile = '/var/log/system.log';
 
-$nentries = $config['syslog']['nentries'];
-if (!$nentries) {
+if (empty($config['syslog']['nentries'])) {
 	$nentries = 50;
+} else {
+	$nentries = $config['syslog']['nentries'];
 }
 
-if ($_POST['clear']) {
+if (isset($_POST['clear'])) {
 	clear_log_file($system_logfile);
 }
 
diff --git a/src/www/diag_logs_auth.php b/src/www/diag_logs_auth.php
index 1650f1cb8..4541ba673 100644
--- a/src/www/diag_logs_auth.php
+++ b/src/www/diag_logs_auth.php
@@ -34,9 +34,10 @@ require_once("interfaces.inc");
 
 $portal_logfile = '/var/log/portalauth.log';
 
-$nentries = $config['syslog']['nentries'];
-if (!$nentries) {
-	$nentries = 50;
+if (empty($config['syslog']['nentries'])) {
+        $nentries = 50;
+} else {
+        $nentries = $config['syslog']['nentries'];
 }
 
 if ($_POST['clear']) {
diff --git a/src/www/diag_logs_dhcp.php b/src/www/diag_logs_dhcp.php
index 0d88ace2b..e5f3297b8 100644
--- a/src/www/diag_logs_dhcp.php
+++ b/src/www/diag_logs_dhcp.php
@@ -35,9 +35,10 @@ require_once("interfaces.inc");
 
 $dhcpd_logfile = '/var/log/dhcpd.log';
 
-$nentries = $config['syslog']['nentries'];
-if (!$nentries) {
-	$nentries = 50;
+if (empty($config['syslog']['nentries'])) {
+        $nentries = 50;
+} else {
+        $nentries = $config['syslog']['nentries'];
 }
 
 if ($_POST['clear']) {
diff --git a/src/www/diag_logs_gateways.php b/src/www/diag_logs_gateways.php
index 7e7e94f1d..f6121a29c 100644
--- a/src/www/diag_logs_gateways.php
+++ b/src/www/diag_logs_gateways.php
@@ -36,9 +36,10 @@ require_once("interfaces.inc");
 
 $system_logfile = '/var/log/gateways.log';
 
-$nentries = $config['syslog']['nentries'];
-if (!$nentries) {
-	$nentries = 50;
+if (empty($config['syslog']['nentries'])) {
+        $nentries = 50;
+} else {
+        $nentries = $config['syslog']['nentries'];
 }
 
 if ($_POST['clear']) {
diff --git a/src/www/diag_logs_ipsec.php b/src/www/diag_logs_ipsec.php
index 35afd39f4..8b8b8f269 100644
--- a/src/www/diag_logs_ipsec.php
+++ b/src/www/diag_logs_ipsec.php
@@ -55,9 +55,10 @@ function return_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinve
 
 $ipsec_logfile = '/var/log/ipsec.log';
 
-$nentries = $config['syslog']['nentries'];
-if (!$nentries) {
-	$nentries = 50;
+if (empty($config['syslog']['nentries'])) {
+        $nentries = 50;
+} else {
+        $nentries = $config['syslog']['nentries'];
 }
 
 if ($_POST['clear']) {
diff --git a/src/www/diag_logs_ntpd.php b/src/www/diag_logs_ntpd.php
index 9479bc436..38c7f60d8 100644
--- a/src/www/diag_logs_ntpd.php
+++ b/src/www/diag_logs_ntpd.php
@@ -36,9 +36,10 @@ require_once("interfaces.inc");
 
 $ntpd_logfile = '/var/log/ntpd.log';
 
-$nentries = $config['syslog']['nentries'];
-if (!$nentries) {
-	$nentries = 50;
+if (empty($config['syslog']['nentries'])) {
+        $nentries = 50;
+} else {
+        $nentries = $config['syslog']['nentries'];
 }
 
 if ($_POST['clear']) {
diff --git a/src/www/diag_logs_openvpn.php b/src/www/diag_logs_openvpn.php
index d3b719cb5..8223d1e51 100644
--- a/src/www/diag_logs_openvpn.php
+++ b/src/www/diag_logs_openvpn.php
@@ -39,9 +39,10 @@ $shortcut_section = "openvpn";
 
 $openvpn_logfile = '/var/log/openvpn.log';
 
-$nentries = $config['syslog']['nentries'];
-if (!$nentries) {
-	$nentries = 50;
+if (empty($config['syslog']['nentries'])) {
+        $nentries = 50;
+} else {
+        $nentries = $config['syslog']['nentries'];
 }
 
 if ($_POST['clear']) {
diff --git a/src/www/diag_logs_ppp.php b/src/www/diag_logs_ppp.php
index b7ec3323c..ce2a7b2ba 100644
--- a/src/www/diag_logs_ppp.php
+++ b/src/www/diag_logs_ppp.php
@@ -34,9 +34,10 @@ require_once("interfaces.inc");
 
 $ppps_logfile = '/var/log/ppps.log';
 
-$nentries = $config['syslog']['nentries'];
-if (!$nentries) {
-	$nentries = 50;
+if (empty($config['syslog']['nentries'])) {
+        $nentries = 50;
+} else {
+        $nentries = $config['syslog']['nentries'];
 }
 
 if ($_POST['clear']) {
diff --git a/src/www/diag_logs_proxy.php b/src/www/diag_logs_proxy.php
index 72cb540fe..3c85e4d10 100644
--- a/src/www/diag_logs_proxy.php
+++ b/src/www/diag_logs_proxy.php
@@ -29,9 +29,10 @@ require_once("guiconfig.inc");
 
 $logfile = '/var/log/squid/cache.log';
 
-$max_logentries = $config['syslog']['nentries'];
-if (!$max_logentries) {
-	$max_logentries = 50;
+if (empty($config['syslog']['nentries'])) {
+        $nentries = 50;
+} else {
+        $nentries = $config['syslog']['nentries'];
 }
 
 if ($_POST['clear']) {
diff --git a/src/www/diag_logs_relayd.php b/src/www/diag_logs_relayd.php
index 3e696e8b3..daf269efc 100644
--- a/src/www/diag_logs_relayd.php
+++ b/src/www/diag_logs_relayd.php
@@ -35,9 +35,10 @@ require_once("interfaces.inc");
 
 $relayd_logfile = '/var/log/relayd.log';
 
-$nentries = $config['syslog']['nentries'];
-if (!$nentries) {
-	$nentries = 50;
+if (empty($config['syslog']['nentries'])) {
+        $nentries = 50;
+} else {
+        $nentries = $config['syslog']['nentries'];
 }
 
 if ($_POST['clear']) {
diff --git a/src/www/diag_logs_resolver.php b/src/www/diag_logs_resolver.php
index e720c8c8d..0e775e518 100644
--- a/src/www/diag_logs_resolver.php
+++ b/src/www/diag_logs_resolver.php
@@ -36,9 +36,10 @@ require_once("interfaces.inc");
 
 $system_logfile = '/var/log/resolver.log';
 
-$nentries = $config['syslog']['nentries'];
-if (!$nentries) {
-	$nentries = 50;
+if (empty($config['syslog']['nentries'])) {
+        $nentries = 50;
+} else {
+        $nentries = $config['syslog']['nentries'];
 }
 
 if ($_POST['clear']) {
diff --git a/src/www/diag_logs_routing.php b/src/www/diag_logs_routing.php
index 6bc18c75d..857894c41 100644
--- a/src/www/diag_logs_routing.php
+++ b/src/www/diag_logs_routing.php
@@ -33,9 +33,10 @@ require_once("interfaces.inc");
 
 $routing_logfile = '/var/log/routing.log';
 
-$nentries = $config['syslog']['nentries'];
-if (!$nentries) {
-	$nentries = 50;
+if (empty($config['syslog']['nentries'])) {
+        $nentries = 50;
+} else {
+        $nentries = $config['syslog']['nentries'];
 }
 
 if ($_POST['clear']) {
diff --git a/src/www/diag_logs_vpn.php b/src/www/diag_logs_vpn.php
index c6ca73680..6ec4ff951 100644
--- a/src/www/diag_logs_vpn.php
+++ b/src/www/diag_logs_vpn.php
@@ -33,9 +33,11 @@ require_once("vpn.inc");
 require_once("system.inc");
 require_once("interfaces.inc");
 
-$nentries = $config['syslog']['nentries'];
-if (!$nentries)
-	$nentries = 50;
+if (empty($config['syslog']['nentries'])) {
+        $nentries = 50;
+} else {
+        $nentries = $config['syslog']['nentries'];
+}
 
 if (htmlspecialchars($_POST['vpntype']))
 	$vpntype = htmlspecialchars($_POST['vpntype']);
diff --git a/src/www/diag_logs_wireless.php b/src/www/diag_logs_wireless.php
index 8f34b1639..3e3de0c6b 100644
--- a/src/www/diag_logs_wireless.php
+++ b/src/www/diag_logs_wireless.php
@@ -35,9 +35,10 @@ require_once("interfaces.inc");
 
 $wireless_logfile = '/var/log/wireless.log';
 
-$nentries = $config['syslog']['nentries'];
-if (!$nentries) {
-	$nentries = 50;
+if (empty($config['syslog']['nentries'])) {
+        $nentries = 50;
+} else {
+        $nentries = $config['syslog']['nentries'];
 }
 
 if ($_POST['clear']) {