Skip to content

Commit 601f7f0

Browse files
lucaboeschlucaboesch
committed
Adhere to Moodle coding style.
1 parent 455213c commit 601f7f0

25 files changed

+262
-139
lines changed

‎backup/moodle2/backup_subcourse_activity_task.class.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
defined('MOODLE_INTERNAL') || die();
2727

28-
require_once($CFG->dirroot.'/mod/subcourse/backup/moodle2/backup_subcourse_stepslib.php');
28+
require_once($CFG->dirroot . '/mod/subcourse/backup/moodle2/backup_subcourse_stepslib.php');
2929

3030
/**
3131
* Provides settings and steps to perform a complete backup of the activity.
@@ -34,7 +34,6 @@
3434
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
3535
*/
3636
class backup_subcourse_activity_task extends backup_activity_task {
37-
3837
/**
3938
* Define (add) particular settings this activity can have
4039
*/
@@ -60,11 +59,11 @@ public static function encode_content_links($content) {
6059
$base = preg_quote($CFG->wwwroot, "/");
6160

6261
// Link to the list of subcourses.
63-
$search = "/(".$base."\/mod\/subcourse\/index.php\?id\=)([0-9]+)/";
62+
$search = "/(" . $base . "\/mod\/subcourse\/index.php\?id\=)([0-9]+)/";
6463
$content = preg_replace($search, '$@SUBCOURSEINDEX*$2@$', $content);
6564

6665
// Link to subcourse by moduleid.
67-
$search = "/(".$base."\/mod\/subcourse\/view.php\?id\=)([0-9]+)/";
66+
$search = "/(" . $base . "\/mod\/subcourse\/view.php\?id\=)([0-9]+)/";
6867
$content = preg_replace($search, '$@SUBCOURSEVIEWBYID*$2@$', $content);
6968

7069
return $content;

‎backup/moodle2/backup_subcourse_stepslib.php‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,25 @@
3030
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
3131
*/
3232
class backup_subcourse_activity_structure_step extends backup_activity_structure_step {
33-
3433
/**
3534
* Defines the complete subcourse structure for backup
3635
*/
3736
protected function define_structure() {
3837

3938
$subcourse = new backup_nested_element('subcourse', ['id'], [
40-
'name', 'intro', 'introformat', 'timecreated', 'timemodified', 'timefetched',
41-
'refcourse', 'instantredirect', 'completioncourse', 'blankwindow', 'fetchpercentage',
42-
'coursepageprintgrade', 'coursepageprintprogress'
39+
'name',
40+
'intro',
41+
'introformat',
42+
'timecreated',
43+
'timemodified',
44+
'timefetched',
45+
'refcourse',
46+
'instantredirect',
47+
'completioncourse',
48+
'blankwindow',
49+
'fetchpercentage',
50+
'coursepageprintgrade',
51+
'coursepageprintprogress',
4352
]);
4453

4554
$subcourse->set_source_table('subcourse', ['id' => backup::VAR_ACTIVITYID]);

‎backup/moodle2/restore_subcourse_activity_task.class.php‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
3535
*/
3636
class restore_subcourse_activity_task extends restore_activity_task {
37-
3837
/**
3938
* Define (add) particular settings this activity can have
4039
*/
@@ -73,7 +72,6 @@ public static function define_decode_rules() {
7372
$rules[] = new restore_decode_rule('SUBCOURSEINDEX', '/mod/subcourse/index.php?id=$1', 'course');
7473

7574
return $rules;
76-
7775
}
7876

7977
/**
@@ -107,8 +105,15 @@ public static function define_restore_log_rules_for_course() {
107105
$rules = [];
108106

109107
// Fix old wrong uses (missing extension).
110-
$rules[] = new restore_log_rule('subcourse', 'view all', 'index?id={course}', null,
111-
null, null, 'index.php?id={course}');
108+
$rules[] = new restore_log_rule(
109+
'subcourse',
110+
'view all',
111+
'index?id={course}',
112+
null,
113+
null,
114+
null,
115+
'index.php?id={course}'
116+
);
112117
$rules[] = new restore_log_rule('subcourse', 'view all', 'index.php?id={course}', null);
113118

114119
return $rules;

‎backup/moodle2/restore_subcourse_stepslib.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
3131
*/
3232
class restore_subcourse_activity_structure_step extends restore_activity_structure_step {
33-
3433
/**
3534
* Attaches the handlers of the backup XML tree parts.
3635
*

‎classes/completion/custom_completion.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class custom_completion extends \core_completion\activity_custom_completion {
3535
*/
3636
public function get_state(string $rule): int {
3737
global $CFG, $DB;
38-
require_once($CFG->dirroot.'/completion/completion_completion.php');
38+
require_once($CFG->dirroot . '/completion/completion_completion.php');
3939

4040
$this->validate_rule($rule);
4141

‎classes/event/course_module_viewed.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
3333
*/
3434
class course_module_viewed extends \core\event\course_module_viewed {
35-
3635
/**
3736
* Initialize the event - set the objecttable.
3837
*/

‎classes/event/subcourse_grades_fetched.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
3333
*/
3434
class subcourse_grades_fetched extends \core\event\base {
35-
3635
/**
3736
* Initialize the event.
3837
*/
@@ -57,7 +56,7 @@ public static function get_name() {
5756
* @return string
5857
*/
5958
public function get_description() {
60-
return "The user with id '{$this->userid}' fetched grades from the course with id '{$this->other['refcourse']}' ".
59+
return "The user with id '{$this->userid}' fetched grades from the course with id '{$this->other['refcourse']}' " .
6160
"into the 'subcourse' activity with the course module id '{$this->contextinstanceid}'.";
6261
}
6362

‎classes/external/view_subcourse.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
/**
1818
* Provides {@see \mod_subcourse\external\view_subcourse} class.
1919
*
20+
* @package mod_subcourse
2021
* @copyright 2020 David Mudrák <david@moodle.com>
2122
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
2223
*/
@@ -43,7 +44,6 @@
4344
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
4445
*/
4546
class view_subcourse extends external_api {
46-
4747
/**
4848
* Describes the parameters for view_subcourse.
4949
*
@@ -72,7 +72,7 @@ public static function execute($subcourseid) {
7272
$warnings = [];
7373

7474
$subcourse = $DB->get_record('subcourse', ['id' => $params['subcourseid']], '*', MUST_EXIST);
75-
list($course, $cm) = get_course_and_cm_from_instance($subcourse, 'subcourse');
75+
[$course, $cm] = get_course_and_cm_from_instance($subcourse, 'subcourse');
7676
$context = \context_module::instance($cm->id);
7777

7878
self::validate_context($context);

‎classes/observers.php‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
3838
*/
3939
class observers {
40-
4140
/**
4241
* User graded
4342
*
@@ -53,8 +52,16 @@ public static function user_graded(\core\event\user_graded $event) {
5352
$subcourses = $DB->get_records('subcourse', ['refcourse' => $courseid], '', 'id, course, refcourse, fetchpercentage');
5453

5554
foreach ($subcourses as $subcourse) {
56-
subcourse_grades_update($subcourse->course, $subcourse->id, $subcourse->refcourse,
57-
null, false, false, $userid, $subcourse->fetchpercentage);
55+
subcourse_grades_update(
56+
$subcourse->course,
57+
$subcourse->id,
58+
$subcourse->refcourse,
59+
null,
60+
false,
61+
false,
62+
$userid,
63+
$subcourse->fetchpercentage
64+
);
5865
}
5966
}
6067

@@ -76,8 +83,16 @@ public static function role_assigned(\core\event\role_assigned $event) {
7683
$subcourses = $DB->get_records('subcourse', ['course' => $courseid], '', 'id, course, refcourse, fetchpercentage');
7784

7885
foreach ($subcourses as $subcourse) {
79-
subcourse_grades_update($subcourse->course, $subcourse->id, $subcourse->refcourse,
80-
null, false, false, $userid, $subcourse->fetchpercentage);
86+
subcourse_grades_update(
87+
$subcourse->course,
88+
$subcourse->id,
89+
$subcourse->refcourse,
90+
null,
91+
false,
92+
false,
93+
$userid,
94+
$subcourse->fetchpercentage
95+
);
8196
}
8297
}
8398

@@ -93,7 +108,7 @@ public static function role_assigned(\core\event\role_assigned $event) {
93108
*/
94109
public static function course_completed(\core\event\course_completed $event) {
95110
global $CFG, $DB;
96-
require_once($CFG->dirroot.'/lib/completionlib.php');
111+
require_once($CFG->dirroot . '/lib/completionlib.php');
97112

98113
$courseid = $event->courseid;
99114
$userid = $event->relateduserid;

‎classes/output/mobile.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
/**
1818
* Provides {@see \mod_subcourse\output\mobile} class.
1919
*
20+
* @package mod_subcourse
2021
* @copyright 2020 David Mudrák <david@moodle.com>
2122
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
2223
*/
@@ -36,7 +37,6 @@
3637
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
3738
*/
3839
class mobile {
39-
4040
/**
4141
* Return the data for the CoreCourseModuleDelegate delegate.
4242
*
@@ -64,7 +64,6 @@ public static function main_view($args) {
6464
if (has_capability('mod/subcourse:fetchgrades', $context)) {
6565
$warning = get_string('refcoursenull', 'subcourse');
6666
}
67-
6867
} else {
6968
$refcourse = $DB->get_record('course', ['id' => $subcourse->refcourse], 'id, fullname', IGNORE_MISSING);
7069
}
@@ -79,8 +78,13 @@ public static function main_view($args) {
7978

8079
// Pre-format some of the texts for the mobile app.
8180
$subcourse->name = \core_external\util::format_string($subcourse->name, $context);
82-
[$subcourse->intro, $subcourse->introformat] = \core_external\util::format_text($subcourse->intro, $subcourse->introformat,
83-
$context, 'mod_subcourse', 'intro');
81+
[$subcourse->intro, $subcourse->introformat] = \core_external\util::format_text(
82+
$subcourse->intro,
83+
$subcourse->introformat,
84+
$context,
85+
'mod_subcourse',
86+
'intro'
87+
);
8488

8589
$data = [
8690
'cmid' => $cm->id,

0 commit comments

Comments
 (0)