From 12bcf31ddda26f90a563bf6b9af0ff1983a44bb5 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Tue, 13 Oct 2015 21:49:04 +0200
Subject: [PATCH] (captiveportal, new) add list of allowed Addresses to model
 and form

---
 .../OPNsense/CaptivePortal/forms/dialogZone.xml          | 9 +++++++++
 .../app/models/OPNsense/CaptivePortal/CaptivePortal.xml  | 4 ++++
 2 files changed, 13 insertions(+)

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 8c1900690..6826b4564 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml
@@ -56,6 +56,15 @@
         <type>text</type>
         <help><![CDATA[Hostname (of this machine) to redirect login page to, leave blank to use this interface IP address, otherwise make sure the client can access DNS to resolve this location. When using a SSL certificate, make sure both this name and the cert name are equal.]]></help>
     </field>
+    <field>
+        <id>zone.allowedAddresses</id>
+        <label>allowed addresses</label>
+        <type>text</type>
+        <type>select_multiple</type>
+        <style>tokenize</style>
+        <help><![CDATA[Avoid authentication for the addresses and subnets in this list]]></help>
+        <allownew>true</allownew>
+    </field>
     <field>
         <id>zone.description</id>
         <label>description</label>
diff --git a/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml b/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
index 6366916dc..7020d6cae 100644
--- a/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
@@ -57,6 +57,10 @@
                     <mask>/^([0-9a-zA-Z.,_\-]){0,1024}$/u</mask>
                     <ValidationMessage>Please enter a valid servername, ip address or leave this option blank</ValidationMessage>
                 </servername>
+                <allowedAddresses type="CSVListField">
+                    <Required>N</Required>
+                    <mask>/^([\/0-9.,])*/u</mask>
+                </allowedAddresses>
                 <description type="TextField">
                     <Required>Y</Required>
                     <mask>/^([\t\n\v\f\r 0-9a-zA-Z.,_\x{00A0}-\x{FFFF}]){1,255}$/u</mask>