StarMirror/PrivateBin
1
0
Fork 0
mirror of https://github.com/PrivateBin/PrivateBin.git synced 2024-03-22 13:10:41 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into php8

Browse Source
This commit is contained in:
github-actions[bot] 2023-01-21 07:46:05 +00:00
commit 476aa0d3f1
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Controller.php
View File

@ -425,10 +425,13 @@ class Controller
*/ */
private function _jsonld($type) private function _jsonld($type)
{ {
if ( if (!in_array($type, array(
$type !== 'paste' && $type !== 'comment' && 'comment',
$type !== 'pastemeta' && $type !== 'commentmeta' 'commentmeta',
) { 'paste',
'pastemeta',
'types',
))) {
$type = ''; $type = '';
} }
$content = '{}'; $content = '{}';
@ -440,6 +443,13 @@ class Controller
file_get_contents($file) file_get_contents($file)
); );
} }
if ($type === 'types') {
$content = str_replace(
implode('", "', array_keys($this->_conf->getDefaults()['expire_options'])),
implode('", "', array_keys($this->_conf->getSection('expire_options'))),
$content
);
}
header('Content-type: application/ld+json'); header('Content-type: application/ld+json');
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');

17
tst/JsonApiTest.php
View File

@ -253,6 +253,23 @@ class JsonApiTest extends TestCase
), $content, 'outputs data correctly'); ), $content, 'outputs data correctly');
} }
/**
* @runInSeparateProcess
*/
public function testJsonLdTypes()
{
$_GET['jsonld'] = 'types';
ob_start();
new Controller;
$content = ob_get_contents();
ob_end_clean();
$this->assertEquals(str_replace(
'?jsonld=',
'/?jsonld=',
file_get_contents(PUBLIC_PATH . '/js/types.jsonld')
), $content, 'outputs data correctly');
}
/** /**
* @runInSeparateProcess * @runInSeparateProcess
*/ */