summaryrefslogtreecommitdiffhomepage
path: root/module/public-core/src
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-04-22 15:06:38 +0000
committerSteven Barth <steven@midlink.org>2008-04-22 15:06:38 +0000
commiteb9a1093c274bf33f9d7a798f0030821da637663 (patch)
treea128436c9b880da48834c1c5b2d1efc2eca9a7b0 /module/public-core/src
parent7eb6eebf51c300d6e3f71faae520d461b6babe7d (diff)
* ffluci.controller.public.olsr: Renamed a variable to not overwrite Lua core functions
* ffluci.sys.wifi.iwscan: Fixed Wlan-Scan parsing algorithm * ffluci.view.sudo_status.iwscan: Fixed Frequency / Channel row to match different kinds of available data
Diffstat (limited to 'module/public-core/src')
-rw-r--r--module/public-core/src/controller/public/olsr.lua6
-rw-r--r--module/public-core/src/view/sudo_status/iwscan.htm2
2 files changed, 4 insertions, 4 deletions
diff --git a/module/public-core/src/controller/public/olsr.lua b/module/public-core/src/controller/public/olsr.lua
index 0e43ced49f..d41f5ed41d 100644
--- a/module/public-core/src/controller/public/olsr.lua
+++ b/module/public-core/src/controller/public/olsr.lua
@@ -104,9 +104,9 @@ end
-- Internal
-function fetch_txtinfo(table)
- table = table or ""
- local rawdata = ffluci.sys.httpget("http://127.0.0.1:2006/"..table)
+function fetch_txtinfo(otable)
+ otable = otable or ""
+ local rawdata = ffluci.sys.httpget("http://127.0.0.1:2006/"..otable)
if #rawdata == 0 then
return nil
diff --git a/module/public-core/src/view/sudo_status/iwscan.htm b/module/public-core/src/view/sudo_status/iwscan.htm
index 483039f4ee..8a1ee7254f 100644
--- a/module/public-core/src/view/sudo_status/iwscan.htm
+++ b/module/public-core/src/view/sudo_status/iwscan.htm
@@ -8,7 +8,7 @@ for iface, cells in pairs(ffluci.sys.wifi.iwscan()) do
<td><%=cell.ESSID%></td>
<td><%=cell.Address%></td>
<td><%=cell.Mode%></td>
-<td><%=cell.Channel%></td>
+<td><%=(cell.Channel or cell.Frequency or "")%></td>
<td><%=cell["Encryption key"]%></td>
<td><%=cell.Quality%></td>
<td><%=cell["Signal level"]%></td>