Project

General

Profile

Download (13.3 KB)

Bug #18844 » 8507_v3.diff

Administrator Admin, 2009-04-24 21:18

View differences:

typo3/file_list.php (working copy)
$buttons['csh'] = t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'filelist_module', $GLOBALS['BACK_PATH'], '', TRUE);
// upload button
$theIcon = '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/upload.gif','width="18" height="16"').' title="'.$GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:cm.upload',1)).'" alt="" />';
$theIconText = $GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:cm.upload', 1));
$theIcon = '<img' .
t3lib_iconWorks::skinImg($this->backPath, 'gfx/upload.gif', 'width="18" height="16"') .
' title="' . $theIconText . '" alt="' . $theIconText .
'" />';
$buttons['upload'] = '<a href="'.$BACK_PATH.'file_upload.php?target='.rawurlencode($this->id).'&returnUrl='.rawurlencode($this->filelist->listURL()).'">'.$theIcon.'</a>';
$theIcon = '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/new_file.gif','width="18" height="16"').' title="'.$GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:cm.new',1)).'" alt="" />';
$theIconText = $GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:cm.new', 1));
$theIcon = '<img' .
t3lib_iconWorks::skinImg($this->backPath, 'gfx/new_file.gif', 'width="18" height="16"') .
' title="' . $theIconText . '" alt="' . $theIconText .
'" />';
$buttons['new'] = '<a href="'.$BACK_PATH.'file_newfolder.php?target='.rawurlencode($this->id).'&returnUrl='.rawurlencode($this->filelist->listURL()).'">'.$theIcon.'</a>';
return $buttons;
typo3/class.file_list.inc (working copy)
// if this is some subpage under the mount root....
if ($GLOBALS['SOBE']->basicFF->checkPathAgainstMounts($theFile['path'])) {
// The icon with link
$otherMarkers['PAGE_ICON'] = '<img'.t3lib_iconWorks::skinImg($this->backPath,$icon,'width="18" height="16"').' title="'.htmlspecialchars($theFile['file']).'" alt="" />';
$imageText = htmlspecialchars($theFile['file']);
$otherMarkers['PAGE_ICON'] = '<img' .
t3lib_iconWorks::skinImg($this->backPath,$icon,'width="18" height="16"') .
' title="' . $imageText . '" alt="' . $imageText . '" />';
if ($this->clickMenus) $otherMarkers['PAGE_ICON'] = $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($otherMarkers['PAGE_ICON'],$path);
$buttons['level_up'] .= $this->linkWrapDir('<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/i/folder_up.gif','width="18" height="16"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.upOneLevel',1).'" alt="" />',$theFile['path']);
// Level up icon
$imageText = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.upOneLevel', 1);
$buttonsLevelUpImg = '<img' .
t3lib_iconWorks::skinImg($this->backPath, 'gfx/i/folder_up.gif', 'width="18" height="16"') .
' title="' . $imageText . '" alt="' . $imageText . '" />';
$buttons['level_up'] .= $this->linkWrapDir($buttonsLevelUpImg, $theFile['path']);
$otherMarkers['TITLE'] .= t3lib_div::fixed_lgd_cs($title,-($this->fixedL+20)); // No HTML specialchars here - HTML like <b> </b> is allowed
// this is the root page
......
}
}
$buttons['refresh'] = '<a href="'.htmlspecialchars($this->listURL()).'">'.
'<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/refresh_n.gif','width="14" height="14"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.reload',1).'" alt="" />'.
'</a>';
$imageText = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.reload', 1);
$buttons['refresh'] = '<a href="' . htmlspecialchars($this->listURL()) . '">' .
'<img' .
t3lib_iconWorks::skinImg($this->backPath, 'gfx/refresh_n.gif', 'width="14" height="14"') .
' title="' . $imageText . '" alt="' . $imageText .
'" />'.
'</a>';
return array($buttons, $otherMarkers);
}
......
$cells=array();
$table='_FILE';
$elFromTable = $this->clipObj->elFromTable($table);
if (count($elFromTable)) {
$cells[]='<a href="'.htmlspecialchars($this->clipObj->pasteUrl('_FILE',$this->path)).'" onclick="return '.htmlspecialchars($this->clipObj->confirmMsg('_FILE',$this->path,'into',$elFromTable)).'">'.
'<img'.t3lib_iconWorks::skinImg('','gfx/clip_pasteafter.gif','width="12" height="12"').' title="'.$GLOBALS['LANG']->getLL('clip_paste',1).'" alt="" /></a>';
if (count($elFromTable)) {
$imageText = $GLOBALS['LANG']->getLL('clip_paste', 1);
$pasteAfterImage = '<img' .
t3lib_iconWorks::skinImg('', 'gfx/clip_pasteafter.gif', 'width="12" height="12"') .
' title="' . $imageText . '" alt="' . $imageText . '" />';
$cells[] = '<a ' .
'href="' . htmlspecialchars($this->clipObj->pasteUrl('_FILE', $this->path)) .
'" onclick="return ' . htmlspecialchars($this->clipObj->confirmMsg('_FILE', $this->path, 'into', $elFromTable)) . '">' .
$pasteAfterImage . '</a>';
}
if ($this->clipObj->current!='normal' && $iOut) {
$cells[]=$this->linkClipboardHeaderIcon('<img'.t3lib_iconWorks::skinImg('','gfx/clip_copy.gif','width="12" height="12"').' title="'.$GLOBALS['LANG']->getLL('clip_selectMarked',1).'" alt="" />',$table,'setCB');
$cells[]=$this->linkClipboardHeaderIcon('<img'.t3lib_iconWorks::skinImg('','gfx/garbage.gif','width="11" height="12"').' title="'.$GLOBALS['LANG']->getLL('clip_deleteMarked',1).'" alt="" />',$table,'delete',$GLOBALS['LANG']->getLL('clip_deleteMarkedWarning'));
$onClick = 'checkOffCB(\''.implode(',',$this->CBnames).'\'); return false;';
$cells[]='<a href="#" onclick="'.htmlspecialchars($onClick).'">'.
'<img'.t3lib_iconWorks::skinImg('','gfx/clip_select.gif','width="12" height="12"').' title="'.$GLOBALS['LANG']->getLL('clip_markRecords',1).'" alt="" />'.
'</a>';
// Select marked icon
$imageText = $GLOBALS['LANG']->getLL('clip_selectMarked', 1);
$cells[] = $this->linkClipboardHeaderIcon(
'<img' . t3lib_iconWorks::skinImg('', 'gfx/clip_copy.gif', 'width="12" height="12"') . ' title="' . $imageText . '" alt="' . $imageText . '" />',
$table,
'setCB'
);
// Delete marked icon
$imageText = $GLOBALS['LANG']->getLL('clip_deleteMarked', 1);
$cells[] = $this->linkClipboardHeaderIcon(
'<img' . t3lib_iconWorks::skinImg('', 'gfx/garbage.gif', 'width="11" height="12"') . ' title="' . $imageText . '" alt="' . $imageText . '" />',
$table,
'delete',
$GLOBALS['LANG']->getLL('clip_deleteMarkedWarning')
);
// Mark records icon
$imageText = $GLOBALS['LANG']->getLL('clip_markRecords', 1);
$markRecordsImage = '<img' .
t3lib_iconWorks::skinImg('', 'gfx/clip_select.gif', 'width="12" height="12"') .
' title="' . $imageText . '" alt="' . $imageText . '" />';
$onClick = 'checkOffCB(\'' . implode(',', $this->CBnames) . '\'); return false;';
$cells[] = '<a href="#" onclick="' . htmlspecialchars($onClick) . '">' . $markRecordsImage . '</a>';
}
$theData[$v] = implode('',$cells);
......
list($title,$icon,$path) = $this->dirData($theFile);
// The icon with link
$theIcon = '<img'.t3lib_iconWorks::skinImg($this->backPath,$icon,'width="18" height="16"').' title="'.htmlspecialchars($theFile['file']).'" alt="" />';
$theIconText = htmlspecialchars($theFile['file']);
$theIcon = '<img' .
t3lib_iconWorks::skinImg($this->backPath, $icon, 'width="18" height="16"') .
' title="' . $theIconText . '" alt="' . $theIconText . '" />';
if ($this->clickMenus) $theIcon = $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($theIcon,$path);
// Preparing and getting the data-array
......
$icon = t3lib_BEfunc::getFileIcon($ext);
// The icon with link
$theIcon = '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/fileicons/'.$icon,'width="18" height="16"').' title="'.htmlspecialchars($theFile['file']).'" alt="" />';
if ($this->clickMenus) $theIcon = $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($theIcon,$theFile['path'].$theFile['file']);
$theIconText = htmlspecialchars($theFile['file']);
$theIcon = '<img' .
t3lib_iconWorks::skinImg($this->backPath, 'gfx/fileicons/' . $icon, 'width="18" height="16"') .
' title="' . $theIconTex . '" alt="' . $theIconText . '" />';
if ($this->clickMenus) {
$theIcon = $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($theIcon, $theFile['path'] . $theFile['file']);
}
// Preparing and getting the data-array
$theData = Array();
......
$params.= '&md5sum='.t3lib_div::shortMD5($check);
$href = $this->backPath.$this->thumbScript.'?&dummy='.$GLOBALS['EXEC_TIME'].$params;
$thumbData[$titleCol]='<img src="'.htmlspecialchars($href).'" hspace="2" title="'.htmlspecialchars(trim($theFile['file'])).'" alt="" />';
$iconText = htmlspecialchars(trim($theFile['file']));
$thumbData[$titleCol] = '<img
src="' . htmlspecialchars($href) . '" hspace="2" ' .
'title="' . $iconText . '" alt="' . $iconText . '" />';
$out.= $this->addelement(4,'',$thumbData);
}
}
......
// For normal clipboard, add copy/cut buttons:
if ($this->clipObj->current=='normal') {
$isSel = $this->clipObj->isSelected('_FILE',$md5);
$cells[]='<a href="'.htmlspecialchars($this->clipObj->selUrlFile($fullIdent,1,($isSel=='copy'))).'">'.
'<img'.t3lib_iconWorks::skinImg('','gfx/clip_copy'.($isSel=='copy'?'_h':'').'.gif','width="12" height="12"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:cm.copy',1).'" alt="" />'.
'</a>';
$cells[]='<a href="'.htmlspecialchars($this->clipObj->selUrlFile($fullIdent,0,($isSel=='cut'))).'">'.
'<img'.t3lib_iconWorks::skinImg('','gfx/clip_cut'.($isSel=='cut'?'_h':'').'.gif','width="12" height="12"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:cm.cut',1).'" alt="" />'.
'</a>';
// copy icon
$iconText = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:cm.copy', 1);
$iconCopy = '<img' .
t3lib_iconWorks::skinImg('', 'gfx/clip_copy' . ($isSel == 'copy' ? '_h' : '') . '.gif', 'width="12" height="12"') .
' title="' . $iconText . '" alt="' . $iconText . '" />';
$cells[] = '<a href="' . htmlspecialchars($this->clipObj->selUrlFile($fullIdent, 1, ($isSel == 'copy'))) . '">' .
$iconCopy .
'</a>';
// cut icon
$iconText = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:cm.cut', 1);
$iconCut = '<img' .
t3lib_iconWorks::skinImg('', 'gfx/clip_cut' . ($isSel == 'cut' ? '_h' : '') . '.gif', 'width="12" height="12"') .
' title="' . $iconText . '" alt="' . $iconText . '" />';
$cells[] = '<a href="' . htmlspecialchars($this->clipObj->selUrlFile($fullIdent, 0, ($isSel == 'cut'))) . '">' .
$iconCut .
'</a>';
} else { // For numeric pads, add select checkboxes:
$n='_FILE|'.$md5;
$this->CBnames[]=$n;
......
// Display PASTE button, if directory:
$elFromTable = $this->clipObj->elFromTable('_FILE');
if (@is_dir($fullIdent) && count($elFromTable)) {
$cells[]='<a href="'.htmlspecialchars($this->clipObj->pasteUrl('_FILE',$fullIdent)).'" onclick="return '.htmlspecialchars($this->clipObj->confirmMsg('_FILE',$fullIdent,'into',$elFromTable)).'">'.
'<img'.t3lib_iconWorks::skinImg('','gfx/clip_pasteinto.gif','width="12" height="12"').' title="'.$GLOBALS['LANG']->getLL('clip_pasteInto',1).'" alt="" />'.
'</a>';
$iconText = $GLOBALS['LANG']->getLL('clip_pasteInto', 1);
$iconPaste = '<img' .
t3lib_iconWorks::skinImg('', 'gfx/clip_pasteinto.gif', 'width="12" height="12"') .
' title="' . $iconText . '" alt="' . $iconText . '" />';
$cells[] = '<a href="' . htmlspecialchars($this->clipObj->pasteUrl('_FILE', $fullIdent)) .
'" onclick="return ' . htmlspecialchars($this->clipObj->confirmMsg('_FILE', $fullIdent, 'into', $elFromTable)) . '">' .
$iconPaste .
'</a>';
}
// Compile items into a DIV-element:
typo3/alt_file_navframe.php (working copy)
// Refresh
$buttons['refresh'] = '<a href="' . htmlspecialchars(t3lib_div::getIndpEnv('REQUEST_URI')) . '">' .
'<img' . t3lib_iconWorks::skinImg('','gfx/refresh_n.gif','width="14" height="14"') . ' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.refresh',1) . '" alt="" /></a>';
'<img' . t3lib_iconWorks::skinImg('','gfx/refresh_n.gif','width="14" height="14"') . ' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.refresh',1) . '" alt="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.refresh',1) . '" /></a>';
// CSH
$buttons['csh'] = str_replace('typo3-csh-inline','typo3-csh-inline show-right',t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'filetree', $GLOBALS['BACK_PATH']));
(3-3/4)