Bug #21623 ยป 12680.diff
| typo3/sysext/cms/tslib/class.tslib_content.php (working copy) | ||
|---|---|---|
|
$url = $this->stdWrap($conf['file'], $conf['file.']);
|
||
|
}
|
||
|
$url = $this->typoLink_URL(array('parameter' => $url));
|
||
|
$mode = is_file(PATH_site . $url) ? 'file' : 'url';
|
||
|
if ($mode === 'file') {
|
||
|
$filename = $GLOBALS['TSFE']->tmpl->getFileName($url);
|
||
|
$fileinfo = t3lib_div::split_fileref($filename);
|
||
|
$conf['file'] = rawurlencode($filename);
|
||
|
$conf['file'] = $filename;
|
||
|
} else {
|
||
|
$conf['file'] = rawurlencode($url);
|
||
|
$conf['file'] = $this->typoLink_URL(array('parameter' => $url));
|
||
|
}
|
||
|
$renderType = $conf['renderType'];
|
||
| ... | ... | |
|
$renderType = $conf['parameter.']['mmRenderType'];
|
||
|
}
|
||
|
if ($renderType === 'auto') {
|
||
|
// default renderType is swf
|
||
|
$renderType = 'swf';
|
||
|
$handler = array_keys($conf['fileExtHandler.']);
|
||
|
if (in_array($fileinfo['fileext'], $handler)) {
|
||
|
$renderType = strtolower($conf['fileExtHandler.'][$fileinfo['fileext']]);
|
||
| ... | ... | |
|
}
|
||
|
$forcePlayer = isset($conf['parameter.']['mmFile']) ? intval($conf['parameter.']['mmforcePlayer']) : $conf['forcePlayer'];
|
||
|
if (($renderType == 'swf')) {
|
||
|
$mode = 'file';
|
||
|
}
|
||
|
$conf['forcePlayer'] = $forcePlayer;
|
||
|
$conf['type'] = isset($conf['parameter.']['mmType']) ? $conf['parameter.']['mmType'] : $conf['type'];
|
||
|
$mime = $renderType . 'object';
|
||
| ... | ... | |
|
return '<p style="background-color: yellow;">' . $GLOBALS['TSFE']->sL('LLL:EXT:cms/locallang_ttc.xml:media.noFile', true) . '</p>';
|
||
|
}
|
||
|
$conf = array_merge($conf['mimeConf.']['swfobject.'], $conf);
|
||
|
if ($mode == 'url') {
|
||
|
$conf[$conf['type'] . '.']['player'] = strpos($url, '://') === false ? 'http://' . $url : $url;
|
||
|
} else {
|
||
|
$conf[$conf['type'] . '.']['player'] = $url;
|
||
|
}
|
||
|
$conf['file'] = '';
|
||
|
$conf['installUrl'] = 'null';
|
||
|
$conf['flashvars'] = array_merge((array) $conf['flashvars'], $conf['predefined']);
|
||
|
}
|
||
| ... | ... | |
|
$player = $this->stdWrap($conf[$conf['type'] . '.']['player'], $conf[$conf['type'] . '.']['player.']);
|
||
|
$installUrl = $conf['installUrl'] ? $conf['installUrl'] : $prefix . 'typo3/contrib/flashmedia/swfobject/expressInstall.swf';
|
||
|
$filename = $this->stdWrap($conf['file'], $conf['file.']);
|
||
|
if ($filename) {
|
||
|
if (strpos($filename, rawurlencode('://')) !== FALSE) {
|
||
|
if ($filename && $conf['forcePlayer']) {
|
||
|
if (strpos($filename, '://') !== FALSE) {
|
||
|
$conf['flashvars.']['file'] = $filename;
|
||
|
} else {
|
||
|
if ($prefix) {
|
||
| ... | ... | |
|
}
|
||
|
}
|
||
|
} else {
|
||
|
$player = $filename;
|
||
|
}
|
||
|
// Write calculated values in conf for the hook
|
||
|
$conf['player'] = $player;
|
||
| ... | ... | |
|
}
|
||
|
}
|
||
|
$GLOBALS['TYPO3_DB']->sql_free_result($res);
|
||
|
|
||
|
// Set targetDomain to first found domain record if the target page cannot be reached within the current domain
|
||
|
if (count($foundDomains) > 0
|
||
|
if (count($foundDomains) > 0
|
||
|
&& (!in_array($currentDomain, $foundDomains) || count($foundForcedDomains) > 0)) {
|
||
|
foreach ($targetPageRootlinePids as $pid) {
|
||
|
// Always use the 'forced' domain if we found one
|
||
| ... | ... | |
|
}
|
||
|
}
|
||
|
}
|
||
|
|
||
|
// If target page has a different domain and the current domain's linking scheme (e.g. simulateStaticDocuments/RealURL/...) should not be used
|
||
|
if (strlen($targetDomain) && !$enableLinksAcrossDomains) {
|
||
|
$target = isset($conf['extTarget']) ? $conf['extTarget'] : $GLOBALS['TSFE']->extTarget;
|
||