* luci/app/chillispot: replace macauth with generalized auth cbi model

diff --git a/applications/luci-chillispot/luasrc/model/cbi/chillispot_macauth.lua b/applications/luci-chillispot/luasrc/model/cbi/chillispot_auth.lua
similarity index 79%
rename from applications/luci-chillispot/luasrc/model/cbi/chillispot_macauth.lua
rename to applications/luci-chillispot/luasrc/model/cbi/chillispot_auth.lua
index b042911b633279bca3f011e806f31bc0ef876147..8f033f070e68360c2ed4ac90da30cff841a68624 100644 (file)
--- a/applications/luci-chillispot/luasrc/model/cbi/chillispot_macauth.lua
+++ b/applications/luci-chillispot/luasrc/model/cbi/chillispot_auth.lua
@@ -53,24 +53,24 @@ s1:option( Value, "nasmac" ).optional = true
 s1:option( Value, "wwwdir" ).optional = true
 s1:option( Value, "wwwbin" ).optional = true
 
-s:option( Value, "localusers" ).optional = true
-s:option( Value, "postauthproxy" ).optional = true
-s:option( Value, "postauthproxyport" ).optional = true
-s:option( Value, "locationname" ).optional = true
+s1:option( Value, "localusers" ).optional = true
+s1:option( Value, "postauthproxy" ).optional = true
+s1:option( Value, "postauthproxyport" ).optional = true
+s1:option( Value, "locationname" ).optional = true
 
 
 -- mac authentication
-s = m:section(TypedSection, "macauth")
-s.anonymous = true
+s2 = m:section(TypedSection, "macauth")
+s2.anonymous = true
 
-s:option( Flag, "macauth" )
-s:option( Flag, "macallowlocal" )
-s:option( DynamicList, "macallowed" )
+s2:option( Flag, "macauth" )
+s2:option( Flag, "macallowlocal" )
+s2:option( DynamicList, "macallowed" )
 
-pw = s:option( Value, "macpasswd" )
+pw = s2:option( Value, "macpasswd" )
 pw.optional = true
 pw.password = true
 
-s:option( Value, "macsuffix" ).optional = true
+s2:option( Value, "macsuffix" ).optional = true
 
 return m