<!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>[4138] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-badges: Support Forums: Add moderator badge to moderator forum replies.</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://meta.trac.wordpress.org/changeset/4138">4138</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/4138","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coffee2code</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-09-27 17:56:20 +0000 (Tue, 27 Sep 2016)</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'>Support Forums: Add moderator badge to moderator forum replies.
* Keymasters get the same "Moderator" badge as there is no need to publicly differentiate the roles.
* The badge color matches the color used for the support team's profiles.wordpress.org badges.
* In contexts where the user would otherwise get a plugin or theme author/contributor badge, the moderator badge is not shown.
See <a href="http://meta.trac.wordpress.org/ticket/2073">#2073</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbpuserbadgesincclasspluginphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-badges/inc/class-plugin.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbpuserbadgeswporgbbpuserbadgesphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-badges/wporg-bbp-user-badges.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbpuserbadgesincclasspluginphp"></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/plugins/wporg-bbp-user-badges/inc/class-plugin.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/plugins/wporg-bbp-user-badges/inc/class-plugin.php 2016-09-27 16:17:49 UTC (rev 4137)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-badges/inc/class-plugin.php 2016-09-27 17:56:20 UTC (rev 4138)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_get_reply_class', array( $this, 'bbp_get_reply_class' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add badge before reply author info.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'bbp_theme_before_reply_author_details', array( $this, 'wporg_support_add_author_badges' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'bbp_theme_before_reply_author_details', array( $this, 'add_user_badges' ) );
</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"> protected function get_author_badge_info() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,6 +102,11 @@
</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"> public function bbp_get_reply_class( $classes, $reply_id ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Class related to moderators.
+ if ( $this->is_user_moderator() ) {
+ $classes[] = 'by-moderator';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Class related to plugin and theme authors/contributors.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $info = $this->get_author_badge_info() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->is_user_author( $info['user_login'], $info['type'], $info['slug'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +129,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Display author badge if reply author is in support or reviews forum for
</span><span class="cx" style="display: block; padding: 0 10px"> * the plugin/theme they contribute to.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function wporg_support_add_author_badges() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function add_user_badges() {
+ $output = $this->get_author_badge();
+
+ // Don't assign moderator badge if already assigning author badge.
+ if ( ! $output ) {
+ $output = $this->get_moderator_badge();
+ }
+
+ if ( $output ) {
+ echo $this->format_badge( $output['type'], $output['label'], $output['help'] );
+ }
+ }
+
+ protected function format_badge( $type, $label, $help = '' ) {
+ $output = '';
+
+ if ( $label ) {
+ $output .= sprintf(
+ '<span class="author-badge author-badge-%s" title="%s">%s</span>',
+ esc_attr( $type ),
+ esc_attr( $help ),
+ $label
+ );
+ }
+
+ // Return the markup.
+ return $output;
+ }
+
+ protected function get_author_badge() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $info = $this->get_author_badge_info() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,19 +185,18 @@
</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">- // Build the markup.
- $output = '';
- if ( $label ) {
- $output .= sprintf(
- '<span class="author-badge %s-author-badge" title="%s">%s</span>',
- esc_attr( $info['type'] ),
- esc_attr( $help ),
- $label
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $label ? array( 'type' => $info['type'], 'label' => $label, 'help' => $help ) : false;
+ }
+
+ protected function get_moderator_badge() {
+ $label = $help = null;
+
+ if ( $this->is_user_moderator() ) {
+ $label = __( 'Moderator', 'wporg-forums' );
+ $help = __( 'This person is a moderator on this forum', 'wporg-forums' );
</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">- // Output the markup.
- echo $output;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $label ? array( 'type' => 'moderator', 'label' => $label, 'help' => $help ) : false;
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,4 +283,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $contributors && in_array( $user_login, $contributors );
</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">+ /**
+ * Checks if the specified user is a forum moderator or keymaster.
+ *
+ * By default, this considers a keymaster as being a moderator for the purpose
+ * of badging them. Use the $strict argument to check that the user is a
+ * moderator without considering if they are a keymaster.
+ *
+ * @param string $user_id Optional. User ID. Assumes current reply author ID
+ * if not provided.
+ * @param bool $strict Optional. True if user should strictly be checked
+ * for being a moderator, false will also check if they
+ * are a keymaster. Default false.
+ * @return bool True if user is a moderator, false otherwise.
+ */
+ public function is_user_moderator( $user_id = '', $strict = false ) {
+ if ( ! $user_id ) {
+ $user_id = bbp_get_reply_author_id();
+ }
+
+ return ( user_can( $user_id, 'moderate' ) || ( ! $strict && bbp_is_user_keymaster( $user_id ) ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbpuserbadgeswporgbbpuserbadgesphp"></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/plugins/wporg-bbp-user-badges/wporg-bbp-user-badges.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/plugins/wporg-bbp-user-badges/wporg-bbp-user-badges.php 2016-09-27 16:17:49 UTC (rev 4137)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-badges/wporg-bbp-user-badges.php 2016-09-27 17:56:20 UTC (rev 4138)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Plugin Name: bbPress: Show User Badges
- * Description: Display a badge for plugin and theme authors and contributors for replies in their own support forums.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Plugin Name: bbPress: User Badges
+ * Description: Display a badge in user replies as appropriate (such as for a plugin/theme author/contributor, moderator).
</ins><span class="cx" style="display: block; padding: 0 10px"> * Version: 1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * Author: WordPress.org
</span><span class="cx" style="display: block; padding: 0 10px"> * Author URI: https://wordpress.org/
</span></span></pre>
</div>
</div>
</body>
</html>