Ticket #7261: 7261.diff

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

@@ -2044 +2044 @@
                         'signups_' . $action
                 );
 
+                // Prefetch registration field data.
+                $fdata = array();
+                if ( 'activate' === $action && bp_is_active( 'xprofile' ) ) {
+                        $fields = bp_xprofile_get_groups( array(
+                                'profile_group_id' => 1,
+                                'exclude_fields' => 1,
+                                'update_meta_cache' => false,
+                                'fetch_fields' => true,
+                        ) );
+                        $fields = $fields[0]->fields;
+                        foreach( $fields as $f ) {
+                                $fdata[ $f->id ] = $f->name;
+                        }
+                }
+
                 ?>
 
                 <div class="wrap">
@@ -2052 +2067 @@
 
                         <ol class="bp-signups-list">
                         <?php foreach ( $signups as $signup ) :
+                                $last_notified = mysql2date( 'Y/m/d g:i:s a', $signup->date_sent );
 
-                                $last_notified = mysql2date( 'Y/m/d g:i:s a', $signup->date_sent ); ?>
+                                // Get all xprofile field IDs except field 1.
+                                $profile_field_ids = array_flip( explode( ',', $signup->meta['profile_field_ids'] ) );
+                                unset( $profile_field_ids[1] );
+                        ?>
 
                                 <li>
-                                        <?php echo esc_html( $signup->user_name ) ?> - <?php echo sanitize_email( $signup->user_email );?>
+                                        <strong><?php echo esc_html( $signup->user_login ) ?></strong>
+
+                                        <?php if ( 'activate' == $action ) : ?>
+
+                                                <ul>
+                                                        <li><?php printf( '<em>%1$s</em> - %2$s', esc_html__( 'Display Name', 'buddypress' ), esc_html__( $signup->user_name ) ) ; ?></li>
+                                                        <li><?php printf( '<em>%1$s</em> - %2$s', esc_html__( 'Email', 'buddypress' ), sanitize_email( $signup->user_email ) ); ?></li>
+
+                                                        <?php if ( bp_is_active( 'xprofile' ) && ! empty( $profile_field_ids ) ) : ?>
+                                                                <?php foreach ( $profile_field_ids as $pid => $noop ) :
+                                                                        $field_value = isset( $signup->meta[ "field_{$pid}" ] ) ? $signup->meta[ "field_{$pid}" ] : ''; ?>
+                                                                        <li><?php printf( '<em>%1$s</em> - %2$s', esc_html( $fdata[ $pid ] ), $this->format_xprofile_field_for_display( $field_value ) ); ?></li>
+                                                                <?php endforeach;  ?>
+
+                                                        <?php endif; ?>
+                                                </ul>
+
+                                        <?php endif; ?>
 
                                         <?php if ( 'resend' == $action ) : ?>
 
@@ -2309 +2345 @@
                         }
                 }
         }
+
+        /**
+         * Formats a signup's xprofile field data for display.
+         *
+         * Operates recursively on arrays, which are then imploded with commas.
+         *
+         * @since 2.8.0
+         *
+         * @param string|array $value Field value.
+         * @return string
+         */
+        protected function format_xprofile_field_for_display( $value ) {
+                if ( is_array( $value ) ) {
+                        $value = array_map( array( $this, 'format_xprofile_field_for_display' ), $value );
+                        $value = implode( ', ', $value );
+                } else {
+                        $value = stripslashes( $value );
+                        $value = esc_html( $value );
+                }
+
+                return $value;
+        }
 }
 endif; // End class_exists check.