-
+
-
+
-
elseif ( ($method==='GET') && ($parameters[0]==='pages') && !empty($parameters[1]) ) {
@@ -144,6 +142,15 @@ class pluginAPI extends Plugin {
elseif ( ($method==='POST') && ($parameters[0]==='pages') && empty($parameters[1]) && $writePermissions ) {
$data = $this->createPage($inputs);
}
+ // (GET) /api/tags
+ elseif ( ($method==='GET') && ($parameters[0]==='tags') && empty($parameters[1]) ) {
+ $data = $this->getTags();
+ }
+ // (GET) /api/tags/
+ elseif ( ($method==='GET') && ($parameters[0]==='tags') && !empty($parameters[1]) ) {
+ $tagKey = $parameters[1];
+ $data = $this->getTag($tagKey);
+ }
else {
$this->response(401, 'Unauthorized', array('message'=>'Access denied or invalid endpoint.'));
}
@@ -193,7 +200,7 @@ class pluginAPI extends Plugin {
return $this->cleanInputs($inputs);
}
- // Returns an array with key=>value
+ // Returns an array with key=>value with the inputs
// If the content is JSON is parsed to array
private function cleanInputs($inputs)
{
@@ -240,14 +247,63 @@ class pluginAPI extends Plugin {
exit($json);
}
- private function getPages()
+ private function getTags()
+ {
+ global $tags;
+ $tmp = array(
+ 'status'=>'0',
+ 'message'=>'List of tags.',
+ 'data'=>array()
+ );
+ foreach ($tags->keys() as $key) {
+ $tag = $tags->getMap($key);
+ array_push($tmp['data'], $tag);
+ }
+ return $tmp;
+ }
+
+ // Returns the tag information and the pages releated to the tag
+ // The array with the pages has the complete information of each page
+ private function getTag($key)
+ {
+ try {
+ $tag = new Tag($key);
+ } catch (Exception $e) {
+ return array(
+ 'status'=>'1',
+ 'message'=>'Tag not found by the tag key: '.$key
+ );
+ }
+
+ $list = array();
+ foreach ($tag->pages() as $pageKey) {
+ try {
+ $page = new Page($pageKey);
+ array_push($list, $page->json($returnsArray=true));
+ } catch (Exception $e){}
+ }
+
+ $data = $tag->json($returnsArray=true);
+ $data['pages'] = $list;
+
+ return array(
+ 'status'=>'0',
+ 'message'=>'Tag data and pages related to the tag.',
+ 'data'=>$data
+ );
+ }
+
+ private function getPages($args)
{
global $pages;
-
- $onlyPublished = true;
+ $published = $args['published'];
+ $static = $args['static'];
+ $draft = $args['draft'];
+ $sticky = $args['sticky'];
+ $scheduled = $args['scheduled'];
$numberOfItems = $this->getValue('numberOfItems');
$pageNumber = 1;
- $list = $pages->getList($pageNumber, $numberOfItems, $onlyPublished);
+ $list = $pages->getList($pageNumber, $numberOfItems, $published, $static, $sticky, $draft, $scheduled);
$tmp = array(
'status'=>'0',
@@ -255,12 +311,16 @@ class pluginAPI extends Plugin {
'data'=>array()
);
- // Get keys of pages
foreach ($list as $pageKey) {
try {
// Create the page object from the page key
$page = new Page($pageKey);
- array_push($tmp['data'], $page->json( $returnsArray=true ));
+ if ($args['untagged'] && (empty($page->tags()))) {
+ // Push the page to the data array for the response
+ array_push($tmp['data'], $page->json($returnsArray=true));
+ } else {
+ array_push($tmp['data'], $page->json($returnsArray=true));
+ }
} catch (Exception $e) {
// Continue
}
diff --git a/bl-plugins/simplemde/plugin.php b/bl-plugins/simplemde/plugin.php
index e4dc79bd..f063a8c9 100644
--- a/bl-plugins/simplemde/plugin.php
+++ b/bl-plugins/simplemde/plugin.php
@@ -82,7 +82,7 @@ class pluginsimpleMDE extends Plugin {
return simplemde.value();
}'.PHP_EOL;
- // Insert an image in the editor in the cursor position
+ // Insert an image in the editor at the cursor position
// Function required for Bludit
$html .= 'function editorInsertMedia(filename) {
addContentSimpleMDE("!['.$L->get('Image description').']("+filename+")");
diff --git a/bl-plugins/tinymce/plugin.php b/bl-plugins/tinymce/plugin.php
index 28d86e86..a1adb465 100644
--- a/bl-plugins/tinymce/plugin.php
+++ b/bl-plugins/tinymce/plugin.php
@@ -77,7 +77,7 @@ class pluginTinymce extends Plugin {
$html = <<
- // Insert an image in the editor in the cursor position
+ // Insert an image in the editor at the cursor position
// Function required for Bludit
function editorInsertMedia(filename) {
tinymce.activeEditor.insertContent("![\"\"](\""+filename+"\")
");
+
diff --git a/bl-kernel/admin/themes/grizzly/js/ajax.js b/bl-kernel/admin/themes/grizzly/js/ajax.js
new file mode 100644
index 00000000..2a10259a
--- /dev/null
+++ b/bl-kernel/admin/themes/grizzly/js/ajax.js
@@ -0,0 +1,107 @@
+class Ajax {
+
+ constructor() {
+ this.apiURL = new URL('http://localhost:8000/api/');
+ this.token = "790f6f150492ebe24c6197f53ff10010";
+ this.authentication = "cb75be4a34ce9222914c0555f6faaa8d";
+ }
+
+ async getPage(key) {
+ let url = this.apiURL+"pages/"+key+"?token="+this.token;
+ try {
+ const response = await fetch(url, {
+ method: "GET"
+ });
+ const json = await response.json();
+ return json.data;
+ }
+ catch (err) {
+ console.log(err);
+ return false;
+ }
+ }
+
+ createPage() {
+ var url = this.apiURL+"pages";
+ return fetch(url, {
+ credentials: 'same-origin',
+ method: "POST",
+ body: JSON.stringify({
+ token: this.token,
+ authentication: this.authentication
+ }),
+ headers: new Headers({
+ 'Content-Type': 'application/json'
+ }),
+ })
+ .then(function(response) {
+ return response.json();
+ })
+ .then(function(json) {
+ return json.data.key;
+ })
+ .catch(err => {
+ console.log(err);
+ return false;
+ });
+ }
+
+ updatePage(key, title, content, tags) {
+ log('this.updatePage()', key);
+ var url = this.apiURL+"pages/"+key;
+ return fetch(url, {
+ credentials: 'same-origin',
+ method: "PUT",
+ body: JSON.stringify({
+ token: this.token,
+ authentication: this.authentication,
+ title: title,
+ content: content,
+ tags: tags
+ }),
+ headers: new Headers({
+ 'Content-Type': 'application/json'
+ }),
+ })
+ .then(function(response) {
+ return response.json();
+ })
+ .then(function(json) {
+ return json.data.key;
+ })
+ .catch(err => {
+ console.log(err);
+ return false;
+ });
+ }
+
+ async getTags() {
+ let url = this.apiURL+"tags?token="+this.token;
+ try {
+ const response = await fetch(url, {
+ method: "GET"
+ });
+ const json = await response.json();
+ return json.data;
+ }
+ catch (err) {
+ console.log(err);
+ return false;
+ }
+ }
+
+ async getTag(key) {
+ let url = this.apiURL+"tags/"+key+"?token="+this.token;
+ try {
+ const response = await fetch(url, {
+ method: "GET"
+ });
+ const json = await response.json();
+ return json.data;
+ }
+ catch (err) {
+ console.log(err);
+ return false;
+ }
+ }
+}
\ No newline at end of file
diff --git a/bl-kernel/admin/themes/grizzly/js/parser.js b/bl-kernel/admin/themes/grizzly/js/parser.js
new file mode 100644
index 00000000..cc6f9227
--- /dev/null
+++ b/bl-kernel/admin/themes/grizzly/js/parser.js
@@ -0,0 +1,42 @@
+class Parser {
+ // Returns an array with tags
+ // The tags are parser from hash-tags
+ // text = Hello this is a #test of #the function
+ // returns ['test', 'the']
+ tags(text) {
+ var rgx = /#(\w+)\b/gi;
+ var tag;
+ var tags = [];
+ while (tag = rgx.exec(text)){
+ tags.push(tag[1])
+ }
+ // tags is an array, implode with comma ,
+ return tags.join(",");
+ }
+
+ // Returns all characters after the hash # and space
+ // Onlt the first match
+ // text = # Hello World
+ // returns "Hello World"
+ title(text) {
+ var rgx = /# (.*)/;
+ let title = rgx.exec(text);
+ if (title) {
+ return title[1].trim();
+ }
+ return "";
+ }
+
+ // Returns the text without the first line
+ // The first line is removed only if the first line has a # Headline1
+ removeFirstLine(text) {
+ var lines = text.split("\n");
+ if (lines) {
+ // If the first line included # Headline1 then the line is removed
+ if (lines[0].includes("# ")) {
+ lines.splice(0,1);
+ }
+ }
+ return lines.join("\n");
+ }
+}
\ No newline at end of file
diff --git a/bl-kernel/pages.class.php b/bl-kernel/pages.class.php
index a04406d4..68c907cb 100644
--- a/bl-kernel/pages.class.php
+++ b/bl-kernel/pages.class.php
@@ -326,6 +326,18 @@ class Pages extends dbJSON {
return false;
}
+ // Returns a database with all pages
+ // $onlyKeys = true; Returns only the pages keys
+ // $onlyKeys = false; Returns part of the database, I do not recommend use this
+ public function getDB($onlyKeys=true)
+ {
+ $tmp = $this->db;
+ if ($onlyKeys) {
+ return array_keys($tmp);
+ }
+ return $tmp;
+ }
+
// Returns a database with published pages
// $onlyKeys = true; Returns only the pages keys
// $onlyKeys = false; Returns part of the database, I do not recommend use this
@@ -454,35 +466,47 @@ class Pages extends dbJSON {
// (int) $pageNumber, the page number
// (int) $numberOfItems, amount of items to return, if -1 returns all the items
// (boolean) $onlyPublished, TRUE to return only published pages
- public function getList($pageNumber, $numberOfItems, $onlyPublished=true)
+ public function getList($pageNumber, $numberOfItems, $published=true, $static=false, $sticky=false, $draft=false, $scheduled=false)
{
- $db = array_keys($this->db);
+ $list = array();
+ if ($published) {
+ $list += $this->getPublishedDB();
+ }
- if ($onlyPublished) {
- $db = $this->getPublishedDB(true);
+ if ($static) {
+ $list += $pages->getStaticDB();
+ }
+
+ if ($sticky) {
+ $list += $pages->getStickyDB();
+ }
+
+ if ($draft) {
+ $list += $pages->getDraftDB();
+ }
+
+ if ($scheduled) {
+ $list += $pages->getScheduledDB();
}
if ($numberOfItems==-1) {
- return $db;
+ return $list;
}
// The first page number is 1, so the real is 0
$realPageNumber = $pageNumber - 1;
- $total = count($db);
+ $total = count($list);
$init = (int) $numberOfItems * $realPageNumber;
$end = (int) min( ($init + $numberOfItems - 1), $total );
$outrange = $init<0 ? true : $init>$end;
-
if (!$outrange) {
- return array_slice($db, $init, $numberOfItems, true);
+ return array_slice($list, $init, $numberOfItems, true);
}
return false;
}
-
-
// Returns the amount of pages
// (boolean) $total, TRUE returns the total of pages
// (boolean) $total, FALSE returns the total of published pages (without draft and scheduled)
diff --git a/bl-kernel/pagex.class.php b/bl-kernel/pagex.class.php
index 17575427..a4785eef 100644
--- a/bl-kernel/pagex.class.php
+++ b/bl-kernel/pagex.class.php
@@ -265,6 +265,7 @@ class Page {
$tmp['content'] = $this->content(); // Markdown parsed
$tmp['contentRaw'] = $this->contentRaw(true); // No Markdown parsed
$tmp['description'] = $this->description();
+ $tmp['type'] = $this->type();
$tmp['date'] = $this->dateRaw();
$tmp['dateUTC'] = Date::convertToUTC($this->dateRaw(), DB_DATE_FORMAT, DB_DATE_FORMAT);
$tmp['permalink'] = $this->permalink(true);
diff --git a/bl-kernel/tag.class.php b/bl-kernel/tag.class.php
index 06c4678c..308b06da 100644
--- a/bl-kernel/tag.class.php
+++ b/bl-kernel/tag.class.php
@@ -42,9 +42,24 @@ class Tag {
return $this->getValue('permalink');
}
- // Returns an array with the keys of pages linked to the tag
+ // Returns an array with the pages keys linked to the tag
public function pages()
{
return $this->getValue('list');
}
+
+ // Returns an array in json format with all the data of the tag
+ public function json($returnsArray=false)
+ {
+ $tmp['key'] = $this->key();
+ $tmp['name'] = $this->name();
+ $tmp['permalink'] = $this->permalink();
+ $tmp['pages'] = $this->pages();
+
+ if ($returnsArray) {
+ return $tmp;
+ }
+
+ return json_encode($tmp);
+ }
}
\ No newline at end of file
diff --git a/bl-kernel/tags.class.php b/bl-kernel/tags.class.php
index 703ccaac..cb1f7587 100644
--- a/bl-kernel/tags.class.php
+++ b/bl-kernel/tags.class.php
@@ -17,23 +17,22 @@ class Tags extends dbList {
global $pages;
// Get a database with published pages
- $db = $pages->getPublishedDB(false);
-
+ $db = $pages->getDB(false);
$tagsIndex = array();
-
- foreach($db as $pageKey=>$pageFields) {
+ foreach ($db as $pageKey=>$pageFields) {
$tags = $pageFields['tags'];
- foreach($tags as $tagKey=>$tagName) {
- if( isset($tagsIndex[$tagKey]) ) {
+ foreach ($tags as $tagKey=>$tagName) {
+ if (isset($tagsIndex[$tagKey])) {
array_push($tagsIndex[$tagKey]['list'], $pageKey);
- }
- else {
+ } else {
$tagsIndex[$tagKey]['name'] = $tagName;
$tagsIndex[$tagKey]['list'] = array($pageKey);
}
}
}
+ // Sort database by alphabet
+ ksort($tagsIndex);
$this->db = $tagsIndex;
return $this->save();
}
diff --git a/bl-plugins/api/plugin.php b/bl-plugins/api/plugin.php
index 914cca64..bd5520bc 100644
--- a/bl-plugins/api/plugin.php
+++ b/bl-plugins/api/plugin.php
@@ -67,16 +67,14 @@ class pluginAPI extends Plugin {
// METHOD INPUTS
// ------------------------------------------------------------
$inputs = $this->getMethodInputs();
-
- if ( empty($inputs) ) {
+ if (empty($inputs)) {
$this->response(400, 'Bad Request', array('message'=>'Missing method inputs.'));
}
// ENDPOINT PARAMETERS
// ------------------------------------------------------------
$parameters = $this->getEndpointParameters($URI);
-
- if ( empty($parameters) ) {
+ if (empty($parameters)) {
$this->response(400, 'Bad Request', array('message'=>'Missing endpoint parameters.'));
}
@@ -123,7 +121,7 @@ class pluginAPI extends Plugin {
// (GET) /api/pages
if ( ($method==='GET') && ($parameters[0]==='pages') && empty($parameters[1]) ) {
- $data = $this->getPages();
+ $data = $this->getPages($inputs);
}
// (GET) /api/pages/