From e674327a2527c365522dde1b89f30acbcfbc7a39 Mon Sep 17 00:00:00 2001
From: Diego Najar <dignajar@gmail.com>
Date: Mon, 20 Aug 2018 22:32:14 +0200
Subject: [PATCH] Remove reserved characters from URL, changes on labels

---
 bl-kernel/abstract/dblist.class.php    | 5 +++++
 bl-kernel/admin/views/content.php      | 2 +-
 bl-kernel/admin/views/edit-content.php | 2 +-
 bl-kernel/admin/views/new-content.php  | 2 +-
 bl-kernel/boot/rules/69.pages.php      | 2 +-
 bl-kernel/boot/variables.php           | 3 +++
 bl-kernel/helpers/text.class.php       | 2 +-
 bl-kernel/pages.class.php              | 4 +++-
 8 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/bl-kernel/abstract/dblist.class.php b/bl-kernel/abstract/dblist.class.php
index 4bb870a8..1fabc6b6 100644
--- a/bl-kernel/abstract/dblist.class.php
+++ b/bl-kernel/abstract/dblist.class.php
@@ -64,7 +64,12 @@ class dbList extends dbJSON
 
 	public function generateKey($name)
 	{
+		global $L;
+
 		$key = Text::cleanUrl($name);
+		if (Text::isEmpty($key)) {
+			$key = $L->g('empty');
+		}
 		while (isset($this->db[$key])) {
 			$key++;
 		}
diff --git a/bl-kernel/admin/views/content.php b/bl-kernel/admin/views/content.php
index 5048a360..fa5d45de 100644
--- a/bl-kernel/admin/views/content.php
+++ b/bl-kernel/admin/views/content.php
@@ -118,7 +118,7 @@ function table($type) {
 						.'</a>
 					</div>
 					<div>
-						<p style="font-size: 0.8em" class="m-0 text-uppercase text-muted">'.( ((ORDER_BY=='position') || ($type!='published'))?'Position: '.$page->position():$page->relativeTime() ).'</p>
+						<p style="font-size: 0.8em" class="m-0 text-uppercase text-muted">'.( ((ORDER_BY=='position') || ($type!='published'))?'Position: '.$page->position():$page->date(MANAGE_CONTENT_DATE_FORMAT) ).'</p>
 					</div>
 				</td>';
 
diff --git a/bl-kernel/admin/views/edit-content.php b/bl-kernel/admin/views/edit-content.php
index fe6f0be5..2b12462c 100644
--- a/bl-kernel/admin/views/edit-content.php
+++ b/bl-kernel/admin/views/edit-content.php
@@ -6,7 +6,7 @@
 		<a class="nav-link active" id="content-tab" data-toggle="tab" href="#content" role="tab" aria-controls="content" aria-selected="true"><?php $L->p('Editor') ?></a>
 	</li>
 	<li class="nav-item">
-		<a class="nav-link" id="images-tab" data-toggle="tab" href="#images" role="tab" aria-controls="images" aria-selected="false"><?php $L->p('Images') ?></a>
+		<a class="nav-link" id="images-tab" data-toggle="tab" href="#images" role="tab" aria-controls="images" aria-selected="false"><?php $L->p('Cover images') ?></a>
 	</li>
 	<li class="nav-item">
 		<a class="nav-link " id="options-tab" data-toggle="tab" href="#options" role="tab" aria-controls="options" aria-selected="false"><?php $L->p('Options') ?></a>
diff --git a/bl-kernel/admin/views/new-content.php b/bl-kernel/admin/views/new-content.php
index d5cad060..503f5ead 100644
--- a/bl-kernel/admin/views/new-content.php
+++ b/bl-kernel/admin/views/new-content.php
@@ -6,7 +6,7 @@
 		<a class="nav-link active" id="content-tab" data-toggle="tab" href="#content" role="tab" aria-controls="content" aria-selected="true"><?php $L->p('Editor') ?></a>
 	</li>
 	<li class="nav-item">
-		<a class="nav-link" id="images-tab" data-toggle="tab" href="#images" role="tab" aria-controls="images" aria-selected="false"><?php $L->p('Images') ?></a>
+		<a class="nav-link" id="images-tab" data-toggle="tab" href="#images" role="tab" aria-controls="images" aria-selected="false"><?php $L->p('Cover images') ?></a>
 	</li>
 	<li class="nav-item">
 		<a class="nav-link " id="options-tab" data-toggle="tab" href="#options" role="tab" aria-controls="options" aria-selected="false"><?php $L->p('Options') ?></a>
diff --git a/bl-kernel/boot/rules/69.pages.php b/bl-kernel/boot/rules/69.pages.php
index 69c12a97..d802c767 100644
--- a/bl-kernel/boot/rules/69.pages.php
+++ b/bl-kernel/boot/rules/69.pages.php
@@ -66,7 +66,7 @@ elseif ($url->whereAmI()==='tag') {
 }
 // Build content by category
 elseif ($url->whereAmI()==='category') {
-        $content = buildPagesByCategory();
+	$content = buildPagesByCategory();
 }
 // Build content for the homepage
 elseif ( ($url->whereAmI()==='home') || ($url->whereAmI()==='blog') ) {
diff --git a/bl-kernel/boot/variables.php b/bl-kernel/boot/variables.php
index 4efc9d2b..8cd16ae4 100644
--- a/bl-kernel/boot/variables.php
+++ b/bl-kernel/boot/variables.php
@@ -80,6 +80,9 @@ define('SCHEDULED_DATE_FORMAT', 'D, j M Y, H:i');
 // Notifications date format
 define('NOTIFICATIONS_DATE_FORMAT', 'D, j M Y, H:i');
 
+// Manage content date format
+define('MANAGE_CONTENT_DATE_FORMAT', 'D, j M Y, H:i');
+
 // Amount of items to show on notification panel
 define('NOTIFICATIONS_AMOUNT', 10);
 
diff --git a/bl-kernel/helpers/text.class.php b/bl-kernel/helpers/text.class.php
index 7a7155db..6259bf21 100644
--- a/bl-kernel/helpers/text.class.php
+++ b/bl-kernel/helpers/text.class.php
@@ -131,7 +131,7 @@ class Text {
 		if (EXTREME_FRIENDLY_URL) {
 			$string = self::lowercase($string);
 			$string = trim($string, $separator);
-			$string = preg_replace("/[\/_|+:!@#$%^&*(). -]+/", $separator, $string);
+			$string = preg_replace("/[\/_|+:!@#$%^&*()';=,?\[\]~. -]+/", $separator, $string);
 			$string = trim($string, $separator);
 			return $string;
 		}
diff --git a/bl-kernel/pages.class.php b/bl-kernel/pages.class.php
index 63531028..9954c9c7 100644
--- a/bl-kernel/pages.class.php
+++ b/bl-kernel/pages.class.php
@@ -645,6 +645,8 @@ class Pages extends dbJSON {
 	// Generate a valid Key/Slug
 	public function generateKey($text, $parent=false, $returnSlug=false, $oldKey='')
 	{
+		global $L;
+
 		if (Text::isEmpty($text)) {
 			$text = 'empty';
 		}
@@ -657,7 +659,7 @@ class Pages extends dbJSON {
 
 		// cleanURL can return empty string
 		if (Text::isEmpty($newKey)) {
-			$newKey = 'empty';
+			$key = $L->g('empty');
 		}
 
 		if ($newKey!==$oldKey) {