replace deprecated strftime function for Tōtara 17

Merge pull request #307 from sarahjcotton/moodle-41-fixes
Fix for Moodle 4.1 [#306]
2026-05-16 21:41:31 +02:00 · 2023-05-29 08:56:59 +12:00 · 2023-02-09 09:15:36 +13:00 · 2023-02-08 10:23:01 +00:00 · 2023-02-08 10:23:01 +00:00 · 2023-02-08 10:22:54 +00:00
68 changed files with 1359 additions and 527 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,10 @@
+# .github/workflows/ci.yml
+name: ci
+
+on: [push, pull_request]
+
+jobs:
+  ci:
+    uses: catalyst/catalyst-moodle-workflows/.github/workflows/ci.yml@main
+    with:
+      disable_behat: true
--- a/.github/workflows/moodle-release.yml
+++ b/.github/workflows/moodle-release.yml
@@ -0,0 +1,21 @@
+#
+# Whenever version.php is changed, add the latest version
+# to the Moodle Plugins directory at https://moodle.org/plugins
+#
+name: Releasing in the Plugins directory
+
+on:
+  push:
+    branches:
+      - MOODLE_39_STABLE
+    paths:
+      - 'version.php'
+
+jobs:
+  workflow_group_39_plus_release:
+    uses: catalyst/catalyst-moodle-workflows/.github/workflows/group-39-plus-release.yml@main
+    with:
+      plugin_name: auth_outage
+      disable_behat: true
+    secrets:
+      moodle_org_token: ${{ secrets.MOODLE_ORG_TOKEN }}
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,60 +0,0 @@
-language: php
-
-sudo: true
-
-addons:
-  firefox: "47.0.1"
-  postgresql: "9.4"
-  apt:
-    packages:
-    - oracle-java8-installer
-    - oracle-java8-set-default
-
-cache:
-  directories:
-  - $HOME/.composer/cache
-  - $HOME/.npm
-
-php:
- - 7.0
-
-env:
-  - DB=pgsql MOODLE_BRANCH=MOODLE_33_STABLE
-  - DB=pgsql MOODLE_BRANCH=MOODLE_34_STABLE
-  - DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE
-  - DB=pgsql MOODLE_BRANCH=master
-  - DB=mysqli MOODLE_BRANCH=master
-
-matrix:
-  include:
-    - php: 5.6
-      env: DB=pgsql MOODLE_BRANCH=MOODLE_33_STABLE
-    - php: 5.6
-      env: DB=mysqli MOODLE_BRANCH=MOODLE_33_STABLE
-    - php: 7.1
-      env: DB=pgsql MOODLE_BRANCH=master
-
-
-before_install:
-  - phpenv config-rm xdebug.ini
-  - nvm install 8.9
-  - nvm use 8.9
-  - cd ../..
-  - composer selfupdate
-  - composer create-project -n --no-dev --prefer-dist blackboard-open-source/moodle-plugin-ci ci ^2
-  - export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH"
-
-install:
-  - moodle-plugin-ci install
-
-script:
- - moodle-plugin-ci phplint
- - moodle-plugin-ci phpcpd
- - moodle-plugin-ci phpmd
- - moodle-plugin-ci codechecker
- - moodle-plugin-ci validate
- - moodle-plugin-ci savepoints
- - moodle-plugin-ci mustache
- - moodle-plugin-ci grunt
- - moodle-plugin-ci phpunit
- - moodle-plugin-ci behat
--- a/QUICKGUIDE.md
+++ b/QUICKGUIDE.md
@@ -59,6 +59,9 @@ Basic Usage

    _Anyone who tries to use Moodle now will receive a maintenance message._

+    **Note:** If the outage starts with the option `Auto start maintenance mode` checked, the maint mode won't exit automatically.
+    It will need to be disabled through command line.
+
 1) Perform the maintenance activities.

    At this point it is safe to perform the required maintenance as no one can use the system, not even admins.
--- a/README.md
+++ b/README.md
@@ -1,6 +1,4 @@
-<a href="https://travis-ci.org/catalyst/moodle-auth_outage">
-<img src="https://travis-ci.org/catalyst/moodle-auth_outage.svg?branch=master">
-</a>
+![GitHub Workflow Status (branch)](https://img.shields.io/github/actions/workflow/status/catalyst/moodle-auth_outage/ci.yml?branch=MOODLE_39_STABLE)

 # Moodle Outage manager plugin
 * [Version Support](#version-support)
@@ -8,16 +6,12 @@
 * [Moodle Requirements](#moodle-requirements)
 * [Screenshots](#screenshots)
 * [Installation](#installation)
+* [Theme configuration](#theme-configuration)
 * [How to use](#how-to-use)
 * [Quick Guide](#quick-guide)
 * [Why is it an auth plugin?](#why-it-is-an-auth-plugin)
 * [Feedback and issues](#feedback-and-issues)

-Version Support
-------------
-The master branch supports Moodle 3.3 and higher.
-The MOODLE_32_STABLE branch supports Moodle 2.7 -> Moodle 3.2
-
 What is this?
 -------------

@@ -30,10 +24,7 @@ this plugin creates the concept of graduated outages where at predefined times b
 an outage and after, different levels of warning and access can be provided to students
 and testers letting them know what is about to happen and why.

-<img alt="Default" src="https://cdn.rawgit.com/catalyst/moodle-auth_outage/master/docs/default.svg" width="520">
-
-<img alt="Manager" src="https://cdn.rawgit.com/catalyst/moodle-auth_outage/master/docs/outage.svg" width="520">
-
+![image](https://user-images.githubusercontent.com/187449/149717343-1d2c5237-dbc6-4d2a-a08c-2bdb343e87d2.png)

 Moodle Requirements
 -------------------
@@ -44,6 +35,14 @@ If you have an older version of Moodle you can still make it work but you will
 need to manually add one extra plugin, please check:
 * https://github.com/catalyst/moodle-local_outage

+Branches
+--------
+| Moodle version     | Totara          | Branch           | PHP  |
+| ------------------ | --------------- | ---------------- | ---- |
+| Moodle 3.9+        | Totara 13+      | MOODLE_39_STABLE | 7.2+ |
+| Moodle 3.3 to 3.8  | Totara 11 to 12 | MOODLE_38_STABLE | 7.1+ |
+| Moodle 2.7 to 3.2  |                 | MOODLE_32_STABLE | 5.5+ |
+|                    | Totara up to 10 | TOTARA_10        | 5.5+ |

 Screenshots
 -----------
@@ -88,6 +87,62 @@ if (file_exists(__DIR__.'/auth/outage/bootstrap.php')) {
 }
 ```

+Theme configuration
+-------------------
+
+This plugin must work gracefully with your theme, but every theme can be different so it's impossible to get this right out of the box (other than with the default moodle theme Boost).
+
+There is an admin setting which allows you to add or override and css to fix css issues. Typically these include properly pushing the page down when the outage notification bar is visible, including making this work with fixed headers and when the hamburger menu is open / closed and at different responsive breakpoints.
+
+This can be found at:
+
+`Dashboard / Site administration / Plugins / Authentication / Outage manager / Settings`
+
+
+
+Custom Theme Additional SCSS
+-------------------
+
+Custom themes generally do not have the same `$navbar-height` variable set to 80px (MOODLE), therefore custom themes will not calculate the change in navbar height with page elements that calculate the navbar total height. 
+
+Add the following SCSS For Moodle 3.11+
+
+```
+body.auth_outage {
+    #page-wrapper {
+        #nav-drawer {
+            top: $navbar-height + 100px;
+            height: calc(100% - (#{$navbar-height} + 100px));
+        }
+        #page {
+            margin-top: $navbar-height + 100px;
+        }
+    }
+    [data-region=right-hand-drawer].drawer {
+        top: $navbar-height + 100px;
+        height: calc(100% - (#{$navbar-height} + 100px));
+    } 
+}
+```
+
+Totara is a little different with version 13+ and no variables are used to set the `totaraNav` height 
+
+Add the following CSS For Totara 13+
+
+```
+.totaraNav {
+    margin-top: 100px;
+}
+.local_envbar .totaraNav {
+    margin-top: 50px;
+}
+body.auth_outage #page {
+    margin-top: 0;
+}
+```
+
+
+
 How to use
 ----------

@@ -104,7 +159,7 @@ Creates a new outage.
  -c,  --clone              clone another outage except for the start time.
  -a,  --autostart          must be Y or N, sets if the outage automatically triggers maintenance mode.
  -w,  --warn               how many seconds before it starts to display a warning.
-  -s,  --start              in how many seconds should this outage start. Required.
+  -s,  --start              in how many seconds should this outage start or unix time to start outage. Required.
  -d,  --duration           how many seconds should the outage last.
  -t,  --title              the title of the outage.
  -e,  --description        the description of the outage.
--- a/auth.php
+++ b/auth.php
@@ -58,7 +58,6 @@ class auth_plugin_outage extends auth_plugin_base {
    /**
     * Always returns false (password wrong or user does not exist).
     *
-     * @inheritdoc PHPMD will not warn about unused parameters if overriding.
     * @param string $username Not used in this plugin.
     * @param string $password Not used in this plugin.
     * @return bool False
@@ -66,11 +65,4 @@ class auth_plugin_outage extends auth_plugin_base {
    public function user_login($username, $password) {
        return false;
    }
-
-    /**
-     * Login page hook.
-     */
-    public function loginpage_hook() {
-        outagelib::inject();
-    }
 }
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -30,7 +30,9 @@
 */

 // This call is required by Moodle, but this script should have been called by config.php anyway.
+// @codingStandardsIgnoreStart
 require_once(__DIR__.'/../../config.php');
+// @codingStandardsIgnoreEnd

 // We need the CFG->dataroot, if not set yet this script is called too early in config.php file.
 if (!isset($CFG->dataroot)) {
@@ -67,9 +69,20 @@ if (is_callable('auth_outage_bootstrap_callback')) {
 }

 // 3) Check for allowed scripts or IPs during outages.
+if (!empty($_SERVER['REQUEST_URI'])) {
+    $rooturl = parse_url($CFG->wwwroot);
+    $path = '';
+    if (array_key_exists('path', $rooturl) && !empty($rooturl['path'])) {
+        $path = $rooturl['path'];
+    }
+    $url = $path.'/auth/outage/info.php';
+    $outageinfo = strpos($_SERVER['REQUEST_URI'], $url) === 0 ? true : false;
+}
 $allowed = !file_exists($CFG->dataroot.'/climaintenance.php') // Not in maintenance mode.
           || (defined('ABORT_AFTER_CONFIG') && ABORT_AFTER_CONFIG) // Only config requested.
-           || (defined('CLI_SCRIPT') && CLI_SCRIPT); // Allow CLI scripts.
+           || (defined('CLI_SCRIPT') && CLI_SCRIPT) // Allow CLI scripts.
+           || $outageinfo // Allow outage info requests.
+           || (defined('NO_AUTH_OUTAGE') && NO_AUTH_OUTAGE); // Allow any page should not be blocked by maintenance mode.
 if (!$allowed) {
    // Call the climaintenance.php which will check for allowed IPs.
    $CFG->dirroot = dirname(dirname(dirname(__FILE__))); // It is not defined yet but the script below needs it.
--- a/checkfinished.php
+++ b/checkfinished.php
@@ -25,6 +25,12 @@

 use auth_outage\dml\outagedb;

+define('NO_MOODLE_COOKIES', true);
+ // @codingStandardsIgnoreStart
+header('Cache-Control: public, max-age=10,s-maxage=10');
+ // @codingStandardsIgnoreEnd
+define('NO_AUTH_OUTAGE', true);
+
 require_once(__DIR__.'/../../config.php');

 $active = outagedb::get_active();
--- a/classes/calendar/calendar.php
+++ b/classes/calendar/calendar.php
@@ -65,7 +65,7 @@ class calendar {
            debugging('Cannot update calendar entry for outage #'.$outage->id.', event not found. Creating it...');
            self::create($outage);
        } else {
-            $event->update(self::create_data($outage));
+            $event->update(self::create_data($outage), false);
        }
    }

--- a/classes/dml/outagedb.php
+++ b/classes/dml/outagedb.php
@@ -117,25 +117,40 @@ class outagedb {
            $outage->createdby = $USER->id;
            // Then create it, log it and adjust its id.
            $outage->id = $DB->insert_record('auth_outage', $outage, true);
-            outage_created::create(
-                ['objectid' => $outage->id, 'other' => (array)$outage]
-            )->trigger();
+
+            $other = (array) $outage;
+            $other['title'] = $outage->get_title();
+            $event = outage_created::create([
+                'objectid' => $outage->id,
+                'other' => $other,
+            ]);
+            $event->add_record_snapshot('auth_outage', (object)(array) $outage);
+            $event->trigger();
+
            // Create calendar entry.
            calendar::create($outage);
        } else {
+
+            $other = (array) $outage;
+            $other['title'] = $outage->get_title();
+            $event = outage_updated::create([
+                'objectid' => $outage->id,
+                'other' => $other,
+            ]);
+
+            $event->add_record_snapshot('auth_outage', (object)(array) $outage);
+            $event->trigger();
+
            // Remove the createdby field so it does not get updated.
            unset($outage->createdby);
            $DB->update_record('auth_outage', $outage);
-            // Log it.
-            outage_updated::create(
-                ['objectid' => $outage->id, 'other' => (array)$outage]
-            )->trigger();
+
            // Update calendar entry.
            calendar::update($outage);
        }

        // Trigger outages modified events.
-        outagelib::prepare_next_outage();
+        outagelib::prepare_next_outage(true);

        // All done, return the id.
        return $outage->id;
@@ -156,7 +171,16 @@ class outagedb {

        // Log it.
        $previous = $DB->get_record('auth_outage', ['id' => $id], '*', MUST_EXIST);
-        $event = outage_deleted::create(['objectid' => $id, 'other' => (array)$previous]);
+
+        $outage = new outage($previous);
+
+        $other = (array) $outage;
+        $other['title'] = $outage->get_title();
+        $event = outage_deleted::create([
+            'objectid' => $id,
+            'other' => $other,
+        ]);
+
        $event->add_record_snapshot('auth_outage', $previous);
        $event->trigger();

@@ -187,21 +211,20 @@ class outagedb {
            throw new coding_exception('$time must be null or a positive int.', $time);
        }

-        $select = ':datetime2 <= stoptime AND (finished IS NULL OR :datetime3 <= finished)'; // End condition.
-        $select = "(warntime <= :datetime1 AND (${select}))"; // Full select part.
-        $data = $DB->get_records_select(
-            'auth_outage',
-            $select,
-            ['datetime1' => $time, 'datetime2' => $time, 'datetime3' => $time],
-            'starttime ASC, stoptime DESC, title ASC',
-            '*',
-            0,
-            1
-        );
+        // Get cached outage, or null.
+        $outageinfo = get_config('moodle', 'auth_outage_active_outage');

-        // Not using $DB->get_record_select instead because there is no 'limit' parameter.
-        // Allowing multiple records still raises an internal error.
-        return (count($data) == 0) ? null : new outage(array_shift($data));
+        if (!$outageinfo) {
+            return null;
+        } else {
+            $outagecache = new outage(json_decode($outageinfo));
+        }
+
+        if ($outagecache && $outagecache->warntime <= $time && $outagecache->stoptime >= $time
+            && (!$outagecache->finished || $outagecache->finished >= $time)) {
+            return  $outagecache;
+        }
+        return null;
    }

    /**
--- a/classes/event/outage_created.php
+++ b/classes/event/outage_created.php
@@ -28,8 +28,6 @@ namespace auth_outage\event;
 use core\event\base;
 use moodle_url;

-defined('MOODLE_INTERNAL') || die();
-
 /**
 * outage_created class.
 *
@@ -45,8 +43,7 @@ class outage_created extends base {
     * @return string
     */
    public function get_description() {
-        return "The user with the id '{$this->userid}' created a new outage title '{$this->other['title']}' ".
-               " with id '{$this->other['id']}'.";
+        return "The user with the id '{$this->userid}' created outage {$this->other['id']} '{$this->other['title']}'";
    }

    /**
@@ -54,7 +51,7 @@ class outage_created extends base {
     * @return moodle_url
     */
    public function get_url() {
-        return new moodle_url('/auth/outage/list.php#auth_outage_id_'.$this->other['id']);
+        return new moodle_url('/auth/outage/edit.php', ['edit' => $this->other['id']]);
    }

    /**
--- a/classes/event/outage_deleted.php
+++ b/classes/event/outage_deleted.php
@@ -27,8 +27,6 @@ namespace auth_outage\event;
 use core\event\base;
 use moodle_url;

-defined('MOODLE_INTERNAL') || die();
-
 /**
 * outage_deleted class.
 *
@@ -44,8 +42,7 @@ class outage_deleted extends base {
     * @return string
     */
    public function get_description() {
-        return "The user with the id '{$this->userid}' deleted the outage titled '{$this->other['title']}' ".
-               "with id '{$this->other['id']}'.";
+        return "The user with the id '{$this->userid}' deleted outage {$this->other['id']} '{$this->other['title']}'";
    }

    /**
@@ -53,7 +50,7 @@ class outage_deleted extends base {
     * @return moodle_url
     */
    public function get_url() {
-        return new moodle_url('/auth/outage/list.php#auth_outage_id_'.$this->other['id']);
+        return new moodle_url('/auth/outage/manage.php');
    }

    /**
--- a/classes/event/outage_updated.php
+++ b/classes/event/outage_updated.php
@@ -28,8 +28,6 @@ namespace auth_outage\event;
 use core\event\base;
 use moodle_url;

-defined('MOODLE_INTERNAL') || die();
-
 /**
 * outage_updated class.
 *
@@ -45,8 +43,7 @@ class outage_updated extends base {
     * @return string
     */
    public function get_description() {
-        return "The user with the id '{$this->userid}' updated the outage title '{$this->other['title']}' ".
-               "with id '{$this->other['id']}'.";
+        return "The user with the id '{$this->userid}' updated outage {$this->other['id']} '{$this->other['title']}'";
    }

    /**
@@ -54,7 +51,7 @@ class outage_updated extends base {
     * @return moodle_url
     */
    public function get_url() {
-        return new moodle_url('/auth/outage/list.php');
+        return new moodle_url('/auth/outage/edit.php', ['edit' => $this->other['id']]);
    }

    /**
--- a/classes/form/outage/edit.php
+++ b/classes/form/outage/edit.php
@@ -82,6 +82,7 @@ class edit extends moodleform {
        $mform->addHelpButton('description', 'description', 'auth_outage');

        $mform->addElement('static', 'usagehints', '', get_string('textplaceholdershint', 'auth_outage'));
+        $mform->addElement('static', 'warningreenablemaintenancemode', '');

        $this->add_action_buttons();
    }
@@ -146,6 +147,9 @@ class edit extends moodleform {
     * @throws coding_exception
     */
    public function set_data($outage) {
+        global $OUTPUT, $CFG;
+        $mform = $this->_form;
+
        // Cannot change method signature, check type.
        if ($outage instanceof outage) {
            $this->_form->setDefaults([
@@ -157,6 +161,21 @@ class edit extends moodleform {
                'title' => $outage->title,
                'description' => ['text' => $outage->description, 'format' => '1'],
            ]);
+
+            // If the default_autostart is configured in config, then force autostart to be the default value.
+            if (array_key_exists('auth_outage', $CFG->forced_plugin_settings)
+                && array_key_exists('default_autostart', $CFG->forced_plugin_settings['auth_outage'])) {
+                $this->_form->setDefaults([
+                    'autostart' => $CFG->forced_plugin_settings['auth_outage']['default_autostart']
+                ]);
+                $mform->freeze('autostart');
+            }
+
+            if (!empty($outage->id) && $outage->autostart && $outage->starttime < time() && $outage->stoptime > time()) {
+                $warning = $mform->getElement('warningreenablemaintenancemode');
+                $warning->setValue($OUTPUT->notification(get_string('warningreenablemaintenancemode', 'auth_outage'),
+                    'notifywarning'));
+            }
        } else {
            throw new coding_exception('$outage must be an outage object.', $outage);
        }
--- a/classes/local/cli/cli_exception.php
+++ b/classes/local/cli/cli_exception.php
@@ -27,8 +27,6 @@ namespace auth_outage\local\cli;

 use Exception;

-defined('MOODLE_INTERNAL') || die();
-
 /**
 * cli_exception class.
 *
--- a/classes/local/cli/clibase.php
+++ b/classes/local/cli/clibase.php
@@ -29,8 +29,6 @@ use auth_outage\local\outagelib;
 use coding_exception;
 use core\session\manager;

-defined('MOODLE_INTERNAL') || die();
-
 /**
 * clibase class.
 *
@@ -106,25 +104,25 @@ abstract class clibase {
     * Generates all options (parameters) available for the CLI command.
     * @return mixed[] Options.
     */
-    public abstract function generate_options();
+    abstract public function generate_options();

    /**
     * Generate all short forms for the available options.
     * @return string[] Short form options.
     */
-    public abstract function generate_shortcuts();
+    abstract public function generate_shortcuts();

    /**
     * Executes the CLI script.
     */
-    public abstract function execute();
+    abstract public function execute();

    /**
     * Change session to admin user.
     */
    protected function become_admin_user() {
        global $DB;
-        $user = $DB->get_record('user', ['id' => 2]);
+        $user = get_admin();
        unset($user->description);
        unset($user->access);
        unset($user->preference);
@@ -147,5 +145,6 @@ abstract class clibase {
            $long = '--'.$long;
            printf("  %-4s %-20s %s\n", $short, $long, $text);
        }
+        printf("\n%s\n\n", get_string('cli'.$cliname.'examples', 'auth_outage'));
    }
 }
--- a/classes/local/cli/create.php
+++ b/classes/local/cli/create.php
@@ -29,8 +29,6 @@ use auth_outage\dml\outagedb;
 use auth_outage\local\outage;
 use coding_exception;

-defined('MOODLE_INTERNAL') || die();
-
 /**
 * create class.
 *
@@ -170,7 +168,9 @@ class create extends clibase {
        $this->become_admin_user();

        // Create the outage.
-        $start = $this->time + $options['start'];
+        // If time is above 1500000000 then it must be a unix time timestamp, otherwise they are trying to create
+        // an outage 47 years in advance.
+        $start = $options['start'] > 1500000000 ? $options['start'] : $this->time + $options['start'];
        $outage = new outage([
            'autostart' => $options['autostart'],
            'warntime' => $start - $options['warn'],
@@ -198,7 +198,7 @@ class create extends clibase {
    private function clone_defaults() {
        $id = $this->options['clone'];
        if (!is_number($id) || ($id <= 0)) {
-            throw new cli_exception(get_string('clierrorinvalidvalue', 'auth_outage', ['param' => 'clone']),
+            throw new cli_exception(get_string('clierrorinvalidvaluenotid', 'auth_outage', ['param' => 'clone']),
                cli_exception::ERROR_PARAMETER_INVALID);
        }

@@ -243,12 +243,12 @@ class create extends clibase {
     */
    private function merge_options_check_parameters_int_nonnegative($option, $param) {
        if (!is_number($option)) {
-            throw new cli_exception(get_string('clierrorinvalidvalue', 'auth_outage', ['param' => $param]),
+            throw new cli_exception(get_string('clierrorinvalidvaluenotnumber', 'auth_outage', ['param' => $param]),
                cli_exception::ERROR_PARAMETER_INVALID);
        }
        $option = (int)$option;
        if ($option < 0) {
-            throw new cli_exception(get_string('clierrorinvalidvalue', 'auth_outage', ['param' => $param]),
+            throw new cli_exception(get_string('clierrorinvalidvaluenegativenumber', 'auth_outage', ['param' => $param]),
                cli_exception::ERROR_PARAMETER_INVALID);
        }
        return $option;
@@ -263,12 +263,12 @@ class create extends clibase {
     */
    private function merge_options_check_parameters_string_nonempty($option, $param) {
        if (!is_string($option)) {
-            throw new cli_exception(get_string('clierrorinvalidvalue', 'auth_outage', ['param' => $param]),
+            throw new cli_exception(get_string('clierrorinvalidvaluenotstring', 'auth_outage', ['param' => $param]),
                cli_exception::ERROR_PARAMETER_INVALID);
        }
        $option = trim($option);
        if (strlen($option) == 0) {
-            throw new cli_exception(get_string('clierrorinvalidvalue', 'auth_outage', ['param' => $param]),
+            throw new cli_exception(get_string('clierrorinvalidvalueemptystring', 'auth_outage', ['param' => $param]),
                cli_exception::ERROR_PARAMETER_INVALID);
        }
        return $option;
@@ -296,7 +296,7 @@ class create extends clibase {
            }
        }

-        throw new cli_exception(get_string('clierrorinvalidvalue', 'auth_outage', ['param' => $param]),
+        throw new cli_exception(get_string('clierrorinvalidvaluenotbool', 'auth_outage', ['param' => $param]),
            cli_exception::ERROR_PARAMETER_INVALID);
    }
 }
--- a/classes/local/cli/finish.php
+++ b/classes/local/cli/finish.php
@@ -28,8 +28,6 @@ namespace auth_outage\local\cli;
 use auth_outage\dml\outagedb;
 use auth_outage\local\outage;

-defined('MOODLE_INTERNAL') || die();
-
 /**
 * finish class.
 *
--- a/classes/local/cli/waitforit.php
+++ b/classes/local/cli/waitforit.php
@@ -28,8 +28,6 @@ namespace auth_outage\local\cli;
 use auth_outage\dml\outagedb;
 use auth_outage\local\outage;

-defined('MOODLE_INTERNAL') || die();
-
 /**
 * waitforit class.
 *
@@ -131,7 +129,7 @@ class waitforit extends clibase {
            return;
        }

-        $time = strftime('%F %T %Z');
+        $time = \totara_core\strftime::format('%F %T %Z');
        printf("[%s] %s\n", $time, $message);
    }

--- a/classes/local/controllers/infopage.php
+++ b/classes/local/controllers/infopage.php
@@ -32,8 +32,6 @@ use coding_exception;
 use context_system;
 use moodle_url;

-defined('MOODLE_INTERNAL') || die();
-
 /**
 * infopage class.
 *
@@ -48,20 +46,32 @@ class infopage {
     */
    private $outage;

+    /**
+     * @var bool|null Defines if the page is generated for a static outage page.
+     */
+    private $static;
+
    /**
     * infopage_controller constructor.
     * @param array $params Parameters to use or null to get from Moodle API (request).
     */
    public function __construct(array $params = null) {
+        global $CFG;
+        // Enable SVG support here to make sure all SVG files
+        // used in the current theme are served properly.
+        $CFG->svgicons = true;
+
        if (is_null($params)) {
            $params = [
                'id' => optional_param('id', null, PARAM_INT),
                'outage' => null,
+                'static' => optional_param('static', false, PARAM_BOOL),
            ];
        } else {
            $defaults = [
                'id' => null,
                'outage' => null,
+                'static' => false,
            ];
            $params = array_merge($defaults, $params);
        }
@@ -88,7 +98,6 @@ class infopage {
    /**
     * Generates and outputs the HTML for the info page.
     * @uses    redirect
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable) $viewbag is used inside 'require'.
     */
    public function output() {
        global $PAGE, $CFG, $OUTPUT;
@@ -97,13 +106,17 @@ class infopage {
            redirect(new moodle_url('/'));
        }

+        // If it's not static outage page, then check access, then redirect if not allowed.
+        if (!$this->static && !has_capability('auth/outage:viewinfo', context_system::instance())) {
+            redirect(new moodle_url('/'));
+        }
        $PAGE->set_context(context_system::instance());
        $PAGE->set_title($this->outage->get_title());
        $PAGE->set_heading($this->outage->get_title());
        $PAGE->set_url(new moodle_url('/auth/outage/info.php'));

        // No hooks injecting into this page, do it manually.
-        outagelib::inject();
+        echo outagelib::get_inject_code();

        echo $OUTPUT->header();
        $viewbag = [
@@ -139,5 +152,6 @@ class infopage {
        }

        $this->outage = $params['outage'];
+        $this->static = $params['static'];
    }
 }
--- a/classes/local/controllers/maintenance_static_page.php
+++ b/classes/local/controllers/maintenance_static_page.php
@@ -29,8 +29,6 @@ use auth_outage\local\outage;
 use coding_exception;
 use DOMDocument;

-defined('MOODLE_INTERNAL') || die();
-
 /**
 * maintenance_static_page class.
 *
@@ -61,7 +59,7 @@ class maintenance_static_page {
            $html = '<html></html>';
        } else {
            $data = maintenance_static_page_io::file_get_data(
-                $CFG->wwwroot.'/auth/outage/info.php?auth_outage_hide_warning=1&id='.$outage->id);
+                $CFG->wwwroot.'/auth/outage/info.php?auth_outage_hide_warning=1&static=1&id='.$outage->id);
            $html = $data['contents'];
        }

@@ -122,6 +120,7 @@ class maintenance_static_page {
    }

    /**
+     * Gets generator io.
     * @return maintenance_static_page_io
     */
    public function get_io() {
--- a/classes/local/controllers/maintenance_static_page_generator.php
+++ b/classes/local/controllers/maintenance_static_page_generator.php
@@ -27,13 +27,12 @@ namespace auth_outage\local\controllers;

 use auth_outage\local\outagelib;
 use coding_exception;
+use core_php_time_limit;
 use DOMDocument;
 use DOMElement;
 use invalid_state_exception;
 use moodle_url;

-defined('MOODLE_INTERNAL') || die();
-
 /**
 * maintenance_static_page_generator class.
 *
@@ -43,6 +42,15 @@ defined('MOODLE_INTERNAL') || die();
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
 class maintenance_static_page_generator {
+    /** PATTERN
+     * The pattern should match the attribute values that
+     * go as 'url(xxxxx)', but make sure 'url(data:xxxxx)' is not
+     * rewritten. Must be case insensitive to match 'URL(xxxxx)'.
+     * It should be possible to specify other background attributes as
+     * 'background: color url(xxxxx) no-repeat'.
+     */
+    protected const PATTERN = '/url\s*\(\s*[\'"]?(?![\'"]?data:)([^\s\'"]+)[\'"]?\s*\)/i';
+
    /** @var DOMDocument */
    protected $dom;

@@ -75,6 +83,10 @@ class maintenance_static_page_generator {
        $this->io->cleanup();

        if (!is_null($this->dom)) {
+
+            // This can take a while to process using repeated curls.
+            core_php_time_limit::raise();
+
            $this->io->create_resources_path();

            $this->remove_script_tags();
@@ -83,6 +95,7 @@ class maintenance_static_page_generator {
            $this->update_link_favicon();
            $this->update_images();
            $this->remove_configured_css_selectors();
+            $this->update_inline_background_images();

            $html = $this->dom->saveHTML();
            if (trim($html) == '') {
@@ -95,6 +108,7 @@ class maintenance_static_page_generator {
    }

    /**
+     * Gets maintenance_static_page_io.
     * @return maintenance_static_page_io
     */
    public function get_io() {
@@ -128,7 +142,7 @@ class maintenance_static_page_generator {
                continue;
            }
            $saved = $this->io->save_url_file($href);
-            if (is_null($saved['url'])) {
+            if (empty($saved['url'])) {
                $url = $href; // Skipped, use original URL.
            } else {
                $this->update_link_stylesheet_parse($saved['file'], dirname($href));
@@ -138,6 +152,29 @@ class maintenance_static_page_generator {
        }
    }

+    /**
+     * Retrieves all URLs from file content using regular expressions.
+     *
+     * @param string $contents Content of the file
+     * @return array Array of all matches in multi-dimensional array
+     */
+    public function get_urls_from_stylesheet($contents) {
+        preg_match_all('#url\([\'"]?(?!data:)([^\'"\)]+)#', $contents, $matches);
+        return $matches;
+    }
+
+    /**
+     * Retrieves a URL from inline style using regular expressions.
+     *
+     * @param string $style Content of the style attribute
+     * @return array Array containing match
+     */
+    public function get_url_from_inline_style($style) {
+        preg_match(self::PATTERN, $style, $match);
+        return $match;
+    }
+
+
    /**
     * Checks for urls inside filename.
     *
@@ -148,15 +185,15 @@ class maintenance_static_page_generator {
        global $CFG;

        $contents = file_get_contents($filename);
-        if (!preg_match_all('#url\([\'"]?([^\'"\)]+)#', $contents, $matches)) {
-            return;
-        }
+        $matches = $this->get_urls_from_stylesheet($contents);
+
        foreach ($matches[1] as $originalurl) {
            // Allow incomplete URLs in CSS, assume it is from moodle root.
            if (maintenance_static_page_io::is_url($originalurl)) {
                $fullurl = $originalurl;
            } else if ($originalurl[0] == '/') {
-                $fullurl = $CFG->wwwroot.$originalurl;
+                $rooturl = parse_url($CFG->wwwroot);
+                $fullurl = $rooturl['scheme'].'://'.$rooturl['host'].$originalurl;
            } else {
                $fullurl = $baseref.'/'.$originalurl;
            }
@@ -206,6 +243,31 @@ class maintenance_static_page_generator {
        }
    }

+    /**
+     * Fetch and fixes all inline background images.
+     */
+    private function update_inline_background_images() {
+        global $CFG;
+        $xpath = new \DOMXPath($this->dom);
+        $elements = $xpath->query("//*[contains(@style,'background')]");
+
+        foreach ($elements as $element) {
+            $style = $element->getAttribute("style");
+            $matches = $this->get_url_from_inline_style($style);
+            if (isset($matches[1])) {
+                // Allow incomplete URLs in style, assume it is from moodle root.
+                if (maintenance_static_page_io::is_url($matches[1])) {
+                    $fullurl = $matches[1];
+                } else {
+                    $fullurl = (string) new moodle_url($matches[1]);
+                }
+                $newurl = $this->io->generate_file_url($fullurl);
+                $updated = preg_replace(self::PATTERN, ' url('.$newurl.') ', $style);
+                $element->setAttribute('style', $updated);
+            }
+        }
+    }
+
    /**
     * Remove from DOM the CSS selectores defined in the plugin settings.
     */
@@ -241,7 +303,7 @@ class maintenance_static_page_generator {
    /**
     * Fetches all elements based on the given selector.
     *
-     * @param $selector
+     * @param string $selector element selector
     *
     * @return DOMElement[]
     */
@@ -259,7 +321,7 @@ class maintenance_static_page_generator {
    /**
     * Fetch all elements which contains the given class.
     *
-     * @param $class
+     * @param string $class element class
     *
     * @return DOMElement[]
     */
@@ -275,6 +337,9 @@ class maintenance_static_page_generator {
        return $matches;
    }

+    /**
+     * Adds meta refresh to head element.
+     */
    private function add_meta_refresh() {
        $meta = $this->dom->createElement('meta');
        $meta->setAttribute('http-equiv', 'refresh');
@@ -287,6 +352,7 @@ class maintenance_static_page_generator {
    }

    /**
+     * Gets refresh time.
     * @return int
     */
    public function get_refresh_time() {
@@ -294,6 +360,7 @@ class maintenance_static_page_generator {
    }

    /**
+     * Sets refresh time.
     * @param int $refreshtime
     */
    public function set_refresh_time($refreshtime) {
--- a/classes/local/controllers/maintenance_static_page_io.php
+++ b/classes/local/controllers/maintenance_static_page_io.php
@@ -31,8 +31,6 @@ use finfo;
 use invalid_parameter_exception;
 use moodle_url;

-defined('MOODLE_INTERNAL') || die();
-
 /**
 * maintenance_static_page_io class.
 *
@@ -44,11 +42,13 @@ defined('MOODLE_INTERNAL') || die();
 class maintenance_static_page_io {
    /**
     * Checks if the given string starts with "http://" or "https://".
-     * @param $url
+     * Also checks for "//" at the start of image, which setting_file_url still uses.
+     *
+     * @param string $url url string for check
     * @return bool
     */
    public static function is_url($url) {
-        return (bool)preg_match('#^http(s)?://#', $url);
+        return ((bool) preg_match('#^http(s)?://#', $url) || (bool) preg_match('#^//#', $url));
    }

    /**
@@ -80,6 +80,7 @@ class maintenance_static_page_io {
    protected $preview = false;

    /**
+     * Sets preview
     * @param boolean $preview
     */
    public function set_preview($preview) {
@@ -213,7 +214,7 @@ class maintenance_static_page_io {
    /**
     * Saves the content of the URL into a file, returning the local filename.
     * @param string $url Input URL.
-     * @return string|null Output filename or null if skipped.
+     * @return array|null Output an array with the filename and url or null if skipped.
     */
    public function save_url_file($url) {
        global $CFG;
--- a/classes/local/outage.php
+++ b/classes/local/outage.php
@@ -28,8 +28,6 @@ namespace auth_outage\local;
 use coding_exception;
 use stdClass;

-defined('MOODLE_INTERNAL') || die();
-
 /**
 * outage class.
 *
@@ -281,7 +279,17 @@ class outage {
     */
    private function adjust_field_types() {
        // Adjust int fields.
-        $fs = ['createdby', 'id', 'lastmodified', 'modifiedby', 'starttime', 'stoptime', 'warntime', 'finished'];
+        $fs = [
+            'id',
+            'starttime',
+            'stoptime',
+            'warntime',
+            'finished',
+            'createdby',
+            'lastmodified',
+            'modifiedby',
+        ];
+
        foreach ($fs as $f) {
            $this->$f = ($this->$f === null) ? null : (int)$this->$f;
        }
@@ -289,4 +297,12 @@ class outage {
        // Adjust bool fields.
        $this->autostart = ($this->autostart === null) ? null : (bool)$this->autostart;
    }
+
+    /**
+     * Return json encoded outage.
+     * @return string Json string.
+     */
+    public function __toString() {
+        return json_encode(get_object_vars($this));
+    }
 }
--- a/classes/local/outagelib.php
+++ b/classes/local/outagelib.php
@@ -29,6 +29,7 @@ use auth_outage\dml\outagedb;
 use auth_outage\local\controllers\maintenance_static_page;
 use auth_outage\output\renderer;
 use coding_exception;
+use curl;
 use Exception;
 use file_exception;
 use invalid_parameter_exception;
@@ -47,39 +48,72 @@ require_once(__DIR__.'/../../lib.php');
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
 class outagelib {
+
+    /** Outage start. */
+    const OUTAGE_START = '<!-- OUTAGESTART -->';
+
+    /** Outage end. */
+    const OUTAGE_END = '<!-- OUTAGEEND -->';
+
    /**
     * @var bool Flags in the injection function was already called.
     */
    private static $injectcalled = false;

+    /**
+     * Fetches page.
+     * @param string $file file to be fetched
+     */
    public static function fetch_page($file) {
-        $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, $file);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
-        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
-        curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 5); // It is localhost, time to connect is enough.
-        curl_setopt($curl, CURLOPT_TIMEOUT, 15); // It is localhost, time to fetch index is enough.
-        $contents = curl_exec($curl);
-        $mime = curl_getinfo($curl, CURLINFO_CONTENT_TYPE);
-        curl_close($curl);
+        global $CFG;
+        require_once($CFG->libdir . '/filelib.php');
+
+        $curl = new curl();
+        $contents = $curl->get($file);
+        $info = $curl->get_info();
+        if (!empty($info['content_type'])) {
+            $mime = $info['content_type'];
+        } else {
+            $mime = '';
+        }
        return compact('contents', 'mime');
    }

    /**
-     * Calls inject even if it was already called before.
+     * Resets inject called to allow the code to be regenerated.
     */
-    public static function reinject() {
+    public static function reset_injectcalled() {
        self::$injectcalled = false;
-        self::inject();
    }

    /**
-     * Will check for ongoing or warning outages and will attach the message bar as required.
+     * Given a time, usually now, when is the next outage window?
+     * @param int $time time for next window
     */
-    public static function inject() {
-        global $CFG;
+    public static function get_next_window($time = null) {

+        $config = self::get_config();
+
+        if (!$time) {
+            $time = time();
+        }
+
+        $default = $config->default_time;
+        if ($default) {
+            // First try natural language parsing.
+            $time = strtotime($default, $time);
+        }
+        return $time;
+    }
+
+
+    /**
+     * Will check for ongoing or warning outages and will return the message bar as required.
+     *
+     * @return string|void CSS and HTML for the warning bar if it should be displayed
+     */
+    public static function get_inject_code() {
+        global $PAGE;
        // Ensure we do not kill the whole website in case of an error.
        try {
            // Check if we should inject the code.
@@ -109,8 +143,8 @@ class outagelib {
            }

            // There is a previewing or active outage.
-            $CFG->additionalhtmltopofbody = renderer::get()->render_warningbar($active, $time, false, $preview).
-                                            $CFG->additionalhtmltopofbody;
+            $renderer = $PAGE->get_renderer('auth_outage');
+            return $renderer->render_warningbar($active, $time, false, $preview);
        } catch (Exception $e) {
            debugging('Exception occured while injecting our code: '.$e->getMessage());
            debugging($e->getTraceAsString(), DEBUG_DEVELOPER);
@@ -134,7 +168,12 @@ class outagelib {
            }
        }

-        return (object)array_merge(self::get_config_defaults(), $config);
+        $config = array_merge(self::get_config_defaults(), $config);
+        // Combine allowed IPs config values together.
+        if (isset($config['allowedips_forced'])) {
+            $config['allowedips'] = trim($config['allowedips'] . "\n" . $config['allowedips_forced']);
+        }
+        return (object)$config;
    }

    /**
@@ -145,6 +184,7 @@ class outagelib {
        return [
            'allowedips'               => '',
            'css'                      => '',
+            'default_time'             => '',
            'default_autostart'        => '0',
            'default_duration'         => (string)(60 * 60),
            'default_warning_duration' => (string)(60 * 60),
@@ -156,18 +196,34 @@ class outagelib {

    /**
     * Executed when outages are modified (created, updated or deleted).
+     *
+     * @param bool $reenablemaint should we re-enable maintenance mode for ongoing outage
+     * @throws coding_exception
+     * @throws file_exception
     */
-    public static function prepare_next_outage() {
+    public static function prepare_next_outage($reenablemaint = false) {
        // If there is an ongoing outage, prepare it instead.
        $outage = outagedb::get_ongoing();
        if (is_null($outage)) {
            $outage = outagedb::get_next_starting();
+            $ongoingoutage = false;
+        } else {
+            $ongoingoutage = true;
        }
+
+        // Set json formatted outage string to cache.
+        set_config('auth_outage_active_outage', (string)$outage);
+
        maintenance_static_page::create_from_outage($outage)->generate();
        self::update_climaintenance_code($outage);
-        self::update_maintenance_later($outage);
+        if (!$ongoingoutage || $reenablemaint || is_null($outage)) {
+            self::update_maintenance_later($outage);
+        }
    }

+    /**
+     * Checks if wwwroot accessible.
+     */
    private static function check_wwwroot_accessible() {
        global $CFG;
        $result = self::fetch_page($CFG->wwwroot);
@@ -190,6 +246,7 @@ class outagelib {
                unset_config('maintenance_message');
            }
            set_config('maintenance_later', $outage->starttime);
+            self::maintenance_config_log($outage);
        }
    }

@@ -246,13 +303,16 @@ class outagelib {
        }
        // I know Moodle validation would clean up this field, but just in case, let's ensure no
        // single-quotes (and double for the sake of it) are present otherwise it would break the code.
-        $allowedips = str_replace('\'"', '', $allowedips);
+        $allowedips = addslashes($allowedips);

        $code = <<<'EOT'
 <?php
 if ((time() >= {{STARTTIME}}) && (time() < {{STOPTIME}})) {
    define('MOODLE_INTERNAL', true);
    require_once($CFG->dirroot.'/lib/moodlelib.php');
+    if (file_exists($CFG->dirroot.'/lib/classes/ip_utils.php')) {
+        require_once($CFG->dirroot.'/lib/classes/ip_utils.php');
+    }
    if (!remoteip_in_list('{{ALLOWEDIPS}}')) {
        header($_SERVER['SERVER_PROTOCOL'] . ' 503 Moodle under maintenance');
        header('Status: 503 Moodle under maintenance');
@@ -265,6 +325,7 @@ if ((time() >= {{STARTTIME}}) && (time() < {{STOPTIME}})) {
        header('Expires: Mon, 20 Aug 1969 09:23:00 GMT');
        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
        header('Accept-Ranges: none');
+        header('X-Moodle-Maintenance: manager');
        if ((defined('AJAX_SCRIPT') && AJAX_SCRIPT) || (defined('WS_SERVER') && WS_SERVER)) {
            exit(0);
        }
@@ -321,16 +382,14 @@ EOT;
     * Generates a warning message in case the plugin is not active and configured.
     *
     * @return string
-     *
-     * @internal stdClass $CFG
-     * @internal bootstrap_renderer $OUTPUT
     */
    public static function generate_plugin_configuration_warning() {
        global $CFG, $OUTPUT, $PAGE;

        $message = [];

-        if (trim(self::get_config()->allowedips) != '' && (!isset($CFG->auth_outage_bootstrap_loaded) || !$CFG->auth_outage_bootstrap_loaded)) {
+        if (trim(self::get_config()->allowedips) != ''
+                && (!isset($CFG->auth_outage_bootstrap_loaded) || !$CFG->auth_outage_bootstrap_loaded)) {
            $message[] = get_string('configurationwarning', 'auth_outage');
        }

@@ -356,4 +415,18 @@ EOT;

        return $message;
    }
+
+    /**
+     * Logging for maintenance mode configuration.
+     *
+     * @param outage|null $outage Outage or null if no scheduled outage.
+     */
+    private static function maintenance_config_log(outage $outage) {
+        mtrace(get_string('logformaintmodeconfig', 'auth_outage'));
+        $timezone = ' (Timezone ' . \core_date::get_server_timezone_object()->getName() . ')';
+        mtrace('... updated at ' . date('H:i:s'));
+        $time = date("Y-m-d H:i:s", $outage->starttime);
+        mtrace("... enable maintenance mode at $time $timezone");
+        mtrace(get_string('logformaintmodeconfigcomplete', 'auth_outage'));
+    }
 }
--- a/classes/output/manage/base_table.php
+++ b/classes/output/manage/base_table.php
@@ -48,6 +48,10 @@ class base_table extends flexible_table {
     */
    private static $autoid = 0;

+    /**
+     * Creates start time string.
+     * @param string $starttime start time
+     */
    protected static function create_starttime_string($starttime) {
        $absolute = userdate($starttime, get_string('datetimeformat', 'auth_outage'));
        $relative = $starttime - time();
--- a/classes/output/renderer.php
+++ b/classes/output/renderer.php
@@ -26,14 +26,13 @@
 namespace auth_outage\output;

 use auth_outage\local\outage;
+use auth_outage\local\outagelib;
 use coding_exception;
 use core_user;
 use html_writer;
 use moodle_url;
 use plugin_renderer_base;

-defined('MOODLE_INTERNAL') || die();
-
 /**
 * auth_outage_renderer class.
 *
@@ -43,15 +42,6 @@ defined('MOODLE_INTERNAL') || die();
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
 class renderer extends plugin_renderer_base {
-    /**
-     * Returns the outage renderer.
-     * @return renderer The outage renderer.
-     */
-    public static function get() {
-        global $PAGE;
-        return $PAGE->get_renderer('auth_outage');
-    }
-
    /**
     * Outputs the view in a separate scope to avoid conflicts with variable names.
     * @param string $view View PHP file.
@@ -74,6 +64,13 @@ class renderer extends plugin_renderer_base {
     * @return string The rendered view code.
     */
    public function render_view($view, $viewbag = []) {
+
+        // Do not render if the request are from some layouts.
+        $excludelayout = ['embedded', 'popup', 'secure', 'maintenance'];
+        if (in_array($this->page->pagelayout, $excludelayout)) {
+            return '';
+        }
+
        ob_start();
        $this->output_view($view, $viewbag);
        $html = ob_get_contents();
@@ -153,8 +150,6 @@ class renderer extends plugin_renderer_base {
     * @return string The formatted HTML.
     */
    private function renderoutage(outage $outage, $buttons) {
-        global $OUTPUT;
-
        if ($outage->createdby == 0) {
            $created = get_string('na', 'auth_outage');
        } else {
@@ -178,14 +173,14 @@ class renderer extends plugin_renderer_base {
        $url = new moodle_url('/auth/outage/edit.php', ['edit' => $outage->id]);
        $img = html_writer::empty_tag(
            'img',
-            ['src' => $OUTPUT->image_url('t/edit'), 'alt' => get_string('edit'), 'class' => 'iconsmall']
+            ['src' => $this->output->image_url('t/edit'), 'alt' => get_string('edit'), 'class' => 'iconsmall']
        );
        $linkedit = html_writer::link($url, $img, ['title' => get_string('edit')]);

        $url = new moodle_url('/auth/outage/delete.php', ['id' => $outage->id]);
        $img = html_writer::empty_tag(
            'img',
-            ['src' => $OUTPUT->image_url('t/delete'), 'alt' => get_string('delete'), 'class' => 'iconsmall']
+            ['src' => $this->output->image_url('t/delete'), 'alt' => get_string('delete'), 'class' => 'iconsmall']
        );
        $linkdelete = html_writer::link($url, $img, ['title' => get_string('delete')]);

@@ -196,35 +191,38 @@ class renderer extends plugin_renderer_base {
            $finished = userdate($finished, get_string('datetimeformat', 'auth_outage'));
        }

-        return html_writer::div(
+        $start = outagelib::OUTAGE_START;
+        $end = outagelib::OUTAGE_END;
+        $outagehtml = html_writer::div(
            html_writer::tag('blockquote',
-                html_writer::div(html_writer::tag('b', $outage->get_title(), ['data-id' => $outage->id])).
-                html_writer::div(html_writer::tag('i', $outage->get_description())).
-                html_writer::div(
-                    html_writer::tag('b', get_string('tableheaderwarnbefore', 'auth_outage').': ').
-                    format_time($outage->get_warning_duration())
-                ).
-                html_writer::div(
-                    html_writer::tag('b', get_string('tableheaderstarttime', 'auth_outage').': ').
-                    userdate($outage->starttime, get_string('datetimeformat', 'auth_outage'))
-                ).
-                html_writer::div(
-                    html_writer::tag('b', get_string('tableheaderdurationplanned', 'auth_outage').': ').
-                    format_time($outage->get_duration_planned())
-                ).
-                html_writer::div(
-                    html_writer::tag('b', get_string('tableheaderdurationactual', 'auth_outage').': ').
-                    $finished
-                ).
-                html_writer::div(
-                    html_writer::tag('small',
-                        'Created by '.$created.
-                        ', modified by '.$modified.' on '.
-                        userdate($outage->lastmodified, get_string('datetimeformat', 'auth_outage'))
-                    )
-                ).
-                ($buttons ? html_writer::div($linkedit.$linkdelete) : '')
+                             html_writer::div(html_writer::tag('b', $outage->get_title(), ['data-id' => $outage->id])).
+                             html_writer::div(html_writer::tag('i', $outage->get_description())).
+                             html_writer::div(
+                                 html_writer::tag('b', get_string('tableheaderwarnbefore', 'auth_outage').': ').
+                                 format_time($outage->get_warning_duration())
+                             ).
+                             html_writer::div(
+                                 html_writer::tag('b', get_string('tableheaderstarttime', 'auth_outage').': ').
+                                 userdate($outage->starttime, get_string('datetimeformat', 'auth_outage'))
+                             ).
+                             html_writer::div(
+                                 html_writer::tag('b', get_string('tableheaderdurationplanned', 'auth_outage').': ').
+                                 format_time($outage->get_duration_planned())
+                             ).
+                             html_writer::div(
+                                 html_writer::tag('b', get_string('tableheaderdurationactual', 'auth_outage').': ').
+                                 $finished
+                             ).
+                             html_writer::div(
+                                 html_writer::tag('small',
+                                                  'Created by '.$created.
+                                                  ', modified by '.$modified.' on '.
+                                                  userdate($outage->lastmodified, get_string('datetimeformat', 'auth_outage'))
+                                 )
+                             ).
+                             ($buttons ? html_writer::div($linkedit.$linkdelete) : '')
            )
        );
+        return $start . $outagehtml . $end;
    }
 }
--- a/classes/privacy/provider.php
+++ b/classes/privacy/provider.php
@@ -23,8 +23,6 @@

 namespace auth_outage\privacy;

-defined('MOODLE_INTERNAL') || die();
-
 use core_privacy\local\legacy_polyfill;

 /**
--- a/classes/task/update_static_page.php
+++ b/classes/task/update_static_page.php
@@ -29,8 +29,6 @@ use auth_outage\local\controllers\infopage;
 use auth_outage\local\outagelib;
 use core\task\scheduled_task;

-defined('MOODLE_INTERNAL') || die();
-
 /**
 * update_static_page class.
 *
--- a/db/access.php
+++ b/db/access.php
@@ -0,0 +1,37 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Define capabilities for plugin.
+ *
+ * @package    auth_outage
+ * @author     Andrew Madden <andrewmadden@catalyst-au.net>
+ * @copyright  2021 Catalyst IT
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$capabilities = [
+    'auth/outage:viewinfo' => array(
+        'captype' => 'read',
+        'contextlevel' => CONTEXT_SYSTEM,
+        'archetypes' => array(
+            'guest' => CAP_ALLOW,
+            'user' => CAP_ALLOW,
+        )
+    ),
+];
--- a/db/uninstall.php
+++ b/db/uninstall.php
@@ -24,14 +24,11 @@
 */
 use auth_outage\local\controllers\maintenance_static_page;

-defined('MOODLE_INTERNAL') || die();
-
 /**
 * Auth Outage plugin uninstall code.
 * @return bool result
 * @throws moodle_exception
 */
-
 function xmldb_auth_outage_uninstall() {
    global $DB;

--- a/db/upgrade.php
+++ b/db/upgrade.php
@@ -22,7 +22,6 @@
 * @copyright  2016 Catalyst IT
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-defined('MOODLE_INTERNAL') || die();

 /**
 * Outage plugin upgrade code
--- a/delete.php
+++ b/delete.php
@@ -33,6 +33,7 @@ require_once($CFG->libdir.'/formslib.php');

 admin_externalpage_setup('auth_outage_manage');
 $PAGE->set_url(new moodle_url('/auth/outage/manage.php'));
+$output = $PAGE->get_renderer('auth_outage');

 $mform = new delete();
 if ($mform->is_cancelled()) {
@@ -52,10 +53,10 @@ $dataid = new stdClass();
 $dataid->id = $outage->id;
 $mform->set_data($dataid);

-echo $OUTPUT->header();
+echo $output->header();

-echo renderer::get()->renderdeleteconfirmation($outage);
+echo $output->renderdeleteconfirmation($outage);

 $mform->display();

-echo $OUTPUT->footer();
+echo $output->footer();
--- a/edit.php
+++ b/edit.php
@@ -34,6 +34,7 @@ require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/formslib.php');

 admin_externalpage_setup('auth_outage_manage');
+$output = $PAGE->get_renderer('auth_outage');
 $PAGE->set_url(new moodle_url('/auth/outage/manage.php'));

 $mform = new edit();
@@ -42,11 +43,12 @@ if ($mform->is_cancelled()) {
    redirect(new moodle_url('/auth/outage/manage.php'));
 } else if ($outage = $mform->get_data()) {
    $id = outagedb::save($outage);
-    redirect($CFG->wwwroot. '/auth/outage/manage.php#auth_outage_id_'.$id);
+    redirect(new moodle_url('/auth/outage/manage.php'));
 }

 $clone = optional_param('clone', 0, PARAM_INT);
 $edit = optional_param('edit', 0, PARAM_INT);
+$time = optional_param('starttime', 0, PARAM_INT);
 if ($clone && $edit) {
    throw new invalid_parameter_exception('Cannot provide both clone and edit ids.');
 }
@@ -60,7 +62,10 @@ if ($clone) {
    $action = 'outageedit';
 } else {
    $config = outagelib::get_config();
-    $time = time();
+    if (empty($time)) {
+        $time = outagelib::get_next_window();
+    }
+
    $outage = new outage([
        'autostart' => $config->default_autostart,
        'starttime' => $time,
@@ -79,7 +84,7 @@ if ($outage == null) {
 $mform->set_data($outage);

 $PAGE->navbar->add(get_string($action.'crumb', 'auth_outage'));
-echo $OUTPUT->header();
-echo renderer::get()->rendersubtitle($action);
+echo $output->header();
+echo $output->rendersubtitle($action);
 $mform->display();
-echo $OUTPUT->footer();
+echo $output->footer();
--- a/file.php
+++ b/file.php
@@ -57,7 +57,6 @@ header('Accept-Ranges: none');

 /**
 * Callback used in bootstrap.
- * @SupressWarnings(PHPMD)
 */
 function auth_outage_bootstrap_callback() {
    // Not using classes as classloader has not been initialized yet. Keep it minimalist.
@@ -74,7 +73,9 @@ function auth_outage_bootstrap_callback() {
    exit(0);
 }

+// @codingStandardsIgnoreStart
 require_once(__DIR__.'/../../config.php');
+// @codingStandardsIgnoreEnd

 // We should never reach here if config.php and auth/outage/bootstrap.php intercepted it correctly.
 // If config.php did not execute the callback function we can use the debugging function here.
--- a/finish.php
+++ b/finish.php
@@ -33,6 +33,7 @@ require_once($CFG->libdir.'/formslib.php');

 admin_externalpage_setup('auth_outage_manage');
 $PAGE->set_url(new moodle_url('/auth/outage/manage.php'));
+$output = $PAGE->get_renderer('auth_outage');

 $mform = new finish();
 if ($mform->is_cancelled()) {
@@ -52,10 +53,10 @@ $dataid = new stdClass();
 $dataid->id = $outage->id;
 $mform->set_data($dataid);

-echo $OUTPUT->header();
+echo $output->header();

-echo renderer::get()->renderfinishconfirmation($outage);
+echo $output->renderfinishconfirmation($outage);

 $mform->display();

-echo $OUTPUT->footer();
+echo $output->footer();
--- a/info.php
+++ b/info.php
@@ -25,7 +25,9 @@

 use auth_outage\local\controllers\infopage;

+// @codingStandardsIgnoreStart
 require_once(__DIR__.'/../../config.php');
+// @codingStandardsIgnoreEnd

 $info = new infopage();
 $info->output();
--- a/lang/en/auth_outage.php
+++ b/lang/en/auth_outage.php
@@ -26,7 +26,10 @@
 $string['auth_outagedescription'] = 'Auxiliary plugin that warns users about a future outage and prevents them from logging in once the outage starts.';
 $string['autostart'] = 'Auto start maintenance mode.';
 $string['autostart_help'] = 'If selected, when the outage starts it will automatically turn on Moodle maintenance mode.';
+$string['builtinallowediplist'] = 'Builtin Allowed IP List';
+$string['builtinallowediplist_desc'] = 'A second allowed IP list which makes it easier to have some IPs forced in config.php and others editable in the UI';
 $string['clicreatehelp'] = 'Creates a new outage.';
+$string['clicreateexamples'] = "Create an outage starting in 10 seconds\n\n> php create.php -s=10";
 $string['clicreateparamautostart'] = 'must be Y or N, sets if the outage automatically triggers maintenance mode.';
 $string['clicreateparamblock'] = 'blocks until outage starts.';
 $string['clicreateparamclone'] = 'clone another outage except for the start time.';
@@ -34,10 +37,11 @@ $string['clicreateparamdescription'] = 'the description of the outage.';
 $string['clicreateparamduration'] = 'how many seconds should the outage last.';
 $string['clicreateparamhelp'] = 'shows parameters help.';
 $string['clicreateparamonlyid'] = 'only outputs the new outage id, useful for scripts.';
-$string['clicreateparamstart'] = 'in how many seconds should this outage start. Required.';
+$string['clicreateparamstart'] = 'in how many seconds should this outage start or unix time to start outage. Required.';
 $string['clicreateparamtitle'] = 'the title of the outage.';
 $string['clicreateparamwarn'] = 'how many seconds before it starts to display a warning.';
 $string['clifinishhelp'] = 'Finishes an ongoing outage.';
+$string['clifinishexamples'] = '';
 $string['clifinishnotongoing'] = 'Outage is not ongoing.';
 $string['clifinishparamhelp'] = 'shows parameters help.';
 $string['clifinishparamactive'] = 'finishes the currently active outage.';
@@ -45,6 +49,7 @@ $string['clifinishparamoutageid'] = 'the id of the outage to finish.';
 $string['cliinmaintenancemode'] = 'Moodle maintenance mode is on. Use "php admin/cli/maintenance.php --disable" to disable it before finishing the outage.';
 $string['cliwaitforiterroridxoractive'] = 'You must use --outageid=# or --active parameter but not both.';
 $string['cliwaitforithelp'] = 'Waits until an outage starts.';
+$string['cliwaitforitexamples'] = '';
 $string['cliwaitforitoutagestarted'] = 'Outage started!';
 $string['cliwaitforitoutagestartingin'] = 'Outage starting in {$a->countdown}.';
 $string['cliwaitforitparamactive'] = 'wait for the currently active outage.';
@@ -53,6 +58,12 @@ $string['cliwaitforitparamoutageid'] = 'the id of the outage to wait until it st
 $string['cliwaitforitparamsleep'] = 'maximum amount of seconds before status output.';
 $string['cliwaitforitparamverbose'] = 'enable verbose mode.';
 $string['clierrorinvalidvalue'] = 'Invalid value for parameter: {$a->param}';
+$string['clierrorinvalidvaluenotid'] = 'Param --{$a->param} must be an id number';
+$string['clierrorinvalidvaluenotbool'] = 'Param --{$a->param} must be set to either Y or N';
+$string['clierrorinvalidvaluenotnumber'] = 'Param --{$a->param} must be a number';
+$string['clierrorinvalidvaluenegativenumber'] = 'Param --{$a->param} must be a positive number';
+$string['clierrorinvalidvaluenotstring'] = 'Param --{$a->param} must be a string';
+$string['clierrorinvalidvalueemptystring'] = 'Param --{$a->param} must not be an empty string';
 $string['clierrormissingparamaters'] = 'You must specify the start time, use --help for more information.';
 $string['clierroroutagechanged'] = 'Outage was changed while waiting.';
 $string['clierroroutageended'] = 'Outage has already ended.';
@@ -71,9 +82,11 @@ $string['defaultoutageduration'] = 'Outage duration';
 $string['defaultoutagedurationdescription'] = 'Default duration (in minutes) of an outage.';
 $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, 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}}.';
+$string['defaulttitlevalue'] = 'System down from {{start}} for {{duration}}';
 $string['defaultdescription'] = 'Description';
 $string['defaultdescriptiondescription'] = 'Default warning message for outages. Use {{start}} and {{stop}} placeholders as required.';
 $string['defaultdescriptionvalue'] = 'There is an scheduled maintenance from {{start}} to {{stop}} and our system will not be available during that time.';
@@ -89,10 +102,13 @@ $string['infostart'] = 'start';
 $string['infostartofwarning'] = 'start of warning';
 $string['infostaticpage'] = 'static page';
 $string['infopagestaticgenerated'] = 'This warning was generated on {$a->time}.';
+$string['ips_combine'] = 'The IPs listed above will be combined with the IPs listed below.';
 $string['allowedipsempty'] = 'When the allowed IPs list is empty we will not block anyone. You can add your own IP address (<i>{$a->ip}</i>) and block all other IPs.';
 $string['allowedipshasmyip'] = 'Your IP (<i>{$a->ip}</i>) is in the list and you will not be blocked out during an Outage.';
 $string['allowedipshasntmyip'] = 'Your IP (<i>{$a->ip}</i>) is not in the list and you will be blocked out during an outage.';
 $string['allowedipsnoconfig'] = 'Your config.php does not have the extra setup to allow blocking via IP.<br />Please refer to our <a href="https://github.com/catalyst/moodle-auth_outage#installation" target="_blank">README.md</a> file for more information.';
+$string['logformaintmodeconfig'] = 'Update maintenance mode configuration.';
+$string['logformaintmodeconfigcomplete'] = 'Updating maintenance mode configuration complete.';
 $string['menusettings'] = 'Settings';
 $string['menumanage'] = 'Manage outages';
 $string['messageoutagebackonline'] = 'We are back online!';
@@ -101,6 +117,7 @@ $string['messageoutageongoing'] = 'Back online at {$a->stop}.';
 $string['messageoutagewarning'] = 'Shutting down in {{countdown}}';
 $string['na'] = 'n/a';
 $string['notfound'] = 'No outages found.';
+$string['outage:viewinfo'] = 'View outage info';
 $string['outageedit'] = 'Edit outage';
 $string['outageeditcrumb'] = 'Edit';
 $string['outageclone'] = 'Clone outage';
@@ -116,6 +133,7 @@ $string['outagefinish'] = 'Finish outage';
 $string['outagefinishwarning'] = 'You are about to mark this outage as finished. The system will be immediately back online.';
 $string['outageslistfuture'] = 'Planned outages';
 $string['outageslistpast'] = 'Outage history';
+$string['outage:updatenotify'] = '';
 $string['pluginname'] = 'Outage manager';
 $string['removeselectors'] = 'Remove selectors';
 $string['removeselectorsdescription'] = 'CSS selectors to remove when rendering a static themed maintenance page. One selector per line.';
@@ -143,6 +161,7 @@ $string['title_help'] = 'A short title to for this outage. It will be displayed
 $string['warningdurationerrorinvalid'] = 'Warning duration must be positive.';
 $string['warningduration'] = 'Warning duration';
 $string['warningduration_help'] = 'How long before the start of the outage should the warning be displayed.';
+$string['warningreenablemaintenancemode'] = 'Please note that saving this outage will re-enable maintenance mode.<br />Untick "Auto start maintenance mode" if you want to prevent this.';

 /*
 * Privacy provider (GDPR)
--- a/lib.php
+++ b/lib.php
@@ -25,29 +25,6 @@

 use auth_outage\local\outagelib;

-defined('MOODLE_INTERNAL') || die;
-
-/**
- * Used in Moodle 30+ when a user is logged on.
- */
-function auth_outage_extend_navigation_user_settings() {
-    outagelib::inject();
-}
-
-/**
- * Used in Moodle 30+ on the frontpage.
- */
-function auth_outage_extend_navigation_frontpage() {
-    outagelib::inject();
-}
-
-/**
- * Used in Moodle 31+ when a user is logged on.
- */
-function auth_outage_extend_navigation_user() {
-    outagelib::inject();
-}
-
 /**
 * Used for adminlib::set_updatedcallback which requires a string that resolves to a function.
 *
@@ -62,7 +39,7 @@ function auth_outage_outagelib_prepare_next_outage() {
 *
 * To keep it minimalist it was not added to the outagelib.php class.
 *
- * @param $file string Filename to fetch from sitedata
+ * @param string $file Filename to fetch from sitedata
 * @return string|null Full path to the sitedata file or null if file is not valid.
 */
 function auth_outage_get_climaintenance_resource_file($file) {
@@ -98,3 +75,13 @@ function auth_outage_get_fontawesome_icon_map() {
        'core:i/auth_outageevent' => 'fa-power-off',
    ];
 }
+
+/**
+ * Inject the warning bar into the page if there is currently an outage.
+ *
+ * @return string|void
+ */
+function auth_outage_before_standard_top_of_body_html() {
+    // Get code to inject.
+    return outagelib::get_inject_code();
+}
--- a/manage.php
+++ b/manage.php
@@ -32,16 +32,17 @@ require_once($CFG->libdir.'/adminlib.php');

 admin_externalpage_setup('auth_outage_manage');
 $PAGE->set_url(new moodle_url('/auth/outage/manage.php'));
+$output = $PAGE->get_renderer('auth_outage');

-echo $OUTPUT->header();
+echo $output->header();

 // Give it a consistent time so all outages are listed. Useful when debugging.
 $now = time();

-renderer::get()->output_view('manage.php', [
+$output->output_view('manage.php', [
    'unended' => outagedb::get_all_unended($now),
    'ended'   => outagedb::get_all_ended($now),
    'warning' => outagelib::generate_plugin_configuration_warning(),
 ]);

-echo $OUTPUT->footer();
+echo $output->footer();
--- a/preview.php
+++ b/preview.php
@@ -28,7 +28,9 @@
 use auth_outage\dml\outagedb;
 use auth_outage\local\controllers\maintenance_static_page;

+// @codingStandardsIgnoreStart
 require_once(__DIR__.'/../../config.php');
+// @codingStandardsIgnoreEnd
 $id = optional_param('id', null, PARAM_INT);
 $outage = is_null($id) ? outagedb::get_next_starting() : outagedb::get_by_id($id);
 if (is_null($outage)) {
--- a/renderer.php
+++ b/renderer.php
@@ -26,8 +26,6 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

-defined('MOODLE_INTERNAL') || die();
-
 /**
 * auth_outage_renderer class.
 *
--- a/settings.php
+++ b/settings.php
@@ -26,25 +26,30 @@
 * @var admin_settingpage $settings
 * @var bootstrap_renderer $OUTPUT
 * @var admin_root $ADMIN
+ * @var moodle_page $PAGE
 */
 use auth_outage\local\outagelib;

 defined('MOODLE_INTERNAL') || die;

-if ($hassiteconfig && is_enabled_auth('outage')) {
+if ($hassiteconfig) {
    $defaults = outagelib::get_config_defaults();
    $settings->visiblename = get_string('menusettings', 'auth_outage');
+    $description = outagelib::generate_plugin_configuration_warning();

    $settings->add(new admin_setting_heading(
        'defaults',
        get_string('settingssectiondefaults', 'auth_outage'),
-        get_string('settingssectiondefaultsdescription', 'auth_outage')));
+        get_string('settingssectiondefaultsdescription', 'auth_outage') . $description
+    ));
+
    $settings->add(new admin_setting_configcheckbox(
        'auth_outage/default_autostart',
        get_string('defaultoutageautostart', 'auth_outage'),
        get_string('defaultoutageautostartdescription', 'auth_outage'),
        $defaults['default_autostart']
    ));
+
    $settings->add(new admin_setting_configduration(
        'auth_outage/default_warning_duration',
        get_string('defaultwarningduration', 'auth_outage'),
@@ -59,6 +64,13 @@ if ($hassiteconfig && is_enabled_auth('outage')) {
        $defaults['default_duration'],
        60
    ));
+    $settings->add(new admin_setting_configtext(
+        'auth_outage/default_time',
+        get_string('defaulttime', 'auth_outage'),
+        get_string('defaulttimedescription', 'auth_outage'),
+        '',
+        PARAM_TEXT
+    ));
    $settings->add(new admin_setting_configtext(
        'auth_outage/default_title',
        get_string('defaulttitle', 'auth_outage'),
@@ -89,20 +101,23 @@ if ($hassiteconfig && is_enabled_auth('outage')) {

    // Create 'Allowed IPs' settings.
    $allowedips = outagelib::get_config()->allowedips;
-    $description = outagelib::generate_plugin_configuration_warning();
    if (trim($allowedips) == '') {
        $message = 'allowedipsempty';
        $type = 'notifymessage';
-    } else if (remoteip_in_list($allowedips)) {
-        $message = 'allowedipshasmyip';
-        $type = 'notifysuccess';
    } else {
-        $message = 'allowedipshasntmyip';
-        $type = 'notifyerror';
+        if (remoteip_in_list($allowedips)) {
+            $message = 'allowedipshasmyip';
+            $type = 'notifysuccess';
+        } else {
+            $message = 'allowedipshasntmyip';
+            $type = 'notifyerror';
+        }
    };
-    $description .= $OUTPUT->notification(get_string($message, 'auth_outage', ['ip' => getremoteaddr()]), $type);
+    $description = $OUTPUT->notification(get_string($message, 'auth_outage', ['ip' => getremoteaddr()]), $type);
+
+    $description .= '<p>' . get_string('ipblockersyntax', 'admin') . '</p>';
+    $description .= '<p>' . get_string('ips_combine', 'auth_outage') . '</p>';

-    $description .= '<p>'.get_string('ipblockersyntax', 'admin').'</p>';
    $iplist = new admin_setting_configiplist(
        'auth_outage/allowedips',
        get_string('allowediplist', 'admin'),
@@ -112,6 +127,14 @@ if ($hassiteconfig && is_enabled_auth('outage')) {
    $iplist->set_updatedcallback('auth_outage_outagelib_prepare_next_outage');
    $settings->add($iplist);

+    $iplist = new admin_setting_configiplist(
+        'auth_outage/allowedips_forced',
+        get_string('builtinallowediplist', 'auth_outage'),
+        get_string('builtinallowediplist_desc', 'auth_outage'),
+        ''
+    );
+    $settings->add($iplist);
+
    // Create 'Static Page - Elements to Remove' settings.
    $toremove = new admin_setting_configtextarea(
        'auth_outage/remove_selectors',
@@ -133,7 +156,7 @@ if ($hassiteconfig && is_enabled_auth('outage')) {
        new admin_externalpage(
            'auth_outage_manage',
            get_string('menumanage', 'auth_outage'),
-            new moodle_url($CFG->wwwroot.'/auth/outage/manage.php')
+            new moodle_url($CFG->wwwroot . '/auth/outage/manage.php')
        )
    );
 }
--- a/tests/behat/behat_auth_outage.php
+++ b/tests/behat/behat_auth_outage.php
@@ -39,7 +39,6 @@ require_once(__DIR__.'/../../../../lib/behat/behat_base.php');
 * @author      Daniel Thee Roperto <daniel.roperto@catalyst-au.net>
 * @copyright   2016 Catalyst IT
 * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @SuppressWarnings(public) Allow as many methods as needed.
 */
 class behat_auth_outage extends behat_base {
    /**
@@ -155,6 +154,7 @@ class behat_auth_outage extends behat_base {
    }

    /**
+     * Check if an specific action is not visible.
     * @Then /^I should see an empty settings text area "([^"]*)"$/
     * @param string $name
     */
@@ -163,6 +163,7 @@ class behat_auth_outage extends behat_base {
    }

    /**
+     * Check if an specific action is not visible.
     * @When /^I go to the "Outage Settings" page$/
     */
    public function i_go_to_the_outage_settings_page() {
@@ -321,7 +322,7 @@ class behat_auth_outage extends behat_base {
        }
        if ($seconds >= 0) {
            $seconds++; // Give one extra second for things to happen.
-            $this->getSession()->wait($seconds * 1000, false);
+            $this->getSession()->wait($seconds * 1000);
        }
    }

--- a/tests/behat/disable_in_layout.feature
+++ b/tests/behat/disable_in_layout.feature
@@ -0,0 +1,48 @@
+@auth @auth_outage @javascript @_file_upload @_switch_iframe
+Feature: Disable warning bar in embedded layout
+  In order alert users about an outage
+  As any user
+  I need to view the warning bar, but not in embedded layout
+
+  Background:
+    Given the authentication plugin "outage" is enabled
+    And the following "courses" exist:
+      | fullname | shortname |
+      | Course 1 | C1 |
+    And the following "activities" exist:
+      | activity | name       | intro      | introformat | course | content  | contentformat | idnumber |
+      | page     | PageName1  | PageDesc1  | 1           | C1     | H5Ptest  | 1             | 1        |
+    And the "displayh5p" filter is "on"
+
+  Scenario: Disable warning bar in embedded h5p in book activity
+    Given I log in as "admin"
+    And I am on "Course 1" course homepage with editing mode on
+    And I add a "File" to section "1"
+    And I set the following fields to these values:
+      | Name | ipsumFile |
+    And I upload "h5p/tests/fixtures/ipsums.h5p" file to "Select files" filemanager
+    And I press "Save and return to course"
+    And I follow "PageName1"
+    And I navigate to "Edit settings" in current page administration
+    And I click on "Insert H5P" "button" in the "#fitem_id_page" "css_element"
+    And I click on "Browse repositories..." "button" in the "Insert H5P" "dialogue"
+    And I click on "Server files" "link" in the ".fp-repo-area" "css_element"
+    And I click on "ipsumFile (File)" "link"
+    And I click on "ipsums.h5p" "link"
+    And I click on "Select this file" "button"
+    And I click on "Insert H5P" "button" in the "Insert H5P" "dialogue"
+    And I wait until the page is ready
+    And I click on "Save and display" "button"
+    When there is the following outage:
+      | warnbefore | startsin |
+      | 0          | 0        |
+    And I reload the page
+    Then I should see "Back online at" in the warning bar
+    And I should not see "Lorum ipsum"
+#   Switch to iframe created by filter
+    And I switch to "h5p-iframe" class iframe
+    And I should not see the warning bar
+#   Switch to iframe created by embed.php page
+    And I switch to "h5p-iframe" class iframe
+    And I should see "Lorum ipsum"
+    And I should not see the warning bar
--- a/tests/phpunit/base_testcase.php
+++ b/tests/phpunit/base_testcase.php
@@ -31,7 +31,8 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

-defined('MOODLE_INTERNAL') || die();
+use auth_outage\dml\outagedb;
+use auth_outage\local\outage;

 /**
 * auth_outage_base_testcase class.
@@ -40,7 +41,6 @@ defined('MOODLE_INTERNAL') || die();
 * @author     Daniel Thee Roperto <daniel.roperto@catalyst-au.net>
 * @copyright  2016 Catalyst IT
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @SuppressWarnings(public) Allow as many methods as needed.
 */
 abstract class auth_outage_base_testcase extends advanced_testcase {
    /**
@@ -64,10 +64,55 @@ abstract class auth_outage_base_testcase extends advanced_testcase {
        }
    }

-    public function setUp() {
+    /**
+     * Revoke permission to see info page.
+     */
+    protected function revoke_info_page_permissions() {
+        global $DB;
+
+        $guestrole = $DB->get_record('role', array('shortname' => 'guest'));
+        role_change_permission($guestrole->id, context_system::instance(), 'auth/outage:viewinfo', CAP_PREVENT);
+
+        $this->setGuestUser();
+    }
+
+    /**
+     * Get an outage object.
+     *
+     * @return \auth_outage\local\outage
+     */
+    protected function get_dummy_outage() {
+        $now = time();
+
+        return new outage([
+            'id' => 1,
+            'autostart' => false,
+            'warntime' => $now - 100,
+            'starttime' => $now + 100,
+            'stoptime' => $now + 200,
+            'title' => 'Title',
+            'description' => 'Description',
+        ]);
+    }
+
+    /**
+     * Setup testcase.
+     */
+    public function setUp(): void {
        global $CFG;

        parent::setUp();
        $this->resetAfterTest(true);
    }
+
+    /**
+     * Tear down to restore the original DB reference.
+     */
+    public function tearDown(): void {
+        global $DB;
+
+        foreach (outagedb::get_all() as $i => $outage) {
+            $DB->delete_records('auth_outage', ['id' => $outage->id]);
+        }
+    }
 }
--- a/tests/phpunit/calendar/calendar_test.php
+++ b/tests/phpunit/calendar/calendar_test.php
@@ -26,8 +26,6 @@
 use auth_outage\calendar\calendar;
 use auth_outage\local\outage;

-defined('MOODLE_INTERNAL') || die();
-
 /**
 * calendar_test test class.
 *
@@ -39,7 +37,7 @@ defined('MOODLE_INTERNAL') || die();
 * @copyright       Catalyst IT
 * @license         http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class calendar_test extends advanced_testcase {
+class auth_outage_calendar_test extends advanced_testcase {
    /**
     * @var outage|null The calendar entry owner.
     */
@@ -49,8 +47,8 @@ class calendar_test extends advanced_testcase {
     * Creates an outage and checks if its in the calendar.
     */
    public function test_create() {
+        $this->resetAfterTest(true);
        self::setAdminUser();
-        $this->resetAfterTest(false);

        $time = time();
        self::$outage = new outage([
@@ -70,8 +68,20 @@ class calendar_test extends advanced_testcase {
     * Updates an outage and checks the calendar.
     */
    public function test_update() {
+        $this->resetAfterTest(true);
        self::setAdminUser();
-        $this->resetAfterTest(false);
+
+        $time = time();
+        self::$outage = new outage([
+            'id' => 1,
+            'autostart' => false,
+            'warntime' => $time - 100,
+            'starttime' => $time,
+            'stoptime' => $time + (2 * 60 * 60),
+            'title' => 'Title',
+            'description' => 'Description',
+        ]);
+        calendar::create(self::$outage);

        self::$outage->title = 'New Title';
        calendar::update(self::$outage);
@@ -82,8 +92,22 @@ class calendar_test extends advanced_testcase {
     * Deletes an outage and checks the calendar.
     */
    public function test_delete() {
-        self::setAdminUser();
        $this->resetAfterTest(true);
+        self::setAdminUser();
+
+        $time = time();
+        self::$outage = new outage([
+            'id' => 1,
+            'autostart' => false,
+            'warntime' => $time - 100,
+            'starttime' => $time,
+            'stoptime' => $time + (2 * 60 * 60),
+            'title' => 'Title',
+            'description' => 'Description',
+        ]);
+        calendar::create(self::$outage);
+
+        $this->check_calendar();

        calendar::delete(self::$outage->id);
        self::assertNull(calendar::load(self::$outage->id));
@@ -93,8 +117,8 @@ class calendar_test extends advanced_testcase {
     * Try to update a non existing outage.
     */
    public function test_update_notfound() {
-        self::setAdminUser();
        $this->resetAfterTest(true);
+        self::setAdminUser();

        $time = time();
        $outage = new outage([
@@ -108,19 +132,20 @@ class calendar_test extends advanced_testcase {
        ]);

        calendar::update($outage);
-        self::assertCount(1, phpunit_util::get_debugging_messages());
-        phpunit_util::reset_debugging();
+        self::assertCount(1, $this->getDebuggingMessages());
+        $this->resetDebugging();
    }

    /**
     * Try to delete a non existing outage.
     */
    public function test_delete_notfound() {
-        self::setAdminUser();
        $this->resetAfterTest(true);
+        self::setAdminUser();
+
        calendar::delete(1);
-        self::assertCount(1, phpunit_util::get_debugging_messages());
-        phpunit_util::reset_debugging();
+        self::assertCount(1, $this->getDebuggingMessages());
+        $this->resetDebugging();
    }

    /**
--- a/tests/phpunit/dml/outagedb_test.php
+++ b/tests/phpunit/dml/outagedb_test.php
@@ -36,9 +36,8 @@ require_once(__DIR__.'/../base_testcase.php');
 * @author      Daniel Thee Roperto <daniel.roperto@catalyst-au.net>
 * @copyright   2016 Catalyst IT
 * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @SuppressWarnings(public) Allow as many methods as needed.
 */
-class outagedb_test extends auth_outage_base_testcase {
+class auth_outage_outagedb_test extends auth_outage_base_testcase {
    /**
     * Creates an array of ids in from the given outages array.
     * @param outage[] $outages An array of outages.
@@ -79,7 +78,7 @@ class outagedb_test extends auth_outage_base_testcase {
    /**
     * Ensure DB tests run as admin.
     */
-    public function setUp() {
+    public function setUp(): void {
        parent::setUp();
        $this->setAdminUser();
    }
@@ -245,6 +244,15 @@ class outagedb_test extends auth_outage_base_testcase {
        $activeid = self::saveoutage(false, $now, -2, 1, 2, 'An outage in warning period.');
        self::assertSame($activeid, outagedb::get_active($now)->id, 'Wrong active outage picked.');

+        $activeid = self::saveoutage(false, $now, -2, 0, 2, 'An outage starts now.');
+        self::assertSame($activeid, outagedb::get_active($now)->id, 'Wrong active outage picked.');
+
+        self::saveoutage(false, $now, -2, 0, -1, 'Invalid outage.');
+        self::assertSame($activeid, outagedb::get_active($now)->id, 'Wrong active outage picked.');
+
+        self::saveoutage(false, $now, -2, 0, 0, 'Invalid outage.');
+        self::assertSame($activeid, outagedb::get_active($now)->id, 'Wrong active outage picked.');
+
        self::saveoutage(false, $now, -1, 2, 3,
            'Another outage in warning period, but ignored as it starts after the previous one.');
        self::assertSame($activeid, outagedb::get_active($now)->id, 'Wrong active outage picked.');
@@ -428,8 +436,8 @@ class outagedb_test extends auth_outage_base_testcase {
    public function test_finish_now_notfound() {
        $this->resetAfterTest(true);
        outagedb::finish(1);
-        self::assertCount(1, phpunit_util::get_debugging_messages());
-        phpunit_util::reset_debugging();
+        self::assertCount(1, $this->getDebuggingMessages());
+        $this->resetDebugging();
    }

    /**
@@ -450,8 +458,8 @@ class outagedb_test extends auth_outage_base_testcase {
        self::assertTrue(!$outage->is_ongoing($time));

        outagedb::finish($id, $time);
-        self::assertCount(1, phpunit_util::get_debugging_messages());
-        phpunit_util::reset_debugging();
+        self::assertCount(1, $this->getDebuggingMessages());
+        $this->resetDebugging();
    }

    /**
--- a/tests/phpunit/event/events_test.php
+++ b/tests/phpunit/event/events_test.php
@@ -26,8 +26,6 @@
 use auth_outage\dml\outagedb;
 use auth_outage\local\outage;

-defined('MOODLE_INTERNAL') || die();
-
 /**
 * events_test tests class.
 *
@@ -39,7 +37,7 @@ defined('MOODLE_INTERNAL') || die();
 * @copyright       Catalyst IT
 * @license         http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class events_test extends advanced_testcase {
+class auth_outage_events_test extends advanced_testcase {
    /**
     * @var outage|null Outage used in the tests.
     */
@@ -57,7 +55,7 @@ class events_test extends advanced_testcase {
    public function test_save() {
        global $DB;
        self::setAdminUser();
-        $this->resetAfterTest(false);
+        $this->resetAfterTest(true);

        // Save new outage.
        $now = time();
@@ -90,7 +88,20 @@ class events_test extends advanced_testcase {
        global $DB;

        self::setAdminUser();
-        $this->resetAfterTest(false);
+        $this->resetAfterTest(true);
+
+        // Save new outage.
+        $now = time();
+        $outage = new outage([
+            'autostart' => false,
+            'warntime' => $now - 60,
+            'starttime' => 60,
+            'stoptime' => 120,
+            'title' => 'Title',
+            'description' => 'Description',
+        ]);
+        $outage->id = outagedb::save($outage);
+        self::$outage = $outage;

        self::$outage->starttime += 10;
        outagedb::save(self::$outage);
@@ -117,6 +128,19 @@ class events_test extends advanced_testcase {
        self::setAdminUser();
        $this->resetAfterTest(true);

+        // Save new outage.
+        $now = time();
+        $outage = new outage([
+            'autostart' => false,
+            'warntime' => $now - 60,
+            'starttime' => 60,
+            'stoptime' => 120,
+            'title' => 'Title',
+            'description' => 'Description',
+        ]);
+        $outage->id = outagedb::save($outage);
+        self::$outage = $outage;
+
        outagedb::delete(self::$outage->id);

        // Should not exist.
--- a/tests/phpunit/form/forms_test.php
+++ b/tests/phpunit/form/forms_test.php
@@ -39,7 +39,7 @@ require_once(__DIR__.'/../base_testcase.php');
 * @copyright   2016 Catalyst IT
 * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class forms_test extends auth_outage_base_testcase {
+class auth_outage_forms_test extends auth_outage_base_testcase {
    /**
     * Create a delete form.
     */
@@ -146,8 +146,8 @@ class forms_test extends auth_outage_base_testcase {
        $_POST['description'] = ['text' => 'The <b>description</b>.', 'format' => '2'];
        $edit = new edit();
        self::assertNull($edit->get_data());
-        self::assertCount(1, phpunit_util::get_debugging_messages());
-        phpunit_util::reset_debugging();
+        self::assertCount(1, $this->getDebuggingMessages());
+        $this->resetDebugging();
    }

    /**
@@ -198,6 +198,10 @@ class forms_test extends auth_outage_base_testcase {
        ];
    }

+    /**
+     * Skip tests for moodle below 30.
+     * @param string $reason reason to be filled
+     */
    private function skip_because_moodle_is_below_30($reason = '') {
        global $CFG;

--- a/tests/phpunit/installation_test.php
+++ b/tests/phpunit/installation_test.php
@@ -39,9 +39,8 @@ require_once(__DIR__.'/base_testcase.php');
 * @author     Daniel Thee Roperto <daniel.roperto@catalyst-au.net>
 * @copyright  2016 Catalyst IT
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @SuppressWarnings(public) Allow as many methods as needed.
 */
-class installation_test extends auth_outage_base_testcase {
+class auth_outage_installation_test extends auth_outage_base_testcase {
    /**
     * Checks if plugin cleans up data after uninstall.
     *
@@ -64,7 +63,11 @@ class installation_test extends auth_outage_base_testcase {
            'title' => 'Title',
            'description' => 'Description',
        ]);
+        ob_start();
        \auth_outage\dml\outagedb::save($outage);
+        $text = trim(ob_get_contents());
+        ob_end_clean();
+        self::assertStringContainsString('Update maintenance mode configuration', $text);
        self::assertSame(1, $DB->count_records_select('event', "eventtype = 'auth_outage'", null));

        // Uninstall plugin.
@@ -72,7 +75,7 @@ class installation_test extends auth_outage_base_testcase {
        $progress = new progress_trace_buffer(new text_progress_trace(), false);
        core_plugin_manager::instance()->uninstall_plugin('auth_outage', $progress);
        $progress->finished();
-        self::assertContains('++ Success ++', $progress->get_buffer());
+        self::assertStringContainsString('++ Success ++', $progress->get_buffer());

        // Check ...
        self::assertSame(0, $DB->count_records_select('event', "eventtype = 'auth_outage'", null),
--- a/tests/phpunit/lib_test.php
+++ b/tests/phpunit/lib_test.php
@@ -34,9 +34,11 @@ require_once(__DIR__.'/../../lib.php');
 * @author     Daniel Thee Roperto <daniel.roperto@catalyst-au.net>
 * @copyright  2017 Catalyst IT
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @SuppressWarnings(public) Allow as many methods as needed.
 */
-class lib_test extends auth_outage_base_testcase {
+class auth_outage_lib_test extends auth_outage_base_testcase {
+    /**
+     * Test this plugin gets climaintenance resource file.
+     */
    public function test_auth_outage_get_climaintenance_resource_file_resolves_a_file() {
        global $CFG;
        $dir = $CFG->dataroot.'/auth_outage/climaintenance';
@@ -88,6 +90,9 @@ class lib_test extends auth_outage_base_testcase {
        self::assertSame($realfile, $actual);
    }

+    /**
+     * Test this plugin gets climaintenance resource file and prevents path traversal attack.
+     */
    public function test_auth_outage_get_climaintenance_resource_file_prevent_path_traversal() {
        global $CFG;

--- a/tests/phpunit/local/cli/cli_test.php
+++ b/tests/phpunit/local/cli/cli_test.php
@@ -36,9 +36,8 @@ require_once(__DIR__.'/cli_testcase.php');
 * @author     Daniel Thee Roperto <daniel.roperto@catalyst-au.net>
 * @copyright  2016 Catalyst IT
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @SuppressWarnings(public) Allow as many methods as needed.
 */
-class cli_test extends auth_outage_cli_testcase {
+class auth_outage_cli_test extends auth_outage_cli_testcase {
    /**
     * Tests providing an unknown parameter.
     */
@@ -82,8 +81,8 @@ class cli_test extends auth_outage_cli_testcase {
        $this->set_parameters(['-h']);
        $cli = new create();
        $output = $this->execute($cli);
-        self::assertContains('-h', $output);
-        self::assertContains('--help', $output);
+        self::assertStringContainsString('-h', $output);
+        self::assertStringContainsString('--help', $output);
    }

    /**
--- a/tests/phpunit/local/cli/cli_testcase.php
+++ b/tests/phpunit/local/cli/cli_testcase.php
@@ -35,13 +35,12 @@ require_once(__DIR__.'/../../base_testcase.php');
 * @author     Daniel Thee Roperto <daniel.roperto@catalyst-au.net>
 * @copyright  2016 Catalyst IT
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @SuppressWarnings(public) Allow as many methods as needed.
 */
 abstract class auth_outage_cli_testcase extends auth_outage_base_testcase {
    /**
     * Always enable the auth outage plugin, resets after test and set no parameters.
     */
-    public function setUp() {
+    public function setUp(): void {
        global $CFG;

        // PHPUnit does not load config.php file.
--- a/tests/phpunit/local/cli/create_test.php
+++ b/tests/phpunit/local/cli/create_test.php
@@ -38,9 +38,8 @@ require_once(__DIR__.'/cli_testcase.php');
 * @author      Daniel Thee Roperto <daniel.roperto@catalyst-au.net>
 * @copyright   2016 Catalyst IT
 * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @SuppressWarnings(public) Allow as many methods as needed.
 */
-class create_test extends auth_outage_cli_testcase {
+class auth_outage_create_test extends auth_outage_cli_testcase {
    /**
     * Tests without any arguments.
     */
@@ -121,8 +120,8 @@ class create_test extends auth_outage_cli_testcase {
        $this->set_parameters(['--help']);
        $cli = new create();
        $output = $this->execute($cli);
-        self::assertContains('Creates', $output);
-        self::assertContains('--help', $output);
+        self::assertStringContainsString('Creates', $output);
+        self::assertStringContainsString('--help', $output);
    }

    /**
@@ -158,10 +157,10 @@ class create_test extends auth_outage_cli_testcase {
        $cli = new create();
        $cli->set_referencetime($now);
        $text = $this->execute($cli);
-        self::assertContains('created', $text);
+        self::assertStringContainsString('created', $text);
        // Check creted outage.
-        list(, $id) = explode(':', $text);
-        $id = (int)$id;
+        $clioutput = explode(':', $text);
+        $id = (int)end($clioutput);
        $outage = outagedb::get_by_id($id);
        self::assertSame($now, $outage->starttime);
        self::assertSame(10, $outage->get_warning_duration());
@@ -222,10 +221,10 @@ class create_test extends auth_outage_cli_testcase {
            'description' => 'Default Description',
        ]);
        $text = $this->execute($cli);
-        self::assertContains('created', $text);
+        self::assertStringContainsString('created', $text);
        // Check creted outage.
-        list(, $id) = explode(':', $text);
-        $id = (int)$id;
+        $clioutput = explode(':', $text);
+        $id = (int)end($clioutput);
        $outage = outagedb::get_by_id($id);
        self::assertSame($now + 50, $outage->starttime, 'Wrong starttime.');
        self::assertSame($outage->starttime - 100, $outage->warntime, 'Wrong warntime.');
@@ -300,8 +299,8 @@ class create_test extends auth_outage_cli_testcase {
        $cli = new create();
        $cli->set_referencetime($now);
        $text = $this->execute($cli);
-        self::assertContains('created', $text);
-        self::assertContains('started', $text);
+        self::assertStringContainsString('created', $text);
+        self::assertStringContainsString('started', $text);
    }

    /**
--- a/tests/phpunit/local/cli/finish_test.php
+++ b/tests/phpunit/local/cli/finish_test.php
@@ -38,9 +38,8 @@ require_once(__DIR__.'/cli_testcase.php');
 * @author      Daniel Thee Roperto <daniel.roperto@catalyst-au.net>
 * @copyright   2016 Catalyst IT
 * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @SuppressWarnings(public) Allow as many methods as needed.
 */
-class finish_test extends auth_outage_cli_testcase {
+class auth_outage_finish_test extends auth_outage_cli_testcase {
    /**
     * Tests the constructor.
     */
@@ -73,8 +72,8 @@ class finish_test extends auth_outage_cli_testcase {
        $this->set_parameters(['--help']);
        $cli = new finish();
        $text = $this->execute($cli);
-        self::assertContains('Finishes', $text);
-        self::assertContains('--help', $text);
+        self::assertStringContainsString('Finishes', $text);
+        self::assertStringContainsString('--help', $text);
    }

    /**
--- a/tests/phpunit/local/cli/waitforit_test.php
+++ b/tests/phpunit/local/cli/waitforit_test.php
@@ -38,9 +38,8 @@ require_once(__DIR__.'/cli_testcase.php');
 * @author      Daniel Thee Roperto <daniel.roperto@catalyst-au.net>
 * @copyright   2016 Catalyst IT
 * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @SuppressWarnings(public) Allow as many methods as needed.
 */
-class waitforit_test extends auth_outage_cli_testcase {
+class auth_outage_waitforit_test extends auth_outage_cli_testcase {
    /**
     * Tests the constructor.
     */
@@ -79,8 +78,8 @@ class waitforit_test extends auth_outage_cli_testcase {
        $this->set_parameters(['--help']);
        $cli = new waitforit();
        $text = $this->execute($cli);
-        self::assertContains('Waits', $text);
-        self::assertContains('--help', $text);
+        self::assertStringContainsString('Waits', $text);
+        self::assertStringContainsString('--help', $text);
    }

    /**
@@ -152,9 +151,9 @@ class waitforit_test extends auth_outage_cli_testcase {
        $cli = new waitforit();
        $cli->set_referencetime($now);
        $output = $this->execute($cli);
-        self::assertContains('Verbose mode', $output);
-        self::assertContains('starting in 1 sec', $output);
-        self::assertContains('started', $output);
+        self::assertStringContainsString('Verbose mode', $output);
+        self::assertStringContainsString('starting in 1 sec', $output);
+        self::assertStringContainsString('started', $output);
    }

    /**
@@ -179,11 +178,11 @@ class waitforit_test extends auth_outage_cli_testcase {
            return $now;
        });
        $output = $this->execute($cli);
-        self::assertContains("starting in 45", $output);
-        self::assertContains("sleep 30 second", $output);
-        self::assertContains("starting in 15", $output);
-        self::assertContains("sleep 15 second", $output);
-        self::assertContains("started!", $output);
+        self::assertStringContainsString("starting in 45", $output);
+        self::assertStringContainsString("sleep 30 second", $output);
+        self::assertStringContainsString("starting in 15", $output);
+        self::assertStringContainsString("sleep 15 second", $output);
+        self::assertStringContainsString("started!", $output);
    }

    /**
--- a/tests/phpunit/local/controllers/fixtures/withurls-quoted.css
+++ b/tests/phpunit/local/controllers/fixtures/withurls-quoted.css
@@ -3,5 +3,5 @@ a {
 }

 div {
-    background-image: url('/auth/outage/tests/phpunit/local/controllers/fixtures/catalyst.png');
+    background-image: url('/moodle/auth/outage/tests/phpunit/local/controllers/fixtures/catalyst.png');
 }
--- a/tests/phpunit/local/controllers/fixtures/withurls.css
+++ b/tests/phpunit/local/controllers/fixtures/withurls.css
@@ -3,5 +3,5 @@ a {
 }

 div {
-    background-image: url(/auth/outage/tests/phpunit/local/controllers/fixtures/catalyst.png);
+    background-image: url(/moodle/auth/outage/tests/phpunit/local/controllers/fixtures/catalyst.png);
 }
--- a/tests/phpunit/local/controllers/infopage_test.php
+++ b/tests/phpunit/local/controllers/infopage_test.php
@@ -36,13 +36,14 @@ require_once(__DIR__.'/../../base_testcase.php');
 * @author     Daniel Thee Roperto <daniel.roperto@catalyst-au.net>
 * @copyright  2016 Catalyst IT
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @SuppressWarnings(public) Allow as many methods as needed.
 */
-class infopagecontroller_test extends auth_outage_base_testcase {
+class auth_outage_infopagecontroller_test extends auth_outage_base_testcase {
    /**
     * Tests the constructor.
     */
    public function test_constructor() {
+        $this->assertTrue(has_capability('auth/outage:viewinfo', context_system::instance()));
+
        new infopage();
    }

@@ -50,6 +51,8 @@ class infopagecontroller_test extends auth_outage_base_testcase {
     * Tests the constructor with given parameters.
     */
    public function test_constructor_withparams() {
+        $this->assertTrue(has_capability('auth/outage:viewinfo', context_system::instance()));
+
        $_GET = ['id' => 1, 'static' => 'true'];
        new infopage();
    }
@@ -58,16 +61,10 @@ class infopagecontroller_test extends auth_outage_base_testcase {
     * Tests the constructor with different id and outage id.
     */
    public function test_constructor_idmismatch() {
-        $outage = new outage([
-            'id' => 1,
-            'autostart' => false,
-            'warntime' => time() - 60,
-            'starttime' => time(),
-            'stoptime' => time() + 60,
-            'title' => 'Title',
-            'description' => 'Description',
-        ]);
-        $this->set_expected_exception('coding_exception');
+        $this->assertTrue(has_capability('auth/outage:viewinfo', context_system::instance()));
+
+        $outage = $this->get_dummy_outage();
+        $this->set_expected_exception('coding_exception', 'Provided id and outage->id do not match. (2/1)');
        new infopage(['id' => 2, 'outage' => $outage]);
    }

@@ -75,35 +72,94 @@ class infopagecontroller_test extends auth_outage_base_testcase {
     * Tests the constructor with an invalid outage.
     */
    public function test_constructor_invalidoutage() {
-        $this->set_expected_exception('coding_exception');
-        new infopage(['outage' => 'My outage']);
-    }
+        $this->assertTrue(has_capability('auth/outage:viewinfo', context_system::instance()));

-    /**
-     * We should have an exception because CLI cannot redirect.
-     */
-    public function test_output_nonstatic_nooutage() {
-        $info = new infopage(['static' => false]);
-        $this->set_expected_exception('moodle_exception');
-        $info->output();
+        $this->set_expected_exception('coding_exception', 'Provided outage is not a valid outage object. (My outage)');
+        new infopage(['outage' => 'My outage']);
    }

    /**
     * Checks the output of the info page.
     */
    public function test_output() {
-        $now = time();
-        $outage = new outage([
-            'id' => 1,
-            'autostart' => false,
-            'warntime' => $now - 100,
-            'starttime' => $now + 100,
-            'stoptime' => $now + 200,
-            'title' => 'Title',
-            'description' => 'Description',
-        ]);
+        $this->assertTrue(has_capability('auth/outage:viewinfo', context_system::instance()));
+
+        $outage = $this->get_dummy_outage();
+
        $info = new infopage(['outage' => $outage]);
        $output = $info->get_output();
-        self::assertContains('auth_outage_info', $output);
+        self::assertStringContainsString('auth_outage_info', $output);
+    }
+
+    /**
+     * Checks the output of the info page.
+     */
+    public function test_output_without_permission() {
+        $this->revoke_info_page_permissions();
+        $this->assertFalse(has_capability('auth/outage:viewinfo', context_system::instance()));
+
+        $outage = $this->get_dummy_outage();
+        $info = new infopage(['outage' => $outage]);
+
+        $this->set_expected_exception('moodle_exception', 'Unsupported redirect detected, script execution terminated');
+        $output = $info->get_output();
+    }
+
+    /**
+     * Checks the output of the info page.
+     */
+    public function test_output_without_permission_but_static() {
+        $this->revoke_info_page_permissions();
+        $this->assertFalse(has_capability('auth/outage:viewinfo', context_system::instance()));
+
+        $outage = $this->get_dummy_outage();
+        $info = new infopage(['outage' => $outage, 'static' => true]);
+
+        $output = $info->get_output();
+        self::assertStringContainsString('auth_outage_info', $output);
+    }
+
+    /**
+     * Checks the output of the info page.
+     */
+    public function test_output_with_forcelogin() {
+        $this->assertTrue(has_capability('auth/outage:viewinfo', context_system::instance()));
+
+        set_config('forcelogin', true);
+
+        $outage = $this->get_dummy_outage();
+        $info = new infopage(['outage' => $outage]);
+
+        $this->set_expected_exception('moodle_exception', 'Unsupported redirect detected, script execution terminated');
+        $info->get_output();
+    }
+
+    /**
+     * Checks the output of the info page.
+     */
+    public function test_output_with_forcelogin_if_static() {
+        $this->assertTrue(has_capability('auth/outage:viewinfo', context_system::instance()));
+
+        set_config('forcelogin', true);
+
+        $outage = $this->get_dummy_outage();
+
+        $info = new infopage(['outage' => $outage, 'static' => true]);
+
+        $output = $info->get_output();
+        self::assertStringContainsString('auth_outage_info', $output);
+    }
+
+    /**
+     * Tests the constructor enables SVG support.
+     */
+    public function test_svgicons_is_true() {
+        global $CFG;
+
+        $this->assertTrue(has_capability('auth/outage:viewinfo', context_system::instance()));
+
+        $CFG->svgicons = false;
+        new infopage();
+        self::assertTrue($CFG->svgicons);
    }
 }
--- a/tests/phpunit/local/controllers/maintenance_static_page_test.php
+++ b/tests/phpunit/local/controllers/maintenance_static_page_test.php
@@ -25,6 +25,7 @@

 use auth_outage\local\controllers\maintenance_static_page;
 use auth_outage\local\controllers\maintenance_static_page_io;
+use auth_outage\local\controllers\maintenance_static_page_generator;
 use auth_outage\task\update_static_page;

 defined('MOODLE_INTERNAL') || die();
@@ -37,10 +38,11 @@ require_once(__DIR__.'/../../base_testcase.php');
 * @author     Daniel Thee Roperto <daniel.roperto@catalyst-au.net>
 * @copyright  2016 Catalyst IT
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @SuppressWarnings(public) Allow as many methods as needed.
- * @SuppressWarnings(methods) Allow as many methods as needed.
 */
-class maintenance_static_page_test extends auth_outage_base_testcase {
+class auth_outage_maintenance_static_page_test extends auth_outage_base_testcase {
+    /**
+     * Test template file.
+     */
    public function test_templatefile() {
        global $CFG;
        $page = maintenance_static_page::create_from_html('<html></html>');
@@ -50,6 +52,9 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
            $page->get_io()->get_template_file());
    }

+    /**
+     * Test resources folder.
+     */
    public function test_resourcesfolder() {
        global $CFG;
        $page = maintenance_static_page::create_from_html('<html></html>');
@@ -58,10 +63,16 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
        self::assertSame($CFG->dataroot.'/auth_outage/climaintenance/preview', $page->get_io()->get_resources_folder());
    }

+    /**
+     * Test create from outage.
+     */
    public function test_createfromoutage() {
        // How to fetch a page from PHPUnit environment?
    }

+    /**
+     * Test create from HTML.
+     */
    public function test_createfromhtml() {
        $html = "<!DOCTYPE html>\n<html><head><title>Title</title></head><body>Content</body></html>";
        $expected = "<!DOCTYPE html>\n<html><head><title>Title</title><meta http-equiv=\"refresh\" content=\"300\">".
@@ -69,6 +80,9 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
        self::assertSame($expected, $this->generated_page_html($html));
    }

+    /**
+     * Test remove script tags.
+     */
    public function test_removescripttags() {
        $html = "<!DOCTYPE html>\n".
                '<html><head><script type="text/javascript" src="http://xyz"></script><title>Title</title></head>'.
@@ -76,9 +90,12 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
        maintenance_static_page::create_from_html($html)->generate();

        $generated = $this->generated_page_html($html);
-        self::assertNotContains('<script', $generated);
+        self::assertStringNotContainsString('<script', $generated);
    }

+    /**
+     * Test remove script tags.
+     */
    public function test_updatelinkstylesheet() {
        $localcsslink = $this->get_fixture_path('simple.css');
        $externalcsslink = 'http://google.com/coolstuff.css';
@@ -87,11 +104,14 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
                '<body>Content<link rel="stylesheet" href="'.$externalcsslink.'"></body></html>';
        $generated = $this->generated_page_html($html);

-        self::assertContains('www.example.com/moodle/auth/outage/file.php?file=', $generated);
-        self::assertNotContains($localcsslink, $generated);
-        self::assertContains($externalcsslink, $generated);
+        self::assertStringContainsString('www.example.com/moodle/auth/outage/file.php?file=', $generated);
+        self::assertStringNotContainsString($localcsslink, $generated);
+        self::assertStringContainsString($externalcsslink, $generated);
    }

+    /**
+     * Test update link style sheet urls.
+     */
    public function test_updatelinkstylesheet_urls() {
        $localcsslink = $this->get_fixture_path('withurls.css');
        $html = "<!DOCTYPE html>\n".
@@ -101,12 +121,15 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
        $page->generate();

        // Check for css file.
-        self::assertFileExists($page->get_io()->get_resources_folder().'/622ef6e83acfcb274cdf37bdb3bffa0923f9a7ad.dGV4dC9wbGFpbg');
+        self::assertFileExists($page->get_io()->get_resources_folder().'/d8643101d96b093e642b15544e4d1f7815b5ba55.dGV4dC9wbGFpbg');

        // Check for catalyst.png file referenced in url(..) of css.
        self::assertFileExists($page->get_io()->get_resources_folder().'/ff7f7f87a26a908fc72930eaefb6b57306361d16.aW1hZ2UvcG5n');
    }

+    /**
+     * Test update link style sheet urls quoted.
+     */
    public function test_updatelinkstylesheet_urls_quoted() {
        $localcsslink = $this->get_fixture_path('withurls-quoted.css');
        $html = "<!DOCTYPE html>\n".
@@ -116,12 +139,15 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
        $page->generate();

        // Check for css file.
-        self::assertFileExists($page->get_io()->get_resources_folder().'/1d84b6d321fef780237f84834b7316c079221a31.dGV4dC9wbGFpbg');
+        self::assertFileExists($page->get_io()->get_resources_folder().'/9fe2374b03953e1949d54ab750be2d8706891c03.dGV4dC9wbGFpbg');

        // Check for catalyst.png file referenced in url(..) of css.
        self::assertFileExists($page->get_io()->get_resources_folder().'/ff7f7f87a26a908fc72930eaefb6b57306361d16.aW1hZ2UvcG5n');
    }

+    /**
+     * Test update link style sheet urls with sub dir.
+     */
    public function test_updatelinkstylesheet_urls_subdir() {
        $localcsslink = $this->get_fixture_path('subdir/withurls-subdir.css');
        $html = "<!DOCTYPE html>\n".
@@ -137,6 +163,9 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
        self::assertFileExists($page->get_io()->get_resources_folder().'/a02a8a442fa82d5205ffb24722d9df7f35161f56.dGV4dC9wbGFpbg');
    }

+     /**
+      * Test update images to file.php style link.
+      */
    public function test_updateimages() {
        $localimglink = $this->get_fixture_path('catalyst.png');
        $externalimglink = 'http://google.com/coolstyle.css';
@@ -145,11 +174,14 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
                '<body><img src="'.$localimglink.'">Content<img src="'.$externalimglink.'" /></body></html>';
        $generated = $this->generated_page_html($html);

-        self::assertContains('www.example.com/moodle/auth/outage/file.php?file=', $generated);
-        self::assertNotContains($localimglink, $generated);
-        self::assertContains($externalimglink, $generated);
+        self::assertStringContainsString('www.example.com/moodle/auth/outage/file.php?file=', $generated);
+        self::assertStringNotContainsString($localimglink, $generated);
+        self::assertStringContainsString($externalimglink, $generated);
    }

+     /**
+      * Test update favicon to file.php style link.
+      */
    public function test_updatelinkfavicon() {
        $link = $this->get_fixture_path('catalyst.png');
        $html = "<!DOCTYPE html>\n".
@@ -157,10 +189,67 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
                '<body>Content</body></html>';
        $generated = $this->generated_page_html($html);

-        self::assertNotContains($link, $generated);
-        self::assertContains('www.example.com/moodle/auth/outage/file.php?file=', $generated);
+        self::assertStringNotContainsString($link, $generated);
+        self::assertStringContainsString('www.example.com/moodle/auth/outage/file.php?file=', $generated);
    }

+
+    /**
+     * Data provider for test_update_inline_background_images
+     * @return array
+     */
+    public function test_update_inline_background_images_provider() {
+        return [
+            // Empty string.
+            ["", false],
+            // URLs that should be retrieved.
+            ["color: #FF00FF; background: lightblue url(/pluginfile.php/1/theme_custom/banner/251298630/0001.png) no-repeat", true],
+            ["background: lightblue url(https://www.example.com/moodle/pluginfile.php/1/theme_custom/banner/251298630/0001.png) no-repeat", true],
+            ["background:url('https://www.example.com/moodle/pluginfile.php/1/theme_custom/banner/251298630/0001.png')", true],
+            ["background-image : url( /pix/help.png);", true],
+            ["background-image: url ('/pix/help.png')", true],
+            // URLs that should not be retrieved.
+            ["background-image:url(data:image/gif;base64,R0lGODlhYADIAP=)", false],
+            ["background-image:url('data:image/gif;base64,R0lGODlhYADIAP=')", false]
+        ];
+    }
+
+    /**
+     * Tests update_inline_background_images() method to update the background images.
+     *
+     * @dataProvider test_update_inline_background_images_provider
+     * @param string $stylecontent Content of the style to test
+     * @param bool $rewrite Flag if URL should be rewritten
+     * @throws coding_exception
+     */
+    public function test_update_inline_background_images($stylecontent, $rewrite) {
+        global $CFG;
+        $this->resetAfterTest(true);
+        $generator = new maintenance_static_page_generator(new DOMDocument(), new maintenance_static_page_io());
+
+        $html = '<!DOCTYPE html>\n'.
+            '<html><head><title>Title</title></head>'.
+            '<body><div style="'.$stylecontent.'">Content</div></body></html>';
+
+        // Temporarily disable debugging to prevent errors because file does not exist
+        $debuglevel = $CFG->debug;
+        $CFG->debug = '';
+        $generated = $this->generated_page_html($html);
+        // Restore debugging level
+        $CFG->debug = $debuglevel;
+        $matches = $generator->get_url_from_inline_style($stylecontent);
+        if ($rewrite) {
+            self::assertStringNotContainsString($matches[1], $generated);
+            self::assertStringContainsString('www.example.com/moodle/auth/outage/file.php?file=', $generated);
+            self::assertIsArray($matches);
+        } else {
+            self::assertStringContainsString($stylecontent, $generated);
+        }
+    }
+
+     /**
+      * Test update preview path to file.php style link.
+      */
    public function test_previewpath() {
        $link = $this->get_fixture_path('catalyst.png');
        $html = "<!DOCTYPE html>\n".
@@ -171,8 +260,8 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
        $page->generate();
        $generated = trim(file_get_contents($page->get_io()->get_template_file()));

-        self::assertNotContains($link, $generated);
-        self::assertContains('www.example.com/moodle/auth/outage/file.php?file=preview%2F', $generated);
+        self::assertStringNotContainsString($link, $generated);
+        self::assertStringContainsString('www.example.com/moodle/auth/outage/file.php?file=preview%2F', $generated);
    }

    /**
@@ -208,9 +297,17 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
        touch($file);
        self::assertFileExists($file);
        maintenance_static_page::create_from_outage(null)->generate();
-        self::assertFileNotExists($file);
+        // Backwards compatibility with older PHPUnit - use old assertFile method.
+        if (method_exists($this, 'assertFileDoesNotExist')) {
+            self::assertFileDoesNotExist($file);
+        } else {
+            self::assertFileNotExists($file);
+        }
    }

+    /**
+     * Tests created file.
+     */
    public function test_createdfile() {
        global $CFG;

@@ -234,7 +331,7 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
    /**
     * Gets a fixture file for this test case.
     *
-     * @param $file
+     * @param string $file file name
     *
     * @return string
     */
@@ -242,30 +339,59 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
        return (string)new moodle_url('/auth/outage/tests/phpunit/local/controllers/fixtures/'.$file);
    }

+    /**
+     * Test saving empty string for template file.
+     */
    public function test_invalid_string_saving_template_empty() {
        $io = new maintenance_static_page_io();
        $this->set_expected_exception('coding_exception');
        $io->save_template_file('');
    }

+    /**
+     * Test saving non string for template file.
+     */
    public function test_invalid_string_saving_template_nostring() {
        $io = new maintenance_static_page_io();
        $this->set_expected_exception('coding_exception');
        $io->save_template_file(50);
    }

+    /**
+     * Test get url for file.
+     */
    public function test_get_url_for_file() {
        $io = new maintenance_static_page_io();
-        self::assertContains('www.example.com/moodle/auth/outage/file.php?file=img.png', $io->get_url_for_file('img.png'));
+        self::assertStringContainsString('www.example.com/moodle/auth/outage/file.php?file=img.png', $io->get_url_for_file('img.png'));
    }

-    public function test_is_url() {
-        self::assertTrue(maintenance_static_page_io::is_url('http://catalyst.net.nz'));
-        self::assertTrue(maintenance_static_page_io::is_url('https://www.catalyst-au.net/'));
-        self::assertFalse(maintenance_static_page_io::is_url('/homepage'));
-        self::assertFalse(maintenance_static_page_io::is_url('file://homepage'));
+    /**
+     * Return array of url data provider and true or false.
+     */
+    public function is_url_dataprovider() {
+        return [
+            [true, 'http://catalyst.net.nz'],
+            [true, 'https://www.catalyst-au.net/'],
+            [false, '/homepage'],
+            [false, 'file://homepage'],
+            [true, '//catalyst-au.net/img/test.jpg'],
+            [false, '://www.catalyst-au.net/img/test.jpg']
+        ];
    }

+    /**
+     * Test if it is url
+     * @dataProvider is_url_dataprovider
+     * @param string $result expected result
+     * @param string $url url to be checked
+     */
+    public function test_is_url($result, $url) {
+        self::assertEquals($result, maintenance_static_page_io::is_url($url));
+    }
+
+    /**
+     * Test file get_data.
+     */
    public function test_file_get_data() {
        $file = __DIR__.'/fixtures/catalyst.png';
        $found = maintenance_static_page_io::file_get_data($file);
@@ -273,19 +399,28 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
        self::assertSame('image/png', $found['mime']);
    }

+    /**
+     * Test invalid file get_data.
+     */
    public function test_file_get_data_invalidfile() {
        $found = maintenance_static_page_io::file_get_data(__DIR__.'/fixtures/invalidfile');
        self::assertSame('', $found['contents']);
        self::assertSame('unknown', $found['mime']);
-        self::assertCount(1, phpunit_util::get_debugging_messages());
-        phpunit_util::reset_debugging();
+        self::assertCount(1, $this->getDebuggingMessages());
+        $this->resetDebugging();
    }

+    /**
+     * Test invalid file get_data.
+     */
    public function test_file_get_data_invalidfilename() {
        $this->set_expected_exception('coding_exception');
        maintenance_static_page_io::file_get_data(200);
    }

+    /**
+     * Test remove css selector.
+     */
    public function test_remove_css_selector() {
        $this->resetAfterTest(true);
        $html = "<!DOCTYPE html>\n".
@@ -294,10 +429,13 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
        set_config('remove_selectors', '.removeme', 'auth_outage');
        $generated = $this->generated_page_html($html);

-        self::assertNotContains('removeme', $generated);
-        self::assertNotContains('Goodbye cruel world', $generated);
+        self::assertStringNotContainsString('removeme', $generated);
+        self::assertStringNotContainsString('Goodbye cruel world', $generated);
    }

+    /**
+     * Test remove css selector id.
+     */
    public function test_remove_css_selector_id() {
        $this->resetAfterTest(true);
        $html = "<!DOCTYPE html>\n".
@@ -306,10 +444,13 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
        set_config('remove_selectors', '#removeme', 'auth_outage');
        $generated = $this->generated_page_html($html);

-        self::assertNotContains('removeme', $generated);
-        self::assertNotContains('Goodbye cruel world', $generated);
+        self::assertStringNotContainsString('removeme', $generated);
+        self::assertStringNotContainsString('Goodbye cruel world', $generated);
    }

+    /**
+     * Test remove css selector with multi lines.
+     */
    public function test_remove_css_selector_with_multiline() {
        $this->resetAfterTest(true);
        $html = "<!DOCTYPE html>\n".
@@ -321,11 +462,14 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
        set_config('remove_selectors', ".removeme\n.deleteme", 'auth_outage');
        $generated = $this->generated_page_html($html);

-        self::assertNotContains('removeme', $generated);
-        self::assertNotContains('deleteme', $generated);
-        self::assertNotContains('Goodbye cruel world', $generated);
+        self::assertStringNotContainsString('removeme', $generated);
+        self::assertStringNotContainsString('deleteme', $generated);
+        self::assertStringNotContainsString('Goodbye cruel world', $generated);
    }

+    /**
+     * Test remove css selector needs trim.
+     */
    public function test_remove_css_selector_needing_trim() {
        $this->resetAfterTest(true);
        $html = "<!DOCTYPE html>\n".
@@ -337,11 +481,14 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
        set_config('remove_selectors', " .removeme     \n    .deleteme   ", 'auth_outage');
        $generated = $this->generated_page_html($html);

-        self::assertNotContains('removeme', $generated);
-        self::assertNotContains('deleteme', $generated);
-        self::assertNotContains('Goodbye cruel world', $generated);
+        self::assertStringNotContainsString('removeme', $generated);
+        self::assertStringNotContainsString('deleteme', $generated);
+        self::assertStringNotContainsString('Goodbye cruel world', $generated);
    }

+    /**
+     * Test remove css selector with empty line.
+     */
    public function test_remove_css_selector_with_empty_line() {
        $this->resetAfterTest(true);
        $html = "<!DOCTYPE html>\n".
@@ -353,11 +500,14 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
        set_config('remove_selectors', "\n\n.removeme\n\n\n\n.deleteme\n\n", 'auth_outage');
        $generated = $this->generated_page_html($html);

-        self::assertNotContains('removeme', $generated);
-        self::assertNotContains('deleteme', $generated);
-        self::assertNotContains('Goodbye cruel world', $generated);
+        self::assertStringNotContainsString('removeme', $generated);
+        self::assertStringNotContainsString('deleteme', $generated);
+        self::assertStringNotContainsString('Goodbye cruel world', $generated);
    }

+    /**
+     * Test remove css selector with invalid id.
+     */
    public function test_remove_css_selector_with_invalid_id() {
        $this->resetAfterTest(true);
        $html = "<!DOCTYPE html>\n".
@@ -366,10 +516,13 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
        set_config('remove_selectors', '#invalidid', 'auth_outage');
        $generated = $this->generated_page_html($html);

-        self::assertContains('removeme', $generated);
-        self::assertContains('Goodbye cruel world', $generated);
+        self::assertStringContainsString('removeme', $generated);
+        self::assertStringContainsString('Goodbye cruel world', $generated);
    }

+    /**
+     * Test meta refresh 5 minutes.
+     */
    public function test_meta_refresh_5minutes() {
        $this->resetAfterTest(true);
        $html = "<!DOCTYPE html>\n".
@@ -378,9 +531,12 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
        set_config('remove_selectors', '#invalidid', 'auth_outage');
        $generated = $this->generated_page_html($html);

-        self::assertContains('<meta http-equiv="refresh" content="300">', $generated);
+        self::assertStringContainsString('<meta http-equiv="refresh" content="300">', $generated);
    }

+    /**
+     * Test meta refresh maximum 5 minutes.
+     */
    public function test_meta_refresh_maximum_5seconds() {
        $this->resetAfterTest(true);
        $html = "<!DOCTYPE html>\n".
@@ -393,6 +549,47 @@ class maintenance_static_page_test extends auth_outage_base_testcase {
        $generated = trim(file_get_contents($page->get_io()->get_template_file()));
        return $generated;

-        self::assertContains('<meta http-equiv="refresh" content="5">', $generated);
+        self::assertStringContainsString('<meta http-equiv="refresh" content="5">', $generated);
+    }
+
+    /**
+     * Data provider for test_get_urls_from_stylesheet
+     * @return array
+     */
+    public function test_get_urls_from_stylesheet_provider() {
+        return [
+            // Empty string.
+            ["", 0],
+            // URLs that should be retrieved.
+            ["background:url(/theme/image.php/_s/boost/core/1581292565/t/expanded)", 1],
+            ["background:url('/theme/image.php/_s/boost/core/1581292565/t/expanded')", 1],
+            ["src:url(\"/theme/font.php/boost/core/1581292565/fontawesome-webfont.eot?#iefix&v=4.7.0\")", 1],
+            ["background-image:url(pix/vline-rtl.gif)", 1],
+            // URLs that should not be retrieved.
+            ["background-image:url(data:image/gif;base64,R0lGODlhYADIAP=)", 0],
+            ["background-image:url('data:image/gif;base64,R0lGODlhYADIAP=')", 0],
+            ["background-image:url(\"data:image/svg+xml;charset=utf8,%3Csvg xmlns=\'http://www.w3.org/2000/svg\'\")", 0],
+            // Combination of URLs used above.
+            ["background-image:url(pix/vline-rtl.gif) background:url(/theme/image.php/_s/boost/core/158/t/expanded)", 2],
+            ["background-image:url(data:image/gif;base64,R0lG=)src:url(\"/theme/font.php/fontawesome-webfont.eot\")", 1],
+        ];
+    }
+
+    /**
+     * Tests get_urls_from_stylesheet() method to get all appropriate URLS from the file.
+     *
+     * @dataProvider test_get_urls_from_stylesheet_provider
+     * @param string $filecontent Content of the file
+     * @param int $count Expected quantity of found URLs
+     * @throws coding_exception
+     */
+    public function test_get_urls_from_stylesheet($filecontent, $count) {
+        $this->resetAfterTest(true);
+        $generator = new maintenance_static_page_generator(new DOMDocument(), new maintenance_static_page_io());
+        $matches = $generator->get_urls_from_stylesheet($filecontent);
+
+        self::assertIsArray($matches);
+        self::assertCount(2, $matches);
+        self::assertCount($count, $matches[1]);
    }
 }
--- a/tests/phpunit/local/outage_test.php
+++ b/tests/phpunit/local/outage_test.php
@@ -35,9 +35,8 @@ require_once(__DIR__.'/../base_testcase.php');
 * @author     Daniel Thee Roperto <daniel.roperto@catalyst-au.net>
 * @copyright  2016 Catalyst IT
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @SuppressWarnings(public) Allow as many methods as needed.
 */
-class outage_test extends auth_outage_base_testcase {
+class auth_outage_outage_test extends auth_outage_base_testcase {
    /**
     * Tests the constructor.
     */
@@ -281,11 +280,11 @@ class outage_test extends auth_outage_base_testcase {
            'description' => 'Description {{start}} {{stop}} {{duration}}',
        ]);
        $title = $outage->get_title();
-        self::assertNotContains('{', $title);
-        self::assertNotContains('}', $title);
+        self::assertStringNotContainsString('{', $title);
+        self::assertStringNotContainsString('}', $title);
        $description = $outage->get_description();
-        self::assertNotContains('{', $description);
-        self::assertNotContains('}', $description);
+        self::assertStringNotContainsString('{', $description);
+        self::assertStringNotContainsString('}', $description);
    }

    /**
--- a/tests/phpunit/local/outagelib_test.php
+++ b/tests/phpunit/local/outagelib_test.php
@@ -31,6 +31,7 @@ defined('MOODLE_INTERNAL') || die();

 global $CFG;
 require_once($CFG->libdir.'/adminlib.php');
+require_once(__DIR__.'/../base_testcase.php');

 /**
 * outagelib_test test class.
@@ -39,9 +40,8 @@ require_once($CFG->libdir.'/adminlib.php');
 * @author      Daniel Thee Roperto <daniel.roperto@catalyst-au.net>
 * @copyright   2016 Catalyst IT
 * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @SuppressWarnings(public) Allow as many methods as needed.
 */
-class outagelib_test extends advanced_testcase {
+class auth_outage_outagelib_test extends auth_outage_base_testcase {
    /**
     * Check if maintenance message is disabled as needed.
     */
@@ -60,10 +60,14 @@ class outagelib_test extends advanced_testcase {
        ]);

        set_config('maintenance_message', 'A message.');
+        ob_start();
        outagedb::save($outage);
+        $text = trim(ob_get_contents());
+        ob_end_clean();
+        self::assertStringContainsString('Update maintenance mode configuration', $text);
        self::assertFalse((bool)get_config('moodle', 'maintenance_message'));
-        self::assertCount(2, phpunit_util::get_debugging_messages());
-        phpunit_util::reset_debugging();
+        self::assertCount(2, $this->getDebuggingMessages());
+        $this->resetDebugging();
    }

    /**
@@ -81,7 +85,7 @@ class outagelib_test extends advanced_testcase {
     * Check outagelib::inject() works as expected.
     */
    public function test_inject() {
-        global $CFG;
+        global $OUTPUT;

        $this->resetAfterTest(true);
        self::setAdminUser();
@@ -94,17 +98,23 @@ class outagelib_test extends advanced_testcase {
            'title' => 'Title',
            'description' => 'Description',
        ]);
+        ob_start();
        $outage->id = outagedb::save($outage);
-        self::assertEmpty($CFG->additionalhtmltopofbody);
+        $text = trim(ob_get_contents());
+        ob_end_clean();
+        self::assertStringContainsString('Update maintenance mode configuration', $text);

-        outagelib::reinject();
-        self::assertContains('<style>', $CFG->additionalhtmltopofbody);
-        self::assertContains('<script>', $CFG->additionalhtmltopofbody);
+        outagelib::reset_injectcalled();
+        // Get full header to avoid interactions with other single inject plugins.
+        $header1 = $OUTPUT->standard_top_of_body_html();
+        self::assertStringContainsString('<style>', $header1);
+        self::assertStringContainsString('<script>', $header1);

-        // Should not inject more than once with the inject() function.
-        $size = strlen($CFG->additionalhtmltopofbody);
-        outagelib::inject();
-        self::assertSame($size, strlen($CFG->additionalhtmltopofbody));
+        // Should not inject more than once.
+        $size = strlen($OUTPUT->standard_top_of_body_html());
+        self::assertSame($size, strlen($OUTPUT->standard_top_of_body_html()));
+        // Check styles aren't reinjected.
+        self::assertStringNotContainsString('<style>', $OUTPUT->standard_top_of_body_html());
    }

    /**
@@ -112,9 +122,10 @@ class outagelib_test extends advanced_testcase {
     */
    public function test_inject_broken() {
        $_GET = ['auth_outage_break_code' => '1'];
-        outagelib::reinject();
-        self::assertCount(2, phpunit_util::get_debugging_messages());
-        phpunit_util::reset_debugging();
+        outagelib::reset_injectcalled();
+        $header = outagelib::get_inject_code();
+        self::assertCount(2, $this->getDebuggingMessages());
+        $this->resetDebugging();
    }

    /**
@@ -133,13 +144,18 @@ class outagelib_test extends advanced_testcase {
            'title' => 'Title',
            'description' => 'Description',
        ]);
+        ob_start();
        $outage->id = outagedb::save($outage);
-        self::assertEmpty($CFG->additionalhtmltopofbody);
+        $text = trim(ob_get_contents());
+        ob_end_clean();
+        self::assertStringContainsString('Update maintenance mode configuration', $text);
+
        $_GET = ['auth_outage_preview' => (string)$outage->id];

-        outagelib::reinject();
-        self::assertContains('<style>', $CFG->additionalhtmltopofbody);
-        self::assertContains('<script>', $CFG->additionalhtmltopofbody);
+        outagelib::reset_injectcalled();
+        $header = outagelib::get_inject_code();
+        self::assertStringContainsString('<style>', $header);
+        self::assertStringContainsString('<script>', $header);
    }

    /**
@@ -147,11 +163,12 @@ class outagelib_test extends advanced_testcase {
     */
    public function test_inject_preview_notfound() {
        global $CFG;
-        self::assertEmpty($CFG->additionalhtmltopofbody);
+
        $_GET = ['auth_outage_preview' => '1'];
        // Should not throw exception or halt anything, silently ignore it.
-        outagelib::reinject();
-        self::assertEmpty($CFG->additionalhtmltopofbody);
+        outagelib::reset_injectcalled();
+        $header = outagelib::get_inject_code();
+        self::assertEmpty($header);
    }

    /**
@@ -170,19 +187,24 @@ class outagelib_test extends advanced_testcase {
            'title' => 'Title',
            'description' => 'Description',
        ]);
+        ob_start();
        $outage->id = outagedb::save($outage);
-        self::assertEmpty($CFG->additionalhtmltopofbody);
+        $text = trim(ob_get_contents());
+        ob_end_clean();
+        self::assertStringContainsString('Update maintenance mode configuration', $text);
        $_GET = ['auth_outage_preview' => (string)$outage->id, 'auth_outage_delta' => '500'];
-        outagelib::reinject();
+        outagelib::reset_injectcalled();
+        $header = outagelib::get_inject_code();
        // Still empty, delta is too high (outage ended).
-        self::assertEmpty($CFG->additionalhtmltopofbody);
+        self::assertEmpty($header);
    }

    /**
     * Test injection without active outage.
     */
    public function test_inject_noactive() {
-        outagelib::reinject();
+        outagelib::reset_injectcalled();
+        outagelib::get_inject_code();
    }

    /**
@@ -209,6 +231,10 @@ class outagelib_test extends advanced_testcase {
        foreach ($keys as $k) {
            self::assertSame($config->$k, $k.'_value', 'auth_outage');
        }
+
+        set_config('allowedips_forced', 'allowedips_forced_value', 'auth_outage');
+        $config = outagelib::get_config();
+        self::assertSame($config->allowedips, "allowedips_value\nallowedips_forced_value", 'auth_outage');
    }

    /**
@@ -271,25 +297,35 @@ class outagelib_test extends advanced_testcase {
            'title' => 'Title',
            'description' => 'Description',
        ]);
+        ob_start();
        $outage->id = outagedb::save($outage);
-        self::assertEmpty($CFG->additionalhtmltopofbody);
+        $text = trim(ob_get_contents());
+        ob_end_clean();
+        self::assertStringContainsString('Update maintenance mode configuration', $text);

        // Pretend we are there...
        $_SERVER['SCRIPT_FILENAME'] = '/var/www/alternativepath/admin/settings.php'; // Issue #88 regression test.
        $_SERVER['SCRIPT_NAME'] = '/admin/settings.php';
        $_GET['section'] = 'additionalhtml';
-        outagelib::reinject();
+        outagelib::reset_injectcalled();
+        $header = outagelib::get_inject_code();

-        self::assertEmpty($CFG->additionalhtmltopofbody);
+        self::assertEmpty($header);
    }

+    /**
+     * Test create maintenance php code
+     */
    public function test_createmaintenancephpcode() {
        $expected = <<<'EOT'
 <?php
 if ((time() >= 123) && (time() < 456)) {
    define('MOODLE_INTERNAL', true);
    require_once($CFG->dirroot.'/lib/moodlelib.php');
-    if (!remoteip_in_list('heyyou
+    if (file_exists($CFG->dirroot.'/lib/classes/ip_utils.php')) {
+        require_once($CFG->dirroot.'/lib/classes/ip_utils.php');
+    }
+    if (!remoteip_in_list('hey\'\"you
 a.b.c.d
 e.e.e.e/20')) {
        header($_SERVER['SERVER_PROTOCOL'] . ' 503 Moodle under maintenance');
@@ -303,6 +339,7 @@ e.e.e.e/20')) {
        header('Expires: Mon, 20 Aug 1969 09:23:00 GMT');
        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
        header('Accept-Ranges: none');
+        header('X-Moodle-Maintenance: manager');
        if ((defined('AJAX_SCRIPT') && AJAX_SCRIPT) || (defined('WS_SERVER') && WS_SERVER)) {
            exit(0);
        }
@@ -320,7 +357,13 @@ EOT;
        self::assertSame($expected, $found);
    }

-    public function test_createmaintenancephpcode_withoutage() {
+    /**
+     * Test create maintenance php code without age
+     *
+     * @param string $configkey The key of the config.
+     * @dataProvider test_createmaintenancephpcode_withoutage_provider
+     */
+    public function test_createmaintenancephpcode_withoutage($configkey) {
        global $CFG;
        $this->resetAfterTest(true);

@@ -329,6 +372,9 @@ EOT;
 if ((time() >= 123) && (time() < 456)) {
    define('MOODLE_INTERNAL', true);
    require_once($CFG->dirroot.'/lib/moodlelib.php');
+    if (file_exists($CFG->dirroot.'/lib/classes/ip_utils.php')) {
+        require_once($CFG->dirroot.'/lib/classes/ip_utils.php');
+    }
    if (!remoteip_in_list('127.0.0.1')) {
        header($_SERVER['SERVER_PROTOCOL'] . ' 503 Moodle under maintenance');
        header('Status: 503 Moodle under maintenance');
@@ -341,6 +387,7 @@ if ((time() >= 123) && (time() < 456)) {
        header('Expires: Mon, 20 Aug 1969 09:23:00 GMT');
        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
        header('Accept-Ranges: none');
+        header('X-Moodle-Maintenance: manager');
        if ((defined('AJAX_SCRIPT') && AJAX_SCRIPT) || (defined('WS_SERVER') && WS_SERVER)) {
            exit(0);
        }
@@ -359,7 +406,7 @@ EOT;
            'stoptime' => 456,
        ]);
        $file = $CFG->dataroot.'/climaintenance.php';
-        set_config('allowedips', '127.0.0.1', 'auth_outage');
+        set_config($configkey, '127.0.0.1', 'auth_outage');

        outagelib::update_climaintenance_code($outage);
        self::assertFileExists($file);
@@ -367,6 +414,13 @@ EOT;
        self::assertSame($found, $expected);
    }

+    public function test_createmaintenancephpcode_withoutage_provider(): array {
+        return [['allowedips'], ['allowedips_forced']];
+    }
+
+    /**
+     * Test create maintenance php code without IPs
+     */
    public function test_createmaintenancephpcode_withoutips() {
        global $CFG;
        $this->resetAfterTest(true);
@@ -377,19 +431,33 @@ EOT;
        ]);
        $file = $CFG->dataroot.'/climaintenance.php';
        set_config('allowedips', '', 'auth_outage');
+        set_config('allowedips_forced', '', 'auth_outage');

        touch($file);
        outagelib::update_climaintenance_code($outage);
-        self::assertFileNotExists($file);
+        // Backwards compatibility with older PHPUnit - use old assertFile method.
+        if (method_exists($this, 'assertFileDoesNotExist')) {
+            self::assertFileDoesNotExist($file);
+        } else {
+            self::assertFileNotExists($file);
+        }
    }

+    /**
+     * Test create maintenance php code without outage
+     */
    public function test_createmaintenancephpcode_withoutoutage() {
        global $CFG;
        $file = $CFG->dataroot.'/climaintenance.php';

        touch($file);
        outagelib::update_climaintenance_code(null);
-        self::assertFileNotExists($file);
+        // Backwards compatibility with older PHPUnit - use old assertFile method.
+        if (method_exists($this, 'assertFileDoesNotExist')) {
+            self::assertFileDoesNotExist($file);
+        } else {
+            self::assertFileNotExists($file);
+        }
    }

    /**
@@ -416,9 +484,7 @@ EOT;
        $this->create_outage();

        // Change settings.
-        admin_write_settings((object)[
-            's_auth_outage_allowedips' => '127',
-        ]);
+        set_config('s_auth_outage_allowedips', '127', 'auth_outage');

        // The method outagelib::prepare_next_outage() should have been called from admin_write_settings().
        foreach ([$CFG->dataroot.'/climaintenance.template.html', $CFG->dataroot.'/climaintenance.php'] as $file) {
@@ -436,9 +502,7 @@ EOT;
        $this->create_outage();

        // Change settings.
-        admin_write_settings((object)[
-            's_auth_outage_remove_selectors' => '.something',
-        ]);
+        set_config('s_auth_outage_remove_selectors', '.something', 'auth_outage');

        // The method outagelib::prepare_next_outage() should have been called from admin_write_settings().
        foreach ([$CFG->dataroot.'/climaintenance.template.html', $CFG->dataroot.'/climaintenance.php'] as $file) {
@@ -469,7 +533,12 @@ EOT;
        // The method outagelib::prepare_next_outage() should have been called by save().
        self::assertFalse(get_config('moodle', 'maintenance_later'));
        // This file should not exist even if the statement above fails as Moodle does not create it immediately but test anyway.
-        self::assertFileNotExists($CFG->dataroot.'/climaintenance.html');
+        // Backwards compatibility with older PHPUnit - use old assertFile method.
+        if (method_exists($this, 'assertFileDoesNotExist')) {
+            self::assertFileDoesNotExist($CFG->dataroot.'/climaintenance.html');
+        } else {
+            self::assertFileNotExists($CFG->dataroot.'/climaintenance.html');
+        }
    }

    /**
@@ -489,18 +558,24 @@ EOT;
            'title' => 'Title',
            'description' => 'Description',
        ]);
+        ob_start();
        $outage->id = outagedb::save($outage);
-        self::assertEmpty($CFG->additionalhtmltopofbody);
-
+        $text = trim(ob_get_contents());
+        ob_end_clean();
+        self::assertStringContainsString('Update maintenance mode configuration', $text);
        // Pretend we are there...
        $_SERVER['SCRIPT_FILENAME'] = '/var/www/alternativepath/admin/settings.php'; // Issue #88 regression test.
        $_SERVER['SCRIPT_NAME'] = '/admin/settings.php';
        $_GET['section'] = 'notadditionalhtml';
-        outagelib::reinject();
+        outagelib::reset_injectcalled();

-        self::assertNotEmpty($CFG->additionalhtmltopofbody);
+        $header = outagelib::get_inject_code();
+        self::assertNotEmpty($header);
    }

+    /**
+     * Creates outage for tests.
+     */
    private function create_outage() {
        $this->resetAfterTest(true);
        self::setAdminUser();
--- a/version.php
+++ b/version.php
@@ -28,7 +28,8 @@
 defined('MOODLE_INTERNAL') || die();

 $plugin->component = "auth_outage";
-$plugin->version = 2019022200;                  // The current plugin version (Date: YYYYMMDDXX).
-$plugin->release = '1.0.10';                     // Human-readable release information.
-$plugin->requires = 2017051500; // Requires 3.3 and higher.
+$plugin->version = 2023012700;                  // The current plugin version (Date: YYYYMMDDXX).
+$plugin->release = 2023012700;                  // Human-readable release information.
+$plugin->requires = 2017111309;                 // 2017111309 = T13, but this really requires 3.9 and higher.
 $plugin->maturity = MATURITY_STABLE;            // Suitable for PRODUCTION environments!
+$plugin->supported = [39, 401];                 // A range of branch numbers of supported moodle versions.
--- a/views/manage.php
+++ b/views/manage.php
@@ -26,16 +26,20 @@
 use auth_outage\output\manage\history_table;
 use auth_outage\output\manage\planned_table;
 use auth_outage\output\renderer;
+use auth_outage\dml\outagedb;
+use auth_outage\local\outagelib;

 defined('MOODLE_INTERNAL') || die();

+global $PAGE;
+$output = $PAGE->get_renderer('auth_outage');
 $urlnew = new moodle_url('/auth/outage/edit.php');

 echo $viewbag['warning'];
 ?>

 <section id="section_planned_outages">
-    <?php echo renderer::get()->rendersubtitle('outageslistfuture'); ?>
+    <?php echo $output->rendersubtitle('outageslistfuture'); ?>
    <?php if (empty($viewbag['unended'])): ?>
        <p>
            <small><?php echo get_string('notfound', 'auth_outage'); ?></small>
@@ -47,13 +51,27 @@ echo $viewbag['warning'];
        $table->finish_output();
        ?>
    <?php endif; ?>
-    <input type="button" class="form-submit"
-           value="<?php echo get_string('outagecreate', 'auth_outage'); ?>"
-           onclick="location.href='<?php echo $urlnew; ?>';"/>
+    <?php
+    $outage = outagedb::get_ongoing();
+    if (is_null($outage)) :
+        $config = outagelib::get_config();
+        $default = $config->default_time;
+        $max = $default ? 3 : 1;
+        $next = time();
+        for ($c = 0; $c < $max; $c++) {
+            echo '<p>';
+            $next = outagelib::get_next_window($next);
+            $urlnew->param('starttime', $next);
+            echo $output->single_button($urlnew, get_string('outagecreate', 'auth_outage'));
+            if ($default) {
+                echo ' ' . userdate( $next, get_string('datetimeformat', 'auth_outage'));
+            }
+        }
+    endif; ?>
 </section>

 <section id="section_outage_history">
-    <?php echo renderer::get()->rendersubtitle('outageslistpast'); ?>
+    <?php echo $output->rendersubtitle('outageslistpast'); ?>
    <?php if (empty($viewbag['ended'])): ?>
        <p>
            <small><?php echo get_string('notfound', 'auth_outage'); ?></small>
--- a/views/warningbar/warningbar.css
+++ b/views/warningbar/warningbar.css
@@ -12,12 +12,21 @@ If you need to make changes here, remember to update your settings inside Moodle
    padding: 0;
    position: fixed;
    text-align: center;
+    display: flex;
+    justify-content: center;
+    align-items: center;
    top: 0;
    transition: background 3s ease-out;
    width: 100%;
    z-index: 9999;
 }

+#auth_outage_warningbar_box .auth_outage_warningbar_center {
+    /* fix to prevent existing theme hacks to fix issue */
+    margin-top: 0;
+    position: static;
+}
+
 #auth_outage_warningbar_box.auth_outage_warning_period {
    background:
        repeating-linear-gradient(
@@ -66,16 +75,10 @@ If you need to make changes here, remember to update your settings inside Moodle
    background-color: #090;
 }

-.auth_outage_warningbar_center {
-    margin-top: -35px;
-    position: relative;
-    top: 50%;
-}
-
 #auth_outage_warningbar_message {
    font-size: 200%;
    font-weight: bold;
-    margin: 10px 0;
+    margin: 0;
 }

 a.auth_outage_warningbar_box_title {
@@ -87,6 +90,7 @@ a.auth_outage_warningbar_box_finish {
    border: 1px solid black;
    border-radius: 5px;
    color: darkgray;
+    white-space: nowrap;
    font-weight: bold;
    margin-left: 10px;
    padding-left: 5px;
@@ -99,14 +103,36 @@ a.auth_outage_warningbar_box_finish:hover {
    background-color: black;
 }

-.auth_outage_warningbar_spacer {
-    height: 80px;
-}
-
 body.auth_outage #nav-drawer {
    top: 150px;
 }

 body.auth_outage nav.fixed-top.navbar {
    top: 100px;
-}
+}
+
+body.auth_outage #page {
+    margin-top: 150px;
+}
+
+body.auth_outage.path-mod-assign [data-region="grading-navigation-panel"] {
+    top: 100px;
+}
+
+body.auth_outage.path-mod-assign [data-region="grade-panel"] {
+    top: 185px;
+}
+
+body.auth_outage .layout.fullscreen {
+    top: 150px;
+}
+
+body.auth_outage .modal-dialog {
+    margin: calc(150px + 1.75rem) auto;
+}
+
+@media (max-width: 767px) {
+    #auth_outage_warningbar_message {
+        font-size: 120%;
+    }
+}
--- a/views/warningbar/warningbar.js
+++ b/views/warningbar/warningbar.js
@@ -56,6 +56,8 @@ var authOutageWarningBar = {
    },

    tickOngoing: function() {
+        const MINSECS = 60;
+
        if (this.finished) {
            return;
        }
@@ -78,13 +80,8 @@ var authOutageWarningBar = {
        xmlhttp.open("GET", this.checkfinishedurl, true);
        xmlhttp.send();

-        var estimatedServerTime = this.servertime + (Date.now() - this.clienttime);
-        var sleepSeconds = this.stops - estimatedServerTime; // How long to sleep until it stops.
-        if (sleepSeconds <= 0) {
-            sleepSeconds = 5; // It should be back, keep checking every 5 seconds.
-        } else {
-            sleepSeconds = Math.min(sleepSeconds, (5 * 60)); // Check at least every 5 minutes.
-        }
+        // Checking if the site is back online every 4-6 minutes.
+        var sleepSeconds = 4 * MINSECS + (2 * MINSECS * Math.random());

        setTimeout(function() {
            $this.tickOngoing();
--- a/views/warningbar/warningbar.php
+++ b/views/warningbar/warningbar.php
@@ -74,8 +74,6 @@ if (!$viewbag['static']) {
        </div>
    </div>

-    <div class="auth_outage_warningbar_spacer">&nbsp;</div>
-
 <?php if (!$viewbag['static']): ?>
    <script>
        document.body.className += ' auth_outage';