From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sat, 11 Aug 2018 12:34:58 +0000 (+0200)
Subject: baculum: Fix saving directives in messages resource
X-Git-Tag: Release-9.2.1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aadf400ee46a59e98490d9ee63308049e18ed416;p=thirdparty%2Fbacula.git

baculum: Fix saving directives in messages resource
---

diff --git a/gui/baculum/protected/API/Class/BaculaSetting.php b/gui/baculum/protected/API/Class/BaculaSetting.php
index b314dbd9c..b586b479d 100644
--- a/gui/baculum/protected/API/Class/BaculaSetting.php
+++ b/gui/baculum/protected/API/Class/BaculaSetting.php
@@ -286,6 +286,9 @@ class BaculaSetting extends APIModule {
 			}
 
 		} elseif ($resource_type_new === 'Messages') {
+			$formatted_msg_directives = array(
+				'Name', 'Description', 'MailCommand', 'OperatorCommand'
+			);
 			$resource_type = $resource_type_new;
 			$resource = array($resource_type => array());
 			foreach ($resource_new[$resource_type] as $directive_name => $directive_value) {
@@ -298,6 +301,8 @@ class BaculaSetting extends APIModule {
 						array_push($value, implode(', ', $directive_value[$i]['MsgTypes']));
 						$resource[$resource_type][$directive_value[$i]['Type']] = implode(' = ', $value);
 					}
+				} elseif (in_array($directive_name, $formatted_msg_directives)) {
+					$resource[$resource_type][$directive_name] = $this->formatDirectiveValue($resource_type, $directive_name, $directive_value);
 				} else {
 					$resource[$resource_type][$directive_name] = $directive_value;
 				}