tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WebWizard: Add removeToken option to method clearSession 

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(
'onSuccess' => function () {
$wizard = new WebWizard();
$wizard->clearSession();
$wizard->clearSession(false);
}
));
$form->setUidDisabled();

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

@ -380,15 +380,19 @@ 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();
$tokenPath = Config::resolvePath('setup.token');
if (file_exists($tokenPath)) {
@unlink($tokenPath);
if ($removeToken) {
$tokenPath = Config::resolvePath('setup.token');
if (file_exists($tokenPath)) {
@unlink($tokenPath);
}
}
}