Merge pull request #386 from turnitin/develop

Develop to master for release 2018102901

Author: dwinn

CHANGELOG.md

@@ -1,3 +1,16 @@
+### Date:       2018-October-29
+### Release:    v2018082802
+
+### :wrench: Fixes and enhancements
+
+---
+
+#### We've fixed a bug that prevented users from being able to accept the EULA
+
+On Friday 26th October, we released a plugin update that unexpectedly prevented new users from being able to accept the EULA in the Plagiarism Plugin, and were subsequently unable to submit to Turnitin. If you've updated your plugin since Friday, we're kindly requesting that you update again to resolve this bug.
+
+---
+
 ### Date:	2018-August-28
 ### Release:	v2018082802
 

classes/digitalreceipt/pp_receipt_message.php

@@ -92,6 +92,7 @@ public function build_message($input) {
      * @return string
      */
     public function build_instructor_message($input) {
+        $message = new stdClass();
         $message->submission_title = $input['submission_title'];
         $message->assignment_name = $input['assignment_name'];
         if ( isset($input['assignment_part']) ) {
@@ -114,9 +115,16 @@ public function build_instructor_message($input) {
      * @return void
      */
     public function send_instructor_message($instructors, $message) {
+        global $CFG;
         $subject = get_string('receipt_instructor_copy_subject', 'plagiarism_turnitin');
 
-        $eventdata = new stdClass();
+        // Pre 2.9 does not have \core\message\message()
+        if ($CFG->branch >= 29) {
+            $eventdata = new \core\message\message();
+        } else {
+            $eventdata = new stdClass();
+        }
+
         $eventdata->component         = 'plagiarism_turnitin'; // Your component name.
         $eventdata->name              = 'submission'; // This is the message name from messages.php.
         $eventdata->userfrom          = \core_user::get_noreply_user();

lib.php

@@ -551,7 +551,7 @@ public function load_page_components() {
 
         $jsurl = new moodle_url($CFG->wwwroot.'/plagiarism/turnitin/jquery/jquery-3.3.1.min.js');
         $PAGE->requires->js($jsurl);
-        $jsurl = new moodle_url($CFG->wwwroot.'/mod/turnitintooltwo/jquery/turnitintooltwo-2018082301.min.js');
+        $jsurl = new moodle_url($CFG->wwwroot.'/mod/turnitintooltwo/jquery/turnitintooltwo-2018102601.min.js');
         $PAGE->requires->js($jsurl);
         if ($CFG->branch > 29) {
             $jsurl = new moodle_url($CFG->wwwroot.'/plagiarism/turnitin/jquery/turnitin_module_post29.js');

version.php

@@ -19,7 +19,7 @@
  * @copyright 2012 iParadigms LLC
  */
 
-$plugin->version = 2018082802;
+$plugin->version = 2018102901;
 $plugin->release = "2.7+";
 $plugin->requires = 2014051200;
 $plugin->component = 'plagiarism_turnitin';
@@ -32,6 +32,6 @@
 }
 
 $plugin->dependencies = array(
-    'mod_turnitintooltwo' => 2018082801,
+    'mod_turnitintooltwo' => 2018102601,
     'mod_assign' => 2013110500
 );