L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-31028: Added pathname hashes to eventdata

Browse Source 
Also fix strict standard warning
This commit is contained in:
Christopher Tombleson
2012-05-09 13:46:20 +12:00
parent e16e2300c5
commit 4447223b38
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/submission/file/locallib.php
+3 -2
View File
@@ -200,9 +200,10 @@ class assign_submission_file extends assign_submission_plugin {
$eventdata->courseid = $this->assignment->get_course()->id;
$eventdata->userid = $USER->id;
if ($count > 1) {
$eventdata->files = $files;
$eventdata->files = $files; // This is depreceated - please use pathnamehashes instead!
}
$eventdata->file = $files;
$eventdata->file = $files; // This is depreceated - please use pathnamehashes instead!
$eventdata->pathnamehashes = array_keys($files);
events_trigger('assessable_file_uploaded', $eventdata);
mod/assignment/type/upload/assignment.class.php
+2 -1
View File
@@ -600,8 +600,9 @@ class assignment_upload extends assignment_base {
$eventdata->courseid = $this->course->id;
$eventdata->userid = $USER->id;
if ($files) {
$eventdata->files = $files;
$eventdata->files = $files; // This is depreceated - please use pathnamehashes instead!
}
$eventdata->pathnamehashes = array_keys($files);
events_trigger('assessable_file_uploaded', $eventdata);
$returnurl = new moodle_url('/mod/assignment/view.php', array('id'=>$this->cm->id));
redirect($returnurl);
mod/assignment/type/uploadsingle/assignment.class.php
+2 -1
View File
@@ -237,7 +237,8 @@ class assignment_uploadsingle extends assignment_base {
$eventdata->itemid = $submission->id;
$eventdata->courseid = $this->course->id;
$eventdata->userid = $USER->id;
$eventdata->file = $file;
$eventdata->file = $file; // This is depreceated - please use pathnamehashes instead!
$eventdata->pathnamehashes = array($file->get_pathnamehash());
events_trigger('assessable_file_uploaded', $eventdata);
}
plagiarism/lib.php
+3 -3
View File
@@ -44,13 +44,13 @@ class plagiarism_plugin {
* hook to allow plagiarism specific information to be returned unformatted
* @param int $cmid
* @param int $userid
* @param object $file moodle file object
* @param stored_file $file moodle file object
* @return array containing at least:
* - 'analyzed' - whether the file has been successfully analyzed
* - 'score' - similarity score - ('' if not known)
* - 'reporturl' - url of originality report - '' if unavailable
*/
public function get_file_results($cmid, $userid, $file) {
public function get_file_results($cmid, $userid, stored_file $file) {
return array('analyzed' => '', 'score' => '', 'reporturl' => '');
}
/**
@@ -86,4 +86,4 @@ class plagiarism_plugin {
*/
public function plagiarism_cron() {
}
}
}