Skip to content
Browse files

Merge branch 'w13_MDL-26966_20_urlparsing' of git://github.com/skodak…

…/moodle into MOODLE_20_STABLE
  • Loading branch information...
2 parents 50496af + 0ae36f6 commit b6225c0f2f85d526c466293b8947f9d620302135 @stronk7 stronk7 committed Mar 28, 2011
Showing with 379 additions and 375 deletions.
  1. +5 −1 lib/setuplib.php
  2. +1 −1 theme/anomaly/layout/general.php
  3. +1 −1 theme/anomaly/layout/report.php
  4. +6 −6 theme/arialist/layout/frontpage.php
  5. +4 −4 theme/arialist/layout/general.php
  6. +1 −1 theme/arialist/layout/report.php
  7. +1 −1 theme/base/layout/embedded.php
  8. +6 −6 theme/base/layout/frontpage.php
  9. +4 −4 theme/base/layout/general.php
  10. +1 −1 theme/base/layout/report.php
  11. +6 −6 theme/binarius/layout/frontpage.php
  12. +4 −4 theme/binarius/layout/general.php
  13. +1 −1 theme/binarius/layout/report.php
  14. +1 −1 theme/boxxie/layout/embedded.php
  15. +16 −16 theme/boxxie/layout/frontpage.php
  16. +16 −16 theme/boxxie/layout/general.php
  17. +12 −12 theme/brick/layout/frontpage.php
  18. +20 −20 theme/brick/layout/general.php
  19. +1 −1 theme/canvas/layout/embedded.php
  20. +10 −10 theme/canvas/layout/frontpage.php
  21. +5 −5 theme/canvas/layout/general.php
  22. +2 −2 theme/canvas/layout/report.php
  23. +1 −1 theme/formal_white/layout/embedded.php
  24. +1 −1 theme/formal_white/layout/frontpage.php
  25. +1 −1 theme/formal_white/layout/general.php
  26. +1 −1 theme/formfactor/layout/embedded.php
  27. +10 −10 theme/formfactor/layout/frontpage.php
  28. +11 −11 theme/formfactor/layout/general.php
  29. +13 −13 theme/fusion/layout/frontpage.php
  30. +12 −12 theme/fusion/layout/general.php
  31. +8 −8 theme/leatherbound/layout/frontpage.php
  32. +6 −6 theme/leatherbound/layout/general.php
  33. +1 −1 theme/leatherbound/layout/report.php
  34. +1 −1 theme/magazine/layout/embedded.php
  35. +28 −28 theme/magazine/layout/frontpage.php
  36. +27 −27 theme/magazine/layout/general.php
  37. +13 −13 theme/nimble/layout/frontpage.php
  38. +12 −12 theme/nimble/layout/general.php
  39. +9 −9 theme/nonzero/layout/frontpage.php
  40. +5 −5 theme/nonzero/layout/general.php
  41. +14 −14 theme/overlay/layout/frontpage.php
  42. +17 −17 theme/overlay/layout/general.php
  43. +1 −1 theme/serenity/layout/embedded.php
  44. +11 −11 theme/serenity/layout/frontpage.php
  45. +10 −10 theme/serenity/layout/general.php
  46. +16 −16 theme/sky_high/layout/frontpage.php
  47. +16 −16 theme/sky_high/layout/general.php
  48. +2 −2 theme/sky_high/layout/report.php
  49. +2 −2 theme/splash/layout/general.php
  50. +2 −2 theme/splash/layout/report.php
  51. +1 −1 theme/standardold/layout/embedded.php
  52. +2 −2 theme/standardold/layout/frontpage.php
  53. +1 −1 theme/standardold/layout/general.php
View
6 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;
}
View
2 theme/anomaly/layout/general.php
@@ -25,7 +25,7 @@
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
View
2 theme/anomaly/layout/report.php
@@ -19,7 +19,7 @@
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
View
12 theme/arialist/layout/frontpage.php
@@ -24,7 +24,7 @@
} else {
$tagline = '<!-- There was no custom tagline set -->';
}
-if (!empty($PAGE->theme->settings->logo)) {
+if (!empty($PAGE->theme->settings->logo)) {
$logourl = $PAGE->theme->settings->logo;
}
@@ -33,11 +33,11 @@
<head>
<title><?php echo $PAGE->title ?></title>
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
- <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+ <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<?php if ($hascustommenu) { ?>
@@ -70,7 +70,7 @@
</div>
</div>
</div>
-
+
<!-- END OF HEADER -->
<!-- START OF CONTENT -->
@@ -79,15 +79,15 @@
<div id="page-content">
<div id="region-main-box">
<div id="region-post-box">
-
+
<div id="region-main-wrap">
<div id="region-main">
<div class="region-content">
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</div>
</div>
</div>
-
+
<?php if ($hassidepost) { ?>
<div id="region-post" class="block-region">
<div class="region-content">
View
8 theme/arialist/layout/general.php
@@ -27,7 +27,7 @@
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<?php if ($hascustommenu) { ?>
@@ -77,23 +77,23 @@
<div id="page-content">
<div id="region-main-box">
<div id="region-post-box">
-
+
<div id="region-main-wrap">
<div id="region-main">
<div class="region-content">
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</div>
</div>
</div>
-
+
<?php if ($hassidepost) { ?>
<div id="region-post" class="block-region">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-post') ?>
</div>
</div>
<?php } ?>
-
+
</div>
</div>
</div>
View
2 theme/arialist/layout/report.php
@@ -27,7 +27,7 @@
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<?php if ($hascustommenu) { ?>
View
2 theme/base/layout/embedded.php
@@ -5,7 +5,7 @@
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
View
12 theme/base/layout/frontpage.php
@@ -25,10 +25,10 @@
<head>
<title><?php echo $PAGE->title ?></title>
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
- <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+ <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
@@ -49,31 +49,31 @@
<div id="page-content">
<div id="region-main-box">
<div id="region-post-box">
-
+
<div id="region-main-wrap">
<div id="region-main">
<div class="region-content">
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</div>
</div>
</div>
-
+
<?php if ($hassidepre) { ?>
<div id="region-pre" class="block-region">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-pre') ?>
</div>
</div>
<?php } ?>
-
+
<?php if ($hassidepost) { ?>
<div id="region-post" class="block-region">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-post') ?>
</div>
</div>
<?php } ?>
-
+
</div>
</div>
</div>
View
8 theme/base/layout/general.php
@@ -32,7 +32,7 @@
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
<?php if ($hasheading || $hasnavbar) { ?>
@@ -64,23 +64,23 @@
<div id="page-content">
<div id="region-main-box">
<div id="region-post-box">
-
+
<div id="region-main-wrap">
<div id="region-main">
<div class="region-content">
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</div>
</div>
</div>
-
+
<?php if ($hassidepre) { ?>
<div id="region-pre" class="block-region">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-pre') ?>
</div>
</div>
<?php } ?>
-
+
<?php if ($hassidepost) { ?>
<div id="region-post" class="block-region">
<div class="region-content">
View
2 theme/base/layout/report.php
@@ -26,7 +26,7 @@
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
<?php if ($hasheading || $hasnavbar) { ?>
View
12 theme/binarius/layout/frontpage.php
@@ -25,11 +25,11 @@
<head>
<title><?php echo $PAGE->title ?></title>
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
- <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+ <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
@@ -54,7 +54,7 @@
<?php } ?>
</div>
</div>
-
+
<!-- END OF HEADER -->
<!-- START OF CONTENT -->
@@ -63,15 +63,15 @@
<div id="page-content">
<div id="region-main-box">
<div id="region-post-box">
-
+
<div id="region-main-wrap">
<div id="region-main">
<div class="region-content">
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</div>
</div>
</div>
-
+
<?php if ($hassidepost) { ?>
<div id="region-post" class="block-region">
<div class="region-content">
@@ -86,7 +86,7 @@
<div class="myclear"></div>
</div>
-
+
<!-- END OF CONTENT -->
<div class="myclear"></div>
View
8 theme/binarius/layout/general.php
@@ -28,7 +28,7 @@
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
@@ -77,23 +77,23 @@
<div id="page-content">
<div id="region-main-box">
<div id="region-post-box">
-
+
<div id="region-main-wrap">
<div id="region-main">
<div class="region-content">
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</div>
</div>
</div>
-
+
<?php if ($hassidepost) { ?>
<div id="region-post" class="block-region">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-post') ?>
</div>
</div>
<?php } ?>
-
+
</div>
</div>
</div>
View
2 theme/binarius/layout/report.php
@@ -28,7 +28,7 @@
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
View
2 theme/boxxie/layout/embedded.php
@@ -5,7 +5,7 @@
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page-wrapper" class="embedded">
View
32 theme/boxxie/layout/frontpage.php
@@ -29,16 +29,16 @@
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<?php if ($hasheading || $hasnavbar) { ?>
<div id="page-wrapper">
<div id="page" class="clearfix">
-
+
<div id="page-header" class="clearfix">
<?php if ($PAGE->heading) { ?>
<h1 class="headermain"><?php echo $PAGE->heading ?></h1>
@@ -56,57 +56,57 @@
</div>
<?php } ?>
-
+
<div id="page-content">
<div id="region-main-box">
<div id="region-post-box">
-
+
<div id="region-main-wrap">
<div id="region-main">
<div class="region-content">
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</div>
</div>
</div>
-
+
<?php if ($hassidepre) { ?>
<div id="region-pre">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-pre') ?>
</div>
</div>
<?php } ?>
-
+
<?php if ($hassidepost) { ?>
<div id="region-post">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-post') ?>
</div>
</div>
<?php } ?>
-
+
</div>
</div>
</div>
-
+
<div class="clearfix"></div>
<?php if ($hasfooter) { ?>
-
+
<div id="page-footer" class="clearfix">
<p class="helplink"><?php echo page_doc_link(get_string('moodledocslink')) ?></p>
<?php echo $OUTPUT->login_info(); ?>
</div>
-
-
+
+
<?php }
if ($hasheading || $hasnavbar) { ?>
-
+
<div class="myclear"></div>
</div> <!-- END #page -->
-
+
</div> <!-- END #page-wrapper -->
-
+
<?php } ?>
<div id="page-footer-bottom">
@@ -116,7 +116,7 @@
echo $OUTPUT->standard_footer_html();
} ?>
-</div>
+</div>
<?php echo $OUTPUT->standard_end_of_body_html() ?>
</body>
View
32 theme/boxxie/layout/general.php
@@ -29,16 +29,16 @@
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<?php if ($hasheading || $hasnavbar) { ?>
<div id="page-wrapper">
<div id="page" class="clearfix">
-
+
<div id="page-header" class="clearfix">
<?php if ($PAGE->heading) { ?>
<h1 class="headermain"><?php echo $PAGE->heading ?></h1>
@@ -56,51 +56,51 @@
</div>
<div class="myclear"></div>
-
+
<?php if ($hasnavbar) { ?>
<div class="navbar clearfix">
<div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
<div class="navbutton"> <?php echo $PAGE->button; ?></div>
</div>
<?php } ?>
-
+
<?php } ?>
-
+
<div id="page-content">
<div id="region-main-box">
<div id="region-post-box">
-
+
<div id="region-main-wrap">
<div id="region-main">
<div class="region-content">
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</div>
</div>
</div>
-
+
<?php if ($hassidepre) { ?>
<div id="region-pre">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-pre') ?>
</div>
</div>
<?php } ?>
-
+
<?php if ($hassidepost) { ?>
<div id="region-post">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-post') ?>
</div>
</div>
<?php } ?>
-
+
</div>
</div>
</div>
-
+
<div class="myclear"></div>
<?php if ($hasfooter) { ?>
-
+
<div id="page-footer" class="clearfix">
<p class="helplink"><?php echo page_doc_link(get_string('moodledocslink')) ?></p>
<?php echo $OUTPUT->login_info(); ?>
@@ -111,7 +111,7 @@
if ($hasheading || $hasnavbar) { ?>
<div class="myclear"></div>
</div> <!-- END #page -->
-
+
</div> <!-- END #page-wrapper -->
<?php } ?>
@@ -122,11 +122,11 @@
echo $OUTPUT->home_link();
echo $OUTPUT->standard_footer_html();
-
+
} ?>
-</div>
-
+</div>
+
<?php echo $OUTPUT->standard_end_of_body_html() ?>
</body>
View
24 theme/brick/layout/frontpage.php
@@ -25,7 +25,7 @@
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<!-- START OF HEADER -->
@@ -41,23 +41,23 @@
<a href="<?php echo $CFG->wwwroot; ?>" title="Home"><?php echo $PAGE->heading ?></a>
</div>
<?php } ?>
-
+
<div id="loggedinas">
- <?php if ($hasheading) {
+ <?php if ($hasheading) {
echo $OUTPUT->lang_menu();
echo $OUTPUT->login_info();
echo $PAGE->headingmenu;
} ?>
</div>
<div id="headerbottom">
-
+
<div id="menu">
<?php if ($hascustommenu) { ?>
<div id="custommenu"><?php echo $custommenu; ?></div>
<?php } ?>
</div>
-
+
</div>
</div>
@@ -78,34 +78,34 @@
<div id="page-content">
<div id="region-main-box">
<div id="region-post-box">
-
+
<div id="region-main-wrap">
<div id="region-main">
<div class="region-content">
-
+
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</div>
</div>
</div>
-
+
<?php if ($hassidepost) { ?>
<div id="region-post" class="block-region">
<div class="region-content">
-
+
<?php echo $OUTPUT->blocks_for_region('side-post') ?>
-
+
</div>
</div>
<?php } ?>
-
+
</div>
</div>
</div>
</div>
<!-- END OF CONTENT -->
-
+
</div>
</div>
</div>
View
40 theme/brick/layout/general.php
@@ -26,37 +26,37 @@
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<!-- START OF HEADER -->
<div id="headerwrap">
<div id="header">
-
+
<?php if (!empty($PAGE->theme->settings->logo)) { ?>
-
+
<div id="logo">
</div>
-
+
<?php } else { ?>
<div id="nologo">
<?php echo $PAGE->heading ?>
</div>
<?php } ?>
-
+
<div id="loggedinas">
- <?php if ($hasheading) {
+ <?php if ($hasheading) {
echo $OUTPUT->lang_menu();
echo $OUTPUT->login_info();
echo $PAGE->headingmenu;
} ?>
</div>
<div id="headerbottom">
-
+
<div id="menu">
<?php if ($hascustommenu) { ?>
<div id="custommenu"><?php echo $custommenu; ?></div>
@@ -67,7 +67,7 @@
<h1><?php echo $PAGE->heading ?></h1>
</div>
<?php } ?>
-
+
</div>
</div>
@@ -87,49 +87,49 @@
<div id="page-content">
<div id="region-main-box">
<div id="region-post-box">
-
+
<div id="region-main-wrap">
<div id="region-main">
<div class="region-content">
-
+
<?php if ($hasnavbar) { ?>
<div class="navbar">
<div class="wrapper">
<div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
</div>
</div>
<?php } ?>
-
+
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
-
+
</div>
</div>
</div>
-
+
<?php if ($hassidepost) { ?>
-
+
<div id="region-post" class="block-region">
<div class="region-content">
-
+
<?php if ($hasnavbutton) { ?>
<div class="navbutton"><?php echo $PAGE->button; ?></div>
<?php } ?>
-
+
<?php echo $OUTPUT->blocks_for_region('side-post') ?>
-
+
</div>
</div>
-
+
<?php } ?>
-
+
</div>
</div>
</div>
</div>
<!-- END OF CONTENT -->
-
+
</div>
</div>
</div>
View
2 theme/canvas/layout/embedded.php
@@ -5,7 +5,7 @@
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
View
20 theme/canvas/layout/frontpage.php
@@ -20,18 +20,18 @@
<head>
<title><?php echo $PAGE->title ?></title>
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
- <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+ <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
<!-- START OF HEADER -->
<div id="wrapper" class="clearfix">
-
+
<div id="page-header">
<div id="page-header-wrapper" class="clearfix">
<h1 class="headermain"><?php echo $PAGE->heading ?></h1>
@@ -40,13 +40,13 @@
echo $OUTPUT->login_info();
echo $OUTPUT->lang_menu();
echo $PAGE->headingmenu;
- ?>
+ ?>
</div>
</div>
</div>
-
+
<div class="clearer"></div> <!-- temporarily added on 06/25/10 -->
-
+
<!-- END OF HEADER -->
<!-- START OF CONTENT -->
@@ -55,31 +55,31 @@
<div id="page-content">
<div id="region-main-box">
<div id="region-post-box">
-
+
<div id="region-main-wrap">
<div id="region-main">
<div class="region-content">
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</div>
</div>
</div>
-
+
<?php if ($hassidepre) { ?>
<div id="region-pre">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-pre') ?>
</div>
</div>
<?php } ?>
-
+
<?php if ($hassidepost) { ?>
<div id="region-post">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-post') ?>
</div>
</div>
<?php } ?>
-
+
</div>
</div>
</div>
View
10 theme/canvas/layout/general.php
@@ -22,7 +22,7 @@
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
@@ -66,31 +66,31 @@
<div id="page-content">
<div id="region-main-box">
<div id="region-post-box">
-
+
<div id="region-main-wrap">
<div id="region-main">
<div class="region-content">
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</div>
</div>
</div>
-
+
<?php if ($hassidepre) { ?>
<div id="region-pre">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-pre') ?>
</div>
</div>
<?php } ?>
-
+
<?php if ($hassidepost) { ?>
<div id="region-post">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-post') ?>
</div>
</div>
<?php } ?>
-
+
</div>
</div>
</div>
View
4 theme/canvas/layout/report.php
@@ -22,7 +22,7 @@
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
@@ -62,7 +62,7 @@
<!-- START OF CONTENT -->
-
+
<div id="page-content-wrapper" class="clearfix">
<div id="page-content">
<div id="report-main-content">
View
2 theme/formal_white/layout/embedded.php
@@ -8,7 +8,7 @@
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses) ?>">
<?php echo $OUTPUT->standard_top_of_body_html(); ?>
<div id="page-content">
View
2 theme/formal_white/layout/frontpage.php
@@ -47,7 +47,7 @@
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html();
if ($hasframe) { ?>
View
2 theme/formal_white/layout/general.php
@@ -47,7 +47,7 @@
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html();
if ($hasframe) { ?>
View
2 theme/formfactor/layout/embedded.php
@@ -5,7 +5,7 @@
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
View
20 theme/formfactor/layout/frontpage.php
@@ -20,16 +20,16 @@
<head>
<title><?php echo $PAGE->title ?></title>
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
- <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+ <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
<!-- START OF HEADER -->
-
+
<div id="page-header" class="clearfix">
<div id="page-header-wrapper">
<h1 class="headermain"><?php echo $PAGE->heading ?></h1>
@@ -38,19 +38,19 @@
echo $OUTPUT->login_info();
echo $OUTPUT->lang_menu();
echo $PAGE->headingmenu;
- ?>
+ ?>
</div>
</div>
</div>
-
+
<?php if ($hascustommenu) { ?>
<div id="custommenu"><?php echo $custommenu; ?></div>
<?php } else { ?>
<ul id="page-navigation" class="clearfix">
<li>&nbsp;</li>
</ul>
<?php } ?>
-
+
<!-- END OF HEADER -->
<!-- START OF CONTENT -->
@@ -59,31 +59,31 @@
<div id="page-content">
<div id="region-main-box">
<div id="region-post-box">
-
+
<div id="region-main-wrap">
<div id="region-main">
<div class="region-content">
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</div>
</div>
</div>
-
+
<?php if ($hassidepre) { ?>
<div id="region-pre">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-pre') ?>
</div>
</div>
<?php } ?>
-
+
<?php if ($hassidepost) { ?>
<div id="region-post">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-post') ?>
</div>
</div>
<?php } ?>
-
+
</div>
</div>
</div>
View
22 theme/formfactor/layout/general.php
@@ -25,7 +25,7 @@
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
@@ -34,7 +34,7 @@
<div id="page-header" class="clearfix">
<div id="page-header-wrapper">
-
+
<?php if ($hasheading) { ?>
<h1 class="headermain"><?php echo $PAGE->heading ?></h1>
<div class="headermenu">
@@ -46,12 +46,12 @@
echo $PAGE->headingmenu
?>
</div>
- <?php } ?>
-
+ <?php } ?>
+
</div>
</div>
- <?php if ($hasheading) { ?>
+ <?php if ($hasheading) { ?>
<?php if ($hascustommenu) { ?>
<div id="custommenu"><?php echo $custommenu; ?></div>
<?php } else { ?>
@@ -60,46 +60,46 @@
</ul>
<?php } ?>
<?php } ?>
-
+
<?php if ($hasnavbar) { ?>
<div class="navbar clearfix">
<div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
<div class="navbutton"> <?php echo $PAGE->button; ?></div>
</div>
<?php } ?>
-
+
<?php } ?>
<!-- END OF HEADER -->
<div id="page-content-wrapper">
<div id="page-content">
<div id="region-main-box">
<div id="region-post-box">
-
+
<div id="region-main-wrap">
<div id="region-main">
<div class="region-content">
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</div>
</div>
</div>
-
+
<?php if ($hassidepre) { ?>
<div id="region-pre">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-pre') ?>
</div>
</div>
<?php } ?>
-
+
<?php if ($hassidepost) { ?>
<div id="region-post">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-post') ?>
</div>
</div>
<?php } ?>
-
+
</div>
</div>
</div>
View
26 theme/fusion/layout/frontpage.php
@@ -37,11 +37,11 @@
<head>
<title><?php echo $PAGE->title ?></title>
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
- <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+ <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
@@ -69,12 +69,12 @@
<?php } else { ?>
<div id="custommenu" style="line-height:1em;">&nbsp;</div> <!-- temporary until I find a better fix -->
<?php } ?>
-
+
</div>
</div>
</div>
-
+
<!-- END OF HEADER -->
<!-- START OF CONTENT -->
@@ -83,22 +83,22 @@
<div id="page-content">
<div id="region-main-box">
<div id="region-post-box">
-
+
<div id="region-main-wrap">
<div id="region-main">
<div class="region-content">
-
+
<div id="region-header">
<h1 class="headermain"><?php echo $PAGE->heading ?></h1>
<p class="tagline"><?php echo $tagline ?></p>
</div>
-
+
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
-
+
</div>
</div>
</div>
-
+
<?php if ($hassidepost) { ?>
<div id="region-post" class="block-region">
<div id="region-post-wrap-1">
@@ -110,8 +110,8 @@
</div>
</div>
<?php } ?>
-
- </div>
+
+ </div>
</div>
</div>
</div>
@@ -135,8 +135,8 @@
</div>
<!-- END OF FOOTER -->
-
-
+
+
</div> <!-- END #page -->
<?php echo $OUTPUT->standard_end_of_body_html() ?>
View
24 theme/fusion/layout/general.php
@@ -35,7 +35,7 @@
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
@@ -51,15 +51,15 @@
<div id="page-header" class="inside">
<div id="page-header-wrapper" class="wrapper clearfix">
-
+
<?php if ($hasheading) { ?>
<div id="headermenus" class="clearfix">
<div class="headermenu">
<?php if (!empty($PAGE->layout_options['langmenu'])) {
echo $OUTPUT->lang_menu();
}
- echo $OUTPUT->login_info();
- echo $PAGE->headingmenu
+ echo $OUTPUT->login_info();
+ echo $PAGE->headingmenu
?>
</div>
<?php if ($hascustommenu) { ?>
@@ -69,7 +69,7 @@
<?php } ?>
</div>
<?php } ?>
-
+
</div>
</div>
@@ -84,7 +84,7 @@
<div id="page-content">
<div id="region-main-box">
<div id="region-post-box">
-
+
<div id="region-main-wrap">
<div id="region-main">
<div class="region-content">
@@ -105,12 +105,12 @@
</div>
</div>
<?php } ?>
-
+
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</div>
</div>
</div>
-
+
<?php if ($hassidepost) { ?>
<div id="region-post" class="block-region">
<div id="region-post-wrap-1">
@@ -122,7 +122,7 @@
</div>
</div>
<?php } ?>
-
+
</div>
</div>
</div>
@@ -136,9 +136,9 @@
</div>
</div>
-
+
<?php } ?>
-
+
<!-- START OF FOOTER -->
<?php if ($hasfooter) { ?>
@@ -152,7 +152,7 @@
?>
</div>
<?php } ?>
-
+
</div>
<?php echo $OUTPUT->standard_end_of_body_html() ?>
</body>
View
16 theme/leatherbound/layout/frontpage.php
@@ -29,11 +29,11 @@
<head>
<title><?php echo $PAGE->title ?></title>
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
- <meta name="description" content="<?php echo strip_tags(format_text($SITE->summary, FORMAT_HTML)) ?>" />
+ <meta name="description" content="<?php p(strip_tags(format_text($SITE->summary, FORMAT_HTML))) ?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
@@ -47,11 +47,11 @@
echo $OUTPUT->login_info();
echo $OUTPUT->lang_menu();
echo $PAGE->headingmenu;
- ?>
+ ?>
</div>
</div>
</div>
-
+
<!-- END OF HEADER -->
<?php if ($hascustommenu) { ?>
@@ -68,31 +68,31 @@
<div id="page-content">
<div id="region-main-box">
<div id="region-post-box">
-
+
<div id="region-main-wrap">
<div id="region-main">
<div class="region-content">
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</div>
</div>
</div>
-
+
<?php if ($hassidepre) { ?>
<div id="region-pre" class="block-region">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-pre') ?>
</div>
</div>
<?php } ?>
-
+
<?php if ($hassidepost) { ?>
<div id="region-post" class="block-region">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-post') ?>
</div>
</div>
<?php } ?>
-
+
</div>
</div>
</div>
View
12 theme/leatherbound/layout/general.php
@@ -28,7 +28,7 @@
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
@@ -47,7 +47,7 @@
<?php } ?>
</div>
</div>
-
+
<?php if ($hascustommenu) { ?>
<div id="custommenuwrap"><div id="custommenu"><?php echo $custommenu; ?></div></div>
<?php } ?>
@@ -67,31 +67,31 @@
<div id="page-content">
<div id="region-main-box">
<div id="region-post-box">
-
+
<div id="region-main-wrap">
<div id="region-main">
<div class="region-content">
<?php echo core_renderer::MAIN_CONTENT_TOKEN ?>
</div>
</div>
</div>
-
+
<?php if ($hassidepre) { ?>
<div id="region-pre" class="block-region">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-pre') ?>
</div>
</div>
<?php } ?>
-
+
<?php if ($hassidepost) { ?>
<div id="region-post" class="block-region">
<div class="region-content">
<?php echo $OUTPUT->blocks_for_region('side-post') ?>
</div>
</div>
<?php } ?>
-
+
</div>
</div>
</div>
View
2 theme/leatherbound/layout/report.php
@@ -28,7 +28,7 @@
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
View
2 theme/magazine/layout/embedded.php
@@ -5,7 +5,7 @@
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
View
56 theme/magazine/layout/frontpage.php
@@ -29,7 +29,7 @@
<link rel="shortcut icon" href="<?php echo $OUTPUT->pix_url('favicon', 'theme')?>" />
<?php echo $OUTPUT->standard_head_html() ?>
</head>
-<body id="<?php echo $PAGE->bodyid ?>" class="<?php echo $PAGE->bodyclasses.' '.join(' ', $bodyclasses) ?>">
+<body id="<?php p($PAGE->bodyid) ?>" class="<?php p($PAGE->bodyclasses.' '.join(' ', $bodyclasses)) ?>">
<?php echo $OUTPUT->standard_top_of_body_html() ?>
<div id="page">
@@ -38,17 +38,17 @@
<div id="header-wrap">
<div id="header-container">
<div id="headerinner">
-
+
<div id="headleft">
</div>
<div id="headright">
- <?php if ($hasheading) {
+ <?php if ($hasheading) {
echo $OUTPUT->lang_menu();
echo $OUTPUT->login_info();
echo $PAGE->headingmenu;
} ?>
</div>
-
+
</div>
</div>
</div>
@@ -63,8 +63,8 @@
</div>
</div>
<?php } else { ?>
-
-
+
+
<div id="nologo" <?php if(!$hascustommenu) {echo "class='nomenu'";} ?>>
<a href="<?php echo $CFG->wwwroot; ?>" title="Home"><?php echo $PAGE->heading ?></a>
</div>
@@ -92,90 +92,90 @@
<div id="outercontainer">
<div id="container">
<div id="innercontainer">
-
+
<div id="jcontrols_button">
<div class="jcontrolsleft">
<?php if ($hasnavbar) { ?>
<div class="navbar clearfix">
<div class="breadcrumb"> <?php echo $OUTPUT->navbar(); ?></div>
-
+
</div>
<?php } ?>
</div>
-
+
<div class="jcontrolsright">
- <?php if ($hasnavbar) {
- echo $PAGE->button;
+ <?php if ($hasnavbar) {
+ echo $PAGE