baculum: Fix undefined index error on web config wizard page

diff --git a/gui/baculum/protected/Web/Class/BaculumWebPage.php b/gui/baculum/protected/Web/Class/BaculumWebPage.php
index 868aac6dc0fff5b2046a92a07a19eaebd23863c4..b0a27adc04a0f0e13e1dd782214fc42fb0055d93 100644 (file)
--- a/gui/baculum/protected/Web/Class/BaculumWebPage.php
+++ b/gui/baculum/protected/Web/Class/BaculumWebPage.php
@@ -74,7 +74,7 @@ class BaculumWebPage extends BaculumPage {
                if (isset($_SESSION['language']) && !empty($_SESSION['language'])) {
                        $language =  $_SESSION['language'];
                } else {
-                       if (key_exists('lang', $this->config['baculum'])) {
+                       if (isset($this->config['baculum']) && key_exists('lang', $this->config['baculum'])) {
                                $language = $this->config['baculum']['lang'];
                        }
                        if (is_null($language)) {

diff --git a/gui/baculum/protected/Web/Pages/WebConfigWizard.php b/gui/baculum/protected/Web/Pages/WebConfigWizard.php
index fb6517fdc7d125b2ac7084a61404b8cd41f99ca6..08f48a62e46ad74bd928d7b5921e9ba6e9fd221e 100644 (file)
--- a/gui/baculum/protected/Web/Pages/WebConfigWizard.php
+++ b/gui/baculum/protected/Web/Pages/WebConfigWizard.php
@@ -38,7 +38,7 @@ class WebConfigWizard extends BaculumWebPage
 
        public function onInit($param) {
                parent::onInit($param);
-               $this->Lang->SelectedValue = $_SESSION['language'];
+               $this->Lang->SelectedValue = $this->getLanguage();
                $config = $this->getModule('web_config');
                $this->web_config = $config->getConfig();
                $this->host_config = $this->getModule('host_config')->getConfig();