Changeset 2464

Timestamp:

01/27/2010 12:15:46 PM (15 years ago)

Author:

apeatling

Message:

Fixes #1690

Location:

trunk

Files:

• bp-core/bp-core-signup.php (modified) (1 diff)
• bp-core/bp-core-templatetags.php (modified) (1 diff)
• bp-themes/bp-default/registration/register.php (modified) (1 diff)
• bp-themes/bp-default/sidebar.php (modified) (4 diffs)
• bp-themes/bp-sn-parent/header.php (modified) (1 diff)
• bp-themes/bp-sn-parent/registration/register.php (modified) (1 diff)

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

@@ -19 +19 @@
 
     /* If signups are disabled, just re-direct */
-    if ( !bp_get_signup_allowed() || 'none' == bp_get_signup_allowed() || 'blog' == bp_get_signup_allowed() )
+    if ( !bp_get_signup_allowed() )
         bp_core_redirect( $bp->root_domain );
 

trunk/bp-core/bp-core-templatetags.php

@@ -1240 +1240 @@
 }
     function bp_get_signup_allowed() {
-        if ( bp_core_is_multisite() )
-            return get_site_option( 'registration' );
-        else {
+        if ( bp_core_is_multisite() ) {
+            $status = get_site_option( 'registration' );
+            if ( 'all' != $status && 'user' != $status )
+                return false;
+
+            return true;
+        } else {
             if ( (int)get_option( 'users_can_register') )
                 return 'user';
         }
+
+        return false;
+    }
+
+function bp_blog_signup_allowed() {
+    echo bp_get_blog_signup_allowed();
+}
+    function bp_get_blog_signup_allowed() {
+        if ( !bp_core_is_multisite() )
+            return false;
+
+        $status = get_site_option( 'registration' );
+        if ( 'none' != $status && 'user' != $status )
+            return true;
 
         return false;

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

@@ -161 +161 @@
                 <?php do_action( 'bp_after_signup_profile_fields' ) ?>
 
-                <?php if ( bp_core_is_multisite() && 'all' == bp_get_signup_allowed() || 'blog' == bp_get_signup_allowed() ) : ?>
+                <?php if ( bp_get_blog_signup_allowed() ) : ?>
 
                     <?php do_action( 'bp_before_blog_details_fields' ) ?>

trunk/bp-themes/bp-default/sidebar.php

@@ -8 +8 @@
     <?php if ( is_user_logged_in() ) : ?>
 
+        <?php do_action( 'bp_before_sidebar_me' ) ?>
+
         <div id="sidebar-me">
             <a href="<?php echo bp_loggedin_user_domain() ?>">
@@ -15 +17 @@
             <h4><?php bp_loggedinuser_link() ?></h4>
             <a class="button" href="<?php echo wp_logout_url(wp_get_referer()) ?>"><?php _e( 'Log Out', 'buddypress' ) ?></a>
+
+            <?php do_action( 'bp_sidebar_me' ) ?>
         </div>
+
+        <?php do_action( 'bp_after_sidebar_me' ) ?>
 
         <?php if ( function_exists( 'bp_message_get_notices' ) ) : ?>
@@ -22 +28 @@
 
     <?php else : ?>
+
+        <?php do_action( 'bp_before_sidebar_login_form' ) ?>
 
         <p id="login-text">
@@ -39 +47 @@
             <p class="forgetmenot"><label><input name="rememberme" type="checkbox" id="userbar_rememberme" value="forever" /> <?php _e( 'Remember Me', 'buddypress' ) ?></label></p>
 
+            <?php do_action( 'bp_sidebar_login_form' ) ?>
+
             <input type="submit" name="wp-submit" id="userbar_wp-submit" value="<?php _e('Log In'); ?>" tabindex="100" />
             <input type="hidden" name="redirect_to" value="<?php bp_root_domain() ?>" />
             <input type="hidden" name="testcookie" value="1" />
         </form>
+
+        <?php do_action( 'bp_after_sidebar_login_form' ) ?>
 
     <?php endif; ?>

trunk/bp-themes/bp-sn-parent/header.php

@@ -52 +52 @@
                     <input type="submit" name="wp-submit" id="wp-submit" value="<?php _e( 'Log In', 'buddypress' ) ?>"/>
 
-                    <?php if ( 'none' != bp_get_signup_allowed() && 'blog' != bp_get_signup_allowed() ) : ?>
+                    <?php if ( bp_get_signup_allowed() ) : ?>
                         <input type="button" name="signup-submit" id="signup-submit" value="<?php _e( 'Sign Up', 'buddypress' ) ?>" onclick="location.href='<?php echo bp_signup_page() ?>'" />
                     <?php endif; ?>

trunk/bp-themes/bp-sn-parent/registration/register.php

@@ -160 +160 @@
                 <?php do_action( 'bp_after_signup_profile_fields' ) ?>
 
-                <?php if ( 'all' == bp_get_signup_allowed() || 'blog' == bp_get_signup_allowed() ) : ?>
+                <?php if ( bp_get_blog_signup_allowed() ) : ?>
 
                     <?php do_action( 'bp_before_blog_details_fields' ) ?>