Merge pull request #490 from turnitin/develop

Develop to master for release 2019121701

Author: dwinn

.travis.yml

@@ -2,54 +2,35 @@ language: php
 
 sudo: false
 
-addons:
-  postgresql: "9.3"
-
 cache:
   directories:
     - $HOME/.composer/cache
 
 php:
- - 5.5
- - 7.0
- - 7.2
+  - 7.1
+  - 7.2
+
+services:
+  - mysql
+  - postgresql
 
 env:
  global:
   - IGNORE_PATHS=sdk/,pix/,vendor/
   - IGNORE_NAMES=jquery*,styles.css,autoload_static.php
  matrix:
-  - DB=pgsql MOODLE_BRANCH=MOODLE_31_STABLE
-  - DB=mysqli MOODLE_BRANCH=MOODLE_31_STABLE
-
-
-#TODO: Readd these once the split is complete.
-
-#  - DB=pgsql MOODLE_BRANCH=MOODLE_34_STABLE
-#  - DB=mysqli MOODLE_BRANCH=MOODLE_34_STABLE
-#  - DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE
-#  - DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE
-
-matrix:
-  exclude:
-  - env: DB=pgsql MOODLE_BRANCH=MOODLE_31_STABLE
-    php: 7.2
-  - env: DB=mysqli MOODLE_BRANCH=MOODLE_31_STABLE
-    php: 7.2
-  - env: DB=pgsql MOODLE_BRANCH=MOODLE_34_STABLE
-    php: 5.5
-  - env: DB=mysqli MOODLE_BRANCH=MOODLE_34_STABLE
-    php: 5.5
-  - env: DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE
-    php: 5.5
-  - env: DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE
-    php: 5.5
+  - DB=pgsql MOODLE_BRANCH=MOODLE_36_STABLE
+  - DB=mysqli MOODLE_BRANCH=MOODLE_36_STABLE
+  - DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE
+  - DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE
+  - DB=pgsql MOODLE_BRANCH=MOODLE_38_STABLE
+  - DB=mysqli MOODLE_BRANCH=MOODLE_38_STABLE
 
 before_install:
   - phpenv config-rm xdebug.ini
   - cd ../..
   - composer selfupdate
-  - composer create-project -n --no-dev --prefer-dist moodlerooms/moodle-plugin-ci ci ^1
+  - composer create-project -n --no-dev --prefer-dist blackboard-open-source/moodle-plugin-ci ci ^1
   - export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH"
 
 install:
@@ -61,4 +42,4 @@ script:
   - moodle-plugin-ci csslint
   - moodle-plugin-ci shifter
   - moodle-plugin-ci validate
-#  - moodle-plugin-ci phpunit
+  - moodle-plugin-ci phpunit

CHANGELOG.md

@@ -1,3 +1,28 @@
+### Date:       2019-December-17
+### Release:	v2019121701
+
+#### :zap: What's new
+
+---
+
+#### We now support Moodle 3.8
+
+You can find out more about Moodle 3.8 via Moodle's [release notes](https://docs.moodle.org/dev/Moodle_3.8_release_notes).
+
+#### :wrench: Fixes and enhancements
+
+---
+
+#### Anonymous marking is now available again
+
+A bug had prevented the use of Anonymous marking when configuring the integration. This bug has now been fixed and the anonymous marketing will remain enabled when navigating away from the configuration page.
+
+#### Submissions will still display when error code 13 is detected
+
+Error code 13 can appear in various circumstances where a score is not returned to Turnitin. A bug caused submissions with this error code to no longer display in the inbox. While the error code can still occur, it will no longer prevent access to the submission and it will be displayed within the inbox as intended.
+
+---
+
 ### Date:       2019-June-25
 ### Release:	v2019062501
 
@@ -10,6 +35,7 @@
 There was an issue affecting users trying to upgrade the latest version of Moodle Plagiarism Plugin. It was discovered that users attempting to upgrade to v2019060601 from versions older than v2016011101 weren't able to do so. This latest version will allow for all users to upgrade to the latest version from any of the previous versions.
 
 ---
+
 ### Date:       2019-June-06
 ### Release:	v2019060601
 

README.md

@@ -26,4 +26,4 @@ Plagiarism plugins also need to be enabled before this plugin can be used. You c
 
 You can set default values and whether the plugin is enabled within Moodle modules by going to `"Site Administration" > "Plugins" > "Plagiarism prevention" > "Turnitin plagiarism plugin"`.
 
-To create/update assignments, process submissions and update grades your moodle environment will need to have cron job running regularly. For information on how to do this please consult http://docs.moodle.org/26/en/Cron.
+To create/update assignments, process submissions and update grades your moodle environment will need to have cron job running regularly. For information on how to do this please consult https://docs.moodle.org/37/en/Cron.

ajax.php

@@ -226,10 +226,12 @@
         $eulauser->user_agreement_accepted = 0;
         if ($message == 'turnitin_eula_accepted') {
             $eulauser->user_agreement_accepted = 1;
-            plagiarism_turnitin_activitylog("User ".$USER->id." (".$turnitinuser->turnitin_uid.") accepted the EULA.", "PP_EULA_ACCEPTANCE");
+            $logstring = "User ".$USER->id." (".$turnitinuser->turnitin_uid.") accepted the EULA.";
+            plagiarism_turnitin_activitylog($logstring, "PP_EULA_ACCEPTANCE");
         } else if ($message == 'turnitin_eula_declined') {
             $eulauser->user_agreement_accepted = -1;
-            plagiarism_turnitin_activitylog("User ".$USER->id." (".$turnitinuser->turnitin_uid.") declined the EULA.", "PP_EULA_ACCEPTANCE");
+            $logstring = "User ".$USER->id." (".$turnitinuser->turnitin_uid.") declined the EULA.";
+            plagiarism_turnitin_activitylog($logstring, "PP_EULA_ACCEPTANCE");
         }
 
         // Update the user using the above object.

classes/digitalreceipt/pp_receipt_message.php

@@ -36,12 +36,7 @@ public function send_message($userid, $message, $courseid) {
 
         $subject = get_string('digital_receipt_subject', 'plagiarism_turnitin');
 
-        // Pre 2.9 does not have \core\message\message()
-        if ($CFG->branch >= 29) {
-            $eventdata = new \core\message\message();
-        } else {
-            $eventdata = new stdClass();
-        }
+        $eventdata = new \core\message\message();
         $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();
@@ -115,16 +110,9 @@ 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');
 
-        // Pre 2.9 does not have \core\message\message()
-        if ($CFG->branch >= 29) {
-            $eventdata = new \core\message\message();
-        } else {
-            $eventdata = new stdClass();
-        }
+        $eventdata = new \core\message\message();
 
         $eventdata->component         = 'plagiarism_turnitin'; // Your component name.
         $eventdata->name              = 'submission'; // This is the message name from messages.php.

classes/forms/turnitin_form.class.php

@@ -33,8 +33,7 @@
 class turnitin_form extends moodleform {
 
     // Define the form.
-    public function definition()
-    {
+    public function definition() {
         $mform =& $this->_form;
 
         foreach ($this->_customdata["elements"] as $element) {
@@ -128,8 +127,7 @@ public function definition()
      *
      * @return the form as an object to print to screen at our convenience
      */
-    public function display()
-    {
+    public function display() {
         ob_start();
         parent::display();
         $form = ob_get_contents();

classes/forms/turnitin_setupform.class.php

@@ -48,8 +48,8 @@ public function definition() {
         $mform->addElement('advcheckbox', 'turnitin_use', get_string('useturnitin', 'plagiarism_turnitin'), '', null, array(0, 1));
 
         // Loop through all modules that support Plagiarism.
-        $mods = core_component::get_plugin_list('mod');
-        foreach ($mods as $mod => $modpath) {
+        $mods = array_keys(core_component::get_plugin_list('mod'));
+        foreach ($mods as $mod) {
             if (plugin_supports('mod', $mod, FEATURE_PLAGIARISM)) {
                 $mform->addElement('advcheckbox',
                     'turnitin_use_mod_'.$mod,
@@ -97,7 +97,7 @@ public function definition() {
         );
 
         // Debugging and logging settings.
-        $mform->addElement('select', 'plagiarism_turnitin_enablediagnostic', get_string('turnitindiagnostic', 'plagiarism_turnitin'), $ynoptions);
+        $mform->addElement('select', 'plagiarism_turnitin_enablediagnostic', get_string('turnitindiagnostic', 'plagiarism_turnitin'), $diagnosticoptions);
         $mform->addElement('static', 'plagiarism_turnitin_enablediagnostic_desc', null, get_string('turnitindiagnostic_desc', 'plagiarism_turnitin'));
 
         $mform->addElement('header', 'plagiarism_accountsettings', get_string('tiiaccountsettings', 'plagiarism_turnitin'));
@@ -222,8 +222,8 @@ public function display() {
      */
     public function save($data) {
         // Save whether the plugin is enabled for individual modules.
-        $mods = core_component::get_plugin_list('mod');
-        foreach ($mods as $mod => $modpath) {
+        $mods = array_keys(core_component::get_plugin_list('mod'));
+        foreach ($mods as $mod) {
             if (plugin_supports('mod', $mod, FEATURE_PLAGIARISM)) {
                 $property = "turnitin_use_mod_" . $mod;
                 ${ "turnitin_use_mod_" . "$mod" } = (!empty($data->$property)) ? $data->$property : 0;
@@ -234,7 +234,7 @@ public function save($data) {
             }
         }
 
-        $properties = array("accountid", "secretkey", "apiurl", "enablediagnostic", "usegrademark", "enablepeermark", "useerater",
+        $properties = array("accountid", "secretkey", "apiurl", "enablediagnostic", "usegrademark", "enablepeermark", "useerater", "useanon",
             "transmatch", "repositoryoption", "agreement", "enablepseudo", "pseudofirstname", "pseudolastname", "lastnamegen", "pseudosalt", "pseudoemaildomain");
 
         foreach ($properties as $property) {

classes/modules/turnitin_assign.class.php

@@ -68,7 +68,8 @@ public function set_content($linkarray, $cm) {
      *
      * @param $assignid
      */
-    public function is_resubmission_allowed($assignid, $reportgenspeed, $submissiontype, $attemptreopenmethod, $attemptreopened = null) {
+    public function is_resubmission_allowed($assignid, $reportgenspeed, $submissiontype, $attemptreopenmethod,
+                                            $attemptreopened = null) {
         global $DB, $CFG;
 
         // Get the maximum number of file submissions allowed.

classes/turnitin_class.class.php

@@ -16,10 +16,8 @@
 
 use Integrations\PhpSdk\TiiClass;
 
-/**
- * @package   plagiarism_turnitin
- * @copyright 2012 iParadigms LLC *
- */
+// @package   plagiarism_turnitin
+// @copyright 2012 iParadigms LLC
 
 defined('MOODLE_INTERNAL') || die();
 

classes/turnitin_submission.class.php

@@ -130,7 +130,7 @@ public function recreate_submission_event() {
                 $forum = $DB->get_record("forum", array("id" => $this->cm->instance));
 
                 // Some forum types don't pass in certain values on main forum page.
-                if ((empty($discussionid) || $querystrid != 0) && ($forum->type == 'blog' || $forum->type == 'single')) {
+                if ((empty($discussionid)) && ($forum->type == 'blog' || $forum->type == 'single')) {
                     $discussion = $DB->get_record_sql('SELECT FD.id
                                                                 FROM {forum_posts} FP JOIN {forum_discussions} FD
                                                                 ON FP.discussion = FD.id
@@ -187,7 +187,6 @@ public function recreate_submission_event() {
      * Get the file information from Moodle. We really specifically only need the itemid.
      */
     public function get_file_info() {
-        global $DB;
         $fs = get_file_storage();
 
         if (!$file = $fs->get_file_by_hash($this->submissiondata->identifier)) {

classes/turnitin_user.class.php

@@ -141,11 +141,11 @@ public function get_pseudo_lastname() {
             $userinfoob->userid = $this->id;
             $userinfoob->fieldid = $config->plagiarism_turnitin_pseudolastname;
             $userinfoob->data = $uniqueid;
-            if (isset($userinfoob->data)) {
+            if ($userinfo != false) {
                 $userinfoob->id = $userinfo->id;
-                $DB->update_record('user_info_data', $userinfo);
+                $DB->update_record('user_info_data', $userinfoob);
             } else {
-                $DB->insert_record('user_info_data', $userinfo);
+                $DB->insert_record('user_info_data', $userinfoob);
             }
         } else if ($config->plagiarism_turnitin_pseudolastname != 0) {
             $uniqueid = $userinfo->data;

css/colorbox.css

@@ -247,7 +247,6 @@
 $string['repositoryoptions_4'] = 'إرسال كل الورق إلى المستودع المؤسسي';
 $string['turnitinrepositoryoptions_help'] = '<strong>تمكين خيارات مستودعات المدرس القياسية: </strong><br />يستطيع المعلمون مطالبة Turnitin بإضافة مستندات إلى المستودع القياسي أو المستودع الخاص بالمؤسسة التعليمية أو عدم إضافتها إلى مستودع.<br /><br /><strong>تمكين خيارات المستودع الموسعة للمدرب: </strong><br />سوف يتيح هذا الخيار للمعلمين عرض إعداد الواجبات للمساح للطلاب بإعلام Turnitin بمكان تخزين مستنداتهم. ويستطيع الطلاب اختيار إضافة مستنداتهم إلى مستودع الطلاب القياسي أو إلى المستودع الخاص بالمعلم.<br /><br /><strong>قم بإرسال كل الأوراق إلى المستودع المعتاد: </strong><br />ستتم إضافة جميع المستندات إلى مستودع الطلاب القياسي بشكل افتراضي.<br /><br /><strong>لا تقم بإرسال أي أوراق إلى المستودع: </strong><br />سوف يقتصر استخدام المستندات على إجراء فحص أولي بواسطة Turnitin والعرض على المعلم لوضع الدرجات.<br /><br /><strong>إرسال كل الورق إلى المستودع المؤسسي: </strong><br />تتم مطالبة Turnitin بتخزين جميع الأوراق في مستودع أوراق المؤسسة. ولا يتم إجراء فحوصات التشابه على المستندات المرسلة إلا بواسطة معلمين آخرين من مؤسستك.';
 $string['turnitinuseanon'] = 'استخدام التعليم المجهول';
-$string['turnitinuseanon_desc'] = 'اختر ما اذا كنت ستسمح للتعليم المجهول عند تقييم الإرسالات.<br /><i>(هذا متوفر فقط للمستخدمين الذين يكون لديهم التعليم المجهول مكونًا في حساباتهم)</i>';
 $string['createassignmenterror'] = 'حدث خطأ عند محاولة إنشاء المهمة في Turnitin';
 $string['editassignmenterror'] = 'حدث خطأ عند محاولة تحرير المهمة في Turnitin';
 $string['ppassignmentediterror'] = 'تعذر تحرير هذه الوحدة {$a->title} (معرف TII: {$a->assignmentid})، يُرجى الرجوع إلى سجلات واجهة برمجة التطبيقات (API) للحصول على مزيد من المعلومات.';