From 30a3ecbbc286693e7aa384e3c2715dcc1ac8e6b6 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Sun, 27 Jan 2019 14:09:23 +0100
Subject: [PATCH] =?UTF-8?q?moduel=20cde=20:=20d=C3=A9sactiver=20iframe=20-?=
 =?UTF-8?q?=20modifier=20showcontent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php                         | 27 ++++++++++++++++++---------
 core/module/theme/resource/custom.css | 12 +-----------
 module/code/code.php                  |  6 +-----
 3 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/core/core.php b/core/core.php
index 542cbf46..7b79b511 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1972,16 +1972,25 @@ class layout extends common {
 	 * Affiche le contenu
 	 */
 	public function showContent() {
-		if(
-			$this->core->output['title']
-			AND (
-				$this->getData(['page', $this->getUrl(0)]) === null
-				OR $this->getData(['page', $this->getUrl(0), 'hideTitle']) === false
-			)
-		) {
-			echo '<h1 id="sectionTitle">' . $this->core->output['title'] . '</h1>';
+		// Exception pour le module code
+		if ($this->getData(['page', $this->getUrl(0), 'moduleId']) == 'code'&&
+		    $this->getUrl(1) !== 'config') {	
+			$this->core->output['title'];
+			//$this->core->output[include('site/file/source/' . $this->getdata(['module',$this->getUrl(0),'file']))];
+			echo include('site/file/source/' . $this->getdata(['module',$this->getUrl(0),'file']));
+		} else {
+			// Fin de l'exception
+			if(
+				$this->core->output['title']
+				AND (
+					$this->getData(['page', $this->getUrl(0)]) === null
+					OR $this->getData(['page', $this->getUrl(0), 'hideTitle']) === false
+				)
+			) {
+				echo '<h1 id="sectionTitle">' . $this->core->output['title'] . '</h1>';
+			}
+			echo $this->core->output['content'];
 		}
-		echo $this->core->output['content'];
 	}
 
 /**
diff --git a/core/module/theme/resource/custom.css b/core/module/theme/resource/custom.css
index dad33c28..708caca0 100755
--- a/core/module/theme/resource/custom.css
+++ b/core/module/theme/resource/custom.css
@@ -143,14 +143,4 @@ input[type='password']:hover,
 .inputFile:hover,
 select:hover,
 textarea:hover {
-}
-
-/* iframe du module core */
-
-iframe {
-    height: 100%;
-    border: none;
-    margin-top: 10px;
-    margin-bottom: 10px;
-    
-  }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/module/code/code.php b/module/code/code.php
index dfc5ed19..24ed5fbe 100644
--- a/module/code/code.php
+++ b/module/code/code.php
@@ -63,11 +63,7 @@ class code extends common {
 			$this->setData(['module', $this->getUrl(0), 'count', helper::filter($this->getData(['module', $this->getUrl(0), 'count']) + 1, helper::FILTER_INT)]);
 			// Valeurs en sortie
 			$this->addOutput([
-				'content' => '<iframe name="modulecodefile" src="' . 
-							   helper::baseUrl(false) . 
-							   'site/file/source/' . 
-							   $this->getData(['module', $this->getUrl(0), 'file']) . 
-							   '"></iframe>' ,
+				'content' => $this->getData(['module', $this->getUrl(0), 'file']),
 				'state' => true
 			]);
 		}