<!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>[4216] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums: Forums Theme: Add notice indicating that a topic is being held for moderation.</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/4216">4216</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/4216","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-10-11 18:52:07 +0000 (Tue, 11 Oct 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'>Forums Theme: Add notice indicating that a topic is being held for moderation.
Can display one of five possible messages:
* For moderators, that a topic is flagged as spam.
* For moderators, that a topic is pending.
* For blocked users, that the topic has been held for moderation by the automated system.
* When a topic is pending for less than 96 hours, that the topic has been held for moderation and will be reviewed.
* When a topic is pending for more than 96 hours, that the topic has been held for moderation but that moderators should be asked (via Slack) about it.
Props SergeyBiryukov, coffee2code, Ipstenu.
Fixes <a href="http://meta.trac.wordpress.org/ticket/1561">#1561</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsstylecss">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsfunctionsphp"></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/themes/pub/wporg-forums/functions.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/themes/pub/wporg-forums/functions.php 2016-10-11 18:49:59 UTC (rev 4215)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/functions.php 2016-10-11 18:52:07 UTC (rev 4216)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,6 +231,57 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return ( WordPressdotorg\Forums\Plugin::REVIEWS_FORUM_ID == bbp_get_topic_forum_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">+/**
+ * Display a notice for messages caught in the moderation queue.
+ */
+function wporg_support_add_moderation_notice() {
+ $post_time = mysql2date( 'U', get_post_field( 'post_date', get_the_ID() ) );
+ $seconds_passed = current_time( 'timestamp' ) - $post_time;
+ $hours_passed = (int) ( $seconds_passed / HOUR_IN_SECONDS );
+ $post_status = get_post_status();
+ $is_moderator = current_user_can( 'moderate' );
+ $is_user_blocked = ! current_user_can( 'spectate' );
+
+ if ( in_array( $post_status, array( 'pending', 'spam' ) ) ) :
+ $notice_class = $notice = '';
+
+ if ( $is_moderator ) {
+ if ( 'spam' === $post_status ) {
+ $notice_class = 'warning';
+ $notice = __( 'This post has been flagged as spam.', 'wporg-forums' );
+ } else {
+ $notice = __( 'This post is currently pending.', 'wporg-forums' );
+ }
+ } elseif ( $is_user_blocked ) {
+ // Blocked users get a generic message with no call to action or moderation timeframe.
+ $notice = __( 'This post has been held for moderation by our automated system.', 'wporg-forums' );
+ } elseif ( $hours_passed > 96 ) {
+ $notice_class = 'warning';
+ $notice = sprintf(
+ /* translators: %s: https://make.wordpress.org/chat/ */
+ __( 'This post was held for moderation by our automated system but has taken longer than expected to get approved. Please come to the #forums channel on <a href="%s">WordPress Slack</a> and let us know. Provide a link to the post.', 'wporg-forums' ),
+ 'https://make.wordpress.org/chat/'
+ );
+ } else {
+ $notice = sprintf(
+ /* translators: %d: number of hours */
+ __( 'This post has been held for moderation by our automated system. It will be reviewed within %d hours.', 'wporg-forums' ),
+ 72
+ );
+ }
+
+ if ( $notice ) :
+ printf(
+ '<div class="bbp-template-notice %s"><p>%s</p></div>',
+ esc_attr( $notice_class ),
+ $notice
+ );
+ endif;
+ endif;
+}
+add_action( 'bbp_theme_before_topic_content', 'wporg_support_add_moderation_notice' );
+add_action( 'bbp_theme_before_reply_content', 'wporg_support_add_moderation_notice' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** bb Base *******************************************************************/
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function bb_base_search_form() {
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgforumsstylecss"></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/themes/pub/wporg-forums/style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/style.css 2016-10-11 18:49:59 UTC (rev 4215)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/style.css 2016-10-11 18:52:07 UTC (rev 4216)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,6 +161,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> list-style: disc;
</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">+.bbp-topic-content div.bbp-template-notice,
+.bbp-reply-content div.bbp-template-notice {
+ display: inline-block;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* Reply button */
</span><span class="cx" style="display: block; padding: 0 10px"> div.bbp-submit-wrapper {
</span><span class="cx" style="display: block; padding: 0 10px"> float: none;
</span></span></pre>
</div>
</div>
</body>
</html>