From 797fd6ff7b267fbdabb962567dccf494f60c1d7c Mon Sep 17 00:00:00 2001
From: Michael Steenbeek <42928941+MichaelDeciso@users.noreply.github.com>
Date: Mon, 3 Dec 2018 13:39:49 +0100
Subject: [PATCH] Implement #2689: Add setting to always send accounting
 requests (#2996)

---
 .../OPNsense/CaptivePortal/Api/AccessController.php         | 4 ++--
 .../controllers/OPNsense/CaptivePortal/forms/dialogZone.xml | 6 ++++++
 .../mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml | 4 ++++
 3 files changed, 12 insertions(+), 2 deletions(-)

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 3391ebc9d..bb02da873 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/AccessController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/AccessController.php
@@ -193,12 +193,12 @@ class AccessController extends ApiControllerBase
                             $authProps = $authServer->getLastAuthProperties();
                             // when adding more client/session restrictions, extend next code
                             // (currently only time is restricted)
-                            if (array_key_exists('session_timeout', $authProps)) {
+                            if (array_key_exists('session_timeout', $authProps) || $cpZone->alwaysSendAccountingReqs == '1') {
                                 $backend->configdpRun(
                                     "captiveportal set session_restrictions",
                                     array((string)$cpZone->zoneid,
                                         $CPsession['sessionId'],
-                                        $authProps['session_timeout']
+                                        $authProps['session_timeout'] ?? null,
                                         )
                                 );
                             }
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml
index 0ead0f59e..5248b9b4f 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml
@@ -24,6 +24,12 @@
         <type>select_multiple</type>
         <help><![CDATA[Select authentication methods to use, leave empty for no authentication needed.]]></help>
     </field>
+    <field>
+        <id>zone.alwaysSendAccountingReqs</id>
+        <label>Always send accounting requests</label>
+        <type>checkbox</type>
+        <help><![CDATA[This will make the captive portal always send accounting requests, rather than just when there is a need for accounting (e.g. when there is a daily session limit).]]></help>
+    </field>
     <field>
         <id>zone.authEnforceGroup</id>
         <label>Enforce local group</label>
diff --git a/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml b/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
index ae400c21a..04f9ea474 100644
--- a/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
@@ -31,6 +31,10 @@
                     <multiple>Y</multiple>
                     <default>Local Database</default>
                 </authservers>
+                <alwaysSendAccountingReqs type="BooleanField">
+                    <default>0</default>
+                    <Required>Y</Required>
+                </alwaysSendAccountingReqs>
                 <authEnforceGroup type="AuthGroupField">
                     <Required>N</Required>
                 </authEnforceGroup>