Merge pull request #6 from CleanTalk/dev

Fixed antispam_activity_status after saved settings
CleanTalk · Sep 21, 2021 · 3f3c507 · 3f3c507
2 parents e7eb4e3 + cef3aa3
commit 3f3c507
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/cleantalk/inc/cron_functions.php b/cleantalk/inc/cron_functions.php
@@ -52,11 +52,14 @@ function apbct_sfw_send_logs(){
  */
 function apbct__plugin_get_latest_version() {
     $path_to_config = CLEANTALK_ROOT . 'config.php';
+    global $antispam_activity_status;
 
     $updater = new \Cleantalk\Updater\Updater( CLEANTALK_ROOT );
     $latest_version = $updater->getLatestVersion();
     File::clean__variable($path_to_config, 'latest_version');
     File::inject__variable($path_to_config, 'latest_version', $latest_version);
-    File::clean__variable(CLEANTALK_CONFIG_FILE, 'antispam_activity_status');
-    File::inject__variable(CLEANTALK_CONFIG_FILE, 'antispam_activity_status', true);
+    if (! isset($antispam_activity_status)) {
+        File::clean__variable($path_to_config, 'antispam_activity_status');
+        File::inject__variable($path_to_config, 'antispam_activity_status', true);
+    }
 }
diff --git a/cleantalk/settings.php b/cleantalk/settings.php
@@ -55,6 +55,7 @@
                 $path_to_config = CLEANTALK_ROOT . 'config.php';
                 $apikey = Post::get( 'apikey' );
                 global $account_name_ob;
+                global $antispam_activity_status;
 
                 /**
                  * Apikey validation
@@ -79,8 +80,14 @@
                     die(Err::add('Please, enter the access key')->get_last( 'as_json' ));
                 }
 
+                if (! isset($antispam_activity_status) && Post::is_set( 'antispam_activity_status' )) {
+                    File::clean__variable($path_to_config, 'antispam_activity_status');
+                    File::inject__variable($path_to_config, 'antispam_activity_status', (bool)Post::get( 'antispam_activity_status' ));
+                } else {
+                    File::replace__variable( $path_to_config, 'antispam_activity_status', (bool)Post::get( 'antispam_activity_status' ) );
+                }
+
                 File::replace__variable( $path_to_config, 'apikey', $apikey );
-                File::replace__variable( $path_to_config, 'antispam_activity_status', (bool)Post::get( 'antispam_activity_status' ) );
                 File::replace__variable( $path_to_config, 'registrations_test', (bool)Post::get( 'registrations_test' ) );
                 File::replace__variable( $path_to_config, 'general_postdata_test', (bool)Post::get( 'general_postdata_test' ) );
                 File::replace__variable( $path_to_config, 'spam_firewall', (bool)Post::get( 'spam_firewall' ) );