From 9682626eec09a6b19a5fa89c5b2d8b27a4bcb9d4 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Thu, 3 May 2012 16:05:58 +0800 Subject: [PATCH] MDL-31270: mod_assign fix whitespace issues --- mod/assign/assignmentplugin.php | 8 ++++---- mod/assign/feedback/comments/locallib.php | 4 ++-- mod/assign/feedback/file/locallib.php | 6 +++--- mod/assign/gradingtable.php | 4 ++-- mod/assign/lib.php | 8 ++++---- mod/assign/locallib.php | 4 ++-- mod/assign/renderable.php | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/mod/assign/assignmentplugin.php b/mod/assign/assignmentplugin.php index 19382b95e85..1ce470355c3 100644 --- a/mod/assign/assignmentplugin.php +++ b/mod/assign/assignmentplugin.php @@ -235,7 +235,7 @@ abstract class assign_plugin { /** * Should not output anything - return the result as a string so it can be consumed by webservices. * - * @param stdClass $submissionorgrade assign_submission or assign_grade + * @param stdClass $submissionorgrade assign_submission or assign_grade * For submission plugins this is the submission data, for feedback plugins it is the grade data * @return string - return a string representation of the submission in full */ @@ -339,7 +339,7 @@ abstract class assign_plugin { /** * Should not output anything - return the result as a string so it can be consumed by webservices. * - * @param stdClass $submissionorgrade assign_submission or assign_grade + * @param stdClass $submissionorgrade assign_submission or assign_grade * For submission plugins this is the submission data, for feedback plugins it is the grade data * @param bool $showviewlink Modifed to return whether or not to show a link to the full submission/feedback * @return string - return a string representation of the submission in full @@ -363,7 +363,7 @@ abstract class assign_plugin { /** * Produce a list of files suitable for export that represent this feedback or submission * - * @param stdClass $submissionorgrade assign_submission or assign_grade + * @param stdClass $submissionorgrade assign_submission or assign_grade * For submission plugins this is the submission data, for feedback plugins it is the grade data * @return array - return an array of files indexed by filename */ @@ -425,7 +425,7 @@ abstract class assign_plugin { /** * Formatting for log info - * + * * @param stdClass $submissionorgrade assign_submission or assign_grade The new submission or grade * @return string */ diff --git a/mod/assign/feedback/comments/locallib.php b/mod/assign/feedback/comments/locallib.php index e68764aae89..362bf3ea09a 100644 --- a/mod/assign/feedback/comments/locallib.php +++ b/mod/assign/feedback/comments/locallib.php @@ -131,7 +131,7 @@ class assign_feedback_comments extends assign_feedback_plugin { } return ''; } - + /** * Return true if this plugin can upgrade an old Moodle 2.2 assignment of this type * and version. @@ -147,7 +147,7 @@ class assign_feedback_comments extends assign_feedback_plugin { } return false; } - + /** * Upgrade the settings from the old assignment to the new plugin based one * diff --git a/mod/assign/feedback/file/locallib.php b/mod/assign/feedback/file/locallib.php index 21c022303f3..fb1596baa5b 100644 --- a/mod/assign/feedback/file/locallib.php +++ b/mod/assign/feedback/file/locallib.php @@ -76,7 +76,7 @@ class assign_feedback_file extends assign_feedback_plugin { /** * Get form elements for grading form * - * @param stdClass $grade + * @param stdClass $grade * @param MoodleQuickForm $mform * @param stdClass $data * @return bool true if elements were added to the form @@ -196,7 +196,7 @@ class assign_feedback_file extends assign_feedback_plugin { public function get_file_areas() { return array(ASSIGN_FILEAREA_FEEDBACK_FILES=>$this->get_name()); } - + /** * Return true if this plugin can upgrade an old Moodle 2.2 assignment of this type * and version. @@ -212,7 +212,7 @@ class assign_feedback_file extends assign_feedback_plugin { } return false; } - + /** * Upgrade the settings from the old assignment to the new plugin based one * diff --git a/mod/assign/gradingtable.php b/mod/assign/gradingtable.php index e456e059ca2..9dd91729b29 100644 --- a/mod/assign/gradingtable.php +++ b/mod/assign/gradingtable.php @@ -87,7 +87,7 @@ class assign_grading_table extends table_sql implements renderable { $fields = user_picture::fields('u') . ', u.id as userid, u.firstname as firstname, u.lastname as lastname, '; $fields .= 's.status as status, s.id as submissionid, s.timecreated as firstsubmission, s.timemodified as timesubmitted, '; $fields .= 'g.id as gradeid, g.grade as grade, g.timemodified as timemarked, g.timecreated as firstmarked, g.mailed as mailed, g.locked as locked'; - $from = '{user} u LEFT JOIN {assign_submission} s ON u.id = s.userid AND s.assignment = ?' . + $from = '{user} u LEFT JOIN {assign_submission} s ON u.id = s.userid AND s.assignment = ?' . ' LEFT JOIN {assign_grades} g ON u.id = g.userid AND g.assignment = ?'; $userparams = array(); @@ -95,7 +95,7 @@ class assign_grading_table extends table_sql implements renderable { $userparams[] = '?'; $params[] = $userid; } - + $where = 'u.id IN (' . implode(',', $userparams) . ')'; if ($filter == ASSIGN_FILTER_SUBMITTED) { $where .= ' AND s.timecreated > 0 '; diff --git a/mod/assign/lib.php b/mod/assign/lib.php index 10a3c33b029..d11f867a0e0 100644 --- a/mod/assign/lib.php +++ b/mod/assign/lib.php @@ -325,7 +325,7 @@ function assign_print_overview($courses, &$htmlarray) { * This is used by the recent activity block * @param mixed $course the course to print activity for * @param bool $viewfullnames boolean to determine whether to show full names or not - * @param int $timestart the time the rendering started + * @param int $timestart the time the rendering started */ function assign_print_recent_activity($course, $viewfullnames, $timestart) { global $CFG, $USER, $DB, $OUTPUT; @@ -612,7 +612,7 @@ function assign_print_recent_mod_activity($activity, $courseid, $detail, $modnam * Checks if a scale is being used by an assignment * * This is used by the backup code to decide whether to back up a scale - * @param int $assignmentid + * @param int $assignmentid * @param int $scaleid * @return boolean True if the scale is used by the assignment */ @@ -633,7 +633,7 @@ function assign_scale_used($assignmentid, $scaleid) { * Checks if scale is being used by any instance of assignment * * This is used to find out if scale used anywhere - * @param int $scaleid + * @param int $scaleid * @return boolean True if the scale is used by any assignment */ function assign_scale_used_anywhere($scaleid) { @@ -901,7 +901,7 @@ function assign_user_complete($course, $user, $coursemodule, $assign) { /** * Print the grade information for the assignment for this user - * + * * @param stdClass $course * @param stdClass $user * @param stdClass $coursemodule diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php index 81aa2342761..a193b56e189 100644 --- a/mod/assign/locallib.php +++ b/mod/assign/locallib.php @@ -866,7 +866,7 @@ class assign { /** * Return a grade in user-friendly form, whether it's a scale or not * - * @param mixed $grade int|null + * @param mixed $grade int|null * @return string User-friendly representation of grade */ public function display_grade($grade) { @@ -2619,7 +2619,7 @@ class assign { /** * revert to draft * Uses url parameter userid - * + * * @param int $userid * @return void */ diff --git a/mod/assign/renderable.php b/mod/assign/renderable.php index 4d52088f74f..6ce054c52a4 100644 --- a/mod/assign/renderable.php +++ b/mod/assign/renderable.php @@ -39,7 +39,7 @@ class assign_submit_for_grading_page implements renderable { /** * Constructor * @param string $notifications - Any mesages to display - * @param int $coursemoduleid + * @param int $coursemoduleid */ public function __construct($notifications, $coursemoduleid) { $this->notifications = $notifications;