Ticket #5362: 5362-delist-actions.3.diff

admin-edit.php

@@ -43 +43 @@
                 'exclude_from_search' => true,
                 'label_count'         => _n_noop( 'Suspended <span class="count">(%s)</span>', 'Suspended <span class="count">(%s)</span>', 'wporg-themes' ),
         ) );
+
+        // Themes can be "delisted" to hide them from search, but allow them to be uploaded.
+        register_post_status( 'delist', array(
+                'label'               => __( 'Delisted', 'wporg-themes' ),
+                'protected'           => false,
+                'public'              => true,
+                'exclude_from_search' => true,
+                'label_count'         => _n_noop( 'Delisted <span class="count">(%s)</span>', 'Delisted <span class="count">(%s)</span>', 'wporg-themes' ),
+        ) );
 }
 add_action( 'init', 'wporg_themes_post_status' );
 
@@ -124 +133 @@
                 $links[] = sprintf( '<a class="submit-reinstate_theme" title="%1$s" href="%2$s">%3$s</a>', esc_attr__( 'Suspend this item', 'wporg-themes' ), esc_url( wporg_themes_get_reinstate_url( $post ) ), __( 'Reinstate', 'wporg-themes' ) );
         }
 
+        if ( current_user_can( 'suspend_theme', $post->ID ) && 'publish' == $post->post_status ) {
+                $links[] = sprintf( '<a class="submit-delist_theme submitdelete" title="%1$s" href="%2$s">%3$s</a>', esc_attr__( 'Delist this item', 'wporg-themes' ), esc_url( wporg_themes_get_delist_url( $post ) ), __( 'Delist', 'wporg-themes' ) );
+        }
+        elseif ( current_user_can( 'reinstate_theme', $post->ID ) && 'delist' == $post->post_status ) {
+                $links[] = sprintf( '<a class="submit-relist_theme" title="%1$s" href="%2$s">%3$s</a>', esc_attr__( 'Relist this item', 'wporg-themes' ), esc_url( wporg_themes_get_relist_url( $post ) ), __( 'Relist', 'wporg-themes' ) );
+        }
+
         if ( ! empty( $links ) ) {
                 echo '<div class="misc-pub-section">' . implode( ' | ', $links ) . '</div>';
         }
@@ -184 +200 @@
 
         wporg_themes_remove_wpthemescom( $post->post_name );
 
-        wp_redirect( add_query_arg( 'suspended', 1, remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'ids', 'reinstated' ), wp_get_referer() ) ) );
+        wp_redirect( add_query_arg( 'suspended', 1, remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'ids', 'reinstated', 'delisted', 'relisted' ), wp_get_referer() ) ) );
         exit();
 }
 add_filter( 'admin_action_suspend', 'wporg_themes_suspend_theme' );
@@ -227 +243 @@
          */
         add_post_meta( $post_id, '_wporg_themes_reinstated', true );
 
-        wp_redirect( add_query_arg( 'reinstated', 1, remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'ids', 'suspended' ), wp_get_referer() ) ) );
+        wp_redirect( add_query_arg( 'reinstated', 1, remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'ids', 'suspended', 'delisted', 'relisted' ), wp_get_referer() ) ) );
         exit();
 }
 add_filter( 'admin_action_reinstate', 'wporg_themes_reinstate_theme' );
 
 /**
+ * Action link to delist a theme.
+ *
+ * @param WP_Post $post
+ * @return string URL
+ */
+function wporg_themes_get_delist_url( $post ) {
+        return wp_nonce_url( add_query_arg( 'action', 'delist', admin_url( sprintf( get_post_type_object( $post->post_type )->_edit_link, $post->ID ) ) ), "delist-post_{$post->ID}" );
+}
+
+/**
+ * Action link to relist a theme.
+ *
+ * @param WP_Post $post
+ * @return string URL
+ */
+function wporg_themes_get_relist_url( $post ) {
+        return wp_nonce_url( add_query_arg( 'action', 'relist', admin_url( sprintf( get_post_type_object( $post->post_type )->_edit_link, $post->ID ) ) ), "relist-post_{$post->ID}" );
+}
+
+/**
+ * Delist a theme.
+ */
+function wporg_themes_delist_theme() {
+        $post_id = isset( $_GET['post'] ) ? (int) $_GET['post'] : 0;
+
+        if ( ! $post_id ) {
+                wp_redirect( admin_url( 'edit.php' ) );
+                exit();
+        }
+
+        check_admin_referer( 'delist-post_' . $post_id );
+
+        $post = get_post( $post_id );
+
+        if ( 'delist' == $post->post_status ) {
+                wp_die( __( 'This item has already been delisted.', 'wporg-themes' ) );
+        }
+
+        if ( ! get_post_type_object( $post->post_type ) ) {
+                wp_die( __( 'Unknown post type.', 'wporg-themes' ) );
+        }
+
+        if ( ! current_user_can( 'suspend_theme', $post_id ) || 'repopackage' != $post->post_type ) {
+                wp_die( __( 'You are not allowed to delist this item.', 'wporg-themes' ) );
+        }
+
+        wp_update_post( array(
+                'ID'          => $post_id,
+                'post_status' => 'delist',
+        ) );
+
+        wp_redirect( add_query_arg( 'delisted', 1, remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'ids', 'reinstated', 'delisted', 'relisted' ), wp_get_referer() ) ) );
+        exit();
+}
+add_filter( 'admin_action_delist', 'wporg_themes_delist_theme' );
+
+/**
+ * Reinstate a theme.
+ */
+function wporg_themes_relist_theme() {
+        $post_id = isset( $_GET['post'] ) ? (int) $_GET['post'] : 0;
+
+        if ( ! $post_id ) {
+                wp_redirect( admin_url( 'edit.php' ) );
+                exit();
+        }
+
+        check_admin_referer( 'relist-post_' . $post_id );
+
+        $post = get_post( $post_id );
+
+        if ( 'delist' != $post->post_status ) {
+                wp_die( __( 'This item has already been relisted.', 'wporg-themes' ) );
+        }
+
+        if ( ! get_post_type_object( $post->post_type ) ) {
+                wp_die( __( 'Unknown post type.', 'wporg-themes' ) );
+        }
+
+        if ( ! current_user_can( 'reinstate_theme', $post_id ) || 'repopackage' != $post->post_type ) {
+                wp_die( __( 'You are not allowed to relist this item.', 'wporg-themes' ) );
+        }
+
+        wp_update_post( array(
+                'ID'          => $post_id,
+                'post_status' => 'publish',
+        ) );
+
+        wp_redirect( add_query_arg( 'relisted', 1, remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'ids', 'suspended', 'delisted', 'relisted' ), wp_get_referer() ) ) );
+        exit();
+}
+add_filter( 'admin_action_relist', 'wporg_themes_relist_theme' );
+
+/**
  * Remove themes from wp-themes.com upon theme status moving to draft.
  *
  * @param WP_Post $post
@@ -262 +372 @@
                 add_settings_error( 'wporg_themes', 'reinstated', sprintf( $message, $reinstated ), 'updated' );
         }
 
+        elseif ( ! empty( $_GET['delisted'] ) ) {
+                $delisted = absint( $_GET['delisted'] );
+                $message    = _n( '%s theme delisted.', '%s themes delisted.', $delisted, 'wporg-themes' );
+
+                add_settings_error( 'wporg_themes', 'delisted', sprintf( $message, $delisted ) );
+        }
+        elseif ( ! empty( $_GET['relisted'] ) ) {
+                $relisted = absint( $_GET['relisted'] );
+                $message    = _n( '%s theme relisted.', '%s themes relisted.', $relisted, 'wporg-themes' );
+
+                add_settings_error( 'wporg_themes', 'relisted', sprintf( $message, $relisted ), 'updated' );
+        }
+
         // Display admin notices, if any.
         settings_errors( 'wporg_themes' );
 }

class-themes-api.php

@@ -446 +446 @@
                         $themes = get_posts( array(
                                 'name'      => $this->request->slug,
                                 'post_type' => 'repopackage',
+                                'post_status' => 'publish,delist',
                         ) );
 
                         if ( $themes ) {

class-wporg-themes-upload.php

@@ -487 +487 @@
                          * Specify post stati so this query returns a result for draft themes, even
                          * if the uploading user doesn't have have the permission to view drafts.
                          */
-                        'post_status'      => array( 'publish', 'pending', 'draft', 'future', 'trash', 'suspend' ),
+                        'post_status'      => array( 'publish', 'pending', 'draft', 'future', 'trash', 'suspend', 'delist' ),
                         'suppress_filters' => false,
                 ) );
                 $theme = current( $themes );

query-modifications.php

@@ -38 +38 @@
                 $query->query_vars['post_status'] = 'publish';
         }
 
+        if ( !empty( $query->query_vars['name'] ) ) {
+                $query->query_vars['post_status'] = 'publish,delist';
+        }
+
         switch ( $query->query_vars['browse'] ) {
                 case 'new':
                         $query->query_vars['orderby'] = 'post_date';

theme-directory.php

@@ -1144 +1144 @@
                                 $noindex = true;
                         }
                 }
+
+                if ( !$noindex && 'delist' === $post->post_status ) {
+                        $noindex = 'nosnippet';
+                }
         }
 
         if ( is_tag() ) {
@@ -1333 +1337 @@
 add_filter( 'wporg_canonical_url', 'wporg_themes_canonical_url' );
 
 // Theme Directory doesn't support pagination.
-add_filter( 'wporg_rel_next_pages', '__return_zero' );
- No newline at end of file
+add_filter( 'wporg_rel_next_pages', '__return_zero' );