Merge pull request #97 from turnitin/qa04

Qa04
turnitin · Feb 23, 2016 · 958387c · 958387c
2 parents 334b101 + 8e9da15
commit 958387c
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+### Date:       2016-February-23
+### Release:    v2016011104
+
+- Fixes:
+	- EULA acceptance problem due to lack of module context.
+	- Missing noscript EULA string added.
+	- Incorrect version number in upgrade db script for adding due_date_refresh field.
+	- Split collated empty function for pre PHP 5.5 environments.
+
+---
+
 ### Date:       2016-February-22
 ### Release:    v2016011103
 

diff --git a/ajax.php b/ajax.php
@@ -27,18 +27,18 @@
 if( !empty( $cmid ) ){
     $cm = get_coursemodule_from_id('', $cmid);
     $context = context_course::instance($cm->course);
-}
 
-// Work out user role.
-$userrole = '';
-switch ($cm->modname) {
-    case "forum":
-    case "workshop":
-        $userrole = (has_capability('plagiarism/turnitin:viewfullreport', $context)) ? 'Instructor' : 'Learner';
-        break;
-    default:
-        $userrole = (has_capability('mod/'.$cm->modname.':grade', $context)) ? 'Instructor' : 'Learner';
-        break;
+    // Work out user role.
+    $userrole = '';
+    switch ($cm->modname) {
+        case "forum":
+        case "workshop":
+            $userrole = (has_capability('plagiarism/turnitin:viewfullreport', $context)) ? 'Instructor' : 'Learner';
+            break;
+        default:
+            $userrole = (has_capability('mod/'.$cm->modname.':grade', $context)) ? 'Instructor' : 'Learner';
+            break;
+    }
 }
 
 $pathnamehash = optional_param('pathnamehash', "", PARAM_ALPHANUM);

diff --git a/db/upgrade.php b/db/upgrade.php
@@ -183,7 +183,7 @@ function xmldb_plagiarism_turnitin_upgrade($oldversion) {
         }
     }
 
-    if ($oldversion < 2016011102) {
+    if ($oldversion < 2016011104) {
         $table = new xmldb_table('plagiarism_turnitin_files');
         $field = new xmldb_field('duedate_report_refresh', XMLDB_TYPE_INTEGER, '1', XMLDB_UNSIGNED, true, false, 0,'gm_feedback');
         if (!$dbman->field_exists($table, $field)) {

diff --git a/jquery/turnitin_module.js b/jquery/turnitin_module.js
@@ -193,7 +193,7 @@ jQuery(document).ready(function($) {
     // Open the DV in a new window in such a way as to not be blocked by popups.
     function openDV(dvtype, submissionid, coursemoduleid, url) {
         dvWindow = window.open('', '_blank');
-        var loading = '<div style="text-align:center;">';
+        var loading = '<div class="tii_dv_loading" style="text-align:center;">';
         loading += '<img src="'+M.cfg.wwwroot+'/plagiarism/turnitin/pix/tiiIcon.svg" style="width:100px; height: 100px">';
         loading += '<p style="font-family: Arial, Helvetica, sans-serif;">'+M.str.plagiarism_turnitin.loadingdv+'</p>';
         loading += '</div>';

diff --git a/lang/en/plagiarism_turnitin.php b/lang/en/plagiarism_turnitin.php
@@ -72,6 +72,7 @@
 $string['turnitinrefreshsubmissions'] = 'Refresh Submissions';
 $string['turnitinrefreshingsubmissions'] = 'Refreshing Submissions';
 $string['turnitinppulapre'] = 'To submit a file to Turnitin you must first accept our EULA. Choosing to not accept our EULA will submit your file to Moodle only. Click here to accept.';
+$string['noscriptula'] = '(As you do not have javascript enabled you will have to manually refresh this page before you can make a submission after accepting the Turnitin User Agreement)';
 $string['filedoesnotexist'] = 'File has been deleted';
 
 

diff --git a/lib.php b/lib.php
@@ -2384,7 +2384,8 @@ public function tii_submission($cm, $tiiassignmentid, $user, $submitter, $identi
                     $title = $file->get_filename();
                     $timemodified = $file->get_timemodified();
                     $filename = $file->get_filename();
-                    if (empty($textcontent = $file->get_content())) {
+                    $textcontent = $file->get_content();
+                    if (empty($textcontent)) {
                         $errorcode = 9;
                     }
                 } else {

diff --git a/version.php b/version.php
@@ -5,14 +5,14 @@
  * and open the template in the editor.
  */
 
-$plugin->version =  2016011103;
+$plugin->version =  2016011104;
 $plugin->release = "2.6+";
 $plugin->requires =  2013111800;
 $plugin->cron     = 300;
 $plugin->component = 'plagiarism_turnitin';
 $plugin->maturity  = MATURITY_STABLE;
 
 $plugin->dependencies = array(
-	'mod_turnitintooltwo' => 2016011102,
+	'mod_turnitintooltwo' => 2016011104,
     'mod_assign' => 2013110500
 );