L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-17236 html block: proper cleanup of html; backported from HEAD

Browse Source
This commit is contained in:
skodak
2008-11-19 16:47:36 +00:00
parent 64954387a6
commit f07e38fbca
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/html/block_html.php
+8 -3
View File
@@ -12,7 +12,7 @@ class block_html extends block_base {
}
function specialization() {
$this->title = isset($this->config->title) ? $this->config->title : get_string('newhtmlblock', 'block_html');
$this->title = isset($this->config->title) ? format_string($this->config->title) : get_string('newhtmlblock', 'block_html');
}
function instance_allow_multiple() {
@@ -24,8 +24,13 @@ class block_html extends block_base {
return $this->content;
}
$filteropt = new stdClass;
$filteropt->noclean = true;
if (!empty($this->instance->pinned) or $this->instance->pagetype === 'course-view') {
// fancy html allowed only on course page and in pinned blocks for security reasons
$filteropt = new stdClass;
$filteropt->noclean = true;
} else {
$filteropt = null;
}
$this->content = new stdClass;
$this->content->text = isset($this->config->text) ? format_text($this->config->text, FORMAT_HTML, $filteropt) : '';
blocks/html/config_instance.html
+9 -2
View File
@@ -1,4 +1,11 @@
<?php $usehtmleditor = can_use_html_editor(); ?>
<?php
$usehtmleditor = can_use_html_editor();
$text = isset($this->config->text) ? $this->config->text : '';
if (empty($this->instance->pinned) and $this->instance->pagetype !== 'course-view') {
$text = clean_text($text, FORMAT_HTML);
}
?>
<table cellpadding="9" cellspacing="0">
<tr valign="top">
<td align="right"><?php print_string('configtitle', 'block_html'); ?>:</td>
@@ -6,7 +13,7 @@
</tr>
<tr valign="top">
<td align="right"><?php print_string('configcontent', 'block_html'); ?>:</td>
<td><?php print_textarea($usehtmleditor, 25, 50, 0, 0, 'text', isset($this->config->text)?$this->config->text:'') ?></td>
<td><?php print_textarea($usehtmleditor, 25, 50, 0, 0, 'text', $text) ?></td>
</tr>
<tr>
<td colspan="3" align="center">