Changeset 12929

Timestamp:

04/28/2021 11:52:39 PM (3 years ago)

Author:

dcavins

Message:

Member Invites: Install emails on upgrade to 8.0.

Include the new emails and descriptions and install them
during the upgrade to 8.0.

See #8139.

Location:

trunk/src/bp-core

Files:

• bp-core-functions.php (modified) (7 diffs)
• bp-core-update.php (modified) (1 diff)

trunk/src/bp-core/bp-core-functions.php

@@ -703 +703 @@
     // Register and Activate are not components, but need pages when
     // registration is enabled.
-    if ( bp_get_signup_allowed() ) {
+    if ( bp_get_signup_allowed() || bp_get_members_invitations_allowed()  ) {
         foreach ( array( 'register', 'activate' ) as $slug ) {
             if ( ! isset( $pages[ $slug ] ) ) {
@@ -3473 +3473 @@
     if ( 'settings-verify-email-change' === $email_type && isset( $args['tokens']['displayname'] ) ) {
         $email->set_to( $to, $args['tokens']['displayname'] );
+    // Emails sent to nonmembers will have no recipient.name populated.
+    } else if ( 'bp-members-invitation' === $email_type ) {
+        $email->set_to( $to, $to );
     } else {
         $email->set_to( $to );
@@ -3816 +3819 @@
             'post_title'   => __( '[{{{site.name}}}] You have an invitation to the group: "{{group.name}}"', 'buddypress' ),
             /* translators: do not remove {} brackets or translate its contents. */
-            'post_content' => __( "<a href=\"{{{inviter.url}}}\">{{inviter.name}}</a> has invited you to join the group: &quot;{{group.name}}&quot;.\n{{invite.message}}\n<a href=\"{{{invites.url}}}\">Go here to accept your invitation</a> or <a href=\"{{{group.url}}}\">visit the group</a> to learn more.", 'buddypress' ),
-            /* translators: do not remove {} brackets or translate its contents. */
-            'post_excerpt' => __( "{{inviter.name}} has invited you to join the group: \"{{group.name}}\".\n\nTo accept your invitation, visit: {{{invites.url}}}\n\nTo learn more about the group, visit: {{{group.url}}}.\nTo view {{inviter.name}}'s profile, visit: {{{inviter.url}}}", 'buddypress' ),
+            'post_content' => __( "<a href=\"{{{inviter.url}}}\">{{inviter.name}}</a> has invited you to join the group: &quot;{{group.name}}&quot;.\n\n{{invite.message}}\n\n<a href=\"{{{invites.url}}}\">Go here to accept your invitation</a> or <a href=\"{{{group.url}}}\">visit the group</a> to learn more.", 'buddypress' ),
+            /* translators: do not remove {} brackets or translate its contents. */
+            'post_excerpt' => __( "{{inviter.name}} has invited you to join the group: \"{{group.name}}\".\n\n{{invite.message}}\n\nTo accept your invitation, visit: {{{invites.url}}}\n\nTo learn more about the group, visit: {{{group.url}}}.\nTo view {{inviter.name}}'s profile, visit: {{{inviter.url}}}", 'buddypress' ),
         ),
         'groups-member-promoted' => array(
@@ -3867 +3870 @@
             /* translators: do not remove {} brackets or translate its contents. */
             'post_excerpt' => __( "Your membership request for the group \"{{group.name}}\" has been rejected.\n\nTo request membership again, visit: {{{group.url}}}", 'buddypress' ),
+        ),
+        'bp-members-invitation' => array(
+            /* translators: do not remove {} brackets or translate its contents. */
+            'post_title'   => __( '{{inviter.name}} has invited you to join {{site.name}}', 'buddypress' ),
+            /* translators: do not remove {} brackets or translate its contents. */
+            'post_content' => __( "<a href=\"{{{inviter.url}}}\">{{inviter.name}}</a> has invited you to join the site: &quot;{{site.name}}&quot;.\n\n{{usermessage}}\n\n<a href=\"{{{invite.accept_url}}}\">Accept your invitation</a> or <a href=\"{{{site.url}}}\">visit the site</a> to learn more.", 'buddypress' ),
+            /* translators: do not remove {} brackets or translate its contents. */
+            'post_excerpt' => __( "{{inviter.name}} has invited you to join the site \"{{site.name}}\".\n\n{{usermessage}}\n\nTo accept your invitation, visit: {{{invite.accept_url}}}\n\nTo learn more about the site, visit: {{{site.url}}}.\nTo view {{inviter.name}}'s profile, visit: {{{inviter.url}}}", 'buddypress' ),
         ),
     ) );
@@ -4011 +4022 @@
     $core_user_activation = array(
         'description'   => __( 'Recipient has successfully activated an account.', 'buddypress' ),
+    );
+
+    $members_invitation = array(
+        'description'   => __( 'A site member has sent a site invitation to the recipient.', 'buddypress' ),
+        'unsubscribe'   => array(
+            'meta_key'  => 'notification_bp_members_invite',
+            'message'   => __( 'You will no longer receive emails when you are invited to join this site.', 'buddypress' ),
+        ),
     );
 
@@ -4031 +4050 @@
         'groups-membership-request-rejected' => $groups_membership_request_rejected,
         'core-user-activation'               => $core_user_activation,
+        'bp-members-invitation'              => $members_invitation,
     );
 
@@ -4163 +4183 @@
  *    @type string $user_id           The ID of the user to whom the notification is sent.
  *    @type string $redirect_to       Optional. The url to which the user will be redirected. Default is the activity directory.
+ *    @type string $email             Optional. The email address of the user to whom the notification is sent.
  * }
  * @return string The unsubscribe link.

trunk/src/bp-core/bp-core-update.php

@@ -696 +696 @@
     if ( isset( $emails['core-user-activation'] ) ) {
         $new_emails['core-user-activation'] = $emails['core-user-activation'];
+    }
+
+    if ( isset( $emails['bp-members-invitation'] ) ) {
+        $new_emails['bp-members-invitation'] = $emails['bp-members-invitation'];
     }