From c23950b0bd95ae045f4a67badca1de262ba7ad81 Mon Sep 17 00:00:00 2001
From: Jos Schellevis <jos.schellevis@deciso.com>
Date: Wed, 10 Dec 2014 16:04:39 +0000
Subject: [PATCH] Fix traffic graph widget

---
 src/www/index.php                                  |  2 +-
 .../widgets/javascript/min/traffic_graph-min.js    |  1 -
 src/www/widgets/javascript/traffic_graph.js        |  4 +++-
 src/www/widgets/widgets/traffic_graphs.widget.php  | 14 +++++++++++---
 4 files changed, 15 insertions(+), 6 deletions(-)
 delete mode 100644 src/www/widgets/javascript/min/traffic_graph-min.js

diff --git a/src/www/index.php b/src/www/index.php
index ea3c2f98a..1935f3e18 100644
--- a/src/www/index.php
+++ b/src/www/index.php
@@ -530,7 +530,7 @@ echo $jscriptstr;
 				?>
 						<section class="col-xs-12 col-md-6 widgetdiv" id="<?php echo $widgetname;?>"  style="display:<?php echo $divdisplay; ?>;">
 				          	<div class="content-box">	          	
-					          									                    <form action="<?=$_SERVER['REQUEST_URI'];?>" method="post" id="iform">
+			   <form action="<?=$_SERVER['REQUEST_URI'];?>" method="post" id="iform">
 	           <input type="hidden" value="" name="sequence" id="sequence" />
 								<header class="content-box-head container-fluid">
 
diff --git a/src/www/widgets/javascript/min/traffic_graph-min.js b/src/www/widgets/javascript/min/traffic_graph-min.js
deleted file mode 100644
index 74eaddf0c..000000000
--- a/src/www/widgets/javascript/min/traffic_graph-min.js
+++ /dev/null
@@ -1 +0,0 @@
-function trafficshowDiv(e,t){selectedDiv=e+"graphdiv",jQuery("#"+selectedDiv).show(),d=document,t&&(selectIntLink=selectedDiv+"-min",textlink=d.getElementById(selectIntLink),textlink.style.display="inline",selectIntLink=selectedDiv+"-open",textlink=d.getElementById(selectIntLink),textlink.style.display="none")}function trafficminimizeDiv(e,t){selectedDiv=e+"graphdiv",jQuery("#"+selectedDiv).hide(),d=document,t&&(selectIntLink=selectedDiv+"-open",textlink=d.getElementById(selectIntLink),textlink.style.display="inline",selectIntLink=selectedDiv+"-min",textlink=d.getElementById(selectIntLink),textlink.style.display="none")}
\ No newline at end of file
diff --git a/src/www/widgets/javascript/traffic_graph.js b/src/www/widgets/javascript/traffic_graph.js
index 769fe66dd..9dfa2915b 100644
--- a/src/www/widgets/javascript/traffic_graph.js
+++ b/src/www/widgets/javascript/traffic_graph.js
@@ -1,7 +1,7 @@
 function trafficshowDiv(incDiv,swapButtons){
 	//appear element
 	selectedDiv = incDiv + "graphdiv";
-	jQuery('#' + selectedDiv).show();      
+	jQuery('#' + selectedDiv).show();  
 	d = document;	
 	if (swapButtons){
 		selectIntLink = selectedDiv + "-min";
@@ -12,6 +12,7 @@ function trafficshowDiv(incDiv,swapButtons){
 		textlink = d.getElementById(selectIntLink);
 		textlink.style.display = "none";
 	}
+	document.iform["shown[" + incDiv + "]"].value = "show";
 }
 	
 function  trafficminimizeDiv(incDiv,swapButtons){
@@ -28,5 +29,6 @@ function  trafficminimizeDiv(incDiv,swapButtons){
 		textlink = d.getElementById(selectIntLink);
 		textlink.style.display = "none";
 	} 
+	document.iform["shown[" + incDiv + "]"].value = "hide";
 }
 
diff --git a/src/www/widgets/widgets/traffic_graphs.widget.php b/src/www/widgets/widgets/traffic_graphs.widget.php
index a850f35b0..2b4d7c8b5 100644
--- a/src/www/widgets/widgets/traffic_graphs.widget.php
+++ b/src/www/widgets/widgets/traffic_graphs.widget.php
@@ -38,6 +38,12 @@ require_once("pfsense-utils.inc");
 require_once("functions.inc");
 
 $first_time = false;
+
+//var_dump($config["widgets"]["trafficgraphs"]);
+//$config["widgets"]["trafficgraphs"]["shown"]["item"][1]="lan";
+//write_config(gettext("Widget configuration has been changed."));
+
+
 if (!is_array($config["widgets"]["trafficgraphs"])) {
 	$first_time = true;
 	$config["widgets"]["trafficgraphs"] = array();
@@ -56,6 +62,7 @@ if (isset($config['ipsec']['enable']))
 	$ifdescrs['enc0'] = "IPsec";
 
 if ($_POST) {
+
 	if (isset($_POST["refreshinterval"])) {
 		$a_config["refreshinterval"] = $_POST["refreshinterval"];
 	}
@@ -100,12 +107,13 @@ if (isset($a_config["scale_type"])) {
 
 <div id="traffic_graphs-settings" class="widgetconfigdiv" style="display:none;">
 <form action="/widgets/widgets/traffic_graphs.widget.php" method="post" name="iform" id="iform">
+				<?php foreach ($ifdescrs as $ifname => $ifdescr) { ?>
+						<input type="hidden" name="shown[<?= $ifname ?>]" value="<?= $shown[$ifname] ? "show" : "hide" ?>" />
+						<?php } ?>
                         	
     <table class="table table-striped">
     	<tbody>
-			<?php foreach ($ifdescrs as $ifname => $ifdescr) { ?>
-						<input type="hidden" name="shown[<?= $ifname ?>]" value="<?= $shown[$ifname] ? "show" : "hide" ?>" />
-						<?php } ?>
+
 						<tr>
 							<td>
 								Default AutoScale: