lucaspalomodevelop/opnsense-core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/opnsense-core.git synced 2026-03-13 00:07:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

openvpn: style sweep

Browse Source
This commit is contained in:
Franco Fichtner 2023-04-12 08:03:01 +02:00
parent 011f1eebe4
commit 5835eedf37
6 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/Api/ClientOverwritesController.php
View File

@ -30,7 +30,6 @@ namespace OPNsense\OpenVPN\Api;
use OPNsense\Base\ApiMutableModelControllerBase;
/**
* Class ClientOverwritesController
* @package OPNsense\OpenVPN\Api
@ -67,4 +66,4 @@ class ClientOverwritesController extends ApiMutableModelControllerBase
{
return $this->toggleBase('Overwrites.Overwrite', $uuid, $enabled);
}
}
}

2
src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/forms/dialogCSO.xml
View File

@ -145,4 +145,4 @@
Set primary WINS server address (NetBIOS over TCP/IP Name Server). Repeat this option to set secondary WINS server addresses.
</help>
</field>
</fields>
</fields>

1
src/opnsense/mvc/app/models/OPNsense/OpenVPN/FieldTypes/OpenVPNServerField.php
View File

@ -31,7 +31,6 @@ namespace OPNsense\OpenVPN\FieldTypes;
use OPNsense\Base\FieldTypes\BaseListField;
use OPNsense\Core\Config;
/**
* @package OPNsense\Base\FieldTypes
*/

7
src/opnsense/mvc/app/models/OPNsense/OpenVPN/Migrations/M1_0_0.php
View File

@ -35,7 +35,6 @@ use OPNsense\Base\BaseModelMigration;
use OPNsense\OpenVPN\OpenVPN;
use OPNsense\Firewall\Util;
class M1_0_0 extends BaseModelMigration
{
/**
@ -78,7 +77,7 @@ class M1_0_0 extends BaseModelMigration
$nets[] = trim($item);
}
}
$record->{$type.'_networks'} = implode(',', $nets);
$record->{$type . '_networks'} = implode(',', $nets);
}
if (!empty((string)$csc->gwredir)) {
$record->redirect_gateway = 'def1';
@ -89,9 +88,9 @@ class M1_0_0 extends BaseModelMigration
$record->dns_domain_search = (string)$csc->dns_domain_search;
foreach (['dns_server', 'ntp_server', 'wins_server'] as $fieldname) {
$items = [];
for ($i=1 ; $i <= 4; ++$i) {
for ($i = 1; $i <= 4; ++$i) {
$fname = $fieldname . $i;
if (!empty((string)$csc->$fname)){
if (!empty((string)$csc->$fname)) {
$items[] = (string)$csc->$fname;
}
}

8
src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.php
View File

@ -60,7 +60,7 @@ class OpenVPN extends BaseModel
foreach (['local', 'remote'] as $type) {
$f1 = $type . '_network';
$f2 = $type . '_networkv6';
foreach (explode(',', (string)$cso->{$type.'_networks'}) as $item) {
foreach (explode(',', (string)$cso->{$type . '_networks'}) as $item) {
if (strpos($item, ":") === false) {
$target_fieldname = $f1;
} else {
@ -73,10 +73,10 @@ class OpenVPN extends BaseModel
}
}
}
if (!empty((string)$cso->push_reset)){
if (!empty((string)$cso->push_reset)) {
$result['push_reset'] = '1';
}
if (!empty((string)$cso->block)){
if (!empty((string)$cso->block)) {
$result['block'] = '1';
}
$result['dns_domain'] = (string)$cso->dns_domain;
@ -84,7 +84,7 @@ class OpenVPN extends BaseModel
foreach (['dns_server', 'ntp_server', 'wins_server'] as $fieldname) {
if (!empty((string)$cso->$fieldname . 's')) {
foreach (explode(',', (string)$cso->{$fieldname . 's'}) as $idx => $item) {
$result[$fieldname. (string)($idx+1)] = $item;
$result[$fieldname . (string)($idx + 1)] = $item;
}
}
}

2
src/opnsense/mvc/app/views/OPNsense/OpenVPN/cso.volt
View File

@ -94,4 +94,4 @@
</div>
</div>
{{ partial("layout_partials/base_dialog",['fields':formDialogCSO,'id':'DialogCSO','label':lang._('Edit CSO')])}}
{{ partial("layout_partials/base_dialog",['fields':formDialogCSO,'id':'DialogCSO','label':lang._('Edit CSO')])}}