From: samhemelryk <samhemelryk>
Date: Mon, 7 Sep 2009 07:20:14 +0000 (+0000)
Subject: core MDL-19799 Updated print_header and build_navigation to OUTPUT and PAGE equivalents
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=70f25518adc521922482fd9a15f9b776881d8a3d;p=moodle.git

core MDL-19799 Updated print_header and build_navigation to OUTPUT and PAGE equivalents
---

diff --git a/error/index.php b/error/index.php
index 450f4b54b7..dbe2157a54 100644
--- a/error/index.php
+++ b/error/index.php
@@ -45,8 +45,10 @@
     header("HTTP/1.0 404 Not Found");
     header("Status: 404 Not Found");
 
-    print_header($site->fullname .':Error', $site->fullname .': Error 404', 'Error 404 - File not Found', '');
-
+    $PAGE->set_title($site->fullname .':Error');
+    $PAGE->set_heading($site->fullname .': Error 404');
+    $PAGE->navbar->add('Error 404 - File not Found');
+    echo $OUTPUT->header();
     echo $OUTPUT->box(get_string('pagenotexist', 'error'). '<br />'.s($requesturi), 'generalbox boxaligncenter');
 
     if (isloggedin()) {
diff --git a/help.php b/help.php
index 4fc66f050c..8bca3cec70 100644
--- a/help.php
+++ b/help.php
@@ -93,7 +93,8 @@ if(preg_match('~(##emoticons_html##)~', $output, $matches)) {
 }
 
 // Do the main output.
-print_header($title);
+$PAGE->set_title($title);
+echo $OUTPUT->header();
 echo $OUTPUT->box_start();
 print $output;
 echo $OUTPUT->box_end();
diff --git a/sso/hive/expired.php b/sso/hive/expired.php
index bd74315aaa..1079173b19 100644
--- a/sso/hive/expired.php
+++ b/sso/hive/expired.php
@@ -9,7 +9,7 @@
 
     //MW theres no easy way to log in seamlessly. We need the users unhashed password.
     // It's a security risk to carry that in $SESSION so we put up login form.
-    print_header();
+    echo $OUTPUT->header();
     echo $OUTPUT->notification('Your session has expired. Please log in again.'); 
 ?>
       <form action="login.php" method="post" id="login">
diff --git a/userpix/index.php b/userpix/index.php
index 58e66f62bd..24454189ab 100644
--- a/userpix/index.php
+++ b/userpix/index.php
@@ -19,7 +19,10 @@
 
     $title = get_string("users");
 
-    print_header($title, $title, build_navigation(array(array('name' => $title, 'link' => null, 'type' => 'misc'))));
+    $PAGE->navbar->add($title);
+    $PAGE->set_title($title);
+    $PAGE->set_heading($title);
+    echo $OUTPUT->header();
 
     foreach ($users as $user) {
         $fullname = fullname($user);
diff --git a/userpix/upgrade.php b/userpix/upgrade.php
index bcf1e77e60..fe1cd6c85a 100644
--- a/userpix/upgrade.php
+++ b/userpix/upgrade.php
@@ -15,7 +15,10 @@
 
     $title = get_string("users");
 
-    print_header($title, $title, build_navigation(array(array('name' => $title, 'link' => null, 'type' => 'misc'))));
+    $PAGE->navbar->add($title);
+    $PAGE->set_title($title);
+    $PAGE->set_heading($title);
+    echo $OUTPUT->header();
 
     foreach ($users as $user) {
         upgrade_profile_image($user->id);