[BUGFIX] Show correct record title
[Packages/TYPO3.CMS.git] / typo3 / install / index.php
index f88dd15..32a81de 100755 (executable)
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 1999-2010 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
@@ -27,9 +27,7 @@
 /**
  * Starter-script for install screen
  *
- * $Id$
- *
- * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
+ * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
  * @package TYPO3
  * @subpackage core
  */
 // Insert some security here, if you don't trust the Install Tool Password:
 // **************************************************************************
 
-if (defined('E_DEPRECATED')) {
-       error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
-} else {
-       error_reporting(E_ALL ^ E_NOTICE);
-}
+error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
+
+$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'])));
 
-$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'])));
 $PATH_site = dirname(dirname(dirname($PATH_thisScript)));
 
 $quickstartFile = $PATH_site . '/typo3conf/FIRST_INSTALL';
@@ -81,7 +80,7 @@ if (1==2 || !is_file($enableInstallToolFile)) {
                '../contrib/prototype/prototype.js"></script>' . LF;
        $javascript .= '<script type="text/javascript" src="' .
                '../sysext/install/Resources/Public/Javascript/install.js"></script>';
-       
+
                // Get the template file
        $template = @file_get_contents($PATH_site . '/typo3/templates/install.html');
                // Define the markers content
@@ -95,13 +94,13 @@ if (1==2 || !is_file($enableInstallToolFile)) {
                        </p>
                        <ul>
                                <li>
-                                       In the typo3conf/ folder, create a file named ENABLE_INSTALL_TOOL. The file name is 
+                                       In the typo3conf/ folder, create a file named ENABLE_INSTALL_TOOL. The file name is
                                        case sensitive, but the file itself can simply be an empty file.
                                </li>
                                <li class="t3-install-locked-user-settings">
-                                       Alternatively, in the Backend, go to <a href="../sysext/setup/mod/index.php">User tools &gt; User settings</a>
-                                       and let TYPO3 create this file for you. When you\'re finished, you can also visit 
-                                       <a href="../sysext/setup/mod/index.php">User tools &gt; User settings</a> and delete the file from there.
+                                       Alternatively, in the Backend, go to <a href="javascript:top.goToModule(\'user_setup\',1);">User tools &gt; User settings</a>
+                                       and let TYPO3 create this file for you. When you\'re finished, you can also visit
+                                       <a href="javascript:top.goToModule(\'user_setup\',1);">User tools &gt; User settings</a> and delete the file from there.
                                </li>
                        </ul>
                        <p>
@@ -140,4 +139,4 @@ $BACK_PATH='../';
 define('TYPO3_enterInstallScript', '1');
 require ('../init.php');
 
-?>
+?>
\ No newline at end of file