diff --git a/LICENSE b/LICENSE index 64a02ae24..c36cfbddd 100644 --- a/LICENSE +++ b/LICENSE @@ -19,6 +19,7 @@ Copyright (c) 2010 Jim Pingle Copyright (c) 2015 Jos Schellevis Copyright (c) 2018 João Vilaça Copyright (c) 2019 Juergen Kellerer +Copyright (c) 2020 Manuel Faux Copyright (c) 2003-2004 Manuel Kasper Copyright (c) 2020 Marc Leuser Copyright (c) 2020 Martin Wasley 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 a8e651c58..ccb2cb6d9 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 @@ -169,12 +169,10 @@ class SettingsController extends ApiMutableModelControllerBase if ($row['enable_secrules']) { if ($row['enable_learning_mode']) { $row['waf_status'] = gettext('learning'); - } - else { + } else { $row['waf_status'] = gettext('enabled'); } - } - else { + } else { $row['waf_status'] = gettext('disabled'); } } diff --git a/www/nginx/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/NaxsiIdentifierConstraint.php b/www/nginx/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/NaxsiIdentifierConstraint.php index 085b5d9f7..2373aae52 100644 --- a/www/nginx/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/NaxsiIdentifierConstraint.php +++ b/www/nginx/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/NaxsiIdentifierConstraint.php @@ -60,11 +60,9 @@ class NaxsiIdentifierConstraint extends BaseConstraint // 0 can only be used solely elseif ($intval == 0 && count($vals) > 1) { $validator->appendMessage(new Message(gettext("If ID 0 is specified, no other IDs can be listed."), $attribute)); - } - elseif ($intval < 0) { + } elseif ($intval < 0) { $neg++; - } - elseif ($intval > 0) { + } elseif ($intval > 0) { $pos++; } } @@ -81,8 +79,7 @@ class NaxsiIdentifierConstraint extends BaseConstraint // Did the user try to specify multiple IDs? if (strpos($val, ',')) { $validator->appendMessage(new Message(gettext("Rules can only have a single ID."), $attribute)); - } - else { + } else { $validator->appendMessage(new Message(gettext("Rule IDs need to be numeric."), $attribute)); } }