From a1e8a7241bbb59edc8b32a9710fd0445e6796f93 Mon Sep 17 00:00:00 2001
From: oesi <oesi@technikum-wien.at>
Date: Wed, 2 Dec 2015 10:11:41 +0100
Subject: [PATCH] HTTPS Ermittlung korrigiert

---
 include/meta/easyui.php             | 3 +--
 include/meta/jquery-tablesorter.php | 3 +--
 include/meta/jquery.php             | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/include/meta/easyui.php b/include/meta/easyui.php
index b923dd4e5..0970268bb 100644
--- a/include/meta/easyui.php
+++ b/include/meta/easyui.php
@@ -20,12 +20,11 @@
 //require_once(dirname(__FILE__).'/config/vilesci.config.inc.php'); Muss vor dieser Datei eingebunden werden!
 
 $ar = APP_ROOT;
-if(isset($_SERVER["https"]) && $_SERVER["https"] != "")
+if(isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] != "" && $_SERVER["HTTPS"] != "off")
 	$ar = preg_replace("/^http:/i", "https:", $ar);
 else
 	$ar = preg_replace("/^https:/i", "http:", $ar);
 
-
 //Originaldateien des Herstellers
 echo '<link rel="stylesheet" type="text/css" href="'.$ar.'vendor/FHC-vendor/easyui/themes/icon.css">';
 echo '<link rel="stylesheet" type="text/css" href="'.$ar.'vendor/FHC-vendor/easyui/themes/gray/easyui.css">';
diff --git a/include/meta/jquery-tablesorter.php b/include/meta/jquery-tablesorter.php
index 95f731036..845febbe0 100644
--- a/include/meta/jquery-tablesorter.php
+++ b/include/meta/jquery-tablesorter.php
@@ -19,9 +19,8 @@
  */
 //require_once(dirname(__FILE__).'/config/vilesci.config.inc.php'); Muss vor dieser Datei eingebunden werden!
 
-
 $ar = APP_ROOT;
-if(isset($_SERVER["https"]) && $_SERVER["https"] != "")
+if(isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] != "" && $_SERVER["HTTPS"] != "off")
 	$ar = preg_replace("/^http:/i", "https:", $ar);
 else
 	$ar = preg_replace("/^https:/i", "http:", $ar);
diff --git a/include/meta/jquery.php b/include/meta/jquery.php
index 78521cf00..0415758f5 100644
--- a/include/meta/jquery.php
+++ b/include/meta/jquery.php
@@ -21,7 +21,7 @@
 
 
 $ar = APP_ROOT;
-if(isset($_SERVER["https"]) && $_SERVER["https"] != "")
+if(isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] != "" && $_SERVER["HTTPS"] != "off")
 	$ar = preg_replace("/^http:/i", "https:", $ar);
 else
 	$ar = preg_replace("/^https:/i", "http:", $ar);