[FEATURE] Redirect to Shortcut target page
[Packages/TYPO3.CMS.git] / typo3 / sysext / cms / tslib / index_ts.php
old mode 100755 (executable)
new mode 100644 (file)
index e1801a2..8b3c4f8
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 1999-2004 Kasper Skaarhoj (kasper@typo3.com)
+*  (c) 1999-2011 Kasper Skårhøj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
  * The script configures constants, includes libraries and does a little logic here and there in order to instantiate the right classes to create the webpage.
  * All the real data processing goes on in the "tslib/" classes which this script will include and use as needed.
  *
- * On UNIX: You should create a symlink to this file from the directory from which you want your TYPO3 website to run (which is ../)
- * ln -s tslib/index_ts.php index.php
+ * Revised for TYPO3 3.6 June/2003 by Kasper Skårhøj
  *
- * On Windows this file should copied to "index.php" in your website root (which is ../)
- *
- * $Id$
- * Revised for TYPO3 3.6 June/2003 by Kasper Skaarhoj
- *
- * @author     Kasper Skaarhoj <kasper@typo3.com>
+ * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
  * @package TYPO3
  * @subpackage tslib
  */
 
 // *******************************
+// Checking PHP version
+// *******************************
+if (version_compare(phpversion(), '5.2', '<')) die ('TYPO3 requires PHP 5.2.0 or higher.');
+
+// *******************************
 // Set error reporting
 // *******************************
-error_reporting (E_ALL ^ E_NOTICE);
+error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
 
 
 // ******************
 // Constants defined
 // ******************
-$TYPO3_MISC['microtime_start'] = microtime();
+$TYPO3_MISC['microtime_start'] = microtime(TRUE);
 define('TYPO3_OS', stristr(PHP_OS,'win')&&!stristr(PHP_OS,'darwin')?'WIN':'');
 define('TYPO3_MODE','FE');
-define('PATH_thisScript',str_replace('//','/', str_replace('\\','/', php_sapi_name()=='cgi'||php_sapi_name()=='isapi'||php_sapi_name()=='cgi-fcgi' ? $HTTP_SERVER_VARS['PATH_TRANSLATED']:$HTTP_SERVER_VARS['SCRIPT_FILENAME'])));
 
-define('PATH_site', dirname(PATH_thisScript).'/');
-define('PATH_t3lib', PATH_site.'t3lib/');
-define('PATH_tslib', PATH_site.'tslib/');
-define('PATH_typo3conf', PATH_site.'typo3conf/');
+if(!defined('PATH_thisScript')) {
+       define('PATH_thisScript', str_replace('//', '/', str_replace('\\', '/',
+               (PHP_SAPI == 'fpm-fcgi' || PHP_SAPI == 'cgi' || PHP_SAPI == 'isapi' || PHP_SAPI == 'cgi-fcgi') &&
+               ($_SERVER['ORIG_PATH_TRANSLATED'] ? $_SERVER['ORIG_PATH_TRANSLATED'] : $_SERVER['PATH_TRANSLATED']) ?
+               ($_SERVER['ORIG_PATH_TRANSLATED'] ? $_SERVER['ORIG_PATH_TRANSLATED'] : $_SERVER['PATH_TRANSLATED']) :
+               ($_SERVER['ORIG_SCRIPT_FILENAME'] ? $_SERVER['ORIG_SCRIPT_FILENAME'] : $_SERVER['SCRIPT_FILENAME']))));
+}
+
+if (!defined('PATH_site'))                     define('PATH_site', dirname(PATH_thisScript).'/');
+if (!defined('PATH_t3lib'))            define('PATH_t3lib', PATH_site.'t3lib/');
+
 define('TYPO3_mainDir', 'typo3/');             // This is the directory of the backend administration for the sites of this TYPO3 installation.
+define('PATH_typo3', PATH_site.TYPO3_mainDir);
+define('PATH_typo3conf', PATH_site.'typo3conf/');
+
+if (!defined('PATH_tslib')) {
+       if (@is_dir(PATH_site.TYPO3_mainDir.'sysext/cms/tslib/')) {
+               define('PATH_tslib', PATH_site.TYPO3_mainDir.'sysext/cms/tslib/');
+       } elseif (@is_dir(PATH_site.'tslib/')) {
+               define('PATH_tslib', PATH_site.'tslib/');
+       }
+}
 
 if (!@is_dir(PATH_typo3conf))  die('Cannot find configuration. This file is probably executed from the wrong location.');
 
 // *********************
+// Unset variable(s) in global scope (fixes #13959)
+// *********************
+unset($error);
+
+// *********************
+// Prevent any output until AJAX/compression is initialized to stop
+// AJAX/compression data corruption
+// *********************
+ob_start();
+
+// *********************
 // Timetracking started
 // *********************
-require_once(PATH_t3lib.'class.t3lib_timetrack.php');
-$TT = new t3lib_timeTrack;
+if ($_SESSION['TYPO3-TT-start']) {
+       require_once(PATH_t3lib.'class.t3lib_timetrack.php');
+       $TT = new t3lib_timeTrack;
+} else {
+       require_once(PATH_t3lib.'class.t3lib_timetracknull.php');
+       $TT = new t3lib_timeTrackNull;
+}
+
 $TT->start();
 $TT->push('','Script start');
 
 
 // *********************
-// DIV Library included
+// 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();
 
 
@@ -92,47 +124,111 @@ require(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('<strong>Error:</strong> The main frontend extension "cms" was not loaded. Enable it in the extension manager in the backend.');
 
-require(PATH_t3lib.'class.t3lib_db.php');
-$TYPO3_DB = t3lib_div::makeInstance('t3lib_DB');
+if (!defined('PATH_tslib')) {
+       define('PATH_tslib', t3lib_extMgm::extPath('cms').'tslib/');
+}
 
-$CLIENT=t3lib_div::clientInfo();                               // Set to the browser: net / msie if 4+ browsers
-$TT->pull();
+
+// Restart time tracking if BE login exists
+if (!$_SESSION['TYPO3-TT-start'] && $_COOKIE[t3lib_beUserAuth::getCookieName()]) {
+       $_SESSION['TYPO3-TT-start'] = TRUE;
+
+       $TT = new t3lib_timeTrack;
+       $TT->start();
+       $TT->push('', 'Script start (late)');
+}
 
 
 // *********************
-// Libraries included
+// Error & Exception handling
 // *********************
-$TT->push('Include Frontend libraries','');
-       require_once(PATH_tslib.'class.tslib_fe.php');
-       require_once(PATH_t3lib.'class.t3lib_page.php');
-       require_once(PATH_t3lib.'class.t3lib_userauth.php');
-       require_once(PATH_tslib.'class.tslib_feuserauth.php');
-       require_once(PATH_t3lib.'class.t3lib_tstemplate.php');
-       require_once(PATH_t3lib.'class.t3lib_cs.php');
+if ($TYPO3_CONF_VARS['SC_OPTIONS']['errors']['exceptionHandler'] !== '') {
+       $TT->push('Register Exceptionhandler', '');
+       if ($TYPO3_CONF_VARS['SYS']['errorHandler'] !== '') {
+                       // register an error handler for the given errorHandlerErrors
+               $errorHandler = t3lib_div::makeInstance($TYPO3_CONF_VARS['SYS']['errorHandler'], $TYPO3_CONF_VARS['SYS']['errorHandlerErrors']);
+                       // set errors which will be converted in an exception
+               $errorHandler->setExceptionalErrors($TYPO3_CONF_VARS['SC_OPTIONS']['errors']['exceptionalErrors']);
+       }
+       $exceptionHandler = t3lib_div::makeInstance($TYPO3_CONF_VARS['SC_OPTIONS']['errors']['exceptionHandler']);
+       $TT->pull();
+}
+
+$TYPO3_DB = t3lib_div::makeInstance('t3lib_DB');
+$TYPO3_DB->debugOutput = $TYPO3_CONF_VARS['SYS']['sqlDebug'];
+
+$CLIENT = t3lib_div::clientInfo();                             // Set to the browser: net / msie if 4+ browsers
 $TT->pull();
 
 
 // *******************************
 // Checking environment
 // *******************************
-if (t3lib_div::int_from_ver(phpversion())<4000006)     die ('TYPO3 runs with PHP4.0.6+ only');
-
-if (isset($HTTP_POST_VARS['GLOBALS']) || isset($HTTP_GET_VARS['GLOBALS']))     die('You cannot set the GLOBALS-array from outside the script.');
+if (isset($_POST['GLOBALS']) || isset($_GET['GLOBALS'])) {
+       throw new Exception('You cannot set the GLOBALS-array from outside the script.', 1294585200);
+}
 if (!get_magic_quotes_gpc())   {
        $TT->push('Add slashes to GET/POST arrays','');
-       t3lib_div::addSlashesOnArray($HTTP_GET_VARS);
-       t3lib_div::addSlashesOnArray($HTTP_POST_VARS);
-       $_GET = $HTTP_GET_VARS;
-       $_POST = $HTTP_POST_VARS;
+       t3lib_div::addSlashesOnArray($_GET);
+       t3lib_div::addSlashesOnArray($_POST);
+       $HTTP_GET_VARS = $_GET;
+       $HTTP_POST_VARS = $_POST;
        $TT->pull();
 }
 
+
+// Hook to preprocess the current request:
+if (is_array($TYPO3_CONF_VARS['SC_OPTIONS']['tslib/index_ts.php']['preprocessRequest'])) {
+       foreach ($TYPO3_CONF_VARS['SC_OPTIONS']['tslib/index_ts.php']['preprocessRequest'] as $hookFunction) {
+               $hookParameters = array();
+               t3lib_div::callUserFunction($hookFunction, $hookParameters, $hookParameters);
+       }
+       unset($hookFunction);
+       unset($hookParameters);
+}
+
+
+// *********************
+// Look for extension ID which will launch alternative output engine
+// *********************
+if ($temp_extId = t3lib_div::_GP('eID'))       {
+       if ($classPath = t3lib_div::getFileAbsFileName($TYPO3_CONF_VARS['FE']['eID_include'][$temp_extId]))     {
+               // Remove any output produced until now
+               ob_clean();
+
+               require($classPath);
+       }
+       exit;
+}
+
+
 // ***********************************
 // Create $TSFE object (TSFE = TypoScript Front End)
 // Connecting to database
 // ***********************************
-$temp_TSFEclassName=t3lib_div::makeInstanceClassName('tslib_fe');
-$TSFE = new $temp_TSFEclassName(
+$TSFE = t3lib_div::makeInstance('tslib_fe',
+       $TYPO3_CONF_VARS,
+       t3lib_div::_GP('id'),
+       t3lib_div::_GP('type'),
+       t3lib_div::_GP('no_cache'),
+       t3lib_div::_GP('cHash'),
+       t3lib_div::_GP('jumpurl'),
+       t3lib_div::_GP('MP'),
+       t3lib_div::_GP('RDCT')
+);
+/** @var $TSFE tslib_fe */
+
+if($TYPO3_CONF_VARS['FE']['pageUnavailable_force'] &&
+       !t3lib_div::cmpIP(t3lib_div::getIndpEnv('REMOTE_ADDR'), $TYPO3_CONF_VARS['SYS']['devIPmask'])) {
+       $TSFE->pageUnavailableAndExit('This page is temporarily unavailable.');
+}
+
+
+$TSFE->connectToDB();
+
+       // In case of a keyword-authenticated preview, re-initialize the TSFE object:
+if ($temp_previewConfig = $TSFE->ADMCMD_preview())     {
+       $TSFE = t3lib_div::makeInstance('tslib_fe',
                $TYPO3_CONF_VARS,
                t3lib_div::_GP('id'),
                t3lib_div::_GP('type'),
@@ -142,112 +238,64 @@ $TSFE = new $temp_TSFEclassName(
                t3lib_div::_GP('MP'),
                t3lib_div::_GP('RDCT')
        );
-$TSFE->connectToMySQL();
-if ($TSFE->RDCT)       {$TSFE->sendRedirect();}
+       $TSFE->ADMCMD_preview_postInit($temp_previewConfig);
+}
+
+
+$TSFE->sendRedirect();
 
 
 // *******************
-// output compression
+// Output compression
 // *******************
-if ($TYPO3_CONF_VARS['FE']['compressionLevel'])        {
-       ob_start();
-       require_once(PATH_t3lib.'class.gzip_encode.php');
+// Remove any output produced until now
+ob_clean();
+if ($TYPO3_CONF_VARS['FE']['compressionLevel'] && extension_loaded('zlib'))    {
+       if (t3lib_utility_Math::canBeInterpretedAsInteger($TYPO3_CONF_VARS['FE']['compressionLevel'])) {
+               // Prevent errors if ini_set() is unavailable (safe mode)
+               @ini_set('zlib.output_compression_level', $TYPO3_CONF_VARS['FE']['compressionLevel']);
+       }
+       ob_start(array(t3lib_div::makeInstance('tslib_fecompression'), 'compressionOutputHandler'));
 }
 
 // *********
 // FE_USER
 // *********
 $TT->push('Front End user initialized','');
+       /* @var $TSFE tslib_fe */
        $TSFE->initFEuser();
 $TT->pull();
 
+
 // *********
 // BE_USER
 // *********
-$BE_USER='';
-if ($HTTP_COOKIE_VARS['be_typo_user']) {               // If the backend cookie is set, we proceed and checks if a backend user is logged in.
-       $TYPO3_MISC['microtime_BE_USER_start'] = microtime();
-       $TT->push('Back End user initialized','');
-               require_once (PATH_t3lib.'class.t3lib_befunc.php');
-               require_once (PATH_t3lib.'class.t3lib_userauthgroup.php');
-               require_once (PATH_t3lib.'class.t3lib_beuserauth.php');
-               require_once (PATH_t3lib.'class.t3lib_tsfebeuserauth.php');
-
-                       // the value this->formfield_status is set to empty in order to disable login-attempts to the backend account through this script
-               $BE_USER = t3lib_div::makeInstance('t3lib_tsfeBeUserAuth');     // New backend user object
-               $BE_USER->OS = TYPO3_OS;
-               $BE_USER->start();                      // Object is initialized
-               $BE_USER->unpack_uc('');
-               if ($BE_USER->user['uid'])      {
-                       $BE_USER->fetchGroupData();
-                       $TSFE->beUserLogin = 1;
-               }
-               if ($BE_USER->checkLockToIP() && $BE_USER->checkBackendAccessSettingsFromInitPhp())     {
-                       $BE_USER->extInitFeAdmin();
-                       if ($BE_USER->extAdmEnabled)    {
-                               require_once(t3lib_extMgm::extPath('lang').'lang.php');
-                               $LANG = t3lib_div::makeInstance('language');
-                               $LANG->init($BE_USER->uc['lang']);
-
-                               $BE_USER->extSaveFeAdminConfig();
-                                       // Setting some values based on the admin panel
-                               $TSFE->forceTemplateParsing = $BE_USER->extGetFeAdminValue('tsdebug', 'forceTemplateParsing');
-                               $TSFE->displayEditIcons = $BE_USER->extGetFeAdminValue('edit', 'displayIcons');
-                               $TSFE->displayFieldEditIcons = $BE_USER->extGetFeAdminValue('edit', 'displayFieldIcons');
-
-                               if (t3lib_div::_GP('ADMCMD_editIcons')) {
-                                       $TSFE->displayFieldEditIcons=1;
-                                       $BE_USER->uc['TSFE_adminConfig']['edit_editNoPopup']=1;
-                               }
-                               if (t3lib_div::_GP('ADMCMD_simUser'))   {
-                                       $BE_USER->uc['TSFE_adminConfig']['preview_simulateUserGroup']=intval(t3lib_div::_GP('ADMCMD_simUser'));
-                                       $BE_USER->ext_forcePreview=1;
-                               }
-                               if (t3lib_div::_GP('ADMCMD_simTime'))   {
-                                       $BE_USER->uc['TSFE_adminConfig']['preview_simulateDate']=intval(t3lib_div::_GP('ADMCMD_simTime'));
-                                       $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'))        {
-                                       $TSFE->includeTCA();
-                                       if ($BE_USER->extIsEditAction())        {
-                                               require_once (PATH_t3lib.'class.t3lib_tcemain.php');
-                                               $BE_USER->extEditAction();
-                                       }
-                                       if ($BE_USER->extIsFormShown()) {
-                                               require_once(PATH_t3lib.'class.t3lib_tceforms.php');
-                                               require_once(PATH_t3lib.'class.t3lib_iconworks.php');
-                                               require_once(PATH_t3lib.'class.t3lib_loaddbgroup.php');
-                                               require_once(PATH_t3lib.'class.t3lib_transferdata.php');
-                                       }
-                               }
+/** @var $BE_USER t3lib_tsfeBeUserAuth */
+$BE_USER = $TSFE->initializeBackendUser();
 
-                               if ($TSFE->forceTemplateParsing || $TSFE->displayEditIcons || $TSFE->displayFieldEditIcons)     { $TSFE->set_no_cache(); }
-                       }
 
-       //              $WEBMOUNTS = (string)($BE_USER->groupData['webmounts'])!='' ? explode(',',$BE_USER->groupData['webmounts']) : Array();
-       //              $FILEMOUNTS = $BE_USER->groupData['filemounts'];
-               } else {        // Unset the user initialization.
-                       $BE_USER='';
-                       $TSFE->beUserLogin=0;
-               }
-       $TT->pull();
-       $TYPO3_MISC['microtime_BE_USER_end'] = microtime();
-}
+// ********************
+// Workspace preview:
+// ********************
+$TSFE->workspacePreviewInit();
 
 
 // *****************************************
-// Proces the ID, type and other parameters
+// Process the ID, type and other parameters
 // After this point we have an array, $page in TSFE, which is the page-record of the current page, $id
 // *****************************************
 $TT->push('Process ID','');
+               // Initialize admin panel since simulation settings are required here:
+       if ($TSFE->isBackendUserLoggedIn()) {
+               $BE_USER->initializeAdminPanel();
+       }
+
        $TSFE->checkAlternativeIdMethods();
        $TSFE->clear_preview();
        $TSFE->determineId();
 
                // Now, if there is a backend user logged in and he has NO access to this page, then re-evaluate the id shown!
-       if ($TSFE->beUserLogin && !$BE_USER->extPageReadAccess($TSFE->page))    {
+       if ($TSFE->isBackendUserLoggedIn() && (!$BE_USER->extPageReadAccess($TSFE->page) || t3lib_div::_GP('ADMCMD_noBeUser'))) {       // t3lib_div::_GP('ADMCMD_noBeUser') is placed here because workspacePreviewInit() might need to know if a backend user is logged in!
 
                        // Remove user
                unset($BE_USER);
@@ -261,6 +309,30 @@ $TT->push('Process ID','');
        $TSFE->makeCacheHash();
 $TT->pull();
 
+// *****************************************
+// Admin Panel & Frontend editing
+// *****************************************
+if ($TSFE->isBackendUserLoggedIn()) {
+               // if a BE User is present load, the sprite manager for frontend-editing
+       $spriteManager = t3lib_div::makeInstance('t3lib_SpriteManager', FALSE);
+       $spriteManager->loadCacheFile();
+
+       $BE_USER->initializeFrontendEdit();
+       if ($BE_USER->adminPanel instanceof tslib_AdminPanel) {
+               $LANG = t3lib_div::makeInstance('language');
+               $LANG->init($BE_USER->uc['lang']);
+       }
+       if ($BE_USER->frontendEdit instanceof t3lib_frontendedit) {
+               $BE_USER->frontendEdit->initConfigOptions();
+       }
+}
+
+// *******************************************
+// Get compressed $TCA-Array();
+// After this, we should now have a valid $TCA, though minimized
+// *******************************************
+$TSFE->getCompressedTCarray();
+
 
 // ********************************
 // Starts the template
@@ -284,18 +356,26 @@ $TT->pull();
 // ******************************************************
 $TSFE->getConfigArray();
 
+// ********************************
+// Convert POST data to internal "renderCharset" if different from the metaCharset
+// *******************************
+$TSFE->convPOSTCharset();
+
 
 // *******************************************
-// Get compressed $TCA-Array();
-// After this, we should now have a valid $TCA, though minimized
+// Setting language and locale
 // *******************************************
-$TSFE->getCompressedTCarray();
+$TT->push('Setting language and locale','');
+       $TSFE->settingLanguage();
+       $TSFE->settingLocale();
+$TT->pull();
 
 
-// *******************************************
-// Setting the internal var, sys_language_uid
-// *******************************************
-$TSFE->settingLanguage();
+// ********************************
+// Check JumpUrl
+// *******************************
+$TSFE->setExternalJumpUrl();
+$TSFE->checkJumpUrlReferer();
 
 
 // ********************************
@@ -304,12 +384,9 @@ $TSFE->settingLanguage();
 // *******************************
 switch($TSFE->checkDataSubmission())   {
        case 'email':
-               require_once(PATH_t3lib.'class.t3lib_htmlmail.php');
-               require_once(PATH_t3lib.'class.t3lib_formmail.php');
                $TSFE->sendFormmail();
        break;
        case 'fe_tce':
-               require_once(PATH_tslib.'class.tslib_fetce.php');
                $TSFE->includeTCA();
                $TT->push('fe_tce','');
                $TSFE->fe_tce();
@@ -318,10 +395,10 @@ switch($TSFE->checkDataSubmission())      {
 }
 
 
-// ********************************
-// Check JumpUrl
 // *******************************
-$TSFE->checkJumpUrl();
+// Check for shortcut page and redirect
+// *******************************
+$TSFE->checkPageForShortcutRedirect();
 
 
 // ********************************
@@ -330,55 +407,27 @@ $TSFE->checkJumpUrl();
 $TSFE->setUrlIdToken();
 
 $TT->push('Page generation','');
-if ($TSFE->doXHTML_cleaning()) {require_once(PATH_t3lib.'class.t3lib_parsehtml.php');}
-if ($TSFE->isGeneratePage())   {
+       if ($TSFE->isGeneratePage()) {
                $TSFE->generatePage_preProcessing();
                $temp_theScript=$TSFE->generatePage_whichScript();
 
-               if ($temp_theScript)    {
+               if ($temp_theScript) {
                        include($temp_theScript);
                } else {
-                       require_once(PATH_tslib.'class.tslib_pagegen.php');
                        include(PATH_tslib.'pagegen.php');
                }
-               if ($TSFE->isSearchIndexPage()) {
-                       if ($TSFE->config['config']['index_externals']) {require_once(PATH_t3lib.'class.t3lib_htmlmail.php');}
-                       require_once(t3lib_extMgm::extPath('indexed_search','class.indexer.php'));
-               }
                $TSFE->generatePage_postProcessing();
-} elseif ($TSFE->isINTincScript())     {
-       require_once(PATH_tslib.'class.tslib_pagegen.php');
-       include(PATH_tslib.'pagegen.php');
-}
+       } elseif ($TSFE->isINTincScript()) {
+               include(PATH_tslib.'pagegen.php');
+       }
 $TT->pull();
 
 
 // ********************************
-// $GLOBALS['TSFE']->config['INTincScript']
+// $TSFE->config['INTincScript']
 // *******************************
 if ($TSFE->isINTincScript())           {
        $TT->push('Non-cached objects','');
-               $INTiS_config = $GLOBALS['TSFE']->config['INTincScript'];
-
-                       // Special feature: Include libraries
-               $TT->push('Include libraries');
-               reset($INTiS_config);
-               while(list(,$INTiS_cPart)=each($INTiS_config))  {
-                       if ($INTiS_cPart['conf']['includeLibs'])        {
-                               $INTiS_resourceList = t3lib_div::trimExplode(',',$INTiS_cPart['conf']['includeLibs'],1);
-                               $GLOBALS['TT']->setTSlogMessage('Files for inclusion: "'.implode(', ',$INTiS_resourceList).'"');
-                               reset($INTiS_resourceList);
-                               while(list(,$INTiS_theLib)=each($INTiS_resourceList))   {
-                                       $INTiS_incFile=$GLOBALS['TSFE']->tmpl->getFileName($INTiS_theLib);
-                                       if ($INTiS_incFile)     {
-                                               require_once('./'.$INTiS_incFile);
-                                       } else {
-                                               $GLOBALS['TT']->setTSlogMessage('Include file "'.$INTiS_theLib.'" did not exist!',2);
-                                       }
-                               }
-                       }
-               }
-               $TT->pull();
                $TSFE->INTincScript();
        $TT->pull();
 }
@@ -386,6 +435,7 @@ if ($TSFE->isINTincScript())                {
 // ***************
 // Output content
 // ***************
+$sendTSFEContent = FALSE;
 if ($TSFE->isOutputting())     {
        $TT->push('Print Content','');
        $TSFE->processOutput();
@@ -396,35 +446,24 @@ if ($TSFE->isOutputting())        {
        if ($TSFE->isEXTincScript())    {
                $TT->push('External PHP-script','');
                                // Important global variables here are $EXTiS_*, they must not be overridden in include-scripts!!!
-                       $EXTiS_config = $GLOBALS['TSFE']->config['EXTincScript'];
-                       $EXTiS_splitC = explode('<!--EXT_SCRIPT.',$GLOBALS['TSFE']->content);                   // Splits content with the key.
+                       $EXTiS_config = $TSFE->config['EXTincScript'];
+                       $EXTiS_splitC = explode('<!--EXT_SCRIPT.',$TSFE->content);      // Splits content with the key
 
                                // Special feature: Include libraries
-                       reset($EXTiS_config);
-                       while(list(,$EXTiS_cPart)=each($EXTiS_config))  {
-                               if ($EXTiS_cPart['conf']['includeLibs'])        {
-                                       $EXTiS_resourceList = t3lib_div::trimExplode(',',$EXTiS_cPart['conf']['includeLibs'],1);
-                                       $GLOBALS['TT']->setTSlogMessage('Files for inclusion: "'.implode(', ',$EXTiS_resourceList).'"');
-                                       reset($EXTiS_resourceList);
-                                       while(list(,$EXTiS_theLib)=each($EXTiS_resourceList))   {
-                                               $EXTiS_incFile=$GLOBALS['TSFE']->tmpl->getFileName($EXTiS_theLib);
-                                               if ($EXTiS_incFile)     {
-                                                       require_once($EXTiS_incFile);
-                                               } else {
-                                                       $GLOBALS['TT']->setTSlogMessage('Include file "'.$EXTiS_theLib.'" did not exist!',2);
-                                               }
-                                       }
+                       foreach ($EXTiS_config as $EXTiS_cPart) {
+                               if (isset($EXTiS_cPart['conf']['includeLibs']) && $EXTiS_cPart['conf']['includeLibs']) {
+                                       $EXTiS_resourceList = t3lib_div::trimExplode(',',$EXTiS_cPart['conf']['includeLibs'], TRUE);
+                                       $TSFE->includeLibraries($EXTiS_resourceList);
                                }
                        }
 
-                       reset($EXTiS_splitC);
-                       while(list($EXTiS_c,$EXTiS_cPart)=each($EXTiS_splitC))  {
+                       foreach ($EXTiS_splitC as $EXTiS_c => $EXTiS_cPart) {
                                if (substr($EXTiS_cPart,32,3)=='-->')   {       // If the split had a comment-end after 32 characters it's probably a split-string
                                        $EXTiS_key = 'EXT_SCRIPT.'.substr($EXTiS_cPart,0,32);
                                        if (is_array($EXTiS_config[$EXTiS_key]))        {
                                                $REC = $EXTiS_config[$EXTiS_key]['data'];
                                                $CONF = $EXTiS_config[$EXTiS_key]['conf'];
-                                               $content='';
+                                               $content = '';
                                                include($EXTiS_config[$EXTiS_key]['file']);
                                                echo $content;  // The script MAY return content in $content or the script may just output the result directly!
                                        }
@@ -436,7 +475,7 @@ if ($TSFE->isOutputting())  {
 
                $TT->pull();
        } else {
-               echo $GLOBALS['TSFE']->content;
+               $sendTSFEContent = TRUE;
        }
        $TT->pull();
 }
@@ -451,11 +490,10 @@ $TSFE->storeSessionData();
 // ***********
 // Statistics
 // ***********
-$TYPO3_MISC['microtime_end'] = microtime();
+$TYPO3_MISC['microtime_end'] = microtime(TRUE);
 $TSFE->setParseTime();
-if ($TSFE->isOutputting() && ($TSFE->TYPO3_CONF_VARS['FE']['debug'] || $TSFE->config['config']['debug']))      {
-       echo '
-<!-- Parsetime: '.$TSFE->scriptParseTime.' ms-->';
+if ($TSFE->isOutputting() && (!empty($TSFE->TYPO3_CONF_VARS['FE']['debug']) || !empty($TSFE->config['config']['debug']))) {
+       $TSFE->content .=  LF . '<!-- Parsetime: ' . $TSFE->scriptParseTime . 'ms -->';
 }
 $TSFE->statistics();
 
@@ -473,13 +511,9 @@ $TSFE->previewInfo();
 
 
 // ******************
-// Publishing static
+// Hook for end-of-frontend
 // ******************
-if (is_object($BE_USER))       {
-       if ($BE_USER->extAdmModuleEnabled('publish') && $BE_USER->extPublishList)       {
-               include_once(PATH_tslib.'publish.php');
-       }
-}
+$TSFE->hook_eofe();
 
 
 // ********************
@@ -491,36 +525,29 @@ $TT->pull();
 // ******************
 // beLoginLinkIPList
 // ******************
-echo $GLOBALS['TSFE']->beLoginLinkIPList();
+echo $TSFE->beLoginLinkIPList();
 
 
 // *************
 // Admin panel
 // *************
-if (is_object($BE_USER)
-       && $GLOBALS['TSFE']->beUserLogin
-       && $GLOBALS['TSFE']->config['config']['admPanel']
-       && $BE_USER->extAdmEnabled
-//     && $BE_USER->extPageReadAccess($GLOBALS['TSFE']->page)  // This is already done, if there is a BE_USER object at this point!
-       && !$BE_USER->extAdminConfig['hide'])   {
-               echo $BE_USER->extPrintFeAdminDialog();
+if (is_object($BE_USER) && $BE_USER->isAdminPanelVisible() && $TSFE->isBackendUserLoggedIn()) {
+       $TSFE->content = str_ireplace('</head>',  $BE_USER->adminPanel->getAdminPanelHeaderData() . '</head>', $TSFE->content);
+       $TSFE->content = str_ireplace('</body>',  $BE_USER->displayAdminPanel() . '</body>', $TSFE->content);
 }
 
+if ($sendTSFEContent) {
+       echo $TSFE->content;
+}
 
 // *************
 // Debugging Output
 // *************
-if(@is_callable(array($error,'debugOutput'))) {
+if(isset($error) && is_object($error) && @is_callable(array($error,'debugOutput'))) {
        $error->debugOutput();
 }
-if (TYPO3_DLOG)        t3lib_div::devLog('END of FRONTEND session','',0,array('_FLUSH'=>TRUE));
-
-
-// *************
-// Compressions
-// *************
-if ($TYPO3_CONF_VARS['FE']['compressionLevel'])        {
-       new gzip_encode($TYPO3_CONF_VARS['FE']['compressionLevel'], false, $GLOBALS['TYPO3_CONF_VARS']['FE']['compressionDebugInfo']);
+if (TYPO3_DLOG) {
+       t3lib_div::devLog('END of FRONTEND session', 'cms', 0, array('_FLUSH' => TRUE));
 }
 
-?>
+?>
\ No newline at end of file