From 5648e8313c7a40bb26d9733f68199da1618441c4 Mon Sep 17 00:00:00 2001
From: Diego Najar <dignajar@gmail.com>
Date: Tue, 15 Jan 2019 19:30:35 +0100
Subject: [PATCH] select page not found

---
 bl-kernel/admin/views/settings.php | 59 ++++++++++++++++++++++++++----
 bl-kernel/functions.php            | 13 -------
 2 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/bl-kernel/admin/views/settings.php b/bl-kernel/admin/views/settings.php
index 38050bf9..ccf40219 100644
--- a/bl-kernel/admin/views/settings.php
+++ b/bl-kernel/admin/views/settings.php
@@ -35,6 +35,12 @@
 		'name'=>'homepage',
 		'value'=>$site->homepage()
 	));
+
+	// Page not found
+	echo Bootstrap::formInputHidden(array(
+		'name'=>'pageNotFound',
+		'value'=>$site->pageNotFound()
+	));
 ?>
 
 	<!-- General tab -->
@@ -113,7 +119,6 @@
 		} catch (Exception $e) {
 			$homeValue = '';
 		}
-
 		echo Bootstrap::formInputText(array(
 			'name'=>'homepageTMP',
 			'label'=>$L->g('Homepage'),
@@ -123,13 +128,20 @@
 			'tip'=>$L->g('Returning page for the main page')
 		));
 
-		$homepageOptions[' '] = '- '.$L->g('Default message').' -';
-		echo Bootstrap::formSelect(array(
-			'name'=>'pageNotFound',
+		// Page not found 404
+		try {
+			$pageNotFoundKey = $site->pageNotFound();
+			$pageNotFound = new Page($pageNotFoundKey);
+			$pageNotFoundValue = $pageNotFound->title();
+		} catch (Exception $e) {
+			$pageNotFoundValue = '';
+		}
+		echo Bootstrap::formInputText(array(
+			'name'=>'pageNotFoundTMP',
 			'label'=>$L->g('Page not found'),
-			'options'=>$homepageOptions,
-			'selected'=>$site->pageNotFound(),
+			'value'=>$pageNotFoundValue,
 			'class'=>'',
+			'placeholder'=>$L->g('Start typing a page title to see a list of suggestions.'),
 			'tip'=>$L->g('Returning page when the page doesnt exist')
 		));
 
@@ -268,7 +280,7 @@
 	<script>
 	$(document).ready(function() {
 
-		// Parent autocomplete
+		// Homepage autocomplete
 		var homepageXHR;
 		var homepageList; // Keep the parent list returned to get the key by the title page
 		$("#jshomepageTMP").autoComplete({
@@ -306,6 +318,33 @@
 			}
 		});
 
+		// pageNotFound autocomplete
+		var pageNotFoundXHR;
+		var pageNotFoundList; // Keep the parent list returned to get the key by the title page
+		$("#jspageNotFoundTMP").autoComplete({
+			minChars: 1,
+			source: function(term, response) {
+				// Prevent call inmediatly another ajax request
+				try { pageNotFoundXHR.abort(); } catch(e){}
+					pageNotFoundXHR = $.getJSON(HTML_PATH_ADMIN_ROOT+"ajax/get-published", {query: term},
+					function(data) {
+						pageNotFoundList = data;
+						term = term.toLowerCase();
+						var matches = [];
+						for (var title in data) {
+							if (~title.toLowerCase().indexOf(term))
+								matches.push(title);
+						}
+						response(matches);
+				});
+			},
+			onSelect: function(e, term, item) {
+				// pageNotFoundList = array( pageTitle => pageKey )
+				var key = pageNotFoundList[term];
+				$("#jspageNotFound").attr("value", key);
+			}
+		});
+
 	});
 	</script>
 
@@ -498,3 +537,9 @@
 	</div>
 
 <?php echo Bootstrap::formClose(); ?>
+
+<script>
+	// Open the tab defined in the URL
+	const anchor = window.location.hash;
+	$(`a[href="${anchor}"]`).tab('show');
+</script>
diff --git a/bl-kernel/functions.php b/bl-kernel/functions.php
index 9cc56fcb..2f2518f0 100644
--- a/bl-kernel/functions.php
+++ b/bl-kernel/functions.php
@@ -795,19 +795,10 @@ function activateTheme($themeDirectory) {
 	global $site;
 	global $syslog;
 	global $L, $language;
-	global $blocks;
 
 	if (Sanitize::pathFile(PATH_THEMES.$themeDirectory)) {
 		$site->set(array('theme'=>$themeDirectory));
 
-		// Remove all blocks
-		$blocks->truncate();
-
-		// Include Blocks for the theme
-		if (Sanitize::pathFile(PATH_THEMES.$themeDirectory.DS.'blocks.php')) {
-			include(PATH_THEMES.$themeDirectory.DS.'blocks.php');
-		}
-
 		$syslog->add(array(
 			'dictionaryKey'=>'new-theme-configured',
 			'notes'=>$themeDirectory
@@ -818,7 +809,3 @@ function activateTheme($themeDirectory) {
 	}
 	return false;
 }
-
-function deleteAllBlocks() {
-	global $blocks;
-}
\ No newline at end of file