Ticket #3359: 3359.diff

trunk/src/includes/replies/functions.php

@@ -543 +543 @@
 
                         // Filter anonymous data
                         $anonymous_data = bbp_filter_anonymous_post_data();
+
+                        // Anonymous data checks out, so set cookies, etc...
+                        bbp_set_current_anonymous_user_data( $anonymous_data );
                 }
         }
 
@@ -2227 +2230 @@
  */
 function bbp_check_reply_edit() {
 
-        // Bail if not editing a topic
+        // Bail if not editing a reply
         if ( ! bbp_is_reply_edit() ) {
                 return;
         }
 
-        // User cannot edit topic, so redirect back to reply
-        if ( ! current_user_can( 'edit_reply', bbp_get_reply_id() ) ) {
+        // User cannot edit reply, so redirect back to reply
+        if ( ! current_user_can( 'edit_reply', bbp_get_reply_id() ) && ! bbp_anonymous_user_can( 'edit_reply', bbp_get_reply_id() ) ) {
                 bbp_redirect( bbp_get_reply_url() );
         }
 }

trunk/src/includes/replies/template.php

@@ -1855 +1855 @@
                 if ( ! current_user_can( 'edit_others_replies' ) ) {
 
                         // User cannot edit or it is past the lock time
-                        if ( empty( $reply ) || ! current_user_can( 'edit_reply', $reply->ID ) || bbp_past_edit_lock( $reply->post_date_gmt ) ) {
+                        if ( empty( $reply ) || (! current_user_can( 'edit_reply', $reply->ID ) && ! bbp_anonymous_user_can( 'edit_reply', $reply->ID ) ) || bbp_past_edit_lock( $reply->post_date_gmt ) ) {
                                 return;
                         }
                 }

trunk/src/includes/topics/functions.php

@@ -460 +460 @@
 
                         // Filter anonymous data
                         $anonymous_data = bbp_filter_anonymous_post_data();
+
+                        // Anonymous data checks out, so set cookies, etc...
+                        bbp_set_current_anonymous_user_data( $anonymous_data );
                 }
         }
 
@@ -3838 +3841 @@
         }
 
         // User cannot edit topic, so redirect back to topic
-        if ( ! current_user_can( 'edit_topic', bbp_get_topic_id() ) ) {
+        if ( ! current_user_can( 'edit_topic', bbp_get_topic_id() ) && ! bbp_anonymous_user_can( 'edit_topic', bbp_get_topic_id() ) ) {
                 bbp_redirect( bbp_get_topic_permalink() );
         }
 }

trunk/src/includes/topics/template.php

@@ -2410 +2410 @@
                 if ( ! current_user_can( 'edit_others_topics' ) ) {
 
                         // User cannot edit or it is past the lock time
-                        if ( empty( $topic ) || ! current_user_can( 'edit_topic', $topic->ID ) || bbp_past_edit_lock( $topic->post_date_gmt ) ) {
+                        if ( empty( $topic ) || (! current_user_can( 'edit_topic', $topic->ID ) && ! bbp_anonymous_user_can( 'edit_topic', $topic->ID ) ) || bbp_past_edit_lock( $topic->post_date_gmt ) ) {
                                 return;
                         }
                 }

trunk/src/includes/users/capabilities.php

@@ -826 +826 @@
         // Filter & return
         return (array) apply_filters( 'bbp_get_moderators', $users, $object_id, $object_type );
 }
+
+function bbp_anonymous_user_can( $capability, ...$args ) {
+
+        switch ( $capability ) {
+
+                default:
+                        return false;
+
+                case 'edit_topic':
+                case 'edit_reply':
+
+                        $post_id = $args[0];
+                        $post = ( 'edit_topic' == $capability ) ? bbp_get_topic( $post_id ) : bbp_get_reply( $post_id );
+
+                        if ( empty( $post ) ) {
+                                return false;
+                        }
+                        
+                        if ( $post->post_author ) {
+                                return false;
+                        }
+
+                        $current_user = wp_get_current_user();
+
+                        if ( $current_user->ID ) {
+                                return false;
+                        }
+
+                        $anonymous_data = wp_get_current_commenter();
+
+                        $retval = $anonymous_data['comment_author']       == get_post_meta( $post_id, '_bbp_anonymous_name',    true ) &&
+                                          $anonymous_data['comment_author_email'] == get_post_meta( $post_id, '_bbp_anonymous_email',   true ) &&
+                                          $anonymous_data['comment_author_url']   == get_post_meta( $post_id, '_bbp_anonymous_website', true );
+
+                        return $retval;
+        }
+}