Project

General

Profile

Bug #19293 » rtehtmlarea_bugfix_9297_typo3_4-2_v2.patch

Administrator Admin, 2008-09-08 06:40

View differences:

typo3/browse_links.php (copie de travail)
$this->content = '';
// look for alternativ mountpoints
switch((string)$this->mode) {
$browser_readOnly = false;
switch ((string)$this->mode) {
case 'rte':
case 'db':
case 'wizard':
......
if ($altMountPoints) {
$GLOBALS['BE_USER']->groupData['webmounts'] = implode(',', array_unique(t3lib_div::intExplode(',', $altMountPoints)));
$GLOBALS['WEBMOUNTS'] = $GLOBALS['BE_USER']->returnWebmounts();
$browser_readOnly = true;
}
break;
case 'file':
case 'filedrag':
case 'folder':
......
$altMountPoints = trim($GLOBALS['BE_USER']->getTSConfigVal('options.folderTree.altElementBrowserMountPoints'));
if ($altMountPoints) {
$altMountPoints = t3lib_div::trimExplode(',', $altMountPoints);
foreach($altMountPoints as $filePathRelativeToFileadmindir) {
foreach ($altMountPoints as $filePathRelativeToFileadmindir) {
$GLOBALS['BE_USER']->addFileMount('', $filePathRelativeToFileadmindir, $filePathRelativeToFileadmindir, 1, 0);
}
$GLOBALS['FILEMOUNTS'] = $GLOBALS['BE_USER']->returnFilemounts();
......
}
break;
}
// render type by user func
$browserRendered = false;
if (is_array ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/browse_links.php']['browserRendering'])) {
......
$browserRenderObj = t3lib_div::getUserObj($classRef);
if (is_object($browserRenderObj) && method_exists($browserRenderObj, 'isValid') && method_exists($browserRenderObj, 'render')) {
if ($browserRenderObj->isValid($this->mode, $this)) {
$browserRenderObj->readOnly = $browser_readOnly;
$this->content.= $browserRenderObj->render($this->mode, $this);
$browserRendered = true;
break;
......
// if type was not rendered use default rendering functions
if(!$browserRendered) {
$this->browser = t3lib_div::makeInstance('browse_links');
$this->browser->readOnly = $browser_readOnly;
$this->browser->init();
if ($browser_readOnly) {
$this->browser->readOnly = true;
}
$modData = $GLOBALS['BE_USER']->getModuleData('browse_links.php', 'ses');
list($modData, $store) = $this->browser->processSessionData($modData);
$GLOBALS['BE_USER']->pushModuleData('browse_links.php', $modData);
// Output the correct content according to $this->mode
switch((string)$this->mode) {
case 'rte':
typo3/sysext/rtehtmlarea/mod3/browse_links.php (copie de travail)
if ($altMountPoints) {
$GLOBALS['BE_USER']->groupData['webmounts'] = implode(',', array_unique(t3lib_div::intExplode(',', $altMountPoints)));
$GLOBALS['WEBMOUNTS'] = $GLOBALS['BE_USER']->returnWebmounts();
$this->readOnly = true;
}
// Setting alternative file browsing mounts (ONLY local to browse_links.php this script so they stay "read-only")
$altMountPoints = trim($GLOBALS['BE_USER']->getTSConfigVal('options.folderTree.altElementBrowserMountPoints'));
(2-2/3)