Added feature #16027: Let typolink honour secure filelink configuration
authorErnesto Baschny <ernst@cron-it.de>
Wed, 17 Nov 2010 08:45:31 +0000 (08:45 +0000)
committerErnesto Baschny <ernst@cron-it.de>
Wed, 17 Nov 2010 08:45:31 +0000 (08:45 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@9428 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/cms/tslib/class.tslib_content.php

index 1d5b91e..66c504c 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-17  Ernesto Baschny  <ernst@cron-it.de>
+
+       * Added feature #16027: Let typolink honour secure filelink configuration
+
 2010-11-17  Benjamin Mack  <benni@typo3.org>
 
        * Added feature #4203: Workspace DB / filemounts should narrow down the users' mounts (Thanks to Sonja Scholz)
index 7c0de95..9dad2a1 100644 (file)
@@ -5382,10 +5382,12 @@ class tslib_cObj {
                                        if (file_exists(rawurldecode($splitLinkParam[0])) || $isLocalFile) {
                                                if ($linktxt == '')
                                                        $linktxt = rawurldecode($link_param);
-                                               if ($GLOBALS['TSFE']->config['config']['jumpurl_enable']) {
+                                               if ($GLOBALS['TSFE']->config['config']['jumpurl_enable'] || $conf['jumpurl']) {
+                                                       $theFileEnc = str_replace('%2F', '/', rawurlencode(rawurldecode($link_param)));
                                                        $this->lastTypoLinkUrl = $GLOBALS['TSFE']->absRefPrefix .
                                                                $GLOBALS['TSFE']->config['mainScript'] . $initP .
                                                                '&jumpurl=' . rawurlencode($link_param) .
+                                                               ($conf['jumpurl.']['secure'] ? $this->locDataJU($theFileEnc, $conf['jumpurl.']['secure.']) : '') .
                                                                $GLOBALS['TSFE']->getMethodUrlIdToken;
                                                } else {
                                                        $this->lastTypoLinkUrl = $GLOBALS['TSFE']->absRefPrefix . $link_param;