<!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>[12517] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin: Plugin Directory: Administration: Add bulk actions for close/disable/open.</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/12517">12517</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/12517","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-03-30 03:37:47 +0000 (Thu, 30 Mar 2023)</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: Administration: Add bulk actions for close/disable/open.

This streamlines administration of cases where a large group of plugins need to be disabled or re-opened.

Fixes <a href="http://meta.trac.wordpress.org/ticket/6903">#6903</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_htmlwpcontentpluginsplugindirectoryadminclassstatustransitionsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-status-transitions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminlisttableclasspluginpostsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/list-table/class-plugin-posts.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  2023-03-30 01:39:46 UTC (rev 12516)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php    2023-03-30 03:37:47 UTC (rev 12517)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,7 @@
</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="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                add_action( 'load-edit.php', array( $this, 'bulk_reject_plugins' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         add_action( 'load-edit.php', array( $this, 'bulk_action_plugins' ) );
</ins><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><span class="cx" style="display: block; padding: 0 10px">                add_action( 'edit_form_top', array( $this, 'show_permalink' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,51 +228,92 @@
</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">-         * Rejects plugins in bulk.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Performs plugin status changes in bulk.
</ins><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 bulk_reject_plugins() {
-               if ( empty( $_REQUEST['action'] ) || empty( $_REQUEST['action2'] ) || ! in_array( 'plugin_reject', array( $_REQUEST['action'], $_REQUEST['action2'] ) ) || 'plugin' !== $_REQUEST['post_type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function bulk_action_plugins() {
+               if (
+                       empty( $_REQUEST['action'] ) ||
+                       empty( $_REQUEST['action2'] ) ||
+                       'plugin' !== $_REQUEST['post_type']
+               ) {
</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><span class="cx" style="display: block; padding: 0 10px">                check_admin_referer( 'bulk-posts' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $rejected = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $action = array_intersect(
+                       [ 'plugin_open', 'plugin_close', 'plugin_disable', 'plugin_reject' ],
+                       [ $_REQUEST['action'], $_REQUEST['action2'] ]
+               );
+               $action = array_shift( $action );
+               if ( ! $action ) {
+                       return;
+               }
+
+               switch( $action ) {
+                       case 'plugin_open':
+                               $capability = 'plugin_approve';
+                               $new_status = 'publish';
+                               $message    = _n_noop( '%s plugin opened.', '%s plugins opened.', 'wporg-plugins' );
+                               $from_state = [ 'closed', 'disabled' ];
+                               break;
+                       case 'plugin_close':
+                               $capability = 'plugin_close';
+                               $new_status = 'closed';
+                               $message    = _n_noop( '%s plugin closed.', '%s plugins closed.', 'wporg-plugins' );
+                               $from_state = [ 'closed', 'disabled', 'publish', 'approved' ];
+                               break;
+                       case 'plugin_disable':
+                               $capability = 'plugin_close';
+                               $new_status = 'disabled';
+                               $message    = _n_noop( '%s plugin disabled.', '%s plugins disabled.', 'wporg-plugins' );
+                               $from_state = [ 'closed', 'disabled', 'publish', 'approved' ];
+                               break;
+                       case 'plugin_reject':
+                               $capability = 'plugin_reject';
+                               $new_status = 'rejected';
+                               $message    = _n_noop( '%s plugin rejected.', '%s plugins rejected.', 'wporg-plugins' );
+                               $from_state = [ 'new', 'pending' ];
+                               break;
+                       default:
+                               return;
+               }
+
+               $closed = 0;
</ins><span class="cx" style="display: block; padding: 0 10px">                 $plugins  = get_posts( array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'post_type'      => 'plugin',
</span><span class="cx" style="display: block; padding: 0 10px">                        'post__in'       => array_map( 'absint', $_REQUEST['post'] ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'post_status'    => array( 'new', 'pending' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'post_status'    => $from_state,
</ins><span class="cx" style="display: block; padding: 0 10px">                         'posts_per_page' => count( $_REQUEST['post'] ),
</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">                foreach ( $plugins as $plugin ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! current_user_can( 'plugin_reject', $plugin ) ) {
-                               wp_die( __( 'You are not allowed to reject this plugin.', 'wporg-plugins' ), '', array( 'back_link' => true ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( ! current_user_can( $capability, $plugin ) ) {
+                               continue;
</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">                        $updated = wp_update_post( array(
</span><span class="cx" style="display: block; padding: 0 10px">                                'ID'          => $plugin->ID,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'post_status' => 'rejected',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'post_status' => $new_status,
</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">                        if ( $updated && ! is_wp_error( $updated ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $rejected++;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $closed++;
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                }
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( $rejected ) {
-                       set_transient( 'settings_errors', array(
-                               array(
-                                       'setting' => 'wporg-plugins',
-                                       'code'    => 'plugins-bulk-rejected',
-                                       'message' => sprintf( _n( '%d plugin rejected.', '%d plugins rejected.', $rejected, 'wporg-plugins' ), $rejected ),
-                                       'type'    => 'updated',
-                               ),
-                       ) );
</del><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_transient( 'settings_errors', array(
+                       array(
+                               'setting' => 'wporg-plugins',
+                               'code'    => 'plugins-bulk-actioned',
+                               'message' => sprintf( translate_nooped_plural( $message, $closed, 'wporg-plugins' ), number_format_i18n( $closed ) ),
+                               'type'    => 'updated',
+                       ),
+               ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $send_back = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'locked', 'ids', 'action', 'action2', 'tags_input', 'post_author', 'comment_status', 'ping_status', '_status', 'post', 'bulk_edit', 'post_view' ), wp_get_referer() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                wp_redirect( add_query_arg( array( 'settings-updated' => true ), $send_back ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         wp_safe_redirect( add_query_arg( array( 'settings-updated' => true ), $send_back ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                 exit;
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminclassstatustransitionsphp"></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-status-transitions.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-status-transitions.php      2023-03-30 01:39:46 UTC (rev 12516)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-status-transitions.php        2023-03-30 03:37:47 UTC (rev 12517)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,7 +322,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @param int $post_id Post ID.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function save_close_reason( $post_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! isset( $_POST['close_reason'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! isset( $_REQUEST['close_reason'] ) ) {
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,7 +330,7 @@
</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">-                $close_reason = sanitize_key( $_POST['close_reason'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $close_reason = sanitize_key( $_REQUEST['close_reason'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                update_post_meta( $post_id, '_close_reason', $close_reason );
</span><span class="cx" style="display: block; padding: 0 10px">                update_post_meta( $post_id, 'plugin_closed_date', current_time( 'mysql' ) );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminlisttableclasspluginpostsphp"></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/list-table/class-plugin-posts.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/list-table/class-plugin-posts.php 2023-03-30 01:39:46 UTC (rev 12516)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/list-table/class-plugin-posts.php   2023-03-30 03:37:47 UTC (rev 12517)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,6 +82,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $actions['plugin_reject'] = __( 'Reject', 'wporg-plugins' );
</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">+                if ( current_user_can( 'plugin_approve' ) && ( empty( $_REQUEST['post_status'] ) || in_array( $_REQUEST['post_status'], array( 'closed', 'disabled' ) ) ) ) {
+                       $actions['plugin_open'] = __( 'Open', 'wporg-plugins' );
+               }
+
+               if ( current_user_can( 'plugin_close' ) && ( empty( $_REQUEST['post_status'] ) || in_array( $_REQUEST['post_status'], array( 'publish', 'approved', 'disabled' ) ) ) ) {
+                       $actions['plugin_close'] = __( 'Close', 'wporg-plugins' );
+               }
+
+               if ( current_user_can( 'plugin_close' ) && ( empty( $_REQUEST['post_status'] ) || in_array( $_REQUEST['post_status'], array( 'publish', 'approved', 'closed' ) ) ) ) {
+                       $actions['plugin_disable'] = __( 'Disable', 'wporg-plugins' );
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 return $actions;
</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">@@ -499,4 +511,43 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                return $status_links;
</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 the "actions" fields below the filters.
+        */
+       public function extra_tablenav( $which ) {
+               parent::extra_tablenav( $which );
+
+               // TODO: This shouldn't have inline CSS/JS.
+
+               if ( 'top' === $which ) {
+                       ?>
+                       <fieldset class="alignleft actions hide-if-js bulk-plugin_close bulk-plugin_disable" disabled="disabled">
+                               <select name="close_reason" id="close_reason">
+                                       <option disabled="disabled" value='' selected="selected"><?php esc_html_e( 'Close/Disable Reason:', 'wporg-plugins' ); ?></option>
+                                       <?php foreach ( Template::get_close_reasons() as $key => $label ) : ?>
+                                               <option value="<?php echo esc_attr( $key ); ?>"><?php echo esc_html( $label ); ?></option>
+                                       <?php endforeach; ?>
+                               </select>
+                       </fieldset>
+                       <style>
+                               #posts-filter fieldset.bulk-plugin_close {
+                                       margin: 0;
+                               }
+                       </style>
+                       <script>
+                       jQuery( function( $ ) {
+                               $( '.bulkactions' ).on( 'change', function() {
+                                       var $this = $( this ),
+                                               val = $this.find(':selected').val(),
+                                               $tablenav = $this.parents('form').find( '.tablenav.top' );
+
+                                       $tablenav.find( '.actions.bulk-plugin_close, .actions.bulk-plugin_disable' ).prop( 'disabled', true ).hide();
+                                       $tablenav.find( '.actions.bulk-' + val ).prop( 'disabled', false ).show();
+                               } );
+                       } );
+                       </script>
+                       <?php
+               }
+       }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>

</body>
</html>