--- spamcleaner.php	Tue Dec 22 12:05:41 2009
+++ spamcleaner.php	Wed Dec 16 23:44:45 2009
@@ -44,24 +44,8 @@
 //     http://tracker.moodle.org/browse/MDL-17144
 
 // Configuration
+// check and modify the spam.php language file
 
-// List of known spammy keywords, please add more here
-
-$autokeywords = array(
-                    "<img",
-                    "fuck",
-                    "casino",
-                    "porn",
-                    "xxx",
-                    "cialis",
-                    "viagra",
-                    "poker",
-                    "warcraft"
-                );
-
-
-/////////////////////////////////////////////////////////////////////////////////
-
 require_once('config.php');
 
 require_js(array('yui_dom-event', 'yui_connection', 'yui_json'));
@@ -164,7 +148,11 @@
     search_spammers($keywords);
 
 } else if (!empty($autodetect)) {     // Use the inbuilt keyword list to detect users
-    search_spammers($autokeywords);
+    $keywords = explode(',', get_string('spamwords','spam'));
+    foreach ($keywords as $key => $keyword) {
+        $keywords[$key] = trim($keyword);
+    }
+	search_spammers($keywords);
 }
 
 echo '</div>';
@@ -259,6 +247,7 @@
               <button id="removeall_btn">Delete all these user accounts</button>
               </div>';
     }
+	
 }
 function filter_user($user, $keywords, $count) {
     global $CFG, $SESSION;