* Fixed ffluci.util.trim, ffluci.util.split

diff --git a/core/src/ffluci/util.lua b/core/src/ffluci/util.lua
index 9cb1e14..3ff7bc2 100644 (file)
--- a/core/src/ffluci/util.lua
+++ b/core/src/ffluci/util.lua
@@ -153,6 +153,10 @@ function split(str, pat, max, regex)
        local t = {}
        local c = 1
        
        local t = {}
        local c = 1
        

+       if #str == 0 then
+               return {""}
+       end
+       

        if #pat == 0 then
                return nil
        end
        if #pat == 0 then
                return nil
        end


@@ -172,8 +176,9 @@ function split(str, pat, max, regex)
 end
 
 -- Removes whitespace from beginning and end of a string
 end
 
 -- Removes whitespace from beginning and end of a string

-function trim (string)
-       return string:gsub("^%s*(.-)%s*$", "%1")
+function trim(string)
+       local s = string:gsub("^%s*(.-)%s*$", "%1")
+       return s

 end
 
 -- Updates given table with new values
 end
 
 -- Updates given table with new values

diff --git a/module/public-core/src/controller/public/status.lua b/module/public-core/src/controller/public/status.lua
index a786eb2..8d2f7a3 100644 (file)
--- a/module/public-core/src/controller/public/status.lua
+++ b/module/public-core/src/controller/public/status.lua
@@ -10,7 +10,6 @@ function action_index()
        data.routes = {}
        for i, r in pairs(ffluci.sys.net.routes()) do
                if r.Destination == "00000000" then
        data.routes = {}
        for i, r in pairs(ffluci.sys.net.routes()) do
                if r.Destination == "00000000" then

-                       r.Gateway = ffluci.sys.net.hexip4(r.Gateway)

                        table.insert(data.routes, r)
                end
        end
                        table.insert(data.routes, r)
                end
        end

diff --git a/module/public-core/src/view/public_status/index.htm b/module/public-core/src/view/public_status/index.htm
index d81125d..3813331 100644 (file)
--- a/module/public-core/src/view/public_status/index.htm
+++ b/module/public-core/src/view/public_status/index.htm
@@ -63,9 +63,12 @@
 <th><%:metric Metrik%></th>
 <th><%:iface Schnittstelle%></th>
 </tr>
 <th><%:metric Metrik%></th>
 <th><%:iface Schnittstelle%></th>
 </tr>

-<% for i, rt in pairs(routes) do%>
+<%
+local be = (routes[1] and routes[1].Mask:sub(-2) == "00")
+for i, rt in pairs(routes) do
+%>

 <tr>
 <tr>

-<td><%=rt.Gateway%></th>
+<td><%=ffluci.sys.net.hexip4(rt.Gateway, be)%></th>

 <td><%=rt.Metric%></th>
 <td><%=rt.Iface%></th>
 </tr>
 <td><%=rt.Metric%></th>
 <td><%=rt.Iface%></th>
 </tr>