diff options
| author | Steven Barth <steven@midlink.org> | 2008-04-22 18:01:41 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-04-22 18:01:41 +0000 |
| commit | b15171305b5e6e9b1da4dc05c4d7e105980b9d9d (patch) | |
| tree | 845bf294d49a616d0051c626fe3bd9d10656fe75 | |
| parent | 187bbe4bbec7cb22c33df9c805c829e939892016 (diff) | |
* Fixed ffluci.util.trim, ffluci.util.split
| -rw-r--r-- | core/src/ffluci/util.lua | 9 | ||||
| -rw-r--r-- | module/public-core/src/controller/public/status.lua | 1 | ||||
| -rw-r--r-- | module/public-core/src/view/public_status/index.htm | 7 |
3 files changed, 12 insertions, 5 deletions
diff --git a/core/src/ffluci/util.lua b/core/src/ffluci/util.lua index 9cb1e1420c..3ff7bc2033 100644 --- 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 + if #str == 0 then + return {""} + 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 -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 diff --git a/module/public-core/src/controller/public/status.lua b/module/public-core/src/controller/public/status.lua index a786eb2d7e..8d2f7a303f 100644 --- 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 - r.Gateway = ffluci.sys.net.hexip4(r.Gateway) 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 d81125de25..3813331078 100644 --- 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> -<% 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> -<td><%=rt.Gateway%></th> +<td><%=ffluci.sys.net.hexip4(rt.Gateway, be)%></th> <td><%=rt.Metric%></th> <td><%=rt.Iface%></th> </tr> |