<!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>[7130] sites/trunk/wp15.wordpress.net/public_html/content: WP15: Set new Tagregator posts to `pending` for manual approval.</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 { white-space: pre-line; 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/7130">7130</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/7130","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-04-18 21:22:07 +0000 (Wed, 18 Apr 2018)</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'>WP15: Set new Tagregator posts to `pending` for manual approval.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwp15wordpressnetpublic_htmlcontentmupluginsmiscellaneousphp">sites/trunk/wp15.wordpress.net/public_html/content/mu-plugins/miscellaneous.php</a></li>
<li><a href="#sitestrunkwp15wordpressnetpublic_htmlcontentthemestwentyseventeenwp15pagelivephp">sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/page-live.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwp15wordpressnetpublic_htmlcontentmupluginsmiscellaneousphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wp15.wordpress.net/public_html/content/mu-plugins/miscellaneous.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wp15.wordpress.net/public_html/content/mu-plugins/miscellaneous.php 2018-04-18 16:31:36 UTC (rev 7129)
+++ sites/trunk/wp15.wordpress.net/public_html/content/mu-plugins/miscellaneous.php 2018-04-18 21:22:07 UTC (rev 7130)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,11 +10,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WP15\Miscellaneous;
</span><span class="cx" style="display: block; padding: 0 10px"> use DateTime;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use TGGRSourceFlickr, TGGRSourceGoogle, TGGRSourceInstagram, TGGRSourceTwitter;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'WPINC' ) || die();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'map_meta_cap', __NAMESPACE__ . '\allow_css_editing', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'tggr_end_date', __NAMESPACE__ . '\set_tagregator_cutoff_date' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'wp_insert_post_data', __NAMESPACE__ . '\moderate_tagregator_posts' );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_enqueue_scripts', __NAMESPACE__ . '\register_assets', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_enqueue_scripts', __NAMESPACE__ . '\register_assets', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'mime_types', __NAMESPACE__ . '\mime_types' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,6 +62,40 @@
</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">+ * Set new Tagregator posts to `pending`, so they can be manually approved before being displayed.
+ *
+ * The `#WP15` hashtag is shared with other, non-WordPress meanings, and sometimes has content that would be
+ * inappropriate for an official WP site. So, we need to manually approve the posts before they're published.
+ *
+ * @param array $post_data
+ *
+ * @return array
+ */
+function moderate_tagregator_posts( $post_data ) {
+ $tagregator_post_types = array();
+ $moderator_actions = array( 'edit', 'editpost', 'inline-save' );
+ $modules = array( 'TGGRSourceFlickr', 'TGGRSourceGoogle', 'TGGRSourceInstagram', 'TGGRSourceTwitter' );
+
+ foreach ( $modules as $module ) {
+ if ( defined( "$module::POST_TYPE_SLUG" ) ) {
+ array_push( $tagregator_post_types, $module::POST_TYPE_SLUG );
+ }
+ }
+
+ if ( 'publish' !== $post_data['post_status'] || ! in_array( $post_data['post_type'], $tagregator_post_types, true ) ) {
+ return $post_data;
+ }
+
+ if ( isset( $_REQUEST['action'] ) && in_array( $_REQUEST['action'], $moderator_actions, true ) ) {
+ return $post_data;
+ }
+
+ $post_data['post_status'] = 'pending';
+
+ return $post_data;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Register style and script assets for later enqueueing.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function register_assets() {
</span></span></pre></div>
<a id="sitestrunkwp15wordpressnetpublic_htmlcontentthemestwentyseventeenwp15pagelivephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/page-live.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/page-live.php 2018-04-18 16:31:36 UTC (rev 7129)
+++ sites/trunk/wp15.wordpress.net/public_html/content/themes/twentyseventeen-wp15/page-live.php 2018-04-18 21:22:07 UTC (rev 7130)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,10 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php esc_html_e( 'Join the conversation by using #WP15 on your favorite social networks.', 'wp15' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( current_user_can( 'manage_options' ) ) : ?>
- <p style="color:darkred">Don't forget to enable this for logged-out visitors once moderation is in place.</p>
</del><span class="cx" style="display: block; padding: 0 10px"> <?php echo do_shortcode( '[tagregator hashtag="#WP15"]' ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php endif; ?>
</del><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </article>
</span></span></pre>
</div>
</div>
</body>
</html>