<!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>[3095] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Show banners to provide a clearer status for plugins.</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/3095">3095</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/3095","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-05-06 22:17:09 +0000 (Fri, 06 May 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'>Plugin Directory: Show banners to provide a clearer status for plugins.
Redirects users who can edit a particular plugin that is closed or disabled
from the front-end to the edit page of that plugin and adds admin notices to
give more context about the current status of a plugin.
Fixes <a href="http://meta.trac.wordpress.org/ticket/1689">#1689</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminclasscustomizationsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminclasscustomizationsphp"></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/plugin-directory/admin/class-customizations.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/plugin-directory/admin/class-customizations.php 2016-05-06 19:13:40 UTC (rev 3094)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php 2016-05-06 22:17:09 UTC (rev 3095)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,9 +24,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Constructor.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function __construct() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Admin Metaboxes
- add_action( 'add_meta_boxes', array( $this, 'register_admin_metaboxes' ), 10, 2 );
- add_action( 'do_meta_boxes', array( $this, 'replace_title_global' ) );
</del><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'dashboard_glance_items', array( $this, 'plugin_glance_items' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,11 +31,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_assets' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'admin_head-edit.php', array( $this, 'plugin_posts_list_table' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'admin_notices', array( $this, 'add_post_status_notice' ) );
+ add_action( 'all_admin_notices', array( $this, 'admin_notices' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'display_post_states', array( $this, 'post_states' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_ajax_replyto-comment', array( $this, 'save_custom_comment' ), 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'comment_row_actions', array( $this, 'custom_comment_row_actions' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Admin Metaboxes
+ add_action( 'add_meta_boxes', array( $this, 'register_admin_metaboxes' ), 10, 2 );
+ add_action( 'do_meta_boxes', array( $this, 'replace_title_global' ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'postbox_classes_plugin_internal-notes', array( __NAMESPACE__ . '\Metabox\Internal_Notes', 'postbox_classes' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'postbox_classes_plugin_plugin-committers', array( __NAMESPACE__ . '\Metabox\Committers', 'postbox_classes' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_ajax_add-committer', array( __NAMESPACE__ . '\Metabox\Committers', 'add_committer' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,6 +226,66 @@
</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">+ * Adds banners to provide a clearer status for a plugin.
+ *
+ * This is being displayed in the edit screen for a particular plugin,
+ * providing more context about the current status of a plugin for both
+ * Committers and Reviewers/Admins.
+ */
+ public function add_post_status_notice() {
+ if ( 'post.php' !== $GLOBALS['pagenow'] ) {
+ return;
+ }
+
+ $message = '';
+ $post = get_post();
+ $is_admin = current_user_can( 'plugin_approve' );
+
+ switch ( $post->post_status ) {
+ case 'draft':
+ case 'pending':
+ $message = __( 'This plugin is requested and not visible to the public yet.', 'wporg-plugins' );
+ if ( ! $is_admin ) {
+ $message .= ' ' . __( 'Please be patient as your plugin gets reviewed.', 'wporg-plugins' );
+ }
+ break;
+
+ case 'rejected':
+ $message = __( 'This plugin is rejected and is not visible to the public.', 'wporg-plugins' );
+ break;
+
+ case 'approved':
+ $message = __( 'This plugin is approved and awaiting data upload but not visible to the public yet.', 'wporg-plugins' );
+ if ( ! $is_admin ) {
+ $message .= ' ' . __( 'Once you make your first commit, the plugin will become public.', 'wporg-plugins' );
+ }
+ break;
+
+ case 'closed':
+ $message = __( 'This plugin is closed and is not visible to the public.', 'wporg-plugins' );
+ break;
+
+ case 'disabled':
+ $message = __( 'This plugin is closed and is not visible to the public.', 'wporg-plugins' );
+ if ( $is_admin ) {
+ $message = __( 'This plugin is disabled (closed, but actively serving updates) and is not visible to the public.', 'wporg-plugins' );
+ }
+ break;
+ }
+
+ if ( $message ) {
+ add_settings_error( 'wporg-plugins', 'status-notice', $message, 'updated' );
+ }
+ }
+
+ /**
+ * Displays all admin notices registered to `wporg-plugins`.
+ */
+ public function admin_notices() {
+ settings_errors( 'wporg-plugins' );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Filter the default post display states used in the posts list table.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $post_states An array of post display states.
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp"></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/plugin-directory/class-plugin-directory.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/plugin-directory/class-plugin-directory.php 2016-05-06 19:13:40 UTC (rev 3094)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php 2016-05-06 22:17:09 UTC (rev 3095)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,12 +28,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_content', array( $this, 'filter_post_content_to_correct_page' ), 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'rest_api_allowed_post_types', array( $this, 'filter_allowed_post_types' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_update_option_jetpack_options', array( $this, 'filter_jetpack_options' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'template_redirect', array( $this, 'redirect_hidden_plugins' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'map_meta_cap', array( __NAMESPACE__ . '\Capabilities', 'map_meta_cap' ), 10, 4 );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Shim in postmeta support for data which doesn't yet live in postmeta
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'get_post_metadata', array( $this, 'filter_shim_postmeta' ), 10, 3 );
</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_filter( 'map_meta_cap', array( __NAMESPACE__ . '\Capabilities', 'map_meta_cap' ), 10, 4 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Load the API routes
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'rest_api_init', array( __NAMESPACE__ . '\API\Base', 'load_routes' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -433,7 +434,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $new_value;
</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">+ /**
+ * Redirects Committers and Admins to a plugin's edit page if it's disabled or closed.
+ */
+ public function redirect_hidden_plugins() {
+ if ( ! is_404() ) {
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = self::get_plugin_post( get_query_var( 'name', false ) );
+
+ if ( $post instanceof \WP_Post && in_array( $post->post_status, array( 'disabled', 'closed' ), true ) && current_user_can( 'edit_post', $post ) ) {
+ wp_safe_redirect( add_query_arg( array( 'post' => $post->ID, 'action' => 'edit' ), admin_url( 'post.php' ) ) );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Shim in some postmeta values which get retrieved from other locations temporarily.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre>
</div>
</div>
</body>
</html>