From ca2f2cf549b63d9cbfee5eef8239adfa8dc6ebee Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 12 Dec 2017 08:47:30 +0100
Subject: [PATCH 01/24] Add option to filter by single series

---
 includes/shortcodes.php       |  26 ++++----
 includes/template-tags.php    |   4 ++
 views/archive-wpfc_sermon.php | 117 +++++++++++++---------------------
 views/single-wpfc_sermon.php  |  58 ++++++++---------
 4 files changed, 93 insertions(+), 112 deletions(-)

diff --git a/includes/shortcodes.php b/includes/shortcodes.php
index d53947e..bd525a4 100755
--- a/includes/shortcodes.php
+++ b/includes/shortcodes.php
@@ -612,13 +612,14 @@ function getLatestSeriesImageId( $series = 0 ) {
 	/**
 	 * Renders sorting HTML.
 	 *
-	 * @param array $atts       Shortcode parameters.
-	 *
-	 * @type string $series     Force specific series to show. Slug only
-	 * @type string $preachers  Force specific preacher to show. Slug only
-	 * @type string $topics     Force specific topic to show. Slug only
-	 * @type string $books      Force specific book to show. Slug only
-	 * @type string $visibility 'none' to hide the forced fields, 'disable' to show them as disabled and 'suggest' to
+	 * @param array $atts          Shortcode parameters.
+	 *
+	 * @type string $series_filter Do filtering in this specific series (slug)
+	 * @type string $series        Force specific series to show. Slug only
+	 * @type string $preachers     Force specific preacher to show. Slug only
+	 * @type string $topics        Force specific topic to show. Slug only
+	 * @type string $books         Force specific book to show. Slug only
+	 * @type string $visibility    'none' to hide the forced fields, 'disable' to show them as disabled and 'suggest' to
 	 *       just set the default value while allowing user to change it. Default 'suggest'
 	 *
 	 * @return string Sorting HTML
@@ -640,11 +641,12 @@ public function displaySermonSorting( $atts = array() ) {
 
 		// default shortcode options
 		$args = array(
-			'series'     => '',
-			'preachers'  => '',
-			'topics'     => '',
-			'books'      => '',
-			'visibility' => 'suggest',
+			'series_filter' => '',
+			'series'        => '',
+			'preachers'     => '',
+			'topics'        => '',
+			'books'         => '',
+			'visibility'    => 'suggest',
 		);
 
 		// merge default and user options
diff --git a/includes/template-tags.php b/includes/template-tags.php
index 9ff427a..17b74d9 100755
--- a/includes/template-tags.php
+++ b/includes/template-tags.php
@@ -186,6 +186,10 @@ function render_wpfc_sorting( $args = array() ) {
                             <option value=""><?php echo $filter['title'] ?></option>
 							<?php echo wpfc_get_term_dropdown( $filter['taxonomy'], ! empty( $args[ $filter['taxonomy'] ] ) ? $args[ $filter['taxonomy'] ] : '' ); ?>
                         </select>
+						<?php if ( $args['series_filter'] !== '' ): ?>
+                            <input type="hidden" name="wpfc_sermon_series"
+                                   value="<?= esc_attr( $args['series_filter'] ) ?>">
+						<?php endif; ?>
                         <noscript>
                             <div><input type="submit" value="Submit"/></div>
                         </noscript>
diff --git a/views/archive-wpfc_sermon.php b/views/archive-wpfc_sermon.php
index d68977d..f6922b8 100644
--- a/views/archive-wpfc_sermon.php
+++ b/views/archive-wpfc_sermon.php
@@ -1,87 +1,62 @@
 <?php
-defined( 'ABSPATH' ) or die; // exit if accessed directly
-
 /**
- * The template for displaying Sermon Archive pages.
+ * The template for displaying archive pages
+ *
+ * @link https://codex.wordpress.org/Template_Hierarchy
+ *
+ * @package WordPress
+ * @subpackage Twenty_Seventeen
+ * @since 1.0
+ * @version 1.0
  */
 
 get_header(); ?>
 
+<div class="wrap">
+
+	<?php if ( have_posts() ) : ?>
+		<header class="page-header">
+			<?php
+				the_archive_title( '<h1 class="page-title">', '</h1>' );
+				the_archive_description( '<div class="taxonomy-description">', '</div>' );
+			?>
+		</header><!-- .page-header -->
+	<?php endif; ?>
+
+	<div id="primary" class="content-area">
+		<main id="main" class="site-main" role="main">
 
-<div id="container">
-    <div id="content" role="main">
-        <h1 class="page-title"><?php echo trim( \SermonManager::getOption( 'archive_title' ) ) === '' ? esc_html__( 'Sermons', 'sermon-manager-for-wordpress' ) : \SermonManager::getOption( 'archive_title' ); ?></h1>
-		<?php echo render_wpfc_sorting(); ?>
-		<?php if ( $wp_query->max_num_pages > 1 ) : ?>
-            <div id="nav-above" class="navigation">
-                <div class="nav-previous">
-					<?php next_posts_link( wp_sprintf( /* translators: %s see msgid "&larr;", effectively <span class="meta-nav">&larr;</span> */
-						esc_html__( '%s Older sermons', 'sermon-manager-for-wordpress' ), '<span class="meta-nav">' . esc_html__( '&larr;' ) . '</span>' ) ); ?>
-                </div>
-                <div class="nav-next">
-					<?php previous_posts_link( wp_sprintf( /* translators: %s see msgid "&rarr;", effectively <span class="meta-nav">&rarr;</span> */
-						esc_html__( 'Newer sermons %s', 'sermon-manager-for-wordpress' ), '<span class="meta-nav">' . esc_html__( '&rarr;' ) . '</span>' ) ); ?>
-                </div>
-            </div>
-		<?php endif; ?>
+		<?php
+		if ( have_posts() ) : ?>
+			<?php
+			/* Start the Loop */
+			while ( have_posts() ) : the_post();
 
-		<?php if ( ! have_posts() ) : ?>
-            <div id="post-0" class="post error404 not-found">
-                <h1 class="entry-title"><?php esc_html_e( 'Not Found', 'sermon-manager-for-wordpress' ); ?></h1>
-                <div class="entry-content">
-                    <p><?php esc_html_e( 'Apologies, but no sermons were found.', 'sermon-manager-for-wordpress' ); ?></p>
-					<?php get_search_form(); ?>
-                </div>
-            </div>
-		<?php endif; ?>
+				/*
+				 * 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();
 
-		<?php while ( have_posts() ) : the_post(); ?>
-            <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                <h2 class="entry-title">
-                    <a href="<?php the_permalink(); ?>" rel="bookmark"
-                       title="<?php echo wp_sprintf( esc_attr__( 'Permalink to %s', 'sermon-manager-for-wordpress' ), the_title_attribute( 'echo=0' ) ); ?>">
-						<?php the_title(); ?>
-                    </a>
-                </h2>
+			endwhile;
 
-                <div class="entry-meta">
-					<span class="meta-prep meta-prep-author">
-						<?php echo wp_sprintf( esc_html__( 'Preached on %s', 'sermon-manager-for-wordpress' ), date_i18n( get_option( 'date_format' ), sm_get_the_date( 'U' ) ) ); ?>
-                    </span>
-                    <span class="meta-sep"> by </span>
-					<?php the_terms( $post->ID, 'wpfc_preacher', '', ', ', ' ' ); ?>
-                </div>
+			the_posts_pagination( array(
+				'prev_text' => twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '<span class="screen-reader-text">' . __( 'Previous page', 'twentyseventeen' ) . '</span>',
+				'next_text' => '<span class="screen-reader-text">' . __( 'Next page', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ),
+				'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyseventeen' ) . ' </span>',
+			) );
 
-                <div class="entry-content">
-					<?php wpfc_sermon_excerpt(); ?>
-                </div>
+		else :
 
-                <div class="entry-utility">
-					<span class="comments-link">
-						<?php $comment_count = (object) wp_count_comments( $post->ID ); ?>
-						<?php comments_popup_link( esc_html__( 'Leave a comment', 'sermon-manager-for-wordpress' ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', 1, 'sermon-manager-for-wordpress' ) ), number_format_i18n( 1 ) ), wp_sprintf( esc_html( _n( '%s comment', '%s comments', $approved_comments_count = intval( $comment_count->approved ), 'sermon-manager-for-wordpress' ) ), number_format_i18n( $approved_comments_count ) ) ); ?>
-                    </span>
-					<?php edit_post_link( esc_html__( 'Edit', 'sermon-manager-for-wordpress' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
-                </div>
-            </div>
+			get_template_part( 'template-parts/post/content', 'none' );
 
-		<?php endwhile; ?>
+		endif; ?>
 
-		<?php if ( $wp_query->max_num_pages > 1 ) : ?>
-            <div id="nav-below" class="navigation">
-                <div class="nav-previous">
-					<?php next_posts_link( wp_sprintf( /* translators: %s see msgid "&larr;", effectively <span class="meta-nav">&larr;</span> */
-						esc_html__( '%s Older sermons', 'sermon-manager-for-wordpress' ), '<span class="meta-nav">' . esc_html__( '&larr;' ) . '</span>' ) ); ?>
-                </div>
-                <div class="nav-next">
-					<?php previous_posts_link( wp_sprintf( /* translators: %s see msgid "&rarr;", effectively <span class="meta-nav">&rarr;</span> */
-						esc_html__( 'Newer sermons %s', 'sermon-manager-for-wordpress' ), '<span class="meta-nav">' . esc_html__( '&rarr;' ) . '</span>' ) ); ?>
-                </div>
-            </div>
-		<?php endif; ?>
+		</main><!-- #main -->
+	</div><!-- #primary -->
+	<?php get_sidebar(); ?>
+</div><!-- .wrap -->
 
-    </div>
-</div>
+<?php get_footer();
 
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
diff --git a/views/single-wpfc_sermon.php b/views/single-wpfc_sermon.php
index 8fa2ea1..8fc1d76 100755
--- a/views/single-wpfc_sermon.php
+++ b/views/single-wpfc_sermon.php
@@ -11,32 +11,32 @@
 
 get_header(); ?>
 
-<div id="container">
-    <div id="content" role="main">
-        <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-
-            <h1 class="entry-title"><?php the_title(); ?></h1>
-
-			<?php wpfc_sermon_single(); ?>
-
-            <div class="entry-utility">
-				<?php edit_post_link( __( 'Edit', 'sermon-manager-for-wordpress' ), '<span class="edit-link">', '</span>' ); ?>
-            </div><!-- .entry-utility -->
-
-        </div><!-- #post-## -->
-
-        <div id="nav-below" class="navigation">
-            <div class="nav-previous">
-				<?php previous_post_link( '%link', '<span class="meta-nav">' . esc_html_x( '&larr;', 'Previous post link', 'sermon-manager-for-wordpress' ) . '</span> %title' ); ?>
-            </div>
-            <div class="nav-next">
-				<?php next_post_link( '%link', '%title <span class="meta-nav">' . esc_html_x( '&rarr;', 'Next post link', 'sermon-manager-for-wordpress' ) . '</span>' ); ?>
-            </div>
-        </div><!-- #nav-below -->
-
-		<?php comments_template( '', true ); ?>
-    </div><!-- #content -->
-</div><!-- #container -->
-
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+<div class="wrap">
+	<div id="primary" class="content-area">
+		<main id="main" class="site-main" role="main">
+			<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+				<h1 class="entry-title"><?php the_title(); ?></h1>
+
+				<?php wpfc_sermon_single(); ?>
+
+				<div class="entry-utility">
+					<?php edit_post_link( __( 'Edit', 'sermon-manager-for-wordpress' ), '<span class="edit-link">', '</span>' ); ?>
+				</div><!-- .entry-utility -->
+			</div><!-- #post-## -->
+
+			<div id="nav-below" class="navigation">
+				<div class="nav-previous">
+					<?php previous_post_link( '%link', '<span class="meta-nav">' . esc_html_x( '&larr;', 'Previous post link', 'sermon-manager-for-wordpress' ) . '</span> %title' ); ?>
+				</div>
+				<div class="nav-next">
+					<?php next_post_link( '%link', '%title <span class="meta-nav">' . esc_html_x( '&rarr;', 'Next post link', 'sermon-manager-for-wordpress' ) . '</span>' ); ?>
+				</div>
+			</div><!-- #nav-below -->
+
+			<?php comments_template( '', true ); ?>
+    </main><!-- #main -->
+	</div><!-- #primary -->
+	<?php get_sidebar(); ?>
+</div><!-- .wrap -->
+
+<?php get_footer();

From c40bb44140685a3ec7337d6f1a5f024d1cea46f1 Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 12 Dec 2017 09:27:48 +0100
Subject: [PATCH 02/24] Add option to filter by multiple series

---
 includes/template-tags.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/includes/template-tags.php b/includes/template-tags.php
index 17b74d9..14834a5 100755
--- a/includes/template-tags.php
+++ b/includes/template-tags.php
@@ -186,9 +186,16 @@ function render_wpfc_sorting( $args = array() ) {
                             <option value=""><?php echo $filter['title'] ?></option>
 							<?php echo wpfc_get_term_dropdown( $filter['taxonomy'], ! empty( $args[ $filter['taxonomy'] ] ) ? $args[ $filter['taxonomy'] ] : '' ); ?>
                         </select>
-						<?php if ( $args['series_filter'] !== '' ): ?>
-                            <input type="hidden" name="wpfc_sermon_series"
-                                   value="<?= esc_attr( $args['series_filter'] ) ?>">
+						<?php if ( $args['series_filter'] !== '' && $series = explode( ',', $args['series_filter'] ) ): ?>
+							<?php if ( $series > 1 ): ?>
+								<?php foreach ( $series as $item ): ?>
+                                    <input type="hidden" name="wpfc_sermon_series[]"
+                                           value="<?= esc_attr( trim( $item ) ) ?>">
+								<?php endforeach; ?>
+							<?php else: ?>
+                                <input type="hidden" name="wpfc_sermon_series"
+                                       value="<?= esc_attr( $series[0] ) ?>">
+							<?php endif; ?>
 						<?php endif; ?>
                         <noscript>
                             <div><input type="submit" value="Submit"/></div>

From 063f3799836a3b5083bb7bf0e43891e35a11f63f Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 12 Dec 2017 09:42:33 +0100
Subject: [PATCH 03/24] Fix series filtering shortcode option

---
 includes/template-tags.php | 2 +-
 readme.txt                 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/includes/template-tags.php b/includes/template-tags.php
index 14834a5..f1574b3 100755
--- a/includes/template-tags.php
+++ b/includes/template-tags.php
@@ -186,7 +186,7 @@ function render_wpfc_sorting( $args = array() ) {
                             <option value=""><?php echo $filter['title'] ?></option>
 							<?php echo wpfc_get_term_dropdown( $filter['taxonomy'], ! empty( $args[ $filter['taxonomy'] ] ) ? $args[ $filter['taxonomy'] ] : '' ); ?>
                         </select>
-						<?php if ( $args['series_filter'] !== '' && $series = explode( ',', $args['series_filter'] ) ): ?>
+						<?php if ( isset( $args['series_filter'] ) && $args['series_filter'] !== '' && $series = explode( ',', $args['series_filter'] ) ): ?>
 							<?php if ( $series > 1 ): ?>
 								<?php foreach ( $series as $item ): ?>
                                     <input type="hidden" name="wpfc_sermon_series[]"
diff --git a/readme.txt b/readme.txt
index 697bb17..4fb4f97 100755
--- a/readme.txt
+++ b/readme.txt
@@ -100,6 +100,9 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 2. Sermon Files
 
 ## Changelog ##
+### 2.10 ###
+* New: Added option in filtering shortcode to filter only in a specific series
+
 ### 2.9.3 ###
 * Fix: Sermons can be imported again after deleting
 * Fix: Fatal error on PHP 7.2

From ea9bfdd57e0a3ef45af490b8eda9bede68398edb Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 12 Dec 2017 10:14:25 +0100
Subject: [PATCH 04/24] Add missing shortcode parameter

---
 includes/shortcodes.php | 2 ++
 readme.txt              | 1 +
 2 files changed, 3 insertions(+)

diff --git a/includes/shortcodes.php b/includes/shortcodes.php
index bd525a4..b5d2359 100755
--- a/includes/shortcodes.php
+++ b/includes/shortcodes.php
@@ -406,6 +406,7 @@ public function displayImages( $atts = array() ) {
 	 * @type string $atts ['size'] Image size. Possible options: sermon_small, sermon_medium, sermon_wide, thumbnail,
 	 *       medium, large, full, or any size added with add_image_size()
 	 * @type bool   $atts ['show_title'] false to hide the series title (true is the default)
+	 * @type bool   $atts ['show_desc'] false to hide the series description (true is the default)
 	 * @type string $atts ['title_wrapper'] Possible options: p, h1, h2, h3, h4, h5, h6, div
 	 * @type string $atts ['title_class'] CSS class for title
 	 * @type string $atts ['service_type'] Service type ID/slug/name. Used to get latest series from that service type.
@@ -432,6 +433,7 @@ function displayLatestSeriesImage( $atts = array() ) {
 			'image_class'      => 'latest-series-image',
 			'size'             => 'large',
 			'show_title'       => true,
+			'show_desc'        => true,
 			'title_wrapper'    => 'h3',
 			'title_class'      => 'latest-series-title',
 			'service_type'     => '',
diff --git a/readme.txt b/readme.txt
index 4fb4f97..f56c307 100755
--- a/readme.txt
+++ b/readme.txt
@@ -102,6 +102,7 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 ## Changelog ##
 ### 2.10 ###
 * New: Added option in filtering shortcode to filter only in a specific series
+* Fix: Fix warning in `latest_series` shortcode
 
 ### 2.9.3 ###
 * Fix: Sermons can be imported again after deleting

From 2256d20362fdce02bc0094685263da2f04e3d575 Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 12 Dec 2017 13:19:40 +0100
Subject: [PATCH 05/24] Replace bib.ly with reftagger.com

---
 assets/js/bibly.min.js                        | 54 -------------------
 assets/js/verse.js                            | 11 ++++
 .../settings/class-sm-settings-verse.php      | 26 ++++++---
 readme.txt                                    |  1 +
 sermons.php                                   |  9 ++--
 5 files changed, 33 insertions(+), 68 deletions(-)
 delete mode 100644 assets/js/bibly.min.js
 create mode 100644 assets/js/verse.js

diff --git a/assets/js/bibly.min.js b/assets/js/bibly.min.js
deleted file mode 100644
index 5c63ad4..0000000
--- a/assets/js/bibly.min.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*!
- * bib.ly
- * Bible reference shortener and popup linker
- * http://bib.ly/
- *
- * Copyright 2012, John Dyer (http://j.hn/)
- *
- * Scripture quotations marked "ESV" are taken from The Holy Bible, English Standard Version. 
- * Copyright ©2001 by Crossway Bibles, a publishing ministry of Good News Publishers. Used by permission. 
- * All rights reserved. Text provided by the Crossway Bibles Web Service (http://www.gnpcb.org/esv/share/services/).
- *
- * NET Bible® copyright ©1996-2006 by Biblical Studies Press, L.L.C. (http://bible.org/)
- *
- * For all other versions, this site uses the Biblia web services (http://biblia.com/) 
- * from Logos Bible Software (http://www.logos.com/)
- */
-
-var bible={};
-(function(){var c=function(j){return j.split(" ")},g=function(j,l){var r=l.split(" "),k=[],i=null,m,v,n,s;if(j==1)i=["1","I","First"];else if(j==2)i=["2","II","Second"];else if(j==3)i=["3","III","Third"];m=0;for(v=r.length;m<v;m++){n=0;for(s=i.length;n<s;n++){k.push(i[n]+" "+r[m]);n===0&&k.push(i[n]+r[m])}}k.unshift(i[0]+r[1]);k.unshift(i[0]+" "+r[0]);return k};bible.Books=[{names:c("Genesis Ge Gen"),verses:[31,25,24,26,32,22,24,22,29,32,32,20,18,24,21,16,27,33,38,18,34,24,20,67,34,35,46,22,35,43,
-55,32,20,31,29,43,36,30,23,23,57,38,34,34,28,34,31,22,33,26]},{names:c("Exodus Ex Exo Exod"),verses:[22,25,22,31,23,30,25,32,35,29,10,51,22,31,27,36,16,27,25,26,36,31,33,18,40,37,21,43,46,38,18,35,23,35,35,38,29,31,43,38]},{names:c("Leviticus Le Lev"),verses:[17,16,17,35,19,30,38,36,24,20,47,8,59,57,33,34,16,30,37,27,24,33,44,23,55,46,34]},{names:c("Numbers Nu Num"),verses:[54,34,51,49,31,27,89,26,23,36,35,16,33,45,41,50,13,32,22,29,35,41,30,25,18,65,23,31,40,16,54,42,56,29,34,13]},{names:c("Deuteronomy Dt Deut Deu De"),
-verses:[46,37,29,49,33,25,26,20,29,22,32,32,18,29,23,22,20,22,21,20,23,30,25,22,19,19,26,68,29,20,30,52,29,12]},{names:c("Joshua Js Jos Jos Josh"),verses:[18,24,17,24,15,27,26,35,27,43,23,24,33,15,63,10,18,28,51,9,45,34,16,33]},{names:c("Judges Jg Jud Jdg Ju Jdgs Judg"),verses:[36,23,31,24,31,40,25,35,57,18,40,15,25,20,20,31,13,31,30,48,25]},{names:c("Ruth Ru Rut"),verses:[22,23,18,22]},{names:g(1,"Samuel Sa Sam"),verses:[28,36,21,22,12,21,17,22,27,27,15,25,23,52,35,23,58,30,24,42,15,23,29,22,44,
-25,12,25,11,31,13]},{names:g(2,"Samuel Sa Sam"),verses:[27,32,39,12,25,23,29,18,13,19,27,31,39,33,37,23,29,33,43,26,22,51,39,25]},{names:g(1,"Kings Ki King Kin Kngs"),verses:[53,46,28,34,18,38,51,66,28,29,43,33,34,31,34,34,24,46,21,43,29,53]},{names:g(2,"Kings Ki King Kin Kngs"),verses:[18,25,27,44,27,33,20,29,37,36,21,21,25,29,38,20,41,37,37,21,26,20,37,20,30]},{names:g(1,"Chronicles Ch Chr"),verses:[54,55,24,43,26,81,40,40,44,14,47,40,14,17,29,43,27,17,19,8,30,19,32,31,31,32,34,21,30]},{names:g(2,
-"Chronicles Ch Chr"),verses:[17,18,17,22,14,42,22,18,31,19,23,16,22,15,19,14,19,34,11,37,20,12,21,27,28,23,9,27,36,27,21,33,25,33,27,23]},{names:c("Ezra Ez Ezr"),verses:[11,70,13,24,17,22,28,36,15,44]},{names:c("Nehemiah Ne Neh Neh Ne"),verses:[11,20,32,23,19,19,73,18,38,39,36,47,31]},{names:c("Esther Es Est Esth"),verses:[22,23,15,17,14,14,10,17,32,3]},{names:c("Job Jb Job"),verses:[22,13,26,21,27,30,21,22,35,22,20,25,28,22,35,22,16,21,29,29,34,30,17,25,6,14,23,28,25,31,40,22,33,37,16,33,24,41,30,
-24,34,17]},{names:c("Psalm Ps Psa Pss Psalms"),verses:[6,12,8,8,12,10,17,9,20,18,7,8,6,7,5,11,15,50,14,9,13,31,6,10,22,12,14,9,11,12,24,11,22,22,28,12,40,22,13,17,13,11,5,26,17,11,9,14,20,23,19,9,6,7,23,13,11,11,17,12,8,12,11,10,13,20,7,35,36,5,24,20,28,23,10,12,20,72,13,19,16,8,18,12,13,17,7,18,52,17,16,15,5,23,11,13,12,9,9,5,8,28,22,35,45,48,43,13,31,7,10,10,9,8,18,19,2,29,176,7,8,9,4,8,5,6,5,6,8,8,3,18,3,3,21,26,9,8,24,13,10,7,12,15,21,10,20,14,9,6]},{names:c("Proverbs Pr Prov Pro"),verses:[33,
-22,35,27,23,35,27,36,18,32,31,28,25,35,33,33,28,24,29,30,31,29,35,34,28,28,27,28,27,33,31]},{names:c("Ecclesiastes Ec Ecc"),verses:[18,26,22,16,20,12,29,17,18,20,10,14]},{names:["Song of Solomon","SOS","Song of Songs"],verses:[17,17,11,16,16,13,13,14]},{names:c("Isaiah Isa"),verses:[31,22,26,6,30,13,25,22,21,34,16,6,22,32,9,14,14,7,25,6,17,25,18,23,12,21,13,29,24,33,9,20,24,17,10,22,38,22,8,31,29,25,28,28,25,13,15,22,26,11,23,15,12,17,13,12,21,14,21,22,11,12,19,12,25,24]},{names:c("Jeremiah Je Jer"),
-verses:[19,37,25,31,31,30,34,22,26,25,23,17,27,22,21,21,27,23,15,18,14,30,40,10,38,24,22,17,32,24,40,44,26,22,19,32,21,28,18,16,18,22,13,30,5,28,7,47,39,46,64,34]},{names:c("Lamentations La Lam Lament"),verses:[22,22,66,22,22]},{names:c("Ezekiel Ek Ezek Eze"),verses:[28,10,27,17,17,14,27,18,11,22,25,28,23,23,8,63,24,32,14,49,32,31,49,27,17,21,36,26,21,26,18,32,33,31,15,38,28,23,29,49,26,20,27,31,25,24,23,35]},{names:c("Daniel Da Dan Dl Dnl"),verses:[21,49,30,37,31,28,28,27,27,21,45,13]},{names:c("Hosea Ho Hos"),
-verses:[11,23,5,19,15,11,16,14,17,15,12,14,16,9]},{names:c("Joel Jl Joel Joe"),verses:[20,32,21]},{names:c("Amos Am Amos Amo"),verses:[15,16,15,13,27,14,17,14,15]},{names:c("Obadiah Ob Oba Obd Odbh"),verses:[21]},{names:c("Jonah Jh Jon Jnh"),verses:[17,10,10,11]},{names:c("Micah Mi Mic"),verses:[16,13,12,13,15,16,20]},{names:c("Nahum Na Nah Na"),verses:[15,13,19]},{names:c("Habakkuk Hb Hab Hk Habk"),verses:[17,20,19]},{names:c("Zephaniah Zp Zep Zeph Ze"),verses:[18,15,20]},{names:c("Haggai Ha Hag Hagg"),
-verses:[15,23]},{names:c("Zechariah Zc Zech Zec"),verses:[21,13,10,14,11,15,14,23,17,12,17,14,9,21]},{names:c("Malachi Ml Mal Mlc"),verses:[14,17,18,6]},{names:c("Matthew Mt Matt Mat"),verses:[25,23,17,25,48,34,29,34,38,42,30,50,58,36,39,28,27,35,30,34,46,46,39,51,46,75,66,20]},{names:c("Mark Mk Mrk"),verses:[45,28,35,41,43,56,37,38,50,52,33,44,37,72,47,20]},{names:c("Luke Lk Luk Lu"),verses:[80,52,38,44,39,49,50,56,62,42,54,59,35,35,32,31,37,43,48,47,38,71,56,53]},{names:c("John Jn Joh Jo"),verses:[51,
-25,36,54,47,71,53,59,41,42,57,50,38,31,27,33,26,40,42,31,25]},{names:c("Acts Ac Act"),verses:[26,47,26,37,42,15,60,40,43,48,30,25,52,28,41,40,34,28,41,38,40,30,35,27,27,32,44,31]},{names:c("Romans Ro Rom Rmn Rmns"),verses:[32,29,31,25,21,23,25,39,33,21,36,21,14,23,33,27]},{names:g(1,"Corinthians Co Cor"),verses:[31,16,23,21,13,20,40,13,27,33,34,31,13,40,58,24]},{names:g(2,"Corinthians Co Cor"),verses:[24,17,18,18,21,18,16,24,15,18,33,21,14]},{names:c("Galatians Ga Gal Gltns"),verses:[24,21,29,31,
-26,18]},{names:c("Ephesians Ep Eph Ephn"),verses:[23,22,21,32,33,24]},{names:c("Philippians Phi Phil Phi"),verses:[30,30,21,23]},{names:c("Colossians Co Col Colo Cln Clns"),verses:[29,23,25,18]},{names:g(1,"Thessalonians Th Thess Thes"),verses:[10,20,13,18,28]},{names:g(2,"Thessalonians Th Thess Thes"),verses:[12,17,18]},{names:g(1,"Timothy Ti Tim"),verses:[20,15,16,16,25,21]},{names:g(2,"Timothy Ti Tim"),verses:[18,26,17,22]},{names:c("Titus Ti Tit Tt Ts"),verses:[16,15,15]},{names:c("Philemon Pm Phile Philm Pm"),
-verses:[25]},{names:c("Hebrews He Heb Hw"),verses:[14,18,19,16,14,20,28,13,28,39,40,29,25]},{names:c("James Jm Jam Jas Ja"),verses:[27,26,18,17,20]},{names:g(1,"Peter Pe Pet P"),verses:[25,25,22,19,14]},{names:g(2,"Peter Pe Pet P"),verses:[21,22,18]},{names:g(1,"John Jo Jn J"),verses:[10,29,24,21,21]},{names:g(2,"John Jo Jn J"),verses:[13]},{names:g(3,"John Jo Jn J"),verses:[14]},{names:c("Jude"),verses:[25]},{names:c("Revelation Re Rev Rvltn"),verses:[20,29,22,11,14,17,17,13,21,11,19,17,18,20,8,
-21,18,24,21,15,27,20]}]})();bible.genNames=function(){for(var c=[],g=0,j=bible.Books.length;g<j;g++)c.push(bible.Books[g].names.join("|"));return c.join("|")};
-bible.parseReference=function(c){var g=-1,j=-1,l=-1,r=-1,k=-1;c=(new String(c)).replace("&ndash;","-").replace("\u2013","-").replace(/(\d+[\.:])\s+(\d+)/gi,"$1$2");var i,m,v,n,s=false,u=false,h=false,t="",p,q=null;for(i=c.length;i>=0;i--)if(/[A-Za-z\s]/.test(c.substring(i-1,i))){q=c.substring(0,i);break}if(q!=null){q=q.replace(/\s+$/,"").replace(/\.+$/,"").toLowerCase();i=0;for(v=bible.Books.length;i<v&&g==-1;i++){m=0;for(n=bible.Books[i].names.length;m<n;m++){p=(new String(bible.Books[i].names[m])).toLowerCase();
-if(q==p){g=i;c=c.substring(p.length);break}}}if(g>-1){for(i=0;i<c.length;i++){m=c.charAt(i);if(m==" "||isNaN(m)){if(h){if(m=="-"||m=="\u2013"){s=true;u=false}else if(m==":"||m==","||m==".")u=true;t="";h=false}}else{h=true;t+=m;if(u)if(s)k=parseInt(t,10);else l=parseInt(t,10);else if(s)r=parseInt(t,10);else j=parseInt(t,10)}}if(bible.Books[g].verses.length==1)if(j>1&&l==-1){l=j;j=1}if(j>0&&l>0&&r>0&&k<=0){k=r;r=j}if(j>0&&l<=0&&r>0&&k>0)l=1;if(g>-1&&j<=0&&l<=0&&r<=0&&k<=0)j=1;if(typeof bible.Books[g].verses!=
-"undefined"){if(j==-1)j=1;else if(j>bible.Books[g].verses.length){j=bible.Books[g].verses.length;if(l>0)l=1}if(l>bible.Books[g].verses[j-1])l=bible.Books[g].verses[j-1];if(l>0&&k<=l)k=r=-1}}}return bible.Reference(g,j,l,r,k)};
-bible.Reference=function(){var c=-1,g=-1,j=-1,l=-1,r=-1,k=arguments;if(k.length!=0)if(k.length==1&&typeof k[0]=="string")return bible.parseReference(k[0]);else if(k.length==1)return null;else{c=k[0];g=k[1];if(k.length>=3)j=k[2];if(k.length>=4)l=k[3];if(k.length>=5)r=k[4]}return{bookIndex:c,chapter:g,verse:j,chapter1:g,verse1:j,chapter2:l,verse2:r,isValid:function(){return c>-1&&c<bible.Books.length&&g>0},chapterAndVerse:function(i,m,v){i=i||":";m=m||"-";v=v||"-";var n=this.chapter1,s=this.chapter2,
-u=this.verse1,h=this.verse2;return n>0&&u<=0&&s<=0&&h<=0?n:n>0&&u>0&&s<=0&&h<=0?n+i+u:n>0&&u>0&&s<=0&&h>0?n+i+u+m+h:n>0&&u<=0&&s>0&&h<=0?n+v+s:n>0&&u>0&&s>0&&h>0?n+i+u+v+(n!=s?s+i:"")+h:"?"},toString:function(){if(this.bookIndex<0||this.bookIndex>=bible.Books.length)return"invalid";return bible.Books[this.bookIndex].names[0]+" "+this.chapterAndVerse()},toShortUrl:function(){if(this.bookIndex<0||this.bookIndex>=bible.Books.length)return"invalid";return"http://bib.ly/"+(bible.Books[this.bookIndex].names.length>
-1?bible.Books[this.bookIndex].names[1]:bible.Books[this.bookIndex].names[0])+this.chapterAndVerse(".","-","-")}}};
-(function(){var c=1E5,g=function(a,b){var d="callback"+c++,e=p.createElement("script");t[d]=function(f){b(f)};a+=(a.indexOf("?")>-1?"&":"?")+"callback="+d;e.setAttribute("src",a);e.setAttribute("type","text/javascript");q.appendChild(e)},j=function(a,b){var d=C(),e=h.maxVerses,f=new bible.Reference(a);if(f.verse1>0&&f.verse2>0&&f.verse2-f.verse1>e-1)f.verse2=f.verse1+(e-1);else if(f.verse1<=0&&f.verse2<=0){f.verse1=1;f.verse2=e;f.chapter2=-1}switch(d){default:case "NET":g("https://labs.bible.org/api/?passage="+
-encodeURIComponent(f.toString())+"&type=json",b);break;case "KJV":case "LEB":g("https://api.biblia.com/v1/bible/content/"+d+".html.json?style=oneVersePerLine&key="+h.bibliaApiKey+"&passage="+encodeURIComponent(f.toString()),b);break;case "ESV":g("http://www.esvapi.org/crossref/ref.php?reference="+encodeURIComponent(f.toString()),b)}},l,r=function(a){function b(){w=f.left-e.outer.offsetWidth/2+d.offsetWidth/2;y=f.top-e.outer.clientHeight;if(w<0)w=0;else if(w+e.outer.clientWidth>viewport.width)w=viewport.width-
-e.outer.clientWidth-20;if(y<0||y<scrollPos.y){y=f.top+d.offsetHeight+10;e.arrowtop.style.display="block";e.arrowtop_border.style.display="block";e.arrowbot.style.display="none";e.arrowbot_border.style.display="none"}else{y-=10;e.arrowtop.style.display="none";e.arrowtop_border.style.display="none";e.arrowbot.style.display="block";e.arrowbot_border.style.display="block"}e.outer.style.top=y+"px";e.outer.style.left=w+"px"}if(!a)a=t.event;if(h.enablePopups){clearTimeout(l);delete l;var d=a.target?a.target:
-a.srcElement,e=h.popup,f=n(d),w=y=0;a=C();referenceText=d.getAttribute("rel");viewport=s();scrollPos=u();e.outer.style.display="block";e.header.innerHTML=referenceText+" ("+a+")";e.content.innerHTML="Loading...<br/><br/><br/>";e.footer.innerHTML=M(a);b();j(referenceText,function(x){var z=C(),N=h.popup,O=h.maxVerses,B="",F=z+"-version",G;switch(z){default:case "NET":z=0;for(G=x.length;z<G&&z<O;z++)B+='<span class="bibly_verse_number">'+x[z].verse+"</span>"+x[z].text+" ";break;case "KJV":case "LEB":F+=
-" biblia";B=x.text;break;case "ESV":B=x.content}N.content.innerHTML='<div class="'+F+'">'+B+"</div>";b()})}},k=function(){if(h.enablePopups)l=setTimeout(v,500)},i=function(){clearTimeout(l);delete l},m=function(){l=setTimeout(v,500)},v=function(){h.popup.outer.style.display="none"},n=function(a){var b=curtop=curtopscroll=curleftscroll=0;if(a.offsetParent){do{b+=a.offsetLeft;curtop+=a.offsetTop;curleftscroll+=a.offsetParent?a.offsetParent.scrollLeft:0;curtopscroll+=a.offsetParent?a.offsetParent.scrollTop:
-0}while(a=a.offsetParent)}return{left:b,top:curtop,leftScroll:curleftscroll,topScroll:curtopscroll}},s=function(){var a=0,b=0;if(typeof t.innerWidth=="number"){a=t.innerWidth;b=t.innerHeight}else if(p.documentElement&&(p.documentElement.clientWidth||p.documentElement.clientHeight)){a=p.documentElement.clientWidth;b=p.documentElement.clientHeight}else if(q&&(q.clientWidth||q.clientHeight)){a=q.clientWidth;b=q.clientHeight}return{width:a,height:b}},u=function(){var a=0,b=0;if(q&&(q.scrollLeft||q.scrollTop)){b=
-q.scrollTop;a=q.scrollLeft}else if(p.documentElement&&(p.documentElement.scrollLeft||p.documentElement.scrollTop)){b=p.documentElement.scrollTop;a=p.documentElement.scrollLeft}else if(typeof t.pageYOffset=="number"){b=t.pageYOffset;a=t.pageXOffset}return{x:a,y:b}},h={version:"0.9.5",maxNodes:500,className:"bibly_reference",enablePopups:true,popupVersion:"ESV",linkVersion:"",bibliaApiKey:"436e02d01081d28a78a45d65f66f4416",autoStart:true,startNodeId:"",maxVerses:4,newWindow:false,ignoreClassName:"bibly_ignore",
-ignoreTags:["h1","h2","h3","h4"],newTagName:"A",handleLinks:function(a,b){a.setAttribute("href",b.toShortUrl()+(h.linkVersion!=""?"."+h.linkVersion:""));a.setAttribute("title","Read "+b.toString());a.setAttribute("rel",b.toString());a.setAttribute("class",h.className);h.newWindow&&a.setAttribute("target","_blank");A(a,"mouseover",r);A(a,"mouseout",k)}},t=window,p=document,q=null,H=["NET","ESV","KJV","LEB","DARBY"],D="\\b("+bible.genNames()+").?\\s+(((1?\\d{1,2})([.:]\\s?(\\d+))?)(\\s?[-\u2013&]\\s?(\\d+)([.:]\\s?(\\d+))?)?((\\s?,(\\s+)?((1?\\d{1,2})([.:]\\s?(\\d+))?)(\\s?[-\u2013&]\\s?(\\d+)([.:]\\s?(\\d+))?)?)|(\\s?;(\\s+)?(1?\\d{1,2})[.:]\\s?(\\d+)(\\s?[-\u2013&]\\s?(\\d+))?))*)\\b",
-P=RegExp(D,"mi"),Q=RegExp("((1?\\d{1,2})([.:]\\s?(\\d+))?)(\\s?[-\u2013&]\\s?(\\d+)([.:]\\s?(\\d+))?)?","mi"),R=["a","script","style","textarea"],o=null,S=function(a){var b=P.exec(a.data),d;o=null;if(b){d=b[0];b=a.splitText(b.index);b.splitText(d.length);return a=I(a,b)}else return a},I=function(a,b){if(b.nodeValue==null)return b;var d=b.nodeValue.indexOf(","),e=b.nodeValue.indexOf(";");d=d>0&&e>0?Math.min(d,e):Math.max(d,e);var f;if(d>0){f=b.splitText(d);for(d=1;d<f.nodeValue.length&&f.nodeValue.substring(d,
-d+1)==" ";)d++;f=f.splitText(d)}refText=b.nodeValue;d=T(refText);if(typeof d!="undefined"&&d.isValid()){newNode=a.ownerDocument.createElement(h.newTagName);a.parentNode.replaceChild(newNode,b);h.handleLinks(newNode,d);newNode.appendChild(b);if(f)newNode=I(a,f);return newNode}else return b},T=function(a){var b=new bible.Reference(a),d=null,e,f;if(b!=null&&typeof b.isValid!="undefined"&&b.isValid())return o=b;else if(o!=null){if(d=Q.exec(a)){b=parseInt(d[2],10);e=parseInt(d[4],10);f=parseInt(d[6],10);
-d=parseInt(d[8],10);if(isNaN(e))e=0;if(isNaN(f))f=0;if(isNaN(d))d=0;if(b>0&&e==0&&f==0&&d==0){o.verse1=b;o.chapter2=-1;o.verse2=-1}else if(b>0&&e>0&&f==0&&d==0){o.chapter1=b;o.verse1=e;o.chapter2=-1;o.verse2=-1}else if(b>0&&e==0&&f>0&&d==0){o.verse1=b;o.chapter2=-1;o.verse2=f}else if(b>0&&e>0&&f>0&&d==0){o.chapter1=b;o.verse1=e;o.chapter2=-1;o.verse2=f}else if(b>0&&e>0&&f>0&&d>0){o.chapter1=b;o.verse1=e;o.chapter2=f;o.verse2=d}return o}return{refText:a,toShortUrl:function(){return"http://bib.ly/"+
-a.replace(/\s/ig,"").replace(/:/ig,".").replace(/\u2013/ig,"-")},toString:function(){return a+" = Can't parse it"}}}},M=function(a){switch(a){case "NET":return'<a href="http://bible.org/">NET Bible\u00ae copyright \u00a91996-2006 by Biblical Studies Press, LLC</a>';case "ESV":return'English Standard Version. Copyright &copy;2001 by <a href="http://www.crosswaybibles.org">Crossway Bibles</a>';case "LEB":case "KJV":return a+' powered by <a href="http://biblia.com/">Biblia</a> web services from <a href="http://www.logos.com/">Logos Bible Software</a>';
-default:return""}},C=function(){for(var a=h.popupVersion.toUpperCase(),b=-1,d=0,e=H.length;d<e;d++)if(H[d].toUpperCase()===a){b=d;break}return b>-1?a:"ESV"},K=function(a){J(a.childNodes[0],1,S)},J=function(a,b,d){for(var e=0,f=RegExp("^("+R.concat(h.ignoreTags).join("|")+")$","i");a&&b>0;){e++;if(e>=h.maxNodes){setTimeout(function(){J(a,b,d)},50);break}switch(a.nodeType){case 1:if(!f.test(a.tagName.toLowerCase())&&a.childNodes.length>0&&(h.ignoreClassName==""||a.className.toString().indexOf(h.ignoreClassName)==
--1)){a=a.childNodes[0];b++;continue}break;case 3:case 4:a=d(a)}if(a.nextSibling)a=a.nextSibling;else for(;b>0;){a=a.parentNode;b--;if(a.nextSibling){a=a.nextSibling;break}}}},A=function(a,b,d){if(a.attachEvent)a.attachEvent("on"+b,d);else if(a.addEventListener)a.addEventListener(b,d,false);else{var e=a["on"+b];a["on"+b]=function(){d();e()}}},L=false;D=function(){var a,b,d,e=arguments[0]||{},f=1,w=arguments.length;if(typeof e!=="object"&&typeof e!=="function")e={};for(;f<w;f++)if((a=arguments[f])!=
-null)for(b in a){d=a[b];if(e!==d)if(d!==undefined)e[b]=d}return e};var E=function(){if(!L){L=true;p=document;q=p.body;var a=h.popup={outer:p.createElement("div")},b=["header","content","footer","arrowtop_border","arrowtop","arrowbot_border","arrowbot"],d,e,f,w,x=null;a.outer.className="bibly_popup_outer";d=0;for(e=b.length;d<e;d++){w=b[d];f=p.createElement("div");f.className="bibly_popup_"+w;a.outer.appendChild(f);a[w]=f}q.appendChild(a.outer);A(a.outer,"mouseover",i);A(a.outer,"mouseout",m);if(h.autoStart){if(h.startNodeId!=
-"")x=p.getElementById(h.startNodeId);if(x==null)x=q;K(x)}}};A(p,"DOMContentLoaded",E);A(t,"load",E);if(typeof window.bibly!="undefined")h=D(h,window.bibly);h.startBibly=E;h.scanForReferences=K;t.bibly=h})();
diff --git a/assets/js/verse.js b/assets/js/verse.js
new file mode 100644
index 0000000..4e664db
--- /dev/null
+++ b/assets/js/verse.js
@@ -0,0 +1,11 @@
+var refTagger = {
+    settings: {
+        bibleVersion: verse.bible_version
+    }
+};
+
+(function (d, t) {
+    var g = d.createElement(t), s = d.getElementsByTagName(t)[0];
+    g.src = "//api.reftagger.com/v2/RefTagger.js";
+    s.parentNode.insertBefore(g, s);
+}(document, "script"));
\ No newline at end of file
diff --git a/includes/admin/settings/class-sm-settings-verse.php b/includes/admin/settings/class-sm-settings-verse.php
index b918be1..a9cd68a 100644
--- a/includes/admin/settings/class-sm-settings-verse.php
+++ b/includes/admin/settings/class-sm-settings-verse.php
@@ -28,23 +28,33 @@ public function get_settings() {
 			array(
 				'title'   => __( 'Verse Popups', 'sermon-manager-for-wordpress' ),
 				'type'    => 'checkbox',
-				'desc'    => __( 'Disable Bib.ly verse popups', 'sermon-manager-for-wordpress' ),
+				'desc'    => __( 'Disable verse popups', 'sermon-manager-for-wordpress' ),
 				'id'      => 'bibly',
 				'default' => 'no',
 			),
 			array(
 				'title'   => __( 'Bible Version for Verse Popups', 'sermon-manager-for-wordpress' ),
 				'type'    => 'select',
-				// translators: %s see effectively <code>ESV</code>
-				'desc'    => wp_sprintf( __( 'Warning! %s is not supported if your site uses SSL (HTTPS).', 'sermon-manager-for-wordpress' ), '<code>ESV</code>' ),
 				'id'      => 'bibly_version',
 				'options' => array(
-					'KJV' => 'KJV',
-					'ESV' => 'ESV',
-					'NET' => 'NET',
-					'LEB' => 'LEB'
+					'AMP'         => 'Amplified Bible (AMP)',
+					'ASV'         => 'American Standard Version (ASV)',
+					'DAR'         => 'Darby',
+					'ESV'         => 'English Standard Version (ESV)',
+					'GW'          => 'God\'s Word',
+					'HCSB'        => 'Holman Christian Standard Bible (HCSB)',
+					'KJV'         => 'King James Version (KJV)',
+					'LEB'         => 'Lexham English Bible (LEB)',
+					'MESSAGE'     => 'Message Bible',
+					'NASB'        => 'New American Standard Bible (NASB)',
+					'NCV'         => 'New Century Version (NCV)',
+					'NIRV'        => 'New International Reader\'s Version (NIRV)',
+					'NKJV'        => 'New King James Version (NKJV)',
+					'NLT'         => 'New Living Translation (NLT)',
+					'DOUAYRHEIMS' => 'Douay-Rheims',
+					'YLT'         => 'Young\'s Literal Translation (YLT)',
 				),
-				'default' => 'KJV',
+				'default' => 'ESV',
 			),
 			array(
 				'title' => __( 'Show key verse in widget', 'sermon-manager-for-wordpress' ),
diff --git a/readme.txt b/readme.txt
index f56c307..b58fd9a 100755
--- a/readme.txt
+++ b/readme.txt
@@ -102,6 +102,7 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 ## Changelog ##
 ### 2.10 ###
 * New: Added option in filtering shortcode to filter only in a specific series
+* Change: Replace Bib.ly with reftagger.com
 * Fix: Fix warning in `latest_series` shortcode
 
 ### 2.9.3 ###
diff --git a/sermons.php b/sermons.php
index f3e00bf..604d162 100755
--- a/sermons.php
+++ b/sermons.php
@@ -286,15 +286,12 @@ public static function enqueue_scripts_styles() {
 		}
 
 		if ( ! \SermonManager::getOption( 'bibly' ) ) {
-			wp_enqueue_script( 'wpfc-sm-bibly-script', SM_URL . 'assets/js/bibly.min.js', array(), SM_VERSION );
-			wp_enqueue_style( 'wpfc-sm-bibly-style', SM_URL . 'assets/css/bibly.min.css', array(), SM_VERSION );
+			wp_enqueue_script( 'wpfc-sm-verse-script', SM_URL . 'assets/js/verse.js', array(), SM_VERSION );
 
 			// get options for JS
 			$bible_version = \SermonManager::getOption( 'bibly_version' );
-			wp_localize_script( 'wpfc-sm-bibly-script', 'bibly', array( // pass WP data into JS from this point on
-				'linkVersion'  => $bible_version,
-				'enablePopups' => true,
-				'popupVersion' => $bible_version,
+			wp_localize_script( 'wpfc-sm-verse-script', 'verse', array( // pass WP data into JS from this point on
+				'bible_version'  => $bible_version,
 			) );
 		}
 

From cba765dc7705ef3fec7b21c21294121902a140de Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 12 Dec 2017 13:24:20 +0100
Subject: [PATCH 06/24] Remove bib.ly CSS

---
 assets/css/bibly.min.css | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 assets/css/bibly.min.css

diff --git a/assets/css/bibly.min.css b/assets/css/bibly.min.css
deleted file mode 100644
index 334c513..0000000
--- a/assets/css/bibly.min.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * bib.ly
- * Bible reference shortener and popup linker
- * http://bib.ly/
- *
- * Copyright 2011, John Dyer (http://j.hn/)
- */
-
-.bibly_popup_outer{position:absolute;top:0;left:0;display:none;z-index:777777;width:270px;text-align:left;font-family:Helvetica,Arial,sans-serif;font-size:12px;line-height:1em;color:#11111;background:#fff;border:solid 1px #333;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;-webkit-box-shadow:0 1px 5px rgba(50,50,50,0.5);-moz-box-shadow:0 1px 5px rgba(50,50,50,0.5);box-shadow:0 1px 5px rgba(50,50,50,0.5);}.bibly_popup_header{background:#305274;padding:4px 10px;font-weight:bold;line-height:1.2em;color:#fff;-webkit-text-shadow:1px 1px 1px rgba(50,50,50,0.5);-moz-text-shadow:1px 1px 1px rgba(50,50,50,0.5);text-shadow:1px 1px 1px rgba(50,50,50,0.5);}.bibly_popup_footer{padding:5px 10px;font-size:8px;color:#666;}.bibly_popup_footer a{color:#666;text-decoration:underline;}.bibly_popup_arrowbot{position:absolute;bottom:-9px;left:120px;width:1px;height:1px;border:solid 30px #fff;border-width:10px 15px 0 15px;border-color:#fff transparent transparent transparent;}.bibly_popup_arrowbot_border{position:absolute;bottom:-10px;left:120px;width:1px;height:1px;border:solid 30px #000;border-width:10px 15px 0 15px;border-color:#000 transparent transparent transparent;}.bibly_popup_arrowtop{position:absolute;top:-9px;left:120px;width:1px;height:1px;border:solid 30px #305274;border-width:0 15px 10px 15px;border-color:transparent transparent #305274 transparent;}.bibly_popup_arrowtop_border{position:absolute;top:-10px;left:120px;width:1px;height:1px;border:solid 30px #000;border-width:0 15px 10px 15px;border-color:transparent transparent #000 transparent;}.bibly_popup_content{padding:10px;min-height:40px;color:#111;line-height:1.4em;}.bibly_popup_content p{display:inline;color:#111;}.bibly_popup_content .NET-version p:first-child{display:none;}.bibly_popup_content .NET-version a{display:none;}.bibly_popup_content .ESV-version h2{display:none;}.bibly_popup_content .biblia p:first-child{display:none;}.bibly_verse_number,.bibly_popup_content sup,.bibly_popup_content .ESV-version .verse-num{font-size:9px;color:#666;top:-3px;vertical-align:baseline;position:relative;margin-right:2px;}
\ No newline at end of file

From f97a7937dd549a346b87682f8a0adf153000a2e1 Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 12 Dec 2017 13:38:12 +0100
Subject: [PATCH 07/24] Change bib.ly option names

---
 includes/admin/settings/class-sm-settings-verse.php |  4 ++--
 includes/class-sm-install.php                       |  3 +++
 includes/sm-update-functions.php                    | 13 +++++++++++++
 sermons.php                                         |  4 ++--
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/includes/admin/settings/class-sm-settings-verse.php b/includes/admin/settings/class-sm-settings-verse.php
index a9cd68a..3c29564 100644
--- a/includes/admin/settings/class-sm-settings-verse.php
+++ b/includes/admin/settings/class-sm-settings-verse.php
@@ -29,13 +29,13 @@ public function get_settings() {
 				'title'   => __( 'Verse Popups', 'sermon-manager-for-wordpress' ),
 				'type'    => 'checkbox',
 				'desc'    => __( 'Disable verse popups', 'sermon-manager-for-wordpress' ),
-				'id'      => 'bibly',
+				'id'      => 'verse_popup',
 				'default' => 'no',
 			),
 			array(
 				'title'   => __( 'Bible Version for Verse Popups', 'sermon-manager-for-wordpress' ),
 				'type'    => 'select',
-				'id'      => 'bibly_version',
+				'id'      => 'verse_bible_version',
 				'options' => array(
 					'AMP'         => 'Amplified Bible (AMP)',
 					'ASV'         => 'American Standard Version (ASV)',
diff --git a/includes/class-sm-install.php b/includes/class-sm-install.php
index e8853f5..9dda8df 100644
--- a/includes/class-sm-install.php
+++ b/includes/class-sm-install.php
@@ -27,6 +27,9 @@ class SM_Install {
 		'2.9.3' => array(
 			'sm_update_293_fix_import_dates',
 		),
+		'2.10' => array(
+			'sm_update_210_update_options'
+		),
 	);
 
 	/** @var object Background update class */
diff --git a/includes/sm-update-functions.php b/includes/sm-update-functions.php
index 7ef3e3e..8b060f1 100644
--- a/includes/sm-update-functions.php
+++ b/includes/sm-update-functions.php
@@ -134,3 +134,16 @@ function sm_update_29_convert_settings() {
 function sm_update_293_fix_import_dates() {
 	sm_update_28_fill_out_empty_dates();
 }
+
+/**
+ * Removed Bibly so we will change option names
+ */
+function sm_update_210_update_options() {
+	if ( is_bool( SermonManager::getOption( 'bibly' ) ) ) {
+		update_option( 'sermonmanager_verse_popup', SermonManager::getOption( 'bibly' ) ? 'yes' : 'no' );
+	}
+
+	if ( $bible_version = SermonManager::getOption( 'bibly_version' ) ) {
+		update_option( 'sermonmanager_verse_bible_version', $bible_version );
+	}
+}
\ No newline at end of file
diff --git a/sermons.php b/sermons.php
index 604d162..febde69 100755
--- a/sermons.php
+++ b/sermons.php
@@ -285,11 +285,11 @@ public static function enqueue_scripts_styles() {
 			}
 		}
 
-		if ( ! \SermonManager::getOption( 'bibly' ) ) {
+		if ( ! \SermonManager::getOption( 'verse_popup' ) ) {
 			wp_enqueue_script( 'wpfc-sm-verse-script', SM_URL . 'assets/js/verse.js', array(), SM_VERSION );
 
 			// get options for JS
-			$bible_version = \SermonManager::getOption( 'bibly_version' );
+			$bible_version = \SermonManager::getOption( 'verse_bible_version' );
 			wp_localize_script( 'wpfc-sm-verse-script', 'verse', array( // pass WP data into JS from this point on
 				'bible_version'  => $bible_version,
 			) );

From c493e67f7828f141ffea6d510c61969f5d736bf6 Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 12 Dec 2017 14:05:23 +0100
Subject: [PATCH 08/24] Add more player options

---
 .../settings/class-sm-settings-general.php      | 15 +++++++++++----
 includes/sm-update-functions.php                |  4 ++++
 includes/template-tags.php                      |  6 ++++--
 readme.txt                                      |  1 +
 sermons.php                                     | 17 ++++++++++++-----
 5 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/includes/admin/settings/class-sm-settings-general.php b/includes/admin/settings/class-sm-settings-general.php
index d61dd01..5b3018b 100644
--- a/includes/admin/settings/class-sm-settings-general.php
+++ b/includes/admin/settings/class-sm-settings-general.php
@@ -74,10 +74,17 @@ public function get_settings() {
 				'id'    => 'archive_player',
 			),
 			array(
-				'title' => __( 'Use old audio player', 'sermon-manager-for-wordpress' ),
-				'type'  => 'checkbox',
-				'desc'  => __( 'Use old audio player', 'sermon-manager-for-wordpress' ),
-				'id'    => 'use_old_player',
+				'title'   => __( 'Audio Player', 'sermon-manager-for-wordpress' ),
+				'type'    => 'select',
+				'desc'    => __( 'Select which player to use for playing Sermons', 'sermon-manager-for-wordpress' ),
+				'id'      => 'player',
+				'options' => array(
+					'plyr'         => 'Plyr',
+					'mediaelement' => 'Mediaelement',
+					'wordpress'    => 'Old WordPress player',
+					'none'         => 'Browser HTML5',
+				),
+				'default' => 'plyr',
 			),
 			array(
 				'title'    => __( 'Custom label for &ldquo;Preacher&rdquo;', 'sermon-manager-for-wordpress' ),
diff --git a/includes/sm-update-functions.php b/includes/sm-update-functions.php
index 8b060f1..435dd60 100644
--- a/includes/sm-update-functions.php
+++ b/includes/sm-update-functions.php
@@ -146,4 +146,8 @@ function sm_update_210_update_options() {
 	if ( $bible_version = SermonManager::getOption( 'bibly_version' ) ) {
 		update_option( 'sermonmanager_verse_bible_version', $bible_version );
 	}
+
+	if ( is_bool( SermonManager::getOption( 'use_old_player' ) ) ){
+		update_option( 'sermonmanager_player', SermonManager::getOption( 'use_old_player' ) ? 'wordpress' : 'plyr' );
+	}
 }
\ No newline at end of file
diff --git a/includes/template-tags.php b/includes/template-tags.php
index f1574b3..2a545e0 100755
--- a/includes/template-tags.php
+++ b/includes/template-tags.php
@@ -332,7 +332,9 @@ function wpfc_render_audio( $url = '' ) {
 		return '';
 	}
 
-	if ( \SermonManager::getOption( 'use_old_player' ) ) {
+	$player = \SermonManager::getOption( 'player' ) ?: 'plyr';
+
+	if ( $player === 'wordpress' ) {
 		$attr = array(
 			'src'     => $url,
 			'preload' => 'none'
@@ -340,7 +342,7 @@ function wpfc_render_audio( $url = '' ) {
 
 		$output = wp_audio_shortcode( $attr );
 	} else {
-		$output = '<audio controls preload="metadata" class="wpfc-sermon-player">';
+		$output = '<audio controls preload="metadata" class="wpfc-sermon-player ' . ( $player === 'mediaelement' ? 'mejs__player' : '' ) . '">';
 		$output .= '<source src="' . $url . '">';
 		$output .= '</audio>';
 	}
diff --git a/readme.txt b/readme.txt
index b58fd9a..a531a16 100755
--- a/readme.txt
+++ b/readme.txt
@@ -102,6 +102,7 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 ## Changelog ##
 ### 2.10 ###
 * New: Added option in filtering shortcode to filter only in a specific series
+* New: Added option to pick more players for playing sermons
 * Change: Replace Bib.ly with reftagger.com
 * Fix: Fix warning in `latest_series` shortcode
 
diff --git a/sermons.php b/sermons.php
index febde69..bdf800e 100755
--- a/sermons.php
+++ b/sermons.php
@@ -278,10 +278,17 @@ 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' );
 
-			if ( ! \SermonManager::getOption( 'use_old_player' ) ) {
-				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 audio\'));}' );
+			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 audio\'));}' );
+
+					break;
 			}
 		}
 
@@ -291,7 +298,7 @@ public static function enqueue_scripts_styles() {
 			// get options for JS
 			$bible_version = \SermonManager::getOption( 'verse_bible_version' );
 			wp_localize_script( 'wpfc-sm-verse-script', 'verse', array( // pass WP data into JS from this point on
-				'bible_version'  => $bible_version,
+				'bible_version' => $bible_version,
 			) );
 		}
 

From b3ad249780c71291de42498f4964293be293bbf7 Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 12 Dec 2017 17:51:46 +0100
Subject: [PATCH 09/24] Add podcast redirect setting

Closes #144
---
 assets/js/admin/settings.js                   | 42 +++++++++++++++++++
 .../settings/class-sm-settings-podcast.php    | 20 ++++++++-
 includes/admin/views/html-admin-settings.php  |  2 +-
 includes/podcast-functions.php                | 20 ++++++++-
 4 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/assets/js/admin/settings.js b/assets/js/admin/settings.js
index e69de29..3063441 100644
--- a/assets/js/admin/settings.js
+++ b/assets/js/admin/settings.js
@@ -0,0 +1,42 @@
+/**
+ * Hide or show fields on checkbox change
+ */
+$('#enable_podcast_redirection').change(function () {
+    podcast_redirect(this.checked);
+});
+
+/**
+ * Hide or show the fields on document load
+ */
+jQuery(document).ready(function () {
+    var check = jQuery('#enable_podcast_redirection');
+
+    if (check.length) {
+        podcast_redirect(check.is(':checked'));
+    }
+});
+
+/**
+ * Shows or hides podcast redirection fields
+ *
+ * @param {bool} show True to show, false to hide
+ */
+function podcast_redirect(show) {
+    if (typeof(show) !== 'boolean')
+        return;
+
+    var el = [
+        jQuery('#podcast_redirection_old_url'),
+        jQuery('#podcast_redirection_new_url')
+    ];
+
+    for (var i = 0; i < el.length; i++) {
+        var temp = el[i];
+
+        while (!temp.is("tr")) {
+            temp = temp.parent();
+        }
+
+        show ? temp.show() : temp.hide();
+    }
+}
\ No newline at end of file
diff --git a/includes/admin/settings/class-sm-settings-podcast.php b/includes/admin/settings/class-sm-settings-podcast.php
index d61dcd3..41e9b93 100644
--- a/includes/admin/settings/class-sm-settings-podcast.php
+++ b/includes/admin/settings/class-sm-settings-podcast.php
@@ -141,6 +141,23 @@ public function get_settings() {
 				'id'    => 'enable_podcast_html_description',
 				'desc'  => __( 'Enables showing of HTML in iTunes description field. Uncheck if description looks messy.', 'sermon-manager-for-wordpress' ),
 			),
+			array(
+				'title'    => __( 'Redirect', 'sermon-manager-for-wordpress' ),
+				'type'     => 'checkbox',
+				'id'       => 'enable_podcast_redirection',
+				'desc'     => __( 'Enables redirection of podcast from old to new URL.', 'sermon-manager-for-wordpress' ),
+				'desc_tip' => __( 'You can use relative or absolute URLs.', 'sermon-manager-for-wordpress' ),
+			),
+			array(
+				'title' => __( 'Old URL', 'sermon-manager-for-wordpress' ),
+				'type'  => 'text',
+				'id'    => 'podcast_redirection_old_url',
+			),
+			array(
+				'title' => __( 'New URL', 'sermon-manager-for-wordpress' ),
+				'type'  => 'text',
+				'id'    => 'podcast_redirection_new_url',
+			),
 			array(
 				'title'       => __( 'Number of podcasts to show', 'sermon-manager-for-wordpress' ),
 				'type'        => 'number',
@@ -159,7 +176,8 @@ public function after() {
         <div>
             <p>
                 <label for="feed_url"><?= __( 'Feed URL to Submit to iTunes', 'sermon-manager-for-wordpress' ) ?></label>
-                <input type="text" disabled="disabled" value="<?= home_url( '/' ) . '?feed=rss2&post_type=wpfc_sermon' ?>" id="feed_url">
+                <input type="text" disabled="disabled"
+                       value="<?= home_url( '/' ) . '?feed=rss2&post_type=wpfc_sermon' ?>" id="feed_url">
             </p>
             <p>
 				<?= // translators: %s Feed Validator link, see msgid "Feed Validator"
diff --git a/includes/admin/views/html-admin-settings.php b/includes/admin/views/html-admin-settings.php
index 83a2e0a..92ba1de 100644
--- a/includes/admin/views/html-admin-settings.php
+++ b/includes/admin/views/html-admin-settings.php
@@ -6,7 +6,7 @@
 
 $current_tab = empty( $current_tab ) ? 'general' : $current_tab;
 ?>
-<div class="wrap sm">
+<div class="wrap sm sm_settings_<?=$current_tab?>">
     <div class="intro">
         <h1 class="wp-heading-inline">Sermon Manager Settings</h1>
     </div>
diff --git a/includes/podcast-functions.php b/includes/podcast-functions.php
index aa68718..39ab804 100644
--- a/includes/podcast-functions.php
+++ b/includes/podcast-functions.php
@@ -12,6 +12,21 @@
  */
 add_action( 'do_feed_podcast', 'wpfc_podcast_render', 10, 1 );
 
+/**
+ * Redirection, if enabled in settings
+ */
+add_action( 'parse_request', function () {
+	if ( SermonManager::getOption( 'enable_podcast_redirection' ) ) {
+		$old_url     = wp_make_link_relative( preg_replace( '{/$}', '', SermonManager::getOption( 'podcast_redirection_old_url' ) ) );
+		$current_url = preg_replace( '{/$}', '', $_SERVER['REQUEST_URI'] );
+
+		if ( strpos( $current_url, $old_url ) !== false ) {
+			wp_redirect( SermonManager::getOption( 'podcast_redirection_new_url' ), 301 );
+			exit;
+		}
+	}
+} );
+
 /**
  * Add podcast data to the WordPress default XML feed
  *
@@ -83,7 +98,7 @@ function wpfc_podcast_render() {
  * @return void
  */
 function wpfc_podcast_add_namespace() {
-	echo 'xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd"';
+	echo 'xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd" version="2.0"';
 }
 
 /**
@@ -106,13 +121,14 @@ function wpfc_podcast_add_head() {
 	);
 
 	?>
+    <!--suppress XmlUnboundNsPrefix -->
     <copyright><?php echo html_entity_decode( esc_html( \SermonManager::getOption( 'copyright' ) ), ENT_COMPAT, 'UTF-8' ) ?></copyright>
     <itunes:subtitle><?php echo esc_html( \SermonManager::getOption( 'itunes_subtitle' ) ) ?></itunes:subtitle>
     <itunes:author><?php echo esc_html( \SermonManager::getOption( 'itunes_author' ) ) ?></itunes:author>
 	<?php if ( trim( category_description() ) !== '' ) : ?>
         <itunes:summary><?php echo str_replace( '&nbsp;', '',
 				\SermonManager::getOption( 'enable_podcast_html_description' ) ?
-					stripslashes( wpautop( wp_filter_kses( category_description() ) ), true ) :
+					stripslashes( wpautop( wp_filter_kses( category_description() ) ) ) :
 					stripslashes( wp_filter_nohtml_kses( category_description() ) ) ); ?></itunes:summary>
 	<?php else: ?>
         <itunes:summary><?php echo str_replace( '&nbsp;', '',

From 0e41e602400de38f65224fd91326dfaf5468aaa9 Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 12 Dec 2017 18:03:30 +0100
Subject: [PATCH 10/24] Improve XML feed formatting

---
 includes/podcast-functions.php | 11 ++++++-----
 readme.txt                     |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/includes/podcast-functions.php b/includes/podcast-functions.php
index 39ab804..ab4ba4b 100644
--- a/includes/podcast-functions.php
+++ b/includes/podcast-functions.php
@@ -121,7 +121,7 @@ function wpfc_podcast_add_head() {
 	);
 
 	?>
-    <!--suppress XmlUnboundNsPrefix -->
+    <!--suppress XmlUnboundNsPrefix, CheckEmptyScriptTag -->
     <copyright><?php echo html_entity_decode( esc_html( \SermonManager::getOption( 'copyright' ) ), ENT_COMPAT, 'UTF-8' ) ?></copyright>
     <itunes:subtitle><?php echo esc_html( \SermonManager::getOption( 'itunes_subtitle' ) ) ?></itunes:subtitle>
     <itunes:author><?php echo esc_html( \SermonManager::getOption( 'itunes_author' ) ) ?></itunes:author>
@@ -177,10 +177,11 @@ function wpfc_podcast_add_item() {
 	?>
     <itunes:author><?php echo esc_html( $speaker ); ?></itunes:author>
     <itunes:subtitle><?php echo esc_html( $series ); ?></itunes:subtitle>
-    <itunes:summary><?php echo preg_replace( '/&nbsp;/', '',
-			\SermonManager::getOption( 'enable_podcast_html_description' ) ?
-				stripslashes( wpautop( wp_filter_kses( get_wpfc_sermon_meta( 'sermon_description' ) ) ) ) :
-				stripslashes( wp_filter_nohtml_kses( get_wpfc_sermon_meta( 'sermon_description' ) ) ) ); ?></itunes:summary>
+    <content:encoded>
+        <![CDATA[
+		<?php echo preg_replace( '/&nbsp;/', '', stripslashes( wpautop( wp_filter_kses( get_wpfc_sermon_meta( 'sermon_description' ) ) ) ) ); ?>
+        ]]>
+    </content:encoded>
 	<?php if ( $post_image ) : ?>
         <itunes:image href="<?php echo esc_url( $post_image ); ?>"/>
 	<?php endif; ?>
diff --git a/readme.txt b/readme.txt
index a531a16..2663d47 100755
--- a/readme.txt
+++ b/readme.txt
@@ -103,6 +103,8 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 ### 2.10 ###
 * New: Added option in filtering shortcode to filter only in a specific series
 * New: Added option to pick more players for playing sermons
+* New: Added an option to redirect podcast
+* Change: Improved XML feed formatting
 * Change: Replace Bib.ly with reftagger.com
 * Fix: Fix warning in `latest_series` shortcode
 

From ecf63dad99aaea6f80e57b1f5c77c30091f75d91 Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 12 Dec 2017 18:24:32 +0100
Subject: [PATCH 11/24] Fix development version update functions not executing

---
 includes/class-sm-install.php | 66 ++++++++++++++++++-----------------
 sermons.php                   | 14 --------
 2 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/includes/class-sm-install.php b/includes/class-sm-install.php
index 9dda8df..41b0388 100644
--- a/includes/class-sm-install.php
+++ b/includes/class-sm-install.php
@@ -27,7 +27,7 @@ class SM_Install {
 		'2.9.3' => array(
 			'sm_update_293_fix_import_dates',
 		),
-		'2.10' => array(
+		'2.10'  => array(
 			'sm_update_210_update_options'
 		),
 	);
@@ -49,7 +49,9 @@ public static function init() {
 	 * This check is done on all requests and runs if the versions do not match
 	 */
 	public static function check_version() {
-		if ( ! defined( 'IFRAME_REQUEST' ) && ( ( isset( $GLOBALS['sm_force_update'] ) && $GLOBALS['sm_force_update'] === true ) || get_option( 'sm_version' ) !== SM_VERSION ) ) {
+		global $pagenow;
+
+		if ( ! defined( 'IFRAME_REQUEST' ) && (( $pagenow === 'plugins.php' && isset($_GET['activate']) && $_GET['activate'] === 'true' ) || get_option( 'sm_version' ) !== SM_VERSION ) ) {
 			self::_install();
 			do_action( 'sm_updated' );
 		}
@@ -109,6 +111,36 @@ private static function _install() {
 		do_action( 'sm_installed' );
 	}
 
+	/**
+	 * Default options.
+	 *
+	 * Sets up the default options used on the settings page.
+	 *
+	 * @since 2.10
+	 */
+	private static function _create_options() {
+		// Include settings so that we can run through defaults
+		include_once 'admin/class-sm-admin-settings.php';
+
+		$settings = SM_Admin_Settings::get_settings_pages();
+
+		foreach ( $settings as $section ) {
+			if ( ! method_exists( $section, 'get_settings' ) ) {
+				continue;
+			}
+			$subsections = array_unique( array_merge( array( '' ), array_keys( $section->get_sections() ) ) );
+
+			foreach ( $subsections as $subsection ) {
+				foreach ( $section->get_settings( $subsection ) as $value ) {
+					if ( isset( $value['default'] ) && isset( $value['id'] ) ) {
+						$autoload = isset( $value['autoload'] ) ? (bool) $value['autoload'] : true;
+						add_option( $value['id'], $value['default'], '', ( $autoload ? 'yes' : 'no' ) );
+					}
+				}
+			}
+		}
+	}
+
 	/**
 	 * Push all needed DB updates to the queue for processing.
 	 */
@@ -211,36 +243,6 @@ public static function plugin_row_meta( $links, $file ) {
 
 		return (array) $links;
 	}
-
-	/**
-	 * Default options.
-	 *
-	 * Sets up the default options used on the settings page.
-	 *
-	 * @since 2.10
-	 */
-	private static function _create_options() {
-		// Include settings so that we can run through defaults
-		include_once 'admin/class-sm-admin-settings.php';
-
-		$settings = SM_Admin_Settings::get_settings_pages();
-
-		foreach ( $settings as $section ) {
-			if ( ! method_exists( $section, 'get_settings' ) ) {
-				continue;
-			}
-			$subsections = array_unique( array_merge( array( '' ), array_keys( $section->get_sections() ) ) );
-
-			foreach ( $subsections as $subsection ) {
-				foreach ( $section->get_settings( $subsection ) as $value ) {
-					if ( isset( $value['default'] ) && isset( $value['id'] ) ) {
-						$autoload = isset( $value['autoload'] ) ? (bool) $value['autoload'] : true;
-						add_option( $value['id'], $value['default'], '', ( $autoload ? 'yes' : 'no' ) );
-					}
-				}
-			}
-		}
-	}
 }
 
 SM_Install::init();
diff --git a/sermons.php b/sermons.php
index bdf800e..79e4b47 100755
--- a/sermons.php
+++ b/sermons.php
@@ -69,7 +69,6 @@ public function __construct() {
 		// Include required items
 		$this->_includes();
 
-		register_activation_hook( __FILE__, array( $this, 'check_for_update_functions' ) );
 		// load translations
 		add_action( 'after_setup_theme', array( $this, 'load_translations' ) );
 		// enqueue scripts & styles
@@ -420,19 +419,6 @@ public function render_sermon_into_content( $post_ID, $post ) {
 	function php_notice_handler() {
 		update_option( 'dismissed-' . $_POST['type'], 1 );
 	}
-
-	/**
-	 * Executes non-executed update functions on plugin activation
-	 *
-	 * Useful for development versions
-	 *
-	 * @since 2.9.3
-	 */
-	function check_for_update_functions() {
-		$GLOBALS['sm_force_update'] = true;
-
-		include_once 'includes/class-sm-install.php';
-	}
 }
 
 // Initialize Sermon Manager

From 9d36aa5aa895709ae58b053b187716c1a9a84bbf Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 12 Dec 2017 20:12:17 +0100
Subject: [PATCH 12/24] Add function for getting png image dimensions

---
 includes/sm-core-functions.php | 82 ++++++++++++++++++++++++++++++++--
 1 file changed, 79 insertions(+), 3 deletions(-)

diff --git a/includes/sm-core-functions.php b/includes/sm-core-functions.php
index 628652c..ba4918c 100644
--- a/includes/sm-core-functions.php
+++ b/includes/sm-core-functions.php
@@ -245,18 +245,94 @@ function sm_get_image_size( $image_size ) {
 	return apply_filters( 'sm_get_image_size_' . $image_size, $size );
 }
 
+/**
+ * Checks the file extension and gets image size based on filetype.
+ *
+ * @param string $img_loc Image URL
+ *
+ * @return array|false Array with first item as width and second as height of false if unable to get data
+ *
+ * @since 2.10
+ */
+function sm_get_image_dimensions( $img_loc ) {
+	// check if url is set
+	if ( trim( $img_loc ) === '' ) {
+		return false;
+	}
+
+	switch ( pathinfo( strtolower( $img_loc ), PATHINFO_EXTENSION ) ) {
+		case 'jpg':
+		case 'jpeg':
+			return sm_get_jpeg_dimensions( $img_loc );
+		case 'png':
+			return sm_get_png_dimensions( $img_loc );
+	}
+
+	return false;
+}
+
+/**
+ * Retrieve PNG width and height without downloading/reading entire image.
+ * Adapted from http://php.net/manual/en/function.getimagesize.php#88793
+ *
+ * @param string $img_loc Image URL
+ *
+ * @return array|false Array with first item as width and second as height of false if unable to get data
+ *
+ * @since 2.10
+ */
+function sm_get_png_dimensions( $img_loc ) {
+	$handle = @fopen( $img_loc, "rb" );
+
+	// check if url is accessible or fail gracefully
+	if ( $handle === false ) {
+		return false;
+	}
+
+	$new_block = null;
+	if ( ! feof( $handle ) ) {
+		$new_block = fread( $handle, 33 );
+		if ( $new_block[0] == "\x89" &&
+		     $new_block[1] == "\x50" &&
+		     $new_block[2] == "\x4E" &&
+		     $new_block[3] == "\x47" &&
+		     $new_block[4] == "\x0D" &&
+		     $new_block[5] == "\x0A" &&
+		     $new_block[6] == "\x1A" &&
+		     $new_block[7] == "\x0A" ) {
+			if ( $new_block[12] . $new_block[13] . $new_block[14] . $new_block[15] === "\x49\x48\x44\x52" ) {
+				$width = unpack( 'H*', $new_block[16] . $new_block[17] . $new_block[18] . $new_block[19] );
+				$width = hexdec( $width[1] );
+
+				$height = unpack( 'H*', $new_block[20] . $new_block[21] . $new_block[22] . $new_block[23] );
+				$height = hexdec( $height[1] );
+
+				return array( $width, $height );
+			}
+		}
+	}
+
+	return false;
+}
+
 /**
  * Retrieve JPEG width and height without downloading/reading entire image.
  *
  * @param string $img_loc Image URL
  *
- * @return array|bool
+ * @return array|false
  * @since 2.9
  *
  * @see   http://php.net/manual/en/function.getimagesize.php#88793
  */
 function sm_get_jpeg_dimensions( $img_loc ) {
-	$handle = fopen( $img_loc, "rb" ) or die( "Invalid file stream." );
+	$handle = @fopen( $img_loc, "rb" );
+
+	// check if url is accessible or fail gracefully
+	if ( $handle === false ) {
+		return false;
+	}
+
 	$new_block = null;
 	if ( ! feof( $handle ) ) {
 		$new_block = fread( $handle, 32 );
@@ -408,7 +484,7 @@ function sm_import_and_set_post_thumbnail( $image_url, $post_id = 0 ) {
 
 		update_post_meta( $attachment_id, '_wp_attached_file', $image_url );
 
-		$size = sm_get_jpeg_dimensions( $image_url );
+		$size = sm_get_image_dimensions( $image_url );
 		if ( is_array( $size ) ) {
 			update_post_meta( $attachment_id, '_wp_attachment_metadata', array(
 				'width'  => $size[0],

From c320701b3287dedd8474b94a6e67532ed6341d4c Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 12 Dec 2017 20:24:49 +0100
Subject: [PATCH 13/24] PNG image dimensions function slight optimisation

---
 includes/sm-core-functions.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/includes/sm-core-functions.php b/includes/sm-core-functions.php
index ba4918c..73965f1 100644
--- a/includes/sm-core-functions.php
+++ b/includes/sm-core-functions.php
@@ -289,9 +289,8 @@ function sm_get_png_dimensions( $img_loc ) {
 		return false;
 	}
 
-	$new_block = null;
 	if ( ! feof( $handle ) ) {
-		$new_block = fread( $handle, 33 );
+		$new_block = fread( $handle, 24 );
 		if ( $new_block[0] == "\x89" &&
 		     $new_block[1] == "\x50" &&
 		     $new_block[2] == "\x4E" &&

From 580291dc93c43e0ef86bf7c4c1c7861d71f13991 Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 12 Dec 2017 20:44:28 +0100
Subject: [PATCH 14/24] Fix date not being localised

---
 includes/class-sm-dates.php | 2 +-
 readme.txt                  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/class-sm-dates.php b/includes/class-sm-dates.php
index a4b292f..ef8d63a 100644
--- a/includes/class-sm-dates.php
+++ b/includes/class-sm-dates.php
@@ -88,7 +88,7 @@ public static function get( $format = '', $post = null, $force_unix_sanitation =
 		}
 
 		// Format it
-		$date = date( $format, $date );
+		$date = date_i18n( $format, $date );
 
 		/**
 		 * Filters the date a post was preached
diff --git a/readme.txt b/readme.txt
index 2663d47..b3753be 100755
--- a/readme.txt
+++ b/readme.txt
@@ -107,6 +107,7 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 * Change: Improved XML feed formatting
 * Change: Replace Bib.ly with reftagger.com
 * Fix: Fix warning in `latest_series` shortcode
+* Fix: Fix date not being localised
 
 ### 2.9.3 ###
 * Fix: Sermons can be imported again after deleting

From 795e1d8f215e7480e2c1edaaba57c2c0c68f5571 Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 12 Dec 2017 20:58:51 +0100
Subject: [PATCH 15/24] Fix SB audio path

---
 includes/admin/import/class-sm-import-sb.php | 11 +++++++----
 readme.txt                                   |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/includes/admin/import/class-sm-import-sb.php b/includes/admin/import/class-sm-import-sb.php
index 99fd817..7ecf878 100644
--- a/includes/admin/import/class-sm-import-sb.php
+++ b/includes/admin/import/class-sm-import-sb.php
@@ -204,10 +204,13 @@ private function _import_sermons() {
 		global $wpdb;
 
 		// Imported sermons
-		$imported = get_option( '_sm_import_sb_messages', array() );
+		$imported = get_option( '_sm_import_sb_messages', array(
+			'upload_dir' => 'wp-content/uploads/sermons/',
+		) );
 
-		// media upload directory
-		$media = wp_get_upload_dir();
+		// SB options
+		$options = get_option( 'sermonbrowser_options', array() );
+		$options = empty( $options ) ? $options : base64_decode( $options );
 
 		/**
 		 * Filter sermons that will be imported
@@ -261,7 +264,7 @@ private function _import_sermons() {
 
 				if ( in_array( pathinfo( $url, PATHINFO_EXTENSION ), array( 'mp3', 'wav', 'ogg' ) ) ) {
 					if ( parse_url( $url, PHP_URL_SCHEME ) === null ) {
-						$url = $media['baseurl'] . '/media/audio/' . rawurlencode( $url );
+						$url = home_url( $options['upload_dir'] . rawurlencode( $url ) );
 					}
 
 					update_post_meta( $id, 'sermon_audio', $url );
diff --git a/readme.txt b/readme.txt
index b3753be..078b0fb 100755
--- a/readme.txt
+++ b/readme.txt
@@ -108,6 +108,7 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 * Change: Replace Bib.ly with reftagger.com
 * Fix: Fix warning in `latest_series` shortcode
 * Fix: Fix date not being localised
+* Fix: Sermon Browser audio URL not working if default path is changed in Sermon Browser settings
 
 ### 2.9.3 ###
 * Fix: Sermons can be imported again after deleting

From 5e973cfee85aa7ba2cbf454cc793e4116562cd9f Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 12 Dec 2017 21:06:20 +0100
Subject: [PATCH 16/24] Add SB audio path error check

---
 includes/admin/import/class-sm-import-sb.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/includes/admin/import/class-sm-import-sb.php b/includes/admin/import/class-sm-import-sb.php
index 7ecf878..2e5fce8 100644
--- a/includes/admin/import/class-sm-import-sb.php
+++ b/includes/admin/import/class-sm-import-sb.php
@@ -204,13 +204,13 @@ private function _import_sermons() {
 		global $wpdb;
 
 		// Imported sermons
-		$imported = get_option( '_sm_import_sb_messages', array(
-			'upload_dir' => 'wp-content/uploads/sermons/',
-		) );
+		$imported = get_option( '_sm_import_sb_messages', array() );
 
 		// SB options
-		$options = get_option( 'sermonbrowser_options', array() );
-		$options = empty( $options ) ? $options : base64_decode( $options );
+		$options = get_option( 'sermonbrowser_options', array(
+			'upload_dir' => 'wp-content/uploads/sermons/',
+		) );
+		$options = is_array( $options ) ? $options : base64_decode( $options );
 
 		/**
 		 * Filter sermons that will be imported
@@ -264,7 +264,7 @@ private function _import_sermons() {
 
 				if ( in_array( pathinfo( $url, PATHINFO_EXTENSION ), array( 'mp3', 'wav', 'ogg' ) ) ) {
 					if ( parse_url( $url, PHP_URL_SCHEME ) === null ) {
-						$url = home_url( $options['upload_dir'] . rawurlencode( $url ) );
+						$url = home_url( ( ! empty( $options['upload_dir'] ) ? $options['upload_dir'] : 'wp-content/uploads/sermons/' ) . rawurlencode( $url ) );
 					}
 
 					update_post_meta( $id, 'sermon_audio', $url );

From 599b8d1aa7cfde43060b0f702aaa6058dd163c86 Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 12 Dec 2017 21:11:18 +0100
Subject: [PATCH 17/24] Fix PHP warning during partial sermon import

---
 includes/admin/import/class-sm-import-sb.php | 4 ++++
 includes/admin/import/class-sm-import-se.php | 4 ++++
 readme.txt                                   | 5 +++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/includes/admin/import/class-sm-import-sb.php b/includes/admin/import/class-sm-import-sb.php
index 2e5fce8..de5a665 100644
--- a/includes/admin/import/class-sm-import-sb.php
+++ b/includes/admin/import/class-sm-import-sb.php
@@ -304,6 +304,10 @@ private function _import_sermons() {
 		) {
 			$terms = array();
 
+			if ( empty( $this->{$terms_array} ) ) {
+				continue;
+			}
+
 			foreach ( $this->{$terms_array} as $item ) {
 				$terms[] = intval( $item['new_id'] );
 			}
diff --git a/includes/admin/import/class-sm-import-se.php b/includes/admin/import/class-sm-import-se.php
index 851e721..a64e2ae 100644
--- a/includes/admin/import/class-sm-import-se.php
+++ b/includes/admin/import/class-sm-import-se.php
@@ -390,6 +390,10 @@ private function _import_messages() {
 		) {
 			$terms = array();
 
+			if ( empty( $this->{$terms_array} ) ) {
+				continue;
+			}
+
 			foreach ( $this->{$terms_array} as $item ) {
 				$terms[] = intval( $item['new_id'] );
 			}
diff --git a/readme.txt b/readme.txt
index 078b0fb..b3fa554 100755
--- a/readme.txt
+++ b/readme.txt
@@ -106,9 +106,10 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 * New: Added an option to redirect podcast
 * Change: Improved XML feed formatting
 * Change: Replace Bib.ly with reftagger.com
-* Fix: Fix warning in `latest_series` shortcode
-* Fix: Fix date not being localised
+* Fix: Date was not being localised
 * Fix: Sermon Browser audio URL not working if default path is changed in Sermon Browser settings
+* Fix: Warning in `latest_series` shortcode
+* Fix: Warning during partial sermon import
 
 ### 2.9.3 ###
 * Fix: Sermons can be imported again after deleting

From a8c015e11348cffc4ba61a55c2006b21c9fbd4ce Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 12 Dec 2017 21:23:27 +0100
Subject: [PATCH 18/24] Add (stats) views importing from Sermon Browser

---
 includes/admin/import/class-sm-import-sb.php | 3 +++
 readme.txt                                   | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/includes/admin/import/class-sm-import-sb.php b/includes/admin/import/class-sm-import-sb.php
index de5a665..0b1eea2 100644
--- a/includes/admin/import/class-sm-import-sb.php
+++ b/includes/admin/import/class-sm-import-sb.php
@@ -291,6 +291,9 @@ private function _import_sermons() {
 			// set date
 			update_post_meta( $id, 'sermon_date', strtotime( $sermon->datetime ) );
 			update_post_meta( $id, 'sermon_date_auto', '1' );
+
+			// set views
+			update_post_meta( $id, 'Views', $wpdb->get_var( "SELECT SUM(`count`) FROM {$wpdb->prefix}sb_stuff WHERE `sermon_id` = '{$sermon->id}'" ) );
 		}
 
 		// update term counts
diff --git a/readme.txt b/readme.txt
index b3fa554..adfb8d9 100755
--- a/readme.txt
+++ b/readme.txt
@@ -106,8 +106,9 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 * New: Added an option to redirect podcast
 * Change: Improved XML feed formatting
 * Change: Replace Bib.ly with reftagger.com
+* Change: Sermon Browser will import stats as well now (needs re-import, existing data won't duplicate)
 * Fix: Date was not being localised
-* Fix: Sermon Browser audio URL not working if default path is changed in Sermon Browser settings
+* Fix: Sermon Browser audio URL not working if default path is changed in Sermon Browser settings (needs re-import, existing data won't duplicate)
 * Fix: Warning in `latest_series` shortcode
 * Fix: Warning during partial sermon import
 

From 8e03e081dd9e71e6240d7ab32d2c4dbe4f33b0b0 Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Wed, 13 Dec 2017 08:15:10 +0100
Subject: [PATCH 19/24] Fix PHP fatal error

---
 readme.txt  | 1 +
 sermons.php | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index adfb8d9..08b6f5e 100755
--- a/readme.txt
+++ b/readme.txt
@@ -108,6 +108,7 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 * Change: Replace Bib.ly with reftagger.com
 * Change: Sermon Browser will import stats as well now (needs re-import, existing data won't duplicate)
 * Fix: Date was not being localised
+* Fix: There was a fatal error during sermon deletion on PHP 5.4<
 * Fix: Sermon Browser audio URL not working if default path is changed in Sermon Browser settings (needs re-import, existing data won't duplicate)
 * Fix: Warning in `latest_series` shortcode
 * Fix: Warning during partial sermon import
diff --git a/sermons.php b/sermons.php
index 79e4b47..e32b4ac 100755
--- a/sermons.php
+++ b/sermons.php
@@ -114,7 +114,9 @@ public function __construct() {
 			$sermons_se = get_option( '_sm_import_se_messages' );
 			$sermons_sb = get_option( '_sm_import_sb_messages' );
 
-			foreach ( array( $sermons_se, $sermons_sb ) as $offset0 => &$sermons_array ) {
+			$sermon_messages = array( $sermons_se, $sermons_sb );
+
+			foreach ( $sermon_messages as $offset0 => &$sermons_array ) {
 				foreach ( $sermons_array as $offset1 => $value ) {
 					if ( $value['new_id'] == $id ) {
 						unset( $sermons_array[ $offset1 ] );

From efbde7538e45ca5aae04ab72d29985f7f2cb2fe2 Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Wed, 13 Dec 2017 08:37:13 +0100
Subject: [PATCH 20/24] Change to home_url() instead of get_site_url()

---
 includes/CMB2/includes/CMB2_Utils.php | 4 ++--
 includes/template-tags.php            | 4 ++--
 readme.txt                            | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/includes/CMB2/includes/CMB2_Utils.php b/includes/CMB2/includes/CMB2_Utils.php
index 9abaae8..bc3e606 100755
--- a/includes/CMB2/includes/CMB2_Utils.php
+++ b/includes/CMB2/includes/CMB2_Utils.php
@@ -260,7 +260,7 @@ public static function array_insert( &$array, $new, $position ) {
 	 */
 	public static function url( $path = '' ) {
 		// SM: Seems like CMB2 doesn't return a correct URL. This should fix it.
-		return str_replace( get_site_url(), '', SM_URL ) . 'includes/CMB2/' . $path;
+		return str_replace( home_url(), '', SM_URL ) . 'includes/CMB2/' . $path;
 
 		if ( self::$url ) {
 			return self::$url . $path;
@@ -318,7 +318,7 @@ public static function get_url_from_dir( $dir ) {
 		// Check to see if it's anywhere in the root directory
 
 		$site_dir = self::normalize_path( self::$ABSPATH );
-		$site_url = trailingslashit( is_multisite() ? network_site_url() : site_url() );
+		$site_url = trailingslashit( is_multisite() ? network_home_url() : home_url() );
 
 		$url = str_replace(
 			array( $site_dir, WP_PLUGIN_DIR ),
diff --git a/includes/template-tags.php b/includes/template-tags.php
index 2a545e0..facc0fb 100755
--- a/includes/template-tags.php
+++ b/includes/template-tags.php
@@ -145,7 +145,7 @@ function render_wpfc_sermon_archive() {
  * @since 2.5.0 added $args
  */
 function render_wpfc_sorting( $args = array() ) {
-	$action = get_site_url() . '/' . ( SermonManager::getOption( 'common_base_slug' ) ? ( SermonManager::getOption( 'archive_slug' ) ?: 'sermons' ) : '' );
+	$action = home_url() . '/' . ( SermonManager::getOption( 'common_base_slug' ) ? ( SermonManager::getOption( 'archive_slug' ) ?: 'sermons' ) : '' );
 
 	// Filters HTML fields data
 	$filters = array(
@@ -181,7 +181,7 @@ function render_wpfc_sorting( $args = array() ) {
                         <select name="<?php echo $filter['taxonomy'] ?>"
                                 title="<?php echo $filter['title'] ?>"
                                 id="<?php echo $filter['taxonomy'] ?>"
-                                onchange="if(this.options[this.selectedIndex].value !== ''){return this.form.submit()}else{window.location = '<?= get_site_url() . '/' . ( SermonManager::getOption( 'archive_slug' ) ?: 'sermons' ) ?>';}"
+                                onchange="if(this.options[this.selectedIndex].value !== ''){return this.form.submit()}else{window.location = '<?= home_url() . '/' . ( SermonManager::getOption( 'archive_slug' ) ?: 'sermons' ) ?>';}"
 							<?php echo ! empty( $args[ $filter['taxonomy'] ] ) && $args['visibility'] === 'disable' ? 'disabled' : '' ?>>
                             <option value=""><?php echo $filter['title'] ?></option>
 							<?php echo wpfc_get_term_dropdown( $filter['taxonomy'], ! empty( $args[ $filter['taxonomy'] ] ) ? $args[ $filter['taxonomy'] ] : '' ); ?>
diff --git a/readme.txt b/readme.txt
index 08b6f5e..04cf5ee 100755
--- a/readme.txt
+++ b/readme.txt
@@ -107,6 +107,7 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 * Change: Improved XML feed formatting
 * Change: Replace Bib.ly with reftagger.com
 * Change: Sermon Browser will import stats as well now (needs re-import, existing data won't duplicate)
+* Fix: Certain URLs were not working under wordpress.com and other websites that have different home and site URLs
 * Fix: Date was not being localised
 * Fix: There was a fatal error during sermon deletion on PHP 5.4<
 * Fix: Sermon Browser audio URL not working if default path is changed in Sermon Browser settings (needs re-import, existing data won't duplicate)

From 00aa1ff4c5617f0b4e25496887b879e068bbd0ed Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Wed, 13 Dec 2017 08:45:22 +0100
Subject: [PATCH 21/24] Clear feed cache on settings save

---
 includes/admin/class-sm-admin-settings.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/includes/admin/class-sm-admin-settings.php b/includes/admin/class-sm-admin-settings.php
index 144f3a6..6bfeff2 100644
--- a/includes/admin/class-sm-admin-settings.php
+++ b/includes/admin/class-sm-admin-settings.php
@@ -111,7 +111,7 @@ public static function get_settings_pages() {
 	 * Save the settings.
 	 */
 	public static function save() {
-		global $current_tab;
+		global $current_tab, $wpdb;
 
 		if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'sm-settings' ) ) {
 			die( __( 'Action failed. Please refresh the page and retry.', 'sermon-manager-for-wordpress' ) );
@@ -127,6 +127,13 @@ public static function save() {
 		// Clear any unwanted data and flush rules
 		wp_schedule_single_event( time(), 'sm_flush_rewrite_rules' );
 
+		/**
+		 * Pass any false value to `sm_clear_feed_transients` filter to skip clearing transients
+		 */
+		if ( $current_tab === 'podcast' && apply_filters( 'sm_clear_feed_transients', true ) ) {
+			$wpdb->query( "DELETE FROM `$wpdb->options` WHERE `option_name` LIKE ('_transient_feed_%') OR `option_name` LIKE ('_transient_timeout_feed_%')" );
+		}
+
 		do_action( 'sm_settings_saved' );
 	}
 

From 8b3c5df1ecf548d7a21db0090507ad4348838588 Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Wed, 13 Dec 2017 08:57:30 +0100
Subject: [PATCH 22/24] Fix settings JS

---
 assets/js/admin/settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/admin/settings.js b/assets/js/admin/settings.js
index 3063441..7fb8a30 100644
--- a/assets/js/admin/settings.js
+++ b/assets/js/admin/settings.js
@@ -1,7 +1,7 @@
 /**
  * Hide or show fields on checkbox change
  */
-$('#enable_podcast_redirection').change(function () {
+jQuery('#enable_podcast_redirection').change(function () {
     podcast_redirect(this.checked);
 });
 

From 60a900629fdc6a090e22cf462b89083f9bcbe4d8 Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Wed, 13 Dec 2017 09:26:25 +0100
Subject: [PATCH 23/24] Add a warning for HTML podcast option

---
 includes/admin/settings/class-sm-settings-podcast.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/includes/admin/settings/class-sm-settings-podcast.php b/includes/admin/settings/class-sm-settings-podcast.php
index 41e9b93..b2a468d 100644
--- a/includes/admin/settings/class-sm-settings-podcast.php
+++ b/includes/admin/settings/class-sm-settings-podcast.php
@@ -136,10 +136,11 @@ public function get_settings() {
 				'desc_tip' => wp_sprintf( __( 'For more info on PodTrac or to sign up for an account, visit %s', 'sermon-manager-for-wordpress' ), '<a href="http://podtrac.com">podtrac.com</a>' ),
 			),
 			array(
-				'title' => __( 'HTML in description', 'sermon-manager-for-wordpress' ),
-				'type'  => 'checkbox',
-				'id'    => 'enable_podcast_html_description',
-				'desc'  => __( 'Enables showing of HTML in iTunes description field. Uncheck if description looks messy.', 'sermon-manager-for-wordpress' ),
+				'title'    => __( 'HTML in description', 'sermon-manager-for-wordpress' ),
+				'type'     => 'checkbox',
+				'id'       => 'enable_podcast_html_description',
+				'desc'     => __( 'Enables showing of HTML in iTunes description field. Uncheck if description looks messy.', 'sermon-manager-for-wordpress' ),
+				'desc_tip' => __( 'It is recommended to leave it unchecked.', 'sermon-manager-for-wordpress' ),
 			),
 			array(
 				'title'    => __( 'Redirect', 'sermon-manager-for-wordpress' ),

From 373dc183c627f2bae00a0fca5f34584994b50e3e Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 19 Dec 2017 11:48:14 +0100
Subject: [PATCH 24/24] Update versions

---
 readme.txt  | 2 +-
 sermons.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index 04cf5ee..311e71b 100755
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ Tags: church, sermon, sermons, preaching, podcasting, manage, managing, podcasts
 Requires at least: 4.5  
 Tested up to: 4.9.1  
 Requires PHP: 5.3  
-Stable tag: 2.9.3  
+Stable tag: 2.10  
 License: GPLv2  
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
diff --git a/sermons.php b/sermons.php
index e32b4ac..d857c85 100755
--- 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.9.3
+ * Version: 2.10
  * Author: WP for Church
  * Author URI: https://www.wpforchurch.com/
  * Requires at least: 4.5