From 89c871dfe34520725286dd0e5097871d2886a069 Mon Sep 17 00:00:00 2001
From: dg9vh <kim@huebel-online.de>
Date: Wed, 12 Oct 2016 20:31:36 +0000
Subject: [PATCH] relocated javascripts for better performance if disabling
 sections

---
 include/lh_ajax.php        | 26 ++++++++++++++++++
 include/localtx_ajax.php   | 26 ++++++++++++++++++
 include/sysinfo_ajax.php   |  1 -
 include/ysfgatewayinfo.php |  8 ++++++
 index.php                  | 54 --------------------------------------
 txinfo.php                 |  2 +-
 version.php                |  2 +-
 7 files changed, 62 insertions(+), 57 deletions(-)

diff --git a/include/lh_ajax.php b/include/lh_ajax.php
index df63327..085dd13 100644
--- a/include/lh_ajax.php
+++ b/include/lh_ajax.php
@@ -30,4 +30,30 @@ $totalLH = count($lastHeard);
     </table>
   </div>  
 </div>
+<script>
+$(document).ready(function(){
+  var lastHeardT = $('#lastHeard').dataTable( {
+	"aaSorting": [[0,'desc']],
+	"ajax": '<?php
+	$protocol = "http";
+	if ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') || $_SERVER['SERVER_PORT'] == 443) 
+  		$protocol = "https";
+  	echo $protocol."://";
+	$base_dir  = __DIR__;// Absolute path to your installation, ex: /var/www/mywebsite
+	$base_dir = substr($basedir,0,strpos($basedir,"include"));
+	$doc_root  = preg_replace("!${_SERVER['SCRIPT_NAME']}$!", '', $_SERVER['SCRIPT_FILENAME']); # ex: /var/www
+	echo $_SERVER['HTTP_HOST'].preg_replace("!^${doc_root}!", '', $base_dir) ?>/ajax.php?section=lastHeard',
+	"deferRender": true
+  } );
 
+<?php
+	if (!isset($_GET['stoprefresh'])) {
+?>
+setInterval( function () {
+    lastHeardT.api().ajax.reload( );
+}, <?php echo REFRESHAFTER * 1000 ?> );
+<?php		
+	}
+?>  
+});
+</script>
diff --git a/include/localtx_ajax.php b/include/localtx_ajax.php
index 02cd1d5..7dd6716 100644
--- a/include/localtx_ajax.php
+++ b/include/localtx_ajax.php
@@ -30,4 +30,30 @@ $totalLH = count($lastHeard);
     </table>
   </div>  
 </div>
+<script>
+$(document).ready(function(){
+	var localTxT = $('#localTx').dataTable( {
+    "aaSorting": [[0,'desc']],
+	"ajax": '<?php
+	$protocol = "http";
+	if ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') || $_SERVER['SERVER_PORT'] == 443) 
+  		$protocol = "https";
+  	echo $protocol."://";
+	$base_dir  = __DIR__; // Absolute path to your installation, ex: /var/www/mywebsite
+	$base_dir = substr($basedir,0,strpos($basedir,"include"));
+	$doc_root  = preg_replace("!${_SERVER['SCRIPT_NAME']}$!", '', $_SERVER['SCRIPT_FILENAME']); # ex: /var/www
+	echo $_SERVER['HTTP_HOST'].preg_replace("!^${doc_root}!", '', $base_dir) ?>/ajax.php?section=localTx',
+	"deferRender": true
+  } );
 
+<?php
+	if (!isset($_GET['stoprefresh'])) {
+?>
+setInterval( function () {
+    localTxT.api().ajax.reload( );
+}, <?php echo REFRESHAFTER * 1000 ?> );
+<?php		
+	}
+?>
+});
+</script>
diff --git a/include/sysinfo_ajax.php b/include/sysinfo_ajax.php
index cae62c1..d699442 100644
--- a/include/sysinfo_ajax.php
+++ b/include/sysinfo_ajax.php
@@ -25,7 +25,6 @@ function loadXMLDocSysinfo() {
 	xmlhttp.send();
 
 	var timeout = window.setTimeout("loadXMLDocSysinfo()", 20000);
-	refreshMode();
 }
 loadXMLDocSysinfo();
 </script>
diff --git a/include/ysfgatewayinfo.php b/include/ysfgatewayinfo.php
index 8781ef7..bd4923a 100644
--- a/include/ysfgatewayinfo.php
+++ b/include/ysfgatewayinfo.php
@@ -56,3 +56,11 @@
   </table>
   </div>
 </div>
+
+<script>
+$(document).ready(function(){
+var ysfGatewaysT = $('#ysfGateways').dataTable( {
+    "aaSorting": [[0,'asc']]
+  } );
+});
+</script>
diff --git a/index.php b/index.php
index 0382bb6..d6105f5 100644
--- a/index.php
+++ b/index.php
@@ -106,60 +106,6 @@ if (!isset($_GET['stoprefresh'])) {
 ?>
  | get your own at: <a href="https://github.com/dg9vh/MMDVMHost-Dashboard">https://github.com/dg9vh/MMDVMHost-Dashboard</a>
 	</div>
-<script>
-$(document).ready(function(){
-  
-var lastHeardT = $('#lastHeard').dataTable( {
-	"aaSorting": [[0,'desc']],
-	"ajax": '<?php
-	$protocol = "http";
-	if ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') || $_SERVER['SERVER_PORT'] == 443) 
-  		$protocol = "https";
-  	echo $protocol."://";
-	$base_dir  = __DIR__; // Absolute path to your installation, ex: /var/www/mywebsite
-	$doc_root  = preg_replace("!${_SERVER['SCRIPT_NAME']}$!", '', $_SERVER['SCRIPT_FILENAME']); # ex: /var/www
-	echo $_SERVER['HTTP_HOST'].preg_replace("!^${doc_root}!", '', $base_dir) ?>/ajax.php?section=lastHeard',
-	"deferRender": true
-  } );
-
-<?php
-	if (!isset($_GET['stoprefresh'])) {
-?>
-setInterval( function () {
-    lastHeardT.api().ajax.reload( );
-}, <?php echo REFRESHAFTER * 1000 ?> );
-<?php		
-	}
-?>  
-
-var localTxT = $('#localTx').dataTable( {
-    "aaSorting": [[0,'desc']],
-	"ajax": '<?php
-	$protocol = "http";
-	if ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') || $_SERVER['SERVER_PORT'] == 443) 
-  		$protocol = "https";
-  	echo $protocol."://";
-	$base_dir  = __DIR__; // Absolute path to your installation, ex: /var/www/mywebsite
-	$doc_root  = preg_replace("!${_SERVER['SCRIPT_NAME']}$!", '', $_SERVER['SCRIPT_FILENAME']); # ex: /var/www
-	echo $_SERVER['HTTP_HOST'].preg_replace("!^${doc_root}!", '', $base_dir) ?>/ajax.php?section=localTx',
-	"deferRender": true
-  } );
-
-<?php
-	if (!isset($_GET['stoprefresh'])) {
-?>
-setInterval( function () {
-    localTxT.api().ajax.reload( );
-}, <?php echo REFRESHAFTER * 1000 ?> );
-<?php		
-	}
-?>
-
-var ysfGatewaysT = $('#ysfGateways').dataTable( {
-    "aaSorting": [[0,'asc']]
-  } );
-});
-</script>
 	<noscript>
 	 For full functionality of this site it is necessary to enable JavaScript.
 	 Here are the <a href="http://www.enable-javascript.com/" target="_blank">
diff --git a/txinfo.php b/txinfo.php
index 0e873bd..c6dad15 100644
--- a/txinfo.php
+++ b/txinfo.php
@@ -10,7 +10,7 @@ $logLinesMMDVM = getShortMMDVMLog();
 $reverseLogLinesMMDVM = $logLinesMMDVM;
 array_multisort($reverseLogLinesMMDVM,SORT_DESC);
 $lastHeard = getLastHeard($reverseLogLinesMMDVM, True);
-$oldLastHeard = $_SESSION['lastHeard'];
+//$oldLastHeard = $_SESSION['lastHeard'];
 echo"<!--";
 var_dump($lastHeard);
 echo"-->";
diff --git a/version.php b/version.php
index 812fd84..5e8d05c 100644
--- a/version.php
+++ b/version.php
@@ -1,3 +1,3 @@
 <?php
-define("VERSION", "20161012-2");
+define("VERSION", "20161012-3");
 ?>