Changeset 527 for trunk/bp-groups.php

Timestamp:

11/10/2008 11:22:03 AM (17 years ago)

Author:

apeatling

Message:

Added new function "bp_core_redirect()" to perform safe "wp_redirect()" calls. Stops bug with redirection loops and multiple friend confirmations.

File:

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

trunk/bp-groups.php

@@ -288 +288 @@
             bp_core_add_message( __('Group invite could not be accepted', 'buddypress'), 'error' );         
         }
-        wp_redirect( $_SERVER['HTTP_REFERER'] );
+        bp_core_redirect( $_SERVER['HTTP_REFERER'] );
         
     } else if ( isset($bp['action_variables']) && in_array( 'reject', $bp['action_variables'] ) && is_numeric($bp['action_variables'][1]) ) {
@@ -296 +296 @@
             bp_core_add_message( __('Group invite could not be rejected', 'buddypress'), 'error' );         
         }
-        wp_redirect( $_SERVER['HTTP_REFERER'] );
+        bp_core_redirect( $_SERVER['HTTP_REFERER'] );
     }
     
@@ -336 +336 @@
             // We're done.
             if ( $create_group_step == 4 )
-                wp_redirect( bp_group_permalink( $group_obj, false ) );
+                bp_core_redirect( bp_group_permalink( $group_obj, false ) );
 
             if ( !$group_id = groups_manage_group( $create_group_step, $_SESSION['group_obj_id'] ) ) {
                 bp_core_add_message( __('There was an error saving group details. Please try again.', 'buddypress'), 'error' );
-                wp_redirect( $bp['loggedin_domain'] . $bp['groups']['slug'] . '/create/step/' . $create_group_step );
+                bp_core_redirect( $bp['loggedin_domain'] . $bp['groups']['slug'] . '/create/step/' . $create_group_step );
             } else {
                 $create_group_step++;
@@ -396 +396 @@
             
             if ( !strpos( $_SERVER['HTTP_REFERER'], $bp['wire']['slug'] ) ) {
-                wp_redirect( bp_group_permalink( $group_obj, false ) );
+                bp_core_redirect( bp_group_permalink( $group_obj, false ) );
             } else {
-                wp_redirect( bp_group_permalink( $group_obj, false ) . '/' . $bp['wire']['slug'] );
+                bp_core_redirect( bp_group_permalink( $group_obj, false ) . '/' . $bp['wire']['slug'] );
             }
     
@@ -411 +411 @@
             
             if ( !strpos( $_SERVER['HTTP_REFERER'], $bp['wire']['slug'] ) ) {
-                wp_redirect( bp_group_permalink( $group_obj, false ) );
+                bp_core_redirect( bp_group_permalink( $group_obj, false ) );
             } else {
-                wp_redirect( bp_group_permalink( $group_obj, false ) . '/' . $bp['wire']['slug'] );
+                bp_core_redirect( bp_group_permalink( $group_obj, false ) . '/' . $bp['wire']['slug'] );
             }
         
@@ -453 +453 @@
             
             bp_core_add_message( __('Group invites sent.', 'buddypress') );
-            wp_redirect( bp_group_permalink( $group_obj, false ) );
+            bp_core_redirect( bp_group_permalink( $group_obj, false ) );
         } else {
             // Show send invite page
@@ -470 +470 @@
             if ( !groups_leave_group( $group_obj->id ) ) {
                 bp_core_add_message(  __('There was an error leaving the group. Please try again.', 'buddypress'), 'error' );
-                wp_redirect( bp_group_permalink( $group_obj, false) );
+                bp_core_redirect( bp_group_permalink( $group_obj, false) );
             } else {
                 bp_core_add_message( __('You left the group successfully.', 'buddypress') );
-                wp_redirect( $bp['loggedin_domain'] . $bp['groups']['slug'] );
+                bp_core_redirect( $bp['loggedin_domain'] . $bp['groups']['slug'] );
             }
         } else if ( isset($bp['action_variables']) && $bp['action_variables'][0] == 'no' ) {
-            wp_redirect( bp_group_permalink( $group_obj, false) );
+            bp_core_redirect( bp_group_permalink( $group_obj, false) );
         } else {
             // Show leave group page
@@ -498 +498 @@
                 bp_core_add_message( __( 'Your membership request was sent to the group administrator successfully. You will be notified when the group administrator responds to your request.', 'buddypress' ) );
             }
-            wp_redirect( bp_group_permalink( $group_obj, false ) );
+            bp_core_redirect( bp_group_permalink( $group_obj, false ) );
         }
         bp_catch_uri( 'groups/request-membership' );
@@ -526 +526 @@
                 bp_core_add_message( __( 'Group details were successfully updated.', 'buddypress' ) );
             }
-            wp_redirect( $_SERVER['HTTP_REFERER'] );
+            bp_core_redirect( $_SERVER['HTTP_REFERER'] );
         }
 
@@ -557 +557 @@
             }
             
-            wp_redirect( $_SERVER['HTTP_REFERER'] );
+            bp_core_redirect( $_SERVER['HTTP_REFERER'] );
         }
         
@@ -596 +596 @@
                 }   
             }
-            wp_redirect( $_SERVER['HTTP_REFERER'] );
+            bp_core_redirect( $_SERVER['HTTP_REFERER'] );
         }
         
@@ -618 +618 @@
             } else {
                 bp_core_add_message( __( 'The group was deleted successfully', 'buddypress' ) );
-                wp_redirect( site_url() . '/' . $bp['groups']['slug'] . '/' );
+                bp_core_redirect( site_url() . '/' . $bp['groups']['slug'] . '/' );
             }
-            wp_redirect( $_SERVER['HTTP_REFERER'] );
+            bp_core_redirect( $_SERVER['HTTP_REFERER'] );
         } else {
             bp_catch_uri( 'groups/admin/delete-group' );
@@ -691 +691 @@
             bp_core_add_message( __('You joined the group!', 'buddypress') );
         }
-        wp_redirect( $_SERVER['HTTP_REFERER'] );
+        bp_core_redirect( $_SERVER['HTTP_REFERER'] );
     }