From 18d3f1e7a080a16dcc4faf0dd4f1bbcbbedbf58f Mon Sep 17 00:00:00 2001
From: m-lopez-f <miguel.lopez@artica.es>
Date: Thu, 8 Sep 2016 09:50:13 +0200
Subject: [PATCH] Fixed problems with auto-refresh

---
 .../visual_console/public_console.php         | 52 +++++++++--------
 .../operation/visual_console/render_view.php  | 58 ++++++++++---------
 2 files changed, 59 insertions(+), 51 deletions(-)

diff --git a/pandora_console/operation/visual_console/public_console.php b/pandora_console/operation/visual_console/public_console.php
index b231683746..9233615b41 100755
--- a/pandora_console/operation/visual_console/public_console.php
+++ b/pandora_console/operation/visual_console/public_console.php
@@ -134,11 +134,13 @@ echo '</div>';
 ui_require_jquery_file('countdown');
 ui_require_javascript_file('wz_jsgraphics');
 ui_require_javascript_file('pandora_visual_console');
+$ignored_params['refr'] = '';
 ?>
 
 <script language="javascript" type="text/javascript">
 	$(document).ready(function () {
 		var refr = <?php echo (int) $refr; ?>;
+		var href = "<?php echo ui_get_url_refresh ($ignored_params); ?>";
 		
 		var startCountDown = function (duration, cb) {
 			$('div.vc-countdown').countdown('destroy');
@@ -152,42 +154,44 @@ ui_require_javascript_file('pandora_visual_console');
 				alwaysExpire: true,
 				onExpiry: function () {
 					$('div.vc-countdown').countdown('destroy');
-					cb();
+					//~ cb();
+					url = js_html_entity_decode( href ) + duration;
+					$(document).attr ("location", url);
 				}
 			});
 		}
 		
-		var fetchMap = function () {
-			$.ajax({
-				url: 'public_console.php',
-				type: 'GET',
-				dataType: 'html',
-				data: {
-					hash: '<?php echo $hash; ?>',
-					id_layout: <?php echo $id_layout; ?>,
-					graph_javascript: <?php echo (int) $graph_javascript; ?>,
-					id_user: '<?php echo $config['id_user']; ?>',
-					width: $(window).width(),
-					height: $(window).height(),
-					xhr: true
-				}
-			})
-			.done(function (data, textStatus, xhr) {
-				$('div#vc-container').html(data);
-				startCountDown(refr, fetchMap);
-			});
-		}
-		
+		//~ var fetchMap = function () {
+			//~ $.ajax({
+				//~ url: 'public_console.php',
+				//~ type: 'GET',
+				//~ dataType: 'html',
+				//~ data: {
+					//~ hash: '<?php echo $hash; ?>',
+					//~ id_layout: <?php echo $id_layout; ?>,
+					//~ graph_javascript: <?php echo (int) $graph_javascript; ?>,
+					//~ id_user: '<?php echo $config['id_user']; ?>',
+					//~ width: $(window).width(),
+					//~ height: $(window).height(),
+					//~ xhr: true
+				//~ }
+			//~ })
+			//~ .done(function (data, textStatus, xhr) {
+				//~ $('div#vc-container').html(data);
+				//~ startCountDown(refr, fetchMap);
+			//~ });
+		//~ }
+		startCountDown(refr, false);
 		// Auto hide controls
 		var controls = document.getElementById('vc-controls');
 		autoHideElement(controls, 1000);
 		
 		$('select#refr').change(function (event) {
 			refr = Number.parseInt(event.target.value, 10);
-			startCountDown(refr, fetchMap);
+			startCountDown(refr, false);
 		});
 		
 		// Start the map fetch
-		fetchMap();
+		//~ fetchMap();
 	});
 </script>
diff --git a/pandora_console/operation/visual_console/render_view.php b/pandora_console/operation/visual_console/render_view.php
index 24f69a76ee..7eaedd4eba 100755
--- a/pandora_console/operation/visual_console/render_view.php
+++ b/pandora_console/operation/visual_console/render_view.php
@@ -209,31 +209,34 @@ else {
 
 ui_require_javascript_file('wz_jsgraphics');
 ui_require_javascript_file('pandora_visual_console');
-
+$ignored_params['refr'] = '';
 ?>
 
 <script language="javascript" type="text/javascript">
 	$(document).ready (function () {
-		var refr = <?php echo $refr; ?>;
+		var refr = <?php echo (int)$refr; ?>;
 		var pure = <?php echo (int) $config['pure']; ?>;
-			
+		var href = "<?php echo ui_get_url_refresh ($ignored_params); ?>";
+		
 		if (pure) {
-			//~ var startCountDown = function (duration, cb) {
-				//~ $('div.vc-countdown').countdown('destroy');
-				//~ if (!duration) return;
-				//~ var t = new Date();
-				//~ t.setTime(t.getTime() + duration * 1000);
-				//~ $('div.vc-countdown').countdown({
-					//~ until: t,
-					//~ format: 'MS',
-					//~ layout: '(%M%nn%M:%S%nn%S <?php echo __('Until refresh'); ?>) ',
-					//~ alwaysExpire: true,
-					//~ onExpiry: function () {
-						//~ $('div.vc-countdown').countdown('destroy');
-						//~ cb();
-					//~ }
-				//~ });
-			//~ }
+			var startCountDown = function (duration, cb) {
+				$('div.vc-countdown').countdown('destroy');
+				if (!duration) return;
+				var t = new Date();
+				t.setTime(t.getTime() + duration * 1000);
+				$('div.vc-countdown').countdown({
+					until: t,
+					format: 'MS',
+					layout: '(%M%nn%M:%S%nn%S <?php echo __('Until refresh'); ?>) ',
+					alwaysExpire: true,
+					onExpiry: function () {
+						$('div.vc-countdown').countdown('destroy');
+						//cb();
+						url = js_html_entity_decode( href ) + duration;
+						$(document).attr ("location", url);
+					}
+				});
+			}
 			
 			//~ var fetchMap = function () {
 				//~ $.ajax({
@@ -252,17 +255,18 @@ ui_require_javascript_file('pandora_visual_console');
 				//~ })
 				//~ .done(function (data, textStatus, xhr) {
 					//~ $('div#vc-container').html(data);
-					//~ startCountDown(refr, fetchMap);
+					//~ startCountDown(refr, false);
 				//~ });
 			//~ }
-			
+			startCountDown(refr, false);
 			//~ // Auto hide controls
-			//~ var controls = document.getElementById('vc-controls');
-			//~ autoHideElement(controls, 1000);
-			//~ $('select#refr').change(function (event) {
-				//~ refr = Number.parseInt(event.target.value, 10);
-				//~ startCountDown(refr, fetchMap);
-			//~ });
+			var controls = document.getElementById('vc-controls');
+			autoHideElement(controls, 1000);
+			
+			$('select#refr').change(function (event) {
+				refr = Number.parseInt(event.target.value, 10);
+				startCountDown(refr, false);
+			});
 			
 			//~ // Start the map fetch
 			//~ fetchMap();