lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 01:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

src: style and whitespace sweep

Browse Source
This commit is contained in:
Franco Fichtner 2021-05-19 15:21:56 +02:00
parent 2ba6da4eef
commit 06e1c552d9
13 changed files with 14253 additions and 14252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/etc/inc/plugins.inc.d/ipsec.inc
View File

@ -1536,7 +1536,7 @@ function ipsec_configure_do($verbose = false, $interface = '')
$inactivityline = '';
}
if (!empty($ph1ent['keyingtries'])) {
$keyingtriesline = "keyingtries = " ;
$keyingtriesline = "keyingtries = ";
$keyingtriesline .= $ph1ent['keyingtries'] == -1 ? "%forever" : $ph1ent['keyingtries'];
} else {
$keyingtriesline = '';

2
src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/LogController.php
View File

@ -45,7 +45,7 @@ class LogController extends ApiControllerBase
$searchPhrase = '';
// create filter to sanitize input data
$filter = new Filter([
'query' => function($value){
'query' => function ($value) {
return preg_replace("/[^0-9,a-z,A-Z, ,*,\-,_,.,\#]/", "", $value);
}
]);

6
src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/LvtemplateController.php
View File

@ -44,7 +44,10 @@ class LvtemplateController extends ApiMutableModelControllerBase
{
return $this->searchBase(
"templates.template",
array('name', 'filters', 'or'), "name", null, SORT_NATURAL|SORT_FLAG_CASE
array('name', 'filters', 'or'),
"name",
null,
SORT_NATURAL | SORT_FLAG_CASE
);
}
@ -67,5 +70,4 @@ class LvtemplateController extends ApiMutableModelControllerBase
{
return $this->delBase("templates.template", $uuid);
}
}

2
src/opnsense/mvc/app/controllers/OPNsense/IDS/Api/ServiceController.php
View File

@ -174,7 +174,7 @@ class ServiceController extends ApiMutableServiceControllerBase
$this->sessionClose();
// create filter to sanitize input data
$filter = new Filter([
'query' => function($value){
'query' => function ($value) {
return preg_replace("/[^0-9,a-z,A-Z, ,*,\-,_,.,\#]/", "", $value);
}
]);

2
src/opnsense/mvc/app/controllers/OPNsense/IDS/Api/SettingsController.php
View File

@ -71,7 +71,7 @@ class SettingsController extends ApiMutableModelControllerBase
$this->sessionClose();
// create filter to sanitize input data
$filter = (new FilterFactory())->newInstance();
$filter->set('query', function($value){
$filter->set('query', function ($value) {
return preg_replace("/[^0-9,a-z,A-Z, ,*,\-,_,.,\#]/", "", $value);
});

1
src/opnsense/mvc/app/library/OPNsense/Auth/Base.php
View File

@ -161,5 +161,4 @@ abstract class Base
{
return $this->lastAuthErrors;
}
}

2
src/opnsense/mvc/app/library/OPNsense/Core/Config.php
View File

@ -466,7 +466,7 @@ class Config extends Singleton
/**
* send config change to audit log including the context we currently know of.
*/
private function auditLogChange($backup_filename, $revision=null)
private function auditLogChange($backup_filename, $revision = null)
{
openlog("audit", LOG_ODELAY, LOG_AUTH);
$append_message = "";

2
src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php
View File

@ -123,7 +123,7 @@ class FilterRule extends Rule
// reply-to gateway set, when found map to reply attribute, otherwise skip keyword
if (!empty($this->gatewayMapping[$rule['reply-to']])) {
$if = $this->gatewayMapping[$rule['reply-to']]['interface'];
if (!empty($this->gatewayMapping[$rule['reply-to']]['gateway'])){
if (!empty($this->gatewayMapping[$rule['reply-to']]['gateway'])) {
$gw = $this->gatewayMapping[$rule['reply-to']]['gateway'];
$rule['reply'] = "reply-to ( {$if} {$gw} ) ";
} else {

22
src/opnsense/mvc/app/library/OPNsense/Firewall/Util.php
View File

@ -86,17 +86,17 @@ class Util
*/
public static function isWildcard($network)
{
$tmp = explode('/', $network);
if (count($tmp) == 2) {
if (self::isIpAddress($tmp[0]) && self::isIpAddress($tmp[1])) {
if (strpos($tmp[0], ':') !== false && strpos($tmp[1], ':') !== false) {
return true;
} elseif (strpos($tmp[0], ':') === false && strpos($tmp[1], ':') === false) {
return true;
}
}
}
return false;
$tmp = explode('/', $network);
if (count($tmp) == 2) {
if (self::isIpAddress($tmp[0]) && self::isIpAddress($tmp[1])) {
if (strpos($tmp[0], ':') !== false && strpos($tmp[1], ':') !== false) {
return true;
} elseif (strpos($tmp[0], ':') === false && strpos($tmp[1], ':') === false) {
return true;
}
}
}
return false;
}
/**

2
src/opnsense/mvc/app/models/OPNsense/Core/Migrations/M1_0_0.php
View File

@ -41,7 +41,7 @@ class M1_0_0 extends BaseModelMigration
public function run($model)
{
if ((empty((string)$model->type) || (string)$model->type == "devel") && !empty((string)$model->mirror) ) {
if ((empty((string)$model->type) || (string)$model->type == "devel") && !empty((string)$model->mirror)) {
$is_business = stripos((string)$model->mirror, "opnsense-update.deciso.com") > 1;
if ($is_business) {
$model->type = "business";

2
src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/AliasContentField.php
View File

@ -235,7 +235,7 @@ class AliasContentField extends BaseField
{
$messages = array();
foreach ($this->getItems($data) as $pnetwork) {
if (!Util::isSubnet("0000".$pnetwork)) {
if (!Util::isSubnet("0000" . $pnetwork)) {
$messages[] = sprintf(
gettext('Entry "%s" is not a valid partial ipv6 net definition (e.g. ::1000/64).'),
$pnetwork

28458
src/opnsense/www/js/chart.js
View File

File diff suppressed because it is too large Load Diff

2
src/www/status_dhcpv6_leases.php
View File

@ -293,7 +293,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
continue;
}
$slease = [];
$slease['ip'] = $static['ipaddrv6'];
$slease['ip'] = Net_IPv6::compress($static['ipaddrv6']);
$slease['if'] = $static['interface'];
$slease['type'] = 'static';
$slease['duid'] = $static['duid'];