Changeset 44532

Timestamp:

05/06/08 08:41:13 (2 months ago)

Author:

ear1grey

Message:

Cleaned up message describing what is about to be deleted.

Files:

• worst-offenders/trunk/functions.php (modified) (2 diffs)

worst-offenders/trunk/functions.php

@@ -251 +251 @@
 function do_delete($comma_separated_id_list) {
       global $wpdb, $keys;
-      $query = "delete from wp_comments where   comment_ID in ($comma_separated_id_list)";
+      $info["banned"] = wo3_prepare_ban_ip_addresses($comma_separated_id_list);
+      $query = "delete from wp_comments where comment_ID in ($comma_separated_id_list)";
       $result = $wpdb->query($query);
-      return $result;
+      $info["deleted"] = $result;
+      return $info;
+}
+
+
+function wo3_prepare_ban_ip_addresses($comma_separated_id_list) {
+      global $wpdb, $keys, $wo3_feedback;
+      $query = "select distinct comment_author_IP from wp_comments where comment_ID in ($comma_separated_id_list)";
+      $results = $wpdb->get_results($query);
+      $ban=0;
+      foreach($results as $result) {
+            do_action("ban_ip_address", $result->comment_author_IP);
+            $ban++;
+      }
+      return $ban;      
 }
 
@@ -292 +307 @@
             if (!empty($_POST['worst'])) {
                   $deletionList     =     implode(",", $_POST['worst']);
-//                $wo3_feedback[] = "<div class='updated'>$deletionList</div>";
-                  $deleted = do_delete($deletionList);
-                  if ($deleted === false) {
+                  $info = do_delete($deletionList);
+                  if ($info["deleted"] === false)     {
                         $wo3_feedback[] = "<div class='updated'>DB      Error -     Failed to   delete - Boo!      Perhaps the DB   log   can   help!</div>";
                   }     else {
-                        $wo3_feedback[] = "<div class='updated'>Congratulations!  You just ignored <strong>$deleted</strong> servings of spam!</div>";
+                        $wo3_feedback[] = "<div class='updated'>Congratulations!  You just ignored <strong>".$info["deleted"]."</strong> servings of spam, from <strong>".$info["banned"]."</strong> worst offenders.</div>";
                         update_option( $keys['counter'], $deleted + get_option( $keys['counter'] ) );
                         reset_current_count();