From 0ad0af1e5b87cd7ab234b109b94180ae079c0f41 Mon Sep 17 00:00:00 2001 From: Darren Date: Sun, 6 Nov 2011 17:12:19 +0000 Subject: [PATCH] Spamfilter server module empty array fix --- client/js/gateway.js | 2 +- server/kiwi_modules/spamfilter.js | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/client/js/gateway.js b/client/js/gateway.js index 048981d..86f7ebc 100644 --- a/client/js/gateway.js +++ b/client/js/gateway.js @@ -146,7 +146,7 @@ kiwi.gateway = { */ parse: function (item) { if (item.event !== undefined) { - $(kiwi.gateway).trigger("on" + item.event, item); + $(kiwi.gateway).trigger('on' + item.event, item); switch (item.event) { case 'options': diff --git a/server/kiwi_modules/spamfilter.js b/server/kiwi_modules/spamfilter.js index 5e28b92..5f3ff76 100644 --- a/server/kiwi_modules/spamfilter.js +++ b/server/kiwi_modules/spamfilter.js @@ -8,12 +8,15 @@ var compiled_regex; exports.onload = function(){ filters = []; - compiled_regex = new RegExp(filters.join('|'), 'im'); + + if (filter.length > 0) { + compiled_regex = new RegExp(filters.join('|'), 'im'); + } } exports.onmsg = function(msg){ - if (msg.msg.search(compiled_regex) > -1) { + if (typeof compiled_regex !== 'undefined' && msg.msg.search(compiled_regex) > -1) { return null; } -- 2.25.1