<!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][12955] trunk/src/bp-xprofile: xProfile Admin: always display the group of signup fields</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 { white-space: pre-line; 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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/12955">12955</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12955","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-05-22 12:52:18 +0000 (Sat, 22 May 2021)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>xProfile Admin: always display the group of signup fields

Even if the signups are not allowed, make sure admins can "preset" the registration/invitation form of their site.

Props johnjamesjacoby

Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8477">#8477</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpxprofilebpxprofileadminphp">trunk/src/bp-xprofile/bp-xprofile-admin.php</a></li>
<li><a href="#trunksrcbpxprofileclassesclassbpxprofiledatatemplatephp">trunk/src/bp-xprofile/classes/class-bp-xprofile-data-template.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpxprofilebpxprofileadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/bp-xprofile-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/bp-xprofile-admin.php       2021-05-20 17:18:28 UTC (rev 12954)
+++ trunk/src/bp-xprofile/bp-xprofile-admin.php 2021-05-22 12:52:18 UTC (rev 12955)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,13 +188,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <?php endforeach; endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <?php if ( bp_get_signup_allowed() ) : ?>
-                                               <li id="signup-group" class="not-sortable last">
-                                                       <a href="#tabs-signup-group" class="ui-tab">
-                                                               <?php esc_html_e( 'Signup Fields', 'buddypress' ); ?>
-                                                       </a>
-                                               </li>
-                                       <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <li id="signup-group" class="not-sortable last">
+                                               <a href="#tabs-signup-group" class="ui-tab">
+                                                       <?php esc_html_e( 'Signup Fields', 'buddypress' ); ?>
+                                               </a>
+                                       </li>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,69 +310,93 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // List fields to use into the signup form.
-                               if ( bp_get_signup_allowed() ) {
-                                       $signup_groups = bp_xprofile_get_groups(
-                                               array(
-                                                       'fetch_fields'       => true,
-                                                       'signup_fields_only' => true,
-                                               )
-                                       );
-                                       $has_signup_fields   = false;
-                                       $signup_fields       = array();
-                                       $signup_fields_order = bp_xprofile_get_signup_field_ids();
-                                       ?>
-                                       <div id="tabs-signup-group"" class="tab-wrapper">
-                                               <div class="tab-toolbar">
-                                                       <p class="description"><?php esc_html_e( 'Drag fields from other groups and drop them on the above tab to include them into your registration form.', 'buddypress' ); ?></a>
-                                               </div>
-                                               <fieldset id="signup-fields" class="connectedSortable field-group" aria-live="polite" aria-atomic="true" aria-relevant="all">
-                                                       <legend class="screen-reader-text">
-                                                               <?php esc_html_e( 'Fields to use into the registration form', 'buddypress' );?>
-                                                       </legend>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $signup_groups = bp_xprofile_get_groups(
+                                       array(
+                                               'fetch_fields'       => true,
+                                               'signup_fields_only' => true,
+                                       )
+                               );
+                               $has_signup_fields   = false;
+                               $signup_fields       = array();
+                               $signup_fields_order = bp_xprofile_get_signup_field_ids();
+                               ?>
+                               <div id="tabs-signup-group"" class="tab-wrapper">
+                                       <div class="tab-toolbar">
+                                               <p class="description"><?php esc_html_e( 'Drag fields from other groups and drop them on the above tab to include them into your registration form.', 'buddypress' ); ?></a>
+                                       </div>
+                                       <fieldset id="signup-fields" class="connectedSortable field-group" aria-live="polite" aria-atomic="true" aria-relevant="all">
+                                               <legend class="screen-reader-text">
+                                                       <?php esc_html_e( 'Fields to use into the registration form', 'buddypress' );?>
+                                               </legend>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        <?php
-                                                       if ( ! empty( $signup_groups ) ) {
-                                                               foreach ( $signup_groups as $signup_group ) {
-                                                                       if ( ! empty( $signup_group->fields ) ) {
-                                                                               $has_signup_fields = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <?php
+                                               if ( ! empty( $signup_groups ) ) {
+                                                       foreach ( $signup_groups as $signup_group ) {
+                                                               if ( ! empty( $signup_group->fields ) ) {
+                                                                       $has_signup_fields = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                                foreach ( $signup_group->fields as $signup_field ) {
-                                                                                       // Load the field.
-                                                                                       $_signup_field = xprofile_get_field( $signup_field, null, false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                                 foreach ( $signup_group->fields as $signup_field ) {
+                                                                               // Load the field.
+                                                                               $_signup_field = xprofile_get_field( $signup_field, null, false );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                                        /**
-                                                                                        * This function handles the WYSIWYG profile field
-                                                                                        * display for the xprofile admin setup screen.
-                                                                                        */
-                                                                                       $signup_fields[ $_signup_field->id ] = bp_xprofile_admin_get_signup_field( $_signup_field, $signup_group, '' );
-                                                                               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                                         /**
+                                                                                * This function handles the WYSIWYG profile field
+                                                                                * display for the xprofile admin setup screen.
+                                                                                */
+                                                                               $signup_fields[ $_signup_field->id ] = bp_xprofile_admin_get_signup_field( $_signup_field, $signup_group, '' );
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                         }
</span><span class="cx" style="display: block; padding: 0 10px">                                                                }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                        }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                // Output signup fields according to their signup position.
-                                                               foreach ( $signup_fields_order as $ordered_signup_field_id ) {
-                                                                       if ( ! isset( $signup_fields[ $ordered_signup_field_id ] ) ) {
-                                                                               continue;
-                                                                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 // Output signup fields according to their signup position.
+                                                       foreach ( $signup_fields_order as $ordered_signup_field_id ) {
+                                                               if ( ! isset( $signup_fields[ $ordered_signup_field_id ] ) ) {
+                                                                       continue;
+                                                               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                        echo $signup_fields[ $ordered_signup_field_id ];
-                                                               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         echo $signup_fields[ $ordered_signup_field_id ];
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        if ( ! $has_signup_fields ) {
-                                                               ?>
-                                                               <p class="nodrag nofields"><?php esc_html_e( 'There are no registration fields set. The registration form uses the primary group by default.', 'buddypress' ); ?></p>
-                                                               <?php
-                                                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         if ( ! $has_signup_fields ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                </fieldset>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 <p class="nodrag nofields"><?php esc_html_e( 'There are no registration fields set. The registration form uses the primary group by default.', 'buddypress' ); ?></p>
+                                                       <?php
+                                               }
+                                               ?>
+                                       </fieldset>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        <?php if ( bp_get_signup_allowed() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 <p><?php esc_html_e( '* Fields in this group appear on the registration page.', 'buddypress' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        </div>
-                                       <?php
-                               }
-                               ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <?php else : ?>
+                                               <p>
+                                                       <?php
+                                                       // Include a link to edit settings.
+                                                       $settings_link = '';
+
+                                                       if ( is_multisite() && current_user_can( 'manage_network_users') ) {
+                                                               $settings_link = sprintf(
+                                                                       ' <a href="%1$">%2$s</a>.',
+                                                                       esc_url( network_admin_url( 'settings.php' ) ),
+                                                                       esc_html__( 'Edit settings', 'buddypress' )
+                                                               );
+                                                       } elseif ( current_user_can( 'manage_options' ) ) {
+                                                               $settings_link = sprintf(
+                                                                       ' <a href="%1$s">%2$s</a>.',
+                                                                       esc_url( bp_get_admin_url( 'options-general.php' ) ),
+                                                                       esc_html__( 'Edit settings', 'buddypress' )
+                                                               );
+                                                       }
+
+                                                       printf(
+                                                               /* translators: %s is the link to the registration settings. */
+                                                               esc_html__( '* Fields in this group will appear on the registration page as soon as users will be able to register to your site.%s', 'buddypress' ),
+                                                               $settings_link
+                                                       );
+                                                       ?>
+                                               </p>
+                                       <?php endif; ?>
+                               </div>
</ins><span class="cx" style="display: block; padding: 0 10px">                         </div>
</span><span class="cx" style="display: block; padding: 0 10px">                </form>
</span><span class="cx" style="display: block; padding: 0 10px">        </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1029,7 +1051,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php if ( empty( $field->can_delete ) ) : ?><?php esc_html_e( '(Primary)', 'buddypress' ); endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php bp_the_profile_field_required_label(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php if ( bp_get_signup_allowed() && $field->get_signup_position() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php if ( $field->get_signup_position() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <span class="bp-signup-field-label"><?php esc_html_e( '(Sign-up)', 'buddypress' );?></span>
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php if ( bp_get_member_types() ) : echo $field->get_member_type_label(); endif; ?>
</span></span></pre></div>
<a id="trunksrcbpxprofileclassesclassbpxprofiledatatemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/classes/class-bp-xprofile-data-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/classes/class-bp-xprofile-data-template.php 2021-05-20 17:18:28 UTC (rev 12954)
+++ trunk/src/bp-xprofile/classes/class-bp-xprofile-data-template.php   2021-05-22 12:52:18 UTC (rev 12955)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,7 +166,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $groups = bp_xprofile_get_groups( $r );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( true === $r['signup_fields_only'] && bp_get_signup_allowed() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( true === $r['signup_fields_only'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         $signup_fields_order       = bp_xprofile_get_signup_field_ids();
</span><span class="cx" style="display: block; padding: 0 10px">                        $signup_group              = new BP_XProfile_Group();
</span><span class="cx" style="display: block; padding: 0 10px">                        $signup_group->id          = 0;
</span></span></pre>
</div>
</div>

</body>
</html>