<!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>[4332] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php: Support Forums: Add subscription management to user profiles.</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/4332">4332</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/4332","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jmdodd</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-11-06 21:35:21 +0000 (Sun, 06 Nov 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 subscription management to user profiles.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbptermsubscriptionincclasspluginphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporgbbptermsubscriptionincclasspluginphp"></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-term-subscription/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-term-subscription/inc/class-plugin.php 2016-11-06 21:31:13 UTC (rev 4331)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php 2016-11-06 21:35:21 UTC (rev 4332)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_parse_args( $args, array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'topic-tag',
</span><span class="cx" style="display: block; padding: 0 10px"> 'labels' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'receipt' => __( 'You are receiving this email because you are subscribed to a topic tag.', 'wporg-forums'),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'subscribed_header' => __( 'Subscribed Topic Tags', 'wporg-forums' ),
+ 'subscribed_user_notice' => __( 'You are not currently subscribed to any topic tags.', 'wporg-forums' ),
+ 'subscribed_anon_notice' => __( 'This user is not currently subscribed to any topic tags.', 'wporg-forums' ),
+ 'receipt' => __( 'You are receiving this email because you are subscribed to a topic tag.', 'wporg-forums'),
</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">@@ -49,6 +52,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Notify subscribers when a topic or reply with a given term is added.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bbp_new_topic', array( $this, 'notify_term_subscribers_of_new_topic' ), 10, 4 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bbp_new_reply', array( $this, 'notify_term_subscribers_of_new_reply' ), 10, 5 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ add_action( 'bbp_template_after_user_subscriptions', array( $this, 'user_subscriptions' ) );
</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">@@ -122,9 +127,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $success = self::add_user_subscription( $user_id, $term_id );
</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">+ // Redirect
+ if ( bbp_is_subscriptions() ) {
+ $redirect = bbp_get_subscriptions_permalink( $user_id );
+ } else {
+ $redirect = get_term_link( $term_id );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Success!
</span><span class="cx" style="display: block; padding: 0 10px"> if ( true === $success ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect = get_term_link( $term_id );
</del><span class="cx" style="display: block; padding: 0 10px"> bbp_redirect( $redirect );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( true === $is_subscribed && 'wporg_bbp_subscribe_term' === $action ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Term: topic tag */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,6 +337,46 @@
</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">+ * Add a term subscription block to the user's profile.
+ */
+ public function user_subscriptions() {
+ $user_id = bbp_get_user_id();
+ if ( empty( $user_id ) ) {
+ return;
+ }
+ $terms = self::get_user_taxonomy_subscriptions( $user_id, $this->taxonomy );
+ ?>
+
+ <div class="bbp-user-subscriptions">
+ <h2 class="entry-title"><?php echo esc_html( $this->labels['subscribed_header'] ); ?></h2>
+ <div class="bbp-user-section">
+ <?php
+ if ( $terms ) {
+ echo '<p id="bbp-term-' . esc_attr( $this->taxonomy ) . '">' . "\n";
+ foreach ( $terms as $term ) {
+ echo '<a href="' . esc_url( get_term_link( $term->term_id ) ) . '">' . esc_html( $term->slug ) . '</a>';
+ if ( get_current_user_id() == $user_id ) {
+ $url = self::get_subscription_url( $user_id, $term->term_id, $this->taxonomy );
+ echo ' (<a href="' . esc_url( self::get_subscription_url( $user_id, $term->term_id, $this->taxonomy ) ) . '">' . esc_html( 'Unsubscribe', 'wporg-forums' ) . '</a>)';
+ }
+ echo "</br>\n";
+ }
+ echo "</p>\n";
+ } else {
+ if ( bbp_get_user_id() == get_current_user_id() ) {
+ echo '<p>' . esc_html( $this->labels['subscribed_user_notice'] ) . '</p>';
+ } else {
+ echo '<p>' . esc_html( $this->labels['subscribed_anon_notice'] ) . '</p>';
+ }
+ }
+ ?>
+ </div>
+ </div>
+
+ <?php
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Get the user's subscriptions for a given taxonomy; defaults to 'topic-tag'.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param $user_id int The user id
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -433,14 +484,44 @@
</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">- * Create the link for subscribing to/unsubscribing from a given term.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Create the url for subscribing to/unsubscribing from a given term.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $action The action
</del><span class="cx" style="display: block; padding: 0 10px"> * @param int $user_id The user id
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $term_id The term id
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $taxonomy The taxonomy
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string
</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 static function get_subscription_link( $args = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function get_subscription_url( $user_id = 0, $term_id, $taxonomy ) {
+ if ( empty( $user_id ) ) {
+ $user_id = bbp_get_user_id();
+ }
+
+ if ( empty( $user_id ) ) {
+ return false;
+ }
+
+ $term = get_term( $term_id, $taxonomy );
+ if ( ! $term ) {
+ return false;
+ }
+
+ if ( self::is_user_subscribed_to_term( $user_id, $term_id ) ) {
+ $query_args = array( 'action' => 'wporg_bbp_unsubscribe_term', 'term_id' => $term_id, 'taxonomy' => $taxonomy );
+ } else {
+ $query_args = array( 'action' => 'wporg_bbp_subscribe_term', 'term_id' => $term_id, 'taxonomy' => $taxonomy );
+ }
+
+ if ( bbp_is_subscriptions() ) {
+ $permalink = bbp_get_subscriptions_permalink( $user_id );
+ } else {
+ $permalink = get_term_link( $term_id );
+ }
+
+ $url = esc_url( wp_nonce_url( add_query_arg( $query_args, $permalink ), 'toggle-term-subscription_' . $user_id . '_' . $term_id . '_' . $taxonomy ) );
+ return $url;
+ }
+
+ public static function get_subscription_link( $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'spectate' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,26 +536,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $r['user_id'] ) || empty( $r['term_id'] ) || empty( $r['taxonomy'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_id = $r['user_id'];
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id = $r['term_id'];
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = $r['taxonomy'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = get_term( $term_id, $taxonomy );
- if ( ! $term ) {
- return false;
- }
-
- if ( self::is_user_subscribed_to_term( $user_id, $term_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = self::get_subscription_url( $r['user_id'], $r['term_id'], $r['taxonomy'] );
+ $text = $r['subscribe'];
+ if ( self::is_user_subscribed_to_term( $r['user_id'], $r['term_id'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = $r['unsubscribe'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query_args = array( 'action' => 'wporg_bbp_unsubscribe_term', 'term_id' => $term_id, 'taxonomy' => $taxonomy );
- } else {
- $text = $r['subscribe'];
- $query_args = array( 'action' => 'wporg_bbp_subscribe_term', 'term_id' => $term_id, 'taxonomy' => $taxonomy );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $permalink = get_term_link( $term_id );
-
- $url = esc_url( wp_nonce_url( add_query_arg( $query_args, $permalink ), 'toggle-term-subscription_' . $user_id . '_' . $term_id . '_' . $taxonomy ) );
</del><span class="cx" style="display: block; padding: 0 10px"> return sprintf( "<div class='wporg-bbp-term-subscription'><a href='%s'>%s</a></div>",
</span><span class="cx" style="display: block; padding: 0 10px"> $url,
</span><span class="cx" style="display: block; padding: 0 10px"> esc_html( $text ) );
</span></span></pre>
</div>
</div>
</body>
</html>