Changeset 2287 for trunk/bp-activity.php

Timestamp:

01/10/2010 08:42:42 PM (16 years ago)

Author:

apeatling

Message:

Shifted the filter select from the main activity page tab row onto a second row to accommodate the missing feed link (links will be altered on an upcoming commit). Added a mentions tab. Tweaked a couple of css styles and ID's for better re-use.

File:

• trunk/bp-activity.php (modified) (3 diffs)

trunk/bp-activity.php

@@ -194 +194 @@
 
 function bp_activity_screen_notification_settings() {
-    global $current_user; ?>
+    global $bp; ?>
     <table class="notification-settings" id="activity-notification-settings">
         <tr>
@@ -205 +205 @@
         <tr>
             <td></td>
-            <td><?php printf( __( 'A member mentions you in an update using "@%s"', 'buddypress' ), $current_user->user_login ) ?></td>
-            <td class="yes"><input type="radio" name="notifications[notification_activity_new_mention]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_activity_new_mention' ) || 'yes' == get_usermeta( $current_user->id, 'notification_activity_new_mention' ) ) { ?>checked="checked" <?php } ?>/></td>
-            <td class="no"><input type="radio" name="notifications[notification_activity_new_mention]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_activity_new_mention' ) ) { ?>checked="checked" <?php } ?>/></td>
+            <td><?php printf( __( 'A member mentions you in an update using "@%s"', 'buddypress' ), bp_core_get_username( $bp->displayed_user->user_id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) ?></td>
+            <td class="yes"><input type="radio" name="notifications[notification_activity_new_mention]" value="yes" <?php if ( !get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_mention' ) || 'yes' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_mention' ) ) { ?>checked="checked" <?php } ?>/></td>
+            <td class="no"><input type="radio" name="notifications[notification_activity_new_mention]" value="no" <?php if ( 'no' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_mention' ) ) { ?>checked="checked" <?php } ?>/></td>
         </tr>
         <tr>
             <td></td>
             <td><?php printf( __( "A member replies to an update you've posted", 'buddypress' ), $current_user->user_login ) ?></td>
-            <td class="yes"><input type="radio" name="notifications[notification_activity_new_reply]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_activity_new_reply' ) || 'yes' == get_usermeta( $current_user->id, 'notification_activity_new_reply' ) ) { ?>checked="checked" <?php } ?>/></td>
-            <td class="no"><input type="radio" name="notifications[notification_activity_new_reply]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_activity_new_reply' ) ) { ?>checked="checked" <?php } ?>/></td>
+            <td class="yes"><input type="radio" name="notifications[notification_activity_new_reply]" value="yes" <?php if ( !get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_reply' ) || 'yes' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_reply' ) ) { ?>checked="checked" <?php } ?>/></td>
+            <td class="no"><input type="radio" name="notifications[notification_activity_new_reply]" value="no" <?php if ( 'no' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_reply' ) ) { ?>checked="checked" <?php } ?>/></td>
         </tr>
 
@@ -444 +444 @@
 }
 
+function bp_activity_post_update( $args = '' ) {
+    global $bp;
+
+    $defaults = array(
+        'content' => false,
+        'user_id' => $bp->loggedin_user->id
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r, EXTR_SKIP );
+
+    if ( empty($content) || empty($content) )
+        return false;
+
+    /* Record this on the user's profile */
+    $from_user_link = bp_core_get_userlink( $user_id );
+    $activity_content = sprintf( __('%s posted an update:', 'buddypress'), $from_user_link );
+    $activity_content .= '<div class="activity-inner">' . $content . '</div>';
+
+    $primary_link = bp_core_get_userlink( $user_id, false, true );
+
+    /* Now write the values */
+    $activity_id = bp_activity_add( array(
+        'user_id' => $user_id,
+        'content' => apply_filters( 'bp_activity_new_update_content', $activity_content ),
+        'primary_link' => apply_filters( 'bp_activity_new_update_primary_link', $primary_link ),
+        'component_name' => $bp->activity->id,
+        'component_action' => 'new_wire_post'
+    ) );
+
+    /* Add this update to the "latest update" usermeta so it can be fetched anywhere. */
+    update_usermeta( $bp->loggedin_user->id, 'bp_latest_update', array( 'id' => $activity_id, 'content' => wp_filter_kses( $content ) ) );
+
+    do_action( 'bp_activity_posted_update', $content, $user_id, $activity_id );
+
+    return $activity_id;
+}
+
 function bp_activity_new_comment( $args = '' ) {
     global $bp;