From 16c9fddc5403cbd2f14a46da2a01b1fb31a3dceb Mon Sep 17 00:00:00 2001 From: cm <7zh6dj9f9@mozmail.com> Date: Thu, 7 Nov 2024 15:02:46 +0000 Subject: [PATCH] Server monitoring notification defaults to obey configuration --- .../Module/Server/Controller/ServerController.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/psm/Module/Server/Controller/ServerController.php b/src/psm/Module/Server/Controller/ServerController.php index cb08e5fc..3df16fe4 100644 --- a/src/psm/Module/Server/Controller/ServerController.php +++ b/src/psm/Module/Server/Controller/ServerController.php @@ -140,6 +140,17 @@ class ServerController extends AbstractServerController return $this->twig->render('module/server/server/list.tpl.html', $tpl_data); } + /** + * Set default monitoring dropdown selections to configured values. + */ + private static function setDefaultMonitoringNotificationsToConfiguredValues( array &$tpl_data ): void { + $tpl_data['edit_email_selected'] = psm_get_conf('email_status') ? 'yes' : 'no'; + $tpl_data['edit_sms_selected'] = psm_get_conf('sms_status') ? 'yes' : 'no'; + $tpl_data['edit_pushover_selected'] = psm_get_conf('pushover_status') ? 'yes' : 'no'; + $tpl_data['edit_telegram_selected'] = psm_get_conf('telegram_status') ? 'yes' : 'no'; + $tpl_data['edit_jabber_selected'] = psm_get_conf('jabber_status') ? 'yes' : 'no'; + } + /** * Prepare the template to show the update screen for a single server */ @@ -154,6 +165,8 @@ class ServerController extends AbstractServerController $modal->setOKButtonLabel(psm_get_lang('system', 'delete')); $tpl_data = $this->getLabels(); + self::setDefaultMonitoringNotificationsToConfiguredValues( $tpl_data ); + $tpl_data['edit_server_id'] = $this->server_id; $tpl_data['url_save'] = psm_build_url(array( 'mod' => 'server',