X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/blobdiff_plain/0df32f1e0e29293c07dd554a229415c45d9016af..bfa7453b18469370dc8668aeaf4afaaef93cdaac:/index.php diff --git a/index.php b/index.php index 9c309fdca87..70b82bc0b49 100644 --- a/index.php +++ b/index.php @@ -2,7 +2,7 @@ /*************************************************************** * Copyright notice * -* (c) 1999-2008 Kasper Skaarhoj (kasperYYYY@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 @@ -28,9 +28,7 @@ * This is the MAIN DOCUMENT of the TypoScript driven standard front-end (from the "cms" extension) * Basically this is the "index.php" script which all requests for TYPO3 delivered pages goes to in the frontend (the website) * - * $Id$ - * - * @author René Fritz + * @author René Fritz * @package TYPO3 * @subpackage tslib */ @@ -39,14 +37,18 @@ // Set error reporting // ******************************* -error_reporting (E_ALL ^ E_NOTICE); +error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED); // ****************** // Constants defined // ****************** -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 == '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'])))); define('PATH_site', dirname(PATH_thisScript).'/'); @@ -66,7 +68,7 @@ if (@is_dir(PATH_site.'typo3/sysext/cms/tslib/')) { } if (PATH_tslib=='') { - die('Cannot find tslib/. Please set path by defining $configured_tslib_path in '.basename(PATH_thisScript).'.'); + die('Cannot find tslib/. Please set path by defining $configured_tslib_path in ' . htmlspecialchars(basename(PATH_thisScript)) . '.'); } // ******************