[Fix] Avoid `table.getn` method as it has been removed in lua 5.3

Issue: #697
Reported by: @jessbo

diff --git a/rules/forwarding.lua b/rules/forwarding.lua
index c5c8912afc1e3efe009f8fe0c1dd7f5c3e60b4dc..68d0c10952378a94fd77f1193df963df81a6d28d 100644 (file)
--- a/rules/forwarding.lua
+++ b/rules/forwarding.lua
@@ -24,7 +24,7 @@ rspamd_config.FWD_GOOGLE = {
         local envfrom = task:get_from(1)
         local envrcpts = task:get_recipients(1)
         -- Forwarding will only be to a single recipient
-        if table.getn(envrcpts) > 1 then return false end
+        if #envrcpts > 1 then return false end
         -- Get recipient and compute VERP address
         local rcpt = envrcpts[1].addr:lower()
         local verp = rcpt:gsub('@','=')
@@ -53,7 +53,7 @@ rspamd_config.FWD_SRS = {
         local envfrom = task:get_from(1)
         local envrcpts = task:get_recipients(1)
         -- Forwarding is only to a single recipient
-        if table.getn(envrcpts) > 1 then return false end
+        if #envrcpts > 1 then return false end
         -- Get recipient and compute rewritten SRS address
         local srs = '=' .. envrcpts[1].domain:lower() ..
                     '=' .. envrcpts[1].user:lower()
@@ -74,7 +74,7 @@ rspamd_config.FORWARDED = {
         if not task:has_recipients(1) then return false end
         local envrcpts = task:get_recipients(1)
         -- Forwarding will only be for single recipient messages
-        if table.getn(envrcpts) > 1 then return false end
+        if #envrcpts > 1 then return false end
         -- Get any other headers we might need
         local lu = task:get_header('List-Unsubscribe')
         local to = task:get_recipients(2)

diff --git a/rules/misc.lua b/rules/misc.lua
index e51b0435aa1b3fce1e3805233d0dd6d68838eb48..6c3b732b1f0ecf176f5ec60f6175d1b655e61261 100644 (file)
--- a/rules/misc.lua
+++ b/rules/misc.lua
@@ -325,7 +325,7 @@ rspamd_config.ENVFROM_VERP = {
         local envfrom = task:get_from(1)
         local envrcpts = task:get_recipients(1)
         -- VERP only works for single recipient messages
-        if table.getn(envrcpts) > 1 then return false end
+        if #envrcpts > 1 then return false end
         -- Get recipient and compute VERP address
         local rcpt = envrcpts[1].addr:lower()
         local verp = rcpt:gsub('@','=')