Mailing List Archive

Author: quinlan
Date: Sun Feb 15 04:40:48 2004
New Revision: 6656

Modified:
incubator/spamassassin/trunk/rules/20_html_tests.cf
incubator/spamassassin/trunk/rules/70_testing.cf
Log:
replace HTML_TITLE_EMPTY with T_HTML_TITLE_EMPTY
remove T_HTML_LINK_UNCLICKABLE
remove HTML order rules


Modified: incubator/spamassassin/trunk/rules/20_html_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_html_tests.cf (original)
+++ incubator/spamassassin/trunk/rules/20_html_tests.cf Sun Feb 15 04:40:48 2004
@@ -325,7 +325,7 @@
describe HTML_NONELEMENT_80_90 80% to 90% of HTML elements are non-standard
describe HTML_NONELEMENT_90_100 90% to 100% of HTML elements are non-standard

-body HTML_TITLE_EMPTY eval:html_eval('title_text', '!~ /\S/s')
+body HTML_TITLE_EMPTY eval:html_title('!~ /\S/s')
describe HTML_TITLE_EMPTY HTML title contains no text

body HTML_TITLE_UNTITLED eval:html_eval('title_text', '=~ /Untitled/i')

Modified: incubator/spamassassin/trunk/rules/70_testing.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/70_testing.cf (original)
+++ incubator/spamassassin/trunk/rules/70_testing.cf Sun Feb 15 04:40:48 2004
@@ -218,7 +218,6 @@
body T_HTML_TITLE_EXTRA eval:html_test('t_title_extra')

# possible replacement rules
-body T_HTML_TITLE_EMPTY eval:html_title('!~ /\S/s')
body T_HTML_TITLE_UNTITLED_1 eval:html_title('=~ /untitled/i')
body T_HTML_TITLE_UNTITLED_2 eval:html_title('=~ /new page \d+/i')
body T_HTML_TITLE_UNTITLED_3 eval:html_title('=~ /untitled|new page \d+/i')
@@ -541,179 +540,3 @@
# same ratware; forges dates as 'with SMTP; Jan, 17 2004 22:05:48 -0300'
header T_DATE_COMMA Received =~ /\bwith \S+\; [A-Z][a-z][a-z],\s+\d\d\s+\d\d\d\d\s/

-########################################################################
-# slew of HTML order rules
-#
-# these were originally autogenerated some months ago by dumping HTML
-# tag orders for spam and ham, but the dumps were not separated by
-# message, so some good rules may have been missed
-
-body T_RANGE_100_110 eval:html_order('range', '100', '110')
-body T_RANGE_110_120 eval:html_order('range', '110', '120')
-body T_RANGE_120_130 eval:html_order('range', '120', '130')
-body T_RANGE_130_140 eval:html_order('range', '130', '140')
-body T_RANGE_140_150 eval:html_order('range', '140', '150')
-body T_RANGE_150_160 eval:html_order('range', '150', '160')
-body T_RANGE_160_170 eval:html_order('range', '160', '170')
-body T_RANGE_170_180 eval:html_order('range', '170', '180')
-body T_RANGE_180_190 eval:html_order('range', '180', '190')
-body T_RANGE_190_200 eval:html_order('range', '190', '200')
-body T_RANGE_200_210 eval:html_order('range', '200', '210')
-body T_RANGE_210_220 eval:html_order('range', '210', '220')
-body T_RANGE_220_230 eval:html_order('range', '220', '230')
-body T_RANGE_230_240 eval:html_order('range', '230', '240')
-body T_RANGE_240_250 eval:html_order('range', '240', '250')
-body T_RANGE_250_260 eval:html_order('range', '250', '260')
-body T_RANGE_260_270 eval:html_order('range', '260', '270')
-body T_RANGE_270_280 eval:html_order('range', '270', '280')
-body T_RANGE_280_290 eval:html_order('range', '280', '290')
-body T_RANGE_290_300 eval:html_order('range', '290', '300')
-
-body T_ANY_0A_BR eval:html_order('any', 'br', '/a')
-body T_ANY_0BODY_0HTML eval:html_order('any', '/html', '/body')
-body T_ANY_0CENTER_0FONT eval:html_order('any', '/center', '/font')
-body T_ANY_0CENTER_0FONT eval:html_order('any', '/font', '/center')
-body T_ANY_0CENTER_0P eval:html_order('any', '/center', '/p')
-body T_ANY_0CENTER_BR eval:html_order('any', 'br', '/center')
-body T_ANY_0CENTER_IMG eval:html_order('any', '/center', 'img')
-body T_ANY_0CENTER_IMG eval:html_order('any', 'img', '/center')
-body T_ANY_0DIV_IMG eval:html_order('any', '/div', 'img')
-body T_ANY_0DIV_IMG eval:html_order('any', 'img', '/div')
-body T_ANY_0FONT_0CENTER eval:html_order('any', '/center', '/font')
-body T_ANY_0FONT_0CENTER eval:html_order('any', '/font', '/center')
-body T_ANY_0HTML_0BODY eval:html_order('any', '/body', '/html')
-body T_ANY_0HTML_0BODY eval:html_order('any', '/html', '/body')
-body T_ANY_0P_0CENTER eval:html_order('any', '/center', '/p')
-body T_ANY_0P_0P eval:html_order('any', '/p', '/p')
-body T_ANY_0TABLE_0CENTER eval:html_order('any', '/center', '/table')
-body T_ANY_0TABLE_0CENTER eval:html_order('any', '/table', '/center')
-body T_ANY_BODY_A eval:html_order('any', 'a', 'body')
-body T_ANY_BODY_A eval:html_order('any', 'body', 'a')
-body T_ANY_BR_0A eval:html_order('any', '/a', 'br')
-body T_ANY_BR_0A eval:html_order('any', 'br', '/a')
-body T_ANY_BR_0CENTER eval:html_order('any', '/center', 'br')
-body T_ANY_BR_0CENTER eval:html_order('any', 'br', '/center')
-body T_ANY_BR_A eval:html_order('any', 'a', 'br')
-body T_ANY_B_A eval:html_order('any', 'a', 'b')
-body T_ANY_B_CENTER eval:html_order('any', 'b', 'center')
-body T_ANY_B_CENTER eval:html_order('any', 'center', 'b')
-body T_ANY_CENTER_A eval:html_order('any', 'a', 'center')
-body T_ANY_CENTER_A eval:html_order('any', 'center', 'a')
-body T_ANY_CENTER_B eval:html_order('any', 'b', 'center')
-body T_ANY_CENTER_B eval:html_order('any', 'center', 'b')
-body T_ANY_CENTER_DIV eval:html_order('any', 'center', 'div')
-body T_ANY_CENTER_DIV eval:html_order('any', 'div', 'center')
-body T_ANY_CENTER_FONT eval:html_order('any', 'center', 'font')
-body T_ANY_CENTER_FONT eval:html_order('any', 'font', 'center')
-body T_ANY_DIV_CENTER eval:html_order('any', 'center', 'div')
-body T_ANY_DIV_CENTER eval:html_order('any', 'div', 'center')
-body T_ANY_FONT_CENTER eval:html_order('any', 'center', 'font')
-body T_ANY_FONT_CENTER eval:html_order('any', 'font', 'center')
-body T_ANY_HTML_CENTER eval:html_order('any', 'center', 'html')
-body T_ANY_HTML_CENTER eval:html_order('any', 'html', 'center')
-body T_ANY_IMG_0CENTER eval:html_order('any', '/center', 'img')
-body T_ANY_IMG_0CENTER eval:html_order('any', 'img', '/center')
-body T_ANY_IMG_0DIV eval:html_order('any', '/div', 'img')
-body T_ANY_IMG_0DIV eval:html_order('any', 'img', '/div')
-body T_ANY_P_B eval:html_order('any', 'b', 'p')
-body T_ANY_UNDEF_BODY eval:html_order('any', 'body', 'undef')
-body T_ANY_UNDEF_BODY eval:html_order('any', 'undef', 'body')
-
-body T_CLOSE_0A_0CENTER eval:html_order('any', '/a', '/center')
-body T_CLOSE_0A_0CENTER eval:html_order('close', '/center', '/a')
-body T_CLOSE_0BODY_0HTML eval:html_order('close', '/html', '/body')
-body T_CLOSE_0CENTER_0A eval:html_order('any', '/center', '/a')
-body T_CLOSE_0CENTER_0A eval:html_order('close', '/a', '/center')
-body T_CLOSE_0CENTER_0FONT eval:html_order('any', '/center', '/font')
-body T_CLOSE_0CENTER_0FONT eval:html_order('close', '/font', '/center')
-body T_CLOSE_0CENTER_0P eval:html_order('any', '/center', '/p')
-body T_CLOSE_0CENTER_0P eval:html_order('close', '/center', '/p')
-body T_CLOSE_0CENTER_0P eval:html_order('close', '/p', '/center')
-body T_CLOSE_0FONT_0CENTER eval:html_order('any', '/font', '/center')
-body T_CLOSE_0FONT_0CENTER eval:html_order('close', '/center', '/font')
-body T_CLOSE_0P_0CENTER eval:html_order('close', '/center', '/p')
-
-body T_IGNORE_A_BODY eval:html_order('ignore', 'body', 'a')
-body T_IGNORE_A_CENTER eval:html_order('ignore', 'a', 'center')
-body T_IGNORE_A_CENTER eval:html_order('ignore', 'center', 'a')
-body T_IGNORE_A_P eval:html_order('ignore', 'p', 'a')
-body T_IGNORE_BODY_A eval:html_order('ignore', 'a', 'body')
-body T_IGNORE_BODY_A eval:html_order('ignore', 'body', 'a')
-body T_IGNORE_BODY_CENTER eval:html_order('ignore', 'center', 'body')
-body T_IGNORE_BODY_HTML eval:html_order('ignore', 'html', 'body')
-body T_IGNORE_B_CENTER eval:html_order('ignore', 'b', 'center')
-body T_IGNORE_B_CENTER eval:html_order('ignore', 'center', 'b')
-body T_IGNORE_CENTER_A eval:html_order('ignore', 'a', 'center')
-body T_IGNORE_CENTER_A eval:html_order('ignore', 'center', 'a')
-body T_IGNORE_CENTER_B eval:html_order('ignore', 'b', 'center')
-body T_IGNORE_CENTER_B eval:html_order('ignore', 'center', 'b')
-body T_IGNORE_CENTER_BODY eval:html_order('ignore', 'body', 'center')
-body T_IGNORE_CENTER_BR eval:html_order('ignore', 'br', 'center')
-body T_IGNORE_CENTER_DIV eval:html_order('ignore', 'center', 'div')
-body T_IGNORE_CENTER_DIV eval:html_order('ignore', 'div', 'center')
-body T_IGNORE_CENTER_FONT eval:html_order('ignore', 'center', 'font')
-body T_IGNORE_CENTER_FONT eval:html_order('ignore', 'font', 'center')
-body T_IGNORE_CENTER_HTML eval:html_order('ignore', 'center', 'html')
-body T_IGNORE_CENTER_HTML eval:html_order('ignore', 'html', 'center')
-body T_IGNORE_CENTER_IMG eval:html_order('ignore', 'center', 'img')
-body T_IGNORE_CENTER_IMG eval:html_order('ignore', 'img', 'center')
-body T_IGNORE_CENTER_P eval:html_order('ignore', 'p', 'center')
-body T_IGNORE_CENTER_TABLE eval:html_order('ignore', 'center', 'table')
-body T_IGNORE_CENTER_TABLE eval:html_order('ignore', 'table', 'center')
-body T_IGNORE_DIV_CENTER eval:html_order('ignore', 'center', 'div')
-body T_IGNORE_DIV_CENTER eval:html_order('ignore', 'div', 'center')
-body T_IGNORE_DIV_IMG eval:html_order('ignore', 'div', 'img')
-body T_IGNORE_DIV_IMG eval:html_order('ignore', 'img', 'div')
-body T_IGNORE_FONT_CENTER eval:html_order('ignore', 'center', 'font')
-body T_IGNORE_FONT_CENTER eval:html_order('ignore', 'font', 'center')
-body T_IGNORE_FONT_TABLE eval:html_order('ignore', 'table', 'font')
-body T_IGNORE_HTML_CENTER eval:html_order('ignore', 'center', 'html')
-body T_IGNORE_HTML_CENTER eval:html_order('ignore', 'html', 'center')
-body T_IGNORE_IMG_CENTER eval:html_order('ignore', 'center', 'img')
-body T_IGNORE_IMG_CENTER eval:html_order('ignore', 'img', 'center')
-body T_IGNORE_IMG_DIV eval:html_order('ignore', 'div', 'img')
-body T_IGNORE_IMG_DIV eval:html_order('ignore', 'img', 'div')
-body T_IGNORE_P_CENTER eval:html_order('ignore', 'center', 'p')
-body T_IGNORE_TABLE_CENTER eval:html_order('ignore', 'center', 'table')
-body T_IGNORE_TABLE_CENTER eval:html_order('ignore', 'table', 'center')
-body T_IGNORE_TABLE_FONT eval:html_order('ignore', 'font', 'table')
-body T_IGNORE_TABLE_FONT eval:html_order('ignore', 'table', 'font')
-body T_IGNORE_TD_CENTER eval:html_order('ignore', 'center', 'td')
-body T_IGNORE_UNDEF_BODY eval:html_order('ignore', 'body', 'undef')
-body T_IGNORE_UNDEF_BODY eval:html_order('ignore', 'undef', 'body')
-
-body T_OPEN_A_CENTER eval:html_order('open', 'center', 'a')
-body T_OPEN_BODY_A eval:html_order('any', 'body', 'a')
-body T_OPEN_BODY_A eval:html_order('open', 'a', 'body')
-body T_OPEN_BODY_A eval:html_order('open', 'body', 'a')
-body T_OPEN_B_CENTER eval:html_order('any', 'b', 'center')
-body T_OPEN_B_CENTER eval:html_order('open', 'center', 'b')
-body T_OPEN_CENTER_BR eval:html_order('open', 'br', 'center')
-body T_OPEN_CENTER_DIV eval:html_order('open', 'div', 'center')
-body T_OPEN_CENTER_FONT eval:html_order('any', 'center', 'font')
-body T_OPEN_CENTER_FONT eval:html_order('open', 'font', 'center')
-body T_OPEN_CENTER_IMG eval:html_order('any', 'center', 'img')
-body T_OPEN_CENTER_IMG eval:html_order('open', 'center', 'img')
-body T_OPEN_CENTER_IMG eval:html_order('open', 'img', 'center')
-body T_OPEN_CENTER_P eval:html_order('open', 'p', 'center')
-body T_OPEN_HTML_CENTER eval:html_order('any', 'html', 'center')
-body T_OPEN_HTML_CENTER eval:html_order('open', 'center', 'html')
-body T_OPEN_HTML_CENTER eval:html_order('open', 'html', 'center')
-body T_OPEN_IMG_CENTER eval:html_order('any', 'img', 'center')
-body T_OPEN_IMG_CENTER eval:html_order('open', 'center', 'img')
-body T_OPEN_IMG_CENTER eval:html_order('open', 'img', 'center')
-body T_OPEN_IMG_DIV eval:html_order('open', 'div', 'img')
-body T_OPEN_IMG_FONT eval:html_order('open', 'font', 'img')
-body T_OPEN_INPUT_P eval:html_order('any', 'input', 'p')
-body T_OPEN_INPUT_P eval:html_order('open', 'p', 'input')
-body T_OPEN_P_CENTER eval:html_order('any', 'p', 'center')
-body T_OPEN_P_CENTER eval:html_order('open', 'center', 'p')
-body T_OPEN_P_INPUT eval:html_order('open', 'input', 'p')
-body T_OPEN_P_STRONG eval:html_order('open', 'strong', 'p')
-body T_OPEN_UNDEF_BODY eval:html_order('open', 'body', 'undef')
-body T_OPEN_UNDEF_BODY eval:html_order('open', 'undef', 'body')
-
-########################################################################
-
-body T_HTML_LINK_UNCLICKABLE eval:html_test('anchor_unclickable')
-describe T_HTML_LINK_UNCLICKABLE HTML link is not clickable