Added feature #14719: Add ability to use typo3conf/FIRST_INSTALL to temporarily enabl...
authorJeff Segars <jsegars@alumni.rice.edu>
Tue, 22 Jun 2010 02:45:08 +0000 (02:45 +0000)
committerJeff Segars <jsegars@alumni.rice.edu>
Tue, 22 Jun 2010 02:45:08 +0000 (02:45 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@8023 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/install/index.php

index 1e12b79..2cfb1c5 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
        * Followup to #10424: Old version (3.x) screenshots in CSH - removed label reference to version 3.6 (Thanks to Philipp Gampe)
        * Fixed bug #14760: Use labels for search in list view (Thanks to Georg Ringer)
        * Fixed bug #14601: Date picker does not work on IRRE elements (Thanks to Steffen Ritter)
+       * Added feature #14719: Add ability to use typo3conf/FIRST_INSTALL to temporarily enable the Install Tool and allow an easier first install.
 
 2010-06-21  Stanislas Rolland  <typo3@sjbr.ca>
 
index 923e941..d1bf53f 100755 (executable)
@@ -49,9 +49,15 @@ if (defined('E_DEPRECATED')) {
 $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)));
 
-       // Only allow Install Tool access if the file "typo3conf/ENABLE_INSTALL_TOOL" is found
+$quickstartFile = $PATH_site . '/typo3conf/FIRST_INSTALL';
 $enableInstallToolFile = $PATH_site . '/typo3conf/ENABLE_INSTALL_TOOL';
 
+       // If typo3conf/QUICKSTART is present and can be deleted, automatically create typo3conf/ENABLE_INSTALL_TOOL
+if (is_file($quickstartFile) && unlink($quickstartFile)) {
+       touch($enableInstallToolFile);
+}
+
+       // Only allow Install Tool access if the file "typo3conf/ENABLE_INSTALL_TOOL" is found
 if (is_file($enableInstallToolFile) && (time() - filemtime($enableInstallToolFile) > 3600)) {
        $content = file_get_contents($enableInstallToolFile);
        $verifyString = 'KEEP_FILE';