From 23ea0fe6e4c67fede8da60df795298d4e2253fc6 Mon Sep 17 00:00:00 2001
From: Diego Najar <dignajar@gmail.com>
Date: Sun, 7 Oct 2018 23:11:49 +0200
Subject: [PATCH] bug fix when insert image and cover images

---
 bl-kernel/admin/themes/booty/html/media.php   | 19 ++++++++------
 .../{delete-file.php => delete-image.php}     | 25 +++++++++++++------
 bl-kernel/ajax/get-published.php              | 21 +++++++++++-----
 bl-plugins/search/languages/en.json           |  2 +-
 bl-plugins/search/languages/es.json           |  7 ++++++
 bl-plugins/search/metadata.json               |  2 +-
 bl-plugins/search/plugin.php                  |  4 +--
 bl-plugins/tinymce/plugin.php                 |  4 +--
 8 files changed, 58 insertions(+), 26 deletions(-)
 rename bl-kernel/ajax/{delete-file.php => delete-image.php} (50%)
 create mode 100644 bl-plugins/search/languages/es.json

diff --git a/bl-kernel/admin/themes/booty/html/media.php b/bl-kernel/admin/themes/booty/html/media.php
index 6d18ad04..cea2d8ad 100644
--- a/bl-kernel/admin/themes/booty/html/media.php
+++ b/bl-kernel/admin/themes/booty/html/media.php
@@ -2,12 +2,16 @@
 // Preload the first 10 files to not call via AJAX when the user open the first time the media manager
 if (IMAGE_RESTRICT) {
 	$imagesDirectory = (IMAGE_RELATIVE_TO_ABSOLUTE? '' : HTML_PATH_UPLOADS_PAGES.$uuid.'/');
+	$imagesURL = (IMAGE_RELATIVE_TO_ABSOLUTE? '' : DOMAIN_UPLOADS_PAGES.$uuid.'/');
 	$thumbnailDirectory = PATH_UPLOADS_PAGES.$uuid.DS.'thumbnails'.DS;
 	$thumbnailHTML = HTML_PATH_UPLOADS_PAGES.$uuid.'/thumbnails/';
+	$thumbnailURL = DOMAIN_UPLOADS_PAGES.$uuid.'/thumbnails/';
 } else {
 	$imagesDirectory = (IMAGE_RELATIVE_TO_ABSOLUTE? '' : HTML_PATH_UPLOADS);
+	$imagesURL = (IMAGE_RELATIVE_TO_ABSOLUTE? '' : DOMAIN_UPLOADS);
 	$thumbnailDirectory = PATH_UPLOADS_THUMBNAILS;
 	$thumbnailHTML = HTML_PATH_UPLOADS_THUMBNAILS;
+	$thumbnailURL = DOMAIN_UPLOADS_THUMBNAILS;
 }
 $listOfFilesByPage = Filesystem::listFiles($thumbnailDirectory, '*', '*', $GLOBALS['MEDIA_MANAGER_SORT_BY_DATE'], $GLOBALS['MEDIA_MANAGER_NUMBER_OF_FILES']);
 $preLoadFiles = array();
@@ -99,15 +103,15 @@ function displayFiles(files) {
 	cleanFiles();
 	// Regenerate the table
 	$.each(files, function(key, filename) {
-		var thumbnail = "<?php echo $thumbnailHTML; ?>"+filename;
-		var path = "<?php echo $imagesDirectory; ?>";
+		var thumbnail = "<?php echo $thumbnailURL; ?>"+filename;
+		var image = "<?php echo $imagesURL; ?>"+filename;
 
 		tableRow = '<tr id="js'+filename+'">'+
 				'<td style="width:80px"><img class="img-thumbnail" alt="200x200" src="'+thumbnail+'" style="width: 50px; height: 50px;"><\/td>'+
 				'<td class="information">'+
 					'<div class="pb-2">'+filename+'<\/div>'+
 					'<div>'+
-						'<button type="button" class="btn btn-primary btn-sm mr-2" onClick="editorInsertMedia(\''+path+filename+'\'); closeMediaManager();"><?php $L->p('Insert') ?><\/button>'+
+						'<button type="button" class="btn btn-primary btn-sm mr-2" onClick="editorInsertMedia(\''+image+'\'); closeMediaManager();"><?php $L->p('Insert') ?><\/button>'+
 						'<button type="button" class="btn btn-primary btn-sm" onClick="setCoverImage(\''+filename+'\'); closeMediaManager();"><?php $L->p('Set as cover image') ?><\/button>'+
 						'<button type="button" class="btn btn-secondary btn-sm float-right" onClick="deleteMedia(\''+filename+'\')"><?php $L->p('Delete') ?><\/button>'+
 					'<\/div>'+
@@ -133,9 +137,10 @@ function getFiles(pageNumber) {
 
 // Delete the file and the thumbnail if exist
 function deleteMedia(filename) {
-	$.post(HTML_PATH_ADMIN_ROOT+"ajax/delete-file",
+	$.post(HTML_PATH_ADMIN_ROOT+"ajax/delete-image",
 		{ 	tokenCSRF: tokenCSRF,
-			filename: filename
+			filename: filename,
+			uuid: "<?php echo $uuid; ?>"
 		},
 		function(data) {
 			getFiles(1);
@@ -144,9 +149,9 @@ function deleteMedia(filename) {
 }
 
 function setCoverImage(filename) {
-	var thumbnail = "<?php echo $thumbnailHTML; ?>"+filename;
+	var image = "<?php echo $imagesURL; ?>"+filename;
 	$("#jscoverImage").val(filename);
-	$("#jscoverImagePreview").attr("src", thumbnail);
+	$("#jscoverImagePreview").attr("src", image);
 }
 
 $(document).ready(function() {
diff --git a/bl-kernel/ajax/delete-file.php b/bl-kernel/ajax/delete-image.php
similarity index 50%
rename from bl-kernel/ajax/delete-file.php
rename to bl-kernel/ajax/delete-image.php
index 1a7a655b..d52a5547 100644
--- a/bl-kernel/ajax/delete-file.php
+++ b/bl-kernel/ajax/delete-image.php
@@ -5,6 +5,9 @@ header('Content-Type: application/json');
 // ----------------------------------------------------------------------------
 // (string) $_POST['path'] Name of file to delete, just the filename
 $filename = isset($_POST['filename']) ? $_POST['filename'] : false;
+
+// (string) $_POST['uuid']
+$uuid = empty($_POST['uuid']) ? false : $_POST['uuid'];
 // ----------------------------------------------------------------------------
 
 if ($filename==false) {
@@ -14,19 +17,27 @@ if ($filename==false) {
 	)));
 }
 
-// Check if the filename exist
-if (Sanitize::pathFile(PATH_UPLOADS.$filename)) {
-	Filesystem::rmfile(PATH_UPLOADS.$filename);
+if ($uuid && IMAGE_RESTRICT) {
+	$imagePath = PATH_UPLOADS_PAGES.$uuid.DS;
+	$thumbnailPath = PATH_UPLOADS_PAGES.$uuid.DS.'thumbnails'.DS;
+} else {
+	$imagePath = PATH_UPLOADS;
+	$thumbnailPath = PATH_UPLOADS_THUMBNAILS;
 }
 
-// Check if the file has a thumbnail
-if (Sanitize::pathFile(PATH_UPLOADS_THUMBNAILS.$filename)) {
-	Filesystem::rmfile(PATH_UPLOADS_THUMBNAILS.$filename);
+// Delete image
+if (Sanitize::pathFile($imagePath.$filename)) {
+	Filesystem::rmfile($imagePath.$filename);
+}
+
+// Delete thumbnail
+if (Sanitize::pathFile($thumbnailPath.$filename)) {
+	Filesystem::rmfile($thumbnailPath.$filename);
 }
 
 exit (json_encode(array(
 	'status'=>0,
-	'message'=>'File deleted.'
+	'message'=>'Image deleted.'
 )));
 
 ?>
\ No newline at end of file
diff --git a/bl-kernel/ajax/get-published.php b/bl-kernel/ajax/get-published.php
index fac85fcd..b7688f47 100644
--- a/bl-kernel/ajax/get-published.php
+++ b/bl-kernel/ajax/get-published.php
@@ -13,12 +13,21 @@ if ($query===false) {
 	)));
 }
 
-$tmp = array();
-$parents = buildParentPages();
-foreach ($parents as $parent) {
-	$lowerTitle = Text::lowercase($parent->title());
-	if (Text::stringContains($lowerTitle, $query)) {
-		$tmp[$parent->title()] = $parent->key();
+$list = array();
+$published = $pages->getPublishedDB();
+$statics = $pages->getStaticDB();
+$pagesKey = array_merge($published, $statics);
+foreach ($pagesKey as $pageKey) {
+	try {
+		$page = new Page($pageKey);
+		if ($page->isParent()) {
+			$lowerTitle = Text::lowercase($page->title());
+			if (Text::stringContains($lowerTitle, $query)) {
+				$tmp[$page->title()] = $page->key();
+			}
+		}
+	} catch (Exception $e) {
+		// continue
 	}
 }
 
diff --git a/bl-plugins/search/languages/en.json b/bl-plugins/search/languages/en.json
index cfa18ea9..71027ccb 100644
--- a/bl-plugins/search/languages/en.json
+++ b/bl-plugins/search/languages/en.json
@@ -2,6 +2,6 @@
 	"plugin-data":
 	{
 		"name": "Search",
-		"description": ""
+		"description": "Provide a search box to your users to search through the content of your site."
 	}
 }
\ No newline at end of file
diff --git a/bl-plugins/search/languages/es.json b/bl-plugins/search/languages/es.json
new file mode 100644
index 00000000..26ef34e2
--- /dev/null
+++ b/bl-plugins/search/languages/es.json
@@ -0,0 +1,7 @@
+{
+	"plugin-data":
+	{
+		"name": "Buscador",
+		"description": "Este plugin provee un buscador para tus usuarios para buscar a través del contenido de su sitio."
+	}
+}
\ No newline at end of file
diff --git a/bl-plugins/search/metadata.json b/bl-plugins/search/metadata.json
index f2d3a7f4..263f2336 100644
--- a/bl-plugins/search/metadata.json
+++ b/bl-plugins/search/metadata.json
@@ -3,7 +3,7 @@
 	"email": "",
 	"website": "https://plugins.bludit.com",
 	"version": "3.0",
-	"releaseDate": "2018-01-23",
+	"releaseDate": "2018-10-07",
 	"license": "MIT",
 	"compatible": "3.0",
 	"notes": ""
diff --git a/bl-plugins/search/plugin.php b/bl-plugins/search/plugin.php
index 6ee70fa8..06dc6913 100644
--- a/bl-plugins/search/plugin.php
+++ b/bl-plugins/search/plugin.php
@@ -9,8 +9,8 @@ class pluginSearch extends Plugin {
 	{
 		// Fields and default values for the database of this plugin
 		$this->dbFields = array(
-			'label'=>'search',
-			'wordsToCachePerPage'=>300
+			'label'=>'Search',
+			'wordsToCachePerPage'=>800
 		);
 	}
 
diff --git a/bl-plugins/tinymce/plugin.php b/bl-plugins/tinymce/plugin.php
index bffedcce..7b41646d 100644
--- a/bl-plugins/tinymce/plugin.php
+++ b/bl-plugins/tinymce/plugin.php
@@ -119,13 +119,13 @@ tinymce.init({
 	schema: "html5",
 	statusbar: false,
 	menubar:false,
-	remove_script_host: false,
 	branding: false,
 	browser_spellcheck: true,
 	pagebreak_separator: PAGE_BREAK,
 	paste_as_text: true,
-	relative_urls: true,
 	remove_script_host: false,
+	convert_urls: true,
+	relative_urls: false,
 	$document_base_url
 	plugins: ["$plugins"],
 	toolbar1: "$toolbar1",