From 2698e9c1ace11ba48979e281562c150060e37c2f Mon Sep 17 00:00:00 2001
From: samhemelryk <samhemelryk>
Date: Mon, 7 Sep 2009 02:11:54 +0000
Subject: [PATCH] mod-quiz MDL-19813 Updated print_header and build_navigation
 to OUTPUT and PAGE equivalents

---
 mod/quiz/accessrules.php    | 15 ++++++++++-----
 mod/quiz/addrandom.php      |  2 +-
 mod/quiz/attemptlib.php     |  4 +++-
 mod/quiz/comment.php        |  2 +-
 mod/quiz/edit.php           |  4 ++--
 mod/quiz/index.php          |  5 +----
 mod/quiz/report/default.php |  1 -
 mod/quiz/reviewquestion.php |  4 ++--
 mod/quiz/view.php           |  6 ++++--
 9 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/mod/quiz/accessrules.php b/mod/quiz/accessrules.php
index 0d5c3aa1550..36e3d8b2527 100644
--- a/mod/quiz/accessrules.php
+++ b/mod/quiz/accessrules.php
@@ -226,7 +226,7 @@ class quiz_access_manager {
         global $CFG, $OUTPUT;
         $url = $this->_quizobj->view_url();
         if ($this->securewindow_required($canpreview)) {
-            print_header();
+            echo $OUTPUT->header();
             echo $OUTPUT->box_start();
             if ($message) {
                 echo '<p>' . $message . '</p><p>' . get_string('windowclosing', 'quiz') . '</p>';
@@ -599,7 +599,7 @@ class password_access_rule extends quiz_access_rule_base {
      * @return mixed return null, unless $return is true, and a form needs to be displayed.
      */
     public function do_password_check($canpreview, $accessmanager, $return = false) {
-        global $CFG, $SESSION, $OUTPUT;
+        global $CFG, $SESSION, $OUTPUT, $PAGE;
 
     /// We have already checked the password for this quiz this session, so don't ask again.
         if (!empty($SESSION->passwordcheckedquizzes[$this->_quiz->id])) {
@@ -623,7 +623,8 @@ class password_access_rule extends quiz_access_rule_base {
 
     /// Start the page and print the quiz intro, if any.
         if (!$return) {
-            print_header('', '', '', 'quizpassword');
+            $PAGE->set_focuscontrol('quizpassword');
+            echo $OUTPUT->header();
         }
         if (trim(strip_tags($this->_quiz->intro))) {
             $cm = get_coursemodule_from_id('quiz', $this->_quiz->id);
@@ -744,11 +745,15 @@ class securewindow_access_rule extends quiz_access_rule_base {
      *
      * @param string $title HTML title tag content, passed to printheader.
      * @param string $headtags extra stuff to go in the HTML head tag, passed to printheader.
+     *                $headtags has been deprectaed since Moodle 2.0
      */
-    public function setup_secure_page($title, $headtags) {
+    public function setup_secure_page($title, $headtags=null) {
+        global $OUTPUT, $PAGE;
     /// This prevents the message window coming up.
         define('MESSAGE_WINDOW', true);
-        print_header($title, '', '', '', $headtags, false, '', '', false, '');
+        $PAGE->set_title($title);
+        $PAGE->set_cacheable(false);
+        echo $OUTPUT->header();
         echo "\n\n", '<script type="text/javascript">';
     /// This used to be in protect_js.php. I really don't understand this bit.
     /// I have just moved it here for cleanliness reasons.
diff --git a/mod/quiz/addrandom.php b/mod/quiz/addrandom.php
index 3e445eed827..60ab5b9528b 100644
--- a/mod/quiz/addrandom.php
+++ b/mod/quiz/addrandom.php
@@ -71,7 +71,7 @@ $strupdatemodule = '';
 if (has_capability('moodle/course:manageactivities', $contexts->lowest())) {
     $strupdatemodule = update_module_button($cm->id, $course->id, get_string('modulename', 'quiz'));
 }
-$navigation = build_navigation($streditingquiz, $cm);
+$PAGE->navbar->add($streditingquiz);
 print_header_simple($streditingquiz, '', $navigation, '', '', true, $strupdatemodule);
 
 if (!$quizname = $DB->get_field($cm->modname, 'name', array('id' => $cm->instance))) {
diff --git a/mod/quiz/attemptlib.php b/mod/quiz/attemptlib.php
index f04ce3a0cf0..93419d9f21f 100644
--- a/mod/quiz/attemptlib.php
+++ b/mod/quiz/attemptlib.php
@@ -334,7 +334,9 @@ class quiz {
      * parameter.
      */
     public function navigation($title) {
-        return build_navigation($title, $this->cm);
+        global $PAGE;
+        $PAGE->navbar->add($title);
+        return '';
     }
 
     // Private methods =====================================================================
diff --git a/mod/quiz/comment.php b/mod/quiz/comment.php
index 3aa5154e373..fe3abc3fd50 100644
--- a/mod/quiz/comment.php
+++ b/mod/quiz/comment.php
@@ -35,7 +35,7 @@
             $attemptobj->get_quizid(), $attemptobj->get_cmid());
 
 /// Print the page header
-    print_header();
+    echo $OUTPUT->header();
     echo $OUTPUT->heading(format_string($attemptobj->get_question($questionid)->name));
 
 /// Process any data that was submitted.
diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index d2d2f2f8083..fa371944f75 100644
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -443,8 +443,8 @@ $strupdatemodule = has_capability('moodle/course:manageactivities',
         update_module_button($cm->id, $course->id,
         get_string('modulename', 'quiz')) :
         "";
-$navigation = build_navigation($pagetitle, $cm);
-
+        
+$PAGE->navbar->add($pagetitle);
 $PAGE->requires->skip_link_to('questionbank',  get_string('skipto', 'access', get_string('questionbank', 'question')));
 $PAGE->requires->skip_link_to('quizcontentsblock',  get_string('skipto', 'access', get_string('questionsinthisquiz', 'quiz')));
 
diff --git a/mod/quiz/index.php b/mod/quiz/index.php
index 82fce37da3f..f34bc9f5b61 100644
--- a/mod/quiz/index.php
+++ b/mod/quiz/index.php
@@ -30,10 +30,7 @@
                    </div>
                  </form>";
     }
-    $navlinks = array();
-    $navlinks[] = array('name' => $strquizzes, 'link' => '', 'type' => 'activity');
-    $navigation = build_navigation($navlinks);
-
+    $PAGE->navbar->add($strquizzes);
     print_header_simple($strquizzes, '', $navigation,
                  '', '', true, $streditquestions, navmenu($course));
 
diff --git a/mod/quiz/report/default.php b/mod/quiz/report/default.php
index b77bd1eff23..5a38a7e0f0d 100644
--- a/mod/quiz/report/default.php
+++ b/mod/quiz/report/default.php
@@ -27,7 +27,6 @@ class quiz_default_report {
         $strquizzes = get_string("modulenameplural", "quiz");
         $strquiz  = get_string("modulename", "quiz");
     /// Print the page header
-        $navigation = build_navigation('', $cm);
         
         print_header_simple(format_string($quiz->name), "", $navigation,
                      '', '', true, update_module_button($cm->id, $course->id, $strquiz), navmenu($course, $cm));
diff --git a/mod/quiz/reviewquestion.php b/mod/quiz/reviewquestion.php
index 8c5181284da..f02fb41e08c 100644
--- a/mod/quiz/reviewquestion.php
+++ b/mod/quiz/reviewquestion.php
@@ -62,9 +62,9 @@
             $attemptobj->get_quizid(), $attemptobj->get_cmid());
 
 /// Print the page header
-    $headtags = $attemptobj->get_question_html_head_contributions($questionid);
-    print_header('', '', '', '', $headtags);
+    $attemptobj->get_question_html_head_contributions($questionid);
 
+    echo $OUTPUT->header();
     echo '<div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>'; // for overlib
 
 /// Print infobox
diff --git a/mod/quiz/view.php b/mod/quiz/view.php
index 8b082b9a60e..708eb15f231 100644
--- a/mod/quiz/view.php
+++ b/mod/quiz/view.php
@@ -83,8 +83,10 @@
     }
     $buttons .= '</tr></table>';
 
-    $navigation = build_navigation(array(), $cm);
-    print_header($title, $course->fullname, $navigation, '', '', true, $buttons, navmenu($course, $cm), false, $bodytags);
+    $PAGE->set_title($title);
+    $PAGE->set_heading($course->fullname);
+    $PAGE->set_button($buttons);
+    echo $OUTPUT->header();
 
 /// Print heading and tabs (if there is more than one).
     $currenttab = 'info';