From 85a27147c4b1308102134acf136ba8dde9e8b0f6 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 14 Mar 2024 08:49:45 +0100 Subject: [PATCH] plugins: style sweep --- dns/ddclient/src/etc/inc/plugins.inc.d/ddclient.inc | 4 ++-- .../wazuh-agent/src/etc/inc/plugins.inc.d/wazuhagent.inc | 2 +- www/caddy/pkg-descr | 2 +- www/caddy/src/etc/inc/plugins.inc.d/caddy.inc | 6 ++++-- .../controllers/OPNsense/Caddy/ReverseProxyController.php | 6 ++++-- .../mvc/app/models/OPNsense/Caddy/Migrations/M1_1_3.php | 3 --- .../src/opnsense/scripts/OPNsense/Caddy/caddy_certs.php | 3 ++- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dns/ddclient/src/etc/inc/plugins.inc.d/ddclient.inc b/dns/ddclient/src/etc/inc/plugins.inc.d/ddclient.inc index 2a45595e5..e41cb1835 100644 --- a/dns/ddclient/src/etc/inc/plugins.inc.d/ddclient.inc +++ b/dns/ddclient/src/etc/inc/plugins.inc.d/ddclient.inc @@ -32,8 +32,8 @@ function ddclient_services() $services = []; $cnf = \OPNsense\Core\Config::getInstance()->object(); $is_enabled = false; - if ($cnf->OPNsense && $cnf->OPNsense->DynDNS && $cnf->OPNsense->DynDNS->general){ - $is_enabled = $cnf->OPNsense->DynDNS->general->enabled == '1'; + if ($cnf->OPNsense && $cnf->OPNsense->DynDNS && $cnf->OPNsense->DynDNS->general) { + $is_enabled = $cnf->OPNsense->DynDNS->general->enabled == '1'; } if ($is_enabled) { diff --git a/security/wazuh-agent/src/etc/inc/plugins.inc.d/wazuhagent.inc b/security/wazuh-agent/src/etc/inc/plugins.inc.d/wazuhagent.inc index 132dfd5dc..ce7d94ade 100644 --- a/security/wazuh-agent/src/etc/inc/plugins.inc.d/wazuhagent.inc +++ b/security/wazuh-agent/src/etc/inc/plugins.inc.d/wazuhagent.inc @@ -32,7 +32,7 @@ function wazuhagent_services() $services = []; $cnf = \OPNsense\Core\Config::getInstance()->object(); $is_enabled = false; - if ($cnf->OPNsense && $cnf->OPNsense->WazuhAgent && $cnf->OPNsense->WazuhAgent->general){ + if ($cnf->OPNsense && $cnf->OPNsense->WazuhAgent && $cnf->OPNsense->WazuhAgent->general) { $is_enabled = $cnf->OPNsense->WazuhAgent->general->enabled == '1'; } diff --git a/www/caddy/pkg-descr b/www/caddy/pkg-descr index 311733b3c..483ce846c 100644 --- a/www/caddy/pkg-descr +++ b/www/caddy/pkg-descr @@ -27,7 +27,7 @@ Plugin Changelog * Increased timeout of message area in reverse_proxy.volt and general.volt to 15 seconds. * When pressing Apply, the form is saved automatically before the reconfigure action. * Cleaned up Caddy.xml model to satisfy make lint. -* When selecting an interface in Dynamic DNS, at most one IPv6 GUA and IPv4 non-RFC1918 address will be extracted. Fixes all IP addresses being read. +* When selecting an interface in Dynamic DNS, at most one IPv6 GUA and IPv4 non-RFC1918 address will be extracted. Fixes all IP addresses being read. 1.5.1 diff --git a/www/caddy/src/etc/inc/plugins.inc.d/caddy.inc b/www/caddy/src/etc/inc/plugins.inc.d/caddy.inc index a04d784d9..78da119b7 100644 --- a/www/caddy/src/etc/inc/plugins.inc.d/caddy.inc +++ b/www/caddy/src/etc/inc/plugins.inc.d/caddy.inc @@ -32,8 +32,10 @@ function caddy_services() $services = array(); - if (isset($config['Pischem']['caddy']['general']['enabled']) && - $config['Pischem']['caddy']['general']['enabled'] == 1) { + if ( + isset($config['Pischem']['caddy']['general']['enabled']) && + $config['Pischem']['caddy']['general']['enabled'] == 1 + ) { $services[] = array( 'description' => gettext('Caddy Web Server'), 'configd' => array( diff --git a/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/ReverseProxyController.php b/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/ReverseProxyController.php index d6727b48d..4a9947d75 100644 --- a/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/ReverseProxyController.php +++ b/www/caddy/src/opnsense/mvc/app/controllers/OPNsense/Caddy/ReverseProxyController.php @@ -33,8 +33,10 @@ namespace OPNsense\Caddy; use OPNsense\Base\IndexController; -class ReverseProxyController extends IndexController { - public function indexAction() { +class ReverseProxyController extends IndexController +{ + public function indexAction() + { $this->view->pick('OPNsense/Caddy/reverse_proxy'); $this->view->formDialogReverseProxy = $this->getForm("dialogReverseProxy"); $this->view->formDialogSubdomain = $this->getForm("dialogSubdomain"); diff --git a/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Migrations/M1_1_3.php b/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Migrations/M1_1_3.php index b8948233c..c103f8d48 100644 --- a/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Migrations/M1_1_3.php +++ b/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Migrations/M1_1_3.php @@ -40,16 +40,13 @@ class M1_1_3 extends BaseModelMigration // Ensure there are reverse proxy configurations to process if (!empty($config->Pischem->caddy->reverseproxy)) { - // Loop through each reverse proxy configuration in the stored configuration config.xml foreach ($config->Pischem->caddy->reverseproxy->children() as $configNode) { - // Extract the UUID attribute to identify the configuration item $uuid = (string)$configNode->attributes()->uuid; // Check if the current configuration item has a 'Description' to migrate if (!empty($configNode->Description)) { - // Store the value of 'Description' for migration $descriptionValue = (string)$configNode->Description; diff --git a/www/caddy/src/opnsense/scripts/OPNsense/Caddy/caddy_certs.php b/www/caddy/src/opnsense/scripts/OPNsense/Caddy/caddy_certs.php index df8550d33..f4f0f6bf6 100755 --- a/www/caddy/src/opnsense/scripts/OPNsense/Caddy/caddy_certs.php +++ b/www/caddy/src/opnsense/scripts/OPNsense/Caddy/caddy_certs.php @@ -37,7 +37,8 @@ use OPNsense\Core\Config; $configObj = Config::getInstance()->object(); $temp_dir = '/usr/local/etc/caddy/certificates/temp/'; -function extract_and_save_certificates($configObj, $temp_dir) { +function extract_and_save_certificates($configObj, $temp_dir) +{ // Traverse through certificates foreach ($configObj->cert as $cert) { $cert_refid = (string)$cert->refid;