Changeset 9109 for trunk/src/bp-members/bp-members-screens.php

Timestamp:

10/30/2014 04:09:06 AM (10 years ago)

Author:

djpaul

Message:

Signups: move the activation link's key from the query param into the URL proper.

Some email hosts strip the key from the activation link, or mangle it, or prevent it being easily copyable inside their web interfaces. Some web servers/configurations, can also be commonly configured to strip query parameters from the majority of requests, so hopefully this change will alleviate these problems.

Compatibility is maintained for the older query param-style activation links.

Fixes #5831, props r-a-y.

File:

• trunk/src/bp-members/bp-members-screens.php (modified) (1 diff)

trunk/src/bp-members/bp-members-screens.php

@@ -234 +234 @@
     }
 
-    // Check if an activation key has been passed
-    if ( isset( $_GET['key'] ) ) {
-
-        // Activate the signup
-        $user = apply_filters( 'bp_core_activate_account', bp_core_activate_signup( $_GET['key'] ) );
-
-        // If there were errors, add a message and redirect
-        if ( !empty( $user->errors ) ) {
-            bp_core_add_message( $user->get_error_message(), 'error' );
-            bp_core_redirect( trailingslashit( bp_get_root_domain() . '/' . $bp->pages->activate->slug ) );
-        }
-
-        $hashed_key = wp_hash( $_GET['key'] );
-
-        // Check if the avatar folder exists. If it does, move rename it, move
-        // it and delete the signup avatar dir
-        if ( file_exists( bp_core_avatar_upload_path() . '/avatars/signups/' . $hashed_key ) )
-            @rename( bp_core_avatar_upload_path() . '/avatars/signups/' . $hashed_key, bp_core_avatar_upload_path() . '/avatars/' . $user );
-
-        bp_core_add_message( __( 'Your account is now active!', 'buddypress' ) );
-
-        $bp->activation_complete = true;
-    }
+    // grab the key (the old way)
+    $key = isset( $_GET['key'] ) ? $_GET['key'] : '';
+  
+    // grab the key (the new way)
+    if ( empty( $key ) ) {
+        $key = bp_current_action();
+    }
+
+    // bail if no key
+    if ( empty( $key ) ) {
+        return;
+    }
+  
+    // Activate the signup
+    $user = apply_filters( 'bp_core_activate_account', bp_core_activate_signup( $key ) );
+
+    // If there were errors, add a message and redirect
+    if ( ! empty( $user->errors ) ) {
+        bp_core_add_message( $user->get_error_message(), 'error' );
+        bp_core_redirect( trailingslashit( bp_get_root_domain() . '/' . $bp->pages->activate->slug ) );
+    }
+
+    $hashed_key = wp_hash( $key );
+
+    // Check if the avatar folder exists. If it does, move rename it, move
+    // it and delete the signup avatar dir
+    if ( file_exists( bp_core_avatar_upload_path() . '/avatars/signups/' . $hashed_key ) ) {
+        @rename( bp_core_avatar_upload_path() . '/avatars/signups/' . $hashed_key, bp_core_avatar_upload_path() . '/avatars/' . $user );
+    }
+
+    bp_core_add_message( __( 'Your account is now active!', 'buddypress' ) );
+    $bp->activation_complete = true;
 
     bp_core_load_template( apply_filters( 'bp_core_template_activate', array( 'activate', 'registration/activate' ) ) );