From f1a69249f906c87da32445516e559c33473e10d3 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 10 Feb 2020 21:12:05 +0100 Subject: [PATCH] plugins: style sweep --- .../GridExample/Api/SettingsController.php | 1 + .../OPNsense/GridExample/IndexController.php | 1 + .../OPNsense/GridExample/GridExample.php | 1 + .../HelloWorld/Api/ServiceController.php | 1 + .../HelloWorld/Api/SettingsController.php | 1 + .../Api/SimplifiedSettingsController.php | 1 + .../OPNsense/HelloWorld/IndexController.php | 1 + .../models/OPNsense/HelloWorld/HelloWorld.php | 1 + .../inc/plugins.inc.d/dyndns/phpDynDNS.inc | 4 +-- .../OPNsense/Nrpe/Api/CommandController.php | 1 + .../ZabbixAgent/Api/ServiceController.php | 1 + .../ZabbixAgent/Api/SettingsController.php | 1 + .../OPNsense/ZabbixAgent/IndexController.php | 1 + .../OPNsense/ZabbixAgent/ZabbixAgent.php | 1 + .../HAProxy/Api/ServiceController.php | 1 + .../HAProxy/Api/SettingsController.php | 1 + .../HAProxy/Api/StatisticsController.php | 1 + .../OPNsense/HAProxy/StatisticsController.php | 1 + .../app/models/OPNsense/HAProxy/HAProxy.php | 1 + .../OPNsense/HAProxy/Migrations/M2_0_0.php | 1 + .../OPNsense/HAProxy/Migrations/M2_3_0.php | 1 + .../OPNsense/HAProxy/Migrations/M2_6_0.php | 1 + .../OPNsense/HAProxy/Migrations/M2_7_0.php | 1 + .../OPNsense/HAProxy/Migrations/M2_8_0.php | 1 + .../OPNsense/Zerotier/IndexController.php | 1 + .../OPNsense/Zerotier/OverviewController.php | 1 + .../app/models/OPNsense/Zerotier/Zerotier.php | 1 + .../AcmeClient/AccountsController.php | 1 + .../OPNsense/AcmeClient/ActionsController.php | 1 + .../AcmeClient/Api/AccountsController.php | 1 + .../AcmeClient/Api/CertificatesController.php | 1 + .../AcmeClient/Api/ServiceController.php | 1 + .../AcmeClient/Api/SettingsController.php | 1 + .../AcmeClient/Api/ValidationsController.php | 1 + .../AcmeClient/CertificatesController.php | 1 + .../OPNsense/AcmeClient/IndexController.php | 1 + .../AcmeClient/ValidationsController.php | 1 + .../OPNsense/AcmeClient/SftpUploader.php | 2 +- .../models/OPNsense/AcmeClient/AcmeClient.php | 1 + .../OPNsense/AcmeClient/Migrations/M1_6_0.php | 1 + .../OPNsense/AcmeClient/certhelper.php | 22 ++++++------- .../OPNsense/AcmeClient/upload_sftp.php | 2 +- .../OPNsense/Tinc/Api/ServiceController.php | 1 + .../OPNsense/Tinc/Api/SettingsController.php | 1 + .../mvc/app/models/OPNsense/Tinc/Tinc.php | 1 + .../scripts/OPNsense/Muninnode/setup.sh | 1 - .../models/OPNsense/NodeExporter/General.php | 1 + .../Constraints/NgxBusyBufferConstraint.php | 31 ++++++++++++------- 48 files changed, 77 insertions(+), 27 deletions(-) mode change 100644 => 100755 sysutils/munin-node/src/opnsense/scripts/OPNsense/Muninnode/setup.sh diff --git a/devel/grid_example/src/opnsense/mvc/app/controllers/OPNsense/GridExample/Api/SettingsController.php b/devel/grid_example/src/opnsense/mvc/app/controllers/OPNsense/GridExample/Api/SettingsController.php index 92f6fa264..65bc91e04 100644 --- a/devel/grid_example/src/opnsense/mvc/app/controllers/OPNsense/GridExample/Api/SettingsController.php +++ b/devel/grid_example/src/opnsense/mvc/app/controllers/OPNsense/GridExample/Api/SettingsController.php @@ -27,6 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\GridExample\Api; use \OPNsense\Base\ApiMutableModelControllerBase; diff --git a/devel/grid_example/src/opnsense/mvc/app/controllers/OPNsense/GridExample/IndexController.php b/devel/grid_example/src/opnsense/mvc/app/controllers/OPNsense/GridExample/IndexController.php index 96330e723..e3e86e647 100644 --- a/devel/grid_example/src/opnsense/mvc/app/controllers/OPNsense/GridExample/IndexController.php +++ b/devel/grid_example/src/opnsense/mvc/app/controllers/OPNsense/GridExample/IndexController.php @@ -27,6 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\GridExample; /** diff --git a/devel/grid_example/src/opnsense/mvc/app/models/OPNsense/GridExample/GridExample.php b/devel/grid_example/src/opnsense/mvc/app/models/OPNsense/GridExample/GridExample.php index 7f7e55b3b..9b90baa57 100644 --- a/devel/grid_example/src/opnsense/mvc/app/models/OPNsense/GridExample/GridExample.php +++ b/devel/grid_example/src/opnsense/mvc/app/models/OPNsense/GridExample/GridExample.php @@ -27,6 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\GridExample; use OPNsense\Base\BaseModel; diff --git a/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/Api/ServiceController.php b/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/Api/ServiceController.php index 4f74f2fed..fc7516e9d 100644 --- a/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/Api/ServiceController.php +++ b/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/Api/ServiceController.php @@ -27,6 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\HelloWorld\Api; use \OPNsense\Base\ApiControllerBase; diff --git a/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/Api/SettingsController.php b/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/Api/SettingsController.php index 43d6c734a..f62b94181 100644 --- a/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/Api/SettingsController.php +++ b/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/Api/SettingsController.php @@ -27,6 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\HelloWorld\Api; use \OPNsense\Base\ApiControllerBase; diff --git a/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/Api/SimplifiedSettingsController.php b/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/Api/SimplifiedSettingsController.php index 53e3a36f5..feb598cd2 100644 --- a/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/Api/SimplifiedSettingsController.php +++ b/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/Api/SimplifiedSettingsController.php @@ -27,6 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\HelloWorld\Api; use \OPNsense\Base\ApiMutableModelControllerBase; diff --git a/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/IndexController.php b/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/IndexController.php index 92abd5401..712edd161 100644 --- a/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/IndexController.php +++ b/devel/helloworld/src/opnsense/mvc/app/controllers/OPNsense/HelloWorld/IndexController.php @@ -27,6 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\HelloWorld; /** diff --git a/devel/helloworld/src/opnsense/mvc/app/models/OPNsense/HelloWorld/HelloWorld.php b/devel/helloworld/src/opnsense/mvc/app/models/OPNsense/HelloWorld/HelloWorld.php index 4ec5465b5..ccf9125c5 100644 --- a/devel/helloworld/src/opnsense/mvc/app/models/OPNsense/HelloWorld/HelloWorld.php +++ b/devel/helloworld/src/opnsense/mvc/app/models/OPNsense/HelloWorld/HelloWorld.php @@ -27,6 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\HelloWorld; use OPNsense\Base\BaseModel; diff --git a/dns/dyndns/src/etc/inc/plugins.inc.d/dyndns/phpDynDNS.inc b/dns/dyndns/src/etc/inc/plugins.inc.d/dyndns/phpDynDNS.inc index 4ea2c933b..5173554fb 100644 --- a/dns/dyndns/src/etc/inc/plugins.inc.d/dyndns/phpDynDNS.inc +++ b/dns/dyndns/src/etc/inc/plugins.inc.d/dyndns/phpDynDNS.inc @@ -1491,10 +1491,10 @@ class updatedns $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE); if ($http_code == 401) { $status = 'Dynamic DNS: (Error) User Authorization Failed'; - } else if ($http_code == 201) { + } elseif ($http_code == 201) { $status = 'Dynamic DNS: (Success) IP Address Changed Successfully!'; $successful_update = true; - } else if ($http_code == 200) { + } elseif ($http_code == 200) { $status = 'Dynamic DNS: (Success) IP Address Changed Successfully!'; $successful_update = true; } else { diff --git a/net-mgmt/nrpe/src/opnsense/mvc/app/controllers/OPNsense/Nrpe/Api/CommandController.php b/net-mgmt/nrpe/src/opnsense/mvc/app/controllers/OPNsense/Nrpe/Api/CommandController.php index 4e05c4db3..0ae282818 100644 --- a/net-mgmt/nrpe/src/opnsense/mvc/app/controllers/OPNsense/Nrpe/Api/CommandController.php +++ b/net-mgmt/nrpe/src/opnsense/mvc/app/controllers/OPNsense/Nrpe/Api/CommandController.php @@ -1,4 +1,5 @@ * diff --git a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/Api/ServiceController.php b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/Api/ServiceController.php index d9efcdb2f..99dd2e5a1 100644 --- a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/Api/ServiceController.php +++ b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/Api/ServiceController.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\ZabbixAgent\Api; use \OPNsense\Base\ApiMutableServiceControllerBase; diff --git a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/Api/SettingsController.php b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/Api/SettingsController.php index 403d5dba4..158cd72db 100644 --- a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/Api/SettingsController.php +++ b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/Api/SettingsController.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\ZabbixAgent\Api; use \OPNsense\Base\ApiMutableModelControllerBase; diff --git a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/IndexController.php b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/IndexController.php index 798e385c2..0d7da93b8 100644 --- a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/IndexController.php +++ b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/IndexController.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\ZabbixAgent; /** diff --git a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.php b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.php index ee5c59fa5..e9f3bde73 100644 --- a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.php +++ b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\ZabbixAgent; use OPNsense\Base\BaseModel; diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ServiceController.php b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ServiceController.php index 74133f2e3..72b76dd10 100644 --- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ServiceController.php +++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ServiceController.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\HAProxy\Api; use \OPNsense\Base\ApiMutableServiceControllerBase; diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/SettingsController.php b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/SettingsController.php index dc82a0d25..a6cdf7b1d 100644 --- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/SettingsController.php +++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/SettingsController.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\HAProxy\Api; use OPNsense\Base\ApiMutableModelControllerBase; diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/StatisticsController.php b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/StatisticsController.php index 87627fe58..d11d952d5 100644 --- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/StatisticsController.php +++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/StatisticsController.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\HAProxy\Api; use \OPNsense\Base\ApiControllerBase; diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/StatisticsController.php b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/StatisticsController.php index fc09cffec..c44a6b30f 100644 --- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/StatisticsController.php +++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/StatisticsController.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\HAProxy; /** diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.php b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.php index dc460e0ef..1028b45b3 100644 --- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.php +++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\HAProxy; use OPNsense\Base\BaseModel; diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_0_0.php b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_0_0.php index e95c55cac..e2b0d59f5 100644 --- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_0_0.php +++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_0_0.php @@ -27,6 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\HAProxy\Migrations; use OPNsense\Base\BaseModelMigration; diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_3_0.php b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_3_0.php index 9179bdea8..648149d90 100644 --- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_3_0.php +++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_3_0.php @@ -27,6 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\HAProxy\Migrations; use OPNsense\Base\BaseModelMigration; diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_6_0.php b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_6_0.php index 3ca56ee15..c8ea606ba 100644 --- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_6_0.php +++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_6_0.php @@ -27,6 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\HAProxy\Migrations; use OPNsense\Base\BaseModelMigration; diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_7_0.php b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_7_0.php index 38b389a9a..0fbbf0ed0 100644 --- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_7_0.php +++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_7_0.php @@ -27,6 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\HAProxy\Migrations; use OPNsense\Base\BaseModelMigration; diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_8_0.php b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_8_0.php index aab65e262..94947ae22 100644 --- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_8_0.php +++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/Migrations/M2_8_0.php @@ -27,6 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\HAProxy\Migrations; use OPNsense\Base\BaseModelMigration; diff --git a/net/zerotier/src/opnsense/mvc/app/controllers/OPNsense/Zerotier/IndexController.php b/net/zerotier/src/opnsense/mvc/app/controllers/OPNsense/Zerotier/IndexController.php index 77197c0f0..198a95989 100644 --- a/net/zerotier/src/opnsense/mvc/app/controllers/OPNsense/Zerotier/IndexController.php +++ b/net/zerotier/src/opnsense/mvc/app/controllers/OPNsense/Zerotier/IndexController.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\Zerotier; class IndexController extends \OPNsense\Base\IndexController diff --git a/net/zerotier/src/opnsense/mvc/app/controllers/OPNsense/Zerotier/OverviewController.php b/net/zerotier/src/opnsense/mvc/app/controllers/OPNsense/Zerotier/OverviewController.php index 154f65fa7..e733439e3 100644 --- a/net/zerotier/src/opnsense/mvc/app/controllers/OPNsense/Zerotier/OverviewController.php +++ b/net/zerotier/src/opnsense/mvc/app/controllers/OPNsense/Zerotier/OverviewController.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\Zerotier; require_once 'plugins.inc.d/zerotier.inc'; diff --git a/net/zerotier/src/opnsense/mvc/app/models/OPNsense/Zerotier/Zerotier.php b/net/zerotier/src/opnsense/mvc/app/models/OPNsense/Zerotier/Zerotier.php index 477d90d36..a16fa8f8a 100644 --- a/net/zerotier/src/opnsense/mvc/app/models/OPNsense/Zerotier/Zerotier.php +++ b/net/zerotier/src/opnsense/mvc/app/models/OPNsense/Zerotier/Zerotier.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\Zerotier; use OPNsense\Base\BaseModel; diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/AccountsController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/AccountsController.php index 314358a89..374112c23 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/AccountsController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/AccountsController.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\AcmeClient; /** diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ActionsController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ActionsController.php index 16a61a822..002446342 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ActionsController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ActionsController.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\AcmeClient; /** diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/AccountsController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/AccountsController.php index 8bad4e039..b221db968 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/AccountsController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/AccountsController.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\AcmeClient\Api; use \OPNsense\Base\ApiMutableModelControllerBase; diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/CertificatesController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/CertificatesController.php index ba222e885..aafed6861 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/CertificatesController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/CertificatesController.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\AcmeClient\Api; use \OPNsense\Base\ApiMutableModelControllerBase; diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/ServiceController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/ServiceController.php index 2577251ff..074690cb1 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/ServiceController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/ServiceController.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\AcmeClient\Api; use \OPNsense\Base\ApiControllerBase; diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/SettingsController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/SettingsController.php index 9dd98cef0..38abd4fa4 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/SettingsController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/SettingsController.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\AcmeClient\Api; use \OPNsense\Base\ApiMutableModelControllerBase; diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/ValidationsController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/ValidationsController.php index f786f257e..999a70323 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/ValidationsController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/ValidationsController.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\AcmeClient\Api; use \OPNsense\Base\ApiMutableModelControllerBase; diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/CertificatesController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/CertificatesController.php index feb9cbd23..8e58c37ef 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/CertificatesController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/CertificatesController.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\AcmeClient; /** diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/IndexController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/IndexController.php index 7a2b077fb..f13b7e9c1 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/IndexController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/IndexController.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\AcmeClient; /** diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ValidationsController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ValidationsController.php index ee62404c1..8c2f2a365 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ValidationsController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ValidationsController.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\AcmeClient; /** diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/SftpUploader.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/SftpUploader.php index 6742cd50c..883dac356 100644 --- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/SftpUploader.php +++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/SftpUploader.php @@ -389,7 +389,7 @@ class SftpUploader $temporary_files[] = $file; Utils::requireThat(chmod($file, 0600), "failed setting user-only permissions on '$file'."); return $file; - }; + } } return false; diff --git a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.php b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.php index 549089bf9..347cd471b 100644 --- a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.php +++ b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\AcmeClient; use OPNsense\Base\BaseModel; diff --git a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Migrations/M1_6_0.php b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Migrations/M1_6_0.php index 78215bf72..22bb91001 100644 --- a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Migrations/M1_6_0.php +++ b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Migrations/M1_6_0.php @@ -27,6 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\AcmeClient\Migrations; use OPNsense\Base\BaseModelMigration; diff --git a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php index 6f7ce765d..9101fd639 100755 --- a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php +++ b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php @@ -590,9 +590,9 @@ function run_acme_validation($certObj, $valObj, $acctObj) // Check wether IPv6 support is enabled $configObj = Config::getInstance()->object(); if (isset($configObj->system->ipv6allow) && ($configObj->system->ipv6allow == "1")) { - $_ipv6_enabled = true; + $_ipv6_enabled = true; } else { - $_ipv6_enabled = false; + $_ipv6_enabled = false; } // Generate rules for all IP addresses @@ -602,17 +602,17 @@ function run_acme_validation($certObj, $valObj, $acctObj) // Add one rule for every IP foreach ($dedup_iplist as $ip) { if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) { - // IPv4 - $_dst = '127.0.0.1'; - $_family = 'inet'; - log_error("AcmeClient: using IPv4 address: ${ip}"); + // IPv4 + $_dst = '127.0.0.1'; + $_family = 'inet'; + log_error("AcmeClient: using IPv4 address: ${ip}"); } elseif (($_ipv6_enabled == true) && (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))) { - // IPv6 - $_dst = '::1'; - $_family = 'inet6'; - log_error("AcmeClient: using IPv6 address: ${ip}"); + // IPv6 + $_dst = '::1'; + $_family = 'inet6'; + log_error("AcmeClient: using IPv6 address: ${ip}"); } else { - continue; // skip broken entries + continue; // skip broken entries } $anchor_rules .= "rdr pass ${_family} proto tcp from any to ${ip} port 80 -> ${_dst} port ${local_http_port}\n"; } diff --git a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/upload_sftp.php b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/upload_sftp.php index 05fc9443d..a7298113f 100755 --- a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/upload_sftp.php +++ b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/upload_sftp.php @@ -503,7 +503,7 @@ function addFilesToUpload(array $options, SftpUploader &$uploader) $files = preg_split('/[,;\s]+/', $options["files"] ?: "", 0, PREG_SPLIT_NO_EMPTY); foreach ($files as $file) { $uploader->addFile($file, "", $chmod, $chgrp); - }; + } if (empty($uploader->pending())) { Utils::log()->error("Didn't files to upload (files: " . join(", ", $files) . ")."); diff --git a/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/Api/ServiceController.php b/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/Api/ServiceController.php index 1ad63da2d..823f9b8cb 100644 --- a/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/Api/ServiceController.php +++ b/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/Api/ServiceController.php @@ -27,6 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\Tinc\Api; use \OPNsense\Base\ApiControllerBase; diff --git a/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/Api/SettingsController.php b/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/Api/SettingsController.php index a8e763bf4..77d807cfd 100644 --- a/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/Api/SettingsController.php +++ b/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/Api/SettingsController.php @@ -27,6 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\Tinc\Api; use \OPNsense\Base\ApiMutableModelControllerBase; diff --git a/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.php b/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.php index 71df5c926..22647a986 100644 --- a/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.php +++ b/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.php @@ -27,6 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\Tinc; use OPNsense\Base\BaseModel; diff --git a/sysutils/munin-node/src/opnsense/scripts/OPNsense/Muninnode/setup.sh b/sysutils/munin-node/src/opnsense/scripts/OPNsense/Muninnode/setup.sh old mode 100644 new mode 100755 index 33dd0b832..39eb3c57f --- a/sysutils/munin-node/src/opnsense/scripts/OPNsense/Muninnode/setup.sh +++ b/sysutils/munin-node/src/opnsense/scripts/OPNsense/Muninnode/setup.sh @@ -5,4 +5,3 @@ mkdir -p /var/log/munin/ mkdir -p /var/run/munin/ chown -R munin:munin /var/munin/plugin-state/ /var/munin/ /var/log/munin/ /var/run/munin/ chmod 755 /var/munin/plugin-state/ /var/munin/ /var/log/munin/ /var/run/munin/ - diff --git a/sysutils/node_exporter/src/opnsense/mvc/app/models/OPNsense/NodeExporter/General.php b/sysutils/node_exporter/src/opnsense/mvc/app/models/OPNsense/NodeExporter/General.php index 0213ce5ad..a049ba655 100644 --- a/sysutils/node_exporter/src/opnsense/mvc/app/models/OPNsense/NodeExporter/General.php +++ b/sysutils/node_exporter/src/opnsense/mvc/app/models/OPNsense/NodeExporter/General.php @@ -28,6 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. * */ + namespace OPNsense\NodeExporter; use OPNsense\Base\BaseModel; diff --git a/www/nginx/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/NgxBusyBufferConstraint.php b/www/nginx/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/NgxBusyBufferConstraint.php index ac100e9f1..862467db9 100644 --- a/www/nginx/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/NgxBusyBufferConstraint.php +++ b/www/nginx/src/opnsense/mvc/app/models/OPNsense/Base/Constraints/NgxBusyBufferConstraint.php @@ -1,4 +1,5 @@ proxy_buffers_size; $proxy_busy_buffers_size_node = $parentNode->proxy_busy_buffers_size; - if(!$this->isEmpty($proxy_buffers_count_node) && !$this->isEmpty($proxy_buffers_size_node)) { + if (!$this->isEmpty($proxy_buffers_count_node) && !$this->isEmpty($proxy_buffers_size_node)) { $proxy_buffers_count_int = intval((string) $proxy_buffers_count_node); $proxy_buffers_size_int = intval((string) $proxy_buffers_size_node); @@ -64,30 +64,39 @@ class NgxBusyBufferConstraint extends BaseConstraint $proxy_buffer_size_int = intval((string) $proxy_buffer_size_node); } - if (isset($proxy_buffers_total_minus1_size) && isset($proxy_busy_buffers_size) && - $proxy_buffers_total_minus1_size < $proxy_busy_buffers_size) { + if ( + isset($proxy_buffers_total_minus1_size) && isset($proxy_busy_buffers_size) && + $proxy_buffers_total_minus1_size < $proxy_busy_buffers_size + ) { $validator->appendMessage(new Message( gettext("Proxy Buffer Size must be less than the size of all Proxy Buffers minus one buffer."), $attribute, - $this->getOption('name'))); + $this->getOption('name') + )); } // nginx: [emerg] "proxy_busy_buffers_size" must be equal to or greater than the maximum of the value of "proxy_buffer_size" and one of the "proxy_buffers" - if (isset($proxy_busy_buffers_size) && isset($proxy_buffers_size_int) && - $proxy_busy_buffers_size < $proxy_buffers_size_int) { + if ( + isset($proxy_busy_buffers_size) && isset($proxy_buffers_size_int) && + $proxy_busy_buffers_size < $proxy_buffers_size_int + ) { $validator->appendMessage(new Message( gettext("Proxy Busy Buffers Size must be equal to or greater than the maximum of one of the Proxy Buffers."), $attribute, - $this->getOption('name'))); + $this->getOption('name') + )); } // nginx: [emerg] "proxy_busy_buffers_size" must be equal to or greater than the maximum of the value of "proxy_buffer_size" and one of the "proxy_buffers" - if (isset($proxy_busy_buffers_size) && isset($proxy_buffer_size_int) && - $proxy_busy_buffers_size < $proxy_buffer_size_int) { + if ( + isset($proxy_busy_buffers_size) && isset($proxy_buffer_size_int) && + $proxy_busy_buffers_size < $proxy_buffer_size_int + ) { $validator->appendMessage(new Message( gettext("Proxy Busy Buffers Size must be equal to or greater than the maximum of the value of Proxy Buffer Size."), $attribute, - $this->getOption('name'))); + $this->getOption('name') + )); } } }