From 5bb453739c5625fec83c8727d1a8439fc633223a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Mon, 28 Mar 2022 19:07:44 +0200
Subject: [PATCH 1/4] remove gallery unique du theme

---
 module/gallery/view/theme/theme.php | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/module/gallery/view/theme/theme.php b/module/gallery/view/theme/theme.php
index 456f32b0..cf087c5d 100644
--- a/module/gallery/view/theme/theme.php
+++ b/module/gallery/view/theme/theme.php
@@ -11,23 +11,6 @@
         <?php echo template::submit('galleryThemeBack'); ?>
     </div>
 </div>
-<div class="row">
-    <div class="col12">
-        <div class="block">
-            <h4>Galerie unique</h4>
-            <div class="row">
-                <div class="col12 verticalAlignBottom">
-                    <?php echo template::checkbox('galleryThemeShowUniqueGallery', true, 'Masquer l\'index des galeries lorsque le module ne contient qu\'une galerie' , [
-                                'checked' => count($this->getData(['module', $this->getUrl(0), 'content'])) === 1
-                                                ? $this->getData(['module', $this->getUrl(0), 'theme', 'showUniqueGallery'])
-                                                : false,
-                                'disabled' => count($this->getData(['module', $this->getUrl(0), 'content'])) > 1
-                        ]); ?>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
 <div class="row">
     <div class="col12">
         <div class="block">

From 2f45c1d0c3bf827a279931f15825806afb409e7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Mon, 28 Mar 2022 19:09:55 +0200
Subject: [PATCH 2/4] =?UTF-8?q?format=20des=20ic=C3=B4nes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/gallery/view/config/config.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/module/gallery/view/config/config.php b/module/gallery/view/config/config.php
index 204fdc9c..d80038c3 100644
--- a/module/gallery/view/config/config.php
+++ b/module/gallery/view/config/config.php
@@ -10,22 +10,19 @@
 	<div class="col1 offset7">
 		<?php echo template::button('galleryConfigOption', [
 			'href' => helper::baseUrl() . $this->getUrl(0) . '/option/' . $_SESSION['csrf'],
-			'value' => '',
-			'ico' => 'sliders',
+			'value' => template::ico('sliders')
 		]); ?>
 	</div>
 	<div class="col1">
 		<?php echo template::button('galleryConfigTheme', [
 			'href' => helper::baseUrl() . $this->getUrl(0) . '/theme/' . $_SESSION['csrf'],
-			'value' => '',
-			'ico' => 'brush',
+			'value' => template::ico('brush')
 		]); ?>
 	</div>
 	<div class="col1">
 		<?php echo template::button('galleryAdd', [
-			'ico' => '',
-			'value' => template::ico('plus'),
 			'href' => helper::baseUrl() . $this->getUrl(0) . '/add/',
+			'value' => template::ico('plus')
 		]); ?>
 	</div>
 </div>

From aff2dce49641af5dbea61eb24d1a76b79fb845e6 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Tue, 29 Mar 2022 13:07:12 +0200
Subject: [PATCH 3/4] gerpage : supprime un test inutile

---
 core/core.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/core.php b/core/core.php
index a9015382..6929e7ca 100644
--- a/core/core.php
+++ b/core/core.php
@@ -553,7 +553,6 @@ class common {
 		if (
 				$this->getData(['page', $page, 'content']) !== ''
 				&& file_exists(self::DATA_DIR . $lang . '/content/' . $this->getData(['page', $page, 'content']))
-				&& is_file(self::DATA_DIR . $lang . '/content/' . $this->getData(['page', $page, 'content']))
 			) {
 				return file_get_contents(self::DATA_DIR . $lang . '/content/' . $this->getData(['page', $page, 'content']));
 			} else {

From 2b02e058c479c0967738013e9d730f4a2d35a845 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Tue, 29 Mar 2022 13:07:31 +0200
Subject: [PATCH 4/4] =?UTF-8?q?Met=20=C3=A0=20jour=20les=20URL=20absolues?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/include/update.inc.php | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/core/include/update.inc.php b/core/include/update.inc.php
index 153a9d3d..731798da 100644
--- a/core/include/update.inc.php
+++ b/core/include/update.inc.php
@@ -949,7 +949,6 @@ if ($this->getData(['core', 'dataVersion']) < 11400) {
 		}
 	}
 
-
 	// Rafraichir les thèmes
 	if (file_exists(self::DATA_DIR . 'admin.css')) {
 		unlink (self::DATA_DIR . 'admin.css');
@@ -958,6 +957,26 @@ if ($this->getData(['core', 'dataVersion']) < 11400) {
 		unlink (self::DATA_DIR . 'theme.css');
 	}
 
+	// Transforme les URL en références relatives
+	$baseUrl = $this->getData(['core', 'baseUrl']);
+	$baseUrl2 = str_replace('?', '', $baseUrl);
+	foreach ($this->getHierarchy(null,null,null) as $parentKey=>$parentValue) {
+		$pageList [] = $parentKey;
+		foreach ($parentValue as $childKey) {
+			$pageList [] = $childKey;
+		}
+	}
+	foreach ($pageList as $parentKey => $parent) {
+		$s = $this->getPage(  $parent, self::$i18n);
+		// Suppression des sous-dossiers
+		$s = str_replace ($baseUrl, './', $s);
+		$s = str_replace ($baseUrl2, './', $s);
+		$this->setPage( $parent, $s, self::$i18n);
+	}
+
+	// Suppression de la variable URL dans core
+	//$this->deleteData(['core', 'baseUrl']);
+
 	// Mise à jour
 	$this->setData(['core', 'dataVersion', 11400]);
 }
\ No newline at end of file