From 1f23fef84093b80f14663546146a83156fb367c3 Mon Sep 17 00:00:00 2001
From: Marcin Haba <marcin.haba@bacula.pl>
Date: Fri, 14 Jul 2017 19:26:13 +0200
Subject: [PATCH] baculum: Fix showing errors from the API

---
 gui/baculum/protected/Web/Pages/BaculumError.page | 6 ++----
 gui/baculum/protected/Web/Pages/BaculumError.php  | 3 ++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/gui/baculum/protected/Web/Pages/BaculumError.page b/gui/baculum/protected/Web/Pages/BaculumError.page
index b2b4d728ad..f9acc52af8 100644
--- a/gui/baculum/protected/Web/Pages/BaculumError.page
+++ b/gui/baculum/protected/Web/Pages/BaculumError.page
@@ -2,10 +2,8 @@
 <com:TContent ID="Message">
  <div id="message-box">
 	<h2><%[ Baculum problem ]%></h2>
-	<com:TPanel Visible="<%=$this->error != 2 && $this->error != 4 && $this->error != 6%>">
-		<h3>Error <%=$this->error%> - <%=$this->output%></h3>
-		<hr />
-	</com:TPanel>
+	<h3>Error <%=$this->error%> - <%=$this->output%></h3>
+	<hr />
 	<p class="center">
 		<a href="<%=$this->Service->constructUrl('WebHome')%>"><%[ TRY AGAIN ]%></a> <%[ or run ]%>
 		<a href="<%=$this->Service->constructUrl('WebConfigWizard')%>"><%[ Baculum Initial Wizard ]%></a>
diff --git a/gui/baculum/protected/Web/Pages/BaculumError.php b/gui/baculum/protected/Web/Pages/BaculumError.php
index b65a473ec3..8f047c4cec 100644
--- a/gui/baculum/protected/Web/Pages/BaculumError.php
+++ b/gui/baculum/protected/Web/Pages/BaculumError.php
@@ -23,12 +23,13 @@
 Prado::using('Application.Web.Class.BaculumWebPage');
 
 class BaculumError extends BaculumWebPage {
+
 	public $error;
 	public $output;
 
 	public function onInit($param) {
 		$this->error = intval($this->Request['error']);
-		$this->output = $this->Request['output'];
+		$this->output = urldecode($this->Request['output']);
 	}
 }
 ?>
-- 
2.39.5