From 236e6a54e9a93284ca170b68aa1188dfaa195c3d Mon Sep 17 00:00:00 2001
From: Stephen Beaver <sbeaver@netgate.com>
Date: Mon, 1 Aug 2016 20:05:45 -0400
Subject: Fixed #6669 Read widget config before adding a new one. (Was starting
 a new array)

---
 src/usr/local/www/index.php                                 | 4 +++-
 src/usr/local/www/widgets/widgets/traffic_graphs.widget.php | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/usr/local/www/index.php b/src/usr/local/www/index.php
index 352823a..808b1df 100644
--- a/src/usr/local/www/index.php
+++ b/src/usr/local/www/index.php
@@ -122,7 +122,9 @@ if (!is_array($config['widgets'])) {
 
 if ($_POST && $_POST['sequence']) {
 
-	$widget_settings = array();
+	// Read in the existing widget settings
+	$widget_settings = $config['widgets'];
+
 	$widget_settings['sequence'] = rtrim($_POST['sequence'], ',');
 
 	foreach ($widgets as $widgetname => $widgetconfig) {
diff --git a/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php b/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php
index 47ef135..c770975 100644
--- a/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php
+++ b/src/usr/local/www/widgets/widgets/traffic_graphs.widget.php
@@ -34,20 +34,24 @@ require_once("ipsec.inc");
 require_once("functions.inc");
 
 $first_time = false;
+
 if (!is_array($config["widgets"]["trafficgraphs"])) {
 	$first_time = true;
 	$config["widgets"]["trafficgraphs"] = array();
 }
+
 $a_config = &$config["widgets"]["trafficgraphs"];
 
 if (!is_array($a_config["shown"])) {
 	$a_config["shown"] = array();
 }
+
 if (!is_array($a_config["shown"]["item"])) {
 	$a_config["shown"]["item"] = array();
 }
 
 $ifdescrs = get_configured_interface_with_descr();
+
 if (ipsec_enabled()) {
 	$ifdescrs['enc0'] = "IPsec";
 }
@@ -75,6 +79,7 @@ if ($_POST) {
 }
 
 $shown = array();
+
 foreach ($a_config["shown"]["item"] as $if) {
 	$shown[$if] = true;
 }
-- 
cgit v1.1