Merge pull request #758 from turnitin/develop

Release 2024080101

Author: jack-tii

CHANGELOG.md

@@ -1,8 +1,47 @@
+### Date:       2024-August-01
+### Release:    v2024080101
+
+---
+
+#### Icon Image Fixed
+Previously when a file was submitted that did not meet the requirements for processing by Turnitin, an icon image would be displayed incorrectly. This has now been fixed.
+
+#### Issue With Multiple Peermark Assignments
+Previously when a Moodle Direct V2 assignment contained 2 or more Peermark assignments, there was an issue that stopped them from successfully opening. This has now been fixed.
+
+#### Fixed Inbox Ordering On First Name
+Previously when sorting submissions in the assignment inbox by first name, the order of the sorted items would be incorrect. This has now been resolved.
+
+#### Error Logged While Creating Course
+Previously there was a bug which would sometimes cause an error to be logged while creating a course. This has now been resolved.
+
+#### PHP 8.1+ Deprecation Warnings
+We have resolved several deprecation warnings that would be displayed when running under PHP 8.1+.
+
+#### Issue With Bulk Editing of Completion Settings
+Previously there was an error when editing completion settings in bulk that would prevent the page from loading. This has now been resolved.
+
+#### Error Generating Pseudo Last Names
+Previously when generating dummy lastnames for students for data privacy purposes, the process would fail if no last name was set. This has now been resolved.
+
+#### Error when Max Grade Set To Zero
+Previously when a single part of a multi-part assignment had its max grade set to zero, the percentage grade would fail to be calculated and an error message would be shown instead. This has now been resolved and grades are shown correctly.
+
+#### Error when restoring a course
+Previously when deleting and later restoring a course, the course restoration would fail if the course end date had already passed. This was because the start date was being set to be after the end date. In cases where this would occur, we now set the end date to today, which allows the course to be restored correctly.
+
+#### Bug in student enrolment
+There was previously a bug in student enrolment that meant that sometimes suspended users were being enrolled on courses when they should have been skipped. This has now been resolved.
+
+#### Checks For Submission File Types
+Previously we were missing a check for the file types of submissions. This meant that students could always submit files of any type, which would cause their submissions to become stuck in a pending state. This has now been resolved, and if the option is enabled, students can upload only files of supported types.
+
+---
+
 ### Date:       2024-March-29
 ### Release:    v2024032901
 
 #### Export Buttons Fixed
-
 The export buttons along with the individual submission refresh and download buttons and the bulk submission download buttons are now functioning as expected.
 
 ### Date:       2024-February-06

backup/moodle2/restore_turnitintooltwo_stepslib.php

@@ -149,6 +149,7 @@ protected function process_turnitintooltwo_submissions($data) {
 
         // Create TII User Account Details.
         if (!$tiiuser = $DB->get_record('turnitintooltwo_users', array('turnitin_uid' => $data->tiiuserid))) {
+            $tiiuser = new stdClass();
             $tiiuser->userid = $data->userid;
             $tiiuser->turnitin_uid = $data->tiiuserid;
             $DB->insert_record('turnitintooltwo_users', $tiiuser);

extras.php

@@ -97,15 +97,7 @@
 
         $output .= $OUTPUT->box($coursesearchform, 'generalbox', 'course_search_options');
 
-        $displaylist = array();
-        $parentlist = array();
-        require_once($CFG->dirroot."/course/lib.php");
-        if (file_exists($CFG->libdir.'/coursecatlib.php')) {
-            require_once($CFG->libdir.'/coursecatlib.php');
-            $displaylist = coursecat::make_categories_list('');
-        } else {
-            make_categories_list($displaylist, $parentlist, '');
-        }
+        $displaylist = core_course_category::make_categories_list('');
 
         $categoryselectlabel = html_writer::label(get_string('selectcoursecategory', 'turnitintooltwo'), 'create_course_category');
         $categoryselect = html_writer::select($displaylist, 'create_course_category', '', array(),

jquery/turnitintooltwo-2024032901.js

@@ -293,6 +293,7 @@
                 if (i == 3) {
                     submissionsDataTableColumns.push({ "sType": "string", "bSortable": false });
                     visibleCols.push(true);
+                // last name as index 2, make it hidden
                 } else if (i == 2) {
                     submissionsDataTableColumns.push({ "sType": "string", "bSortable": false, "bVisible": false });
                     visibleCols.push(false);
@@ -308,6 +309,10 @@
                 } else if ((i == 13 && showOrigReport) || (i == 12 && !showOrigReport)) {
                     submissionsDataTableColumns.push({ "sClass": "right" });
                     visibleCols.push(true);
+                // first name index noOfColumns - 1 in ordinar and multipart assignments, make it hidden     
+                } else if (i == noOfColumns - 1) {
+                    submissionsDataTableColumns.push({ "sType": "string", "bSortable": false, "bVisible": false });
+                    visibleCols.push(false);    
                 } else if (i == 1 || ((i >= 9 && !showOrigReport && !useGradeMark)
                     || (i >= 11 && ((!showOrigReport && useGradeMark) || (showOrigReport && !useGradeMark)))
                     || (i >= 13 && showOrigReport && useGradeMark))) {

jquery/turnitintooltwo-2024032901.min.js

@@ -251,7 +251,7 @@ function turnitintooltwo_grade_item_update($turnitintooltwo, $grades = null) {
 
     // Get the latest part, for the post date and set the default hidden value on grade item.
     $lastpart = $DB->get_record('turnitintooltwo_parts', array('turnitintooltwoid' => $turnitintooltwo->id), 'max(dtpost)');
-    $lastpart = current($lastpart);
+    $lastpart = current((array)$lastpart);
     $params['hidden'] = $lastpart;
 
     // There should always be a $cm unless this is called on module creation.
@@ -823,7 +823,7 @@ function turnitintooltwo_cron_update_gradbook($assignment, $task) {
 }
 
 /**
- * Abstracted version of print_error()
+ * Abstracted version of throw new moodle_exception() - formerly print_error()
  *
  * @param string $input The error string if module = null otherwise the language string called by get_string()
  * @param string $module The module string
@@ -847,7 +847,7 @@ function turnitintooltwo_print_error($input, $module = 'turnitintooltwo',
         $message .= ' ('.basename($file).' | '.$line.')';
     }
 
-    print_error($input, 'turnitintooltwo', $link, $message);
+    throw new moodle_exception($input, 'turnitintooltwo', $link, $message);
     exit();
 }
 
@@ -1523,7 +1523,7 @@ function turnitintooltwo_init_browser_assignment_table($tiicourseid) {
                         );
 
     if (!empty($turnitincourse)) {
-        $course = current($turnitincourse);
+        $course = current((array)$turnitincourse);
         $coursedetails = turnitintooltwo_assignment::get_course_data($course->courseid, $course->course_type);
         $courseid = $course->courseid;
         $coursetitle = $coursedetails->fullname;

jquery/turnitintooltwo-2024032901.min.js.map

@@ -34,7 +34,18 @@ class mod_turnitintooltwo_mod_form extends moodleform_mod {
     private $turnitintooltwo;
 
     public function definition() {
-        global $DB, $USER, $COURSE;
+        global $DB, $USER, $COURSE, $PAGE;
+
+        // Don't do anything here if called from a completion page as output has already begun.
+        // This is needed because of MDL-78528.
+        $completionpagetypes = [
+            'course-defaultcompletion' => 'Edit completion default settings (Moodle >= 4.3)',
+            'course-editbulkcompletion' => 'Edit completion settings in bulk for a single course',
+            'course-editdefaultcompletion' => 'Edit completion default settings (Moodle < 4.3)',
+        ];
+        if (isset($completionpagetypes[$PAGE->pagetype])) {
+            return;
+        }
 
         // Module string is useful for product support.
         $modulestring = '<!-- Turnitin Moodle Direct Version: '.turnitintooltwo_get_version().' - (';
@@ -119,10 +130,10 @@ public function definition() {
 
         $modulestring .= ') -->';
 
-        $this->show_form($instructorrubrics, $sharedrubrics, $modulestring, $course->turnitin_cid);
+        $this->show_form($instructorrubrics, $sharedrubrics, $course->turnitin_cid, $modulestring);
     }
 
-    public function show_form($instructorrubrics, $sharedrubrics, $modulestring = '', $tiicourseid) {
+    public function show_form($instructorrubrics, $sharedrubrics, $tiicourseid, $modulestring = '') {
         global $CFG, $OUTPUT, $COURSE, $PAGE, $DB;
         $PAGE->requires->string_for_js('changerubricwarning', 'turnitintooltwo');
         $PAGE->requires->string_for_js('closebutton', 'turnitintooltwo');

lib.php

@@ -1,11 +1,11 @@
 <?php
 
-require_once( 'usersoap.class.php' );
-require_once( 'classsoap.class.php' );
-require_once( 'assignmentsoap.class.php' );
-require_once( 'membershipsoap.class.php' );
-require_once( 'submissionsoap.class.php' );
-require_once( 'lti.class.php' );
+require_once( __DIR__.'/usersoap.class.php' );
+require_once( __DIR__.'/classsoap.class.php' );
+require_once( __DIR__.'/assignmentsoap.class.php' );
+require_once( __DIR__.'/membershipsoap.class.php' );
+require_once( __DIR__.'/submissionsoap.class.php' );
+require_once( __DIR__.'/lti.class.php' );
 
 /**
  * The Turnitin SDK Wrapper class. This class will give you access to all available API functionality.

mod_form.php

@@ -4,11 +4,11 @@
  * and open the template in the editor.
  */
 
-require_once( 'soap.class.php' );
-require_once( 'tiiassignment.class.php' );
-require_once( 'tiipeermarkassignment.class.php' );
-require_once( 'response.class.php' );
-require_once( 'sdkexception.class.php' );
+require_once( __DIR__.'/soap.class.php' );
+require_once( __DIR__.'/tiiassignment.class.php' );
+require_once( __DIR__.'/tiipeermarkassignment.class.php' );
+require_once( __DIR__.'/response.class.php' );
+require_once( __DIR__.'/sdkexception.class.php' );
 
 /**
  * @ignore

sdk/api.class.php

@@ -4,10 +4,10 @@
  * and open the template in the editor.
  */
 
-require_once( 'soap.class.php' );
-require_once( 'tiiclass.class.php' );
-require_once( 'response.class.php' );
-require_once( 'sdkexception.class.php' );
+require_once( __DIR__.'/soap.class.php' );
+require_once( __DIR__.'/tiiclass.class.php' );
+require_once( __DIR__.'/response.class.php' );
+require_once( __DIR__.'/sdkexception.class.php' );
 
 /**
  * @ignore

sdk/assignmentsoap.class.php

@@ -4,7 +4,7 @@
  * and open the template in the editor.
  */
 
-require_once( 'logger.php' );
+require_once( __DIR__.'/logger.php' );
 
 /**
  * @ignore

sdk/classsoap.class.php

@@ -6,9 +6,9 @@
  * and open the template in the editor.
  */
 
-require_once( 'sdkexception.class.php' );
-require_once( 'tiilti.class.php' );
-require_once( 'response.class.php' );
+require_once( __DIR__.'/sdkexception.class.php' );
+require_once( __DIR__.'/tiilti.class.php' );
+require_once( __DIR__.'/response.class.php' );
 
 /**
  * @ignore
@@ -602,7 +602,7 @@ public function __getLastRequest() {
      *
      * @param string $lastrequest
      */
-    private function __setLastRequest( $lastrequest ) {
+    private function setLastRequestPrivate( $lastrequest ) {
         $this->lastrequest = $lastrequest;
     }
 
@@ -618,7 +618,7 @@ public function __getLastResponse() {
      *
      * @param string $lastresponse
      */
-    private function __setLastResponse( $lastresponse ) {
+    private function setLastResponsePrivate( $lastresponse ) {
         $this->lastresponse = $lastresponse;
     }
 
@@ -969,8 +969,8 @@ private function transportData( $params ) {
             $response = $result;
         }
 
-        $this->__setLastRequest( print_r( $params, true ) );
-        $this->__setLastResponse( $result );
+        $this->setLastRequestPrivate( print_r( $params, true ) );
+        $this->setLastResponsePrivate( $result );
 
         curl_close($ch);
         return $response;

sdk/log.class.php

@@ -4,10 +4,10 @@
  * and open the template in the editor.
  */
 
-require_once( 'soap.class.php' );
-require_once( 'tiimembership.class.php' );
-require_once( 'response.class.php' );
-require_once( 'sdkexception.class.php' );
+require_once( __DIR__.'/soap.class.php' );
+require_once( __DIR__.'/tiimembership.class.php' );
+require_once( __DIR__.'/response.class.php' );
+require_once( __DIR__.'/sdkexception.class.php' );
 
 /**
  * @ignore

sdk/lti.class.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once( 'sdkexception.class.php' );
+require_once( __DIR__.'/sdkexception.class.php' );
 
 /**
  * Response object containing data parsed from the API response

sdk/membershipsoap.class.php

@@ -4,8 +4,8 @@
  * and open the template in the editor.
  */
 
-require_once( 'oauthsimple.class.php' );
-require_once( 'log.class.php' );
+require_once( __DIR__.'/oauthsimple.class.php' );
+require_once( __DIR__.'/log.class.php' );
 
 /**
  * @ignore
@@ -283,8 +283,7 @@ public function __construct( $wsdl, $options, $logpath = null ) {
         parent::__construct( $wsdl, $options );
     }
 
-    #[\ReturnTypeWillChange]
-    public function __doRequest($request, $location, $action, $version, $one_way = null) {
+    public function __doRequest($request, $location, $action, $version, $one_way = null): ?string {
 
         $http_headers = array(
             'Content-type: text/xml;charset="utf-8"',

sdk/response.class.php

@@ -4,10 +4,10 @@
  * and open the template in the editor.
  */
 
-require_once( 'soap.class.php' );
-require_once( 'tiisubmission.class.php' );
-require_once( 'response.class.php' );
-require_once( 'sdkexception.class.php' );
+require_once( __DIR__.'/soap.class.php' );
+require_once( __DIR__.'/tiisubmission.class.php' );
+require_once( __DIR__.'/response.class.php' );
+require_once( __DIR__.'/sdkexception.class.php' );
 
 /**
  * @ignore

sdk/soap.class.php

@@ -6,7 +6,7 @@
  * and open the template in the editor.
  */
 
-require_once( 'tiipeermarkassignment.class.php' );
+require_once( __DIR__.'/tiipeermarkassignment.class.php' );
 
 /**
  * Defines the TiiAssignment data object which contains getters and setters for a Turnitin Assignment API object.

sdk/submissionsoap.class.php

@@ -6,7 +6,7 @@
  * and open the template in the editor.
  */
 
-require_once( 'tiirubric.class.php' );
+require_once( __DIR__.'/tiirubric.class.php' );
 
 /**
  * Defines the TiiSubmission data object which contains getters and setters for a Turnitin Class API object.

sdk/tiiassignment.class.php

@@ -7,7 +7,7 @@
  * and open the template in the editor.
  */
 
-require_once( 'tiiform.class.php' );
+require_once( __DIR__.'/tiiform.class.php' );
 
 /**
  * Defines the TiiLTI data object which contains getters and setters for a Turnitin LTI Launch object.

sdk/tiiclass.class.php

@@ -4,7 +4,7 @@
  * @subpackage TiiSubmission
  */
 
-require_once( 'tiiform.class.php' );
+require_once( __DIR__.'/tiiform.class.php' );
 
 /**
  * Defines the TiiSubmission data object which contains getters and setters for a Turnitin Submission API object.

sdk/tiilti.class.php

@@ -6,8 +6,8 @@
  * and open the template in the editor.
  */
 
-require_once( 'sdkexception.class.php' );
-require_once( 'tiirubric.class.php' );
+require_once( __DIR__.'/sdkexception.class.php' );
+require_once( __DIR__.'/tiirubric.class.php' );
 
 /**
  * Defines the TiiUser data object which contains getters and setters for a Turnitin User object.

sdk/tiisubmission.class.php

@@ -3,11 +3,11 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-require_once( 'soap.class.php' );
-require_once( 'tiiuser.class.php' );
-require_once( 'tiipseudouser.class.php' );
-require_once( 'response.class.php' );
-require_once( 'sdkexception.class.php' );
+require_once( __DIR__.'/soap.class.php' );
+require_once( __DIR__.'/tiiuser.class.php' );
+require_once( __DIR__.'/tiipseudouser.class.php' );
+require_once( __DIR__.'/response.class.php' );
+require_once( __DIR__.'/sdkexception.class.php' );
 
 /**
  * @ignore

sdk/tiiuser.class.php

@@ -328,7 +328,6 @@
         $output .= $OUTPUT->box($coursesearchform, 'generalbox', 'course_search_options');
 
         $displaylist = core_course_category::make_categories_list('');
-        $parentlist = array();
 
         $categoryselectlabel = html_writer::label(get_string('selectcoursecategory', 'turnitintooltwo'),
                                                     'create_course_category');