upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-06-06 15:26:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

www/nginx: cleanups and sync

Browse source
This commit is contained in:
Franco Fichtner 2021-04-12 08:50:05 +02:00
parent 0e22f6a366
commit 94351ebddf
3 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
LICENSE
View file

@ -19,6 +19,7 @@ Copyright (c) 2010 Jim Pingle <jimp@pfsense.org>
Copyright (c) 2015 Jos Schellevis
Copyright (c) 2018 João Vilaça <machadovilaca@gmail.com>
Copyright (c) 2019 Juergen Kellerer
Copyright (c) 2020 Manuel Faux
Copyright (c) 2003-2004 Manuel Kasper <mk@neon1.net>
Copyright (c) 2020 Marc Leuser
Copyright (c) 2020 Martin Wasley

6
www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/SettingsController.php
View file

@ -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');
}
}

9
www/nginx/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/NaxsiIdentifierConstraint.php
View file

@ -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));
}
}