Changeset 3331

Timestamp:

06/11/2016 08:21:45 PM (9 years ago)

Author:

obenland

Message:

Plugin Directory: Give Reviewers the ability to filter plugins by author IP.

See #1570.

Location:

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

Files:

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

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

@@ -173 +173 @@
         if ( empty( $query->query['post_status'] ) ) {
             $query->query_vars['post_status'] = array( 'publish', 'future', 'draft', 'pending', 'disabled', 'closed', 'rejected', 'approved' );
+        }
+
+        // Make it possible to search for plugins that were submitted from a specific IP.
+        if ( current_user_can( 'plugin_review' ) && ! empty( $query->query['s'] ) && filter_var( $query->query['s'], FILTER_VALIDATE_IP ) ) {
+            $query->query_vars['meta_key']   = '_author_ip';
+            $query->query_vars['meta_value'] = $query->query_vars['s'];
+            unset( $query->query_vars['s'] );
+
+            add_filter( 'get_search_query', function() use ( $query ) {
+                return esc_html( $query->query_vars['meta_value'] );
+            } );
         }
 

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

@@ -79 +79 @@
         }
 
-        $user_ips = array();// $wpdb->get_col( $wpdb->prepare( 'SELECT DISTINCT poster_ip FROM plugin_2_posts WHERE poster_id = %s', $author->ID ) );
-        $user_ips = array_filter( $user_ips, 'strlen' );
+        $post_ids = get_posts( array(
+            'fields'         => 'ids',
+            'post_type'      => 'plugin',
+            'author'         => $author->ID,
+            'meta_key'       => '_author_ip',
+            'posts_per_page' => -1,
+        ) );
+
+        $user_ips = array_unique( array_map( function( $post_id ) {
+            return get_post_meta( $post_id, '_author_ip', true );
+        }, $post_ids ) );
+
         if ( $user_ips ) :
             sort( $user_ips, SORT_NUMERIC );
 
-            $user_ips = array_map( array( 'Author_Card', 'link_ip' ), $user_ips );
-
-            echo '<p>IPs : ' . implode( ', ', $user_ips ) . '</p>';
+            printf( '<p>IPs : %s</p>', implode( ', ', array_map( array( __NAMESPACE__ . '\Author_Card', 'link_ip' ), $user_ips ) ) );
         endif;
 
@@ -191 +199 @@
         do_action( 'wporg_plugins_author_card', $post, $author, $all_plugins );
     }
+
+    /**
+     * Builds a link to a list of plugins submitted from a given IP.
+     *
+     * @param string $ip IP address of the plugin author.
+     * @return string
+     */
+    protected static function link_ip( $ip ) {
+        return sprintf( '<a href="%1$s">%2$s</a>', esc_url( add_query_arg( array(
+            'post_type' => 'plugin',
+            's'         => $ip,
+        ), admin_url( 'edit.php' ) ) ), $ip );
+    }
 }

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

@@ -661 +661 @@
      *     @type string $content     The long description of the plugin.
      *     @type array  $tags        The tags associated with the plugin.
-     *     @type array  $tags        The meta information of the plugin.
+     *     @type array  $meta        The meta information of the plugin.
      * }
      * @return \WP_Post|\WP_Error

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

@@ -80 +80 @@
 
         if ( ! $plugin ) {
+            $author_ip = $wpdb->get_var( $wpdb->prepare( 'SELECT poster_ip FROM ' . PLUGINS_TABLE_PREFIX . 'posts WHERE topic_id = %s', $topic->topic_id ) );
+
             $plugin = Plugin_Directory::create_plugin_post( array(
                 'slug' => $plugin_slug,
@@ -89 +91 @@
                 'post_modified' => $topic->topic_time,
                 'post_modified_gmt' => $topic->topic_time,
+                'meta' => array(
+                    '_author_ip' => $author_ip,
+                ),
             ) );
         }

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

@@ -204 +204 @@
                     'support_threads'          => 0,
                     'support_threads_resolved' => 0,
+                    '_author_ip'               => preg_replace( '/[^0-9a-fA-F:., ]/', '', $_SERVER['REMOTE_ADDR'] ),
                 ),
             ) );