mirror/moodle-auth_outage
1
0
Fork 0
mirror of https://github.com/catalyst/moodle-auth_outage.git synced 2026-05-17 05:48:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed support for cron syntax #163

Browse Source
This commit is contained in:
Brendan Heywood
2020-03-26 01:40:06 +11:00
parent 9ed0b74112
commit afc81edfde
2 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
classes/local/outagelib.php
View File

@@ -92,22 +92,8 @@ class outagelib {
$default = $config->default_time;
if ($default) {
// First try natural language parsing.
$time = strtotime($default, $time);
// Lean on the Task API to convert the cron syntax to
// the next valid outage date and time.
$parts = explode(' ', $default);
if (count($parts) == 5) {
$task = new \core\task\calendar_cron_task();
$task->set_minute($parts[0]);
$task->set_hour($parts[1]);
$task->set_day($parts[2]);
$task->set_month($parts[3]);
$task->set_day_of_week($parts[4]);
$time = $task->get_next_scheduled_time();
}
}
return $time;
}

5
lang/en/auth_outage.php
View File

@@ -81,10 +81,7 @@ $string['defaultoutagedurationdescription'] = 'Default duration (in minutes) of
$string['defaultwarningduration'] = 'Warning duration';
$string['defaultwarningdurationdescription'] = 'Default warning time (in minutes) for outages.';
$string['defaulttime'] = 'Default time';
$string['defaulttimedescription'] = 'The default time for the next outage. This is expressed in either natural language or a cron notation. eg to say that a regular outage window is any Thursday at 7pm either of these work:
<pre>0 19 * * 4
next Thursday 7pm</pre>
See also <a target=_blank href="https://en.wikipedia.org/wiki/Cron#CRON_expression">Cron expressions</a> and <a target=_blank href="https://www.php.net/manual/en/datetime.formats.relative.php">Relative dates</a>';
$string['defaulttimedescription'] = 'The default time for the next outage, expressed in natural language eg "next Thursday 7pm". See <a target=_blank href="https://www.php.net/manual/en/datetime.formats.relative.php">PHP relative dates</a>';
$string['defaulttitle'] = 'Title';
$string['defaulttitledescription'] = 'Default title for outages. Use {{start}} and {{stop}} placeholders as required.';
$string['defaulttitlevalue'] = 'System down from {{start}} for {{duration}}';