Merge pull request #889 from Codeinwp/feat/deactivate-rollback

Feat/deactivate rollback

Author: selul

inc/admin.php

@@ -43,6 +43,8 @@ class Optml_Admin {
 	const OLD_USER_ENABLED_LD = 'optml_enabled_limit_dimensions';
 	const OLD_USER_ENABLED_CL = 'optml_enabled_cloud_sites';
 
+	const SYNC_CRON = 'optml_daily_sync';
+	const ENRICH_CRON = 'optml_pull_image_data';
 	/**
 	 * Optml_Admin constructor.
 	 */
@@ -58,13 +60,12 @@ public function __construct() {
 		add_action( 'admin_notices', [ $this, 'add_notice' ] );
 		add_action( 'admin_notices', [ $this, 'add_notice_upgrade' ] );
 		add_action( 'admin_notices', [ $this, 'add_notice_conflicts' ] );
-		add_action( 'optml_daily_sync', [ $this, 'daily_sync' ] );
+		add_action( self::SYNC_CRON, [ $this, 'daily_sync' ] );
 		add_action( 'admin_init', [ $this, 'redirect_old_dashboard' ] );
 
 		if ( $this->settings->is_connected() ) {
 			add_action( 'init', [ $this, 'check_domain_change' ] );
-			add_action( 'optml_pull_image_data_init', [ $this, 'pull_image_data_init' ] );
-			add_action( 'optml_pull_image_data', [ $this, 'pull_image_data' ] );
+			add_action( self::ENRICH_CRON, [ $this, 'pull_image_data' ] );
 
 			// Backwards compatibility for older versions of WordPress < 6.0.0 requiring 3 parameters for this specific filter.
 			$below_6_0_0 = version_compare( get_bloginfo( 'version' ), '6.0.0', '<' );
@@ -76,15 +77,17 @@ public function __construct() {
 
 			add_action( 'updated_post_meta', [ $this, 'detect_image_alt_change' ], 10, 4 );
 			add_action( 'added_post_meta', [ $this, 'detect_image_alt_change' ], 10, 4 );
-			add_action( 'init', [ $this, 'schedule_data_enhance_cron' ] );
+			if ( ! wp_next_scheduled( self::ENRICH_CRON ) ) {
+				wp_schedule_event( time() + 10, 'hourly', self::ENRICH_CRON );
+			}
 		}
 		add_action( 'init', [ $this, 'update_default_settings' ] );
 		add_action( 'init', [ $this, 'update_limit_dimensions' ] );
 		add_action( 'init', [ $this, 'update_cloud_sites_default' ] );
 		add_action( 'admin_init', [ $this, 'maybe_redirect' ] );
 		add_action( 'admin_init', [ $this, 'init_no_script' ] );
-		if ( ! is_admin() && $this->settings->is_connected() && ! wp_next_scheduled( 'optml_daily_sync' ) ) {
-			wp_schedule_event( time() + 10, 'daily', 'optml_daily_sync', [] );
+		if ( ! is_admin() && $this->settings->is_connected() && ! wp_next_scheduled( self::SYNC_CRON ) ) {
+			wp_schedule_event( time() + 10, 'twicedaily', self::SYNC_CRON, [] );
 		}
 		add_action( 'optml_after_setup', [ $this, 'register_public_actions' ], 999999 );
 
@@ -194,16 +197,6 @@ protected function is_gzipped( $contents ) {
 		}
 		// phpcs:enable
 	}
-	/**
-	 * Schedules the hourly cron that starts the querying for images alt/title attributes
-	 *
-	 * @uses action: init
-	 */
-	public function schedule_data_enhance_cron() {
-		if ( ! wp_next_scheduled( 'optml_pull_image_data_init' ) ) {
-			wp_schedule_event( time(), 'hourly', 'optml_pull_image_data_init' );
-		}
-	}
 
 	/**
 	 * Query the database for images and extract the alt/title to send them to the API
@@ -253,20 +246,6 @@ public function pull_image_data() {
 			$api = new Optml_Api();
 			$api->call_data_enrich_api( $image_data );
 		}
-		if ( ! empty( $attachments ) ) {
-			wp_schedule_single_event( time() + 5, 'optml_pull_image_data' );
-		}
-	}
-
-	/**
-	 * Schedule the event to pull image alt/title
-	 *
-	 * @uses action: optml_pull_image_data_init
-	 */
-	public function pull_image_data_init() {
-		if ( ! wp_next_scheduled( 'optml_pull_image_data' ) ) {
-			wp_schedule_single_event( time() + 5, 'optml_pull_image_data' );
-		}
 	}
 
 	/**
@@ -1097,7 +1076,24 @@ public function daily_sync() {
 		if ( isset( $data['extra_visits'] ) ) {
 			$this->settings->update_frontend_banner_from_remote( $data['extra_visits'] );
 		}
+		// Here the account got deactivated, in this case we check if the user is using offloaded images and we roll them back.
+		if ( isset( $data['status'] ) && $data['status'] === 'inactive' ) {
+			// We check if the user has images offloaded.
+			if ( $this->settings->get( 'offload_media' ) === 'disabled' ) {
+				return;
+			}
 
+			$in_progress = $this->settings->get( 'offloading_status' ) !== 'disabled';
+			// We check if there is an in progress transfer, we stop it.
+			if ( $in_progress ) {
+				$this->settings->update( 'offloading_status', 'disabled' );
+			}
+			$this->settings->update( 'rollback_status', 'enabled' );
+			// We start the rollback process.
+			Optml_Logger::instance()->add_log( 'rollback_images', 'Account deactivated, starting rollback.' );
+			Optml_Media_Offload::get_image_count( 'rollback_images', false );
+			$this->settings->update( 'offload_media', 'disabled' );
+		}
 		remove_filter( 'optml_dont_trigger_settings_updated', '__return_true' );
 	}
 

inc/settings.php

@@ -115,7 +115,7 @@ class Optml_Settings {
 	 *
 	 * @var array All options.
 	 */
-	private $options;
+	private static $options;
 
 	/**
 	 * Optml_Settings constructor.
@@ -125,11 +125,11 @@ public function __construct() {
 
 		$this->namespace      = OPTML_NAMESPACE . '_settings';
 		$this->default_schema = apply_filters( 'optml_default_settings', $this->default_schema );
-		$this->options        = wp_parse_args( get_option( $this->namespace, $this->default_schema ), $this->default_schema );
+		self::$options        = wp_parse_args( get_option( $this->namespace, $this->default_schema ), $this->default_schema );
 
 		if ( defined( 'OPTIML_ENABLED_MU' ) && defined( 'OPTIML_MU_SITE_ID' ) && $this->to_boolean( constant( 'OPTIML_ENABLED_MU' ) ) && constant( 'OPTIML_MU_SITE_ID' ) ) {
 			switch_to_blog( constant( 'OPTIML_MU_SITE_ID' ) );
-			$this->options = wp_parse_args( get_option( $this->namespace, $this->default_schema ), $this->default_schema );
+			self::$options = wp_parse_args( get_option( $this->namespace, $this->default_schema ), $this->default_schema );
 			restore_current_blog();
 		}
 
@@ -166,7 +166,7 @@ public function __construct() {
 						continue;
 					}
 					$sanitized_value       = ( $type === 'bool' ) ? ( $value === 'on' ? 'enabled' : 'disabled' ) : (int) $value;
-					$this->options[ $key ] = $sanitized_value;
+					self::$options[ $key ] = $sanitized_value;
 				}
 			}
 		}
@@ -203,7 +203,7 @@ public function get( $key ) {
 			return null;
 		}
 
-		return isset( $this->options[ $key ] ) ? $this->options[ $key ] : '';
+		return isset( self::$options[ $key ] ) ? self::$options[ $key ] : '';
 	}
 
 	/**
@@ -418,13 +418,13 @@ public function update_frontend_banner_from_remote( $value ) {
 			return false;
 		}
 
-		$opts                    = $this->options;
+		$opts                    = self::$options;
 		$opts['banner_frontend'] = $value ? 'enabled' : 'disabled';
 
 		$update = update_option( $this->namespace, $opts, false );
 
 		if ( $update ) {
-			$this->options = $opts;
+			self::$options = $opts;
 		}
 
 		return $update;
@@ -446,7 +446,7 @@ public function update( $key, $value ) {
 		if ( ! $this->is_main_mu_site() ) {
 			return false;
 		}
-		$opt = $this->options;
+		$opt = self::$options;
 
 		if ( $key === 'banner_frontend' ) {
 			$api          = new Optml_Api();
@@ -456,9 +456,11 @@ public function update( $key, $value ) {
 		}
 
 		$opt[ $key ] = $value;
+
 		$update      = update_option( $this->namespace, $opt, false );
+
 		if ( $update ) {
-			$this->options = $opt;
+			self::$options = $opt;
 		}
 		if ( apply_filters( 'optml_dont_trigger_settings_updated', false ) === false ) {
 			do_action( 'optml_settings_updated' );
@@ -703,12 +705,14 @@ public function get_cdn_url() {
 	 */
 	public function reset() {
 		$reset_schema            = $this->default_schema;
-		$reset_schema['filters'] = $this->options['filters'];
+		$reset_schema['filters'] = self::$options['filters'];
 
 		$update = update_option( $this->namespace, $reset_schema );
 		if ( $update ) {
-			$this->options = $reset_schema;
+			self::$options = $reset_schema;
 		}
+		wp_unschedule_hook( Optml_Admin::SYNC_CRON );
+		wp_unschedule_hook( Optml_Admin::ENRICH_CRON );
 
 		return $update;
 	}