mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-53661_master' of https://github.com/sam-moodle/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2016-04-04 12:19:12 +08:00
commit a5a70e33f7
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mod/lti/locallib.php
View File

@ -1404,10 +1404,8 @@ function lti_prepare_type_for_save($type, $config) {
$type->secureicon = $config->lti_secureicon;
}
if (isset($config->lti_forcessl)) {
$type->forcessl = !empty($config->lti_forcessl) ? $config->lti_forcessl : 0;
$config->lti_forcessl = $type->forcessl;
}
$type->forcessl = !empty($config->lti_forcessl) ? $config->lti_forcessl : 0;
$config->lti_forcessl = $type->forcessl;
$type->timemodified = time();

28
mod/lti/tests/locallib_test.php
View File

@ -264,4 +264,32 @@ class mod_lti_locallib_testcase extends advanced_testcase {
$this->assertEquals($ncount, $rncount, 'All newline characters should be a combination of \r\n');
}
/**
* Tests lti_prepare_type_for_save's handling of the "Force SSL" configuration.
*/
public function test_lti_prepare_type_for_save_forcessl() {
$type = new stdClass();
$config = new stdClass();
// Try when the forcessl config property is not set.
lti_prepare_type_for_save($type, $config);
$this->assertObjectHasAttribute('lti_forcessl', $config);
$this->assertEquals(0, $config->lti_forcessl);
$this->assertEquals(0, $type->forcessl);
// Try when forcessl config property is set.
$config->lti_forcessl = 1;
lti_prepare_type_for_save($type, $config);
$this->assertObjectHasAttribute('lti_forcessl', $config);
$this->assertEquals(1, $config->lti_forcessl);
$this->assertEquals(1, $type->forcessl);
// Try when forcessl config property is set to 0.
$config->lti_forcessl = 0;
lti_prepare_type_for_save($type, $config);
$this->assertObjectHasAttribute('lti_forcessl', $config);
$this->assertEquals(0, $config->lti_forcessl);
$this->assertEquals(0, $type->forcessl);
}
}