From 63f686bde3e95eed8d2223d00e5f6403a5ef2d4c Mon Sep 17 00:00:00 2001
From: Stephen Jones <sjones@Administrators-MacBook-Air.local>
Date: Tue, 17 Oct 2017 15:00:08 -0500
Subject: [PATCH] Added JSON checks for widgets to prevent parsing errors.

---
 .../local/www/widgets/widgets/ipsec.widget.php | 18 ++++++++++--------
 .../netgate_services_and_support.widget.php    | 16 +++++++++++-----
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/usr/local/www/widgets/widgets/ipsec.widget.php b/src/usr/local/www/widgets/widgets/ipsec.widget.php
index 1513b1ed63..93786ef472 100644
--- a/src/usr/local/www/widgets/widgets/ipsec.widget.php
+++ b/src/usr/local/www/widgets/widgets/ipsec.widget.php
@@ -28,7 +28,7 @@
 
 $nocsrf = true;
 
-require_once("auth_check.inc");
+require_once("guiconfig.inc");
 require_once("functions.inc");
 require_once("ipsec.inc");
 
@@ -253,9 +253,7 @@ if (isset($config['ipsec']['phase2'])): ?>
 		<p  style="padding-left:10px;"><?=gettext('IPsec can be configured <a href="vpn_ipsec.php">here</a>.')?></p>
 	</div>
 <?php endif;
-// This function was in index.php It seems that the ipsec widget is the only place it is used
-// so now it lives here. It wouldn't hurt to update this function and the tab display, but it
-// looks OK for now. The display_widget_tabs() function in guiconfig.inc would need to be updated to match
+
 ?>
 <script type="text/javascript">
 //<![CDATA[
@@ -310,11 +308,15 @@ events.push(function(){
 
 	// Callback function called by refresh system when data is retrieved
 	function ipsec_callback(s) {
-		var obj = JSON.parse(s);
+		try{
+			var obj = JSON.parse(s);
 
-		$('tbody', '#<?=$widgetkey_nodash?>-Overview').html(obj.overview);
-		$('tbody', '#<?=$widgetkey_nodash?>-tunnel').html(obj.tunnel);
-		$('tbody', '#<?=$widgetkey_nodash?>-mobile').html(obj.mobile);
+			$('tbody', '#<?=$widgetkey_nodash?>-Overview').html(obj.overview);
+			$('tbody', '#<?=$widgetkey_nodash?>-tunnel').html(obj.tunnel);
+			$('tbody', '#<?=$widgetkey_nodash?>-mobile').html(obj.mobile);
+		}catch(e){
+
+		}
 	}
 
 	// POST data to send via AJAX
diff --git a/src/usr/local/www/widgets/widgets/netgate_services_and_support.widget.php b/src/usr/local/www/widgets/widgets/netgate_services_and_support.widget.php
index 0d8b28b7fe..995af1f439 100644
--- a/src/usr/local/www/widgets/widgets/netgate_services_and_support.widget.php
+++ b/src/usr/local/www/widgets/widgets/netgate_services_and_support.widget.php
@@ -137,12 +137,18 @@ print("</div>");
 
 				success: function(data){
 					if (data.length > 0) {
-						var obj = JSON.parse(data);
+						try{
+							var obj = JSON.parse(data);
+
+							$('#summary').removeClass("alert");
+							$('#summary').removeClass("alert-warning");
+							$('#summary').html(obj.summary);
+							$('#htmltxt').html(obj.htmltext);
+
+						}catch(e){
+
+						}
 
-						$('#summary').removeClass("alert");
-						$('#summary').removeClass("alert-warning");
-						$('#summary').html(obj.summary);
-						$('#htmltxt').html(obj.htmltext);
 					}
 				},