Changeset 2158

Timestamp:

11/30/2009 12:27:52 PM (16 years ago)

Author:

apeatling

Message:

Adding activity item permalink support

Location:

trunk

Files:

• bp-activity.php (modified) (4 diffs)
• bp-activity/bp-activity-classes.php (modified) (2 diffs)
• bp-activity/bp-activity-templatetags.php (modified) (4 diffs)
• bp-activity/bp-activity-widgets.php (modified) (1 diff)
• bp-groups.php (modified) (3 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (2 diffs)
• bp-themes/bp-default/_inc/css/screen.css (modified) (1 diff)
• bp-themes/bp-sn-parent/activity/entry.php (modified) (1 diff)
• bp-themes/bp-sn-parent/activity/just-me.php (modified) (1 diff)
• bp-themes/bp-sn-parent/groups/single/home.php (modified) (1 diff)

trunk/bp-activity.php

@@ -83 +83 @@
     bp_core_add_root_component( BP_ACTIVITY_SLUG );
 }
-add_action( 'plugins_loaded', 'bp_activity_setup_root_component' );
+add_action( 'plugins_loaded', 'bp_activity_setup_root_component', 2 );
 
 function bp_activity_setup_nav() {
@@ -136 +136 @@
 }
 
+function bp_activity_screen_single_activity_permalink() {
+    global $bp;
+
+    if ( !$bp->displayed_user->id || $bp->current_component != $bp->activity->slug )
+        return false;
+
+    if ( empty( $bp->current_action ) || !is_numeric( $bp->current_action ) )
+        return false;
+
+    /* Get the activity details */
+    $activity = bp_activity_get_specific( array( 'activity_ids' => $bp->current_action ) );
+
+    if ( !$activity = $activity['activities'][0] )
+        bp_core_redirect( $bp->root_domain );
+
+    $has_access = true;
+    /* Redirect based on the type of activity */
+    if ( $activity->component_name == $bp->groups->id ) {
+        if ( !function_exists( 'groups_get_group' ) )
+            bp_core_redirect( $bp->root_domain );
+
+        if ( $group = groups_get_group( array( 'group_id' => $activity->item_id ) ) ) {
+            /* Check to see if the group is not public, if so, check the user has access to see this activity */
+            if ( 'public' != $group->status ) {
+                if ( !groups_is_user_member( $bp->loggedin_user->id, $group->id ) )
+                    $has_access = false;
+            }
+        }
+    }
+
+    $has_access = apply_filters( 'bp_activity_permalink_access', $has_access, &$activity );
+
+    if ( !$has_access ) {
+        bp_core_add_message( __( 'You do not have access to this activity.', 'buddypress' ), 'error' );
+        bp_core_redirect( $bp->loggedin_user->domain );
+    }
+
+    bp_core_load_template( apply_filters( 'bp_activity_template_profile_activity_permalink', 'activity/single' ) );
+}
+/* This screen is not attached to a nav item, so we need to add an action for it. */
+add_action( 'wp', 'bp_activity_screen_single_activity_permalink', 3 );
 
 /********************************************************************************
@@ -145 +186 @@
  */
 
+function bp_activity_action_permalink_router() {
+    global $bp;
+
+    if ( $bp->current_component != $bp->activity->slug || $bp->current_action != 'p' )
+        return false;
+
+    if ( empty( $bp->action_variables[0] ) || !is_numeric( $bp->action_variables[0] ) )
+        return false;
+
+    /* Get the activity details */
+    $activity = bp_activity_get_specific( array( 'activity_ids' => $bp->action_variables[0] ) );
+
+    if ( !$activity = $activity['activities'][0] )
+        bp_core_redirect( $bp->root_domain );
+
+    $redirect = false;
+    /* Redirect based on the type of activity */
+    if ( $activity->component_name == $bp->groups->id ) {
+        if ( $activity->user_id )
+            $redirect = bp_core_get_userurl( $activity->user_id ) . $bp->activity->slug . '/' . $activity->id;
+        else {
+            if ( $group = groups_get_group( array( 'group_id' => $activity->item_id ) ) )
+                $redirect = bp_get_group_permalink( $group ) . $bp->activity->slug . '/' . $activity->id;
+        }
+    } else
+        $redirect = bp_core_get_userurl( $activity->user_id ) . $bp->activity->slug . '/' . $activity->id;
+
+    if ( !$redirect )
+        bp_core_redirect( $bp->root_domain );
+
+    /* Redirect to the actual activity permalink page */
+    bp_core_redirect( apply_filters( 'bp_activity_action_permalink_url', $redirect . '/', &$activity ) );
+}
+add_action( 'wp', 'bp_activity_action_permalink_router', 3 );
+
 function bp_activity_action_delete_activity() {
     global $bp;
@@ -178 +254 @@
 }
 add_action( 'wp', 'bp_activity_action_delete_activity', 3 );
-
 
 function bp_activity_action_sitewide_feed() {

trunk/bp-activity/bp-activity-classes.php

@@ -188 +188 @@
             $sort = 'DESC';
 
+        /* Hide Hidden Items? */
+        if ( !$show_hidden )
+            $hidden_sql = "AND hide_sitewide = 0";
+
         /* Alter the query based on whether we want to show activity item comments in the stream like normal comments or threaded below the activity */
         if ( !$display_comments || 'threaded' == $display_comments ) {
             if ( $per_page && $page && $max )
-                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d {$search_sql} {$filter_sql} AND component_action != 'activity_comment' ORDER BY date_recorded {$sort} {$pag_sql}", $user_id ) );
+                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d {$search_sql} {$filter_sql} {$hidden_sql} AND component_action != 'activity_comment' ORDER BY date_recorded {$sort} {$pag_sql}", $user_id ) );
             else
-                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d {$search_sql} {$filter_sql} AND component_action != 'activity_comment' ORDER BY date_recorded {$sort} {$pag_sql} {$max_sql}", $user_id ) );
-
-            $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE user_id = %d {$search_sql} {$filter_sql} AND component_action != 'activity_comment' ORDER BY date_recorded {$sort} {$max_sql}", $user_id ) );
+                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d {$search_sql} {$filter_sql} {$hidden_sql} AND component_action != 'activity_comment' ORDER BY date_recorded {$sort} {$pag_sql} {$max_sql}", $user_id ) );
+
+            $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE user_id = %d {$search_sql} {$filter_sql} {$hidden_sql} AND component_action != 'activity_comment' ORDER BY date_recorded {$sort} {$max_sql}", $user_id ) );
 
             if ( $activities && $display_comments )
@@ -201 +205 @@
         } else {
             if ( $per_page && $page && $max )
-                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d {$search_sql} {$filter_sql} ORDER BY date_recorded {$sort} {$pag_sql}", $user_id ) );
+                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d {$search_sql} {$filter_sql} {$hidden_sql} ORDER BY date_recorded {$sort} {$pag_sql}", $user_id ) );
             else
-                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d {$search_sql} {$filter_sql} ORDER BY date_recorded {$sort} {$pag_sql} {$max_sql}", $user_id ) );
-
-            $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE user_id = %d {$search_sql} {$filter_sql} ORDER BY date_recorded {$sort} {$max_sql}", $user_id ) );
+                $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE user_id = %d {$search_sql} {$filter_sql} {$hidden_sql} ORDER BY date_recorded {$sort} {$pag_sql} {$max_sql}", $user_id ) );
+
+            $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE user_id = %d {$search_sql} {$filter_sql} {$hidden_sql} ORDER BY date_recorded {$sort} {$max_sql}", $user_id ) );
 
             if ( $activities )

trunk/bp-activity/bp-activity-templatetags.php

@@ -32 +32 @@
 
             if ( $type == 'personal' )
-                $this->activities = bp_activity_get_for_user( array( 'user_id' => $user_id, 'display_comments' => $display_comments, 'max' => $max, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'sort' => $sort, 'search_terms' => $search_terms, 'filter' => $filter ) );
+                $this->activities = bp_activity_get_for_user( array( 'user_id' => $user_id, 'display_comments' => $display_comments, 'max' => $max, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'sort' => $sort, 'search_terms' => $search_terms, 'filter' => $filter, 'show_hidden' => $show_hidden ) );
 
             if ( $type == 'friends' && ( bp_is_home() || is_site_admin() || $bp->loggedin_user->id == $user_id ) )
@@ -153 +153 @@
     }
 
+    /* Support for permalinks on single item pages: /groups/my-group/activity/124/ */
+    if ( $bp->current_action == $bp->activity->slug )
+        $include = $bp->action_variables[0];
+
     if ( isset( $_GET['afilter'] ) )
         $filter = array( 'object' => $_GET['afilter'] );
@@ -348 +352 @@
     }
 
+    if ( 'activity_comment' == $activities_template->activity->component_action )
+        $meta = '</span> <span class="activity-header-meta"> &middot; <a href="' . $bp->root_domain . '/' . BP_ACTIVITY_SLUG . '/p/' . $activities_template->activity->item_id . '">' . __( 'View Thread', 'buddypress' ) . '</a>';
+    else
+        $meta = '</span> <span class="activity-header-meta"> &middot; <a href="' . $bp->root_domain . '/' . BP_ACTIVITY_SLUG . '/p/' . $activities_template->activity->id . '">' . __( 'Permalink', 'buddypress' ) . '</a>';
+
     /* Add the delete link if the user has permission on this item */
     if ( ( $activities_template->activity->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin || is_site_admin() )
-        $content[1] = '</span> <span class="activity-delete-link">' . bp_get_activity_delete_link() . '</span>' . $content[1];
-
+         $meta .= ' &middot;' . bp_get_activity_delete_link();
+
+    $content[1] = $meta . '</span>' . $content[1];
     $content_new = '';
 
@@ -486 +496 @@
     return apply_filters( 'bp_activity_insert_time_since', @sprintf( $content, @sprintf( __( '&nbsp; %s ago', 'buddypress' ), bp_core_time_since( strtotime( $date ) ) ) ) );
 }
+
+function bp_activity_permalink_id() {
+    echo bp_get_activity_permalink_id();
+}
+    function bp_get_activity_permalink_id() {
+        global $bp;
+
+        return apply_filters( 'bp_get_activity_permalink_id', $bp->current_action );
+    }
 
 function bp_activity_css_class() {

trunk/bp-activity/bp-activity-widgets.php

@@ -49 +49 @@
                     <div id="whats-new-submit">
                         <span class="ajax-loader"></span> &nbsp;
-                        <input type="submit" name="aw-whats-new-submit" id="aw-whats-new-submit" value="<?php _e( 'Update', 'callisto' ) ?>" />
+                        <input type="submit" name="aw-whats-new-submit" id="aw-whats-new-submit" value="<?php _e( 'Post Update', 'callisto' ) ?>" />
                     </div>
 

trunk/bp-groups.php

@@ -575 +575 @@
 }
 
-
 function groups_screen_group_home() {
     global $bp;
 
     if ( $bp->is_single_item ) {
-
         if ( isset($_GET['new']) ) {
             // Delete group request notifications for the user
@@ -975 +973 @@
     }
 }
+
+function groups_screen_group_activity_permalink() {
+    global $bp;
+
+    if ( !$bp->is_single_item || $bp->current_component != $bp->groups->slug || $bp->current_action != $bp->activity->slug )
+        return false;
+
+    if ( '' != locate_template( array( 'groups/single/home.php' ), false ) )
+        bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
+    else
+        bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/group-home' ) );
+}
+add_action( 'wp', 'groups_screen_group_activity_permalink', 3 );
 
 function groups_screen_group_admin() {
@@ -1607 +1618 @@
  */
 
+function groups_get_group( $args = '' ) {
+    $defaults = array(
+        'group_id' => false,
+        'load_users' => false
+    );
+
+    $args = wp_parse_args( $args, $defaults );
+    extract( $args, EXTR_SKIP );
+
+    return apply_filters( 'groups_get_group', new BP_Groups_Group( $group_id, true, $load_users ) );
+}
+
 /*** Group Creation, Editing & Deletion *****************************************/
 

trunk/bp-groups/bp-groups-templatetags.php

@@ -484 +484 @@
             $group =& $groups_template->group;
 
-        return apply_filters( 'bp_get_group_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group->slug );
+        return apply_filters( 'bp_get_group_permalink', $bp->root_domain . '/' . $bp->groups->slug . '/' . $group->slug . '/' );
     }
 
@@ -739 +739 @@
 }
 
+function bp_group_is_activity_permalink() {
+    global $bp;
+
+    if ( !$bp->is_single_item || $bp->current_component != $bp->groups->slug || $bp->current_action != $bp->activity->slug )
+        return false;
+
+    return true;
+}
+
 function bp_group_pagination() {
     echo bp_get_group_pagination();

trunk/bp-themes/bp-default/_inc/css/screen.css

@@ -1341 +1341 @@
             margin-bottom: 18px;
         }
+
+.activity-list li span.activity-header-meta {
+    font-size: 0.95em;
+}
+    .activity-list li span.activity-header-meta a {
+        color: #888;
+    }
 
 .activity-list li span.time-since {

trunk/bp-themes/bp-sn-parent/activity/entry.php

@@ -22 +22 @@
             <div class="ac-reply-avatar"><?php bp_loggedin_user_avatar( 'width=25&height=25' ) ?></div>
             <div class="ac-reply-content">
-                <textarea id="ac-input-<?php bp_activity_id() ?>" class="ac-input" name="ac-input-<?php bp_activity_id() ?>"></textarea>
+                <div class="ac-textarea">
+                    <textarea id="ac-input-<?php bp_activity_id() ?>" class="ac-input" name="ac-input-<?php bp_activity_id() ?>"></textarea>
+                </div>
+
                 <input type="submit" name="ac-form-submit" value="<?php _e( 'Post', 'buddypress' ) ?> &rarr;" />
             </div>

trunk/bp-themes/bp-sn-parent/activity/just-me.php

@@ -54 +54 @@
                     <div class="activity">
 
-                    <?php if ( bp_has_activities( 'type=personal&max=20&per_page=20&display_comments=stream' ) ) : ?>
+                    <?php if ( bp_has_activities( 'type=personal&max=20&per_page=20&display_comments=stream&show_hidden=' . bp_is_home() ) ) : ?>
 
                         <ul id="activity-list" class="activity-list item-list">

trunk/bp-themes/bp-sn-parent/groups/single/home.php

@@ -59 +59 @@
                             <h4><?php _e( 'Group Activity', 'buddypress' ); ?></h4>
 
-                            <?php if ( is_user_logged_in() && bp_group_is_member() ) : ?>
+                            <?php if ( is_user_logged_in() && bp_group_is_member() && !bp_group_is_activity_permalink() ) : ?>
 
                             <form action="" method="post" id="whats-new-form" name="whats-new-form">