Make it optional to define protected custom variables

fixes #7590
Icinga · Nov 7, 2014 · f1b6a82 · f1b6a82
1 parent bb96316
commit f1b6a82
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/modules/monitoring/application/forms/Config/SecurityConfigForm.php b/modules/monitoring/application/forms/Config/SecurityConfigForm.php
@@ -55,7 +55,8 @@ public function createElements(array $formData)
             'text',
             'protected_customvars',
             array(
-                'required'      => true,
+                'allowEmpty'    => true,
+                'value'         => '*pw*,*pass*,community',
                 'label'         => mt('monitoring', 'Protected Custom Variables'),
                 'description'   => mt('monitoring',
                     'Comma separated case insensitive list of protected custom variables.'

diff --git a/modules/monitoring/library/Monitoring/Installation/SecurityStep.php b/modules/monitoring/library/Monitoring/Installation/SecurityStep.php
@@ -56,7 +56,9 @@ public function getSummary()
             . '<tbody>'
             . '<tr>'
             . '<td><strong>' . mt('monitoring', 'Protected Custom Variables') . '</strong></td>'
-            . '<td>' . $this->data['securityConfig']['protected_customvars'] . '</td>'
+            . '<td>' . ($this->data['securityConfig']['protected_customvars'] ? (
+                $this->data['securityConfig']['protected_customvars']
+            ) : mt('monitoring', 'None', 'monitoring.protected_customvars')) . '</td>'
             . '</tr>'
             . '</tbody>'
             . '</table>';