diff -ur typo3_src-4.0.1.orig/t3lib/class.t3lib_beuserauth.php typo3_src-4.0.1/t3lib/class.t3lib_beuserauth.php --- typo3_src-4.0.1.orig/t3lib/class.t3lib_beuserauth.php 2006-07-31 13:51:37.000000000 +0200 +++ typo3_src-4.0.1/t3lib/class.t3lib_beuserauth.php 2006-09-03 20:55:24.000000000 +0200 @@ -125,7 +125,7 @@ 'emailMeAtLogin' => 0, 'condensedMode' => 0, 'noMenuMode' => 0, - 'startInTaskCenter' => 0, + 'startModule' => 'help_aboutmodules', 'hideSubmoduleIcons' => 0, 'helpText' => 1, 'titleLen' => 30, diff -ur typo3_src-4.0.1.orig/typo3/alt_main.php typo3_src-4.0.1/typo3/alt_main.php --- typo3_src-4.0.1.orig/typo3/alt_main.php 2006-07-31 13:51:50.000000000 +0200 +++ typo3_src-4.0.1/typo3/alt_main.php 2006-09-03 21:56:28.000000000 +0200 @@ -437,8 +437,13 @@ function startModule() { global $BE_USER; $module = preg_replace('/[^[:alnum:]_]/','',t3lib_div::_GET('module')); - if (!$module && $BE_USER->uc['startInTaskCenter']) { - $module = 'user_task'; + + if (!$module) { + if ($BE_USER->uc['startModule']) { + $module = $BE_USER->uc['startModule']; + } elseif ($BE_USER->uc['startInTaskCenter']) { + $module = 'user_task'; + } } $params = t3lib_div::_GET('modParams'); diff -ur typo3_src-4.0.1.orig/typo3/sysext/setup/mod/index.php typo3_src-4.0.1/typo3/sysext/setup/mod/index.php --- typo3_src-4.0.1.orig/typo3/sysext/setup/mod/index.php 2006-07-31 13:51:49.000000000 +0200 +++ typo3_src-4.0.1/typo3/sysext/setup/mod/index.php 2006-09-03 22:07:05.000000000 +0200 @@ -62,6 +62,7 @@ require('conf.php'); require($BACK_PATH.'init.php'); require_once(PATH_t3lib.'class.t3lib_tcemain.php'); +require_once(PATH_t3lib.'class.t3lib_loadmodules.php'); @@ -130,7 +131,7 @@ // Startup $BE_USER->uc['condensedMode'] = $d['condensedMode']; $BE_USER->uc['noMenuMode'] = $d['noMenuMode']; - if (t3lib_extMgm::isLoaded('taskcenter')) $BE_USER->uc['startInTaskCenter'] = $d['startInTaskCenter']; + $BE_USER->uc['startModule'] = $d['startModule']; $BE_USER->uc['thumbnailsByDefault'] = $d['thumbnailsByDefault']; $BE_USER->uc['helpText'] = $d['helpText']; $BE_USER->uc['titleLen'] = intval($d['titleLen']); @@ -246,13 +247,18 @@ * @return void */ function main() { - global $BE_USER,$LANG,$BACK_PATH; + global $BE_USER,$LANG,$BACK_PATH,$TBE_MODULES;; // Start page: $this->doc->JScode.= ''; $this->content.= $this->doc->startPage($LANG->getLL('UserSettings')); $this->content.= $this->doc->header($LANG->getLL('UserSettings').' - ['.$BE_USER->user['username'].']'); - + + // Load available backend modules + $this->loadModules = t3lib_div::makeInstance('t3lib_loadModules'); + $this->loadModules->observeWorkspaces = TRUE; + $this->loadModules->load($TBE_MODULES); + // CSH general: $this->content.= t3lib_BEfunc::cshItem('_MOD_user_setup', '', $GLOBALS['BACK_PATH'],'|'); @@ -317,10 +323,21 @@ '; - if (t3lib_extMgm::isLoaded('taskcenter')) { - $code[4][1] = $this->setLabel('startInTaskCenter','startInTaskCenter'); - $code[4][2] = 'uc['startInTaskCenter']?' checked="checked"':'').' />'; + $code[4][1] = $this->setLabel('startModule','startModule'); + $modSelect = ''; + $code[4][2] = $modSelect; + $code[5][1] = $this->setLabel('showThumbs','thumbnailsByDefault'); $code[5][2] = 'uc['thumbnailsByDefault']?' checked="checked"':'').' />'; $code[6][1] = $this->setLabel('helpText'); diff -ur typo3_src-4.0.1.orig/typo3/sysext/setup/mod/locallang.xml typo3_src-4.0.1/typo3/sysext/setup/mod/locallang.xml --- typo3_src-4.0.1.orig/typo3/sysext/setup/mod/locallang.xml 2006-07-31 13:51:49.000000000 +0200 +++ typo3_src-4.0.1/typo3/sysext/setup/mod/locallang.xml 2006-09-03 20:55:25.000000000 +0200 @@ -64,7 +64,7 @@ - +