diff --git a/t3lib/class.t3lib_foldertree.php b/t3lib/class.t3lib_foldertree.php index f6cfad835d0468833d831fef6806e6d89e36d50c..664ed4bdd0b20860c4faf17509db2d9caf0c7d9f 100644 --- a/t3lib/class.t3lib_foldertree.php +++ b/t3lib/class.t3lib_foldertree.php @@ -106,10 +106,7 @@ class t3lib_folderTree extends t3lib_treeView { */ function wrapTitle($title, $row, $bank = 0) { $aOnClick = 'return jumpTo(\'' . $this->getJumpToParam($row) . '\',this,\'' . $this->domIdPrefix . $this->getId($row) . '\',' . $bank . ');'; - $CSM = ''; - if ($GLOBALS['TYPO3_CONF_VARS']['BE']['useOnContextMenuHandler']) { - $CSM = ' oncontextmenu="' . htmlspecialchars($GLOBALS['TBE_TEMPLATE']->wrapClickMenuOnIcon('', $row['path'], '', 0, '', '', TRUE)) . '"'; - } + $CSM = ' oncontextmenu="' . htmlspecialchars($GLOBALS['TBE_TEMPLATE']->wrapClickMenuOnIcon('', $row['path'], '', 0, '', '', TRUE)) . '"'; return '<a href="#" title="' . htmlspecialchars($row['title']) . '" onclick="' . htmlspecialchars($aOnClick) . '"' . $CSM . '>' . $title . '</a>'; } diff --git a/t3lib/config_default.php b/t3lib/config_default.php index 8fdff576fdedfb45d0a1d9ce86d804c229d3a0fe..87c9a09111aed73e6a293cbac3947f10d96f699a 100644 --- a/t3lib/config_default.php +++ b/t3lib/config_default.php @@ -479,7 +479,6 @@ $TYPO3_CONF_VARS = array( 'customPermOptions' => array(), // Array with sets of custom permission options. Syntax is; 'key' => array('header' => 'header string, language splitted', 'items' => array('key' => array('label, language splitted', 'icon reference', 'Description text, language splitted'))). Keys cannot contain ":|," characters. 'fileDenyPattern' => FILE_DENY_PATTERN_DEFAULT , // A perl-compatible regular expression (without delimiters!) that - if it matches a filename - will deny the file upload/rename or whatever in the webspace. For security reasons, files with multiple extensions have to be denied on an Apache environment with mod_alias, if the filename contains a valid php handler in an arbitary position. Also, ".htaccess" files have to be denied. Matching is done case-insensitive. Default value is stored in constant FILE_DENY_PATTERN_DEFAULT 'interfaces' => 'backend', // This determines which interface options is available in the login prompt and in which order (All options: ",backend,frontend") - 'useOnContextMenuHandler' => TRUE, // Boolean: If set, the context menus (clickmenus) in the backend are activated on right-click - although this is not a XHTML attribute! 'loginNews' => array(), // In this array you can define news-items for the login screen. To this array, add arrays with assoc keys 'date', 'header', 'content' (HTML content) and for those appropriate value pairs 'loginNewsTitle' => '', // Define alternative header message for the LoginNews. If this var is empty, the default header "Important messages:" is displayed. 'notificationPrefix' => '[TYPO3 Note]', // String: Used to prefix the subject of mails sent in the taskcenter diff --git a/typo3/alt_clickmenu.php b/typo3/alt_clickmenu.php index 5d3e4a46bf9f428aa829ff943f29b0d782be90e6..c839eafae2159967bc616a14e69545ac64912d96 100644 --- a/typo3/alt_clickmenu.php +++ b/typo3/alt_clickmenu.php @@ -1265,9 +1265,7 @@ class clickMenu { $onClick=preg_replace('/hideCM\(\);/i','',$onClick); if (!$i[5]) $onClick.='Clickmenu.hideAll();'; - if ($GLOBALS['TYPO3_CONF_VARS']['BE']['useOnContextMenuHandler']) { - $CSM = ' oncontextmenu="'.htmlspecialchars($onClick).';return false;"'; - } + $CSM = ' oncontextmenu="'.htmlspecialchars($onClick).';return false;"'; $out[]=' <tr class="typo3-CSM-itemRow" onclick="'.htmlspecialchars($onClick).'" onmouseover="this.bgColor=\''.$GLOBALS['TBE_TEMPLATE']->bgColor5.'\';" onmouseout="this.bgColor=\'\';"'.$CSM.'> diff --git a/typo3/class.filelistfoldertree.php b/typo3/class.filelistfoldertree.php index d315d98d8c29e423ad42e61cf70f74cd0b0c870e..06d29c148684215576d9bd8614c5b08ae0efc320 100644 --- a/typo3/class.filelistfoldertree.php +++ b/typo3/class.filelistfoldertree.php @@ -116,10 +116,7 @@ class filelistFolderTree extends t3lib_folderTree { */ function wrapTitle($title,$row,$bank=0) { $aOnClick = 'return jumpTo(\''.$this->getJumpToParam($row).'\',this,\''.$this->domIdPrefix.$this->getId($row).'\','.$bank.');'; - $CSM = ''; - if ($GLOBALS['TYPO3_CONF_VARS']['BE']['useOnContextMenuHandler']) { - $CSM = ' oncontextmenu="'.htmlspecialchars($GLOBALS['TBE_TEMPLATE']->wrapClickMenuOnIcon('',$row['path'],'',0,'&bank='.$this->bank,'',TRUE)).'"'; - } + $CSM = ' oncontextmenu="'.htmlspecialchars($GLOBALS['TBE_TEMPLATE']->wrapClickMenuOnIcon('',$row['path'],'',0,'&bank='.$this->bank,'',TRUE)).'"'; $theFolderTitle='<a href="#" onclick="'.htmlspecialchars($aOnClick).'"'.$CSM.'>'.$title.'</a>'; // Wrap title in a drag/drop span. diff --git a/typo3/class.webpagetree.php b/typo3/class.webpagetree.php index abf4ddb8689f8e38533c324dbb135d3ca6cb8835..aa9a1240bb2860c6b1725453d3a1c152cb85b16d 100644 --- a/typo3/class.webpagetree.php +++ b/typo3/class.webpagetree.php @@ -176,10 +176,7 @@ class webPageTree extends t3lib_browseTree { } $aOnClick = 'return jumpTo(\''.$this->getJumpToParam($row).'\',this,\''.$this->domIdPrefix.$this->getId($row).'\','.$bank.');'; - $CSM = ''; - if ($GLOBALS['TYPO3_CONF_VARS']['BE']['useOnContextMenuHandler']) { - $CSM = ' oncontextmenu="'.htmlspecialchars($GLOBALS['TBE_TEMPLATE']->wrapClickMenuOnIcon('','pages',$row['uid'],0,'&bank='.$this->bank,'',TRUE)).';"'; - } + $CSM = ' oncontextmenu="'.htmlspecialchars($GLOBALS['TBE_TEMPLATE']->wrapClickMenuOnIcon('','pages',$row['uid'],0,'&bank='.$this->bank,'',TRUE)).';"'; $thePageTitle='<a href="#" onclick="'.htmlspecialchars($aOnClick).'"'.$CSM.'>'.$title.'</a>'; // Wrap title in a drag/drop span. diff --git a/typo3/template.php b/typo3/template.php index 1d5fbbe06226e50b3ab4615deb8786155edc4bd8..00060841d20197c30927aa00db9eb85f003c0490 100644 --- a/typo3/template.php +++ b/typo3/template.php @@ -290,7 +290,7 @@ class template { function wrapClickMenuOnIcon($str,$table,$uid='',$listFr=1,$addParams='',$enDisItems='', $returnOnClick=FALSE) { $backPath = rawurlencode($this->backPath).'|'.t3lib_div::shortMD5($this->backPath.'|'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey']); $onClick = 'showClickmenu("'.$table.'","'.$uid.'","'.$listFr.'","'.str_replace('+','%2B',$enDisItems).'","'.str_replace('&','&',addcslashes($backPath,'"')).'","'.str_replace('&','&',addcslashes($addParams,'"')).'");return false;'; - return $returnOnClick ? $onClick : '<a href="#" onclick="'.htmlspecialchars($onClick).'"'.($GLOBALS['TYPO3_CONF_VARS']['BE']['useOnContextMenuHandler'] ? ' oncontextmenu="'.htmlspecialchars($onClick).'"' : '').'>'.$str.'</a>'; + return $returnOnClick ? $onClick : '<a href="#" onclick="'.htmlspecialchars($onClick).'" oncontextmenu="'.htmlspecialchars($onClick).'">'.$str.'</a>'; } /**