Index: anon-upload-template.php =================================================================== --- anon-upload-template.php (revision 7134) +++ anon-upload-template.php (working copy) @@ -61,6 +61,7 @@ .video-upload p { margin: 16px 0; + overflow: auto; } .video-upload h3 { @@ -214,6 +215,9 @@ 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; } $message = '

' . $message . '

'; } elseif ( !empty($_REQUEST['success']) ) { @@ -314,8 +318,8 @@

- - + +

Index: functions.php =================================================================== --- functions.php (revision 7133) +++ functions.php (working copy) @@ -164,6 +164,7 @@ global $post; $slides_url = get_post_meta( $post->ID, '_wptv_slides_url', true ); + $producer_username = get_post_meta( $post->ID, '_wptv_producer_username', true ); wp_nonce_field( 'edit-video-info', 'video_info_metabox_nonce' ); ?> @@ -173,6 +174,10 @@

+

+ + +

0 ) ) ); + + if ( array_key_exists( 'location', $response ) ) { + if ( false === strpos( $response['location'], 'd=mm' ) ) { + $username_exists = true; + } + } + + return $username_exists; +} + +// todo temp +function test_wporg_username_exists() { + $valid_usernames = array( 'iandunn', 'iandunn-CapitalTest', 'Ian Dunn Space Capital Test', 'kovshenin', '.EXTRATER.', '_Skyn3t_' ); + $invalid_usernames = array( '', 252342, 'sfjj2fasdfaef', '#@(@%%@#&*(*&(', '.;.;.;' ); + + foreach ( $valid_usernames as $username ) { + printf( "

Valid username %s was marked as %s

", $username, wporg_username_exists( $username ) ? 'valid' : 'invalid' ); + } + + foreach ( $invalid_usernames as $username ) { + printf( "

Invalid username %s was marked as %s

", $username, wporg_username_exists( $username ) ? 'valid' : 'invalid' ); + } +} +//test_wporg_username_exists(); Index: plugins/wordpresstv-anon-upload/anon-upload.php =================================================================== --- plugins/wordpresstv-anon-upload/anon-upload.php (revision 7134) +++ plugins/wordpresstv-anon-upload/anon-upload.php (working copy) @@ -47,7 +47,7 @@ function validate() { $text_fields = array( 'wptv_video_title', - 'wptv_video_producer', + 'wptv_producer_username', 'wptv_speakers', 'wptv_event', 'wptv_slides_url' @@ -62,6 +62,10 @@ return $this->error( 13 ); } + if ( empty( $_POST['wptv_producer_username'] ) || ! wporg_username_exists( $_POST['wptv_producer_username'] ) ) { + return $this->error( 14 ); + } + if ( ! is_user_logged_in() ) { if ( empty( $_POST['wptv_uploaded_by'] ) ) { return $this->error( 10 ); @@ -259,7 +263,7 @@ } $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'] ); $description = $this->sanitize_text( $_posted['wptv_video_description'], false ); @@ -266,6 +270,7 @@ $language = $this->sanitize_text( $_posted['wptv_language'] ); $slides = $this->sanitize_text( $_posted['wptv_slides_url'] ); $ip = $_SERVER['REMOTE_ADDR']; + // todo re-align after this commit $categories = ''; if ( ! empty( $_posted['post_category'] ) && is_array( $_posted['post_category'] ) ) { @@ -282,7 +287,7 @@ 'submitted_by' => $anon_author, 'submitted_email' => $anon_author_email, 'title' => $video_title, - 'producer' => $video_producer, + 'producer_username' => $producer_username, 'speakers' => $speakers, 'event' => $event, 'language' => $language, @@ -290,6 +295,7 @@ 'description' => $description, 'slides' => $slides, 'ip' => $ip, + // todo re-align after this commit ); $post_meta['video_guid'] = $video_data->guid; @@ -324,9 +330,12 @@ $embed_args['blog_id'] = get_current_blog_id(); $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' ); // todo username should be taxonomy like producer name, rather than meta + foreach ( $new_fields as $field ) { + if ( ! array_key_exists( $field, $meta ) ) { + $meta[ $field ] = ''; + } } ?> @@ -460,10 +469,11 @@
-

Producer:

+

Producer WordPress.org Username:

+

- - Approve + + Approve

@@ -528,6 +538,8 @@ if (id.indexOf('#new-tag-') != -1) { el.val(target.siblings('input[type="text"]').val()); el.siblings('.tagadd').click(); + } else if ('#title' == id || '#wptv-producer-username' == id) { + el.val(target.siblings('input[type="text"]').val()); } else if ('#title' == id || '#wptv-slides-url' == id) { el.val(target.siblings('input[type="text"]').val()); } else if (id == '#excerpt') { Index: sidebar-single.php =================================================================== --- sidebar-single.php (revision 7133) +++ sidebar-single.php (working copy) @@ -81,5 +81,40 @@ printf( 'Subtitle this video →', esc_url( add_query_arg( 'video', $video->post_id, home_url( 'subtitle/' ) ) ) ); } } + + /* + * 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_username = get_post_meta( get_the_ID(), '_wptv_producer_username', true ); + + if ( $producer_name = get_the_terms( get_the_ID(), 'producer' ) ) { + if ( ! is_wp_error( $producer_name ) && ! empty( $producer_name[0]->name ) ) { + $producer_name = $producer_name[0]->name; + } else { + $producer_name = false; + } + } + ?> + + +
Producer
+ +
+ + + + + + + + + + + +
+ +