Merge branch 'release/2.15.15'

Nikola Miljkovic · Nikola Miljkovic · commit a1fd0a41960b · 2019-03-04T22:43:58.000+01:00
diff --git a/assets/js/admin/settings/conditionals.js b/assets/js/admin/settings/conditionals.js
@@ -66,13 +66,14 @@ if ( typeof sm_conditionals !== 'undefined' ) {
 									 */
 									let selected_value = this.value;
 
+
 									// Hide or show the elements.
-									sm_hide_show_elements( target_value, selected_value, not, table_row );
+									sm_hide_show_elements( target_value, conditional_element.closest( 'tr' ).hasClass( 'hidden' ) ? false : selected_value, not, table_row );
 								}
 							);
 
 							// Call the function first time.
-							sm_hide_show_elements( target_value, conditional_element.val(), not, table_row );
+							sm_hide_show_elements( target_value, conditional_element.closest( 'tr' ).hasClass( 'hidden' ) ? false : conditional_element.val(), not, table_row );
 						}
 					);
 				}
@@ -122,9 +123,14 @@ function sm_hide_show_elements( target_value, current_value, not, table_row ) {
 	if ( is_ajax ) {
 		sm_reset_option_value( element, ! table_row.hasClass( 'hidden' ) );
 
+		// The GET parameters.
+		let $_GET = sm_get_query_params( document.location.search );
+
 		let data = {
 			'action': 'sm_settings_get_select_data',
-			'id': current_value,
+			'category': current_value,
+			'option_id': table_row.find( 'select' ).attr( 'id' ),
+			'podcast_id': $_GET[ 'post' ],
 		};
 
 		// Request element data.
@@ -162,12 +168,24 @@ function sm_hide_show_elements( target_value, current_value, not, table_row ) {
 									jQuery( this.remove() );
 								}
 							);
+
 							jQuery.each(
-								response,
+								response.options,
 								function ( id, item ) {
 									table_row.find( 'select' ).append( jQuery( '<option/>' ).val( id ).text( item ) );
 								}
 							);
+
+							if ( response.selected ) {
+								table_row.find( 'select' ).val( response.selected ).change();
+							} else {
+								table_row.find( 'select' ).prop( "selectedIndex", 0 );
+							}
+
+							if ( Object.keys( response.options ).length === 0 ) {
+								table_row.addClass( 'hidden' );
+								return;
+							}
 							break;
 					}
 				}
@@ -221,3 +239,22 @@ function sm_isset( value ) {
 		return false
 	}
 }
+
+/**
+ * Gets query parameters from the URL (GET for example).
+ *
+ * @param {string} qs Query string.
+ */
+function sm_get_query_params( qs ) {
+	qs         = qs.split( "+" ).join( " " );
+	var params = {},
+		tokens,
+		re     = /[?&]?([^=]+)=([^&]*)/g;
+
+	while ( tokens = re.exec( qs ) ) {
+		params[ decodeURIComponent( tokens[ 1 ] ) ]
+			= decodeURIComponent( tokens[ 2 ] );
+	}
+
+	return params;
+}
diff --git a/assets/js/admin/settings/conditionals.min.js b/assets/js/admin/settings/conditionals.min.js
diff --git a/includes/sm-template-functions.php b/includes/sm-template-functions.php
@@ -94,7 +94,7 @@ function render_wpfc_sorting( $args = array() ) {
 		'wpfc_preacher'      => 'hide_preachers',
 		'wpfc_bible_book'    => 'hide_books',
 		'wpfc_service_type'  => 'hide_service_types',
-        'wpfc_dates'         => 'hide_dates',
+		'wpfc_dates'         => 'hide_dates',
 	) );
 
 	// Save orig args for filters.
@@ -115,7 +115,7 @@ function render_wpfc_sorting( $args = array() ) {
 		'hide_preachers'      => '',
 		'hide_books'          => '',
 		'hide_service_types'  => SermonManager::getOption( 'service_type_filtering' ) ? '' : 'yes',
-        'hide_dates'          => '',
+		'hide_dates'          => '',
 		'hide_filters'        => ! SermonManager::getOption( 'hide_filters' ),
 		'action'              => 'none',
 	);
@@ -340,59 +340,84 @@ function wpfc_render_video( $url = '', $seek = true ) {
 /**
  * Renders the audio player.
  *
- * @param string|int $source The URL or the attachment ID of the audio file.
- * @param int        $seek   Allows seeking to specific second in audio file.
+ * @param int|string $source The ID of the sermon, or alternatively, the URL or the attachment ID of the audio file.
+ * @param int        $seek   Seek to specific second in audio file.
  *
  * @since 2.12.3 added $seek
+ * @since 2.15.15 The sermon can be used as first parameter
  *
- * @return string Audio player HTML.
+ * @return string|false Audio player HTML or false if sermon has no audio.
  */
 function wpfc_render_audio( $source = '', $seek = null ) {
-	if ( is_int( $source ) || is_numeric( $source ) ) {
-		$source = wp_get_attachment_url( intval( $source ) );
+	// For later filtering.
+	$source_orig = $source;
 
-		if ( ! $source ) {
-			return '';
+	// Check if it's a sermon or attachment ID.
+	if ( is_numeric( $source ) ) {
+		$object = get_post( $source );
+
+		if ( ! $object ) {
+			return false;
 		}
-	} elseif ( is_string( $source ) ) {
-		if ( '' === trim( $source ) ) {
-			return '';
+
+		switch ( $object->post_type ) {
+			case 'wpfc_sermon':
+				$sermon_audio_id     = get_wpfc_sermon_meta( 'sermon_audio_id' );
+				$sermon_audio_url    = get_wpfc_sermon_meta( 'sermon_audio' );
+				$sermon_audio_url_wp = $sermon_audio_id ? wp_get_attachment_url( intval( $sermon_audio_id ) ) : false;
+
+				$source = $sermon_audio_id && $sermon_audio_url_wp ? $sermon_audio_url_wp : $sermon_audio_url;
+				break;
+			case 'attachment':
+				$source = wp_get_attachment_url( $object->ID );
+				break;
 		}
-	} else {
-		return '';
 	}
 
+	// Check if set.
+	if ( ! $source ) {
+		return false;
+	}
+
+	// Get the current player.
 	$player = strtolower( \SermonManager::getOption( 'player' ) ?: 'plyr' );
 
-	if ( strtolower( 'WordPress' ) === $player ) {
-		$attr = array(
-			'src'     => $source,
-			'preload' => 'none',
-		);
+	switch ( strtolower( $player ) ) {
+		case 'wordpress': // phpcs:ignore
+			$attr = array(
+				'src'     => $source,
+				'preload' => 'none',
+			);
 
-		$output = wp_audio_shortcode( $attr );
-	} else {
-		$extra_settings = '';
+			$output = wp_audio_shortcode( $attr );
+			break;
+		default:
+			$extra_settings = '';
 
-		if ( is_numeric( $seek ) ) {
-			// Sanitation just in case.
-			$extra_settings = 'data-plyr_seek=\'' . intval( $seek ) . '\'';
-		}
+			if ( is_numeric( $seek ) ) {
+				// Sanitation just in case.
+				$extra_settings = 'data-plyr_seek=\'' . intval( $seek ) . '\'';
+			}
+
+			$output = '';
 
-		$output = '';
+			$output .= '<audio controls preload="metadata" class="wpfc-sermon-player ' . ( 'mediaelement' === $player ? 'mejs__player' : '' ) . '" ' . $extra_settings . '>';
+			$output .= '<source src="' . $source . '" type="audio/mp3">';
+			$output .= '</audio>';
 
-		$output .= '<audio controls preload="metadata" class="wpfc-sermon-player ' . ( 'mediaelement' === $player ? 'mejs__player' : '' ) . '" ' . $extra_settings . '>';
-		$output .= '<source src="' . $source . '" type="audio/mp3">';
-		$output .= '</audio>';
+			break;
 	}
 
 	/**
 	 * Allows changing of the audio player to any HTML.
 	 *
-	 * @param string $output Audio player HTML.
-	 * @param string $source Audio source URL.
+	 * @param string     $output      Audio player HTML.
+	 * @param string     $source      Audio source URL.
+	 * @param int|string $source_orig The original source parameter.
+	 *
+	 * @since 2.15.15 Added $source_orig.
 	 */
-	return apply_filters( 'sm_audio_player', $output, $source );
+	return apply_filters( 'sm_audio_player', $output, $source, $source_orig );
 }
 
 /**
diff --git a/readme.txt b/readme.txt
@@ -5,7 +5,7 @@ Tags: church, sermon, sermons, preaching, podcasting, manage, managing, podcasts
 Requires at least: 4.7.0
 Tested up to: 5.1
 Requires PHP: 5.3
-Stable tag: 2.15.14
+Stable tag: 2.15.15
 License: GPLv2
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -122,6 +122,9 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 2. Sermon Files
 
 ## Changelog ##
+### 2.15.15 ###
+* Fix: RSS feed not working
+
 ### 2.15.14 ###
 * New: Add compatibility for Pro theme
 * New: Add a setting to change default sermon ordering (in "Display" tab)
diff --git a/sermons.php b/sermons.php
@@ -3,7 +3,7 @@
  * Plugin Name: Sermon Manager for WordPress
  * Plugin URI: https://www.wpforchurch.com/products/sermon-manager-for-wordpress/
  * Description: Add audio and video sermons, manage speakers, series, and more.
- * Version: 2.15.14
+ * Version: 2.15.15
  * Author: WP for Church
  * Author URI: https://www.wpforchurch.com/
  * Requires at least: 4.5
@@ -866,11 +866,14 @@ function () {
 			}
 		);
 
-		add_action( 'wp_ajax_sm_settings_get_select_data', function () {
-			echo json_encode( apply_filters( 'sm_settings_get_select_data', array(), $_POST['id'] ) );
+		add_action(
+			'wp_ajax_sm_settings_get_select_data',
+			function () {
+				echo json_encode( apply_filters( 'sm_settings_get_select_data', array(), $_POST['category'], $_POST['podcast_id'], $_POST['option_id'] ) );
 
-			wp_die();
-		} );
+				wp_die();
+			}
+		);
 	}
 }
 
diff --git a/views/partials/content-sermon-archive.php b/views/partials/content-sermon-archive.php
@@ -112,14 +112,9 @@
 					<?php endif; ?>
 				</div>
 
-				<?php if ( \SermonManager::getOption( 'archive_player' ) && ( get_wpfc_sermon_meta( 'sermon_audio' ) || get_wpfc_sermon_meta( 'sermon_audio_id' ) ) ) : ?>
-					<?php
-					$sermon_audio_id     = get_wpfc_sermon_meta( 'sermon_audio_id' );
-					$sermon_audio_url_wp = $sermon_audio_id ? wp_get_attachment_url( intval( $sermon_audio_id ) ) : false;
-					$sermon_audio_url    = $sermon_audio_id && $sermon_audio_url_wp ? $sermon_audio_url_wp : get_wpfc_sermon_meta( 'sermon_audio' );
-					?>
+				<?php if ( \SermonManager::getOption( 'archive_player' ) ) : ?>
 					<div class="wpfc-sermon-audio">
-						<?php echo wpfc_render_audio( $sermon_audio_url ); ?>
+						<?php echo wpfc_render_audio( $post->ID ); ?>
 					</div>
 				<?php endif; ?>
 			<?php else : ?>
diff --git a/views/wpfc-podcast-feed.php b/views/wpfc-podcast-feed.php
@@ -11,8 +11,10 @@
 
 if ( isset( $GLOBALS['sm_podcast_data'] ) && is_array( $GLOBALS['sm_podcast_data'] ) ) {
 	$settings = $GLOBALS['sm_podcast_data'];
+	$is_pro   = true;
 } else {
 	$settings = array();
+	$is_pro   = false;
 }
 
 // Option ID => escape function.
@@ -180,16 +182,64 @@
 
 $sermon_podcast_query = new WP_Query( $args );
 
-$categories = array(
-	'0' => '',
-	'1' => 'Buddhism',
-	'2' => 'Christianity',
-	'3' => 'Hinduism',
-	'4' => 'Islam',
-	'5' => 'Judaism',
-	'6' => 'Other',
-	'7' => 'Spirituality',
-);
+if ( ! $is_pro ) {
+	$categories = array(
+		'0' => '',
+		'1' => 'Buddhism',
+		'2' => 'Christianity',
+		'3' => 'Hinduism',
+		'4' => 'Islam',
+		'5' => 'Judaism',
+		'6' => 'Other',
+		'7' => 'Spirituality',
+	);
+
+	$category          = 'Religion &amp; Spirituality';
+	$subcategory       = esc_attr( ! empty( $categories[ $settings['itunes_sub_category'] ] ) ? $categories[ $settings['itunes_sub_category'] ] : 'Christianity' );
+	$category_override = false;
+} else {
+	if ( function_exists( 'smp_get_itunes_categories' ) && function_exists( 'smp_get_itunes_subcategories' ) ) {
+		$category_override = PHP_EOL;
+		$all_categories    = smp_get_itunes_categories();
+		$all_subcategories = smp_get_itunes_subcategories();
+
+		for ( $i = 1; $i <= 3; $i ++ ) {
+			$category    = isset( $settings[ 'itunes_category_' . $i ] ) ? $settings[ 'itunes_category_' . $i ] : '';
+			$category    = $category ? ( isset( $all_categories[ $category ] ) ? $all_categories[ $category ] : '' ) : '';
+			$category    = str_replace( '&', '&amp;', $category );
+			$subcategory = isset( $settings[ 'itunes_category_' . $i . '_subcategory' ] ) ? $settings[ 'itunes_category_' . $i . '_subcategory' ] : '';
+			$subcategory = str_replace( '&', '&amp;', $subcategory );
+
+			if ( $subcategory ) {
+				foreach ( $all_subcategories as $cat_id => $cat_subs ) {
+					foreach ( $cat_subs as $cat_sub_id => $cat_sub_name ) {
+						if ( $cat_sub_id === $subcategory ) {
+							$subcategory = $cat_sub_name;
+							break 2;
+						}
+					}
+				}
+			}
+
+			if ( ! $category ) {
+				continue;
+			}
+
+			$category_override .= '<itunes:category text="' . $category . '">' . PHP_EOL;
+
+			if ( $subcategory ) {
+				$category_override .= '	<itunes:category text="' . $subcategory . '"/>' . PHP_EOL;
+			}
+
+			$category_override .= '</itunes:category>' . PHP_EOL;
+		}
+
+		unset( $category );
+		unset( $subcategory );
+
+		$category_override .= PHP_EOL;
+	}
+}
 
 $title            = $settings['title'];
 $link             = $settings['website_link'];
@@ -203,7 +253,6 @@
 $owner_name       = $settings['itunes_owner_name'];
 $owner_email      = $settings['itunes_owner_email'];
 $cover_image_url  = $settings['itunes_cover_image'];
-$subcategory      = esc_attr( ! empty( $categories[ $settings['itunes_sub_category'] ] ) ? $categories[ $settings['itunes_sub_category'] ] : 'Christianity' );
 
 ?>
 <rss version="2.0"
@@ -236,9 +285,13 @@
 			<itunes:image href="<?php echo $cover_image_url; ?>"/>
 		<?php endif; ?>
 
-		<itunes:category text="Religion &amp; Spirituality">
-			<itunes:category text="<?php echo $subcategory; ?>"/>
-		</itunes:category>
+		<?php if ( ! $category_override ) : ?>
+			<itunes:category text="<?php echo $category; ?>">
+				<itunes:category text="<?php echo $subcategory; ?>"/>
+			</itunes:category>
+		<?php else : ?>
+			<?php echo $category_override; ?>
+		<?php endif; ?>
 		<?php
 		if ( $sermon_podcast_query->have_posts() ) :
 			while ( $sermon_podcast_query->have_posts() ) :
