diff --git a/api/backlog/index.php b/api/backlog/index.php index b994fcfc5854e37dc1f1fd15e1c1268d74cebba1..557b4cea5687f98359191440f0bd6ac158b8ecab 100644 --- a/api/backlog/index.php +++ b/api/backlog/index.php @@ -15,5 +15,5 @@ try { $backend->authenticateFromHeader($_SERVER['HTTP_AUTHORIZATION'] ?: ""); $renderer->renderJson($backend->context($_GET['anchor'] ?: 0, $_GET['buffer'] ?: 0, $_GET['before'], $_GET['after'])); } catch (\Exception $e) { - $renderer->renderError($e); + $renderer->renderJson(["error" => $e->getMessage()]); } \ No newline at end of file diff --git a/api/search/index.php b/api/search/index.php index e9e45c81675d737bd241665797075731bdeefb36..8b977f08812c6260f5d908f24c45eec0199cdef2 100644 --- a/api/search/index.php +++ b/api/search/index.php @@ -15,5 +15,5 @@ try { $backend->authenticateFromHeader($_SERVER['HTTP_AUTHORIZATION'] ?: ""); $renderer->renderJson($backend->findBuffers($_GET['q'] ?: "")); } catch (\Exception $e) { - $renderer->renderError($e); + $renderer->renderJson(["error" => $e->getMessage()]); } \ No newline at end of file diff --git a/api/searchbuffer/index.php b/api/searchbuffer/index.php index 5e964b72fe247b85fc77c512b00050a088b8f0b3..af96e4b0d76db69d3c32d2805ee76a03c85657f2 100644 --- a/api/searchbuffer/index.php +++ b/api/searchbuffer/index.php @@ -13,7 +13,7 @@ $backend = Backend::createFromConfig($config); try { $backend->authenticateFromHeader($_SERVER['HTTP_AUTHORIZATION'] ?: ""); - $renderer->renderJson($backend->findInBuffer($_GET['q'] ?: "", $_GET['buffer'] ?: 0, $_GET['offset'] ?: 0)); + $renderer->renderJson($backend->findInBuffer($_GET['q'] ?: "", $_GET['buffer'] ?: 0, $_GET['offset'] ?: 0, $_GET['limit'] ?: 0)); } catch (\Exception $e) { - $renderer->renderError($e); + $renderer->renderJson(["error" => $e->getMessage()]); } \ No newline at end of file diff --git a/api/searchbuffers/index.php b/api/searchbuffers/index.php new file mode 100644 index 0000000000000000000000000000000000000000..ed64ceb78edc23f4a7ad988704927f8a354b97fe --- /dev/null +++ b/api/searchbuffers/index.php @@ -0,0 +1,19 @@ +<?php + +namespace QuasselRestSearch; + +require_once '../../qrs_config.php'; +require_once '../../backend/Database.php'; +require_once '../../backend/helper/RendererHelper.php'; +require_once '../../backend/helper/SessionHelper.php'; + +$config = Config::createFromGlobals(); +$renderer = new RendererHelper($config); +$backend = Backend::createFromConfig($config); + +try { + $backend->authenticateFromHeader($_SERVER['HTTP_AUTHORIZATION'] ?: ""); + $renderer->renderJson($backend->findInBufferMultiple($_GET['q'] ?: "", $_GET['limit'] ?: 4)); +} catch (\Exception $e) { + $renderer->renderJson(["error" => $e->getMessage()]); +} \ No newline at end of file diff --git a/backend/helper/RendererHelper.php b/backend/helper/RendererHelper.php index be512d8d0775ed59eca40063c6ca9e48b028d3cf..54ff2d3a22ac0a58b999c5c60e094b24562e15ba 100644 --- a/backend/helper/RendererHelper.php +++ b/backend/helper/RendererHelper.php @@ -21,7 +21,6 @@ class RendererHelper { public function renderJsonError($json) { header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden'); header('Status: 403 Forbidden'); - echo 'Error 403: Forbidden' . "\n"; header('Content-Type: application/json'); echo json_encode($json) . "\n"; } diff --git a/res/search.js b/res/search.js index ff844d41714478e39329b561c41f362ed4c4cfc8..f9d99fd25238713f381caf4f136bae362f7883a3 100644 --- a/res/search.js +++ b/res/search.js @@ -144,7 +144,7 @@ var render_buffer_overview = function (buffer) { "<h2>" + buffer.network + " – " + buffer.name + "</h2>" + "<article>" + ( buffer.contexts.slice(0, 4).map(render_context).join("") + - "<inline-button class='load_more'>Load More Results</inline-button>" + "<inline-button class='load_more'>Show More Results</inline-button>" ) + "</article>" ) + "</buffer>" )