Project

General

Profile

Bug #25207 » 0017806.patch

Administrator Admin, 2011-03-01 10:54

View differences:

t3lib/stddb/tbl_be.php (working copy)
'type' => 'radio',
'items' => array(
array('LLL:EXT:lang/locallang_tca.xml:sys_filemounts.base_absolute', 0),
array('LLL:EXT:lang/locallang_tca.xml:sys_filemounts.base_relative', 1)
array('LLL:EXT:lang/locallang_tca.xml:sys_filemounts.base_relative', 1),
array('LLL:EXT:lang/locallang_tca.xml:sys_filemounts.base_pathsite', 2)
),
'default' => 0
)
t3lib/class.t3lib_userauthgroup.php (working copy)
if ($this->dataLists['filemount_list']) {
$res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', 'sys_filemounts', 'deleted=0 AND hidden=0 AND pid=0 AND uid IN (' . $this->dataLists['filemount_list'] . ')', '', $orderBy);
while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
$this->addFileMount($row['title'], $row['path'], $row['path'], $row['base'] ? 1 : 0, '');
$this->addFileMount($row['title'], $row['path'], $row['path'], t3lib_div::intInRange($row['base'], 0, 2), '');
}
}
......
if ($path) { // there must be some chars in the path
$fdir = PATH_site . $GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir']; // fileadmin dir, absolute
if ($webspace) {
$path = $fdir . $path; // PATH_site + fileadmin dir is prepended
if (strcmp($webspace, '1') === 0) {
$path = $fdir . $path; // PATH_site + fileadmin dir is prepended
} else {
$path = PATH_site . $path; // PATH_site dir is prepended
}
} else {
if ($this->OS != 'WIN') { // with WINDOWS no prepending!!
$path = '/' . $path; // root-level is the start...
......
while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
// add every filemount of this workspace record
$this->addFileMount($row['title'], $row['path'], $row['path'], ($row['base'] ? 1 : 0), '');
$this->addFileMount($row['title'], $row['path'], $row['path'], t3lib_div::intInRange($row['base'], 0, 2), '');
// get the added entry, and check if it was in the users' original filemounts
// if not, remove it from the new filemount list again
typo3/sysext/lang/locallang_tca.xml (working copy)
<label index="sys_filemounts.base">Base:</label>
<label index="sys_filemounts.base_absolute">absolute (root) / </label>
<label index="sys_filemounts.base_relative">relative ../fileadmin/</label>
<label index="sys_filemounts.base_pathsite">pathsite (webroot)</label>
<label index="sys_news">System News</label>
<label index="sys_news.tabs.access">Access</label>
<label index="sys_workspace.adminusers">Owners:</label>
(1-1/2)