<!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>[3997] sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc: Support Forums: Enable new/edit reviews.</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/3997">3997</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/3997","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-09-07 19:13:46 +0000 (Wed, 07 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: Enable new/edit reviews.
These will be visible once the review forum is opened.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassdirectorycompatphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassratingscompatphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassdirectorycompatphp"></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/support-forums/inc/class-directory-compat.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/support-forums/inc/class-directory-compat.php 2016-09-07 18:50:50 UTC (rev 3996)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php 2016-09-07 19:13:46 UTC (rev 3997)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +126,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Instantiate WPORG_Ratings compat mode for reviews.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( class_exists( 'WPORG_Ratings' ) && class_exists( 'WordPressdotorg\Forums\Ratings_Compat' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->ratings = new Ratings_Compat( $this->compat(), $this->slug(), $this->get_object( $this->slug() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->ratings = new Ratings_Compat( $this->compat(), $this->slug(), $this->taxonomy(), $this->get_object( $this->slug() ) );
</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"> $this->loaded = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +154,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Instantiate WPORG_Ratings compat mode for reviews.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( class_exists( 'WPORG_Ratings' ) && class_exists( 'WordPressdotorg\Forums\Ratings_Compat' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->ratings = new Ratings_Compat( $this->compat(), $this->slug(), $this->get_object( $this->slug() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->ratings = new Ratings_Compat( $this->compat(), $this->slug(), $this->taxonomy(), $this->get_object( $this->slug() ) );
</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"> $this->loaded = true;
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassratingscompatphp"></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/support-forums/inc/class-ratings-compat.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/support-forums/inc/class-ratings-compat.php 2016-09-07 18:50:50 UTC (rev 3996)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-ratings-compat.php 2016-09-07 19:13:46 UTC (rev 3997)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,27 +4,27 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> class Ratings_Compat {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $compat = null;
- var $slug = null;
- var $object = null;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $compat = null;
+ var $slug = null;
+ var $object = null;
+ var $taxonomy = null;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> var $filter = false;
</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 __construct( $compat, $slug, $object, $rating = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __construct( $compat, $slug, $taxonomy, $object ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! class_exists( 'WPORG_Ratings' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- if ( empty( $compat ) || empty( $slug ) || empty( $object ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $compat ) || empty( $slug ) || empty( $taxonomy ) || empty( $object ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- $this->compat = $compat;
- $this->slug = $slug;
- $this->object = $object;
- $this->rating = $rating;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->compat = $compat;
+ $this->slug = $slug;
+ $this->taxonomy = $taxonomy;
+ $this->object = $object;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->reviews_count = \WPORG_Ratings::get_rating_count( $this->compat, $this->slug, $this->rating );
</del><span class="cx" style="display: block; padding: 0 10px"> $this->ratings_counts = \WPORG_Ratings::get_rating_counts( $this->compat, $this->slug );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->avg_rating = \WPORG_Ratings::get_avg_rating( $this->compat, $this->slug );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,12 +40,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_topic_pagination', array( $this, 'add_filter_topic_pagination' ) );
</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">+ // Total reviews count. Can be altered using $this->filter if needed.
+ $this->reviews_count = \WPORG_Ratings::get_rating_count( $this->compat, $this->slug, 0 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Set up the single topic.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bbp_template_before_lead_topic', array( $this, 'add_topic_stars' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set up ratings view.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wporg_compat_before_single_view', array( $this, 'do_view_header' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_get_topic_title', array( $this, 'get_topic_title' ), 10, 2 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Add the topic form as either a new or edit form.
+ add_action( 'wporg_compat_new_review_notice', array( $this, 'do_template_notice' ) );
+ add_action( 'wporg_compat_after_single_view', array( $this, 'add_topic_form' ) );
+ add_action( 'bbp_theme_before_topic_form_content', array( $this, 'add_topic_form_stars' ), 8 );
+
+ // Check to see if a topic is being created/edited.
+ add_action( 'bbp_new_topic_post_extras', array( $this, 'topic_post_extras' ) );
+ add_action( 'bbp_edit_topic_post_extras', array( $this, 'topic_post_extras' ) );
</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">@@ -152,7 +164,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="reviews-submit-link">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_user_logged_in() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<a href="#postform" class="btn">';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<a href="#new-post" class="btn">';
</ins><span class="cx" style="display: block; padding: 0 10px"> _e( 'Add your own review', 'wporg-forums' );
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,4 +195,106 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Set the rating on topic creation or edit.
+ *
+ * @param int $topic_id The topic id
+ */
+ public function topic_post_extras( $topic_id ) {
+ if ( isset( $_POST['rating'] ) && in_array( (int) $_POST['rating'], array( 1, 2, 3, 4, 5 ) ) ) {
+ if (
+ Plugin::REVIEWS_FORUM_ID == bbp_get_topic_forum_id( $topic_id )
+ &&
+ bbp_get_topic_author_id( $topic_id ) == get_current_user_id()
+ ) {
+ \WPORG_Ratings::set_rating( $topic_id, $this->compat, $this->slug, bbp_get_topic_author_id( $topic_id ), absint( $_POST['rating'] ) );
+ }
+ }
+ }
+
+ public function add_topic_form() {
+ if ( ! $this->is_rating_view() ) {
+ return;
+ }
+
+ if ( ! is_user_logged_in() ) {
+ echo '<p>';
+ printf(
+ __( 'You must %s to submit a review.You can also log in or register using the form near the top of this page.' ),
+ sprintf( '<a href="https://login.wordpress.org/">%s</a>', esc_html_x( 'log in', 'verb: You must log in to submit a review.', 'wporg-forums' ) ) );
+ echo '</p>';
+ return;
+ }
+
+ if ( bbp_has_topics( array(
+ 'author' => get_current_user_id(),
+ 'post_status' => 'any',
+ 'post_type' => bbp_get_topic_post_type(),
+ 'post_parent' => Plugin::REVIEWS_FORUM_ID,
+ 'tax_query' => array( array(
+ 'taxonomy' => $this->taxonomy,
+ 'field' => 'slug',
+ 'terms' => $this->slug,
+ ) ),
+ 'no_found_rows' => true,
+ 'orderby' => 'ID',
+ ) ) ) {
+ bbp_the_topic();
+ add_filter( 'bbp_is_topic_edit', '__return_true' );
+ } else {
+ add_filter( 'bbp_is_topic_edit', '__return_false' );
+ }
+
+ bbp_get_template_part( 'form', 'topic' );
+ }
+
+ public function do_template_notice() {
+ $report = $rate = '';
+ switch( $this->compat ) {
+ case 'plugin' :
+ $report = __( 'If you are reporting an issue with this plugin, please post %s instead.', 'wporg-forums' );
+ $rate = __( 'In order to rate a plugin, you must also submit a review.', 'wporg-forums' );
+ break;
+ case 'theme' :
+ $report = __( 'If you are reporting an issue with this theme, please post %s instead.', 'wporg-forums' );
+ $rate = __( 'In order to rate a theme, you must also submit a review.', 'wporg-forums' );
+ break;
+ }
+ ?>
+ <p><?php _e( 'When posting a review, follow these guidelines:', 'wporg-forums' ); ?></p>
+ <ul>
+ <li><?php printf( esc_html( $report ), sprintf( '<a href="%s">%s</a>',
+ esc_url( sprintf( 'https://wordpress.org/support/%s/%s/', $this->compat, $this->slug ) ),
+ _x( 'here', 'please post here instead', 'wporg-forums' )
+ ) ); ?></li>
+ <li><?php echo esc_html( $rate ); ?></li>
+ <li><?php esc_html_e( 'Please provide as much detail as you can to justify your rating and to help others.', 'wporg-forums' ); ?></li>
+ </ul>
+ <?php
+ }
+
+ public function add_topic_form_stars() {
+ if ( ! $this->is_rating_view() ) {
+ return;
+ }
+
+ if ( bbp_is_topic_edit() && bbp_get_topic_author_id() != get_current_user_id() ) {
+ return;
+ }
+
+ \WPORG_Ratings::get_dashicons_form( $this->compat, $this->slug, true );
+ }
+
+ public function is_rating_view() {
+ if ( bbp_is_single_view() && 'reviews' == bbp_get_view_id() ) {
+ return true;
+ }
+
+ if ( bbp_is_topic_edit() && bbp_get_topic_forum_id() == Plugin::REVIEWS_FORUM_ID ) {
+ return true;
+ }
+
+ return false;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>