Changeset 18394

Timestamp:

Oct 1, 2012, 4:40:07 PM (12 years ago)

Author:

mistic100

Message:

use preg_match, usually faster

File:

• extensions/comments_blacklist/include/functions.inc.php (modified) (2 diffs)

extensions/comments_blacklist/include/functions.inc.php

@@ -6 +6 @@
   global $conf;
   
-  if ($comment_action == $conf['comments_blacklist']['action'])
+  if ( $comment_action==$conf['comments_blacklist']['action'] or $comment_action=='reject' )
   {
     return $comment_action;
@@ -12 +12 @@
   
   $blacklist = file(COMM_BLACKLIST_FILE, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-  $blacklist = array_map('strtolower', $blacklist);
-  $content = ' '.strtolower($comm['content']).' ';
-  $author = ' '.strtolower($comm['author']).' ';
+  $blacklist = array_map(create_function('$w', 'return " ".preg_quote($w)." ";'), $blacklist);
+  $blacklist = implode('|', $blacklist);
+
+  $content = str_replace(array("\r\n","\n"), ' ', $comm['content']);
   
-  foreach ($blacklist as $word)
+  if ( preg_match('#('.$blacklist.')#i', ' '.$comm['author'].' ') or preg_match('#('.$blacklist.')#i', ' '.$content.' ') )
   {
-    $word = ' '.$word.' ';
-    if ( strpos($content, $word)!==false or strpos($author, $word)!==false )
-    {
-      return $conf['comments_blacklist']['action'];
-    }
+    return $conf['comments_blacklist']['action'];
   }