Changeset 423

Timestamp:

10/09/2007 17:43:56 (11 months ago)

Author:

nextime

Message:

--

Files:

• wrt/whiterussian/packages/webifmdx-hotspot/tags/mercury/MDXBUILD (modified) (1 diff)
• wrt/whiterussian/packages/webifmdx-hotspot/tags/mercury/Makefile (modified) (1 diff)
• wrt/whiterussian/packages/webifmdx-hotspot/tags/mercury/files/bin/save_hotspot (modified) (1 diff)
• wrt/whiterussian/packages/webifmdx-hotspot/tags/mercury/files/www/cgi-bin/webifmdx/hotspot-captive.sh (modified) (4 diffs)
• wrt/whiterussian/packages/webifmdx-hotspot/trunk/MDXBUILD (modified) (1 diff)
• wrt/whiterussian/packages/webifmdx-hotspot/trunk/Makefile (modified) (1 diff)
• wrt/whiterussian/packages/webifmdx-hotspot/trunk/files/bin/save_hotspot (modified) (1 diff)
• wrt/whiterussian/packages/webifmdx-hotspot/trunk/files/www/cgi-bin/webifmdx/hotspot-captive.sh (modified) (4 diffs)

wrt/whiterussian/packages/webifmdx-hotspot/tags/mercury/MDXBUILD

@@ -1 @@
-
+

wrt/whiterussian/packages/webifmdx-hotspot/tags/mercury/Makefile

@@ -5 +5 @@
-PKG_NAME:=webifmdx-hotspot
-PKG_VERSION:=0.1
-3
+4
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

wrt/whiterussian/packages/webifmdx-hotspot/tags/mercury/files/bin/save_hotspot

@@ -8 +8 @@
-nvram show 2>/dev/null | sed '/^chilli_/!d; s/^chilli_//;' | awk -F '=' '
-BEGIN {
-
+|macallowlocal
-        print "# this file is automatically generated"
-}

wrt/whiterussian/packages/webifmdx-hotspot/tags/mercury/files/www/cgi-bin/webifmdx/hotspot-captive.sh

@@ -12 +12 @@
-        FORM_chilli_uamanydns="${chilli_uamanydns:-$(nvram get chilli_uamanydns)}"
-        FORM_chilli_macauth="${chilli_macauth:-$(nvram get chilli_macauth)}"
+   FORM_chilli_macallowlocal="${chilli_macallowlocal:-$(nvram get chilli_macallowlocal)}"
-        FORM_chilli_macallowed="${chilli_macallowed:-$(nvram get chilli_macallowed)}"
-        FORM_chilli_macpasswd="${chilli_macpasswd:-$(nvram get chilli_macpasswd)}"
@@ -26 +27 @@
-int|FORM_chilli_uamanydns|@TR<<hotspot_captive_UAM_Any_DNS#UAM Any DNS>>||$FORM_chilli_uamanydns
-int|FORM_chilli_macauth|@TR<<hotspot_captive_MAC_Auth#MAC Authentication>>||$FORM_chilli_macauth
+int|FORM_chilli_macallowlocal|@TR<<hotspot_captive_MAC_AllowLocal#MAC Local Auth>>||$FORM_chilli_macallowlocal
-string|FORM_chilli_macallowed|@TR<<hotspot_captive_MAC_Allowed#MAC Allowed>>||$FORM_chilli_macallowed
-string|FORM_chilli_macpasswd|@TR<<hotspot_captive_MAC_Password#MAC Password>>||$FORM_chilli_macpasswd
@@ -40 +42 @@
-                        save_setting hotspot chilli_macallowed "$FORM_chilli_macallowed"
-                        save_setting hotspot chilli_macauth "$FORM_chilli_macauth"
+         save_setting hotspot chilli_macallowlocal "$FORM_chilli_macallowlocal"
-                        save_setting hotspot chilli_macsuffix "$FORM_chilli_macsuffix"
-                        save_setting hotspot chilli_macpasswd "$FORM_chilli_macpasswd"
@@ -82 +85 @@
-helptext|hotspot_captive_MAC_Auth_helptext#If enabled, users will be authenticated only based on their MAC Address.
-field|@TR<<hotspot_captive_MAC_Allowed#MAC Allowed>>
+checkbox|chilli_macallowlocal|$FORM_chilli_macallowlocal|1
+helpitem|hotspot_captive_MAC_AllowLocal#MAC Local Auth
+helptext|hotspot_captive_MAC_AllowLocal_helptext#If enabled local auth on mac address is performed.
+field|@TR<<hotspot_captive_MAC_Allowed#MAC Allowed>>
-text|chilli_macallowed|$FORM_chilli_macallowed
-helpitem|hotspot_captive_MAC_Allowed#MAC Allowed

wrt/whiterussian/packages/webifmdx-hotspot/trunk/MDXBUILD

@@ -1 @@
-
+

wrt/whiterussian/packages/webifmdx-hotspot/trunk/Makefile

@@ -5 +5 @@
-PKG_NAME:=webifmdx-hotspot
-PKG_VERSION:=0.1
-3
+4
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

wrt/whiterussian/packages/webifmdx-hotspot/trunk/files/bin/save_hotspot

@@ -8 +8 @@
-nvram show 2>/dev/null | sed '/^chilli_/!d; s/^chilli_//;' | awk -F '=' '
-BEGIN {
-
+|macallowlocal
-        print "# this file is automatically generated"
-}

wrt/whiterussian/packages/webifmdx-hotspot/trunk/files/www/cgi-bin/webifmdx/hotspot-captive.sh

@@ -12 +12 @@
-        FORM_chilli_uamanydns="${chilli_uamanydns:-$(nvram get chilli_uamanydns)}"
-        FORM_chilli_macauth="${chilli_macauth:-$(nvram get chilli_macauth)}"
+   FORM_chilli_macallowlocal="${chilli_macallowlocal:-$(nvram get chilli_macallowlocal)}"
-        FORM_chilli_macallowed="${chilli_macallowed:-$(nvram get chilli_macallowed)}"
-        FORM_chilli_macpasswd="${chilli_macpasswd:-$(nvram get chilli_macpasswd)}"
@@ -26 +27 @@
-int|FORM_chilli_uamanydns|@TR<<hotspot_captive_UAM_Any_DNS#UAM Any DNS>>||$FORM_chilli_uamanydns
-int|FORM_chilli_macauth|@TR<<hotspot_captive_MAC_Auth#MAC Authentication>>||$FORM_chilli_macauth
+int|FORM_chilli_macallowlocal|@TR<<hotspot_captive_MAC_AllowLocal#MAC Local Auth>>||$FORM_chilli_macallowlocal
-string|FORM_chilli_macallowed|@TR<<hotspot_captive_MAC_Allowed#MAC Allowed>>||$FORM_chilli_macallowed
-string|FORM_chilli_macpasswd|@TR<<hotspot_captive_MAC_Password#MAC Password>>||$FORM_chilli_macpasswd
@@ -40 +42 @@
-                        save_setting hotspot chilli_macallowed "$FORM_chilli_macallowed"
-                        save_setting hotspot chilli_macauth "$FORM_chilli_macauth"
+         save_setting hotspot chilli_macallowlocal "$FORM_chilli_macallowlocal"
-                        save_setting hotspot chilli_macsuffix "$FORM_chilli_macsuffix"
-                        save_setting hotspot chilli_macpasswd "$FORM_chilli_macpasswd"
@@ -82 +85 @@
-helptext|hotspot_captive_MAC_Auth_helptext#If enabled, users will be authenticated only based on their MAC Address.
-field|@TR<<hotspot_captive_MAC_Allowed#MAC Allowed>>
+checkbox|chilli_macallowlocal|$FORM_chilli_macallowlocal|1
+helpitem|hotspot_captive_MAC_AllowLocal#MAC Local Auth
+helptext|hotspot_captive_MAC_AllowLocal_helptext#If enabled local auth on mac address is performed.
+field|@TR<<hotspot_captive_MAC_Allowed#MAC Allowed>>
-text|chilli_macallowed|$FORM_chilli_macallowed
-helpitem|hotspot_captive_MAC_Allowed#MAC Allowed