Changeset 1724

Timestamp:

07/10/2015 08:32:01 PM (11 years ago)

Author:

iandunn

Message:

WordPress.tv: Give credit to video producers.

Fixes #986
Props BrashRebel

Location:

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

Files:

• anon-upload-template.php (modified) (4 diffs)
• functions.php (modified) (2 diffs)
• plugins/wordpresstv-anon-upload/anon-upload.php (modified) (8 diffs)
• sidebar-single.php (modified) (1 diff)

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

@@ -62 +62 @@
     .video-upload p {
         margin: 16px 0;
+        overflow: auto;
     }
 
@@ -174 +175 @@
         case 1:
             $message = 'Error: pleas select a video file.';
+            // todo fix all the 'pleas' typos
             break;
         case 2:
@@ -202 +204 @@
         case 13:
             $message = "Error: please leave the first field empty. (It helps us know you're not a spammer.)";
+            break;
+        case 14:
+            $message = "Error: please enter a valid WordPress.org username for the producer, or leave the field empty.";
             break;
     }
@@ -303 +308 @@
 
     <p>
-        <label for="wptv_video_producer"><?php esc_html_e( 'Video producer' ); ?></label>
-        <input type="text" id="wptv_video_producer" name="wptv_video_producer" value="" />
+        <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="" />
     </p>
     <p>

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

@@ -77 +77 @@
             'args'     => array( 'orderby' => 'term_order' ),
             'rewrite'  => array( 'slug' => 'producer' ),
+        ) );
+
+        register_taxonomy( 'producer-username', array( 'post' ), array(
+            'label'    => __( 'Producer Username', 'wptv' ),
+            'template' => __( 'Producer: %l.', 'wptv' ),
+            'helps'    => __( 'Separate producer usernames with commas.', 'wptv' ),
+            'sort'     => true,
+            'args'     => array( 'orderby' => 'term_order' ),
+            'rewrite'  => array( 'slug' => 'producer-username' ),
         ) );
 
@@ -819 +828 @@
 }
 add_filter( 'get_the_excerpt', 'wptv_excerpt_slides' );
+
+/**
+ * Checks if the given username exists on WordPress.org
+ *
+ * grav-redirect.php will redirect to a Gravatar image URL. If the WordPress.org username exists, the `d` parameter
+ * will be 'retro', and if it doesn't it'll be 'mm'.
+ *
+ * @param string $username
+ *
+ * @return bool
+ */
+function wporg_username_exists( $username ) {
+    $username_exists = false;
+    $validator_url   = add_query_arg( 'user', $username, 'https://wordpress.org/grav-redirect.php' );
+    $response        = wp_remote_retrieve_headers( wp_remote_get( $validator_url, array( 'redirection' => 0 ) ) );
+
+    if ( array_key_exists( 'location', $response ) ) {
+        if ( false === strpos( $response['location'], 'd=mm' ) ) {
+            $username_exists = true;
+        }
+    }
+
+    return $username_exists;
+}

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

@@ -48 +48 @@
         $text_fields = array(
             'wptv_video_title',
-            'wptv_video_producer',
+            'wptv_producer_username',
             'wptv_speakers',
             'wptv_event',
@@ -61 +61 @@
 
             return $this->error( 13 );
+        }
+
+        if ( ! empty( $_POST['wptv_producer_username'] ) && ! wporg_username_exists( $_POST['wptv_producer_username'] ) ) {
+            return $this->error( 14 );
         }
 
@@ -260 +264 @@
 
         $video_title    = $this->sanitize_text( $_posted['wptv_video_title'] );
-        $video_producer = $this->sanitize_text( $_posted['wptv_video_producer'] );
+        $producer_username = $this->sanitize_text( $_posted['wptv_producer_username'] );
         $speakers       = $this->sanitize_text( $_posted['wptv_speakers'] );
         $event          = $this->sanitize_text( $_posted['wptv_event'] );
@@ -267 +271 @@
         $slides         = $this->sanitize_text( $_posted['wptv_slides_url'] );
         $ip             = $_SERVER['REMOTE_ADDR'];
+        // todo realign in separate commit
 
         $categories = '';
@@ -283 +288 @@
             'submitted_email' => $anon_author_email,
             'title'           => $video_title,
-            'producer'        => $video_producer,
+            'producer_username' => $producer_username,
             'speakers'        => $speakers,
             'event'           => $event,
@@ -291 +296 @@
             'slides'          => $slides,
             'ip'              => $ip,
+            // todo realign in separate commit
         );
 
@@ -325 +331 @@
         $embed_args['post_id'] = $meta['attachment_id'];
 
-        // Add slides index to meta (necessary for posts that were uploaded before the field was added)
-        if ( ! array_key_exists( 'slides', $meta ) ) {
-            $meta['slides'] = '';
+        // Add missing indexes to $meta (necessary for posts that were uploaded before the fields were added)
+        $new_fields = array( 'slides', 'producer_username' );
+        foreach ( $new_fields as $field ) {
+            if ( ! array_key_exists( $field, $meta ) ) {
+                $meta[ $field ] = '';
+            }
         }
 
@@ -461 +470 @@
 
                     <div class="row">
-                        <p class="label">Producer:</p>
-                        <p class="data">
-                            <input type="text" value="<?php echo esc_attr( $meta['producer'] ); ?>"/>
-                            <a class="button-secondary anon-approve" href="#new-tag-producer">Approve</a>
+                        <p class="label">Producer WordPress.org Username:</p>
+
+                        <p class="data">
+                            <input type="text" value="<?php echo esc_attr( $meta['producer_username'] ); ?>"/>
+                            <a class="button-secondary anon-approve" href="#new-tag-producer-username">Approve</a>
                         </p>
                     </div>

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

@@ -82 +82 @@
                     }
                 }
+
+            /*
+             * Credit video producer with link to their WordPress.org profile
+             *
+             * In most cases we'll either have the producer name, or the username, but not both.
+             */
+            $producer_name     = get_the_terms( get_the_ID(), 'producer' );
+            $producer_username = get_the_terms( get_the_ID(), 'producer-username' );
             ?>
+
+            <?php if ( $producer_name || $producer_username ) : ?>
+                <h5>Producer</h5>
+
+                <div class="video-producer">
+                    <?php if ( $producer_username ) : ?>
+
+                        <a href="<?php echo esc_url( 'https://profiles.wordpress.org/' . rawurlencode( $producer_username[0]->name ) ); ?>">
+                            <?php if ( $producer_name ) : ?>
+                                <?php echo esc_html( $producer_name[0]->name ); ?>
+                            <?php else : ?>
+                                <?php echo esc_html( $producer_username[0]->name ); ?>
+                            <?php endif; ?>
+                        </a>
+
+                    <?php else : ?>
+
+                        <a href="<?php echo esc_url( get_term_link( $producer_name[0] ) ); ?>">
+                            <?php echo esc_html( $producer_name[0]->name ); ?>
+                        </a>
+
+                    <?php endif; ?>
+                </div>
+            <?php endif; ?>
+
 </div><!-- .secondary-content -->