",f=M.cfg.wwwroot+"/plagiarism/turnitinsim/pix/tiiIcon.svg";e+="![](\""+f+"\")
";var g=M.str.plagiarism_turnitinsim.loadingcv;e+="
";a(d.document.body).html(e);a.ajax({type:"GET",url:M.cfg.wwwroot+"/plagiarism/turnitinsim/ajax/cv.php",dataType:"json",data:{action:"request_cv_launch",submissionid:c,sesskey:M.cfg.sesskey},success:function success(a){d.location=a.viewer_url;this.checkDVClosed(d)},checkDVClosed:function checkDVClosed(a){var b=this;if(a.closed){window.location=window.location}else{setTimeout(function(){b.checkDVClosed(a)},500)}}})})}}});
+define ("plagiarism_turnitinsim/cv_launch",["jquery","core/str"],function(a,b){return{openCv:function openCv(){a(document).on("click",".or_score",function(){var c=a(this).parent().attr("class").split(/\s+/),d=0;a(c).each(function(a){if(c[a].match("^submission_")){d=c[a].split("_")[1]}});var e=window.open("","cvWindow"),f=""+g+"
";e+="",g=M.cfg.wwwroot+"/plagiarism/turnitinsim/pix/tiiIcon.svg";f+="![](\""+g+"\")
";b.get_string("loadingcv","plagiarism_turnitinsim").done(function(b){f+="
";a(e.document.body).html(f);a.ajax({type:"GET",url:M.cfg.wwwroot+"/plagiarism/turnitinsim/ajax/cv.php",dataType:"json",data:{action:"request_cv_launch",submissionid:d,sesskey:M.cfg.sesskey},success:function success(a){e.location=a.viewer_url;this.checkDVClosed(e)},checkDVClosed:function checkDVClosed(a){var b=this;if(a.closed){window.location=window.location}else{setTimeout(function(){b.checkDVClosed(a)},500)}}})})}}});
//# sourceMappingURL=cv_launch.min.js.map
diff --git a/amd/build/cv_launch.min.js.map b/amd/build/cv_launch.min.js.map
index 0bd8df4..902cbab 100644
--- a/amd/build/cv_launch.min.js.map
+++ b/amd/build/cv_launch.min.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../src/cv_launch.js"],"names":["define","$","open_cv","document","on","classList","parent","attr","split","submissionid","each","index","match","dvWindow","window","open","loading","icon","M","cfg","wwwroot","loadingCvStr","str","plagiarism_turnitinsim","loadingcv","body","html","ajax","type","url","dataType","data","action","sesskey","success","location","viewer_url","checkDVClosed","that","closed","setTimeout"],"mappings":"AA4BAA,OAAM,oCAAC,CAAC,QAAD,CAAD,CAAa,SAASC,CAAT,CAAY,CAC3B,MAAO,CACHC,OAAO,CAAE,kBAAW,CAChBD,CAAC,CAACE,QAAD,CAAD,CAAYC,EAAZ,CAAe,OAAf,CAAwB,WAAxB,CAAqC,UAAW,IAGxCC,CAAAA,CAAS,CAAGJ,CAAC,CAAC,IAAD,CAAD,CAAQK,MAAR,GAAiBC,IAAjB,CAAsB,OAAtB,EAA+BC,KAA/B,CAAqC,KAArC,CAH4B,CAIxCC,CAAY,CAAG,CAJyB,CAK5CR,CAAC,CAACI,CAAD,CAAD,CAAaK,IAAb,CAAkB,SAASC,CAAT,CAAe,CAC7B,GAAIN,CAAS,CAACM,CAAD,CAAT,CAAiBC,KAAjB,CAAuB,cAAvB,CAAJ,CAA4C,CACxCH,CAAY,CAAGJ,CAAS,CAACM,CAAD,CAAT,CAAiBH,KAAjB,CAAuB,GAAvB,EAA4B,CAA5B,CAClB,CACJ,CAJD,EAL4C,GAaxCK,CAAAA,CAAQ,CAAGC,MAAM,CAACC,IAAP,CAAY,EAAZ,CAAgB,UAAhB,CAb6B,CAcxCC,CAAO,CAAG,6DAd8B,CAexCC,CAAI,CAAGC,CAAC,CAACC,GAAF,CAAMC,OAAN,CAAgB,yCAfiB,CAgB5CJ,CAAO,EAAI,cAAeC,CAAf,CAAsB,0CAAjC,CACA,GAAII,CAAAA,CAAY,CAAGH,CAAC,CAACI,GAAF,CAAMC,sBAAN,CAA6BC,SAAhD,CACAR,CAAO,EAAI,2DAA2DK,CAA3D,CAA0E,MAArF,CACAL,CAAO,EAAI,QAAX,CACAf,CAAC,CAACY,CAAQ,CAACV,QAAT,CAAkBsB,IAAnB,CAAD,CAA0BC,IAA1B,CAA+BV,CAA/B,EAEAf,CAAC,CAAC0B,IAAF,CAAO,CACHC,IAAI,CAAE,KADH,CAEHC,GAAG,CAAEX,CAAC,CAACC,GAAF,CAAMC,OAAN,CAAgB,qCAFlB,CAGHU,QAAQ,CAAE,MAHP,CAIHC,IAAI,CAAE,CACFC,MAAM,CAAE,mBADN,CAEFvB,YAAY,CAAEA,CAFZ,CAGFwB,OAAO,CAAEf,CAAC,CAACC,GAAF,CAAMc,OAHb,CAJH,CASHC,OAAO,CAAE,iBAASH,CAAT,CAAe,CAEpBlB,CAAQ,CAACsB,QAAT,CAAoBJ,CAAI,CAACK,UAAzB,CACA,KAAKC,aAAL,CAAmBxB,CAAnB,CACH,CAbE,CAcHwB,aAAa,CAAE,uBAASxB,CAAT,CAAmB,CAC9B,GAAIyB,CAAAA,CAAI,CAAG,IAAX,CACA,GAAIzB,CAAQ,CAAC0B,MAAb,CAAqB,CACjBzB,MAAM,CAACqB,QAAP,CAAkBrB,MAAM,CAACqB,QAC5B,CAFD,IAEO,CACHK,UAAU,CAAC,UAAW,CAClBF,CAAI,CAACD,aAAL,CAAmBxB,CAAnB,CACH,CAFS,CAEP,GAFO,CAGb,CACJ,CAvBE,CAAP,CAyBH,CA/CD,CAgDH,CAlDE,CAoDV,CArDK,CAAN","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle. If not, see "+b+"
";a(".eulacontainer").hide().html(b).fadeIn()});f+="';\n var icon = M.cfg.wwwroot + '/plagiarism/turnitinsim/pix/tiiIcon.svg';\n loading += '![](\"')
';\n var loadingCvStr = M.str.plagiarism_turnitinsim.loadingcv;\n loading += '
';\n $(dvWindow.document.body).html(loading);\n\n $.ajax({\n type: \"GET\",\n url: M.cfg.wwwroot + \"/plagiarism/turnitinsim/ajax/cv.php\",\n dataType: \"json\",\n data: {\n action: 'request_cv_launch',\n submissionid: submissionid,\n sesskey: M.cfg.sesskey\n },\n success: function(data) {\n // Redirect opened window to returned URL.\n dvWindow.location = data.viewer_url;\n this.checkDVClosed(dvWindow);\n },\n checkDVClosed: function(dvWindow) {\n var that = this;\n if (dvWindow.closed) {\n window.location = window.location;\n } else {\n setTimeout(function() {\n that.checkDVClosed(dvWindow);\n }, 500);\n }\n }\n });\n });\n }\n };\n});"],"file":"cv_launch.min.js"}
\ No newline at end of file
+{"version":3,"sources":["../src/cv_launch.js"],"names":["define","$","str","openCv","document","on","classList","parent","attr","split","submissionid","each","index","match","dvWindow","window","open","loading","icon","M","cfg","wwwroot","get_string","done","text","hide","html","fadeIn","body","ajax","type","url","dataType","data","action","sesskey","success","location","viewer_url","checkDVClosed","that","closed","setTimeout"],"mappings":"AA4BAA,OAAM,oCAAC,CAAC,QAAD,CAAW,UAAX,CAAD,CAAyB,SAASC,CAAT,CAAYC,CAAZ,CAAiB,CAC5C,MAAO,CACHC,MAAM,CAAE,iBAAW,CACfF,CAAC,CAACG,QAAD,CAAD,CAAYC,EAAZ,CAAe,OAAf,CAAwB,WAAxB,CAAqC,UAAW,IAGxCC,CAAAA,CAAS,CAAGL,CAAC,CAAC,IAAD,CAAD,CAAQM,MAAR,GAAiBC,IAAjB,CAAsB,OAAtB,EAA+BC,KAA/B,CAAqC,KAArC,CAH4B,CAIxCC,CAAY,CAAG,CAJyB,CAK5CT,CAAC,CAACK,CAAD,CAAD,CAAaK,IAAb,CAAkB,SAASC,CAAT,CAAgB,CAC9B,GAAIN,CAAS,CAACM,CAAD,CAAT,CAAiBC,KAAjB,CAAuB,cAAvB,CAAJ,CAA4C,CACxCH,CAAY,CAAGJ,CAAS,CAACM,CAAD,CAAT,CAAiBH,KAAjB,CAAuB,GAAvB,EAA4B,CAA5B,CAClB,CACJ,CAJD,EAL4C,GAaxCK,CAAAA,CAAQ,CAAGC,MAAM,CAACC,IAAP,CAAY,EAAZ,CAAgB,UAAhB,CAb6B,CAcxCC,CAAO,CAAG,6DAd8B,CAexCC,CAAI,CAAGC,CAAC,CAACC,GAAF,CAAMC,OAAN,CAAgB,yCAfiB,CAgB5CJ,CAAO,EAAI,cAAeC,CAAf,CAAsB,0CAAjC,CAEAhB,CAAG,CAACoB,UAAJ,CAAe,WAAf,CAA4B,wBAA5B,EAAsDC,IAAtD,CAA2D,SAASC,CAAT,CAAe,CACtEP,CAAO,EAAI,2DAA2DO,CAA3D,CAAkE,MAA7E,CACAvB,CAAC,CAAC,gBAAD,CAAD,CAAoBwB,IAApB,GAA2BC,IAA3B,CAAgCF,CAAhC,EAAsCG,MAAtC,EACH,CAHD,EAKAV,CAAO,EAAI,QAAX,CACAhB,CAAC,CAACa,CAAQ,CAACV,QAAT,CAAkBwB,IAAnB,CAAD,CAA0BF,IAA1B,CAA+BT,CAA/B,EAEAhB,CAAC,CAAC4B,IAAF,CAAO,CACHC,IAAI,CAAE,KADH,CAEHC,GAAG,CAAEZ,CAAC,CAACC,GAAF,CAAMC,OAAN,CAAgB,qCAFlB,CAGHW,QAAQ,CAAE,MAHP,CAIHC,IAAI,CAAE,CACFC,MAAM,CAAE,mBADN,CAEFxB,YAAY,CAAEA,CAFZ,CAGFyB,OAAO,CAAEhB,CAAC,CAACC,GAAF,CAAMe,OAHb,CAJH,CASHC,OAAO,CAAE,iBAASH,CAAT,CAAe,CAEpBnB,CAAQ,CAACuB,QAAT,CAAoBJ,CAAI,CAACK,UAAzB,CACA,KAAKC,aAAL,CAAmBzB,CAAnB,CACH,CAbE,CAcHyB,aAAa,CAAE,uBAASzB,CAAT,CAAmB,CAC9B,GAAI0B,CAAAA,CAAI,CAAG,IAAX,CACA,GAAI1B,CAAQ,CAAC2B,MAAb,CAAqB,CACjB1B,MAAM,CAACsB,QAAP,CAAkBtB,MAAM,CAACsB,QAC5B,CAFD,IAEO,CACHK,UAAU,CAAC,UAAW,CAClBF,CAAI,CAACD,aAAL,CAAmBzB,CAAnB,CACH,CAFS,CAEP,GAFO,CAGb,CACJ,CAvBE,CAAP,CAyBH,CAnDD,CAoDH,CAtDE,CAwDV,CAzDK,CAAN","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle. If not, see ' + loadingCvStr + '
';\n loading += '';\n var icon = M.cfg.wwwroot + '/plagiarism/turnitinsim/pix/tiiIcon.svg';\n loading += '';\n\n str.get_string('loadingcv', 'plagiarism_turnitinsim').done(function(text) {\n loading += '
';\n $(dvWindow.document.body).html(loading);\n\n $.ajax({\n type: \"GET\",\n url: M.cfg.wwwroot + \"/plagiarism/turnitinsim/ajax/cv.php\",\n dataType: \"json\",\n data: {\n action: 'request_cv_launch',\n submissionid: submissionid,\n sesskey: M.cfg.sesskey\n },\n success: function(data) {\n // Redirect opened window to returned URL.\n dvWindow.location = data.viewer_url;\n this.checkDVClosed(dvWindow);\n },\n checkDVClosed: function(dvWindow) {\n var that = this;\n if (dvWindow.closed) {\n window.location = window.location;\n } else {\n setTimeout(function() {\n that.checkDVClosed(dvWindow);\n }, 500);\n }\n }\n });\n });\n }\n };\n});"],"file":"cv_launch.min.js"}
\ No newline at end of file
diff --git a/amd/build/eula_response.min.js b/amd/build/eula_response.min.js
index 7eb8602..da8e566 100644
--- a/amd/build/eula_response.min.js
+++ b/amd/build/eula_response.min.js
@@ -1,2 +1,2 @@
-define ("plagiarism_turnitinsim/eula_response",["jquery"],function(a){return{eula_response:function eula_response(){a(document).ready(function(){a("input[name=submitbutton]").prop("disabled","disabled")});a(document).on("click","#pp-eula-accept",function(){a("input[name=submitbutton]").prop("disabled","");a.ajax({type:"POST",url:M.cfg.wwwroot+"/plagiarism/turnitinsim/ajax/eula_response.php",dataType:"text",data:{action:"accept_eula",sesskey:M.cfg.sesskey},success:function success(){a(".eulacontainer").hide().html(M.str.plagiarism_turnitinsim.eulaaccepted).fadeIn()}})});a(document).on("click","#pp-eula-decline",function(){a(".eulacontainer").hide().html(M.str.plagiarism_turnitinsim.euladeclined).fadeIn();a("input[name=submitbutton]").prop("disabled","")})}}});
+define ("plagiarism_turnitinsim/eula_response",["jquery","core/str"],function(a,b){return{eulaResponse:function eulaResponse(){a(document).ready(function(){a("input[name=submitbutton]").prop("disabled","disabled")});a(document).on("click","#pp-eula-accept",function(){a("input[name=submitbutton]").prop("disabled","");a.ajax({type:"POST",url:M.cfg.wwwroot+"/plagiarism/turnitinsim/ajax/eula_response.php",dataType:"text",data:{action:"accept_eula",sesskey:M.cfg.sesskey},success:function success(){b.get_string("eulaaccepted","plagiarism_turnitinsim").done(function(b){a(".eulacontainer").hide().html(b).fadeIn()})}})});a(document).on("click","#pp-eula-decline",function(){b.get_string("euladeclined","plagiarism_turnitinsim").done(function(b){a(".eulacontainer").hide().html(b).fadeIn()});a("input[name=submitbutton]").prop("disabled","")})}}});
//# sourceMappingURL=eula_response.min.js.map
diff --git a/amd/build/eula_response.min.js.map b/amd/build/eula_response.min.js.map
index 106de6e..6c00fdf 100644
--- a/amd/build/eula_response.min.js.map
+++ b/amd/build/eula_response.min.js.map
@@ -1 +1 @@
-{"version":3,"sources":["../src/eula_response.js"],"names":["define","$","eula_response","document","ready","prop","on","ajax","type","url","M","cfg","wwwroot","dataType","data","action","sesskey","success","hide","html","str","plagiarism_turnitinsim","eulaaccepted","fadeIn","euladeclined"],"mappings":"AA4BAA,OAAM,wCAAC,CAAC,QAAD,CAAD,CAAa,SAASC,CAAT,CAAY,CAC3B,MAAO,CACHC,aAAa,CAAE,wBAAW,CACtBD,CAAC,CAACE,QAAD,CAAD,CAAYC,KAAZ,CAAkB,UAAW,CACzBH,CAAC,CAAC,0BAAD,CAAD,CAA8BI,IAA9B,CAAmC,UAAnC,CAA+C,UAA/C,CACH,CAFD,EAIAJ,CAAC,CAACE,QAAD,CAAD,CAAYG,EAAZ,CAAe,OAAf,CAAwB,iBAAxB,CAA2C,UAAW,CAClDL,CAAC,CAAC,0BAAD,CAAD,CAA8BI,IAA9B,CAAmC,UAAnC,CAA+C,EAA/C,EAGAJ,CAAC,CAACM,IAAF,CAAO,CACHC,IAAI,CAAE,MADH,CAEHC,GAAG,CAAEC,CAAC,CAACC,GAAF,CAAMC,OAAN,CAAgB,gDAFlB,CAGHC,QAAQ,CAAE,MAHP,CAIHC,IAAI,CAAE,CAACC,MAAM,CAAE,aAAT,CAAwBC,OAAO,CAAEN,CAAC,CAACC,GAAF,CAAMK,OAAvC,CAJH,CAKHC,OAAO,CAAE,kBAAW,CAChBhB,CAAC,CAAC,gBAAD,CAAD,CAAoBiB,IAApB,GAA2BC,IAA3B,CAAgCT,CAAC,CAACU,GAAF,CAAMC,sBAAN,CAA6BC,YAA7D,EAA2EC,MAA3E,EACH,CAPE,CAAP,CASH,CAbD,EAeAtB,CAAC,CAACE,QAAD,CAAD,CAAYG,EAAZ,CAAe,OAAf,CAAwB,kBAAxB,CAA4C,UAAW,CACnDL,CAAC,CAAC,gBAAD,CAAD,CAAoBiB,IAApB,GAA2BC,IAA3B,CAAgCT,CAAC,CAACU,GAAF,CAAMC,sBAAN,CAA6BG,YAA7D,EAA2ED,MAA3E,GACAtB,CAAC,CAAC,0BAAD,CAAD,CAA8BI,IAA9B,CAAmC,UAAnC,CAA+C,EAA/C,CACH,CAHD,CAIH,CAzBE,CA2BV,CA5BK,CAAN","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle. If not, see ' + text + '
';\n $('.eulacontainer').hide().html(text).fadeIn();\n });\n\n loading += '';
var icon = M.cfg.wwwroot + '/plagiarism/turnitinsim/pix/tiiIcon.svg';
loading += '
';
- var loadingCvStr = M.str.plagiarism_turnitinsim.loadingcv;
- loading += '
';
$(dvWindow.document.body).html(loading);
diff --git a/amd/src/eula_response.js b/amd/src/eula_response.js
index ff45f92..87b2ecc 100644
--- a/amd/src/eula_response.js
+++ b/amd/src/eula_response.js
@@ -26,9 +26,9 @@
* @module plagiarism_turnitinsim/handleEulaResponse
*/
-define(['jquery'], function($) {
+define(['jquery', 'core/str'], function($, str) {
return {
- eula_response: function() {
+ eulaResponse: function() {
$(document).ready(function() {
$('input[name=submitbutton]').prop('disabled', 'disabled');
});
@@ -43,13 +43,18 @@ define(['jquery'], function($) {
dataType: "text",
data: {action: "accept_eula", sesskey: M.cfg.sesskey},
success: function() {
- $('.eulacontainer').hide().html(M.str.plagiarism_turnitinsim.eulaaccepted).fadeIn();
+ str.get_string('eulaaccepted', 'plagiarism_turnitinsim').done(function(text) {
+ $('.eulacontainer').hide().html(text).fadeIn();
+ });
}
});
});
$(document).on('click', '#pp-eula-decline', function() {
- $('.eulacontainer').hide().html(M.str.plagiarism_turnitinsim.euladeclined).fadeIn();
+ str.get_string('euladeclined', 'plagiarism_turnitinsim').done(function(text) {
+ $('.eulacontainer').hide().html(text).fadeIn();
+ });
+
$('input[name=submitbutton]').prop('disabled', '');
});
}
diff --git a/amd/src/inbox_eula_launch.js b/amd/src/inbox_eula_launch.js
index d8e2dbe..1fd49de 100644
--- a/amd/src/inbox_eula_launch.js
+++ b/amd/src/inbox_eula_launch.js
@@ -24,7 +24,7 @@ define(['jquery',
],
function($, Templates, ModalFactory, ModalTcEula) {
return {
- inbox_eula_launch: function() {
+ inboxEulaLaunch: function() {
var trigger = $('.eula-row-launch');
ModalFactory.create(
diff --git a/amd/src/modal_eula.js b/amd/src/modal_eula.js
index c62a65f..034464f 100644
--- a/amd/src/modal_eula.js
+++ b/amd/src/modal_eula.js
@@ -74,7 +74,7 @@ define(
Config.wwwroot + '/plagiarism/turnitinsim/eula.php?cmd=eularedirect&sesskey=' + Config.sesskey,
'_blank'
);
- }.bind(this));
+ });
// On accepting the EULA, update the db and queue submissions for this module.
this.getModal().on(CustomEvents.events.activate, SELECTORS.ACCEPT_BUTTON, function() {
@@ -89,7 +89,7 @@ define(
contextid: Config.contextid,
sesskey: Config.sesskey
},
- success: function () {
+ success: function() {
modal.hide();
var link = window.location.origin + window.location.pathname + window.location.search + '&eula=1';
window.location.href = link;
diff --git a/amd/src/resend_submission.js b/amd/src/resend_submission.js
index c87b5b8..5cbb00f 100644
--- a/amd/src/resend_submission.js
+++ b/amd/src/resend_submission.js
@@ -26,7 +26,7 @@
* @module plagiarism_turnitinsim/resendSubmission
*/
-define(['jquery'], function($) {
+define(['jquery', 'core/str'], function($, str) {
return {
resendSubmission: function() {
$(document).on('click', '.pp_resubmit_link', function() {
@@ -37,7 +37,7 @@ define(['jquery'], function($) {
// Moodle forums strip ids from elements so we have to use classes.
var classList = $(this).attr('class').split(/\s+/);
var submissionid = 0;
- $(classList).each(function(index){
+ $(classList).each(function(index) {
if (classList[index].match("^pp_resubmit_id_")) {
submissionid = classList[index].split("_")[3];
}
@@ -50,7 +50,11 @@ define(['jquery'], function($) {
data: {action: "resubmit_event", submissionid: submissionid, sesskey: M.cfg.sesskey},
success: function() {
that.siblings('.turnitinsim_status').removeClass('hidden');
- that.siblings('.tii_status_text').html(M.str.plagiarism_turnitinsim.submissiondisplaystatusqueued);
+
+ str.get_string('euladeclined', 'plagiarism_turnitinsim').done(function(text) {
+ that.siblings('.tii_status_text').html(text);
+ });
+
that.siblings('.pp_resubmitting').addClass('hidden');
},
error: function() {
diff --git a/amd/src/set_report_generation.js b/amd/src/set_report_generation.js
index a6ca6a4..bee955e 100644
--- a/amd/src/set_report_generation.js
+++ b/amd/src/set_report_generation.js
@@ -28,7 +28,7 @@
define(['jquery'], function($) {
return {
- set_report_generation: function() {
+ setReportGeneration: function() {
$(document).on('click', 'input[name="duedate[enabled]"]', function() {
if (!$(this).is(":checked")) {
$('select[name=reportgeneration]')[0].selectedIndex = 0;
diff --git a/backup/moodle2/backup_plagiarism_turnitinsim_plugin.class.php b/backup/moodle2/backup_plagiarism_turnitinsim_plugin.class.php
index ba71953..76f3431 100644
--- a/backup/moodle2/backup_plagiarism_turnitinsim_plugin.class.php
+++ b/backup/moodle2/backup_plagiarism_turnitinsim_plugin.class.php
@@ -25,8 +25,18 @@
defined('MOODLE_INTERNAL') || die();
+/**
+ * Used when backing up data created by the plugin.
+ */
class backup_plagiarism_turnitinsim_plugin extends backup_plagiarism_plugin {
+ /**
+ * Required by Moodle's backup tool to define the plugin structure.
+ *
+ * @return backup_plugin_element
+ * @throws backup_step_exception
+ * @throws base_element_struct_exception
+ */
protected function define_module_plugin_structure() {
$plugin = $this->get_plugin_element();
diff --git a/backup/moodle2/restore_plagiarism_turnitinsim_plugin.class.php b/backup/moodle2/restore_plagiarism_turnitinsim_plugin.class.php
index 1bc2aa9..80a2bd8 100644
--- a/backup/moodle2/restore_plagiarism_turnitinsim_plugin.class.php
+++ b/backup/moodle2/restore_plagiarism_turnitinsim_plugin.class.php
@@ -25,6 +25,9 @@
defined('MOODLE_INTERNAL') || die();
+/**
+ * Used when restoring data created by the plugin.
+ */
class restore_plagiarism_turnitinsim_plugin extends restore_plagiarism_plugin {
/**
@@ -42,6 +45,9 @@ protected function define_module_plugin_structure() {
/**
* Restore the Turnitin settings for this module.
* This will only be done if the module is from the same site from where it was backed up.
+ *
+ * @param $data object The data we are restoring.
+ * @throws dml_exception
*/
public function process_turnitinsim_mods($data) {
global $DB;
@@ -59,6 +65,9 @@ public function process_turnitinsim_mods($data) {
* Restore the links to Turnitin submissions.
* This will only be done if the module is from the same site from where it was backed up
* and if the Turnitin submission does not currently exist in the database.
+ *
+ * @param $data object The data we are restoring.
+ * @throws dml_exception
*/
public function process_turnitinsim_subs($data) {
global $DB, $SESSION;
@@ -83,6 +92,9 @@ public function process_turnitinsim_subs($data) {
* Restore the Turnitin users.
* This will only be done if the module is from the same site from where it was backed up
* and if the Turnitin user id does not currently exist in the database.
+ *
+ * @param $data object The data we are restoring.
+ * @throws dml_exception
*/
public function process_turnitinsim_usrs($data) {
global $DB;
diff --git a/callbacks.php b/callbacks.php
index ef3523d..56a4803 100644
--- a/callbacks.php
+++ b/callbacks.php
@@ -86,7 +86,8 @@
}
// Handle Similarity complete callback.
-if ($reqheaders['X-Turnitin-EventType'] == TURNITINSIM_SIMILARITY_COMPLETE || $reqheaders['X-Turnitin-EventType'] == TURNITINSIM_SIMILARITY_UPDATED) {
+if ($reqheaders['X-Turnitin-EventType'] == TURNITINSIM_SIMILARITY_COMPLETE ||
+ $reqheaders['X-Turnitin-EventType'] == TURNITINSIM_SIMILARITY_UPDATED) {
// Get Moodle submission id from Turnitin id.
$submission = $DB->get_record_select('plagiarism_turnitinsim_sub', 'turnitinid = ?', array($params->submission_id));
$tssubmission = new plagiarism_turnitinsim_submission( new plagiarism_turnitinsim_request(), $submission->id );
diff --git a/classes/assign.class.php b/classes/assign.class.php
index d8bc4a0..29d68a7 100644
--- a/classes/assign.class.php
+++ b/classes/assign.class.php
@@ -25,13 +25,17 @@
defined('MOODLE_INTERNAL') || die();
+/**
+ * Helper class for plagiarism_turnitinsim component in assignments
+ */
class plagiarism_turnitinsim_assign {
/**
* Get the text from the database for the submission.
*
- * @param $itemid
- * @return mixed
+ * @param $itemid String The itemid for this submission.
+ * @return mixed The text of the submission.
+ * @throws dml_exception
*/
public function get_onlinetext($itemid) {
global $DB;
@@ -44,8 +48,9 @@ public function get_onlinetext($itemid) {
/**
* Get the item id from the database for this submission.
*
- * @param $params
- * @return mixed
+ * @param $params object The params to call the DB with.
+ * @return int The itemid.
+ * @throws dml_exception
*/
public function get_itemid($params) {
global $DB;
@@ -65,10 +70,13 @@ public function get_itemid($params) {
/**
* Get the actual author of the submission.
*
- * @param $userid
- * @param $relateduserid
- * @param $cm
- * @param $itemid
+ * @param $userid int The userid as given by Moodle.
+ * @param $relateduserid int The relateduserid as given by Moodle.
+ * @param $cm object The course module.
+ * @param $itemid string the itemid for this submission.
+ * @return int The authorid.
+ * @throws coding_exception
+ * @throws dml_exception
*/
public function get_author($userid, $relateduserid, $cm, $itemid) {
$author = (!empty($relateduserid)) ? $relateduserid : $userid;
@@ -94,8 +102,9 @@ public function get_author($userid, $relateduserid, $cm, $itemid) {
/**
* Get the group id that a submission belongs to.
*
- * @param $itemid
- * @return int
+ * @param $itemid string The itemid for the submission.
+ * @return int The group id.
+ * @throws dml_exception
*/
public function get_groupid($itemid) {
global $DB;
@@ -105,13 +114,14 @@ public function get_groupid($itemid) {
return (!empty($moodlesubmission->groupid)) ? $moodlesubmission->groupid : null;
}
- /*
+ /**
* Related user ID will be NULL if an instructor submits on behalf of a student who is in a group.
* To get around this, we get the group ID, get the group members and set the author as the first student in the group.
* @param int $courseid - The course ID.
* @param int $groupid - The ID of the Moodle group that we're getting from.
* @return int $author The Moodle user ID that we'll be using for the author.
+ * @throws coding_exception
*/
public function get_first_group_author($courseid, $groupid) {
static $context;
@@ -132,8 +142,9 @@ public function get_first_group_author($courseid, $groupid) {
/**
* Return whether the submission is a draft.
*
- * @param $itemid
- * @return bool
+ * @param $itemid string The itemid for the submission.
+ * @return bool If the submission is a draft.
+ * @throws dml_exception
*/
public function is_submission_draft($itemid) {
global $DB;
@@ -143,9 +154,12 @@ public function is_submission_draft($itemid) {
return ($moodlesubmission->status == 'draft') ? true : false;
}
- /*
+ /**
* Get the assignment due date.
- * @param $id
+ *
+ * @param $id int The assignment ID we want the due date for.
+ * @return mixed The due date for the assignment.
+ * @throws dml_exception
*/
public function get_due_date($id) {
global $DB;
@@ -155,12 +169,12 @@ public function get_due_date($id) {
return $module->duedate;
}
- /*
+ /**
* Determines whether the OR links in other posts should be seen. This is not applicable for assignments.
*
- * @param $courseid
- * @param $userid
- * @return bool
+ * @param $courseid int The ID for this course.
+ * @param $userid int The userid.
+ * @return bool if showing other posts links.
*/
public function show_other_posts_links($courseid, $userid) {
return true;
diff --git a/classes/callback.class.php b/classes/callback.class.php
index e8acf8e..f3654af 100644
--- a/classes/callback.class.php
+++ b/classes/callback.class.php
@@ -27,10 +27,18 @@
defined('MOODLE_INTERNAL') || die();
+/**
+ * Class for handling callbacks from Turnitin.
+ */
class plagiarism_turnitinsim_callback {
public $tsrequest;
+ /**
+ * plagiarism_turnitinsim_callback constructor.
+ *
+ * @param plagiarism_turnitinsim_request|null $tsrequest The request we're handling.
+ */
public function __construct(plagiarism_turnitinsim_request $tsrequest = null ) {
$this->tsrequest = $tsrequest;
}
@@ -38,10 +46,10 @@ public function __construct(plagiarism_turnitinsim_request $tsrequest = null ) {
/**
* Attempt to retrieve the webhook.
*
- * @param $webhookid
- * @return bool
+ * @param $webhookid string The webhookid to check.
+ * @return bool true if has webhook.
*/
- public function get_webhook($webhookid) {
+ public function has_webhook($webhookid) {
// Make request to get webhook.
try {
$endpoint = TURNITINSIM_ENDPOINT_GET_WEBHOOK;
@@ -78,8 +86,8 @@ public function get_webhook($webhookid) {
/**
* Attempt to delete the webhook (not currently used).
*
- * @param $webhookid
- * @return bool
+ * @param $webhookid string The webhookid to be deleted.
+ * @return bool true if webhook has been deleted.
*/
public function delete_webhook($webhookid) {
// Make request to get webhook.
@@ -115,7 +123,11 @@ public function create_webhook() {
$request['signing_secret'] = $secret;
$request['description'] = get_string('webhook_description', 'plagiarism_turnitinsim', TURNITINSIM_CALLBACK_URL);
$request['url'] = TURNITINSIM_CALLBACK_URL;
- $request['event_types'] = array(TURNITINSIM_SUBMISSION_COMPLETE, TURNITINSIM_SIMILARITY_COMPLETE, TURNITINSIM_SIMILARITY_UPDATED);
+ $request['event_types'] = array(
+ TURNITINSIM_SUBMISSION_COMPLETE,
+ TURNITINSIM_SIMILARITY_COMPLETE,
+ TURNITINSIM_SIMILARITY_UPDATED
+ );
$request['allow_insecure'] = preg_match("@^https?://@", $CFG->wwwroot) ? true : false;
// Make request to add webhook.
@@ -141,11 +153,15 @@ public function create_webhook() {
}
/**
- * Handle callbacks from Turnitin.
+ * Generate a 64 character length hash of the request string.
+ *
+ * @param $requeststring string The request in string format.
+ * @return string A 64 character length hash.
+ * @throws dml_exception
*/
- public function expected_callback_signature($requeststr) {
+ public function expected_callback_signature($requeststring) {
$secret = get_config('plagiarism_turnitinsim', 'turnitin_webhook_secret');
- $sig = hash_hmac('sha256', $requeststr, base64_decode($secret));
+ $sig = hash_hmac('sha256', $requeststring, base64_decode($secret));
return $sig;
}
@@ -153,7 +169,8 @@ public function expected_callback_signature($requeststr) {
/**
* Generate random webhook secret.
*
- * @return string
+ * @return string Random webhook secret.
+ * @throws Exception
*/
public function generate_secret() {
$randomstring = random_bytes(20);
diff --git a/classes/defaults_form.class.php b/classes/defaults_form.class.php
index e0260be..34cbcb2 100644
--- a/classes/defaults_form.class.php
+++ b/classes/defaults_form.class.php
@@ -15,7 +15,7 @@
// along with Moodle. If not, see ' + loadingCvStr + '
'; + + str.get_string('loadingcv', 'plagiarism_turnitinsim').done(function(text) { + loading += '' + text + '
'; + $('.eulacontainer').hide().html(text).fadeIn(); + }); + loading += '