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

Timestamp:

12/16/2019 02:09:35 AM (7 years ago)

Author:

dd32

Message:

Theme Directory: Convert the uploads page into a real shortcode (That returns content) and hard-code the strings on the upload page to allow translation.

Props dingo_d.
Fixes #4839.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/upload.php (modified) (2 diffs)

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

@@ -14 +14 @@
 function wporg_themes_render_upload_shortcode() {
         if ( ! defined( 'THEME_TRACBOT_PASSWORD' ) || ! defined( 'THEME_DROPBOX_PASSWORD' ) ) {
-                printf( '<!-- %s -->', 'Please define SVN and Trac passwords.' );
-                return;
+                return '<!-- Please define SVN and Trac passwords. -->';
         }
 
-        if ( is_user_logged_in() ) :
+        if ( ! is_user_logged_in() ) {
 
-                if ( ! empty( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'wporg-themes-upload' ) && 'upload' === $_POST['action'] ) {
-                        $message = wporg_themes_process_upload(); 
-
-                        if ( ! empty( $message ) ) {
-                                echo "<div class='notice notice-warning'><p>{$message}</p></div>\n";
-                        }
-                }
-        ?>
-                <h4><?php _e( 'Select your zipped theme file', 'wporg-themes' ); ?></h4>
-                <form enctype="multipart/form-data" id="upload_form" method="POST" action="" onsubmit="jQuery('#upload_button').attr('disabled','disabled'); return true;">
-                        <?php wp_nonce_field( 'wporg-themes-upload' ); ?>
-                        <input type="hidden" name="action" value="upload"/>
-                        <input type="file" id="zip_file" name="zip_file" size="25"/>
-                        <input id="upload_button" class="button" type="submit" value="<?php esc_attr_e( 'Upload', 'wporg-themes' ); ?>"/>
-
-                        <p>
-                                <small><?php printf( __( 'Maximum allowed file size: %s', 'wporg-themes' ), esc_html( wporg_themes_get_max_allowed_file_size() ) ); ?></small>
-                        </p>
-                </form>
-        <?php else : ?>
-                <p><?php printf(
+                $log_in_text = sprintf(
                         __( 'Before you can upload a new theme, <a href="%s">please log in</a>.', 'wporg-themes' ),
                         add_query_arg(
@@ -47 +26 @@
                                 'https://login.wordpress.org/'
                         )
-                ); ?><p>
-        <?php endif;
+                );
+
+                return '<p>' . $log_in_text . '</p>';
+        }
+
+        $notice = '';
+
+        if ( ! empty( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'wporg-themes-upload' ) && 'upload' === $_POST['action'] ) {
+                $message = wporg_themes_process_upload();
+
+                if ( ! empty( $message ) ) {
+                        $notice = "<div class='notice notice-warning'><p>{$message}</p></div>";
+                }
+        }
+
+        $form = '<h4>' . __( 'Select your zipped theme file', 'wporg-themes' ) . '</h4>
+                <form enctype="multipart/form-data" id="upload_form" method="POST" action="" onsubmit="jQuery(\'#upload_button\').attr(\'disabled\',\'disabled\'); return true;">
+                        ' . wp_nonce_field( 'wporg-themes-upload', '_wpnonce', true, false ) . '
+                        <input type="hidden" name="action" value="upload"/>
+                        <input type="file" id="zip_file" name="zip_file" size="25"/>
+                        <button id="upload_button" class="button" type="submit" value="' . esc_attr__( 'Upload', 'wporg-themes' ) . '">' . esc_html__( 'Upload', 'wporg-themes' ) . '</button>
+                        <p>
+                                <small>' . sprintf( __( 'Maximum allowed file size: %s', 'wporg-themes' ), esc_html( wporg_themes_get_max_allowed_file_size() ) ) . '</small>
+                        </p>
+                </form>';
+
+        return $notice . $form;
 }