From dd2aa4901ad60ea3daf51f6bd10c5b757697e8de Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 14 Oct 2015 11:01:51 +0200
Subject: [PATCH] (captiveportal, new) add allowedMACAddresses to model and
 form

---
 .../OPNsense/CaptivePortal/forms/dialogZone.xml        | 10 ++++++++++
 .../models/OPNsense/CaptivePortal/CaptivePortal.xml    |  6 ++++++
 2 files changed, 16 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 6826b4564..5665bd853 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/forms/dialogZone.xml
@@ -65,6 +65,16 @@
         <help><![CDATA[Avoid authentication for the addresses and subnets in this list]]></help>
         <allownew>true</allownew>
     </field>
+    <field>
+        <id>zone.allowedMACAddresses</id>
+        <label>allowed MAC addresses</label>
+        <type>text</type>
+        <type>select_multiple</type>
+        <style>tokenize</style>
+        <help><![CDATA[Avoid authentication for the physical addresses in this list]]></help>
+        <allownew>true</allownew>
+        <advanced>true</advanced>
+    </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 7020d6cae..965804f89 100644
--- a/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
@@ -60,7 +60,13 @@
                 <allowedAddresses type="CSVListField">
                     <Required>N</Required>
                     <mask>/^([\/0-9.,])*/u</mask>
+                    <ValidationMessage>Please enter valid addresses</ValidationMessage>
                 </allowedAddresses>
+                <allowedMACAddresses type="CSVListField">
+                    <Required>N</Required>
+                    <mask>/^([0-9a-fA-F:,])*/u</mask>
+                    <ValidationMessage>Please enter valid mac addresses</ValidationMessage>
+                </allowedMACAddresses>
                 <description type="TextField">
                     <Required>Y</Required>
                     <mask>/^([\t\n\v\f\r 0-9a-zA-Z.,_\x{00A0}-\x{FFFF}]){1,255}$/u</mask>