Skip to content

Submit time fix av #751

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
AntonV1211 wants to merge 3 commits into
base: dev
Choose a base branch
from
+14 −54
Open

Submit time fix av #751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b91b410
Fix. SubmitTime. Calculation of the submit time when enabling the gat…
AntonV1211 Feb 27, 2026
0c6c191
Fix. SubmitTime. Calculation of the submit time when enabling the gat…
AntonV1211 Feb 27, 2026
6494614
Fix tests
AntonV1211 Feb 27, 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
6 changes: 4 additions & 2 deletions lib/Cleantalk/ApbctWP/RequestParameters/SubmitTimeHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
final class SubmitTimeHandler
{
const DEFAULT_VALUE = null; // Default value to return when calculation is disabled or invalid
const REQUEST_PARAM_NAME = 'apbct_timestamp'; // Name of the request parameter for the timestamp
const REQUEST_PARAM_NAME = 'ct_ps_timestamp'; // Name of the request parameter for the timestamp

/**
* Retrieves the time difference between the current time and the timestamp
Expand Down Expand Up @@ -78,6 +78,8 @@ final public static function isCalculationDisabled()
global $apbct;

// Return the value of the bot detector setting
return (bool)$apbct->settings['data__bot_detector_enabled'];
return $apbct->settings['data__bot_detector_enabled']
? !RequestParameters::get('ct_gathering_loaded')
: false;
}
}
62 changes: 10 additions & 52 deletions tests/ApbctWP/TestSubmitTimeHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,80 +8,38 @@ class TestSubmitTimeHandler extends TestCase
public function testGetFromRequestReturnsNullWhenCalculationDisabled()
{
global $apbct;
$apbct = (object) ['settings' => ['data__bot_detector_enabled' => true]];
$apbct = (object) [
'settings' => ['data__bot_detector_enabled' => true],
'data' => ['cookies_type' => 'alternative']
];

$result = SubmitTimeHandler::getFromRequest();

$this->assertNull($result);
}

public function testGetFromRequestReturnsNullWhenTimestampIsZero()
{
global $apbct;
$apbct = (object) ['settings' => ['data__bot_detector_enabled' => false]];

$mock = \Mockery::mock('alias:Cleantalk\ApbctWP\RequestParameters\RequestParameters');
$mock->shouldReceive('get')->with(SubmitTimeHandler::REQUEST_PARAM_NAME, true)->andReturn(0);

Mockery::mock('alias:apbct_cookies_test')->shouldReceive('__invoke')->andReturn(1);

$result = SubmitTimeHandler::getFromRequest();

$this->assertNull($result);
}

public function testGetFromRequestReturnsTimeDifferenceWhenValid()
public function testSetToRequestDoesNotModifyWhenCalculationDisabled()
{
global $apbct;
$apbct = (object) [
'settings' => ['data__bot_detector_enabled' => false],
'settings' => ['data__bot_detector_enabled' => true],
'data' => ['cookies_type' => 'alternative']
];

$timestamp = time() - 100;

$mock = \Mockery::mock('alias:Cleantalk\ApbctWP\RequestParameters\RequestParameters');
$mock->shouldReceive('get')->with(SubmitTimeHandler::REQUEST_PARAM_NAME, true)->andReturn($timestamp);

Mockery::mock('alias:apbct_cookies_test')->shouldReceive('__invoke')->andReturn(1);

$result = SubmitTimeHandler::getFromRequest();

$this->assertEquals(100, $result);
}

public function testSetToRequestDoesNotModifyWhenCalculationDisabled()
{
global $apbct;
$apbct = (object) ['settings' => ['data__bot_detector_enabled' => true]];

$cookie_test_value = [];
SubmitTimeHandler::setToRequest(time(), $cookie_test_value);

$this->assertEmpty($cookie_test_value);
}

public function testSetToRequestAddsTimestampToRequestAndCookieTestValue()
{
global $apbct;
$apbct = (object) ['settings' => ['data__bot_detector_enabled' => false]];

$current_timestamp = time();
$cookie_test_value = ['cookies_names' => [], 'check_value' => ''];

$mock = \Mockery::mock('alias:Cleantalk\ApbctWP\RequestParameters\RequestParameters');
$mock->shouldReceive('set')->with(SubmitTimeHandler::REQUEST_PARAM_NAME, (string)$current_timestamp, true)->andReturnNull();

SubmitTimeHandler::setToRequest($current_timestamp, $cookie_test_value);

$this->assertContains(SubmitTimeHandler::REQUEST_PARAM_NAME, $cookie_test_value['cookies_names']);
$this->assertStringContainsString((string)$current_timestamp, $cookie_test_value['check_value']);
}

public function testIsCalculationDisabledReturnsTrueWhenBotDetectorEnabled()
{
global $apbct;
$apbct = (object) ['settings' => ['data__bot_detector_enabled' => true]];
$apbct = (object) [
'settings' => ['data__bot_detector_enabled' => true],
'data' => ['cookies_type' => 'alternative']
];

$result = SubmitTimeHandler::isCalculationDisabled();

Expand Down