From 0ae36f663812cdc0be911fe076bd3aed4cad72ef Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Sun, 27 Mar 2011 12:29:36 +0200 Subject: [PATCH] MDL-26966 improve self URL validation --- lib/setuplib.php | 6 ++- theme/anomaly/layout/general.php | 2 +- theme/anomaly/layout/report.php | 2 +- theme/arialist/layout/frontpage.php | 12 +++--- theme/arialist/layout/general.php | 8 ++-- theme/arialist/layout/report.php | 2 +- theme/base/layout/embedded.php | 2 +- theme/base/layout/frontpage.php | 12 +++--- theme/base/layout/general.php | 8 ++-- theme/base/layout/report.php | 2 +- theme/binarius/layout/frontpage.php | 12 +++--- theme/binarius/layout/general.php | 8 ++-- theme/binarius/layout/report.php | 2 +- theme/boxxie/layout/embedded.php | 2 +- theme/boxxie/layout/frontpage.php | 32 +++++++------- theme/boxxie/layout/general.php | 32 +++++++------- theme/brick/layout/frontpage.php | 24 +++++------ theme/brick/layout/general.php | 40 +++++++++--------- theme/canvas/layout/embedded.php | 2 +- theme/canvas/layout/frontpage.php | 20 ++++----- theme/canvas/layout/general.php | 10 ++--- theme/canvas/layout/report.php | 4 +- theme/formal_white/layout/embedded.php | 2 +- theme/formal_white/layout/frontpage.php | 2 +- theme/formal_white/layout/general.php | 2 +- theme/formfactor/layout/embedded.php | 2 +- theme/formfactor/layout/frontpage.php | 20 ++++----- theme/formfactor/layout/general.php | 22 +++++----- theme/fusion/layout/frontpage.php | 26 ++++++------ theme/fusion/layout/general.php | 24 +++++------ theme/leatherbound/layout/frontpage.php | 16 +++---- theme/leatherbound/layout/general.php | 12 +++--- theme/leatherbound/layout/report.php | 2 +- theme/magazine/layout/embedded.php | 2 +- theme/magazine/layout/frontpage.php | 56 ++++++++++++------------- theme/magazine/layout/general.php | 54 ++++++++++++------------ theme/nimble/layout/frontpage.php | 26 ++++++------ theme/nimble/layout/general.php | 24 +++++------ theme/nonzero/layout/frontpage.php | 18 ++++---- theme/nonzero/layout/general.php | 10 ++--- theme/overlay/layout/frontpage.php | 28 ++++++------- theme/overlay/layout/general.php | 34 +++++++-------- theme/serenity/layout/embedded.php | 2 +- theme/serenity/layout/frontpage.php | 22 +++++----- theme/serenity/layout/general.php | 20 ++++----- theme/sky_high/layout/frontpage.php | 32 +++++++------- theme/sky_high/layout/general.php | 32 +++++++------- theme/sky_high/layout/report.php | 4 +- theme/splash/layout/general.php | 4 +- theme/splash/layout/report.php | 4 +- theme/standardold/layout/embedded.php | 2 +- theme/standardold/layout/frontpage.php | 4 +- theme/standardold/layout/general.php | 2 +- 53 files changed, 379 insertions(+), 375 deletions(-) diff --git a/lib/setuplib.php b/lib/setuplib.php index c4b07ee06d1..1056db449a1 100644 --- a/lib/setuplib.php +++ b/lib/setuplib.php @@ -691,7 +691,6 @@ function initialise_fullme() { $FULLSCRIPT = $hostandport . $rurl['path']; $FULLME = $hostandport . $rurl['fullpath']; $ME = $rurl['fullpath']; - $rurl['path'] = $rurl['fullpath']; } /** @@ -776,6 +775,11 @@ function setup_get_remote_url() { } else { throw new moodle_exception('unsupportedwebserver', 'error', '', $_SERVER['SERVER_SOFTWARE']); } + + // sanitize the url a bit more, the encoding style may be different in vars above + $rurl['fullpath'] = str_replace('"', '%22', $rurl['fullpath']); + $rurl['fullpath'] = str_replace('\'', '%27', $rurl['fullpath']); + return $rurl; } diff --git a/theme/anomaly/layout/general.php b/theme/anomaly/layout/general.php index 048f3b6719f..9048711009b 100644 --- a/theme/anomaly/layout/general.php +++ b/theme/anomaly/layout/general.php @@ -25,7 +25,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?>
diff --git a/theme/anomaly/layout/report.php b/theme/anomaly/layout/report.php index 290643cda81..53c368af2c4 100644 --- a/theme/anomaly/layout/report.php +++ b/theme/anomaly/layout/report.php @@ -19,7 +19,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?>
diff --git a/theme/arialist/layout/frontpage.php b/theme/arialist/layout/frontpage.php index 15dd2e0c2c0..4a5156aea5a 100644 --- a/theme/arialist/layout/frontpage.php +++ b/theme/arialist/layout/frontpage.php @@ -24,7 +24,7 @@ if (!empty($PAGE->theme->settings->tagline)) { } else { $tagline = ''; } -if (!empty($PAGE->theme->settings->logo)) { +if (!empty($PAGE->theme->settings->logo)) { $logourl = $PAGE->theme->settings->logo; } @@ -33,11 +33,11 @@ echo $OUTPUT->doctype() ?> <?php echo $PAGE->title ?> - + standard_head_html() ?> - + standard_top_of_body_html() ?> @@ -70,7 +70,7 @@ echo $OUTPUT->doctype() ?>
- + @@ -79,7 +79,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -87,7 +87,7 @@ echo $OUTPUT->doctype() ?>
- +
diff --git a/theme/arialist/layout/general.php b/theme/arialist/layout/general.php index 141aa59eeea..802ef55dd7c 100644 --- a/theme/arialist/layout/general.php +++ b/theme/arialist/layout/general.php @@ -27,7 +27,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?> @@ -77,7 +77,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -85,7 +85,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -93,7 +93,7 @@ echo $OUTPUT->doctype() ?>
- +
diff --git a/theme/arialist/layout/report.php b/theme/arialist/layout/report.php index 2ddb330a2c2..f254a5cb7f0 100644 --- a/theme/arialist/layout/report.php +++ b/theme/arialist/layout/report.php @@ -27,7 +27,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?> diff --git a/theme/base/layout/embedded.php b/theme/base/layout/embedded.php index 5d222025429..a5dd7414ed0 100644 --- a/theme/base/layout/embedded.php +++ b/theme/base/layout/embedded.php @@ -5,7 +5,7 @@ standard_head_html() ?> - + standard_top_of_body_html() ?>
diff --git a/theme/base/layout/frontpage.php b/theme/base/layout/frontpage.php index bd2774d5140..31faa98981e 100644 --- a/theme/base/layout/frontpage.php +++ b/theme/base/layout/frontpage.php @@ -25,10 +25,10 @@ echo $OUTPUT->doctype() ?> <?php echo $PAGE->title ?> - + standard_head_html() ?> - + standard_top_of_body_html() ?>
@@ -49,7 +49,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -57,7 +57,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -65,7 +65,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -73,7 +73,7 @@ echo $OUTPUT->doctype() ?>
- +
diff --git a/theme/base/layout/general.php b/theme/base/layout/general.php index 2d13385ef93..26f27fc3ee7 100644 --- a/theme/base/layout/general.php +++ b/theme/base/layout/general.php @@ -32,7 +32,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?>
@@ -64,7 +64,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -72,7 +72,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -80,7 +80,7 @@ echo $OUTPUT->doctype() ?>
- +
diff --git a/theme/base/layout/report.php b/theme/base/layout/report.php index 7b2196f99f5..8afd061a77f 100644 --- a/theme/base/layout/report.php +++ b/theme/base/layout/report.php @@ -26,7 +26,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?>
diff --git a/theme/binarius/layout/frontpage.php b/theme/binarius/layout/frontpage.php index b5402c93f56..ab1930275ef 100644 --- a/theme/binarius/layout/frontpage.php +++ b/theme/binarius/layout/frontpage.php @@ -25,11 +25,11 @@ echo $OUTPUT->doctype() ?> <?php echo $PAGE->title ?> - + standard_head_html() ?> - + standard_top_of_body_html() ?>
@@ -54,7 +54,7 @@ echo $OUTPUT->doctype() ?>
- + @@ -63,7 +63,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -71,7 +71,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -86,7 +86,7 @@ echo $OUTPUT->doctype() ?>
- +
diff --git a/theme/binarius/layout/general.php b/theme/binarius/layout/general.php index 2395d0ab75d..e601ed07e9a 100644 --- a/theme/binarius/layout/general.php +++ b/theme/binarius/layout/general.php @@ -28,7 +28,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?>
@@ -77,7 +77,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -85,7 +85,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -93,7 +93,7 @@ echo $OUTPUT->doctype() ?>
- +
diff --git a/theme/binarius/layout/report.php b/theme/binarius/layout/report.php index a67f792baf5..3225a5d3346 100644 --- a/theme/binarius/layout/report.php +++ b/theme/binarius/layout/report.php @@ -28,7 +28,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?>
diff --git a/theme/boxxie/layout/embedded.php b/theme/boxxie/layout/embedded.php index 7ce54561de1..41e141feca8 100644 --- a/theme/boxxie/layout/embedded.php +++ b/theme/boxxie/layout/embedded.php @@ -5,7 +5,7 @@ standard_head_html() ?> - + standard_top_of_body_html() ?>
diff --git a/theme/boxxie/layout/frontpage.php b/theme/boxxie/layout/frontpage.php index 822be30aecf..98288f16256 100644 --- a/theme/boxxie/layout/frontpage.php +++ b/theme/boxxie/layout/frontpage.php @@ -29,8 +29,8 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - - + + standard_top_of_body_html() ?> @@ -38,7 +38,7 @@ echo $OUTPUT->doctype() ?>
- +
heading) { ?>

heading ?>

@@ -56,11 +56,11 @@ echo $OUTPUT->doctype() ?>
- +
- +
@@ -68,7 +68,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -76,7 +76,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -84,29 +84,29 @@ echo $OUTPUT->doctype() ?>
- +
- +
- +

login_info(); ?>
- - + + - +
- +
- +
@@ -116,7 +116,7 @@ if ($hasheading || $hasnavbar) { ?> echo $OUTPUT->standard_footer_html(); } ?> -
+
standard_end_of_body_html() ?> diff --git a/theme/boxxie/layout/general.php b/theme/boxxie/layout/general.php index eaab94d6b18..495135c0999 100644 --- a/theme/boxxie/layout/general.php +++ b/theme/boxxie/layout/general.php @@ -29,8 +29,8 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - - + + standard_top_of_body_html() ?> @@ -38,7 +38,7 @@ echo $OUTPUT->doctype() ?>
- +
heading) { ?>

heading ?>

@@ -56,20 +56,20 @@ echo $OUTPUT->doctype() ?>
- +
navbar(); ?>
button; ?>
- + - +
- +
@@ -77,7 +77,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -85,7 +85,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -93,14 +93,14 @@ echo $OUTPUT->doctype() ?>
- +
- +
- +

login_info(); ?> @@ -111,7 +111,7 @@ echo $OUTPUT->doctype() ?> if ($hasheading || $hasnavbar) { ?>
- +
@@ -122,11 +122,11 @@ if ($hasheading || $hasnavbar) { ?> echo $OUTPUT->home_link(); echo $OUTPUT->standard_footer_html(); - + } ?> -
- +
+ standard_end_of_body_html() ?> diff --git a/theme/brick/layout/frontpage.php b/theme/brick/layout/frontpage.php index 9bedc9a3914..279b82cbcd6 100644 --- a/theme/brick/layout/frontpage.php +++ b/theme/brick/layout/frontpage.php @@ -25,7 +25,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?> @@ -41,9 +41,9 @@ echo $OUTPUT->doctype() ?> heading ?>
- +
- lang_menu(); echo $OUTPUT->login_info(); echo $PAGE->headingmenu; @@ -51,13 +51,13 @@ echo $OUTPUT->doctype() ?>
- + - +
@@ -78,26 +78,26 @@ echo $OUTPUT->doctype() ?>
- +
- +
- +
- + blocks_for_region('side-post') ?> - +
- +
@@ -105,7 +105,7 @@ echo $OUTPUT->doctype() ?> - +
diff --git a/theme/brick/layout/general.php b/theme/brick/layout/general.php index 319758e91e6..43ea28dbc02 100644 --- a/theme/brick/layout/general.php +++ b/theme/brick/layout/general.php @@ -26,19 +26,19 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?>
@@ -87,11 +87,11 @@ echo $OUTPUT->doctype() ?>
- +
- +
@@ -99,29 +99,29 @@ echo $OUTPUT->doctype() ?>
- + - +
- + - +
- +
button; ?>
- + blocks_for_region('side-post') ?> - +
- + - +
@@ -129,7 +129,7 @@ echo $OUTPUT->doctype() ?> - +
diff --git a/theme/canvas/layout/embedded.php b/theme/canvas/layout/embedded.php index 5d222025429..a5dd7414ed0 100644 --- a/theme/canvas/layout/embedded.php +++ b/theme/canvas/layout/embedded.php @@ -5,7 +5,7 @@ standard_head_html() ?> - + standard_top_of_body_html() ?>
diff --git a/theme/canvas/layout/frontpage.php b/theme/canvas/layout/frontpage.php index bf4ae45fa0a..812300c025a 100644 --- a/theme/canvas/layout/frontpage.php +++ b/theme/canvas/layout/frontpage.php @@ -20,10 +20,10 @@ echo $OUTPUT->doctype() ?> <?php echo $PAGE->title ?> - + standard_head_html() ?> - + standard_top_of_body_html() ?>
@@ -31,7 +31,7 @@ echo $OUTPUT->doctype() ?>
- +

heading ?>

@@ -40,13 +40,13 @@ echo $OUTPUT->doctype() ?> echo $OUTPUT->login_info(); echo $OUTPUT->lang_menu(); echo $PAGE->headingmenu; - ?> + ?>
- +
- + @@ -55,7 +55,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -63,7 +63,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -71,7 +71,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -79,7 +79,7 @@ echo $OUTPUT->doctype() ?>
- +
diff --git a/theme/canvas/layout/general.php b/theme/canvas/layout/general.php index 532cc2e4873..4ffc0f6c95b 100644 --- a/theme/canvas/layout/general.php +++ b/theme/canvas/layout/general.php @@ -22,7 +22,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?>
@@ -66,7 +66,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -74,7 +74,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -82,7 +82,7 @@ echo $OUTPUT->doctype() ?>
- +
@@ -90,7 +90,7 @@ echo $OUTPUT->doctype() ?>
- +
diff --git a/theme/canvas/layout/report.php b/theme/canvas/layout/report.php index 49d67890619..7549a2438f4 100644 --- a/theme/canvas/layout/report.php +++ b/theme/canvas/layout/report.php @@ -22,7 +22,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?>
@@ -62,7 +62,7 @@ echo $OUTPUT->doctype() ?> - +
diff --git a/theme/formal_white/layout/embedded.php b/theme/formal_white/layout/embedded.php index 7aca05a0149..1fc9be8bb13 100644 --- a/theme/formal_white/layout/embedded.php +++ b/theme/formal_white/layout/embedded.php @@ -8,7 +8,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html(); ?>
diff --git a/theme/formal_white/layout/frontpage.php b/theme/formal_white/layout/frontpage.php index 08d632d4e9d..69eb7d43cc7 100644 --- a/theme/formal_white/layout/frontpage.php +++ b/theme/formal_white/layout/frontpage.php @@ -47,7 +47,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html(); if ($hasframe) { ?> diff --git a/theme/formal_white/layout/general.php b/theme/formal_white/layout/general.php index b2207560c90..d93c7d0f7e0 100644 --- a/theme/formal_white/layout/general.php +++ b/theme/formal_white/layout/general.php @@ -47,7 +47,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html(); if ($hasframe) { ?> diff --git a/theme/formfactor/layout/embedded.php b/theme/formfactor/layout/embedded.php index 5d222025429..a5dd7414ed0 100644 --- a/theme/formfactor/layout/embedded.php +++ b/theme/formfactor/layout/embedded.php @@ -5,7 +5,7 @@ standard_head_html() ?> - + standard_top_of_body_html() ?>
diff --git a/theme/formfactor/layout/frontpage.php b/theme/formfactor/layout/frontpage.php index 58c87cf8aa7..b416319138e 100644 --- a/theme/formfactor/layout/frontpage.php +++ b/theme/formfactor/layout/frontpage.php @@ -20,16 +20,16 @@ echo $OUTPUT->doctype() ?> <?php echo $PAGE->title ?> - + standard_head_html() ?> - + standard_top_of_body_html() ?>
- +

heading ?>

@@ -38,11 +38,11 @@ echo $OUTPUT->doctype() ?> echo $OUTPUT->login_info(); echo $OUTPUT->lang_menu(); echo $PAGE->headingmenu; - ?> + ?>
- +
@@ -50,7 +50,7 @@ echo $OUTPUT->doctype() ?>
  •  
    • - + @@ -59,7 +59,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -67,7 +67,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -75,7 +75,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -83,7 +83,7 @@ echo $OUTPUT->doctype() ?>
    - +
    diff --git a/theme/formfactor/layout/general.php b/theme/formfactor/layout/general.php index a0e71f9e6e4..57c57baa311 100644 --- a/theme/formfactor/layout/general.php +++ b/theme/formfactor/layout/general.php @@ -25,7 +25,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?>
    @@ -34,7 +34,7 @@ echo $OUTPUT->doctype() ?>
    - +

    heading ?>

    @@ -46,12 +46,12 @@ echo $OUTPUT->doctype() ?> echo $PAGE->headingmenu ?>
    - - + +
    - +
    @@ -60,14 +60,14 @@ echo $OUTPUT->doctype() ?> - +
    navbar(); ?>
    button; ?>
    - + @@ -75,7 +75,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -83,7 +83,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -91,7 +91,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -99,7 +99,7 @@ echo $OUTPUT->doctype() ?>
    - +
    diff --git a/theme/fusion/layout/frontpage.php b/theme/fusion/layout/frontpage.php index 4657c2ef879..d403f80fd87 100644 --- a/theme/fusion/layout/frontpage.php +++ b/theme/fusion/layout/frontpage.php @@ -37,11 +37,11 @@ echo $OUTPUT->doctype() ?> <?php echo $PAGE->title ?> - + standard_head_html() ?> - + standard_top_of_body_html() ?>
    @@ -69,12 +69,12 @@ echo $OUTPUT->doctype() ?>
     
    - +
    - + @@ -83,22 +83,22 @@ echo $OUTPUT->doctype() ?>
    - +
    - +

    heading ?>

    - + - +
    - +
    @@ -110,8 +110,8 @@ echo $OUTPUT->doctype() ?>
    - -
    + +
    @@ -135,8 +135,8 @@ echo $OUTPUT->doctype() ?>
    - - + +
    standard_end_of_body_html() ?> diff --git a/theme/fusion/layout/general.php b/theme/fusion/layout/general.php index 27f1c76be80..e2ba6ef8591 100644 --- a/theme/fusion/layout/general.php +++ b/theme/fusion/layout/general.php @@ -35,7 +35,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?>
    @@ -51,15 +51,15 @@ echo $OUTPUT->doctype() ?>
    - +
    layout_options['langmenu'])) { echo $OUTPUT->lang_menu(); } - echo $OUTPUT->login_info(); - echo $PAGE->headingmenu + echo $OUTPUT->login_info(); + echo $PAGE->headingmenu ?>
    @@ -69,7 +69,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -84,7 +84,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -105,12 +105,12 @@ echo $OUTPUT->doctype() ?>
    - +
    - +
    @@ -122,7 +122,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -136,9 +136,9 @@ echo $OUTPUT->doctype() ?>
    - + - + @@ -152,7 +152,7 @@ echo $OUTPUT->doctype() ?> ?>
    - +
    standard_end_of_body_html() ?> diff --git a/theme/leatherbound/layout/frontpage.php b/theme/leatherbound/layout/frontpage.php index b492b8fe4b4..55061267dbb 100644 --- a/theme/leatherbound/layout/frontpage.php +++ b/theme/leatherbound/layout/frontpage.php @@ -29,11 +29,11 @@ echo $OUTPUT->doctype() ?> <?php echo $PAGE->title ?> - + standard_head_html() ?> - + standard_top_of_body_html() ?>
    @@ -47,11 +47,11 @@ echo $OUTPUT->doctype() ?> echo $OUTPUT->login_info(); echo $OUTPUT->lang_menu(); echo $PAGE->headingmenu; - ?> + ?>
    - + @@ -68,7 +68,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -76,7 +76,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -84,7 +84,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -92,7 +92,7 @@ echo $OUTPUT->doctype() ?>
    - +
    diff --git a/theme/leatherbound/layout/general.php b/theme/leatherbound/layout/general.php index 74d01c1b085..b6d3957442b 100644 --- a/theme/leatherbound/layout/general.php +++ b/theme/leatherbound/layout/general.php @@ -28,7 +28,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?>
    @@ -47,7 +47,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -67,7 +67,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -75,7 +75,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -83,7 +83,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -91,7 +91,7 @@ echo $OUTPUT->doctype() ?>
    - +
    diff --git a/theme/leatherbound/layout/report.php b/theme/leatherbound/layout/report.php index e959c80b66c..7f70c211074 100644 --- a/theme/leatherbound/layout/report.php +++ b/theme/leatherbound/layout/report.php @@ -28,7 +28,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?>
    diff --git a/theme/magazine/layout/embedded.php b/theme/magazine/layout/embedded.php index fa4e8eda673..c4825c5d834 100644 --- a/theme/magazine/layout/embedded.php +++ b/theme/magazine/layout/embedded.php @@ -5,7 +5,7 @@ standard_head_html() ?> - + standard_top_of_body_html() ?>
    diff --git a/theme/magazine/layout/frontpage.php b/theme/magazine/layout/frontpage.php index 163306797e2..46e56b8c68b 100644 --- a/theme/magazine/layout/frontpage.php +++ b/theme/magazine/layout/frontpage.php @@ -29,7 +29,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?>
    @@ -38,17 +38,17 @@ echo $OUTPUT->doctype() ?>
    - +
    - lang_menu(); echo $OUTPUT->login_info(); echo $PAGE->headingmenu; } ?>
    - +
    @@ -63,8 +63,8 @@ echo $OUTPUT->doctype() ?>
    - - + + @@ -92,90 +92,90 @@ echo $OUTPUT->doctype() ?>
    - +
    navbar(); ?>
    - +
    - +
    - button; + button; } ?>
    - +
    - +
    - +
    - +
    - - + + blocks_for_region('side-pre') ?>
    - +
    - + blocks_for_region('side-post') ?>
    - +
    - - + +
    - +
    -
    +
    diff --git a/theme/magazine/layout/general.php b/theme/magazine/layout/general.php index 9b2bae8d3d6..dfad02ada3e 100644 --- a/theme/magazine/layout/general.php +++ b/theme/magazine/layout/general.php @@ -29,7 +29,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?>
    @@ -38,20 +38,20 @@ echo $OUTPUT->doctype() ?>
    - +
    - theme->settings->logo)) { + theme->settings->logo)) { echo $PAGE->heading; } ?>
    - lang_menu(); echo $OUTPUT->login_info(); echo $PAGE->headingmenu; } ?>
    - +
    @@ -93,90 +93,90 @@ echo $OUTPUT->doctype() ?>
    - +
    navbar(); ?>
    - +
    - +
    - button; + button; } ?>
    - +
    - +
    - +
    - +
    - - + + blocks_for_region('side-pre') ?>
    - +
    - + blocks_for_region('side-post') ?>
    - +
    - - + +
    - +
    -
    +
    diff --git a/theme/nimble/layout/frontpage.php b/theme/nimble/layout/frontpage.php index ca987b18fa2..f57e7d55a6e 100644 --- a/theme/nimble/layout/frontpage.php +++ b/theme/nimble/layout/frontpage.php @@ -37,11 +37,11 @@ echo $OUTPUT->doctype() ?> <?php echo $PAGE->title ?> - + standard_head_html() ?> - + standard_top_of_body_html() ?>
    @@ -71,12 +71,12 @@ echo $OUTPUT->doctype() ?> echo $OUTPUT->lang_menu(); ?>
    - +
    - + @@ -85,22 +85,22 @@ echo $OUTPUT->doctype() ?>
    - +
    - +

    heading ?>

    - + - +
    - +
    @@ -112,8 +112,8 @@ echo $OUTPUT->doctype() ?>
    - -
    + +
    @@ -137,8 +137,8 @@ echo $OUTPUT->doctype() ?> - - + + standard_end_of_body_html() ?> diff --git a/theme/nimble/layout/general.php b/theme/nimble/layout/general.php index 7cb973ba892..cae203a96e0 100644 --- a/theme/nimble/layout/general.php +++ b/theme/nimble/layout/general.php @@ -35,7 +35,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?>
    @@ -51,7 +51,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -64,13 +64,13 @@ echo $OUTPUT->doctype() ?> layout_options['langmenu'])) { echo $OUTPUT->lang_menu(); } - echo $OUTPUT->login_info(); - echo $PAGE->headingmenu + echo $OUTPUT->login_info(); + echo $PAGE->headingmenu ?>
    - +
    @@ -85,7 +85,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -106,12 +106,12 @@ echo $OUTPUT->doctype() ?>
    - +
    - +
    @@ -123,7 +123,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -137,9 +137,9 @@ echo $OUTPUT->doctype() ?> - + - + @@ -153,7 +153,7 @@ echo $OUTPUT->doctype() ?> ?> - + standard_end_of_body_html() ?> diff --git a/theme/nonzero/layout/frontpage.php b/theme/nonzero/layout/frontpage.php index 7fdcfc9b233..9da35f2320e 100644 --- a/theme/nonzero/layout/frontpage.php +++ b/theme/nonzero/layout/frontpage.php @@ -31,11 +31,11 @@ echo $OUTPUT->doctype() ?> <?php echo $PAGE->title ?> - + standard_head_html() ?> - + standard_top_of_body_html() ?>
    @@ -49,15 +49,15 @@ echo $OUTPUT->doctype() ?> echo $OUTPUT->login_info(); echo $OUTPUT->lang_menu(); echo $PAGE->headingmenu; - ?> + ?>
    - + - + @@ -67,7 +67,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -75,7 +75,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -83,7 +83,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -91,7 +91,7 @@ echo $OUTPUT->doctype() ?>
    - +
    diff --git a/theme/nonzero/layout/general.php b/theme/nonzero/layout/general.php index ea063834de1..3f2013f72e8 100644 --- a/theme/nonzero/layout/general.php +++ b/theme/nonzero/layout/general.php @@ -28,7 +28,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?>
    @@ -68,7 +68,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -76,7 +76,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -84,7 +84,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -92,7 +92,7 @@ echo $OUTPUT->doctype() ?>
    - +
    diff --git a/theme/overlay/layout/frontpage.php b/theme/overlay/layout/frontpage.php index 0e8a6173ac4..6adb5eb83ce 100644 --- a/theme/overlay/layout/frontpage.php +++ b/theme/overlay/layout/frontpage.php @@ -33,11 +33,11 @@ echo $OUTPUT->doctype() ?> <?php echo $PAGE->title ?> - + standard_head_html() ?> - + standard_top_of_body_html() ?>
    @@ -54,7 +54,7 @@ echo $OUTPUT->doctype() ?> echo $OUTPUT->login_info(); echo $OUTPUT->lang_menu(); echo $PAGE->headingmenu; - ?> + ?>
    @@ -67,24 +67,24 @@ echo $OUTPUT->doctype() ?>
    - +
    - +

    heading ?>

    - -
    + +
    - - - + + +
    - +
    @@ -92,7 +92,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -100,7 +100,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -117,7 +117,7 @@ echo $OUTPUT->doctype() ?>

    - + doctype() ?> <?php echo $PAGE->title ?> - + standard_head_html() ?> - + standard_top_of_body_html() ?>
    @@ -54,7 +54,7 @@ echo $OUTPUT->doctype() ?> echo $OUTPUT->login_info(); echo $OUTPUT->lang_menu(); echo $PAGE->headingmenu; - ?> + ?>
    @@ -67,9 +67,9 @@ echo $OUTPUT->doctype() ?>
    - +
    - +
    @@ -77,27 +77,27 @@ echo $OUTPUT->doctype() ?>
    button; ?>
    - +
    - +
    navbar(); ?>
    - +
    - +
    - - - + + +
    - +
    @@ -105,7 +105,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -113,7 +113,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -130,9 +130,9 @@ echo $OUTPUT->doctype() ?>

    - + - + login_info(); echo $OUTPUT->home_link(); diff --git a/theme/serenity/layout/embedded.php b/theme/serenity/layout/embedded.php index 5d222025429..a5dd7414ed0 100644 --- a/theme/serenity/layout/embedded.php +++ b/theme/serenity/layout/embedded.php @@ -5,7 +5,7 @@ standard_head_html() ?> - + standard_top_of_body_html() ?>
    diff --git a/theme/serenity/layout/frontpage.php b/theme/serenity/layout/frontpage.php index 5156de9f424..12e94f90fa5 100644 --- a/theme/serenity/layout/frontpage.php +++ b/theme/serenity/layout/frontpage.php @@ -2,7 +2,7 @@ $hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT)); $hassidepost = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-post', $OUTPUT)); - + $showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT)); $showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT)); @@ -23,17 +23,17 @@ echo $OUTPUT->doctype() ?> <?php echo $PAGE->title ?> - + standard_head_html() ?> - + standard_top_of_body_html() ?>
    - + - +

    heading ?>

    @@ -42,11 +42,11 @@ echo $OUTPUT->doctype() ?> echo $OUTPUT->login_info(); echo $OUTPUT->lang_menu(); echo $PAGE->headingmenu; - ?> + ?>
    - + @@ -55,7 +55,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -63,7 +63,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -71,7 +71,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -79,7 +79,7 @@ echo $OUTPUT->doctype() ?>
    - +
    diff --git a/theme/serenity/layout/general.php b/theme/serenity/layout/general.php index aa79557947c..367f4d95b2c 100644 --- a/theme/serenity/layout/general.php +++ b/theme/serenity/layout/general.php @@ -25,7 +25,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?>
    @@ -33,7 +33,7 @@ echo $OUTPUT->doctype() ?>
    - +

    heading ?>

    @@ -45,17 +45,17 @@ echo $OUTPUT->doctype() ?> echo $PAGE->headingmenu ?>
    - - + +
    - +
    navbar(); ?>
    button; ?>
    - + @@ -64,7 +64,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -72,7 +72,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -80,7 +80,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -88,7 +88,7 @@ echo $OUTPUT->doctype() ?>
    - +
    diff --git a/theme/sky_high/layout/frontpage.php b/theme/sky_high/layout/frontpage.php index 0dbe3cc0787..7d2e3a7ba82 100644 --- a/theme/sky_high/layout/frontpage.php +++ b/theme/sky_high/layout/frontpage.php @@ -2,7 +2,7 @@ $hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT)); $hassidepost = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-post', $OUTPUT)); - + $showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT)); $showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT)); @@ -38,17 +38,17 @@ echo $OUTPUT->doctype() ?> <?php echo $PAGE->title ?> - + standard_head_html() ?> - + standard_top_of_body_html() ?>
    - + - +
    @@ -58,30 +58,30 @@ echo $OUTPUT->doctype() ?> - - + +
    login_info(); echo $OUTPUT->lang_menu(); echo $PAGE->headingmenu; - ?> + ?>
    - +
    - +
    - +
    @@ -89,7 +89,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -97,7 +97,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -105,7 +105,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -113,7 +113,7 @@ echo $OUTPUT->doctype() ?> - + @@ -131,7 +131,7 @@ echo $OUTPUT->doctype() ?>

    - home_link(); echo $OUTPUT->standard_end_of_body_html() ?>
    diff --git a/theme/sky_high/layout/general.php b/theme/sky_high/layout/general.php index e8116f705dc..d26b6fe417a 100644 --- a/theme/sky_high/layout/general.php +++ b/theme/sky_high/layout/general.php @@ -38,17 +38,17 @@ echo $OUTPUT->doctype() ?> <?php echo $PAGE->title ?> - + standard_head_html() ?> - + standard_top_of_body_html() ?>
    - + - +
    @@ -58,8 +58,8 @@ echo $OUTPUT->doctype() ?>

    - heading ?>

    - - + +
    login_info(); @@ -71,7 +71,7 @@ echo $OUTPUT->doctype() ?>
    - + @@ -85,14 +85,14 @@ echo $OUTPUT->doctype() ?>
    - - - + + +
    - +
    @@ -100,7 +100,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -108,7 +108,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -116,7 +116,7 @@ echo $OUTPUT->doctype() ?>
    - +
    @@ -124,7 +124,7 @@ echo $OUTPUT->doctype() ?> - + @@ -142,7 +142,7 @@ echo $OUTPUT->doctype() ?>

    - home_link(); echo $OUTPUT->standard_end_of_body_html() ?>
    diff --git a/theme/sky_high/layout/report.php b/theme/sky_high/layout/report.php index 3bd42c8571f..9c8427fac51 100644 --- a/theme/sky_high/layout/report.php +++ b/theme/sky_high/layout/report.php @@ -32,10 +32,10 @@ echo $OUTPUT->doctype() ?> <?php echo $PAGE->title ?> - + standard_head_html() ?> - + standard_top_of_body_html() ?>
    diff --git a/theme/splash/layout/general.php b/theme/splash/layout/general.php index 09da6af83a5..d17190e7e28 100644 --- a/theme/splash/layout/general.php +++ b/theme/splash/layout/general.php @@ -37,10 +37,10 @@ echo $OUTPUT->doctype() ?> <?php echo $PAGE->title ?> - + standard_head_html() ?> - + standard_top_of_body_html() ?>
    diff --git a/theme/splash/layout/report.php b/theme/splash/layout/report.php index dad56b6f559..ff92748c646 100644 --- a/theme/splash/layout/report.php +++ b/theme/splash/layout/report.php @@ -32,10 +32,10 @@ echo $OUTPUT->doctype() ?> <?php echo $PAGE->title ?> - + standard_head_html() ?> - + standard_top_of_body_html() ?>
    diff --git a/theme/standardold/layout/embedded.php b/theme/standardold/layout/embedded.php index 5d222025429..a5dd7414ed0 100644 --- a/theme/standardold/layout/embedded.php +++ b/theme/standardold/layout/embedded.php @@ -5,7 +5,7 @@ standard_head_html() ?> - + standard_top_of_body_html() ?>
    diff --git a/theme/standardold/layout/frontpage.php b/theme/standardold/layout/frontpage.php index dbd89d0bac7..857f9007e79 100644 --- a/theme/standardold/layout/frontpage.php +++ b/theme/standardold/layout/frontpage.php @@ -25,10 +25,10 @@ echo $OUTPUT->doctype() ?> <?php echo $PAGE->title ?> - + standard_head_html() ?> - + standard_top_of_body_html() ?>
    diff --git a/theme/standardold/layout/general.php b/theme/standardold/layout/general.php index 79bee9905a8..bac2689ed57 100644 --- a/theme/standardold/layout/general.php +++ b/theme/standardold/layout/general.php @@ -31,7 +31,7 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - + standard_top_of_body_html() ?>