From d2a8576375744216b79491caccfe3c7eaae7a69b Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 25 Jan 2018 22:03:24 +0100
Subject: [PATCH] Dashboard/widgets, ready() triggered twice, replace with
 $(window).load() to prevent duplicate requests. closes
 https://github.com/opnsense/core/issues/2104

---
 src/www/widgets/widgets/ipsec.widget.php      |  2 +-
 src/www/widgets/widgets/log.widget.php        |  6 +--
 src/www/widgets/widgets/ntp_status.widget.php | 44 ++++++++++---------
 src/www/widgets/widgets/openvpn.widget.php    |  2 +-
 .../widgets/system_information.widget.php     |  2 +-
 .../widgets/widgets/traffic_graphs.widget.php |  2 +-
 6 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/src/www/widgets/widgets/ipsec.widget.php b/src/www/widgets/widgets/ipsec.widget.php
index b91597b3c..41846bed7 100644
--- a/src/www/widgets/widgets/ipsec.widget.php
+++ b/src/www/widgets/widgets/ipsec.widget.php
@@ -76,7 +76,7 @@ if (isset($config['ipsec']['phase1'])) {
 if (isset($config['ipsec']['phase2'])) {
 ?>
 <script>
-    $(document).ready(function() {
+    $(window).load(function() {
         $(".ipsec-tab").click(function(){
             $(".ipsec-tab").css('background-color', '#777777');
             $(".ipsec-tab").css('color', 'white');
diff --git a/src/www/widgets/widgets/log.widget.php b/src/www/widgets/widgets/log.widget.php
index 6f126f432..f5aa05084 100644
--- a/src/www/widgets/widgets/log.widget.php
+++ b/src/www/widgets/widgets/log.widget.php
@@ -73,7 +73,7 @@ $nentriesinterfaces = isset($config['widgets']['filterlogentriesinterfaces']) ?
 ?>
 
 <script>
-    $( document ).ready(function() {
+    $(window).load(function() {
         // needed to display the widget settings menu
         $("#log-configure").removeClass("disabled");
         // icons
@@ -161,9 +161,9 @@ $nentriesinterfaces = isset($config['widgets']['filterlogentriesinterfaces']) ?
                 }
                 $("#filter-log-entries > tbody > tr:gt("+(parseInt($("#filterlogentries").val())-1)+")").remove();
                 $("#filter-log-entries > tbody > tr").show();
+                // schedule next fetch
             });
-            // schedule next fetch
-            setTimeout(fetch_log, 2000);
+            setTimeout(fetch_log, 5000);
         }
 
         fetch_log();
diff --git a/src/www/widgets/widgets/ntp_status.widget.php b/src/www/widgets/widgets/ntp_status.widget.php
index fb1b908c6..5b060dd28 100644
--- a/src/www/widgets/widgets/ntp_status.widget.php
+++ b/src/www/widgets/widgets/ntp_status.widget.php
@@ -478,25 +478,27 @@ function clockUpdate()
 
 
 <script>
-  function ntp_getstatus() {
-    scroll(0,0);
-    var url = "/widgets/widgets/ntp_status.widget.php";
-    var pars = 'updateme=yes';
-    jQuery.ajax(
-      url,
-      {
-        type: 'get',
-        data: pars,
-        complete: ntpstatuscallback
-      });
-    // Refresh the status every 1 minute
-    setTimeout('ntp_getstatus()', 1*60*1000);
-  }
-  function ntpstatuscallback(transport) {
-    // The server returns formatted html code
-    var responseStringNtp = transport.responseText
-    jQuery('#ntpstatus').prop('innerHTML',responseStringNtp);
-  }
-  // Do the first status check 1 second after the dashboard opens
-  setTimeout('ntp_getstatus()', 1000);
+    $(window).load(function() {
+        function ntp_getstatus() {
+          scroll(0,0);
+          var url = "/widgets/widgets/ntp_status.widget.php";
+          var pars = 'updateme=yes';
+          jQuery.ajax(
+            url,
+            {
+              type: 'get',
+              data: pars,
+              complete: ntpstatuscallback
+            });
+          // Refresh the status every 1 minute
+          setTimeout('ntp_getstatus()', 1*60*1000);
+        }
+        function ntpstatuscallback(transport) {
+          // The server returns formatted html code
+          var responseStringNtp = transport.responseText
+          jQuery('#ntpstatus').prop('innerHTML',responseStringNtp);
+        }
+        // Do the first status check 1 second after the dashboard opens
+        setTimeout('ntp_getstatus()', 1000);
+    });
 </script>
diff --git a/src/www/widgets/widgets/openvpn.widget.php b/src/www/widgets/widgets/openvpn.widget.php
index e2731653c..14a543f4c 100644
--- a/src/www/widgets/widgets/openvpn.widget.php
+++ b/src/www/widgets/widgets/openvpn.widget.php
@@ -35,7 +35,7 @@ $clients = openvpn_get_active_clients();
 
 ?>
 <script>
-    $( document ).ready(function() {
+    $(window).load(function() {
         // link kill buttons
         $(".act_kill_client").click(function(event){
             event.preventDefault();
diff --git a/src/www/widgets/widgets/system_information.widget.php b/src/www/widgets/widgets/system_information.widget.php
index e473d214c..6aac54adc 100644
--- a/src/www/widgets/widgets/system_information.widget.php
+++ b/src/www/widgets/widgets/system_information.widget.php
@@ -135,7 +135,7 @@ require_once("system.inc");
   /**
    * page setup
    */
-  $( document ).ready(function() {
+  $(window).load(function() {
       // draw cpu graph
       nv.addGraph(function() {
           system_information_widget_cpu_chart = nv.models.lineChart()
diff --git a/src/www/widgets/widgets/traffic_graphs.widget.php b/src/www/widgets/widgets/traffic_graphs.widget.php
index 951302fe2..7a81126c6 100644
--- a/src/www/widgets/widgets/traffic_graphs.widget.php
+++ b/src/www/widgets/widgets/traffic_graphs.widget.php
@@ -114,7 +114,7 @@
   /**
    * page setup
    */
-  $( document ).ready(function() {
+  $(window).load(function() {
       // draw traffic in graph
       nv.addGraph(function() {
           traffic_graph_widget_chart_in = nv.models.lineChart()