Skip to content

Quiz: complete review of expiring time format to avoid errors #7112

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

Merged
NicoDucou merged 2 commits into from
Nov 27, 2025
Merged

Quiz: complete review of expiring time format to avoid errors #7112

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
adb17aa
Quiz: #fix expiracy date format problem when coming for the php sessi…
NicoDucou Nov 27, 2025
50d4c25
Merge branch 'chamilo:master' into master
NicoDucou Nov 27, 2025
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
2 changes: 1 addition & 1 deletion public/main/exercise/exercise_reminder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

if ($time_control) {
// Get time left for expiring time
$time_left = api_strtotime($clock_expired_time->format('Y-m-d H:i:s'), 'UTC') - time();
$time_left = api_strtotime($clock_expired_time, 'UTC') - time();
$htmlHeadXtra[] = $objExercise->showTimeControlJS($time_left);
}

Expand Down
4 changes: 2 additions & 2 deletions public/main/exercise/exercise_submit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,11 +431,11 @@

$clock_expired_time = api_get_utc_datetime($expected_time, false, true);
if ($debug) {
error_log('5.3. $expected_time '.$clock_expired_time);
error_log('5.3. $expected_time '.$clock_expired_time->format('Y-m-d H:i:s'));
}

//Sessions that contain the expired time
$_SESSION['expired_time'][$current_expired_time_key] = $clock_expired_time;
$_SESSION['expired_time'][$current_expired_time_key] = $clock_expired_time->format('Y-m-d H:i:s');
if ($debug) {
error_log(
'5.4. Setting the $_SESSION[expired_time]: '.$_SESSION['expired_time'][$current_expired_time_key]
Expand Down
4 changes: 2 additions & 2 deletions public/main/exercise/overview.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
$htmlHeadXtra[] = api_get_build_js('legacy_exercise.js');
if ($time_control) {
// Get time left for expiring time
$time_left = api_strtotime($clock_expired_time->format('Y-m-d H:i:s'), 'UTC') - time();
$time_left = api_strtotime($clock_expired_time, 'UTC') - time();
/*$htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epiclock/stylesheet/jquery.epiclock.css');
$htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_PATH).'javascript/epiclock/renderers/minute/epiclock.minute.css');
$htmlHeadXtra[] = api_get_js('epiclock/javascript/jquery.dateformat.min.js');
Expand Down Expand Up @@ -145,7 +145,7 @@
);

if ($time_control && !empty($exercise_stat_info['exe_id']) && !empty($clock_expired_time)) {
$time_left_check = api_strtotime($clock_expired_time->format('Y-m-d H:i:s'), 'UTC') - time();
$time_left_check = api_strtotime($clock_expired_time, 'UTC') - time();
if ($time_left_check <= 0) {
$result_url = api_get_path(WEB_CODE_PATH).'exercise/result.php?'
. api_get_cidreq()
Expand Down
8 changes: 6 additions & 2 deletions public/main/inc/lib/exercise.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2030,8 +2030,12 @@ public static function get_session_time_control_key(
$lp_id,
$lp_item_id
);
if (isset($_SESSION['expired_time']) && isset($_SESSION['expired_time'][$time_control_key])) {
$return_value = $_SESSION['expired_time'][$time_control_key];
if (isset($_SESSION['expired_time']) && isset($_SESSION['expired_time'][$time_control_key])) {
if ($_SESSION['expired_time'][$time_control_key] instanceof DateTimeInterface) {
$return_value = $_SESSION['expired_time'][$time_control_key]->format('Y-m-d H:i:s');
} else {
$return_value = $_SESSION['expired_time'][$time_control_key];
}
}

return $return_value;
Expand Down
Loading