Ticket #8582: 8582.12-site-request-info.patch

src/bp-members/bp-members-admin.php

@@ -143 +143 @@
  * @param object|null $signup_object The signup data object.
  */
 function bp_members_admin_preview_signup_profile_info( $signup_field_labels = array(), $signup_object = null ) {
-        if ( ! isset( $signup_object->meta ) || ! $signup_field_labels ) {
-                return;
-        }
-
-        // Init ids.
-        $profile_field_ids = array();
 
-        // Get all xprofile field IDs except field 1.
-        if ( ! empty( $signup_object->meta['profile_field_ids'] ) ) {
-                $profile_field_ids = array_flip( explode( ',', $signup_object->meta['profile_field_ids'] ) );
-                unset( $profile_field_ids[1] );
-        }
         ?>
         <div id="signup-info-modal-<?php echo $signup_object->id; ?>" style="display:none;">
                 <h1><?php printf( '%1$s (%2$s)', esc_html( $signup_object->user_name ), esc_html( $signup_object->user_email ) ); ?></h1>
-                <h2><?php esc_html_e( 'Extended Profile Information', 'buddypress' ); ?></h2>
-
-                <table class="signup-profile-data-drawer wp-list-table widefat fixed striped">
-                        <?php if ( 1 <= count( $profile_field_ids ) ): foreach ( array_keys( $profile_field_ids ) as $profile_field_id ) :
-                                $field_value = isset( $signup_object->meta[ "field_{$profile_field_id}" ] ) ? $signup_object->meta[ "field_{$profile_field_id}" ] : ''; ?>
-                                <tr>
-                                        <td class="column-fields"><?php echo esc_html( $signup_field_labels[ $profile_field_id ] ); ?></td>
-                                        <td><?php echo bp_members_admin_format_xprofile_field_for_display( $field_value ); ?></td>
-                                </tr>
-                        <?php endforeach; else:  ?>
-                                <tr>
-                                        <td><?php esc_html_e( 'There is no additional information to display.', 'buddypress' ); ?></td>
-                                </tr>
-                        <?php endif; ?>
-                </table>
+
+                <?php if ( bp_is_active( 'xprofile' ) && isset( $signup_object->meta ) && $signup_field_labels ) :
+                                // Init ids.
+                                $profile_field_ids = array();
+
+                                // Get all xprofile field IDs except field 1.
+                                if ( ! empty( $signup_object->meta['profile_field_ids'] ) ) {
+                                        $profile_field_ids = array_flip( explode( ',', $signup_object->meta['profile_field_ids'] ) );
+                                        unset( $profile_field_ids[1] );
+                                }
+                        ?>
+                        <h2><?php esc_html_e( 'Extended Profile Information', 'buddypress' ); ?></h2>
+
+                        <table class="signup-profile-data-drawer wp-list-table widefat fixed striped">
+                                <?php if ( 1 <= count( $profile_field_ids ) ): foreach ( array_keys( $profile_field_ids ) as $profile_field_id ) :
+                                        $field_value = isset( $signup_object->meta[ "field_{$profile_field_id}" ] ) ? $signup_object->meta[ "field_{$profile_field_id}" ] : ''; ?>
+                                        <tr>
+                                                <td class="column-fields"><?php echo esc_html( $signup_field_labels[ $profile_field_id ] ); ?></td>
+                                                <td><?php echo bp_members_admin_format_xprofile_field_for_display( $field_value ); ?></td>
+                                        </tr>
+                                <?php endforeach; else: ?>
+                                        <tr>
+                                                <td><?php esc_html_e( 'There is no additional information to display.', 'buddypress' ); ?></td>
+                                        </tr>
+                                <?php endif; ?>
+                        </table>
+                <?php endif; ?>
+
+                <?php if ( bp_members_site_requests_enabled() ) : ?>
+                        <h2><?php esc_html_e( 'Site Request Information', 'buddypress' ); ?></h2>
+                        <table class="signup-profile-data-drawer wp-list-table widefat fixed striped">
+                                <?php if ( ! empty( $signup_object->domain ) || ! empty( $signup_object->path )  ): ?>
+                                        <tr>
+                                                <td class="column-fields"><?php esc_html_e( 'Site Title', 'buddypress' ); ?></td>
+                                                <td><?php echo esc_html( $signup_object->title ); ?></td>
+                                        </tr>
+                                        <tr>
+                                                <td class="column-fields"><?php esc_html_e( 'Domain', 'buddypress' ); ?></td>
+                                                <td><?php echo esc_html( $signup_object->domain ); ?></td>
+                                        </tr>
+                                        <tr>
+                                                <td class="column-fields"><?php esc_html_e( 'Path', 'buddypress' ); ?></td>
+                                                <td><?php echo esc_html( $signup_object->path ); ?></td>
+                                        </tr>
+                                <?php else : ?>
+                                        <tr>
+                                                <td><?php esc_html_e( 'This user has not requested a blog.', 'buddypress' ); ?></td>
+                                        </tr>
+                                <?php endif; ?>
+                        </table>
+                <?php endif; ?>
         </div>
         <?php
 }

src/bp-members/bp-members-functions.php

@@ -3749 +3749 @@
 
         return $signup;
 }
+
+/**
+ * Are site creation requests currently enabled?
+ *
+ * @since 10.0.0
+ *
+ * @return bool Whether site requests are currently enabled.
+ */
+function bp_members_site_requests_enabled() {
+
+        $matches = array( 'blog', 'all' );
+
+        return is_multisite() && in_array( bp_core_get_root_option( 'registration' ), $matches, true );
+}

src/bp-members/bp-members-membership-requests.php

@@ -304 +304 @@
         $actions['resend'] = sprintf( '<a href="%1$s">%2$s</a>', esc_url( $email_link ), esc_html( $resend_label ) );
 
         // Add a link to view profile info when membership requests and xprofile are active.
-        if ( bp_is_active( 'xprofile' ) ) {
+        if ( bp_is_active( 'xprofile' ) || bp_members_site_requests_enabled() ) {
                 $profile_link = add_query_arg(
                         array(
                                 'page'     => 'bp-signups#TB_inline',

src/bp-members/classes/class-bp-members-admin.php

@@ -1757 +1757 @@
                         ) );
 
                         // Use thickbox to display the extended profile information.
-                        if ( bp_is_active( 'xprofile' ) ) {
+                        if ( bp_is_active( 'xprofile' ) || bp_members_site_requests_enabled() ) {
                                 wp_enqueue_style( 'thickbox' );
                                 wp_enqueue_script(
                                         'bp-signup-preview',

src/bp-members/classes/class-bp-members-ms-list-table.php

@@ -125 +125 @@
                 $this->screen->id = $reset_screen_id;
 
                 // Use thickbox to display the extended profile information.
-                if ( bp_is_active( 'xprofile' ) ) {
+                if ( bp_is_active( 'xprofile' ) || bp_members_site_requests_enabled() ) {
                         add_thickbox();
                 }
         }
@@ -353 +353 @@
                 echo esc_html( $signup_object->user_name );
 
                 // Insert the extended profile modal content required by thickbox.
-                if ( ! bp_is_active( 'xprofile' ) ) {
+                if ( ! bp_is_active( 'xprofile' ) && ! bp_members_site_requests_enabled() ) {
                         return;
                 }
 
-                $profile_field_ids = array();
-
-                // Fetch registration field data once only.
-                if ( ! $this->signup_field_labels ) {
-                        $field_groups = bp_xprofile_get_groups(
-                                array(
-                                        'fetch_fields'       => true,
-                                        'signup_fields_only' => true,
-                                )
-                        );
-
-                        foreach( $field_groups as $field_group ) {
-                                foreach( $field_group->fields as $field ) {
-                                        $this->signup_field_labels[ $field->id ] = $field->name;
+                if ( bp_is_active( 'xprofile' ) ) {
+                        $profile_field_ids = array();
+
+                        // Fetch registration field data once only.
+                        if ( ! $this->signup_field_labels ) {
+                                $field_groups = bp_xprofile_get_groups(
+                                        array(
+                                                'fetch_fields'       => true,
+                                                'signup_fields_only' => true,
+                                        )
+                                );
+
+                                foreach( $field_groups as $field_group ) {
+                                        foreach( $field_group->fields as $field ) {
+                                                $this->signup_field_labels[ $field->id ] = $field->name;
+                                        }
                                 }
                         }
                 }