Changeset 8380

Timestamp:

03/01/2019 09:03:33 AM (6 years ago)

Author:

dd32

Message:

WordPress.TV: After a successful upload, keep the event-specific fields prefilled.

Fixes #4231.

Location:

sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2

Files:

• anon-upload-template.php (modified) (4 diffs)
• plugins/wordpresstv-anon-upload/anon-upload.php (modified) (2 diffs)

sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/anon-upload-template.php

@@ -268 +268 @@
                     </p>
                     <p>
-                        <input type="checkbox" id="wptv_video_wordcamp" name="wptv_video_wordcamp" />
+                        <input type="checkbox" id="wptv_video_wordcamp" name="wptv_video_wordcamp" <?php if ( !empty( $_GET['wptv_video_wordcamp'] ) ) { echo 'checked="checked"'; } ?> />
                         <label for="wptv_video_wordcamp" class="wptv-video-wordcamp-cb"><?php esc_html_e( 'This is a WordCamp video' ); ?></label>
                     </p>
@@ -275 +275 @@
                         <p>
                             <label for="wptv_uploaded_by"><?php esc_html_e( 'Uploaded by' ); ?><span class="required"> * </span></label>
-                            <input type="text" id="wptv_uploaded_by" name="wptv_uploaded_by" value="" />
+                            <input type="text" id="wptv_uploaded_by" name="wptv_uploaded_by" value="<?php echo esc_attr( wp_unslash( $_GET['wptv_uploaded_by'] ?? '' ) ); ?>" />
                         </p>
                         <p>
                             <label for="wptv_email"><?php esc_html_e( 'Email address' ); ?><span class="required"> * </span></label>
-                            <input type="text" id="wptv_email" name="wptv_email" value="" />
+                            <input type="text" id="wptv_email" name="wptv_email" value="<?php echo esc_attr( wp_unslash( $_GET['wptv_email'] ?? '' ) ); ?>" />
                         </p>
                     <?php endif; ?>
@@ -285 +285 @@
                     <p>
                         <label for="wptv_video_title"><?php esc_html_e( 'Video title' ); ?></label>
-                        <input type="text" id="wptv_video_title" name="wptv_video_title" value="" />
+                        <input type="text" id="wptv_video_title" name="wptv_video_title" value="<?php echo esc_attr( wp_unslash( $_GET['wptv_video_title'] ?? '' ) ); ?>" />
                     </p>
                     <p>
                         <label for="wptv_language"><?php esc_html_e( 'Language' ); ?></label>
-                        <input type="text" id="wptv_language" name="wptv_language" value="" />
+                        <input type="text" id="wptv_language" name="wptv_language" value="<?php echo esc_attr( wp_unslash( $_GET['wptv_language'] ?? '' ) ); ?>" />
                     </p>
 
                     <div class="cats">
-                        <label for="wptv_categories"><?php esc_html_e( 'Category' ); ?></label>
+                        <label for="post_category"><?php esc_html_e( 'Category' ); ?></label>
                         <ul class="cats-checkboxes">
                             <?php
                             include_once( ABSPATH . '/wp-admin/includes/template.php' );
-                            wp_category_checklist();
+                            $selected_cats = false;
+                            if ( isset( $_GET['post_category'] ) ) {
+                                $selected_cats = array_map( 'intval', $_GET['post_category'] );
+                            }
+                            wp_category_checklist( 0, 0, $selected_cats, false, null, false );
                             ?>
                         </ul>
@@ -304 +308 @@
                     <p>
                         <label for="wptv_producer_username"><?php esc_html_e( 'Producer WordPress.org Username' ); ?></label>
-                        <input type="text" id="wptv_producer_username" name="wptv_producer_username" value="" />
+                        <input type="text" id="wptv_producer_username" name="wptv_producer_username" value="<?php echo esc_attr( wp_unslash( $_GET['wptv_producer_username'] ?? '' ) ); ?>" />
                     </p>
                     <p>
                         <label for="wptv_speakers"><?php esc_html_e( 'Speakers' ); ?></label>
-                        <input type="text" id="wptv_speakers" name="wptv_speakers" value="" />
+                        <input type="text" id="wptv_speakers" name="wptv_speakers" value="<?php echo esc_attr( wp_unslash( $_GET['wptv_speakers'] ?? '' ) ); ?>" />
                     </p>
                     <p>
                         <label for="wptv_event"><?php esc_html_e( 'Event' ); ?></label>
-                        <input type="text" id="wptv_event" name="wptv_event" value="" />
+                        <input type="text" id="wptv_event" name="wptv_event" value="<?php echo esc_attr( wp_unslash( $_GET['wptv_event'] ?? '' ) ); ?>" />
                     </p>
                     <p>
                         <label for="wptv_video_description"><?php esc_html_e( 'Description' ); ?></label>
-                        <textarea name="wptv_video_description" id="wptv_video_description" rows="8" cols="40"></textarea>
+                        <textarea name="wptv_video_description" id="wptv_video_description" rows="8" cols="40"><?php echo esc_textarea( wp_unslash( $_GET['wptv_video_description'] ?? '' ) ); ?></textarea>
                     </p>
                     <p>
                         <label for="wptv_slides_url"><?php esc_html_e( 'Slides URL' ); ?></label>
-                        <input type="text" name="wptv_slides_url" id="wptv_slides_url" value="" />
+                        <input type="text" name="wptv_slides_url" id="wptv_slides_url" value="<?php echo esc_attr( wp_unslash( $_GET['wptv_slides_url'] ?? '' ) ); ?>" />
                     </p>
                     <p>

sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv2/plugins/wordpresstv-anon-upload/anon-upload.php

@@ -24 +24 @@
             }
 
-            $redir = home_url( 'submit-video' );
+            $redir = home_url( '/submit-video/' );
+
+            // Fields to prefill
+            $keep_fields = array(
+                'wptv_video_wordcamp',
+                'wptv_uploaded_by',
+                'wptv_email',
+                'wptv_language',
+                'post_category', // 'wptv_categories',
+                'wptv_producer_username',
+                'wptv_event',
+            );
 
             if ( $this->success ) {
@@ -30 +41 @@
             } elseif ( $this->errors ) {
                 $redir = add_query_arg( array( 'error' => $this->errors ), $redir );
+
+                // Video upload failed, include the video-specific fields in pre-fill.
+                $keep_fields[] = 'wptv_video_title';
+                $keep_fields[] = 'wptv_speakers';
+                $keep_fields[] = 'wptv_video_description';
+                $keep_fields[] = 'wptv_slides_url';
+
             } else {
+                $keep_fields = array();
                 $redir = add_query_arg( array( 'error' => 5 ), $redir );
+            }
+
+            // Keep some fields.
+            if ( $keep_fields ) {
+                $redir = add_query_arg(
+                    urlencode_deep(
+                        array_intersect_key(
+                            $_POST,
+                            array_flip( $keep_fields )
+                        )
+                    ),
+                    $redir
+                );
             }