From 714b25d07d345c0be30d93d366ccd6367263d51a Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Tue, 15 Jul 2014 01:41:07 +0200 Subject: [PATCH] MDL-35870 mod_scorm : whitespace fixes --- mod/scorm/datamodels/aicc.js | 8 ++++---- mod/scorm/datamodels/aicclib.php | 4 ++-- mod/scorm/datamodels/scorm_12.js | 4 ++-- mod/scorm/datamodels/scorm_12lib.php | 4 ++-- mod/scorm/datamodels/scorm_13.js | 6 +++--- mod/scorm/datamodels/scorm_13lib.php | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/mod/scorm/datamodels/aicc.js b/mod/scorm/datamodels/aicc.js index f2edfab7377..90240f38991 100644 --- a/mod/scorm/datamodels/aicc.js +++ b/mod/scorm/datamodels/aicc.js @@ -21,7 +21,7 @@ function AICCapi(def, cmiobj, scormauto, cfgwwwroot, scormid, scoid, attempt, vi var prerequrl = cfgwwwroot + "/mod/scorm/prereqs.php?a="+scormid+"&scoid="+scoid+"&attempt="+attempt+"&mode="+viewmode+"¤torg="+currentorg+"&sesskey="+sesskey; var datamodelurl = cfgwwwroot + "/mod/scorm/datamodel.php"; var datamodelurlparams = "id="+cmid+"&a="+scormid+"&sesskey="+sesskey+"&attempt="+attempt+"&scoid="+scoid; - + // Standard Data Type Definition CMIString256 = '^.{0,255}$'; CMIString4096 = '^.{0,4096}$'; @@ -156,7 +156,7 @@ function AICCapi(def, cmiobj, scormauto, cfgwwwroot, scormid, scoid, attempt, vi } eval(cmiobj); - + if (cmi.core.lesson_status == '') { cmi.core.lesson_status = 'not attempted'; } @@ -511,7 +511,7 @@ function AICCapi(def, cmiobj, scormauto, cfgwwwroot, scormid, scoid, attempt, vi } else { datastring = CollectData(data,'cmi'); } - + //popupwin(datastring); var myRequest = NewHttpReq(); result = DoRequest(myRequest,datamodelurl,datamodelurlparams+datastring); @@ -534,4 +534,4 @@ M.scorm_api = {}; M.scorm_api.init = function(Y, def, cmiobj, scormauto, cfgwwwroot, scormid, scoid, attempt, viewmode, currentorg, sesskey, cmid) { window.API = new AICCapi(def, cmiobj, scormauto, cfgwwwroot, scormid, scoid, attempt, viewmode, currentorg, sesskey, cmid); -} \ No newline at end of file +} diff --git a/mod/scorm/datamodels/aicclib.php b/mod/scorm/datamodels/aicclib.php index 6609021cb79..5015a25e9fe 100644 --- a/mod/scorm/datamodels/aicclib.php +++ b/mod/scorm/datamodels/aicclib.php @@ -491,7 +491,7 @@ function scorm_aicc_generate_simple_sco($scorm) { */ function get_scorm_default (&$userdata, $scorm, $scoid, $attempt, $mode) { global $USER; - + $userdata->student_id = $USER->username; $userdata->student_name = $USER->lastname .', '. $USER->firstname; @@ -561,4 +561,4 @@ function get_scorm_default (&$userdata, $scorm, $scoid, $attempt, $mode) { $def['cmi.comments'] = scorm_isset($userdata, 'cmi.comments'); return $def; -} \ No newline at end of file +} diff --git a/mod/scorm/datamodels/scorm_12.js b/mod/scorm/datamodels/scorm_12.js index 20b1ecf230d..44ac49811e3 100644 --- a/mod/scorm/datamodels/scorm_12.js +++ b/mod/scorm/datamodels/scorm_12.js @@ -17,7 +17,7 @@ // SCORM 1.2 API Implementation // function SCORMapi1_2(def, cmiobj, cmiint, cmistring256, cmistring4096, scormdebugging, scormauto, scormid, cfgwwwroot, sesskey, scoid, attempt, viewmode, cmid, currentorg) { - + var prerequrl = cfgwwwroot + "/mod/scorm/prereqs.php?a="+scormid+"&scoid="+scoid+"&attempt="+attempt+"&mode="+viewmode+"¤torg="+currentorg+"&sesskey="+sesskey; var datamodelurl = cfgwwwroot + "/mod/scorm/datamodel.php"; var datamodelurlparams = "id="+cmid+"&a="+scormid+"&sesskey="+sesskey+"&attempt="+attempt+"&scoid="+scoid; @@ -640,4 +640,4 @@ M.scorm_api = {}; M.scorm_api.init = function(Y, def, cmiobj, cmiint, cmistring256, cmistring4096, scormdebugging, scormauto, scormid, cfgwwwroot, sesskey, scoid, attempt, viewmode, cmid, currentorg) { window.API = new SCORMapi1_2(def, cmiobj, cmiint, cmistring256, cmistring4096, scormdebugging, scormauto, scormid, cfgwwwroot, sesskey, scoid, attempt, viewmode, cmid, currentorg); -} \ No newline at end of file +} diff --git a/mod/scorm/datamodels/scorm_12lib.php b/mod/scorm/datamodels/scorm_12lib.php index 7d8495f8c85..ec3be067e27 100644 --- a/mod/scorm/datamodels/scorm_12lib.php +++ b/mod/scorm/datamodels/scorm_12lib.php @@ -145,7 +145,7 @@ function get_scorm_default (&$userdata, $scorm, $scoid, $attempt, $mode) { $userdata->status = ''; $userdata->score_raw = ''; } - + if ($scodatas = scorm_get_sco($scoid, SCO_DATA)) { foreach ($scodatas as $key => $value) { $userdata->$key = $value; @@ -205,4 +205,4 @@ function get_scorm_default (&$userdata, $scorm, $scoid, $attempt, $mode) { $def['cmi.student_preference.speed'] = scorm_isset($userdata, 'cmi.student_preference.speed', '0'); $def['cmi.student_preference.text'] = scorm_isset($userdata, 'cmi.student_preference.text', '0'); return $def; -} \ No newline at end of file +} diff --git a/mod/scorm/datamodels/scorm_13.js b/mod/scorm/datamodels/scorm_13.js index 3dfe169f0a5..97562060f66 100644 --- a/mod/scorm/datamodels/scorm_13.js +++ b/mod/scorm/datamodels/scorm_13.js @@ -24,7 +24,7 @@ function SCORMapi1_3(def, cmiobj, cmiint, cmicommentsuser, cmicommentslms, scorm var prerequrl = cfgwwwroot + "/mod/scorm/prereqs.php?a="+scormid+"&scoid="+scoid+"&attempt="+attempt+"&mode="+viewmode+"¤torg="+currentorg+"&sesskey="+sesskey; var datamodelurl = cfgwwwroot + "/mod/scorm/datamodel.php"; var datamodelurlparams = "id="+cmid+"&a="+scormid+"&sesskey="+sesskey+"&attempt="+attempt+"&scoid="+scoid; - + // Standard Data Type Definition // language key has to be checked for language dependent strings @@ -253,7 +253,7 @@ function SCORMapi1_3(def, cmiobj, cmiint, cmicommentsuser, cmicommentslms, scorm eval(cmiint); eval(cmicommentsuser); eval(cmicommentslms); - + if (cmi.completion_status == '') { cmi.completion_status = 'not attempted'; } @@ -1232,4 +1232,4 @@ M.scorm_api = {}; M.scorm_api.init = function(Y, def, cmiobj, cmiint, cmicommentsuser, cmicommentslms, scormdebugging, scormauto, scormid, cfgwwwroot, sesskey, scoid, attempt, viewmode, cmid, currentorg) { window.API_1484_11 = new SCORMapi1_3(def, cmiobj, cmiint, cmicommentsuser, cmicommentslms, scormdebugging, scormauto, scormid, cfgwwwroot, sesskey, scoid, attempt, viewmode, cmid, currentorg); -} \ No newline at end of file +} diff --git a/mod/scorm/datamodels/scorm_13lib.php b/mod/scorm/datamodels/scorm_13lib.php index bc9e92de17a..22799666430 100644 --- a/mod/scorm/datamodels/scorm_13lib.php +++ b/mod/scorm/datamodels/scorm_13lib.php @@ -1234,7 +1234,7 @@ function get_scorm_default (&$userdata, $scorm, $scoid, $attempt, $mode) { } } } - + $userdata->mode = 'normal'; if (!empty($mode)) { $userdata->mode = $mode; @@ -1284,4 +1284,4 @@ function get_scorm_default (&$userdata, $scorm, $scoid, $attempt, $mode) { $def['cmi.total_time'] = scorm_empty($userdata, 'cmi.total_time', 'PT0H0M0S'); return $def; -} \ No newline at end of file +}