diff --git a/CHANGES.md b/CHANGES.md index 8c9f2360..bfb312c1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,7 @@ - Corrections - Gestionnaire de fichiers, modifications des paramètres des miniatures. - Suppression d'options inutiles dans l'édition d'une page de type de barre latérale. + - Filtrage du nom des pages dans la fenêtre d'édition des pages. ## version 9.2.12 - Modifications diff --git a/core/core.php b/core/core.php index 374f3336..12fe99fb 100644 --- a/core/core.php +++ b/core/core.php @@ -561,23 +561,23 @@ class common { if ($this->getData(['page', $parentId, 'block']) !== 'bar' ) { // Boucler sur les enfants et récupérer le tableau children avec la liste des enfants foreach($childIds as $childId) { - $children [] = [ 'title' => ' » '. $this->getData(['page', $childId, 'title']) , + $children [] = [ 'title' => ' » '. html_entity_decode($this->getData(['page', $childId, 'title']), ENT_QUOTES) , 'value'=> $rewrite.$childId ]; } // Traitement if (empty($childIds)) { // Pas d'enfant, uniuement l'entrée du parent - $parents [] = ['title' => $this->getData(['page', $parentId, 'title']) , + $parents [] = ['title' => html_entity_decode($this->getData(['page', $parentId, 'title']), ENT_QUOTES) , 'value'=> $rewrite.$parentId ]; } else { // Des enfants, on ajoute la page parent en premier - array_unshift ($children , ['title' => $this->getData(['page', $parentId, 'title']) , + array_unshift ($children , ['title' => html_entity_decode($this->getData(['page', $parentId, 'title']), ENT_QUOTES) , 'value'=> $rewrite.$parentId ]); // puis on ajoute les enfants au parent - $parents [] = ['title' => $this->getData(['page', $parentId, 'title']) , + $parents [] = ['title' => html_entity_decode($this->getData(['page', $parentId, 'title']), ENT_QUOTES) , 'value'=> $rewrite.$parentId , 'menu' => $children ]; @@ -731,8 +731,8 @@ class common { */ public function sendMail($to, $subject, $content) { // Utilisation de PHPMailer version 6.0.6 - require "core/vendor/phpmailer/phpmailer.php"; - require "core/vendor/phpmailer/exception.php"; + require_once "core/vendor/phpmailer/phpmailer.php"; + require_once "core/vendor/phpmailer/exception.php"; // Layout ob_start(); diff --git a/core/module/page/page.php b/core/module/page/page.php index 57298aba..cdc6df93 100755 --- a/core/module/page/page.php +++ b/core/module/page/page.php @@ -53,8 +53,8 @@ class page extends common { ]; public static $displayMenu = [ 'none' => 'Aucun', - 'parents' => 'Menu principal', - 'children' => 'Sous-menu de la page parente' + 'parents' => 'Le menu horizontal', + 'children' => 'Le sous-menu de la page parente' ]; /** @@ -259,8 +259,8 @@ class page extends common { 'position' => $position, 'group' => $this->getinput('pageEditBlock') !== 'bar' ? $this->getInput('pageEditGroup', helper::FILTER_INT) : 0, 'targetBlank' => $this->getInput('pageEditTargetBlank', helper::FILTER_BOOLEAN), - 'targetLity' => $this->getInput('pageEditTargetBlank', helper::FILTER_BOOLEAN) === true ? false : $this->getInput('pageEditTargetLity', helper::FILTER_BOOLEAN), - 'title' => htmlspecialchars_decode($this->getInput('pageEditTitle', helper::FILTER_STRING_SHORT, true), ENT_QUOTES), + 'targetLity' => $this->getInput('pageEditTargetBlank', helper::FILTER_BOOLEAN) === true ? false : $this->getInput('pageEditTargetLity', helper::FILTER_BOOLEAN), + 'title' => $this->getInput('pageEditTitle', helper::FILTER_STRING_SHORT), 'block' => $this->getinput('pageEditBlock'), 'barLeft' => $barLeft, 'barRight' => $barRight, diff --git a/core/module/page/view/edit/edit.js.php b/core/module/page/view/edit/edit.js.php index a1ab375a..929cfa5c 100755 --- a/core/module/page/view/edit/edit.js.php +++ b/core/module/page/view/edit/edit.js.php @@ -515,7 +515,7 @@ $("#pageEditParentPageId").on("change", function() { positionPrevious++; // Ajout à la liste positionDOM.append( - $("