Index: t3lib/config_default.php
===================================================================
--- t3lib/config_default.php (Revision 9982)
+++ t3lib/config_default.php (Arbeitskopie)
@@ -499,6 +499,7 @@
define('TYPO3_db_host', $typo_db_host);
define('TYPO3_tables_script', $typo_db_tables_script);
define('TYPO3_extTableDef_script', $typo_db_extTableDef_script);
+define('TYPO3_InstallToolPassword', $GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword']);
// Defining backend system languages
// When adding new keys, remember to:
Index: t3lib/class.t3lib_befunc.php
===================================================================
--- t3lib/class.t3lib_befunc.php (Revision 9982)
+++ t3lib/class.t3lib_befunc.php (Arbeitskopie)
@@ -4461,7 +4461,7 @@
}
// Check if the Install Tool Password is still default: joh316
- if ($GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword'] == md5('joh316')) {
+ if (TYPO3_InstallToolPassword == md5('joh316')) {
$url = 'install/index.php?redirect_url=index.php' . urlencode('?TYPO3_INSTALL[type]=about');
$warnings["install_password"] = sprintf(
$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:warning.install_password'),
Index: typo3/sysext/reports/reports/status/class.tx_reports_reports_status_securitystatus.php
===================================================================
--- typo3/sysext/reports/reports/status/class.tx_reports_reports_status_securitystatus.php (Revision 9982)
+++ typo3/sysext/reports/reports/status/class.tx_reports_reports_status_securitystatus.php (Arbeitskopie)
@@ -214,7 +214,7 @@
$message = '';
$severity = tx_reports_reports_status_Status::OK;
- if ($GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword'] == md5('joh316')) {
+ if (TYPO3_InstallToolPassword == md5('joh316')) {
$value = $GLOBALS['LANG']->getLL('status_insecure');
$severity = tx_reports_reports_status_Status::ERROR;
Index: typo3/sysext/install/mod/class.tx_install.php
===================================================================
--- typo3/sysext/install/mod/class.tx_install.php (Revision 9982)
+++ typo3/sysext/install/mod/class.tx_install.php (Arbeitskopie)
@@ -269,7 +269,7 @@
function tx_install() {
parent::t3lib_install();
- if (!$GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword']) {
+ if (!defined('TYPO3_InstallToolPassword') || TYPO3_InstallToolPassword == '') {
$this->outputErrorAndExit('Install Tool deactivated.
You must enable it by setting a password in typo3conf/localconf.php. If you insert the line below, the password will be \'joh316\':
\$TYPO3_CONF_VARS[\'BE\'][\'installToolPassword\'] = \'bacb98acf97e0b6112b1d1b650b84971\';', 'Fatal error');
}
@@ -408,7 +408,7 @@
function checkPassword() {
$p = t3lib_div::_GP('password');
- if ($p && md5($p)==$GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword']) {
+ if ($p && md5($p) == TYPO3_InstallToolPassword) {
$this->session->setAuthorized();
// Sending warning email
Index: typo3/sysext/install/mod/class.tx_install_session.php
===================================================================
--- typo3/sysext/install/mod/class.tx_install_session.php (Revision 9982)
+++ typo3/sysext/install/mod/class.tx_install_session.php (Arbeitskopie)
@@ -139,10 +139,7 @@
private function getSessionSavePath() {
return sprintf(
$this->typo3tempPath . '/' . $this->sessionPath,
- md5(
- 'session:' .
- $GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword']
- )
+ md5('session:' . TYPO3_InstallToolPassword)
);
}
@@ -212,7 +209,7 @@
if (!$sessionId) {
$sessionId = $this->getSessionId();
}
- return md5($GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword'].'|'.$sessionId);
+ return md5(TYPO3_InstallToolPassword . '|' . $sessionId);
}
/**