<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][4414] trunk: 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.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>4414</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-05-22 10:59:20 +0000 (Sun, 22 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmembersbpmemberssignupphp">trunk/bp-members/bp-members-signup.php</a></li>
<li><a href="#trunkbpthemesbpdefaultregistrationregisterphp">trunk/bp-themes/bp-default/registration/register.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmembersbpmemberssignupphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-signup.php (4413 => 4414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-signup.php 2011-05-21 22:30:15 UTC (rev 4413)
+++ trunk/bp-members/bp-members-signup.php 2011-05-22 10:59:20 UTC (rev 4414)
</span><span class="lines">@@ -14,26 +14,29 @@
</span><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><span class="cx"> if ( !bp_is_current_component( 'register' ) )
</span><del>- return false;
</del><ins>+ return;
</ins><span class="cx">
</span><span class="cx"> // Not a directory
</span><span class="cx"> bp_update_is_directory( false, 'register' );
</span><span class="cx">
</span><del>- 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() );
-
</del><span class="cx"> // If the user is logged in, redirect away from here
</span><del>- if ( is_user_logged_in() )
- bp_core_redirect( bp_get_root_domain() );
</del><ins>+ 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() );
</ins><span class="cx">
</span><del>- // If signups are disabled, just re-direct
- if ( !bp_get_signup_allowed() )
- bp_core_redirect( bp_get_root_domain() );
</del><ins>+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> $bp->signup->step = 'request-details';
</span><span class="cx">
</span><ins>+ if ( !bp_get_signup_allowed() ) {
+ $bp->signup->step = 'registration-disabled';
+ }
+
</ins><span class="cx"> // If the signup page is submitted, validate and save
</span><del>- if ( isset( $_POST['signup_submit'] ) ) {
</del><ins>+ elseif ( isset( $_POST['signup_submit'] ) ) {
</ins><span class="cx">
</span><span class="cx"> // Check the nonce
</span><span class="cx"> check_admin_referer( 'bp_new_signup' );
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultregistrationregisterphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/registration/register.php (4413 => 4414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/registration/register.php 2011-05-21 22:30:15 UTC (rev 4413)
+++ trunk/bp-themes/bp-default/registration/register.php 2011-05-22 10:59:20 UTC (rev 4414)
</span><span class="lines">@@ -9,6 +9,15 @@
</span><span class="cx">
</span><span class="cx"> <form action="" name="signup_form" id="signup_form" class="standard-form" method="post" enctype="multipart/form-data">
</span><span class="cx">
</span><ins>+ <?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 ?>
+
</ins><span class="cx"> <?php if ( 'request-details' == bp_get_current_signup_step() ) : ?>
</span><span class="cx">
</span><span class="cx"> <h2><?php _e( 'Create an Account', 'buddypress' ) ?></h2>
</span></span></pre>
</div>
</div>
</body>
</html>