Changeset 3335

Timestamp:

06/11/2016 10:07:10 PM (9 years ago)

Author:

obenland

Message:

Plugin Directory: Let plugin authors select categories on upload.

Also refactors create_plugin_post() to me more of a direct wrapper of
wp_insert_post(). Front-end needs styles.

See #1573.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• admin/class-customizations.php (modified) (2 diffs)
• class-plugin-directory.php (modified) (4 diffs)
• cli/class-import.php (modified) (2 diffs)
• shortcodes/class-upload-handler.php (modified) (1 diff)
• shortcodes/class-upload.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php

@@ -29 +29 @@
         add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ) );
         add_action( 'save_post_plugin', array( $this, 'save_plugin_post' ) );
-        add_filter( 'tax_input_pre', array( $this, 'filter_tax_input' ) );
 
         add_action( 'load-edit.php', array( $this, 'bulk_reject_plugins' ) );
@@ -469 +468 @@
             update_post_meta( $post_id, 'tested', wp_slash( wp_unslash( $_POST['tested_with'] ) ) );
         }
-    }
-
-    /**
-     * Filters the value of tax_inputs before saving.
-     *
-     * @param array $tax_input Array of taxonomies with selected terms.
-     * @return array
-     */
-    public function filter_tax_input( $tax_input ) {
-
-        // Limit the amount of assignable categories to 3.
-        if ( isset( $tax_input['plugin_category'] ) ) {
-            $tax_input['plugin_category'] = array_slice( array_filter( $tax_input['plugin_category'] ), 0, 3 );
-        }
-
-        return $tax_input;
     }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php

@@ -26 +26 @@
         add_filter( 'term_link', array( $this, 'term_link' ), 10, 2 );
         add_filter( 'pre_insert_term', array( $this, 'pre_insert_term_prevent' ) );
+        add_filter( 'tax_input_pre', array( $this, 'filter_tax_input' ) );
         add_action( 'pre_get_posts', array( $this, 'use_plugins_in_query' ) );
         add_filter( 'rest_api_allowed_post_types', array( $this, 'filter_allowed_post_types' ) );
@@ -33 +34 @@
         // Shim in postmeta support for data which doesn't yet live in postmeta
         add_filter( 'get_post_metadata', array( $this, 'filter_shim_postmeta' ), 10, 3 );
+
 
         add_filter( 'map_meta_cap', array( __NAMESPACE__ . '\Capabilities', 'map_meta_cap' ), 10, 4 );
@@ -610 +612 @@
 
     /**
+     * Filters the value of tax_inputs before saving.
+     * 
+     * Used both in the admin and the uploader.
+     *
+     * @param array $tax_input Array of taxonomies with selected terms.
+     * @return array
+     */
+    public function filter_tax_input( $tax_input ) {
+
+        // Limit the amount of assignable categories to 3.
+        if ( isset( $tax_input['plugin_category'] ) ) {
+            $tax_input['plugin_category'] = array_slice( array_filter( $tax_input['plugin_category'] ), 0, 3 );
+        }
+
+        return $tax_input;
+    }
+
+    /**
      * Retrieve the WP_Post object representing a given plugin.
      *
@@ -651 +671 @@
      * Create a new post entry for a given plugin slug.
      *
-     * @param array $plugin_info {
-     *     Array of initial plugin post data, all fields are optional.
-     *
-     *     @type string $title       The title of the plugin.
-     *     @type string $slug        The slug of the plugin.
-     *     @type string $status      The status of the plugin ( 'publish', 'pending', 'disabled', 'closed' ).
-     *     @type int    $author      The ID of the plugin author.
-     *     @type string $description The short description of the plugin.
-     *     @type string $content     The long description of the plugin.
-     *     @type array  $tags        The tags associated with the plugin.
-     *     @type array  $meta        The meta information of the plugin.
+     * @param array $args {
+     *     An array of elements that make up a post to insert.
+     *
+     *     @type int    $ID                    The post ID. If equal to something other than 0,
+     *                                         the post with that ID will be updated. Default 0.
+     *     @type int    $post_author           The ID of the user who added the post. Default is
+     *                                         the current user ID.
+     *     @type string $post_date             The date of the post. Default is the current time.
+     *     @type string $post_date_gmt         The date of the post in the GMT timezone. Default is
+     *                                         the value of `$post_date`.
+     *     @type mixed  $post_content          The post content. Default empty.
+     *     @type string $post_content_filtered The filtered post content. Default empty.
+     *     @type string $post_title            The post title. Default empty.
+     *     @type string $post_excerpt          The post excerpt. Default empty.
+     *     @type string $post_status           The post status. Default 'draft'.
+     *     @type string $post_type             The post type. Default 'post'.
+     *     @type string $comment_status        Whether the post can accept comments. Accepts 'open' or 'closed'.
+     *                                         Default is the value of 'default_comment_status' option.
+     *     @type string $ping_status           Whether the post can accept pings. Accepts 'open' or 'closed'.
+     *                                         Default is the value of 'default_ping_status' option.
+     *     @type string $post_password         The password to access the post. Default empty.
+     *     @type string $post_name             The post name. Default is the sanitized post title
+     *                                         when creating a new post.
+     *     @type string $to_ping               Space or carriage return-separated list of URLs to ping.
+     *                                         Default empty.
+     *     @type string $pinged                Space or carriage return-separated list of URLs that have
+     *                                         been pinged. Default empty.
+     *     @type string $post_modified         The date when the post was last modified. Default is
+     *                                         the current time.
+     *     @type string $post_modified_gmt     The date when the post was last modified in the GMT
+     *                                         timezone. Default is the current time.
+     *     @type int    $post_parent           Set this for the post it belongs to, if any. Default 0.
+     *     @type int    $menu_order            The order the post should be displayed in. Default 0.
+     *     @type string $post_mime_type        The mime type of the post. Default empty.
+     *     @type string $guid                  Global Unique ID for referencing the post. Default empty.
+     *     @type array  $post_category         Array of category names, slugs, or IDs.
+     *                                         Defaults to value of the 'default_category' option.
+     *     @type array  $tax_input             Array of taxonomy terms keyed by their taxonomy name. Default empty.
+     *     @type array  $meta_input            Array of post meta values keyed by their post meta key. Default empty.
      * }
      * @return \WP_Post|\WP_Error
      */
-    static public function create_plugin_post( array $plugin_info ) {
-        $title   = ! empty( $plugin_info['title'] )       ? $plugin_info['title']       : '';
-        $slug    = ! empty( $plugin_info['slug'] )        ? $plugin_info['slug']        : sanitize_title( $title );
-        $status  = ! empty( $plugin_info['status'] )      ? $plugin_info['status']      : 'draft';
-        $author  = ! empty( $plugin_info['author'] )      ? $plugin_info['author']      : 0;
-        $desc    = ! empty( $plugin_info['description'] ) ? $plugin_info['description'] : '';
-        $content = ! empty( $plugin_info['content'] )     ? $plugin_info['content']     : '';
-        $meta    = ! empty( $plugin_info['meta'] )        ? $plugin_info['meta']        : array();
-
-        $post_date         = ! empty( $plugin_info['post_date'] )         ? $plugin_info['post_date']         : '';
-        $post_date_gmt     = ! empty( $plugin_info['post_date_gmt'] )     ? $plugin_info['post_date_gmt']     : '';
-        $post_modified     = ! empty( $plugin_info['post_modified'] )     ? $plugin_info['post_modified']     : '';
-        $post_modified_gmt = ! empty( $plugin_info['post_modified_gmt'] ) ? $plugin_info['post_modified_gmt'] : '';
-
-        $id = wp_insert_post( array(
-            'post_type'    => 'plugin',
-            'post_status'  => $status,
-            'post_name'    => $slug,
-            'post_title'   => $title ?: $slug,
-            'post_author'  => $author,
-            'post_content' => $content,
-            'post_excerpt' => $desc,
-            'meta_input'   => $meta,
-            'post_date'         => $post_date,
-            'post_date_gmt'     => $post_date_gmt,
-            'post_modified'     => $post_modified,
-            'post_modified_gmt' => $post_modified_gmt,
-        ), true );
-
-        if ( is_wp_error( $id ) ) {
-            return $id;
-        }
-
-        wp_cache_set( $id, $slug, 'plugin-slugs' );
-
-        return get_post( $id );
+    public static function create_plugin_post( array $args ) {
+        $title = $args['post_title'] ?: $args['post_name'];
+        $slug  = $args['post_name']  ?: sanitize_title( $title );
+
+        $args = wp_parse_args( $args, array(
+            'post_title'        => $title,
+            'post_name'         => $slug,
+            'post_type'         => 'plugin',
+            'post_date'         => '',
+            'post_date_gmt'     => '',
+            'post_modified'     => '',
+            'post_modified_gmt' => '',
+        ) );
+
+        $result = wp_insert_post( $args, true );
+
+        if ( ! is_wp_error( $result ) ) {
+            wp_cache_set( $result, $slug, 'plugin-slugs' );
+            $result = get_post( $result );
+        }
+
+        return $result;
     }
 }

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php

@@ -83 +83 @@
 
             $plugin = Plugin_Directory::create_plugin_post( array(
-                'slug' => $plugin_slug,
-                'status' => $status,
-                'author' => $topic->topic_poster,
+                'post_name' => $plugin_slug,
+                'post_status' => $status,
+                'post_author' => $topic->topic_poster,
                 'override_modified_date' => true,
                 'post_date_gmt' => $topic->topic_start_time,
@@ -91 +91 @@
                 'post_modified' => $topic->topic_time,
                 'post_modified_gmt' => $topic->topic_time,
-                'meta' => array(
+                'meta_input' => array(
                     '_author_ip' => $author_ip,
                 ),

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php

@@ -175 +175 @@
             // Add a Plugin Directory entry for this plugin.
             $plugin_post = Plugin_Directory::create_plugin_post( array(
-                'title'       => $this->plugin['Name'],
-                'slug'        => $this->plugin_slug,
-                'status'      => 'draft',
-                'author'      => get_current_user_id(),
-                'content'     => $content,
-                'description' => $this->plugin['Description'],
-                'tags'        => $readme->tags,
-                'meta'        => array(
+                'post_title'   => $this->plugin['Name'],
+                'post_name'    => $this->plugin_slug,
+                'post_content' => $content,
+                'post_excerpt' => $this->plugin['Description'],
+                'tax_input'    => wp_unslash( $_POST['tax_input'] ),
+                'meta_input'   => array(
                     'tested'                   => $readme->tested,
                     'requires'                 => $readme->requires,

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload.php

@@ -11 +11 @@
 
         if ( is_user_logged_in() ) :
+            include_once ABSPATH . 'wp-admin/includes/template.php';
 
             if ( ! empty( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'wporg-plugins-upload' ) && 'upload' === $_POST['action'] ) :
@@ -41 +42 @@
             <?php endif; ?>
 
-            <form enctype="multipart/form-data" id="upload_form" method="POST" action="">
+            <form id="upload_form" enctype="multipart/form-data" method="POST" action="">
                 <?php wp_nonce_field( 'wporg-plugins-upload' ); ?>
                 <input type="hidden" name="action" value="upload"/>
+                <fieldset>
+                    <legend><?php _e( 'Plugin Categories (up to 3)', 'wporg-plugins' ); ?></legend>
+                    <ul class="category-checklist form-no-clear">
+                        <?php wp_terms_checklist( 0, array( 'taxonomy' => 'plugin_category' ) ); ?>
+                    </ul>
+                </fieldset>
                 <input type="file" id="zip_file" name="zip_file" size="25"/>
                 <input id="upload_button" class="button" type="submit" value="<?php esc_attr_e( 'Upload', 'wporg-plugins' ); ?>"/>