Fixed bug #14717: [Usability] Add delay to close the context menu
[Packages/TYPO3.CMS.git] / typo3 / init.php
old mode 100755 (executable)
new mode 100644 (file)
index 3447f09..6ac65a7
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 1999-2007 Kasper Skaarhoj (kasperYYYY@typo3.com)
+*  (c) 1999-2010 Kasper Skaarhoj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
  * @subpackage core
  */
 
  * @subpackage core
  */
 
+// *******************************
+// Checking PHP version
+// *******************************
+if (version_compare(phpversion(), '5.2', '<')) die ('TYPO3 requires PHP 5.2.0 or higher.');
+
 
 // *******************************
 // Set error reporting
 // *******************************
 
 // *******************************
 // Set error reporting
 // *******************************
-error_reporting (E_ALL ^ E_NOTICE);
+if (defined('E_DEPRECATED')) {
+       error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
+} else {
+       error_reporting(E_ALL ^ E_NOTICE);
+}
 
 
+// *******************************
+// Prevent any unwanted output that may corrupt AJAX/compression. Note: this does
+// not interfeer with "die()" or "echo"+"exit()" messages!
+// *******************************
+ob_start();
 
 // *******************************
 // Define constants
 // *******************************
 define('TYPO3_OS', stristr(PHP_OS,'win')&&!stristr(PHP_OS,'darwin')?'WIN':'');
 define('TYPO3_MODE','BE');
 
 // *******************************
 // Define constants
 // *******************************
 define('TYPO3_OS', stristr(PHP_OS,'win')&&!stristr(PHP_OS,'darwin')?'WIN':'');
 define('TYPO3_MODE','BE');
-define('PATH_thisScript',str_replace('//','/', str_replace('\\','/', (php_sapi_name()=='cgi'||php_sapi_name()=='isapi' ||php_sapi_name()=='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']))));
+define('PATH_thisScript',str_replace('//','/', str_replace('\\','/', (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']))));
 define('TYPO3_mainDir', 'typo3/');             // This is the directory of the backend administration for the sites of this TYPO3 installation.
 
 
 // *******************************
 define('TYPO3_mainDir', 'typo3/');             // This is the directory of the backend administration for the sites of this TYPO3 installation.
 
 
 // *******************************
+// Fix BACK_PATH, if the TYPO3_mainDir is set to something else than
+// typo3/, this is a workaround because the conf.php of the old modules
+// still have "typo3/" hardcoded. Can be removed once we don't have to worry about
+// legacy modules (with conf.php and $BACK_PATH) anymore. See RFC / Bug #13262 for more details.
+// *******************************
+if (isset($BACK_PATH) && strlen($BACK_PATH) > 0 && TYPO3_mainDir != 'typo3/' && substr($BACK_PATH, -7) == '/typo3/') {
+       $BACK_PATH = substr($BACK_PATH, 0, -6) . TYPO3_mainDir;
+}
+
+// *******************************
 // Checking path
 // *******************************
 $temp_path = str_replace('\\','/',dirname(PATH_thisScript).'/');
 // Checking path
 // *******************************
 $temp_path = str_replace('\\','/',dirname(PATH_thisScript).'/');
@@ -100,7 +124,7 @@ if (!$temp_path || substr($temp_path,-strlen(TYPO3_mainDir))!=TYPO3_mainDir)        {       /
                $thisPath_base = basename(substr($temp_path,-strlen(TYPO3_mainDir)));
                $mainPath_base = basename(TYPO3_mainDir);
                if (!strcasecmp($thisPath, $mainPath))  {       // Seems like the requested URL is not case-specific. This may happen on Windows only. -case. Otherwise, redirect to the correct URL. TYPO3_mainDir must be lower-case!!
                $thisPath_base = basename(substr($temp_path,-strlen(TYPO3_mainDir)));
                $mainPath_base = basename(TYPO3_mainDir);
                if (!strcasecmp($thisPath, $mainPath))  {       // Seems like the requested URL is not case-specific. This may happen on Windows only. -case. Otherwise, redirect to the correct URL. TYPO3_mainDir must be lower-case!!
-                       $script_name = (php_sapi_name()=='cgi'||php_sapi_name()=='cgi-fcgi')&&($_SERVER['ORIG_PATH_INFO']?$_SERVER['ORIG_PATH_INFO']:$_SERVER['PATH_INFO']) ? ($_SERVER['ORIG_PATH_INFO']?$_SERVER['ORIG_PATH_INFO']:$_SERVER['PATH_INFO']) : ($_SERVER['ORIG_SCRIPT_NAME']?$_SERVER['ORIG_SCRIPT_NAME']:$_SERVER['SCRIPT_NAME']);      // Copied from t3lib_div::getIndpEnv()
+                       $script_name = (PHP_SAPI=='cgi'||PHP_SAPI=='cgi-fcgi')&&($_SERVER['ORIG_PATH_INFO']?$_SERVER['ORIG_PATH_INFO']:$_SERVER['PATH_INFO']) ? ($_SERVER['ORIG_PATH_INFO']?$_SERVER['ORIG_PATH_INFO']:$_SERVER['PATH_INFO']) : ($_SERVER['ORIG_SCRIPT_NAME']?$_SERVER['ORIG_SCRIPT_NAME']:$_SERVER['SCRIPT_NAME']);    // Copied from t3lib_div::getIndpEnv()
                        header('Location: '.str_replace($thisPath_base, $mainPath_base, $script_name));
                        exit;
                }
                        header('Location: '.str_replace($thisPath_base, $mainPath_base, $script_name));
                        exit;
                }
@@ -124,16 +148,16 @@ if (!$temp_path || substr($temp_path,-strlen(TYPO3_mainDir))!=TYPO3_mainDir)      {       /
 // Remove this line if you want to debug this problem a little more...
 die();
        echo '<br /><br /><strong>If you expect any help from anybody on this issue, you should save this page as an html document and send it along with your request for help!</strong>';
 // Remove this line if you want to debug this problem a little more...
 die();
        echo '<br /><br /><strong>If you expect any help from anybody on this issue, you should save this page as an html document and send it along with your request for help!</strong>';
-       echo '<HR><pre>';
+       echo '<hr /><pre>';
        print_r(array(
                'TYPO3_OS'=>TYPO3_OS,
                'PATH_thisScript'=>PATH_thisScript,
        print_r(array(
                'TYPO3_OS'=>TYPO3_OS,
                'PATH_thisScript'=>PATH_thisScript,
-               'php_sapi_name()'=>php_sapi_name(),
+               'php_sapi_name()'=>PHP_SAPI,
                'TYPO3_MOD_PATH'=>TYPO3_MOD_PATH,
                'PATH_TRANSLATED'=>$_SERVER['PATH_TRANSLATED'],
                'SCRIPT_FILENAME'=>$_SERVER['SCRIPT_FILENAME']
        ));
                'TYPO3_MOD_PATH'=>TYPO3_MOD_PATH,
                'PATH_TRANSLATED'=>$_SERVER['PATH_TRANSLATED'],
                'SCRIPT_FILENAME'=>$_SERVER['SCRIPT_FILENAME']
        ));
-       echo '</pre><HR>';
+       echo '</pre><hr />';
        phpinfo();
        exit;
 } else {
        phpinfo();
        exit;
 } else {
@@ -143,8 +167,20 @@ die();
        $temp_path_t3lib = @is_dir(PATH_site.'t3lib/') ? PATH_site.'t3lib/' : PATH_typo3.'t3lib/';
        define('PATH_t3lib', $temp_path_t3lib);                 // Abs. path to t3lib/ (general TYPO3 library) within the TYPO3 admin dir
        define('PATH_typo3conf', PATH_site.'typo3conf/');       // Abs. TYPO3 configuration path (local, not part of source)
        $temp_path_t3lib = @is_dir(PATH_site.'t3lib/') ? PATH_site.'t3lib/' : PATH_typo3.'t3lib/';
        define('PATH_t3lib', $temp_path_t3lib);                 // Abs. path to t3lib/ (general TYPO3 library) within the TYPO3 admin dir
        define('PATH_typo3conf', PATH_site.'typo3conf/');       // Abs. TYPO3 configuration path (local, not part of source)
+
+       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/');
+               }
+       }
 }
 
 }
 
+// *********************
+// Unset variable(s) in global scope (fixes #13959)
+// *********************
+unset($error);
 
 // *************************************************
 // t3lib_div + extention management class included
 
 // *************************************************
 // t3lib_div + extention management class included
@@ -158,16 +194,42 @@ require_once(PATH_t3lib.'class.t3lib_extmgm.php');        // Extension API Management l
 require(PATH_t3lib.'config_default.php');
 if (!defined ('TYPO3_db'))     die ('The configuration file was not included.');
 
 require(PATH_t3lib.'config_default.php');
 if (!defined ('TYPO3_db'))     die ('The configuration file was not included.');
 
-require_once(PATH_t3lib.'class.t3lib_db.php');         // The database library
+
+
+
+// *********************
+// Error & Exception handling
+// *********************
+if ($TYPO3_CONF_VARS['SC_OPTIONS']['errors']['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']);
+}
+
+/** @var TYPO3_DB t3lib_db */
 $TYPO3_DB = t3lib_div::makeInstance('t3lib_DB');
 $TYPO3_DB->debugOutput = $TYPO3_CONF_VARS['SYS']['sqlDebug'];
 
 $CLIENT = t3lib_div::clientInfo();                                     // $CLIENT includes information about the browser/user-agent
 $PARSETIME_START = t3lib_div::milliseconds();          // Is set to the system time in milliseconds. This could be used to output script parsetime in the end of the script
 
 $TYPO3_DB = t3lib_div::makeInstance('t3lib_DB');
 $TYPO3_DB->debugOutput = $TYPO3_CONF_VARS['SYS']['sqlDebug'];
 
 $CLIENT = t3lib_div::clientInfo();                                     // $CLIENT includes information about the browser/user-agent
 $PARSETIME_START = t3lib_div::milliseconds();          // Is set to the system time in milliseconds. This could be used to output script parsetime in the end of the script
 
+// ***********************************
+// Initializing the Caching System
+// ***********************************
 
 
+if (TYPO3_UseCachingFramework) {
+       $typo3CacheManager = t3lib_div::makeInstance('t3lib_cache_Manager');
+       $typo3CacheFactory = t3lib_div::makeInstance('t3lib_cache_Factory');
+       $typo3CacheFactory->setCacheManager($typo3CacheManager);
 
 
-
+       t3lib_cache::initPageCache();
+       t3lib_cache::initPageSectionCache();
+       t3lib_cache::initContentHashCache();
+}
 // *************************
 // CLI dispatch processing
 // *************************
 // *************************
 // CLI dispatch processing
 // *************************
@@ -185,36 +247,38 @@ if (defined('TYPO3_cliMode') && TYPO3_cliMode && basename(PATH_thisScript)=='cli
                } else {
                        echo "The supplied 'cliKey' was not valid. Please use one of the available from this list:\n\n";
                        print_r(array_keys($TYPO3_CONF_VARS['SC_OPTIONS']['GLOBAL']['cliKeys']));
                } else {
                        echo "The supplied 'cliKey' was not valid. Please use one of the available from this list:\n\n";
                        print_r(array_keys($TYPO3_CONF_VARS['SC_OPTIONS']['GLOBAL']['cliKeys']));
-                       echo "\n";
+                       echo LF;
                        exit;
                }
        } else {
                echo "Please supply a 'cliKey' as first argument. The following are available:\n\n";
                print_r($TYPO3_CONF_VARS['SC_OPTIONS']['GLOBAL']['cliKeys']);
                        exit;
                }
        } else {
                echo "Please supply a 'cliKey' as first argument. The following are available:\n\n";
                print_r($TYPO3_CONF_VARS['SC_OPTIONS']['GLOBAL']['cliKeys']);
-               echo "\n";
+               echo LF;
                exit;
        }
 }
 
 
                exit;
        }
 }
 
 
-
-// *********************
-// Libraries included
-// *********************
-require_once(PATH_t3lib.'class.t3lib_userauth.php');
-require_once(PATH_t3lib.'class.t3lib_userauthgroup.php');
-require_once(PATH_t3lib.'class.t3lib_beuserauth.php');
-require_once(PATH_t3lib.'class.t3lib_iconworks.php');
-require_once(PATH_t3lib.'class.t3lib_befunc.php');
-require_once(PATH_t3lib.'class.t3lib_cs.php');
-
 // **********************
 // Check Hardcoded lock on BE:
 // **********************
 if ($TYPO3_CONF_VARS['BE']['adminOnly'] < 0)   {
 // **********************
 // Check Hardcoded lock on BE:
 // **********************
 if ($TYPO3_CONF_VARS['BE']['adminOnly'] < 0)   {
-       header('Status: 404 Not Found');        // Send Not Found header - if the webserver can make use of it...
-       header('Location: http://');    // Just point us away from here...
-       exit;   // ... and exit good!
+       t3lib_BEfunc::typo3printError('Backend locked', 'Backend and Install Tool are locked for maintenance. [BE][adminOnly] is set to "' . intval($TYPO3_CONF_VARS['BE']['adminOnly']) . '".');
+       exit;
+}
+if (!(defined('TYPO3_cliMode') && TYPO3_cliMode) && @is_file(PATH_typo3conf.'LOCK_BACKEND'))   {
+       if (TYPO3_PROCEED_IF_NO_USER == 2) {
+               // ajax poll for login, let him pass
+       } else {
+               $fContent = t3lib_div::getUrl(PATH_typo3conf.'LOCK_BACKEND');
+               if ($fContent)  {
+                       header('Location: '.$fContent); // Redirect
+               } else {
+                       t3lib_BEfunc::typo3printError('Backend locked', 'Browser backend is locked for maintenance. Remove lock by removing the file "typo3conf/LOCK_BACKEND" or use CLI-scripts.');
+               }
+               exit;
+       }
+
 }
 
 // **********************
 }
 
 // **********************
@@ -233,16 +297,24 @@ if (trim($TYPO3_CONF_VARS['BE']['IPmaskList']) && !(defined('TYPO3_cliMode') &&
 // Check SSL (https)
 // **********************
 if (intval($TYPO3_CONF_VARS['BE']['lockSSL']) && !(defined('TYPO3_cliMode') && TYPO3_cliMode)) {
 // Check SSL (https)
 // **********************
 if (intval($TYPO3_CONF_VARS['BE']['lockSSL']) && !(defined('TYPO3_cliMode') && TYPO3_cliMode)) {
+       if(intval($TYPO3_CONF_VARS['BE']['lockSSLPort'])) {
+               $sslPortSuffix = ':'.intval($TYPO3_CONF_VARS['BE']['lockSSLPort']);
+       } else {
+               $sslPortSuffix = '';
+       }
        if ($TYPO3_CONF_VARS['BE']['lockSSL'] == 3)     {
                $requestStr = substr(t3lib_div::getIndpEnv('TYPO3_REQUEST_SCRIPT'), strlen(t3lib_div::getIndpEnv('TYPO3_SITE_URL').TYPO3_mainDir));
                if($requestStr == 'index.php' && !t3lib_div::getIndpEnv('TYPO3_SSL'))   {
                        list(,$url) = explode('://',t3lib_div::getIndpEnv('TYPO3_REQUEST_URL'),2);
        if ($TYPO3_CONF_VARS['BE']['lockSSL'] == 3)     {
                $requestStr = substr(t3lib_div::getIndpEnv('TYPO3_REQUEST_SCRIPT'), strlen(t3lib_div::getIndpEnv('TYPO3_SITE_URL').TYPO3_mainDir));
                if($requestStr == 'index.php' && !t3lib_div::getIndpEnv('TYPO3_SSL'))   {
                        list(,$url) = explode('://',t3lib_div::getIndpEnv('TYPO3_REQUEST_URL'),2);
-                       header('Location: https://'.$url);
+                       list($server,$address) = explode('/',$url,2);
+                       header('Location: https://'.$server.$sslPortSuffix.'/'.$address);
+                       exit;
                }
        } elseif (!t3lib_div::getIndpEnv('TYPO3_SSL') ) {
                if ($TYPO3_CONF_VARS['BE']['lockSSL'] == 2)     {
                        list(,$url) = explode('://',t3lib_div::getIndpEnv('TYPO3_SITE_URL').TYPO3_mainDir,2);
                }
        } elseif (!t3lib_div::getIndpEnv('TYPO3_SSL') ) {
                if ($TYPO3_CONF_VARS['BE']['lockSSL'] == 2)     {
                        list(,$url) = explode('://',t3lib_div::getIndpEnv('TYPO3_SITE_URL').TYPO3_mainDir,2);
-                       header('Location: https://'.$url);      // Just point us away from here...
+                       list($server,$address) = explode('/',$url,2);
+                       header('Location: https://'.$server.$sslPortSuffix.'/'.$address);
                } else {
                        header('Status: 404 Not Found');        // Send Not Found header - if the webserver can make use of it...
                        header('Location: http://');    // Just point us away from here...
                } else {
                        header('Status: 404 Not Found');        // Send Not Found header - if the webserver can make use of it...
                        header('Location: http://');    // Just point us away from here...
@@ -255,7 +327,6 @@ if (intval($TYPO3_CONF_VARS['BE']['lockSSL']) && !(defined('TYPO3_cliMode') && T
 // *******************************
 // Checking environment
 // *******************************
 // *******************************
 // Checking environment
 // *******************************
-if (t3lib_div::int_from_ver(phpversion())<5001000)     die ('TYPO3 requires PHP 5.1.0 or higher.');
 if (isset($_POST['GLOBALS']) || isset($_GET['GLOBALS']))       die('You cannot set the GLOBALS-array from outside the script.');
 if (!get_magic_quotes_gpc())   {
        t3lib_div::addSlashesOnArray($_GET);
 if (isset($_POST['GLOBALS']) || isset($_GET['GLOBALS']))       die('You cannot set the GLOBALS-array from outside the script.');
 if (!get_magic_quotes_gpc())   {
        t3lib_div::addSlashesOnArray($_GET);
@@ -270,7 +341,7 @@ if (!get_magic_quotes_gpc())        {
 // ********************************************
 if (defined('TYPO3_enterInstallScript') && TYPO3_enterInstallScript)   {
        if(!t3lib_extMgm::isLoaded('install')) {
 // ********************************************
 if (defined('TYPO3_enterInstallScript') && TYPO3_enterInstallScript)   {
        if(!t3lib_extMgm::isLoaded('install')) {
-               die('Install Tool is not loaded as an extension.<br/>You must add the key "install" to the list of installed extensions in typo3conf/localconf.php, $TYPO3_CONF_VARS["EXT"]["extList"].');
+               die('Install Tool is not loaded as an extension.<br />You must add the key "install" to the list of installed extensions in typo3conf/localconf.php, $TYPO3_CONF_VARS[\'EXT\'][\'extList\'].');
        }
 
        require_once(t3lib_extMgm::extPath('install').'mod/class.tx_install.php');
        }
 
        require_once(t3lib_extMgm::extPath('install').'mod/class.tx_install.php');
@@ -286,14 +357,14 @@ if (defined('TYPO3_enterInstallScript') && TYPO3_enterInstallScript)      {
 // *************************
 if ($TYPO3_DB->sql_pconnect(TYPO3_db_host, TYPO3_db_username, TYPO3_db_password))      {
        if (!TYPO3_db)  {
 // *************************
 if ($TYPO3_DB->sql_pconnect(TYPO3_db_host, TYPO3_db_username, TYPO3_db_password))      {
        if (!TYPO3_db)  {
-               t3lib_BEfunc::typo3PrintError ('No database selected','Database Error');
+               t3lib_BEfunc::typo3PrintError('Database Error', 'No database selected');
                exit;
        } elseif (!$TYPO3_DB->sql_select_db(TYPO3_db))  {
                exit;
        } elseif (!$TYPO3_DB->sql_select_db(TYPO3_db))  {
-               t3lib_BEfunc::typo3PrintError ('Cannot connect to the current database, "'.TYPO3_db.'"','Database Error');
+               t3lib_BEfunc::typo3PrintError('Database Error', 'Cannot connect to the current database, "' . TYPO3_db . '"');
                exit;
        }
 } else {
                exit;
        }
 } else {
-       t3lib_BEfunc::typo3PrintError ('The current username, password or host was not accepted when the connection to the database was attempted to be established!','Database Error');
+       t3lib_BEfunc::typo3PrintError('Database Error', 'The current username, password or host was not accepted when the connection to the database was attempted to be established!');
        exit;
 }
 
        exit;
 }
 
@@ -322,6 +393,9 @@ if (TYPO3_extTableDef_script)       {
        include (PATH_typo3conf.TYPO3_extTableDef_script);
 }
 
        include (PATH_typo3conf.TYPO3_extTableDef_script);
 }
 
+       // load TYPO3 SpriteGenerating API
+$spriteManager = t3lib_div::makeInstance('t3lib_SpriteManager', TRUE);
+$spriteManager->loadCacheFile();
 
 
 // *******************************
 
 
 // *******************************
@@ -339,12 +413,17 @@ $BE_USER->OS = TYPO3_OS;
 $BE_USER->start();                     // Object is initialized
 $BE_USER->checkCLIuser();
 $BE_USER->backendCheckLogin(); // Checking if there's a user logged in
 $BE_USER->start();                     // Object is initialized
 $BE_USER->checkCLIuser();
 $BE_USER->backendCheckLogin(); // Checking if there's a user logged in
-$BE_USER->trackBeUser($TYPO3_CONF_VARS['BE']['trackBeUser']);  // Tracking backend user script hits
 
        // Setting the web- and filemount global vars:
 $WEBMOUNTS = $BE_USER->returnWebmounts();              // ! WILL INCLUDE deleted mount pages as well!
 $FILEMOUNTS = $BE_USER->returnFilemounts();
 
 
        // Setting the web- and filemount global vars:
 $WEBMOUNTS = $BE_USER->returnWebmounts();              // ! WILL INCLUDE deleted mount pages as well!
 $FILEMOUNTS = $BE_USER->returnFilemounts();
 
+// *******************************
+// $GLOBALS['LANG'] initialisation
+// *******************************
+$GLOBALS['LANG'] = t3lib_div::makeInstance('language');
+$GLOBALS['LANG']->init($BE_USER->uc['lang']);
+
 
 // ****************
 // CLI processing
 
 // ****************
 // CLI processing
@@ -354,9 +433,9 @@ if (defined('TYPO3_cliMode') && TYPO3_cliMode)      {
        if (!strcmp($_SERVER['argv'][1],'status'))      {
                echo "Status of TYPO3 CLI script:\n\n";
                echo "Username [uid]: ".$BE_USER->user['username']." [".$BE_USER->user['uid']."]\n";
        if (!strcmp($_SERVER['argv'][1],'status'))      {
                echo "Status of TYPO3 CLI script:\n\n";
                echo "Username [uid]: ".$BE_USER->user['username']." [".$BE_USER->user['uid']."]\n";
-               echo "Database: ".TYPO3_db."\n";
-               echo "PATH_site: ".PATH_site."\n";
-               echo "\n";
+               echo "Database: ".TYPO3_db.LF;
+               echo "PATH_site: ".PATH_site.LF;
+               echo LF;
                exit;
        }
 }
                exit;
        }
 }
@@ -364,8 +443,12 @@ if (defined('TYPO3_cliMode') && TYPO3_cliMode)     {
 // ****************
 // compression
 // ****************
 // ****************
 // compression
 // ****************
-if ($TYPO3_CONF_VARS['BE']['compressionLevel'])        {
-       ob_start();
-       require_once (PATH_t3lib.'class.gzip_encode.php');
+ob_clean();
+if (extension_loaded('zlib') && $TYPO3_CONF_VARS['BE']['compressionLevel'])    {
+       if (t3lib_div::testInt($TYPO3_CONF_VARS['BE']['compressionLevel'])) {
+               @ini_set('zlib.output_compression_level', $TYPO3_CONF_VARS['BE']['compressionLevel']);
+       }
+       ob_start('ob_gzhandler');
 }
 }
+
 ?>
 ?>