Changeset 13436 for trunk/src/bp-activity/classes/class-bp-akismet.php

Timestamp:

03/15/2023 08:16:46 AM (2 years ago)

Author:

imath

Message:

Make more BuddyPress generated links ready for BP Rewrites

• Improve the Members component adding permastructs and custom rewrite

rules for registration and activation pages.

• Improve the Blogs component adding custom rewrite rule to handle the

Blogs create page.

• Make a huge progress about replacing all occurrences of

bp_get_root_domain() (45 replacements were performed).

• Deprecate bp_groups_directory_permalink(),

bp_get_groups_directory_permalink(), bp_blogs_directory_permalink() &
bp_get_blogs_directory_permalink() and replace them with these new
functions: bp_groups_directory_url(), bp_get_groups_directory_url(),
bp_blogs_directory_url() & bp_get_blogs_directory_url().

• Although bp_loggedin_user_domain() & bp_displayed_user_domain()

should also be deprecated, we're leaving them as aliases of the right
functions to use. Plugin authors shouldn't use them to build other links
than member's profile home url.

NB: these deprecations are required because these functions were used
to build BuddyPress URLs concatenating URL chunks. Once the BP Classic
plugin will be built we will adapt the code to remove these deprecation
notices.

Props r-a-y, johnjamesjacoby, boonebgorges

Closes ​https://github.com/buddypress/buddypress/pull/73
See #4954

File:

• trunk/src/bp-activity/classes/class-bp-akismet.php (modified) (4 diffs)

trunk/src/bp-activity/classes/class-bp-akismet.php

@@ -192 +192 @@
      */
     public function add_activity_spam_button() {
-        if ( !bp_activity_user_can_mark_spam() )
-            return;
+        if ( ! bp_activity_user_can_mark_spam() ) {
+            return;
+        }
 
         // By default, only handle activity updates and activity comments.
-        if ( !in_array( bp_get_activity_type(), BP_Akismet::get_activity_types() ) )
-            return;
+        if ( ! in_array( bp_get_activity_type(), BP_Akismet::get_activity_types(), true ) ) {
+            return;
+        }
+
+        $spam_link = bp_rewrites_get_url(
+            array(
+                'component_id'                 => 'activity',
+                'single_item_action'           => 'spam',
+                'single_item_action_variables' => array( bp_get_activity_id() ),
+            )
+        );
 
         bp_button(
@@ -205 +215 @@
                 'id'         => 'activity_make_spam_' . bp_get_activity_id(),
                 'link_class' => 'bp-secondary-action spam-activity confirm button item-button',
-                'link_href'  => wp_nonce_url( bp_get_root_domain() . '/' . bp_get_activity_slug() . '/spam/' . bp_get_activity_id() . '/', 'bp_activity_akismet_spam_' . bp_get_activity_id() ),
+                'link_href'  => wp_nonce_url( $spam_link, 'bp_activity_akismet_spam_' . bp_get_activity_id() ),
                 'link_text'  => __( 'Spam', 'buddypress' ),
                 'wrapper'    => false,
@@ -220 +230 @@
      */
     public function add_activity_comment_spam_button() {
-        if ( !bp_activity_user_can_mark_spam() )
-            return;
+        if ( ! bp_activity_user_can_mark_spam() ) {
+            return;
+        }
 
         // By default, only handle activity updates and activity comments.
         $current_comment = bp_activity_current_comment();
-        if ( empty( $current_comment ) || !in_array( $current_comment->type, BP_Akismet::get_activity_types() ) )
-            return;
+        if ( empty( $current_comment ) || ! in_array( $current_comment->type, BP_Akismet::get_activity_types(), true ) ) {
+            return;
+        }
+
+        $spam_link = add_query_arg(
+            'cid',
+            bp_get_activity_comment_id(),
+            bp_rewrites_get_url(
+                array(
+                    'component_id'                 => 'activity',
+                    'single_item_action'           => 'spam',
+                    'single_item_action_variables' => array( bp_get_activity_comment_id() ),
+                )
+            )
+        );
 
         bp_button(
@@ -234 +258 @@
                 'id'         => 'activity_make_spam_' . bp_get_activity_comment_id(),
                 'link_class' => 'bp-secondary-action spam-activity-comment confirm',
-                'link_href'  => wp_nonce_url( bp_get_root_domain() . '/' . bp_get_activity_slug() . '/spam/' . bp_get_activity_comment_id() . '/?cid=' . bp_get_activity_comment_id(), 'bp_activity_akismet_spam_' . bp_get_activity_comment_id() ),
+                'link_href'  => wp_nonce_url( $spam_link, 'bp_activity_akismet_spam_' . bp_get_activity_comment_id() ),
                 'link_text'  => __( 'Spam', 'buddypress' ),
                 'wrapper'    => false,