Changeset 10431

Timestamp:

11/06/2020 04:30:43 AM (4 years ago)

Author:

dd32

Message:

Theme Directory: Block duplicate Theme URI's (except when by the current author) and add a "Are you sure you want to upload this here" type message for those who are lost.

Fixes #4039.

Location:

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

Files:

• class-wporg-themes-upload.php (modified) (6 diffs)
• query-modifications.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php

@@ -156 +156 @@
                 '<code>Theme Name:</code>',
                 '<code>style.css</code>',
-                __( 'https://codex.wordpress.org/Theme_Development#Theme_Style_Sheet', 'wporg-themes' )
+                __( 'https://codex.wordpress.org/Theme_Development#Theme_Stylesheet', 'wporg-themes' )
             );
 
@@ -197 +197 @@
                 '<code>Description:</code>',
                 '<code>style.css</code>',
-                __( 'https://codex.wordpress.org/Theme_Development#Theme_Style_Sheet', 'wporg-themes' )
+                __( 'https://codex.wordpress.org/Theme_Development#Theme_Stylesheet', 'wporg-themes' )
             );
 
@@ -210 +210 @@
                 '<code>Tags:</code>',
                 '<code>style.css</code>',
-                __( 'https://codex.wordpress.org/Theme_Development#Theme_Style_Sheet', 'wporg-themes' )
+                __( 'https://codex.wordpress.org/Theme_Development#Theme_Stylesheet', 'wporg-themes' )
             );
 
@@ -223 +223 @@
                 '<code>Version:</code>',
                 '<code>style.css</code>',
-                __( 'https://codex.wordpress.org/Theme_Development#Theme_Style_Sheet', 'wporg-themes' )
+                __( 'https://codex.wordpress.org/Theme_Development#Theme_Stylesheet', 'wporg-themes' )
             );
 
@@ -236 +236 @@
         }
 
-        // Make sure we have version that is higher than any previously uploaded version of this theme.
+        // Version is greater than current version happens after authorship checks.
+
+        // Prevent duplicate URLs.
+        $themeuri = $this->theme->get( 'ThemeURI' );
+        $authoruri = $this->theme->get( 'AuthorURI' );
+        if ( !empty( $themeuri ) && !empty( $authoruri ) && $themeuri == $authoruri ) {
+            return __( 'Duplicate theme and author URLs. A theme URL is a page/site that provides details about this specific theme. An author URL is a page/site that provides information about the author of the theme. You aren&rsquo;t required to provide both, so pick the one that best applies to your URL.', 'wporg-themes' );
+        }
+
+        // Check for child theme's parent in the directory (non-buddypress only)
+        if ( $this->theme->parent() && ! in_array( 'buddypress', $this->theme->get( 'Tags' ) ) && ! $this->is_parent_available() ) {
+            /* translators: %s: parent theme */
+            return sprintf( __( 'There is no theme called %s in the directory. For child themes, you must use a parent theme that already exists in the directory.', 'wporg-themes' ),
+                '<code>' . $this->theme->parent() . '</code>'
+            );
+        }
+
+        // Generic text to suggest "Are you in the right place?"
+        $are_you_in_the_right_place = '<br>' . 
+            __( 'The WordPress.org Theme Directory is for sharing a unique theme with others, duplicates are not allowed.', 'wporg-themes' ) .
+            '<br>' .
+            sprintf(
+                /* translators: %s: A link to https://wordpress.org/support/article/using-themes/ */
+                __( "If you're attempting to install a theme on your website, <a href='%s'>please see this article</a>.", 'wporg-themes' ),
+                'https://wordpress.org/support/article/using-themes/'
+            );
+
+        // Is there already a theme with the name name by a different author?
+        if ( ! empty( $this->theme_post ) && $this->theme_post->post_author != $this->author->ID ) {
+            /* translators: 1: theme slug, 2: style.css */
+            return sprintf( __( 'There is already a theme called %1$s by a different author. Please change the name of your theme in %2$s and upload it again.', 'wporg-themes' ),
+                '<code>' . $this->theme_slug . '</code>',
+                '<code>style.css</code>'
+            ) . $are_you_in_the_right_place;
+        }
+
+        // Check if the ThemeURI is already in use by another theme by another author.
+        if ( empty( $this->theme_post ) && ! empty( $themeuri ) ) {
+            $theme_uri_matches = get_posts( [
+                'post_type'        => 'repopackage',
+                'post_status'      => 'publish',
+                'meta_query'       => [
+                    'theme_uri_search' => [
+                        'key'     => '_theme_url',
+                        'value'   => '"' . $themeuri . '"', // Searching within a Serialized PHP value
+                        'compare' => 'LIKE'
+                    ],
+                ]
+            ] );
+            $theme_owners = wp_list_pluck( $theme_uri_matches, 'post_author' );
+
+            if ( $theme_owners && ! in_array( $this->author->ID, $theme_owners ) ) {
+                return sprintf(
+                    /* translators: 1: theme name, 2: style.css */
+                    __( 'There is already a theme using the Theme URL %1$s by a different author. Please check the URI of your theme in %2$s and upload it again.', 'wporg-themes' ),
+                    '<code>' . esc_html( $theme_uri ) . '</code>',
+                    '<code>style.css</code>'
+                ) . $are_you_in_the_right_place;
+            }
+        }
+
+        // We know it's the correct author, now we can check if it's suspended.
+        if ( ! empty( $this->theme_post ) && 'suspend' === $this->theme_post->post_status ) {
+            /* translators: %s: mailto link */
+            return sprintf( __( 'This theme is suspended from the Theme Repository and it can&rsquo;t be updated. If you have any questions about this please contact %s.', 'wporg-themes' ),
+                '<a href="mailto:themes@wordpress.org">themes@wordpress.org</a>'
+            );
+        }
+
+        // Make sure we have version that is higher than any previously uploaded version of this theme. This check happens last to allow the non-author blocks to kick in.
         if ( ! empty( $this->theme_post ) && ! version_compare( $this->theme->get( 'Version' ), $this->theme_post->max_version, '>' ) ) {
             /* translators: 1: theme name, 2: theme version, 3: style.css */
@@ -243 +312 @@
                 '<code>' . $this->theme_post->max_version . '</code>',
                 '<code>style.css</code>'
-            );
-        }
-
-        // Prevent duplicate URLs.
-        $themeuri = $this->theme->get( 'ThemeURI' );
-        $authoruri = $this->theme->get( 'AuthorURI' );
-        if ( !empty( $themeuri ) && !empty( $authoruri ) && $themeuri == $authoruri ) {
-            return __( 'Duplicate theme and author URLs. A theme URL is a page/site that provides details about this specific theme. An author URL is a page/site that provides information about the author of the theme. You aren&rsquo;t required to provide both, so pick the one that best applies to your URL.', 'wporg-themes' );
-        }
-
-        // Check for child theme's parent in the directory (non-buddypress only)
-        if ( $this->theme->parent() && ! in_array( 'buddypress', $this->theme->get( 'Tags' ) ) && ! $this->is_parent_available() ) {
-            /* translators: %s: parent theme */
-            return sprintf( __( 'There is no theme called %s in the directory. For child themes, you must use a parent theme that already exists in the directory.', 'wporg-themes' ),
-                '<code>' . $this->theme->parent() . '</code>'
-            );
-        }
-
-        // Is there already a theme with the name name by a different author?
-        if ( ! empty( $this->theme_post ) && $this->theme_post->post_author != $this->author->ID ) {
-            /* translators: 1: theme slug, 2: style.css */
-            return sprintf( __( 'There is already a theme called %1$s by a different author. Please change the name of your theme in %2$s and upload it again.', 'wporg-themes' ),
-                '<code>' . $this->theme_slug . '</code>',
-                '<code>style.css</code>'
-            );
-        }
-
-        // We know it's the correct author, now we can check if it's suspended.
-        if ( ! empty( $this->theme_post ) && 'suspend' === $this->theme_post->post_status ) {
-            /* translators: %s: mailto link */
-            return sprintf( __( 'This theme is suspended from the Theme Repository and it can&rsquo;t be updated. If you have any questions about this please contact %s.', 'wporg-themes' ),
-                '<a href="mailto:themes@wordpress.org">themes@wordpress.org</a>'
             );
         }

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/query-modifications.php

@@ -127 +127 @@
         empty( $query->query_vars['author_name'] ) &&
         ! in_array( $query->query_vars['browse'], array( 'favorites', 'new', 'updated' ) ) &&
-        empty( $query->query_vars['meta_query']['trac_sync_ticket_id'] ) // jobs/class-trac-sync.php - Always needs to find the post, and looks up via a meta search.
+        empty( $query->query_vars['meta_query']['trac_sync_ticket_id'] ) && // jobs/class-trac-sync.php - Always needs to find the post, and looks up via a meta search.
+        empty( $query->query_vars['meta_query']['theme_uri_search'] ) // class-wporg-themes-upload.php - Searching all known themes by meta value.
     ) {
         $query->query_vars['date_query']['recent_themes_only'] = array(