joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Dropped that dirty dirty XML support.

Browse source
This commit is contained in:
Josh Sherman 2014-09-25 09:27:59 -04:00
parent 2fa2b6ad03
commit b67269a202
1 changed files with 3 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/classes/Display.php
View file

@ -49,21 +49,6 @@ class Display extends Object
$this->module->response = [$this->module->response]; $this->module->response = [$this->module->response];
} }
$return_json = false;
$return_xml = false;
foreach ($this->module->output as $return)
{
$variable = 'return_' . $return;
$$variable = true;
}
// Makes sure the return type is valid
if (!$return_json && !$return_xml)
{
throw new Exception('Invalid return type.');
}
// Checks for the PHPSESSID in the query string // Checks for the PHPSESSID in the query string
if (stripos($_SERVER['REQUEST_URI'], '?PHPSESSID=') === false) if (stripos($_SERVER['REQUEST_URI'], '?PHPSESSID=') === false)
{ {
@ -96,17 +81,9 @@ class Display extends Object
$response['response'] = $this->module->response; $response['response'] = $this->module->response;
} }
if ($return_json) header('Content-type: application/json');
{ $pretty = isset($_REQUEST['pretty']) ? JSON_PRETTY_PRINT : false;
header('Content-type: application/json'); echo json_encode($response, $pretty);
$pretty = isset($_REQUEST['pretty']) ? JSON_PRETTY_PRINT : false;
echo json_encode($response, $pretty);
}
elseif ($return_xml)
{
header('Content-type: text/xml');
echo Convert::arrayToXML($response, isset($_REQUEST['pretty']));
}
return ob_get_clean(); return ob_get_clean();
} }