<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][12920] trunk/src/bp-members: Member Invites: Add screens.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/12920">12920</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12920","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dcavins</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-04-28 23:50:46 +0000 (Wed, 28 Apr 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Member Invites: Add screens.
Introduce new logic on registration screens
and `list-invites` and `send-invites` screens.
See <a href="http://buddypress.trac.wordpress.org/ticket/8139">#8139</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmembersclassesclassbpmemberscomponentphp">trunk/src/bp-members/classes/class-bp-members-component.php</a></li>
<li><a href="#trunksrcbpmembersscreensregisterphp">trunk/src/bp-members/screens/register.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcbpmembersscreenslistinvitesphp">trunk/src/bp-members/screens/list-invites.php</a></li>
<li><a href="#trunksrcbpmembersscreenssendinvitesphp">trunk/src/bp-members/screens/send-invites.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpmembersclassesclassbpmemberscomponentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/classes/class-bp-members-component.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/classes/class-bp-members-component.php 2021-04-28 23:50:34 UTC (rev 12919)
+++ trunk/src/bp-members/classes/class-bp-members-component.php 2021-04-28 23:50:46 UTC (rev 12920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,6 +139,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Theme compatibility.
</span><span class="cx" style="display: block; padding: 0 10px"> new BP_Registration_Theme_Compat();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Invitations.
+ if ( is_user_logged_in() && bp_is_user_members_invitations() ) {
+ 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';
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcbpmembersscreenslistinvitesphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/bp-members/screens/list-invites.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/screens/list-invites.php (rev 0)
+++ trunk/src/bp-members/screens/list-invites.php 2021-04-28 23:50:46 UTC (rev 12920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,80 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?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' );
</ins></span></pre></div>
<a id="trunksrcbpmembersscreensregisterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/screens/register.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/screens/register.php 2021-04-28 23:50:34 UTC (rev 12919)
+++ trunk/src/bp-members/screens/register.php 2021-04-28 23:50:46 UTC (rev 12920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,9 +42,27 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $bp->signup->step = 'request-details';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !bp_get_signup_allowed() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Could the user be accepting an invitation?
+ $active_invite = false;
+ if ( bp_get_members_invitations_allowed() ) {
+ // Check to see if there's a valid invitation.
+ $maybe_invite = bp_get_members_invitation_from_request();
+ if ( $maybe_invite->id && $maybe_invite->invitee_email ) {
+ // Check if this user is already a member.
+ $args = array(
+ 'invitee_email' => $maybe_invite->invitee_email,
+ 'accepted' => 'accepted',
+ 'fields' => 'ids',
+ );
+ $accepted_invites = bp_members_invitations_get_invites( $args );
+ if ( ! $accepted_invites ) {
+ $active_invite = true;
+ }
+ }
+ }
+
+ if ( ! bp_get_signup_allowed() && ! $active_invite ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $bp->signup->step = 'registration-disabled';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> // If the signup page is submitted, validate and save.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_POST['signup_submit'] ) && bp_verify_nonce_request( 'bp_new_signup' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpmembersscreenssendinvitesphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/bp-members/screens/send-invites.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/screens/send-invites.php (rev 0)
+++ trunk/src/bp-members/screens/send-invites.php 2021-04-28 23:50:46 UTC (rev 12920)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,77 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?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' );
</ins></span></pre>
</div>
</div>
</body>
</html>