<!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][11406] trunk/src: Users Admin: Show profile field data on "Activate Pending Accounts" page.</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 { 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/11406">11406</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/11406","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>r-a-y</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-01-31 20:42:48 +0000 (Tue, 31 Jan 2017)</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'>Users Admin: Show profile field data on "Activate Pending Accounts" page.
This commit now displays the profile field data that the pending user
filled in so an administrator can make a better decision as to whether to
activate the user or not.
Props r-a-y, slaFFik, boonebgorges, DJPaul.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7261">#7261</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcoreadmincsscommoncss">trunk/src/bp-core/admin/css/common.css</a></li>
<li><a href="#trunksrcbpmembersclassesclassbpmembersadminphp">trunk/src/bp-members/classes/class-bp-members-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcoreadmincsscommoncss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/admin/css/common.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/admin/css/common.css 2017-01-31 20:31:10 UTC (rev 11405)
+++ trunk/src/bp-core/admin/css/common.css 2017-01-31 20:42:48 UTC (rev 11406)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -553,7 +553,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> text-align: center;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.bp-signups-list table {
+ margin: 1em 0;
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.bp-signups-list .column-fields {
+ font-weight: bold;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*------------------------------------------------------------------------------
</span><span class="cx" style="display: block; padding: 0 10px"> * 4.0 Emails - Edit Page
</span><span class="cx" style="display: block; padding: 0 10px"> *----------------------------------------------------------------------------*/
</span></span></pre></div>
<a id="trunksrcbpmembersclassesclassbpmembersadminphp"></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-admin.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-admin.php 2017-01-31 20:31:10 UTC (rev 11405)
+++ trunk/src/bp-members/classes/class-bp-members-admin.php 2017-01-31 20:42:48 UTC (rev 11406)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2040,6 +2040,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'signups_' . $action
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Prefetch registration field data.
+ $fdata = array();
+ if ( 'activate' === $action && bp_is_active( 'xprofile' ) ) {
+ $fields = bp_xprofile_get_groups( array(
+ 'profile_group_id' => 1,
+ 'exclude_fields' => 1,
+ 'update_meta_cache' => false,
+ 'fetch_fields' => true,
+ ) );
+ $fields = $fields[0]->fields;
+ foreach( $fields as $f ) {
+ $fdata[ $f->id ] = $f->name;
+ }
+ }
+
</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"> <div class="wrap">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2048,12 +2063,45 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <ol class="bp-signups-list">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $signups as $signup ) :
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $last_notified = mysql2date( 'Y/m/d g:i:s a', $signup->date_sent );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $last_notified = mysql2date( 'Y/m/d g:i:s a', $signup->date_sent ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get all xprofile field IDs except field 1.
+ $profile_field_ids = array_flip( explode( ',', $signup->meta['profile_field_ids'] ) );
+ unset( $profile_field_ids[1] );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo esc_html( $signup->user_name ) ?> - <?php echo sanitize_email( $signup->user_email );?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <strong><?php echo esc_html( $signup->user_login ) ?></strong>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'activate' == $action ) : ?>
+ <table class="wp-list-table widefat fixed striped">
+ <tbody>
+ <tr>
+ <td class="column-fields"><?php esc_html_e( 'Display Name', 'buddypress' ); ?></td>
+ <td><?php echo esc_html( $signup->user_name ); ?></td>
+ </tr>
+
+ <tr>
+ <td class="column-fields"><?php esc_html_e( 'Email', 'buddypress' ); ?></td>
+ <td><?php echo sanitize_email( $signup->user_email ); ?></td>
+ </tr>
+
+ <?php if ( bp_is_active( 'xprofile' ) && ! empty( $profile_field_ids ) ) : ?>
+ <?php foreach ( $profile_field_ids as $pid => $noop ) :
+ $field_value = isset( $signup->meta[ "field_{$pid}" ] ) ? $signup->meta[ "field_{$pid}" ] : ''; ?>
+ <tr>
+ <td class="column-fields"><?php echo esc_html( $fdata[ $pid ] ); ?></td>
+ <td><?php echo $this->format_xprofile_field_for_display( $field_value ); ?></td>
+ </tr>
+
+ <?php endforeach; ?>
+
+ <?php endif; ?>
+
+ </tbody>
+ </table>
+ <?php endif; ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'resend' == $action ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2305,5 +2353,27 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Formats a signup's xprofile field data for display.
+ *
+ * Operates recursively on arrays, which are then imploded with commas.
+ *
+ * @since 2.8.0
+ *
+ * @param string|array $value Field value.
+ * @return string
+ */
+ protected function format_xprofile_field_for_display( $value ) {
+ if ( is_array( $value ) ) {
+ $value = array_map( array( $this, 'format_xprofile_field_for_display' ), $value );
+ $value = implode( ', ', $value );
+ } else {
+ $value = stripslashes( $value );
+ $value = esc_html( $value );
+ }
+
+ return $value;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // End class_exists check.
</span></span></pre>
</div>
</div>
</body>
</html>