baculum: Tweak exit from wizard and directors get

diff --git a/gui/baculum/protected/Pages/ConfigurationWizard.php b/gui/baculum/protected/Pages/ConfigurationWizard.php
index 29472aaac2846239e71bd10483fd001b400bbb33..a2965527843ca8d0375740c69476b057f89bd596 100644 (file)
--- a/gui/baculum/protected/Pages/ConfigurationWizard.php
+++ b/gui/baculum/protected/Pages/ConfigurationWizard.php
@@ -114,7 +114,7 @@ class ConfigurationWizard extends BaculumPage
                                $urlPrefix = $this->Application->getModule('friendly-url')->getUrlPrefix();
                                $location = sprintf("%s://%s:%s@%s:%d%s", $http_protocol, $cfgData['baculum']['login'], $cfgData['baculum']['password'], $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $urlPrefix);
                                header("Location: $location");
-                               exit();
+                               return;
                        } else { // standard version (user defined auth method)
                                $this->goToDefaultPage();
                        }

diff --git a/gui/baculum/protected/Pages/Home.php b/gui/baculum/protected/Pages/Home.php
index 9e10ac9d38b05180a54e0f1c67bf35406e78afaf..84097554c6e19133120b19a44cccef155d66e134 100644 (file)
--- a/gui/baculum/protected/Pages/Home.php
+++ b/gui/baculum/protected/Pages/Home.php
@@ -45,9 +45,8 @@ class Home extends BaculumPage
                        $this->Logging->Checked = $this->getModule('logging')->isDebugOn();
                }
 
-               $directors = $this->getModule('api')->get(array('directors'))->output;
-
                if(!$this->IsPostBack && !$this->IsCallBack) {
+                       $directors = $this->getModule('api')->get(array('directors'))->output;
                        if(!array_key_exists('director', $_SESSION)) {
                                $_SESSION['director'] = $directors[0];
                        }