[BUGFIX] Update mentions of localconf.php
authorFrancois Suter <francois@typo3.org>
Tue, 4 Sep 2012 07:48:26 +0000 (09:48 +0200)
committerGeorg Ringer <georg.ringer@gmail.com>
Sat, 22 Sep 2012 09:38:22 +0000 (11:38 +0200)
The Core still contains quite a few mentions of
"typo3conf/localconf.php". They should be changed to
"typo3conf/LocalConfiguration.php" wherever appropriate.

Fixes: #40570
Releases: 6.0
Change-Id: Ieedd2582fef64cc66f1602807fc7a1510bc44ce5
Reviewed-on: http://review.typo3.org/14327
Reviewed-by: Markus Klein
Tested-by: Markus Klein
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer
t3lib/class.t3lib_install.php
typo3/install/index.php
typo3/sysext/core/Classes/Core/Bootstrap.php
typo3/sysext/install/Classes/Installer.php
typo3/sysext/lang/locallang_mod_tools_em.xlf

index 0b9b222..67b3a66 100644 (file)
@@ -388,16 +388,16 @@ class t3lib_install {
                $lines[] = $writeToLocalconf_dat['endLine'];
                $success = FALSE;
                if (!\TYPO3\CMS\Core\Utility\GeneralUtility::writeFile($writeToLocalconf_dat['tmpfile'], implode(LF, $lines))) {
-                       $msg = 'typo3conf/localconf.php' . $tmpExt . ' could not be written - maybe a write access problem?';
+                       $msg = 'typo3conf/LocalConfiguration.php' . $tmpExt . ' could not be written - maybe a write access problem?';
                } elseif (strcmp(\TYPO3\CMS\Core\Utility\GeneralUtility::getUrl($writeToLocalconf_dat['tmpfile']), implode(LF, $lines))) {
                        @unlink($writeToLocalconf_dat['tmpfile']);
-                       $msg = 'typo3conf/localconf.php' . $tmpExt . ' was NOT written properly (written content didn\'t match file content) - maybe a disk space problem?';
+                       $msg = 'typo3conf/LocalConfiguration.php' . $tmpExt . ' was NOT written properly (written content didn\'t match file content) - maybe a disk space problem?';
                } elseif (!@copy($writeToLocalconf_dat['tmpfile'], $writeToLocalconf_dat['file'])) {
-                       $msg = 'typo3conf/localconf.php could not be replaced by typo3conf/localconf.php' . $tmpExt . ' - maybe a write access problem?';
+                       $msg = 'typo3conf/LocalConfiguration.php could not be replaced by typo3conf/LocalConfiguration.php' . $tmpExt . ' - maybe a write access problem?';
                } else {
                        @unlink($writeToLocalconf_dat['tmpfile']);
                        $success = TRUE;
-                       $msg = 'Configuration written to typo3conf/localconf.php';
+                       $msg = 'Configuration written to typo3conf/LocalConfiguration.php';
                }
                $this->messages[] = $msg;
                if (!$success) {
index 0faa4cf..7d52c01 100755 (executable)
@@ -75,7 +75,7 @@ require '../sysext/install/Classes/InstallBootstrap.php';
 
        // Run install script
 if (!\TYPO3\CMS\Core\Extension\ExtensionManager::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/LocalConfiguration.php, $TYPO3_CONF_VARS[\'EXT\'][\'extListArray\'].');
 }
 require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('install') . 'mod/class.tx_install.php';
 $install_check = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Install\\Installer');
index 2c088e9..f4d993b 100644 (file)
@@ -169,7 +169,7 @@ class Bootstrap {
                        unset($GLOBALS['typo_db_host']);
                        unset($GLOBALS['typo_db_extTableDef_script']);
                } else {
-                       die(\TYPO3\CMS\Core\Configuration\ConfigurationManager::LOCALCONF_FILE . ' not found!');
+                       die('Neither ' . \TYPO3\CMS\Core\Configuration\ConfigurationManager::LOCAL_CONFIGURATION_FILE . ' (recommended) nor ' . \TYPO3\CMS\Core\Configuration\ConfigurationManager::LOCALCONF_FILE . ' (obsolete) could be found!');
                }
                define('TYPO3_user_agent', 'User-Agent: ' . $GLOBALS['TYPO3_CONF_VARS']['HTTP']['userAgent']);
                return $this;
index 65114eb..d7d5fc9 100644 (file)
@@ -464,7 +464,7 @@ REMOTE_ADDR was \'' . \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('REMOTE
                                        If you don\'t know the current password, you can set a new
                                        one by setting the value of
                                        $TYPO3_CONF_VARS[\'BE\'][\'installToolPassword\'] in
-                                       typo3conf/localconf.php to the md5() hash value of the
+                                       typo3conf/LocalConfiguration.php to the md5() hash value of the
                                        password you desire.
                                </p>
                        '
@@ -7159,6 +7159,4 @@ REMOTE_ADDR was \'' . \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('REMOTE
        }
 
 }
-
-
-?>
+?>
\ No newline at end of file
index f60747c..56430d7 100644 (file)
                                <source>Write access error</source>
                        </trans-unit>
                        <trans-unit id="ext_details_write_error_localconf" xml:space="preserve">
-                               <source>typo3conf/localconf.php seems not to be writable, so the extension cannot be installed automatically!</source>
+                               <source>typo3conf/LocalConfiguration.php seems not to be writable, so the extension cannot be installed automatically!</source>
                        </trans-unit>
                        <trans-unit id="ext_details_error_downloading" xml:space="preserve">
                                <source>Error while trying to download the extension file...</source>