Skip to content

Fixing correct date being returned when global course is set to ID 1 #17

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
rhell4 wants to merge 1 commit into
base: MOODLE_35_STABLE
Choose a base branch
from
Open

Fixing correct date being returned when global course is set to ID 1 #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 14 additions & 10 deletions classes/condition.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,18 @@ public function save() {
* @return boolean
*/
public function is_available($not, \core_availability\info $info, $grabthelot, $userid) {
return $this->is_available_for_all($not);
$course = $info->get_course();
return $this->is_available_for_all($not, $course);
}

/**
* Checks the target is globally available
* @param bool $not
* @param object $cousre The course object
* @return boolean
*/
public function is_available_for_all($not = false) {

$referencedate = $this->get_reference_date();
public function is_available_for_all($not = false, $course = null) {
$referencedate = $this->get_reference_date($course);

// Check condition.
$now = self::get_time();
Expand All @@ -96,16 +97,21 @@ public function is_available_for_all($not = false) {

/**
* Get the reference date to calculate shift from
* @param object $cousre The course object
* @return integer date
*/
protected function get_reference_date() {
protected function get_reference_date($course = null) {
global $COURSE, $USER, $DB;

if (!$course) {
$course = $COURSE;
}

$config = get_config('availability_days');

if (empty($config->referencedate) || $config->referencedate == 'coursestartdate') {
// Calculate from course start date.
$referencedate = $COURSE->startdate;
$referencedate = $course->startdate;
} else {
// Calculate from lowest active enrol date of the user.
$sql = '
Expand All @@ -124,11 +130,11 @@ protected function get_reference_date() {
GROUP BY
ue.userid
';
if ($lowest = $DB->get_record_sql($sql, array($COURSE->id, $USER->id))) {
if ($lowest = $DB->get_record_sql($sql, array($course->id, $USER->id))) {
$referencedate = $lowest->minenroltime;
} else {
// This should not happen but some role assigned users NON enrolled might fall into that case.
$referencedate = $COURSE->startdate;
$referencedate = $course->startdate;
}
}

Expand Down Expand Up @@ -201,8 +207,6 @@ protected static function get_time() {
* @return string Date
*/
protected function show_days($days, $dateonly = false) {
global $COURSE;

$time = $this->get_reference_date() + ($days * DAYSECS);
return '+'.$days.' ('.userdate($time, get_string($dateonly ? 'strftimedate' : 'strftimedatetime', 'langconfig')).')';
}
Expand Down