Project

General

Profile

Download (5.46 KB)

Bug #21354 ยป 12336.diff

Administrator Admin, 2009-10-25 15:13

View differences:

typo3/sysext/cms/tslib/class.tslib_content.php (working copy)
$url = $this->stdWrap($conf['file'], $conf['file.']);
}
$url = rawurldecode($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'] = $url;
$conf['file'] = rawurlencode($filename);
} else {
$conf['file'] = $url;
$conf['file'] = rawurlencode($url);
}
......
}
$conf['type'] = isset($conf['parameter.']['mmType']) ? $conf['parameter.']['mmType'] : $conf['type'];
$typeConf = $conf['mimeConf.'][$conf['type'] . '.'] ? $conf['mimeConf.'][$conf['type'] . '.'] : array();
$mime = $renderType . 'object';
$typeConf = $conf['mimeConf.'][$mime . '.'][$conf['type'] . '.'] ? $conf['mimeConf.'][$mime . '.'][$conf['type'] . '.'] : array();
$conf['predefined'] = array();
$width = intval($conf['parameter.']['mmWidth']);
......
}
// render MEDIA
if ($mode == 'url' && $url != '' || !$forcePlayer) {
if ($mode == 'url' && !$forcePlayer) {
// url is called direct, not with player
if ($url == '' && !$conf['allowEmptyUrl']) {
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;
......
$conf['file'] = '';
$conf['installUrl'] = 'null';
$conf['flashvars'] = array_merge((array) $conf['flashvars'], $conf['predefined']);
if ($renderType == 'qt') {
}
switch ($renderType) {
case 'swf':
$conf[$conf['type'] . '.'] = array_merge($conf['mimeConf.']['swfobject.'][$conf['type'] . '.'], $typeConf);
$conf = array_merge($conf['mimeConf.']['swfobject.'], $conf);
unset($conf['mimeConf.']);
$conf['flashvars.'] = array_merge((array) $conf['flashvars.'], $conf['predefined']);
$content = $this->SWFOBJECT($conf);
break;
case 'qt':
$conf[$conf['type'] . '.'] = array_merge($conf['mimeConf.']['swfobject.'][$conf['type'] . '.'], $typeConf);
$conf = array_merge($conf['mimeConf.']['qtobject.'], $conf);
unset($conf['mimeConf.']);
$conf['params.'] = array_merge((array) $conf['params.'], $conf['predefined']);
$content = $this->QTOBJECT($conf);
} else {
$conf = array_merge($conf['mimeConf.']['swfobject.'], $conf);
unset($conf['mimeConf.']);
$content = $this->SWFOBJECT($conf);
}
} else {
if ($mode == 'url' && $url == '' && !$conf['allowEmptyUrl']) {
return '<p style="background-color: yellow;">' . $GLOBALS['TSFE']->sL('LLL:EXT:cms/locallang_ttc.xml:media.noFile', true) . '</p>';
}
switch ($renderType) {
case 'swf':
$conf[$conf['type'] . '.'] = array_merge($conf['mimeConf.']['swfobject.'][$conf['type'] . '.'], $typeConf);
$conf = array_merge($conf['mimeConf.']['swfobject.'], $conf);
unset($conf['mimeConf.']);
$conf['flashvars.'] = array_merge((array) $conf['flashvars.'], $conf['predefined']);
$content = $this->SWFOBJECT($conf);
break;
case 'qt':
$conf[$conf['type'] . '.'] = array_merge($conf['mimeConf.']['swfobject.'][$conf['type'] . '.'], $typeConf);
$conf = array_merge($conf['mimeConf.']['qtobject.'], $conf);
unset($conf['mimeConf.']);
$conf['params.'] = array_merge((array) $conf['params.'], $conf['predefined']);
$content = $this->QTOBJECT($conf);
break;
case 'media':
$paramsArray = array_merge((array) $typeConf['default.']['params.'], (array) $conf['params.'], $conf['predefined']);
$conf['params']= '';
foreach ($paramsArray as $key => $value) {
$conf['params'] .= $key . '=' . $value . chr(10);
break;
case 'media':
$paramsArray = array_merge((array) $typeConf['default.']['params.'], (array) $conf['params.'], $conf['predefined']);
$conf['params']= '';
foreach ($paramsArray as $key => $value) {
$conf['params'] .= $key . '=' . $value . chr(10);
}
$content = $this->MULTIMEDIA($conf);
break;
default:
if (is_array ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/hooks/class.tx_cms_mediaitems.php']['customMediaRender'])) {
foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/hooks/class.tx_cms_mediaitems.php']['customMediaRender'] as $classRef) {
$hookObj = t3lib_div::getUserObj($classRef);
$conf['file'] = $url;
$conf['mode'] = $mode;
$content = $hookObj->customMediaRender($renderType, $conf, $this);
}
$content = $this->MULTIMEDIA($conf);
break;
default:
if (is_array ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/hooks/class.tx_cms_mediaitems.php']['customMediaRender'])) {
foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/hooks/class.tx_cms_mediaitems.php']['customMediaRender'] as $classRef) {
$hookObj = t3lib_div::getUserObj($classRef);
$conf['file'] = $url;
$conf['mode'] = $mode;
$content = $hookObj->customMediaRender($renderType, $conf, $this);
}
}
}
}
return $content;
}
    (1-1/1)