Merge pull request #580 from turnitin/develop

Release 2020072201

Author: jmcgettrick

.travis.yml

@@ -7,49 +7,39 @@ cache:
     - $HOME/.composer/cache
 
 php:
- - 5.5
-# - 5.6
  - 7.1
+ - 7.2
+
+services:
+ - mysql
+ - postgresql
 
 env:
  global:
   - IGNORE_PATHS=sdk/,fonts/,pix/
   - IGNORE_NAMES=jquery*,moment.js,colorbox.css,tooltipster.css,*.min.css,*.min.js,tii-icon-webfont.css,styles.css,styles.css.map,gulpfile.js
  matrix:
-  - DB=pgsql MOODLE_BRANCH=MOODLE_32_STABLE
-  - DB=mysqli MOODLE_BRANCH=MOODLE_32_STABLE
-  - DB=pgsql MOODLE_BRANCH=MOODLE_31_STABLE
-  - DB=mysqli MOODLE_BRANCH=MOODLE_31_STABLE
-
-matrix:
-  exclude:
-   - env: DB=pgsql MOODLE_BRANCH=MOODLE_31_STABLE
-     php: 7.1
-   - env: DB=mysqli MOODLE_BRANCH=MOODLE_31_STABLE
-     php: 7.1
-   - env: DB=pgsql MOODLE_BRANCH=MOODLE_32_STABLE
-     php: 5.5
-   - env: DB=mysqli MOODLE_BRANCH=MOODLE_32_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:
   - moodle-plugin-ci install
 
 script:
-  - moodle-plugin-ci phplint
-#  - moodle-plugin-ci phpcpd
-  - moodle-plugin-ci phpmd
-#  - moodle-plugin-ci codechecker
-  - moodle-plugin-ci csslint
-  - moodle-plugin-ci shifter
-#  - moodle-plugin-ci jshint
-  - moodle-plugin-ci validate
-  - moodle-plugin-ci phpunit
-  - moodle-plugin-ci behat
+ - moodle-plugin-ci phplint
+ - moodle-plugin-ci phpmd
+ - moodle-plugin-ci csslint
+ - moodle-plugin-ci shifter
+ - moodle-plugin-ci validate
+ - moodle-plugin-ci phpunit

CHANGELOG.md

@@ -1,3 +1,30 @@
+### Date:		2020-Jul-22
+### Release:	v2020072201
+
+#### :zap: What's new
+
+####Support for Moodle 3.9
+
+Moodle Direct V2 now supports Moodle version 3.9.
+
+---
+
+#### :wrench: Fixes and enhancements
+
+#### Paper deletion icon now appears
+
+A visual bug had caused the ‘trash can’ icon to now appear when using Moodle version 3.8 or later. The icon now appears as intended. 
+
+#### Undefined Index warnings no longer show in Apache logs
+     
+PHP warnings and notices could occasionally appear in your Apache logs from Turnitin due to a reference to an undefined variable. This issue has been fixed and these warnings will no longer appear. 
+
+#### The submission form displays better in Moodle versions 3.7 and above
+
+A visual bug had caused the submission form to be pressed into a much smaller area in Moodle versions 3.7 and above. While functionality remained the same, this bug has been fixed to give the submission form more room and make it easier to use. 
+
+---
+
 ### Date:		2019-Jul-02
 ### Release:	v2019070201
 

README.md

@@ -12,7 +12,7 @@ If you are having issues, please consult our [TROUBLE SHOOTING](https://github.c
 Installation
 ------------
 
-Before installing these plugins firstly make sure you are logged in as an Administrator and that you are using Moodle 2.6 or higher.
+Before installing these plugins firstly make sure you are logged in as an Administrator and that you are using Moodle 3.5 or higher.
 
 To install, all you need to do is copy all the files into the mod/turnitintooltwo directory on your moodle installation. You should then go to `"Site Administration" > "Notifications"` and follow the on screen instructions.
 

backup/moodle2/backup_turnitintooltwo_stepslib.php

@@ -88,7 +88,7 @@ protected function define_structure() {
         $values['tiiaccount'] = $config->accountid;
         $turnitintooltwo->fill_values($values);
 
-        $part->set_source_table('turnitintooltwo_parts', array('turnitintooltwoid' => backup::VAR_ACTIVITYID));
+        $part->set_source_table('turnitintooltwo_parts', array('turnitintooltwoid' => backup::VAR_ACTIVITYID), 'id');
 
         $course->set_source_sql("
             SELECT  t.id, t.courseid, t.ownerid, tu.turnitin_uid AS ownertiiuid,

classes/nonsubmitters/nonsubmitters_message.php

@@ -27,13 +27,7 @@ class nonsubmitters_message {
     public function send_message($userid, $subject, $message, $courseid) {
         global $CFG;
 
-        // 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         = 'mod_turnitintooltwo';
         $eventdata->name              = 'nonsubmitters'; // This is the message name from messages.php.
         $eventdata->userfrom          = \core_user::get_noreply_user();

classes/privacy/provider.php

@@ -27,15 +27,19 @@
 defined('MOODLE_INTERNAL') || die();
 
 use core_privacy\local\metadata\collection;
+use core_privacy\local\request\approved_userlist;
 use core_privacy\local\request\contextlist;
 use core_privacy\local\request\approved_contextlist;
 use core_privacy\local\request\helper;
+use core_privacy\local\request\userlist;
 use core_privacy\local\request\writer;
 
 class provider implements
     // This plugin does store personal user data.
     \core_privacy\local\metadata\provider,
 
+    \core_privacy\local\request\core_userlist_provider,
+
     // This plugin is a core_user_data_provider.
     \core_privacy\local\request\plugin\provider {
 
@@ -113,7 +117,8 @@ public static function _get_contexts_for_userid($userid) {
                 INNER JOIN {course_modules} cm ON cm.id = c.instanceid AND c.contextlevel = :contextlevel
                 INNER JOIN {modules} m ON m.id = cm.module AND m.name = :modname
                 INNER JOIN {turnitintooltwo} t ON t.id = cm.instance
-                LEFT JOIN {turnitintooltwo_submissions} ts ON ts.turnitintooltwoid = t.id
+                INNER JOIN {turnitintooltwo_submissions} ts ON ts.turnitintooltwoid = t.id
+                WHERE ts.userid = :userid
         ";
 
         $params = [
@@ -243,4 +248,68 @@ public static function _delete_data_for_user(approved_contextlist $contextlist)
             );
         }
     }
-}
+
+    /**
+     * Get the list of users who have data within a context.
+     *
+     * @param   userlist $userlist The userlist containing the list of users who have data in this context/plugin combination.
+     */
+    public static function get_users_in_context(userlist $userlist) {
+        $context = $userlist->get_context();
+
+        if ($context->contextlevel != CONTEXT_MODULE) {
+            return;
+        }
+
+        $sql = "SELECT ts.userid
+                  FROM {turnitintooltwo_submissions} ts
+                  JOIN {course_modules} cm ON cm.instance = ts.turnitintooltwoid
+                  JOIN {modules} m ON m.id = cm.module AND m.name = :modname
+                 WHERE cm.id = :cmid";
+
+        $params = [
+            'modname' => 'turnitintooltwo',
+            'cmid' => $context->instanceid
+        ];
+
+        $userlist->add_from_sql('userid', $sql, $params);
+    }
+
+    /**
+     * Delete multiple users within a single context.
+     *
+     * @param   approved_userlist $userlist The approved context and user information to delete information for.
+     */
+    public static function delete_data_for_users(approved_userlist $userlist) {
+        global $DB;
+
+        $context = $userlist->get_context();
+
+        if ($context->contextlevel != CONTEXT_MODULE) {
+            return;
+        }
+
+        $userids = $userlist->get_userids();
+
+        list($insql, $inparams) = $DB->get_in_or_equal($userids, SQL_PARAMS_NAMED);
+
+        $sql1 = "SELECT ts.id
+                   FROM {turnitintooltwo_submissions} ts
+                   JOIN {course_modules} cm ON cm.instance = ts.turnitintooltwoid
+                   JOIN {modules} m ON m.id = cm.module AND m.name = :modname
+                  WHERE ts.userid $insql
+                    AND cm.id = :cmid";
+
+        $params = [
+            'modname' => 'turnitintooltwo',
+            'cmid' => $context->instanceid
+        ];
+
+        $params = array_merge($params, $inparams);
+
+        $attempt = $DB->get_fieldset_sql($sql1, $params);
+
+
+        $DB->delete_records_list('turnitintooltwo_submissions', 'id', array_values($attempt));
+    }
+}

jquery/turnitintooltwo-2018102601.js

@@ -30,6 +30,8 @@
             }
         });
 
+        $("div.mod_turnitintooltwo").parent().css("width", "100%");
+
         $(document).on('click', '.delete_paper', function () {
             // Set up the confirm window.
             var confirmstrname = $(this).data("confirm");