Skip to content

Commit c785ba4

Browse files
committed
Merge branch 'wip-120367-m401' into MOODLE_401_STABLE
2 parents 359a5a1 + 5915ef7 commit c785ba4

File tree

9 files changed

+225
-86
lines changed

9 files changed

+225
-86
lines changed

mod/assign/submission/onenote/backup/moodle2/backup_assignsubmission_onenote_subplugin.class.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
* @package assignsubmission_onenote
3131
*/
3232
class backup_assignsubmission_onenote_subplugin extends backup_subplugin {
33-
3433
/**
3534
* Returns the subplugin information to attach to submission element.
3635
*
@@ -53,5 +52,4 @@ protected function define_submission_subplugin_structure() {
5352
$subpluginelement->annotate_files('assignsubmission_onenote', 'submission_onenote', 'submission');
5453
return $subplugin;
5554
}
56-
5755
}

mod/assign/submission/onenote/backup/moodle2/restore_assignsubmission_onenote_subplugin.class.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
* @package assignsubmission_onenote
3232
*/
3333
class restore_assignsubmission_onenote_subplugin extends restore_subplugin {
34-
3534
/**
3635
* Returns the paths to be handled by the subplugin at workshop level
3736
*
@@ -69,5 +68,4 @@ public function process_assignsubmission_onenote_submission($data) {
6968

7069
$this->add_related_files('assignsubmission_onenote', 'submission_onenote', 'submission', null, $oldsubmissionid);
7170
}
72-
7371
}

mod/assign/submission/onenote/classes/event/assessable_uploaded.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
* @since Moodle 2.6
3535
*/
3636
class assessable_uploaded extends \core\event\assessable_uploaded {
37-
3837
/**
3938
* Legacy event files.
4039
*
@@ -118,5 +117,4 @@ protected function init() {
118117
parent::init();
119118
$this->data['objecttable'] = 'assign_submission';
120119
}
121-
122120
}

mod/assign/submission/onenote/classes/event/submission_created.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
* @since Moodle 2.7
3939
*/
4040
class submission_created extends \mod_assign\event\submission_created {
41-
4241
/**
4342
* Init method.
4443
*/

mod/assign/submission/onenote/classes/event/submission_updated.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
* @since Moodle 2.7
3939
*/
4040
class submission_updated extends \mod_assign\event\submission_updated {
41-
4241
/**
4342
* Init method.
4443
*/

mod/assign/submission/onenote/classes/privacy/provider.php

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
use mod_assign\privacy\assignsubmission_user_provider;
4141
use mod_assign\privacy\useridlist;
4242

43+
// phpcs:disable Universal.OOStructures.AlphabeticExtendsImplements.ImplementsWrongOrder
4344
/**
4445
* Privacy class for requesting user data.
4546
*
@@ -48,9 +49,10 @@
4849
* @copyright (C) 2014 onwards Microsoft, Inc. (http://microsoft.com/)
4950
*/
5051
class provider implements
51-
metadataprovider,
52-
assignsubmission_provider,
53-
assignsubmission_user_provider {
52+
metadataprovider,
53+
assignsubmission_provider,
54+
assignsubmission_user_provider {
55+
// phpcs:enable Universal.OOStructures.AlphabeticExtendsImplements.ImplementsWrongOrder
5456
/**
5557
* Return metadata about this plugin.
5658
*
@@ -123,9 +125,13 @@ public static function export_submission_user_data(assign_plugin_request_data $e
123125
foreach ($records as $record) {
124126
writer::with_context($context)
125127
->export_data($currentpath, $record);
126-
writer::with_context($exportdata->get_context())->export_area_files($currentpath,
127-
'assignsubmission_onenote', base::ASSIGNSUBMISSION_ONENOTE_FILEAREA, $submissionid);
128128

129+
writer::with_context($exportdata->get_context())->export_area_files(
130+
$currentpath,
131+
'assignsubmission_onenote',
132+
base::ASSIGNSUBMISSION_ONENOTE_FILEAREA,
133+
$submissionid
134+
);
129135
}
130136
}
131137

@@ -141,8 +147,11 @@ public static function delete_submission_for_context(assign_plugin_request_data
141147
global $DB;
142148

143149
$fs = get_file_storage();
144-
$fs->delete_area_files($requestdata->get_context()->id, 'assignsubmission_onenote',
145-
base::ASSIGNSUBMISSION_ONENOTE_FILEAREA);
150+
$fs->delete_area_files(
151+
$requestdata->get_context()->id,
152+
'assignsubmission_onenote',
153+
base::ASSIGNSUBMISSION_ONENOTE_FILEAREA
154+
);
146155

147156
$filters = ['assignment' => $requestdata->get_assign()->get_instance()->id];
148157
$DB->delete_records('assignsubmission_onenote', $filters);
@@ -166,8 +175,12 @@ public static function delete_submission_for_userid(assign_plugin_request_data $
166175

167176
// Delete files.
168177
$fs = get_file_storage();
169-
$fs->delete_area_files($deletedata->get_context()->id, 'assignsubmission_onenote',
170-
base::ASSIGNSUBMISSION_ONENOTE_FILEAREA, $submissionid);
178+
$fs->delete_area_files(
179+
$deletedata->get_context()->id,
180+
'assignsubmission_onenote',
181+
base::ASSIGNSUBMISSION_ONENOTE_FILEAREA,
182+
$submissionid
183+
);
171184

172185
// Delete the records in the table.
173186
$filters = ['assignment' => $assignmentid, 'submission' => $submissionid];

0 commit comments

Comments
 (0)