Spamfilter server module empty array fix

diff --git a/client/js/gateway.js b/client/js/gateway.js
index 048981d5c3a415b84191c7da53b5ce754f6cbc46..86f7ebcf8cd142316e2ff14f524bc9a332117ebb 100644 (file)
--- 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 5e28b92cab8cd419139f0946e37a08b452bbf795..5f3ff761dcbe5962e6c9c20885b6f2eb78cfbca9 100644 (file)
--- 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;
        }