### Eclipse Workspace Patch 1.0 #P moodle Index: mod/scorm/datamodels/scorm_13.js.php =================================================================== RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13.js.php,v retrieving revision 1.13 diff -u -r1.13 scorm_13.js.php --- mod/scorm/datamodels/scorm_13.js.php 16 Jan 2007 14:01:41 -0000 1.13 +++ mod/scorm/datamodels/scorm_13.js.php 20 Jan 2007 11:22:33 -0000 @@ -1,6 +1,6 @@ status)) { - //if ($userdata->status == ''&& (!(($userdata->{'cmi.exit'} == 'suspend') || ($userdata->{'cmi.exit'} == 'logout'))&& !($userdata->{'adl.nav.request'} == 'suspendAll'))||($userdata->{'cmi.exit'} == 'normal')) { //antes solo llegaba esta línea hasta el && + //if ($userdata->status == ''&& (!(($userdata->{'cmi.exit'} == 'suspend') || ($userdata->{'cmi.exit'} == 'logout'))&& !($userdata->{'adl.nav.request'} == 'suspendAll'))||($userdata->{'cmi.exit'} == 'normal')) { //antes solo llegaba esta l�nea hasta el && if (!isset($userdata->{'cmi.exit'}) || (($userdata->{'cmi.exit'} == 'time-out') || ($userdata->{'cmi.exit'} == 'normal'))) { $userdata->entry = 'ab-initio'; } else { @@ -75,11 +75,11 @@ 'cmi.comments_from_lms.n.comment':{'format':CMILangString4000, 'mod':'r'}, 'cmi.comments_from_lms.n.location':{'format':CMIString250, 'mod':'r'}, 'cmi.comments_from_lms.n.timestamp':{'format':CMITime, 'mod':'r'}, - 'cmi.completion_status':{'defaultvalue':'{'cmi.completion_status'})?$userdata->{'cmi.completion_status'}:'unknown' ?>', 'format':CMICStatus, 'mod':'rw'}, - 'cmi.completion_threshold':{'defaultvalue':threshold)?'\''.$userdata->threshold.'\'':'null' ?>, 'mod':'r'}, + 'cmi.completion_status':{'defaultvalue':'{'cmi.completion_status'})?addslashes_js($userdata->{'cmi.completion_status'}):'unknown' ?>', 'format':CMICStatus, 'mod':'rw'}, + 'cmi.completion_threshold':{'defaultvalue':threshold)?'\''.addslashes_js($userdata->threshold).'\'':'null' ?>, 'mod':'r'}, 'cmi.credit':{'defaultvalue':'credit)?$userdata->credit:'' ?>', 'mod':'r'}, - 'cmi.entry':{'defaultvalue':'entry ?>', 'mod':'r'}, - 'cmi.exit':{'defaultvalue':'{'cmi.exit'})?$userdata->{'cmi.exit'}:'' ?>', 'format':CMIExit, 'mod':'w'}, + 'cmi.entry':{'defaultvalue':'entry) ?>', 'mod':'r'}, + 'cmi.exit':{'defaultvalue':'{'cmi.exit'})?addslashes_js($userdata->{'cmi.exit'}):'' ?>', 'format':CMIExit, 'mod':'w'}, 'cmi.interactions._children':{'defaultvalue':interactions_children, 'mod':'r'}, 'cmi.interactions._count':{'mod':'r', 'defaultvalue':'0'}, 'cmi.interactions.n.id':{'pattern':CMIIndex, 'format':CMILongIdentifier, 'mod':'rw'}, @@ -94,17 +94,17 @@ 'cmi.interactions.n.result':{'pattern':CMIIndex, 'format':CMIResult, 'mod':'rw'}, 'cmi.interactions.n.latency':{'pattern':CMIIndex, 'format':CMITimespan, 'mod':'rw'}, 'cmi.interactions.n.description':{'pattern':CMIIndex, 'format':CMILangString250, 'mod':'rw'}, - 'cmi.launch_data':{'defaultvalue':datafromlms)?'\''.$userdata->datafromlms.'\'':'null' ?>, 'mod':'r'}, - 'cmi.learner_id':{'defaultvalue':'student_id ?>', 'mod':'r'}, + 'cmi.launch_data':{'defaultvalue':datafromlms)?'\''.addslashes_js($userdata->datafromlms).'\'':'null' ?>, 'mod':'r'}, + 'cmi.learner_id':{'defaultvalue':'student_id) ?>', 'mod':'r'}, 'cmi.learner_name':{'defaultvalue':'student_name) ?>', 'mod':'r'}, 'cmi.learner_preference._children':{'defaultvalue':student_preference_children, 'mod':'r'}, 'cmi.learner_preference.audio_level':{'defaultvalue':'1', 'format':CMIDecimal, 'range':audio_range, 'mod':'rw'}, 'cmi.learner_preference.language':{'defaultvalue':'', 'format':CMILang, 'mod':'rw'}, 'cmi.learner_preference.delivery_speed':{'defaultvalue':'1', 'format':CMIDecimal, 'range':speed_range, 'mod':'rw'}, 'cmi.learner_preference.audio_captioning':{'defaultvalue':'0', 'format':CMISInteger, 'range':text_range, 'mod':'rw'}, - 'cmi.location':{'defaultvalue':{'cmi.location'})?'\''.$userdata->{'cmi.location'}.'\'':'null' ?>, 'format':CMIString1000, 'mod':'rw'}, - 'cmi.max_time_allowed':{'defaultvalue':maxtimeallowed)?'\''.$userdata->maxtimeallowed.'\'':'null' ?>, 'mod':'r'}, - 'cmi.mode':{'defaultvalue':'mode ?>', 'mod':'r'}, + 'cmi.location':{'defaultvalue':{'cmi.location'})?'\''.addslashes_js($userdata->{'cmi.location'}).'\'':'null' ?>, 'format':CMIString1000, 'mod':'rw'}, + 'cmi.max_time_allowed':{'defaultvalue':maxtimeallowed)?'\''.addslashes_js($userdata->maxtimeallowed).'\'':'null' ?>, 'mod':'r'}, + 'cmi.mode':{'defaultvalue':'mode) ?>', 'mod':'r'}, 'cmi.objectives._children':{'defaultvalue':objectives_children, 'mod':'r'}, 'cmi.objectives._count':{'mod':'r', 'defaultvalue':'0'}, 'cmi.objectives.n.id':{'pattern':CMIIndex, 'format':CMILongIdentifier, 'mod':'rw'}, @@ -117,18 +117,18 @@ 'cmi.objectives.n.completion_status':{'defaultvalue':'unknown', 'pattern':CMIIndex, 'format':CMICStatus, 'mod':'rw'}, 'cmi.objectives.n.progress_measure':{'defaultvalue':null, 'format':CMIDecimal, 'range':progress_range, 'mod':'rw'}, 'cmi.objectives.n.description':{'pattern':CMIIndex, 'format':CMILangString250, 'mod':'rw'}, - 'cmi.progress_measure':{'defaultvalue':{'cmi.progess_measure'})?'\''.$userdata->{'cmi.progress_measure'}.'\'':'null' ?>, 'format':CMIDecimal, 'range':progress_range, 'mod':'rw'}, - 'cmi.scaled_passing_score':{'defaultvalue':{'cmi.scaled_passing_score'})?'\''.$userdata->{'cmi.scaled_passing_score'}.'\'':'null' ?>, 'format':CMIDecimal, 'range':scaled_range, 'mod':'r'}, + 'cmi.progress_measure':{'defaultvalue':{'cmi.progess_measure'})?'\''.addslashes_js($userdata->{'cmi.progress_measure'}).'\'':'null' ?>, 'format':CMIDecimal, 'range':progress_range, 'mod':'rw'}, + 'cmi.scaled_passing_score':{'defaultvalue':{'cmi.scaled_passing_score'})?'\''.addslashes_js($userdata->{'cmi.scaled_passing_score'}).'\'':'null' ?>, 'format':CMIDecimal, 'range':scaled_range, 'mod':'r'}, 'cmi.score._children':{'defaultvalue':score_children, 'mod':'r'}, - 'cmi.score.scaled':{'defaultvalue':{'cmi.score.scaled'})?'\''.$userdata->{'cmi.score.scaled'}.'\'':'null' ?>, 'format':CMIDecimal, 'range':scaled_range, 'mod':'rw'}, - 'cmi.score.raw':{'defaultvalue':{'cmi.score.raw'})?'\''.$userdata->{'cmi.score.raw'}.'\'':'null' ?>, 'format':CMIDecimal, 'mod':'rw'}, - 'cmi.score.min':{'defaultvalue':{'cmi.score.min'})?'\''.$userdata->{'cmi.score.min'}.'\'':'null' ?>, 'format':CMIDecimal, 'mod':'rw'}, - 'cmi.score.max':{'defaultvalue':{'cmi.score.max'})?'\''.$userdata->{'cmi.score.max'}.'\'':'null' ?>, 'format':CMIDecimal, 'mod':'rw'}, + 'cmi.score.scaled':{'defaultvalue':{'cmi.score.scaled'})?'\''.addslashes_js($userdata->{'cmi.score.scaled'}).'\'':'null' ?>, 'format':CMIDecimal, 'range':scaled_range, 'mod':'rw'}, + 'cmi.score.raw':{'defaultvalue':{'cmi.score.raw'})?'\''.addslashes_js($userdata->{'cmi.score.raw'}).'\'':'null' ?>, 'format':CMIDecimal, 'mod':'rw'}, + 'cmi.score.min':{'defaultvalue':{'cmi.score.min'})?'\''.addslashes_js($userdata->{'cmi.score.min'}).'\'':'null' ?>, 'format':CMIDecimal, 'mod':'rw'}, + 'cmi.score.max':{'defaultvalue':{'cmi.score.max'})?'\''.addslashes_js($userdata->{'cmi.score.max'}).'\'':'null' ?>, 'format':CMIDecimal, 'mod':'rw'}, 'cmi.session_time':{'format':CMITimespan, 'mod':'w', 'defaultvalue':'PT0H0M0S'}, - 'cmi.success_status':{'defaultvalue':'{'cmi.success_status'})?$userdata->{'cmi.success_status'}:'unknown' ?>', 'format':CMISStatus, 'mod':'rw'}, - 'cmi.suspend_data':{'defaultvalue':{'cmi.suspend_data'})?'\''.$userdata->{'cmi.suspend_data'}.'\'':'null' ?>, 'format':CMIString64000, 'mod':'rw'}, - 'cmi.time_limit_action':{'defaultvalue':timelimitaction)?'\''.$userdata->timelimitaction.'\'':'null' ?>, 'mod':'r'}, - 'cmi.total_time':{'defaultvalue':'{'cmi.total_time'})?$userdata->{'cmi.total_time'}:'PT0H0M0S' ?>', 'mod':'r'}, + 'cmi.success_status':{'defaultvalue':'{'cmi.success_status'})?addslashes_js($userdata->{'cmi.success_status'}):'unknown' ?>', 'format':CMISStatus, 'mod':'rw'}, + 'cmi.suspend_data':{'defaultvalue':{'cmi.suspend_data'})?'\''.addslashes_js($userdata->{'cmi.suspend_data'}).'\'':'null' ?>, 'format':CMIString64000, 'mod':'rw'}, + 'cmi.time_limit_action':{'defaultvalue':timelimitaction)?'\''.addslashes_js($userdata->timelimitaction).'\'':'null' ?>, 'mod':'r'}, + 'cmi.total_time':{'defaultvalue':'{'cmi.total_time'})?addslashes_js($userdata->{'cmi.total_time'}):'PT0H0M0S' ?>', 'mod':'r'}, 'adl.nav.request':{'defaultvalue':'_none_', 'format':NAVEvent, 'mod':'rw'} }; // @@ -176,7 +176,7 @@ echo ' '.$subelement.".score = new Object();\n"; echo ' '.$subelement.".score._children = score_children;\n"; } - echo ' '.$element.' = \''.$value."';\n"; + echo ' '.$element.' = \''.addslashes_js($value)."';\n"; } } if ($count > 0) { @@ -567,7 +567,7 @@ value = value*1.0; if (value >= ranges[0]) { if ((ranges[1] == '*') || (value <= ranges[1])) { - eval(element+'="'+value+'";'); + eval(element+'=value;'); errorCode = "0"; student_id ?>', 'mod':'r', 'writeerror':'403'}, - 'cmi.core.student_name':{'defaultvalue':'student_name) ?>', 'mod':'r', 'writeerror':'403'}, - 'cmi.core.lesson_location':{'defaultvalue':'{'cmi.core.lesson_location'})?$userdata->{'cmi.core.lesson_location'}:'' ?>', 'format':CMIString256, 'mod':'rw', 'writeerror':'405'}, - 'cmi.core.credit':{'defaultvalue':'credit ?>', 'mod':'r', 'writeerror':'403'}, - 'cmi.core.lesson_status':{'defaultvalue':'{'cmi.core.lesson_status'})?$userdata->{'cmi.core.lesson_status'}:'' ?>', 'format':CMIStatus, 'mod':'rw', 'writeerror':'405'}, - 'cmi.core.entry':{'defaultvalue':'entry ?>', 'mod':'r', 'writeerror':'403'}, + 'cmi.core.student_id':{'defaultvalue':'student_id) ?>', 'mod':'r', 'writeerror':'403'}, + 'cmi.core.student_name':{'defaultvalue':'student_name) ?>', 'mod':'r', 'writeerror':'403'}, + 'cmi.core.lesson_location':{'defaultvalue':'{'cmi.core.lesson_location'})?addslashes_js($userdata->{'cmi.core.lesson_location'}):'' ?>', 'format':CMIString256, 'mod':'rw', 'writeerror':'405'}, + 'cmi.core.credit':{'defaultvalue':'credit) ?>', 'mod':'r', 'writeerror':'403'}, + 'cmi.core.lesson_status':{'defaultvalue':'{'cmi.core.lesson_status'})?addslashes_js($userdata->{'cmi.core.lesson_status'}):'' ?>', 'format':CMIStatus, 'mod':'rw', 'writeerror':'405'}, + 'cmi.core.entry':{'defaultvalue':'entry) ?>', 'mod':'r', 'writeerror':'403'}, 'cmi.core.score._children':{'defaultvalue':score_children, 'mod':'r', 'writeerror':'402'}, - 'cmi.core.score.raw':{'defaultvalue':'{'cmi.core.score.raw'})?$userdata->{'cmi.core.score.raw'}:'' ?>', 'format':CMIDecimal, 'range':score_range, 'mod':'rw', 'writeerror':'405'}, - 'cmi.core.score.max':{'defaultvalue':'{'cmi.core.score.max'})?$userdata->{'cmi.core.score.max'}:'' ?>', 'format':CMIDecimal, 'range':score_range, 'mod':'rw', 'writeerror':'405'}, - 'cmi.core.score.min':{'defaultvalue':'{'cmi.core.score.min'})?$userdata->{'cmi.core.score.min'}:'' ?>', 'format':CMIDecimal, 'range':score_range, 'mod':'rw', 'writeerror':'405'}, - 'cmi.core.total_time':{'defaultvalue':'{'cmi.core.total_time'})?$userdata->{'cmi.core.total_time'}:'00:00:00' ?>', 'mod':'r', 'writeerror':'403'}, - 'cmi.core.lesson_mode':{'defaultvalue':'mode ?>', 'mod':'r', 'writeerror':'403'}, - 'cmi.core.exit':{'defaultvalue':'{'cmi.core.exit'})?$userdata->{'cmi.core.exit'}:'' ?>', 'format':CMIExit, 'mod':'w', 'readerror':'404', 'writeerror':'405'}, + 'cmi.core.score.raw':{'defaultvalue':'{'cmi.core.score.raw'})?addslashes_js($userdata->{'cmi.core.score.raw'}):'' ?>', 'format':CMIDecimal, 'range':score_range, 'mod':'rw', 'writeerror':'405'}, + 'cmi.core.score.max':{'defaultvalue':'{'cmi.core.score.max'})?addslashes_js($userdata->{'cmi.core.score.max'}):'' ?>', 'format':CMIDecimal, 'range':score_range, 'mod':'rw', 'writeerror':'405'}, + 'cmi.core.score.min':{'defaultvalue':'{'cmi.core.score.min'})?addslashes_js($userdata->{'cmi.core.score.min'}):'' ?>', 'format':CMIDecimal, 'range':score_range, 'mod':'rw', 'writeerror':'405'}, + 'cmi.core.total_time':{'defaultvalue':'{'cmi.core.total_time'})?addslashes_js($userdata->{'cmi.core.total_time'}):'00:00:00' ?>', 'mod':'r', 'writeerror':'403'}, + 'cmi.core.lesson_mode':{'defaultvalue':'mode) ?>', 'mod':'r', 'writeerror':'403'}, + 'cmi.core.exit':{'defaultvalue':'{'cmi.core.exit'})?addslashes_js($userdata->{'cmi.core.exit'}):'' ?>', 'format':CMIExit, 'mod':'w', 'readerror':'404', 'writeerror':'405'}, 'cmi.core.session_time':{'format':CMITimespan, 'mod':'w', 'defaultvalue':'00:00:00', 'readerror':'404', 'writeerror':'405'}, - 'cmi.suspend_data':{'defaultvalue':'{'cmi.suspend_data'})?$userdata->{'cmi.suspend_data'}:'' ?>', 'format':CMIString4096, 'mod':'rw', 'writeerror':'405'}, - 'cmi.launch_data':{'defaultvalue':'datafromlms)?$userdata->datafromlms:'' ?>', 'mod':'r', 'writeerror':'403'}, - 'cmi.comments':{'defaultvalue':'{'cmi.comments'})?$userdata->{'cmi.comments'}:'' ?>', 'format':CMIString4096, 'mod':'rw', 'writeerror':'405'}, + 'cmi.suspend_data':{'defaultvalue':'{'cmi.suspend_data'})?addslashes_js($userdata->{'cmi.suspend_data'}):'' ?>', 'format':CMIString4096, 'mod':'rw', 'writeerror':'405'}, + 'cmi.launch_data':{'defaultvalue':'datafromlms)?addslashes_js($userdata->datafromlms):'' ?>', 'mod':'r', 'writeerror':'403'}, + 'cmi.comments':{'defaultvalue':'{'cmi.comments'})?addslashes_js($userdata->{'cmi.comments'}):'' ?>', 'format':CMIString4096, 'mod':'rw', 'writeerror':'405'}, 'cmi.comments_from_lms':{'mod':'r', 'writeerror':'403'}, 'cmi.objectives._children':{'defaultvalue':objectives_children, 'mod':'r', 'writeerror':'402'}, 'cmi.objectives._count':{'mod':'r', 'defaultvalue':'0', 'writeerror':'402'}, @@ -80,9 +80,9 @@ 'cmi.objectives.n.score.max':{'defaultvalue':'', 'pattern':CMIIndex, 'format':CMIDecimal, 'range':score_range, 'mod':'rw', 'writeerror':'405'}, 'cmi.objectives.n.status':{'pattern':CMIIndex, 'format':CMIStatus2, 'mod':'rw', 'writeerror':'405'}, 'cmi.student_data._children':{'defaultvalue':student_data_children, 'mod':'r', 'writeerror':'402'}, - 'cmi.student_data.mastery_score':{'defaultvalue':'masteryscore)?$userdata->masteryscore:'' ?>', 'mod':'r', 'writeerror':'403'}, - 'cmi.student_data.max_time_allowed':{'defaultvalue':'maxtimeallowed)?$userdata->maxtimeallowed:'' ?>', 'mod':'r', 'writeerror':'403'}, - 'cmi.student_data.time_limit_action':{'defaultvalue':'timelimitaction)?$userdata->timelimitaction:'' ?>', 'mod':'r', 'writeerror':'403'}, + 'cmi.student_data.mastery_score':{'defaultvalue':'masteryscore)?addslashes_js($userdata->masteryscore):'' ?>', 'mod':'r', 'writeerror':'403'}, + 'cmi.student_data.max_time_allowed':{'defaultvalue':'maxtimeallowed)?addslashes_js($userdata->maxtimeallowed):'' ?>', 'mod':'r', 'writeerror':'403'}, + 'cmi.student_data.time_limit_action':{'defaultvalue':'timelimitaction)?addslashes_js($userdata->timelimitaction):'' ?>', 'mod':'r', 'writeerror':'403'}, 'cmi.student_preference._children':{'defaultvalue':student_preference_children, 'mod':'r', 'writeerror':'402'}, 'cmi.student_preference.audio':{'defaultvalue':'0', 'format':CMISInteger, 'range':audio_range, 'mod':'rw', 'writeerror':'405'}, 'cmi.student_preference.language':{'defaultvalue':'', 'format':CMIString256, 'mod':'rw', 'writeerror':'405'}, @@ -145,7 +145,7 @@ echo ' '.$subelement.".score.min = '';\n"; echo ' '.$subelement.".score.max = '';\n"; } - echo ' '.$element.' = \''.$value."';\n"; + echo ' '.$element.' = \''.addslashes_js($value)."';\n"; } } if ($count > 0) { @@ -334,7 +334,7 @@ ranges = range.split('#'); value = value*1.0; if ((value >= ranges[0]) && (value <= ranges[1])) { - eval(element+'="'+value+'";'); + eval(element+'=value;'); errorCode = "0";