mirror of
https://github.com/moodle/moodle.git
synced 2025-01-19 14:27:22 +01:00
MDL-26880 - Fixed missing of activity id
Moved errorCode as global, to allow GetLastError() to work Applied MDL-17891 mechanism against AJAX failures, "true if true, false otherwise" Limited what added to log when in debug, to be compliant with mdl_log.action as VARCHAR(40)
This commit is contained in:
Matteo Scaramuccia
Dan Marsden
parent
91787c37e1
commit
0ec0224b9a
@ -72,7 +72,7 @@
|
|||||||
// Log every datamodel update requested
|
// Log every datamodel update requested
|
||||||
if (substr($element,0,15) == 'adl.nav.request' || substr($element,0,3) == 'cmi') {
|
if (substr($element,0,15) == 'adl.nav.request' || substr($element,0,3) == 'cmi') {
|
||||||
if (scorm_debugging($scorm)) {
|
if (scorm_debugging($scorm)) {
|
||||||
add_to_log($course->id, 'scorm', 'trk: '.trim($scorm->name).' at: '.$attempt, 'view.php?id='.$cm->id, "$element => $value", $cm->id);
|
add_to_log($course->id, 'scorm', 'trk: '.substr(trim($scorm->name), 0, 25).' at: '.$attempt, 'view.php?id='.$cm->id, "$element => $value", $cm->id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -266,6 +266,7 @@ function SCORMapi1_3() {
|
|||||||
var Initialized = false;
|
var Initialized = false;
|
||||||
var Terminated = false;
|
var Terminated = false;
|
||||||
var diagnostic = "";
|
var diagnostic = "";
|
||||||
|
var errorCode = "0";
|
||||||
|
|
||||||
function Initialize (param) {
|
function Initialize (param) {
|
||||||
errorCode = "0";
|
errorCode = "0";
|
||||||
@ -275,7 +276,6 @@ function SCORMapi1_3() {
|
|||||||
errorCode = "0";
|
errorCode = "0";
|
||||||
<?php
|
<?php
|
||||||
if (scorm_debugging($scorm)) {
|
if (scorm_debugging($scorm)) {
|
||||||
// echo 'alert("Initialized SCORM 1.3");';
|
|
||||||
echo 'LogAPICall("Initialize", param, "", errorCode);';
|
echo 'LogAPICall("Initialize", param, "", errorCode);';
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
@ -292,7 +292,6 @@ function SCORMapi1_3() {
|
|||||||
}
|
}
|
||||||
<?php
|
<?php
|
||||||
if (scorm_debugging($scorm)) {
|
if (scorm_debugging($scorm)) {
|
||||||
// echo 'alert("Initialize: "+GetErrorString(errorCode));';
|
|
||||||
echo 'LogAPICall("Initialize", param, "", errorCode);';
|
echo 'LogAPICall("Initialize", param, "", errorCode);';
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
@ -310,43 +309,53 @@ function SCORMapi1_3() {
|
|||||||
errorCode = "0";
|
errorCode = "0";
|
||||||
if (param == "") {
|
if (param == "") {
|
||||||
if ((Initialized) && (!Terminated)) {
|
if ((Initialized) && (!Terminated)) {
|
||||||
|
var AJAXResult = StoreData(cmi,true);
|
||||||
<?php
|
<?php
|
||||||
if (scorm_debugging($scorm)) {
|
if (scorm_debugging($scorm)) {
|
||||||
// echo 'alert("Terminated SCORM 1.3");';
|
echo 'LogAPICall("Terminate", "AJAXResult", AJAXResult, 0);';
|
||||||
echo 'LogAPICall("Terminate", param, "", 0);';
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
Initialized = false;
|
result = ('true' == AJAXResult) ? 'true' : 'false';
|
||||||
Terminated = true;
|
errorCode = ('true' == result)? '0' : '101'; // General exception for any AJAX fault
|
||||||
var result = StoreData(cmi,true);
|
<?php
|
||||||
if (adl.nav.request != '_none_') {
|
if (scorm_debugging($scorm)) {
|
||||||
switch (adl.nav.request) {
|
echo 'LogAPICall("Terminate", "result", result, errorCode);';
|
||||||
case 'continue':
|
}
|
||||||
|
?>
|
||||||
|
if ('true' == result) {
|
||||||
|
Initialized = false;
|
||||||
|
Terminated = true;
|
||||||
|
if (adl.nav.request != '_none_') {
|
||||||
|
switch (adl.nav.request) {
|
||||||
|
case 'continue':
|
||||||
|
setTimeout('scorm_get_next();',500);
|
||||||
|
break;
|
||||||
|
case 'previous':
|
||||||
|
setTimeout('scorm_get_prev();',500);
|
||||||
|
break;
|
||||||
|
case 'choice':
|
||||||
|
break;
|
||||||
|
case 'exit':
|
||||||
|
break;
|
||||||
|
case 'exitAll':
|
||||||
|
break;
|
||||||
|
case 'abandon':
|
||||||
|
break;
|
||||||
|
case 'abandonAll':
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (<?php echo $scorm->auto ?> == 1) {
|
||||||
setTimeout('scorm_get_next();',500);
|
setTimeout('scorm_get_next();',500);
|
||||||
break;
|
}
|
||||||
case 'previous':
|
|
||||||
setTimeout('scorm_get_prev();',500);
|
|
||||||
break;
|
|
||||||
case 'choice':
|
|
||||||
break;
|
|
||||||
case 'exit':
|
|
||||||
break;
|
|
||||||
case 'exitAll':
|
|
||||||
break;
|
|
||||||
case 'abandon':
|
|
||||||
break;
|
|
||||||
case 'abandonAll':
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
// trigger TOC update
|
||||||
|
var sURL = "<?php echo $CFG->wwwroot; ?>" + "/mod/scorm/prereqs.php?a=<?php echo $scorm->id ?>&scoid=<?php echo $scoid ?>&attempt=<?php echo $attempt ?>&mode=<?php echo $mode ?>¤torg=<?php echo $currentorg ?>&sesskey=<?php echo sesskey(); ?>";
|
||||||
|
YAHOO.util.Connect.asyncRequest('GET', sURL, this.connectPrereqCallback, null);
|
||||||
} else {
|
} else {
|
||||||
if (<?php echo $scorm->auto ?> == 1) {
|
diagnostic = "Failure calling the Terminate remote callback: the server replied with HTTP Status " + AJAXResult;
|
||||||
setTimeout('scorm_get_next();',500);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
// trigger TOC update
|
return result;
|
||||||
var sURL = "<?php echo $CFG->wwwroot; ?>" + "/mod/scorm/prereqs.php?a=<?php echo $scorm->id ?>&scoid=<?php echo $scoid ?>&attempt=<?php echo $attempt ?>&mode=<?php echo $mode ?>¤torg=<?php echo $currentorg ?>&sesskey=<?php echo sesskey(); ?>";
|
|
||||||
YAHOO.util.Connect.asyncRequest('GET', sURL, this.connectPrereqCallback, null);
|
|
||||||
return "true";
|
|
||||||
} else {
|
} else {
|
||||||
if (Terminated) {
|
if (Terminated) {
|
||||||
errorCode = "113";
|
errorCode = "113";
|
||||||
@ -359,7 +368,7 @@ function SCORMapi1_3() {
|
|||||||
}
|
}
|
||||||
<?php
|
<?php
|
||||||
if (scorm_debugging($scorm)) {
|
if (scorm_debugging($scorm)) {
|
||||||
echo 'alert("Terminate: "+GetErrorString(errorCode));';
|
echo 'LogAPICall("Terminate", param, "", errorCode);';
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
return "false";
|
return "false";
|
||||||
@ -391,7 +400,6 @@ function SCORMapi1_3() {
|
|||||||
errorCode = "0";
|
errorCode = "0";
|
||||||
<?php
|
<?php
|
||||||
if (scorm_debugging($scorm)) {
|
if (scorm_debugging($scorm)) {
|
||||||
// echo 'alert("GetValue("+element+") -> "+eval(element));';
|
|
||||||
echo 'LogAPICall("GetValue", element, eval(element), 0);';
|
echo 'LogAPICall("GetValue", element, eval(element), 0);';
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
@ -457,7 +465,6 @@ function SCORMapi1_3() {
|
|||||||
}
|
}
|
||||||
<?php
|
<?php
|
||||||
if (scorm_debugging($scorm)) {
|
if (scorm_debugging($scorm)) {
|
||||||
// echo 'alert("GetValue("+element+") -> "+GetErrorString(errorCode));';
|
|
||||||
echo 'LogAPICall("GetValue", element, "", errorCode);';
|
echo 'LogAPICall("GetValue", element, "", errorCode);';
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
@ -754,7 +761,6 @@ function SCORMapi1_3() {
|
|||||||
errorCode = "0";
|
errorCode = "0";
|
||||||
<?php
|
<?php
|
||||||
if (scorm_debugging($scorm)) {
|
if (scorm_debugging($scorm)) {
|
||||||
// echo 'alert("SetValue("+element+","+value+") -> OK");';
|
|
||||||
echo 'LogAPICall("SetValue", element, value, errorCode);';
|
echo 'LogAPICall("SetValue", element, value, errorCode);';
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
@ -770,7 +776,6 @@ function SCORMapi1_3() {
|
|||||||
errorCode = "0";
|
errorCode = "0";
|
||||||
<?php
|
<?php
|
||||||
if (scorm_debugging($scorm)) {
|
if (scorm_debugging($scorm)) {
|
||||||
// echo 'alert("SetValue("+element+","+value+") -> OK");';
|
|
||||||
echo 'LogAPICall("SetValue", element, value, errorCode);';
|
echo 'LogAPICall("SetValue", element, value, errorCode);';
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
@ -922,14 +927,23 @@ function SCORMapi1_3() {
|
|||||||
errorCode = "0";
|
errorCode = "0";
|
||||||
if (param == "") {
|
if (param == "") {
|
||||||
if ((Initialized) && (!Terminated)) {
|
if ((Initialized) && (!Terminated)) {
|
||||||
result = StoreData(cmi,false);
|
var AJAXResult = StoreData(cmi,false);
|
||||||
<?php
|
<?php
|
||||||
if (scorm_debugging($scorm)) {
|
if (scorm_debugging($scorm)) {
|
||||||
echo 'LogAPICall("Commit", param, "", 0);';
|
echo 'LogAPICall("Commit", "AJAXResult", AJAXResult, 0);';
|
||||||
//echo 'alert("Data Commited");';
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
return "true";
|
var result = ('true' == AJAXResult) ? 'true' : 'false';
|
||||||
|
errorCode = ('true' == result)? '0' : '101'; // General exception for any AJAX fault
|
||||||
|
<?php
|
||||||
|
if (scorm_debugging($scorm)) {
|
||||||
|
echo 'LogAPICall("Commit", "result", result, errorCode);';
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
if ('false' == result) {
|
||||||
|
diagnostic = "Failure calling the Commit remote callback: the server replied with HTTP Status " + AJAXResult;
|
||||||
|
}
|
||||||
|
return result;
|
||||||
} else {
|
} else {
|
||||||
if (Terminated) {
|
if (Terminated) {
|
||||||
errorCode = "143";
|
errorCode = "143";
|
||||||
@ -942,15 +956,14 @@ function SCORMapi1_3() {
|
|||||||
}
|
}
|
||||||
<?php
|
<?php
|
||||||
if (scorm_debugging($scorm)) {
|
if (scorm_debugging($scorm)) {
|
||||||
echo 'LogAPICall("Commit", param, "", 0);';
|
echo 'LogAPICall("Commit", param, "", errorCode);';
|
||||||
// echo 'alert("Commit: "+GetErrorString(errorCode));';
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
return "false";
|
return "false";
|
||||||
}
|
}
|
||||||
|
|
||||||
function GetLastError () {
|
function GetLastError () {
|
||||||
<?php
|
<?php
|
||||||
if (scorm_debugging($scorm)) {
|
if (scorm_debugging($scorm)) {
|
||||||
echo 'LogAPICall("GetLastError", "", "", errorCode);';
|
echo 'LogAPICall("GetLastError", "", "", errorCode);';
|
||||||
}
|
}
|
||||||
@ -1241,18 +1254,8 @@ function SCORMapi1_3() {
|
|||||||
datastring += navrequest;
|
datastring += navrequest;
|
||||||
datastring += '&attempt=<?php echo $attempt ?>';
|
datastring += '&attempt=<?php echo $attempt ?>';
|
||||||
datastring += '&scoid=<?php echo $scoid ?>';
|
datastring += '&scoid=<?php echo $scoid ?>';
|
||||||
<?php
|
|
||||||
// if (scorm_debugging($scorm)) {
|
|
||||||
// echo 'popupwin(datastring);';
|
|
||||||
// }
|
|
||||||
?>
|
|
||||||
var myRequest = NewHttpReq();
|
var myRequest = NewHttpReq();
|
||||||
var result = DoRequest(myRequest,"<?php p($CFG->wwwroot) ?>/mod/scorm/datamodel.php","id=<?php p($id) ?>&sesskey=<?php echo sesskey() ?>"+datastring);
|
var result = DoRequest(myRequest,"<?php p($CFG->wwwroot) ?>/mod/scorm/datamodel.php","id=<?php p($id) ?>&a=<?php p($a) ?>&sesskey=<?php echo sesskey() ?>"+datastring);
|
||||||
<?php
|
|
||||||
// if (scorm_debugging($scorm)) {
|
|
||||||
// echo 'popupwin(result);';
|
|
||||||
// }
|
|
||||||
?>
|
|
||||||
var results = String(result).split('\n');
|
var results = String(result).split('\n');
|
||||||
if ((results.length > 2) && (navrequest != '')) {
|
if ((results.length > 2) && (navrequest != '')) {
|
||||||
eval(results[2]);
|
eval(results[2]);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user