WebWizard: Add removeToken option to method clearSession

refs #9658
Icinga · Dec 22, 2016 · dd09ee5 · dd09ee5
1 parent 9164e40
commit dd09ee5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/modules/setup/application/controllers/IndexController.php b/modules/setup/application/controllers/IndexController.php
@@ -79,7 +79,7 @@ public function restartAction()
         $form = new Form(array(
             'onSuccess' => function () {
                 $wizard = new WebWizard();
-                $wizard->clearSession();
+                $wizard->clearSession(false);
             }
         ));
         $form->setUidDisabled();

diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
@@ -380,15 +380,19 @@ protected function addButtons(Form $page)
     }
 
     /**
-     * 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);
+            }
         }
     }