From 4cdc01e0601fee415a14f0d54a0682e120c32c5b Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Mon, 14 Aug 2017 10:56:05 +0200
Subject: [PATCH 01/10] Fix PHP notice in the footer

Closes #56
---
 includes/shortcodes.php | 16 ++++++++++++----
 includes/widgets.php    |  4 +++-
 readme.txt              |  3 +++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/includes/shortcodes.php b/includes/shortcodes.php
index c1ff4bb..7162817 100755
--- a/includes/shortcodes.php
+++ b/includes/shortcodes.php
@@ -62,7 +62,9 @@ public function legacyShortcodes() {
 	 */
 	public function displaySermonsList( $atts ) {
 		// enqueue scripts and styles
-		define( 'SM_ENQUEUE_SCRIPTS_STYLES', true );
+		if ( ! defined( 'SM_ENQUEUE_SCRIPTS_STYLES' ) ) {
+			define( 'SM_ENQUEUE_SCRIPTS_STYLES', true );
+		}
 
 		// default options
 		$args = array(
@@ -261,7 +263,9 @@ public function convertTaxonomyName( $name, $new_name ) {
 	 */
 	public function displayImages( $atts = array() ) {
 		// enqueue scripts and styles
-		define( 'SM_ENQUEUE_SCRIPTS_STYLES', true );
+		if ( ! defined( 'SM_ENQUEUE_SCRIPTS_STYLES' ) ) {
+			define( 'SM_ENQUEUE_SCRIPTS_STYLES', true );
+		}
 
 		// default args
 		$args = array(
@@ -352,7 +356,9 @@ public function displayImages( $atts = array() ) {
 	 */
 	function displayLatestSeriesImage( $atts = array() ) {
 		// enqueue scripts and styles
-		define( 'SM_ENQUEUE_SCRIPTS_STYLES', true );
+		if ( ! defined( 'SM_ENQUEUE_SCRIPTS_STYLES' ) ) {
+			define( 'SM_ENQUEUE_SCRIPTS_STYLES', true );
+		}
 
 		// default options
 		$args = array(
@@ -546,7 +552,9 @@ function getLatestSeriesImageId( $series = 0 ) {
 	 */
 	public function displaySermonSorting( $atts = array() ) {
 		// enqueue scripts and styles
-		define( 'SM_ENQUEUE_SCRIPTS_STYLES', true );
+		if ( ! defined( 'SM_ENQUEUE_SCRIPTS_STYLES' ) ) {
+			define( 'SM_ENQUEUE_SCRIPTS_STYLES', true );
+		}
 
 		return render_wpfc_sorting();
 	}
diff --git a/includes/widgets.php b/includes/widgets.php
index be259d2..5450015 100755
--- a/includes/widgets.php
+++ b/includes/widgets.php
@@ -20,7 +20,9 @@ public function __construct() {
 
 	function widget( $args, $instance ) {
 		// enqueue scripts and styles
-		define( 'SM_ENQUEUE_SCRIPTS_STYLES', true );
+		if ( ! defined( 'SM_ENQUEUE_SCRIPTS_STYLES' ) ) {
+			define( 'SM_ENQUEUE_SCRIPTS_STYLES', true );
+		}
 
 		$cache = wp_cache_get( 'widget_recent_sermons', 'widget' );
 
diff --git a/readme.txt b/readme.txt
index 005263a..1e9a4fe 100755
--- a/readme.txt
+++ b/readme.txt
@@ -83,6 +83,9 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 2. Sermon Files
 
 == Changelog ==
+= 2.4.7 =
+* Fix PHP notice in the footer
+
 = 2.4.6 =
 * Add a setting to define podcast count
 * Fix a bug that caused WSOD on some hosts

From 88eb2bb7085fbf265a7ad8cb19012b81e7a855d4 Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Mon, 14 Aug 2017 11:27:30 +0200
Subject: [PATCH 02/10] Force dates fix

Closes #55
---
 readme.txt  |  1 +
 sermons.php | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/readme.txt b/readme.txt
index 1e9a4fe..1e58b48 100755
--- a/readme.txt
+++ b/readme.txt
@@ -85,6 +85,7 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 == Changelog ==
 = 2.4.7 =
 * Fix PHP notice in the footer
+* Force dates fix for users who did not do it yet (there are too many bugs caused by old dates)
 
 = 2.4.6 =
 * Add a setting to define podcast count
diff --git a/sermons.php b/sermons.php
index 1cb0d73..242257c 100755
--- a/sermons.php
+++ b/sermons.php
@@ -59,6 +59,74 @@ public function __construct() {
 		add_action( 'pre_get_posts', array( $this, 'fix_sermons_ordering' ), 9999 );
 		// no idea... better not touch it for now.
 		add_filter( 'sermon-images-disable-public-css', '__return_true' );
+
+		// force dates fix
+		$this->fix_dates();
+	}
+
+	private function fix_dates() {
+		if ( intval( get_option( 'wpfc_sm_dates_all_fixed' ) ) === 1 || ! is_admin() ) {
+			return;
+		}
+
+		try {
+			global $wpdb;
+			$wp_query   = new WP_Query( array(
+				'post_type'      => 'wpfc_sermon',
+				'posts_per_page' => - 1,
+				'post_status'    => 'any'
+			) );
+			$posts_meta = array();
+
+			$sermons = $wp_query->posts;
+
+			foreach ( $sermons as $sermon ) {
+				// get post meta directly from DB. The reason for not using get_post_meta() is that we need meta_id too.
+				$date = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s", $sermon->ID, 'sermon_date' ) );
+
+				// if for some reason, the date is blank or something else, continue to next sermon
+				if ( empty( $date[0] ) ) {
+					continue;
+				}
+
+				// assign first sermon_date meta to $date variable
+				$date = $date[0];
+
+				// skip if we need only old dates
+				if ( is_numeric( $date->meta_value ) ) {
+					continue;
+				}
+
+				$posts_meta[] = array(
+					'date'    => $date->meta_value,
+					'meta_id' => $date->meta_id,
+					'post_id' => $sermon->ID,
+				);
+			}
+
+			$dates = $posts_meta;
+			$fixed = 0;
+
+			if ( ! empty( $dates ) ) {
+				foreach ( $dates as $date ) {
+					// for backup
+					update_post_meta( $date['post_id'], 'sermon_date_old', $date['date'] );
+					// update the date
+					update_post_meta( $date['post_id'], 'sermon_date', strtotime( $date['date'] ) );
+					// add it to fixed dates
+					$fixed ++;
+				}
+
+				update_option( 'wpfc_sm_dates_fixed', $fixed );
+				update_option( 'wpfc_sm_dates_remaining', intval( get_option( 'wpfc_sm_dates_total', true ) ) - $fixed );
+			}
+
+			update_option( 'wpfc_sm_dates_all_fixed', 1 );
+		} catch ( Exception $exception ) {
+			print_r( $exception );
+			die();
+			// failed :(
+		}
 	}
 
 	/**

From 8107b09f05f5ed54735f37d24d2b71c58410924f Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Mon, 14 Aug 2017 12:03:19 +0200
Subject: [PATCH 03/10] Fix slashes in RSS feed

Closes #54
---
 includes/podcast-functions.php | 20 ++++++++++----------
 readme.txt                     |  1 +
 views/wpfc-podcast-feed.php    |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/includes/podcast-functions.php b/includes/podcast-functions.php
index ebb9ae5..9c315de 100755
--- a/includes/podcast-functions.php
+++ b/includes/podcast-functions.php
@@ -99,13 +99,13 @@ function wpfc_podcast_add_head() {
 	<?php if ( trim( category_description() ) !== '' ) : ?>
         <itunes:summary><?php echo str_replace( '&nbsp;', '',
 				\SermonManager::getOption( 'enable_podcast_html_description' ) ?
-					wpautop( wp_filter_kses( category_description() ), true ) :
-					wp_filter_nohtml_kses( category_description() ) ); ?></itunes:summary>
+					stripslashes( wp_filter_kses( wpautop( category_description() ) ), true ) :
+					stripslashes( wp_filter_nohtml_kses( category_description() ) ) ); ?></itunes:summary>
 	<?php else: ?>
         <itunes:summary><?php echo str_replace( '&nbsp;', '',
 				\SermonManager::getOption( 'enable_podcast_html_description' ) ?
-					wp_filter_kses( wpautop( \SermonManager::getOption( 'itunes_summary' ) ) ) :
-					wp_filter_nohtml_kses( \SermonManager::getOption( 'itunes_summary' ) ) ); ?></itunes:summary>
+					stripslashes( wp_filter_kses( wpautop( \SermonManager::getOption( 'itunes_summary' ) ) ) ) :
+					stripslashes( wp_filter_nohtml_kses( \SermonManager::getOption( 'itunes_summary' ) ) ) ); ?></itunes:summary>
 	<?php endif; ?>
     <itunes:owner>
         <itunes:name><?php echo esc_html( \SermonManager::getOption( 'itunes_owner_name' ) ) ?></itunes:name>
@@ -143,8 +143,8 @@ function wpfc_podcast_add_item() {
     <itunes:subtitle><?php echo esc_html( $series ); ?></itunes:subtitle>
     <itunes:summary><?php echo preg_replace( '/&nbsp;/', '',
 			\SermonManager::getOption( 'enable_podcast_html_description' ) ?
-				wpautop( wp_filter_kses( get_wpfc_sermon_meta( 'sermon_description' ) ) ) :
-				wp_filter_nohtml_kses( get_wpfc_sermon_meta( 'sermon_description' ) ) ); ?></itunes:summary>
+				stripslashes( wp_filter_kses( wpautop( get_wpfc_sermon_meta( 'sermon_description' ) ) ) ) :
+				stripslashes( wp_filter_nohtml_kses( get_wpfc_sermon_meta( 'sermon_description' ) ) ) ); ?></itunes:summary>
 	<?php if ( $post_image ) : ?>
         <itunes:image href="<?php echo esc_url( $post_image ); ?>"/>
 	<?php endif; ?>
@@ -174,9 +174,9 @@ function wpfc_podcast_add_item() {
  */
 function wpfc_podcast_summary( $content ) {
 	if ( \SermonManager::getOption( 'enable_podcast_html_description' ) ) {
-		$content = wpautop( wp_filter_kses( get_wpfc_sermon_meta( 'sermon_description' ) ) );
+		$content = stripslashes( wp_filter_kses( wpautop( get_wpfc_sermon_meta( 'sermon_description' ) ) ) );
 	} else {
-		$content = wp_filter_nohtml_kses( get_wpfc_sermon_meta( 'sermon_description' ) );
+		$content = stripslashes( wp_filter_nohtml_kses( get_wpfc_sermon_meta( 'sermon_description' ) ) );
 	}
 
 	return $content;
@@ -230,9 +230,9 @@ function wpfc_bloginfo_rss_filter( $info, $show ) {
 			break;
 		case 'description':
 			if ( \SermonManager::getOption( 'enable_podcast_html_description' ) ) {
-				$new_info = wpautop( wp_filter_kses( \SermonManager::getOption( 'itunes_summary' ) ) );
+				$new_info = stripslashes( wp_filter_kses( wpautop( \SermonManager::getOption( 'itunes_summary' ) ) ) );
 			} else {
-				$new_info = wp_filter_nohtml_kses( \SermonManager::getOption( 'itunes_summary' ) );
+				$new_info = stripslashes( wp_filter_nohtml_kses( \SermonManager::getOption( 'itunes_summary' ) ) );
 			}
 
 			break;
diff --git a/readme.txt b/readme.txt
index 1e58b48..e61ba27 100755
--- a/readme.txt
+++ b/readme.txt
@@ -86,6 +86,7 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 = 2.4.7 =
 * Fix PHP notice in the footer
 * Force dates fix for users who did not do it yet (there are too many bugs caused by old dates)
+* Fix slashes in RSS feed
 
 = 2.4.6 =
 * Add a setting to define podcast count
diff --git a/views/wpfc-podcast-feed.php b/views/wpfc-podcast-feed.php
index 7f30785..5e182c2 100644
--- a/views/wpfc-podcast-feed.php
+++ b/views/wpfc-podcast-feed.php
@@ -50,7 +50,7 @@
 					<?php the_category_rss( 'rss2' ) ?>
                     <guid isPermaLink="false"><?php the_guid(); ?></guid>
 
-                    <description><![CDATA[<?php echo get_wpfc_sermon_meta( 'sermon_description' ); ?>]]></description>
+                    <description>asd<![CDATA[<?php echo get_wpfc_sermon_meta( 'sermon_description' ); ?>]]></description>
 					<?php wpfc_podcast_add_item(); ?>
                 </item>
 			<?php endif; ?>

From 2461c20a260c51c59b337eaaa1a93c2c723afbcd Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Mon, 14 Aug 2017 12:37:31 +0200
Subject: [PATCH 04/10] Fix podcast cover image not selecting

Closes #53
---
 includes/options.php | 51 +++++++++++++++++++++++++++++---------------
 readme.txt           |  4 +++-
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/includes/options.php b/includes/options.php
index ceada3e..4f07e97 100755
--- a/includes/options.php
+++ b/includes/options.php
@@ -31,6 +31,7 @@ function wpfc_init() {
 		}
 
 		register_setting( 'wpfc_plugin_options', 'wpfc_options', $args );
+		wp_enqueue_media();
 	}
 
 	// Add menu page
@@ -99,17 +100,38 @@ function wpfc_sermon_options_render_form() {
             <script type="text/javascript">
                 jQuery(document).ready(function () {
                     jQuery('.sermon-option-tabs').tabs();
-                    jQuery('#upload_cover_image').click(function () {
-                        uploadID = jQuery(this).prev('input');
-                        tb_show('', 'media-upload.php?type=image&amp;TB_iframe=true');
-                        return false;
+
+                    var frame,
+                        addImgLink = jQuery('#upload_cover_image'),
+                        imgSrcInput = jQuery('.itunes_cover_image_field');
+
+                    addImgLink.on('click', function (event) {
+                        event.preventDefault();
+
+                        if (frame) {
+                            frame.open();
+                            return;
+                        }
+
+                        frame = wp.media({
+                            title: 'Select or Upload Cover Image',
+                            button: {
+                                text: 'Use this image'
+                            },
+                            library: {
+                                type: [ 'image' ]
+                            },
+                            multiple: false
+                        });
+
+                        frame.on('select', function () {
+                            var attachment = frame.state().get('selection').first().toJSON();
+
+                            imgSrcInput.val(attachment.url);
+                        });
+
+                        frame.open();
                     });
-                    window.send_to_editor = function (html) {
-                        imgurl = jQuery('img', html).attr('src');
-                        uploadID.val(imgurl);
-                        /*assign the value to the input*/
-                        tb_remove();
-                    };
                 });
             </script>
             <style type="text/css">
@@ -620,18 +642,13 @@ function wpfc_sermon_options_render_form() {
                                                 <th scope="row"><?php _e( 'Cover Image', 'sermon-manager' ); ?></th>
                                                 <td class="option">
                                                     <input id="wpfc_options[itunes_cover_image]" size="45" type="text"
-                                                           name="wpfc_options[itunes_cover_image]"
+                                                           name="wpfc_options[itunes_cover_image]" class="itunes_cover_image_field"
                                                            value="<?php esc_attr_e( $itunes_cover_image ); ?>"/>
                                                     <input id="upload_cover_image" type="button" class="button"
                                                            value="Upload Image"/>
-													<?php if ( $itunes_cover_image ): ?>
-                                                        <br/>
-                                                        <img src="<?php esc_attr_e( $itunes_cover_image ); ?>"
-                                                             width="300px" height="300px" class="preview"/>
-													<?php endif; ?>
                                                 </td>
                                                 <td class="info">
-                                                    <p><?php _e( 'This JPG will serve as the Podcast artwork in the iTunes Store. The image should be 1400px by 1400px', 'sermon-manager' ); ?></p>
+                                                    <p><?php _e( 'This JPG will serve as the Podcast artwork in the iTunes Store. The image must be between 1400px by 1400px and 3000px by 3000px or else iTunes will not accept your feed.', 'sermon-manager' ); ?></p>
                                                 </td>
                                             </tr>
 
diff --git a/readme.txt b/readme.txt
index e61ba27..ac28ad5 100755
--- a/readme.txt
+++ b/readme.txt
@@ -85,8 +85,10 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 == Changelog ==
 = 2.4.7 =
 * Fix PHP notice in the footer
-* Force dates fix for users who did not do it yet (there are too many bugs caused by old dates)
+* Fix sermons ordering (Force dates fix for users who did not do it yet)
 * Fix slashes in RSS feed
+* Fix podcast cover image not selecting
+* Replaced old media manager with new one for podcast cover image
 
 = 2.4.6 =
 * Add a setting to define podcast count

From bd05b8ac06a13cbd147e87fb1c15fbfdc60e64e9 Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Mon, 14 Aug 2017 12:47:49 +0200
Subject: [PATCH 05/10] Fix PHP notice in the footer

This is the real fix. The previous one is not the fix for this issue, but it's useful nevertheless.

Related #56
---
 sermons.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/sermons.php b/sermons.php
index 242257c..35778ae 100755
--- a/sermons.php
+++ b/sermons.php
@@ -205,10 +205,13 @@ public static function load_translations() {
 	 * @return void
 	 */
 	public static function enqueue_scripts_styles() {
-		if ( ! ( defined( 'SM_SCRIPTS_STYLES_ENQUEUED' ) ||
-		         ! defined( 'SM_ENQUEUE_SCRIPTS_STYLES' ) ||
-		         'wpfc_sermon' !== get_post_type() ||
-		         ! is_post_type_archive( 'wpfc_sermon' ) )
+		if ( defined( 'SM_SCRIPTS_STYLES_ENQUEUED' ) ) {
+	        return;
+		}
+
+		if ( ! ( defined( 'SM_ENQUEUE_SCRIPTS_STYLES' ) ||
+		         'wpfc_sermon' === get_post_type() ||
+		         is_post_type_archive( 'wpfc_sermon' ) )
 		) {
 			return;
 		}

From 30c6fd611cfc54d711f8ff41c0ff82855b1fbe4e Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 15 Aug 2017 09:54:44 +0200
Subject: [PATCH 06/10] Remove first sermon image showing up as podcast cover
 image

---
 includes/podcast-functions.php | 4 +---
 readme.txt                     | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/includes/podcast-functions.php b/includes/podcast-functions.php
index 9c315de..fb81292 100755
--- a/includes/podcast-functions.php
+++ b/includes/podcast-functions.php
@@ -112,9 +112,7 @@ function wpfc_podcast_add_head() {
         <itunes:email><?php echo esc_html( \SermonManager::getOption( 'itunes_owner_email' ) ) ?></itunes:email>
     </itunes:owner>
     <itunes:explicit>no</itunes:explicit>
-	<?php if ( has_post_thumbnail() ) : ?>
-        <itunes:image href="<?php echo esc_url( the_post_thumbnail_url() ); ?>"/>
-	<?php else: ?>
+	<?php if ( \SermonManager::getOption( 'itunes_cover_image' ) ) : ?>
         <itunes:image href="<?php echo esc_url( \SermonManager::getOption( 'itunes_cover_image' ) ) ?>"/>
 	<?php endif; ?>
     <itunes:category text="<?php echo esc_attr( \SermonManager::getOption( 'itunes_top_category' ) ) ?>">
diff --git a/readme.txt b/readme.txt
index ac28ad5..c724cf1 100755
--- a/readme.txt
+++ b/readme.txt
@@ -88,6 +88,7 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 * Fix sermons ordering (Force dates fix for users who did not do it yet)
 * Fix slashes in RSS feed
 * Fix podcast cover image not selecting
+* Fix first sermon image showing up as podcast cover image when none selected
 * Replaced old media manager with new one for podcast cover image
 
 = 2.4.6 =

From c603c4b40329e97ca74fb233225b484317455a3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Miljkovi=C4=87?=
 <nikola3244@users.noreply.github.com>
Date: Tue, 15 Aug 2017 11:56:40 +0200
Subject: [PATCH 07/10] Disable dates fix, seems like it has a bug

---
 sermons.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sermons.php b/sermons.php
index 35778ae..9a3335d 100755
--- a/sermons.php
+++ b/sermons.php
@@ -61,7 +61,7 @@ public function __construct() {
 		add_filter( 'sermon-images-disable-public-css', '__return_true' );
 
 		// force dates fix
-		$this->fix_dates();
+		//$this->fix_dates();
 	}
 
 	private function fix_dates() {

From 4132257fed4b33cd4ad49873113cb1ffd43a29c3 Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 15 Aug 2017 13:47:59 +0200
Subject: [PATCH 08/10] Remove fix dates options and force new dates

---
 includes/admin-functions.php  |   5 +-
 includes/fix-dates.php        | 323 ----------------------------------
 includes/options.php          | 108 ------------
 includes/shortcodes.php       |  10 +-
 includes/template-tags.php    | 125 +------------
 includes/types-taxonomies.php |  27 ---
 includes/widgets.php          |   5 -
 readme.txt                    |   5 +-
 sermons.php                   |  59 ++++---
 views/wpfc-podcast-feed.php   |   5 -
 10 files changed, 47 insertions(+), 625 deletions(-)
 delete mode 100644 includes/fix-dates.php

diff --git a/includes/admin-functions.php b/includes/admin-functions.php
index afc8ae3..7886aea 100755
--- a/includes/admin-functions.php
+++ b/includes/admin-functions.php
@@ -163,8 +163,7 @@ function wpfc_sermon_order( $vars ) {
 					break;
 				case 'preached':
 					$vars = array_merge( $vars, array(
-						'meta_key' => 'sermon_date',
-						'orderby'  => 'meta_value'
+						'orderby' => 'date'
 					) );
 					break;
 			}
@@ -234,7 +233,7 @@ function wpfc_sermon_columns( $column ) {
 			$data = wpfc_entry_views_get( array( 'post_id' => $post->ID ) );
 			break;
 		case "preached":
-			$data = wpfc_sermon_date_filter( 0, '', $post );
+			$data = get_the_date();
 			break;
 		case "passage":
 			$data = get_post_meta( $post->ID, 'bible_passage', true );
diff --git a/includes/fix-dates.php b/includes/fix-dates.php
deleted file mode 100644
index 5399741..0000000
--- a/includes/fix-dates.php
+++ /dev/null
@@ -1,323 +0,0 @@
-<?php
-
-/**
- * Important!
- * Sometime in the past, not sure when, SM (or CMB2) developers decided to change (sermon) date format from (mm/dd/YY)
- * to Unix time. This caused some (un)expected bugs, and with this fix, I'm hoping that those bugs will be solved.
- *
- * This fix will select all sermon dates, which are stored as sermon post meta field, called `sermon_date`.
- * Those dates, if not numeric, will be put through `strtotime()` in hope to get them converted to Unix time.
- *
- * For every non Unix sermon date, this function will also create a backup post meta, called `sermon_date_old`.
- * Purpose of this field will be to restore dates if we screw up something. I hope not, but this plugin is a huge pile
- * of spaghetti code.
- *
- * This script will also increase PHP's max execution time, to avoid timeouts.
- *
- * TODO:
- * 1) Add "revert" functionality. That will remove `sermon_date` post meta fields where there is an existing
- * `sermon_date_old`, and it will rename `sermon_date_old` to `sermon_date`. If something goes wrong.
- * 2) Add stop detection, i.e. let's write an index (sermon ID) to a db value. If that key exists, that means that
- * function has been interrupted and it will start converting from that index.
- *
- * @see   https://github.com/WP-for-Church/Sermon-Manager/issues/27
- * @since 2.0.9
- */
-class WPFC_Fix_Dates {
-
-	/**
-	 * Instance of this class
-	 *
-	 * @var null
-	 */
-	private static $instance = null;
-
-	/**
-	 * Main init function. Fills class variables, initializes other functions.
-	 *
-	 * @return bool False if there were some errors; True otherwise.
-	 */
-	public function init() {
-		$this->attachWP();
-		$this->defineActions();
-
-		if ( ! boolval( get_option( 'wpfc_sm_dates_all_fixed', '0' ) ) ) {
-			add_action( 'admin_notices', array( self::getInstance(), 'render_warning' ) );
-		}
-
-		return true;
-	}
-
-	/**
-	 * Add actions/filters to WP
-	 *
-	 * @return void
-	 */
-	public function attachWP() {
-		add_action( 'wpfc_fix_dates', array( self::getInstance(), 'fix' ) );
-	}
-
-	/**
-	 * Get new instance self or current one if exists
-	 *
-	 * @return WPFC_Fix_Dates
-	 */
-	public static function getInstance() {
-		if ( null === self::$instance ) {
-			self::$instance = new self;
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * Will define actions and corresponding integers:
-	 *  SM_DATES_NONE = 0
-	 *  SM_DATES_CHECK = 1
-	 *  SM_DATES_FIX = 2
-	 *  SM_DATES_REVERT = 9
-	 *
-	 * @return bool True on success
-	 * @throws ErrorException Throws if constants are already defined and have a different value. This should never
-	 * happen, but better be safe than sorry.
-	 */
-	public function defineActions() {
-		$actions = array(
-			'SM_DATES_NONE'   => 0,
-			'SM_DATES_CHECK'  => 1,
-			'SM_DATES_FIX'    => 2,
-			'SM_DATES_REVERT' => 9,
-		);
-
-		foreach ( $actions as $action => $value ) {
-			if ( defined( $action ) ) {
-				if ( constant( $action ) !== $value ) {
-					throw new ErrorException( 'Please try to deactivate all plugins except Sermon Manager and try again.', 1 );
-				}
-			} else {
-				define( $action, $value );
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Gets last action that has been executed
-	 *
-	 * @return int|null Action int if success, null on failure
-	 * @see defineActions()
-	 */
-	public function getLastAction() {
-		$action = get_option( 'wpfc_sm_dates_last_action', SM_DATES_NONE );
-
-		if ( $action !== SM_DATES_NONE ) {
-			if ( ! is_numeric( $action ) ) {
-				return $this->getAction( $action );
-			}
-		}
-
-		return $action;
-	}
-
-	/**
-	 * Converts textual action to int
-	 *
-	 * @param string $action The action
-	 *
-	 * @return int|null Action int if success, null on failure
-	 * @see defineActions()
-	 */
-	public function getAction( $action ) {
-		if ( is_numeric( $action ) ) {
-			return intval( $action );
-		}
-
-		switch ( $action ) {
-			case "check":
-				return SM_DATES_CHECK;
-			case "fix":
-				return SM_DATES_FIX;
-			case "revert";
-				return SM_DATES_REVERT;
-		}
-
-		return SM_DATES_NONE;
-	}
-
-	/**
-	 * Function used to display a message in WP admin area.
-	 *
-	 * @return void
-	 */
-	public function render_warning() {
-		?>
-		<div class="notice notice-error is-dismissible">
-			<p><strong>Important!</strong> Sermon Manager needs to check dates of old sermons.
-				<a href="<?php echo admin_url( 'edit.php?post_type=wpfc_sermon&page=' . basename( SERMON_MANAGER_PATH ) . '/includes/options.php#sermon-options-dates-fix' ); ?>">Click
-					here</a> if you want to do it now.</p>
-		</div>
-		<?php
-	}
-
-	/**
-	 * Main fixing function
-	 *
-	 * @return bool
-	 */
-	public function fix() {
-		$action    = $this->getCurrentAction();
-		$old_dates = $this->getDatesStats();
-
-		if ( $action === SM_DATES_NONE && $old_dates['total'] < 0 ) {
-			?>
-			Click on "<span style="color:#fff">Check dates for errors</span>" to begin...
-			<?php
-		} else if ( $action === SM_DATES_CHECK ) {
-			?>
-			Checking for errors...
-			<?php
-			$dates       = $this->getAllDates( true );
-			$dates_stats = $this->getDatesStats();
-			if ( $dates_stats['total'] < 1 ) {
-				update_option( 'wpfc_sm_dates_total', count( $dates ) );
-				update_option( 'wpfc_sm_dates_remaining', count( $dates ) );
-				update_option( 'wpfc_sm_dates_fixed', 0 );
-				update_option( 'wpfc_sm_dates_checked', 1 );
-				update_option( 'wpfc_sm_dates_last_action', SM_DATES_CHECK );
-				update_option( 'wpfc_sm_dates_old', serialize( $dates ) );
-
-				if ( count( $dates ) === 0 ) {
-					update_option( 'wpfc_sm_dates_all_fixed', 1 );
-				}
-			}
-			?>
-			<br>Done. <?php echo count( $dates ) ? 'Please reload the page and click on "Fix All".' : 'No errors.'; ?>
-			</span><?php echo wpfc_console_zsh( '', false ); ?>
-			<?php
-		} else if ( $action === SM_DATES_FIX ) {
-			echo 'Starting date fixing...<br>';
-			flush();
-
-			$dates = unserialize( get_option( 'wpfc_sm_dates_old', serialize( array() ) ) );
-			$fixed = 0;
-
-			if ( ! empty( $dates ) ) {
-				echo 'Fixing dates...<br>';
-				flush();
-				foreach ( $dates as $date ) {
-					// for backup
-					add_post_meta( $date['post_id'], 'sermon_date_old', $date['date'] );
-					// update the date
-					update_post_meta( $date['post_id'], 'sermon_date', strtotime( $date['date'] ) );
-					// add it to fixed dates
-					$fixed ++;
-				}
-
-				update_option( 'wpfc_sm_dates_fixed', $fixed );
-				update_option( 'wpfc_sm_dates_remaining', intval( get_option( 'wpfc_sm_dates_total', true ) ) - $fixed );
-			}
-
-			update_option( 'wpfc_sm_dates_all_fixed', 1 );
-
-			echo 'Date fixing completed.<br>';
-			flush();
-
-			echo '</span>';
-			echo wpfc_console_zsh( '', false );
-		}
-	}
-
-	/**
-	 * Gets current action that is being executed
-	 *
-	 * @return int|null Action int if success, null on failure
-	 * @see defineActions()
-	 */
-	public function getCurrentAction() {
-		$action = SM_DATES_NONE;
-
-		if ( isset( $_GET['fix_dates'] ) && $_GET['fix_dates'] !== '' ) {
-			$action = $_GET['fix_dates'];
-		} else if ( isset( $_POST['fix_dates'] ) && $_POST['fix_dates'] !== '' ) {
-			$action = $_POST['fix_dates'];
-		}
-
-		return $this->getAction( $action );
-	}
-
-	/**
-	 * Gets some statistics about dates scan
-	 *
-	 * @return array[] Details about old dates.
-	 * @type int $old_dates ['total'] = Total old dates, the number on the first scan
-	 * @type int $old_dates ['fixed'] = Number of fixed dates
-	 * @type int $old_dates ['remaining'] = How many are left to do.
-	 */
-	public function getDatesStats() {
-		$option_names = array(
-			'total'     => 'wpfc_sm_dates_total',
-			'fixed'     => 'wpfc_sm_dates_fixed',
-			'remaining' => 'wpfc_sm_dates_remaining',
-		);
-
-		$stats = array();
-		foreach ( $option_names as $name => $option_name ) {
-			$stats[ $name ] = get_option( $option_name, - 1 );
-		}
-
-		return $stats;
-	}
-
-	/**
-	 * Get all sermon dates from post meta
-	 *
-	 * @param bool $filter_old True to get only old dates, false for all (default false)
-	 *
-	 * @return array Array of post meta IDs, dates and sermon dates
-	 */
-	public function getAllDates( $filter_old = false ) {
-		global $wpdb;
-		$wp_query   = new WP_Query( array(
-			'post_type'      => 'wpfc_sermon',
-			'posts_per_page' => - 1,
-			'post_status'    => 'any'
-		) );
-		$posts_meta = array();
-
-		$sermons = $wp_query->posts;
-
-		foreach ( $sermons as $sermon ) {
-			// get post meta directly from DB. The reason for not using get_post_meta() is that we need meta_id too.
-			$date = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s", $sermon->ID, 'sermon_date' ) );
-
-			// if for some reason, the date is blank or something else, continue to next sermon
-			if ( empty( $date[0] ) ) {
-				continue;
-			}
-
-			// assign first sermon_date meta to $date variable
-			$date = $date[0];
-
-			// skip if we need only old dates
-			if ( is_numeric( $date->meta_value ) && $filter_old ) {
-				continue;
-			}
-
-			$posts_meta[] = array(
-				'date'    => $date->meta_value,
-				'meta_id' => $date->meta_id,
-				'post_id' => $sermon->ID,
-			);
-		}
-
-		return $posts_meta;
-	}
-}
-
-try {
-	$WPFC_Fix_Dates = new WPFC_Fix_Dates();
-	$WPFC_Fix_Dates->init();
-} catch ( Exception $e ) {
-	print_r( $e );
-}
\ No newline at end of file
diff --git a/includes/options.php b/includes/options.php
index 4f07e97..b862c49 100755
--- a/includes/options.php
+++ b/includes/options.php
@@ -148,58 +148,6 @@ function wpfc_sermon_options_render_form() {
                     background: #ffffff
                 }
 
-                #sermon-options-dates-fix > .inside {
-                    display: flex;
-                    flex-wrap: wrap;
-                }
-
-                #sermon-options-dates-fix > .inside > .main {
-                    flex: 1 0 80%;
-                }
-
-                #sermon-options-dates-fix > .inside > .damage-report {
-                    flex: 1 0 20%;
-                }
-
-                #sermon-options-dates-fix > .inside > .damage-report p {
-                    margin: .3rem 0;
-                }
-
-                #sermon-options-dates-fix > .inside > .damage-report > .main-errors h3 {
-                    margin: 0;
-                }
-
-                #sermon-options-dates-fix > .inside > .damage-report > .main-errors h1 {
-                    padding: 10px 0;
-                    font-size: 48px;
-                    line-height: 48px;
-                    text-align: center;
-                }
-
-                #sermon-options-dates-fix .console {
-                    width: 97%;
-                    min-height: 200px;
-                    background: #002b36;
-                    color: #93a1a1;
-                    font-family: monospace;
-                    margin-top: 20px;
-                    border: 1px solid #001d25;
-                    padding: 3px;
-                }
-
-                #sermon-options-dates-fix .console > span:last-child:after {
-                    content: "\002588";
-                    display: block;
-                }
-
-                #sermon-options-dates-fix .console .zsh {
-                    display: block;
-                }
-
-                #sermon-options-dates-fix .console .zsh:after {
-                    display: inline !important;
-                }
-
                 .sm-box h3 {
                     text-align: center;
                     background: #f7f7f7;
@@ -220,8 +168,6 @@ function wpfc_sermon_options_render_form() {
                                href="#sermon-options-verse"><?php _e( 'Verse', 'sermon-manager' ); ?></a></li>
                         <li><a id="sermon-podcast" class="nav-tab"
                                href="#sermon-options-podcast"><?php _e( 'Podcast', 'sermon-manager' ); ?></a></li>
-                        <li><a id="sermon-dates-fix" class="nav-tab"
-                               href="#sermon-options-dates-fix"><?php _e( 'Dates Fix', 'sermon-manager' ); ?></a></li>
 						<?php do_action( 'wpfc_settings_form_tabs' ); ?>
                     </ul>
                 </h2>
@@ -761,60 +707,6 @@ function wpfc_sermon_options_render_form() {
                                     </div> <!-- .inside -->
                                 </div>
 
-                                <div class="postbox tab-content" id="sermon-options-dates-fix">
-                                    <h3><span><?php _e( 'Dates Fix', 'sermon-manager' ); ?></span></h3>
-                                    <div class="inside">
-                                        <div class="main">
-                                            <div class="actions">
-                                                <a class="button-primary"
-                                                   href="<?php echo admin_url( 'edit.php?post_type=wpfc_sermon&page=' . basename( SERMON_MANAGER_PATH ) . '/includes/options.php' ) . '&fix_dates=check#sermon-options-dates-fix' ?>">Check
-                                                    dates for errors</a>
-                                                <a class="button-primary <?php echo ! get_option( 'wpfc_sm_dates_checked', 0 ) || ( isset( $_GET['fix_dates'] ) && $_GET['fix_dates'] !== 'check' ) || get_option( 'wpfc_sm_dates_all_fixed', true ) ? 'disabled' : ''; ?>"
-                                                   href="<?php echo admin_url( 'edit.php?post_type=wpfc_sermon&page=' . basename( SERMON_MANAGER_PATH ) . '/includes/options.php' ) . '&fix_dates=fix#sermon-options-dates-fix' ?>">Fix
-                                                    All</a>
-                                                <a class="button-secondary disabled" href="">Revert fix</a>
-                                            </div>
-                                            <div class="console">
-												<?php
-												/**
-												 * Shows zsh-like CLI, 'sermon-manager@website.com'
-												 *
-												 * @param string $command    Command to execute
-												 * @param bool   $close_span False to not close <span>
-												 */
-												function wpfc_console_zsh( $command = '', $close_span = true ) {
-													?>
-                                                    <span class="zsh">
-													<?php preg_match( '/http(s|):\/\/(.*?(?=\/|$))/', get_site_url(), $url ); ?>
-                                                    <span style="color: #268bd2">
-														sermon-manager</span>@<?php echo $url[2]; ?>
-                                                    ~ % <?php echo $command; ?>
-													<?php if ( $close_span ): ?>
-                                                        </span>
-													<?php endif; ?>
-													<?php
-												} ?>
-												<?php wpfc_console_zsh( 'fixdates' ); ?>
-                                                <span class="content">
-													<?php do_action( 'wpfc_fix_dates' ); ?>
-												</span>
-                                            </div>
-                                        </div>
-                                        <div class="damage-report">
-                                            <div class="main-errors">
-                                                <h3>Errors:</h3>
-                                                <h1><?php echo get_option( 'wpfc_sm_dates_remaining', '?' ); ?></h1>
-                                            </div>
-                                            <div class="detailed-report">
-                                                <p>Total errors:
-													<?php echo get_option( 'wpfc_sm_dates_total', '?' ); ?></p>
-                                                <p>Fixed so far:
-													<?php echo get_option( 'wpfc_sm_dates_fixed', '?' ); ?></p>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-
 								<?php do_action( 'wpfc_settings_form' ); ?>
                                 <p class="submit">
                                     <input type="submit" class="button-primary"
diff --git a/includes/shortcodes.php b/includes/shortcodes.php
index 7162817..5653985 100755
--- a/includes/shortcodes.php
+++ b/includes/shortcodes.php
@@ -624,9 +624,6 @@ function displaySermons( $atts = array() ) {
 			'post_type'      => 'wpfc_sermon',
 			'posts_per_page' => $args['per_page'],
 			'order'          => $args['order'],
-			'meta_key'       => 'sermon_date',
-			'meta_value_num' => time(),
-			'meta_compare'   => '<=',
 			'paged'          => $my_page,
 		);
 
@@ -643,12 +640,7 @@ function displaySermons( $atts = array() ) {
 			$args['orderby'] = 'date';
 		}
 
-		// set the ordering options
-		if ( $args['orderby'] === 'date' ) {
-			$query_args['orderby'] = 'meta_value_num';
-		} else {
-			$query_args['orderby'] = $args['orderby'];
-		}
+		$query_args['orderby'] = $args['orderby'];
 
 		// if we should show just specific sermons
 		if ( $args['sermons'] ) {
diff --git a/includes/template-tags.php b/includes/template-tags.php
index cb75486..c2548ae 100755
--- a/includes/template-tags.php
+++ b/includes/template-tags.php
@@ -243,15 +243,8 @@ function wpfc_sermon_description( $before = '', $after = '' ) {
 // render any sermon date
 function wpfc_sermon_date( $args, $before = '', $after = '' ) {
 	global $post;
-	$ugly_date = get_post_meta( $post->ID, 'sermon_date', true );
 
-	// seems like it was stored as a text in the db sometime in the past
-	if ( ! is_numeric( $ugly_date ) ) {
-		$ugly_date = strtotime( $ugly_date );
-	}
-
-	$date = date_i18n( $args, $ugly_date );
-	echo $before . $date . $after;
+	echo $before . date_i18n( $args, get_the_date( 'U', $post->ID ) ) . $after;
 }
 
 // Change the_author to the preacher on frontend display
@@ -269,7 +262,7 @@ 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', ) ) ) :
+    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,
@@ -279,7 +272,7 @@ function render_sermon_image( $size ) {
 			'before'       => '',
 			'before_image' => ''
 		) );
-	elseif ( ! has_post_thumbnail() && ! apply_filters( 'sermon-images-list-the-terms', '', array( 'taxonomy' => 'wpfc_sermon_series', ) ) ) :
+    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,
@@ -375,8 +368,8 @@ function wpfc_sermon_attachments() {
 	);
 	$attachments = get_posts( $args );
 	$html        = '';
-	$html .= '<div id="wpfc-attachments" class="cf">';
-	$html .= '<p><strong>' . __( 'Download Files', 'sermon-manager' ) . '</strong>';
+	$html        .= '<div id="wpfc-attachments" class="cf">';
+	$html        .= '<p><strong>' . __( 'Download Files', 'sermon-manager' ) . '</strong>';
 	if ( $attachments ) {
 		foreach ( $attachments as $attachment ) {
 			// skip audio, so we don't have double URLs
@@ -564,111 +557,3 @@ function wpfc_footer_preacher() {
 		}
 	}
 }
-
-/**
- * Change published date to sermon date on frontend display.
- * Filters the output of `get_the_time` because `get_the_time` returns post time instead of sermon time.
- *
- * @param string|int       $the_time Already filtered time. This will be returned if post type is not `wpfc_sermon`
- * @param string           $d        Format to use for retrieving the time the post was written.
- * @param null|int|WP_Post $post     WP_Post object or ID
- *
- * @return string|int|false
- */
-function wpfc_sermon_time_filter( $the_time = 0, $d = '', $post = null ) {
-	if ( 'wpfc_sermon' == get_post_type( $post ) ) {
-		// if the post is not set, try to get current one
-		if ( $post === null ) {
-			$post = the_post();
-		}
-
-		// get the post
-		$post = get_post( $post );
-
-		// this check is maybe not needed, post will be validated on first call of `get_the_time`
-		if ( ! $post ) {
-			return false;
-		}
-
-		// use specified format, or get default one if not specified
-		$format = $d === '' ? get_option( 'time_format' ) : $d;
-
-		// get sermon date
-		$date = get_post_meta( $post->ID, 'sermon_date', true );
-
-		// if the sermon time is not represented as Unix timestamp, convert it
-		if ( ! is_numeric( $date ) ) {
-			$date = strtotime( $date );
-		}
-
-		// get post hour, minute and second, in seconds
-		$his = explode( ':', date( 'H:i:s', strtotime( $post->post_date ) ) );
-
-		// add hour, minute and second to sermon time
-		$date += ( $his[0] * 60 * 60 + $his[1] * 60 + $his[2] );
-
-		// convert time to expected format for `mysql2date`
-		$date = date( 'Y-m-d H:i:s', $date );
-
-		// do the actual conversion
-		$the_time = mysql2date( $format, $date, true );
-	}
-
-	return $the_time;
-}
-
-add_filter( 'get_the_time', 'wpfc_sermon_time_filter', 10, 3 );
-
-/**
- * Change published date to sermon date on frontend display.
- * Filters the output of `get_the_date` because `get_the_date` returns post date instead of sermon date.
- *
- * @param string|int  $the_date Already filtered time. This will be returned if post type is not `wpfc_sermon`
- * @param string      $d        Format to use for retrieving the time the post was written.
- * @param int|WP_Post $post     WP_Post object or ID
- *
- * @return string|int|false
- */
-function wpfc_sermon_date_filter( $the_date = 0, $d = '', $post = null ){
-	if ( 'wpfc_sermon' == get_post_type() ) {
-		// if the post is not set, try to get current one
-		if ( ! is_single() && $post === null ) {
-			$post = the_post();
-		}
-
-		// get the post
-		$post = get_post( $post );
-
-		// this check is maybe not needed, post will be validated on first call of `get_the_time`
-		if ( ! $post ) {
-			return false;
-		}
-
-		// use specified format, or get default one if not specified
-		$format = $d === '' ? get_option( 'date_format' ) : $d;
-
-		// get sermon date
-		$date = get_post_meta( $post->ID, 'sermon_date', true );
-
-		// if the sermon time is not represented as Unix timestamp, convert it
-		if ( ! is_numeric( $date ) ) {
-			$date = strtotime( $date );
-		}
-
-		// get post hour, minute and second, in seconds
-		$his = explode( ':', date( 'H:i:s', strtotime( $post->post_date ) ) );
-
-		// add hour, minute and second to sermon time
-		$date += ( $his[0] * 60 * 60 + $his[1] * 60 + $his[2] );
-
-		// convert time to expected format for `mysql2date`
-		$date = date( 'Y-m-d H:i:s', $date );
-
-		// do the actual conversion
-		$the_date = mysql2date( $format, $date, true );
-	}
-
-	return $the_date;
-}
-
-add_filter( 'get_the_date', 'wpfc_sermon_date_filter', 10, 3 );
diff --git a/includes/types-taxonomies.php b/includes/types-taxonomies.php
index 41b3284..de64eb8 100755
--- a/includes/types-taxonomies.php
+++ b/includes/types-taxonomies.php
@@ -277,33 +277,6 @@ function wpfc_sermon_metaboxes() {
 		// 'cmb_styles' => false, // false to disable the CMB stylesheet
 		// 'closed'     => true, // Keep the metabox closed by default
 	) );
-
-	$date_format = 'm/d/Y';
-	if ( \SermonManager::getOption( 'date_format' ) !== '' ) {
-		switch ( \SermonManager::getOption( 'date_format' ) ) {
-			case '0':
-				$date_format = 'm/d/Y';
-				break;
-			case '1':
-				$date_format = 'd/m/Y';
-				break;
-			case '2':
-				$date_format = 'Y/m/d';
-				break;
-			case '3':
-				$date_format = 'Y/d/m';
-				break;
-		}
-	}
-
-	$cmb->add_field( array(
-		'name'        => __( 'Date', 'sermon-manager' ),
-		'desc'        => __( 'Enter the date the sermon was given. <strong>NOTE: Each sermon must have a date!</strong>', 'sermon-manager' ) . '<br>(format: ' . $date_format . ')',
-		'id'          => 'sermon_date',
-		'type'        => 'text_date_timestamp',
-		// 'timezone_meta_key' => 'wiki_test_timezone',
-		'date_format' => $date_format,
-	) );
 	$cmb->add_field( array(
 		'name'             => __( 'Service Type', 'sermon-manager' ),
 		'desc'             => __( 'Select the type of service. Modify service types in Sermons -> Service Types.', 'sermon-manager' ),
diff --git a/includes/widgets.php b/includes/widgets.php
index 5450015..5b918be 100755
--- a/includes/widgets.php
+++ b/includes/widgets.php
@@ -46,11 +46,6 @@ function widget( $args, $instance ) {
 
 		$r = new WP_Query( array(
 			'post_type'           => 'wpfc_sermon',
-			'meta_key'            => 'sermon_date',
-			'meta_value'          => time(),
-			'meta_compare'        => '<=',
-			'orderby'             => 'meta_value',
-			'order'               => 'DESC',
 			'posts_per_page'      => $number,
 			'no_found_rows'       => true,
 			'post_status'         => 'publish',
diff --git a/readme.txt b/readme.txt
index c724cf1..b98b924 100755
--- a/readme.txt
+++ b/readme.txt
@@ -85,10 +85,13 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 == Changelog ==
 = 2.4.7 =
 * Fix PHP notice in the footer
-* Fix sermons ordering (Force dates fix for users who did not do it yet)
 * Fix slashes in RSS feed
 * Fix podcast cover image not selecting
 * Fix first sermon image showing up as podcast cover image when none selected
+* Fix all dates issues
+* Removed "Date" field (left side) in Sermon edit screen, "Published" date (right side) will be used from now on
+* Removed "Fix Dates" option tab, it's not necessary anymore
+* Removed all warnings and error related to dates
 * Replaced old media manager with new one for podcast cover image
 
 = 2.4.6 =
diff --git a/sermons.php b/sermons.php
index 35778ae..ba21018 100755
--- a/sermons.php
+++ b/sermons.php
@@ -60,12 +60,12 @@ public function __construct() {
 		// no idea... better not touch it for now.
 		add_filter( 'sermon-images-disable-public-css', '__return_true' );
 
-		// force dates fix
+		// do dates fixing
 		$this->fix_dates();
 	}
 
 	private function fix_dates() {
-		if ( intval( get_option( 'wpfc_sm_dates_all_fixed' ) ) === 1 || ! is_admin() ) {
+		if ( get_option( 'wpfc_sm_dates_convert_done', 0 ) == 1 || ! is_admin() ) {
 			return;
 		}
 
@@ -81,26 +81,32 @@ private function fix_dates() {
 			$sermons = $wp_query->posts;
 
 			foreach ( $sermons as $sermon ) {
+				// reset variable
+				$old = false;
+
 				// get post meta directly from DB. The reason for not using get_post_meta() is that we need meta_id too.
 				$date = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s", $sermon->ID, 'sermon_date' ) );
 
-				// if for some reason, the date is blank or something else, continue to next sermon
-				if ( empty( $date[0] ) ) {
-					continue;
-				}
+				// if for some reason, the date is blank or some other value,
+				// try to get backup dates and if they are also blank or have some other value
+				// then continue to the next sermon
+				if ( empty( $date[0]->meta_value ) ) {
+					$date = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s", $sermon->ID, 'sermon_date_old' ) );
 
-				// assign first sermon_date meta to $date variable
-				$date = $date[0];
+					if ( empty( $date[0]->meta_value ) ) {
+						continue;
+					}
 
-				// skip if we need only old dates
-				if ( is_numeric( $date->meta_value ) ) {
-					continue;
+					$old = true;
 				}
 
+				$post_time = explode( ':', get_post_time( 'H:i:s', true, $sermon->ID ) );
+
+				// add it to array for fixing
 				$posts_meta[] = array(
-					'date'    => $date->meta_value,
-					'meta_id' => $date->meta_id,
+					'date'    => intval( $date[0]->meta_value ) + $post_time[0] * 60 * 60 + $post_time[1] * 60 + $post_time[2],
 					'post_id' => $sermon->ID,
+					'old'     => $old,
 				);
 			}
 
@@ -109,24 +115,30 @@ private function fix_dates() {
 
 			if ( ! empty( $dates ) ) {
 				foreach ( $dates as $date ) {
-					// for backup
-					update_post_meta( $date['post_id'], 'sermon_date_old', $date['date'] );
-					// update the date
-					update_post_meta( $date['post_id'], 'sermon_date', strtotime( $date['date'] ) );
+					// convert it to mysql date
+					$post_date = date( "Y-m-d H:i:s", $date['date'] );
+
+					// save to the database
+					$wpdb->update( $wpdb->posts, array(
+						'post_date'     => $post_date,
+						'post_date_gmt' => get_gmt_from_date( $post_date ),
+					), array(
+						'ID' => $date['post_id'],
+					) );
+
 					// add it to fixed dates
 					$fixed ++;
 				}
-
-				update_option( 'wpfc_sm_dates_fixed', $fixed );
-				update_option( 'wpfc_sm_dates_remaining', intval( get_option( 'wpfc_sm_dates_total', true ) ) - $fixed );
 			}
 
-			update_option( 'wpfc_sm_dates_all_fixed', 1 );
+			// clear all cached data
+			wp_cache_flush();
 		} catch ( Exception $exception ) {
 			print_r( $exception );
-			die();
 			// failed :(
 		}
+
+		update_option( 'wpfc_sm_dates_convert_done', 1 );
 	}
 
 	/**
@@ -155,7 +167,6 @@ private function includes() {
 		 */
 		$admin_includes = array(
 			'/includes/admin-functions.php', // General Admin area functions
-			'/includes/fix-dates.php', // Date fixing, explained in the script
 			'/includes/CMB2/init.php', // Metaboxes
 			'/includes/options.php', // Options Page
 		);
@@ -206,7 +217,7 @@ public static function load_translations() {
 	 */
 	public static function enqueue_scripts_styles() {
 		if ( defined( 'SM_SCRIPTS_STYLES_ENQUEUED' ) ) {
-	        return;
+			return;
 		}
 
 		if ( ! ( defined( 'SM_ENQUEUE_SCRIPTS_STYLES' ) ||
diff --git a/views/wpfc-podcast-feed.php b/views/wpfc-podcast-feed.php
index 5e182c2..6067568 100644
--- a/views/wpfc-podcast-feed.php
+++ b/views/wpfc-podcast-feed.php
@@ -11,11 +11,6 @@
 $args                 = array(
 	'post_type'      => 'wpfc_sermon',
 	'posts_per_page' => - 1,
-	'meta_key'       => 'sermon_date',
-	'meta_value'     => time(),
-	'meta_compare'   => '<=',
-	'orderby'        => 'meta_value',
-	'order'          => 'DESC'
 );
 $sermon_podcast_query = new WP_Query( $args );
 

From 56fbc134f5a1f17f6ef6951153dca10675300da5 Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 15 Aug 2017 15:22:53 +0200
Subject: [PATCH 09/10] Massive performance increase in dates fixing

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

diff --git a/readme.txt b/readme.txt
index b98b924..d92be9a 100755
--- a/readme.txt
+++ b/readme.txt
@@ -88,7 +88,7 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 * Fix slashes in RSS feed
 * Fix podcast cover image not selecting
 * Fix first sermon image showing up as podcast cover image when none selected
-* Fix all dates issues
+* Fix all dates issues (please allow the page to load after the update, it will take a minute; if you stop the load, please open `<your website URL>/wp-admin/?sm_fix_dates`)
 * Removed "Date" field (left side) in Sermon edit screen, "Published" date (right side) will be used from now on
 * Removed "Fix Dates" option tab, it's not necessary anymore
 * Removed all warnings and error related to dates
diff --git a/sermons.php b/sermons.php
index ba21018..1ef4a75 100755
--- a/sermons.php
+++ b/sermons.php
@@ -65,47 +65,55 @@ public function __construct() {
 	}
 
 	private function fix_dates() {
-		if ( get_option( 'wpfc_sm_dates_convert_done', 0 ) == 1 || ! is_admin() ) {
-			return;
+		if ( ! isset( $_GET['sm_fix_dates'] ) ) {
+			if ( get_option( 'wpfc_sm_dates_convert_done', 0 ) == 1 || ! is_admin() ) {
+				return;
+			}
 		}
 
 		try {
 			global $wpdb;
-			$wp_query   = new WP_Query( array(
-				'post_type'      => 'wpfc_sermon',
-				'posts_per_page' => - 1,
-				'post_status'    => 'any'
-			) );
 			$posts_meta = array();
 
-			$sermons = $wp_query->posts;
+			// sermon date storage until now
+			$sermon_dates = $wpdb->get_results( $wpdb->prepare( "SELECT meta_value, post_id FROM $wpdb->postmeta WHERE meta_key = %s", 'sermon_date' ) );
+			// sermon date storage that was created by our fixing scripts
+			$old_dates = $wpdb->get_results( $wpdb->prepare( "SELECT meta_value, post_id FROM $wpdb->postmeta WHERE meta_key = %s", 'sermon_date_old' ) );
+			// WP sermon dates
+			$wp_dates = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_date FROM $wpdb->posts WHERE post_type = %s", 'wpfc_sermon' ) );
 
-			foreach ( $sermons as $sermon ) {
+			foreach ( $sermon_dates as $sermon_date ) {
 				// reset variable
-				$old = false;
-
-				// get post meta directly from DB. The reason for not using get_post_meta() is that we need meta_id too.
-				$date = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s", $sermon->ID, 'sermon_date' ) );
+				$old = $post_date = false;
 
 				// if for some reason, the date is blank or some other value,
 				// try to get backup dates and if they are also blank or have some other value
 				// then continue to the next sermon
-				if ( empty( $date[0]->meta_value ) ) {
-					$date = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s", $sermon->ID, 'sermon_date_old' ) );
-
-					if ( empty( $date[0]->meta_value ) ) {
-						continue;
+				if ( empty( $sermon_date->meta_value ) ) {
+					foreach ( $old_dates as $old_date ) {
+						if ( $old_date->post_id == $sermon_date->post_id ) {
+							$sermon_date = $old_date;
+							break;
+						}
 					}
 
 					$old = true;
 				}
 
-				$post_time = explode( ':', get_post_time( 'H:i:s', true, $sermon->ID ) );
+				// get post time
+				foreach ( $wp_dates as $wp_date ) {
+					if ( $wp_date->ID == $sermon_date->post_id ) {
+						$post_date = $wp_date->post_date;
+						break;
+					}
+				}
+
+				$post_time = explode( ':', date( 'H:i:s', strtotime( $post_date ) ) );
 
 				// add it to array for fixing
 				$posts_meta[] = array(
-					'date'    => intval( $date[0]->meta_value ) + $post_time[0] * 60 * 60 + $post_time[1] * 60 + $post_time[2],
-					'post_id' => $sermon->ID,
+					'date'    => intval( $sermon_date->meta_value ) + $post_time[0] * 60 * 60 + $post_time[1] * 60 + $post_time[2],
+					'post_id' => (int) $sermon_date->post_id,
 					'old'     => $old,
 				);
 			}

From 4c7bd17af69bf8b1e1ceae6eddb55edecf0ced58 Mon Sep 17 00:00:00 2001
From: Nikola <nikolam3244@gmail.com>
Date: Tue, 15 Aug 2017 15:23:21 +0200
Subject: [PATCH 10/10] Update version

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

diff --git a/readme.txt b/readme.txt
index d92be9a..bcf5550 100755
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Donate link: http://wpforchurch.com/
 Tags: church, sermon, sermons, preaching, podcasting
 Requires at least: 4.5
 Tested up to: 4.8.1
-Stable tag: 2.4.6
+Stable tag: 2.4.7
 
 Add audio and video sermons, manage speakers, series, and more to your church website.
 
diff --git a/sermons.php b/sermons.php
index 1ef4a75..71d6f40 100755
--- a/sermons.php
+++ b/sermons.php
@@ -3,7 +3,7 @@
 Plugin Name: Sermon Manager for WordPress
 Plugin URI: http://www.wpforchurch.com/products/sermon-manager-for-wordpress/
 Description: Add audio and video sermons, manage speakers, series, and more. Visit <a href="http://wpforchurch.com" target="_blank">Wordpress for Church</a> for tutorials and support.
-Version: 2.4.6
+Version: 2.4.7
 Author: WP for Church
 Contributors: wpforchurch, jprummer, jamzth
 Author URI: http://www.wpforchurch.com/