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

Timestamp:

10/11/2016 06:27:26 AM (8 years ago)

Author:

dd32

Message:

Plugin Directory: Remove wp-admin access and a bunch of code that's no longer needed.

See #2111.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php (modified) (10 diffs)

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

@@ -42 +42 @@
         add_filter( 'post_type_link', array( $this, 'package_link' ), 10, 2 );
         add_filter( 'term_link', array( $this, 'term_link' ), 10, 2 );
-        add_filter( 'pre_insert_term', array( $this, 'pre_insert_term_prevent' ), 10, 2 );
-        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' ) );
@@ -129 +127 @@
             'show_ui'           => current_user_can( 'plugin_set_section' ),
             'show_admin_column' => current_user_can( 'plugin_set_section' ),
-            'meta_box_cb'       => false, // 'post_categories_meta_box',
             'capabilities'      => array(
                 'assign_terms' => 'plugin_set_section',
@@ -159 +156 @@
             'show_ui'           => true,
             'show_admin_column' => true,
-            'meta_box_cb'       => array( __NAMESPACE__ . '\Admin\Metabox\Plugin_Categories', 'display' ),
             'capabilities'      => array(
                 'assign_terms' => 'plugin_set_category',
@@ -175 +171 @@
             'show_ui'           => true,
             'show_admin_column' => false,
-            'meta_box_cb'       => false, // array( __NAMESPACE__ . '\Admin\Metabox\Plugin_Categories', 'display' ),
+            'meta_box_cb'       => false,
             'capabilities'      => array(
                 'assign_terms' => 'plugin_set_category',
@@ -191 +187 @@
             'show_ui'           => true,
             'show_admin_column' => false,
-            'meta_box_cb'       => false, // array( __NAMESPACE__ . '\Admin\Metabox\Plugin_Categories', 'display' ),
+            'meta_box_cb'       => false,
             'capabilities'      => array(
                 'assign_terms' => 'plugin_set_category',
@@ -454 +450 @@
         }
         if ( 'plugin_built_for' == $term->taxonomy ) {
-
             // Term slug = Post Slug = /%postname%/
             return trailingslashit( home_url( $term->slug ) );
@@ -460 +455 @@
 
         return $term_link;
-    }
-
-    /**
-     * Checks if the current users is a super admin before allowing terms to be added.
-     *
-     * @param string $term     The term to add or update.
-     * @param string $taxonomy The taxonomy of the term.
-     * @return string|\WP_Error The term to add or update or WP_Error on failure.
-     */
-    public function pre_insert_term_prevent( $term, $taxonomy ) {
-        $allowed_taxonomies = array( 'plugin_tags', 'plugin_contributors' );
-
-        if ( ! in_array( $taxonomy, $allowed_taxonomies ) && ! is_super_admin() ) {
-            $term = new \WP_Error( 'not-allowed', __( 'You are not allowed to add terms.', 'wporg-plugins' ) );
-        }
-
-        return $term;
     }
 
@@ -773 +751 @@
 
             if ( 'tags' === $path[2] ) {
-                if ( isset( Tag_To_Category::$map[ $path[3] ] ) ) {
-                    wp_safe_redirect( home_url( '/category/' . Tag_To_Category::$map[ $path[3] ] . '/' ) );
-                    die();
-                } else if ( isset( $path[3] ) ) {
-                    wp_safe_redirect( home_url( '/search/' . $path[3] . '/' ) );
+                if ( isset( $path[3] ) ) {
+                    wp_safe_redirect( home_url( '/search/' . urlencode( $path[3] ) . '/' ) );
                     die();
                 } else {
@@ -793 +768 @@
             // Otherwise, handle a plugin redirect.
             if ( $plugin = self::get_plugin_post( $path[2] ) ) {
-                $is_disabled = in_array( $plugin->post_status, array( 'disabled', 'closed' ), true );
-
-                if ( $is_disabled && current_user_can( 'edit_post', $plugin ) ) {
-                    wp_safe_redirect( add_query_arg( array(
-                        'post'   => $plugin->ID,
-                        'action' => 'edit',
-                    ), admin_url( 'post.php' ) ) );
-                    die();
-                } else if ( ! $is_disabled ) {
-                    wp_safe_redirect( get_permalink( $plugin->ID ) );
+                $permalink = get_permalink( $plugin->ID );
+                if ( parse_url( $permalink, PHP_URL_PATH ) != $_SERVER['REQUEST_URI'] ) {
+                    wp_safe_redirect( $permalink );
                     die();
                 }
@@ -966 +934 @@
 
         return $content_pages;
-    }
-
-    /**
-     * 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;
     }