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 b586b479dea2df1ba101738f660affbf124acce5..09b8ed85a3d75aacfdc38e51810311d76fcd5eff 100644 (file)
--- 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);
                                }
                        }