Skip to content

Commit

Permalink
src: style sweep
Browse files Browse the repository at this point in the history
  • Loading branch information
fichtner committed Jan 14, 2019
1 parent 39b8dd4 commit 4ff0260
Show file tree
Hide file tree
Showing 88 changed files with 219 additions and 219 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down
Loading

0 comments on commit 4ff0260

Please sign in to comment.