+
@@ -44,12 +74,12 @@
';
+
+ return $html;
+}
+
+/**
+ * Render sermon image, if not set try series image, if not set too - try preacher
+ *
+ * @param string $size Image size, supports WP image size
+ *
+ * @deprecated 2.12.0
+ */
+function render_sermon_image( $size ) {
+ //$size = any defined image size in WordPress
+ if ( has_post_thumbnail() ) :
+ the_post_thumbnail( $size );
+ elseif ( apply_filters( 'sermon-images-list-the-terms', '', array( 'taxonomy' => 'wpfc_sermon_series', ) ) ) :
+ // get series image
+ print apply_filters( 'sermon-images-list-the-terms', '', array(
+ 'image_size' => $size,
+ 'taxonomy' => 'wpfc_sermon_series',
+ 'after' => '',
+ 'after_image' => '',
+ 'before' => '',
+ 'before_image' => ''
+ ) );
+ elseif ( ! has_post_thumbnail() && ! apply_filters( 'sermon-images-list-the-terms', '', array( 'taxonomy' => 'wpfc_sermon_series', ) ) ) :
+ // get speaker image
+ print apply_filters( 'sermon-images-list-the-terms', '', array(
+ 'image_size' => $size,
+ 'taxonomy' => 'wpfc_preacher',
+ 'after' => '',
+ 'after_image' => '',
+ 'before' => '',
+ 'before_image' => ''
+ ) );
+ endif;
+}
+
+/**
+ * Renders video and/or audio with wrapper HTML
+ *
+ * @return string The HTML
+ *
+ * @deprecated 2.12.0
+ */
+function wpfc_sermon_media() {
+ $html = '';
+
+ if ( get_wpfc_sermon_meta( 'sermon_video_link' ) ) {
+ $html .= '
';
+ $html .= wpfc_render_video( get_wpfc_sermon_meta( 'sermon_video_link' ) );
+ $html .= '
';
+ } else {
+ $html .= '
';
+ $html .= do_shortcode( get_wpfc_sermon_meta( 'sermon_video' ) );
+ $html .= '
';
+ }
+
+ if ( get_wpfc_sermon_meta( 'sermon_audio' ) ) {
+ $html .= '
';
+ $html .= wpfc_render_audio( get_wpfc_sermon_meta( 'sermon_audio' ) );
+ $html .= '
';
+ }
+
+ return $html;
+}
+
+/**
+ * @deprecated 2.12.0
+ */
+function wpfc_sermon_author_filter() {
+ _deprecated_function( __FUNCTION__, '2.12.0', null );
+}
diff --git a/includes/sm-template-functions.php b/includes/sm-template-functions.php
new file mode 100755
index 0000000..23260ba
--- /dev/null
+++ b/includes/sm-template-functions.php
@@ -0,0 +1,671 @@
+taxonomy . '.php';
+
+ if ( ! file_exists( get_stylesheet_directory() . '/' . $default_file ) ) {
+ $default_file = 'archive-wpfc_sermon.php';
+ }
+ } else {
+ $default_file = 'archive-wpfc_sermon.php';
+ }
+ } elseif ( is_post_type_archive( 'wpfc_sermon' ) ) {
+ $default_file = 'archive-wpfc_sermon.php';
+ } else {
+ $default_file = '';
+ }
+
+ if ( $default_file ) {
+ if ( file_exists( get_stylesheet_directory() . '/' . $default_file ) ) {
+ return get_stylesheet_directory() . '/' . $default_file;
+ }
+
+ return SM_PATH . 'views/' . $default_file;
+ }
+
+ return $template;
+ } );
+}
+
+/**
+ * Replaces default the_content and/or the_excerpt with proper sermon content
+ *
+ * @param string $content The default content
+ *
+ * @return string The modified content if it's Sermon related data
+ */
+function add_wpfc_sermon_content( $content ) {
+ if ( 'wpfc_sermon' === get_post_type() && in_the_loop() == true ) {
+ if ( ! is_feed() && ( is_archive() || is_search() ) ) {
+ $content = wpfc_sermon_excerpt_v2( true );
+ } elseif ( is_singular() && is_main_query() ) {
+ $content = wpfc_sermon_single_v2( true );
+ }
+ }
+
+ return $content;
+}
+
+add_filter( 'the_content', 'add_wpfc_sermon_content' );
+if ( ! \SermonManager::getOption( 'disable_the_excerpt' ) ) {
+ add_filter( 'the_excerpt', 'add_wpfc_sermon_content' );
+}
+
+/**
+ * Render sermon sorting/filtering
+ *
+ * @param array $args Display options. See the 'sermon_sort_fields' shortcode for array items
+ *
+ * @see WPFC_Shortcodes->displaySermonSorting()
+ *
+ * @return string the HTML
+ *
+ * @since 2.5.0 added $args
+ */
+function render_wpfc_sorting( $args = array() ) {
+ $action = ( SermonManager::getOption( 'home_url_filtering' ) ? home_url() : site_url() ) . '/' . ( SermonManager::getOption( 'common_base_slug' ) ? ( SermonManager::getOption( 'archive_slug' ) ?: 'sermons' ) : '' );
+
+ // Filters HTML fields data
+ $filters = array(
+ array(
+ 'className' => 'sortPreacher',
+ 'taxonomy' => 'wpfc_preacher',
+ /* Translators: %s: Preacher label (sentence case; singular) */
+ 'title' => sprintf( __( 'Filter by %s', 'sermon-manager-for-wordpress' ), \SermonManager::getOption( 'preacher_label' ) ?: 'Preacher' ),
+ ),
+ array(
+ 'className' => 'sortSeries',
+ 'taxonomy' => 'wpfc_sermon_series',
+ 'title' => __( 'Filter by Series', 'sermon-manager-for-wordpress' )
+ ),
+ array(
+ 'className' => 'sortTopics',
+ 'taxonomy' => 'wpfc_sermon_topics',
+ 'title' => __( 'Filter by Topic', 'sermon-manager-for-wordpress' )
+ ),
+ array(
+ 'className' => 'sortBooks',
+ 'taxonomy' => 'wpfc_bible_book',
+ 'title' => __( 'Filter by Book', 'sermon-manager-for-wordpress' )
+ ),
+ );
+
+ ob_start(); ?>
+
+ ID, $meta_key, true );
+ if ( $data !== '' ) {
+ return $data;
+ }
+
+ return null;
+}
+
+/**
+ * Pass sermon content through WordPres functions, to render shortcodes, etc
+ *
+ * @param string $meta_key Sermon meta key
+ * @param int $post_id Post ID
+ *
+ * @return string The processed content
+ */
+function process_wysiwyg_output( $meta_key, $post_id = 0 ) {
+ global $wp_embed;
+
+ $post_id = $post_id ? $post_id : get_the_id();
+
+ $content = get_post_meta( $post_id, $meta_key, true );
+ $content = $wp_embed->autoembed( $content );
+ $content = $wp_embed->run_shortcode( $content );
+ $content = wpautop( $content );
+ $content = do_shortcode( $content );
+
+ return $content;
+}
+
+/**
+ * Render sermon description
+ *
+ * @param string $before content before description
+ * @param string $after content after description
+ * @param bool $return True to return, false to echo (default)
+ *
+ * @return string The HTML, if $return is set to true
+ */
+function wpfc_sermon_description( $before = '', $after = '', $return = false ) {
+ $output = $before . wpautop( process_wysiwyg_output( 'sermon_description', get_the_ID() ) ) . $after;
+
+ if ( ! $return ) {
+ echo $output;
+ }
+
+ return $output;
+}
+
+/**
+ * Returns sermon image URL
+ *
+ * @param bool $fallback If set to true, it will try to get series image URL if sermon image URL is not set
+ *
+ * @return string Image URL or empty string
+ *
+ * @since 2.12.0
+ */
+function get_sermon_image_url( $fallback = true ) {
+ if ( get_the_post_thumbnail_url() ) {
+ return get_the_post_thumbnail_url();
+ }
+
+ if ( $fallback ) {
+ foreach (
+ apply_filters( 'sermon-images-get-the-terms', '', array(
+ 'post_id' => get_the_ID()
+ ) ) as $term
+ ) {
+ if ( isset( $term->image_id ) && $term->image_id !== 0 ) {
+ $image = wp_get_attachment_image_url( $term->image_id, 'full' );
+ if ( $image ) {
+ return $image;
+ }
+ }
+ }
+ }
+
+ return '';
+}
+
+/**
+ * Renders the video player
+ *
+ * @param string $url The URL of the video file
+ *
+ * @return string Video player HTML
+ *
+ * @since 2.11.0
+ */
+function wpfc_render_video( $url = '' ) {
+ if ( ! is_string( $url ) || trim( $url ) === '' ) {
+ return '';
+ }
+
+ $player = \SermonManager::getOption( 'player' ) ?: 'plyr';
+
+ if ( $player === 'wordpress' ) {
+ $attr = array(
+ 'src' => $url,
+ 'preload' => 'none'
+ );
+
+ $output = wp_video_shortcode( $attr );
+ } else {
+ $is_youtube_long = strpos( strtolower( $url ), 'youtube.com' );
+ $is_youtube_short = strpos( strtolower( $url ), 'youtu.be' );
+ $is_youtube = $is_youtube_long || $is_youtube_short;
+ $is_vimeo = strpos( strtolower( $url ), 'vimeo.com' );
+
+ if ( $is_youtube || $is_vimeo ) {
+ $output = '
';
+ } else {
+ $output = '
';
+ $output .= '';
+ $output .= ' ';
+ }
+ }
+
+ /**
+ * Allows changing of the video player to any HTML
+ *
+ * @param string $output Video player HTML
+ * @param string $url Video source URL
+ */
+ return apply_filters( 'sm_video_player', $output, $url );
+}
+
+/**
+ * Renders the audio player
+ *
+ * @param string $url The URL of the audio file
+ *
+ * @return string Audio player HTML
+ */
+function wpfc_render_audio( $url = '' ) {
+ if ( ! is_string( $url ) || trim( $url ) === '' ) {
+ return '';
+ }
+
+ $player = \SermonManager::getOption( 'player' ) ?: 'plyr';
+
+ if ( $player === 'wordpress' ) {
+ $attr = array(
+ 'src' => $url,
+ 'preload' => 'none'
+ );
+
+ $output = wp_audio_shortcode( $attr );
+ } else {
+ $output = '
';
+ $output .= '';
+ $output .= ' ';
+ }
+
+ /**
+ * Allows changing of the audio player to any HTML
+ *
+ * @param string $output Audio player HTML
+ * @param string $url Audio source URL
+ */
+ return apply_filters( 'sm_audio_player', $output, $url );
+}
+
+/**
+ * Render sermon attachments HTML
+ *
+ * @return string
+ */
+function wpfc_sermon_attachments() {
+ if ( ! get_wpfc_sermon_meta( 'sermon_audio' ) &&
+ ! get_wpfc_sermon_meta( 'sermon_notes' ) &&
+ ! get_wpfc_sermon_meta( 'sermon_bulletin' ) ) {
+ return '';
+ }
+
+ $html = '
';
+
+ return apply_filters( 'sm_attachments_html', $html );
+}
+
+/**
+ * Renders updates single sermon view
+ *
+ * @param bool $return True to return output, false to echo (default)
+ * @param WP_Post $post WP_Post instance of the sermon
+ *
+ * @return string The HTML if $return is set to true
+ */
+function wpfc_sermon_single_v2( $return = false, $post = null ) {
+ if ( $post === null ) {
+ global $post;
+ }
+
+ ob_start();
+ ?>
+
+
>
+
+
+
+
+
+
+
+
+
+
+ ID ) ) : ?>
+
+ ID, 'wpfc_sermon_topics' ) ?>
+
+
+
+
+
+
+
+
>
+
+
+
+
+
+
+ ID ) ) : ?>
+
+ ID, 'wpfc_sermon_series' ) ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ fields for
element
+ *
+ * @param string $taxonomy Taxonomy name
+ * @param string $default Force a default value regardless the query var
+ *
+ * @return string HTML fields
+ *
+ * @since 2.5.0 added $default
+ */
+function wpfc_get_term_dropdown( $taxonomy, $default = '' ) {
+ // reset var
+ $html = '';
+
+ $terms = get_terms( array(
+ 'taxonomy' => $taxonomy,
+ 'hide_empty' => false, // todo: add option to disable/enable this globally
+ ) );
+
+ if ( $taxonomy === 'wpfc_bible_book' && \SermonManager::getOption( 'sort_bible_books', true ) ) {
+ // book order
+ $books = array(
+ 'Genesis',
+ 'Exodus',
+ 'Leviticus',
+ 'Numbers',
+ 'Deuteronomy',
+ 'Joshua',
+ 'Judges',
+ 'Ruth',
+ '1 Samuel',
+ '2 Samuel',
+ '1 Kings',
+ '2 Kings',
+ '1 Chronicles',
+ '2 Chronicles',
+ 'Ezra',
+ 'Nehemiah',
+ 'Esther',
+ 'Job',
+ 'Psalm',
+ 'Proverbs',
+ 'Ecclesiastes',
+ 'Song of Songs',
+ 'Isaiah',
+ 'Jeremiah',
+ 'Lamentations',
+ 'Ezekiel',
+ 'Daniel',
+ 'Hosea',
+ 'Joel',
+ 'Amos',
+ 'Obadiah',
+ 'Jonah',
+ 'Micah',
+ 'Nahum',
+ 'Habakkuk',
+ 'Zephaniah',
+ 'Haggai',
+ 'Zechariah',
+ 'Malachi',
+ 'Matthew',
+ 'Mark',
+ 'Luke',
+ 'John',
+ 'Acts',
+ 'Romans',
+ '1 Corinthians',
+ '2 Corinthians',
+ 'Galatians',
+ 'Ephesians',
+ 'Philippians',
+ 'Colossians',
+ '1 Thessalonians',
+ '2 Thessalonians',
+ '1 Timothy',
+ '2 Timothy',
+ 'Titus',
+ 'Philemon',
+ 'Hebrews',
+ 'James',
+ '1 Peter',
+ '2 Peter',
+ '1 John',
+ '2 John',
+ '3 John',
+ 'Jude',
+ 'Revelation',
+ 'Topical',
+ );
+
+ $ordered_terms = $unordered_terms = array();
+
+ // assign every book a number
+ foreach ( $terms as $term ) {
+ if ( array_search( $term->name, $books ) !== false ) {
+ $ordered_terms[ array_search( $term->name, $books ) ] = $term;
+ } else {
+ $unordered_terms[] = $term;
+ }
+ }
+
+ // order the numbers (books)
+ ksort( $ordered_terms );
+
+ $terms = array_merge( $ordered_terms, $unordered_terms );
+ }
+
+ foreach ( $terms as $term ) {
+ $html .= ' slug === get_query_var( $taxonomy ) : $term->slug === $default ) ? 'selected' : '' ) . '>' . $term->name . ' ';
+ }
+
+ return $html;
+}
\ No newline at end of file
diff --git a/includes/template-tags.php b/includes/template-tags.php
deleted file mode 100755
index b8c4b0a..0000000
--- a/includes/template-tags.php
+++ /dev/null
@@ -1,779 +0,0 @@
-
-
-
-displaySermonSorting()
- *
- * @return string the HTML
- *
- * @since 2.5.0 added $args
- */
-function render_wpfc_sorting( $args = array() ) {
- $action = site_url() . '/' . ( SermonManager::getOption( 'common_base_slug' ) ? ( SermonManager::getOption( 'archive_slug' ) ?: 'sermons' ) : '' );
-
- // Filters HTML fields data
- $filters = array(
- array(
- 'className' => 'sortPreacher',
- 'taxonomy' => 'wpfc_preacher',
- /* Translators: %s: Preacher label (sentence case; singular) */
- 'title' => sprintf( __( 'Filter by %s', 'sermon-manager-for-wordpress' ), \SermonManager::getOption( 'preacher_label' ) ?: 'Preacher' ),
- ),
- array(
- 'className' => 'sortSeries',
- 'taxonomy' => 'wpfc_sermon_series',
- 'title' => __( 'Filter by Series', 'sermon-manager-for-wordpress' )
- ),
- array(
- 'className' => 'sortTopics',
- 'taxonomy' => 'wpfc_sermon_topics',
- 'title' => __( 'Filter by Topic', 'sermon-manager-for-wordpress' )
- ),
- array(
- 'className' => 'sortBooks',
- 'taxonomy' => 'wpfc_bible_book',
- 'title' => __( 'Filter by Book', 'sermon-manager-for-wordpress' )
- ),
- );
-
- ob_start(); ?>
-
- ID, $args, true );
- if ( $data != '' ) {
- echo $before . $data . $after;
- }
-
- echo '';
-}
-
-// return any sermon meta
-function get_wpfc_sermon_meta( $args ) {
- global $post;
- $data = get_post_meta( $post->ID, $args, true );
- if ( $data != '' ) {
- return $data;
- }
-
- return null;
-}
-
-function process_wysiwyg_output( $meta_key, $post_id = 0 ) {
- global $wp_embed;
-
- $post_id = $post_id ? $post_id : get_the_id();
-
- $content = get_post_meta( $post_id, $meta_key, true );
- $content = $wp_embed->autoembed( $content );
- $content = $wp_embed->run_shortcode( $content );
- $content = wpautop( $content );
- $content = do_shortcode( $content );
-
- return $content;
-}
-
-// render/return sermon description
-function wpfc_sermon_description( $before = '', $after = '', $return = false ) {
- global $post;
- $output = $before . wpautop( process_wysiwyg_output( 'sermon_description', get_the_ID() ) ) . $after;
-
- if ( $return ) {
- return $output;
- } else {
- echo $output;
- }
-}
-
-// Change the_author to the preacher on frontend display
-function wpfc_sermon_author_filter() {
- global $post;
- $preacher = the_terms( $post->ID, 'wpfc_preacher', '', ', ', ' ' );
-
- return $preacher;
-}
-
-//add_filter('the_author', 'wpfc_sermon_author_filter');
-
-// render sermon image - loops through featured image, series image, speaker image, none
-function render_sermon_image( $size ) {
- //$size = any defined image size in WordPress
- if ( has_post_thumbnail() ) :
- the_post_thumbnail( $size );
- elseif ( apply_filters( 'sermon-images-list-the-terms', '', array( 'taxonomy' => 'wpfc_sermon_series', ) ) ) :
- // get series image
- print apply_filters( 'sermon-images-list-the-terms', '', array(
- 'image_size' => $size,
- 'taxonomy' => 'wpfc_sermon_series',
- 'after' => '',
- 'after_image' => '',
- 'before' => '',
- 'before_image' => ''
- ) );
- elseif ( ! has_post_thumbnail() && ! apply_filters( 'sermon-images-list-the-terms', '', array( 'taxonomy' => 'wpfc_sermon_series', ) ) ) :
- // get speaker image
- print apply_filters( 'sermon-images-list-the-terms', '', array(
- 'image_size' => $size,
- 'taxonomy' => 'wpfc_preacher',
- 'after' => '',
- 'after_image' => '',
- 'before' => '',
- 'before_image' => ''
- ) );
- endif;
-}
-
-/*
- * render media files section
- * for template files use
- * do_action ('sermon_media');
- *
- */
-function wpfc_sermon_media() {
- $html = '';
-
- if ( get_wpfc_sermon_meta( 'sermon_video_link' ) ) {
- $html .= '';
- $html .= wpfc_render_video( get_wpfc_sermon_meta( 'sermon_video_link' ) );
- $html .= '
';
- } else {
- $html .= '';
- $html .= do_shortcode( get_wpfc_sermon_meta( 'sermon_video' ) );
- $html .= '
';
- }
-
- if ( get_wpfc_sermon_meta( 'sermon_audio' ) ) {
- $html .= '';
- $html .= wpfc_render_audio( get_wpfc_sermon_meta( 'sermon_audio' ) );
- $html .= '
';
- }
-
- return $html;
-}
-
-/**
- * Renders the video player
- *
- * @param string $url The URL of the video file
- *
- * @return string Video player HTML
- *
- * @since 2.11.0
- */
-function wpfc_render_video( $url = '' ) {
- if ( ! is_string( $url ) || trim( $url ) === '' ) {
- return '';
- }
-
- $player = \SermonManager::getOption( 'player' ) ?: 'plyr';
-
- if ( $player === 'wordpress' ) {
- $attr = array(
- 'src' => $url,
- 'preload' => 'none'
- );
-
- $output = wp_video_shortcode( $attr );
- } else {
- $is_youtube_long = strpos( strtolower( $url ), 'youtube.com' );
- $is_youtube_short = strpos( strtolower( $url ), 'youtu.be' );
- $is_youtube = $is_youtube_long || $is_youtube_short;
- $is_vimeo = strpos( strtolower( $url ), 'vimeo.com' );
-
- if ( $is_youtube || $is_vimeo ) {
- $output = '
';
- } else {
- $output = '';
- $output .= '';
- $output .= ' ';
- }
- }
-
- /**
- * Allows changing of the video player to any HTML
- *
- * @param string $output Video player HTML
- * @param string $url Video source URL
- */
- return apply_filters( 'sm_video_player', $output, $url );
-}
-
-/**
- * Renders the audio player
- *
- * @param string $url The URL of the audio file
- *
- * @return string Audio player HTML
- */
-function wpfc_render_audio( $url = '' ) {
- if ( ! is_string( $url ) || trim( $url ) === '' ) {
- return '';
- }
-
- $player = \SermonManager::getOption( 'player' ) ?: 'plyr';
-
- if ( $player === 'wordpress' ) {
- $attr = array(
- 'src' => $url,
- 'preload' => 'none'
- );
-
- $output = wp_audio_shortcode( $attr );
- } else {
- $output = '';
- $output .= '';
- $output .= ' ';
- }
-
- /**
- * Allows changing of the audio player to any HTML
- *
- * @param string $output Audio player HTML
- * @param string $url Audio source URL
- */
- return apply_filters( 'sm_audio_player', $output, $url );
-}
-
-// legacy function
-function wpfc_sermon_files() {
- do_action( 'sermon_media' );
-}
-
-// just get the sermon audio
-function wpfc_sermon_audio() {
- $html = '';
- $html .= '';
- $html .= wpfc_render_audio( get_wpfc_sermon_meta( 'sermon_audio' ) );
- $html .= '
';
-
- return $html;
-}
-
-// render additional files
-function wpfc_sermon_attachments() {
- global $post;
-
- if ( ! get_wpfc_sermon_meta( 'sermon_audio' ) &&
- ! get_wpfc_sermon_meta( 'sermon_notes' ) &&
- ! get_wpfc_sermon_meta( 'sermon_bulletin' ) ) {
- return '';
- }
-
- $html = '';
-
- return apply_filters( 'sm_attachments_html', $html );
-}
-
-// legacy function
-function render_wpfc_sermon_single() {
- do_action( 'sermon_single' );
-}
-
-// single sermon action
-function wpfc_sermon_single( $return = false, $post = '' ) {
- if ( $post === '' ) {
- global $post;
- }
-
- ob_start();
- ?>
-
-
-
-
-
-
-
-
-
- ID, 'wpfc_sermon_topics', '
' . __( 'Sermon Topics: ', 'sermon-manager-for-wordpress' ), ',', '
' ); ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
';
- echo '',
- 'after_image' => '',
- 'before' => '';
- echo '
';
- }
- }
- }
-}
-
-/**
- * Display preacher info on an individual sermon
- */
-function wpfc_footer_preacher() {
- global $post;
- $terms = get_the_terms( $post->ID, 'wpfc_preacher' );
- if ( $terms ) {
- foreach ( $terms as $term ) {
- if ( $term->description ) {
- echo '';
- echo '',
- 'after_image' => '',
- 'before' => '';
- echo '
';
- }
- }
- }
-}
-
-/**
- * Build fields for element
- *
- * @param string $taxonomy Taxonomy name
- * @param string $default Force a default value regardless the query var
- *
- * @return string HTML fields
- *
- * @since 2.5.0 added $default
- */
-function wpfc_get_term_dropdown( $taxonomy, $default = '' ) {
- // reset var
- $html = '';
-
- $terms = get_terms( array(
- 'taxonomy' => $taxonomy,
- 'hide_empty' => false, // todo: add option to disable/enable this globally
- ) );
-
- if ( $taxonomy === 'wpfc_bible_book' && \SermonManager::getOption( 'sort_bible_books', true ) ) {
- // book order
- $books = array(
- 'Genesis',
- 'Exodus',
- 'Leviticus',
- 'Numbers',
- 'Deuteronomy',
- 'Joshua',
- 'Judges',
- 'Ruth',
- '1 Samuel',
- '2 Samuel',
- '1 Kings',
- '2 Kings',
- '1 Chronicles',
- '2 Chronicles',
- 'Ezra',
- 'Nehemiah',
- 'Esther',
- 'Job',
- 'Psalm',
- 'Proverbs',
- 'Ecclesiastes',
- 'Song of Songs',
- 'Isaiah',
- 'Jeremiah',
- 'Lamentations',
- 'Ezekiel',
- 'Daniel',
- 'Hosea',
- 'Joel',
- 'Amos',
- 'Obadiah',
- 'Jonah',
- 'Micah',
- 'Nahum',
- 'Habakkuk',
- 'Zephaniah',
- 'Haggai',
- 'Zechariah',
- 'Malachi',
- 'Matthew',
- 'Mark',
- 'Luke',
- 'John',
- 'Acts',
- 'Romans',
- '1 Corinthians',
- '2 Corinthians',
- 'Galatians',
- 'Ephesians',
- 'Philippians',
- 'Colossians',
- '1 Thessalonians',
- '2 Thessalonians',
- '1 Timothy',
- '2 Timothy',
- 'Titus',
- 'Philemon',
- 'Hebrews',
- 'James',
- '1 Peter',
- '2 Peter',
- '1 John',
- '2 John',
- '3 John',
- 'Jude',
- 'Revelation',
- 'Topical',
- );
-
- $ordered_terms = $unordered_terms = array();
-
- // assign every book a number
- foreach ( $terms as $term ) {
- if ( array_search( $term->name, $books ) !== false ) {
- $ordered_terms[ array_search( $term->name, $books ) ] = $term;
- } else {
- $unordered_terms[] = $term;
- }
- }
-
- // order the numbers (books)
- ksort( $ordered_terms );
-
- $terms = array_merge( $ordered_terms, $unordered_terms );
- }
-
- foreach ( $terms as $term ) {
- $html .= ' slug === get_query_var( $taxonomy ) : $term->slug === $default ) ? 'selected' : '' ) . '>' . $term->name . ' ';
- }
-
- return $html;
-}
-
diff --git a/readme.txt b/readme.txt
index b416b70..ec46217 100755
--- a/readme.txt
+++ b/readme.txt
@@ -3,9 +3,9 @@ Contributors: wpforchurch, nikolam
Donate link: http://wpforchurch.com/
Tags: church, sermon, sermons, preaching, podcasting, manage, managing, podcasts, itunes
Requires at least: 4.5
-Tested up to: 4.9.3
+Tested up to: 4.9.4
Requires PHP: 5.3
-Stable tag: 2.11.3
+Stable tag: 2.12.0
License: GPLv2
License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -102,6 +102,19 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
2. Sermon Files
## Changelog ##
+### 2.12.0 ###
+* New: Add all new views, much more improved
+* New: Add more options to sorting shortcode
+* Fix: Add more error checking to importing
+* Fix: Audio player defaults to "Browser HTML5" when "Disable Sermon Styles" option is checked
+* Fix: Plyr sometimes not loading
+* Fix: Rare error on PHP 5.3
+* Dev: Add an option to enable output of PHP errors in Sermon Manager
+* Dev: Add an option to load Plyr in footer
+* Dev: Add an option to use home_url in dropdown filtering
+* Dev: Load Plyr earlier
+* Dev: Make sure that import/export functions are executed only on import/export page
+
### 2.11.3 ###
* Fix: Sermon date not being saved when date format is changed
* Fix: YouTube short URL was not being detected (thanks @macbookandrew)
diff --git a/sermons.php b/sermons.php
index eb15ac7..56d2540 100755
--- a/sermons.php
+++ b/sermons.php
@@ -3,11 +3,11 @@
* 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.11.3
+ * Version: 2.12.0
* Author: WP for Church
* Author URI: https://www.wpforchurch.com/
* Requires at least: 4.5
- * Tested up to: 4.9.3
+ * Tested up to: 4.9.4
*
* Text Domain: sermon-manager-for-wordpress
* Domain Path: /languages/
@@ -131,33 +131,43 @@ public function __construct() {
// temporary hook for importing until API is properly done
add_action( 'admin_init', function () {
- if ( isset( $_GET['doimport'] ) ) {
- $class = null;
-
- switch ( $_GET['doimport'] ) {
- case 'sb':
- $class = new SM_Import_SB();
- break;
- case 'se':
- $class = new SM_Import_SE();
- break;
- }
+ if ( isset( $_GET['page'] ) && $_GET['page'] === 'sm-import-export' ) {
+ if ( isset( $_GET['doimport'] ) ) {
+ $class = null;
+
+ switch ( $_GET['doimport'] ) {
+ case 'sb':
+ $class = new SM_Import_SB();
+ break;
+ case 'se':
+ $class = new SM_Import_SE();
+ break;
+ case 'exsm':
+ $class = new SM_Export_SM();
+ $class->sermon_export_wp();
+ die();
+ break;
+ case 'sm':
+ $class = new SM_Import_SM();
+ break;
+ }
- if ( $class !== null ) {
- $class->import();
- add_action( 'admin_notices', function () {
- if ( ! ! \SermonManager::getOption( 'debug_import' ) ) : ?>
-
-
+ if ( $class !== null ) {
+ $class->import();
+ add_action( 'admin_notices', function () {
+ if ( ! ! \SermonManager::getOption( 'debug_import' ) ) : ?>
+
+
-
-
+
+
+ get_results( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s", 'wpfc_sermon' ) );
@@ -231,7 +243,7 @@ public function __construct() {
$sermon_ID = $sermon->ID;
if ( $value === 11 ) {
- $this->render_sermon_into_content( $sermon_ID, null, true );
+ $sm->render_sermon_into_content( $sermon_ID, null, true );
} else {
$wpdb->query( "UPDATE $wpdb->posts SET `post_content` = '' WHERE `ID` = $sermon_ID" );
}
@@ -253,6 +265,8 @@ public function __construct() {
$skip_excerpt_check = true;
+ $sm = SermonManager::get_instance();
+
// All sermons
$sermons = $wpdb->get_results( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s", 'wpfc_sermon' ) );
@@ -260,7 +274,7 @@ public function __construct() {
$sermon_ID = $sermon->ID;
if ( $value === 11 ) {
- $this->render_sermon_into_content( $sermon_ID, null, true );
+ $sm->render_sermon_into_content( $sermon_ID, null, true );
} else {
$wpdb->query( "UPDATE $wpdb->posts SET `post_excerpt` = '' WHERE `ID` = $sermon_ID" );
}
@@ -299,7 +313,7 @@ private function _includes() {
'includes/entry-views.php', // Entry Views Tracking
'includes/shortcodes.php', // Shortcodes
'includes/widgets.php', // Widgets
- 'includes/template-tags.php', // Template Tags
+ 'includes/sm-template-functions.php', // Template functions
'includes/podcast-functions.php', // Podcast Functions
'includes/helper-functions.php', // Global Helper Functions
);
@@ -346,6 +360,19 @@ public static function getOption( $name = '', $default = '' ) {
return SM_Admin_Settings::get_option( $name, $default );
}
+ /**
+ * Creates or returns an instance of this class.
+ *
+ * @return SermonManager A single instance of this class.
+ */
+ public static function get_instance() {
+ if ( null == self::$instance ) {
+ self::$instance = new self;
+ }
+
+ return self::$instance;
+ }
+
/**
* Saves whole Sermon HTML markup into post content for better search compatibility
*
@@ -475,19 +502,6 @@ public static function fix_sermons_ordering( $query ) {
}
}
- /**
- * Creates or returns an instance of this class.
- *
- * @return SermonManager A single instance of this class.
- */
- public static function get_instance() {
- if ( null == self::$instance ) {
- self::$instance = new self;
- }
-
- return self::$instance;
- }
-
/**
* Load plugin translations
*
@@ -518,20 +532,27 @@ public static function enqueue_scripts_styles() {
wp_enqueue_style( 'wpfc-sm-styles', SM_URL . 'assets/css/sermon.css', array(), SM_VERSION );
wp_enqueue_style( 'dashicons' );
- switch ( \SermonManager::getOption( 'player' ) ) {
- case 'mediaelement':
- wp_enqueue_script( 'wp-mediaelement' );
-
- break;
- case 'plyr':
- wp_enqueue_script( 'wpfc-sm-plyr', SM_URL . 'assets/js/plyr.js', array(), SM_VERSION );
- wp_enqueue_style( 'wpfc-sm-plyr-css', SM_URL . 'assets/css/plyr.css', array(), SM_VERSION );
- wp_add_inline_script( 'wpfc-sm-plyr', 'window.onload=function(){plyr.setup(document.querySelectorAll(\'.wpfc-sermon-player, .wpfc-sermon-video-player\'));}' );
+ wp_enqueue_script( 'wpfc-sm-additional_classes', SM_URL . 'assets/js/additional_classes.js', array(), SM_VERSION, true );
- break;
+ // load theme-specific styling, if there's any
+ if ( file_exists( SM_PATH . 'assets/css/theme-specific/' . get_option( 'template' ) . '.css' ) ) {
+ wp_enqueue_style( 'wpfc-sm-style-' . get_option( 'template' ), SM_URL . 'assets/css/theme-specific/' . get_option( 'template' ) . '.css', array( 'wpfc-sm-styles' ), SM_VERSION );
}
}
+ switch ( \SermonManager::getOption( 'player' ) ) {
+ case 'mediaelement':
+ wp_enqueue_script( 'wp-mediaelement' );
+
+ break;
+ case 'plyr':
+ wp_enqueue_script( 'wpfc-sm-plyr', SM_URL . 'assets/js/plyr.js', array(), SM_VERSION, \SermonManager::getOption( 'player_js_footer' ) );
+ wp_enqueue_style( 'wpfc-sm-plyr-css', SM_URL . 'assets/css/plyr.css', array(), SM_VERSION );
+ wp_add_inline_script( 'wpfc-sm-plyr', 'window.addEventListener(\'DOMContentLoaded\', function() {plyr.setup(document.querySelectorAll(\'.wpfc-sermon-player, .wpfc-sermon-video-player\'));})' );
+
+ break;
+ }
+
if ( ! \SermonManager::getOption( 'verse_popup' ) ) {
wp_enqueue_script( 'wpfc-sm-verse-script', SM_URL . 'assets/js/verse.js', array(), SM_VERSION );
@@ -565,11 +586,17 @@ public static function enqueue_scripts_styles() {
*
* @param array $classes An array of existing post classes
* @param array $class An array of additional classes added to the post (not needed)
- * @param int $ID The post ID
+ * @param int $post_id The post ID
*
* @return array Modified class list
*/
- public static function add_additional_sermon_classes( $classes, $class, $ID ) {
+ public static function add_additional_sermon_classes( $classes, $class, $post_id ) {
+ if ( get_post_type( $post_id ) !== 'wpfc_sermon' ) {
+ return $classes;
+ }
+
+ $additional_classes = array();
+
$taxonomies = array(
'wpfc_preacher',
'wpfc_sermon_series',
@@ -578,7 +605,7 @@ public static function add_additional_sermon_classes( $classes, $class, $ID ) {
);
foreach ( $taxonomies as $taxonomy ) {
- foreach ( (array) get_the_terms( $ID, $taxonomy ) as $term ) {
+ foreach ( (array) get_the_terms( $post_id, $taxonomy ) as $term ) {
if ( empty( $term->slug ) ) {
continue;
}
@@ -590,12 +617,31 @@ public static function add_additional_sermon_classes( $classes, $class, $ID ) {
$term_class = $term->term_id;
}
- $classes[] = esc_attr( sanitize_html_class( $taxonomy . '-' . $term_class, $taxonomy . '-' . $term->term_id ) );
+ $additional_classes[] = esc_attr( sanitize_html_class( $taxonomy . '-' . $term_class, $taxonomy . '-' . $term->term_id ) );
}
}
}
- return $classes;
+ if ( is_archive() ) {
+ $additional_classes[] = 'wpfc-sermon';
+
+ if ( \SermonManager::getOption( 'theme_compatibility' ) ) {
+ $additional_classes[] = 'noborder';
+ }
+ } else {
+ $additional_classes[] = 'wpfc-sermon-single';
+ }
+
+ /**
+ * Allows filtering of additional Sermon Manager classes
+ *
+ * @param array $classes The array of added classes
+ *
+ * @since 2.12.0
+ */
+ $additional_classes = apply_filters( 'wpfc_sermon_classes', $additional_classes, $classes, $post_id );
+
+ return array_merge( $additional_classes, $classes );
}
/**
@@ -632,5 +678,10 @@ function php_notice_handler() {
}
}
+if ( SermonManager::getOption( 'sm_debug' ) || ( defined( 'SM_DEBUG' ) && SM_DEBUG === true ) ) {
+ error_reporting( E_ALL );
+ ini_set( 'display_errors', 'On' );
+}
+
// Initialize Sermon Manager
SermonManager::get_instance();
diff --git a/views/archive-wpfc_sermon.php b/views/archive-wpfc_sermon.php
index f2e67d6..0d55fe3 100644
--- a/views/archive-wpfc_sermon.php
+++ b/views/archive-wpfc_sermon.php
@@ -1,57 +1,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- /*
- * Include the Post-Format-specific template for the content.
- * If you want to override this in a child theme, then include a file
- * called content-___.php (where ___ is the Post Format name) and that will be used instead.
- */
- wpfc_sermon_excerpt();
+
- endwhile;
-
- the_posts_pagination();
- else :
-
- get_template_part( 'template-parts/post/content', 'none' );
-
- endif; ?>
-
-
-
-
-
+
+
+
+
';
+ if ( is_archive() ) {
+ get_sidebar();
+ }
+ break;
+ case 'twentytwelve' :
+ echo '
@@ -17,11 +17,41 @@
; ?>)
+ 
@@ -44,12 +74,12 @@