From 4ff026076a8a9245c45b52a6c01e983157e7716c Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 14 Jan 2019 09:04:33 +0100 Subject: [PATCH] src: style sweep --- .../controllers/OPNsense/iperf/Api/InstanceController.php | 6 +++--- .../controllers/OPNsense/Redis/Api/ServiceController.php | 8 ++++---- .../controllers/OPNsense/Redis/Api/SettingsController.php | 4 ++-- .../app/controllers/OPNsense/Bind/Api/AclController.php | 4 ++-- .../app/controllers/OPNsense/Bind/Api/DnsblController.php | 4 ++-- .../controllers/OPNsense/Bind/Api/GeneralController.php | 4 ++-- .../controllers/OPNsense/Bind/Api/ServiceController.php | 8 ++++---- .../OPNsense/Dnscryptproxy/Api/CloakController.php | 4 ++-- .../OPNsense/Dnscryptproxy/Api/ForwardController.php | 4 ++-- .../OPNsense/Dnscryptproxy/Api/GeneralController.php | 4 ++-- .../OPNsense/Dnscryptproxy/Api/ServerController.php | 4 ++-- .../OPNsense/Dnscryptproxy/Api/ServiceController.php | 8 ++++---- .../OPNsense/Dnscryptproxy/Api/WhitelistController.php | 4 ++-- .../OPNsense/Postfix/Api/AddressController.php | 4 ++-- .../OPNsense/Postfix/Api/AntispamController.php | 4 ++-- .../controllers/OPNsense/Postfix/Api/DomainController.php | 4 ++-- .../OPNsense/Postfix/Api/GeneralController.php | 4 ++-- .../OPNsense/Postfix/Api/RecipientController.php | 4 ++-- .../OPNsense/Postfix/Api/RecipientbccController.php | 4 ++-- .../controllers/OPNsense/Postfix/Api/SenderController.php | 4 ++-- .../OPNsense/Postfix/Api/SenderbccController.php | 4 ++-- .../OPNsense/Postfix/Api/ServiceController.php | 8 ++++---- .../controllers/OPNsense/Rspamd/Api/ServiceController.php | 8 ++++---- .../OPNsense/Rspamd/Api/SettingsController.php | 4 ++-- .../controllers/OPNsense/Lldpd/Api/GeneralController.php | 4 ++-- .../controllers/OPNsense/Lldpd/Api/ServiceController.php | 8 ++++---- .../OPNsense/Netsnmp/Api/GeneralController.php | 4 ++-- .../OPNsense/Netsnmp/Api/ServiceController.php | 8 ++++---- .../controllers/OPNsense/Netsnmp/Api/UserController.php | 4 ++-- .../controllers/OPNsense/Telegraf/Api/KeyController.php | 4 ++-- .../OPNsense/ZabbixAgent/Api/SettingsController.php | 4 ++-- .../OPNsense/Freeradius/Api/ClientController.php | 4 ++-- .../OPNsense/Freeradius/Api/LdapController.php | 4 ++-- .../OPNsense/Freeradius/Api/UserController.php | 4 ++-- .../app/controllers/OPNsense/Quagga/Api/BgpController.php | 4 ++-- .../OPNsense/Quagga/Api/Ospf6settingsController.php | 4 ++-- .../OPNsense/Quagga/Api/OspfsettingsController.php | 4 ++-- .../app/controllers/OPNsense/Quagga/Api/RipController.php | 4 ++-- .../OPNsense/HAProxy/Api/ServiceController.php | 8 ++++---- .../OPNsense/MDNSRepeater/Api/SettingsController.php | 4 ++-- .../controllers/OPNsense/Ntopng/Api/GeneralController.php | 4 ++-- .../controllers/OPNsense/Ntopng/Api/ServiceController.php | 8 ++++---- .../app/controllers/OPNsense/Quagga/Api/BgpController.php | 4 ++-- .../OPNsense/Quagga/Api/Ospf6settingsController.php | 4 ++-- .../OPNsense/Quagga/Api/OspfsettingsController.php | 4 ++-- .../controllers/OPNsense/Relayd/Api/ServiceController.php | 8 ++++---- .../OPNsense/Relayd/Api/SettingsController.php | 4 ++-- .../OPNsense/Shadowsocks/Api/GeneralController.php | 4 ++-- .../OPNsense/Shadowsocks/Api/LocalController.php | 4 ++-- .../OPNsense/Shadowsocks/Api/LocalserviceController.php | 8 ++++---- .../OPNsense/Shadowsocks/Api/ServiceController.php | 8 ++++---- .../controllers/OPNsense/Siproxd/Api/DomainController.php | 4 ++-- .../controllers/OPNsense/Siproxd/Api/UserController.php | 4 ++-- .../controllers/OPNsense/Vnstat/Api/GeneralController.php | 4 ++-- .../controllers/OPNsense/Vnstat/Api/ServiceController.php | 8 ++++---- .../OPNsense/Wireguard/Api/ClientController.php | 4 ++-- .../OPNsense/Wireguard/Api/GeneralController.php | 4 ++-- .../OPNsense/Wireguard/Api/ServerController.php | 4 ++-- .../OPNsense/Wireguard/Api/ServiceController.php | 8 ++++---- .../app/controllers/OPNsense/Wol/Api/WolController.php | 4 ++-- .../OPNsense/Zerotier/Api/NetworkController.php | 4 ++-- .../OPNsense/Zerotier/Api/SettingsController.php | 4 ++-- .../OPNsense/AcmeClient/Api/SettingsController.php | 4 ++-- .../controllers/OPNsense/ClamAV/Api/GeneralController.php | 4 ++-- .../controllers/OPNsense/ClamAV/Api/ServiceController.php | 8 ++++---- .../OPNsense/Openconnect/Api/GeneralController.php | 4 ++-- .../OPNsense/Openconnect/Api/ServiceController.php | 8 ++++---- .../OPNsense/Softether/Api/GeneralController.php | 4 ++-- .../OPNsense/Softether/Api/ServiceController.php | 8 ++++---- .../controllers/OPNsense/Tinc/Api/SettingsController.php | 4 ++-- .../controllers/OPNsense/Tor/Api/ExitaclController.php | 4 ++-- .../controllers/OPNsense/Tor/Api/GeneralController.php | 4 ++-- .../OPNsense/Tor/Api/HiddenserviceController.php | 4 ++-- .../OPNsense/Tor/Api/HiddenserviceaclController.php | 4 ++-- .../app/controllers/OPNsense/Tor/Api/RelayController.php | 4 ++-- .../controllers/OPNsense/Tor/Api/SocksaclController.php | 4 ++-- .../OPNsense/NodeExporter/Api/GeneralController.php | 4 ++-- .../OPNsense/NodeExporter/Api/ServiceController.php | 8 ++++---- .../controllers/OPNsense/Nut/Api/ServiceController.php | 8 ++++---- .../controllers/OPNsense/Nut/Api/SettingsController.php | 4 ++-- .../OPNsense/CICAP/Api/AntivirusController.php | 4 ++-- .../controllers/OPNsense/CICAP/Api/GeneralController.php | 4 ++-- .../controllers/OPNsense/CICAP/Api/ServiceController.php | 8 ++++---- .../app/controllers/OPNsense/Nginx/Api/BansController.php | 4 ++-- .../controllers/OPNsense/Nginx/Api/ServiceController.php | 8 ++++---- .../controllers/OPNsense/Nginx/Api/SettingsController.php | 4 ++-- .../OPNsense/ProxySSO/Api/SettingsController.php | 4 ++-- .../OPNsense/ProxyUserACL/Api/SettingsController.php | 4 ++-- 88 files changed, 219 insertions(+), 219 deletions(-) diff --git a/benchmarks/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/Api/InstanceController.php b/benchmarks/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/Api/InstanceController.php index 943059f7ac..084eaf499c 100644 --- a/benchmarks/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/Api/InstanceController.php +++ b/benchmarks/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/Api/InstanceController.php @@ -37,9 +37,9 @@ class InstanceController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\iperf\FakeInstance'; - static protected $internalModelName = 'instance'; - static private $SOCKET_PATH = "unix:///var/run/iperf-manager.sock"; + protected static $internalModelClass = '\OPNsense\iperf\FakeInstance'; + protected static $internalModelName = 'instance'; + private static $SOCKET_PATH = "unix:///var/run/iperf-manager.sock"; // override base to set model - not used here public function setAction() diff --git a/databases/redis/src/opnsense/mvc/app/controllers/OPNsense/Redis/Api/ServiceController.php b/databases/redis/src/opnsense/mvc/app/controllers/OPNsense/Redis/Api/ServiceController.php index fbc7e62198..059389c76f 100644 --- a/databases/redis/src/opnsense/mvc/app/controllers/OPNsense/Redis/Api/ServiceController.php +++ b/databases/redis/src/opnsense/mvc/app/controllers/OPNsense/Redis/Api/ServiceController.php @@ -32,8 +32,8 @@ class ServiceController extends ApiMutableServiceControllerBase { - static protected $internalServiceClass = '\OPNsense\Redis\Redis'; - static protected $internalServiceTemplate = 'OPNsense/Redis'; - static protected $internalServiceEnabled = 'general.enabled'; - static protected $internalServiceName = 'redis'; + protected static $internalServiceClass = '\OPNsense\Redis\Redis'; + protected static $internalServiceTemplate = 'OPNsense/Redis'; + protected static $internalServiceEnabled = 'general.enabled'; + protected static $internalServiceName = 'redis'; } diff --git a/databases/redis/src/opnsense/mvc/app/controllers/OPNsense/Redis/Api/SettingsController.php b/databases/redis/src/opnsense/mvc/app/controllers/OPNsense/Redis/Api/SettingsController.php index 9a76825c33..55305f5876 100644 --- a/databases/redis/src/opnsense/mvc/app/controllers/OPNsense/Redis/Api/SettingsController.php +++ b/databases/redis/src/opnsense/mvc/app/controllers/OPNsense/Redis/Api/SettingsController.php @@ -32,6 +32,6 @@ class SettingsController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\Redis\Redis'; - static protected $internalModelName = 'redis'; + protected static $internalModelClass = '\OPNsense\Redis\Redis'; + protected static $internalModelName = 'redis'; } diff --git a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/AclController.php b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/AclController.php index 06716e0c54..36d1dc7da3 100644 --- a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/AclController.php +++ b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/AclController.php @@ -33,8 +33,8 @@ class AclController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'acl'; - static protected $internalModelClass = '\OPNsense\Bind\Acl'; + protected static $internalModelName = 'acl'; + protected static $internalModelClass = '\OPNsense\Bind\Acl'; public function searchAclAction() { diff --git a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/DnsblController.php b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/DnsblController.php index 704a735b18..581b73f68b 100644 --- a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/DnsblController.php +++ b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/DnsblController.php @@ -34,6 +34,6 @@ class DnsblController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\Bind\Dnsbl'; - static protected $internalModelName = 'dnsbl'; + protected static $internalModelClass = '\OPNsense\Bind\Dnsbl'; + protected static $internalModelName = 'dnsbl'; } diff --git a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/GeneralController.php b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/GeneralController.php index 2618c5df7b..d712f7fde9 100644 --- a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/GeneralController.php +++ b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/GeneralController.php @@ -34,6 +34,6 @@ class GeneralController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\Bind\General'; - static protected $internalModelName = 'general'; + protected static $internalModelClass = '\OPNsense\Bind\General'; + protected static $internalModelName = 'general'; } diff --git a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/ServiceController.php b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/ServiceController.php index dab4dd7070..a612a11216 100644 --- a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/ServiceController.php +++ b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/ServiceController.php @@ -41,10 +41,10 @@ */ class ServiceController extends ApiMutableServiceControllerBase { - static protected $internalServiceClass = '\OPNsense\Bind\General'; - static protected $internalServiceTemplate = 'OPNsense/Bind'; - static protected $internalServiceEnabled = 'enabled'; - static protected $internalServiceName = 'bind'; + protected static $internalServiceClass = '\OPNsense\Bind\General'; + protected static $internalServiceTemplate = 'OPNsense/Bind'; + protected static $internalServiceEnabled = 'enabled'; + protected static $internalServiceName = 'bind'; public function dnsblAction() { diff --git a/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/CloakController.php b/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/CloakController.php index 355debfed8..6d01e97df2 100644 --- a/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/CloakController.php +++ b/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/CloakController.php @@ -34,8 +34,8 @@ class CloakController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'cloak'; - static protected $internalModelClass = '\OPNsense\Dnscryptproxy\Cloak'; + protected static $internalModelName = 'cloak'; + protected static $internalModelClass = '\OPNsense\Dnscryptproxy\Cloak'; public function searchCloakAction() { diff --git a/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/ForwardController.php b/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/ForwardController.php index a5f657b08c..0525dee1c5 100644 --- a/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/ForwardController.php +++ b/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/ForwardController.php @@ -34,8 +34,8 @@ class ForwardController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'forward'; - static protected $internalModelClass = '\OPNsense\Dnscryptproxy\Forward'; + protected static $internalModelName = 'forward'; + protected static $internalModelClass = '\OPNsense\Dnscryptproxy\Forward'; public function searchForwardAction() { diff --git a/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/GeneralController.php b/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/GeneralController.php index 7ea282a81c..53a624c579 100644 --- a/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/GeneralController.php +++ b/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/GeneralController.php @@ -34,6 +34,6 @@ class GeneralController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\Dnscryptproxy\General'; - static protected $internalModelName = 'general'; + protected static $internalModelClass = '\OPNsense\Dnscryptproxy\General'; + protected static $internalModelName = 'general'; } diff --git a/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/ServerController.php b/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/ServerController.php index fd67720026..b2754bcc53 100644 --- a/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/ServerController.php +++ b/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/ServerController.php @@ -33,8 +33,8 @@ class ServerController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'server'; - static protected $internalModelClass = '\OPNsense\Dnscryptproxy\Server'; + protected static $internalModelName = 'server'; + protected static $internalModelClass = '\OPNsense\Dnscryptproxy\Server'; public function searchServerAction() { diff --git a/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/ServiceController.php b/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/ServiceController.php index 82d5056772..cfe1735788 100644 --- a/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/ServiceController.php +++ b/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/ServiceController.php @@ -40,8 +40,8 @@ */ class ServiceController extends ApiMutableServiceControllerBase { - static protected $internalServiceClass = '\OPNsense\Dnscryptproxy\General'; - static protected $internalServiceTemplate = 'OPNsense/Dnscryptproxy'; - static protected $internalServiceEnabled = 'enabled'; - static protected $internalServiceName = 'dnscryptproxy'; + protected static $internalServiceClass = '\OPNsense\Dnscryptproxy\General'; + protected static $internalServiceTemplate = 'OPNsense/Dnscryptproxy'; + protected static $internalServiceEnabled = 'enabled'; + protected static $internalServiceName = 'dnscryptproxy'; } diff --git a/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/WhitelistController.php b/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/WhitelistController.php index 8ff9c07b46..7950a2099a 100644 --- a/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/WhitelistController.php +++ b/dns/dnscrypt-proxy/src/opnsense/mvc/app/controllers/OPNsense/Dnscryptproxy/Api/WhitelistController.php @@ -34,8 +34,8 @@ class WhitelistController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'whitelist'; - static protected $internalModelClass = '\OPNsense\Dnscryptproxy\Whitelist'; + protected static $internalModelName = 'whitelist'; + protected static $internalModelClass = '\OPNsense\Dnscryptproxy\Whitelist'; public function searchWhitelistAction() { diff --git a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/AddressController.php b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/AddressController.php index 6eb1739e58..9d4685f4ab 100644 --- a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/AddressController.php +++ b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/AddressController.php @@ -32,8 +32,8 @@ class AddressController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'address'; - static protected $internalModelClass = '\OPNsense\Postfix\Address'; + protected static $internalModelName = 'address'; + protected static $internalModelClass = '\OPNsense\Postfix\Address'; public function searchAddressAction() { diff --git a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/AntispamController.php b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/AntispamController.php index eee8f1fda1..007321aa4a 100644 --- a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/AntispamController.php +++ b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/AntispamController.php @@ -33,6 +33,6 @@ class AntispamController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'antispam'; - static protected $internalModelClass = '\OPNsense\Postfix\Antispam'; + protected static $internalModelName = 'antispam'; + protected static $internalModelClass = '\OPNsense\Postfix\Antispam'; } diff --git a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/DomainController.php b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/DomainController.php index 9bf9b8ecd0..2b1690c275 100644 --- a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/DomainController.php +++ b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/DomainController.php @@ -33,8 +33,8 @@ class DomainController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'domain'; - static protected $internalModelClass = '\OPNsense\Postfix\Domain'; + protected static $internalModelName = 'domain'; + protected static $internalModelClass = '\OPNsense\Postfix\Domain'; public function searchDomainAction() { diff --git a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/GeneralController.php b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/GeneralController.php index b8da29a2d3..54c0d776c5 100644 --- a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/GeneralController.php +++ b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/GeneralController.php @@ -32,6 +32,6 @@ class GeneralController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\Postfix\General'; - static protected $internalModelName = 'general'; + protected static $internalModelClass = '\OPNsense\Postfix\General'; + protected static $internalModelName = 'general'; } diff --git a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/RecipientController.php b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/RecipientController.php index 37d2d7ce54..a887394715 100644 --- a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/RecipientController.php +++ b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/RecipientController.php @@ -33,8 +33,8 @@ class RecipientController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'recipient'; - static protected $internalModelClass = '\OPNsense\Postfix\Recipient'; + protected static $internalModelName = 'recipient'; + protected static $internalModelClass = '\OPNsense\Postfix\Recipient'; public function searchRecipientAction() { diff --git a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/RecipientbccController.php b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/RecipientbccController.php index 3f642276cb..079d76736b 100644 --- a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/RecipientbccController.php +++ b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/RecipientbccController.php @@ -32,8 +32,8 @@ class RecipientbccController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'recipientbcc'; - static protected $internalModelClass = '\OPNsense\Postfix\Recipientbcc'; + protected static $internalModelName = 'recipientbcc'; + protected static $internalModelClass = '\OPNsense\Postfix\Recipientbcc'; public function searchRecipientbccAction() { diff --git a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/SenderController.php b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/SenderController.php index 309cf8cfcf..5407691b05 100644 --- a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/SenderController.php +++ b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/SenderController.php @@ -33,8 +33,8 @@ class SenderController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'sender'; - static protected $internalModelClass = '\OPNsense\Postfix\Sender'; + protected static $internalModelName = 'sender'; + protected static $internalModelClass = '\OPNsense\Postfix\Sender'; public function searchSenderAction() { diff --git a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/SenderbccController.php b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/SenderbccController.php index 7b79f79afe..cbc481807d 100644 --- a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/SenderbccController.php +++ b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/SenderbccController.php @@ -32,8 +32,8 @@ class SenderbccController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'senderbcc'; - static protected $internalModelClass = '\OPNsense\Postfix\Senderbcc'; + protected static $internalModelName = 'senderbcc'; + protected static $internalModelClass = '\OPNsense\Postfix\Senderbcc'; public function searchSenderbccAction() { diff --git a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/ServiceController.php b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/ServiceController.php index d318d00468..e0091751c1 100644 --- a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/ServiceController.php +++ b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/ServiceController.php @@ -39,10 +39,10 @@ */ class ServiceController extends ApiMutableServiceControllerBase { - static protected $internalServiceClass = '\OPNsense\Postfix\General'; - static protected $internalServiceTemplate = 'OPNsense/Postfix'; - static protected $internalServiceEnabled = 'enabled'; - static protected $internalServiceName = 'postfix'; + protected static $internalServiceClass = '\OPNsense\Postfix\General'; + protected static $internalServiceTemplate = 'OPNsense/Postfix'; + protected static $internalServiceEnabled = 'enabled'; + protected static $internalServiceName = 'postfix'; /** * check rspamd diff --git a/mail/rspamd/src/opnsense/mvc/app/controllers/OPNsense/Rspamd/Api/ServiceController.php b/mail/rspamd/src/opnsense/mvc/app/controllers/OPNsense/Rspamd/Api/ServiceController.php index 021ef704b1..d0b58c87d2 100644 --- a/mail/rspamd/src/opnsense/mvc/app/controllers/OPNsense/Rspamd/Api/ServiceController.php +++ b/mail/rspamd/src/opnsense/mvc/app/controllers/OPNsense/Rspamd/Api/ServiceController.php @@ -32,8 +32,8 @@ class ServiceController extends ApiMutableServiceControllerBase { - static protected $internalServiceClass = '\OPNsense\Rspamd\RSpamd'; - static protected $internalServiceTemplate = 'OPNsense/Rspamd'; - static protected $internalServiceEnabled = 'general.enabled'; - static protected $internalServiceName = 'rspamd'; + protected static $internalServiceClass = '\OPNsense\Rspamd\RSpamd'; + protected static $internalServiceTemplate = 'OPNsense/Rspamd'; + protected static $internalServiceEnabled = 'general.enabled'; + protected static $internalServiceName = 'rspamd'; } diff --git a/mail/rspamd/src/opnsense/mvc/app/controllers/OPNsense/Rspamd/Api/SettingsController.php b/mail/rspamd/src/opnsense/mvc/app/controllers/OPNsense/Rspamd/Api/SettingsController.php index d1391e6760..3baa92ec58 100644 --- a/mail/rspamd/src/opnsense/mvc/app/controllers/OPNsense/Rspamd/Api/SettingsController.php +++ b/mail/rspamd/src/opnsense/mvc/app/controllers/OPNsense/Rspamd/Api/SettingsController.php @@ -32,6 +32,6 @@ class SettingsController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\Rspamd\RSpamd'; - static protected $internalModelName = 'rspamd'; + protected static $internalModelClass = '\OPNsense\Rspamd\RSpamd'; + protected static $internalModelName = 'rspamd'; } diff --git a/net-mgmt/lldpd/src/opnsense/mvc/app/controllers/OPNsense/Lldpd/Api/GeneralController.php b/net-mgmt/lldpd/src/opnsense/mvc/app/controllers/OPNsense/Lldpd/Api/GeneralController.php index 739f018286..4dddfc38b0 100644 --- a/net-mgmt/lldpd/src/opnsense/mvc/app/controllers/OPNsense/Lldpd/Api/GeneralController.php +++ b/net-mgmt/lldpd/src/opnsense/mvc/app/controllers/OPNsense/Lldpd/Api/GeneralController.php @@ -35,6 +35,6 @@ class GeneralController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\Lldpd\General'; - static protected $internalModelName = 'general'; + protected static $internalModelClass = '\OPNsense\Lldpd\General'; + protected static $internalModelName = 'general'; } diff --git a/net-mgmt/lldpd/src/opnsense/mvc/app/controllers/OPNsense/Lldpd/Api/ServiceController.php b/net-mgmt/lldpd/src/opnsense/mvc/app/controllers/OPNsense/Lldpd/Api/ServiceController.php index 8e951c14c1..f3dbbe97e1 100644 --- a/net-mgmt/lldpd/src/opnsense/mvc/app/controllers/OPNsense/Lldpd/Api/ServiceController.php +++ b/net-mgmt/lldpd/src/opnsense/mvc/app/controllers/OPNsense/Lldpd/Api/ServiceController.php @@ -36,10 +36,10 @@ class ServiceController extends ApiMutableServiceControllerBase { - static protected $internalServiceClass = '\OPNsense\Lldpd\General'; - static protected $internalServiceTemplate = 'OPNsense/Lldpd'; - static protected $internalServiceEnabled = 'enabled'; - static protected $internalServiceName = 'lldpd'; + protected static $internalServiceClass = '\OPNsense\Lldpd\General'; + protected static $internalServiceTemplate = 'OPNsense/Lldpd'; + protected static $internalServiceEnabled = 'enabled'; + protected static $internalServiceName = 'lldpd'; /** * show lldpd neighbors diff --git a/net-mgmt/net-snmp/src/opnsense/mvc/app/controllers/OPNsense/Netsnmp/Api/GeneralController.php b/net-mgmt/net-snmp/src/opnsense/mvc/app/controllers/OPNsense/Netsnmp/Api/GeneralController.php index 3d79cce4e4..4ff88c6004 100644 --- a/net-mgmt/net-snmp/src/opnsense/mvc/app/controllers/OPNsense/Netsnmp/Api/GeneralController.php +++ b/net-mgmt/net-snmp/src/opnsense/mvc/app/controllers/OPNsense/Netsnmp/Api/GeneralController.php @@ -34,6 +34,6 @@ class GeneralController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\Netsnmp\General'; - static protected $internalModelName = 'general'; + protected static $internalModelClass = '\OPNsense\Netsnmp\General'; + protected static $internalModelName = 'general'; } diff --git a/net-mgmt/net-snmp/src/opnsense/mvc/app/controllers/OPNsense/Netsnmp/Api/ServiceController.php b/net-mgmt/net-snmp/src/opnsense/mvc/app/controllers/OPNsense/Netsnmp/Api/ServiceController.php index 466cfbf6cc..1fd5a3dbc1 100644 --- a/net-mgmt/net-snmp/src/opnsense/mvc/app/controllers/OPNsense/Netsnmp/Api/ServiceController.php +++ b/net-mgmt/net-snmp/src/opnsense/mvc/app/controllers/OPNsense/Netsnmp/Api/ServiceController.php @@ -40,8 +40,8 @@ */ class ServiceController extends ApiMutableServiceControllerBase { - static protected $internalServiceClass = '\OPNsense\Netsnmp\General'; - static protected $internalServiceTemplate = 'OPNsense/Netsnmp'; - static protected $internalServiceEnabled = 'enabled'; - static protected $internalServiceName = 'netsnmp'; + protected static $internalServiceClass = '\OPNsense\Netsnmp\General'; + protected static $internalServiceTemplate = 'OPNsense/Netsnmp'; + protected static $internalServiceEnabled = 'enabled'; + protected static $internalServiceName = 'netsnmp'; } diff --git a/net-mgmt/net-snmp/src/opnsense/mvc/app/controllers/OPNsense/Netsnmp/Api/UserController.php b/net-mgmt/net-snmp/src/opnsense/mvc/app/controllers/OPNsense/Netsnmp/Api/UserController.php index c19e6f19e5..f32149bea2 100644 --- a/net-mgmt/net-snmp/src/opnsense/mvc/app/controllers/OPNsense/Netsnmp/Api/UserController.php +++ b/net-mgmt/net-snmp/src/opnsense/mvc/app/controllers/OPNsense/Netsnmp/Api/UserController.php @@ -33,8 +33,8 @@ class UserController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'user'; - static protected $internalModelClass = '\OPNsense\Netsnmp\User'; + protected static $internalModelName = 'user'; + protected static $internalModelClass = '\OPNsense\Netsnmp\User'; public function searchUserAction() { diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/Api/KeyController.php b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/Api/KeyController.php index a60c331019..55e94f3275 100644 --- a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/Api/KeyController.php +++ b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/Api/KeyController.php @@ -33,8 +33,8 @@ class KeyController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'key'; - static protected $internalModelClass = '\OPNsense\Telegraf\Key'; + protected static $internalModelName = 'key'; + protected static $internalModelClass = '\OPNsense\Telegraf\Key'; public function searchKeyAction() { 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 adca245cc8..4101d5e678 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 @@ -40,8 +40,8 @@ */ class SettingsController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'zabbixagent'; - static protected $internalModelClass = '\OPNsense\ZabbixAgent\ZabbixAgent'; + protected static $internalModelName = 'zabbixagent'; + protected static $internalModelClass = '\OPNsense\ZabbixAgent\ZabbixAgent'; public function searchUserparametersAction() { diff --git a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/Api/ClientController.php b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/Api/ClientController.php index f027cedaf7..ee4c1ec2b9 100644 --- a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/Api/ClientController.php +++ b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/Api/ClientController.php @@ -37,8 +37,8 @@ class ClientController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'Client'; - static protected $internalModelClass = '\OPNsense\Freeradius\Client'; + protected static $internalModelName = 'Client'; + protected static $internalModelClass = '\OPNsense\Freeradius\Client'; public function getAction() { // define list of configurable settings diff --git a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/Api/LdapController.php b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/Api/LdapController.php index eb9fa357bb..73721c921a 100644 --- a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/Api/LdapController.php +++ b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/Api/LdapController.php @@ -34,6 +34,6 @@ class LdapController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'ldap'; - static protected $internalModelClass = '\OPNsense\Freeradius\Ldap'; + protected static $internalModelName = 'ldap'; + protected static $internalModelClass = '\OPNsense\Freeradius\Ldap'; } diff --git a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/Api/UserController.php b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/Api/UserController.php index 7169bf1c6b..78d9185023 100644 --- a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/Api/UserController.php +++ b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/Api/UserController.php @@ -37,8 +37,8 @@ class UserController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'User'; - static protected $internalModelClass = '\OPNsense\Freeradius\User'; + protected static $internalModelName = 'User'; + protected static $internalModelClass = '\OPNsense\Freeradius\User'; public function getAction() { diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php index 554f61babf..3a95608915 100644 --- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php +++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php @@ -35,8 +35,8 @@ class BgpController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'bgp'; - static protected $internalModelClass = '\OPNsense\Quagga\BGP'; + protected static $internalModelName = 'bgp'; + protected static $internalModelClass = '\OPNsense\Quagga\BGP'; public function searchNeighborAction() { diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/Ospf6settingsController.php b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/Ospf6settingsController.php index 2d6fc60678..79020c443f 100644 --- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/Ospf6settingsController.php +++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/Ospf6settingsController.php @@ -38,8 +38,8 @@ class Ospf6settingsController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'ospf6'; - static protected $internalModelClass = '\OPNsense\Quagga\OSPF6'; + protected static $internalModelName = 'ospf6'; + protected static $internalModelClass = '\OPNsense\Quagga\OSPF6'; public function searchInterfaceAction() { return $this->searchBase('interfaces.interface', array("enabled", "interfacename", "area", "networktype")); diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/OspfsettingsController.php b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/OspfsettingsController.php index fef38db192..7cc0c346b1 100644 --- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/OspfsettingsController.php +++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/OspfsettingsController.php @@ -32,8 +32,8 @@ class OspfsettingsController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'ospf'; - static protected $internalModelClass = '\OPNsense\Quagga\OSPF'; + protected static $internalModelName = 'ospf'; + protected static $internalModelClass = '\OPNsense\Quagga\OSPF'; public function searchNetworkAction() { diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/RipController.php b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/RipController.php index 6cdce68beb..5e786794dc 100644 --- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/RipController.php +++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/RipController.php @@ -33,6 +33,6 @@ class RipController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'rip'; - static protected $internalModelClass = '\OPNsense\Quagga\RIP'; + protected static $internalModelName = 'rip'; + protected static $internalModelClass = '\OPNsense\Quagga\RIP'; } 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 89f7105737..b68191110f 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 @@ -39,10 +39,10 @@ */ class ServiceController extends ApiMutableServiceControllerBase { - static protected $internalServiceClass = '\OPNsense\HAProxy\HAProxy'; - static protected $internalServiceTemplate = 'OPNsense/HAProxy'; - static protected $internalServiceEnabled = 'general.enabled'; - static protected $internalServiceName = 'haproxy'; + protected static $internalServiceClass = '\OPNsense\HAProxy\HAProxy'; + protected static $internalServiceTemplate = 'OPNsense/HAProxy'; + protected static $internalServiceEnabled = 'general.enabled'; + protected static $internalServiceName = 'haproxy'; /** * run syntax check for haproxy configuration diff --git a/net/mdns-repeater/src/opnsense/mvc/app/controllers/OPNsense/MDNSRepeater/Api/SettingsController.php b/net/mdns-repeater/src/opnsense/mvc/app/controllers/OPNsense/MDNSRepeater/Api/SettingsController.php index 5b1780ea01..26d920dd60 100644 --- a/net/mdns-repeater/src/opnsense/mvc/app/controllers/OPNsense/MDNSRepeater/Api/SettingsController.php +++ b/net/mdns-repeater/src/opnsense/mvc/app/controllers/OPNsense/MDNSRepeater/Api/SettingsController.php @@ -34,6 +34,6 @@ class SettingsController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\MDNSRepeater\MDNSRepeater'; - static protected $internalModelName = 'mdnsrepeater'; + protected static $internalModelClass = '\OPNsense\MDNSRepeater\MDNSRepeater'; + protected static $internalModelName = 'mdnsrepeater'; } diff --git a/net/ntopng/src/opnsense/mvc/app/controllers/OPNsense/Ntopng/Api/GeneralController.php b/net/ntopng/src/opnsense/mvc/app/controllers/OPNsense/Ntopng/Api/GeneralController.php index 739e967f62..ed0bab7c5a 100644 --- a/net/ntopng/src/opnsense/mvc/app/controllers/OPNsense/Ntopng/Api/GeneralController.php +++ b/net/ntopng/src/opnsense/mvc/app/controllers/OPNsense/Ntopng/Api/GeneralController.php @@ -34,6 +34,6 @@ class GeneralController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\Ntopng\General'; - static protected $internalModelName = 'general'; + protected static $internalModelClass = '\OPNsense\Ntopng\General'; + protected static $internalModelName = 'general'; } diff --git a/net/ntopng/src/opnsense/mvc/app/controllers/OPNsense/Ntopng/Api/ServiceController.php b/net/ntopng/src/opnsense/mvc/app/controllers/OPNsense/Ntopng/Api/ServiceController.php index 18f6a621f8..99cbbc33a6 100644 --- a/net/ntopng/src/opnsense/mvc/app/controllers/OPNsense/Ntopng/Api/ServiceController.php +++ b/net/ntopng/src/opnsense/mvc/app/controllers/OPNsense/Ntopng/Api/ServiceController.php @@ -40,10 +40,10 @@ */ class ServiceController extends ApiMutableServiceControllerBase { - static protected $internalServiceClass = '\OPNsense\Ntopng\General'; - static protected $internalServiceTemplate = 'OPNsense/Ntopng'; - static protected $internalServiceEnabled = 'enabled'; - static protected $internalServiceName = 'ntopng'; + protected static $internalServiceClass = '\OPNsense\Ntopng\General'; + protected static $internalServiceTemplate = 'OPNsense/Ntopng'; + protected static $internalServiceEnabled = 'enabled'; + protected static $internalServiceName = 'ntopng'; /** * check if Redis plugin is installed diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php index cfb6aa47f6..2b2a8a0cc5 100644 --- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php +++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php @@ -38,8 +38,8 @@ class BgpController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'BGP'; - static protected $internalModelClass = '\OPNsense\Quagga\BGP'; + protected static $internalModelName = 'BGP'; + protected static $internalModelClass = '\OPNsense\Quagga\BGP'; public function getAction() { // define list of configurable settings diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/Ospf6settingsController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/Ospf6settingsController.php index eeec842412..d874560f6a 100644 --- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/Ospf6settingsController.php +++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/Ospf6settingsController.php @@ -38,8 +38,8 @@ class Ospf6settingsController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'OSPF6'; - static protected $internalModelClass = '\OPNsense\Quagga\OSPF6'; + protected static $internalModelName = 'OSPF6'; + protected static $internalModelClass = '\OPNsense\Quagga\OSPF6'; public function getAction() { $result = array(); diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/OspfsettingsController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/OspfsettingsController.php index 6c55bed5ce..f0bfb2686f 100644 --- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/OspfsettingsController.php +++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/OspfsettingsController.php @@ -37,8 +37,8 @@ class OspfsettingsController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'OSPF'; - static protected $internalModelClass = '\OPNsense\Quagga\OSPF'; + protected static $internalModelName = 'OSPF'; + protected static $internalModelClass = '\OPNsense\Quagga\OSPF'; public function getAction() { $result = array(); diff --git a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/ServiceController.php b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/ServiceController.php index 157510da3e..79b0630f6a 100644 --- a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/ServiceController.php +++ b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/ServiceController.php @@ -38,10 +38,10 @@ */ class ServiceController extends ApiMutableServiceControllerBase { - static protected $internalServiceClass = '\OPNsense\Relayd\Relayd'; - static protected $internalServiceEnabled = 'general.enabled'; - static protected $internalServiceTemplate = 'OPNsense/Relayd'; - static protected $internalServiceName = 'relayd'; + protected static $internalServiceClass = '\OPNsense\Relayd\Relayd'; + protected static $internalServiceEnabled = 'general.enabled'; + protected static $internalServiceTemplate = 'OPNsense/Relayd'; + protected static $internalServiceName = 'relayd'; private $internalLockHandle = null; /** diff --git a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php index cde88bb911..3c7a676666 100644 --- a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php +++ b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/Api/SettingsController.php @@ -42,8 +42,8 @@ class SettingsController extends ApiControllerBase { - static protected $internalModelName = 'relayd'; - static protected $internalModelClass = '\OPNsense\Relayd\Relayd'; + protected static $internalModelName = 'relayd'; + protected static $internalModelClass = '\OPNsense\Relayd\Relayd'; public $mdlRelayd = null; /** diff --git a/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/Api/GeneralController.php b/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/Api/GeneralController.php index d960c17589..553d0c63de 100644 --- a/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/Api/GeneralController.php +++ b/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/Api/GeneralController.php @@ -32,6 +32,6 @@ class GeneralController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\Shadowsocks\General'; - static protected $internalModelName = 'general'; + protected static $internalModelClass = '\OPNsense\Shadowsocks\General'; + protected static $internalModelName = 'general'; } diff --git a/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/Api/LocalController.php b/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/Api/LocalController.php index 5f8f4aec96..4870774015 100644 --- a/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/Api/LocalController.php +++ b/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/Api/LocalController.php @@ -32,6 +32,6 @@ class LocalController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\Shadowsocks\Local'; - static protected $internalModelName = 'local'; + protected static $internalModelClass = '\OPNsense\Shadowsocks\Local'; + protected static $internalModelName = 'local'; } diff --git a/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/Api/LocalserviceController.php b/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/Api/LocalserviceController.php index 6b889da127..a67694d085 100644 --- a/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/Api/LocalserviceController.php +++ b/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/Api/LocalserviceController.php @@ -32,8 +32,8 @@ class LocalserviceController extends ApiMutableServiceControllerBase { - static protected $internalServiceClass = '\OPNsense\Shadowsocks\Local'; - static protected $internalServiceTemplate = 'OPNsense/Shadowsocks'; - static protected $internalServiceEnabled = 'enabled'; - static protected $internalServiceName = 'shadowsockslocal'; + protected static $internalServiceClass = '\OPNsense\Shadowsocks\Local'; + protected static $internalServiceTemplate = 'OPNsense/Shadowsocks'; + protected static $internalServiceEnabled = 'enabled'; + protected static $internalServiceName = 'shadowsockslocal'; } diff --git a/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/Api/ServiceController.php b/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/Api/ServiceController.php index eb2a9f0023..29d8f8bbfc 100644 --- a/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/Api/ServiceController.php +++ b/net/shadowsocks/src/opnsense/mvc/app/controllers/OPNsense/Shadowsocks/Api/ServiceController.php @@ -32,8 +32,8 @@ class ServiceController extends ApiMutableServiceControllerBase { - static protected $internalServiceClass = '\OPNsense\Shadowsocks\General'; - static protected $internalServiceTemplate = 'OPNsense/Shadowsocks'; - static protected $internalServiceEnabled = 'enabled'; - static protected $internalServiceName = 'shadowsocks'; + protected static $internalServiceClass = '\OPNsense\Shadowsocks\General'; + protected static $internalServiceTemplate = 'OPNsense/Shadowsocks'; + protected static $internalServiceEnabled = 'enabled'; + protected static $internalServiceName = 'shadowsocks'; } diff --git a/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/Api/DomainController.php b/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/Api/DomainController.php index 4b2930910d..1f88dd8cc6 100644 --- a/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/Api/DomainController.php +++ b/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/Api/DomainController.php @@ -37,8 +37,8 @@ class DomainController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'Domain'; - static protected $internalModelClass = '\OPNsense\Siproxd\Domain'; + protected static $internalModelName = 'Domain'; + protected static $internalModelClass = '\OPNsense\Siproxd\Domain'; public function getAction() { diff --git a/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/Api/UserController.php b/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/Api/UserController.php index a2311cbe8b..8d3ff5985e 100644 --- a/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/Api/UserController.php +++ b/net/siproxd/src/opnsense/mvc/app/controllers/OPNsense/Siproxd/Api/UserController.php @@ -37,8 +37,8 @@ class UserController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'User'; - static protected $internalModelClass = '\OPNsense\Siproxd\User'; + protected static $internalModelName = 'User'; + protected static $internalModelClass = '\OPNsense\Siproxd\User'; public function getAction() { diff --git a/net/vnstat/src/opnsense/mvc/app/controllers/OPNsense/Vnstat/Api/GeneralController.php b/net/vnstat/src/opnsense/mvc/app/controllers/OPNsense/Vnstat/Api/GeneralController.php index daede80a96..a579e72e70 100644 --- a/net/vnstat/src/opnsense/mvc/app/controllers/OPNsense/Vnstat/Api/GeneralController.php +++ b/net/vnstat/src/opnsense/mvc/app/controllers/OPNsense/Vnstat/Api/GeneralController.php @@ -34,6 +34,6 @@ class GeneralController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\Vnstat\General'; - static protected $internalModelName = 'general'; + protected static $internalModelClass = '\OPNsense\Vnstat\General'; + protected static $internalModelName = 'general'; } diff --git a/net/vnstat/src/opnsense/mvc/app/controllers/OPNsense/Vnstat/Api/ServiceController.php b/net/vnstat/src/opnsense/mvc/app/controllers/OPNsense/Vnstat/Api/ServiceController.php index b645504435..93e8860dd5 100644 --- a/net/vnstat/src/opnsense/mvc/app/controllers/OPNsense/Vnstat/Api/ServiceController.php +++ b/net/vnstat/src/opnsense/mvc/app/controllers/OPNsense/Vnstat/Api/ServiceController.php @@ -40,10 +40,10 @@ */ class ServiceController extends ApiMutableServiceControllerBase { - static protected $internalServiceClass = '\OPNsense\Vnstat\General'; - static protected $internalServiceTemplate = 'OPNsense/Vnstat'; - static protected $internalServiceEnabled = 'enabled'; - static protected $internalServiceName = 'vnstat'; + protected static $internalServiceClass = '\OPNsense\Vnstat\General'; + protected static $internalServiceTemplate = 'OPNsense/Vnstat'; + protected static $internalServiceEnabled = 'enabled'; + protected static $internalServiceName = 'vnstat'; /** * list hourly statistics diff --git a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ClientController.php b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ClientController.php index 9c26921e6f..f06cf41ce8 100644 --- a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ClientController.php +++ b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ClientController.php @@ -33,8 +33,8 @@ class ClientController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'client'; - static protected $internalModelClass = '\OPNsense\Wireguard\Client'; + protected static $internalModelName = 'client'; + protected static $internalModelClass = '\OPNsense\Wireguard\Client'; public function searchClientAction() { diff --git a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/GeneralController.php b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/GeneralController.php index e4d4cc2237..da33e0f57f 100644 --- a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/GeneralController.php +++ b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/GeneralController.php @@ -34,6 +34,6 @@ class GeneralController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\Wireguard\General'; - static protected $internalModelName = 'general'; + protected static $internalModelClass = '\OPNsense\Wireguard\General'; + protected static $internalModelName = 'general'; } diff --git a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServerController.php b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServerController.php index 380ffe49b1..eff42b557e 100644 --- a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServerController.php +++ b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServerController.php @@ -34,8 +34,8 @@ class ServerController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'server'; - static protected $internalModelClass = '\OPNsense\Wireguard\Server'; + protected static $internalModelName = 'server'; + protected static $internalModelClass = '\OPNsense\Wireguard\Server'; public function searchServerAction() { diff --git a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServiceController.php b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServiceController.php index ce9b0bed6d..94fe65ecd6 100644 --- a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServiceController.php +++ b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServiceController.php @@ -40,10 +40,10 @@ */ class ServiceController extends ApiMutableServiceControllerBase { - static protected $internalServiceClass = '\OPNsense\Wireguard\General'; - static protected $internalServiceTemplate = 'OPNsense/Wireguard'; - static protected $internalServiceEnabled = 'enabled'; - static protected $internalServiceName = 'wireguard'; + protected static $internalServiceClass = '\OPNsense\Wireguard\General'; + protected static $internalServiceTemplate = 'OPNsense/Wireguard'; + protected static $internalServiceEnabled = 'enabled'; + protected static $internalServiceName = 'wireguard'; /** * show wireguard config diff --git a/net/wol/src/opnsense/mvc/app/controllers/OPNsense/Wol/Api/WolController.php b/net/wol/src/opnsense/mvc/app/controllers/OPNsense/Wol/Api/WolController.php index f28074cd18..ef19b5e180 100644 --- a/net/wol/src/opnsense/mvc/app/controllers/OPNsense/Wol/Api/WolController.php +++ b/net/wol/src/opnsense/mvc/app/controllers/OPNsense/Wol/Api/WolController.php @@ -36,8 +36,8 @@ class WolController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'wol'; - static protected $internalModelClass = '\OPNsense\Wol\Wol'; + protected static $internalModelName = 'wol'; + protected static $internalModelClass = '\OPNsense\Wol\Wol'; public function setAction() { diff --git a/net/zerotier/src/opnsense/mvc/app/controllers/OPNsense/Zerotier/Api/NetworkController.php b/net/zerotier/src/opnsense/mvc/app/controllers/OPNsense/Zerotier/Api/NetworkController.php index 036c20dd8c..6bafb74e79 100644 --- a/net/zerotier/src/opnsense/mvc/app/controllers/OPNsense/Zerotier/Api/NetworkController.php +++ b/net/zerotier/src/opnsense/mvc/app/controllers/OPNsense/Zerotier/Api/NetworkController.php @@ -40,8 +40,8 @@ class NetworkController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'Zerotier'; - static protected $internalModelClass = '\OPNsense\Zerotier\Zerotier'; + protected static $internalModelName = 'Zerotier'; + protected static $internalModelClass = '\OPNsense\Zerotier\Zerotier'; public function searchAction() { diff --git a/net/zerotier/src/opnsense/mvc/app/controllers/OPNsense/Zerotier/Api/SettingsController.php b/net/zerotier/src/opnsense/mvc/app/controllers/OPNsense/Zerotier/Api/SettingsController.php index 1d04a90955..c360b1bcf8 100644 --- a/net/zerotier/src/opnsense/mvc/app/controllers/OPNsense/Zerotier/Api/SettingsController.php +++ b/net/zerotier/src/opnsense/mvc/app/controllers/OPNsense/Zerotier/Api/SettingsController.php @@ -40,8 +40,8 @@ class SettingsController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'Zerotier'; - static protected $internalModelClass = '\OPNsense\Zerotier\Zerotier'; + protected static $internalModelName = 'Zerotier'; + protected static $internalModelClass = '\OPNsense\Zerotier\Zerotier'; public function getAction() { 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 3771b6b7e6..13150708ee 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 @@ -42,8 +42,8 @@ */ class SettingsController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'acmeclient'; - static protected $internalModelClass = '\OPNsense\AcmeClient\AcmeClient'; + protected static $internalModelName = 'acmeclient'; + protected static $internalModelClass = '\OPNsense\AcmeClient\AcmeClient'; /** * create new cron job or return already available one diff --git a/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/Api/GeneralController.php b/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/Api/GeneralController.php index 6b06ce0024..011e496c63 100644 --- a/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/Api/GeneralController.php +++ b/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/Api/GeneralController.php @@ -35,6 +35,6 @@ class GeneralController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'general'; - static protected $internalModelClass = '\OPNsense\ClamAV\General'; + protected static $internalModelName = 'general'; + protected static $internalModelClass = '\OPNsense\ClamAV\General'; } diff --git a/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/Api/ServiceController.php b/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/Api/ServiceController.php index dedc455d4b..5213a9d498 100644 --- a/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/Api/ServiceController.php +++ b/security/clamav/src/opnsense/mvc/app/controllers/OPNsense/ClamAV/Api/ServiceController.php @@ -37,10 +37,10 @@ */ class ServiceController extends ApiMutableServiceControllerBase { - static protected $internalServiceClass = '\OPNsense\ClamAV\General'; - static protected $internalServiceTemplate = 'OPNsense/ClamAV'; - static protected $internalServiceEnabled = 'enabled'; - static protected $internalServiceName = 'clamav'; + protected static $internalServiceClass = '\OPNsense\ClamAV\General'; + protected static $internalServiceTemplate = 'OPNsense/ClamAV'; + protected static $internalServiceEnabled = 'enabled'; + protected static $internalServiceName = 'clamav'; /** * load the initial signatures diff --git a/security/openconnect/src/opnsense/mvc/app/controllers/OPNsense/Openconnect/Api/GeneralController.php b/security/openconnect/src/opnsense/mvc/app/controllers/OPNsense/Openconnect/Api/GeneralController.php index f0b2705277..acc64bdb87 100644 --- a/security/openconnect/src/opnsense/mvc/app/controllers/OPNsense/Openconnect/Api/GeneralController.php +++ b/security/openconnect/src/opnsense/mvc/app/controllers/OPNsense/Openconnect/Api/GeneralController.php @@ -32,6 +32,6 @@ class GeneralController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\Openconnect\General'; - static protected $internalModelName = 'general'; + protected static $internalModelClass = '\OPNsense\Openconnect\General'; + protected static $internalModelName = 'general'; } diff --git a/security/openconnect/src/opnsense/mvc/app/controllers/OPNsense/Openconnect/Api/ServiceController.php b/security/openconnect/src/opnsense/mvc/app/controllers/OPNsense/Openconnect/Api/ServiceController.php index d47e5bff49..e7fc2ce5fd 100644 --- a/security/openconnect/src/opnsense/mvc/app/controllers/OPNsense/Openconnect/Api/ServiceController.php +++ b/security/openconnect/src/opnsense/mvc/app/controllers/OPNsense/Openconnect/Api/ServiceController.php @@ -32,8 +32,8 @@ class ServiceController extends ApiMutableServiceControllerBase { - static protected $internalServiceClass = '\OPNsense\Openconnect\General'; - static protected $internalServiceTemplate = 'OPNsense/Openconnect'; - static protected $internalServiceEnabled = 'enabled'; - static protected $internalServiceName = 'openconnect'; + protected static $internalServiceClass = '\OPNsense\Openconnect\General'; + protected static $internalServiceTemplate = 'OPNsense/Openconnect'; + protected static $internalServiceEnabled = 'enabled'; + protected static $internalServiceName = 'openconnect'; } diff --git a/security/softether/src/opnsense/mvc/app/controllers/OPNsense/Softether/Api/GeneralController.php b/security/softether/src/opnsense/mvc/app/controllers/OPNsense/Softether/Api/GeneralController.php index 1547f90fd5..5844a20752 100644 --- a/security/softether/src/opnsense/mvc/app/controllers/OPNsense/Softether/Api/GeneralController.php +++ b/security/softether/src/opnsense/mvc/app/controllers/OPNsense/Softether/Api/GeneralController.php @@ -34,6 +34,6 @@ class GeneralController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\Softether\General'; - static protected $internalModelName = 'general'; + protected static $internalModelClass = '\OPNsense\Softether\General'; + protected static $internalModelName = 'general'; } diff --git a/security/softether/src/opnsense/mvc/app/controllers/OPNsense/Softether/Api/ServiceController.php b/security/softether/src/opnsense/mvc/app/controllers/OPNsense/Softether/Api/ServiceController.php index ca49536d98..ac6b37084c 100644 --- a/security/softether/src/opnsense/mvc/app/controllers/OPNsense/Softether/Api/ServiceController.php +++ b/security/softether/src/opnsense/mvc/app/controllers/OPNsense/Softether/Api/ServiceController.php @@ -40,8 +40,8 @@ */ class ServiceController extends ApiMutableServiceControllerBase { - static protected $internalServiceClass = '\OPNsense\Softether\General'; - static protected $internalServiceTemplate = 'OPNsense/Softether'; - static protected $internalServiceEnabled = 'enabled'; - static protected $internalServiceName = 'softether'; + protected static $internalServiceClass = '\OPNsense\Softether\General'; + protected static $internalServiceTemplate = 'OPNsense/Softether'; + protected static $internalServiceEnabled = 'enabled'; + protected static $internalServiceName = 'softether'; } 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 019cf0ea9f..8467898126 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 @@ -38,8 +38,8 @@ */ class SettingsController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'tinc'; - static protected $internalModelClass = '\OPNsense\Tinc\Tinc'; + protected static $internalModelName = 'tinc'; + protected static $internalModelClass = '\OPNsense\Tinc\Tinc'; /** * get network action diff --git a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/ExitaclController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/ExitaclController.php index 924af99144..e9ca640217 100644 --- a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/ExitaclController.php +++ b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/ExitaclController.php @@ -35,8 +35,8 @@ class ExitaclController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'exitpolicy'; - static protected $internalModelClass = '\OPNsense\Tor\ACLExitPolicy'; + protected static $internalModelName = 'exitpolicy'; + protected static $internalModelClass = '\OPNsense\Tor\ACLExitPolicy'; public function searchaclAction() { return $this->searchBase('policy', array('enabled', 'type', 'network', 'action', 'startport', 'endport')); diff --git a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/GeneralController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/GeneralController.php index a155dd36d8..d6adf620ef 100644 --- a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/GeneralController.php +++ b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/GeneralController.php @@ -38,8 +38,8 @@ class GeneralController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\Tor\General'; - static protected $internalModelName = 'general'; + protected static $internalModelClass = '\OPNsense\Tor\General'; + protected static $internalModelName = 'general'; /* override default set action */ public function setAction() diff --git a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceController.php index b2febecb9f..3d66bbf09b 100644 --- a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceController.php +++ b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceController.php @@ -32,8 +32,8 @@ class HiddenserviceController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'hiddenservice'; - static protected $internalModelClass = '\OPNsense\Tor\HiddenService'; + protected static $internalModelName = 'hiddenservice'; + protected static $internalModelClass = '\OPNsense\Tor\HiddenService'; public function searchserviceAction() { return $this->searchBase('service', array('enabled', 'name')); diff --git a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceaclController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceaclController.php index 8cfefb66d3..2b1cb33202 100644 --- a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceaclController.php +++ b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/HiddenserviceaclController.php @@ -32,8 +32,8 @@ class HiddenserviceaclController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'hiddenserviceacl'; - static protected $internalModelClass = '\OPNsense\Tor\HiddenServiceACL'; + protected static $internalModelName = 'hiddenserviceacl'; + protected static $internalModelClass = '\OPNsense\Tor\HiddenServiceACL'; public function searchaclAction() { return $this->searchBase('hiddenserviceacl', array('enabled', 'hiddenservice', 'port', 'target_host', 'target_port')); diff --git a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/RelayController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/RelayController.php index 088602ec0e..34641ca25e 100644 --- a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/RelayController.php +++ b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/RelayController.php @@ -33,6 +33,6 @@ class RelayController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\Tor\Relay'; - static protected $internalModelName = 'relay'; + protected static $internalModelClass = '\OPNsense\Tor\Relay'; + protected static $internalModelName = 'relay'; } diff --git a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/SocksaclController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/SocksaclController.php index 3183b43c1a..d661e00e63 100644 --- a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/SocksaclController.php +++ b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/Api/SocksaclController.php @@ -32,8 +32,8 @@ class SocksaclController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'policy'; - static protected $internalModelClass = '\OPNsense\Tor\ACLSocksPolicy'; + protected static $internalModelName = 'policy'; + protected static $internalModelClass = '\OPNsense\Tor\ACLSocksPolicy'; public function searchaclAction() { return $this->searchBase('policy', array('enabled', 'type', 'network', 'action')); diff --git a/sysutils/node_exporter/src/opnsense/mvc/app/controllers/OPNsense/NodeExporter/Api/GeneralController.php b/sysutils/node_exporter/src/opnsense/mvc/app/controllers/OPNsense/NodeExporter/Api/GeneralController.php index 72a4e7c484..578863702d 100644 --- a/sysutils/node_exporter/src/opnsense/mvc/app/controllers/OPNsense/NodeExporter/Api/GeneralController.php +++ b/sysutils/node_exporter/src/opnsense/mvc/app/controllers/OPNsense/NodeExporter/Api/GeneralController.php @@ -32,6 +32,6 @@ class GeneralController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'general'; - static protected $internalModelClass = 'OPNsense\NodeExporter\General'; + protected static $internalModelName = 'general'; + protected static $internalModelClass = 'OPNsense\NodeExporter\General'; } diff --git a/sysutils/node_exporter/src/opnsense/mvc/app/controllers/OPNsense/NodeExporter/Api/ServiceController.php b/sysutils/node_exporter/src/opnsense/mvc/app/controllers/OPNsense/NodeExporter/Api/ServiceController.php index e0b113c1fe..9ffe9a12a0 100644 --- a/sysutils/node_exporter/src/opnsense/mvc/app/controllers/OPNsense/NodeExporter/Api/ServiceController.php +++ b/sysutils/node_exporter/src/opnsense/mvc/app/controllers/OPNsense/NodeExporter/Api/ServiceController.php @@ -32,8 +32,8 @@ class ServiceController extends ApiMutableServiceControllerBase { - static protected $internalServiceClass = '\OPNsense\NodeExporter\General'; - static protected $internalServiceEnabled = 'enabled'; - static protected $internalServiceTemplate = 'OPNsense/NodeExporter'; - static protected $internalServiceName = 'node_exporter'; + protected static $internalServiceClass = '\OPNsense\NodeExporter\General'; + protected static $internalServiceEnabled = 'enabled'; + protected static $internalServiceTemplate = 'OPNsense/NodeExporter'; + protected static $internalServiceName = 'node_exporter'; } diff --git a/sysutils/nut/src/opnsense/mvc/app/controllers/OPNsense/Nut/Api/ServiceController.php b/sysutils/nut/src/opnsense/mvc/app/controllers/OPNsense/Nut/Api/ServiceController.php index 6b939c5a6d..4a68caf6b3 100644 --- a/sysutils/nut/src/opnsense/mvc/app/controllers/OPNsense/Nut/Api/ServiceController.php +++ b/sysutils/nut/src/opnsense/mvc/app/controllers/OPNsense/Nut/Api/ServiceController.php @@ -33,8 +33,8 @@ class ServiceController extends ApiMutableServiceControllerBase { - static protected $internalServiceClass = '\OPNsense\Nut\Nut'; - static protected $internalServiceTemplate = 'OPNsense/Nut'; - static protected $internalServiceEnabled = 'general.enable'; - static protected $internalServiceName = 'nut'; + protected static $internalServiceClass = '\OPNsense\Nut\Nut'; + protected static $internalServiceTemplate = 'OPNsense/Nut'; + protected static $internalServiceEnabled = 'general.enable'; + protected static $internalServiceName = 'nut'; } diff --git a/sysutils/nut/src/opnsense/mvc/app/controllers/OPNsense/Nut/Api/SettingsController.php b/sysutils/nut/src/opnsense/mvc/app/controllers/OPNsense/Nut/Api/SettingsController.php index 55edbc8028..626f4df252 100644 --- a/sysutils/nut/src/opnsense/mvc/app/controllers/OPNsense/Nut/Api/SettingsController.php +++ b/sysutils/nut/src/opnsense/mvc/app/controllers/OPNsense/Nut/Api/SettingsController.php @@ -33,6 +33,6 @@ class SettingsController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\Nut\Nut'; - static protected $internalModelName = 'nut'; + protected static $internalModelClass = '\OPNsense\Nut\Nut'; + protected static $internalModelName = 'nut'; } diff --git a/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/Api/AntivirusController.php b/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/Api/AntivirusController.php index 93af47482b..6ffd9b7d01 100644 --- a/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/Api/AntivirusController.php +++ b/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/Api/AntivirusController.php @@ -32,6 +32,6 @@ class AntivirusController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\CICAP\Antivirus'; - static protected $internalModelName = 'antivirus'; + protected static $internalModelClass = '\OPNsense\CICAP\Antivirus'; + protected static $internalModelName = 'antivirus'; } diff --git a/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/Api/GeneralController.php b/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/Api/GeneralController.php index 09d4bf59be..8d03ed172e 100644 --- a/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/Api/GeneralController.php +++ b/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/Api/GeneralController.php @@ -32,6 +32,6 @@ class GeneralController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\CICAP\General'; - static protected $internalModelName = 'general'; + protected static $internalModelClass = '\OPNsense\CICAP\General'; + protected static $internalModelName = 'general'; } diff --git a/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/Api/ServiceController.php b/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/Api/ServiceController.php index b944d66228..c980928b88 100644 --- a/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/Api/ServiceController.php +++ b/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/Api/ServiceController.php @@ -38,10 +38,10 @@ */ class ServiceController extends ApiMutableServiceControllerBase { - static protected $internalServiceClass = '\OPNsense\CICAP\General'; - static protected $internalServiceTemplate = 'OPNsense/CICAP'; - static protected $internalServiceEnabled = 'enabled'; - static protected $internalServiceName = 'cicap'; + protected static $internalServiceClass = '\OPNsense\CICAP\General'; + protected static $internalServiceTemplate = 'OPNsense/CICAP'; + protected static $internalServiceEnabled = 'enabled'; + protected static $internalServiceName = 'cicap'; /** * check if ClamAV plugin is installed diff --git a/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/BansController.php b/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/BansController.php index 9493ba51c5..79f9edaa13 100644 --- a/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/BansController.php +++ b/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/BansController.php @@ -32,8 +32,8 @@ class BansController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\Nginx\Nginx'; - static protected $internalModelName = 'nginx'; + protected static $internalModelClass = '\OPNsense\Nginx\Nginx'; + protected static $internalModelName = 'nginx'; public function searchbanAction() { return $this->searchBase('ban', array('ip', 'time')); diff --git a/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/ServiceController.php b/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/ServiceController.php index 77c0ef122b..bffa8afbb1 100644 --- a/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/ServiceController.php +++ b/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/Api/ServiceController.php @@ -36,10 +36,10 @@ class ServiceController extends ApiMutableServiceControllerBase { - static protected $internalServiceClass = '\OPNsense\Nginx\Nginx'; - static protected $internalServiceTemplate = 'OPNsense/Nginx'; - static protected $internalServiceEnabled = 'general.enabled'; - static protected $internalServiceName = 'nginx'; + protected static $internalServiceClass = '\OPNsense\Nginx\Nginx'; + protected static $internalServiceTemplate = 'OPNsense/Nginx'; + protected static $internalServiceEnabled = 'general.enabled'; + protected static $internalServiceName = 'nginx'; /** * override parent method - stopping nginx is not allowed because otherwise you would loose 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 0007ef660f..64a23e75cf 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 @@ -33,8 +33,8 @@ class SettingsController extends ApiMutableModelControllerBase { - static protected $internalModelClass = '\OPNsense\Nginx\Nginx'; - static protected $internalModelName = 'nginx'; + protected static $internalModelClass = '\OPNsense\Nginx\Nginx'; + protected static $internalModelName = 'nginx'; // download rules public function downloadrulesAction() diff --git a/www/web-proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/Api/SettingsController.php b/www/web-proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/Api/SettingsController.php index 3b77bbbebc..79448f0c06 100644 --- a/www/web-proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/Api/SettingsController.php +++ b/www/web-proxy-sso/src/opnsense/mvc/app/controllers/OPNsense/ProxySSO/Api/SettingsController.php @@ -37,6 +37,6 @@ */ class SettingsController extends ApiMutableModelControllerBase { - static protected $internalModelName = "ProxySSO"; - static protected $internalModelClass = "\OPNsense\ProxySSO\ProxySSO"; + protected static $internalModelName = "ProxySSO"; + protected static $internalModelClass = "\OPNsense\ProxySSO\ProxySSO"; } diff --git a/www/web-proxy-useracl/src/opnsense/mvc/app/controllers/OPNsense/ProxyUserACL/Api/SettingsController.php b/www/web-proxy-useracl/src/opnsense/mvc/app/controllers/OPNsense/ProxyUserACL/Api/SettingsController.php index f57b7b93a5..34b885dbe0 100644 --- a/www/web-proxy-useracl/src/opnsense/mvc/app/controllers/OPNsense/ProxyUserACL/Api/SettingsController.php +++ b/www/web-proxy-useracl/src/opnsense/mvc/app/controllers/OPNsense/ProxyUserACL/Api/SettingsController.php @@ -42,8 +42,8 @@ */ class SettingsController extends ApiMutableModelControllerBase { - static protected $internalModelName = 'proxyuseracl'; - static protected $internalModelClass = '\OPNsense\ProxyUserACL\ProxyUserACL'; + protected static $internalModelName = 'proxyuseracl'; + protected static $internalModelClass = '\OPNsense\ProxyUserACL\ProxyUserACL'; /** *