From 9d865eb6cef23c90ce7645732582f6abdab08e7f Mon Sep 17 00:00:00 2001
From: Diego Najar <dignajar@gmail.com>
Date: Sun, 25 Jun 2017 22:54:59 +0200
Subject: [PATCH] bug fixes

---
 .../admin/themes/default/css/default.css      | 22 +++++++-----
 bl-kernel/admin/views/dashboard.php           | 18 ++++++----
 bl-kernel/boot/rules/69.pages.php             |  3 +-
 bl-kernel/dbpages.class.php                   | 12 +++++++
 bl-kernel/page.class.php                      | 21 +++++++----
 bl-plugins/api/plugin.php                     | 36 ++++++++++++-------
 bl-themes/editorial/php/page.php              |  4 +--
 7 files changed, 79 insertions(+), 37 deletions(-)

diff --git a/bl-kernel/admin/themes/default/css/default.css b/bl-kernel/admin/themes/default/css/default.css
index ce418b10..e88ac30d 100644
--- a/bl-kernel/admin/themes/default/css/default.css
+++ b/bl-kernel/admin/themes/default/css/default.css
@@ -681,15 +681,13 @@ div.plugin-links > span.separator {
 	width: 100%;
 }
 
-#jsformplugin > div > label,
-#jsformplugin > div > input[type=text],
-#jsformplugin > div > input[type=checkbox],
-#jsformplugin > div > textarea,
-#jsformplugin > div > select {
-	display: table-cell;
+#jsformplugin ul {
+	padding: 0;
+	list-style: none;
+	margin-bottom: 10px;
 }
 
-#jsformplugin > div > button[type=submit] {
+#jsformplugin button[type=submit] {
 	margin-left: 200px;
 	border-radius: 2px;
 	padding: 1px 20px;
@@ -702,11 +700,19 @@ div.plugin-links > span.separator {
 	cursor: pointer;
 }
 
-#jsformplugin > div > button[type=submit].blue {
+#jsformplugin button[type=submit].blue {
 	background: #007add !important;
 	color: #fff;
 }
 
+#jsformplugin > div > label,
+#jsformplugin > div > input[type=text],
+#jsformplugin > div > input[type=checkbox],
+#jsformplugin > div > textarea,
+#jsformplugin > div > select {
+	display: table-cell;
+}
+
 #jsformplugin > div > span.tip {
 	color: #999;
 	margin-top: 5px;
diff --git a/bl-kernel/admin/views/dashboard.php b/bl-kernel/admin/views/dashboard.php
index 42ee7045..9ca97cd4 100644
--- a/bl-kernel/admin/views/dashboard.php
+++ b/bl-kernel/admin/views/dashboard.php
@@ -92,12 +92,15 @@
 		<h4 class="panel-title"><?php $L->p('Scheduled pages') ?></h4>
 		<ul class="uk-list">
 		<?php
-			if( empty($_scheduledPosts) ) {
+			$scheduledPages = $dbPages->getScheduledDB();
+			if( empty($scheduledPages) ) {
 				echo '<li>'.$Language->g('There are no scheduled pages').'</li>';
 			}
 			else {
-				foreach($_scheduledPosts as $Post) {
-					echo '<li><span class="label-time">'.$Post->dateRaw(SCHEDULED_DATE_FORMAT).'</span><a href="'.HTML_PATH_ADMIN_ROOT.'edit-post/'.$Post->key().'">'.($Post->title()?$Post->title():'['.$Language->g('Empty title').'] ').'</a></li>';
+				$keys = array_keys($scheduledPages);
+				foreach($keys as $key) {
+					$page = buildPage($key);
+					echo '<li><span class="label-time">'.$page->dateRaw(SCHEDULED_DATE_FORMAT).'</span><a href="'.HTML_PATH_ADMIN_ROOT.'edit-page/'.$page->key().'">'.($page->title()?$page->title():'['.$Language->g('Empty title').'] ').'</a></li>';
 				}
 			}
 		?>
@@ -128,12 +131,15 @@
 		<h4 class="panel-title"><?php $L->p('Drafts') ?></h4>
 		<ul class="uk-list">
 		<?php
-			if( empty($_draftPages) ) {
+			$draftPages = $dbPages->getDraftDB();
+			if( empty($draftPages) ) {
 				echo '<li>'.$Language->g('There are no draft pages').'</li>';
 			}
 			else {
-				foreach($_draftPages as $Page) {
-					echo '<li><span class="label-draft">'.$Language->g('Page').'</span><a href="'.HTML_PATH_ADMIN_ROOT.'edit-page/'.$Page->key().'">'.($Page->title()?$Page->title():'['.$Language->g('Empty title').'] ').'</a></li>';
+				$keys = array_keys($scheduledPages);
+				foreach($keys as $key) {
+					$page = buildPage($key);
+					echo '<li><span class="label-draft">'.$Language->g('Page').'</span><a href="'.HTML_PATH_ADMIN_ROOT.'edit-page/'.$page->key().'">'.($page->title()?$page->title():'['.$Language->g('Empty title').'] ').'</a></li>';
 				}
 			}
 		?>
diff --git a/bl-kernel/boot/rules/69.pages.php b/bl-kernel/boot/rules/69.pages.php
index 5aaa2d82..91225924 100644
--- a/bl-kernel/boot/rules/69.pages.php
+++ b/bl-kernel/boot/rules/69.pages.php
@@ -72,5 +72,6 @@ elseif( $Url->whereAmI()==='admin' ) {
 // Set page 404 not found
 if( $Url->notFound() ) {
 	$Url->setWhereAmI('page');
-	$page = new Page('error');
+	$page = buildPage('error');
+	$pages[0] = $page;
 }
diff --git a/bl-kernel/dbpages.class.php b/bl-kernel/dbpages.class.php
index a4465803..250786e8 100644
--- a/bl-kernel/dbpages.class.php
+++ b/bl-kernel/dbpages.class.php
@@ -292,6 +292,18 @@ class dbPages extends dbJSON
 		return $tmp;
 	}
 
+	// Returns a database with drafts pages
+	public function getScheduledDB()
+	{
+		$tmp = $this->db;
+		foreach($tmp as $key=>$fields) {
+			if($fields['status']!='scheduled') {
+				unset($tmp[$key]);
+			}
+		}
+		return $tmp;
+	}
+
 	// Return an array with the database for a page, FALSE otherwise.
 	public function getPageDB($key)
 	{
diff --git a/bl-kernel/page.class.php b/bl-kernel/page.class.php
index 712e20fc..617c3720 100644
--- a/bl-kernel/page.class.php
+++ b/bl-kernel/page.class.php
@@ -18,6 +18,7 @@ class Page {
 	{
 		$filePath = PATH_PAGES.$key.DS.FILENAME;
 
+		// Check if the file exists
 		if( !Sanitize::pathFile($filePath) ) {
 			return false;
 		}
@@ -25,32 +26,38 @@ class Page {
 		$tmp = 0;
 		$lines = file($filePath);
 		foreach($lines as $lineNumber=>$line) {
-			$parts = array_map('trim', explode(':', $line, 2));
+			// Split the line in 2 parts, limiter by :
+			$parts = explode(':', $line, 2);
 
-			// Lowercase variable
+			// Remove all characters except letters and dash -
+			$parts[0] = preg_replace('/[^A-Za-z\-]/', '', $parts[0]);
+
+			// Lowercase
 			$parts[0] = Text::lowercase($parts[0]);
 
-			// If variables is content then break the foreach and process the content after.
-			if($parts[0]==='content') {
+			// Check if the current line start the content of the page
+			// We have two breakers, the word content or 3 dash ---
+			if( ($parts[0]==='content') || ($parts[0]==='---') ) {
 				$tmp = $lineNumber;
 				break;
 			}
 
 			if( !empty($parts[0]) && !empty($parts[1]) ) {
-				// Sanitize all fields, except Content.
+				$parts[1] = trim($parts[1]);
+				// Sanitize all fields, except the content
 				$this->vars[$parts[0]] = Sanitize::html($parts[1]);
 			}
 		}
 
 		// Process the content
 		if($tmp!==0) {
-			// Next line after "Content:" variable
+			// Next line after "Content:" or "---"
 			$tmp++;
 
 			// Remove lines after Content
 			$output = array_slice($lines, $tmp);
 
-			if(!empty($parts[1])) {
+			if( !empty($parts[1]) ) {
 				array_unshift($output, "\n");
 				array_unshift($output, $parts[1]);
 			}
diff --git a/bl-plugins/api/plugin.php b/bl-plugins/api/plugin.php
index 4ed3b348..5a6d60d5 100644
--- a/bl-plugins/api/plugin.php
+++ b/bl-plugins/api/plugin.php
@@ -2,6 +2,8 @@
 
 class pluginAPI extends Plugin {
 
+	private $method;
+
 	public function init()
 	{
 		// Generate the API Token
@@ -15,9 +17,11 @@ class pluginAPI extends Plugin {
 
 	public function form()
 	{
+		global $Language;
+
 		$html  = '<div>';
 		$html .= '<label>'.$Language->get('API Token').'</label>';
-		$html .= '<input type="text" value="'.$this->getValue('token').'" disabled>';
+		$html .= '<input name="token" type="text" value="'.$this->getValue('token').'">';
 		$html .= '<span class="tip">'.$Language->get('This token is for read only and is regenerated every time you install the plugin').'</span>';
 		$html .= '</div>';
 
@@ -53,6 +57,10 @@ class pluginAPI extends Plugin {
 		// Remove the first part of the URI
 		$URI = mb_substr($URI, $length);
 
+		// METHOD
+		// ------------------------------------------------------------
+		$method = $this->getMethod();
+
 		// INPUTS
 		// ------------------------------------------------------------
 		$inputs = $this->getInputs();
@@ -121,6 +129,19 @@ class pluginAPI extends Plugin {
 // PRIVATE METHODS
 // ----------------------------------------------------------------------------
 
+	private function getMethod()
+	{
+		// METHODS
+		// ------------------------------------------------------------
+		// GET
+		// POST
+		// PUT
+		// DELETE
+
+		$this->method = $_SERVER['REQUEST_METHOD'];
+		return $this->method;
+	}
+
 	private function getParameters($URI)
 	{
 		// PARAMETERS
@@ -141,16 +162,7 @@ class pluginAPI extends Plugin {
 
 	private function getInputs()
 	{
-		// METHODS
-		// ------------------------------------------------------------
-		// GET
-		// POST
-		// PUT
-		// DELETE
-
-		$method = $_SERVER['REQUEST_METHOD'];
-
-		switch($method) {
+		switch($this->method) {
 			case "POST":
 				$inputs = $_POST;
 				break;
@@ -224,7 +236,7 @@ class pluginAPI extends Plugin {
 		foreach($keys as $pageKey) {
 			// Create the page object from the page key
 			$page = buildPage($pageKey);
-			array_push($tmp['data'], $Page->json( $returnsArray=true ));
+			array_push($tmp['data'], $page->json( $returnsArray=true ));
 		}
 
 		return $tmp;
diff --git a/bl-themes/editorial/php/page.php b/bl-themes/editorial/php/page.php
index be886b3c..9af8a2f0 100644
--- a/bl-themes/editorial/php/page.php
+++ b/bl-themes/editorial/php/page.php
@@ -12,6 +12,4 @@
 
         <!-- Plugins with the hook pageEnd -->
         <?php Theme::plugins('pageEnd') ?>
-</section>
-
-<?php var_dump($page); ?>
\ No newline at end of file
+</section>
\ No newline at end of file