Changeset 147444

Timestamp:

08/20/2009 12:50:39 PM (17 years ago)

Author:

runejensen

Message:

1.3.4.2 - Fixed error when admin replies from WP-admin

File:

• spamtask/trunk/spamtask.php (modified) (3 diffs)

spamtask/trunk/spamtask.php

@@ -5 +5 @@
 Description: Protects your blog from comment spam, using advanced spam filtering methods. All spam robots are caught effectively.
 Author: Jenruno
-Version: 1.3.4.1
+Version: 1.3.4.2
 Author URI: http://www.jenruno.com/
 */
@@ -18 +18 @@
 
 function SpamTask_MakeCall($host, $POST) {
-    $q = 'HTTP_REFERER='.urlencode($_SERVER['HTTP_HOST']).'&REMOTE_ADDR='.urlencode($_SERVER['REMOTE_ADDR']).'&SpamTask_version=1-3-4-1';
+    $q = 'HTTP_REFERER='.urlencode($_SERVER['HTTP_HOST']).'&REMOTE_ADDR='.urlencode($_SERVER['REMOTE_ADDR']).'&SpamTask_version=1-3-4-2';
     if($POST) { foreach($POST AS $p => $v) { $q .= '&'.urlencode($p).'='.urlencode($v); } }
 
@@ -184 +184 @@
                 $_POST['author'] = $current_user->display_name;
                 $_POST['email'] = $current_user->user_email;
-            }
-            
-            $_POST['wp_blog'] = get_bloginfo('wpurl');
-            $_POST['wp_userlevel'] = $user_level;
-            $result = SpamTask_MakeCall('www.spamtask.com', $_POST);
-
-            if($result AND !strpos($result, 'errorCode">2')) {
-                SpamTask_SaveStatistics($result);
-                $comment['comment_approved'] = 'spam';
-                ob_start();
-                echo $result;
-                if(!strpos($result, 'errorCode')) {
-                    add_filter('comment_post_redirect', create_function('$a', 'ob_end_flush(); exit();'), 10, 2);
-                    return $comment;
-                } else { exit(); }
-            } else {
-                SpamTask_SaveStatistics($result);
-                $r = $wpdb->get_row("SELECT comment_ID, comment_approved, comment_post_ID FROM ".$wpdb->comments." WHERE comment_approved = 'spam' ORDER BY comment_date DESC LIMIT 1");
-                if(get_option('comment_moderation') == 1 AND $user_level < 9) {
-                    $wpdb->query("UPDATE ".$wpdb->comments." SET comment_approved = '0' WHERE comment_ID = '".$r->comment_ID."'");
+                if(strpos(' '.$_SERVER['REQUEST_URI'], 'wp-admin/admin-ajax.php')) { $in_wp_admin = TRUE; }
+                else { $in_wp_admin = FALSE; }
+            }
+            if(!$in_wp_admin) {
+                $_POST['wp_blog'] = get_bloginfo('wpurl');
+                $_POST['wp_userlevel'] = $user_level;
+                $result = SpamTask_MakeCall('www.spamtask.com', $_POST);
+
+                if($result AND !strpos($result, 'errorCode">2')) {
+                    SpamTask_SaveStatistics($result);
+                    $comment['comment_approved'] = 'spam';
+                    ob_start();
+                    echo $result;
+                    if(!strpos($result, 'errorCode')) {
+                        add_filter('comment_post_redirect', create_function('$a', 'ob_end_flush(); exit();'), 10, 2);
+                        return $comment;
+                    } else { exit(); }
                 } else {
-                    $wpdb->query("UPDATE ".$wpdb->comments." SET comment_approved = '1' WHERE comment_ID = '".$r->comment_ID."'");
-                    $wpdb->query("UPDATE ".$wpdb->posts." SET comment_count = comment_count+1 WHERE ID = '".$r->comment_post_ID."'");
-                }
-                if($user_level < 9) { wp_notify_moderator($r->comment_ID); }
-                $location = get_permalink($r->comment_post_ID);
-                wp_redirect($location); exit();
-            }
+                    SpamTask_SaveStatistics($result);
+                    $r = $wpdb->get_row("SELECT comment_ID, comment_approved, comment_post_ID FROM ".$wpdb->comments." WHERE comment_approved = 'spam' ORDER BY comment_date DESC LIMIT 1");
+                    if(get_option('comment_moderation') == 1 AND $user_level < 9) {
+                        $wpdb->query("UPDATE ".$wpdb->comments." SET comment_approved = '0' WHERE comment_ID = '".$r->comment_ID."'");
+                    } else {
+                        $wpdb->query("UPDATE ".$wpdb->comments." SET comment_approved = '1' WHERE comment_ID = '".$r->comment_ID."'");
+                        $wpdb->query("UPDATE ".$wpdb->posts." SET comment_count = comment_count+1 WHERE ID = '".$r->comment_post_ID."'");
+                    }
+                    if($user_level < 9) { wp_notify_moderator($r->comment_ID); }
+                    $location = get_permalink($r->comment_post_ID);
+                    wp_redirect($location); exit();
+                }
+            } else { return $comment; }
         }