Changeset 942231

Timestamp:

07/02/2014 03:31:15 PM (10 years ago)

Author:

eoigal

Message:

• Fix spam/ham reports to work outside of dashboard, i.e. Notifications
• Remove jQuery dependancy for comment form

Location:

akismet/trunk

Files:

• _inc/akismet.css (modified) (1 diff)
• _inc/akismet.js (modified) (1 diff)
• _inc/form.js (modified) (1 diff)
• class.akismet-admin.php (modified) (5 diffs)
• class.akismet.php (modified) (3 diffs)
• readme.txt (modified) (2 diffs)
• wrapper.php (modified) (2 diffs)

akismet/trunk/_inc/akismet.css

@@ -76 +76 @@
 }
 .checkforspam-spinner {
-    display: none;
-    margin-top: 10px;
+    display: ;
+    margin-top: px;
 }
 

akismet/trunk/_inc/akismet.js

@@ -126 +126 @@
     $('.checkforspam:not(.button-disabled)').click( function(e) {
         $('.checkforspam:not(.button-disabled)').addClass('button-disabled');
-        $('.checkforspam-spinner').show();
+        $('.checkforspam-spinner').);
         akismet_check_for_spam(0, 100);
         e.preventDefault();

akismet/trunk/_inc/form.js

@@ -1 @@
-jQuery( function ( $ ) {
-    var ak_js = $( '#ak_js' );
-
-    // If the form field already exists just use that
-    if ( ak_js.length == 0 ) {
-        ak_js = $( '<input type="hidden" id="ak_js" name="ak_js" />' );
-    }
-    else {
-        ak_js.remove();
-    }
-
-    ak_js.val( ( new Date() ).getTime() );
-
-    // single page, front-end comment form
-    // inline comment reply, wp-admin
-    $( '#commentform, #replyrow td:first' ).append( ak_js );
-} );
+if(typeof jQuery!=="undefined"){jQuery(function(e){var t=e("#ak_js");if(t.length==0){t=e('<input type="hidden" id="ak_js" name="ak_js" />')}else{t.remove()}t.val((new Date).getTime());e("#commentform, #replyrow td:first").append(t)})}else{document.addEventListener("DOMContentLoaded",function(){var e=document.getElementById("ak_js");if(!e){e=document.createElement("input");e.setAttribute("id","ak_js");e.setAttribute("type","hidden");e.setAttribute("name","ak_js")}else{e.parentNode.removeChild(e)}e.setAttribute("value",(new Date).getTime());var t=document.getElementById("commentform");if(t){t.appendChild(e)}else{var n=document.getElementById("replyrow");if(n){var r=n.getElementsByTagName("td");if(r.length>0){r[0].appendChild(aj_js)}}}},false)}

akismet/trunk/class.akismet-admin.php

@@ -34 +34 @@
         add_action( 'rightnow_end', array( 'Akismet_Admin', 'rightnow_stats' ) );
         add_action( 'manage_comments_nav', array( 'Akismet_Admin', 'check_for_spam_button' ) );
-        add_action( 'transition_comment_status', array( 'Akismet_Admin', 'transition_comment_status' ), 10, 3 );
         add_action( 'admin_action_akismet_recheck_queue', array( 'Akismet_Admin', 'recheck_queue' ) );
         add_action( 'wp_ajax_akismet_recheck_queue', array( 'Akismet_Admin', 'recheck_queue' ) );
@@ -65 +64 @@
     
     public static function admin_plugin_settings_link( $links ) { 
-        $settings_link = '<a href="'.self::get_page_url().'">'.__('Settings', 'akismet').'</a>';
+        $settings_link = '<a href="'.).'">'.__('Settings', 'akismet').'</a>';
         array_unshift( $links, $settings_link ); 
         return $links; 
@@ -332 +331 @@
             $link = add_query_arg( array( 'page' => 'akismet-admin', 'recheckqueue' => 'true', 'noheader' => 'true' ), admin_url( 'edit-comments.php' ) );
 
-        echo '</div><div class="alignleft"><a class="button-secondary checkforspam" href="' . esc_url( $link ) . '">' . esc_html__('Check for Spam', 'akismet') . '</a>';
-        echo '<img src="' . esc_url( admin_url( 'images/wpspin_light.gif' ) ) . '" class="checkforspam-spinner" />';
-    }
-
-    public static function transition_comment_status( $new_status, $old_status, $comment ) {
-        if ( $new_status == $old_status )
-            return;
-
-        # we don't need to record a history item for deleted comments
-        if ( $new_status == 'delete' )
-            return;
-
-        if ( !is_admin() )
-            return;
-
-        if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) && !current_user_can( 'moderate_comments' ) )
-            return;
-
-        if ( defined('WP_IMPORTING') && WP_IMPORTING == true )
-            return;
-
-        // if this is present, it means the status has been changed by a re-check, not an explicit user action
-        if ( get_comment_meta( $comment->comment_ID, 'akismet_rechecking' ) )
-            return;
-
-        global $current_user;
-        $reporter = '';
-        if ( is_object( $current_user ) )
-            $reporter = $current_user->user_login;
-
-        // Assumption alert:
-        // We want to submit comments to Akismet only when a moderator explicitly spams or approves it - not if the status
-        // is changed automatically by another plugin.  Unfortunately WordPress doesn't provide an unambiguous way to
-        // determine why the transition_comment_status action was triggered.  And there are several different ways by which
-        // to spam and unspam comments: bulk actions, ajax, links in moderation emails, the dashboard, and perhaps others.
-        // We'll assume that this is an explicit user action if POST or GET has an 'action' key.
-        if ( isset($_POST['action']) || isset($_GET['action']) ) {
-            if ( $new_status == 'spam' && ( $old_status == 'approved' || $old_status == 'unapproved' || !$old_status ) ) {
-                return self::submit_spam_comment( $comment->comment_ID );
-            } elseif ( $old_status == 'spam' && ( $new_status == 'approved' || $new_status == 'unapproved' ) ) {
-                return self::submit_nonspam_comment( $comment->comment_ID );
-            }
-        }
-
-        Akismet::update_comment_history( $comment->comment_ID, sprintf( __('%1$s changed the comment status to %2$s', 'akismet'), $reporter, $new_status ), 'status-' . $new_status );
+        echo '</div><div class="alignleft"><a class="button-secondary checkforspam" href="' . esc_url( $link ) . '">' . esc_html__('Check for Spam', 'akismet') . '</a><span class="checkforspam-spinner"></span>';
     }
 
@@ -561 +516 @@
     }
 
-    public static function submit_spam_comment( $comment_id ) {
-        global $wpdb, $current_user, $current_site;
-
-        $comment_id = (int) $comment_id;
-
-        $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $comment_id ) );
-
-        if ( !$comment ) // it was deleted
-            return;
-
-        if ( 'spam' != $comment->comment_approved )
-            return;
-
-        // use the original version stored in comment_meta if available
-        $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
-
-        if ( $as_submitted && is_array( $as_submitted ) && isset( $as_submitted['comment_content'] ) )
-            $comment = (object) array_merge( (array)$comment, $as_submitted );
-
-        $comment->blog         = get_bloginfo('url');
-        $comment->blog_lang    = get_locale();
-        $comment->blog_charset = get_option('blog_charset');
-        $comment->permalink    = get_permalink($comment->comment_post_ID);
-
-        if ( is_object($current_user) )
-            $comment->reporter = $current_user->user_login;
-
-        if ( is_object($current_site) )
-            $comment->site_domain = $current_site->domain;
-
-        $comment->user_role = '';
-        if ( isset( $comment->user_ID ) )
-            $comment->user_role = Akismet::get_user_roles( $comment->user_ID );
-
-        if ( Akismet::is_test_mode() )
-            $comment->is_test = 'true';
-
-        $post = get_post( $comment->comment_post_ID );
-        $comment->comment_post_modified_gmt = $post->post_modified_gmt;
-
-        $response = Akismet::http_post( build_query( $comment ), 'submit-spam' );
-        if ( $comment->reporter ) {
-            Akismet::update_comment_history( $comment_id, sprintf( __('%s reported this comment as spam', 'akismet'), $comment->reporter ), 'report-spam' );
-            update_comment_meta( $comment_id, 'akismet_user_result', 'true' );
-            update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
-        }
-
-        do_action('akismet_submit_spam_comment', $comment_id, $response[1]);
-    }
-
-    public static function submit_nonspam_comment( $comment_id ) {
-        global $wpdb, $current_user, $current_site;
-
-        $comment_id = (int) $comment_id;
-
-        $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $comment_id ) );
-        if ( !$comment ) // it was deleted
-            return;
-
-        // use the original version stored in comment_meta if available
-        $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
-
-        if ( $as_submitted && is_array($as_submitted) && isset($as_submitted['comment_content']) )
-            $comment = (object) array_merge( (array)$comment, $as_submitted );
-
-        $comment->blog         = get_bloginfo('url');
-        $comment->blog_lang    = get_locale();
-        $comment->blog_charset = get_option('blog_charset');
-        $comment->permalink    = get_permalink( $comment->comment_post_ID );
-        $comment->user_role    = '';
-
-        if ( is_object($current_user) )
-            $comment->reporter = $current_user->user_login;
-
-        if ( is_object($current_site) )
-            $comment->site_domain = $current_site->domain;
-
-        if ( isset( $comment->user_ID ) )
-            $comment->user_role = Akismet::get_user_roles($comment->user_ID);
-
-        if ( Akismet::is_test_mode() )
-            $comment->is_test = 'true';
-
-        $post = get_post( $comment->comment_post_ID );
-        $comment->comment_post_modified_gmt = $post->post_modified_gmt;
-
-        $response = Akismet::http_post( build_query( $comment ), 'submit-ham' );
-        if ( $comment->reporter ) {
-            Akismet::update_comment_history( $comment_id, sprintf( __('%s reported this comment as not spam', 'akismet'), $comment->reporter ), 'report-ham' );
-            update_comment_meta( $comment_id, 'akismet_user_result', 'false' );
-            update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
-        }
-
-        do_action('akismet_submit_nonspam_comment', $comment_id, $response[1]);
-    }
-
     // Total spam in queue
     // get_option( 'akismet_spam_count' ) is the total caught ever
@@ -792 +651 @@
     public static function display_spam_check_warning() {
         Akismet::fix_scheduled_recheck();
+
+
 
         if ( self::get_number_spam_waiting() > 0 && wp_next_scheduled('akismet_schedule_cron_recheck') > time() )
-            Akismet::view( 'notice', array( 'type' => 'spam-check' ) );
+            Akismet::view( 'notice', array( 'type' => 'spam-check' ) );
     }
 

akismet/trunk/class.akismet.php

@@ -40 +40 @@
         add_filter( 'comment_moderation_recipients', array( 'Akismet', 'disable_moderation_emails_if_unreachable' ), 1000, 2 );
         add_filter( 'pre_comment_approved', array( 'Akismet', 'last_comment_status' ), 10, 2 );
+
+
 
         if ( '3.0.5' == $GLOBALS['wp_version'] ) {
@@ -372 +374 @@
 
         return ( is_array( $response ) && ! empty( $response[1] ) ) ? $response[1] : false;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 
@@ -676 +822 @@
 
     public static function load_form_js() {
-        wp_enqueue_script( 'akismet-form', AKISMET__PLUGIN_URL . '_inc/form.js', array( 'jquery' ), AKISMET_VERSION );
+        wp_enqueue_script( 'akismet-form', AKISMET__PLUGIN_URL . '_inc/form.js', array( );
     }
 

akismet/trunk/readme.txt

@@ -3 +3 @@
 Tags: akismet, comments, spam
 Requires at least: 3.0
-Tested up to: 3.9
+Tested up to: 3.9
 Stable tag: 3.0.0
 License: GPLv2 or later
@@ -33 +33 @@
 = 3.0.1-alpha =
 * Removed dependency on PHP's fsockopen function
+
+
 
 = 3.0.0 =

akismet/trunk/wrapper.php

@@ -16 +16 @@
     _deprecated_function( __FUNCTION__, '3.0', 'Akismet::http_post()' );
 
-    $path = str_replace( '/1.1/', '', $path );
+    $path = str_replace( '/1.1/', '', $path );
 
     return Akismet::http_post( $request, $path, $ip ); 
@@ -121 +121 @@
 }
 function akismet_submit_nonspam_comment( $comment_id ) {
-    _deprecated_function( __FUNCTION__, '3.0', 'Akismet_Admin::submit_nonspam_comment()' );
-
-    return Akismet_Admin::submit_nonspam_comment( $comment_id );
+    _deprecated_function( __FUNCTION__, '3.0', 'Akismet::submit_nonspam_comment()' );
+
+    return Akismet::submit_nonspam_comment( $comment_id );
 }
 function akismet_submit_spam_comment( $comment_id ) {
-    _deprecated_function( __FUNCTION__, '3.0', 'Akismet_Admin::submit_spam_comment()' );
-
-    return Akismet_Admin::submit_spam_comment( $comment_id );
+    _deprecated_function( __FUNCTION__, '3.0', 'Akismet::submit_spam_comment()' );
+
+    return Akismet::submit_spam_comment( $comment_id );
 }
 function akismet_transition_comment_status( $new_status, $old_status, $comment ) {
-    _deprecated_function( __FUNCTION__, '3.0', 'Akismet_Admin::transition_comment_status()' );
-
-    return Akismet_Admin::transition_comment_status( $new_status, $old_status, $comment );
+    _deprecated_function( __FUNCTION__, '3.0', 'Akismet::transition_comment_status()' );
+
+    return Akismet::transition_comment_status( $new_status, $old_status, $comment );
 }
 function akismet_spam_count( $type = false ) {