* Minor bugfixes

diff --git a/INSTALL b/INSTALL
index 6cccc77f987f155234e96b817220927d4c056635..8c3bbe8d7a026b0ddea575f519f652fd16d37b4a 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -13,7 +13,7 @@ TOC:
                
        3. Run ./scripts/feeds update
        
                
        3. Run ./scripts/feeds update
        

-       4. Run ./scripts/feeds install luci-lua ffluci
+       4. Run ./scripts/feeds install ffluci

        
        5. Type make menuconfig and you will find ffluci in the menu "Administration"
        
        
        5. Type make menuconfig and you will find ffluci in the menu "Administration"
        

diff --git a/module/public-core/src/view/public_status/index.htm b/module/public-core/src/view/public_status/index.htm
index 38133310780a7ac534b218705ccbc947374c0336..44c4ea7a766e5b73c0181b748adfa8b5e5e43fec 100644 (file)
--- 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>
 <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 />
 </table>
 <br />
 <br />


@@ -64,7 +47,15 @@
 <th><%:iface Schnittstelle%></th>
 </tr>
 <%
 <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>
 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 156a0336fce77f9a3aec905cfb390780a270a8fa..cd694d32461055763c13b3ccb8fb4bd7f42fe2bc 100644 (file)
--- 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 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
 %>
 
 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 (file)
index 0000000..e06b631
--- /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%>