From 10b7c5f95c02bc1d94eacaa505ad7ccb6eeace47 Mon Sep 17 00:00:00 2001 From: piers Date: Wed, 25 Feb 2009 23:13:53 +0000 Subject: [PATCH] MDL-18212 - switch to addslashes_js - thanks Tim. Backport 1.8. --- mod/scorm/datamodels/scormlib.php | 42 +++++++++++++++---------------- mod/scorm/locallib.php | 4 +-- mod/scorm/restorelib.php | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/mod/scorm/datamodels/scormlib.php b/mod/scorm/datamodels/scormlib.php index cb420e57ded..c3011ba7274 100644 --- a/mod/scorm/datamodels/scormlib.php +++ b/mod/scorm/datamodels/scormlib.php @@ -5,7 +5,7 @@ function scorm_get_resources($blocks) { if ($block['name'] == 'RESOURCES') { foreach ($block['children'] as $resource) { if ($resource['name'] == 'RESOURCE') { - $resources[addslashes($resource['attrs']['IDENTIFIER'])] = $resource['attrs']; + $resources[addslashes_js($resource['attrs']['IDENTIFIER'])] = $resource['attrs']; } } } @@ -43,7 +43,7 @@ function scorm_get_manifest($blocks,$scoes) { } break; case 'MANIFEST': - $manifest = addslashes($block['attrs']['IDENTIFIER']); + $manifest = addslashes_js($block['attrs']['IDENTIFIER']); $organization = ''; $resources = array(); $resources = scorm_get_resources($block['children']); @@ -55,8 +55,8 @@ function scorm_get_manifest($blocks,$scoes) { $sco->identifier = $item; $sco->title = $item; $sco->parent = '/'; - $sco->launch = addslashes($resource['HREF']); - $sco->scormtype = addslashes($resource['ADLCP:SCORMTYPE']); + $sco->launch = addslashes_js($resource['HREF']); + $sco->scormtype = addslashes_js($resource['ADLCP:SCORMTYPE']); $scoes->elements[$manifest][$organization][$item] = $sco; } } @@ -64,12 +64,12 @@ function scorm_get_manifest($blocks,$scoes) { break; case 'ORGANIZATIONS': if (!isset($scoes->defaultorg)) { - $scoes->defaultorg = addslashes($block['attrs']['DEFAULT']); + $scoes->defaultorg = addslashes_js($block['attrs']['DEFAULT']); } $scoes = scorm_get_manifest($block['children'],$scoes); break; case 'ORGANIZATION': - $identifier = addslashes($block['attrs']['IDENTIFIER']); + $identifier = addslashes_js($block['attrs']['IDENTIFIER']); $organization = ''; $scoes->elements[$manifest][$organization][$identifier]->identifier = $identifier; $scoes->elements[$manifest][$organization][$identifier]->parent = '/'; @@ -91,31 +91,31 @@ function scorm_get_manifest($blocks,$scoes) { $parent = array_pop($parents); array_push($parents, $parent); - $identifier = addslashes($block['attrs']['IDENTIFIER']); + $identifier = addslashes_js($block['attrs']['IDENTIFIER']); $scoes->elements[$manifest][$organization][$identifier]->identifier = $identifier; $scoes->elements[$manifest][$organization][$identifier]->parent = $parent->identifier; if (!isset($block['attrs']['ISVISIBLE'])) { $block['attrs']['ISVISIBLE'] = 'true'; } - $scoes->elements[$manifest][$organization][$identifier]->isvisible = addslashes($block['attrs']['ISVISIBLE']); + $scoes->elements[$manifest][$organization][$identifier]->isvisible = addslashes_js($block['attrs']['ISVISIBLE']); if (!isset($block['attrs']['PARAMETERS'])) { $block['attrs']['PARAMETERS'] = ''; } - $scoes->elements[$manifest][$organization][$identifier]->parameters = addslashes($block['attrs']['PARAMETERS']); + $scoes->elements[$manifest][$organization][$identifier]->parameters = addslashes_js($block['attrs']['PARAMETERS']); if (!isset($block['attrs']['IDENTIFIERREF'])) { $scoes->elements[$manifest][$organization][$identifier]->launch = ''; $scoes->elements[$manifest][$organization][$identifier]->scormtype = 'asset'; } else { - $idref = addslashes($block['attrs']['IDENTIFIERREF']); + $idref = addslashes_js($block['attrs']['IDENTIFIERREF']); $base = ''; if (isset($resources[$idref]['XML:BASE'])) { $base = $resources[$idref]['XML:BASE']; } - $scoes->elements[$manifest][$organization][$identifier]->launch = addslashes($base.$resources[$idref]['HREF']); + $scoes->elements[$manifest][$organization][$identifier]->launch = addslashes_js($base.$resources[$idref]['HREF']); if (empty($resources[$idref]['ADLCP:SCORMTYPE'])) { $resources[$idref]['ADLCP:SCORMTYPE'] = 'asset'; } - $scoes->elements[$manifest][$organization][$identifier]->scormtype = addslashes($resources[$idref]['ADLCP:SCORMTYPE']); + $scoes->elements[$manifest][$organization][$identifier]->scormtype = addslashes_js($resources[$idref]['ADLCP:SCORMTYPE']); } $parent = new stdClass(); @@ -133,7 +133,7 @@ function scorm_get_manifest($blocks,$scoes) { if (!isset($block['tagData'])) { $block['tagData'] = ''; } - $scoes->elements[$manifest][$parent->organization][$parent->identifier]->title = addslashes($block['tagData']); + $scoes->elements[$manifest][$parent->organization][$parent->identifier]->title = addslashes_js($block['tagData']); break; case 'ADLCP:PREREQUISITES': if ($block['attrs']['TYPE'] == 'aicc_script') { @@ -142,7 +142,7 @@ function scorm_get_manifest($blocks,$scoes) { if (!isset($block['tagData'])) { $block['tagData'] = ''; } - $scoes->elements[$manifest][$parent->organization][$parent->identifier]->prerequisites = addslashes($block['tagData']); + $scoes->elements[$manifest][$parent->organization][$parent->identifier]->prerequisites = addslashes_js($block['tagData']); } break; case 'ADLCP:MAXTIMEALLOWED': @@ -151,7 +151,7 @@ function scorm_get_manifest($blocks,$scoes) { if (!isset($block['tagData'])) { $block['tagData'] = ''; } - $scoes->elements[$manifest][$parent->organization][$parent->identifier]->maxtimeallowed = addslashes($block['tagData']); + $scoes->elements[$manifest][$parent->organization][$parent->identifier]->maxtimeallowed = addslashes_js($block['tagData']); break; case 'ADLCP:TIMELIMITACTION': $parent = array_pop($parents); @@ -159,7 +159,7 @@ function scorm_get_manifest($blocks,$scoes) { if (!isset($block['tagData'])) { $block['tagData'] = ''; } - $scoes->elements[$manifest][$parent->organization][$parent->identifier]->timelimitaction = addslashes($block['tagData']); + $scoes->elements[$manifest][$parent->organization][$parent->identifier]->timelimitaction = addslashes_js($block['tagData']); break; case 'ADLCP:DATAFROMLMS': $parent = array_pop($parents); @@ -167,7 +167,7 @@ function scorm_get_manifest($blocks,$scoes) { if (!isset($block['tagData'])) { $block['tagData'] = ''; } - $scoes->elements[$manifest][$parent->organization][$parent->identifier]->datafromlms = addslashes($block['tagData']); + $scoes->elements[$manifest][$parent->organization][$parent->identifier]->datafromlms = addslashes_js($block['tagData']); break; case 'ADLCP:MASTERYSCORE': $parent = array_pop($parents); @@ -175,7 +175,7 @@ function scorm_get_manifest($blocks,$scoes) { if (!isset($block['tagData'])) { $block['tagData'] = ''; } - $scoes->elements[$manifest][$parent->organization][$parent->identifier]->masteryscore = addslashes($block['tagData']); + $scoes->elements[$manifest][$parent->organization][$parent->identifier]->masteryscore = addslashes_js($block['tagData']); break; case 'ADLCP:COMPLETIONTHRESHOLD': $parent = array_pop($parents); @@ -183,7 +183,7 @@ function scorm_get_manifest($blocks,$scoes) { if (!isset($block['tagData'])) { $block['tagData'] = ''; } - $scoes->elements[$manifest][$parent->organization][$parent->identifier]->threshold = addslashes($block['tagData']); + $scoes->elements[$manifest][$parent->organization][$parent->identifier]->threshold = addslashes_js($block['tagData']); break; case 'ADLNAV:PRESENTATION': $parent = array_pop($parents); @@ -489,7 +489,7 @@ function scorm_parse_scorm($pkgdir,$scormid) { $newitem->organization = $organization; $standarddatas = array('parent', 'identifier', 'launch', 'scormtype', 'title'); foreach ($standarddatas as $standarddata) { - $newitem->$standarddata = addslashes($item->$standarddata); + $newitem->$standarddata = addslashes_js($item->$standarddata); } // Insert the new SCO, and retain the link between the old and new for later adjustment @@ -504,7 +504,7 @@ function scorm_parse_scorm($pkgdir,$scormid) { foreach ($optionaldatas as $optionaldata) { if (isset($item->$optionaldata)) { $data->name = $optionaldata; - $data->value = addslashes($item->$optionaldata); + $data->value = addslashes_js($item->$optionaldata); $dataid = insert_record('scorm_scoes_data',$data); } } diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php index 0b393ad193b..db67d6bb1d1 100755 --- a/mod/scorm/locallib.php +++ b/mod/scorm/locallib.php @@ -256,7 +256,7 @@ function scorm_get_scoes($id,$organisation=false) { function scorm_insert_track($userid,$scormid,$scoid,$attempt,$element,$value) { $id = null; if ($track = get_record_select('scorm_scoes_track',"userid='$userid' AND scormid='$scormid' AND scoid='$scoid' AND attempt='$attempt' AND element='$element'")) { - $track->value = addslashes($value); + $track->value = addslashes_js($value); $track->timemodified = time(); $id = update_record('scorm_scoes_track',$track); } else { @@ -265,7 +265,7 @@ function scorm_insert_track($userid,$scormid,$scoid,$attempt,$element,$value) { $track->scoid = $scoid; $track->attempt = $attempt; $track->element = $element; - $track->value = addslashes($value); + $track->value = addslashes_js($value); $track->timemodified = time(); $id = insert_record('scorm_scoes_track',$track); } diff --git a/mod/scorm/restorelib.php b/mod/scorm/restorelib.php index 40886dd27ab..1d4eef9d1f1 100755 --- a/mod/scorm/restorelib.php +++ b/mod/scorm/restorelib.php @@ -478,7 +478,7 @@ if ($result != $content) { //Update record - $scorm->summary = addslashes($result); + $scorm->summary = addslashes_js($result); $status = update_record("scorm",$scorm); if (debugging()) { if (!defined('RESTORE_SILENTLY')) {