aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xapt-panopticon-report-email-web.lua24
1 files changed, 13 insertions, 11 deletions
diff --git a/apt-panopticon-report-email-web.lua b/apt-panopticon-report-email-web.lua
index 1cb74fd..3f80d03 100755
--- a/apt-panopticon-report-email-web.lua
+++ b/apt-panopticon-report-email-web.lua
@@ -28,7 +28,7 @@ local revDNS = function(hosts, dom, IP)
28 end 28 end
29 else 29 else
30 for k, v in pairs(hosts) do 30 for k, v in pairs(hosts) do
31 if APT.options.roundRobin.value ~= k then 31 if (APT.options.roundRobin.value ~= k) and (nil ~= v.IPs) then
32 local IPs = v.IPs 32 local IPs = v.IPs
33 for i, u in pairs(IPs) do 33 for i, u in pairs(IPs) do
34 if "table" == type(u) then 34 if "table" == type(u) then
@@ -184,7 +184,7 @@ local DNSrrTest = function(hosts, k)
184 space = '   ' 184 space = '   '
185 no = "<font color='grey'><b>no</b></font>" 185 no = "<font color='grey'><b>no</b></font>"
186 end 186 end
187 if (APT.options.roundRobin.value ~= k) and (nil ~= hosts[APT.options.roundRobin.value]) then 187 if (APT.options.roundRobin.value ~= k) and (nil ~= hosts[APT.options.roundRobin.value]) and (nil ~= hosts[k].IPs) then
188 APT.allpairs(hosts[k].IPs, 188 APT.allpairs(hosts[k].IPs,
189 function(i, w, k, v) 189 function(i, w, k, v)
190 if nil ~= hosts[APT.options.roundRobin.value].IPs["deb.roundr.devuan.org"][i] then 190 if nil ~= hosts[APT.options.roundRobin.value].IPs["deb.roundr.devuan.org"][i] then
@@ -323,16 +323,18 @@ local makeIPlist = function(hosts)
323 hosts[k].Country = nil 323 hosts[k].Country = nil
324 hosts[k].Bandwidth = nil 324 hosts[k].Bandwidth = nil
325 325
326 for l, w in pairs(hosts[k].IPs) do 326 if nil ~= hosts[k].IPs then
327 if type(w) == "table" then 327 for l, w in pairs(hosts[k].IPs) do
328 n[l] = {} 328 if type(w) == "table" then
329 for i, u in pairs(w) do 329 n[l] = {}
330 local log = '[<a href="' .. adr .. k .. '_' .. i .. '">graphs</a>] &nbsp; ' .. logCount(k, i) 330 for i, u in pairs(w) do
331 if "" == log then n[l][i] = u else n[l][log .. " " .. revDNS(hosts, k, i)] = u end 331 local log = '[<a href="' .. adr .. k .. '_' .. i .. '">graphs</a>] &nbsp; ' .. logCount(k, i)
332 if "" == log then n[l][i] = u else n[l][log .. " " .. revDNS(hosts, k, i)] = u end
333 end
334 else
335 local log = '[<a href="' .. adr .. k .. '_' .. l .. '">graphs</a>] &nbsp; ' .. logCount(k, l)
336 if "" == log then n[l] = w else n[log .. " " .. revDNS(hosts, k, l)] = w end
332 end 337 end
333 else
334 local log = '[<a href="' .. adr .. k .. '_' .. l .. '">graphs</a>] &nbsp; ' .. logCount(k, l)
335 if "" == log then n[l] = w else n[log .. " " .. revDNS(hosts, k, l)] = w end
336 end 338 end
337 end 339 end
338 m['[<a href="' .. adr .. k .. '">graphs</a>] &nbsp; ' .. log .. " DNS entries -" .. redirs(hosts, k)] = n 340 m['[<a href="' .. adr .. k .. '">graphs</a>] &nbsp; ' .. log .. " DNS entries -" .. redirs(hosts, k)] = n