<!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>[11815] sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/profile-helpers.php: Profiles: Integrate `WPOrg_Learn\Profiles\` helpers.</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/11815">11815</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/11815","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-05-04 23:01:43 +0000 (Wed, 04 May 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: Integrate `WPOrg_Learn\Profiles\` helpers.
This allows `request_profile_update()` and `redirect_sandbox_requests()` to be replaced with a call to `api()`.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentmupluginspubprofilehelpersphp">sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/profile-helpers.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentmupluginspubprofilehelpersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/profile-helpers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/profile-helpers.php 2022-05-04 07:09:14 UTC (rev 11814)
+++ sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/profile-helpers.php 2022-05-04 23:01:43 UTC (rev 11815)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\Profiles;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use WP_Error;
</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"> * Assign a badge to a given user.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,28 +58,48 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Send requests to Profiles and handle errors.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * `$request_args` should match what the handler expects for a particular request.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * See `wporg-profiles-activity-handler.php` and `wporg-profiles-association-handler.php`.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * See `wporg-profiles-activity-handler.php` and `wporg-profiles-association-handler.php`
+ *
+ * @return array|WP_Error
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function api( array $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'https://profiles.wordpress.org/wp-admin/admin-ajax.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = [];
</span><span class="cx" style="display: block; padding: 0 10px"> $sslverify = true;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $error = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Requests to w.org sandbox should also use profiles.w.org sandbox, for testing end to end.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'staging' === wp_get_environment_type() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = str_replace( 'profiles.wordpress.org', '127.0.0.1', $url );
- $sslverify = false; // wp_remote_get() cannot verify SSL if the hostname is 127.0.0.1.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = str_replace( 'profiles.wordpress.org', '127.0.0.1', $url );
+ $sslverify = false; // wp_remote_get() cannot verify SSL if the hostname is 127.0.0.1.
+ $headers['host'] = 'profiles.wordpress.org';
</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">- // Note: Authentication is handled elsewhere transparently.
- return wp_remote_post(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Note: Authentication is handled transparently by `enable_wporg_profiles_ajax_handler()` on Profiles.
+ $response = wp_remote_post(
</ins><span class="cx" style="display: block; padding: 0 10px"> $url,
</span><span class="cx" style="display: block; padding: 0 10px"> [
</span><span class="cx" style="display: block; padding: 0 10px"> 'body' => $args,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'headers' => [
- 'host' => 'profiles.wordpress.org',
- ],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'timeout' => 10,
+ 'headers' => $headers,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'sslverify' => $sslverify,
</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">-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( is_wp_error( $response ) ) {
+ $error = $response->get_error_message();
+
+ } elseif ( 200 != wp_remote_retrieve_response_code( $response ) || 1 !== (int) wp_remote_retrieve_body( $response ) ) {
+ $error = sprintf(
+ 'Error %s %s',
+ $response['response']['code'],
+ $response['body']
+ );
+ }
+
+ if ( $error ) {
+ trigger_error( wp_kses_post( $error ), E_USER_WARNING );
+ }
+
+ return $response;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>