Changeset 18651

Timestamp:

Oct 16, 2012, 10:53:09 AM (12 years ago)

Author:

mistic100

Message:

handle empty file case, check COA and GuestBook

Location:

extensions/comments_blacklist

Files:

• admin.php (modified) (1 diff)
• include/functions.inc.php (modified) (1 diff)
• main.inc.php (modified) (3 diffs)

extensions/comments_blacklist/admin.php

@@ -19 +19 @@
 $template->assign($conf['comments_blacklist']);
 $template->assign(array(
-  'blacklist' => file_get_contents(COMM_BLACKLIST_FILE),
+  'blacklist' => @file_get_contents(COMM_BLACKLIST_FILE),
   'COMM_BLACKLIST_PATH'=> get_root_url() . COMM_BLACKLIST_PATH,
   'COMM_BLACKLIST_ADMIN' => COMM_BLACKLIST_ADMIN,

extensions/comments_blacklist/include/functions.inc.php

@@ -11 +11 @@
   }
   
-  $blacklist = file(COMM_BLACKLIST_FILE, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+  $blacklist = @file(COMM_BLACKLIST_FILE, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+  
+  if (empty($blacklist))
+  {
+    return $comment_action;
+  }
+  
   $blacklist = array_map(create_function('$w', 'return " ".preg_quote($w)." ";'), $blacklist);
   $blacklist = implode('|', $blacklist);

extensions/comments_blacklist/main.inc.php

@@ -36 +36 @@
 {
   add_event_handler('user_comment_check', 'comm_blacklist_user_comment_check', EVENT_HANDLER_PRIORITY_NEUTRAL, 2);
+  add_event_handler('user_comment_check_albums', 'comm_blacklist_user_comment_check', EVENT_HANDLER_PRIORITY_NEUTRAL, 2);
+  add_event_handler('user_comment_check_guestbook', 'comm_blacklist_user_comment_check', EVENT_HANDLER_PRIORITY_NEUTRAL, 2);
   include_once(COMM_BLACKLIST_PATH . 'include/functions.inc.php');
 }
@@ -49 +51 @@
   // apply upgrade if needed
   if (
+    COMM_BLACKLIST_VERSION == 'auto' or 
     $pwg_loaded_plugins[COMM_BLACKLIST_ID]['version'] == 'auto' or
     version_compare($pwg_loaded_plugins[COMM_BLACKLIST_ID]['version'], COMM_BLACKLIST_VERSION, '<')
@@ -56 +59 @@
     comm_blacklist_install();
     
-    if ($pwg_loaded_plugins[COMM_BLACKLIST_ID]['version'] != 'auto')
+    if ( $pwg_loaded_plugins[COMM_BLACKLIST_ID]['version'] != 'auto' and COMM_BLACKLIST_VERSION != 'auto' )
     {
       $query = '