From 71db3237c35ee06c91b10ec9c0c784ce80d639c0 Mon Sep 17 00:00:00 2001
From: dg9vh <kim@huebel-online.de>
Date: Thu, 13 Oct 2016 15:44:40 +0000
Subject: [PATCH] first try to fix
 https://github.com/dg9vh/MMDVMHost-Dashboard/issues/51

---
 include/lh_ajax.php      | 15 ++++++---------
 include/localtx_ajax.php | 16 +++++++---------
 version.php              |  2 +-
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/include/lh_ajax.php b/include/lh_ajax.php
index 085dd13..e09e207 100644
--- a/include/lh_ajax.php
+++ b/include/lh_ajax.php
@@ -34,15 +34,12 @@ $totalLH = count($lastHeard);
 $(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',
+	<?php $request = 'http' . (isset($_SERVER['HTTPS']) ? 's' : '') . '://' . "{$_SERVER['HTTP_HOST']}/{$_SERVER['REQUEST_URI']}"; 
+	if (strpos($request,"index.php")> 0) {
+		$request = substr($request,0,strpos($request,"index.php"));
+	}
+	?>
+	"ajax": '<?php echo $request?>/ajax.php?section=lastHeard',
 	"deferRender": true
   } );
 
diff --git a/include/localtx_ajax.php b/include/localtx_ajax.php
index 7dd6716..d1a1124 100644
--- a/include/localtx_ajax.php
+++ b/include/localtx_ajax.php
@@ -34,15 +34,13 @@ $totalLH = count($lastHeard);
 $(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',
+	
+	<?php $request = 'http' . (isset($_SERVER['HTTPS']) ? 's' : '') . '://' . "{$_SERVER['HTTP_HOST']}/{$_SERVER['REQUEST_URI']}"; 
+	if (strpos($request,"index.php")> 0) {
+		$request = substr($request,0,strpos($request,"index.php"));
+	}
+	?>
+	"ajax": '<?php echo $request?>/ajax.php?section=localTx',
 	"deferRender": true
   } );
 
diff --git a/version.php b/version.php
index 5e8d05c..8b0cd94 100644
--- a/version.php
+++ b/version.php
@@ -1,3 +1,3 @@
 <?php
-define("VERSION", "20161012-3");
+define("VERSION", "20161013-1");
 ?>