From 2249f52fe2b2866a5d94d0939eddd09a0ab30de0 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Tue, 19 Jun 2012 11:20:21 +0800 Subject: [PATCH 1/2] MDL-33808 - incorrect cleaning of repository names --- repository/lib.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/repository/lib.php b/repository/lib.php index eae607275dc..3c10b43a551 100644 --- a/repository/lib.php +++ b/repository/lib.php @@ -1450,7 +1450,7 @@ abstract class repository { $ft = new filetype_parser; $meta = new stdClass(); $meta->id = $this->id; - $meta->name = $this->get_name(); + $meta->name = format_string($this->get_name()); $meta->type = $this->options['type']; $meta->icon = $OUTPUT->pix_url('icon', 'repository_'.$meta->type)->out(false); $meta->supported_types = $ft->get_extensions($this->supported_filetypes()); @@ -1762,6 +1762,7 @@ abstract class repository { // it can be empty, then moodle will look for instance name from language string $mform->addElement('text', 'pluginname', get_string('pluginname', 'repository'), array('size' => '40')); $mform->addElement('static', 'pluginnamehelp', '', get_string('pluginnamehelp', 'repository')); + $mform->setType('pluginname', PARAM_TEXT); } } @@ -1904,6 +1905,7 @@ final class repository_instance_form extends moodleform { $mform->addElement('text', 'name', get_string('name'), 'maxlength="100" size="30"'); $mform->addRule('name', $strrequired, 'required', null, 'client'); + $mform->setType('name', PARAM_TEXT); } public function definition() { From 63472c089e08b950eba4449899dbdaae8fd9f707 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Tue, 19 Jun 2012 12:07:46 +0800 Subject: [PATCH 2/2] MDL-33808 - format title on the repository instance screen --- repository/lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/lib.php b/repository/lib.php index 3c10b43a551..d900a78a6d0 100644 --- a/repository/lib.php +++ b/repository/lib.php @@ -1253,7 +1253,7 @@ abstract class repository { } $type = repository::get_type_by_id($i->options['typeid']); - $table->data[] = array($i->name, $type->get_readablename(), $settings, $delete); + $table->data[] = array(format_string($i->name), $type->get_readablename(), $settings, $delete); //display a grey row if the type is defined as not visible if (isset($type) && !$type->get_visible()) {