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

Timestamp:

04/05/2024 03:44:27 AM (6 months ago)

Author:

dd32

Message:

Plugin Directory: Extract the trademark logic from the upload handler, into a generic class for use in the plugin directory.

See #5868, #6108.

File:

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

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

@@ -3 +3 @@
 
 use WordPressdotorg\Plugin_Directory\Tools\Filesystem;
+use WordPressdotorg\Plugin_Directory\Trademarks;
 
 /**
@@ -94 +95 @@
         if ( isset( $readme->warnings['invalid_plugin_name_header'] ) ) {
             $errors['invalid_plugin_name_header'] = $readme->warnings['invalid_plugin_name_header'];
-        } elseif (  empty( $readme->name ) ) {
+        } elseif ( empty( $readme->name ) ) {
             $errors['invalid_plugin_name_header'] = true;
+        }
+
+        if (
+            empty( $errors['invalid_plugin_name_header'] ) &&
+            ( $trademark_check = Trademarks::check( $readme->name, wp_get_current_user() ) )
+        ) {
+            $errors['trademarked_name'] = [
+                'trademark' => $trademark_check,
+                'context'   => $readme->name,
+                'where'     => 'readme',
+            ];
         }
 
@@ -383 +395 @@
                 );
 
+            case 'trademarked_name':
+                $trademark = $data['trademark'];
+                $context   = $data['context'];
+
+                if ( str_ends_with( $trademark, '-' ) ) {
+                    // Trademarks ending in "-" indicate slug cannot BEGIN with that term.
+                    return sprintf(
+                        /* translators: 1: plugin name/slug, 2: trademarked term, 3: plugin email address */
+                        __( 'The plugin name includes a restricted term. Your chosen plugin name - %1$s - contains the restricted term "%2$s" and cannot be used to begin your slug, permalink, display name, or plugin name. We disallow the use of certain terms in ways that are abused, or potentially infringe on and/or are misleading with regards to trademarks. If you feel this is in error, such as you legally own the trademark for the term, please email us at %4$s and explain your situation.', 'wporg-plugins' ),
+                        '<code>' . esc_html( $context ) . '</code>',
+                        '<code>' . esc_html( trim( $trademark, '-' ) ) . '</code>',
+                        '<code>plugins@wordpress.org</code>'
+                    );
+                } else {
+                    // Trademarks that do NOT end in "-" indicate slug cannot contain term at all.
+                    return sprintf(
+                        /* translators: 1: plugin name/slug, 2: trademarked term, 3: plugin email address */
+                        __( 'The plugin name includes a restricted term. Your chosen plugin name - %1$s - contains the restricted term "%2$s" and cannot be used at all in your plugin permalink nor the display name. If you feel this is in error, such as you legally own the trademark for a term, please email us at %3$s and explain your situation.', 'wporg-plugins' ),
+                        '<code>' . esc_html( $context ) . '</code>',
+                        '<code>' . esc_html( trim( $trademark, '-' ) ) . '</code>',
+                        '<code>plugins@wordpress.org</code>'
+                    );
+                }
+
             /* The are not generated by the Readme Parser, but rather the import parser. */
             case 'invalid_update_uri':