TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplified base URL construction code.

Browse Source
This commit is contained in:
Franck Allimant
2014-06-19 01:15:43 +02:00
parent d0efdd84bc
commit fe8b7e1663
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
local/modules/Tinymce/Resources/js/tinymce/filemanager/config/config.php
View File

@@ -49,15 +49,10 @@ $base_url = rtrim(ConfigQuery::getConfiguredShopUrl(), '/');
// Argh, url_site is not defined ?! // Argh, url_site is not defined ?!
if (empty($base_url)) { 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. // 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 = $request->getSchemeAndHttpHost() . preg_replace('!/tinymce/filemanager/dialog.php.*$!', '', $_SERVER['REQUEST_URI']);
$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']); echo "b=$base_url";
}
// path from base_url to base of upload folder (with start and final /) // path from base_url to base of upload folder (with start and final /)
$upload_dir = '/media/upload/'; $upload_dir = '/media/upload/';