Skip to content

Commit

Permalink
Merge branch '44180-27' of git://github.com/samhemelryk/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
danpoltawski committed Mar 5, 2014
2 parents 3be87d8 + 01773a6 commit a59b2e1
Show file tree
Hide file tree
Showing 32 changed files with 76 additions and 105 deletions.
7 changes: 3 additions & 4 deletions mod/quiz/accessmanager.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
/**
* Classes to enforce the various access rules that can apply to a quiz.
*
* @package mod
* @subpackage quiz
* @copyright 2009 Tim Hunt
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_quiz
* @copyright 2009 Tim Hunt
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/


Expand Down
7 changes: 3 additions & 4 deletions mod/quiz/accessmanager_form.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
/**
* Defines the form that limits student's access to attempt a quiz.
*
* @package mod
* @subpackage quiz
* @copyright 2011 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_quiz
* @copyright 2011 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/


Expand Down
7 changes: 3 additions & 4 deletions mod/quiz/accessrule/accessrulebase.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
/**
* Base class for rules that restrict the ability to attempt a quiz.
*
* @package mod
* @subpackage quiz
* @copyright 2011 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_quiz
* @copyright 2011 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/


Expand Down
7 changes: 3 additions & 4 deletions mod/quiz/addrandom.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@
* Fallback page of /mod/quiz/edit.php add random question dialog,
* for users who do not use javascript.
*
* @package mod
* @subpackage quiz
* @copyright 2008 Olli Savolainen
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_quiz
* @copyright 2008 Olli Savolainen
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/


Expand Down
7 changes: 3 additions & 4 deletions mod/quiz/addrandomform.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
/**
* Defines the Moodle forum used to add random questions to the quiz.
*
* @package mod
* @subpackage quiz
* @copyright 2008 Olli Savolainen
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_quiz
* @copyright 2008 Olli Savolainen
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
/**
* Defines the base class for quiz access plugins backup code.
*
* @package mod
* @subpackage quiz
* @copyright 2011 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_quiz
* @copyright 2011 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/


Expand Down
2 changes: 1 addition & 1 deletion mod/quiz/backup/moodle2/backup_quiz_stepslib.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.

/**
* @package moodlecore
* @package mod_quiz
* @subpackage backup-moodle2
* @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
/**
* Restore code for the quizaccess_honestycheck plugin.
*
* @package mod
* @subpackage quiz
* @copyright 2011 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_quiz
* @copyright 2011 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.

/**
* @package moodlecore
* @package mod_quiz
* @subpackage backup-moodle2
* @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
Expand Down
2 changes: 1 addition & 1 deletion mod/quiz/backup/moodle2/restore_quiz_stepslib.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.

/**
* @package moodlecore
* @package mod_quiz
* @subpackage backup-moodle2
* @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
Expand Down
7 changes: 3 additions & 4 deletions mod/quiz/comment.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@
* This page allows the teacher to enter a manual grade for a particular question.
* This page is expected to only be used in a popup window.
*
* @package mod
* @subpackage quiz
* @copyright gustav delius 2006
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_quiz
* @copyright gustav delius 2006
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

require_once('../../config.php');
Expand Down
7 changes: 3 additions & 4 deletions mod/quiz/db/messages.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
/**
* Defines message providers (types of message sent) for the quiz module.
*
* @package mod
* @subpackage quiz
* @copyright 2010 Andrew Davis http://moodle.com
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_quiz
* @copyright 2010 Andrew Davis http://moodle.com
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

defined('MOODLE_INTERNAL') || die();
Expand Down
7 changes: 3 additions & 4 deletions mod/quiz/db/subplugins.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
/**
* Sub-plugin definitions for the quiz module.
*
* @package mod
* @subpackage quiz
* @copyright 2010 Petr Skoda
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_quiz
* @copyright 2010 Petr Skoda
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

defined('MOODLE_INTERNAL') || die();
Expand Down
3 changes: 1 addition & 2 deletions mod/quiz/edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
* delete Removes a question from the quiz
* savechanges Saves the order and grades for questions in the quiz
*
* @package mod
* @subpackage quiz
* @package mod_quiz
* @copyright 1999 onwards Martin Dougiamas and others {@link http://moodle.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
Expand Down
3 changes: 1 addition & 2 deletions mod/quiz/editlib.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
* the module-indpendent code for handling questions and which in turn
* initialises all the questiontype classes.
*
* @package mod
* @subpackage quiz
* @package mod_quiz
* @copyright 1999 onwards Martin Dougiamas and others {@link http://moodle.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
Expand Down
3 changes: 1 addition & 2 deletions mod/quiz/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
/**
* This script lists all the instances of quiz in a particular course
*
* @package mod
* @subpackage quiz
* @package mod_quiz
* @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
Expand Down
7 changes: 3 additions & 4 deletions mod/quiz/lang/en/quiz.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
/**
* Strings for component 'quiz', language 'en', branch 'MOODLE_20_STABLE'
*
* @package mod
* @subpackage quiz
* @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_quiz
* @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

$string['accessnoticesheader'] = 'You can preview this quiz, but if this were a real attempt, you would be blocked because:';
Expand Down
3 changes: 1 addition & 2 deletions mod/quiz/lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
* This contains functions that are called also from outside the quiz module
* Functions that are only called by the quiz module itself are in {@link locallib.php}
*
* @package mod
* @subpackage quiz
* @package mod_quiz
* @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
Expand Down
3 changes: 1 addition & 2 deletions mod/quiz/locallib.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
* the module-indpendent code for handling questions and which in turn
* initialises all the questiontype classes.
*
* @package mod
* @subpackage quiz
* @package mod_quiz
* @copyright 1999 onwards Martin Dougiamas and others {@link http://moodle.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
Expand Down
3 changes: 1 addition & 2 deletions mod/quiz/mod_form.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
/**
* Defines the quiz module ettings form.
*
* @package mod
* @subpackage quiz
* @package mod_quiz
* @copyright 2006 Jamie Pratt
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
Expand Down
3 changes: 1 addition & 2 deletions mod/quiz/override_form.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
/**
* Settings form for overrides in the quiz module.
*
* @package mod
* @subpackage quiz
* @package mod_quiz
* @copyright 2010 Matt Petro
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
Expand Down
7 changes: 3 additions & 4 deletions mod/quiz/overrideedit.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
/**
* This page handles editing and creation of quiz overrides
*
* @package mod
* @subpackage quiz
* @copyright 2010 Matt Petro
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_quiz
* @copyright 2010 Matt Petro
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/


Expand Down
7 changes: 3 additions & 4 deletions mod/quiz/processattempt.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@
*
* This code used to be near the top of attempt.php, if you are looking for CVS history.
*
* @package mod
* @subpackage quiz
* @copyright 2009 Tim Hunt
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_quiz
* @copyright 2009 Tim Hunt
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

require_once(dirname(__FILE__) . '/../../config.php');
Expand Down
7 changes: 3 additions & 4 deletions mod/quiz/renderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
/**
* Defines the renderer for the quiz module.
*
* @package mod
* @subpackage quiz
* @copyright 2011 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_quiz
* @copyright 2011 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/


Expand Down
7 changes: 3 additions & 4 deletions mod/quiz/report.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
/**
* This script controls the display of the quiz reports.
*
* @package mod
* @subpackage quiz
* @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_quiz
* @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/


Expand Down
7 changes: 3 additions & 4 deletions mod/quiz/reviewquestion.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@
* This page prints a review of a particular question attempt.
* This page is expected to only be used in a popup window.
*
* @package mod
* @subpackage quiz
* @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_quiz
* @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/


Expand Down
7 changes: 3 additions & 4 deletions mod/quiz/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
/**
* Administration settings definitions for the quiz module.
*
* @package mod
* @subpackage quiz
* @copyright 2010 Petr Skoda
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_quiz
* @copyright 2010 Petr Skoda
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/


Expand Down
7 changes: 3 additions & 4 deletions mod/quiz/settingslib.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@
* This page is the entry page into the quiz UI. Displays information about the
* quiz to students and teachers, and lets students see their previous attempts.
*
* @package mod
* @subpackage quiz
* @copyright 2008 Tim Hunt
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_quiz
* @copyright 2008 Tim Hunt
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/


Expand Down
7 changes: 3 additions & 4 deletions mod/quiz/summary.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
/**
* This page prints a summary of a quiz attempt before it is submitted.
*
* @package mod
* @subpackage quiz
* @copyright 2009 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_quiz
* @copyright 2009 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/


Expand Down
7 changes: 3 additions & 4 deletions mod/quiz/tests/quizobj_test.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
/**
* Unit tests for the quiz class.
*
* @package mod
* @subpackage quiz
* @copyright 2008 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_quiz
* @copyright 2008 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/


Expand Down
7 changes: 3 additions & 4 deletions mod/quiz/version.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
/**
* Quiz statistics report version information.
*
* @package mod
* @subpackage quiz
* @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @package mod_quiz
* @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

defined('MOODLE_INTERNAL') || die();
Expand Down
Loading

0 comments on commit a59b2e1

Please sign in to comment.