From 2fb054cc57b2dcfdb72cc73afdd73e3dc5d7be65 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Thu, 23 Apr 2020 07:49:55 +0200
Subject: [PATCH] Supprime les emojis de l'id de la page

---
 core/class/helper.class.php | 4 ++++
 core/core.php               | 2 +-
 core/module/page/page.php   | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/class/helper.class.php b/core/class/helper.class.php
index 392a2c28..579ef071 100755
--- a/core/class/helper.class.php
+++ b/core/class/helper.class.php
@@ -199,11 +199,15 @@ class helper {
 				break;
 			case self::FILTER_ID:
 				$text = mb_strtolower($text, 'UTF-8');
+				// Supprime les emojis et espaces en fin de chaine
+				$text = preg_replace('/[[:^print:]]/', '', $text);
+				$text = rtrim($text);
 				$text = strip_tags(str_replace(
 					explode(',', 'á,à,â,ä,ã,å,ç,é,è,ê,ë,í,ì,î,ï,ñ,ó,ò,ô,ö,õ,ú,ù,û,ü,ý,ÿ,\',", '),
 					explode(',', 'a,a,a,a,a,a,c,e,e,e,e,i,i,i,i,n,o,o,o,o,o,u,u,u,u,y,y,-,-,-'),
 					$text
 				));
+				
 				$text = preg_replace('/([^a-z0-9-])/', '', $text);
 				// Cas où un identifiant est vide
 				if (empty($text)) {
diff --git a/core/core.php b/core/core.php
index 3b9d1f4d..9cd6045b 100755
--- a/core/core.php
+++ b/core/core.php
@@ -36,7 +36,7 @@ class common {
 	const THUMBS_WIDTH = 640;
 
 	// Numéro de version 
-	const ZWII_VERSION = '10.0.067';
+	const ZWII_VERSION = '10.0.068';
 	const ZWII_UPDATE_CHANNEL = "v10";
 
 	public static $actions = [];
diff --git a/core/module/page/page.php b/core/module/page/page.php
index 2f0e5280..72da0f54 100755
--- a/core/module/page/page.php
+++ b/core/module/page/page.php
@@ -187,7 +187,7 @@ class page extends common {
 				$pageId = $this->getInput('pageEditTitle', helper::FILTER_ID, true);
 				// un dossier existe du même nom (erreur en cas de redirection)
 				if (file_exists($pageId)) {
-					$pageId = uniqid($pageId . '-');
+					$pageId = uniqid($pageId);
 				}		
 				// Si l'id a changée
 				if ($pageId !== $this->getUrl(2)) {