tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-26 23:34:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

WebWizard: Add removeToken option to method clearSession

Browse Source 
refs #9658
This commit is contained in:
Noah Hilverling 2016-12-22 14:18:38 +01:00
parent 19f2c813f1
commit a230fd4aa8
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/setup/application/controllers/IndexController.php
View File

@ -79,7 +79,7 @@ class IndexController extends Controller
$form = new Form(array( $form = new Form(array(
'onSuccess' => function () { 'onSuccess' => function () {
$wizard = new WebWizard(); $wizard = new WebWizard();
$wizard->clearSession(); $wizard->clearSession(false);
} }
)); ));
$form->setUidDisabled(); $form->setUidDisabled();

8
modules/setup/library/Setup/WebWizard.php
View File

@ -380,17 +380,21 @@ class WebWizard extends Wizard implements SetupWizard
} }
/** /**
* Clear the session being used by this wizard and drop the setup token * Clear the session being used by this wizard
*
* @param bool $removeToken If true, the setup token will be removed
*/ */
public function clearSession() public function clearSession($removeToken = true)
{ {
parent::clearSession(); parent::clearSession();
if ($removeToken) {
$tokenPath = Config::resolvePath('setup.token'); $tokenPath = Config::resolvePath('setup.token');
if (file_exists($tokenPath)) { if (file_exists($tokenPath)) {
@unlink($tokenPath); @unlink($tokenPath);
} }
} }
}
/** /**
* Return the setup for this wizard * Return the setup for this wizard