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

Issue #59 - Fixed problem related to config existing in DB but empty.

Browse Source
This commit is contained in:
Daniel Thee Roperto
2016-09-29 12:15:59 +10:00
parent ad92ce8e8c
commit 2883a678a4
4 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/form/baseform.php
View File

@@ -23,7 +23,7 @@ defined('MOODLE_INTERNAL') || die();
require_once($CFG->libdir.'/formslib.php');
/**
* Outage base for forms, extends Moodle form to fix a but in the validation method.
* Outage base for forms, extends Moodle form to fix an issue in the validation method.
*
* @package auth_outage
* @author Daniel Thee Roperto <daniel.roperto@catalyst-au.net>

20
classes/local/outagelib.php
View File

@@ -19,6 +19,7 @@ namespace auth_outage\local;
use auth_outage\dml\outagedb;
use auth_outage\local\controllers\infopage;
use auth_outage\output\renderer;
use coding_exception;
use Exception;
use stdClass;
@@ -96,9 +97,20 @@ class outagelib {
* Creates a configuration object ensuring all parameters are set,
* loading defaults even if the plugin is not configured.
* @return stdClass Configuration object with all parameters set.
* @throws coding_exception
*/
public static function get_config() {
return (object)array_merge(self::get_config_defaults(), (array)get_config('auth_outage'));
$config = (array)get_config('auth_outage');
foreach ($config as $k => $v) {
if (!is_string($v)) {
throw new coding_exception('Config is expected to give string.');
}
if (trim($v) == '') {
unset($config[$k]);
}
}
return (object)array_merge(self::get_config_defaults(), $config);
}
/**
@@ -109,9 +121,9 @@ class outagelib {
global $CFG;
return [
'default_autostart' => false,
'default_duration' => (60 * 60),
'default_warning_duration' => (60 * 60),
'default_autostart' => '0',
'default_duration' => (string)(60 * 60),
'default_warning_duration' => (string)(60 * 60),
'default_title' => get_string('defaulttitlevalue', 'auth_outage'),
'default_description' => get_string('defaultdescriptionvalue', 'auth_outage'),
'css' => file_get_contents($CFG->dirroot.'/auth/outage/views/warningbar/warningbar.css'),

0
docs/screencast.md
View File

39
tests/phpunit/local/outagelib_test.php
View File

@@ -147,5 +147,44 @@ class outagelib_test extends advanced_testcase {
public function test_inject_noactive() {
outagelib::reinject();
}
public function test_get_config() {
$this->resetAfterTest(true);
$keys = [
'css',
'default_autostart',
'default_description',
'default_duration',
'default_title',
'default_warning_duration',
];
// Set config with invalid values.
foreach ($keys as $k) {
set_config($k, $k.'_value', 'auth_outage');
}
// Ensure it is not using any defaults.
$config = outagelib::get_config();
foreach ($keys as $k) {
self::assertSame($config->$k, $k.'_value', 'auth_outage');
}
}
public function test_get_config_invalid() {
$this->resetAfterTest(true);
// Set config with invalid values.
set_config('css', " \n", 'auth_outage');
set_config('default_autostart', " \n", 'auth_outage');
set_config('default_description', " \n", 'auth_outage');
set_config('default_duration', " \n", 'auth_outage');
set_config('default_title', " \n", 'auth_outage');
set_config('default_warning_duration', " \n", 'auth_outage');
// Get defaults.
$defaults = outagelib::get_config_defaults();
$config = outagelib::get_config();
// Ensure it is using all defailts.
foreach ($defaults as $k => $v) {
self::assertSame($v, $config->$k);
}
}
}