Package for release (2.2)

- Fixed entries not deleting on schedule when server and WordPress timezones do not match.

Author: travislopes

class-gf-entryexpiration.php

@@ -615,7 +615,7 @@ public function maybe_run_deletion( $form, $settings ) {
 	public function delete_form_entries( $form, $settings ) {
 
 		// Prepare search critera.
-		$search_critera = $this->get_search_criteria( $settings, $form );
+		$search_criteria = $this->get_search_criteria( $settings, $form );
 
 		// Prepare paging criteria.
 		$paging = array(
@@ -624,7 +624,7 @@ public function delete_form_entries( $form, $settings ) {
 		);
 
 		// Get total entry count.
-		$found_entries = GFAPI::count_entries( $form['id'], $search_critera );
+		$found_entries = GFAPI::count_entries( $form['id'], $search_criteria );
 
 		// Set entries processed count.
 		$entries_processed = 0;
@@ -636,7 +636,7 @@ public function delete_form_entries( $form, $settings ) {
 			$this->log_debug( __METHOD__ . '(): Starting deletion of page ' . ( round( $entries_processed / $paging['page_size'] ) + 1 ) . ' of ' . ( round( $found_entries / $paging['page_size'] ) ) );
 
 			// Get entries.
-			$entries = GFAPI::get_entries( $form['id'], $search_critera, null, $paging );
+			$entries = GFAPI::get_entries( $form['id'], $search_criteria, null, $paging );
 
 			// If no more entries were found, break.
 			if ( empty( $entries ) ) {
@@ -684,9 +684,9 @@ public function delete_form_entries( $form, $settings ) {
 	public function get_search_criteria( $settings, $form ) {
 
 		// Initialize search criteria.
-		$search_critera = array(
-			'start_date'     => date( 'Y-m-d H:i:s', 0 ),
-			'end_date'       => date( 'Y-m-d H:i:s', strtotime( '-' . $settings['deletionDate']['number'] . ' ' . $settings['deletionDate']['unit'] ) ),
+		$search_criteria = array(
+			'start_date'     => wp_date( 'Y-m-d H:i:s', 0 ),
+			'end_date'       => wp_date( 'Y-m-d H:i:s', strtotime( '-' . $settings['deletionDate']['number'] . ' ' . $settings['deletionDate']['unit'] ) ),
 			'payment_status' => null,
 		);
 
@@ -698,7 +698,7 @@ public function get_search_criteria( $settings, $form ) {
 		 * @param string $older_than Current entry expiration time.
 		 * @param array  $form Form object.
 		 */
-		$search_critera['end_date'] = gf_apply_filters( array( 'gf_entryexpiration_older_than', $form['id'] ), $search_critera['end_date'], $form );
+		$search_criteria['end_date'] = gf_apply_filters( array( 'gf_entryexpiration_older_than', $form['id'] ), $search_criteria['end_date'], $form );
 
 		/**
 		 * Set the payment status when searching for expired entries.
@@ -708,9 +708,9 @@ public function get_search_criteria( $settings, $form ) {
 		 * @param string null Payment status.
 		 * @param array  $form Form object.
 		 */
-		$search_critera['payment_status'] = gf_apply_filters( array( 'gf_entryexpiration_payment', $form['id'] ), $search_critera['payment_status'], $form );
+		$search_criteria['payment_status'] = gf_apply_filters( array( 'gf_entryexpiration_payment', $form['id'] ), $search_criteria['payment_status'], $form );
 
-		return $search_critera;
+		return $search_criteria;
 
 	}
 

entryexpiration.php

@@ -3,13 +3,13 @@
 Plugin Name: Entry Expiration for Gravity Forms
 Plugin URI: https://travislop.es/plugins/gravity-forms-entry-expiration/
 Description: Provides a simple way to remove old entries in Gravity Forms.
-Version: 2.1
+Version: 2.2
 Author: ForGravity
 Author URI: https://forgravity.com
 Text Domain: gravity-forms-entry-expiration
  **/
 
-define( 'GF_ENTRYEXPIRATION_VERSION', '2.1' );
+define( 'GF_ENTRYEXPIRATION_VERSION', '2.2' );
 
 // If Gravity Forms is loaded, bootstrap the Entry Expiration Add-On.
 add_action( 'gform_loaded', array( 'GF_EntryExpiration_Bootstrap', 'load' ), 5 );

readme.md

@@ -9,6 +9,8 @@
 This WordPress plugin allows you to automatically delete Gravity Forms entries older than a defined timeframe. After activating the plugin, set the oldest age for an entry on the Entry Expiration Settings page inside of Gravity Forms. At midnight, the plugin will delete all entries older than the time you set. Only forms set to be included in the entry expiration will have their entries deleted. You can include a form in the entry expiration process by selecting the "Include in entry expiration" option under Form Settings.
 
 ### Changelog
+* Version 2.2 (2021-09-02)
+	* Fixed entries not deleting on schedule when server and WordPress timezones do not match.
 * Version 2.1 (2020-08-07)
 	* Added capabilities.
 	* Added support for Gravity Forms 2.5.

readme.txt

@@ -1,7 +1,7 @@
 === Entry Expiration for Gravity Forms ===
 Contributors: forgravity, travislopes
 Tags: gravity forms, entry, expiration
-Requires at least: 3.9.2
+Requires at least: 5.3.0
 Tested up to: 5.8.0
 Stable tag: 4.7.3
 Requires PHP: 5.3
@@ -23,7 +23,7 @@ Entry Expiration for Gravity Forms allows you to automatically delete Gravity Fo
 
 == Installation ==
 = Requirements =
-* WordPress version 3.9.2 and later (tested at 5.8.0)
+* WordPress version 5.3.0 and later (tested at 5.8.0)
 * Gravity Forms 1.8.17 and later
 
 = Installation =
@@ -34,6 +34,8 @@ Entry Expiration for Gravity Forms allows you to automatically delete Gravity Fo
 1. Define how often you want entries to be deleted and the minimum age required for entries to be deleted.
 
 == Changelog ==
+= Version 2.2 (2021-09-02) =
+* Fixed entries not deleting on schedule when server and WordPress timezones do not match.
 = Version 2.1 (2020-08-07) =
 * Added capabilities.
 * Added support for Gravity Forms 2.5.