From 4f9801f9debd062f69a1dcec99276aa0f12ee1e4 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 16 Oct 2024 08:31:10 +0200 Subject: [PATCH] www/caddy: style fix --- .../mvc/app/models/OPNsense/Caddy/Caddy.php | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.php b/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.php index aefc67b9b..28181a9fd 100644 --- a/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.php +++ b/www/caddy/src/opnsense/mvc/app/models/OPNsense/Caddy/Caddy.php @@ -240,23 +240,23 @@ class Caddy extends BaseModel ), $key . ".FromDomain" )); - } elseif ( + } elseif ( !in_array((string)$item->Matchers, ['httphost', 'tlssni']) && ( !empty((string)$item->FromDomain) && (string)$item->FromDomain != '*' ) - ) { - $messages->appendMessage(new Message( - sprintf( - gettext( - 'When "%s" matcher is selected, domain must be empty or *.' - ), - $item->Matchers + ) { + $messages->appendMessage(new Message( + sprintf( + gettext( + 'When "%s" matcher is selected, domain must be empty or *.' ), - $key . ".FromDomain" - )); - } + $item->Matchers + ), + $key . ".FromDomain" + )); + } if ((string)$item->Type === 'global' && empty((string)$item->FromPort)) { $messages->appendMessage(new Message( @@ -292,7 +292,8 @@ class Caddy extends BaseModel )); } - if ((string)$item->Type !== 'global' && + if ( + (string)$item->Type !== 'global' && ( (string)$item->Matchers == 'tls' || (string)$item->Matchers == 'http'