Changeset 4414

Timestamp:

05/22/2011 10:59:20 AM (14 years ago)

Author:

djpaul

Message:

If registration page is set to display on the home page, and user registration is disabled, show message to non-logged in users rather than redirect.

Location:

trunk

Files:

• bp-members/bp-members-signup.php (modified) (1 diff)
• bp-themes/bp-default/registration/register.php (modified) (1 diff)

trunk/bp-members/bp-members-signup.php

@@ -15 +15 @@
 
     if ( !bp_is_current_component( 'register' ) )
-        return false;
+        return;
 
     // Not a directory
     bp_update_is_directory( false, 'register' );
 
-    if ( bp_is_component_front_page( 'register' ) && ( is_user_logged_in() || !bp_get_signup_allowed() ) )
-        bp_core_redirect( bp_get_root_domain() . '/' . bp_get_members_root_slug() );
-
     // If the user is logged in, redirect away from here
-    if ( is_user_logged_in() )
-        bp_core_redirect( bp_get_root_domain() );
-
-    // If signups are disabled, just re-direct
-    if ( !bp_get_signup_allowed() )
-        bp_core_redirect( bp_get_root_domain() );
+    if ( is_user_logged_in() ) {
+        if ( bp_is_component_front_page( 'register' ) )
+            bp_core_redirect( bp_get_root_domain() . '/' . bp_get_members_root_slug() );
+        else
+            bp_core_redirect( bp_get_root_domain() );
+
+        return;
+    }
 
     $bp->signup->step = 'request-details';
 
+    if ( !bp_get_signup_allowed() ) {
+        $bp->signup->step = 'registration-disabled';
+    }
+
     // If the signup page is submitted, validate and save
-    if ( isset( $_POST['signup_submit'] ) ) {
+    elseif ( isset( $_POST['signup_submit'] ) ) {
 
         // Check the nonce

trunk/bp-themes/bp-default/registration/register.php

@@ -9 +9 @@
 
             <form action="" name="signup_form" id="signup_form" class="standard-form" method="post" enctype="multipart/form-data">
+
+            <?php if ( 'registration-disabled' == bp_get_current_signup_step() ) : ?>
+                <?php do_action( 'template_notices' ) ?>
+                <?php do_action( 'bp_before_registration_disabled' ) ?>
+
+                    <p><?php _e( 'User registration is currently not allowed.', 'buddypress' ); ?></p>
+
+                <?php do_action( 'bp_after_registration_disabled' ); ?>
+            <?php endif; // registration-disabled signup setp ?>
 
             <?php if ( 'request-details' == bp_get_current_signup_step() ) : ?>