<!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>[12121] sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-association-handler/wporg-profiles-association-handler.php: Profiles Association Handler: Combine the WordCamp, Meetup, and Polyglots code to use the 'generic-badge' handler.</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://meta.trac.wordpress.org/changeset/12121">12121</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/12121","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-10-13 05:57:18 +0000 (Thu, 13 Oct 2022)</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'>Profiles Association Handler: Combine the WordCamp, Meetup, and Polyglots code to use the 'generic-badge' handler.
This also removes some unused code, and defers group re-counting, which speeds up bulk association setting significantly.
See https://buddypress.trac.wordpress.org/ticket/8688</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkprofileswordpressorgpublic_htmlwpcontentpluginswporgprofilesassociationhandlerwporgprofilesassociationhandlerphp">sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-association-handler/wporg-profiles-association-handler.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkprofileswordpressorgpublic_htmlwpcontentpluginswporgprofilesassociationhandlerwporgprofilesassociationhandlerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-association-handler/wporg-profiles-association-handler.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-association-handler/wporg-profiles-association-handler.php 2022-10-13 04:57:01 UTC (rev 12120)
+++ sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-association-handler/wporg-profiles-association-handler.php 2022-10-13 05:57:18 UTC (rev 12121)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> Author: Scott Reilly
</span><span class="cx" style="display: block; padding: 0 10px"> License: GPL2
</span><span class="cx" style="display: block; padding: 0 10px"> Version: 1.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Description: Handles the associations sent from other services in the .org ecosystem (WP, WordCamp, WP, etc).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Description: Handles the associations sent from other services in the .org ecosystem (WP, WordCamp, etc).
</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"> defined( 'ABSPATH' ) or die();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,9 +30,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function plugins_loaded() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_ajax_nopriv_wporg_handle_association', array( $this, 'handle_association' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Approve users added to groups
-// add_action( 'groups_join_group', array( $this, 'auto_accept_group_invite_for_user' ), 10, 2 );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Disable activity reporting related to groups
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bp_activity_component_before_save', array( $this, 'disable_group_activity_reporting' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'bp_register_activity_actions', 'groups_register_activity_actions' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,16 +98,6 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Accept all invitations to a group on behalf of the user.
- *
- * @param int $group_id Group ID
- * @param int $user_id User ID
- */
- public function auto_accept_group_invite_for_user( $group_id, $user_id ) {
- //TODO
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * BP thinks wp-admin is the slug for a user being displayed (which happens
</span><span class="cx" style="display: block; padding: 0 10px"> * to actually exist on .org), so clear that until a proper fix is pursued.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,14 +140,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $source ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'wordcamp':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $association_id = $this->handle_wordcamp_association();
- break;
- case 'meetups' :
- $association_id = $this->handle_meetup_association();
- break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'meetups':
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'polyglots':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $association_id = $this->handle_polyglots_association();
- break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // These sources may send the field as `user_id`/`association`, so handle that format if not specified otherwise.
+ $_POST['users'] ??= (array) $_POST['user_id'];
+ $_POST['badge'] ??= $_POST['association'];
+
+ // Fall through, the generic-badge uses `users`/`badge` for the fields, as set above.
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'generic-badge':
</span><span class="cx" style="display: block; padding: 0 10px"> $association_id = $this->handle_badge_association();
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,169 +164,75 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Handles incoming associations for WordCamp.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Handles incoming associations for the generic '{assign|remove}_badge()' functions. See pub/profile-helpers.php.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Payload: (beyond 'action' and 'source')
- * user_id: User ID
- * association: Slug for group/association
- * command: Either 'add' or 'remove'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Payload: (beyond 'action' and 'source')
+ * users: User ID(s)/login(s)/nicename(s).
+ * badge: Slug for group/association.
+ * command: Either 'add' or 'remove'
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- private function handle_wordcamp_association() {
- $user = get_user_by( 'id', $_POST['user_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function handle_badge_association() {
+ $users = wp_unslash( $_POST['users'] ?? [] );
+ $command = $_POST['command'] ?? '';
+ $badge = sanitize_key( $_POST['badge'] ?? '' );
+ $group_id = BP_Groups_Group::group_exists( $badge );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $user ) {
- return '-1 Association reported for unrecognized user: ' . sanitize_text_field( $_POST['user_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $badge || ! $group_id ) {
+ status_header( 400 );
+ return '-1 Association does not exist: ' . $badge;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $association = sanitize_key( $_POST['association'] );
-
- $associated_associations = array( 'wordcamp-organizer', 'wordcamp-speaker' );
-
- if ( ! in_array( $association, $associated_associations ) ) {
- return '-1 Unrecognized association type';
- }
-
- if ( ! $group_id = BP_Groups_Group::group_exists( $association ) ) {
- return '-1 Association does not exist: ' . $association;
- }
-
- if ( 'add' == $_POST['command'] ) {
- groups_join_group( $group_id, $user->ID );
- groups_accept_invite( $user->ID, $group_id );
- } elseif ( 'remove' == $_POST['command'] ) {
- groups_leave_group( $group_id, $user->ID );
- } else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'add' !== $command && 'remove' !== $command ) {
+ status_header( 400 );
</ins><span class="cx" style="display: block; padding: 0 10px"> return '-1 Unknown association command';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return 1;
- }
-
- /**
- * Handles incoming associations for Meetup.
- *
- * Payload: (beyond 'action' and 'source')
- * users: List of users login
- * association: Group slug
- * @return int|string
- */
- private function handle_meetup_association() {
-
- if ( ( ! isset( $_POST['users'] ) || ( ! is_array( $_POST['users'] ) ) ) ) {
- return '-1 Users does not exist: ';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $users ) ) {
+ status_header( 400 );
+ return '-1 User(s) not specified';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $association = sanitize_key( $_POST['association'] );
- $associated_associations = array( 'meetup-organizer' );
-
- if ( ! in_array( $association, $associated_associations ) ) {
- return '-1 Unrecognized association type';
- }
-
- if ( ! $group_id = BP_Groups_Group::group_exists( $association ) ) {
- return '-1 Association does not exist: ' . $association;
- }
-
- foreach ( $_POST['users'] as $user ) {
- $user = get_user_by( 'login', $user );
- if ( 'add' == $_POST['command'] ) {
- groups_join_group( $group_id, $user->ID );
- groups_accept_invite( $user->ID, $group_id );
- } elseif ( 'remove' == $_POST['command'] ) {
- groups_leave_group( $group_id, $user->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Validate all users.
+ foreach ( $users as $i => $user ) {
+ if ( is_numeric( $user ) && ( absint( $user ) == $user ) ) {
+ $_user = get_user_by( 'id', $user );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return '-1 Unknown association command';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_user = get_user_by( 'login', $user );
+ if ( ! $_user ) {
+ $_user = get_user_by( 'slug', $user );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $_user ) {
+ status_header( 400 );
+ return '-1 Association requested for unrecognized user: ' . sanitize_text_field( $user );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
-
- /**
- * Handles incoming associations for Polyglots/translate.wordpress.org.
- *
- * Payload: (beyond 'action' and 'source')
- * user_id: User ID
- * association: Slug for group/association
- * command: Either 'add' or 'remove'
- */
- private function handle_polyglots_association() {
- $user = get_user_by( 'id', $_POST['user_id'] );
-
- if ( ! $user ) {
- return '-1 Association reported for unrecognized user: ' . sanitize_text_field( $_POST['user_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $users[ $i ] = $_user->ID;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $association = sanitize_key( $_POST['association'] );
-
- $associated_associations = array( 'translation-editor', 'translation-contributor' );
-
- if ( ! in_array( $association, $associated_associations ) ) {
- return '-1 Unrecognized association type';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Defer group re-counts.
+ if ( function_exists( 'bp_groups_defer_group_members_count' ) ) {
+ bp_groups_defer_group_members_count( true );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</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 ( ! $group_id = BP_Groups_Group::group_exists( $association ) ) {
- return '-1 Association does not exist: ' . $association;
- }
-
- if ( 'add' == $_POST['command'] ) {
- groups_join_group( $group_id, $user->ID );
- groups_accept_invite( $user->ID, $group_id );
- } elseif ( 'remove' == $_POST['command'] ) {
- groups_leave_group( $group_id, $user->ID );
- } else {
- return '-1 Unknown association command';
- }
-
- return 1;
- }
-
- /**
- * Handles incoming associations for the generic '{assign|remove}_badge()' functions. See pub/profile-helpers.php.
- *
- * Payload: (beyond 'action' and 'source')
- * user: User ID/email/login
- * badge: Slug for group/association
- * command: Either 'add' or 'remove'
- */
- private function handle_badge_association() {
- $user = wp_unslash( $_POST['user'] ?? '' );
-
- // Handle login/email as input..
- if ( ! is_numeric( $user ) ) {
- $_user = get_user_by( 'login', $user );
- if ( ! $_user && is_email( $user ) ) {
- $_user = get_user_by( 'email', $user );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $users as $user_id ) {
+ if ( 'add' == $command ) {
+ if ( ! groups_is_user_member( $user_id, $group_id ) ) {
+ groups_join_group( $group_id, $user_id );
+ }
+ } elseif ( 'remove' == $command ) {
+ if ( groups_is_user_member( $group_id, $user_id ) ) {
+ groups_leave_group( $group_id, $user_id );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $user = $_user->ID ?? $user;
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user = get_user_by( 'id', $user );
- if ( ! $user ) {
- status_header( 400 );
- return '-1 Association requested for unrecognized user: ' . sanitize_text_field( $_POST['user'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Perform the group recounts.
+ if ( function_exists( 'bp_groups_defer_group_members_count' ) ) {
+ bp_groups_defer_group_members_count( false, $group_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $badge = sanitize_key( $_POST['badge'] ?? '' );
- $group_id = BP_Groups_Group::group_exists( $badge );
- if ( ! $badge || ! $group_id ) {
- status_header( 400 );
- return '-1 Association does not exist: ' . $badge;
- }
-
- if ( 'add' == $_POST['command'] ) {
- groups_join_group( $group_id, $user->ID );
- groups_accept_invite( $user->ID, $group_id );
- } elseif ( 'remove' == $_POST['command'] ) {
- groups_leave_group( $group_id, $user->ID );
- } else {
- status_header( 400 );
- return '-1 Unknown association command';
- }
-
- // NOTE: Actual response from `groups_join_group()` & `groups_leave_group()` set in cookies.
</del><span class="cx" style="display: block; padding: 0 10px"> return 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>