From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sat, 11 Aug 2018 13:22:16 +0000 (+0200)
Subject: baculum: Tweak move messages destinations to unquoted directives
X-Git-Tag: Release-9.2.1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdf3be91e85d2cd9a859a489054519cf1886d8e4;p=thirdparty%2Fbacula.git

baculum: Tweak move messages destinations to unquoted directives
---

diff --git a/gui/baculum/protected/API/Class/BaculaSetting.php b/gui/baculum/protected/API/Class/BaculaSetting.php
index b586b479d..09b8ed85a 100644
--- a/gui/baculum/protected/API/Class/BaculaSetting.php
+++ b/gui/baculum/protected/API/Class/BaculaSetting.php
@@ -55,6 +55,20 @@ class BaculaSetting extends APIModule {
 		'Storage' => array(
 			'SdAddress',
 			'SdAddresses'
+		),
+		'Messages' => array(
+			'Append',
+			'Catalog',
+			'Console',
+			'Director',
+			'File',
+			'Mail',
+			'MailOnError',
+			'MailOnSuccess',
+			'Operator',
+			'Stderr',
+			'Stdout',
+			'Syslog'
 		)
 	);
 
@@ -286,9 +300,6 @@ 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) {
@@ -301,10 +312,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;
+					$resource[$resource_type][$directive_name] = $this->formatDirectiveValue($resource_type, $directive_name, $directive_value);
 				}
 			}