diff --git a/CHANGES.md b/CHANGES.md index 749837e8..867afec2 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -16,10 +16,16 @@ - Gestion des thèmes : - Bouton de réinitialisation avec confirmation +## version 10.3.07 +- Corrections : + - installation, auteurs des articles gérés à l'installation. +- Modification : + - TinyMCE : icône du sélecteur de formats. + ## version 10.3.06 - Correction : - Edition de page avec module, le changement de mise en page désactive le bouton d'option du module. -- Modification : +- Modification : - Modules News et Blog : ajout de l'option flux RSS. L'option est activée par défaut. ## version 10.3.05 diff --git a/core/core.php b/core/core.php index 63a41a8e..33f7f8c3 100644 --- a/core/core.php +++ b/core/core.php @@ -1446,7 +1446,7 @@ class common { } // Mettre à jour les données des blogs les articles sont dans posts foreach ($pageList as $parentKey => $parent) { - //La page a une galerie + //La page a une blog if ($this->getData(['page',$parent,'moduleId']) === 'blog' ) { foreach ( $this->getData(['module', $parent]) as $blogKey => $blogItem) { $data = $this->getdata(['module',$parent,$blogKey]); @@ -1456,7 +1456,7 @@ class common { } } foreach ($pageList as $parentKey => $parent) { - //La page a une galerie + //La page a une news if ($this->getData(['page',$parent,'moduleId']) === 'news' ) { foreach ( $this->getData(['module', $parent]) as $newsKey => $newsItem) { $data = $this->getdata(['module',$parent,$newsKey]); @@ -1488,24 +1488,24 @@ class common { foreach ($pageList as $parentKey => $parent) { //La page a une galerie if ($this->getData(['page',$parent,'moduleId']) === 'blog' ) { - $articleIds = array_keys(helper::arrayCollumn($this->getData(['module',$parent]), 'publishedOn', 'SORT_DESC')); + $articleIds = array_keys(helper::arrayCollumn($this->getData(['module',$parent,'posts']), 'publishedOn', 'SORT_DESC')); foreach ($articleIds as $key => $article) { // Droits les deux groupes - $this->setData(['module', $parent, $article,'editConsent', 3]); + $this->setData(['module', $parent, 'posts', $article,'editConsent', 3]); // Limite de taille 500 - $this->setData(['module', $parent, $article,'commentMaxlength', '500']); + $this->setData(['module', $parent, 'posts', $article,'commentMaxlength', '500']); // Pas d'approbation des commentaires - $this->setData(['module', $parent, $article,'commentApproved', false ]); + $this->setData(['module', $parent, 'posts', $article,'commentApproved', false ]); // pas de notification - $this->setData(['module', $parent, $article,'commentNotification', false ]); + $this->setData(['module', $parent, 'posts', $article,'commentNotification', false ]); // groupe de notification - $this->setData(['module', $parent, $article,'commentGroupNotification', 3 ]); + $this->setData(['module', $parent, 'posts', $article,'commentGroupNotification', 3 ]); } // Traitement des commentaires - if ( is_array($this->getData(['module', $parent, $article,'comment'])) ) { - foreach($this->getData(['module', $parent, $article,'comment']) as $commentId => $comment) { + if ( is_array($this->getData(['module', $parent, 'posts', $article,'comment'])) ) { + foreach($this->getData(['module', $parent, 'posts', $article,'comment']) as $commentId => $comment) { // Approbation - $this->setData(['module', $parent, $article,'comment', $commentId, 'approval', true ]); + $this->setData(['module', $parent, 'posts', $article,'comment', $commentId, 'approval', true ]); } } } diff --git a/core/module/install/install.php b/core/module/install/install.php index bc573824..e9fef5a2 100644 --- a/core/module/install/install.php +++ b/core/module/install/install.php @@ -96,9 +96,9 @@ class install extends common { if ($this->getInput('installDefaultData',helper::FILTER_BOOLEAN) === FALSE) { $this->initData('page','fr',true); $this->initData('module','fr',true); - $this->setData(['module', 'blog', 'mon-premier-article', 'userId', $userId]); - $this->setData(['module', 'blog', 'mon-deuxieme-article', 'userId', $userId]); - $this->setData(['module', 'blog', 'mon-troisieme-article', 'userId', $userId]); + $this->setData(['module', 'blog', 'posts', 'mon-premier-article', 'userId', $userId]); + $this->setData(['module', 'blog', 'posts', 'mon-deuxieme-article', 'userId', $userId]); + $this->setData(['module', 'blog', 'posts', 'mon-troisieme-article', 'userId', $userId]); } // Stocker le dossier d'installation $this->setData(['core', 'baseUrl', helper::baseUrl(false,false) ]); diff --git a/core/vendor/tinymce/init.js b/core/vendor/tinymce/init.js index 809ad9f2..6c876a1f 100755 --- a/core/vendor/tinymce/init.js +++ b/core/vendor/tinymce/init.js @@ -27,7 +27,7 @@ tinymce.init({ // Plugins plugins: "advlist anchor autolink autoresize autosave codemirror colorpicker contextmenu fullscreen hr image imagetools link lists media paste searchreplace stickytoolbar tabfocus table template textcolor emoticons nonbreaking", // Contenu de la barre d'outils - toolbar: "restoredraft | undo redo | formatselect bold italic underline forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist emoticons | table template | image media link | code fullscreen", + toolbar: "restoredraft | undo redo | formatselect | bold italic underline forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist emoticons | table template | image media link | code fullscreen", // Emoticons emoticons_append: { custom_mind_explode: { diff --git a/module/blog/blog.php b/module/blog/blog.php index 0642097b..a8ac5c11 100644 --- a/module/blog/blog.php +++ b/module/blog/blog.php @@ -152,7 +152,7 @@ class blog extends common { } // Incrémente l'id de l'article $articleId = helper::increment($this->getInput('blogAddTitle', helper::FILTER_ID), $this->getData(['page'])); - $articleId = helper::increment($articleId, (array) $this->getData(['module', $this->getUrl(0)])); + $articleId = helper::increment($articleId, (array) $this->getData(['module', $this->getUrl(0),'posts'])); $articleId = helper::increment($articleId, array_keys(self::$actions)); // Crée l'article $this->setData(['module', @@ -354,7 +354,7 @@ class blog extends common { */ public function config() { // Ids des articles par ordre de publication - $articleIds = array_keys(helper::arrayCollumn($this->getData(['module', $this->getUrl(0)]), 'publishedOn', 'SORT_DESC')); + $articleIds = array_keys(helper::arrayCollumn($this->getData(['module', $this->getUrl(0),'posts']), 'publishedOn', 'SORT_DESC')); // Gestion des droits d'accès $filterData=[]; foreach ($articleIds as $key => $value) {