Index: t3lib/class.t3lib_befunc.php
===================================================================
--- t3lib/class.t3lib_befunc.php (revision 7662)
+++ t3lib/class.t3lib_befunc.php (working copy)
@@ -4410,7 +4410,7 @@
/**
* Returns the name of the backend script relative to the TYPO3 main directory.
*
- * @param string Name of the backend interface (backend, backend_old, frontend) to look up the script name for. If no interface is given, the interface for the current backend user is used.
+ * @param string Name of the backend interface (backend, frontend) to look up the script name for. If no interface is given, the interface for the current backend user is used.
* @return string The name of the backend script relative to the TYPO3 main directory.
*/
public static function getBackendScript($interface = '') {
@@ -4419,9 +4419,6 @@
}
switch ($interface) {
- case 'backend_old':
- $script = 'alt_main.php';
- break;
case 'frontend':
$script = '../.';
break;
Index: t3lib/class.t3lib_userauthgroup.php
===================================================================
--- t3lib/class.t3lib_userauthgroup.php (revision 7662)
+++ t3lib/class.t3lib_userauthgroup.php (working copy)
@@ -734,19 +734,8 @@
* @return boolean
*/
function mayMakeShortcut() {
- // If the old BE is used (maybe with some parameters),
- // check for options.enableShortcuts and options.shortcutFrame being set.
- if (substr($this->getTSConfigVal('auth.BE.redirectToURL'), 0, 12) == 'alt_main.php') {
- return $this->getTSConfigVal('options.enableShortcuts') &&
- $this->getTSConfigVal('options.shortcutFrame') &&
- !$this->getTSConfigVal('options.mayNotCreateEditShortcuts');
- }
- // If the new BE is used, don't check options.shortcutFrame,
- // because this is not used there anymore.
- else {
- return $this->getTSConfigVal('options.enableShortcuts') &&
- !$this->getTSConfigVal('options.mayNotCreateEditShortcuts');
- }
+ return $this->getTSConfigVal('options.enableShortcuts') &&
+ !$this->getTSConfigVal('options.mayNotCreateEditShortcuts');
}
/**
@@ -1192,7 +1181,6 @@
if ($this->isAdmin()) {
$this->TSdataArray[]=$this->addTScomment('"admin" user presets:').'
admPanel.enable.all = 1
- options.shortcutFrame = 1
';
if (t3lib_extMgm::isLoaded('sys_note')) {
$this->TSdataArray[]='
Index: t3lib/config_default.php
===================================================================
--- t3lib/config_default.php (revision 7662)
+++ t3lib/config_default.php (working copy)
@@ -220,7 +220,7 @@
'maxFileSize' => '10240', // Integer. If set this is the max filesize in KB's for file operations in the backend. Can be overridden through $TCA per table field separately.
'forceCharset' => '', // String. Normally the charset of the backend users language selection is used. If you set this value to a charset found in t3lib/csconvtbl/ (or "utf-8") the backend (and database) will ALWAYS use this charset. Always use a lowercase value.
'installToolPassword' => '', // String. This is the md5-hashed password for the Install Tool. Set this to '' and access will be totally denied. PLEASE consider to externally password protect the typo3/install/ folder, eg. with a .htaccess file.
- 'defaultUserTSconfig' => 'options.shortcutFrame=1
+ 'defaultUserTSconfig' => '
options.enableShortcuts=1', // String (exclude). Enter lines of default backend user/group TSconfig.
'defaultPageTSconfig' => '', // String (exclude).Enter lines of default Page TSconfig.
'defaultPermissions' => array ( // Default permissions set for new pages in t3lib/tce_main.php. Keys are 'show,edit,delete,new,editcontent'. Enter as comma-list
@@ -242,7 +242,7 @@
),
'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,backend_old,frontend")
+ '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!
'loginLabels' => 'Username|Password|Interface|Log In|Log Out|Backend,Front End,Traditional Backend|Administration Login on ###SITENAME###|(Note: Cookies and JavaScript must be enabled!)|Important Messages:|Your login attempt did not succeed. Make sure to spell your username and password correctly, including upper/lowercase characters.', // Language labels of the login prompt, separated with a pipe symbol (|). These should not be used anymore to change the labels since TYPO3 4.3, furthermore overload the labels with , see EXT:lang/locallang_login.xml for the used labels.
'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
Index: typo3/js/backend.js
===================================================================
--- typo3/js/backend.js (revision 7662)
+++ typo3/js/backend.js (working copy)
@@ -61,12 +61,6 @@
// backend.php
TYPO3BackendShortcutMenu.createShortcut('', moduleName, url);
}
-
- if(top.shortcutFrame) {
- // alt_main.php
- var location = backPath + 'alt_shortcut.php?modName=' + moduleName + '&URL=' + url;
- shortcutFrame.location.href = location;
- }
}
}
}
Index: typo3/jsfunc.tbe_editor.js
===================================================================
--- typo3/jsfunc.tbe_editor.js (revision 7662)
+++ typo3/jsfunc.tbe_editor.js (working copy)
@@ -409,13 +409,6 @@
*/
checkSubmit: function(sendAlert) {
var funcIndex, funcMax, funcRes;
- if (TBE_EDITOR.backend_interface == "backend_old") {
- if (TBE_EDITOR.checkLoginTimeout() && confirm(TBE_EDITOR.labels.refresh_login)) {
- vHWin=window.open(TBE_EDITOR.backPath+'login_frameset.php?','relogin','height=300,width=400,status=0,menubar=0');
- vHWin.focus();
- return false;
- }
- }
var OK=1;
// $this->additionalJS_submit:
Index: typo3/sysext/cms/layout/db_new_content_el.php
===================================================================
--- typo3/sysext/cms/layout/db_new_content_el.php (revision 7662)
+++ typo3/sysext/cms/layout/db_new_content_el.php (working copy)
@@ -291,10 +291,6 @@
} else {
top.TYPO3ModuleMenu.refreshMenu();
}
-
- if(top.shortcutFrame) {
- top.shortcutFrame.refreshShortcuts();
- }
');
// Traverse items for the wizard.
Index: typo3/sysext/lang/locallang_login.xml
===================================================================
--- typo3/sysext/lang/locallang_login.xml (revision 7662)
+++ typo3/sysext/lang/locallang_login.xml (working copy)
@@ -19,7 +19,6 @@
-
Index: typo3/sysext/setup/ext_tables.php
===================================================================
--- typo3/sysext/setup/ext_tables.php (revision 7662)
+++ typo3/sysext/setup/ext_tables.php (working copy)
@@ -53,16 +53,6 @@
'label' => 'LLL:EXT:setup/mod/locallang.xml:condensedMode',
'csh' => 'condensedMode',
),
- 'noMenuMode' => array(
- 'type' => 'select',
- 'items' => array(
- '0' => 'LLL:EXT:setup/mod/locallang.xml:noMenuMode_def',
- '1' => 'LLL:EXT:setup/mod/locallang.xml:noMenuMode_sel',
- 'icons' => 'LLL:EXT:setup/mod/locallang.xml:noMenuMode_icons',
- ),
- 'label' => 'LLL:EXT:setup/mod/locallang.xml:noMenuMode',
- 'csh' => 'noMenuMode',
- ),
'startModule' => array(
'type' => 'select',
'itemsProcFunc' => 'SC_mod_user_setup_index->renderStartModuleSelect',
@@ -161,7 +151,7 @@
),
),
'showitem' => '--div--;LLL:EXT:setup/mod/locallang.xml:personal_data,realName,email,emailMeAtLogin,password,password2,lang,
- --div--;LLL:EXT:setup/mod/locallang.xml:opening,condensedMode,noMenuMode,startModule,thumbnailsByDefault,helpText,edit_showFieldHelp,titleLen,
+ --div--;LLL:EXT:setup/mod/locallang.xml:opening,condensedMode,startModule,thumbnailsByDefault,helpText,edit_showFieldHelp,titleLen,
--div--;LLL:EXT:setup/mod/locallang.xml:editFunctionsTab,edit_RTE,edit_wideDocument,edit_docModuleUpload,enableFlashUploader,resizeTextareas,resizeTextareas_MaxHeight,resizeTextareas_Flexible,disableCMlayers,copyLevels,recursiveDelete,
--div--;LLL:EXT:setup/mod/locallang.xml:adminFunctions,simulate,installToolEnableButton'
Index: typo3/sysext/setup/mod/index.php
===================================================================
--- typo3/sysext/setup/mod/index.php (revision 7662)
+++ typo3/sysext/setup/mod/index.php (working copy)
@@ -354,10 +354,6 @@
} else {
top.TYPO3ModuleMenu.refreshMenu();
}
-
- if (top.shortcutFrame) {
- top.shortcutFrame.refreshShortcuts();
- }
';
}
@@ -898,10 +894,10 @@
}
return t3lib_BEfunc::cshItem('_MOD_user_setup', $str, $this->doc->backPath, '|', false, 'margin-bottom:0px;');
}
-
+
/**
* Returns array with fields defined in $GLOBALS['TYPO3_USER_SETTINGS']['showitem']
- *
+ *
* @param void
* @return array array with fieldnames visible in form
*/
@@ -911,10 +907,6 @@
// disable fields depended on settings
if (!$GLOBALS['TYPO3_CONF_VARS']['BE']['RTEenabled']) {
$fieldList = t3lib_div::rmFromList('edit_RTE', $fieldList);
-}
-
- if ($GLOBALS['BE_USER']->uc['interfaceSetup'] != 'backend_old') {
- $fieldList = t3lib_div::rmFromList('noMenuMode', $fieldList);
}
$fieldArray = t3lib_div::trimExplode(',', $fieldList, TRUE);