From 63f3cbbd7d80bc3c5ca1ae30ae88c94097cd38b9 Mon Sep 17 00:00:00 2001 From: moodler Date: Wed, 14 Jul 2004 06:54:43 +0000 Subject: [PATCH] Merged $bodytags parameter in headers from STABLE --- lib/weblib.php | 6 ++++-- theme/UPGRADE.txt | 7 +++++++ theme/brightretro/header.html | 1 + theme/cordoroyblue/header.html | 1 + theme/cornflower/header.html | 5 +++-- theme/formal_white/header.html | 1 + theme/garden/header.html | 1 + theme/metal/header.html | 1 + theme/oceanblue/header.html | 1 + theme/poweraid/header.html | 2 +- theme/standard/header.html | 1 + theme/standardblue/header.html | 1 + theme/standardgreen/header.html | 1 + theme/standardlogo/header.html | 1 + theme/standardred/header.html | 1 + theme/standardwhite/header.html | 1 + 16 files changed, 27 insertions(+), 5 deletions(-) diff --git a/lib/weblib.php b/lib/weblib.php index 957077d8f5..74df05723c 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -516,7 +516,7 @@ function validate_email ($address) { } function detect_munged_arguments($string) { - if (ereg('\.\.', $string)) { // check for parent URLs + if (substr_count($string, '..') > 1) { // We allow one '..' in a URL return true; } if (ereg('[\|\`]', $string)) { // check for other bad characters @@ -927,7 +927,7 @@ function highlightfast($needle, $haystack) { /// STANDARD WEB PAGE PARTS /////////////////////////////////////////////////// function print_header ($title="", $heading="", $navigation="", $focus="", $meta="", - $cache=true, $button=" ", $menu="", $usexml=false) { + $cache=true, $button=" ", $menu="", $usexml=false, $bodytags="") { // $title - appears top of window // $heading - appears top of page // $navigation - premade navigation string @@ -937,6 +937,8 @@ function print_header ($title="", $heading="", $navigation="", $focus="", $meta= // $button - HTML code for a button (usually for module editing) // $menu - HTML code for a popup menu // $usexml - use XML for this page +// $bodytags - this text will be included verbatim in the tag (useful for onload() etc) + global $USER, $CFG, $THEME, $SESSION; global $course; // This is a bit of an ugly hack to be gotten rid of later diff --git a/theme/UPGRADE.txt b/theme/UPGRADE.txt index e53d26e348..bc9d6029dc 100644 --- a/theme/UPGRADE.txt +++ b/theme/UPGRADE.txt @@ -258,3 +258,10 @@ TD.cal_event_description { } A IMG { } TABLE.formtable TD { } + +================================ +Changes from 1.3.2 - 1.3.3 +-------------------------------- + +$bodytags variable is now included in header.html (important for SCORM) + diff --git a/theme/brightretro/header.html b/theme/brightretro/header.html index 0643aed3da..14567f305e 100644 --- a/theme/brightretro/header.html +++ b/theme/brightretro/header.html @@ -10,6 +10,7 @@ javascript"); ?> - -> +

diff --git a/theme/formal_white/header.html b/theme/formal_white/header.html index ebb72fe3c2..cd257b4599 100644 --- a/theme/formal_white/header.html +++ b/theme/formal_white/header.html @@ -9,6 +9,7 @@ javascript"); ?> -body\" topmargin=\"$THEME->topmargin\" leftmargin=\"$THEME->leftmargin\" marginheight=\"$THEME->marginheight\" marginwidth=\"$THEME->marginwidth\" />"; ?> +body\" topmargin=\"$THEME->topmargin\" leftmargin=\"$THEME->leftmargin\" marginheight=\"$THEME->marginheight\" marginwidth=\"$THEME->marginwidth\" />"; ?> diff --git a/theme/standard/header.html b/theme/standard/header.html index a2cc9af4b5..13765be953 100644 --- a/theme/standard/header.html +++ b/theme/standard/header.html @@ -9,6 +9,7 @@