From 8319260833faa9694262d94742a4312957abdc33 Mon Sep 17 00:00:00 2001
From: Petr Skoda <skodak@moodle.org>
Date: Wed, 4 Nov 2009 11:58:30 +0000
Subject: [PATCH] MDL-20700 coding style cleanup - cvs keywords removed,
 closign php tag removed, trailing whitespace cleanup

---
 mod/quiz/accessrules.php     |  2 +-
 mod/quiz/addrandom.php       |  4 ++--
 mod/quiz/attempt.php         |  4 ++--
 mod/quiz/attemptlib.php      |  4 ++--
 mod/quiz/backuplib.php       |  4 ++--
 mod/quiz/db/access.php       |  4 ++--
 mod/quiz/db/install.php      |  2 +-
 mod/quiz/db/upgrade.php      |  2 +-
 mod/quiz/edit.js             |  2 +-
 mod/quiz/edit.php            |  4 ++--
 mod/quiz/editlib.php         |  2 +-
 mod/quiz/grade.php           |  4 ++--
 mod/quiz/index.php           |  2 +-
 mod/quiz/locallib.php        |  8 ++++----
 mod/quiz/mod_form.php        |  4 ++--
 mod/quiz/processattempt.php  |  3 +--
 mod/quiz/report.php          | 10 +++++-----
 mod/quiz/report/default.php  |  2 +-
 mod/quiz/restorelib.php      | 26 +++++++++++++-------------
 mod/quiz/restorelibpre15.php |  4 ++--
 mod/quiz/review.php          |  6 +++---
 mod/quiz/reviewquestion.php  |  2 +-
 mod/quiz/settingslib.php     |  3 +--
 mod/quiz/settingstree.php    |  2 +-
 mod/quiz/startattempt.php    |  3 +--
 mod/quiz/summary.php         |  2 +-
 mod/quiz/tabs.php            |  6 +++---
 mod/quiz/version.php         |  4 ++--
 mod/quiz/view.php            |  2 +-
 29 files changed, 62 insertions(+), 65 deletions(-)

diff --git a/mod/quiz/accessrules.php b/mod/quiz/accessrules.php
index 93162a7358..c734ba10ff 100644
--- a/mod/quiz/accessrules.php
+++ b/mod/quiz/accessrules.php
@@ -793,4 +793,4 @@ class safebrowser_access_rule extends quiz_access_rule_base {
         return get_string("safebrowsernotice", "quiz");
     }
 }
-?>
+
diff --git a/mod/quiz/addrandom.php b/mod/quiz/addrandom.php
index e08c1d1c51..a1e6db4528 100644
--- a/mod/quiz/addrandom.php
+++ b/mod/quiz/addrandom.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 /**
  * Fallback page of /mod/quiz/edit.php add random question dialog,
  * for users who do not use javascript.
@@ -95,4 +95,4 @@ $addonpage = optional_param('addonpage_form', 0, PARAM_SEQUENCE);
 $qcobject->display_randomquestion_user_interface($addonpage);
 
 echo $OUTPUT->footer();
-?>
+
diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php
index 051df81edb..9242b15db4 100644
--- a/mod/quiz/attempt.php
+++ b/mod/quiz/attempt.php
@@ -1,4 +1,4 @@
-<?php  // $Id$
+<?php
 /**
  * This page prints a particular instance of quiz
  *
@@ -172,4 +172,4 @@
     // Finish the page
     $accessmanager->show_attempt_timer_if_needed($attemptobj->get_attempt(), time());
     echo $OUTPUT->footer();
-?>
+
diff --git a/mod/quiz/attemptlib.php b/mod/quiz/attemptlib.php
index 37091ba74f..aa9ce353cb 100644
--- a/mod/quiz/attemptlib.php
+++ b/mod/quiz/attemptlib.php
@@ -815,7 +815,7 @@ class quiz_attempt extends quiz {
     }
 
     /**
-     * Given a URL containing attempt={this attempt id}, return an array of variant URLs 
+     * Given a URL containing attempt={this attempt id}, return an array of variant URLs
      * @param $url a URL.
      * @return string HTML fragment. Comma-separated list of links to the other
      * attempts with the attempt number as the link text. The curent attempt is
@@ -1171,4 +1171,4 @@ class quiz_review_nav_panel extends quiz_nav_panel_base {
         return $html;
     }
 }
-?>
+
diff --git a/mod/quiz/backuplib.php b/mod/quiz/backuplib.php
index 6fb47e0bc0..0b3074b5af 100644
--- a/mod/quiz/backuplib.php
+++ b/mod/quiz/backuplib.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
     //This php script contains all the stuff to backup quizzes
 
 //This is the "graphical" structure of the quiz mod:
@@ -580,4 +580,4 @@
                                      WHERE g.quiz = ?", array($instanceid));
     }
 
-?>
+
diff --git a/mod/quiz/db/access.php b/mod/quiz/db/access.php
index 724ee267ca..4403c67f6b 100644
--- a/mod/quiz/db/access.php
+++ b/mod/quiz/db/access.php
@@ -1,4 +1,4 @@
-<?php  // $Id$
+<?php
 /**
  * Capability definitions for the quiz module.
  *
@@ -132,4 +132,4 @@ $mod_quiz_capabilities = array(
         'legacy' => array()
     )
 );
-?>
+
diff --git a/mod/quiz/db/install.php b/mod/quiz/db/install.php
index 5dab01213f..a23a176971 100644
--- a/mod/quiz/db/install.php
+++ b/mod/quiz/db/install.php
@@ -1,4 +1,4 @@
-<?php  //$Id$
+<?php
 
 // This file replaces:
 //   * STATEMENTS section in db/install.xml
diff --git a/mod/quiz/db/upgrade.php b/mod/quiz/db/upgrade.php
index 454122c252..56535a4596 100644
--- a/mod/quiz/db/upgrade.php
+++ b/mod/quiz/db/upgrade.php
@@ -1,4 +1,4 @@
-<?php  // $Id$
+<?php
 
 // This file keeps track of upgrades to
 // the quiz module
diff --git a/mod/quiz/edit.js b/mod/quiz/edit.js
index 06bd0f0be1..88d3c4d6f6 100644
--- a/mod/quiz/edit.js
+++ b/mod/quiz/edit.js
@@ -5,7 +5,7 @@ var quiz_edit = {};
 function quiz_edit_init() {
 
     // Add random question dialogue --------------------------------------------
-    
+
     quiz_edit.randomquestiondialog = new YAHOO.widget.Dialog('randomquestiondialog', {
             modal: true,
             width: '100%',
diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index 8c426624b5..3e01d6e1d1 100644
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -442,7 +442,7 @@ $strupdatemodule = has_capability('moodle/course:manageactivities',
         $contexts->lowest()) ?
         $OUTPUT->update_module_button($cm->id, 'quiz') :
         "";
-        
+
 $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/editlib.php b/mod/quiz/editlib.php
index 999356cf16..c4e73960c2 100644
--- a/mod/quiz/editlib.php
+++ b/mod/quiz/editlib.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
diff --git a/mod/quiz/grade.php b/mod/quiz/grade.php
index 4eba8d71dc..0fea9ae3ad 100644
--- a/mod/quiz/grade.php
+++ b/mod/quiz/grade.php
@@ -1,4 +1,4 @@
-<?php  // $Id$
+<?php
 
     require_once("../../config.php");
 
@@ -24,4 +24,4 @@
         redirect('view.php?id='.$cm->id);
     }
 
-?>
+
diff --git a/mod/quiz/index.php b/mod/quiz/index.php
index 53cfcddb3f..2ea177d12f 100644
--- a/mod/quiz/index.php
+++ b/mod/quiz/index.php
@@ -165,4 +165,4 @@
 
 // Finish the page
     echo $OUTPUT->footer();
-?>
+
diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php
index fb44d52a5a..3bbb164b75 100644
--- a/mod/quiz/locallib.php
+++ b/mod/quiz/locallib.php
@@ -1,4 +1,4 @@
-<?php  // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -367,7 +367,7 @@ function quiz_repaginate($layout, $perpage, $shuffle = false) {
 /**
  * Creates an array of maximum grades for a quiz
  * The grades are extracted from the quiz_question_instances table.
- * 
+ *
  * @param integer $quiz The quiz object
  * @return array Array of grades indexed by question id. These are the maximum
  *      possible grades that students can achieve for each of the questions.
@@ -1186,7 +1186,7 @@ function quiz_send_notification_emails($course, $quiz, $attempt, $context, $cm)
  * - Remove duplicate question id's
  * - Remove extra "," from beginning and end
  * - Finally, add a ",0" in the end if there is none
- * 
+ *
  * @param $string $layout the quiz layout to clean up, usually from $quiz->questions.
  * @param boolean $removeemptypages If true, remove empty pages from the quiz. False by default.
  * @return $string the cleaned-up layout
@@ -1246,7 +1246,7 @@ function quiz_error($quiz, $errorcode, $a = null) {
 
 /**
  * Checks if browser is safe browser
- * 
+ *
  * @return true, if browser is safe browser else false
 */
 function quiz_check_safe_browser() {
diff --git a/mod/quiz/mod_form.php b/mod/quiz/mod_form.php
index 03c6e7b375..83b98d6c93 100644
--- a/mod/quiz/mod_form.php
+++ b/mod/quiz/mod_form.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -437,4 +437,4 @@ class mod_quiz_mod_form extends moodleform_mod {
     }
 
 }
-?>
+
diff --git a/mod/quiz/processattempt.php b/mod/quiz/processattempt.php
index fef967d8cf..81671d8ccb 100644
--- a/mod/quiz/processattempt.php
+++ b/mod/quiz/processattempt.php
@@ -1,4 +1,4 @@
-<?php  // $Id$
+<?php
 /**
  * This page deals with processing responses during an attempt at a quiz.
  *
@@ -197,4 +197,3 @@ $accessmanager->clear_password_access();
 
 /// Send the user to the review page.
 redirect($attemptobj->review_url());
-?>
\ No newline at end of file
diff --git a/mod/quiz/report.php b/mod/quiz/report.php
index 69813442cc..503d85b0bb 100644
--- a/mod/quiz/report.php
+++ b/mod/quiz/report.php
@@ -1,4 +1,4 @@
-<?php  // $Id$
+<?php
 
 // This script uses installed report plugins to print quiz reports
 
@@ -46,10 +46,10 @@
         $url->param('mode', $mode);
     }
     $PAGE->set_url($url);
-    
+
     require_login($course, false, $cm);
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
-    
+
     $reportlist = quiz_report_list($context);
     if (count($reportlist)==0){
         print_error('erroraccessingreport', 'quiz');
@@ -59,7 +59,7 @@
     } elseif (!in_array($mode, $reportlist)){
         print_error('erroraccessingreport', 'quiz');
     }
-    
+
     // if no questions have been set up yet redirect to edit.php
     if (!$quiz->questions and has_capability('mod/quiz:manage', $context)) {
         redirect('edit.php?cmid='.$cm->id);
@@ -97,4 +97,4 @@
 
     echo $OUTPUT->footer();
 
-?>
+
diff --git a/mod/quiz/report/default.php b/mod/quiz/report/default.php
index 4fd7cf9599..52d6e921de 100644
--- a/mod/quiz/report/default.php
+++ b/mod/quiz/report/default.php
@@ -1,4 +1,4 @@
-<?php  // $Id$
+<?php
 
 ////////////////////////////////////////////////////////////////////
 /// Default class for report plugins
diff --git a/mod/quiz/restorelib.php b/mod/quiz/restorelib.php
index d4fdf7736c..4b5fc32363 100644
--- a/mod/quiz/restorelib.php
+++ b/mod/quiz/restorelib.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
     //This php script contains all the stuff to restore quiz mods
 
 // Todo:
@@ -56,7 +56,7 @@
             //if necessary, write to restorelog and adjust date/time fields
             if ($restore->course_startdateoffset) {
                 restore_log_date_changes('Quiz', $restore, $info['MOD']['#'], array('TIMEOPEN', 'TIMECLOSE'));
-            }            
+            }
             //traverse_xmlize($info);                                                                     //Debug
             //print_object ($GLOBALS['traverse_array']);                                                  //Debug
             //$GLOBALS['traverse_array']="";                                                              //Debug
@@ -65,7 +65,7 @@
             $quiz = new stdClass;
             $quiz->course = $restore->course_id;
             $quiz->name = backup_todb($info['MOD']['#']['NAME']['0']['#']);
-            $quiz->intro = backup_todb($info['MOD']['#']['INTRO']['0']['#']); 
+            $quiz->intro = backup_todb($info['MOD']['#']['INTRO']['0']['#']);
             $quiz->timeopen = backup_todb($info['MOD']['#']['TIMEOPEN']['0']['#']);
             $quiz->timeclose = backup_todb($info['MOD']['#']['TIMECLOSE']['0']['#']);
             $quiz->optionflags = backup_todb($info['MOD']['#']['OPTIONFLAGS']['0']['#']);
@@ -208,20 +208,20 @@
                 //traverse_xmlize($feedback_info);                                                            //Debug
                 //print_object ($GLOBALS['traverse_array']);                                                  //Debug
                 //$GLOBALS['traverse_array']="";                                                              //Debug
-    
+
                 //We'll need this later!!
                 $oldid = backup_todb($feedback_info['#']['ID']['0']['#']);
-    
+
                 //Now, build the quiz_feedback record structure
                 $feedback = new stdClass();
                 $feedback->quizid = $quiz_id;
                 $feedback->feedbacktext = backup_todb($feedback_info['#']['FEEDBACKTEXT']['0']['#']);
                 $feedback->mingrade = backup_todb($feedback_info['#']['MINGRADE']['0']['#']);
                 $feedback->maxgrade = backup_todb($feedback_info['#']['MAXGRADE']['0']['#']);
-    
+
                 //The structure is equal to the db, so insert the quiz_question_instances
                 $newid = $DB->insert_record('quiz_feedback', $feedback);
-    
+
                 if ($newid) {
                     //We have the newid, update backup_ids
                     backup_putid($restore->backup_unique_code, 'quiz_feedback', $oldid, $newid);
@@ -387,11 +387,11 @@
     //in the restore process
     function quiz_decode_content_links ($content,$restore) {
         global $CFG;
-            
+
         $result = $content;
-                
+
         //Link to the list of quizs
-                
+
         $searchstring='/\$@(QUIZINDEX)\*([0-9]+)@\$/';
         //We look for it
         preg_match_all($searchstring,$content,$foundset);
@@ -408,7 +408,7 @@
                 if($rec->new_id) {
                     //Now replace it
                     $result= preg_replace($searchstring,$CFG->wwwroot.'/mod/quiz/index.php?id='.$rec->new_id,$result);
-                } else { 
+                } else {
                     //It's a foreign link so leave it as original
                     $result= preg_replace($searchstring,$restore->original_wwwroot.'/mod/quiz/index.php?id='.$old_id,$result);
                 }
@@ -474,7 +474,7 @@
     function quiz_decode_content_links_caller($restore) {
         global $CFG, $DB;
         $status = true;
-        
+
         if ($quizs = $DB->get_records('quiz', array('course'=>$restore->course_id), '', "id,intro")) {
                                                //Iterate over each quiz->intro
             $i = 0;   //Counter to send some output to the browser to avoid timeouts
@@ -775,4 +775,4 @@
         return implode(',', $questionids);
     }
 
-?>
+
diff --git a/mod/quiz/restorelibpre15.php b/mod/quiz/restorelibpre15.php
index 4fc900807e..7203b889f3 100644
--- a/mod/quiz/restorelibpre15.php
+++ b/mod/quiz/restorelibpre15.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
     //This php script contains all the stuff to backup/restore
     //quiz mods
 
@@ -1904,4 +1904,4 @@
         }
         return $status;
     }
-?>
+
diff --git a/mod/quiz/review.php b/mod/quiz/review.php
index d744696a5f..bbc77a6086 100644
--- a/mod/quiz/review.php
+++ b/mod/quiz/review.php
@@ -1,4 +1,4 @@
-<?php  // $Id$
+<?php
 /**
  * This page prints a review of a particular quiz attempt
  *
@@ -56,7 +56,7 @@
         $questionids = $attemptobj->get_question_ids();
     } else {
         $questionids = $attemptobj->get_question_ids($page);
-    } 
+    }
     $attemptobj->load_questions($questionids);
     $attemptobj->load_question_states($questionids);
 
@@ -258,4 +258,4 @@
     echo "</div>";
 
     echo $OUTPUT->footer();
-?>
+
diff --git a/mod/quiz/reviewquestion.php b/mod/quiz/reviewquestion.php
index 6198176c6f..c1aaf41139 100644
--- a/mod/quiz/reviewquestion.php
+++ b/mod/quiz/reviewquestion.php
@@ -129,4 +129,4 @@
 
 /// Finish the page
     echo $OUTPUT->footer();
-?>
+
diff --git a/mod/quiz/settingslib.php b/mod/quiz/settingslib.php
index 96f8b1ff5d..b81a2906c1 100644
--- a/mod/quiz/settingslib.php
+++ b/mod/quiz/settingslib.php
@@ -1,4 +1,4 @@
-<?php  // $Id$
+<?php
 
 if (!defined('MOODLE_INTERNAL')) {
     die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page.
@@ -92,4 +92,3 @@ class admin_setting_quiz_reviewoptions extends admin_setting {
                 $this->description, true, '', get_string('everythingon', 'quiz'), $query);
     }
 }
-?>
\ No newline at end of file
diff --git a/mod/quiz/settingstree.php b/mod/quiz/settingstree.php
index 12d194e37d..93e1a72de2 100644
--- a/mod/quiz/settingstree.php
+++ b/mod/quiz/settingstree.php
@@ -1,4 +1,4 @@
-<?php  // $Id$
+<?php
 /**
  * settingstree.php - Tells the admin menu that there are sub menu pages to
  * include for this activity.
diff --git a/mod/quiz/startattempt.php b/mod/quiz/startattempt.php
index 2967aebd98..5b27af7c72 100644
--- a/mod/quiz/startattempt.php
+++ b/mod/quiz/startattempt.php
@@ -1,4 +1,4 @@
-<?php  // $Id$
+<?php
 /**
  * This page deals with starting a new attempt at a quiz.
  *
@@ -122,4 +122,3 @@ foreach ($quizobj->get_questions() as $i => $question) {
 
 /// Redirect to the attempt page.
 redirect($quizobj->attempt_url($attempt->id));
-?>
\ No newline at end of file
diff --git a/mod/quiz/summary.php b/mod/quiz/summary.php
index 999894d088..b9b24709e5 100644
--- a/mod/quiz/summary.php
+++ b/mod/quiz/summary.php
@@ -136,4 +136,4 @@ echo $OUTPUT->container_end();
 $accessmanager->show_attempt_timer_if_needed($attemptobj->get_attempt(), time());
 echo $OUTPUT->footer();
 
-?>
+
diff --git a/mod/quiz/tabs.php b/mod/quiz/tabs.php
index 8b0e16a7af..189442fe3a 100644
--- a/mod/quiz/tabs.php
+++ b/mod/quiz/tabs.php
@@ -1,4 +1,4 @@
-<?php  // $Id$
+<?php
 /**
  * Sets up the tabs used by the quiz pages based on the users capabilites.
  *
@@ -62,7 +62,7 @@ if ($currenttab == 'reports' and isset($mode)) {
     $currenttab = '';
 
     $reportlist = quiz_report_list($context);
-    
+
     foreach ($reportlist as $report) {
         $row[] = new tabobject($report, "$CFG->wwwroot/mod/quiz/report.php?q=$quiz->id&amp;mode=$report",
                                 get_string($report, 'quiz_'.$report));
@@ -97,4 +97,4 @@ if (!$quiz->questions) {
 
 print_tabs($tabs, $currenttab, $inactive, $activated);
 
-?>
+
diff --git a/mod/quiz/version.php b/mod/quiz/version.php
index f10172d34e..1503d351b8 100644
--- a/mod/quiz/version.php
+++ b/mod/quiz/version.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ////////////////////////////////////////////////////////////////////////////////
 //  Code fragment to define the version of quiz
@@ -9,4 +9,4 @@ $module->version  = 2009042000;   // The (date) version of this module
 $module->requires = 2009041700;   // Requires this Moodle version
 $module->cron     = 0;            // How often should cron check this module (seconds)?
 
-?>
+
diff --git a/mod/quiz/view.php b/mod/quiz/view.php
index eccfc5f597..45a38fd8dc 100644
--- a/mod/quiz/view.php
+++ b/mod/quiz/view.php
@@ -1,4 +1,4 @@
-<?php  // $Id$
+<?php
 
 /// This page prints a particular instance of quiz
 
-- 
2.39.5