From fe8b7e1663fe4d5dce4c01871ac041ed31d8bf09 Mon Sep 17 00:00:00 2001
From: Franck Allimant <franck@cqfdev.fr>
Date: Thu, 19 Jun 2014 01:15:43 +0200
Subject: [PATCH] Simplified base URL construction code.

---
 .../js/tinymce/filemanager/config/config.php          | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/local/modules/Tinymce/Resources/js/tinymce/filemanager/config/config.php b/local/modules/Tinymce/Resources/js/tinymce/filemanager/config/config.php
index 23bb19404..53802d8e6 100644
--- a/local/modules/Tinymce/Resources/js/tinymce/filemanager/config/config.php
+++ b/local/modules/Tinymce/Resources/js/tinymce/filemanager/config/config.php
@@ -49,16 +49,11 @@ $base_url = rtrim(ConfigQuery::getConfiguredShopUrl(), '/');
 // Argh, url_site is not defined ?!
 if (empty($base_url)) {
     // A we did not used the router to access this dialog, we cannot use the URL class. Use the good old method.
-    if(isset($_SERVER['HTTPS'])){
-        $base_url = ($_SERVER['HTTPS'] && $_SERVER['HTTPS'] != "off") ? "https" : "http";
-    }
-    else{
-        $base_url = 'http';
-    }
-
-    $base_url .= "://" . $_SERVER['HTTP_HOST'] . preg_replace('!/tinymce/filemanager/dialog.php.*$!', '', $_SERVER['REQUEST_URI']);
+    $base_url = $request->getSchemeAndHttpHost() . preg_replace('!/tinymce/filemanager/dialog.php.*$!', '', $_SERVER['REQUEST_URI']);
 }
 
+echo "b=$base_url";
+
 // path from base_url to base of upload folder (with start and final /)
 $upload_dir = '/media/upload/';