From 346d573197a26d2d2eca1f4e12ba6f2ab9696659 Mon Sep 17 00:00:00 2001
From: Diego Najar <dignajar@gmail.com>
Date: Tue, 15 Jan 2019 19:53:04 +0100
Subject: [PATCH] bludit v3.6

---
 bl-kernel/admin/views/edit-user.php       |  2 +-
 bl-kernel/admin/views/themes.php          |  4 ----
 bl-kernel/boot/init.php                   | 12 ++++--------
 bl-kernel/helpers/filesystem.class.php    |  4 ++--
 bl-plugins/about/metadata.json            |  6 +++---
 bl-plugins/api/metadata.json              |  6 +++---
 bl-plugins/backup/metadata.json           |  6 +++---
 bl-plugins/categories/metadata.json       |  6 +++---
 bl-plugins/disqus/metadata.json           |  6 +++---
 bl-plugins/hit-counter/metadata.json      |  6 +++---
 bl-plugins/html-code/metadata.json        |  6 +++---
 bl-plugins/links/metadata.json            |  6 +++---
 bl-plugins/maintenance-mode/metadata.json |  6 +++---
 bl-plugins/navigation/metadata.json       |  6 +++---
 bl-plugins/opengraph/metadata.json        |  6 +++---
 bl-plugins/remote-content/metadata.json   |  4 ++--
 bl-plugins/robots/metadata.json           |  6 +++---
 bl-plugins/rss/metadata.json              |  6 +++---
 bl-plugins/search/metadata.json           |  4 ++--
 bl-plugins/simple-stats/metadata.json     |  6 +++---
 bl-plugins/simplemde/metadata.json        |  2 +-
 bl-plugins/sitemap/metadata.json          |  6 +++---
 bl-plugins/static-pages/metadata.json     |  4 ++--
 bl-plugins/tags/metadata.json             |  6 +++---
 bl-plugins/tinymce/metadata.json          |  2 +-
 bl-plugins/twitter-cards/metadata.json    |  6 +++---
 bl-plugins/version/metadata.json          |  6 +++---
 bl-themes/alternative/blocks.php          |  2 +-
 bl-themes/alternative/metadata.json       |  6 +++---
 bl-themes/blogx/metadata.json             |  6 +++---
 30 files changed, 76 insertions(+), 84 deletions(-)

diff --git a/bl-kernel/admin/views/edit-user.php b/bl-kernel/admin/views/edit-user.php
index 8cf89fa3..2612d560 100644
--- a/bl-kernel/admin/views/edit-user.php
+++ b/bl-kernel/admin/views/edit-user.php
@@ -114,7 +114,7 @@
 			formData.append('profilePictureInputFile', $(this)[0].files[0]);
 			formData.append('username', $("#jsusername").val());
 			$.ajax({
-				url: HTML_PATH_ADMIN_ROOT+"ajax/profile-picture",
+				url: HTML_PATH_ADMIN_ROOT+"ajax/upload-profile-picture",
 				type: "POST",
 				data: formData,
 				cache: false,
diff --git a/bl-kernel/admin/views/themes.php b/bl-kernel/admin/views/themes.php
index ec99140a..95393b89 100644
--- a/bl-kernel/admin/views/themes.php
+++ b/bl-kernel/admin/views/themes.php
@@ -25,10 +25,6 @@ foreach ($themes as $theme) {
 
 	if ($theme['dirname']!=$site->theme()) {
 		echo '<a href="'.HTML_PATH_ADMIN_ROOT.'install-theme/'.$theme['dirname'].'">'.$L->g('Activate').'</a>';
-	} else {
-		if (Sanitize::pathFile(PATH_THEMES.$theme['dirname'].DS.'blocks.php')) {
-			echo '<a href="'.HTML_PATH_ADMIN_ROOT.'blocks'.'">'.$L->g('Configure Blocks').'</a>';
-		}
 	}
 
 	echo '
diff --git a/bl-kernel/boot/init.php b/bl-kernel/boot/init.php
index dd421a5f..dad06675 100644
--- a/bl-kernel/boot/init.php
+++ b/bl-kernel/boot/init.php
@@ -1,10 +1,10 @@
 <?php defined('BLUDIT') or die('Bludit CMS.');
 
 // Bludit version
-define('BLUDIT_VERSION',	'3.5');
-define('BLUDIT_CODENAME',	'IPA');
-define('BLUDIT_RELEASE_DATE',	'2018-12-01');
-define('BLUDIT_BUILD',		'201811201');
+define('BLUDIT_VERSION',	'3.6');
+define('BLUDIT_CODENAME',	'Pilsner');
+define('BLUDIT_RELEASE_DATE',	'2019-01-15');
+define('BLUDIT_BUILD',		'20190115');
 
 // Debug mode
 // Change to FALSE, for prevent warning or errors on browser
@@ -60,7 +60,6 @@ define('DB_TAGS', PATH_DATABASES.'tags.php');
 define('DB_SYSLOG', PATH_DATABASES.'syslog.php');
 define('DB_USERS', PATH_DATABASES.'users.php');
 define('DB_SECURITY', PATH_DATABASES.'security.php');
-define('DB_BLOCKS', PATH_DATABASES.'blocks.php');
 
 // JSON pretty print
 if (!defined('JSON_PRETTY_PRINT')) {
@@ -82,8 +81,6 @@ include(PATH_ABSTRACT.'dblist.class.php');
 include(PATH_ABSTRACT.'plugin.class.php');
 
 // Inclde Classes
-include(PATH_KERNEL.'blocks.class.php');
-include(PATH_KERNEL.'block.class.php');
 include(PATH_KERNEL.'pages.class.php');
 include(PATH_KERNEL.'users.class.php');
 include(PATH_KERNEL.'tags.class.php');
@@ -134,7 +131,6 @@ $site  		= new Site();
 $url		= new Url();
 $security	= new Security();
 $syslog 	= new Syslog();
-$blocks 	= new Blocks();
 
 // --- Relative paths ---
 // This paths are relative for the user / web browsing.
diff --git a/bl-kernel/helpers/filesystem.class.php b/bl-kernel/helpers/filesystem.class.php
index d41740f3..139c18be 100644
--- a/bl-kernel/helpers/filesystem.class.php
+++ b/bl-kernel/helpers/filesystem.class.php
@@ -209,8 +209,8 @@ class Filesystem {
 		$fileExtension 	= pathinfo($filename, PATHINFO_EXTENSION);
 		$fileExtension 	= Text::lowercase($fileExtension);
 		$filename 	= pathinfo($filename, PATHINFO_FILENAME);
-		$filename 	= Text::replace(' ', '', $filename);
-		$filename 	= Text::replace('_', '', $filename);
+		$filename 	= Text::removeSpaces($filename);
+		$filename 	= Text::removeQuotes($filename);
 
 		// Search for the next filename
 		$tmpName = $filename.'.'.$fileExtension;
diff --git a/bl-plugins/about/metadata.json b/bl-plugins/about/metadata.json
index 936d826e..aa84bec9 100644
--- a/bl-plugins/about/metadata.json
+++ b/bl-plugins/about/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "3.5",
-	"releaseDate": "2018-11-25",
+	"version": "3.6",
+	"releaseDate": "2019-01-15",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/api/metadata.json b/bl-plugins/api/metadata.json
index 936d826e..aa84bec9 100644
--- a/bl-plugins/api/metadata.json
+++ b/bl-plugins/api/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "3.5",
-	"releaseDate": "2018-11-25",
+	"version": "3.6",
+	"releaseDate": "2019-01-15",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/backup/metadata.json b/bl-plugins/backup/metadata.json
index 936d826e..aa84bec9 100644
--- a/bl-plugins/backup/metadata.json
+++ b/bl-plugins/backup/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "3.5",
-	"releaseDate": "2018-11-25",
+	"version": "3.6",
+	"releaseDate": "2019-01-15",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/categories/metadata.json b/bl-plugins/categories/metadata.json
index 936d826e..aa84bec9 100644
--- a/bl-plugins/categories/metadata.json
+++ b/bl-plugins/categories/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "3.5",
-	"releaseDate": "2018-11-25",
+	"version": "3.6",
+	"releaseDate": "2019-01-15",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/disqus/metadata.json b/bl-plugins/disqus/metadata.json
index 936d826e..aa84bec9 100644
--- a/bl-plugins/disqus/metadata.json
+++ b/bl-plugins/disqus/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "3.5",
-	"releaseDate": "2018-11-25",
+	"version": "3.6",
+	"releaseDate": "2019-01-15",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/hit-counter/metadata.json b/bl-plugins/hit-counter/metadata.json
index 936d826e..aa84bec9 100644
--- a/bl-plugins/hit-counter/metadata.json
+++ b/bl-plugins/hit-counter/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "3.5",
-	"releaseDate": "2018-11-25",
+	"version": "3.6",
+	"releaseDate": "2019-01-15",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/html-code/metadata.json b/bl-plugins/html-code/metadata.json
index 936d826e..aa84bec9 100644
--- a/bl-plugins/html-code/metadata.json
+++ b/bl-plugins/html-code/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "3.5",
-	"releaseDate": "2018-11-25",
+	"version": "3.6",
+	"releaseDate": "2019-01-15",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/links/metadata.json b/bl-plugins/links/metadata.json
index 936d826e..aa84bec9 100644
--- a/bl-plugins/links/metadata.json
+++ b/bl-plugins/links/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "3.5",
-	"releaseDate": "2018-11-25",
+	"version": "3.6",
+	"releaseDate": "2019-01-15",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/maintenance-mode/metadata.json b/bl-plugins/maintenance-mode/metadata.json
index 936d826e..aa84bec9 100644
--- a/bl-plugins/maintenance-mode/metadata.json
+++ b/bl-plugins/maintenance-mode/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "3.5",
-	"releaseDate": "2018-11-25",
+	"version": "3.6",
+	"releaseDate": "2019-01-15",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/navigation/metadata.json b/bl-plugins/navigation/metadata.json
index 936d826e..aa84bec9 100644
--- a/bl-plugins/navigation/metadata.json
+++ b/bl-plugins/navigation/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "3.5",
-	"releaseDate": "2018-11-25",
+	"version": "3.6",
+	"releaseDate": "2019-01-15",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/opengraph/metadata.json b/bl-plugins/opengraph/metadata.json
index 936d826e..aa84bec9 100644
--- a/bl-plugins/opengraph/metadata.json
+++ b/bl-plugins/opengraph/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "3.5",
-	"releaseDate": "2018-11-25",
+	"version": "3.6",
+	"releaseDate": "2019-01-15",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/remote-content/metadata.json b/bl-plugins/remote-content/metadata.json
index 2c034eba..042c8754 100644
--- a/bl-plugins/remote-content/metadata.json
+++ b/bl-plugins/remote-content/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com/plugin/remote-content",
-	"version": "3.5",
+	"version": "3.6",
 	"releaseDate": "2018-09-14",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/robots/metadata.json b/bl-plugins/robots/metadata.json
index 936d826e..aa84bec9 100644
--- a/bl-plugins/robots/metadata.json
+++ b/bl-plugins/robots/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "3.5",
-	"releaseDate": "2018-11-25",
+	"version": "3.6",
+	"releaseDate": "2019-01-15",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/rss/metadata.json b/bl-plugins/rss/metadata.json
index 936d826e..aa84bec9 100644
--- a/bl-plugins/rss/metadata.json
+++ b/bl-plugins/rss/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "3.5",
-	"releaseDate": "2018-11-25",
+	"version": "3.6",
+	"releaseDate": "2019-01-15",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/search/metadata.json b/bl-plugins/search/metadata.json
index bd54e3d9..35ee97ce 100644
--- a/bl-plugins/search/metadata.json
+++ b/bl-plugins/search/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "3.5",
+	"version": "3.6",
 	"releaseDate": "2018-10-07",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/simple-stats/metadata.json b/bl-plugins/simple-stats/metadata.json
index 936d826e..aa84bec9 100644
--- a/bl-plugins/simple-stats/metadata.json
+++ b/bl-plugins/simple-stats/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "3.5",
-	"releaseDate": "2018-11-25",
+	"version": "3.6",
+	"releaseDate": "2019-01-15",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/simplemde/metadata.json b/bl-plugins/simplemde/metadata.json
index 17003a51..859e4cda 100644
--- a/bl-plugins/simplemde/metadata.json
+++ b/bl-plugins/simplemde/metadata.json
@@ -5,6 +5,6 @@
 	"version": "1.11.2",
 	"releaseDate": "2016-06-14",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/sitemap/metadata.json b/bl-plugins/sitemap/metadata.json
index 936d826e..aa84bec9 100644
--- a/bl-plugins/sitemap/metadata.json
+++ b/bl-plugins/sitemap/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "3.5",
-	"releaseDate": "2018-11-25",
+	"version": "3.6",
+	"releaseDate": "2019-01-15",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/static-pages/metadata.json b/bl-plugins/static-pages/metadata.json
index 498de2ae..9d5fd0c4 100644
--- a/bl-plugins/static-pages/metadata.json
+++ b/bl-plugins/static-pages/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "3.5",
+	"version": "3.6",
 	"releaseDate": "2018-03-07",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/tags/metadata.json b/bl-plugins/tags/metadata.json
index 936d826e..aa84bec9 100644
--- a/bl-plugins/tags/metadata.json
+++ b/bl-plugins/tags/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "3.5",
-	"releaseDate": "2018-11-25",
+	"version": "3.6",
+	"releaseDate": "2019-01-15",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/tinymce/metadata.json b/bl-plugins/tinymce/metadata.json
index d46cab2e..3f8d9e08 100644
--- a/bl-plugins/tinymce/metadata.json
+++ b/bl-plugins/tinymce/metadata.json
@@ -5,6 +5,6 @@
 	"version": "4.8.5",
 	"releaseDate": "2018-10-31",
 	"license": "GPL v2",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/twitter-cards/metadata.json b/bl-plugins/twitter-cards/metadata.json
index 936d826e..aa84bec9 100644
--- a/bl-plugins/twitter-cards/metadata.json
+++ b/bl-plugins/twitter-cards/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "3.5",
-	"releaseDate": "2018-11-25",
+	"version": "3.6",
+	"releaseDate": "2019-01-15",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-plugins/version/metadata.json b/bl-plugins/version/metadata.json
index 936d826e..aa84bec9 100644
--- a/bl-plugins/version/metadata.json
+++ b/bl-plugins/version/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://plugins.bludit.com",
-	"version": "3.5",
-	"releaseDate": "2018-11-25",
+	"version": "3.6",
+	"releaseDate": "2019-01-15",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-themes/alternative/blocks.php b/bl-themes/alternative/blocks.php
index 1e8aea1e..0aad47e1 100644
--- a/bl-themes/alternative/blocks.php
+++ b/bl-themes/alternative/blocks.php
@@ -3,7 +3,7 @@ $blocks->add(array(
 	'key'=>'google-analitycs',
 	'title'=>'Google Analytics',
 	'value'=>'',
-	'description'=>'Insert the code for Google Analytics'
+	'description'=>$language->get('Insert the code for Google Analytics')
 ));
 
 $blocks->add(array(
diff --git a/bl-themes/alternative/metadata.json b/bl-themes/alternative/metadata.json
index 68b7f28b..96aab74d 100644
--- a/bl-themes/alternative/metadata.json
+++ b/bl-themes/alternative/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://themes.bludit.com",
-	"version": "3.5",
-	"releaseDate": "2018-11-25",
+	"version": "3.6",
+	"releaseDate": "2019-01-15",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file
diff --git a/bl-themes/blogx/metadata.json b/bl-themes/blogx/metadata.json
index 68b7f28b..96aab74d 100644
--- a/bl-themes/blogx/metadata.json
+++ b/bl-themes/blogx/metadata.json
@@ -2,9 +2,9 @@
 	"author": "Bludit",
 	"email": "",
 	"website": "https://themes.bludit.com",
-	"version": "3.5",
-	"releaseDate": "2018-11-25",
+	"version": "3.6",
+	"releaseDate": "2019-01-15",
 	"license": "MIT",
-	"compatible": "3.5",
+	"compatible": "3.6",
 	"notes": ""
 }
\ No newline at end of file