Merge pull request #16 from turnitin/develop

For release 2020012801

ajax/connection_test.php

@@ -18,7 +18,8 @@
  * Ajax functionality related to testing a connection to Turnitin.
  *
  * @package   plagiarism_turnitinsim
- * @copyright 2018 David Winn <[email protected]>
+ * @copyright 2018 Turnitin
+ * @author    David Winn <[email protected]>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
@@ -40,7 +41,7 @@
             $apiurl = required_param('apiurl', PARAM_RAW);
             $apikey = required_param('apikey', PARAM_RAW);
 
-            $tsrequest = new tsrequest();
+            $tsrequest = new plagiarism_turnitinsim_request();
             echo $tsrequest->test_connection($apiurl, $apikey);
         }
 }

ajax/cv.php

@@ -18,7 +18,8 @@
  * Ajax functionality related to Turnitin Cloud Viewer.
  *
  * @package   plagiarism_turnitinsim
- * @copyright 2017 John McGettrick <[email protected]>
+ * @copyright 2017 Turnitin
+ * @author    John McGettrick <[email protected]>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
@@ -37,7 +38,7 @@
 
 switch ($action) {
     case "request_cv_launch":
-        $tssubmission = new tssubmission( new tsrequest(), $submissionid);
+        $tssubmission = new plagiarism_turnitinsim_submission( new plagiarism_turnitinsim_request(), $submissionid);
         echo $tssubmission->request_cv_launch_url();
 
         break;

ajax/eula_response.php

@@ -18,7 +18,8 @@
  * Ajax functionality for handling the Turnitin EULA response.
  *
  * @package   plagiarism_turnitinsim
- * @copyright 2018 John McGettrick <[email protected]>
+ * @copyright 2018 Turnitin
+ * @author    John McGettrick <[email protected]>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
@@ -35,7 +36,7 @@
 $action = required_param('action', PARAM_ALPHAEXT);
 $contextid = optional_param('contextid', 0, PARAM_INT);
 
-$tsrequest = new tsrequest();
+$tsrequest = new plagiarism_turnitinsim_request();
 
 switch ($action) {
     case "accept_eula":
@@ -45,7 +46,7 @@
         // Update EULA accepted version and timestamp for user.
         $data = new stdClass();
         $data->id = $user->id;
-        $data->lasteulaaccepted = get_config('plagiarism', 'turnitin_eula_version');
+        $data->lasteulaaccepted = get_config('plagiarism_turnitinsim', 'turnitin_eula_version');
         $data->lasteulaacceptedtime = time();
         $lang = $tsrequest->get_language();
         $data->lasteulaacceptedlang = $lang->localecode;

ajax/resend_submission.php

@@ -18,14 +18,15 @@
  * Ajax functionality related to resending an errored submission to Turnitin.
  *
  * @package   plagiarism_turnitinsim
- * @copyright 2018 David Winn <[email protected]>
+ * @copyright 2018 Turnitin
+ * @author    David Winn <[email protected]>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 require_once(__DIR__."/../../../config.php");
 require_once(__DIR__."/../lib.php");
-require_once( __DIR__ . '/../classes/tssubmission.class.php' );
-require_once( __DIR__ . '/../classes/tsrequest.class.php' );
+require_once( __DIR__ . '/../classes/submission.class.php' );
+require_once( __DIR__ . '/../classes/request.class.php' );
 
 require_login();
 
@@ -39,7 +40,7 @@
             throw new moodle_exception('invalidsesskey', 'error');
         }
 
-        $tssubmission = new tssubmission(new tsrequest(), $submissionid);
+        $tssubmission = new plagiarism_turnitinsim_submission(new plagiarism_turnitinsim_request(), $submissionid);
         $tssubmission->setstatus(TURNITINSIM_SUBMISSION_STATUS_QUEUED);
         $tssubmission->update();