From 1ab87794b318d41aa23b4b79b0952ea6ac9ebc5a Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 17 Jan 2022 08:14:31 +0100
Subject: [PATCH] www/nginx: style sweep

---
 .../OPNsense/Nginx/Api/SettingsController.php | 43 ++++++++++++++-----
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/SettingsController.php b/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/SettingsController.php
index 853a83291..19d73ae69 100644
--- a/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/SettingsController.php
+++ b/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/SettingsController.php
@@ -342,11 +342,14 @@ class SettingsController extends ApiMutableModelControllerBase
     // http security headers
     public function searchsecurityHeaderAction()
     {
-        $data = $this->searchBase('security_header',
+        $data = $this->searchBase(
+            'security_header',
             ['description', 'referrer', 'xssprotection', 'strict_transport_security_time',
             'enable_csp', 'csp_report_only', 'csp_default_src_enabled', 'csp_script_src_enabled', 'csp_img_src_enabled',
             'csp_style_src_enabled', 'csp_media_src_enabled', 'csp_font_src_enabled', 'csp_frame_src_enabled',
-            'csp_frame_ancestors_enabled', 'csp_form_action_enabled']);
+            'csp_frame_ancestors_enabled',
+            'csp_form_action_enabled']
+        );
 
         // Create "hsts" column (disabled/time)
         foreach ($data['rows'] as &$row) {
@@ -374,15 +377,33 @@ class SettingsController extends ApiMutableModelControllerBase
         foreach ($data['rows'] as &$row) {
             if ($row['enable_csp']) {
                 $enabled = [];
-                if ($row['csp_default_src_enabled']) $enabled[] = gettext("Default Source");
-                if ($row['csp_script_src_enabled']) $enabled[] = gettext("Script Source");
-                if ($row['csp_img_src_enabled']) $enabled[] = gettext("Image Source");
-                if ($row['csp_style_src_enabled']) $enabled[] = gettext("Style Source");
-                if ($row['csp_media_src_enabled']) $enabled[] = gettext("Media Source");
-                if ($row['csp_font_src_enabled']) $enabled[] = gettext("Font Source");
-                if ($row['csp_frame_src_enabled']) $enabled[] = gettext("Frame Source");
-                if ($row['csp_frame_ancestors_enabled']) $enabled[] = gettext("Frame Ancestors");
-                if ($row['csp_form_action_enabled']) $enabled[] = gettext("Form Action");
+                if ($row['csp_default_src_enabled']) {
+                    $enabled[] = gettext("Default Source");
+                }
+                if ($row['csp_script_src_enabled']) {
+                    $enabled[] = gettext("Script Source");
+                }
+                if ($row['csp_img_src_enabled']) {
+                    $enabled[] = gettext("Image Source");
+                }
+                if ($row['csp_style_src_enabled']) {
+                    $enabled[] = gettext("Style Source");
+                }
+                if ($row['csp_media_src_enabled']) {
+                    $enabled[] = gettext("Media Source");
+                }
+                if ($row['csp_font_src_enabled']) {
+                    $enabled[] = gettext("Font Source");
+                }
+                if ($row['csp_frame_src_enabled']) {
+                    $enabled[] = gettext("Frame Source");
+                }
+                if ($row['csp_frame_ancestors_enabled']) {
+                    $enabled[] = gettext("Frame Ancestors");
+                }
+                if ($row['csp_form_action_enabled']) {
+                    $enabled[] = gettext("Form Action");
+                }
 
                 if (count($enabled)) {
                     $row['csp_details'] = implode(', ', $enabled);