From ec2be096ecb4b181d58c3d11dbc83375ee570f67 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Wed, 11 Dec 2019 20:38:27 +0100 Subject: [PATCH 1/6] [10.0.008.dev] notification d'import --- core/core.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/core.php b/core/core.php index d3b2ccec..ae9f25fe 100644 --- a/core/core.php +++ b/core/core.php @@ -34,7 +34,7 @@ class common { const TEMP_DIR = 'site/tmp/'; // Numéro de version - const ZWII_VERSION = '10.0.007.dev'; + const ZWII_VERSION = '10.0.008.dev'; public static $actions = []; public static $coreModuleIds = [ @@ -2527,6 +2527,10 @@ class layout extends common { * Affiche la notification */ public function showNotification() { + if (common::$importNotices) { + $notification = common::$importNotices [0]; + $notificationClass = 'notificationSuccess'; + } if(common::$inputNotices) { $notification = 'Impossible de soumettre le formulaire, car il contient des erreurs'; $notificationClass = 'notificationError'; From f51c04b3550dddac3ec76631c9cc8c9b814f448f Mon Sep 17 00:00:00 2001 From: fredtempez Date: Wed, 11 Dec 2019 21:56:18 +0100 Subject: [PATCH 2/6] =?UTF-8?q?[10.0.009.dev]=20=C3=A9viter=20les=20erreur?= =?UTF-8?q?s=20de=20stockage=20des=20v9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/core/core.php b/core/core.php index ae9f25fe..b27fbde0 100644 --- a/core/core.php +++ b/core/core.php @@ -34,7 +34,7 @@ class common { const TEMP_DIR = 'site/tmp/'; // Numéro de version - const ZWII_VERSION = '10.0.008.dev'; + const ZWII_VERSION = '10.0.009.dev'; public static $actions = []; public static $coreModuleIds = [ @@ -538,18 +538,21 @@ class common { if (!file_exists(self::DATA_DIR . '/fr')) { mkdir (self::DATA_DIR . '/fr'); } + + // Un seul fichier pour éviter les erreurs de sauvegarde des v9 + $tempData = array_merge($tempData,$tempTheme); + // Ecriture des données $this->setData(['config',$tempData['config']]); $this->setData(['core',$tempData['core']]); $this->setData(['page',$tempData['page']]); - // Import des modules - $this->setData(['module',$tempData['module']]); + $this->setData(['module',$tempData['module']]); + $this->setData(['theme',$tempData['theme']]); + // Import des users sauvegardés si option active if ($keepUsers === false) { $this->setData(['user',$tempData['user']]); } - // Import du theme - $this->setData(['theme',$tempTheme['theme']]); // Nettoyage du fichier de thème pour forcer une régénération if (file_exists(self::DATA_DIR . '/theme.css')) { // On ne sait jamais From 933fd1be521919191a7cd105699ea82c2e88e020 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Wed, 11 Dec 2019 22:42:05 +0100 Subject: [PATCH 3/6] =?UTF-8?q?[10.0.010.dev]=20Libell=C3=A9s=20+=20s?= =?UTF-8?q?=C3=A9lection=20homepageId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/module/config/config.php | 2 +- core/module/config/view/index/index.php | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/core/module/config/config.php b/core/module/config/config.php index 869b46e2..8bd986aa 100755 --- a/core/module/config/config.php +++ b/core/module/config/config.php @@ -373,6 +373,7 @@ class config extends common { $this->setData([ 'config', [ + 'homePageId' => $this->getInput('configHomePageId', helper::FILTER_ID, true), 'analyticsId' => $this->getInput('configAnalyticsId'), 'autoBackup' => $this->getInput('configAutoBackup', helper::FILTER_BOOLEAN), 'maintenance' => $this->getInput('configMaintenance', helper::FILTER_BOOLEAN), @@ -392,7 +393,6 @@ class config extends common { 'legalPageId' => $this->getInput('configLegalPageId'), 'metaDescription' => $this->getInput('configMetaDescription', helper::FILTER_STRING_LONG, true), 'title' => $this->getInput('configTitle', helper::FILTER_STRING_SHORT, true), - 'googTransLogo' => $this->getInput('configdGoogTransLogo', helper::FILTER_BOOLEAN), 'autoUpdate' => $this->getInput('configAutoUpdate', helper::FILTER_BOOLEAN) ] ]); diff --git a/core/module/config/view/index/index.php b/core/module/config/view/index/index.php index d6f1da76..c581219a 100755 --- a/core/module/config/view/index/index.php +++ b/core/module/config/view/index/index.php @@ -27,22 +27,21 @@
getData(['page']), 'title', 'SORT_ASC'), [ 'label' => 'Page d\'accueil', - 'selected' =>$this->getData(['config', 'homePageId']), - 'help' => 'La page d\'accueil doit être définie dans une des pages de la langue sélectionnée' + 'selected' =>$this->getData(['config', 'homePageId']) ]); ?>
'Titre du site', 'value' => $this->getData(['config', 'title']), - 'help' => 'Il apparaît dans la barre de titre et les partages sur les réseaux sociaux.' + 'help' => 'Le titre apparaît dans la barre de titre et les partages sur les réseaux sociaux.' ]); ?>
'Description du site', 'value' => $this->getData(['config', 'metaDescription']), - 'help' => 'Elle apparaît dans les partages sur les réseaux sociaux.' + 'help' => 'La description apparaît dans les partages sur les réseaux sociaux.' ]); ?> @@ -108,7 +107,7 @@
$this->getData(['config', 'autoUpdate']), - 'help' => 'Vérifie une fois par jour l\'existence d\'une mise à jour.' + 'help' => 'Vérification quotidiene des mises à jour.' ]); ?>
From ab26ff2cec021b11e1b242e2eacf2ca01062cd14 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Wed, 11 Dec 2019 22:42:35 +0100 Subject: [PATCH 4/6] (10.0.010.dev] version --- core/core.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core.php b/core/core.php index b27fbde0..4da46a70 100644 --- a/core/core.php +++ b/core/core.php @@ -34,7 +34,7 @@ class common { const TEMP_DIR = 'site/tmp/'; // Numéro de version - const ZWII_VERSION = '10.0.009.dev'; + const ZWII_VERSION = '10.0.010.dev'; public static $actions = []; public static $coreModuleIds = [ From 623355c5550f6551862369d5919df42696a4fb32 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Wed, 11 Dec 2019 22:46:07 +0100 Subject: [PATCH 5/6] =?UTF-8?q?Libell=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/module/config/view/index/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/module/config/view/index/index.php b/core/module/config/view/index/index.php index c581219a..1af96b4a 100755 --- a/core/module/config/view/index/index.php +++ b/core/module/config/view/index/index.php @@ -107,7 +107,7 @@
$this->getData(['config', 'autoUpdate']), - 'help' => 'Vérification quotidiene des mises à jour.' + 'help' => 'Vérification quotidienne des mises à jour.' ]); ?>
From 59c79f71cd840193389aca1a1dca9cbdad495056 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Wed, 11 Dec 2019 22:53:11 +0100 Subject: [PATCH 6/6] [10.0.011.dev] supprimer update v8 --- core/core.php | 71 ++------------------------------------------------- 1 file changed, 2 insertions(+), 69 deletions(-) diff --git a/core/core.php b/core/core.php index 4da46a70..3dc6df27 100644 --- a/core/core.php +++ b/core/core.php @@ -34,7 +34,7 @@ class common { const TEMP_DIR = 'site/tmp/'; // Numéro de version - const ZWII_VERSION = '10.0.010.dev'; + const ZWII_VERSION = '10.0.011.dev'; public static $actions = []; public static $coreModuleIds = [ @@ -890,74 +890,7 @@ class common { * Mises à jour */ private function update() { - // Version 8.1.0 - if($this->getData(['core', 'dataVersion']) < 810) { - $this->setData(['config', 'timezone', 'Europe/Paris']); - $this->setData(['core', 'dataVersion', 810]); - //$this->SaveData(); - } - // Version 8.2.0 - if($this->getData(['core', 'dataVersion']) < 820) { - $this->setData(['theme', 'body', 'backgroundColor', 'rgba(236, 239, 241, 1)']); - $this->setData(['theme', 'site', 'backgroundColor', 'rgba(255, 255, 255, 1)']); - $this->setData(['theme', 'text', 'fontSize', '13px']); - $this->setData(['theme', 'text', 'textColor', 'rgba(33, 34, 35, 1)']); - $this->setData(['theme', 'menu', 'fontSize', '1em']); - $this->setData(['theme', 'menu', 'textColor', 'rgba(255, 255, 255, 1)']); - $this->setData(['theme', 'header', 'fontSize', '2em']); - $this->setData(['theme', 'footer', 'textColor', 'rgba(33, 34, 35, 1)']); - $this->setData(['core', 'dataVersion', 820]); - //$this->SaveData(); - } - // Version 8.2.2 - if($this->getData(['core', 'dataVersion']) < 822) { - $this->setData(['config', 'maintenance', false]); - $this->setData(['core', 'dataVersion', 822]); - //$this->SaveData(); - } - // Version 8.2.6 - if($this->getData(['core', 'dataVersion']) < 826) { - $this->setData(['theme','header','linkHome',true]); - $this->setData(['core', 'dataVersion', 826]); - //$this->SaveData(); - } - // Version 8.3.1 - if($this->getData(['core', 'dataVersion']) < 831) { - $this->setData(['theme','header','imageContainer','auto']); - $this->setData(['core', 'dataVersion', 831]); - //$this->SaveData(); - } - - // Version 8.4.0 - if($this->getData(['core', 'dataVersion']) < 840) { - $this->setData(['config','itemsperPage',10]); - $this->setData(['core', 'dataVersion', 840]); - //$this->SaveData(); - } - // Version 8.4.4 - if($this->getData(['core', 'dataVersion']) < 844) { - $this->setData(['core', 'dataVersion', 844]); - //$this->SaveData(); - } - // Version 8.4.6 - if($this->getData(['core', 'dataVersion']) < 846) { - $this->setData(['config','itemsperPage',10]); - $this->setData(['core', 'dataVersion', 846]); - //$this->SaveData(); - } - // Version 8.5.0 - if($this->getData(['core', 'dataVersion']) < 850) { - $this->setData(['theme','menu','font','Open+Sans']); - $this->setData(['core', 'dataVersion', 850]); - //$this->SaveData(); - } - // Version 8.5.1 - if($this->getData(['core', 'dataVersion']) < 851) { - $this->setData(['config','itemsperPage',10]); - $this->deleteData(['config','ItemsperPage']); - $this->setData(['core', 'dataVersion', 851]); - //$this->SaveData(); - } + // Version 9.0.0 if($this->getData(['core', 'dataVersion']) < 9000) { $this->deleteData(['theme', 'site', 'block']);