Ticket #8139: 8139-load-one-inviations-screen.patch

src/bp-members/actions/invitations-bulk-manage.php

@@ -24 +24 @@
         // Get the parameters.
         $action      = ! empty( $_POST['invitation_bulk_action'] ) ? $_POST['invitation_bulk_action'] : '';
         $nonce       = ! empty( $_POST['invitations_bulk_nonce'] ) ? $_POST['invitations_bulk_nonce'] : '';
-        $invitations = ! empty( $_POST['network_invitations']    ) ? $_POST['network_invitations']    : '';
+        $invitations = ! empty( $_POST['member_invitations']     ) ? $_POST['member_invitations']    : '';
 
         // Bail if no action or no IDs.
         if ( ( ! in_array( $action, array( 'cancel', 'resend' ), true ) ) || empty( $invitations ) || empty( $nonce ) ) {
@@ -79 +79 @@
         // Redirect.
         bp_core_redirect( bp_displayed_user_domain() . bp_get_members_invitations_slug() . '/' . bp_current_action() . '/' );
 }
-add_action( 'bp_actions', 'bp_members_invitations_action_bulk_manage' );
- No newline at end of file
+add_action( 'bp_actions', 'bp_members_invitations_action_bulk_manage' );

src/bp-members/bp-members-template.php

@@ -3291 +3291 @@
                 $url = add_query_arg( $args, $link );
 
                 // Add the nonce.
-                $url = wp_nonce_url( $url, 'bp_network_invitation_resend_' . $id );
+                $url = wp_nonce_url( $url, 'bp_member_invitation_resend_' . $id );
 
                 /**
                  * Filters the URL used for resending a single invitation.
@@ -3499 +3499 @@
 
         <input type="submit" id="invitation-bulk-manage" class="button action" value="<?php echo esc_attr_x( 'Apply', 'button', 'buddypress' ); ?>">
         <?php
-}
- No newline at end of file
+}

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

@@ -144 +144 @@
                 // Invitations.
                 if ( is_user_logged_in() && bp_is_user_members_invitations() ) {
                         // Actions.
-                        if ( bp_is_post_request() ) {
+                        if ( isset( $_POST['member_invitations'] ) ) {
                                 require $this->path . 'bp-members/actions/invitations-bulk-manage.php';
                         }
 
                         // Screens.
-                        if ( bp_is_user_members_invitations_list() ) {
-                                require $this->path . 'bp-members/screens/list-invites.php';
-                        } else {
-                                require $this->path . 'bp-members/screens/send-invites.php';
-                        }
+                        require $this->path . 'bp-members/screens/invitations.php';
                 }
         }
 

new file src/bp-members/screens/invitations.php

@@ +1 @@
+<?php
+/**
+ * BuddyPress Members: Invitations screens
+ *
+ * @package BuddyPress
+ * @subpackage MembersScreens
+ * @since 8.0.0
+ */
+
+// Exit if accessed directly.
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Catch and process the Send Invites page.
+ *
+ * @since 8.0.0
+ */
+function members_screen_send_invites() {
+
+        // Chack if there's an invitation to send.
+        if ( isset( $_REQUEST['action'] ) && 'send-invite' === wp_unslash( $_REQUEST['action'] ) ) {
+                $user_id      = bp_displayed_user_id();
+                $default_args = array(
+                        'invitee_email' => '',
+                        'inviter_id'    => $user_id,
+                        'content'       => '',
+                        'send_invite'   => 1,
+                );
+
+                $invite_args = wp_parse_args( array_map( 'wp_unslash', $_REQUEST ), $default_args );
+                $invite_args = array_intersect_key( $invite_args, $default_args );
+
+                // Check the nonce and delete the invitation.
+                if ( bp_verify_nonce_request( 'bp_members_invitation_send_' . $user_id ) && bp_members_invitations_invite_user( $invite_args ) ) {
+                        bp_core_add_message( __( 'Invitation successfully sent!', 'buddypress' )          );
+                } else {
+                        bp_core_add_message( __( 'There was a problem sending that invitation. The user could already be a member of the site or have chosen not to receive invitations from this site.', 'buddypress' ), 'error' );
+                }
+
+                // Redirect.
+                bp_core_redirect( bp_get_members_invitations_send_invites_permalink( $user_id ) );
+        }
+
+        /**
+         * Fires before the loading of template for the send membership invitations page.
+         *
+         * @since 8.0.0
+         */
+        do_action( 'members_screen_send_invites' );
+
+        /**
+         * Filters the template used to display the send membership invitations page.
+         *
+         * @since 8.0.0
+         *
+         * @param string $template Path to the send membership invitations template to load.
+         */
+        bp_core_load_template( apply_filters( 'members_template_send_invites', 'members/single/invitations' ) );
+}
+
+/**
+ * Catch and process the Pending Invites page.
+ *
+ * @since 8.0.0
+ */
+function members_screen_list_sent_invites() {
+
+        // Chack if there's an invitation to cancel or resend.
+        if ( isset( $_GET['action'], $_GET['invitation_id'] ) && $_GET['action'] && $_GET['invitation_id'] ) {
+                $action        = wp_unslash( $_GET['action'] );
+                $invitation_id = (int) wp_unslash( $_GET['invitation_id'] );
+                $user_id       = bp_displayed_user_id();
+
+                if ( 'cancel' === $action ) {
+                        // Check the nonce and delete the invitation.
+                        if ( bp_verify_nonce_request( 'bp_members_invitations_cancel_' . $invitation_id ) && bp_members_invitations_delete_by_id( $invitation_id ) ) {
+                                bp_core_add_message( __( 'Invitation successfully canceled.', 'buddypress' ) );
+                        } else {
+                                bp_core_add_message( __( 'There was a problem canceling that invitation.', 'buddypress' ), 'error' );
+                        }
+                } elseif ( 'resend' === $action ) {
+                        // Check the nonce and resend the invitation.
+                        if ( bp_verify_nonce_request( 'bp_member_invitation_resend_' . $invitation_id ) && bp_members_invitation_resend_by_id( $invitation_id ) ) {
+                                bp_core_add_message( __( 'Invitation successfully resent.', 'buddypress' ) );
+                        } else {
+                                bp_core_add_message( __( 'There was a problem resending that invitation.', 'buddypress' ), 'error' );
+                        }
+                } else {
+                        /**
+                         * Hook here to handle custom actions.
+                         *
+                         * @since 8.0.0
+                         *
+                         * @param string $action        The action name.
+                         * @param int    $invitation_id The invitation ID.
+                         * @param int    $user_id       The displayed user ID.
+                         */
+                        do_action( 'bp_members_invitations_list_invites_action', $action, $invitation_id, $user_id );
+                }
+
+                // Redirect.
+                bp_core_redirect( bp_get_members_invitations_list_invites_permalink( $user_id ) );
+        }
+
+        /**
+         * Fires before the loading of template for the send membership invitations page.
+         *
+         * @since 8.0.0
+         */
+        do_action( 'members_screen_list_sent_invites' );
+
+        /**
+         * Filters the template used to display the send membership invitations page.
+         *
+         * @since 8.0.0
+         *
+         * @param string $template Path to the send membership invitations template to load.
+         */
+        bp_core_load_template( apply_filters( 'members_template_list_sent_invites', 'members/single/invitations' ) );
+}

deleted file src/bp-members/screens/list-invites.php

@@ -1 @@
-<?php
-/**
- * Members: Sent Invitations Status
- *
- * @package BuddyPress
- * @subpackage MembersScreens
- * @since 8.0.0
- */
-
-/**
- * Catch and process the Send Invites page.
- *
- * @since 8.0.0
- */
-function members_screen_list_sent_invites() {
-
-        /**
-         * Fires before the loading of template for the send membership invitations page.
-         *
-         * @since 8.0.0
-         */
-        do_action( 'members_screen_list_sent_invites' );
-
-        /**
-         * Filters the template used to display the send membership invitations page.
-         *
-         * @since 8.0.0
-         *
-         * @param string $template Path to the send membership invitations template to load.
-         */
-        bp_core_load_template( apply_filters( 'members_template_list_sent_invites', 'members/single/invitations' ) );
-}
-
-/**
- * Handle canceling or resending single invitations.
- *
- * @since 8.0.0
- *
- * @return bool
- */
-function bp_members_invitations_action_handling() {
-
-        // Bail if not the read screen.
-        if ( ! bp_is_user_members_invitations_list() ) {
-                return false;
-        }
-
-        // Get the action.
-        $action = ! empty( $_GET['action']        ) ? $_GET['action']        : '';
-        $nonce  = ! empty( $_GET['_wpnonce']      ) ? $_GET['_wpnonce']      : '';
-        $id     = ! empty( $_GET['invitation_id'] ) ? $_GET['invitation_id'] : '';
-
-        // Bail if no action or no ID.
-        if ( empty( $action ) || empty( $id ) ) {
-                return false;
-        }
-
-        if ( 'cancel' === $action ) {
-                // Check the nonce and delete the invitation.
-                if ( bp_verify_nonce_request( 'bp_members_invitations_cancel_' . $id ) && bp_members_invitations_delete_by_id( $id ) ) {
-                        bp_core_add_message( __( 'Invitation successfully canceled.', 'buddypress' ) );
-                } else {
-                        bp_core_add_message( __( 'There was a problem canceling that invitation.', 'buddypress' ), 'error' );
-                }
-        } else if ( 'resend' === $action ) {
-                // Check the nonce and resend the invitation.
-                if ( bp_verify_nonce_request( 'bp_network_invitation_resend_' . $id ) && bp_members_invitation_resend_by_id( $id ) ) {
-                        bp_core_add_message( __( 'Invitation successfully resent.', 'buddypress' ) );
-                } else {
-                        bp_core_add_message( __( 'There was a problem resending that invitation.', 'buddypress' ), 'error' );
-                }
-        } else {
-                return false;
-        }
-
-        // Redirect.
-        $user_id = bp_displayed_user_id();
-        bp_core_redirect( bp_get_members_invitations_list_invites_permalink( $user_id ) );
-}
-add_action( 'bp_actions', 'bp_members_invitations_action_handling' );

deleted file src/bp-members/screens/send-invites.php

@@ -1 @@
-<?php
-/**
- * Members: Send Invitations
- *
- * @package BuddyPress
- * @subpackage MembersScreens
- * @since 8.0.0
- */
-
-/**
- * Catch and process the Send Invites page.
- *
- * @since 8.0.0
- */
-function members_screen_send_invites() {
-
-        /**
-         * Fires before the loading of template for the send membership invitations page.
-         *
-         * @since 8.0.0
-         */
-        do_action( 'members_screen_send_invites' );
-
-        /**
-         * Filters the template used to display the send membership invitations page.
-         *
-         * @since 8.0.0
-         *
-         * @param string $template Path to the send membership invitations template to load.
-         */
-        bp_core_load_template( apply_filters( 'members_template_send_invites', 'members/single/invitations' ) );
-}
-
-/**
- * Handle sending invitations.
- *
- * @since 8.0.0
- *
- * @return bool
- */
-function bp_network_invitations_catch_send_action() {
-
-        // Bail if not the read screen.
-        if ( ! bp_is_user_members_invitations_send_screen() ) {
-                return false;
-        }
-
-        // Get the action.
-        $action  = ! empty( $_REQUEST['action']          ) ? $_REQUEST['action']          : '';
-        $nonce   = ! empty( $_REQUEST['_wpnonce']        ) ? $_REQUEST['_wpnonce']        : '';
-        $email   = ! empty( $_REQUEST['invitee_email']   ) ? $_REQUEST['invitee_email']   : '';
-        $message = ! empty( $_REQUEST['invite_message']  ) ? $_REQUEST['invite_message']  : '';
-
-        // Bail if missing required info.
-        if ( ( 'send-invite' !== $action ) ) {
-                return false;
-        }
-
-        $invite_args = array(
-                'invitee_email' => $email,
-                'inviter_id'    => bp_displayed_user_id(),
-                'content'       => $message,
-                'send_invite'   => 1
-        );
-
-        // Check the nonce and delete the invitation.
-        if ( bp_verify_nonce_request( 'bp_members_invitation_send_' . bp_displayed_user_id() ) && bp_members_invitations_invite_user( $invite_args ) ) {
-                bp_core_add_message( __( 'Invitation successfully sent!', 'buddypress' )          );
-        } else {
-                bp_core_add_message( __( 'There was a problem sending that invitation. The user could already be a member of the site or have chosen not to receive invitations from this site.', 'buddypress' ), 'error' );
-        }
-
-        // Redirect.
-        $user_id = bp_displayed_user_id();
-        bp_core_redirect( bp_get_members_invitations_send_invites_permalink( $user_id ) );
-}
-add_action( 'bp_actions', 'bp_network_invitations_catch_send_action' );

src/bp-templates/bp-legacy/buddypress/members/single/invitations/invitations-loop.php

@@ -36 +36 @@
                                 <tr>
                                         <td class="bulk-select-check">
                                                 <label for="<?php bp_the_members_invitation_property( 'id', 'attribute' ); ?>">
-                                                        <input id="<?php bp_the_members_invitation_property( 'id', 'attribute' ); ?>" type="checkbox" name="network_invitations[]" value="<?php bp_the_members_invitation_property( 'id', 'attribute' ); ?>" class="invitation-check">
+                                                        <input id="<?php bp_the_members_invitation_property( 'id', 'attribute' ); ?>" type="checkbox" name="member_invitations[]" value="<?php bp_the_members_invitation_property( 'id', 'attribute' ); ?>" class="invitation-check">
                                                         <span class="bp-screen-reader-text">
                                                                 <?php
                                                                         /* translators: accessibility text */

src/bp-templates/bp-legacy/buddypress/members/single/invitations/send-invites.php

@@ -23 +23 @@
         <input id="bp_members_invitation_invitee_email" type="email" name="invitee_email" required="required">
 
         <label for="bp_members_invitation_message"><?php esc_html_e( 'Add a personalized message to the invitation (optional)', 'buddypress' ); ?></label>
-        <textarea id="bp_members_invitation_message" name="invite_message"></textarea>
+        <textarea id="bp_members_invitation_message" name="content"></textarea>
 
         <input type="hidden" name="action" value="send-invite">
 

src/bp-templates/bp-nouveau/buddypress/members/single/invitations/invitations-loop.php

@@ -34 +34 @@
                                 <tr>
                                         <td class="bulk-select-check">
                                                 <label for="<?php bp_the_members_invitation_property( 'id', 'attribute' ); ?>">
-                                                        <input id="<?php bp_the_members_invitation_property( 'id', 'attribute' ); ?>" type="checkbox" name="network_invitations[]" value="<?php bp_the_members_invitation_property( 'id', 'attribute' ); ?>" class="invitation-check">
+                                                        <input id="<?php bp_the_members_invitation_property( 'id', 'attribute' ); ?>" type="checkbox" name="member_invitations[]" value="<?php bp_the_members_invitation_property( 'id', 'attribute' ); ?>" class="invitation-check">
                                                         <span class="bp-screen-reader-text">
                                                                 <?php
                                                                         /* translators: accessibility text */

src/bp-templates/bp-nouveau/buddypress/members/single/invitations/send-invites.php

@@ -27 +27 @@
                 <label for="bp_members_invitation_message">
                         <?php esc_html_e( 'Add a personalized message to the invitation (optional)', 'buddypress' ); ?>
                 </label>
-                <textarea id="bp_members_invitation_message" name="invite_message"></textarea>
+                <textarea id="bp_members_invitation_message" name="content"></textarea>
 
                 <input type="hidden" name="action" value="send-invite">