1 files changed, 35 insertions, 30 deletions
diff --git a/applications/luci-chillispot/luasrc/model/cbi/chillispot_radius.lua b/applications/luci-chillispot/luasrc/model/cbi/chillispot_radius.lua
index 8b7ba59b4..568c92f83 100644
--- a/applications/luci-chillispot/luasrc/model/cbi/chillispot_radius.lua
+++ b/applications/luci-chillispot/luasrc/model/cbi/chillispot_radius.lua
@@ -16,48 +16,53 @@ $Id$
 
 m = Map("chillispot")
 
-
--- uam config
-s1 = m:section(TypedSection, "uam")
+-- radius server
+s1 = m:section(TypedSection, "radius")
 s1.anonymous = true
 
-s1:option( Value, "uamserver" )
-s1:option( Value, "uamsecret" ).password = true
-s1:option( Flag, "uamanydns" )
-s1:option( Value, "uamhomepage" ).optional = true
-s1:option( Value, "uamlisten" ).optional = true
-s1:option( Value, "uamport" ).optional = true
-s1:option( DynamicList, "uamallowed" ).optional = true
+s1:option( Value, "radiusserver1" )
+s1:option( Value, "radiusserver2" )
+s1:option( Value, "radiussecret" ).password = true
 
+s1:option( Value, "radiuslisten" ).optional = true
+s1:option( Value, "radiusauthport" ).optional = true
+s1:option( Value, "radiusacctport" ).optional = true
 
--- radius server
-s2 = m:section(TypedSection, "radius")
-s2.anonymous = true
+s1:option( Value, "radiusnasid" ).optional = true
+s1:option( Value, "radiusnasip" ).optional = true
 
-s2:option( Value, "radiusserver1" )
-s2:option( Value, "radiusserver2" )
-s2:option( Value, "radiussecret" ).password = true
+s1:option( Value, "radiuscalled" ).optional = true
+s1:option( Value, "radiuslocationid" ).optional = true
+s1:option( Value, "radiuslocationname" ).optional = true
 
-s2:option( Value, "radiuslisten" ).optional = true
-s2:option( Value, "radiusauthport" ).optional = true
-s2:option( Value, "radiusacctport" ).optional = true
+s1:option( Value, "radiusnasporttype" ).optional = true
 
-s2:option( Value, "radiusnasid" ).optional = true
-s2:option( Value, "radiusnasip" ).optional = true
+s1:option( Flag, "radiusoriginalurl" )
 
-s2:option( Value, "radiuscalled" ).optional = true
-s2:option( Value, "radiuslocationid" ).optional = true
-s2:option( Value, "radiuslocationname" ).optional = true
+s1:option( Value, "adminuser" ).optional = true
+rs = s1:option( Value, "adminpassword" )
+rs.optional = true
+rs.password = true
+
+s1:option( Flag, "swapoctets" )
+s1:option( Flag, "openidauth" )
+s1:option( Flag, "wpaguests" )
+s1:option( Flag, "acctupdate" )
+
+s1:option( Value, "coaport" ).optional = true
+s1:option( Flag, "coanoipcheck" )
+
+s1:option( Flag, "eapolenable" ).optional = true
 
 
 -- radius proxy
-s3 = m:section(TypedSection, "proxy")
-s3.anonymous = true
+s2 = m:section(TypedSection, "proxy")
+s2.anonymous = true
 
-s3:option( Value, "proxylisten" ).optional = true
-s3:option( Value, "proxyport" ).optional = true
-s3:option( Value, "proxyclient" ).optional = true
-ps = s3:option( Value, "proxysecret" )
+s2:option( Value, "proxylisten" ).optional = true
+s2:option( Value, "proxyport" ).optional = true
+s2:option( Value, "proxyclient" ).optional = true
+ps = s2:option( Value, "proxysecret" )
 ps.optional = true
 ps.password = true