diff --git a/main/session/resume_session.php b/main/session/resume_session.php
index 6dd7e0b1935..2bcdf9fe55b 100644
--- a/main/session/resume_session.php
+++ b/main/session/resume_session.php
@@ -398,14 +398,14 @@
}
$editUrl = null;
- /*
+
if (isset($sessionInfo['duration']) && !empty($sessionInfo['duration'])) {
$editUrl = $codePath . 'session/session_user_edit.php?session_id=' . $sessionId . '&user_id=' . $userId;
$editUrl = Display::url(
Display::return_icon('agenda.png', get_lang('SessionDurationEdit')),
$editUrl
);
- }*/
+ }
$table->setCellContents($row, 0, $userLink);
$link = $reportingLink.$courseUserLink.$removeLink.$addUserToUrlLink.$editUrl;
diff --git a/main/session/session_user_edit.php b/main/session/session_user_edit.php
index 998b6e9a369..2076f3b7169 100644
--- a/main/session/session_user_edit.php
+++ b/main/session/session_user_edit.php
@@ -43,12 +43,17 @@
$userId
);
+$extension = 0;
+
if (count($userAccess) == 0) {
// User never accessed the session. End date is still open
$msg = sprintf(get_lang('UserNeverAccessedSessionDefaultDurationIsX'), $sessionInfo['duration']);
} else {
// The user already accessed the session. Show a clear detail of the days count.
+ $duration = $sessionInfo['duration'];
$days = SessionManager::getDayLeftInSession($sessionInfo, $userId);
+ $userSubscription = SessionManager::getUserSession($userId, $sessionId);
+ $extension = $userSubscription['duration'];
$firstAccess = api_strtotime($userAccess['login_course_date'], 'UTC');
$firstAccessString = api_convert_and_format_date($userAccess['login_course_date'], DATE_FORMAT_SHORT, 'UTC');
if ($days > 0) {
@@ -61,29 +66,74 @@
$msg = sprintf(get_lang('FirstAccessWasXSessionDurationYEndDateInZDays'), $firstAccessString, $duration, $days);
} else {
+ if (!empty($subscription['duration'])) {
+ $duration = $duration + $subscription['duration'];
+ }
$endDateInSeconds = $firstAccess + $duration * 24 * 60 * 60;
$last = api_convert_and_format_date($endDateInSeconds, DATE_FORMAT_SHORT);
$msg = sprintf(get_lang('FirstAccessWasXSessionDurationYEndDateWasZ'), $firstAccessString, $duration, $last);
}
}
-$form->addElement('html', sprintf(get_lang('UserXSessionY'), $userInfo['complete_name'], $sessionInfo['name']));
-$form->addElement('html', '
');
-$form->addElement('html', $msg);
-$form->addElement('text', 'duration', [get_lang('ExtraDurationForUser'), null, get_lang('Days')]);
+$header = '
'.'
'; + +$header .= '