From dffdd168aebfc5f67bf61baee9739b5bf96b5e50 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Wed, 08 May 2013 03:42:17 -0400 Subject: [PATCH] Improved regexp --- plugins/attachment_reminder/attachment_reminder.js | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/plugins/attachment_reminder/attachment_reminder.js b/plugins/attachment_reminder/attachment_reminder.js index 01f2b49..a4f3e63 100755 --- a/plugins/attachment_reminder/attachment_reminder.js +++ b/plugins/attachment_reminder/attachment_reminder.js @@ -18,15 +18,12 @@ function rcmail_check_message(msg) { - var i, rg, keywords = rcmail.gettext('keywords', 'attachment_reminder').split(",").concat([".doc", ".pdf"]); + var i, rx, keywords = rcmail.gettext('keywords', 'attachment_reminder').split(",").concat([".doc", ".pdf"]); - for (i=0; i<keywords.length; i++) { - rg = new RegExp(keywords[i],'i'); - if (msg.search(rg) != -1) - return true; - } + $.each(keywords, function(n) { return RegExp.escape(n); }); + rx = new RegExp('(' + keywords.join('|') + ')', 'i'); - return false; + return msg.search(rx) != -1; } function rcmail_have_attachments() -- Gitblit v1.9.1