Index: trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-author-card.php =================================================================== --- trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-author-card.php (revision 9095) +++ trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-author-card.php (working copy) @@ -13,7 +13,41 @@ * @package WordPressdotorg\Plugin_Directory\Admin\Metabox */ class Author_Card { + /** + * List of known problematic IPs + * + * @var array + */ + public static $iffy_ips = [ + '2.240.', + '2.241.', + '5.102.170.', + '5.102.171.', + '38.78.', + '47.15.', + '49.50.124.', + '65.33.104.38', + '71.41.77.202', + '76.73.108.', + '80.131.192.168', + '87.188.', + '91.228.', + '91.238.', + '94.103.41.', + '109.123.', + '110.55.1.251', + '110.55.4.248', + '116.193.162.', + '119.235.251.', + '159.253.145.183', + '173.171.9.190', + '173.234.140.18', + '188.116.36.', + '217.87.', + ]; + + /** * Displays information about the author of the current plugin. * * @param int|WP_Post $post_or_user_id The post or the ID of a specific user. @@ -250,14 +284,34 @@ * @return string */ protected static function link_ip( $ip ) { - return sprintf( - '%2$s', + + $ip_data = array( + 'name' => $ip, + 'tooltip' => '', + 'iffy' => false, + ); + + foreach ( self::$iffy_ips as $check_ip ) { + if ( strpos( $ip, $check_ip ) !== false ) { + $ip_data['name'] .= '*'; + $ip_data['tooltip'] = 'This IP may be problemtic and has been used for abuse before.'; + $ip_data['iffy'] = true; + } + } + + $ip_name = ( true === $warning ) ? $ip . ' *' : $ip; + + $output_ip = sprintf( + '%3$s', esc_url( add_query_arg( array( 'post_type' => 'plugin', 's' => $ip, ), admin_url( 'edit.php' ) ) ), - $ip + $ip_data['tooltip'], + $ip_data['name'] ); + + return $output_ip; } /** Index: trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-review-tools.php =================================================================== --- trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-review-tools.php (revision 9095) +++ trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-review-tools.php (working copy) @@ -32,14 +32,21 @@ * @var array */ public static $reserved_slugs = [ - 'wordpress', - 'woocommerce', + 'apple', + 'contact-form-7', + 'facebook', 'google', - 'youtube', + 'instagram', + 'ios', + 'jetpack', + 'jquery', + 'microsoft', + 'paypal', 'twitter', - 'facebook', + 'woocommerce', + 'wordpress', 'yoast', - 'jetpack', + 'youtube', ]; /** @@ -49,22 +56,23 @@ */ public static $restricted_slugs = [ // High-value plugin genres due to their popularity, often abused by spammers. + 'booking', + 'bookmark', + 'cookie', 'gallery', 'lightbox', + 'seo', 'sitemap', - 'bookmark', + 'slide', 'social', - 'cookie', - 'slide', - 'seo', // Plugins we generally don't allow. 'autoblog', 'auto-blog', - 'booking', + 'framework', + 'library', 'plugin', 'spinning', - 'framework', ]; /** @@ -86,39 +94,6 @@ ]; /** - * List of known problematic IPs - * - * @var array - */ - public static $iffy_ips = [ - '2.240.', - '2.241.', - '5.102.170.', - '5.102.171.', - '38.78.', - '47.15.', - '49.50.124.', - '65.33.104.38', - '71.41.77.202', - '76.73.108.', - '80.131.192.168', - '87.188.', - '91.228.', - '91.238.', - '94.103.41.', - '109.123.', - '110.55.1.251', - '110.55.4.248', - '116.193.162.', - '119.235.251.', - '159.253.145.183', - '173.171.9.190', - '173.234.140.18', - '188.116.36.', - '217.87.', - ]; - - /** * Displays links to plugin assets and automated flags. */ public static function display() { Index: trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php =================================================================== --- trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php (revision 9095) +++ trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php (working copy) @@ -95,7 +95,7 @@ return new \WP_Error( 'unsupported_name', $error . ' ' . sprintf( /* translators: %s: 'Plugin Name:' */ - __( 'Plugin names may only contain latin letters (A-z), numbers, spaces, and hyphens. Please change the %s line in your main plugin file and upload it again.', 'wporg-plugins' ), + __( 'Plugin names may only contain latin letters (A-z), numbers, spaces, and hyphens. Please change the %s line in your main plugin file and readme, then you may upload it again.', 'wporg-plugins' ), esc_html( $this->plugin['Name'] ), 'Plugin Name:' ) ); @@ -107,12 +107,25 @@ return new \WP_Error( 'reserved_name', $error . ' ' . sprintf( /* translators: 1: plugin slug, 2: 'Plugin Name:' */ - __( 'Your chosen plugin name - %1$s - has been reserved for use by WordPress. Please change the %2$s line in your main plugin file and upload it again.', 'wporg-plugins' ), + __( 'Your chosen plugin name - %1$s - has been reserved and cannot be used. Please change the %2$s line in your main plugin file and readme, then you may upload it again.', 'wporg-plugins' ), '' . $this->plugin_slug . '', 'Plugin Name:' ) ); } + // Make sure it doesn't use a TRADEMARK protected slug. + if ( $this->has_trademarked_slug() ) { + $error = __( 'Error: The plugin has a trademarked name.', 'wporg-plugins' ); + + return new \WP_Error( 'trademarked_name', $error . ' ' . sprintf( + /* translators: 1: plugin slug, 2: 'Plugin Name:', 3: plugin email address. */ + __( 'Your chosen plugin name - %1$s - has been flagged as trademark infringement and cannot be used. We have been legally compelled to protect specific trademarks and as such prevent the use of specific terms. Please change the %2$s line in your main plugin file and readme, then you may upload it again. If you feel this is in error, please email us at %3$s and explain why.', 'wporg-plugins' ), + '' . $this->plugin_slug . '', + 'Plugin Name:', + 'plugins@wordpress.org' + ) ); + } + $plugin_post = Plugin_Directory::get_plugin_post( $this->plugin_slug ); // Is there already a plugin with the same slug by a different author? @@ -140,6 +153,18 @@ ) ); } + // Prevent short plugin names (they're generally SEO grabs). + if ( strlen( $this->plugin_slug ) < 5 ) { + $error = __( 'Error: The plugin slug is too short.', 'wporg-plugins' ); + + return new \WP_Error( 'trademarked_name', $error . ' ' . sprintf( + /* translators: 1: plugin slug, 2: 'Plugin Name:' */ + __( 'Your chosen plugin name - %1$s - is not permitted becuase it is too short. Please change the %2$s line in your main plugin file and readme and upload it again.', 'wporg-plugins' ), + '' . $this->plugin_slug . '', + 'Plugin Name:' + ) ); + } + if ( ! $this->plugin['Description'] ) { $error = __( 'Error: The plugin has no description.', 'wporg-plugins' ); @@ -290,15 +315,6 @@ 'plugins@wordpress.org' ) . '

'; - // Warn if the plugin starts with a reserved slug. - if ( $this->starts_with_reserved_slug() ) { - $message .= sprintf( - /* translators: %s: plugin name */ - __( 'Warning: Your plugin will probably need to be renamed. Your chosen plugin name - %s - starts with a term that may belong to another company. When we review your submission we will either correct this for you or request you approve a new name.' ), - esc_html( $this->plugin['Name'] ) - ) . '

'; - } - $message .= __( 'If there is any error in your submission, please email us as soon as possible. We can correct many issues before approval.', 'wporg-plugins' ) . '

'; $message .= sprintf( @@ -334,6 +350,7 @@ 'admin', 'wp-admin', 'wordpress', + 'jquery', ); return in_array( $this->plugin_slug, $reserved_slugs ); @@ -340,30 +357,38 @@ } /** - * Whether the uploaded plugin uses a slug commonly abused by non-reps. + * Whether the uploaded plugin uses a trademark in the slug. * * @return bool */ - public function starts_with_reserved_slug() { - $abused_slugs = array( - 'apple', + public function has_trademarked_slug() { + $return = false; + $trademarked_slugs = array( + 'contact-form-7', 'facebook', 'google', - 'ios', - 'jetpack', + '-gram', + 'gram-', + 'instagram', + 'insta', 'microsoft', 'paypal', 'twitter', + 'tweet', + 'whatsapp', + 'whats-app', 'woocommerce', 'wordpress', 'yoast', ); - // Get the slug in an array. - $slug = explode( '-', $this->plugin_slug ); + foreach ( $trademarked_slugs as $trademark ) { + if ( strpos( $this->plugin_slug, $trademark ) ) { + $return = true; + } + } - // If the slug is the same as the first term, flag for abuse. - return in_array( $slug[0], $abused_slugs ); + return $return; } /** @@ -406,7 +431,7 @@ } echo '

' . sprintf( __( 'Results of Automated Plugin Scanning: %s', 'wporg-plugins' ), vsprintf( '%2$s', $verdict ) ) . '

'; - echo ''; + echo ''; echo '

' . __( 'Note: While the automated plugin scan is based on the Plugin Review Guidelines, it is not a complete review. A successful result from the scan does not guarantee that the plugin will pass review. All submitted plugins are reviewed manually before approval.', 'wporg-plugins' ) . '

'; return $result; @@ -445,14 +470,17 @@ $this->plugin['Name'] ); - /* translators: 1: plugin name, 2: plugin slug */ + /* + Please leave the blank lines in place. + */ $email_content = sprintf( + // translators: 1: plugin name, 2: plugin slug. __( 'Thank you for uploading %1$s to the WordPress Plugin Directory. We will review your submission as soon as possible and send you a follow up email with the results. -Your plugin has been given the initial slug of %2$s, however this is subject to change based on the results of your review. +Your plugin has been given the initial slug of %2$s based on your diplay name of %1$s. This is subject to change based on the results of your review. -If there is any problem with this submission, please reply to this email and let us know right away. In most cases, we can correct errors as long as the plugin has not yet been approved. For situations like an incorrect plugin slug, we are unable to change that post approval. If you do not inform us of any requirements now, we will be unable to honor them later. +If there are any problems with your submission, please REPLY to this email and let us know right away. In most cases, we can correct errors as long as the plugin has not yet been approved. For situations like an incorrect plugin slug, we are unable to change that post approval. If you do not inform us of any requirements now, we will be unable to honor them later. We recommend you review the following links to understand the review process and our expectations: @@ -474,7 +502,7 @@ wp_mail( $user_email, $email_subject, $email_content, 'From: plugins@wordpress.org' ); } - // Helper + // Helper. /** * Whitelist zip files to be allowed to be uploaded to the media library. *