Fix: #6065 - Preview Page not longer refreshes

Cacti · Jan 17, 2025 · 096a403 · 096a403
1 parent 9c34682
commit 096a403
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -17,6 +17,7 @@ Cacti CHANGELOG
 -issue#5963: Cacti caching for db_table_exists() and db_column_exists() is not connection aware and replication does not replicate empty table structures
 -issue#5986: PHP ERRORS with php8.4 while including global_arrays.php
 -issue#5987: Please add a new line to upgrade_database script 
+-issue#6065: Preview page no longer refreshes
 -feature#5921: Add HPE Nimble/Alletra template
 -feature#5933: Only attempt to change the table type and character encoding for built-in Cacti tables
 

diff --git a/graph_view.php b/graph_view.php
@@ -329,19 +329,26 @@ function get_matching_nodes() {
 
 	?>
 	<script type='text/javascript'>
-	var refreshIsLogout = false;
-	var refreshPage     = '<?php print str_replace('tree_content', 'tree', sanitize_uri($_SERVER['REQUEST_URI']));?>';
-	var refreshMSeconds = <?php print read_user_setting('page_refresh')*1000;?>;
+
 	var graph_start     = <?php print get_current_graph_start();?>;
 	var graph_end       = <?php print get_current_graph_end();?>;
 	var timeOffset      = <?php print date('Z');?>
 
-	// Adjust the height of the tree
+	/**
+	 * Adjust the height of the tree and set the page refresh
+	 */
 	$(function() {
-		pageAction   = 'tree';
-		navHeight    = $('.cactiTreeNavigationArea').height();
-		windowHeight = $(window).height();
-		navOffset    = $('.cactiTreeNavigationArea').offset();
+		/* these are all global variables */
+		refreshIsLogout = false;
+		refreshPage     = '<?php print str_replace('tree_content', 'tree', sanitize_uri($_SERVER['REQUEST_URI']));?>';
+		refreshMSeconds = <?php print read_user_setting('page_refresh')*1000;?>;
+		pageAction      = 'tree';
+		navHeight       = $('.cactiTreeNavigationArea').height();
+		windowHeight    = $(window).height();
+		navOffset       = $('.cactiTreeNavigationArea').offset();
+
+		setupPageTimeout();
+
 		if (navHeight + navOffset.top < windowHeight) {
 			$('.cactiTreeNavigationArea').height(windowHeight - navOffset.top);
 		}

diff --git a/lib/html_graph.php b/lib/html_graph.php
@@ -350,8 +350,6 @@ function html_graph_preview_filter($page, $action, $devices_where = '', $templat
 		</form>
 		<script type='text/javascript'>
 
-    	var refreshIsLogout = false;
-		var refreshMSeconds = <?php print read_user_setting('page_refresh')*1000;?>;
 		var graph_start     = <?php print get_current_graph_start();?>;
 		var graph_end       = <?php print get_current_graph_end();?>;
 		var timeOffset      = <?php print date('Z');?>;
@@ -405,6 +403,12 @@ function initPage() {
 		}
 
 		$(function() {
+			refreshIsLogout = false;
+			refreshIsLogout = false;
+			refreshMSeconds = <?php print read_user_setting('page_refresh')*1000;?>;
+
+			setupPageTimeout();
+
 			$('#go').off('click').on('click', function(event) {
 				event.preventDefault();
 				applyGraphFilter();