Changeset 13465

Timestamp:

04/05/2024 07:53:57 AM (4 months ago)

Author:

dd32

Message:

Plugin Directory: Trademarks: Assume a plugins trademark exceptions are those of it's owners and committers. Better handling for portmanteaus, and trim - off when displaying in the error messages.

See #5868.

Location:

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

Files:

• class-trademarks.php (modified) (5 diffs)
• readme/class-validator.php (modified) (1 diff)

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

@@ -1 +1 @@
 <?php
 namespace WordPressdotorg\Plugin_Directory;
+
 
 use WP_Post;
@@ -120 +121 @@
         'wordpess',
         'wpress',
-        'wp-',
+        'wp-',
         'wp-mail-smtp-',
         'yandex-',
@@ -252 +253 @@
         foreach ( $portmanteaus as $portmanteau ) {
             if ( str_starts_with( $plugin_slug, $portmanteau ) ) {
-                $has_trademarked_slug[] = $portmanteau . '-'; // State that the portmanteau cannnot start the text.
+                // Check there isn't a longer matching trademark already flagged.
+                // For example, 'woo' should not flag if 'woocommerce' is already flagged.
+                if ( ! preg_grep( '!^' . preg_quote( $portmanteau, '!' ) . '!', $has_trademarked_slug ) ) {
+                    $has_trademarked_slug[] = $portmanteau . '-'; // State that the portmanteau cannnot start the text.
+                }
             }
         }
@@ -270 +275 @@
 
         // The users email domain.
-        if ( $user && $user->exists() ) {
+        if ( $user && $user->exists() ) {
             $exceptions[] = explode( '@', $user->user_email, 2 )[1];
         }
@@ -280 +285 @@
      * Get the exceptions allowed for a plugin.
      *
-     * @param string $plugin_slug The plugin slug.
+     * @param .
      * @return array
      */
-    public static function get_plugin_exceptions( $plugin_slug ) {
-        return [];
+    public static function get_plugin_exceptions( $post ) {
+        // Assume all of the committers (and owner) are exceptions.
+        $committers = Tools::get_plugin_committers( $post );
+
+        $committers = array_map( function( $user_login ) { return get_user_by( 'login', $user_login); }, $committers );
+        $committers[] = get_user_by( 'id', $post->post_author );
+
+        $exceptions = [];
+        foreach ( $committers as $user ) {
+            $exceptions = array_merge( $exceptions, self::get_user_exceptions( $user ) );
+        }
+
+        return array_unique( $exceptions );
     }
 }

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

@@ -408 +408 @@
 
                 if ( $cannot_start_with ) {
+
+
+
                     $messages[] = sprintf(
                         /* translators: 1: plugin slug, 2: trademarked term, 3: 'Plugin Name:', 4: plugin email address */