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

This commit is contained in:
samhemelryk 2009-09-07 07:20:14 +00:00
parent b87573d7ae
commit 70f25518ad
5 changed files with 15 additions and 6 deletions

View file

@ -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()) {

View file

@ -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();

View file

@ -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">

View file

@ -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);

View file

@ -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);