Index: typo3/sysext/install/mod/class.tx_install.php
===================================================================
--- typo3/sysext/install/mod/class.tx_install.php (revision 7609)
+++ typo3/sysext/install/mod/class.tx_install.php (working copy)
@@ -225,7 +225,8 @@
'cleanup' => 'Clean up',
'phpinfo' => 'phpinfo()',
'typo3conf_edit' => 'Edit files in typo3conf/',
- 'about' => 'About'
+ 'about' => 'About',
+ 'logout' => 'Logout from Install Tool',
);
var $JSmessage = '';
@@ -271,7 +272,7 @@
if ($_GET['TYPO3_INSTALL']['type']) {
$allowedTypes = array(
'config', 'database', 'update', 'images', 'extConfig',
- 'cleanup', 'phpinfo', 'typo3conf_edit', 'about'
+ 'cleanup', 'phpinfo', 'typo3conf_edit', 'about', 'logout'
);
if (in_array($_GET['TYPO3_INSTALL']['type'], $allowedTypes)) {
@@ -535,7 +536,7 @@
if ($this->step) {
$this->output($this->outputWrapper($this->stepOutput()));
} else {
-
+
// Menu...
switch($this->INSTALL['type']) {
case 'images':
@@ -728,6 +729,14 @@
$this->silent=0;
$this->typo3conf_edit();
break;
+ case 'logout':
+ $enableInstallToolFile = PATH_site . 'typo3conf/ENABLE_INSTALL_TOOL';
+ if (is_file($enableInstallToolFile) && trim(file_get_contents($enableInstallToolFile)) !== 'KEEP_FILE') {
+ unlink(PATH_typo3conf . 'ENABLE_INSTALL_TOOL');
+ }
+ $this->session->destroySession();
+ t3lib_utility_Http::redirect($this->scriptSelf);
+ break;
case 'about':
default:
$this->silent=0;
@@ -7578,7 +7587,7 @@
t3lib_div::createVersionNumberedFilename(
'../contrib/prototype/prototype.js'
) . '">';
-
+
// Add JS functions for output
$this->javascript[] = '';
- } else {
+ } else {
$this->stylesheets[] = '