diff --git a/.gitignore b/.gitignore index 485dee64..53279ea5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .idea +log diff --git a/assets/css/admin.css b/assets/css/admin.css index a243cb49..31673c66 100644 --- a/assets/css/admin.css +++ b/assets/css/admin.css @@ -72,4 +72,12 @@ textarea#episode_embed_code { .ssp-episode-details-label { font-weight: bold; +} + +#series_image_preview { + max-width: 160px; +} + +#series_upload_image_button .dashicons { + vertical-align: middle; } \ No newline at end of file diff --git a/assets/css/admin.min.css b/assets/css/admin.min.css index 517efafc..65ba70cf 100644 --- a/assets/css/admin.min.css +++ b/assets/css/admin.min.css @@ -1 +1 @@ -#dashboard_right_now a.podcast-count:before,#dashboard_right_now span.podcast-count:before{content:"\f482"}.feed-series-list-container{margin-top:8px}#feed-series-toggle{cursor:pointer;float:left;margin-top:5px;color:#aaa}#feed-series-toggle:hover{color:#777}#feed-series-toggle:before{font-family:dashicons;font-size:150%}#feed-series-toggle.series-open:before{content:"\f142"}#feed-series-toggle.series-closed:before{content:"\f140"}#feed-series-list{margin:0}.view-feed-link{text-decoration:none}.view-feed-link span{font-size:100%;margin-top:2px;margin-bottom:-2px}#podcast_settings .update-nag{margin:0;padding:1px 9pt}textarea#episode_embed_code{width:100%;height:60px}.episode_embed_code_size_option{width:50px}#podcast-episode-data p{line-height:1.8}#podcast-episode-data input[type="radio"]{vertical-align:middle !important}#podcast-episode-data input[type="text"]{min-width:50%}.ssp-episode-details-label{font-weight:bold} \ No newline at end of file +#dashboard_right_now a.podcast-count:before,#dashboard_right_now span.podcast-count:before{content:"\f482"}.feed-series-list-container{margin-top:8px}#feed-series-toggle{cursor:pointer;float:left;margin-top:5px;color:#aaa}#feed-series-toggle:hover{color:#777}#feed-series-toggle:before{font-family:dashicons;font-size:150%}#feed-series-toggle.series-open:before{content:"\f142"}#feed-series-toggle.series-closed:before{content:"\f140"}#feed-series-list{margin:0}.view-feed-link{text-decoration:none}.view-feed-link span{font-size:100%;margin-top:2px;margin-bottom:-2px}#podcast_settings .update-nag{margin:0;padding:1px 9pt}textarea#episode_embed_code{width:100%;height:60px}.episode_embed_code_size_option{width:50px}#podcast-episode-data p{line-height:1.8}#podcast-episode-data input[type="radio"]{vertical-align:middle !important}#podcast-episode-data input[type="text"]{min-width:50%}.ssp-episode-details-label{font-weight:bold}#series_image_preview{max-width:160px}#series_upload_image_button .dashicons{vertical-align:middle} \ No newline at end of file diff --git a/assets/images/no-image.png b/assets/images/no-image.png new file mode 100644 index 00000000..a6bc908c Binary files /dev/null and b/assets/images/no-image.png differ diff --git a/assets/js/admin.js b/assets/js/admin.js index 7c2024f8..1481cde5 100644 --- a/assets/js/admin.js +++ b/assets/js/admin.js @@ -1,7 +1,7 @@ jQuery(document).ready(function($) { // Uploading files - var file_frame; + var file_frame, series_img_frame; jQuery.fn.ssp_upload_media_file = function( button, preview_media ) { var button_id = button.attr('id'); @@ -41,6 +41,63 @@ jQuery(document).ready(function($) { file_frame.open(); }; + /* Add/Edit Series Image */ + jQuery('#series_upload_image_button').click(function( event ){ + event.preventDefault(); + var send_attachment_bkp = wp.media.editor.send.attachment; + var button = $(this); + var button_id = button.attr('id'); + var preview_id = button_id.replace( '_upload', '' ).replace( '_button', '_preview' ); + var field_id = button_id.replace( '_upload', '' ).replace( '_button', '_id' ); + + // If the media frame already exists, reopen it. + if ( series_img_frame ) { + series_img_frame.open(); + return; + } + + // Create the media frame. + series_img_frame = wp.media({ + title: jQuery( this ).data( 'uploader_title' ), + button: { + text: jQuery( this ).data( 'uploader_button_text' ), + }, + library: { + type: [ 'image' ] + }, + multiple: false + }); + + series_img_frame.on( 'select', function() { + // Get media attachment details from the frame state + var attachment = series_img_frame.state().get('selection').first().toJSON(); + + // Send the attachment URL to our custom image input field. + $('#' + preview_id).attr('src', attachment.url); + + // Send the attachment id to our hidden input + $('#' + field_id).val(attachment.id); + }); + + // Finally, open the modal on click + series_img_frame.open(); + }); + + /* Remove/clear Series Image */ + jQuery('#series_remove_image_button').click(function( event ){ + event.preventDefault(); + var button = $(this); + var button_id = button.attr('id'); + var preview_id = button_id.replace( '_remove', '' ).replace( '_button', '_preview' ); + var field_id = button_id.replace( '_remove', '' ).replace( '_button', '_id' ); + + if ( confirm('Are you sure?') ) { + var src = $('#' + preview_id).attr('data-src'); + $('#' + preview_id).attr('src', src); + $('#' + field_id).val(''); + } + }); + /* ADD/EDIT EPISODE */ jQuery('#upload_audio_file_button').click(function( event ){ diff --git a/assets/js/admin.min.js b/assets/js/admin.min.js index 1896c94f..cde69ca8 100644 --- a/assets/js/admin.min.js +++ b/assets/js/admin.min.js @@ -1 +1 @@ -jQuery(document).ready(function(b){var a;jQuery.fn.ssp_upload_media_file=function(e,d){var c=e.attr("id");var f=c.replace("_button","");var g=c.replace("_button","_preview");if(a){a.open();return}a=wp.media.frames.file_frame=wp.media({title:jQuery(this).data("uploader_title"),button:{text:jQuery(this).data("uploader_button_text")},multiple:false});console.log(a);a.on("select",function(){var h=a.state().get("selection").first().toJSON();console.log(h);jQuery("#"+f).val(h.url);if(d){jQuery("#"+g).attr("src",h.url)}});a.open()};jQuery("#upload_audio_file_button").click(function(c){c.preventDefault();jQuery.fn.ssp_upload_media_file(jQuery(this),false)});jQuery("#episode_embed_code").click(function(){jQuery(this).select()});jQuery(".episode_embed_code_size_option").change(function(){var e=jQuery("#episode_embed_code_width").val();var c=jQuery("#episode_embed_code_height").val();var d=jQuery("#post_ID").val();jQuery.post(ajaxurl,{action:"update_episode_embed_code",width:e,height:c,post_id:d},function(f){if(f){jQuery("#episode_embed_code").val(f);jQuery("#episode_embed_code").select()}})});jQuery(".ssp-datepicker").datepicker({changeMonth:true,changeYear:true,showAnim:"slideDown",dateFormat:"d MM, yy",altField:"#date_recorded",altFormat:"dd-mm-yy",onClose:function(g,f){var h=b.datepicker.parseDate("d MM, yy",g);var c=b.datepicker.formatDate("dd-mm-yy",h);var e=b(this).attr("id").replace("_display","");b("#"+e).val(c)}});jQuery(".ssp-datepicker").change(function(){var d=jQuery(this).val();if(!d){var e=jQuery(this).attr("id");var c=e.replace("_display","");jQuery("#"+c).val("")}});jQuery("#feed-series-toggle").click(function(c){if(jQuery(this).hasClass("series-open")){jQuery("#feed-series-list").slideUp("fast");jQuery(this).removeClass("series-open");jQuery(this).addClass("series-closed")}else{if(jQuery(this).hasClass("series-closed")){jQuery("#feed-series-list").slideDown("fast");jQuery(this).removeClass("series-closed");jQuery(this).addClass("series-open")}}});jQuery("#ss_podcasting_data_image_button").click(function(){jQuery.fn.ssp_upload_media_file(jQuery(this),true)});jQuery("#ss_podcasting_data_image_delete").click(function(){jQuery("#ss_podcasting_data_image").val("");jQuery("#ss_podcasting_data_image_preview").remove();return false})}); \ No newline at end of file +jQuery(document).ready(function(c){var b,a;jQuery.fn.ssp_upload_media_file=function(f,e){var d=f.attr("id");var g=d.replace("_button","");var h=d.replace("_button","_preview");if(b){b.open();return}b=wp.media.frames.file_frame=wp.media({title:jQuery(this).data("uploader_title"),button:{text:jQuery(this).data("uploader_button_text")},multiple:false});console.log(b);b.on("select",function(){var i=b.state().get("selection").first().toJSON();console.log(i);jQuery("#"+g).val(i.url);if(e){jQuery("#"+h).attr("src",i.url)}});b.open()};jQuery("#series_upload_image_button").click(function(h){h.preventDefault();var d=wp.media.editor.send.attachment;var f=c(this);var e=f.attr("id");var i=e.replace("_upload","").replace("_button","_preview");var g=e.replace("_upload","").replace("_button","_id");if(a){a.open();return}a=wp.media({title:jQuery(this).data("uploader_title"),button:{text:jQuery(this).data("uploader_button_text")},library:{type:["image"]},multiple:false});a.on("select",function(){var j=a.state().get("selection").first().toJSON();c("#"+i).attr("src",j.url);c("#"+g).val(j.id)});a.open()});jQuery("#series_remove_image_button").click(function(g){g.preventDefault();var e=c(this);var d=e.attr("id");var h=d.replace("_remove","").replace("_button","_preview");var f=d.replace("_remove","").replace("_button","_id");if(confirm("Are you sure?")){var i=c("#"+h).attr("data-src");c("#"+h).attr("src",i);c("#"+f).val("")}});jQuery("#upload_audio_file_button").click(function(d){d.preventDefault();jQuery.fn.ssp_upload_media_file(jQuery(this),false)});jQuery("#episode_embed_code").click(function(){jQuery(this).select()});jQuery(".episode_embed_code_size_option").change(function(){var f=jQuery("#episode_embed_code_width").val();var d=jQuery("#episode_embed_code_height").val();var e=jQuery("#post_ID").val();jQuery.post(ajaxurl,{action:"update_episode_embed_code",width:f,height:d,post_id:e},function(g){if(g){jQuery("#episode_embed_code").val(g);jQuery("#episode_embed_code").select()}})});jQuery(".ssp-datepicker").datepicker({changeMonth:true,changeYear:true,showAnim:"slideDown",dateFormat:"d MM, yy",altField:"#date_recorded",altFormat:"dd-mm-yy",onClose:function(h,g){var i=c.datepicker.parseDate("d MM, yy",h);var e=c.datepicker.formatDate("dd-mm-yy",i);var f=c(this).attr("id").replace("_display","");c("#"+f).val(e)}});jQuery(".ssp-datepicker").change(function(){var e=jQuery(this).val();if(!e){var f=jQuery(this).attr("id");var d=f.replace("_display","");jQuery("#"+d).val("")}});jQuery("#feed-series-toggle").click(function(d){if(jQuery(this).hasClass("series-open")){jQuery("#feed-series-list").slideUp("fast");jQuery(this).removeClass("series-open");jQuery(this).addClass("series-closed")}else{if(jQuery(this).hasClass("series-closed")){jQuery("#feed-series-list").slideDown("fast");jQuery(this).removeClass("series-closed");jQuery(this).addClass("series-open")}}});jQuery("#ss_podcasting_data_image_button").click(function(){jQuery.fn.ssp_upload_media_file(jQuery(this),true)});jQuery("#ss_podcasting_data_image_delete").click(function(){jQuery("#ss_podcasting_data_image").val("");jQuery("#ss_podcasting_data_image_preview").remove();return false})}); \ No newline at end of file diff --git a/assets/js/fileupload.js b/assets/js/fileupload.js index a2ff96f7..20aba77b 100644 --- a/assets/js/fileupload.js +++ b/assets/js/fileupload.js @@ -39,6 +39,11 @@ jQuery( document ).ready( function ( $ ) { return isValid; } + function sanitizeName(name) { + var punctuationlessName = name.replace(/[,\/#!$%\^&\*;:{}=\-_`'~()+"|? ]/g," "); + return punctuationlessName.replace(/\s{1,}/g,"-"); + } + /** * Of the upload_credentials object isn't available */ @@ -47,9 +52,6 @@ jQuery( document ).ready( function ( $ ) { var bucket = upload_credentials.bucket; var show_slug = upload_credentials.show_slug; var episodes_url = upload_credentials.episodes_url; - var access_key_id = upload_credentials.access_key_id; - var policy = upload_credentials.policy; - var signature = upload_credentials.signature; /** * Creates instance of plupload @@ -61,15 +63,7 @@ jQuery( document ).ready( function ( $ ) { multi_selection: false, container: 'ssp_upload_container', url: 'https://' + bucket + '.s3.amazonaws.com:443/', - multipart_params: { - 'key': show_slug + '/${filename}', - 'Filename': show_slug + '/${filename}', - 'acl': 'public-read', - 'Content-Type': '', - 'AWSAccessKeyId': access_key_id, - 'policy': policy, - 'signature': signature - } + multipart_params: {} } ); /** @@ -98,6 +92,23 @@ jQuery( document ).ready( function ( $ ) { } } ); + /** + * Sanatizes the file name for upload + */ + uploader.bind('BeforeUpload', function (up, file) { + var file_name = sanitizeName(file.name); + var multipart_params = { + 'key': upload_credentials.show_slug + '/' + file_name, + 'Filename': upload_credentials.show_slug + '/' + file_name, + 'acl': 'public-read', + 'Content-Type': '', + 'AWSAccessKeyId': upload_credentials.access_key_id, + 'policy': upload_credentials.policy, + 'signature': upload_credentials.signature + } + uploader.settings.multipart_params = multipart_params; + }); + /** * Show an error if anything goes wrong */ @@ -121,10 +132,11 @@ jQuery( document ).ready( function ( $ ) { // we're only expecting one file to be uploaded var file = files[ 0 ]; + var file_name = sanitizeName(file.name); var filesize_raw = file.size; var file_size = plupload.formatSize(file.size); - var uploaded_file = 'https://s3.amazonaws.com/' + bucket + '/' + show_slug + '/' + file.name; - var episode_file = episodes_url + show_slug + '/' + file.name; + var uploaded_file = 'https://s3.amazonaws.com/' + bucket + '/' + show_slug + '/' + file_name; + var episode_file = episodes_url + show_slug + '/' + file_name; // push podmotor_file_path to wp_ajax_ssp_store_podmotor_file $.ajax( { diff --git a/assets/js/fileupload.min.js b/assets/js/fileupload.min.js index 5de5caab..d46a583a 100644 --- a/assets/js/fileupload.min.js +++ b/assets/js/fileupload.min.js @@ -1 +1 @@ -jQuery(document).ready(function(d){function h(l){d(".peek-a-bar").hide().remove();var k=new d.peekABar({padding:"1em",animation:{type:"fade",duration:1000},cssClass:"ssp-notification-bar",backgroundColor:"#4aa3df"});k.show({html:l})}function a(l){var k=l.type;var m=k.split("/");var n=false;if("audio"==m[0]||"video"==m[0]){n=true}return n}if(typeof upload_credentials!="undefined"){var b=upload_credentials.bucket;var i=upload_credentials.show_slug;var f=upload_credentials.episodes_url;var j=upload_credentials.access_key_id;var g=upload_credentials.policy;var c=upload_credentials.signature;var e=new plupload.Uploader({runtimes:"html5",browse_button:"ssp_select_file",multi_selection:false,container:"ssp_upload_container",url:"https://"+b+".s3.amazonaws.com:443/",multipart_params:{key:i+"/${filename}",Filename:i+"/${filename}",acl:"public-read","Content-Type":"",AWSAccessKeyId:j,policy:g,signature:c}});e.init();e.bind("Init",function(){d("#ssp_upload_notification").remove()});e.bind("FilesAdded",function(k,m){var l=m[0];if(a(l)){h('Uploading file to Castos Hosting. You can continue editing this post while the file uploads. ');e.start()}else{h("You have selected an invalid file type, please select a valid audio or video file.")}});e.bind("Error",function(k,l){alert("Error #"+l.code+": "+l.message)});e.bind("UploadProgress",function(k,l){d("#ssp_upload_progress").html(l.percent+"%")});e.bind("UploadComplete",function(l,q){h("Processing Castos Hosting file.");var p=q[0];var n=p.size;var k=plupload.formatSize(p.size);var m="https://s3.amazonaws.com/"+b+"/"+i+"/"+p.name;var o=f+i+"/"+p.name;d.ajax({method:"GET",url:ajaxurl,data:{action:"ssp_store_podmotor_file",podmotor_file_path:m}}).done(function(r){if(r.status=="success"){h("Uploading file to Castos Hosting Complete.");d("#podmotor_file_id").val(r.file_id);d("#filesize_raw").val(n);d("#filesize").val(k);d("#duration").val(r.file_duration);d("#upload_audio_file").val(o);d(".peek-a-bar").fadeOut(5000)}else{h(r.message)}})})}}); \ No newline at end of file +jQuery(document).ready(function(e){function h(j){e(".peek-a-bar").hide().remove();var i=new e.peekABar({padding:"1em",animation:{type:"fade",duration:1000},cssClass:"ssp-notification-bar",backgroundColor:"#4aa3df"});i.show({html:j})}function d(j){var i=j.type;var k=i.split("/");var l=false;if("audio"==k[0]||"video"==k[0]){l=true}return l}function c(i){var j=i.replace(/[,\/#!$%\^&\*;:{}=\-_`'~()+"|? ]/g," ");return j.replace(/\s{1,}/g,"-")}if(typeof upload_credentials!="undefined"){var g=upload_credentials.bucket;var b=upload_credentials.show_slug;var a=upload_credentials.episodes_url;var f=new plupload.Uploader({runtimes:"html5",browse_button:"ssp_select_file",multi_selection:false,container:"ssp_upload_container",url:"https://"+g+".s3.amazonaws.com:443/",multipart_params:{}});f.init();f.bind("Init",function(){e("#ssp_upload_notification").remove()});f.bind("FilesAdded",function(i,k){var j=k[0];if(d(j)){h('Uploading file to Castos Hosting. You can continue editing this post while the file uploads. ');f.start()}else{h("You have selected an invalid file type, please select a valid audio or video file.")}});f.bind("BeforeUpload",function(j,k){var l=c(k.name);var i={key:upload_credentials.show_slug+"/"+l,Filename:upload_credentials.show_slug+"/"+l,acl:"public-read","Content-Type":"",AWSAccessKeyId:upload_credentials.access_key_id,policy:upload_credentials.policy,signature:upload_credentials.signature};f.settings.multipart_params=i});f.bind("Error",function(i,j){alert("Error #"+j.code+": "+j.message)});f.bind("UploadProgress",function(i,j){e("#ssp_upload_progress").html(j.percent+"%")});f.bind("UploadComplete",function(j,o){h("Processing Castos Hosting file.");var n=o[0];var p=c(n.name);var l=n.size;var i=plupload.formatSize(n.size);var k="https://s3.amazonaws.com/"+g+"/"+b+"/"+p;var m=a+b+"/"+p;e.ajax({method:"GET",url:ajaxurl,data:{action:"ssp_store_podmotor_file",podmotor_file_path:k}}).done(function(q){if(q.status=="success"){h("Uploading file to Castos Hosting Complete.");e("#podmotor_file_id").val(q.file_id);e("#filesize_raw").val(l);e("#filesize").val(i);e("#duration").val(q.file_duration);e("#upload_audio_file").val(m);e(".peek-a-bar").fadeOut(5000)}else{h(q.message)}})})}}); \ No newline at end of file diff --git a/includes/class-ssp-admin.php b/includes/class-ssp-admin.php index ee7a54a2..d34c0643 100644 --- a/includes/class-ssp-admin.php +++ b/includes/class-ssp-admin.php @@ -24,6 +24,18 @@ class SSP_Admin { private $home_url; private $script_suffix; + /** + * Unique identifier for the plugin. + * + * The variable name is used as the text domain when internationalizing strings of text. + * Its value should match the Text Domain file header in the main plugin file. + * + * @since 1.0.0 + * + * @var string + */ + protected $plugin_slug; + /** * Constructor * @@ -40,6 +52,7 @@ public function __construct( $file, $version ) { $this->template_path = trailingslashit( $this->dir ) . 'templates/'; $this->home_url = trailingslashit( home_url() ); $this->token = 'podcast'; + $this->plugin_slug = 'seriously-simple-podcasting'; $this->script_suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; @@ -93,6 +106,12 @@ public function __construct( $file, $version ) { add_filter( 'manage_edit-series_columns', array( $this, 'edit_series_columns' ) ); add_filter( 'manage_series_custom_column', array( $this, 'add_series_columns' ), 1, 3 ); + // Series term meta forms + add_action( 'series_add_form_fields', array( $this, 'add_series_term_meta_fields' ), 10, 2 ); + add_action( 'series_edit_form_fields', array( $this, 'edit_series_term_meta_fields'), 10, 2) ; + add_action( 'created_series', array( $this, 'save_series_meta'), 10, 2 ); + add_action( 'edited_series', array( $this, 'update_series_meta'), 10, 2 ); + // Dashboard widgets. add_filter( 'dashboard_glance_items', array( $this, 'glance_items' ), 10, 1 ); @@ -180,25 +199,25 @@ public function setup_permastruct() { public function register_post_type() { $labels = array( - 'name' => _x( 'Podcast', 'post type general name', 'seriously-simple-podcasting' ), - 'singular_name' => _x( 'Podcast', 'post type singular name', 'seriously-simple-podcasting' ), - 'add_new' => _x( 'Add New', 'podcast', 'seriously-simple-podcasting' ), - 'add_new_item' => sprintf( __( 'Add New %s', 'seriously-simple-podcasting' ), __( 'Episode', 'seriously-simple-podcasting' ) ), - 'edit_item' => sprintf( __( 'Edit %s', 'seriously-simple-podcasting' ), __( 'Episode', 'seriously-simple-podcasting' ) ), - 'new_item' => sprintf( __( 'New %s', 'seriously-simple-podcasting' ), __( 'Episode', 'seriously-simple-podcasting' ) ), - 'all_items' => sprintf( __( 'All %s', 'seriously-simple-podcasting' ), __( 'Episodes', 'seriously-simple-podcasting' ) ), - 'view_item' => sprintf( __( 'View %s', 'seriously-simple-podcasting' ), __( 'Episode', 'seriously-simple-podcasting' ) ), - 'search_items' => sprintf( __( 'Search %a', 'seriously-simple-podcasting' ), __( 'Episodes', 'seriously-simple-podcasting' ) ), - 'not_found' => sprintf( __( 'No %s Found', 'seriously-simple-podcasting' ), __( 'Episodes', 'seriously-simple-podcasting' ) ), - 'not_found_in_trash' => sprintf( __( 'No %s Found In Trash', 'seriously-simple-podcasting' ), __( 'Episodes', 'seriously-simple-podcasting' ) ), + 'name' => _x( 'Podcast', 'post type general name', $this->plugin_slug ), + 'singular_name' => _x( 'Podcast', 'post type singular name', $this->plugin_slug ), + 'add_new' => _x( 'Add New', 'podcast', $this->plugin_slug ), + 'add_new_item' => sprintf( __( 'Add New %s', $this->plugin_slug ), __( 'Episode', $this->plugin_slug ) ), + 'edit_item' => sprintf( __( 'Edit %s', $this->plugin_slug ), __( 'Episode', $this->plugin_slug ) ), + 'new_item' => sprintf( __( 'New %s', $this->plugin_slug ), __( 'Episode', $this->plugin_slug ) ), + 'all_items' => sprintf( __( 'All %s', $this->plugin_slug ), __( 'Episodes', $this->plugin_slug ) ), + 'view_item' => sprintf( __( 'View %s', $this->plugin_slug ), __( 'Episode', $this->plugin_slug ) ), + 'search_items' => sprintf( __( 'Search %a', $this->plugin_slug ), __( 'Episodes', $this->plugin_slug ) ), + 'not_found' => sprintf( __( 'No %s Found', $this->plugin_slug ), __( 'Episodes', $this->plugin_slug ) ), + 'not_found_in_trash' => sprintf( __( 'No %s Found In Trash', $this->plugin_slug ), __( 'Episodes', $this->plugin_slug ) ), 'parent_item_colon' => '', - 'menu_name' => __( 'Podcast', 'seriously-simple-podcasting' ), - 'filter_items_list' => sprintf( __( 'Filter %s list', 'seriously-simple-podcasting' ), __( 'Episode', 'seriously-simple-podcasting' ) ), - 'items_list_navigation' => sprintf( __( '%s list navigation', 'seriously-simple-podcasting' ), __( 'Episode', 'seriously-simple-podcasting' ) ), - 'items_list' => sprintf( __( '%s list', 'seriously-simple-podcasting' ), __( 'Episode', 'seriously-simple-podcasting' ) ), + 'menu_name' => __( 'Podcast', $this->plugin_slug ), + 'filter_items_list' => sprintf( __( 'Filter %s list', $this->plugin_slug ), __( 'Episode', $this->plugin_slug ) ), + 'items_list_navigation' => sprintf( __( '%s list navigation', $this->plugin_slug ), __( 'Episode', $this->plugin_slug ) ), + 'items_list' => sprintf( __( '%s list', $this->plugin_slug ), __( 'Episode', $this->plugin_slug ) ), ); - $slug = apply_filters( 'ssp_archive_slug', __( 'podcast', 'seriously-simple-podcasting' ) ); + $slug = apply_filters( 'ssp_archive_slug', __( 'podcast', $this->plugin_slug ) ); $args = array( 'labels' => $labels, @@ -247,25 +266,25 @@ private function register_taxonomies() { $podcast_post_types = ssp_post_types( true ); $series_labels = array( - 'name' => __( 'Podcast Series', 'seriously-simple-podcasting' ), - 'singular_name' => __( 'Series', 'seriously-simple-podcasting' ), - 'search_items' => __( 'Search Series', 'seriously-simple-podcasting' ), - 'all_items' => __( 'All Series', 'seriously-simple-podcasting' ), - 'parent_item' => __( 'Parent Series', 'seriously-simple-podcasting' ), - 'parent_item_colon' => __( 'Parent Series:', 'seriously-simple-podcasting' ), - 'edit_item' => __( 'Edit Series', 'seriously-simple-podcasting' ), - 'update_item' => __( 'Update Series', 'seriously-simple-podcasting' ), - 'add_new_item' => __( 'Add New Series', 'seriously-simple-podcasting' ), - 'new_item_name' => __( 'New Series Name', 'seriously-simple-podcasting' ), - 'menu_name' => __( 'Series', 'seriously-simple-podcasting' ), - 'view_item' => __( 'View Series', 'seriously-simple-podcasting' ), - 'popular_items' => __( 'Popular Series', 'seriously-simple-podcasting' ), - 'separate_items_with_commas' => __( 'Separate series with commas', 'seriously-simple-podcasting' ), - 'add_or_remove_items' => __( 'Add or remove Series', 'seriously-simple-podcasting' ), - 'choose_from_most_used' => __( 'Choose from the most used Series', 'seriously-simple-podcasting' ), - 'not_found' => __( 'No Series Found', 'seriously-simple-podcasting' ), - 'items_list_navigation' => __( 'Series list navigation', 'seriously-simple-podcasting' ), - 'items_list' => __( 'Series list', 'seriously-simple-podcasting' ), + 'name' => __( 'Podcast Series', $this->plugin_slug ), + 'singular_name' => __( 'Series', $this->plugin_slug ), + 'search_items' => __( 'Search Series', $this->plugin_slug ), + 'all_items' => __( 'All Series', $this->plugin_slug ), + 'parent_item' => __( 'Parent Series', $this->plugin_slug ), + 'parent_item_colon' => __( 'Parent Series:', $this->plugin_slug ), + 'edit_item' => __( 'Edit Series', $this->plugin_slug ), + 'update_item' => __( 'Update Series', $this->plugin_slug ), + 'add_new_item' => __( 'Add New Series', $this->plugin_slug ), + 'new_item_name' => __( 'New Series Name', $this->plugin_slug ), + 'menu_name' => __( 'Series', $this->plugin_slug ), + 'view_item' => __( 'View Series', $this->plugin_slug ), + 'popular_items' => __( 'Popular Series', $this->plugin_slug ), + 'separate_items_with_commas' => __( 'Separate series with commas', $this->plugin_slug ), + 'add_or_remove_items' => __( 'Add or remove Series', $this->plugin_slug ), + 'choose_from_most_used' => __( 'Choose from the most used Series', $this->plugin_slug ), + 'not_found' => __( 'No Series Found', $this->plugin_slug ), + 'items_list_navigation' => __( 'Series list navigation', $this->plugin_slug ), + 'items_list' => __( 'Series list', $this->plugin_slug ), ); $series_args = array( @@ -322,6 +341,106 @@ private function register_taxonomies() { } + /** + * Adds series term metaboxes to the new series form. + */ + public function add_series_term_meta_fields( $taxonomy ) { + // Add series image upload metabox. + $this->series_image_uploader( $taxonomy ); + } + + /** + * Adds series term metaboxes to the edit series form. + */ + public function edit_series_term_meta_fields( $term, $taxonomy ) { + // Add series image edit/upload metabox. + $this->series_image_uploader ( $taxonomy, $mode = 'UPDATE', $term = $term ); + } + + /** + * Series Image Uploader metabox for add/edit. + */ + public function series_image_uploader( $taxonomy, $mode = 'CREATE', $term = null ) { + $series_settings = $this->token . '_series_image_settings'; + // Define a default image. + $default_image = esc_url( $this->assets_url . 'images/no-image.png' ); + if ( $term !== null ) { + $media_id = get_term_meta( $term->term_id, $series_settings, true ); + } + $image_width = "auto"; + $image_height = "auto"; + + if ( $mode == 'UPDATE' && !empty( $media_id ) ) { + $image_attributes = wp_get_attachment_image_src( $media_id, array( $image_width, $image_height ) ); + $src = $image_attributes[0]; + } else { + $src = $default_image; + $media_id = ''; + } + + $series_img_title = __( 'Series Image', $this->plugin_slug ); + $upload_btn_text = __( 'Choose series image', $this->plugin_slug ); + $upload_btn_value = __( 'Add Image', $this->plugin_slug ); + $upload_btn_title = __( 'Choose an image file', $this->plugin_slug ); + $series_img_desc = __( "Set an image as the artwork for the series. No image will be set if not provided.", $this->plugin_slug); + + $series_img_form_label = <<{$series_img_title} +HTML; + + $series_img_form_fields = << +
+ + + +
+

{$series_img_desc}

+HTML; + + if ( $mode == 'CREATE' ) { + echo << + {$series_img_form_label} + {$series_img_form_fields} + +HTML; + } else if ( $mode == 'UPDATE' ) { + echo << + {$series_img_form_label} + + {$series_img_form_fields} + + +HTML; + } + } + + /** + * Hook to allow saving series meta data. + */ + public function save_series_meta( $term_id, $tt_id ) { + $this->insert_update_series_meta( $term_id, $tt_id ); + } + + /** + * Hook to allow updating the series meta data. + */ + public function update_series_meta( $term_id, $tt_id ) { + $this->insert_update_series_meta( $term_id, $tt_id ); + } + + /** + * Main method for saving or updating Series data. + */ + public function insert_update_series_meta( $term_id, $tt_id ) { + $series_settings = $this->token . '_series_image_settings'; + $prev_media_id = get_term_meta( $term_id, $series_settings, true ); + $media_id = sanitize_title( $_POST[$series_settings] ); + update_term_meta( $term_id, $series_settings, $media_id, $prev_media_id ); + } + public function register_meta() { global $wp_version; @@ -335,7 +454,7 @@ public function register_meta() { // Add 'filesize_raw' as this is not included in the displayed field options $fields['filesize_raw'] = array( - 'meta_description' => __( 'The raw file size of the podcast episode media file in bytes.', 'seriously-simple-podcasting' ), + 'meta_description' => __( 'The raw file size of the podcast episode media file in bytes.', $this->plugin_slug ), ); foreach ( $fields as $key => $data ) { @@ -361,8 +480,8 @@ public function register_meta() { */ public function register_custom_column_headings( $defaults ) { $new_columns = apply_filters( 'ssp_admin_columns_episodes', array( - 'series' => __( 'Series', 'seriously-simple-podcasting' ), - 'image' => __( 'Image', 'seriously-simple-podcasting' ), + 'series' => __( 'Series', $this->plugin_slug ), + 'image' => __( 'Image', $this->plugin_slug ), ) ); // remove date column @@ -405,7 +524,7 @@ public function register_custom_columns( $column_name, $id ) { } /** - * Register solumns for series list table + * Register columns for series list table * * @param array $columns Default columns * @@ -416,8 +535,9 @@ public function edit_series_columns( $columns ) { unset( $columns['description'] ); unset( $columns['posts'] ); - $columns['series_feed_url'] = __( 'Series feed URL', 'seriously-simple-podcasting' ); - $columns['posts'] = __( 'Episodes', 'seriously-simple-podcasting' ); + $columns['series_image'] = __( 'Series Image', $this->plugin_slug ); + $columns['series_feed_url'] = __( 'Series feed URL', $this->plugin_slug ); + $columns['posts'] = __( 'Episodes', $this->plugin_slug ); $columns = apply_filters( 'ssp_admin_columns_series', $columns ); @@ -455,6 +575,17 @@ public function add_series_columns( $column_data, $column_name, $term_id ) { $column_data = '' . esc_html( $feed_url ) . ''; break; + case 'series_image': + $series = get_term( $term_id, 'series' ); + $series_settings = $this->token . '_series_image_settings'; + $default_image = esc_url( $this->assets_url . 'images/no-image.png' ); + $media_id = get_term_meta( $term_id, $series_settings, true ); + $image_attributes = wp_get_attachment_image_src( $media_id, array( $image_width, $image_height ) ); + $source = ( !is_null($image_attributes[0]) ) ? $image_attributes[0] : $default_image; + $column_data = << +HTML; + break; } return $column_data; @@ -472,16 +603,16 @@ public function updated_messages( $messages ) { $messages[ $this->token ] = array( 0 => '', - 1 => sprintf( __( 'Episode updated. %sView episode%s.', 'seriously-simple-podcasting' ), '', '' ), - 2 => __( 'Custom field updated.', 'seriously-simple-podcasting' ), - 3 => __( 'Custom field deleted.', 'seriously-simple-podcasting' ), - 4 => __( 'Episode updated.', 'seriously-simple-podcasting' ), - 5 => isset( $_GET['revision'] ) ? sprintf( __( 'Episode restored to revision from %s.', 'seriously-simple-podcasting' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false, - 6 => sprintf( __( 'Episode published. %sView episode%s.', 'seriously-simple-podcasting' ), '', '' ), - 7 => __( 'Episode saved.', 'seriously-simple-podcasting' ), - 8 => sprintf( __( 'Episode submitted. %sPreview episode%s.', 'seriously-simple-podcasting' ), '', '' ), - 9 => sprintf( __( 'Episode scheduled for: %1$s. %2$sPreview episode%3$s.', 'seriously-simple-podcasting' ), '' . date_i18n( __( 'M j, Y @ G:i', 'seriously-simple-podcasting' ), strtotime( $post->post_date ) ) . '', '', '' ), - 10 => sprintf( __( 'Episode draft updated. %sPreview episode%s.', 'seriously-simple-podcasting' ), '', '' ), + 1 => sprintf( __( 'Episode updated. %sView episode%s.', $this->plugin_slug ), '', '' ), + 2 => __( 'Custom field updated.', $this->plugin_slug ), + 3 => __( 'Custom field deleted.', $this->plugin_slug ), + 4 => __( 'Episode updated.', $this->plugin_slug ), + 5 => isset( $_GET['revision'] ) ? sprintf( __( 'Episode restored to revision from %s.', $this->plugin_slug ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false, + 6 => sprintf( __( 'Episode published. %sView episode%s.', $this->plugin_slug ), '', '' ), + 7 => __( 'Episode saved.', $this->plugin_slug ), + 8 => sprintf( __( 'Episode submitted. %sPreview episode%s.', $this->plugin_slug ), '', '' ), + 9 => sprintf( __( 'Episode scheduled for: %1$s. %2$sPreview episode%3$s.', $this->plugin_slug ), '' . date_i18n( __( 'M j, Y @ G:i', $this->plugin_slug ), strtotime( $post->post_date ) ) . '', '', '' ), + 10 => sprintf( __( 'Episode draft updated. %sPreview episode%s.', $this->plugin_slug ), '', '' ), ); return $messages; @@ -509,13 +640,13 @@ public function register_meta_boxes() { public function meta_box_setup( $post ) { global $pagenow; - add_meta_box( 'podcast-episode-data', __( 'Podcast Episode Details', 'seriously-simple-podcasting' ), array( + add_meta_box( 'podcast-episode-data', __( 'Podcast Episode Details', $this->plugin_slug ), array( $this, 'meta_box_content' ), $post->post_type, 'normal', 'high' ); if ( 'post.php' == $pagenow && 'publish' == $post->post_status && function_exists( 'get_post_embed_html' ) ) { - add_meta_box( 'episode-embed-code', __( 'Episode Embed Code', 'seriously-simple-podcasting' ), array( + add_meta_box( 'episode-embed-code', __( 'Episode Embed Code', $this->plugin_slug ), array( $this, 'embed_code_meta_box_content' ), $post->post_type, 'side', 'low' ); @@ -539,8 +670,8 @@ public function embed_code_meta_box_content( $post ) { $embed_code = get_post_embed_html( 500, 350, $post ); // Generate markup for meta box - $html = '

' . __( 'Customise the size of your episode embed below, then copy the HTML to your clipboard.', 'seriously-simple-podcasting' ) . '

'; - $html .= '

    

'; + $html = '

' . __( 'Customise the size of your episode embed below, then copy the HTML to your clipboard.', $this->plugin_slug ) . '

'; + $html .= '

    

'; $html .= '

'; echo $html; @@ -607,7 +738,7 @@ public function meta_box_content() { switch ( $v['type'] ) { case 'file': - $upload_button = ''; + $upload_button = ''; if ( ssp_is_connected_to_podcastmotor() ) { $upload_button = '
'; $upload_button .= ' '; @@ -820,26 +951,26 @@ public function custom_fields() { $fields = array(); $fields['episode_type'] = array( - 'name' => __( 'Episode type:', 'seriously-simple-podcasting' ), + 'name' => __( 'Episode type:', $this->plugin_slug ), 'description' => '', 'type' => 'radio', 'default' => 'audio', 'options' => array( - 'audio' => __( 'Audio', 'seriously-simple-podcasting' ), - 'video' => __( 'Video', 'seriously-simple-podcasting' ) + 'audio' => __( 'Audio', $this->plugin_slug ), + 'video' => __( 'Video', $this->plugin_slug ) ), 'section' => 'info', - 'meta_description' => __( 'The type of podcast episode - either Audio or Video', 'seriously-simple-podcasting' ), + 'meta_description' => __( 'The type of podcast episode - either Audio or Video', $this->plugin_slug ), ); // In v1.14+ the `audio_file` field can actually be either audio or video, but we're keeping the field name here for backwards compatibility $fields['audio_file'] = array( - 'name' => __( 'Podcast file:', 'seriously-simple-podcasting' ), - 'description' => __( 'Upload the primary podcast file or paste the file URL here.', 'seriously-simple-podcasting' ), + 'name' => __( 'Podcast file:', $this->plugin_slug ), + 'description' => __( 'Upload the primary podcast file or paste the file URL here.', $this->plugin_slug ), 'type' => 'file', 'default' => '', 'section' => 'info', - 'meta_description' => __( 'The full URL for the podcast episode media file.', 'seriously-simple-podcasting' ), + 'meta_description' => __( 'The full URL for the podcast episode media file.', $this->plugin_slug ), ); // @@ -848,26 +979,26 @@ public function custom_fields() { 'type' => 'hidden', 'default' => '', 'section' => 'info', - 'meta_description' => __( 'Seriously Simple Hosting file id.', 'seriously-simple-podcasting' ), + 'meta_description' => __( 'Seriously Simple Hosting file id.', $this->plugin_slug ), ); } $fields['duration'] = array( - 'name' => __( 'Duration:', 'seriously-simple-podcasting' ), - 'description' => __( 'Duration of podcast file for display (calculated automatically if possible).', 'seriously-simple-podcasting' ), + 'name' => __( 'Duration:', $this->plugin_slug ), + 'description' => __( 'Duration of podcast file for display (calculated automatically if possible).', $this->plugin_slug ), 'type' => 'text', 'default' => '', 'section' => 'info', - 'meta_description' => __( 'The duration of the file for display purposes.', 'seriously-simple-podcasting' ), + 'meta_description' => __( 'The duration of the file for display purposes.', $this->plugin_slug ), ); $fields['filesize'] = array( - 'name' => __( 'File size:', 'seriously-simple-podcasting' ), - 'description' => __( 'Size of the podcast file for display (calculated automatically if possible).', 'seriously-simple-podcasting' ), + 'name' => __( 'File size:', $this->plugin_slug ), + 'description' => __( 'Size of the podcast file for display (calculated automatically if possible).', $this->plugin_slug ), 'type' => 'text', 'default' => '', 'section' => 'info', - 'meta_description' => __( 'The size of the podcast episode for display purposes.', 'seriously-simple-podcasting' ), + 'meta_description' => __( 'The size of the podcast episode for display purposes.', $this->plugin_slug ), ); if ( ssp_is_connected_to_podcastmotor() ) { @@ -875,35 +1006,35 @@ public function custom_fields() { 'type' => 'hidden', 'default' => '', 'section' => 'info', - 'meta_description' => __( 'Raw size of the podcast episode.', 'seriously-simple-podcasting' ), + 'meta_description' => __( 'Raw size of the podcast episode.', $this->plugin_slug ), ); } $fields['date_recorded'] = array( - 'name' => __( 'Date recorded:', 'seriously-simple-podcasting' ), - 'description' => __( 'The date on which this episode was recorded.', 'seriously-simple-podcasting' ), + 'name' => __( 'Date recorded:', $this->plugin_slug ), + 'description' => __( 'The date on which this episode was recorded.', $this->plugin_slug ), 'type' => 'datepicker', 'default' => '', 'section' => 'info', - 'meta_description' => __( 'The date on which the podcast episode was recorded.', 'seriously-simple-podcasting' ), + 'meta_description' => __( 'The date on which the podcast episode was recorded.', $this->plugin_slug ), ); $fields['explicit'] = array( - 'name' => __( 'Explicit:', 'seriously-simple-podcasting' ), - 'description' => __( 'Mark this episode as explicit.', 'seriously-simple-podcasting' ), + 'name' => __( 'Explicit:', $this->plugin_slug ), + 'description' => __( 'Mark this episode as explicit.', $this->plugin_slug ), 'type' => 'checkbox', 'default' => '', 'section' => 'info', - 'meta_description' => __( 'Indicates whether the episode is explicit.', 'seriously-simple-podcasting' ), + 'meta_description' => __( 'Indicates whether the episode is explicit.', $this->plugin_slug ), ); $fields['block'] = array( - 'name' => __( 'Block:', 'seriously-simple-podcasting' ), - 'description' => __( 'Block this episode from appearing in the iTunes & Google Play podcast libraries.', 'seriously-simple-podcasting' ), + 'name' => __( 'Block:', $this->plugin_slug ), + 'description' => __( 'Block this episode from appearing in the iTunes & Google Play podcast libraries.', $this->plugin_slug ), 'type' => 'checkbox', 'default' => '', 'section' => 'info', - 'meta_description' => __( 'Indicates whether this specific episode should be blocked from the iTunes and Google Play Podcast libraries.', 'seriously-simple-podcasting' ), + 'meta_description' => __( 'Indicates whether this specific episode should be blocked from the iTunes and Google Play Podcast libraries.', $this->plugin_slug ), ); if ( $is_itunes_fields_enabled && $is_itunes_fields_enabled == 'on' ) { @@ -911,54 +1042,54 @@ public function custom_fields() { * New iTunes Tag Announced At WWDC 2017 */ $fields['itunes_episode_number'] = array( - 'name' => __( 'iTunes Episode Number:', 'seriously-simple-podcasting' ), - 'description' => __( 'The iTunes Episode Number. Leave Blank If None.', 'seriously-simple-podcasting' ), + 'name' => __( 'iTunes Episode Number:', $this->plugin_slug ), + 'description' => __( 'The iTunes Episode Number. Leave Blank If None.', $this->plugin_slug ), 'type' => 'number', 'default' => '', 'section' => 'info', - 'meta_description' => __( 'The iTunes Episode Number. Leave Blank If None.', 'seriously-simple-podcasting' ), + 'meta_description' => __( 'The iTunes Episode Number. Leave Blank If None.', $this->plugin_slug ), ); /** * New iTunes Tag Announced At WWDC 2017 */ $fields['itunes_title'] = array( - 'name' => __( 'iTunes Episode Title (Exclude Your Series / Show Number):', 'seriously-simple-podcasting' ), - 'description' => __( 'The iTunes Episode Title. NO Series / Show Number Should Be Included.', 'seriously-simple-podcasting' ), + 'name' => __( 'iTunes Episode Title (Exclude Your Series / Show Number):', $this->plugin_slug ), + 'description' => __( 'The iTunes Episode Title. NO Series / Show Number Should Be Included.', $this->plugin_slug ), 'type' => 'text', 'default' => '', 'section' => 'info', - 'meta_description' => __( 'The iTunes Episode Title. NO Series / Show Number Should Be Included', 'seriously-simple-podcasting' ), + 'meta_description' => __( 'The iTunes Episode Title. NO Series / Show Number Should Be Included', $this->plugin_slug ), ); /** * New iTunes Tag Announced At WWDC 2017 */ $fields['itunes_season_number'] = array( - 'name' => __( 'iTunes Season Number:', 'seriously-simple-podcasting' ), - 'description' => __( 'The iTunes Season Number. Leave Blank If None.', 'seriously-simple-podcasting' ), + 'name' => __( 'iTunes Season Number:', $this->plugin_slug ), + 'description' => __( 'The iTunes Season Number. Leave Blank If None.', $this->plugin_slug ), 'type' => 'number', 'default' => '', 'section' => 'info', - 'meta_description' => __( 'The iTunes Season Number. Leave Blank If None.', 'seriously-simple-podcasting' ), + 'meta_description' => __( 'The iTunes Season Number. Leave Blank If None.', $this->plugin_slug ), ); /** * New iTunes Tag Announced At WWDC 2017 */ $fields['itunes_episode_type'] = array( - 'name' => __( 'iTunes Episode Type:', 'seriously-simple-podcasting' ), + 'name' => __( 'iTunes Episode Type:', $this->plugin_slug ), 'description' => '', 'type' => 'select', 'default' => '', 'options' => array( - '' => __( 'Please Select', 'seriously-simple-podcasting' ), - 'full' => __( 'Full: For Normal Episodes', 'seriously-simple-podcasting' ), - 'trailer' => __( 'Trailer: Promote an Upcoming Show', 'seriously-simple-podcasting' ), - 'bonus' => __( 'Bonus: For Extra Content Related To a Show', 'seriously-simple-podcasting' ) + '' => __( 'Please Select', $this->plugin_slug ), + 'full' => __( 'Full: For Normal Episodes', $this->plugin_slug ), + 'trailer' => __( 'Trailer: Promote an Upcoming Show', $this->plugin_slug ), + 'bonus' => __( 'Bonus: For Extra Content Related To a Show', $this->plugin_slug ) ), 'section' => 'info', - 'meta_description' => __( 'The iTunes Episode Type', 'seriously-simple-podcasting' ), + 'meta_description' => __( 'The iTunes Episode Type', $this->plugin_slug ), ); } @@ -978,7 +1109,7 @@ public function glance_items( $items = array() ) { $post_type_object = get_post_type_object( $this->token ); - $text = _n( '%s Episode', '%s Episodes', $num_posts, 'seriously-simple-podcasting' ); + $text = _n( '%s Episode', '%s Episodes', $num_posts, $this->plugin_slug ); $text = sprintf( $text, number_format_i18n( $num_posts ) ); if ( $post_type_object && current_user_can( $post_type_object->cap->edit_posts ) ) { @@ -1002,13 +1133,13 @@ public function glance_items( $items = array() ) { */ public function plugin_row_meta( $plugin_meta = array(), $plugin_file = '', $plugin_data = array(), $status = '' ) { - if ( ! isset( $plugin_data['slug'] ) || 'seriously-simple-podcasting' != $plugin_data['slug'] ) { + if ( ! isset( $plugin_data['slug'] ) || $this->plugin_slug != $plugin_data['slug'] ) { return $plugin_meta; } - $plugin_meta['docs'] = '' . __( 'Documentation', 'seriously-simple-podcasting' ) . ''; - $plugin_meta['addons'] = '' . __( 'Add-ons', 'seriously-simple-podcasting' ) . ''; - $plugin_meta['review'] = '' . __( 'Write a review', 'seriously-simple-podcasting' ) . ''; + $plugin_meta['docs'] = '' . __( 'Documentation', $this->plugin_slug ) . ''; + $plugin_meta['addons'] = '' . __( 'Add-ons', $this->plugin_slug ) . ''; + $plugin_meta['review'] = '' . __( 'Write a review', $this->plugin_slug ) . ''; return $plugin_meta; } @@ -1022,7 +1153,7 @@ public function plugin_row_meta( $plugin_meta = array(), $plugin_file = '', $plu */ public function enter_title_here( $title ) { if ( get_post_type() == $this->token ) { - $title = __( 'Enter episode title here', 'seriously-simple-podcasting' ); + $title = __( 'Enter episode title here', $this->plugin_slug ); } return $title; @@ -1069,6 +1200,13 @@ public function enqueue_admin_scripts( $hook ) { wp_register_script( 'ssp-settings', esc_url( $this->assets_url . 'js/settings' . $this->script_suffix . '.js' ), array( 'jquery' ), $this->version ); wp_enqueue_script( 'ssp-settings' ); + // Only enqueue the WordPress Media Library picker for adding and editing SSP tags/terms post types. + if ( 'edit-tags.php' === $hook || 'term.php' === $hook ) { + if ( 'series' === $_REQUEST['taxonomy'] ) { + wp_enqueue_media(); + } + } + /** * Only load the upload scripts when adding/editing posts/podcasts */ @@ -1101,7 +1239,7 @@ public function ensure_post_thumbnails_support() { * @return void */ public function load_localisation() { - load_plugin_textdomain( 'seriously-simple-podcasting', false, dirname( plugin_basename( $this->file ) ) . '/lang/' ); + load_plugin_textdomain( $this->plugin_slug, false, dirname( plugin_basename( $this->file ) ) . '/lang/' ); } /** @@ -1109,7 +1247,7 @@ public function load_localisation() { * @return void */ public function load_plugin_textdomain() { - $domain = 'seriously-simple-podcasting'; + $domain = $this->plugin_slug; // The "plugin_locale" filter is also used in load_plugin_textdomain() $locale = apply_filters( 'plugin_locale', get_locale(), $domain ); @@ -1135,7 +1273,7 @@ public function add_feed() { */ public function hide_wp_seo_rss_footer( $include_footer = true ) { - if ( is_feed( 'podcast' ) ) { + if ( is_feed( $this->token ) ) { $include_footer = false; } @@ -1178,7 +1316,7 @@ public function feed_template() { * @return void */ public function redirect_old_feed() { - if ( isset( $_GET['feed'] ) && in_array( $_GET['feed'], array( 'podcast', 'itunes' ) ) ) { + if ( isset( $_GET['feed'] ) && in_array( $_GET['feed'], array( $this->token, 'itunes' ) ) ) { $this->feed_template(); exit; } @@ -1296,7 +1434,7 @@ public function admin_footer_text( $footer_text ) { // Change the footer text if ( ! get_option( 'ssp_admin_footer_text_rated' ) ) { - $footer_text = sprintf( __( 'If you like %1$sSeriously Simple Podcasting%2$s please leave a %3$s★★★★★%4$s rating. A huge thank you in advance!', 'seriously-simple-podcasting' ), '', '', '', '' ); + $footer_text = sprintf( __( 'If you like %1$sSeriously Simple Podcasting%2$s please leave a %3$s★★★★★%4$s rating. A huge thank you in advance!', $this->plugin_slug ), '', '', '', '' ); $footer_text .= ""; } else { - $footer_text = sprintf( __( '%1$sThank you for publishing with %2$sSeriously Simple Podcasting%3$s.%4$s', 'seriously-simple-podcasting' ), '', '', '', '' ); + $footer_text = sprintf( __( '%1$sThank you for publishing with %2$sSeriously Simple Podcasting%3$s.%4$s', $this->plugin_slug ), '', '', '', '' ); } } @@ -1538,7 +1676,7 @@ public function invalid_permalink_structure_notice() { public function show_upgrade_screen() { // first check that we should show the screen $post_type = ( isset( $_GET['post_type'] ) ? filter_var( $_GET['post_type'], FILTER_SANITIZE_STRING ) : '' ); - if ( empty( $post_type ) || 'podcast' !== $post_type ) { + if ( empty( $post_type ) || $this->token !== $post_type ) { return; } @@ -1563,7 +1701,7 @@ public function show_upgrade_screen() { $current_url = rawurlencode( ( isset( $_SERVER['HTTPS'] ) ? 'https' : 'http' ) . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] ); // redirect - $url = add_query_arg( array( 'post_type' => 'podcast', + $url = add_query_arg( array( 'post_type' => $this->token, 'page' => 'upgrade', 'ssp_redirect' => $current_url ), admin_url( 'edit.php' ) ); @@ -1640,4 +1778,4 @@ public function dismiss_119_update_notice() { update_option( 'ssp_dismiss_119_update_notice', 'true' ); } -} \ No newline at end of file +} diff --git a/includes/class-ssp-frontend.php b/includes/class-ssp-frontend.php index 3ec09196..2a5a01d8 100644 --- a/includes/class-ssp-frontend.php +++ b/includes/class-ssp-frontend.php @@ -337,7 +337,8 @@ public function get_album_art( $episode_id = false ) { * Option 2: if the episode belongs to a series, which has an image that is square, then use that */ $series_id = false; - + $series_image = ''; + $series = get_the_terms( $episode_id, 'series' ); if ( $series ) { $series_id = ( ! empty( $series ) && isset( $series[0] ) ) ? $series[0]->term_id : false; @@ -416,7 +417,23 @@ private function get_no_album_art_image_array(){ return compact( 'src', 'width', 'height' ); } - + + + /** + * Return media player for a given file. Used to enable other checks or to prevent the player from loading + * @param string $srcFile + * @param int $episode_id + * @param string $player_size + * + * @return string + */ + public function media_player( $srcFile = '', $episode_id = 0, $player_size = "large" ) { + // check if the ss_player shortcode has been used in the episode already + if ( ! ssp_check_if_podcast_has_shortcode( $episode_id, 'ss_player' ) ) { + return $this->load_media_player( $srcFile, $episode_id, $player_size ); + } + } + /** * Load media player for given file * @param string $srcFile Source of file @@ -424,8 +441,7 @@ private function get_no_album_art_image_array(){ * @param string $player_size mini or large * @return string Media player HTML on success, empty string on failure */ - public function media_player ( $srcFile = '', $episode_id = 0, $player_size = "large" ) { - + public function load_media_player($srcFile = '', $episode_id = 0, $player_size){ global $largePlayerInstanceNumber; $largePlayerInstanceNumber++; @@ -477,9 +493,9 @@ public function media_player ( $srcFile = '', $episode_id = 0, $player_size = "l ?>
> -
-
-
+
+
+
@@ -487,10 +503,10 @@ public function media_player ( $srcFile = '', $episode_id = 0, $player_size = "l

' . substr( $series[0]->name, 0, 35) . ( strlen( $series[0]->name ) > 35 ? '...' : '' ) . '' : ''; - } + echo apply_filters( 'ssp_podcast_title', get_the_title( $episode_id ), get_the_ID() ); + if( $series = get_the_terms( $episode_id, 'series' ) ){ + echo ( !empty( $series ) && isset( $series[0] ) ) ? '
' . substr( $series[0]->name, 0, 35) . ( strlen( $series[0]->name ) > 35 ? '...' : '' ) . '' : ''; + } ?>

@@ -698,7 +714,7 @@ public function media_player ( $srcFile = '', $episode_id = 0, $player_size = "l break; - case 'video': + case 'video': // Use featured image as video poster if( $episode_id && has_post_thumbnail( $episode_id ) ) { @@ -709,7 +725,7 @@ public function media_player ( $srcFile = '', $episode_id = 0, $player_size = "l } $player = wp_video_shortcode( $params ); - break; + break; } // Allow filtering so that alternative players can be used @@ -747,6 +763,11 @@ public function get_episode_type( $episode_id = 0 ) { */ public function episode_meta_details ( $episode_id = 0, $context = 'content', $return = false ) { + // don't render is if the ss_player shortcode is being used. + if ( ssp_check_if_podcast_has_shortcode( $episode_id, 'ss_player' ) ) { + return; + } + if ( ! $episode_id ) { return; } @@ -1741,6 +1762,7 @@ public function register_shortcodes () { 'podcast_episode', 'podcast_playlist', 'ss_podcast', + 'ss_player', ); foreach ( $shortcodes as $shortcode ) { diff --git a/includes/shortcodes/class-ssp-shortcode-podcast_playlist.php b/includes/shortcodes/class-ssp-shortcode-podcast_playlist.php index 11d3f8f0..f8eb8d37 100644 --- a/includes/shortcodes/class-ssp-shortcode-podcast_playlist.php +++ b/includes/shortcodes/class-ssp-shortcode-podcast_playlist.php @@ -239,6 +239,7 @@ function shortcode( $params ) {
@@ -314,4 +316,4 @@ function shortcode( $params ) { } -$GLOBALS['ssp_shortcodes']['podcast_playlist'] = new SSP_Shortcode_Podcast_Playlist(); \ No newline at end of file +$GLOBALS['ssp_shortcodes']['podcast_playlist'] = new SSP_Shortcode_Podcast_Playlist(); diff --git a/includes/shortcodes/class-ssp-shortcode-ss_player.php b/includes/shortcodes/class-ssp-shortcode-ss_player.php new file mode 100644 index 00000000..59a5cec7 --- /dev/null +++ b/includes/shortcodes/class-ssp-shortcode-ss_player.php @@ -0,0 +1,46 @@ +post_type, ssp_post_types( true ), true ) ) { + return; + } + + $episode_id = $current_post->ID; + $file = $ss_podcasting->get_enclosure( $episode_id ); + if ( get_option( 'permalink_structure' ) ) { + $file = $ss_podcasting->get_episode_download_link( $episode_id ); + } + + // Make sure we return and don't echo. + $args['echo'] = false; + + return $ss_podcasting->load_media_player( $file, $episode_id, 'large' ); + } + +} + +$GLOBALS['ssp_shortcodes']['ss_player'] = new SSP_Shortcode_SS_Player(); \ No newline at end of file diff --git a/includes/ssp-functions.php b/includes/ssp-functions.php index cc42e242..9bc4000a 100644 --- a/includes/ssp-functions.php +++ b/includes/ssp-functions.php @@ -939,4 +939,28 @@ function ssp_get_image_id_from_url( $image_url ){ $attachment = $wpdb->get_col( $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE guid='%s';", $image_url ) ); return isset( $attachment[0] ) ? $attachment[0] : false; } +} + +if ( ! function_exists( 'ssp_check_if_podcast_has_shortcode' ) ) { + /** + * Check if the podcast content has a specific shortcode + * + * @param $podcast_id + * @param $shortcode + * + * @return bool + */ + function ssp_check_if_podcast_has_shortcode( $podcast_id = 0, $shortcode = '' ) { + if ( empty( $podcast_id ) ) { + return false; + } + $podcast = get_post( $podcast_id ); + $podcast_content = $podcast->post_content; + //$podcast_content = apply_filters( 'the_content', $podcast_content ); + if ( has_shortcode( $podcast_content, $shortcode ) ) { + return true; + } + + return false; + } } \ No newline at end of file diff --git a/readme.txt b/readme.txt index 856c0677..ddf4435a 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: podcast, audio, video, vodcast, rss, mp3, mp4, feed, itunes, podcasting, m Requires at least: 4.4 Tested up to: 4.9.1 Requires PHP: 5.3.3 -Stable tag: 1.19.5 +Stable tag: 1.19.6 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -102,6 +102,13 @@ You can find complete user and developer documentation (along with the FAQs) on == Changelog == += 1.19.6 = +* 2018-03-02 +* [FIX] Sanitize file name on upload to Castos service +* [NEW] Add ss_player shortcode to embed html player within content via a shortcode. +* [NEW] Added a Feature/series graphic (props @timnolte) +* [UPDATE] Update ssp-shortcode-podcast_playlist, adds parameter "tracklist" to show the list of episodes below the player. (props @robertogcalle) + = 1.19.5 = * 2018-02-09 * [TWEAK] Only load the HTML5 media player track when the user clicks play diff --git a/seriously-simple-podcasting.php b/seriously-simple-podcasting.php index 7815b698..fcd8d25d 100644 --- a/seriously-simple-podcasting.php +++ b/seriously-simple-podcasting.php @@ -1,7 +1,7 @@