From: AL Date: Wed, 16 Nov 2016 17:22:07 +0000 (+0300) Subject: [Fix] Fix check plain text part X-Git-Tag: 1.4.0~44^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a58c1cee63c107ecfeadc47fe29ae630b2ee78e;p=thirdparty%2Frspamd.git [Fix] Fix check plain text part --- diff --git a/src/plugins/lua/hfilter.lua b/src/plugins/lua/hfilter.lua index 0bcbc52ffd..24485a9dc6 100644 --- a/src/plugins/lua/hfilter.lua +++ b/src/plugins/lua/hfilter.lua @@ -255,7 +255,7 @@ local function hfilter(task) plain_text_part = p end end - + local hc = nil if html_text_part then local hc = html_text_part:get_html() if hc then @@ -279,18 +279,19 @@ local function hfilter(task) end end end - elseif plain_text_part then - local url_len = plain_text_part:get_urls_length() - local plen = plain_text_part:get_length() - - if plen > 0 and url_len > 0 then - local rel = url_len / plen - if rel > 0.8 then - task:insert_result('HFILTER_URL_ONLY', (rel - 0.8) * 5.0) - local lines = plain_text_part:get_lines_count() - if lines > 0 and lines < 2 then - task:insert_result('HFILTER_URL_ONELINE', 1.00) - end + end + end + if not hc and plain_text_part then + local url_len = plain_text_part:get_urls_length() + local plen = plain_text_part:get_length() + + if plen > 0 and url_len > 0 then + local rel = url_len / plen + if rel > 0.8 then + task:insert_result('HFILTER_URL_ONLY', (rel - 0.8) * 5.0) + local lines = plain_text_part:get_lines_count() + if lines > 0 and lines < 2 then + task:insert_result('HFILTER_URL_ONELINE', 1.00) end end end