From 4447223b384659ce87da4f324a77d2cc6523e07d Mon Sep 17 00:00:00 2001
From: Christopher Tombleson <christopher@catalyst.net.nz>
Date: Wed, 9 May 2012 13:46:20 +1200
Subject: [PATCH] MDL-31028: Added pathname hashes to eventdata

Also fix strict standard warning
---
 mod/assign/submission/file/locallib.php               | 5 +++--
 mod/assignment/type/upload/assignment.class.php       | 3 ++-
 mod/assignment/type/uploadsingle/assignment.class.php | 3 ++-
 plagiarism/lib.php                                    | 6 +++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/mod/assign/submission/file/locallib.php b/mod/assign/submission/file/locallib.php
index 46e661fb2d2..a85edb25034 100644
--- a/mod/assign/submission/file/locallib.php
+++ b/mod/assign/submission/file/locallib.php
@@ -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);
 
 
diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php
index bea044d270a..a14fee1fb93 100644
--- a/mod/assignment/type/upload/assignment.class.php
+++ b/mod/assignment/type/upload/assignment.class.php
@@ -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);
diff --git a/mod/assignment/type/uploadsingle/assignment.class.php b/mod/assignment/type/uploadsingle/assignment.class.php
index 39b41b7917b..7ffca6fa1e4 100644
--- a/mod/assignment/type/uploadsingle/assignment.class.php
+++ b/mod/assignment/type/uploadsingle/assignment.class.php
@@ -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);
                 }
 
diff --git a/plagiarism/lib.php b/plagiarism/lib.php
index 6f473131921..81237717814 100644
--- a/plagiarism/lib.php
+++ b/plagiarism/lib.php
@@ -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() {
     }
-}
\ No newline at end of file
+}