From: Marcin Haba <marcin.haba@bacula.pl>
Date: Fri, 13 Mar 2015 21:03:29 +0000 (+0100)
Subject: baculum: Tweak exit from wizard and directors get
X-Git-Tag: Release-7.2.0~72
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c9ce1b7a2d724d523b026f73d02a3097f10adf10;p=bacula%2Fbacula

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 29472aaac2..a296552784 100644
--- 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 9e10ac9d38..84097554c6 100644
--- 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];
 			}