Merge branch '10307'

CHANGES.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 10.3.07
+- Petites corrections
+- Bouton format dans TinyMCE
+
 ## version 10.3.06
 - Correction :
     - Edition de page avec module, le changement de mise en page désactive le bouton d'option du module.

README.md

@@ -1,6 +1,6 @@
 ![](https://img.shields.io/github/last-commit/fredtempez/ZwiiCMS/master) ![](https://img.shields.io/github/release-date/fredtempez/ZwiiCMS)
 
-# ZwiiCMS 10.3.06
+# ZwiiCMS 10.3.07
 
 Zwii est un CMS sans base de données (flat-file) qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation.
 

core/core.php

@@ -40,7 +40,7 @@ class common {
 	const ACCESS_TIMER = 1800;
 
 	// Numéro de version
-	const ZWII_VERSION = '10.3.06';
+	const ZWII_VERSION = '10.3.07';
 	const ZWII_UPDATE_CHANNEL = "v10";
 
 	public static $actions = [];
@@ -1896,7 +1896,7 @@ class core extends common {
 					'title' => $title,
 					// Meta description = 160 premiers caractères de l'article
 					'metaDescription' => $this->getData(['page',$this->getUrl(0),'moduleId']) === 'blog' && !empty($this->getUrl(1))
-										? strip_tags(substr($this->getData(['module',$this->getUrl(0),$this->getUrl(1),'content']) ,0,159))
+										? strip_tags(substr($this->getData(['module',$this->getUrl(0),'posts',$this->getUrl(1),'content']) ,0,159))
 										: $this->getData(['page', $this->getUrl(0), 'metaDescription']),
 					'metaTitle' => $this->getData(['page', $this->getUrl(0), 'metaTitle']),
 					'typeMenu' => $this->getData(['page', $this->getUrl(0), 'typeMenu']),

core/module/sitemap/view/index/index.php

@@ -1,40 +1,40 @@
 <ul>
 	<?php foreach($this->getHierarchy(null,true,null) as $parentId => $childIds): ?>
 		<li>
-			<?php 			
+			<?php
 			if ($this->getData(['page', $parentId, 'disable']) === false  && $this->getUser('group') >= $this->getData(['page', $parentId, 'group']))
-			{ ?>	
+			{ ?>
 				<a href="<?php echo helper::baseUrl() . $parentId; ?>"><?php echo $this->getData(['page', $parentId, 'title']); ?></a>
-				<?php 
+				<?php
-			} else { 
+			} else {
 				// page désactivée
-				echo $this->getData(['page', $parentId, 'title']); 
+				echo $this->getData(['page', $parentId, 'title']);
 			} ?>
 			<ul>
 				<?php foreach($childIds as $childId): ?>
 					<li>
 					<!-- Sous-page -->
-					<?php if ($this->getData(['page', $childId, 'disable']) === false && $this->getUser('group') >= $this->getData(['page', $parentId, 'group'])) 
+					<?php if ($this->getData(['page', $childId, 'disable']) === false && $this->getUser('group') >= $this->getData(['page', $parentId, 'group']))
-					{ ?>	
+					{ ?>
 						<a href="<?php echo helper::baseUrl() . $childId; ?>"><?php echo $this->getData(['page', $childId, 'title']); ?></a>
 					<?php } else { ?>
 							<!-- page désactivée -->
-							<?php echo $this->getData(['page', $childId, 'title']); }?>	
+							<?php echo $this->getData(['page', $childId, 'title']); }?>
-							
+
 						<!-- articles d'une sous-page blog-->
 						<ul>
 						<?php if ($this->getData(['page', $childId, 'moduleId']) === 'blog') { ?>
-							
+
 							<?php
 								foreach($this->getData(['module',$childId]) as $articleId => $article): ?>
-								<?php if($this->getData(['module',$childId,$articleId,'state']) === true) {?>								
+								<?php if($this->getData(['module',$childId,'posts',$articleId,'state']) === true) {?>
 									<li>
 										<a href="<?php echo helper::baseUrl() . $childId . '/' . $articleId;?>"><?php echo $article['title']; ?></a>
 									</li>
-								<?php } ?>								
+								<?php } ?>
 								<?php endforeach;
 							} ?>
-						</ul>					
+						</ul>
 					</li>
 				<?php endforeach; ?>
 				<!-- ou articles d'un blog-->
@@ -42,7 +42,7 @@
 				<?php if ($this->getData(['page', $parentId, 'moduleId']) === 'blog'  &&
 				   			!empty($this->getData(['module',$parentId])) ) { ?>
 					<?php foreach($this->getData(['module',$parentId]) as $articleId => $article): ?>
-						<?php if($this->getData(['module',$parentId,$articleId,'state']) === true ): ?>
+						<?php if($this->getData(['module',$parentId,'posts',$articleId,'state']) === true ): ?>
 							<li>
 								<a href="<?php echo helper::baseUrl() .	$parentId. '/' . $articleId;?>"><?php echo $article['title']; ?></a>
 							</li>

core/vendor/tinymce/init.js

@@ -20,7 +20,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 | 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: {