MDL-20636 Fix @package names and PHPdoc layout.

question/format/aiken/lang/en/qformat_aiken.php

@@ -18,9 +18,10 @@
 /**
  * Strings for component 'qformat_aiken', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package   qformat_aiken
- * @copyright 2010 Helen Foster
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    qformat
+ * @subpackage aiken
+ * @copyright  2010 Helen Foster
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 $string['aiken'] = 'Aiken format';

question/format/blackboard/lang/en/qformat_blackboard.php

@@ -18,9 +18,10 @@
 /**
  * Strings for component 'qformat_blackboard', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package   qformat_blackboard
- * @copyright 2010 Helen Foster
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    qformat
+ * @subpackage blackboard
+ * @copyright  2010 Helen Foster
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 $string['blackboard'] = 'Blackboard';

question/format/blackboard_six/lang/en/qformat_blackboard_six.php

@@ -18,9 +18,10 @@
 /**
  * Strings for component 'qformat_blackboard_six', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package   qformat_blackboard_six
- * @copyright 2010 Helen Foster
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    qformat
+ * @subpackage blackboard_six
+ * @copyright  2010 Helen Foster
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 $string['blackboard_six'] = 'Blackboard V6+';

question/format/examview/lang/en/qformat_examview.php

@@ -18,9 +18,10 @@
 /**
  * Strings for component 'qformat_examview', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package   qformat_examview
- * @copyright 2010 Helen Foster
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    qformat
+ * @subpackage examview
+ * @copyright  2010 Helen Foster
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 $string['examview'] = 'Examview';

question/format/gift/lang/en/qformat_gift.php

@@ -18,9 +18,10 @@
 /**
  * Strings for component 'qformat_gift', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package   qformat_gift
- * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    qformat
+ * @subpackage gift
+ * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 $string['nohandler'] = 'No handler for question type {$a}';

question/format/gift/simpletest/testgiftformat.php

@@ -19,9 +19,10 @@
 /**
  * Unit tests for the Moodle GIFT format.
  *
- * @package qformat_xml
- * @copyright 2010 The Open University
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    qformat
+ * @subpackage gift
+ * @copyright  2010 The Open University
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 require_once($CFG->libdir . '/questionlib.php');

question/format/learnwise/lang/en/qformat_learnwise.php

@@ -18,9 +18,10 @@
 /**
  * Strings for component 'qformat_learnwise', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package   qformat_learnwise
- * @copyright 2010 Helen Foster
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    qformat
+ * @subpackage learnwise
+ * @copyright  2010 Helen Foster
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 $string['learnwise'] = 'Learnwise format';

question/format/missingword/lang/en/qformat_missingword.php

@@ -18,9 +18,10 @@
 /**
  * Strings for component 'qformat_missingword', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package   qformat_missingword
- * @copyright 2010 Helen Foster
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    qformat
+ * @subpackage missingword
+ * @copyright  2010 Helen Foster
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 $string['missingword'] = 'Missing word format';

question/format/multianswer/format.php

@@ -18,10 +18,10 @@
 /**
  * Embedded answer (Cloze) question importer.
  *
- * @package qformat
- * @subpackage qformat_multianswer
- * @copyright 2003 Henrik Kaipe
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    qformat
+ * @subpackage multianswer
+ * @copyright  2003 Henrik Kaipe
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
@@ -29,8 +29,8 @@
  * Importer that imports a text file containing a single Multianswer question
  * from a text file.
  *
- * @copyright 2003 Henrik Kaipe
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright  2003 Henrik Kaipe
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class qformat_multianswer extends qformat_default {
 

question/format/multianswer/lang/en/qformat_multianswer.php

@@ -18,9 +18,10 @@
 /**
  * Strings for component 'qformat_multianswer', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package   qformat_multianswer
- * @copyright 2010 Helen Foster
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    qformat
+ * @subpackage multianswer
+ * @copyright  2010 Helen Foster
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 $string['multianswer'] = 'Embedded answers (Cloze)';

question/format/qti_two/lang/en/qformat_qti_two.php

@@ -18,9 +18,10 @@
 /**
  * Strings for component 'qformat_qti_two', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package   qformat_qti_two
- * @copyright 2010 Helen Foster
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    qformat
+ * @subpackage qti_two
+ * @copyright  2010 Helen Foster
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 $string['qti_two'] = 'IMS QTI 2.0 format';

question/format/qti_two/qt_common.php

@@ -31,11 +31,8 @@
  * @param int courseid
  * @return array containing filenames
  * @calledfrom type/<typename>/editquestion.php
- * @package questionbank
- * @subpackage importexport
  */
-function get_course_media_files($courseid)
-{
+function get_course_media_files($courseid) {
 // this code lifted from mod/quiz/question.php and modified
 throw new coding_exception('qti_two not converted to new fil api yet, sorry');
     /*global $CFG;

question/format/webct/lang/en/qformat_webct.php

@@ -18,9 +18,10 @@
 /**
  * Strings for component 'qformat_webct', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package   qformat_webct
- * @copyright 2010 Helen Foster
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    qformat
+ * @subpackage webct
+ * @copyright  2010 Helen Foster
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 $string['webct'] = 'WebCT format';

question/format/xhtml/lang/en/qformat_xhtml.php

@@ -18,9 +18,10 @@
 /**
  * Strings for component 'qformat_xhtml', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package   qformat_xhtml
- * @copyright 2010 Helen Foster
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    qformat
+ * @subpackage xhtml
+ * @copyright  2010 Helen Foster
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 $string['xhtml'] = 'XHTML format';

question/format/xml/format.php

@@ -19,10 +19,10 @@
 /**
  * Code for exporting questions as Moodle XML.
  *
- * @package qformat
+ * @package    qformat
  * @subpackage xml
  * @copyright  1999 onwards Martin Dougiamas {@link http://moodle.com}
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 
@@ -36,7 +36,7 @@ require_once($CFG->libdir . '/xmlize.php');
  * See http://docs.moodle.org/en/Moodle_XML_format for a description of the format.
  *
  * @copyright  1999 onwards Martin Dougiamas {@link http://moodle.com}
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class qformat_xml extends qformat_default {
 

question/format/xml/lang/en/qformat_xml.php

@@ -18,9 +18,10 @@
 /**
  * Strings for component 'qformat_xml', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package   qformat_xml
- * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    qformat
+ * @subpackage xml
+ * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 $string['invalidxml'] = 'Invalid XML file - string expected (use CDATA?)';

question/format/xml/simpletest/testxmlformat.php

@@ -19,9 +19,10 @@
 /**
  * Unit tests for the Moodle XML format.
  *
- * @package qformat_xml
- * @copyright 2010 The Open University
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    qformat
+ * @subpackage xml
+ * @copyright  2010 The Open University
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 require_once($CFG->libdir . '/questionlib.php');
@@ -31,8 +32,8 @@ require_once($CFG->dirroot . '/question/format/xml/format.php');
 /**
  * Unit tests for the matching question definition class.
  *
- * @copyright 2009 The Open University
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright  2009 The Open University
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class qformat_xml_test extends UnitTestCase {
     public function assert_same_xml($expectedxml, $xml) {

question/preview.php

@@ -24,10 +24,10 @@
  * than in the database.
  *
  * @package    moodlecore
- * @subpackage questionbank
+ * @subpackage questionengine
  * @copyright  Alex Smith {@link http://maths.york.ac.uk/serving_maths} and
  *      numerous contributors.
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 

question/type/calculated/lang/en/qtype_calculated.php

@@ -18,9 +18,10 @@
 /**
  * Strings for component 'qtype_calculated', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package   qtype_calculated
- * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    qtype
+ * @subpackage calculated
+ * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 $string['addingcalculated'] = 'Adding a calculated question';

question/type/calculated/lib.php

@@ -18,11 +18,16 @@
 /**
  * Serve question type files
  *
- * @since 2.0
- * @package questionbank
- * @subpackage questiontypes
- * @author Dongsheng Cai <dongsheng@moodle.com>
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since      2.0
+ * @package    qtype
+ * @subpackage calculated
+ * @copyright  Dongsheng Cai <dongsheng@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+
+/**
+ * Checks file access for calculated questions.
  */
 function qtype_calculated_pluginfile($course, $cm, $context, $filearea, $args, $forcedownload) {
     global $CFG;