Changeset 11168

Timestamp:

08/09/2021 02:21:50 AM (4 years ago)

Author:

dufresnesteven

Message:

Themes: Show multiple theme errors at once during upload.

See: ​https://github.com/WordPress/wordpress.org/pull/36

Location:

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

Files:

• class-wporg-themes-upload.php (modified) (15 diffs)
• upload.php (modified) (1 diff)

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

@@ -161 +161 @@
      * Runs various tests, creates Trac ticket, repopackage post, and saves the files to the SVN repo.
      *
-     * @return string Failure or success message.
+     * @return mixed Failure or success message.
      */
     public function process_upload( $file_upload ) {
@@ -188 +188 @@
         }
 
+        $style_errors = array();
+
         // Do we have a readme.txt? Fetch extra data from there too.
         $this->readme = $this->get_readme_data( $theme_files );
@@ -197 +199 @@
         if ( ! $this->has_screenshot( $theme_files ) ) {
             /* translators: 1: screenshot.png, 2: screenshot.jpg */
-            return sprintf( __( 'The zip file must include a file named %1$s or %2$s.', 'wporg-themes' ),
+            $style_errors[] = sprintf( __( 'The zip file must include a file named %1$s or %2$s.', 'wporg-themes' ),
                 '<code>screenshot.png</code>',
                 '<code>screenshot.jpg</code>'
@@ -224 +226 @@
             );
 
-            return $error;
+            $style_errors[] = $error;
         }
 
@@ -230 +232 @@
         if ( false !== strpos( $this->theme_slug, 'wordpress' ) || preg_match( '/\btheme\b/i', $this->theme_slug ) ) {
             /* translators: 1: 'WordPress', 2: 'theme' */
-            return sprintf( __( 'You cannot use %1$s or %2$s in your theme name.', 'wporg-themes' ),
+            $style_errors[] = sprintf( __( 'You cannot use %1$s or %2$s in your theme name.', 'wporg-themes' ),
                 'WordPress',
                 'theme'
@@ -243 +245 @@
         if ( $this->has_reserved_slug() ) {
             /* translators: 1: theme slug, 2: style.css */
-            return sprintf( __( 'Sorry, the theme name %1$s is reserved for use by WordPress Core. Please change the name of your theme in %2$s and upload it again.', 'wporg-themes' ),
+            $style_errors[] = sprintf( __( 'Sorry, the theme name %1$s is reserved for use by WordPress Core. 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>'
@@ -263 +265 @@
             );
 
-            return $error;
+            $style_errors[] = $error;
         }
 
@@ -276 +278 @@
             );
 
-            return $error;
+            $style_errors[] = $error;
         }
 
@@ -289 +291 @@
             );
 
-            return $error;
-        }
-
-        if ( preg_match( '|[^\d\.]|', $this->theme->get( 'Version' ) ) ) {
+            $style_errors[] = $error;
+
+        } else if ( preg_match( '|[^\d\.]|', $this->theme->get( 'Version' ) ) ) {
             /* translators: %s: style.css */
-            return sprintf( __( 'Version strings can only contain numeric and period characters (like 1.2). Please fix your Version: line in %s and upload your theme again.', 'wporg-themes' ),
+            $style_errors[] = sprintf( __( 'Version strings can only contain numeric and period characters (like 1.2). Please fix your Version: line in %s and upload your theme again.', 'wporg-themes' ),
                 '<code>style.css</code>'
             );
@@ -305 +306 @@
         $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' );
+            $style_errors[] = __( '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' );
         }
 
@@ -311 +312 @@
         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' ),
+            $style_errors[] = 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>'
             );
@@ -342 +343 @@
             if ( ! $is_allowed_to_upload_for_theme ) {
                 /* 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' ),
+                $style_errors[] = 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>'
@@ -365 +366 @@
 
             if ( $theme_owners && ! in_array( $this->author->ID, $theme_owners ) ) {
-                return sprintf(
+                $style_errors[] = 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 URL of your theme in %2$s and upload it again.', 'wporg-themes' ),
@@ -377 +378 @@
         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' ),
+            $style_errors[] = 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>'
             );
@@ -385 +386 @@
         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 */
-            return sprintf( __( 'You need to upload a version of %1$s higher than %2$s. Increase the theme version number in %3$s, then upload your zip file again.', 'wporg-themes' ),
+            $style_errors[] = sprintf( __( 'You need to upload a version of %1$s higher than %2$s. Increase the theme version number in %3$s, then upload your zip file again.', 'wporg-themes' ),
                 $this->theme->display( 'Name' ),
                 '<code>' . $this->theme_post->max_version . '</code>',
                 '<code>style.css</code>'
             );
+        }
+
+        // If we had any issues with information in the style.css, exit early.
+        if ( ! empty( $style_errors ) ) {
+            return $style_errors;
         }
 

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

@@ -50 +50 @@
 
     if ( ! empty( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'wporg-themes-upload' ) && 'upload' === $_POST['action'] ) {
-        $message = wporg_themes_process_upload();
+        $messages = wporg_themes_process_upload();
 
-        if ( ! empty( $message ) ) {
-            $notice = "<div class='notice notice-warning'><p>{$message}</p></div>";
+        if ( ! empty( $messages ) ) {
+            $notice_content = "";
+
+            if ( is_array( $messages ) ) {
+                foreach ( $messages as $message){
+                    $notice_content .= "<li>{$message}</li>";
+                }
+            } else {
+                $notice_content = "<li>{$messages}</li>";
+            }
+
+            $notice = "<h2>" . esc_html__( 'Upload Errors', 'wporg-themes' ) . "</h2><div class='notice notice-error notice-large'><ul>{$notice_content}</ul></div>";
         }
     }