r31k
/
bludit
2
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Bug fixes: Static content as parents

This commit is contained in:
Diego Najar 2017-10-20 20:34:22 +02:00
parent 56041fb5a1
commit b089edfa51
3 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ bl-content/*
bl-plugins/timemachine bl-plugins/timemachine
bl-plugins/remote-content bl-plugins/remote-content
bl-kernel/bludit.pro.php bl-kernel/bludit.pro.php
bl-themes/docs

6
bl-kernel/dbpages.class.php
View File

@ -386,10 +386,10 @@ class dbPages extends dbJSON
// Returns an array with all parents pages key, a parent page is not a child // Returns an array with all parents pages key, a parent page is not a child
public function getParents() public function getParents()
{ {
$db = $this->getPublishedDB(); $db = $this->getPublishedDB() + $this->getStaticDB();
foreach($db as $key=>$fields) { foreach ($db as $key=>$fields) {
// if the key has slash then is a child // if the key has slash then is a child
if( Text::stringContains($key, '/') ) { if (Text::stringContains($key, '/')) {
unset($db[$key]); unset($db[$key]);
} }
} }

40
bl-plugins/api/plugin.php
View File

@ -168,14 +168,14 @@ class pluginAPI extends Plugin {
$inputs = $_GET; $inputs = $_GET;
break; break;
case "PUT": case "PUT":
$inputs = file_get_contents("php://input"); $inputs = '';
break; break;
default: default:
$inputs = json_encode(array()); $inputs = json_encode(array());
break; break;
} }
// Try to get raw data // Try to get raw/json data
if (empty($inputs)) { if (empty($inputs)) {
$inputs = file_get_contents('php://input'); $inputs = file_get_contents('php://input');
} }
@ -183,6 +183,25 @@ class pluginAPI extends Plugin {
return $this->cleanInputs($inputs); return $this->cleanInputs($inputs);
} }
// Returns an array with key=>value
// If the content is JSON is parsed to array
private function cleanInputs($inputs)
{
$tmp = array();
if (is_array($inputs)) {
foreach ($inputs as $key=>$value) {
$tmp[$key] = Sanitize::html($value);
}
} elseif (is_string($inputs)) {
$tmp = json_decode($inputs, true);
if (json_last_error()!==JSON_ERROR_NONE) {
$tmp = array();
}
}
return $tmp;
}
private function getEndpointParameters($URI) private function getEndpointParameters($URI)
{ {
// ENDPOINT Parameters // ENDPOINT Parameters
@ -202,23 +221,6 @@ class pluginAPI extends Plugin {
return $parameters; return $parameters;
} }
private function cleanInputs($inputs)
{
$tmp = array();
if (is_array($inputs)) {
foreach ($inputs as $key=>$value) {
$tmp[$key] = Sanitize::html($value);
}
} elseif(is_string($inputs)) {
$tmp = json_decode($inputs, true);
if (json_last_error()!==JSON_ERROR_NONE) {
$tmp = array();
}
}
return $tmp;
}
private function response($code=200, $message='OK', $data=array()) private function response($code=200, $message='OK', $data=array())
{ {
header('HTTP/1.1 '.$code.' '.$message); header('HTTP/1.1 '.$code.' '.$message);