diff --git a/src/etc/inc/plugins.inc.d/captiveportal.inc b/src/etc/inc/plugins.inc.d/captiveportal.inc index 92819a696..b2638d4fb 100644 --- a/src/etc/inc/plugins.inc.d/captiveportal.inc +++ b/src/etc/inc/plugins.inc.d/captiveportal.inc @@ -130,7 +130,7 @@ function captiveportal_firewall($fw) ); // Allow access to the captive portal - $proto = $to_port === '443' ? 'https': 'http'; + $proto = $to_port === '443' ? 'https' : 'http'; $fw->registerFilterRule( 2, [ diff --git a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/AccessController.php b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/AccessController.php index db16d10d0..8fe0f6aff 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/AccessController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/AccessController.php @@ -299,8 +299,10 @@ class AccessController extends ApiControllerBase */ public function apiAction() { - if ($this->request->isGet() && - $this->request->getHeader("accept") == "application/captive+json") { + if ( + $this->request->isGet() && + $this->request->getHeader("accept") == "application/captive+json" + ) { $result = []; $zoneId = $this->request->getHeader("zoneid"); $clientSession = $this->clientSession($zoneId); diff --git a/src/opnsense/mvc/app/library/OPNsense/Firewall/Plugin.php b/src/opnsense/mvc/app/library/OPNsense/Firewall/Plugin.php index 4d74a6edd..1d73d5dcf 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Firewall/Plugin.php +++ b/src/opnsense/mvc/app/library/OPNsense/Firewall/Plugin.php @@ -240,7 +240,7 @@ class Plugin $result .= " quick"; } if (!empty($anchor['ifs'])) { - $ifs = array_filter(array_map(function($if) { + $ifs = array_filter(array_map(function ($if) { return $this->interfaceMapping[$if]['if'] ?? null; }, explode(',', $anchor['ifs']))); diff --git a/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/css/bootstrap-theme.min.css b/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/css/bootstrap-theme.min.css old mode 100644 new mode 100755 diff --git a/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/css/bootstrap.min.css b/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/css/bootstrap.min.css old mode 100644 new mode 100755 diff --git a/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/css/signin.css b/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/css/signin.css old mode 100644 new mode 100755 diff --git a/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/exclude.list b/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/exclude.list old mode 100644 new mode 100755 diff --git a/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.eot b/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.eot old mode 100644 new mode 100755 diff --git a/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.svg b/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.svg old mode 100644 new mode 100755 diff --git a/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.ttf b/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.ttf old mode 100644 new mode 100755 diff --git a/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.woff b/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.woff old mode 100644 new mode 100755 diff --git a/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.woff2 b/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/fonts/glyphicons-halflings-regular.woff2 old mode 100644 new mode 100755 diff --git a/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/images/default-logo.svg b/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/images/default-logo.svg old mode 100644 new mode 100755 diff --git a/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/images/favicon.png b/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/images/favicon.png old mode 100644 new mode 100755 diff --git a/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/index.html b/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/index.html old mode 100644 new mode 100755 diff --git a/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/js/bootstrap.min.js b/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/js/bootstrap.min.js old mode 100644 new mode 100755 diff --git a/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/js/jquery-1.11.2.min.js b/src/opnsense/scripts/OPNsense/CaptivePortal/htdocs_default/js/jquery-1.11.2.min.js old mode 100644 new mode 100755 diff --git a/src/opnsense/scripts/OPNsense/CaptivePortal/lib/pf.py b/src/opnsense/scripts/OPNsense/CaptivePortal/lib/pf.py old mode 100644 new mode 100755 diff --git a/src/opnsense/scripts/OPNsense/CaptivePortal/sql/init.sql b/src/opnsense/scripts/OPNsense/CaptivePortal/sql/init.sql old mode 100644 new mode 100755