From f1b6a82387f1cc7abf2e8c6d47892c0029ce59ac Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 7 Nov 2014 15:05:08 +0100
Subject: [PATCH] Make it optional to define protected custom variables

fixes #7590
---
 .../application/forms/Config/SecurityConfigForm.php           | 3 ++-
 .../library/Monitoring/Installation/SecurityStep.php          | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/forms/Config/SecurityConfigForm.php b/modules/monitoring/application/forms/Config/SecurityConfigForm.php
index a57e827025..c7e8d7efb8 100644
--- 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
index 24239dd6c5..ad580db7f0 100644
--- 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>';