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

Bug #5820 - IE returns unsecure items with SSL on login; merged from MOODLE_16_STABLE

Browse Source
This commit is contained in:
skodak
2006-07-06 15:53:46 +00:00
parent 0fade9ed01
commit 10ab3efc35
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
theme/cornflower/header.html
+4 -4
View File
@@ -8,7 +8,7 @@
<?php include("$CFG->javascript"); ?>
</head>
<body background="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/images/bg.gif" <?php
<body background="<?php echo $CFG->httpswwwroot.'/theme/'.current_theme() ?>/images/bg.gif" <?php
echo " $bodytags";
if ($focus) {
echo " onload=\"setfocus()\"";
@@ -25,7 +25,7 @@
<tr>
<td>
<table background="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/images/headerbg.jpg" width="100%" height="112" cellpadding="0" cellspacing="0" border="0">
<table background="<?php echo $CFG->httpswwwroot.'/theme/'.current_theme() ?>/images/headerbg.jpg" width="100%" height="112" cellpadding="0" cellspacing="0" border="0">
<tr>
@@ -44,7 +44,7 @@
<tr>
<td>
<table background="<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/images/headerbg.jpg" width="100%" height="112" cellpadding="0" cellspacing="0" border="0">
<table background="<?php echo $CFG->httpswwwroot.'/theme/'.current_theme() ?>/images/headerbg.jpg" width="100%" height="112" cellpadding="0" cellspacing="0" border="0">
<tr>
<td valign="top"><?php echo $heading ?></td>
<td align="right" sty class="headermain"le="padding-right:5px" valign="top" class="headerhomemenu"><?php echo $menu ?></td>
@@ -64,7 +64,7 @@
<td align="right" width="20" valign="top"><?php echo $button; ?></td>
</tr>
</table>
<img src="<?php echo $CFG->wwwroot?>/pix/spacer.gif" alt="" height="5" width="1" /><br />
<img src="<?php echo $CFG->httpswwwroot?>/pix/spacer.gif" alt="" height="5" width="1" /><br />
<?php } else if ($heading) { // If no navigation, but a heading, then print a line
?>
theme/formal_white/header.html
+2 -2
View File
@@ -21,13 +21,13 @@
if ($home) { // This is what gets printed on the home page only
?>
<div id="header-home" class="clearfix">
<h1 class="headermain"><img alt='Moodle' src='<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/logo.jpg' /></h1>
<h1 class="headermain"><img alt='Moodle' src='<?php echo $CFG->httpswwwroot.'/theme/'.current_theme() ?>/logo.jpg' /></h1>
<div class="headermenu"><?php echo $menu ?></div>
</div>
<?php } else if ($heading) { // This is what gets printed on any other page with a heading
?>
<div id="header" class="clearfix">
<h1 class="headermain"><img alt='Moodle' src='<?php echo $CFG->wwwroot.'/theme/'.current_theme() ?>/logo_small.jpg' /></h1>
<h1 class="headermain"><img alt='Moodle' src='<?php echo $CFG->httpswwwroot.'/theme/'.current_theme() ?>/logo_small.jpg' /></h1>
<div class="headermenu"><?php echo $menu ?></div>
</div>
<?php } ?>
theme/standardlogo/header.html
+7 -7
View File
@@ -19,23 +19,23 @@
<?php if ($home) { // This is what gets printed on the home page only
if (file_exists($CFG->dirroot.'/logo.jpg')) {
$standardlogo = $CFG->wwwroot.'/logo.jpg';
$standardlogo = $CFG->httpswwwroot.'/logo.jpg';
} else if (file_exists($CFG->dirroot.'/logo.gif')) {
$standardlogo = $CFG->wwwroot.'/logo.gif';
$standardlogo = $CFG->httpswwwroot.'/logo.gif';
} else if (file_exists($CFG->dataroot.'/1/logo.jpg')) {
if (empty($CFG->slasharguments)) {
$standardlogo = $CFG->wwwroot.'/file.php?file=/1/logo.jpg';
$standardlogo = $CFG->httpswwwroot.'/file.php?file=/1/logo.jpg';
} else {
$standardlogo = $CFG->wwwroot.'/file.php/1/logo.jpg';
$standardlogo = $CFG->httpswwwroot.'/file.php/1/logo.jpg';
}
} else if (file_exists($CFG->dataroot.'/1/logo.gif')) {
if (empty($CFG->slasharguments)) {
$standardlogo = $CFG->wwwroot.'/file.php?file=/1/logo.gif';
$standardlogo = $CFG->httpswwwroot.'/file.php?file=/1/logo.gif';
} else {
$standardlogo = $CFG->wwwroot.'/file.php/1/logo.gif';
$standardlogo = $CFG->httpswwwroot.'/file.php/1/logo.gif';
}
} else {
$standardlogo = $CFG->wwwroot.'/theme/'.current_theme().'/logo.gif';
$standardlogo = $CFG->httpswwwroot.'/theme/'.current_theme().'/logo.gif';
}
//Accessibility: warning: ALT text will need editing if logo changes. 'headermain' is now H1.