Changeset 5280

Timestamp:

11/05/2011 09:38:08 PM (13 years ago)

Author:

djpaul

Message:

Add Akismet history information to the Activity admin page's items.
Use new wrapper functions to get user's UA and IP for Akismet calls.
Rename Activity admin page slug.

Location:

trunk

Files:

• bp-activity/bp-activity-admin.php (modified) (2 diffs)
• bp-activity/bp-activity-akismet.php (modified) (2 diffs)
• bp-core/bp-core-cssjs.php (modified) (1 diff)

trunk/bp-activity/bp-activity-admin.php

@@ -32 +32 @@
 
     // Add our screen
-    $hook = add_menu_page( __( 'Activity', 'buddypress' ), __( 'Activity', 'buddypress' ), 'manage_options', 'bp-activity-settings', 'bp_activity_admin' );
+    $hook = add_menu_page( __( 'Activity', 'buddypress' ), __( 'Activity', 'buddypress' ), 'manage_options', 'bp-activity', 'bp_activity_admin' );
 
     // Hook into early actions to load custom CSS and our init handler.
@@ -521 +521 @@
 
         /* translators: 1: activity admin screen permalink, 2: activity ID */
-        printf( __( '<a href="%1$s">Activity ID #%2$d</a>', 'buddypress' ), network_admin_url( 'admin.php?page=bp-activity-settings&a=' . $item['secondary_item_id'] ), $item['secondary_item_id'] );
+        printf( __( '<a href="%1$s">Activity ID #%2$d</a>', 'buddypress' ), network_admin_url( 'admin.php?page=bp-activity&a=' . $item['secondary_item_id'] ), $item['secondary_item_id'] );
     }
 }?>

trunk/bp-activity/bp-activity-akismet.php

@@ -55 +55 @@
 
         // Hook into the Activity wp-admin screen
-        //add_action( 'bp_activity_admin_comment_row_actions', array( $this, 'add_activity_status_row' ), 10, 2 );
-    }
+        add_action( 'bp_activity_admin_comment_row_actions', array( $this, 'comment_row_action' ), 10, 2 );
+    }
+
+    /**
+     * Add a history item to the hover links in an activity's row.
+     *
+     * This function lifted with love from the Akismet WordPress plugin's
+     * akismet_comment_row_action() function. Thanks!
+     *
+     * @param array $actions The hover links
+     * @param array $activity The activity for the current row being processed
+     * @return array The hover links
+     * @since 1.6
+     */
+    function comment_row_action( $actions, $activity ) {
+        $akismet_result = bp_activity_get_meta( $activity['id'], '_bp_akismet_result' );
+        $user_result    = bp_activity_get_meta( $activity['id'], '_bp_akismet_user_result' );
+        $desc           = '';
+
+        if ( !$user_result || $user_result == $akismet_result ) {
+            // Show the original Akismet result if the user hasn't overridden it, or if their decision was the same
+            if ( $akismet_result == 'true' && $activity['is_spam'] )
+                $desc = __( 'Flagged as spam by Akismet', 'buddypress' );
+
+            elseif ( $akismet_result == 'false' && !$activity['is_spam'] )
+                $desc = __( 'Cleared by Akismet', 'buddypress' );
+
+        } else {
+            $who = bp_activity_get_meta( $activity['id'], '_bp_akismet_user' );
+
+            if ( $user_result == 'true' )
+                $desc = sprintf( __( 'Flagged as spam by %s', 'buddypress' ), $who );
+            else
+                $desc = sprintf( __( 'Un-spammed by %s', 'buddypress' ), $who );
+        }
+
+        // add a History item to the hover links, just after Edit
+        if ( $akismet_result ) {
+            $b = array();
+            foreach ( $actions as $k => $item ) {
+                $b[ $k ] = $item;
+                if ( $k == 'edit' )
+                    $b['history'] = '<a href="#"> '. __( 'History', 'buddypress' ) . '</a>';
+            }
+
+            $actions = $b;
+        }
+
+        if ( $desc )
+            echo '<span class="akismet-status"><a href="#">' . htmlspecialchars( $desc ) . '</a></span>';
+
+        return apply_filters( 'bp_akismet_comment_row_action', $actions );
+    }
+
 
     /**
@@ -372 +424 @@
         $activity_data['blog_lang']    = get_locale();
         $activity_data['referrer']     = $_SERVER['HTTP_REFERER'];
-        $activity_data['user_agent']   = $_SERVER['HTTP_USER_AGENT'];
-        $activity_data['user_ip']      = $_SERVER['REMOTE_ADDR'];
+        $activity_data['user_agent']   = bp_core_current_user_ua();
+        $activity_data['user_ip']      = bp_core_current_user_ip();
 
         if ( akismet_test_mode() )

trunk/bp-core/bp-core-cssjs.php

@@ -31 +31 @@
 
         /* Activity Icon */
-        ul#adminmenu li.toplevel_page_bp-activity-settings .wp-menu-image a img { display: none; }
-        ul#adminmenu li.toplevel_page_bp-activity-settings .wp-menu-image a { background-image: url( <?php echo plugins_url( 'buddypress/bp-core/images/admin_menu_icon.png' ) ?> ) !important; background-position: -1px -32px; }
-        ul#adminmenu li.toplevel_page_bp-activity-settings:hover .wp-menu-image a,
-        ul#adminmenu li.toplevel_page_bp-activity-settings.wp-has-current-submenu .wp-menu-image a {
+        ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image a img { display: none; }
+        ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image a { background-image: url( <?php echo plugins_url( 'buddypress/bp-core/images/admin_menu_icon.png' ) ?> ) !important; background-position: -1px -32px; }
+        ul#adminmenu li.toplevel_page_bp-activity:hover .wp-menu-image a,
+        ul#adminmenu li.toplevel_page_bp-activity.wp-has-current-submenu .wp-menu-image a {
             background-position: -1px 0;
         }