george/PrivateBin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

working on JSON-LD validity, added CORS headers preparing external API

Browse Source 
call support
This commit is contained in:
El RIDO
2015-10-18 14:37:58 +02:00
parent 22d0b1ec22
commit 14d08ec56d
10 changed files with 123 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/model/comment.php
View File

@@ -38,8 +38,8 @@ class model_comment extends model_abstract
$comments = $this->_store->readComments($this->getPaste()->getId());
foreach ($comments as $comment) {
if (
$comment->meta->parentid == $this->getParentId() &&
$comment->meta->commentid == $this->getId()
$comment->parentid == $this->getParentId() &&
$comment->id == $this->getId()
) {
$this->_data = $comment;
break;

5
lib/request.php
View File

@@ -91,6 +91,7 @@ class request
}
if (
!array_key_exists('pasteid', $this->_params) &&
!array_key_exists('jsonld', $this->_params) &&
array_key_exists('QUERY_STRING', $_SERVER) &&
!empty($_SERVER['QUERY_STRING'])
)
@@ -117,6 +118,10 @@ class request
$this->_operation = 'read';
}
}
elseif (array_key_exists('jsonld', $this->_params) && !empty($this->_params['jsonld']))
{
$this->_operation = 'jsonld';
}
}
/**

45
lib/zerobin.php
View File

@@ -95,6 +95,14 @@ class zerobin
*/
private $_request;
/**
* URL base
*
* @access private
* @var string
*/
private $_urlbase;
/**
* constructor
*
@@ -127,12 +135,18 @@ class zerobin
case 'read':
$this->_read($this->_request->getParam('pasteid'));
break;
case 'jsonld':
$this->_jsonld($this->_request->getParam('jsonld'));
return;
}
// output JSON or HTML
if ($this->_request->isJsonApiCall())
{
header('Content-type: application/json');
header('Access-Control-Allow-Origin: *');
header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE');
header('Access-Control-Allow-Headers: X-Requested-With, Content-Type');
echo $this->_json;
}
else
@@ -162,6 +176,7 @@ class zerobin
$this->_conf = new configuration;
$this->_model = new model($this->_conf);
$this->_request = new request;
$this->_urlbase = array_key_exists('REQUEST_URI', $_SERVER) ? $_SERVER['REQUEST_URI'] : '/';
}
/**
@@ -422,6 +437,32 @@ class zerobin
$page->draw($this->_conf->getKey('template'));
}
private function _jsonld($type)
{
if (
$type !== 'paste' && $type !== 'comment' &&
$type !== 'pastemeta' && $type !== 'commentmeta'
)
{
$type = '';
}
$content = '{}';
$file = PUBLIC_PATH . DIRECTORY_SEPARATOR . 'js' . DIRECTORY_SEPARATOR . $type . '.jsonld';
if (is_readable($file))
{
$content = str_replace(
'?jsonld=',
$this->_urlbase . '?jsonld=',
file_get_contents($file)
);
}
header('Content-type: application/ld+json');
header('Access-Control-Allow-Origin: *');
header('Access-Control-Allow-Methods: GET');
echo $content;
}
/**
* return JSON encoded message and exit
*
@@ -441,9 +482,7 @@ class zerobin
else
{
$result['id'] = $message;
$result['url'] = (
array_key_exists('REQUEST_URI', $_SERVER) ? $_SERVER['REQUEST_URI'] : '/'
) . '?' . $message;
$result['url'] = $this->_urlbase . '?' . $message;
}
$result += $other;
$this->_json = json_encode($result);