From be8cf51393dfb7a011fcbdcdf86f4c2bc6d783c0 Mon Sep 17 00:00:00 2001
From: Diego Najar <dignajar@gmail.com>
Date: Thu, 12 Jul 2018 20:03:31 +0200
Subject: [PATCH] Session in admin area, improves in creation content

---
 bl-kernel/admin/themes/booty/init.php  |   4 +-
 bl-kernel/admin/views/edit-content.php | 163 ++++++++++++++++---------
 bl-kernel/admin/views/edit-user.php    |  20 +++
 bl-kernel/admin/views/new-content.php  |  12 +-
 bl-kernel/boot/admin.php               |   6 +
 bl-kernel/boot/init.php                |  10 +-
 bl-kernel/page.class.php               |  24 ++++
 things-to-do                           |   5 +-
 8 files changed, 173 insertions(+), 71 deletions(-)

diff --git a/bl-kernel/admin/themes/booty/init.php b/bl-kernel/admin/themes/booty/init.php
index a7b7518c..db5f1677 100644
--- a/bl-kernel/admin/themes/booty/init.php
+++ b/bl-kernel/admin/themes/booty/init.php
@@ -257,12 +257,14 @@ EOF;
 			$type = $args['type'];
 		}
 
+		$checked = $args['checked']?'checked':'';
+
 return <<<EOF
 <div class="$class">
 	<label for="$id" class="col-sm-2">$label</label>
 	<div class="col-sm-10">
 		<div class="form-check">
-			<input class="form-check-input" type="checkbox" id="$id">
+			<input name="$name" class="form-check-input" type="checkbox" id="$id" $checked>
 			<label class="form-check-label" for="$id">$labelForCheckbox</label>
 			<small class="form-text text-muted">$tip</small>
 		</div>
diff --git a/bl-kernel/admin/views/edit-content.php b/bl-kernel/admin/views/edit-content.php
index 6ac99fe3..064dc82e 100644
--- a/bl-kernel/admin/views/edit-content.php
+++ b/bl-kernel/admin/views/edit-content.php
@@ -1,3 +1,5 @@
+<?php defined('BLUDIT') or die('Bludit CMS.'); ?>
+
 <!-- TABS -->
 <ul class="nav nav-tabs" id="dynamicTab" role="tablist">
 	<li class="nav-item">
@@ -107,9 +109,7 @@
 
 		<?php
 			echo Bootstrap::formTitle(array('title'=>'External Cover image'));
-		?>
 
-		<?php
 			echo Bootstrap::formInputTextBlock(array(
 				'name'=>'externalCoverImage',
 				'placeholder'=>'https://',
@@ -123,67 +123,106 @@
 	<!-- TABS OPTIONS -->
 	<div class="tab-pane" id="options" role="tabpanel" aria-labelledby="options-tab">
 		<?php
-			echo Bootstrap::formTitle(array('title'=>'Advanced'));
 
-			// Tags
-			echo Bootstrap::formInputText(array(
-				'name'=>'tags',
-				'label'=>'Tags',
-				'value'=>$page->tags(),
-				'placeholder'=>'Tags separeted by comma'
-			));
+			echo Bootstrap::formTitle(array('title'=>'Advanced'));
 
 			// Date
 			echo Bootstrap::formInputText(array(
 				'name'=>'date',
 				'label'=>'Date',
-				'placeholder'=>'YYYY-MM-DD hh:mm:ss',
-				'value'=>$page->dateRaw()
+				'placeholder'=>'',
+				'value'=>$page->date(),
+				'tip'=>'Date format: <code>YYYY-MM-DD Hours:Minutes:Seconds</code>'
 			));
 
 			// Type
 			echo Bootstrap::formSelect(array(
 				'name'=>'type',
 				'label'=>'Type',
-				'selected'=>$page->status(),
+				'selected'=>$page->type(),
 				'options'=>array(
 					''=>'- Default -',
 					'sticky'=>'Sticky',
 					'static'=>'Static'
-				)
+				),
+				'tip'=>'???'
 			));
 
 			// Parent
+			$parentTMP = buildPage($page->parent());
 			echo Bootstrap::formInputText(array(
 				'name'=>'parentTMP',
-				'label'=>'Parent',
-				'placeholder'=>'Start writing the title of the page parent',
-				'value'=>($page->parent()?$page->parentMethod('title'):'')
+				'label'=>$L->g('Parent'),
+				'placeholder'=>'',
+				'tip'=>'Start typing a page title to see a list of suggestions.',
+				'value'=>($parentTMP?$parentTMP->title():'')
 			));
 
 			// Position
 			echo Bootstrap::formInputText(array(
 				'name'=>'position',
-				'label'=>'Position',
-				'placeholder'=>'',
+				'label'=>$L->g('Position'),
+				'tip'=>'Field used when ordering content by position',
 				'value'=>$page->position()
 			));
 
-			// Friendly URL
-			echo Bootstrap::formInputText(array(
-				'name'=>'slug',
-				'label'=>'Friendly URL',
-				'value'=>$page->slug(),
-				'placeholder'=>'Leave empty for automaticly complete'
-			));
-
 			// Template
 			echo Bootstrap::formInputText(array(
 				'name'=>'template',
 				'label'=>'Template',
 				'placeholder'=>'',
-				'value'=>$page->template()
+				'value'=>$page->template(),
+				'tip'=>'Write a template name to filter the page in the theme and change the style of the page.'
 			));
+
+			echo Bootstrap::formTitle(array('title'=>'SEO'));
+
+			// Tags
+			echo Bootstrap::formInputText(array(
+				'name'=>'tags',
+				'label'=>'Tags',
+				'placeholder'=>'',
+				'value'=>$page->tags(),
+				'tip'=>'Write the tags separeted by comma'
+			));
+
+			// Friendly URL
+			echo Bootstrap::formInputText(array(
+				'name'=>'slug',
+				'tip'=>$L->g('URL associated with the content'),
+				'label'=>$L->g('Friendly URL'),
+				'placeholder'=>'Leave empty for autocomplete by Bludit.',
+				'value'=>$page->slug()
+			));
+
+			echo Bootstrap::formCheckbox(array(
+				'name'=>'noindex',
+				'label'=>'Robots',
+				'labelForCheckbox'=>'Apply <code>noindex</code> to this page',
+				'placeholder'=>'',
+				'class'=>'mt-4',
+				'checked'=>$page->noindex(),
+				'tip'=>'This tells search engines not to show this page in their search results.'
+			));
+
+			echo Bootstrap::formCheckbox(array(
+				'name'=>'nofollow',
+				'label'=>'',
+				'labelForCheckbox'=>'Apply <code>nofollow</code> to this page',
+				'placeholder'=>'',
+				'checked'=>$page->nofollow(),
+				'tip'=>'This tells search engines not to follow links on this page.'
+			));
+
+			echo Bootstrap::formCheckbox(array(
+				'name'=>'noarchive',
+				'label'=>'',
+				'labelForCheckbox'=>'Apply <code>noarchive</code> to this page',
+				'placeholder'=>'',
+				'checked'=>$page->noarchive(),
+				'tip'=>'This tells search engines not to save a cached copy of this page.'
+			));
+
 		?>
 	</div>
 
@@ -213,25 +252,25 @@
 		</div>
 	</div>
 	<script>
-		$(document).ready(function() {
-			function setCategoryBox(value) {
-				var selected = $("#jscategory option:selected");
-				var value = selected.val().trim();
-				if (value) {
-					$("#jscategoryButton").find("span.option").html(selected.text());
-				} else {
-					$("#jscategoryButton").find("span.option").html("-");
-				}
+	$(document).ready(function() {
+		function setCategoryBox(value) {
+			var selected = $("#jscategory option:selected");
+			var value = selected.val().trim();
+			if (value) {
+				$("#jscategoryButton").find("span.option").html(selected.text());
+			} else {
+				$("#jscategoryButton").find("span.option").html("-");
 			}
+		}
 
-			// Set the current category selected
+		// Set the current category selected
+		setCategoryBox();
+
+		// When the user select the category update the category button
+		$("#jscategory").on("change", function() {
 			setCategoryBox();
-
-			// When the user select the category update the category button
-			$("#jscategory").on("change", function() {
-				setCategoryBox();
-			});
 		});
+	});
 	</script>
 
 	<!-- Modal for Description -->
@@ -261,25 +300,25 @@
 		</div>
 	</div>
 	<script>
-		$(document).ready(function() {
-			function setDescriptionBox(value) {
-				var value = $("#jsdescription").val();
-				if (!value) {
-					value = '-';
-				} else {
-					value = jQuery.trim(value).substring(0, 60).split(" ").slice(0, -1).join(" ") + "...";
-				}
-				$("#jsdescriptionButton").find("span.option").html(value);
+	$(document).ready(function() {
+		function setDescriptionBox(value) {
+			var value = $("#jsdescription").val();
+			if (!value) {
+				value = '-';
+			} else {
+				value = jQuery.trim(value).substring(0, 60).split(" ").slice(0, -1).join(" ") + "...";
 			}
+			$("#jsdescriptionButton").find("span.option").html(value);
+		}
 
-			// Set the current description
+		// Set the current description
+		setDescriptionBox();
+
+		// When the user write the description update the description button
+		$("#jsdescription").on("change", function() {
 			setDescriptionBox();
-
-			// When the user write the description update the description button
-			$("#jsdescription").on("change", function() {
-				setDescriptionBox();
-			});
 		});
+	});
 	</script>
 </form>
 
@@ -289,6 +328,9 @@
 <script>
 $(document).ready(function() {
 
+	// Datepicker
+	$("#jsdate").datetimepicker({format:DB_DATE_FORMAT});
+
 	// Button Save
 	$("#jsbuttonSave").on("click", function() {
 		$("#jsstatus").val("published");
@@ -322,6 +364,7 @@ $(document).ready(function() {
 	});
 
 	// Autosave interval
+	// Autosave works when the content of the page is bigger than 100 characters
 	setInterval(function() {
 			var uuid = $("#jsuuid").val();
 			var title = $("#jstitle").val();
@@ -348,10 +391,11 @@ $(document).ready(function() {
 	var parentsXHR;
 	var parentsList; // Keep the parent list returned to get the key by the title page
 	$("#jsparentTMP").autoComplete({
+		minChars: 1,
 		source: function(term, response) {
 			// Prevent call inmediatly another ajax request
 			try { parentsXHR.abort(); } catch(e){}
-			parentsXHR = $.getJSON("<?php echo HTML_PATH_ADMIN_ROOT ?>ajax/get-parents", {query: term},
+			parentsXHR = $.getJSON(HTML_PATH_ADMIN_ROOT+"ajax/get-parents", {query: term},
 				function(data) {
 					parentsList = data;
 					term = term.toLowerCase();
@@ -364,6 +408,7 @@ $(document).ready(function() {
 			});
 		},
 		onSelect: function(e, term, item) {
+			// parentsList = array( pageTitle => pageKey )
 			var parentKey = parentsList[term];
 			$("#jsparent").attr("value", parentKey);
 		}
diff --git a/bl-kernel/admin/views/edit-user.php b/bl-kernel/admin/views/edit-user.php
index 2151f75f..06be37d3 100644
--- a/bl-kernel/admin/views/edit-user.php
+++ b/bl-kernel/admin/views/edit-user.php
@@ -44,6 +44,26 @@ echo Bootstrap::formOpen(array());
 		'tip'=>''
 	));
 
+	echo Bootstrap::formTitle(array('title'=>$L->g('Profile')));
+
+	echo Bootstrap::formInputText(array(
+		'name'=>'firstName',
+		'label'=>$L->g('First Name'),
+		'value'=>$user->firstName(),
+		'class'=>'',
+		'placeholder'=>'',
+		'tip'=>''
+	));
+
+	echo Bootstrap::formInputText(array(
+		'name'=>'lastName',
+		'label'=>$L->g('Last Name'),
+		'value'=>$user->lastName(),
+		'class'=>'',
+		'placeholder'=>'',
+		'tip'=>''
+	));
+
 	echo Bootstrap::formTitle(array('title'=>$L->g('Password')));
 
 	echo '
diff --git a/bl-kernel/admin/views/new-content.php b/bl-kernel/admin/views/new-content.php
index 50b4bea3..d9edbca4 100644
--- a/bl-kernel/admin/views/new-content.php
+++ b/bl-kernel/admin/views/new-content.php
@@ -1,3 +1,5 @@
+<?php defined('BLUDIT') or die('Bludit CMS.'); ?>
+
 <!-- TABS -->
 <ul class="nav nav-tabs" id="dynamicTab" role="tablist">
 	<li class="nav-item">
@@ -132,8 +134,9 @@
 			echo Bootstrap::formInputText(array(
 				'name'=>'parentTMP',
 				'label'=>$L->g('Parent'),
-				'placeholder'=>'Start typing a page title to see a list of suggestions.',
-				'tip'=>'Select a page to arrange your content in hierarchies.'
+				'placeholder'=>'',
+				'tip'=>'Start typing a page title to see a list of suggestions.',
+				'value'=>''
 			));
 
 			// Position
@@ -149,6 +152,7 @@
 				'name'=>'template',
 				'label'=>'Template',
 				'placeholder'=>'',
+				'value'=>'',
 				'tip'=>'Write a template name to filter the page in the theme and change the style of the page.'
 			));
 
@@ -176,6 +180,7 @@
 				'labelForCheckbox'=>'Apply <code>noindex</code> to this page',
 				'placeholder'=>'',
 				'class'=>'mt-4',
+				'checked'=>false,
 				'tip'=>'This tells search engines not to show this page in their search results.'
 			));
 
@@ -184,6 +189,7 @@
 				'label'=>'',
 				'labelForCheckbox'=>'Apply <code>nofollow</code> to this page',
 				'placeholder'=>'',
+				'checked'=>false,
 				'tip'=>'This tells search engines not to follow links on this page.'
 			));
 
@@ -192,11 +198,11 @@
 				'label'=>'',
 				'labelForCheckbox'=>'Apply <code>noarchive</code> to this page',
 				'placeholder'=>'',
+				'checked'=>false,
 				'tip'=>'This tells search engines not to save a cached copy of this page.'
 			));
 
 		?>
-
 	</div>
 
 	<!-- Modal for Categories -->
diff --git a/bl-kernel/boot/admin.php b/bl-kernel/boot/admin.php
index e2268c47..1e0c62fb 100644
--- a/bl-kernel/boot/admin.php
+++ b/bl-kernel/boot/admin.php
@@ -1,5 +1,11 @@
 <?php defined('BLUDIT') or die('Bludit CMS.');
 
+// Session
+Session::start();
+if (Session::started()===false) {
+	exit('Bludit CMS. Session initialization failure.');
+}
+
 $layout = array(
 	'controller'=>null,
 	'view'=>null,
diff --git a/bl-kernel/boot/init.php b/bl-kernel/boot/init.php
index 9e466c76..31248239 100644
--- a/bl-kernel/boot/init.php
+++ b/bl-kernel/boot/init.php
@@ -59,7 +59,7 @@ define('DB_USERS', PATH_DATABASES.'users.php');
 define('DB_SECURITY', PATH_DATABASES.'security.php');
 
 // JSON pretty print
-if(!defined('JSON_PRETTY_PRINT')) {
+if (!defined('JSON_PRETTY_PRINT')) {
 	define('JSON_PRETTY_PRINT', 128);
 }
 
@@ -120,10 +120,10 @@ if (file_exists(PATH_KERNEL.'bludit.pro.php')) {
 }
 
 // Session
-Session::start();
-if (Session::started()===false) {
-	exit('Bludit CMS. Session initialization failure.');
-}
+// Session::start();
+// if (Session::started()===false) {
+// 	exit('Bludit CMS. Session initialization failure.');
+// }
 
 // Objects
 $dbPages 			= new dbPages();
diff --git a/bl-kernel/page.class.php b/bl-kernel/page.class.php
index 3c78b191..866d375d 100644
--- a/bl-kernel/page.class.php
+++ b/bl-kernel/page.class.php
@@ -408,6 +408,12 @@ class Page {
 		return $this->getValue('status');
 	}
 
+	// (string) Returns type of the page
+	public function type()
+	{
+		return $this->status();
+	}
+
 	// Returns the title field
 	public function title()
 	{
@@ -426,6 +432,24 @@ class Page {
 		return $this->getValue('position');
 	}
 
+	// Returns the page noindex
+	public function noindex()
+	{
+		return $this->getValue('noindex');
+	}
+
+	// Returns the page nofollow
+	public function nofollow()
+	{
+		return $this->getValue('nofollow');
+	}
+
+	// Returns the page noarchive
+	public function noarchive()
+	{
+		return $this->getValue('noarchive');
+	}
+
 	// Returns the page slug
 	public function slug()
 	{
diff --git a/things-to-do b/things-to-do
index 646417a4..eb3470f4 100644
--- a/things-to-do
+++ b/things-to-do
@@ -21,9 +21,8 @@ Things to do:
 
 - Fix Tinymce plugin
 
-- New / Edit content
--- Option without category
--- Delete content
+- Edit content
+-- If the parent is set, the
 
 - add to settings
 -- time for autosave