X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/blobdiff_plain/4cf1f42fce73c68c5036e995a4831b6cd267d0e7..a37993435294fee0961614db96bca845c336a381:/typo3/sysext/cms/tslib/index_ts.php diff --git a/typo3/sysext/cms/tslib/index_ts.php b/typo3/sysext/cms/tslib/index_ts.php index c93dc4d13b6..90ec490a83a 100755 --- a/typo3/sysext/cms/tslib/index_ts.php +++ b/typo3/sysext/cms/tslib/index_ts.php @@ -2,7 +2,7 @@ /*************************************************************** * Copyright notice * -* (c) 1999-2004 Kasper Skaarhoj (kasperYYYY@typo3.com) +* (c) 1999-2005 Kasper Skaarhoj (kasperYYYY@typo3.com) * All rights reserved * * This script is part of the TYPO3 project. The TYPO3 project is @@ -78,8 +78,8 @@ $TT->push('','Script start'); // Mandatory libraries included // ********************* $TT->push('Include class t3lib_db, t3lib_div, t3lib_extmgm',''); - require(PATH_t3lib.'class.t3lib_div.php'); - require(PATH_t3lib.'class.t3lib_extmgm.php'); + require_once(PATH_t3lib.'class.t3lib_div.php'); + require_once(PATH_t3lib.'class.t3lib_extmgm.php'); $TT->pull(); @@ -88,11 +88,11 @@ $TT->pull(); // Include configuration // ********************** $TT->push('Include config files',''); -require(PATH_t3lib.'config_default.php'); +require_once(PATH_t3lib.'config_default.php'); if (!defined ('TYPO3_db')) die ('The configuration file was not included.'); // the name of the TYPO3 database is stored in this constant. Here the inclusion of the config-file is verified by checking if this var is set. if (!t3lib_extMgm::isLoaded('cms')) die('Error: The main frontend extension "cms" was not loaded. Enable it in the extension manager in the backend.'); -require(PATH_t3lib.'class.t3lib_db.php'); +require_once(PATH_t3lib.'class.t3lib_db.php'); $TYPO3_DB = t3lib_div::makeInstance('t3lib_DB'); $CLIENT = t3lib_div::clientInfo(); // Set to the browser: net / msie if 4+ browsers @@ -161,6 +161,16 @@ $TT->push('Front End user initialized',''); $TSFE->initFEuser(); $TT->pull(); +// **************** +// PRE BE_USER HOOK +// **************** +if (is_array($TYPO3_CONF_VARS['SC_OPTIONS']['tslib/index_ts.php']['preBeUser'])) { + foreach($TYPO3_CONF_VARS['SC_OPTIONS']['tslib/index_ts.php']['preBeUser'] as $_funcRef) { + $_params = array(); + t3lib_div::callUserFunction($_funcRef, $_params ,$this); + } +} + // ********* // BE_USER // ********* @@ -208,8 +218,8 @@ if ($_COOKIE['be_typo_user']) { // If the backend cookie is set, we proceed and $BE_USER->ext_forcePreview=1; } - // Include classes for editing IF editing module in Admin Panel is open (it is assumed that $TSFE->displayEditIcons is set only if the Edit module is open in the Admin Panel) - if ($BE_USER->extAdmModuleEnabled('edit') && $BE_USER->extIsAdmMenuOpen('edit')) { + // Include classes for editing IF editing module in Admin Panel is open + if (($BE_USER->extAdmModuleEnabled('edit') && $BE_USER->extIsAdmMenuOpen('edit')) || $TSFE->displayEditIcons == 1) { $TSFE->includeTCA(); if ($BE_USER->extIsEditAction()) { require_once (PATH_t3lib.'class.t3lib_tcemain.php');