From 4a8e2ff54187411207cf8e3ddf5fa685a759e9b8 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Wed, 16 Mar 2022 11:02:17 +0100
Subject: [PATCH] =?UTF-8?q?Contenu=20avanc=C3=A9=20des=20pages=20(css=20et?=
 =?UTF-8?q?=20js)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php                                 |  6 ++++--
 core/module/page/page.php                     | 17 ++++++++++++-----
 core/module/page/view/cssEditor/cssEditor.php |  2 +-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/core/core.php b/core/core.php
index cfadbc96..844580fc 100644
--- a/core/core.php
+++ b/core/core.php
@@ -2785,8 +2785,10 @@ class core extends common {
 		) {
 			$this->addOutput([
 				'title' => $title,
-				//'content' => file_get_contents(self::DATA_DIR . self::$i18n . '/content/' . $this->getData(['page', $this->getUrl(0), 'content'])),
-				'content' => $this->getPage($this->getUrl(0), self::$i18n),
+				'content' => 	$this->getPage($this->getUrl(0), self::$i18n) .
+								// Concatène avec les paramètres avancés.
+								$this->getData(['page', $this->getUrl(0), 'css']) . 
+								$this->getData(['page', $this->getUrl(0), 'js']),
 				'metaDescription' => $this->getData(['page', $this->getUrl(0), 'metaDescription']),
 				'metaTitle' => $this->getData(['page', $this->getUrl(0), 'metaTitle']),
 				'typeMenu' => $this->getData(['page', $this->getUrl(0), 'typeMenu']),
diff --git a/core/module/page/page.php b/core/module/page/page.php
index aea77605..e329f60f 100644
--- a/core/module/page/page.php
+++ b/core/module/page/page.php
@@ -457,7 +457,6 @@ class page extends common {
 							}
 						}
 					}
-
 					// Modifie la page ou en crée une nouvelle si l'id a changé
 					$this->setData([
 						'page',
@@ -487,8 +486,8 @@ class page extends common {
 							'hideMenuHead' => $this->getinput('pageEditHideMenuHead', helper::FILTER_BOOLEAN),
 							'hideMenuChildren' => $this->getinput('pageEditHideMenuChildren', helper::FILTER_BOOLEAN),
 							'extraPosition' => $this->getinput('pageEditExtraPosition', helper::FILTER_BOOLEAN),
-							'css' => $this->getData(['page', $pageId, 'css']),
-							'js' => $this->getData(['page', $pageId, 'js'])
+							'css' => $this->getData(['page', $this->getUrl(2), 'css']),
+							'js' => $this->getData(['page', $this->getUrl(2), 'js'])
 						]
 					]);
 
@@ -554,8 +553,12 @@ class page extends common {
 	public function cssEditor() {
 		// Soumission du formulaire
 		if($this->isPost()) {
+			// Contrôle la présence des balises
+			$css =$this->getInput('pageCssEditorContent');
+			$css = strpos ( $css, '<style>')  >= 1 ? $css : '<style>' . $css;
+			$css = strpos ( $css, '</style>') >= 1 ? $css : $css . '</style>';
 			// Enregistre le CSS
-			$this->setData(['page', $this->getUrl(2), 'css', $this->getInput('pageCssEditorContent') ]);
+			$this->setData(['page', $this->getUrl(2), 'css', $css ]);
 			// Valeurs en sortie
 			$this->addOutput([
 				'notification' => 'Modifications enregistrées',
@@ -579,8 +582,12 @@ class page extends common {
 	public function jsEditor() {
 		// Soumission du formulaire
 		if($this->isPost()) {
+			// Contrôle la présence des balises
+			$js = $this->getInput('pageJsEditorContent');
+			$js = strpos ( $css, '<script>') >=1 ? $js : '<script>' . $js;
+			$js = strpos ( $css, '</script>')  >=1 ? $js : $js . '</script>';
 			// Enregistre le JS
-			$this->setData(['page', $this->getUrl(2), 'js', $this->getInput('pageJsEditorContent') ]);
+			$this->setData(['page', $this->getUrl(2), 'js', $js ]);
 			// Valeurs en sortie
 			$this->addOutput([
 				'notification' => 'Modifications enregistrées',
diff --git a/core/module/page/view/cssEditor/cssEditor.php b/core/module/page/view/cssEditor/cssEditor.php
index 2aefe85c..34e8f7bb 100644
--- a/core/module/page/view/cssEditor/cssEditor.php
+++ b/core/module/page/view/cssEditor/cssEditor.php
@@ -14,7 +14,7 @@
 	<div class="row">
 		<div class="col12">
 			<?php echo template::textarea('pageCssEditorContent', [
-				'value' => $this->getData(['page', $this->getUrl(2), 'css' ]),
+				'value' => empty($this->getData(['page', $this->getUrl(2), 'css' ])) ? '<style></style>': $this->getData(['page', $this->getUrl(2), 'css' ]),
 				'class' => 'editor'
 			]); ?>
 		</div>