Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'MDL-28531-22' of git://github.com/FMCorz/moodle into MO…

…ODLE_22_STABLE
  • Loading branch information...
commit 85bd3fd899a635266f960fd3227d5e9bf6d90552 2 parents 59e2a77 + 24d063d
@stronk7 stronk7 authored
View
70 backup/util/helper/backup_cron_helper.class.php
@@ -110,7 +110,7 @@ public static function run_automated_backup($rundirective = self::RUN_ON_SCHEDUL
$nextstarttime = backup_cron_automated_helper::calculate_next_automated_backup($admin->timezone, $now);
$showtime = "undefined";
if ($nextstarttime > 0) {
- $showtime = userdate($nextstarttime,"",$admin->timezone);
+ $showtime = date('r', $nextstarttime);
}
$rs = $DB->get_recordset('course');
@@ -124,7 +124,14 @@ public static function run_automated_backup($rundirective = self::RUN_ON_SCHEDUL
}
// Skip courses that do not yet need backup
- $skipped = !(($backupcourse->nextstarttime >= 0 && $backupcourse->nextstarttime < $now) || $rundirective == self::RUN_IMMEDIATELY);
+ $skipped = !(($backupcourse->nextstarttime > 0 && $backupcourse->nextstarttime < $now) || $rundirective == self::RUN_IMMEDIATELY);
+ if ($skipped && $backupcourse->nextstarttime != $nextstarttime) {
+ $backupcourse->nextstarttime = $nextstarttime;
+ $backupcourse->laststatus = backup_cron_automated_helper::BACKUP_STATUS_SKIPPED;
+ $DB->update_record('backup_courses', $backupcourse);
+ mtrace('Backup of \'' . $course->fullname . '\' is scheduled on ' . $showtime);
+ }
+
// Skip backup of unavailable courses that have remained unmodified in a month
if (!$skipped && empty($course->visible) && ($now - $course->timemodified) > 31*24*60*60) { //Hidden + settings were unmodified last month
//Check log if there were any modifications to the course content
@@ -139,9 +146,10 @@ public static function run_automated_backup($rundirective = self::RUN_ON_SCHEDUL
$skipped = true;
}
}
+
//Now we backup every non-skipped course
if (!$skipped) {
- mtrace('Backing up '.$course->fullname, '...');
+ mtrace('Backing up '.$course->fullname.'...');
//We have to send a email because we have included at least one backup
$emailpending = true;
@@ -270,38 +278,47 @@ public static function get_backup_status_array() {
/**
* Works out the next time the automated backup should be run.
*
- * @param mixed $timezone
- * @param int $now
- * @return int
+ * @param mixed $timezone user timezone
+ * @param int $now timestamp, should not be in the past, most likely time()
+ * @return int timestamp of the next execution at server time
*/
public static function calculate_next_automated_backup($timezone, $now) {
- $result = -1;
+ $result = 0;
$config = get_config('backup');
- $midnight = usergetmidnight($now, $timezone);
+ $autohour = $config->backup_auto_hour;
+ $automin = $config->backup_auto_minute;
+
+ // Gets the user time relatively to the server time.
$date = usergetdate($now, $timezone);
+ $usertime = mktime($date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday'], $date['year']);
+ $diff = $now - $usertime;
- // Get number of days (from today) to execute backups
+ // Get number of days (from user's today) to execute backups.
$automateddays = substr($config->backup_auto_weekdays, $date['wday']) . $config->backup_auto_weekdays;
- $daysfromtoday = strpos($automateddays, "1", 1);
+ $daysfromnow = strpos($automateddays, "1");
- // If we can't find the next day, we set it to tomorrow
- if (empty($daysfromtoday)) {
- $daysfromtoday = 1;
+ // Error, there are no days to schedule the backup for.
+ if ($daysfromnow === false) {
+ return 0;
}
- // If some day has been found
- if ($daysfromtoday !== false) {
- // Calculate distance
- $dist = ($daysfromtoday * 86400) + // Days distance
- ($config->backup_auto_hour * 3600) + // Hours distance
- ($config->backup_auto_minute * 60); // Minutes distance
- $result = $midnight + $dist;
+ // Checks if the date would happen in the future (of the user).
+ $userresult = mktime($autohour, $automin, 0, $date['mon'], $date['mday'] + $daysfromnow, $date['year']);
+ if ($userresult <= $usertime) {
+ // If not, we skip the first scheduled day, that should fix it.
+ $daysfromnow = strpos($automateddays, "1", 1);
+ $userresult = mktime($autohour, $automin, 0, $date['mon'], $date['mday'] + $daysfromnow, $date['year']);
}
- // If that time is past, call the function recursively to obtain the next valid day
- if ($result > 0 && $result < time()) {
- $result = self::calculate_next_automated_backup($timezone, $result);
+ // Now we generate the time relative to the server.
+ $result = $userresult + $diff;
+
+ // If that time is past, call the function recursively to obtain the next valid day.
+ if ($result <= $now) {
+ // Checking time() in here works, but makes PHPUnit Tests extremely hard to predict.
+ // $now should never be earlier than time() anyway...
+ $result = self::calculate_next_automated_backup($timezone, $now + DAYSECS);
}
return $result;
@@ -411,7 +428,12 @@ public static function get_automated_backup_state($rundirective = self::RUN_ON_S
$config = get_config('backup');
$active = (int)$config->backup_auto_active;
- if ($active === self::AUTO_BACKUP_DISABLED || ($rundirective == self::RUN_ON_SCHEDULE && $active === self::AUTO_BACKUP_MANUAL)) {
+ $weekdays = (string)$config->backup_auto_weekdays;
+
+ // In case of automated backup also check that it is scheduled for at least one weekday.
+ if ($active === self::AUTO_BACKUP_DISABLED ||
+ ($rundirective == self::RUN_ON_SCHEDULE && $active === self::AUTO_BACKUP_MANUAL) ||
+ ($rundirective == self::RUN_ON_SCHEDULE && strpos($weekdays, '1') === false)) {
return self::STATE_DISABLED;
} else if (!empty($config->backup_auto_running)) {
// Detect if the backup_auto_running semaphore is a valid one
View
4 lib/moodlelib.php
@@ -2251,10 +2251,10 @@ function get_user_timezone($tz = 99) {
$tz = 99;
- while(($tz == '' || $tz == 99 || $tz == NULL) && $next = each($timezones)) {
+ // Loop while $tz is, empty but not zero, or 99, and there is another timezone is the array
+ while(((empty($tz) && !is_numeric($tz)) || $tz == 99) && $next = each($timezones)) {
$tz = $next['value'];
}
-
return is_numeric($tz) ? (float) $tz : $tz;
}
View
6 lib/simpletest/testmoodlelib.php
@@ -1483,9 +1483,9 @@ public function test_make_timestamp() {
'hour' => '10',
'minutes' => '00',
'seconds' => '00',
- 'timezone' => '0.0', //no dst offset
- 'applydst' => false,
- 'expectedoutput' => '1309528800'
+ 'timezone' => '0.0',
+ 'applydst' => false, //no dst offset
+ 'expectedoutput' => '1309514400' // 6pm at UTC+0
),
array(
'usertimezone' => 'America/Moncton',
Please sign in to comment.
Something went wrong with that request. Please try again.