Changeset 2215


Ignore:
Timestamp:
Nov 5, 2012, 3:22:54 PM (6 years ago)
Author:
matthijs
Message:

Update 3G code to use new country list.

In r2169, the format of the list of countries in /etc/3166en.db.lua
was changed to also store wifi regdomains. It turns out that the 3G code
also uses this list, but since it still expected the old format,
breaking the 3G settings page.

This commit updates the 3G code to also use the new format, fixing the
3G settings page.

Closes: #1228

Location:
trunk/luci
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/luci/applications/luci-wizard-fonera2/luasrc/model/cbi/wizard_fonera2/umts.lua

    r1060 r2215  
    5959        local providers = {}
    6060
    61         for cc, cname in util.vspairs(c3166) do
     61        for i, info in ipairs(c3166) do
     62                local cc, cname, regdom = unpack(info)
     63                cc = string.lower(cc)
     64
    6265                local plist = pdb[cc]
    6366                if plist then
  • trunk/luci/modules/admin-fon/luasrc/model/cbi/fon_umts/auth.lua

    r1659 r2215  
    1717local providers = {}
    1818
    19 for cc, cname in util.vspairs(c3166) do
     19for i, info in ipairs(c3166) do
     20        local cc, cname, regdom = unpack(info)
     21        cc = string.lower(cc)
     22
    2023        local plist = pdb[cc]
    2124        if plist then
  • trunk/luci/modules/admin-fon/luasrc/model/cbi/fon_umts/main.lua

    r1659 r2215  
    6363        local providers = {}
    6464
    65         for cc, cname in util.vspairs(c3166) do
     65        for i, info in ipairs(c3166) do
     66                local cc, cname, regdom = unpack(info)
     67                cc = string.lower(cc)
     68
    6669                local plist = pdb[cc]
    6770                if plist then
Note: See TracChangeset for help on using the changeset viewer.