From a388261259d2935214a319c2301bd3c8ac9f33d3 Mon Sep 17 00:00:00 2001 From: Ermal Date: Mon, 12 Nov 2012 11:12:02 +0000 Subject: Resolves #2678. Merge patch suggedted to stop warnings on PHP_errors.log --- usr/local/www/guiconfig.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'usr/local') diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc index 1241fd2..995e196 100755 --- a/usr/local/www/guiconfig.inc +++ b/usr/local/www/guiconfig.inc @@ -42,7 +42,6 @@ if(!$nocsrf) { } require_once("csrf/csrf-magic.php"); } -require_once("authgui.inc"); /* make sure nothing is cached */ if (!$omit_nocacheheaders) { @@ -53,6 +52,8 @@ if (!$omit_nocacheheaders) { header("Pragma: no-cache"); } +require_once("authgui.inc"); + /* parse the configuration and include all configuration functions */ require_once("functions.inc"); @@ -1079,4 +1080,4 @@ function rule_popup($src,$srcport,$dst,$dstport){ } } -?> \ No newline at end of file +?> -- cgit v1.1 From 69fec196d4f2a56c3390769c98e56ce4da292069 Mon Sep 17 00:00:00 2001 From: Ermal Date: Mon, 12 Nov 2012 11:44:29 +0000 Subject: Resolves #2679. Correct behaviour when port is null to avoid warnings on error log --- usr/local/www/diag_states_summary.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'usr/local') diff --git a/usr/local/www/diag_states_summary.php b/usr/local/www/diag_states_summary.php index fa49563..5138156 100644 --- a/usr/local/www/diag_states_summary.php +++ b/usr/local/www/diag_states_summary.php @@ -103,6 +103,8 @@ function sort_by_ip($a, $b) { } function build_port_info($portarr, $proto) { + if (!portarr) + return ''; $ports = array(); asort($portarr); foreach (array_reverse($portarr, TRUE) as $port => $count) { -- cgit v1.1 From 95a3099eae7744488078e985b3f8ff125f7cd683 Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Mon, 12 Nov 2012 14:56:56 +0100 Subject: fix last commit (#2679) --- usr/local/www/diag_states_summary.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usr/local') diff --git a/usr/local/www/diag_states_summary.php b/usr/local/www/diag_states_summary.php index 5138156..b273d9d 100644 --- a/usr/local/www/diag_states_summary.php +++ b/usr/local/www/diag_states_summary.php @@ -103,7 +103,7 @@ function sort_by_ip($a, $b) { } function build_port_info($portarr, $proto) { - if (!portarr) + if (!$portarr) return ''; $ports = array(); asort($portarr); -- cgit v1.1