baculum: Do not try to switch to new user in API and Web install wizards

diff --git a/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.php b/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.php
index efad0169c2b9e6ab59117e92fa1b009093418bb3..54882c222db4944edf271edcf873c6748ec66d2f 100644 (file)
--- a/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.php
+++ b/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.php
@@ -283,10 +283,6 @@ class APIInstallWizard extends BaculumAPIPage {
                                        true,
                                        $_SERVER['PHP_AUTH_USER']
                                );
-
-                               // Automatic login after finish wizard.
-                               $this->switchToUser($this->APILogin->Text, $this->APIPassword->Text);
-                               // here is exit
                        }
                        if (($this->first_run || $this->add_auth_params) && $this->AuthOAuth2->Checked) {
                                // save OAuth2 auth user on first run or when no OAuth2 client defined
@@ -300,8 +296,8 @@ class APIInstallWizard extends BaculumAPIPage {
                                $oauth2_cfg[$this->APIOAuth2ClientId->Text]['name'] = $this->APIOAuth2Name->Text;
                                $this->getModule('oauth2_config')->setConfig($oauth2_cfg);
                        }
+                       $this->goToDefaultPage();
                }
-               $this->goToDefaultPage();
 
        }
 

diff --git a/gui/baculum/protected/Web/Pages/WebConfigWizard.php b/gui/baculum/protected/Web/Pages/WebConfigWizard.php
index 08f48a62e46ad74bd928d7b5921e9ba6e9fd221e..8fccb699b312fab4b096a1d389df5a94b225ab95 100644 (file)
--- a/gui/baculum/protected/Web/Pages/WebConfigWizard.php
+++ b/gui/baculum/protected/Web/Pages/WebConfigWizard.php
@@ -143,12 +143,8 @@ class WebConfigWizard extends BaculumWebPage
                                        false,
                                        $previous_user
                                );
-
-                               // Automatic login after finish wizard.
-                               $this->switchToUser($cfg_web['baculum']['login'], $this->WebPassword->Text);
-                               // here is exit
-                               exit();
                        }
+                       $this->goToDefaultPage();
                }
        }