From 01030f1be65a45710be2d7fb2823dd026e1c08b6 Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Fri, 14 Feb 2014 17:10:32 +1300 Subject: [PATCH] MDL-44157 mod_forum: unified @package use --- mod/forum/backup/moodle1/lib.php | 3 +-- .../moodle2/backup_forum_activity_task.class.php | 8 ++++---- .../backup/moodle2/backup_forum_settingslib.php | 6 +++--- mod/forum/backup/moodle2/backup_forum_stepslib.php | 6 +++--- .../moodle2/restore_forum_activity_task.class.php | 6 +++--- mod/forum/backup/moodle2/restore_forum_stepslib.php | 6 +++--- mod/forum/db/messages.php | 4 ++-- mod/forum/db/upgrade.php | 2 +- mod/forum/discuss.php | 2 +- mod/forum/index.php | 2 +- mod/forum/lang/en/forum.php | 2 +- mod/forum/lib.php | 13 ++++++------- mod/forum/locallib.php | 2 +- mod/forum/markposts.php | 2 +- mod/forum/mod_form.php | 2 +- mod/forum/post.php | 2 +- mod/forum/renderer.php | 4 ++-- mod/forum/rsslib.php | 2 +- mod/forum/search.php | 2 +- mod/forum/settings.php | 2 +- mod/forum/settracking.php | 2 +- mod/forum/subscribe.php | 3 +-- mod/forum/subscribers.php | 2 +- mod/forum/unsubscribeall.php | 2 +- mod/forum/user.php | 2 +- mod/forum/version.php | 7 +++---- mod/forum/view.php | 2 +- 27 files changed, 47 insertions(+), 51 deletions(-) diff --git a/mod/forum/backup/moodle1/lib.php b/mod/forum/backup/moodle1/lib.php index 0943a973b99..61a2b01fcd0 100644 --- a/mod/forum/backup/moodle1/lib.php +++ b/mod/forum/backup/moodle1/lib.php @@ -18,8 +18,7 @@ /** * Provides support for the conversion of moodle1 backup to the moodle2 format * - * @package mod - * @subpackage forum + * @package mod_forum * @copyright 2011 Mark Nielsen * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/mod/forum/backup/moodle2/backup_forum_activity_task.class.php b/mod/forum/backup/moodle2/backup_forum_activity_task.class.php index b9bca84c340..cbff0760307 100644 --- a/mod/forum/backup/moodle2/backup_forum_activity_task.class.php +++ b/mod/forum/backup/moodle2/backup_forum_activity_task.class.php @@ -18,10 +18,10 @@ /** * Defines backup_forum_activity_task class * - * @package mod_forum - * @category backup - * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com} - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + * @package mod_forum + * @category backup + * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com} + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ defined('MOODLE_INTERNAL') || die(); diff --git a/mod/forum/backup/moodle2/backup_forum_settingslib.php b/mod/forum/backup/moodle2/backup_forum_settingslib.php index b66e78ab5fe..211c0a591b8 100644 --- a/mod/forum/backup/moodle2/backup_forum_settingslib.php +++ b/mod/forum/backup/moodle2/backup_forum_settingslib.php @@ -16,10 +16,10 @@ // along with Moodle. If not, see . /** - * @package moodlecore + * @package mod_forum * @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 + * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com} + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ // This activity has not particular settings but the inherited from the generic diff --git a/mod/forum/backup/moodle2/backup_forum_stepslib.php b/mod/forum/backup/moodle2/backup_forum_stepslib.php index 1a47641126d..800acc3b141 100644 --- a/mod/forum/backup/moodle2/backup_forum_stepslib.php +++ b/mod/forum/backup/moodle2/backup_forum_stepslib.php @@ -16,10 +16,10 @@ // along with Moodle. If not, see . /** - * @package moodlecore + * @package mod_forum * @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 + * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com} + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ /** diff --git a/mod/forum/backup/moodle2/restore_forum_activity_task.class.php b/mod/forum/backup/moodle2/restore_forum_activity_task.class.php index 903c9a16f56..a8c51d8f8b3 100644 --- a/mod/forum/backup/moodle2/restore_forum_activity_task.class.php +++ b/mod/forum/backup/moodle2/restore_forum_activity_task.class.php @@ -16,10 +16,10 @@ // along with Moodle. If not, see . /** - * @package moodlecore + * @package mod_forum * @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 + * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com} + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ defined('MOODLE_INTERNAL') || die(); diff --git a/mod/forum/backup/moodle2/restore_forum_stepslib.php b/mod/forum/backup/moodle2/restore_forum_stepslib.php index 2dfac63cf30..29946728bb3 100644 --- a/mod/forum/backup/moodle2/restore_forum_stepslib.php +++ b/mod/forum/backup/moodle2/restore_forum_stepslib.php @@ -16,10 +16,10 @@ // along with Moodle. If not, see . /** - * @package moodlecore + * @package mod_forum * @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 + * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com} + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ /** diff --git a/mod/forum/db/messages.php b/mod/forum/db/messages.php index 51de4344c56..f195b013ecb 100644 --- a/mod/forum/db/messages.php +++ b/mod/forum/db/messages.php @@ -18,8 +18,8 @@ /** * Defines message providers (types of messages being sent) * - * @package mod-forum - * @copyright 1999 onwards Martin Dougiamas http://moodle.com + * @package mod_forum + * @copyright 1999 onwards Martin Dougiamas http://moodle.com * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/mod/forum/db/upgrade.php b/mod/forum/db/upgrade.php index b189aef2ded..45f3e754ab5 100644 --- a/mod/forum/db/upgrade.php +++ b/mod/forum/db/upgrade.php @@ -36,7 +36,7 @@ * Please do not forget to use upgrade_set_timeout() * before any action that may take longer time to finish. * - * @package mod-forum + * @package mod_forum * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com} * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php index fc821f5d696..b42c5f534ab 100644 --- a/mod/forum/discuss.php +++ b/mod/forum/discuss.php @@ -19,7 +19,7 @@ * Displays a post, and all the posts below it. * If no post is given, displays all posts in a discussion * - * @package mod-forum + * @package mod_forum * @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com} * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/mod/forum/index.php b/mod/forum/index.php index f86c646f412..0fb14958407 100644 --- a/mod/forum/index.php +++ b/mod/forum/index.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * @package mod-forum + * @package mod_forum * @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com} * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php index 7b6c321d9dd..30eb0be25f7 100644 --- a/mod/forum/lang/en/forum.php +++ b/mod/forum/lang/en/forum.php @@ -18,7 +18,7 @@ /** * Strings for component 'forum', language 'en', branch 'MOODLE_20_STABLE' * - * @package forum + * @package mod_forum * @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com} * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 2bad212a5c8..c68f37a04b5 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -15,10 +15,9 @@ // along with Moodle. If not, see . /** - * @package mod - * @subpackage forum - * @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com} - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + * @package mod_forum + * @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(); @@ -7775,7 +7774,7 @@ function forum_extend_settings_navigation(settings_navigation $settingsnav, navi /** * Abstract class used by forum subscriber selection controls - * @package mod-forum + * @package mod_forum * @copyright 2009 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ @@ -7835,7 +7834,7 @@ abstract class forum_subscriber_selector_base extends user_selector_base { /** * A user selector control for potential subscribers to the selected forum - * @package mod-forum + * @package mod_forum * @copyright 2009 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ @@ -7964,7 +7963,7 @@ class forum_potential_subscriber_selector extends forum_subscriber_selector_base /** * User selector control for removing subscribed users - * @package mod-forum + * @package mod_forum * @copyright 2009 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/mod/forum/locallib.php b/mod/forum/locallib.php index c7713f31422..7ab667686c0 100644 --- a/mod/forum/locallib.php +++ b/mod/forum/locallib.php @@ -23,7 +23,7 @@ require_once($CFG->dirroot . '/mod/forum/lib.php'); require_once($CFG->libdir . '/portfolio/caller.php'); /** - * @package mod-forum + * @package mod_forum * @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com} * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/mod/forum/markposts.php b/mod/forum/markposts.php index a47f0495a11..76da24389fd 100644 --- a/mod/forum/markposts.php +++ b/mod/forum/markposts.php @@ -18,7 +18,7 @@ /** * Set tracking option for the forum. * - * @package mod-forum + * @package mod_forum * @copyright 2005 mchurch * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/mod/forum/mod_form.php b/mod/forum/mod_form.php index 4003cc4537c..8c6c4704c7d 100644 --- a/mod/forum/mod_form.php +++ b/mod/forum/mod_form.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * @package mod-forum + * @package mod_forum * @copyright Jamie Pratt * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/mod/forum/post.php b/mod/forum/post.php index f1e9988d0a1..f6a20c5fe1c 100644 --- a/mod/forum/post.php +++ b/mod/forum/post.php @@ -18,7 +18,7 @@ /** * Edit and save a new post to a discussion * - * @package mod-forum + * @package mod_forum * @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com} * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/mod/forum/renderer.php b/mod/forum/renderer.php index 3463504f7e5..7fd14ece5b2 100644 --- a/mod/forum/renderer.php +++ b/mod/forum/renderer.php @@ -18,7 +18,7 @@ /** * This file contains a custom renderer class used by the forum module. * - * @package mod-forum + * @package mod_forum * @copyright 2009 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ @@ -27,7 +27,7 @@ * A custom renderer class that extends the plugin_renderer_base and * is used by the forum module. * - * @package mod-forum + * @package mod_forum * @copyright 2009 Sam Hemelryk * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later **/ diff --git a/mod/forum/rsslib.php b/mod/forum/rsslib.php index e1b86e59c0f..6c301b77da4 100644 --- a/mod/forum/rsslib.php +++ b/mod/forum/rsslib.php @@ -18,7 +18,7 @@ /** * This file adds support to rss feeds generation * - * @package mod_forum + * @package mod_forum * @category rss * @copyright 2001 Eloy Lafuente (stronk7) http://contiento.com * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later diff --git a/mod/forum/search.php b/mod/forum/search.php index c7cc504d2f8..460cb54a9f9 100644 --- a/mod/forum/search.php +++ b/mod/forum/search.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * @package mod-forum + * @package mod_forum * @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com} * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/mod/forum/settings.php b/mod/forum/settings.php index 429c74a0571..03e6afede0d 100644 --- a/mod/forum/settings.php +++ b/mod/forum/settings.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * @package mod-forum + * @package mod_forum * @copyright 2009 Petr Skoda (http://skodak.org) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/mod/forum/settracking.php b/mod/forum/settracking.php index 9a39722194a..aecb568595f 100644 --- a/mod/forum/settracking.php +++ b/mod/forum/settracking.php @@ -18,7 +18,7 @@ /** * Set tracking option for the forum. * - * @package mod-forum + * @package mod_forum * @copyright 2005 mchurch * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/mod/forum/subscribe.php b/mod/forum/subscribe.php index 1bd52774f61..9a949befea3 100644 --- a/mod/forum/subscribe.php +++ b/mod/forum/subscribe.php @@ -26,8 +26,7 @@ * through a confirmation page that redirects the user back with the * sesskey. * - * @package mod - * @subpackage forum + * @package mod_forum * @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com} * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/mod/forum/subscribers.php b/mod/forum/subscribers.php index 87c3b5429ef..740c12485a8 100644 --- a/mod/forum/subscribers.php +++ b/mod/forum/subscribers.php @@ -18,7 +18,7 @@ /** * This file is used to display and organise forum subscribers * - * @package mod-forum + * @package mod_forum * @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com} * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/mod/forum/unsubscribeall.php b/mod/forum/unsubscribeall.php index a08e9ef4037..1c34585dbd3 100644 --- a/mod/forum/unsubscribeall.php +++ b/mod/forum/unsubscribeall.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * @package mod-forum + * @package mod_forum * @copyright 2008 Petr Skoda (http://skodak.org) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/mod/forum/user.php b/mod/forum/user.php index 0059ae8a289..4ec51679175 100644 --- a/mod/forum/user.php +++ b/mod/forum/user.php @@ -18,7 +18,7 @@ /** * Display user activity reports for a course * - * @package mod-forum + * @package mod_forum * @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com} * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/mod/forum/version.php b/mod/forum/version.php index 8f874d5cc7a..2ab39d0cc8b 100644 --- a/mod/forum/version.php +++ b/mod/forum/version.php @@ -17,10 +17,9 @@ /** * Version information * - * @package mod - * @subpackage forum - * @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com} - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + * @package mod_forum + * @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(); diff --git a/mod/forum/view.php b/mod/forum/view.php index ec69112168f..d6af505bf7a 100644 --- a/mod/forum/view.php +++ b/mod/forum/view.php @@ -16,7 +16,7 @@ // along with Moodle. If not, see . /** - * @package mod-forum + * @package mod_forum * @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com} * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */