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

MDL-12561 Fix IE6 "insecure items" warning in SSL sites using htmlarea

Browse Source 
The HTMLArea editor uses the about:blank URL for blank pages, which
IE6 erroneously considers insecure. This commit replaces about:blank
with lib/editor/htmlarea/blank.html instead.


Author: Jonathan Harker <[email protected]>
This commit is contained in:
jonathanharker
2009-05-21 02:28:33 +00:00
parent 3e16e2fd1d
commit 369c4ab13d
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/editor/htmlarea/blank.html
+1
View File
@@ -0,0 +1 @@
<html></html>
lib/editor/htmlarea/coursefiles.php
+1 -1
View File
@@ -142,7 +142,7 @@
var prev = window.parent.ipreview;
if(prev != null) {
prev.location.replace('about:blank');
prev.location.replace('<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/blank.html');
}
var uploader = window.parent.document.forms['uploader'];
if(uploader != null) {
lib/editor/htmlarea/htmlarea.php
+1 -1
View File
@@ -721,7 +721,7 @@ HTMLArea.prototype.generate = function () {
// create the IFRAME
var iframe = document.createElement("iframe");
iframe.src = "about:blank";
iframe.src = "<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/blank.html";
iframe.className = "iframe";
lib/editor/htmlarea/popups/insert_image.php
+3 -3
View File
@@ -90,9 +90,9 @@ function onPreview() {
img.src = url;
var win = null;
if (!document.all) {
win = window.open("about:blank", "ha_imgpreview", "toolbar=no,menubar=no,personalbar=no,innerWidth=100,innerHeight=100,scrollbars=no,resizable=yes");
win = window.open("<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/blank.html", "ha_imgpreview", "toolbar=no,menubar=no,personalbar=no,innerWidth=100,innerHeight=100,scrollbars=no,resizable=yes");
} else {
win = window.open("about:blank", "ha_imgpreview", "channelmode=no,directories=no,height=100,width=100,location=no,menubar=no,resizable=yes,scrollbars=no,toolbar=no");
win = window.open("<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/blank.html", "ha_imgpreview", "channelmode=no,directories=no,height=100,width=100,location=no,menubar=no,resizable=yes,scrollbars=no,toolbar=no");
}
preview_window = win;
var doc = win.document;
@@ -269,7 +269,7 @@ form { margin-bottom: 0px; margin-top: 0px; }
?>
</td>
<td width="45%" valign="top"><?php print_string("preview","editor");?>:<br />
<iframe id="ipreview" name="ipreview" src="about:blank" style="width: 100%; height: 200px;"></iframe>
<iframe id="ipreview" name="ipreview" src="<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/blank.html" style="width: 100%; height: 200px;"></iframe>
</td>
</tr>
</table>
lib/editor/htmlarea/popups/insert_image_std.php
+2 -2
View File
@@ -82,9 +82,9 @@ function onPreview() {
img.src = url;
var win = null;
if (!document.all) {
win = window.open("about:blank", "ha_imgpreview", "toolbar=no,menubar=no,personalbar=no,innerWidth=100,innerHeight=100,scrollbars=no,resizable=yes");
win = window.open("<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/blank.html", "ha_imgpreview", "toolbar=no,menubar=no,personalbar=no,innerWidth=100,innerHeight=100,scrollbars=no,resizable=yes");
} else {
win = window.open("about:blank", "ha_imgpreview", "channelmode=no,directories=no,height=100,width=100,location=no,menubar=no,resizable=yes,scrollbars=no,toolbar=no");
win = window.open("<?php echo $CFG->wwwroot ?>/lib/editor/htmlarea/blank.html", "ha_imgpreview", "channelmode=no,directories=no,height=100,width=100,location=no,menubar=no,resizable=yes,scrollbars=no,toolbar=no");
}
preview_window = win;
var doc = win.document;