Fix timezone management

This commit is contained in:
Tim Wilkinson 2022-03-01 21:40:11 -08:00 committed by Joe AE6XE
parent 3dbb83fcab
commit af53c47d57
1 changed files with 5 additions and 5 deletions

View File

@ -220,8 +220,8 @@ end
local tz_db_names = {} local tz_db_names = {}
for line in io.lines("/etc/zoneinfo") for line in io.lines("/etc/zoneinfo")
do do
local name, _ = line:match("^(.*)\t") local name, tz = line:match("^(.*)\t(.*)")
tz_db_names[#tz_db_names + 1] = { tz = name, name = name } tz_db_names[#tz_db_names + 1] = { name = name, tz = tz }
end end
-- online ping -- online ping
@ -505,8 +505,8 @@ end
if parms.button_save then if parms.button_save then
for _,zone in ipairs(tz_db_names) for _,zone in ipairs(tz_db_names)
do do
if zone.tz == time_zone_name then if zone.name == time_zone_name then
parms.time_zone = zone.name parms.time_zone = zone.tz
break break
end end
end end
@ -1305,7 +1305,7 @@ html.print("</td><tr><td align=left>Longitude</td><td><input type=text name=long
html.print("<tr><td>Timezone</td><td><select name=time_zone_name tabindex=10>") html.print("<tr><td>Timezone</td><td><select name=time_zone_name tabindex=10>")
for _,zone in ipairs(tz_db_names) for _,zone in ipairs(tz_db_names)
do do
html.print("<option value='" .. zone.tz .. "'".. (zone.tz == time_zone_name and " selected" or "") .. ">" .. zone.name .. "</option>") html.print("<option value='" .. zone.name .. "'".. (zone.name == time_zone_name and " selected" or "") .. ">" .. zone.name .. "</option>")
end end
html.print("</select></td><td align=left>NTP Server</td><td><input type=text name=ntp_server size=20 value='" .. ntp_server .. "'></td></table></td></tr></table>") html.print("</select></td><td align=left>NTP Server</td><td><input type=text name=ntp_server size=20 value='" .. ntp_server .. "'></td></table></td></tr></table>")