Skip to content

Fix. WPMS. Errors output for WPMS mutual-mutual mode fixed. #772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Glomberg wants to merge 2 commits into
base: dev
Choose a base branch
from
+28 −1
Open

Fix. WPMS. Errors output for WPMS mutual-mutual mode fixed. #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
243d449
Fix. WPMS. Errors output for WPMS mutual-mutual mode fixed.
Glomberg Apr 3, 2026
cac8468
Fix. Code. Unit test added: check errors array in State.
Glomberg Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/Cleantalk/ApbctWP/State.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,11 +649,13 @@ protected function init()

// Network with Mutual Access key
if ( ! is_main_site() && $this->network_settings['multisite__work_mode'] == 2 ) {
// Get stats from main blog
// Get stats and errors from main blog
switch_to_blog(get_main_site_id());
$main_blog_stats = get_option($this->option_prefix . '_stats');
$main_blog_errors = get_option($this->option_prefix . '_errors');
restore_current_blog();
$this->stats = $main_blog_stats;
$this->errors = $main_blog_errors;
$this->api_key = $this->network_settings['apikey'];
$this->key_is_ok = $this->network_data['key_is_ok'];
$this->user_token = $this->network_data['user_token'];
Expand Down
25 changes: 25 additions & 0 deletions tests/ApbctWP/TestState.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,44 @@ public function testIsHaveErrors_haveErrors()
update_option( 'cleantalk_errors', array( 'error_type' => 'Error text' ) );
$apbct = new State( 'cleantalk', array('settings', 'data', 'errors', 'remote_calls', 'stats', 'fw_stats') );
$this->assertTrue( $apbct->isHaveErrors() );
delete_option('cleantalk_errors');
}

public function testIsHaveErrors_emptyErrors()
{
update_option( 'cleantalk_errors', array() );
$apbct = new State( 'cleantalk', array('settings', 'data', 'errors', 'remote_calls', 'stats', 'fw_stats') );
$this->assertFalse( $apbct->isHaveErrors() );
delete_option('cleantalk_errors');
}

public function testIsHaveErrors_emptyInnerErrors()
{
update_option( 'cleantalk_errors', array( 'error_type' => array() ) );
$apbct = new State( 'cleantalk', array('settings', 'data', 'errors', 'remote_calls', 'stats', 'fw_stats') );
$this->assertFalse( $apbct->isHaveErrors() );
delete_option('cleantalk_errors');
}

public function testIsHaveErrors_filledInnerErrors()
{
update_option( 'cleantalk_errors', array( 'error_type' => array( 'error_text' => 'Error text' ) ) );
$apbct = new State( 'cleantalk', array('settings', 'data', 'errors', 'remote_calls', 'stats', 'fw_stats') );
$this->assertTrue( $apbct->isHaveErrors() );
delete_option('cleantalk_errors');
}

public function testErrorsArrayFromState()
{
$apbct = new State('cleantalk', array('errors'));

$apbct->errorAdd('api', 'error');

$errors_from_state = (array) $apbct->errors;

$this->assertArrayHasKey('api', $errors_from_state);
$this->assertArrayHasKey('error', $errors_from_state['api'][0]);
$this->assertArrayHasKey('error_time', $errors_from_state['api'][0]);
}

//UpdateVars section
Expand All @@ -58,6 +75,7 @@ public function testAutoSaveVars__remote_calls(){
apbct_run_update_actions('6.1','6.2');
$db_result = get_option('cleantalk_remote_calls')['post_api_key'];
$this->assertEquals(array ('last_call' => 0,), $db_result);
delete_option('cleantalk_remote_calls');
}

public function testAutoSaveVars__settings(){
Expand All @@ -71,6 +89,7 @@ public function testAutoSaveVars__settings(){
apbct_run_update_actions('6.1','6.2');
$db_result = get_option('cleantalk_settings')['forms__registrations_test'];
$this->assertEquals(1, $db_result);
delete_option('cleantalk_settings');
}

public function testAutoSaveVars__data(){
Expand All @@ -84,6 +103,7 @@ public function testAutoSaveVars__data(){
apbct_run_update_actions('6.1','6.2');
$db_result = get_option('cleantalk_data')['js_key_lifetime'];
$this->assertEquals(86400, $db_result);
delete_option('cleantalk_data');
}

public function testAutoSaveVars__network_settings(){
Expand All @@ -97,6 +117,7 @@ public function testAutoSaveVars__network_settings(){
apbct_run_update_actions('6.1','6.2');
$db_result = get_option('cleantalk_network_settings')['multisite__white_label__plugin_name'];
$this->assertEquals('Anti-Spam by CleanTalk', $db_result);
delete_option('network_settings');
}

public function testAutoSaveVars__network_data(){
Expand All @@ -110,6 +131,7 @@ public function testAutoSaveVars__network_data(){
apbct_run_update_actions('6.1','6.2');
$db_result = get_option('cleantalk_network_data')['moderate'];
$this->assertEquals(0, $db_result);
delete_option('cleantalk_network_data');
}

public function testAutoSaveVars__stats(){
Expand Down Expand Up @@ -161,6 +183,7 @@ public function testAutoSaveVars__stats(){
$this->assertEquals(14400, $db_result);
$db_result = get_option('cleantalk_stats')['sfw']['sending_logs__timestamp'];
$this->assertEquals(10000, $db_result);
delete_option('cleantalk_stats');

}

Expand All @@ -175,6 +198,7 @@ public function testAutoSaveVars__fw_stats(){
apbct_run_update_actions('6.1','6.2');
$db_result = get_option('cleantalk_fw_stats')['firewall_updating_id'];
$this->assertEquals(null, $db_result);
delete_option('cleantalk_fw_stats');
}

public function testAutoSaveVars__fw_stats_await_exception_without_var_updater(){
Expand All @@ -191,5 +215,6 @@ public function testAutoSaveVars__fw_stats_await_exception_without_var_updater()
//await udefined index
$this->expectException(Notice::class);
$db_result = get_option('cleantalk_fw_stats')['firewall_updating_id'];
delete_option('cleantalk_fw_stats');
}
}
Loading