Changeset 2004 for trunk/bp-groups.php

Timestamp:

09/30/2009 04:42:06 PM (17 years ago)

Author:

apeatling

Message:

Group forum editing and activity recording fixes.

File:

• trunk/bp-groups.php (modified) (16 diffs)

trunk/bp-groups.php

@@ -601 +601 @@
     
     if ( $bp->is_single_item && $bp->groups->current_group->user_has_access ) {
+        
+        /* Fetch the details we need */
         $topic_slug = $bp->action_variables[1];
         $topic_id = bp_forums_get_topic_id_from_slug( $topic_slug );
@@ -637 +639 @@
                     bp_core_add_message( __( 'The topic was made sticky successfully', 'buddypress' ) );
             
-                do_action( 'groups_stick_topic', $topic_id );
+                do_action( 'groups_stick_forum_topic', $topic_id );
                 bp_core_redirect( wp_get_referer() );
             }
@@ -651 +653 @@
                     bp_core_add_message( __( 'The topic was unstuck successfully', 'buddypress') );
             
-                do_action( 'groups_unstick_topic', $topic_id );
+                do_action( 'groups_unstick_forum_topic', $topic_id );
                 bp_core_redirect( wp_get_referer() );
             }
@@ -665 +667 @@
                     bp_core_add_message( __( 'The topic was closed successfully', 'buddypress') );
             
-                do_action( 'groups_close_topic', $topic_id );
+                do_action( 'groups_close_forum_topic', $topic_id );
                 bp_core_redirect( wp_get_referer() );
             }
@@ -679 +681 @@
                     bp_core_add_message( __( 'The topic was opened successfully', 'buddypress') );
             
-                do_action( 'groups_open_topic', $topic_id );
+                do_action( 'groups_open_forum_topic', $topic_id );
                 bp_core_redirect( wp_get_referer() );
             }
 
             /* Delete a topic */
-            else if ( 'delete' == $bp->action_variables[2] && empty( $bp->action_variables[3] ) && ( $bp->is_item_admin || $bp->is_item_mod ) ) {
+            else if ( 'delete' == $bp->action_variables[2] && empty( $bp->action_variables[3] ) ) {
+                /* Fetch the topic */
+                $topic = bp_forums_get_topic_details( $topic_id );
+
+                /* Check the logged in user can delete this topic */
+                if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)$bp->loggedin_user->id != (int)$topic->topic_poster )
+                    bp_core_redirect( wp_get_referer() );
+                
                 /* Check the nonce */
                 check_admin_referer( 'bp_forums_delete_topic' );
@@ -692 +701 @@
                 else
                     bp_core_add_message( __( 'The topic was deleted successfully', 'buddypress') );
-
+                
+                do_action( 'groups_delete_forum_topic', $topic_id );
                 bp_core_redirect( wp_get_referer() );
             }
             
             /* Editing a topic */
-            else if ( 'edit' == $bp->action_variables[2] && empty( $bp->action_variables[3] ) && ( $bp->is_item_admin || $bp->is_item_mod ) ) {
+            else if ( 'edit' == $bp->action_variables[2] && empty( $bp->action_variables[3] ) ) {
+                /* Fetch the topic */
+                $topic = bp_forums_get_topic_details( $topic_id );
+
+                /* Check the logged in user can edit this topic */
+                if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)$bp->loggedin_user->id != (int)$topic->topic_poster )
+                    bp_core_redirect( wp_get_referer() );
+
                 if ( isset( $_POST['save_changes'] ) ) {
                     /* Check the nonce */
@@ -707 +724 @@
                         bp_core_add_message( __( 'The topic was edited successfully', 'buddypress') );
                 
+                    do_action( 'groups_edit_forum_topic', $topic_id );
                     bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic_slug . '/' );
                 }
-
-                /* Check that the user has access to edit this topic, if not, redirect. */
-                $topic = bp_forums_get_topic_details( $topic_id );
-                if ( ( !$bp->is_item_admin && !$bp->is_item_mod ) && $bp->loggedin_user->id != $topic->topic_poster )
-                    bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic_slug . '/' );
-
+                
                 bp_core_load_template( apply_filters( 'groups_template_group_forum_topic_edit', 'groups/single/forum/edit' ) );
             }
             
             /* Delete a post */
-            else if ( 'delete' == $bp->action_variables[2] && $bp->action_variables[4] && ( $bp->is_item_admin || $bp->is_item_mod ) ) {
+            else if ( 'delete' == $bp->action_variables[2] && $post_id = $bp->action_variables[4] ) {
+                /* Fetch the post */
+                $post = bp_forums_get_post( $post_id );
+
+                /* Check the logged in user can edit this topic */
+                if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)$bp->loggedin_user->id != (int)$post->poster_id )
+                    bp_core_redirect( wp_get_referer() );
+
                 /* Check the nonce */
                 check_admin_referer( 'bp_forums_delete_post' );
@@ -727 +747 @@
                 else
                     bp_core_add_message( __( 'The post was deleted successfully', 'buddypress') );
-
+                
+                do_action( 'groups_delete_forum_post', $post_id );
                 bp_core_redirect( wp_get_referer() );
             }
@@ -733 +754 @@
             /* Editing a post */
             else if ( 'edit' == $bp->action_variables[2] && $post_id = $bp->action_variables[4] ) {
+                /* Fetch the post */
+                $post = bp_forums_get_post( $bp->action_variables[4] );
+
+                /* Check the logged in user can edit this topic */
+                if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)$bp->loggedin_user->id != (int)$post->poster_id )
+                    bp_core_redirect( wp_get_referer() );
+
                 if ( isset( $_POST['save_changes'] ) ) {
                     /* Check the nonce */
@@ -741 +769 @@
                     else
                         bp_core_add_message( __( 'The post was edited successfully', 'buddypress') );
-                
+                    
+                    do_action( 'groups_edit_forum_post', $post_id );
                     bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic_slug . '/' );
                 }
                 
-                /* Check that the user has access to edit this post, if not, redirect. */
-                $post = bp_forums_get_post( $post_id );
-                if ( ( !$bp->is_item_admin && !$bp->is_item_mod ) && $bp->loggedin_user->id != $post->poster_id )
-                    bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic_slug . '/' );
-
                 bp_core_load_template( apply_filters( 'groups_template_group_forum_topic_edit', 'groups/single/forum/edit' ) );
             }
@@ -760 +784 @@
                     bp_core_load_template( apply_filters( 'groups_template_group_forum_topic', 'groups/forum/topic' ) );
             }
+            
         } else {
 
@@ -2098 +2123 @@
             'component_action' => 'new_forum_post',
             'item_id' => $bp->groups->current_group->id,
-            'secondary_item_id' => $forum_post->id
+            'secondary_item_id' => $forum_post
         ) );
 
@@ -2143 +2168 @@
     if ( $topic = bp_forums_update_topic( array( 'topic_title' => $topic_title, 'topic_text' => $topic_text, 'topic_id' => $topic_id ) ) ) {
         /* Update the activity stream item */
-        bp_activity_delete_by_item_id( array( 'item_id' => $topic_id, 'component_name' => 'groups', 'component_action' => 'new_forum_topic' ) );
+        if ( function_exists( 'bp_activity_delete_by_item_id' ) )
+            bp_activity_delete_by_item_id( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $topic_id, 'component_name' => $bp->groups->id, 'component_action' => 'new_forum_topic' ) );
         
         $activity_content = sprintf( __( '%s started the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $topic->topic_poster ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic->topic_slug .'">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
@@ -2172 +2198 @@
     $post = bp_forums_get_post( $post_id );
         
-    if ( $post_id = bp_forums_insert_post( array( 'post_id' => $post_id, 'post_text' => $post_text, 'post_time' => $post->post_time, 'topic_id' => $topic_id ) ) ) {
+    if ( $post_id = bp_forums_insert_post( array( 'post_id' => $post_id, 'post_text' => $post_text, 'post_time' => $post->post_time, 'topic_id' => $topic_id, 'poster_id' => $post->poster_id ) ) ) {
         $topic = bp_forums_get_topic_details( $topic_id );
 
         /* Update the activity stream item */
-        bp_activity_delete_by_item_id( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $post_id, 'component_name' => 'groups', 'component_action' => 'new_forum_post' ) );
-        
+        if ( function_exists( 'bp_activity_delete_by_item_id' ) )
+            bp_activity_delete_by_item_id( array( 'item_id' => $bp->groups->current_group->id, 'secondary_item_id' => $post_id, 'component_name' => $bp->groups->id, 'component_action' => 'new_forum_post' ) );
+            
         $activity_content = sprintf( __( '%s posted on the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $post->poster_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic->topic_slug .'">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
         $activity_content .= '<blockquote>' . bp_create_excerpt( attribute_escape( $post_text ) ) . '</blockquote>';
@@ -2186 +2213 @@
             'primary_link' => apply_filters( 'groups_activity_new_forum_post_primary_link', bp_get_group_permalink( $bp->groups->current_group ) ),
             'component_action' => 'new_forum_post',
-            'item_id' => $bp->groups->current_group->id,
+            'item_id' => (int)$bp->groups->current_group->id,
+            'user_id' => (int)$post->poster_id,
             'secondary_item_id' => $post_id,
             'recorded_time' => strtotime( $post->post_time )
@@ -2205 +2233 @@
         /* Delete the activity stream item */
         if ( function_exists( 'bp_activity_delete_by_item_id' ) ) {
-            bp_activity_delete_by_item_id( array( 'item_id' => $topic_id, 'component_name' => 'groups', 'component_action' => 'new_forum_topic' ) );
-            bp_activity_delete_by_item_id( array( 'item_id' => $topic_id, 'component_name' => 'groups', 'component_action' => 'new_forum_post' ) );
+            bp_activity_delete_by_item_id( array( 'item_id' => $topic_id, 'component_name' => $bp->groups->id, 'component_action' => 'new_forum_topic' ) );
+            bp_activity_delete_by_item_id( array( 'item_id' => $topic_id, 'component_name' => $bp->groups->id, 'component_action' => 'new_forum_post' ) );
         }