fix settings cached options

Author: selul

inc/admin.php

@@ -1076,7 +1076,7 @@ public function daily_sync() {
 		// 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( 'transfer_status' ) !== 'offload_images' ) {
+			if ( $this->settings->get( 'offload_media' ) === 'disabled' ) {
 				return;
 			}
 
@@ -1085,6 +1085,7 @@ public function daily_sync() {
 			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 );

inc/settings.php

@@ -113,7 +113,7 @@ class Optml_Settings {
 	 *
 	 * @var array All options.
 	 */
-	private $options;
+	private static $options;
 
 	/**
 	 * Optml_Settings constructor.
@@ -123,11 +123,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();
 		}
 
@@ -164,7 +164,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;
 				}
 			}
 		}
@@ -201,7 +201,7 @@ public function get( $key ) {
 			return null;
 		}
 
-		return isset( $this->options[ $key ] ) ? $this->options[ $key ] : '';
+		return isset( self::$options[ $key ] ) ? self::$options[ $key ] : '';
 	}
 
 	/**
@@ -412,13 +412,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;
@@ -440,7 +440,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();
@@ -450,9 +450,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' );
@@ -695,11 +697,11 @@ 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 );