From 83ef7e06879f2fc0b7b00c309a262b9057afa7c6 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 15 Nov 2022 08:55:50 +0100 Subject: [PATCH] net/freeradius: style updates --- net/freeradius/Makefile | 2 +- net/freeradius/pkg-descr | 1 + .../controllers/OPNsense/Freeradius/Api/ProxyController.php | 2 +- .../app/controllers/OPNsense/Freeradius/ProxyController.php | 2 +- .../Freeradius/forms/dialogEditFreeRADIUSHomeserver.xml | 2 +- .../Freeradius/forms/dialogEditFreeRADIUSHomeserverpool.xml | 2 +- .../OPNsense/Freeradius/forms/dialogEditFreeRADIUSRealm.xml | 2 +- .../mvc/app/controllers/OPNsense/Freeradius/forms/ldap.xml | 2 +- .../opnsense/mvc/app/models/OPNsense/Freeradius/Ldap.xml | 2 +- .../mvc/app/models/OPNsense/Freeradius/Menu/Menu.xml | 2 +- .../opnsense/mvc/app/models/OPNsense/Freeradius/Proxy.php | 3 +-- .../opnsense/mvc/app/models/OPNsense/Freeradius/Proxy.xml | 2 +- .../opnsense/mvc/app/views/OPNsense/Freeradius/proxy.volt | 6 +++--- .../service/templates/OPNsense/Freeradius/proxy.conf | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index 0d9e54433..0d7330d4f 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -4,4 +4,4 @@ PLUGIN_COMMENT= RADIUS Authentication, Authorization and Accounting Server PLUGIN_DEPENDS= freeradius3 PLUGIN_MAINTAINER= m.muenz@gmail.com -.include "../../Mk/plugins.mk" \ No newline at end of file +.include "../../Mk/plugins.mk" diff --git a/net/freeradius/pkg-descr b/net/freeradius/pkg-descr index 98dabe097..beae3fa10 100644 --- a/net/freeradius/pkg-descr +++ b/net/freeradius/pkg-descr @@ -14,6 +14,7 @@ The server is fast, feature-rich, modular, and scalable. Plugin Changelog ================ + 1.9.22 * Add Proxy configuration page: HomeServer, HomeServerPool, Realm diff --git a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/Api/ProxyController.php b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/Api/ProxyController.php index 24baa94c6..d19ac612b 100644 --- a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/Api/ProxyController.php +++ b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/Api/ProxyController.php @@ -406,4 +406,4 @@ class ProxyController extends ApiMutableModelControllerBase { return $this->toggle_handler($uuid, 'homeserverpools', 'homeserverpool'); } -} \ No newline at end of file +} diff --git a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/ProxyController.php b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/ProxyController.php index a117df243..0c359a0ac 100644 --- a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/ProxyController.php +++ b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/ProxyController.php @@ -37,4 +37,4 @@ class ProxyController extends \OPNsense\Base\IndexController $this->view->formDialogEditFreeRADIUSRealm = $this->getForm("dialogEditFreeRADIUSRealm"); $this->view->pick('OPNsense/Freeradius/proxy'); } -} \ No newline at end of file +} diff --git a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/dialogEditFreeRADIUSHomeserver.xml b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/dialogEditFreeRADIUSHomeserver.xml index dc4db8680..0d73339ef 100644 --- a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/dialogEditFreeRADIUSHomeserver.xml +++ b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/dialogEditFreeRADIUSHomeserver.xml @@ -137,4 +137,4 @@ text The idle timeout, in seconds, of a TCP connection. Setting this to 0 means "no timeout". - \ No newline at end of file + diff --git a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/dialogEditFreeRADIUSHomeserverpool.xml b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/dialogEditFreeRADIUSHomeserverpool.xml index b96dd32c4..86f8ebac7 100644 --- a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/dialogEditFreeRADIUSHomeserverpool.xml +++ b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/dialogEditFreeRADIUSHomeserverpool.xml @@ -37,4 +37,4 @@ text If ALL home servers are dead, then this "fallback" home server is used. - \ No newline at end of file + diff --git a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/dialogEditFreeRADIUSRealm.xml b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/dialogEditFreeRADIUSRealm.xml index 5a682b543..1e829d489 100644 --- a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/dialogEditFreeRADIUSRealm.xml +++ b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/dialogEditFreeRADIUSRealm.xml @@ -29,4 +29,4 @@ checkbox Normally, when an incoming User-Name is matched against the realm, the realm name is "stripped" off, and the "stripped" user name is used to perform matches. - \ No newline at end of file + diff --git a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/ldap.xml b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/ldap.xml index 46bbb3613..be7d1affd 100644 --- a/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/ldap.xml +++ b/net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/ldap.xml @@ -65,4 +65,4 @@ text Filter for group objects, should match all available group objects a user might be a member of. - \ No newline at end of file + diff --git a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Ldap.xml b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Ldap.xml index 7ca43fdba..0ee417c47 100644 --- a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Ldap.xml +++ b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Ldap.xml @@ -48,4 +48,4 @@ N - \ No newline at end of file + diff --git a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Menu/Menu.xml b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Menu/Menu.xml index 979d54e3e..d74274127 100644 --- a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Menu/Menu.xml +++ b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Menu/Menu.xml @@ -8,7 +8,7 @@ - + diff --git a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Proxy.php b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Proxy.php index 40ccc778b..84b6570a7 100644 --- a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Proxy.php +++ b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Proxy.php @@ -5,7 +5,6 @@ namespace OPNsense\Freeradius; use OPNsense\Base\BaseModel; use OPNsense\Core\Backend; - class Proxy extends BaseModel { /** @@ -19,4 +18,4 @@ class Proxy extends BaseModel } return false; } -} \ No newline at end of file +} diff --git a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Proxy.xml b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Proxy.xml index 9eddba73d..14256fc17 100644 --- a/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Proxy.xml +++ b/net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Proxy.xml @@ -188,4 +188,4 @@ - \ No newline at end of file + diff --git a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/proxy.volt b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/proxy.volt index a68126faf..a4bf2d198 100644 --- a/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/proxy.volt +++ b/net/freeradius/src/opnsense/mvc/app/views/OPNsense/Freeradius/proxy.volt @@ -182,7 +182,7 @@ $( document ).ready(function() { {{ lang._('Enabled') }} {{ lang._('Name') }} {{ lang._('Type') }} - {{ lang._('Virtual Server') }} + {{ lang._('Virtual Server') }} {{ lang._('Commands') }} @@ -198,7 +198,7 @@ $( document ).ready(function() { - +
@@ -234,4 +234,4 @@ $( document ).ready(function() { {# include dialogs #} {{ partial("layout_partials/base_dialog",['fields':formDialogEditFreeRADIUSHomeserver,'id':'dialogEditFreeRADIUSHomeserver','label':lang._('Edit Homeservers')])}} {{ partial("layout_partials/base_dialog",['fields':formDialogEditFreeRADIUSHomeserverpool,'id':'dialogEditFreeRADIUSHomeserverpool','label':lang._('Edit Homeserverpools')])}} -{{ partial("layout_partials/base_dialog",['fields':formDialogEditFreeRADIUSRealm,'id':'dialogEditFreeRADIUSRealm','label':lang._('Edit Realms')])}} \ No newline at end of file +{{ partial("layout_partials/base_dialog",['fields':formDialogEditFreeRADIUSRealm,'id':'dialogEditFreeRADIUSRealm','label':lang._('Edit Realms')])}} diff --git a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/proxy.conf b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/proxy.conf index 51234474f..770129bcb 100644 --- a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/proxy.conf +++ b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/proxy.conf @@ -123,4 +123,4 @@ realm {{ realm_list.name }} { {% else %} realm LOCAL { } -{% endif %} \ No newline at end of file +{% endif %}