mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

MDL-38509 Fix the communication protocol with Moodle plugins directory

Browse Source 
Implements the behaviour currently specified at
http://docs.moodle.org/dev/On-click_add-on_installation
This commit is contained in:
David Mudrák 2013-03-22 18:14:25 +01:00
parent 59a2cc8d38
commit b7f6442670
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/tool/installaddon/classes/installer.php
View File

@ -68,7 +68,7 @@ class tool_installaddon_installer {
$site = array(
'fullname' => $this->get_site_fullname(),
'url' => $this->get_site_url(),
'major_version' => $this->get_site_major_version(),
'majorversion' => $this->get_site_major_version(),
);
$site = $this->encode_site_information($site);
@ -228,7 +228,7 @@ class tool_installaddon_installer {
protected function get_site_fullname() {
global $SITE;
return $SITE->fullname;
return strip_tags($SITE->fullname);
}
/**

8
admin/tool/installaddon/tests/installer_test.php
View File

@ -47,9 +47,9 @@ class tool_installaddon_installer_test extends advanced_testcase {
$site = json_decode(base64_decode($site), true);
$this->assertEquals('array', gettype($site));
$this->assertEquals(3, count($site));
$this->assertSame($installer->get_site_fullname(), $site['fullname']);
$this->assertSame($installer->get_site_url(), $site['url']);
$this->assertSame($installer->get_site_major_version(), $site['major_version']);
$this->assertSame('Nasty site', $site['fullname']);
$this->assertSame('file:///etc/passwd', $site['url']);
$this->assertSame("2.5'; DROP TABLE mdl_user; --", $site['majorversion']);
}
public function test_extract_installfromzip_file() {
@ -86,7 +86,7 @@ class tool_installaddon_installer_test extends advanced_testcase {
class testable_tool_installaddon_installer extends tool_installaddon_installer {
public function get_site_fullname() {
return '<h1 onmouseover="alert(\'Hello Moodle.org!\');">Nasty site</h1>';
return strip_tags('<h1 onmouseover="alert(\'Hello Moodle.org!\');">Nasty site</h1>');
}
public function get_site_url() {