From 2267242449233888750d5df390e4bc21388927ea Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 5 Mar 2021 13:46:27 +0100 Subject: [PATCH] net/haproxy: style adjustments --- .../OPNsense/HAProxy/Api/ExportController.php | 16 ++++++++-------- .../HAProxy/Api/MaintenanceController.php | 3 --- .../app/views/OPNsense/HAProxy/maintenance.volt | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ExportController.php b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ExportController.php index dbf6ed915..71e1d3947 100644 --- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ExportController.php +++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ExportController.php @@ -72,15 +72,15 @@ class ExportController extends ApiControllerBase $backend = new Backend(); if ($type == 'config') { - $result = $backend->configdRun("haproxy showconf"); - $filename = 'haproxy.conf'; - $filetype = 'text/plain'; - $content = $result; + $result = $backend->configdRun("haproxy showconf"); + $filename = 'haproxy.conf'; + $filetype = 'text/plain'; + $content = $result; } else { - $result = $backend->configdRun("haproxy exportall"); - $filename = 'haproxy_config_export.zip'; - $filetype = 'application/zip'; - $content = file_get_contents('/tmp/haproxy_config_export.zip'); + $result = $backend->configdRun("haproxy exportall"); + $filename = 'haproxy_config_export.zip'; + $filetype = 'application/zip'; + $content = file_get_contents('/tmp/haproxy_config_export.zip'); } $response = array( diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/MaintenanceController.php b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/MaintenanceController.php index 1aac6f4ec..e62d99527 100644 --- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/MaintenanceController.php +++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/MaintenanceController.php @@ -295,7 +295,6 @@ class MaintenanceController extends ApiMutableModelControllerBase // Iterate over all possible cron jobs foreach ($cronjobs as $cron => $cron_action) { - // Name of the item that holds the cron UUID $cron_ref = "${cron}Cron"; @@ -303,7 +302,6 @@ class MaintenanceController extends ApiMutableModelControllerBase if ((string)$mdlHaproxy->maintenance->cronjobs->$cron == "1") { // Check if a cron job already exists if ((string)$mdlHaproxy->maintenance->cronjobs->$cron_ref == "") { - // Create new cron job $mdlCron = new Cron(); // NOTE: Only configd actions are valid commands for cronjobs @@ -339,7 +337,6 @@ class MaintenanceController extends ApiMutableModelControllerBase } else { // Check if a cron job exists if ((string)$mdlHaproxy->maintenance->cronjobs->$cron_ref != "") { - // Clean existin entry $cron_uuid = (string)$mdlHaproxy->maintenance->cronjobs->$cron_ref; $mdlHaproxy->maintenance->cronjobs->$cron_ref = ""; diff --git a/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/maintenance.volt b/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/maintenance.volt index 3ab54d181..ae75d8a20 100644 --- a/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/maintenance.volt +++ b/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/maintenance.volt @@ -210,7 +210,7 @@ POSSIBILITY OF SUCH DAMAGE. var row_id = $(this).data("row-id"); var rows = $("#grid-certificates").bootgrid("getCurrentRows"); var row = rows.filter(function(row) { - return row.id == row_id; + return row.id == row_id; })[0]; var requested_count = row.total_count; var frontend_ids = row.id