Changeset 13169 for trunk/src/bp-members/classes/class-bp-members-admin.php

Timestamp:

12/10/2021 04:14:51 PM (3 years ago)

Author:

dcavins

Message:

Manage Signups Screen: Change labels and behavior for requests.

Change many labels in the WP Admin Signups Screen
to reflect the membership requests capability when enabled.

Add new "Profile Info" action link to User List Tables
so that the site admin can see submitted extended profile
info and any blog requests.

See #8582.

File:

• trunk/src/bp-members/classes/class-bp-members-admin.php (modified) (11 diffs)

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

@@ -515 +515 @@
         if ( ( ! bp_is_network_activated() && ! is_network_admin() ) || ( is_network_admin() && bp_is_network_activated() ) ) {
 
+            $signups_menu_label = __( 'Manage Signups',  'buddypress' );
+
+            if ( bp_get_membership_requests_required() ) {
+                $signups_menu_label = __( 'Manage Pending Memberships',  'buddypress' );
+            }
+
             // Manage signups.
             $hooks['signups'] = $this->signups_page = add_users_page(
-                __( 'Manage Signups',  'buddypress' ),
-                __( 'Manage Signups',  'buddypress' ),
+                $signups_menu_label,
+                $signups_menu_label,
                 $this->capability,
                 'bp-signups',
@@ -1688 +1694 @@
         $allowed_actions = apply_filters( 'bp_signups_admin_allowed_actions', array( 'do_delete', 'do_activate', 'do_resend' ) );
 
-        // Prepare the display of the Community Profile screen.
+        // Prepare the display of the Signups screen.
         if ( ! in_array( $doaction, $allowed_actions ) || ( -1 == $doaction ) ) {
 
@@ -1710 +1716 @@
             ) );
 
+            $signup_help_content = '<p>' . esc_html__( 'Hovering over a row in the pending accounts list will display action links that allow you to manage pending accounts. You can perform the following actions:', 'buddypress' ) . '</p>';
+
+            if ( bp_get_membership_requests_required() ) {
+                $signup_help_content .= '<ul><li>' . esc_html__( '"Activate" will activate the user immediately without requiring that they validate their email.', 'buddypress' ) .'</li>' .
+                    '<li>' . esc_html__( '"Approve Request" or "Resend Approval" takes you to the confirmation screen before being able to send the activation link to the desired pending request. You can only send the activation email once per day.', 'buddypress' ) . '</li>';
+
+                if ( bp_is_active( 'xprofile' ) ) {
+                    $signup_help_content .= '<li>' . esc_html__( '"Profile Info" will display extended profile information for the request.', 'buddypress' ) . '</li>';
+                }
+
+                $signup_help_content .= '<li>' . esc_html__( '"Delete" allows you to delete a pending account from your site. You will be asked to confirm this deletion.', 'buddypress' ) . '</li></ul>';
+            } else {
+                $signup_help_content .= '<ul><li>' . esc_html__( '"Email" takes you to the confirmation screen before being able to send the activation link to the desired pending account. You can only send the activation email once per day.', 'buddypress' ) . '</li>' .
+                    '<li>' . __( '"Delete" allows you to delete a pending account from your site. You will be asked to confirm this deletion.', 'buddypress' ) . '</li></ul>';
+            }
+
+            $signup_help_content .= '<p>' . esc_html__( 'By clicking on a Username you will be able to activate a pending account from the confirmation screen.', 'buddypress' ) . '</p>' .
+                '<p>' . __( 'Bulk actions allow you to perform these 3 actions for the selected rows.', 'buddypress' ) . '</p>';
+
             get_current_screen()->add_help_tab( array(
                 'id'      => 'bp-signups-actions',
                 'title'   => __( 'Actions', 'buddypress' ),
-                'content' =>
-                '<p>' . __( 'Hovering over a row in the pending accounts list will display action links that allow you to manage pending accounts. You can perform the following actions:', 'buddypress' ) . '</p>' .
-                '<ul><li>' . __( '"Email" takes you to the confirmation screen before being able to send the activation link to the desired pending account. You can only send the activation email once per day.', 'buddypress' ) . '</li>' .
-                '<li>' . __( '"Delete" allows you to delete a pending account from your site. You will be asked to confirm this deletion.', 'buddypress' ) . '</li></ul>' .
-                '<p>' . __( 'By clicking on a Username you will be able to activate a pending account from the confirmation screen.', 'buddypress' ) . '</p>' .
-                '<p>' . __( 'Bulk actions allow you to perform these 3 actions for the selected rows.', 'buddypress' ) . '</p>'
+                'content' => $signup_help_content
             ) );
 
             // Help panel - sidebar links.
             get_current_screen()->set_help_sidebar(
-                '<p><strong>' . __( 'For more information:', 'buddypress' ) . '</strong></p>' .
+                '<p><strong>' . esc_html__( 'For more information:', 'buddypress' ) . '</strong></p>' .
                 '<p>' . __( '<a href="https://buddypress.org/support/">Support Forums</a>', 'buddypress' ) . '</p>'
             );
@@ -1736 +1756 @@
                 'heading_list'       => __( 'Pending users list', 'buddypress' ),
             ) );
+
+            // Use thickbox to display the extended profile information.
+            if ( bp_is_active( 'xprofile' ) || bp_members_site_requests_enabled() ) {
+                wp_enqueue_style( 'thickbox' );
+                wp_enqueue_script(
+                    'bp-signup-preview',
+                    $this->js_url . 'signup-preview' . bp_core_get_minified_asset_suffix() . '.js',
+                    array( 'bp-thickbox', 'jquery' ),
+                    bp_get_version(),
+                    true
+                );
+                wp_localize_script(
+                    'bp-signup-preview',
+                    'bpSignupPreview',
+                    array(
+                        'modalLabel' => __( 'Profile info preview', 'buddypress' ),
+                    )
+                );
+            }
 
         } else {
@@ -2228 +2267 @@
 
             case 'resend' :
-                $header_text = __( 'Resend Activation Emails', 'buddypress' );
-                if ( 1 == count( $signup_ids ) ) {
-                    $helper_text = __( 'You are about to resend an activation email to the following account:', 'buddypress' );
+
+                if ( bp_get_membership_requests_required() ) {
+                    $header_text = __( 'Approve Membership Requests', 'buddypress' );
+                    if ( 1 === count( $signup_ids ) ) {
+                        $helper_text = __( 'You are about to send an approval email to the following user:', 'buddypress' );
+                    } else {
+                        $helper_text = __( 'You are about to send approval emails to the following users:', 'buddypress' );
+                    }
                 } else {
-                    $helper_text = __( 'You are about to resend an activation email to the following accounts:', 'buddypress' );
+                    $header_text = __( 'Resend Activation Emails', 'buddypress' );
+                    if ( 1 === count( $signup_ids ) ) {
+                        $helper_text = __( 'You are about to resend an activation email to the following account:', 'buddypress' );
+                    } else {
+                        $helper_text = __( 'You are about to resend an activation email to the following accounts:', 'buddypress' );
+                    }
                 }
                 break;
+
         }
 
@@ -2263 +2313 @@
         // Prefetch registration field data.
         $fdata = array();
-        if ( 'activate' === $action && bp_is_active( 'xprofile' ) ) {
+        if ( bp_is_active( 'xprofile' ) && ( 'activate' == $action || ( 'resend' == $action && bp_get_membership_requests_required() ) ) ) {
             $field_groups = bp_xprofile_get_groups( array(
                 'exclude_fields'    => 1,
@@ -2287 +2337 @@
             <ol class="bp-signups-list">
             <?php foreach ( $signups as $signup ) :
-                $last_notified = mysql2date( 'Y/m/d g:i:s a', $signup->date_sent );
+                if ( $signup->count_sent > 0 ) {
+                    $last_notified = mysql2date( 'Y/m/d g:i:s a', $signup->date_sent );
+                } else {
+                    $last_notified = __( 'Not yet notified', 'buddypress' );
+                }
                 $profile_field_ids = array();
 
@@ -2299 +2353 @@
                     <strong><?php echo esc_html( $signup->user_login ) ?></strong>
 
-                    <?php if ( 'activate' == $action ) : ?>
+                    <?php if ( 'activate' == $action || ( 'resend' == $action && bp_get_membership_requests_required() ) ) : ?>
                         <table class="wp-list-table widefat fixed striped">
                             <tbody>
@@ -2317 +2371 @@
                                         <tr>
                                             <td class="column-fields"><?php echo esc_html( $fdata[ $pid ] ); ?></td>
-                                            <td><?php echo $this->format_xprofile_field_for_display( $field_value ); ?></td>
+                                            <td><?php echo bp_members_admin_format_xprofile_field_for_display( $field_value ); ?></td>
                                         </tr>
 
@@ -2623 +2677 @@
      *
      * @since 2.8.0
+     * @deprecated 10.0.0
      *
      * @param string|array $value Field value.
@@ -2628 +2683 @@
      */
     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;
+        _deprecated_function( __METHOD__, '10.0.0', 'bp_members_admin_format_xprofile_field_for_display' );
+
+        return bp_members_admin_format_xprofile_field_for_display( $value );
     }