Changeset 10468

Timestamp:

11/25/2020 07:28:26 AM (4 years ago)

Author:

dd32

Message:

WordPress.tv: Split the big Category section into Date Recorded, Location, and Category.

The category section now excludes the Year & Location categories, which makes it easier to grok and select categories.

The year category is now not visible on the submit page, but set on the backend based on the date recorded option.

Location:

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

Files:

• anon-upload-template.php (modified) (6 diffs)
• plugins/wordpresstv-anon-upload/anon-upload.php (modified) (5 diffs)

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

@@ -110 +110 @@
             height: 150px;
             overflow: auto;
+            margin-top: 4px;
         }
 
@@ -211 +212 @@
             $message = "Error: please enter a valid WordPress.org username for the producer, or leave the field empty.";
             break;
+        case 15:
+            $message = 'Error: form nonce was missing or invalid.';
+            break;
     }
     $message = '<div class="error"><p>' . $message . '</p></div>';
 } elseif ( !empty($_REQUEST['success']) ) {
     $message = '<div class="success"> <p>Thank you for submitting a video; it was uploaded successfully.</p> <p>Submit another?</p> </div>';
+}
+
+$selected_cats = [];
+if ( isset( $_GET['post_category'] ) ) {
+    // [ selected Id => 0.. ]
+    $selected_cats = array_flip( array_map( 'intval', $_GET['post_category'] ) );
 }
 
@@ -304 +314 @@
                     </p>
 
+                    <div class="location">
+                        <label for="wptv_location"><?php esc_html_e( 'Location' ); ?></label>
+                        <ul class="cats-checkboxes">
+                            <?php
+
+                            foreach ( get_categories( [
+                                'parent'     => get_term_by( 'slug', 'location', 'category' )->term_id,
+                                'hide_empty' => false,
+                            ] ) as $term ) {
+                                printf(
+                                    '<li id="category-%1$d"><label class="selectit"><input value="%1$d" type="checkbox" name="post_category[]" id="in-category-%1$d" %2$s> %3$s</label></li>',
+                                    $term->term_id,
+                                    isset( $selected_cats[ $term->term_id ] ) ? 'checked="checked" ' : '',
+                                    $term->name,
+                                );
+                            }
+                            ?>
+                        </ul>
+                    </div>
+
                     <div class="cats">
                         <label for="post_category"><?php esc_html_e( 'Category' ); ?></label>
                         <ul class="cats-checkboxes">
                             <?php
-                            include_once( ABSPATH . '/wp-admin/includes/template.php' );
-                            $selected_cats = false;
-                            if ( isset( $_GET['post_category'] ) ) {
-                                $selected_cats = array_map( 'intval', $_GET['post_category'] );
+                            foreach ( get_categories( [
+                                'exclude_tree' => [
+                                    get_term_by( 'slug', 'location', 'category' )->term_id,
+                                    get_term_by( 'slug', 'year', 'category' )->term_id,
+                                ],
+                                'parent'       => 0,
+                                'hide_empty'   => false,
+                            ] ) as $term ) {
+                                printf(
+                                    '<li id="category-%1$d"><label class="selectit"><input value="%1$d" type="checkbox" name="post_category[]" id="in-category-%1$d" %2$s> %3$s</label></li>',
+                                    $term->term_id,
+                                    isset( $selected_cats[ $term->term_id ] ) ? 'checked="checked" ' : '',
+                                    $term->name,
+                                );
                             }
-                            wp_category_checklist( 0, 0, $selected_cats, false, null, false );
                             ?>
                         </ul>
@@ -373 +412 @@
             $( 'ul.cats-checkboxes input' ).prop( 'disabled', false );
 
-            $( '#wptv_video_wordcamp, ul.cats-checkboxes input' ).on( 'change', function() {
+            // Float selected items to the start.
+            $( '.location ul.cats-checkboxes, .cats ul.cats-checkboxes' ).each( function() {
+                var list = $(this),
+                    selected = list.find( 'input:checked, #in-category-2648' ); // checked & World-Wide-Web
+
+                selected.each( function() {
+                    var li = $(this).parents( 'li' );
+                    li.remove();
+                    list.prepend( li );
+                } );
+            } );
+
+            // Generate the Event Name
+            $( '#wptv_video_wordcamp, .location ul.cats-checkboxes input, .cats ul.cats-checkboxes input, #wptv_date' ).on( 'change', function() {
                 if ( $( '#wptv_event' ).data('user-altered') ) {
                     return;
@@ -380 +432 @@
                 var title = '';
                 // Get the Location
-                title += $( '#category-6418 ul.children input:checked' ).parent().text().trim() + " ";
+                title += $( '.location input:checked' ).parent().text().trim() + " ";
 
                 // .. and the Year
-                title += $( '#category-91093 ul.children input:checked' ).parent().text().trim();
+                title += $( '#wptv_date' ).value.substring( 0, 4 );
 
                 // If a location or year has been selected, build the Event Name.
@@ -410 +462 @@
             });
 
-            // Pre-select the date category.
-            $( '#wptv_date' ).on( 'change', function() {
-                var year = parseInt( this.value.substring( 0, 4 ) );
-
-                // Blank the year selections.
-                $( '#category-91093 ul.children input' ).prop( 'checked', false );
-
-                // Check the year
-                $( '#category-91093 ul.children input' ).filter( function() {
-                    return parseInt( $(this).parent().text() ) === year;
-                } ).prop( 'checked', true )
-            } );
+            $( '#wptv_video_wordcamp' ).on( 'change', function() {
+                // WordCampTV cat
+                $( '#in-category-12784353' ).prop( 'checked', $( this ).prop( 'checked' ) );
+            });
 
             $( '#video-upload-form' ).submit( function( e ) {

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

@@ -11 +11 @@
         $this->drafts_author = apply_filters( 'wptv_drafts_author_id', $this->drafts_author );  // this is filterable in order to support local development
 
-        add_action( 'admin_post_wptv_video_upload', array( &$this, 'init' ) );
-        add_action( 'admin_post_nopriv_wptv_video_upload', array( &$this, 'init' ) );
-        add_action( 'dbx_post_sidebar', array( &$this, 'display' ) );
+        add_action( 'admin_post_wptv_video_upload', array( $this, 'init' ) );
+        add_action( 'admin_post_nopriv_wptv_video_upload', array( $this, 'init' ) );
+        add_action( 'dbx_post_sidebar', array( $this, 'display' ) );
     }
 
     function init() {
-        if ( ! empty( $_POST['wptvvideon'] ) && wp_verify_nonce( $_POST['wptvvideon'], 'wptv-upload-video' ) ) {
+        $redir = home_url( '/submit-video/' );
+
+        if (
+            empty( $_POST['wptvvideon'] ) ||
+            (
+                empty( $_POST['wptv_uploaded_by'] ) &&
+                ! wp_verify_nonce( $_POST['wptvvideon'], 'wptv-upload-video' )
+            )
+        ) {
+            $this->errors = 15; /* no-nonce / invalid nonce */
+        } else {
             $this->validate();
 
@@ -23 +33 @@
                 $this->success = $this->save();
             }
-
-            $redir = home_url( '/submit-video/' );
-
-            // Fields to prefill
-            $keep_fields = array(
-                'wptv_video_wordcamp',
-                'wptv_uploaded_by',
-                'wptv_email',
-                'wptv_language',
-                'wptv_date',
-                'post_category', // 'wptv_categories',
-                'wptv_producer_username',
-                'wptv_event',
+        }
+
+        // Fields to prefill
+        $keep_fields = array(
+            'wptv_video_wordcamp',
+            'wptv_uploaded_by',
+            'wptv_email',
+            'wptv_language',
+            'wptv_date',
+            'post_category', // 'wptv_categories',
+            'wptv_producer_username',
+            'wptv_event',
+        );
+
+        if ( $this->success ) {
+            $redir = add_query_arg( array( 'success' => 1 ), $redir );
+        } 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
             );
-
-            if ( $this->success ) {
-                $redir = add_query_arg( array( 'success' => 1 ), $redir );
-            } 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
-                );
-            }
-
-            wp_redirect( $redir );
-        } else {
-            // no nonce, send them "home"?
-            wp_redirect( home_url() );
-        }
-
+        }
+
+        wp_redirect( $redir );
         exit;
     }
@@ -305 +309 @@
         $language          = $this->sanitize_text( $_posted['wptv_language'] );
         $slides            = $this->sanitize_text( $_posted['wptv_slides_url'] );
-        $recorded          = $this->sanitize_tett( $_posted['wptv_date'] );
+        $recorded          = $this->sanitize_text( $_posted['wptv_date'] ); // yyyy-mm-dd
         $ip                = $_SERVER['REMOTE_ADDR'];
 
@@ -315 +319 @@
                     $categories .= "$cat,";
                 }
+            }
+        }
+
+        // Add the year category.
+        if ( $recorded ) {
+            $year = substr( $recorded, 0, 4 );
+            if ( $term = get_term_by( 'name', $year, 'category' ) ) {
+                $categories .= $term->term_id;
             }
         }
@@ -481 +493 @@
                         <p class="data">
                             <input type="text" value="<?php echo esc_attr( $meta['recorded'] ); ?>"/>
+                            <?php
+                                // Find the year cat
+                                $cat = get_term_by( 'name', substr( $meta['recorded'], 0, 4 ), 'category' );
+                                if ( $cat ) {
+                                    echo '<a href="#in-category-' . $cat->term_id . '" class="button-secondary anon-approve anon-cat-link" title="Click to approve">Approve</a>';
+                                }
+                            ?>
+                            
                         </p>
                     </div>