diff options
| author | Steven Barth <steven@midlink.org> | 2008-04-22 20:37:30 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-04-22 20:37:30 +0000 |
| commit | 0ea68c4f748860f625eb4163ed3e91f80a593350 (patch) | |
| tree | 638c3b2a120b834098e42df6855cbdab5653aeab /module/public-core/src | |
| parent | 32274f49f0aeb0d424a59d8cba6b20689c43ac92 (diff) | |
* Minor bugfixes
Diffstat (limited to 'module/public-core/src')
| -rw-r--r-- | module/public-core/src/view/public_status/index.htm | 29 | ||||
| -rw-r--r-- | module/public-core/src/view/public_status/routes.htm | 6 | ||||
| -rw-r--r-- | module/public-core/src/view/sudo_status/iwconfig.htm | 21 |
3 files changed, 36 insertions, 20 deletions
diff --git a/module/public-core/src/view/public_status/index.htm b/module/public-core/src/view/public_status/index.htm index 3813331078..44c4ea7a76 100644 --- a/module/public-core/src/view/public_status/index.htm +++ b/module/public-core/src/view/public_status/index.htm @@ -34,24 +34,7 @@ <th><%:signal Signal%></th> <th><%:noise Rausch%></th> </tr> -<%for k, v in pairs(wifi) do%> -<tr> -<td rowspan="2"><%=k%></td> -<td><%=v[1]%></td> -<td><%=v.Frequency%></td> -<td><%=v["Tx-Power"]%></td> -<td><%=v["Bit Rate"]%></td> -<td><%=v["RTS thr"]%></td> -<td><%=v["Fragment thr"]%></td> -<td><%=v["Link Quality"]%></td> -<td><%=v["Signal level"]%></td> -<td><%=v["Noise level"]%></td> -</tr> -<tr> -<td colspan="4"><strong><%:essid ESSID%>: </strong><%=v.ESSID%></td> -<td colspan="5"><strong><%:bssid BSSID%>: </strong><%=(v.Cell or v["Access Point"])%></td> -</tr> -<%end%> +<%=ffluci.sys.httpget("http://127.0.0.1" .. controller .. "/sudo/status/iwconfig")%> </table> <br /> <br /> @@ -64,7 +47,15 @@ <th><%:iface Schnittstelle%></th> </tr> <% -local be = (routes[1] and routes[1].Mask:sub(-2) == "00") + +-- UGLY hack is UGLY +if routes[1] and routes[1].Gateway:sub(-2) == "00" then + local be = true +else + local be = false +end + + for i, rt in pairs(routes) do %> <tr> diff --git a/module/public-core/src/view/public_status/routes.htm b/module/public-core/src/view/public_status/routes.htm index 156a0336fc..cd694d3246 100644 --- a/module/public-core/src/view/public_status/routes.htm +++ b/module/public-core/src/view/public_status/routes.htm @@ -14,7 +14,11 @@ local routes = ffluci.sys.net.routes() -- UGLY hack is UGLY -local be = (routes[1] and routes[1].Mask:sub(-2) == "00") +if routes[1] and routes[1].Gateway:sub(-2) == "00" then + local be = true +else + local be = false +end for i, r in pairs(routes) do %> diff --git a/module/public-core/src/view/sudo_status/iwconfig.htm b/module/public-core/src/view/sudo_status/iwconfig.htm new file mode 100644 index 0000000000..e06b631ac8 --- /dev/null +++ b/module/public-core/src/view/sudo_status/iwconfig.htm @@ -0,0 +1,21 @@ +<% +ffluci.http.textheader() +for k, v in pairs(ffluci.sys.wifi.getiwconfig()) do +%> +<tr> +<td rowspan="2"><%=k%></td> +<td><%=v[1]%></td> +<td><%=v.Frequency%></td> +<td><%=v["Tx-Power"]%></td> +<td><%=v["Bit Rate"]%></td> +<td><%=v["RTS thr"]%></td> +<td><%=v["Fragment thr"]%></td> +<td><%=v["Link Quality"]%></td> +<td><%=v["Signal level"]%></td> +<td><%=v["Noise level"]%></td> +</tr> +<tr> +<td colspan="4"><strong>ESSID: </strong><%=v.ESSID%></td> +<td colspan="5"><strong>BSSID: </strong><%=(v.Cell or v["Access Point"])%></td> +</tr> +<%end%> |