Changeset 3734

Timestamp:

01/18/2011 09:17:21 PM (14 years ago)

Author:

djpaul

Message:

Tell users if they've been marked as a spammer, or haven't activated their account yet, when they try to log in. Fixes #2575

Location:

trunk

Files:

• bp-core.php (modified) (4 diffs)
• bp-core/bp-core-signup.php (modified) (1 diff)

trunk/bp-core.php

@@ -293 +293 @@
 }
 
-/** 
- * Creates a default component slug from a WP page root_slug 
- * 
+/**
+ * Creates a default component slug from a WP page root_slug
+ *
  * Since 1.3, BP components get their root_slug (the slug used immediately
  * following the root domain) from the slug of a corresponding WP page.
- * 
+ *
  * E.g. if your BP installation at example.com has its members page at
  * example.com/community/people, $bp->members->root_slug will be 'community/people'.
@@ -305 +305 @@
  * use elsewhere in the URL, by returning the content after the final '/'
  * in the root_slug ('people' in the example above).
- * 
+ *
  * Filter on 'bp_core_component_slug_from_root_slug' to override this method
  * in general, or define a specific component slug constant (e.g. BP_MEMBERS_SLUG)
  * to override specific component slugs.
- *  
- * @package BuddyPress Core 
- * @since 1.3 
- * 
- * @param str $root_slug The root slug, which comes from $bp->pages->[component]->slug 
- * @return str $slug The short slug for use in the middle of URLs 
- */ 
-function bp_core_component_slug_from_root_slug( $root_slug ) { 
-    $slug_chunks = explode( '/', $root_slug ); 
+ *
+ * @package BuddyPress Core
+ * @since 1.3
+ *
+ * @param str $root_slug The root slug, which comes from $bp->pages->[component]->slug
+ * @return str $slug The short slug for use in the middle of URLs
+ */
+function bp_core_component_slug_from_root_slug( $root_slug ) {
+    $slug_chunks = explode( '/', $root_slug );
     $slug        = array_pop( $slug_chunks );
-    
-    return apply_filters( 'bp_core_component_slug_from_root_slug', $slug, $root_slug ); 
-} 
+
+    return apply_filters( 'bp_core_component_slug_from_root_slug', $slug, $root_slug );
+}
 
 /**
@@ -854 +854 @@
         'screen_function' => &$screen_function
     );
-    
+
     if ( ( $bp->current_action == $slug && $bp->current_component == $parent_slug ) && $user_has_access ) {
         if ( !is_object( $screen_function[0] ) )
@@ -1797 +1797 @@
 
     if ( ( is_multisite() && (int)$user->spam ) || 1 == (int)$user->user_status )
-        bp_core_redirect( $bp->root_domain );
+        return new WP_Error( 'invalid_username', __( '<strong>ERROR</strong>: Your account has been marked as a spammer.', 'buddypress' ) );
     else
         return $auth_obj;
 }
-add_filter( 'authenticate', 'bp_core_boot_spammer', 11, 2 );
+add_filter( 'authenticate', 'bp_core_boot_spammer', 30, 2 );
 
 /**

trunk/bp-core/bp-core-signup.php

@@ -602 +602 @@
 
     if ( 2 == $user_status )
-        bp_core_redirect( $bp->root_domain );
+        return new WP_Error( 'bp_account_not_activated', __( '<strong>ERROR</strong>: Your account has not been activated. Check your email for the activation link.', 'buddypress' ) );
     else
         return $auth_obj;
 }
-add_filter( 'authenticate', 'bp_core_signup_disable_inactive', 11, 2 );
+add_filter( 'authenticate', 'bp_core_signup_disable_inactive', 30, 2 );
 
 /* Kill the wp-signup.php if custom registration signup templates are present */