aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryce Chidester <bryce@cobryce.com>2015-01-24 14:15:26 -0800
committerjim-p <jimp@pfsense.org>2015-02-10 11:42:28 -0500
commitb852b5cd883b3d059bc3744fc7b130531a5f20ed (patch)
treeef6c1fd6941634c7c94cc8e8928b8b8948480f55
parent14f241199fde80e9e29b68ca4ceb3c046e7662c7 (diff)
downloadpfsense-packages-b852b5cd883b3d059bc3744fc7b130531a5f20ed.tar.gz
pfsense-packages-b852b5cd883b3d059bc3744fc7b130531a5f20ed.tar.bz2
pfsense-packages-b852b5cd883b3d059bc3744fc7b130531a5f20ed.zip
Remove conflicting variable $g in mailreports' mail_report_generate_graph()
Fixes #4281
-rw-r--r--config/mailreport/mail_reports.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/config/mailreport/mail_reports.inc b/config/mailreport/mail_reports.inc
index 669b1541..20632a2e 100644
--- a/config/mailreport/mail_reports.inc
+++ b/config/mailreport/mail_reports.inc
@@ -532,7 +532,7 @@ function mail_report_generate_graph($database, $style, $graph, $start, $end) {
$graphcmd .= "--height 200 --width 620 ";
$iflist = get_configured_interface_list();
- $g = 0;
+ $h = 0;
$operand = "";
$comma = "";
$graphtputbip = "";
@@ -578,7 +578,7 @@ function mail_report_generate_graph($database, $style, $graph, $start, $end) {
$graphcmd .= "CDEF:\"{$ifname}-bytes_out_t_block={$ifname}-out_bytes,0,$speedlimit,LIMIT,UN,0,{$ifname}-out_bytes_block,IF,$seconds,*\" ";
$graphcmd .= "CDEF:\"{$ifname}-bytes_t_pass={$ifname}-bytes_in_t_pass,{$ifname}-bytes_out_t_pass,+\" ";
$graphcmd .= "CDEF:\"{$ifname}-bytes_t_block={$ifname}-bytes_in_t_block,{$ifname}-bytes_out_t_block,+\" ";
- if ($g > 0) {
+ if ($h > 0) {
$operand .= ",+";
$comma = ",";
}
@@ -594,7 +594,7 @@ function mail_report_generate_graph($database, $style, $graph, $start, $end) {
$graphtputbyob .= "{$comma}{$ifname}-bytes_out_t_block";
$graphtputbytp .= "{$comma}{$ifname}-bytes_t_pass";
$graphtputbytb .= "{$comma}{$ifname}-bytes_t_block";
- $g++;
+ $h++;
}
$graphcmd .= "CDEF:\"tput-in_bits_pass={$graphtputbip}{$operand}\" ";
$graphcmd .= "CDEF:\"tput-out_bits_pass={$graphtputbop}{$operand}\" ";