tonyair
/
silverstripe-restfulserver
mirror of https://github.com/silverstripe/silverstripe-restfulserver
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #56 from catalyst/sanitise-json-classnames 

Sanitise json classnames
This commit is contained in:
Robbie Averill 2018-04-04 15:19:54 +12:00 committed by GitHub
parent 49f12cb31d 9cfe4f343d
commit bb000254af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/DataFormatter/JSONDataFormatter.php
View File

@ -108,11 +108,11 @@ class JSONDataFormatter extends DataFormatter
} }
$fieldName = $relName . 'ID'; $fieldName = $relName . 'ID';
if ($obj->$fieldName) { $rel = $this->config()->api_base;
$href = Director::absoluteURL($this->config()->api_base . "$relClass/" . $obj->$fieldName); $rel .= $obj->$fieldName
} else { ? $this->sanitiseClassName($relClass) . '/' . $obj->$fieldName
$href = Director::absoluteURL($this->config()->api_base . "$className/$id/$relName"); : $this->sanitiseClassName($className) . "/$id/$relName";
} $href = Director::absoluteURL($rel);
$serobj->$relName = ArrayData::array_to_object(array( $serobj->$relName = ArrayData::array_to_object(array(
"className" => $relClass, "className" => $relClass,
"href" => "$href.json", "href" => "$href.json",
@ -140,8 +140,8 @@ class JSONDataFormatter extends DataFormatter
$innerParts = array(); $innerParts = array();
$items = $obj->$relName(); $items = $obj->$relName();
foreach ($items as $item) { foreach ($items as $item) {
//$href = Director::absoluteURL($this->config()->api_base . "$className/$id/$relName/$item->ID"); $rel = $this->config()->api_base . $this->sanitiseClassName($relClass) . "/$item->ID";
$href = Director::absoluteURL($this->config()->api_base . "$relClass/$item->ID"); $href = Director::absoluteURL($rel);
$innerParts[] = ArrayData::array_to_object(array( $innerParts[] = ArrayData::array_to_object(array(
"className" => $relClass, "className" => $relClass,
"href" => "$href.json", "href" => "$href.json",