Changeset 13449 for trunk/src/bp-groups/actions/create.php

Timestamp:

04/08/2023 06:31:46 AM (18 months ago)

Author:

imath

Message:

Make sure all Groups component URLs are built using BP rewrites API

• Introduce the bp_groups_get_create_url() to ease Groups create URLs generation.
• Improve bp_groups_get_path_chunks() to deal with front-end group admin URLs and the Groups create URLs.
• Deprecate bp_get_groups_directory_permalink() in favor of bp_get_groups_directory_url().
• Replace all remaining deprecated functions usage.
• Start putting deprecated functions behind a function_exists( 'bp_classic' ) check, corresponding functions were added inside the BP Classic backcompat plugin.
• Adjust some Groups routing unit tests.

Props r-a-y, johnjamesjacoby, boonebgorges

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

File:

• trunk/src/bp-groups/actions/create.php (modified) (8 diffs)

trunk/src/bp-groups/actions/create.php

@@ -31 +31 @@
     }
 
-    $bp = buddypress();
+    $bp           = buddypress();
+    $redirect_url = bp_groups_get_create_url();
 
     // Make sure creation steps are in the right order.
@@ -45 +46 @@
         setcookie( 'bp_completed_create_steps', false, time() - 1000, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
 
-        $reset_steps = true;
-        $keys        = array_keys( $bp->groups->group_creation_steps );
-        bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create/step/' . array_shift( $keys ) ) );
+        $reset_steps     = true;
+        $keys            = array_keys( $bp->groups->group_creation_steps );
+        $action_variable = array_shift( $keys );
+        bp_core_redirect( bp_groups_get_create_url( array( $action_variable ) ) );
     }
 
@@ -53 +55 @@
     if ( bp_get_groups_current_create_step() && empty( $bp->groups->group_creation_steps[bp_get_groups_current_create_step()] ) ) {
         bp_core_add_message( __('There was an error saving group details. Please try again.', 'buddypress'), 'error' );
-        bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create' ) );
+        bp_core_redirect( $redirect_url );
     }
 
@@ -67 +69 @@
         if ( ! bp_is_group_creator( $bp->groups->current_group, bp_loggedin_user_id() ) ) {
             bp_core_add_message( __( 'Only the group creator may continue editing this group.', 'buddypress' ), 'error' );
-            bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create' ) );
+            bp_core_redirect( $redirect_url );
         }
     }
@@ -80 +82 @@
             if ( empty( $_POST['group-name'] ) || empty( $_POST['group-desc'] ) || !strlen( trim( $_POST['group-name'] ) ) || !strlen( trim( $_POST['group-desc'] ) ) ) {
                 bp_core_add_message( __( 'Please fill in all of the required fields', 'buddypress' ), 'error' );
-                bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create/step/' . bp_get_groups_current_create_step() ) );
+                bp_core_redirect( bp_groups_get_create_url( array( bp_get_groups_current_create_step() ) ) );
             }
 
             $new_group_id = isset( $bp->groups->new_group_id ) ? $bp->groups->new_group_id : 0;
 
-            if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $new_group_id, 'name' => $_POST['group-name'], 'description' => $_POST['group-desc'], 'slug' => groups_check_slug( sanitize_title( esc_attr( $_POST['group-name'] ) ) ), 'date_created' => bp_core_current_time(), 'status' => 'public' ) ) ) {
+            if ( ! $bp->groups->new_group_id = groups_create_group( array( 'group_id' => $new_group_id, 'name' => $_POST['group-name'], 'description' => $_POST['group-desc'], 'slug' => groups_check_slug( sanitize_title( esc_attr( $_POST['group-name'] ) ) ), 'date_created' => bp_core_current_time(), 'status' => 'public' ) ) ) {
                 bp_core_add_message( __( 'There was an error saving group details. Please try again.', 'buddypress' ), 'error' );
-                bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create/step/' . bp_get_groups_current_create_step() ) );
+                bp_core_redirect( bp_groups_get_create_url( array( bp_get_groups_current_create_step() ) ) );
             }
         }
@@ -104 +106 @@
                 $group_status = 'hidden';
 
-            if ( !$bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'status' => $group_status, 'enable_forum' => $group_enable_forum ) ) ) {
+            if ( ! $bp->groups->new_group_id = groups_create_group( array( 'group_id' => $bp->groups->new_group_id, 'status' => $group_status, 'enable_forum' => $group_enable_forum ) ) ) {
                 bp_core_add_message( __( 'There was an error saving group details. Please try again.', 'buddypress' ), 'error' );
-                bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create/step/' . bp_get_groups_current_create_step() ) );
+                bp_core_redirect( bp_groups_get_create_url( array( bp_get_groups_current_create_step() ) ) );
             }
 
@@ -219 +221 @@
             }
 
-            bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create/step/' . $next_step ) );
+            $redirect_url = bp_get_groups_directory_url( bp_groups_get_path_chunks( array( $next_step ), 'create' ) );
+            bp_core_redirect( $redirect_url );
         }
     }
@@ -238 +241 @@
 
         bp_core_add_message( $message, $error );
-        bp_core_redirect( trailingslashit( bp_get_groups_directory_permalink() . 'create/step/group-invites' ) );
+        bp_core_redirect( bp_groups_get_create_url( array( 'group-invites' ) ) );
     }