From 2c61f2a0b74181b5c7e2d0b7b6a7aeb3c7cc863b Mon Sep 17 00:00:00 2001 From: Fred <23246457+fredtempez@users.noreply.github.com> Date: Sun, 16 Aug 2020 10:57:52 +0200 Subject: [PATCH 1/4] Add files via upload --- site/file/source/icones/loupe.png | Bin 0 -> 1577 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 site/file/source/icones/loupe.png diff --git a/site/file/source/icones/loupe.png b/site/file/source/icones/loupe.png new file mode 100644 index 0000000000000000000000000000000000000000..c0aec15fc4d0b4eea509a4d5c8e62614da977d4e GIT binary patch literal 1577 zcmV+^2G;qBP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=KZlH4c^hW~Sl905rPiQ`~Cs&a!peqONK(>;^j zB(?izs~XCHg)D>~LC=Ko*Y_E|p-{;jlA7m|b3{oc6|NX~JWJUv#kAY=u61lZUCVL7ubwoa5YGO&Jl* zS4Qn%)58oD4}@IyXBpM-D8{yHLG@T;1M(hQJWv}IVnlofO4O;+q_O)(4K5}gZ0MOA z%a*wq7jCjRrB!LNNs$hMER9DHftYV!Xs=uLdJS3MV<)IG!5HC_zpde)CjX>{Iok>m zMZaSOzj);}+*ssR3oQVld2!Pn;77gi$EW;3s)C^IFgrF_<8hielsBBx)y`cyu8E$z zb?>FuL1Eyg7-{Ip!-kJC>O`(hnQ7|G)27cd>rL&V`lbE>HM*$rCbjhJrUq#+dzheg zo#;X@VX#Q>gHuN_1HuN_1HuN_1HuV2D zBolu;;Gfv=1D1WAO)aQibpQYXg=s@WP)S2WAaHVTW@&6?004NLeUUv#!%!53PgA8u zDhhTG>5!r7VnI~IQL9jd3ZYhL)xqSYf6$~MX>oBBTni5VELI&{oON|@6$HT_5GO|` zMHeaYzNFA1#s`=8ao#(J`|bmTMww|=*Epc*RWp@{i<#`I7q&)-|u2P%lqD+t5?lg4DgA>v&=B7#2duZn^lAJK5>{8WtI4xc+8{*i66PHxctVs z;IP0m!)7`)PaGx|3mvRWF%8f*2*Ul_{iE6ZG`iXeeS zEJ1<@1vQjVMinvIby6&(=sfP>A9DN>xfF7hz{s(H3N*-$AN&t~&(_LMPPj>-IMDrK z+aJR~U>9iCZTtJ!wwot_{~5T_+x|)enE52V-qxZ=K;JfSaoyIGJ>YT&7<@8hQ+6aj zm5|Q^?`QN)SzzE6=vi~;);h=O1CXX!C2xR(Ltvyp+3Ozf4tCD%-#e}O{QzNZa-cif zh~@wQ00v@9M??Vs0RI60puMM)00009a7bBm000XU000XU0RWnu7ytkO2XskIMF->v z5C|MKpT8%p0003nNklnJ8B$K{QzL{@kI&bRSzZIYZB)}4Qmo8=N{3LJ#xCe6f zOAe$!qe}3Zf^2|Wpa+~t`@kKL2{SX1D06@ppj&{8ft9eSrRTXa?*`ywRgwdzAq0ss zN(>dJ@|lEyp9MZQ5cK7<2m!AJZtDFJn3tSe@>%bTTPxuFbk0$7HjU`6MLmPhpsYoH z1yemQ40-La50){_fH(ku25jZiwvOGZh(y6(tz+$gy0+tE}q@umIk)uAdaR?cu0Q5}3&4HfmP$NXq00000NkvXXu0mjfMpNnL literal 0 HcmV?d00001 From 707397f3ec7db3dc498fa7ff9cb6aed4c84164d7 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Fri, 21 Aug 2020 18:01:55 +0200 Subject: [PATCH 2/4] 10.2.07 bug flatpickr dans le module formulaire --- CHANGES.md | 6 +++++- module/form/form.php | 10 ++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index e698931e..b6bd1bbf 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,9 +1,13 @@ # Changelog +## version 10.2.07 +- Correction : + - Défaut de chargement de flatpickr dans le module formulaire qui passe en version 2.4 + ## version 10.2.06 - Corrections : - Anticipation de la dépréciation de l'option de cookie samesite=none. - - Warning : absence de fichier map dans le thème TinyMCE lightgray + - Warning : absence de fichier map dans le thème TinyMCE lightgray. ## version 10.2.05 - Correction : diff --git a/module/form/form.php b/module/form/form.php index 2784ebdf..19918a4d 100755 --- a/module/form/form.php +++ b/module/form/form.php @@ -32,7 +32,7 @@ class form extends common { public static $pagination; - const FORM_VERSION = '2.3'; + const FORM_VERSION = '2.4'; // Objets const TYPE_MAIL = 'mail'; @@ -382,7 +382,10 @@ class form extends common { $this->addOutput([ 'notification' => ($sent === true ? 'Formulaire soumis' : $sent), 'redirect' => $redirect ? helper::baseUrl() . $redirect : '', - 'state' => ($sent === true ? true : null) + 'state' => ($sent === true ? true : null), + 'vendor' => [ + 'flatpickr' + ], ]); } // Valeurs en sortie @@ -390,6 +393,9 @@ class form extends common { 'showBarEditButton' => true, 'showPageContent' => true, 'view' => 'index', + 'vendor' => [ + 'flatpickr' + ], ]); } } From 4e88ec43adcfd9258603a2b8ea8181dba279f565 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Fri, 21 Aug 2020 18:35:07 +0200 Subject: [PATCH 3/4] =?UTF-8?q?10.2.07=20Num=C3=A9rotation=20de=20la=20ver?= =?UTF-8?q?sion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- core/core.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f427f44d..fd806728 100755 --- a/README.md +++ b/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.2.06 +# ZwiiCMS 10.2.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. diff --git a/core/core.php b/core/core.php index c7e34b24..219210ef 100755 --- a/core/core.php +++ b/core/core.php @@ -39,7 +39,7 @@ class common { const ACCESS_TIMER = 1800; // Numéro de version - const ZWII_VERSION = '10.2.06'; + const ZWII_VERSION = '10.2.07'; const ZWII_UPDATE_CHANNEL = "v10"; public static $actions = []; From 34f0f8ff0dc4271e7feabe59d14ed1e5bc055217 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Sat, 22 Aug 2020 10:48:03 +0200 Subject: [PATCH 4/4] 10.2.08 bug pageId --- CHANGES.md | 4 ++++ README.md | 2 +- core/core.php | 2 +- core/module/page/page.php | 7 ++++++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index b6bd1bbf..690a500b 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,9 @@ # Changelog +## version 10.2.08 +- Correction : + - Bug pageId, régression corrigée. + ## version 10.2.07 - Correction : - Défaut de chargement de flatpickr dans le module formulaire qui passe en version 2.4 diff --git a/README.md b/README.md index fd806728..77cd7536 100755 --- a/README.md +++ b/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.2.07 +# ZwiiCMS 10.2.08 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. diff --git a/core/core.php b/core/core.php index 219210ef..a3f31036 100755 --- a/core/core.php +++ b/core/core.php @@ -39,7 +39,7 @@ class common { const ACCESS_TIMER = 1800; // Numéro de version - const ZWII_VERSION = '10.2.07'; + const ZWII_VERSION = '10.2.08'; const ZWII_UPDATE_CHANNEL = "v10"; public static $actions = []; diff --git a/core/module/page/page.php b/core/module/page/page.php index 0afd8acd..f409058e 100755 --- a/core/module/page/page.php +++ b/core/module/page/page.php @@ -184,7 +184,12 @@ class page extends common { else { // Soumission du formulaire if($this->isPost()) { - $pageId = $this->getInput('pageEditTitle', helper::FILTER_ID, true); + // Génére l'ID si le titre de la page a changé + if ( $this->getInput('pageEditTitle') !== $this->getData(['page',$this->getUrl(2),'title']) ) { + $pageId = $this->getInput('pageEditTitle', helper::FILTER_ID, true); + } else { + $pageId = $this->getUrl(2); + } // un dossier existe du même nom (erreur en cas de redirection) if (file_exists($pageId)) { $pageId = uniqid($pageId);