From 0bf94567bf0e9115a99e047e92ec5302aa887bab Mon Sep 17 00:00:00 2001 From: fredtempez Date: Wed, 17 Feb 2021 13:49:58 +0100 Subject: [PATCH 01/18] =?UTF-8?q?Copyright=20ann=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 5 +++++ core/core.js.php | 5 +++-- core/core.php | 4 ++-- core/layout/blank.css | 5 +++-- core/layout/common.css | 5 +++-- core/layout/light.css | 5 +++-- core/module/addon/addon.php | 2 +- core/module/addon/view/index/index.css | 2 +- core/module/addon/view/index/index.js.php | 5 +++-- core/module/config/config.php | 2 +- core/module/config/view/advanced/advanced.css | 2 +- core/module/config/view/advanced/advanced.js.php | 2 +- core/module/config/view/backup/backup.css | 2 +- core/module/config/view/backup/backup.js.php | 2 +- core/module/config/view/index/index.css | 2 +- core/module/config/view/manage/manage.css | 2 +- core/module/config/view/script/script.css | 2 +- core/module/install/install.php | 5 +++-- core/module/install/view/index/index.js.php | 5 +++-- core/module/install/view/update/update.css | 2 +- core/module/maintenance/maintenance.php | 5 +++-- core/module/page/page.php | 2 +- core/module/page/view/edit/edit.css | 2 +- core/module/page/view/edit/edit.js.php | 2 +- core/module/sitemap/sitemap.php | 5 +++-- core/module/theme/theme.php | 2 +- core/module/theme/view/admin/admin.css | 2 +- core/module/theme/view/advanced/advanced.css | 2 +- core/module/theme/view/advanced/advanced.js.php | 5 +++-- core/module/theme/view/body/body.css | 2 +- core/module/theme/view/body/body.js.php | 5 +++-- core/module/theme/view/footer/footer.css | 2 +- core/module/theme/view/footer/footer.js.php | 2 +- core/module/theme/view/header/header.css | 2 +- core/module/theme/view/header/header.js.php | 2 +- core/module/theme/view/index/index.css | 5 +++-- core/module/theme/view/index/index.js.php | 5 +++-- core/module/theme/view/manage/manage.css | 2 +- core/module/theme/view/manage/manage.js.php | 5 +++-- core/module/theme/view/menu/menu.css | 2 +- core/module/theme/view/menu/menu.js.php | 5 +++-- core/module/theme/view/site/site.css | 2 +- core/module/theme/view/site/site.js.php | 5 +++-- core/module/translate/translate.php | 5 +++-- core/module/translate/view/index/index.css | 2 +- core/module/user/user.php | 5 +++-- core/module/user/view/add/add.css | 2 +- core/module/user/view/add/add.js.php | 5 +++-- core/module/user/view/edit/edit.css | 2 +- core/module/user/view/edit/edit.js.php | 5 +++-- core/module/user/view/import/import.css | 2 +- core/module/user/view/index/index.css | 2 +- core/module/user/view/index/index.js.php | 5 +++-- core/module/user/view/reset/reset.css | 2 +- index.php | 2 +- module/blog/blog.php | 5 +++-- module/blog/view/add/add.css | 2 +- module/blog/view/add/add.js.php | 5 +++-- module/blog/view/article/article.js.php | 5 +++-- module/blog/view/comment/comment.css | 2 +- module/blog/view/comment/comment.js.php | 5 +++-- module/blog/view/config/config.css | 2 +- module/blog/view/config/config.js.php | 5 +++-- module/blog/view/edit/edit.css | 2 +- module/blog/view/edit/edit.js.php | 5 +++-- module/form/form.php | 4 ++-- module/form/view/config/config.css | 2 +- module/form/view/config/config.js.php | 5 +++-- module/form/view/data/data.css | 2 +- module/form/view/data/data.js.php | 5 +++-- module/gallery/gallery.php | 2 +- module/gallery/view/config/config.css | 2 +- module/gallery/view/config/config.js.php | 2 +- module/gallery/view/edit/edit.css | 2 +- module/gallery/view/edit/edit.js.php | 5 +++-- module/gallery/view/gallery/gallery.js.php | 2 +- module/gallery/view/theme/theme.css | 2 +- module/news/news.php | 5 +++-- module/news/view/add/add.css | 2 +- module/news/view/add/add.js.php | 5 +++-- module/news/view/config/config.css | 2 +- module/news/view/config/config.js.php | 5 +++-- module/news/view/edit/edit.js.php | 5 +++-- module/news/view/index/index.css | 2 +- module/redirection/redirection.php | 5 +++-- module/redirection/view/config/config.css | 2 +- module/redirection/view/index/index.css | 2 +- module/search/search.php | 2 +- module/search/view/config/config.css | 2 +- 89 files changed, 165 insertions(+), 125 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index d0afe0c9..74f586fa 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,10 @@ # Changelog +## version 10.5.00 +- Modifications : + - Gestion des module dans l'interface d'administration. + - à compléter.. + ## version 10.4.03 - Corrections : - En-tête html : absence de la langue. diff --git a/core/core.js.php b/core/core.js.php index 09bfb0dd..869cd52c 100755 --- a/core/core.js.php +++ b/core/core.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/core.php b/core/core.php index 728c4ea3..840a8497 100755 --- a/core/core.php +++ b/core/core.php @@ -7,9 +7,9 @@ * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean - * @license GNU General Public License, version 3 * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez + * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/layout/blank.css b/core/layout/blank.css index b0bb2187..fed98888 100755 --- a/core/layout/blank.css +++ b/core/layout/blank.css @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/layout/common.css b/core/layout/common.css index 3a7f49da..adec27a8 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/layout/light.css b/core/layout/light.css index 5ea840d3..ff248b7b 100755 --- a/core/layout/light.css +++ b/core/layout/light.css @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/addon/addon.php b/core/module/addon/addon.php index 402d96f7..eecbc3e4 100644 --- a/core/module/addon/addon.php +++ b/core/module/addon/addon.php @@ -9,7 +9,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/addon/view/index/index.css b/core/module/addon/view/index/index.css index 805e9150..5a91e7a7 100644 --- a/core/module/addon/view/index/index.css +++ b/core/module/addon/view/index/index.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/addon/view/index/index.js.php b/core/module/addon/view/index/index.js.php index 222b85a1..65ddb98d 100644 --- a/core/module/addon/view/index/index.js.php +++ b/core/module/addon/view/index/index.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/config/config.php b/core/module/config/config.php index c60dc090..7665cfd7 100755 --- a/core/module/config/config.php +++ b/core/module/config/config.php @@ -9,7 +9,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/config/view/advanced/advanced.css b/core/module/config/view/advanced/advanced.css index fc8f1ca2..fdc5d676 100644 --- a/core/module/config/view/advanced/advanced.css +++ b/core/module/config/view/advanced/advanced.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/config/view/advanced/advanced.js.php b/core/module/config/view/advanced/advanced.js.php index 14354f54..cc6664e6 100644 --- a/core/module/config/view/advanced/advanced.js.php +++ b/core/module/config/view/advanced/advanced.js.php @@ -5,7 +5,7 @@ * file that was distributed with this source code. * * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/config/view/backup/backup.css b/core/module/config/view/backup/backup.css index 01a06f8d..8796d11b 100755 --- a/core/module/config/view/backup/backup.css +++ b/core/module/config/view/backup/backup.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/config/view/backup/backup.js.php b/core/module/config/view/backup/backup.js.php index 90b38808..7e564b07 100755 --- a/core/module/config/view/backup/backup.js.php +++ b/core/module/config/view/backup/backup.js.php @@ -5,7 +5,7 @@ * file that was distributed with this source code. * * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/config/view/index/index.css b/core/module/config/view/index/index.css index 805e9150..5a91e7a7 100755 --- a/core/module/config/view/index/index.css +++ b/core/module/config/view/index/index.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/config/view/manage/manage.css b/core/module/config/view/manage/manage.css index 805e9150..5a91e7a7 100755 --- a/core/module/config/view/manage/manage.css +++ b/core/module/config/view/manage/manage.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/config/view/script/script.css b/core/module/config/view/script/script.css index 805e9150..5a91e7a7 100755 --- a/core/module/config/view/script/script.css +++ b/core/module/config/view/script/script.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/install/install.php b/core/module/install/install.php index e9fef5a2..d7c419c5 100755 --- a/core/module/install/install.php +++ b/core/module/install/install.php @@ -1,13 +1,14 @@ * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/install/view/index/index.js.php b/core/module/install/view/index/index.js.php index eef087dd..9f487c3a 100755 --- a/core/module/install/view/index/index.js.php +++ b/core/module/install/view/index/index.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/install/view/update/update.css b/core/module/install/view/update/update.css index 805e9150..5a91e7a7 100755 --- a/core/module/install/view/update/update.css +++ b/core/module/install/view/update/update.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/maintenance/maintenance.php b/core/module/maintenance/maintenance.php index 8840123b..cee861af 100755 --- a/core/module/maintenance/maintenance.php +++ b/core/module/maintenance/maintenance.php @@ -1,13 +1,14 @@ * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/page/page.php b/core/module/page/page.php index c8f57db4..f842e3da 100755 --- a/core/module/page/page.php +++ b/core/module/page/page.php @@ -9,7 +9,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/page/view/edit/edit.css b/core/module/page/view/edit/edit.css index f456dd05..3eed60ff 100755 --- a/core/module/page/view/edit/edit.css +++ b/core/module/page/view/edit/edit.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/page/view/edit/edit.js.php b/core/module/page/view/edit/edit.js.php index 941b24a0..c73b5f66 100755 --- a/core/module/page/view/edit/edit.js.php +++ b/core/module/page/view/edit/edit.js.php @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @authorFrédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/sitemap/sitemap.php b/core/module/sitemap/sitemap.php index 0d14ded4..f57e382d 100755 --- a/core/module/sitemap/sitemap.php +++ b/core/module/sitemap/sitemap.php @@ -1,13 +1,14 @@ * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index a3c1b137..c1441b26 100755 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -11,7 +11,7 @@ * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ * @copyright : Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez */ class theme extends common { diff --git a/core/module/theme/view/admin/admin.css b/core/module/theme/view/admin/admin.css index 08286440..4b233fe4 100755 --- a/core/module/theme/view/admin/admin.css +++ b/core/module/theme/view/admin/admin.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/theme/view/advanced/advanced.css b/core/module/theme/view/advanced/advanced.css index 805e9150..5a91e7a7 100755 --- a/core/module/theme/view/advanced/advanced.css +++ b/core/module/theme/view/advanced/advanced.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/theme/view/advanced/advanced.js.php b/core/module/theme/view/advanced/advanced.js.php index 464d93bb..b2a50fa7 100755 --- a/core/module/theme/view/advanced/advanced.js.php +++ b/core/module/theme/view/advanced/advanced.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/theme/view/body/body.css b/core/module/theme/view/body/body.css index 1a3509ef..8911d1f1 100755 --- a/core/module/theme/view/body/body.css +++ b/core/module/theme/view/body/body.css @@ -7,7 +7,7 @@ * @copyright Copyright (C) 2008-2018, Rémi Jean * @license GNU General Public License, version 3 * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @link http://zwiicms.fr/ */ diff --git a/core/module/theme/view/body/body.js.php b/core/module/theme/view/body/body.js.php index 19a42926..c2d4cdd9 100755 --- a/core/module/theme/view/body/body.js.php +++ b/core/module/theme/view/body/body.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/theme/view/footer/footer.css b/core/module/theme/view/footer/footer.css index 805e9150..5a91e7a7 100755 --- a/core/module/theme/view/footer/footer.css +++ b/core/module/theme/view/footer/footer.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/theme/view/footer/footer.js.php b/core/module/theme/view/footer/footer.js.php index 9b5e9c5c..da12b143 100755 --- a/core/module/theme/view/footer/footer.js.php +++ b/core/module/theme/view/footer/footer.js.php @@ -8,7 +8,7 @@ * @copyright Copyright (C) 2008-2018, Rémi Jean * @license GNU General Public License, version 3 * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @link http://zwiicms.fr/ */ diff --git a/core/module/theme/view/header/header.css b/core/module/theme/view/header/header.css index 9346d7ac..d2dafebe 100755 --- a/core/module/theme/view/header/header.css +++ b/core/module/theme/view/header/header.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/theme/view/header/header.js.php b/core/module/theme/view/header/header.js.php index 87a89cf2..3669bcb8 100755 --- a/core/module/theme/view/header/header.js.php +++ b/core/module/theme/view/header/header.js.php @@ -8,7 +8,7 @@ * @copyright Copyright (C) 2008-2018, Rémi Jean * @license GNU General Public License, version 3 * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @link http://zwiicms.fr/ */ diff --git a/core/module/theme/view/index/index.css b/core/module/theme/view/index/index.css index 809178d3..eb802426 100755 --- a/core/module/theme/view/index/index.css +++ b/core/module/theme/view/index/index.css @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/theme/view/index/index.js.php b/core/module/theme/view/index/index.js.php index 345e765e..1d5eaff3 100755 --- a/core/module/theme/view/index/index.js.php +++ b/core/module/theme/view/index/index.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/theme/view/manage/manage.css b/core/module/theme/view/manage/manage.css index 805e9150..5a91e7a7 100755 --- a/core/module/theme/view/manage/manage.css +++ b/core/module/theme/view/manage/manage.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/theme/view/manage/manage.js.php b/core/module/theme/view/manage/manage.js.php index 765a9662..99bc73c9 100755 --- a/core/module/theme/view/manage/manage.js.php +++ b/core/module/theme/view/manage/manage.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/theme/view/menu/menu.css b/core/module/theme/view/menu/menu.css index 805e9150..5a91e7a7 100755 --- a/core/module/theme/view/menu/menu.css +++ b/core/module/theme/view/menu/menu.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/theme/view/menu/menu.js.php b/core/module/theme/view/menu/menu.js.php index 891c6d58..c707fb66 100755 --- a/core/module/theme/view/menu/menu.js.php +++ b/core/module/theme/view/menu/menu.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/theme/view/site/site.css b/core/module/theme/view/site/site.css index 805e9150..5a91e7a7 100755 --- a/core/module/theme/view/site/site.css +++ b/core/module/theme/view/site/site.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/theme/view/site/site.js.php b/core/module/theme/view/site/site.js.php index 279dd85e..e5090081 100755 --- a/core/module/theme/view/site/site.js.php +++ b/core/module/theme/view/site/site.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/translate/translate.php b/core/module/translate/translate.php index 890e4d0a..c9a9f87e 100755 --- a/core/module/translate/translate.php +++ b/core/module/translate/translate.php @@ -1,13 +1,14 @@ * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/translate/view/index/index.css b/core/module/translate/view/index/index.css index 51a18ec5..88fe3629 100755 --- a/core/module/translate/view/index/index.css +++ b/core/module/translate/view/index/index.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/user/user.php b/core/module/user/user.php index 69c3580e..21e05cfd 100755 --- a/core/module/user/user.php +++ b/core/module/user/user.php @@ -1,13 +1,14 @@ * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/user/view/add/add.css b/core/module/user/view/add/add.css index 55e779b3..1ab3eefb 100755 --- a/core/module/user/view/add/add.css +++ b/core/module/user/view/add/add.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/user/view/add/add.js.php b/core/module/user/view/add/add.js.php index 6d797f0c..545fb77c 100755 --- a/core/module/user/view/add/add.js.php +++ b/core/module/user/view/add/add.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/user/view/edit/edit.css b/core/module/user/view/edit/edit.css index 805e9150..5a91e7a7 100755 --- a/core/module/user/view/edit/edit.css +++ b/core/module/user/view/edit/edit.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/user/view/edit/edit.js.php b/core/module/user/view/edit/edit.js.php index ad7e1087..d7ce4dc8 100755 --- a/core/module/user/view/edit/edit.js.php +++ b/core/module/user/view/edit/edit.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/user/view/import/import.css b/core/module/user/view/import/import.css index 2aa6edae..20dbdfe1 100755 --- a/core/module/user/view/import/import.css +++ b/core/module/user/view/import/import.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/user/view/index/index.css b/core/module/user/view/index/index.css index 805e9150..5a91e7a7 100755 --- a/core/module/user/view/index/index.css +++ b/core/module/user/view/index/index.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/user/view/index/index.js.php b/core/module/user/view/index/index.js.php index 53d5d62d..13e05743 100755 --- a/core/module/user/view/index/index.js.php +++ b/core/module/user/view/index/index.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/core/module/user/view/reset/reset.css b/core/module/user/view/reset/reset.css index 75723119..f422a347 100755 --- a/core/module/user/view/reset/reset.css +++ b/core/module/user/view/reset/reset.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/index.php b/index.php index 30ea149e..3e6b954b 100755 --- a/index.php +++ b/index.php @@ -9,7 +9,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/blog/blog.php b/module/blog/blog.php index e6843a1f..087505f4 100755 --- a/module/blog/blog.php +++ b/module/blog/blog.php @@ -1,13 +1,14 @@ * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/blog/view/add/add.css b/module/blog/view/add/add.css index 805e9150..5a91e7a7 100755 --- a/module/blog/view/add/add.css +++ b/module/blog/view/add/add.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/blog/view/add/add.js.php b/module/blog/view/add/add.js.php index 6067ca10..aacac9d9 100755 --- a/module/blog/view/add/add.js.php +++ b/module/blog/view/add/add.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/blog/view/article/article.js.php b/module/blog/view/article/article.js.php index 0d0fb3e9..b2e7e613 100755 --- a/module/blog/view/article/article.js.php +++ b/module/blog/view/article/article.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/blog/view/comment/comment.css b/module/blog/view/comment/comment.css index 805e9150..5a91e7a7 100755 --- a/module/blog/view/comment/comment.css +++ b/module/blog/view/comment/comment.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/blog/view/comment/comment.js.php b/module/blog/view/comment/comment.js.php index fc6f7aaa..f7bc30d0 100755 --- a/module/blog/view/comment/comment.js.php +++ b/module/blog/view/comment/comment.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/blog/view/config/config.css b/module/blog/view/config/config.css index 805e9150..5a91e7a7 100755 --- a/module/blog/view/config/config.css +++ b/module/blog/view/config/config.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/blog/view/config/config.js.php b/module/blog/view/config/config.js.php index df6138c0..156fb1b1 100755 --- a/module/blog/view/config/config.js.php +++ b/module/blog/view/config/config.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/blog/view/edit/edit.css b/module/blog/view/edit/edit.css index 805e9150..5a91e7a7 100755 --- a/module/blog/view/edit/edit.css +++ b/module/blog/view/edit/edit.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/blog/view/edit/edit.js.php b/module/blog/view/edit/edit.js.php index 96e2872a..503c99bd 100755 --- a/module/blog/view/edit/edit.js.php +++ b/module/blog/view/edit/edit.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/form/form.php b/module/form/form.php index fd66b16a..f8fea92a 100755 --- a/module/form/form.php +++ b/module/form/form.php @@ -9,7 +9,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ @@ -167,7 +167,7 @@ class form extends common { /** * Export CSV * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez */ public function export2csv() { // Jeton incorrect diff --git a/module/form/view/config/config.css b/module/form/view/config/config.css index 5ad89b08..c9c08e84 100755 --- a/module/form/view/config/config.css +++ b/module/form/view/config/config.css @@ -8,7 +8,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/form/view/config/config.js.php b/module/form/view/config/config.js.php index 37afae73..f0f985bd 100755 --- a/module/form/view/config/config.js.php +++ b/module/form/view/config/config.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/form/view/data/data.css b/module/form/view/data/data.css index 805e9150..5a91e7a7 100755 --- a/module/form/view/data/data.css +++ b/module/form/view/data/data.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/form/view/data/data.js.php b/module/form/view/data/data.js.php index 9fb2aafd..f4c0b2b2 100755 --- a/module/form/view/data/data.js.php +++ b/module/form/view/data/data.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php index e8526b7c..a99b62db 100755 --- a/module/gallery/gallery.php +++ b/module/gallery/gallery.php @@ -9,7 +9,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/gallery/view/config/config.css b/module/gallery/view/config/config.css index 8079fedb..b15a3331 100755 --- a/module/gallery/view/config/config.css +++ b/module/gallery/view/config/config.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/gallery/view/config/config.js.php b/module/gallery/view/config/config.js.php index f56117b3..ca2edf11 100755 --- a/module/gallery/view/config/config.js.php +++ b/module/gallery/view/config/config.js.php @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/gallery/view/edit/edit.css b/module/gallery/view/edit/edit.css index 805e9150..5a91e7a7 100755 --- a/module/gallery/view/edit/edit.css +++ b/module/gallery/view/edit/edit.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/gallery/view/edit/edit.js.php b/module/gallery/view/edit/edit.js.php index c36e08d7..97aa4fc3 100755 --- a/module/gallery/view/edit/edit.js.php +++ b/module/gallery/view/edit/edit.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/gallery/view/gallery/gallery.js.php b/module/gallery/view/gallery/gallery.js.php index d99980d2..0b7c46b9 100755 --- a/module/gallery/view/gallery/gallery.js.php +++ b/module/gallery/view/gallery/gallery.js.php @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/gallery/view/theme/theme.css b/module/gallery/view/theme/theme.css index 805e9150..5a91e7a7 100755 --- a/module/gallery/view/theme/theme.css +++ b/module/gallery/view/theme/theme.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/news/news.php b/module/news/news.php index d65c2860..2aec5e94 100755 --- a/module/news/news.php +++ b/module/news/news.php @@ -1,13 +1,14 @@ * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/news/view/add/add.css b/module/news/view/add/add.css index 805e9150..5a91e7a7 100755 --- a/module/news/view/add/add.css +++ b/module/news/view/add/add.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/news/view/add/add.js.php b/module/news/view/add/add.js.php index 77bb1442..34d682e6 100755 --- a/module/news/view/add/add.js.php +++ b/module/news/view/add/add.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/news/view/config/config.css b/module/news/view/config/config.css index 805e9150..5a91e7a7 100755 --- a/module/news/view/config/config.css +++ b/module/news/view/config/config.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/news/view/config/config.js.php b/module/news/view/config/config.js.php index 608f5324..1a75b6f8 100755 --- a/module/news/view/config/config.js.php +++ b/module/news/view/config/config.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/news/view/edit/edit.js.php b/module/news/view/edit/edit.js.php index ef1444ff..2b5a4ece 100755 --- a/module/news/view/edit/edit.js.php +++ b/module/news/view/edit/edit.js.php @@ -1,11 +1,12 @@ /** - * This file is part of Zwii. - * + * This file is part of Zwii. * * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/news/view/index/index.css b/module/news/view/index/index.css index d500e8fe..ba6dd269 100755 --- a/module/news/view/index/index.css +++ b/module/news/view/index/index.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/redirection/redirection.php b/module/redirection/redirection.php index 97a5e6ea..86a4765d 100755 --- a/module/redirection/redirection.php +++ b/module/redirection/redirection.php @@ -1,13 +1,14 @@ * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/redirection/view/config/config.css b/module/redirection/view/config/config.css index 805e9150..5a91e7a7 100755 --- a/module/redirection/view/config/config.css +++ b/module/redirection/view/config/config.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/redirection/view/index/index.css b/module/redirection/view/index/index.css index 805e9150..5a91e7a7 100755 --- a/module/redirection/view/index/index.css +++ b/module/redirection/view/index/index.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ diff --git a/module/search/search.php b/module/search/search.php index 7952edd8..fb1d22c7 100755 --- a/module/search/search.php +++ b/module/search/search.php @@ -9,7 +9,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @copyright Sylvain Lelièvre * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ diff --git a/module/search/view/config/config.css b/module/search/view/config/config.css index 9346d7ac..d2dafebe 100755 --- a/module/search/view/config/config.css +++ b/module/search/view/config/config.css @@ -7,7 +7,7 @@ * @author Rémi Jean * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez - * @copyright Copyright (C) 2018-2020, Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ From 75539e2ef1fc09e961e1c42d11e731876732181f Mon Sep 17 00:00:00 2001 From: fredtempez Date: Wed, 17 Feb 2021 13:51:12 +0100 Subject: [PATCH 02/18] Copyright encore --- core/core.js.php | 2 +- core/core.php | 2 +- core/layout/blank.css | 2 +- core/layout/common.css | 2 +- core/layout/light.css | 2 +- core/module/addon/view/index/index.js.php | 2 +- core/module/install/install.php | 2 +- core/module/install/view/index/index.js.php | 2 +- core/module/maintenance/maintenance.php | 2 +- core/module/sitemap/sitemap.php | 2 +- core/module/theme/view/advanced/advanced.js.php | 2 +- core/module/theme/view/body/body.css | 2 +- core/module/theme/view/body/body.js.php | 2 +- core/module/theme/view/index/index.css | 2 +- core/module/theme/view/index/index.js.php | 2 +- core/module/theme/view/manage/manage.js.php | 2 +- core/module/theme/view/menu/menu.js.php | 2 +- core/module/theme/view/site/site.js.php | 2 +- core/module/translate/translate.php | 2 +- core/module/user/user.php | 2 +- core/module/user/view/add/add.js.php | 2 +- core/module/user/view/edit/edit.js.php | 2 +- core/module/user/view/index/index.js.php | 2 +- module/blog/blog.php | 2 +- module/blog/view/add/add.js.php | 2 +- module/blog/view/article/article.js.php | 2 +- module/blog/view/comment/comment.js.php | 2 +- module/blog/view/config/config.js.php | 2 +- module/blog/view/edit/edit.js.php | 2 +- module/form/view/config/config.js.php | 2 +- module/form/view/data/data.js.php | 2 +- module/gallery/view/edit/edit.js.php | 2 +- module/news/news.php | 2 +- module/news/view/add/add.js.php | 2 +- module/news/view/config/config.js.php | 2 +- module/news/view/edit/edit.js.php | 2 +- module/redirection/redirection.php | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/core/core.js.php b/core/core.js.php index 869cd52c..456cd067 100755 --- a/core/core.js.php +++ b/core/core.js.php @@ -1,5 +1,5 @@ /** - * This file is part of Zwii. * + * This file is part of Zwii. * For full copyright and license information, please see the LICENSE * file that was distributed with this source code. * diff --git a/core/core.php b/core/core.php index 840a8497..5d760b11 100755 --- a/core/core.php +++ b/core/core.php @@ -1,7 +1,7 @@ Date: Wed, 17 Feb 2021 14:16:58 +0100 Subject: [PATCH 03/18] =?UTF-8?q?Effacement=20autoris=C3=A9=20si=20DELETE?= =?UTF-8?q?=20=3D=20TRUE=20OU=20NON=20DEFINI=20et=20module=20pas=20mis=20e?= =?UTF-8?q?n=20oeuvre?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/module/addon/addon.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/module/addon/addon.php b/core/module/addon/addon.php index eecbc3e4..1dd4d8ea 100644 --- a/core/module/addon/addon.php +++ b/core/module/addon/addon.php @@ -84,7 +84,8 @@ class addon extends common { $infoModules[$key]['realName'], $infoModules[$key]['version'], implode(', ', array_keys($inPagesTitle,$key)), - array_key_exists('delete',$infoModules[$key]) && $infoModules[$key]['delete'] === true && implode(', ',array_keys($inPages,$key)) ==='' + //array_key_exists('delete',$infoModules[$key]) && $infoModules[$key]['delete'] === true && implode(', ',array_keys($inPages,$key)) === '' + ($infoModules[$key]['delete'] === false || $infoModules[$key]['delete'] !== false ) && implode(', ',array_keys($inPages,$key)) === '' ? template::button('moduleDelete' . $key, [ 'class' => 'moduleDelete buttonRed', 'href' => helper::baseUrl() . $this->getUrl(0) . '/moduleDelete/' . $key . '/' . $_SESSION['csrf'], From 1eb994368ef1bc12c259a33fe3dd1ea5fe8a22e1 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Wed, 17 Feb 2021 19:34:08 +0100 Subject: [PATCH 04/18] Export WIP --- core/class/helper.class.php | 8 ++-- core/module/addon/addon.php | 93 ++++++++++++++++++++++++++++++------- 2 files changed, 79 insertions(+), 22 deletions(-) diff --git a/core/class/helper.class.php b/core/class/helper.class.php index d711bceb..5cc558dc 100755 --- a/core/class/helper.class.php +++ b/core/class/helper.class.php @@ -161,19 +161,19 @@ class helper { if (array_key_exists('UPDATE', $class_constants)) { $update = $value::UPDATE; } else { - $update = false; + $update = true; } // Constante DELETE if (array_key_exists('DELETE', $class_constants)) { $delete = $value::DELETE; } else { - $delete = false; + $delete = true; } // Constante DATADIRECTORY if (array_key_exists('DATADIRECTORY', $class_constants)) { - $dataDirectory= $value::DATADIRECTORY; + $dataDirectory = $value::DATADIRECTORY; } else { - $dataDirectory = ''; + $dataDirectory = ['fr/module.json']; } // Affection $modules [$value] = [ diff --git a/core/module/addon/addon.php b/core/module/addon/addon.php index 1dd4d8ea..0aebd0b5 100644 --- a/core/module/addon/addon.php +++ b/core/module/addon/addon.php @@ -18,7 +18,8 @@ class addon extends common { public static $actions = [ 'index' => self::GROUP_ADMIN, - 'moduleDelete' => self::GROUP_ADMIN + 'moduleDelete' => self::GROUP_ADMIN, + 'exportModuleData' => self::GROUP_ADMIN, ]; // Gestion des modules @@ -85,17 +86,17 @@ class addon extends common { $infoModules[$key]['version'], implode(', ', array_keys($inPagesTitle,$key)), //array_key_exists('delete',$infoModules[$key]) && $infoModules[$key]['delete'] === true && implode(', ',array_keys($inPages,$key)) === '' - ($infoModules[$key]['delete'] === false || $infoModules[$key]['delete'] !== false ) && implode(', ',array_keys($inPages,$key)) === '' + $infoModules[$key]['delete'] === true && implode(', ',array_keys($inPages,$key)) === '' ? template::button('moduleDelete' . $key, [ 'class' => 'moduleDelete buttonRed', 'href' => helper::baseUrl() . $this->getUrl(0) . '/moduleDelete/' . $key . '/' . $_SESSION['csrf'], 'value' => template::ico('cancel') ]) : '', - array_key_exists('dataDirectory',$infoModules[$key]) && $infoModules[$key]['dataDirectory'] !== '' + is_array($infoModules[$key]['dataDirectory']) && implode(', ',array_keys($inPages,$key)) !== '' ? template::button('moduleExport' . $key, [ 'class' => 'buttonBlue', - 'href' => helper::baseUrl(false).$this->exportZip( $key ), + 'href' => helper::baseUrl(). $this->getUrl(0) . '/exportModuleData/' . $key,// appel de fonction vaut exécution, utiliser un paramètre 'value' => template::ico('upload') ]) : '' @@ -270,23 +271,79 @@ class addon extends common { } /* - * Export des données d'un module externes à module.json + * Export des données d'un module externes ou interne à module.json */ - private function exportZip( $exportModule ){ + public function exportModuleData(){ + // Lire les données du module $infoModules = helper::getModules(); + // Créer un dossier par défaut + $tmpFolder = self::TEMP_DIR . uniqid(); + //$tmpFolder = self::TEMP_DIR . 'test'; + if (!is_dir($tmpFolder)) { + mkdir($tmpFolder); + } + // Clés moduleIds dans les pages + $inPages = helper::arrayCollumn($this->getData(['page']),'moduleId', 'SORT_DESC'); + // Parcourir les pages utilisant le module + foreach (array_keys($inPages,$this->getUrl(2)) as $pageId) { + foreach ($infoModules[$this->getUrl(2)]['dataDirectory'] as $moduleId) { + /** + * Données module.json ? + */ + if (strpos($moduleId,'module.json')) { + // Création de l'arborescence des langues + // Pas de nom dossier de langue - dossier par défaut + $t = explode ('/',$moduleId); + if ( is_array($t)) { + $path = 'fr'; + } else { + $path = $t[0]; + } + // Créer le dossier si inexistant + if (!is_dir($tmpFolder . '/' . $path)) { + mkdir ($tmpFolder . '/' . $path); + } + // Sauvegarde si données non vides + $tmpData [$pageId] = $this->getData(['module',$pageId ]); + if ($tmpData [$pageId] !== null) { + file_put_contents($tmpFolder . '/' . $moduleId, json_encode($tmpData)); + } + /** + * Données dans un json personnalisé, le sauvegarder + */ + } else { + if (file_exists(self::DATA_DIR . '/' . $moduleId) && + !file_exists($tmpFolder . '/' . $moduleId ) ) { + copy ( self::DATA_DIR . '/' . $moduleId, $tmpFolder . '/' . $moduleId ); + } + } + } + } // création du zip - $zip = new ZipArchive(); - if( ! is_dir('tmp/exportDataModules')) mkdir('tmp/exportDataModules',0777, true); - $filename = 'tmp/exportDataModules/'.$exportModule.'dataExport.zip'; - if( is_file( $filename )) unlink( $filename); - $directory = $infoModules[$exportModule]['dataDirectory'].'/'; - if($zip->open( $filename, ZipArchive::CREATE) !== TRUE){ - exit; + $fileName = self::TEMP_DIR . '/' . $this->geturl(2) . 'zip'; + $this->createZip($fileName,$tmpFolder); + if (file_exists($fileName)) { + header('Content-Type: application/octet-stream'); + header('Content-Disposition: attachment; filename="' . $fileName . '"'); + header('Content-Length: ' . filesize($fileName)); + readfile( $fileName); + // Valeurs en sortie + $this->addOutput([ + 'display' => self::DISPLAY_RAW + ]); + //unlink($filename); + //$this->removeDir($tmpFolder); + // Valeurs en sortie + + } else { + // Valeurs en sortie + $this->addOutput([ + 'redirect' => helper::baseUrl() . 'addon', + 'notification' => 'Quelque chose s\'est mal passé', + 'state' => false + ]); } - else{ - $this->createZip($zip,$directory); - $zip->close(); - } - return( $filename ); + } + } From e584e9fd5fd8f37440a36494872c2297cf9d9370 Mon Sep 17 00:00:00 2001 From: SylvainLelievre Date: Thu, 18 Feb 2021 08:56:07 +0100 Subject: [PATCH 05/18] Ajout copyright addon --- core/module/addon/addon.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/module/addon/addon.php b/core/module/addon/addon.php index 0aebd0b5..81067f05 100644 --- a/core/module/addon/addon.php +++ b/core/module/addon/addon.php @@ -10,6 +10,8 @@ * @copyright Copyright (C) 2008-2018, Rémi Jean * @author Frédéric Tempez * @copyright Copyright (C) 2018-2021, Frédéric Tempez + * @author Sylvain Lelièvre +* @copyright Copyright (C) 2020-2021, Sylvain Lelièvre * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ From b5d31033ffccb56dbc33b557ce5694ceab3fc1a7 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Thu, 18 Feb 2021 10:07:05 +0100 Subject: [PATCH 06/18] Blog Balise de fermeture de commentaire - constantes dans les modules --- CHANGES.md | 6 ++++++ README.md | 2 +- core/core.php | 2 +- module/blog/blog.php | 9 ++++++++- module/blog/view/article/article.php | 1 + module/blog/view/config/config.php | 2 +- module/form/form.php | 10 +++++++++- module/form/view/config/config.php | 2 +- module/form/view/data/data.php | 2 +- module/gallery/gallery.php | 11 ++++++++++- module/gallery/view/config/config.php | 2 +- module/gallery/view/edit/edit.php | 2 +- module/gallery/view/theme/theme.php | 2 +- module/news/news.php | 9 ++++++++- module/news/view/config/config.php | 2 +- module/redirection/redirection.php | 9 ++++++++- module/redirection/view/config/config.php | 2 +- module/search/search.php | 9 ++++++++- module/search/view/config/config.php | 2 +- 19 files changed, 69 insertions(+), 17 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 3857a8e6..d8eca2fe 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,11 @@ # Changelog +## version 10.4.04 +- Correction : + - Module Blog : balise non fermée dans les commentaires. +- Modifications : + -Constantes de modules. + ## version 10.4.03 - Corrections : - En-tête html : absence de la langue. diff --git a/README.md b/README.md index 487b18c0..7a84065d 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# ZwiiCMS 10.4.03 +# ZwiiCMS 10.4.04 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 17cf9ca2..66b8fbdc 100755 --- a/core/core.php +++ b/core/core.php @@ -44,7 +44,7 @@ class common { const ACCESS_TIMER = 1800; // Numéro de version - const ZWII_VERSION = '10.4.03'; + const ZWII_VERSION = '10.4.04'; const ZWII_UPDATE_CHANNEL = "v10"; public static $actions = []; diff --git a/module/blog/blog.php b/module/blog/blog.php index ae1d44e9..2e7e0538 100755 --- a/module/blog/blog.php +++ b/module/blog/blog.php @@ -14,6 +14,14 @@ class blog extends common { + const VERSION = '4.4'; + const REALNAME = 'Blog'; + const DELETE = true; + const UPDATE = true; + const DATADIRECTORY = [ + 'fr/module.json' + ]; + const EDIT_OWNER = 'owner'; const EDIT_GROUP = 'group'; const EDIT_ALL = 'all'; @@ -87,7 +95,6 @@ class blog extends common { public static $users = []; - const BLOG_VERSION = '4.3'; /** * Flux RSS diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php index 6706ffa4..aa19fe55 100755 --- a/module/blog/view/article/article.php +++ b/module/blog/view/article/article.php @@ -144,6 +144,7 @@ ? strftime('%d %B %Y - %H:%M', $comment['createdOn']) : utf8_encode(strftime('%d %B %Y - %H:%M', $comment['createdOn'])); ?> + diff --git a/module/blog/view/config/config.php b/module/blog/view/config/config.php index 7830d8fd..fee5671a 100755 --- a/module/blog/view/config/config.php +++ b/module/blog/view/config/config.php @@ -47,6 +47,6 @@
Version n° - +
diff --git a/module/form/form.php b/module/form/form.php index a47a0ec7..597a0323 100755 --- a/module/form/form.php +++ b/module/form/form.php @@ -16,6 +16,14 @@ class form extends common { + const VERSION = '2.8'; + const REALNAME = 'Formulaire'; + const DELETE = true; + const UPDATE = true; + const DATADIRECTORY = [ + 'fr/module.json' + ]; + public static $actions = [ 'config' => self::GROUP_MODERATOR, 'data' => self::GROUP_MODERATOR, @@ -32,7 +40,7 @@ class form extends common { public static $pagination; - const FORM_VERSION = '2.7'; + // Objets const TYPE_MAIL = 'mail'; diff --git a/module/form/view/config/config.php b/module/form/view/config/config.php index 5d2e8946..fea6d9ff 100755 --- a/module/form/view/config/config.php +++ b/module/form/view/config/config.php @@ -164,5 +164,5 @@
Version n° - +
diff --git a/module/form/view/data/data.php b/module/form/view/data/data.php index c60511b4..947e20db 100755 --- a/module/form/view/data/data.php +++ b/module/form/view/data/data.php @@ -26,5 +26,5 @@
Version n° - +
\ No newline at end of file diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php index 77d0f2c3..a3bb4618 100755 --- a/module/gallery/gallery.php +++ b/module/gallery/gallery.php @@ -16,10 +16,19 @@ class gallery extends common { + + const VERSION = '2.6'; + const REALNAME = 'Galerie'; + const DELETE = true; + const UPDATE = true; + const DATADIRECTORY = [ + 'fr/module.json' + ]; + const SORT_ASC = 'SORT_ASC'; const SORT_DSC = 'SORT_DSC'; const SORT_HAND = 'SORT_HAND'; - const GALLERY_VERSION = '2.5'; + public static $directories = []; diff --git a/module/gallery/view/config/config.php b/module/gallery/view/config/config.php index 0c41378b..91400a98 100755 --- a/module/gallery/view/config/config.php +++ b/module/gallery/view/config/config.php @@ -58,6 +58,6 @@
Version n° - +
diff --git a/module/gallery/view/edit/edit.php b/module/gallery/view/edit/edit.php index 9b243d32..c745d1e5 100755 --- a/module/gallery/view/edit/edit.php +++ b/module/gallery/view/edit/edit.php @@ -64,6 +64,6 @@
Version n° - +
diff --git a/module/gallery/view/theme/theme.php b/module/gallery/view/theme/theme.php index 8ada32ed..694ecaf9 100755 --- a/module/gallery/view/theme/theme.php +++ b/module/gallery/view/theme/theme.php @@ -139,7 +139,7 @@
Version n° - +
\ No newline at end of file diff --git a/module/news/news.php b/module/news/news.php index 13fcb2fa..89eb1aca 100755 --- a/module/news/news.php +++ b/module/news/news.php @@ -14,6 +14,14 @@ class news extends common { + const VERSION = '2.1'; + const REALNAME = 'Actualités'; + const DELETE = true; + const UPDATE = true; + const DATADIRECTORY = [ + 'fr/module.json' + ]; + public static $actions = [ 'add' => self::GROUP_MODERATOR, 'config' => self::GROUP_MODERATOR, @@ -33,7 +41,6 @@ class news extends common { false => 'Brouillon', true => 'Publié' ]; - const NEWS_VERSION = '2.0'; public static $users = []; diff --git a/module/news/view/config/config.php b/module/news/view/config/config.php index f25fe3d0..73929b9d 100755 --- a/module/news/view/config/config.php +++ b/module/news/view/config/config.php @@ -48,5 +48,5 @@
Version n° - +
\ No newline at end of file diff --git a/module/redirection/redirection.php b/module/redirection/redirection.php index 5c92521c..e39d70d4 100755 --- a/module/redirection/redirection.php +++ b/module/redirection/redirection.php @@ -14,12 +14,19 @@ class redirection extends common { + const VERSION = '1.5'; + const REALNAME = 'Redirection'; + const DELETE = true; + const UPDATE = true; + const DATADIRECTORY = [ + 'fr/module.json' + ]; + public static $actions = [ 'config' => self::GROUP_MODERATOR, 'index' => self::GROUP_VISITOR ]; - const REDIRECTION_VERSION = '1.4'; /** * Configuration diff --git a/module/redirection/view/config/config.php b/module/redirection/view/config/config.php index 72071f4c..ff421b39 100755 --- a/module/redirection/view/config/config.php +++ b/module/redirection/view/config/config.php @@ -37,5 +37,5 @@
Version n° - +
\ No newline at end of file diff --git a/module/search/search.php b/module/search/search.php index f84dfdeb..56e71f05 100755 --- a/module/search/search.php +++ b/module/search/search.php @@ -18,6 +18,14 @@ class search extends common { + const VERSION = '1.3'; + const REALNAME = 'Recherche'; + const DELETE = true; + const UPDATE = true; + const DATADIRECTORY = [ + 'fr/module.json' + ]; + public static $actions = [ 'index' => self::GROUP_VISITOR, 'config' => self::GROUP_MODERATOR @@ -38,7 +46,6 @@ class search extends common { 400 => '400 caractères', ]; - const SEARCH_VERSION = '1.2'; // Configuration vide public function config() { diff --git a/module/search/view/config/config.php b/module/search/view/config/config.php index 37a60653..f54674d7 100755 --- a/module/search/view/config/config.php +++ b/module/search/view/config/config.php @@ -68,5 +68,5 @@
Version n° - +
\ No newline at end of file From d9003808228f732ff1ff67993e84892212a49276 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Thu, 18 Feb 2021 10:19:12 +0100 Subject: [PATCH 07/18] news erreur de merge --- module/news/news.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/module/news/news.php b/module/news/news.php index 63be7158..93421f44 100755 --- a/module/news/news.php +++ b/module/news/news.php @@ -45,9 +45,6 @@ class news extends common { public static $users = []; - const VERSION = '2.0'; - const REALNAME = 'Nouvelles'; - /** * Flux RSS */ From af72107c794788d35138732bcde73adde17fb653 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Thu, 18 Feb 2021 12:07:40 +0100 Subject: [PATCH 08/18] addon export WIP (pages missing) --- core/core.php | 32 ++++++++++++++++++++++++++++++++ core/module/addon/addon.php | 11 +++++------ 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/core/core.php b/core/core.php index 5d760b11..265abdd0 100755 --- a/core/core.php +++ b/core/core.php @@ -1017,6 +1017,38 @@ class common { return ( rmdir($path) ); } + + /** + * Génère une archive d'un dossier et des sous-dossiers + * @param string fileName path et nom de l'archive + * @param string folder path à zipper + * @param array filter dossiers à exclure + */ + public function makeZip ($fileName, $folder, $filter ) { + $zip = new ZipArchive(); + $zip->open($fileName, ZipArchive::CREATE | ZipArchive::OVERWRITE); + //$directory = 'site/'; + $files = new RecursiveIteratorIterator( + new RecursiveCallbackFilterIterator( + new RecursiveDirectoryIterator( + $folder, + RecursiveDirectoryIterator::SKIP_DOTS + ), + function ($fileInfo, $key, $iterator) use ($filter) { + return $fileInfo->isFile() || !in_array($fileInfo->getBaseName(), $filter); + } + ) + ); + foreach ($files as $name => $file) { + if (!$file->isDir()) { + $filePath = $file->getRealPath(); + $relativePath = substr($filePath, strlen(realpath($folder)) + 1); + $zip->addFile($filePath, $relativePath); + } + } + $zip->close(); + } + /** * Mises à jour */ diff --git a/core/module/addon/addon.php b/core/module/addon/addon.php index 81067f05..15c35a27 100644 --- a/core/module/addon/addon.php +++ b/core/module/addon/addon.php @@ -322,8 +322,8 @@ class addon extends common { } } // création du zip - $fileName = self::TEMP_DIR . '/' . $this->geturl(2) . 'zip'; - $this->createZip($fileName,$tmpFolder); + $fileName = $this->getUrl(2) . '.zip'; + $this->makeZip ($fileName, $tmpFolder, []); if (file_exists($fileName)) { header('Content-Type: application/octet-stream'); header('Content-Disposition: attachment; filename="' . $fileName . '"'); @@ -333,10 +333,9 @@ class addon extends common { $this->addOutput([ 'display' => self::DISPLAY_RAW ]); - //unlink($filename); - //$this->removeDir($tmpFolder); - // Valeurs en sortie - + unlink($fileName); + $this->removeDir($tmpFolder); + exit(); } else { // Valeurs en sortie $this->addOutput([ From 0e4d1ed5704b4bcd73311bc73af1a73c05e8df85 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Thu, 18 Feb 2021 12:32:28 +0100 Subject: [PATCH 09/18] datadirectory si erreur de syntaxe --- core/class/helper.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/class/helper.class.php b/core/class/helper.class.php index 5cc558dc..34332ccd 100755 --- a/core/class/helper.class.php +++ b/core/class/helper.class.php @@ -170,7 +170,10 @@ class helper { $delete = true; } // Constante DATADIRECTORY - if (array_key_exists('DATADIRECTORY', $class_constants)) { + if ( array_key_exists('DATADIRECTORY', $class_constants) + && $class_constants['DATADIRECTORY'] !== [] + && is_array($class_constants['DATADIRECTORY']) + ) { $dataDirectory = $value::DATADIRECTORY; } else { $dataDirectory = ['fr/module.json']; From 74f0f60a8a59ce12046300e3a548359881d773bd Mon Sep 17 00:00:00 2001 From: fredtempez Date: Thu, 18 Feb 2021 12:40:41 +0100 Subject: [PATCH 10/18] Effacer createZip --- core/module/addon/addon.php | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/core/module/addon/addon.php b/core/module/addon/addon.php index 15c35a27..b0f6406a 100644 --- a/core/module/addon/addon.php +++ b/core/module/addon/addon.php @@ -240,37 +240,6 @@ class addon extends common { closedir($dir); } - /* - * Création récursive d'un zip - * https://makitweb.com/how-to-create-and-download-a-zip-file-with-php/ - */ - private function createZip($zip,$dir){ - if (is_dir($dir)){ - if ($dh = opendir($dir)){ - while (($file = readdir($dh)) !== false){ - // If file - if (is_file($dir.$file)) { - if($file != '' && $file != '.' && $file != '..'){ - $zip->addFile($dir.$file); - } - } - else{ - // If directory - if(is_dir($dir.$file) ){ - if($file != '' && $file != '.' && $file != '..'){ - // Add empty directory - $zip->addEmptyDir($dir.$file); - $folder = $dir.$file.'/'; - // Read data of the folder - $this->createZip($zip,$folder); - } - } - } - } - closedir($dh); - } - } - } /* * Export des données d'un module externes ou interne à module.json From 3dcf8f1b960c455e316fb7f93be39d6b5e75840e Mon Sep 17 00:00:00 2001 From: fredtempez Date: Thu, 18 Feb 2021 14:01:44 +0100 Subject: [PATCH 11/18] =?UTF-8?q?export=20ok=20=C3=A0=20tester?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/module/addon/addon.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/module/addon/addon.php b/core/module/addon/addon.php index b0f6406a..0c3aa504 100644 --- a/core/module/addon/addon.php +++ b/core/module/addon/addon.php @@ -258,6 +258,8 @@ class addon extends common { // Parcourir les pages utilisant le module foreach (array_keys($inPages,$this->getUrl(2)) as $pageId) { foreach ($infoModules[$this->getUrl(2)]['dataDirectory'] as $moduleId) { + // Export des pages hébergeant le module + $pageContent[$pageId] = $this->getData(['page',$pageId]); /** * Données module.json ? */ @@ -290,6 +292,10 @@ class addon extends common { } } } + // Enregistrement des pages + if (!file_exists($tmpFolder . '/fr/page.json')) { + file_put_contents($tmpFolder . '/fr/page.json', json_encode($pageContent)); + } // création du zip $fileName = $this->getUrl(2) . '.zip'; $this->makeZip ($fileName, $tmpFolder, []); From 40c862d251ee3a8ed60e59abaea6da8b61f625f2 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Thu, 18 Feb 2021 16:54:34 +0100 Subject: [PATCH 12/18] Nom fonction export --- core/module/addon/addon.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/module/addon/addon.php b/core/module/addon/addon.php index 0c3aa504..844294ab 100644 --- a/core/module/addon/addon.php +++ b/core/module/addon/addon.php @@ -21,7 +21,7 @@ class addon extends common { public static $actions = [ 'index' => self::GROUP_ADMIN, 'moduleDelete' => self::GROUP_ADMIN, - 'exportModuleData' => self::GROUP_ADMIN, + 'export' => self::GROUP_ADMIN, ]; // Gestion des modules @@ -98,7 +98,7 @@ class addon extends common { is_array($infoModules[$key]['dataDirectory']) && implode(', ',array_keys($inPages,$key)) !== '' ? template::button('moduleExport' . $key, [ 'class' => 'buttonBlue', - 'href' => helper::baseUrl(). $this->getUrl(0) . '/exportModuleData/' . $key,// appel de fonction vaut exécution, utiliser un paramètre + 'href' => helper::baseUrl(). $this->getUrl(0) . '/export/' . $key,// appel de fonction vaut exécution, utiliser un paramètre 'value' => template::ico('upload') ]) : '' @@ -244,7 +244,7 @@ class addon extends common { /* * Export des données d'un module externes ou interne à module.json */ - public function exportModuleData(){ + public function export(){ // Lire les données du module $infoModules = helper::getModules(); // Créer un dossier par défaut From ef2aee3f59786be454d460210450cd821876d4fc Mon Sep 17 00:00:00 2001 From: fredtempez Date: Thu, 18 Feb 2021 17:15:13 +0100 Subject: [PATCH 13/18] export ok --- core/module/addon/addon.php | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/core/module/addon/addon.php b/core/module/addon/addon.php index 844294ab..bc754c95 100644 --- a/core/module/addon/addon.php +++ b/core/module/addon/addon.php @@ -268,34 +268,37 @@ class addon extends common { // Pas de nom dossier de langue - dossier par défaut $t = explode ('/',$moduleId); if ( is_array($t)) { - $path = 'fr'; + $lang = 'fr'; } else { - $path = $t[0]; + $lang = $t[0]; } // Créer le dossier si inexistant - if (!is_dir($tmpFolder . '/' . $path)) { - mkdir ($tmpFolder . '/' . $path); + if (!is_dir($tmpFolder . '/' . $lang)) { + mkdir ($tmpFolder . '/' . $lang); } // Sauvegarde si données non vides $tmpData [$pageId] = $this->getData(['module',$pageId ]); if ($tmpData [$pageId] !== null) { file_put_contents($tmpFolder . '/' . $moduleId, json_encode($tmpData)); } - /** - * Données dans un json personnalisé, le sauvegarder - */ } else { - if (file_exists(self::DATA_DIR . '/' . $moduleId) && - !file_exists($tmpFolder . '/' . $moduleId ) ) { - copy ( self::DATA_DIR . '/' . $moduleId, $tmpFolder . '/' . $moduleId ); + /** + * Données dans un json personnalisé, le sauvegarder + * Dossier non localisé + */ + if ( file_exists(self::DATA_DIR . '/' . $moduleId) + && !file_exists($tmpFolder . '/' . $moduleId ) ) { + copy ( self::DATA_DIR . '/' . $moduleId, $tmpFolder . '/' . $moduleId ); } } } } - // Enregistrement des pages - if (!file_exists($tmpFolder . '/fr/page.json')) { - file_put_contents($tmpFolder . '/fr/page.json', json_encode($pageContent)); + // Enregistrement des pages dans le dossier de langue identique à module + + if (!file_exists($tmpFolder . '/' . $lang . '/page.json')) { + file_put_contents($tmpFolder . '/' . $lang . '/page.json', json_encode($pageContent)); } + // création du zip $fileName = $this->getUrl(2) . '.zip'; $this->makeZip ($fileName, $tmpFolder, []); From 14af9847f61c8aa46f992212633af55932a155c3 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Thu, 18 Feb 2021 18:34:53 +0100 Subject: [PATCH 14/18] Import WIP + une correction dans le theme (nom de fonction en double) --- core/module/addon/addon.php | 179 ++++++++++++++--------- core/module/addon/view/import/import.css | 18 +++ core/module/addon/view/import/import.php | 31 ++++ core/module/addon/view/index/index.php | 2 +- core/module/theme/theme.php | 6 +- 5 files changed, 159 insertions(+), 77 deletions(-) create mode 100644 core/module/addon/view/import/import.css create mode 100644 core/module/addon/view/import/import.php diff --git a/core/module/addon/addon.php b/core/module/addon/addon.php index bc754c95..e442f178 100644 --- a/core/module/addon/addon.php +++ b/core/module/addon/addon.php @@ -22,6 +22,7 @@ class addon extends common { 'index' => self::GROUP_ADMIN, 'moduleDelete' => self::GROUP_ADMIN, 'export' => self::GROUP_ADMIN, + 'import' => self::GROUP_ADMIN ]; // Gestion des modules @@ -99,6 +100,13 @@ class addon extends common { ? template::button('moduleExport' . $key, [ 'class' => 'buttonBlue', 'href' => helper::baseUrl(). $this->getUrl(0) . '/export/' . $key,// appel de fonction vaut exécution, utiliser un paramètre + 'value' => template::ico('download') + ]) + : '', + is_array($infoModules[$key]['dataDirectory']) && implode(', ',array_keys($inPages,$key)) !== '' + ? template::button('moduleExport' . $key, [ + 'class' => 'buttonBlue', + 'href' => helper::baseUrl(). $this->getUrl(0) . '/import/' . $key,// appel de fonction vaut exécution, utiliser un paramètre 'value' => template::ico('upload') ]) : '' @@ -245,84 +253,109 @@ class addon extends common { * Export des données d'un module externes ou interne à module.json */ public function export(){ - // Lire les données du module - $infoModules = helper::getModules(); - // Créer un dossier par défaut - $tmpFolder = self::TEMP_DIR . uniqid(); - //$tmpFolder = self::TEMP_DIR . 'test'; - if (!is_dir($tmpFolder)) { - mkdir($tmpFolder); - } - // Clés moduleIds dans les pages - $inPages = helper::arrayCollumn($this->getData(['page']),'moduleId', 'SORT_DESC'); - // Parcourir les pages utilisant le module - foreach (array_keys($inPages,$this->getUrl(2)) as $pageId) { - foreach ($infoModules[$this->getUrl(2)]['dataDirectory'] as $moduleId) { - // Export des pages hébergeant le module - $pageContent[$pageId] = $this->getData(['page',$pageId]); - /** - * Données module.json ? - */ - if (strpos($moduleId,'module.json')) { - // Création de l'arborescence des langues - // Pas de nom dossier de langue - dossier par défaut - $t = explode ('/',$moduleId); - if ( is_array($t)) { - $lang = 'fr'; - } else { - $lang = $t[0]; - } - // Créer le dossier si inexistant - if (!is_dir($tmpFolder . '/' . $lang)) { - mkdir ($tmpFolder . '/' . $lang); - } - // Sauvegarde si données non vides - $tmpData [$pageId] = $this->getData(['module',$pageId ]); - if ($tmpData [$pageId] !== null) { - file_put_contents($tmpFolder . '/' . $moduleId, json_encode($tmpData)); - } + // Lire les données du module + $infoModules = helper::getModules(); + // Créer un dossier par défaut + $tmpFolder = self::TEMP_DIR . uniqid(); + //$tmpFolder = self::TEMP_DIR . 'test'; + if (!is_dir($tmpFolder)) { + mkdir($tmpFolder); + } + // Clés moduleIds dans les pages + $inPages = helper::arrayCollumn($this->getData(['page']),'moduleId', 'SORT_DESC'); + // Parcourir les pages utilisant le module + foreach (array_keys($inPages,$this->getUrl(2)) as $pageId) { + foreach ($infoModules[$this->getUrl(2)]['dataDirectory'] as $moduleId) { + // Export des pages hébergeant le module + $pageContent[$pageId] = $this->getData(['page',$pageId]); + /** + * Données module.json ? + */ + if (strpos($moduleId,'module.json')) { + // Création de l'arborescence des langues + // Pas de nom dossier de langue - dossier par défaut + $t = explode ('/',$moduleId); + if ( is_array($t)) { + $lang = 'fr'; } else { - /** - * Données dans un json personnalisé, le sauvegarder - * Dossier non localisé - */ - if ( file_exists(self::DATA_DIR . '/' . $moduleId) - && !file_exists($tmpFolder . '/' . $moduleId ) ) { - copy ( self::DATA_DIR . '/' . $moduleId, $tmpFolder . '/' . $moduleId ); - } + $lang = $t[0]; + } + // Créer le dossier si inexistant + if (!is_dir($tmpFolder . '/' . $lang)) { + mkdir ($tmpFolder . '/' . $lang); + } + // Sauvegarde si données non vides + $tmpData [$pageId] = $this->getData(['module',$pageId ]); + if ($tmpData [$pageId] !== null) { + file_put_contents($tmpFolder . '/' . $moduleId, json_encode($tmpData)); + } + } else { + /** + * Données dans un json personnalisé, le sauvegarder + * Dossier non localisé + */ + if ( file_exists(self::DATA_DIR . '/' . $moduleId) + && !file_exists($tmpFolder . '/' . $moduleId ) ) { + $this->custom_copy ( self::DATA_DIR . '/' . $moduleId, $tmpFolder . '/' . $moduleId ); } } } - // Enregistrement des pages dans le dossier de langue identique à module + } + // Enregistrement des pages dans le dossier de langue identique à module - if (!file_exists($tmpFolder . '/' . $lang . '/page.json')) { - file_put_contents($tmpFolder . '/' . $lang . '/page.json', json_encode($pageContent)); - } - - // création du zip - $fileName = $this->getUrl(2) . '.zip'; - $this->makeZip ($fileName, $tmpFolder, []); - if (file_exists($fileName)) { - header('Content-Type: application/octet-stream'); - header('Content-Disposition: attachment; filename="' . $fileName . '"'); - header('Content-Length: ' . filesize($fileName)); - readfile( $fileName); - // Valeurs en sortie - $this->addOutput([ - 'display' => self::DISPLAY_RAW - ]); - unlink($fileName); - $this->removeDir($tmpFolder); - exit(); - } else { - // Valeurs en sortie - $this->addOutput([ - 'redirect' => helper::baseUrl() . 'addon', - 'notification' => 'Quelque chose s\'est mal passé', - 'state' => false - ]); - } + if (!file_exists($tmpFolder . '/' . $lang . '/page.json')) { + file_put_contents($tmpFolder . '/' . $lang . '/page.json', json_encode($pageContent)); + } + // création du zip + $fileName = $this->getUrl(2) . '.zip'; + $this->makeZip ($fileName, $tmpFolder, []); + if (file_exists($fileName)) { + header('Content-Type: application/octet-stream'); + header('Content-Disposition: attachment; filename="' . $fileName . '"'); + header('Content-Length: ' . filesize($fileName)); + readfile( $fileName); + // Valeurs en sortie + $this->addOutput([ + 'display' => self::DISPLAY_RAW + ]); + unlink($fileName); + $this->removeDir($tmpFolder); + exit(); + } else { + // Valeurs en sortie + $this->addOutput([ + 'redirect' => helper::baseUrl() . 'addon', + 'notification' => 'Quelque chose s\'est mal passé', + 'state' => false + ]); + } } -} + /* + * Importer des données d'un module externes ou interne à module.json + */ + public function import(){ + // Soumission du formulaire + if($this->isPost()) { + // Récupérer le fichier et le décompacter + $zipFilename = $this->getInput('addonImportFile', helper::FILTER_STRING_SHORT, true); + $tempFolder = uniqid(); + mkdir (self::TEMP_DIR . $tempFolder); + echo $zipFilename; + $zip = new ZipArchive(); + if ($zip->open(self::FILE_DIR . 'source/' . $zipFilename) === TRUE) { + $zip->extractTo(self::TEMP_DIR . $tempFolder ); + } + + // Supprimer le dossier temporaire même si le thème est invalide + //$this->removeDir(self::TEMP_DIR . $tempFolder); + $zip->close(); + } + // Valeurs en sortie + $this->addOutput([ + 'title' => 'Importer des données de module', + 'view' => 'import' + ]); + } +} \ No newline at end of file diff --git a/core/module/addon/view/import/import.css b/core/module/addon/view/import/import.css new file mode 100644 index 00000000..5a91e7a7 --- /dev/null +++ b/core/module/addon/view/import/import.css @@ -0,0 +1,18 @@ +/** + * This file is part of Zwii. + * + * For full copyright and license information, please see the LICENSE + * file that was distributed with this source code. + * + * @author Rémi Jean + * @copyright Copyright (C) 2008-2018, Rémi Jean + * @author Frédéric Tempez + * @copyright Copyright (C) 2018-2021, Frédéric Tempez + * @license GNU General Public License, version 3 + * @link http://zwiicms.fr/ + */ + + +/** NE PAS EFFACER +* admin.css +*/ \ No newline at end of file diff --git a/core/module/addon/view/import/import.php b/core/module/addon/view/import/import.php new file mode 100644 index 00000000..7cc41dac --- /dev/null +++ b/core/module/addon/view/import/import.php @@ -0,0 +1,31 @@ + +
+
+ 'buttonGrey', + 'href' => helper::baseUrl() . 'addon', + 'ico' => 'left', + 'value' => 'Retour' + ]); ?> +
+
+ 'Appliquer' + ]); ?> +
+
+
+
+
+

Installer des données de module

+
+
+ 'Archive ZIP :', + 'type' => 2 + ]); ?> +
+
+
+
+
\ No newline at end of file diff --git a/core/module/addon/view/index/index.php b/core/module/addon/view/index/index.php index 56c5bcf1..6da3c716 100644 --- a/core/module/addon/view/index/index.php +++ b/core/module/addon/view/index/index.php @@ -40,7 +40,7 @@ - + diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index c1441b26..8cb8b382 100755 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -692,7 +692,7 @@ class theme extends common { */ public function export() { // Make zip - $zipFilename = $this->makezip($this->getUrl(2)); + $zipFilename = $this->zipTheme($this->getUrl(2)); // Téléchargement du ZIP header('Content-Description: File Transfer'); header('Content-Type: application/octet-stream'); @@ -710,7 +710,7 @@ class theme extends common { */ public function save() { // Make zip - $zipFilename = $this->makezip($this->getUrl(2)); + $zipFilename = $this->zipTheme($this->getUrl(2)); // Téléchargement du ZIP if (!is_dir(self::FILE_DIR.'source/theme')) { mkdir(self::FILE_DIR.'source/theme'); @@ -772,7 +772,7 @@ class theme extends common { * construction du zip * @param string $modele theme ou admin */ - private function makezip($modele) { + private function zipTheme($modele) { // Creation du dossier $zipFilename = $modele . ' ' .date('d m Y').' '.date('H i s ').'.zip'; $zip = new ZipArchive(); From 0e002df2af1da836d489a0f377fe6d3affd0884b Mon Sep 17 00:00:00 2001 From: SylvainLelievre Date: Fri, 19 Feb 2021 07:14:42 +0100 Subject: [PATCH 15/18] =?UTF-8?q?Correction=20dans=20addon=20du=20contr?= =?UTF-8?q?=C3=B4le=20d'update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/module/addon/addon.php | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/core/module/addon/addon.php b/core/module/addon/addon.php index e442f178..d2a84268 100644 --- a/core/module/addon/addon.php +++ b/core/module/addon/addon.php @@ -11,7 +11,7 @@ * @author Frédéric Tempez * @copyright Copyright (C) 2018-2021, Frédéric Tempez * @author Sylvain Lelièvre -* @copyright Copyright (C) 2020-2021, Sylvain Lelièvre + * @copyright Copyright (C) 2020-2021, Sylvain Lelièvre * @license GNU General Public License, version 3 * @link http://zwiicms.fr/ */ @@ -142,9 +142,10 @@ class addon extends common { // Module normalisé ? if( is_file( $moduleDir.'/'.$moduleName.'/'.$moduleName.'.php' ) AND is_file( $moduleDir.'/'.$moduleName.'/view/index/index.php' ) ){ - // Lecture de la version du module pour validation de la mise à jour + // Lecture de la version et de la validation d'update du module pour validation de la mise à jour // Pour une version <= version installée l'utilisateur doit cocher 'Mise à jour forcée' $version = '0.0'; + $update = false; $file = file_get_contents( $moduleDir.'/'.$moduleName.'/'.$moduleName.'.php'); $file = str_replace(' ','',$file); $file = str_replace("\t",'',$file); @@ -154,6 +155,15 @@ class addon extends common { $posend = strpos($file, "'", $posdeb + 1); $version = substr($file, $posdeb + 1, $posend - $posdeb - 1); } + $pos1 = strpos($file, 'constUPDATE'); + if( $pos1 !== false){ + $posdeb = strpos($file, "=", $pos1); + $posend = strpos($file, ";", $posdeb + 1); + $strUpdate = substr($file, $posdeb + 1, $posend - $posdeb - 1); + if( strpos( $strUpdate,"true",0) !== false){ + $update = true; + } + } // Module déjà installé ? $moduleInstal = false; @@ -169,7 +179,7 @@ class addon extends common { $valInstalVersion = floatval( $infoModules[$moduleName]['version'] ); $newVersion = false; if( $valNewVersion > $valInstalVersion ) $newVersion = true; - $validMaj = $infoModules[$moduleName]['update'] && ( $newVersion || $checkValidMaj); + $validMaj = $update && ( $newVersion || $checkValidMaj); // Nouvelle installation ou mise à jour du module if( ! $moduleInstal || $validMaj ){ @@ -191,7 +201,7 @@ class addon extends common { else{ $notification = ' Version détectée '.$version.' < à celle installée '.$infoModules[$moduleName]['version']; } - if( $infoModules[$moduleName]['update'] === false){ + if( $update === false){ $notification = ' Mise à jour par ce procédé interdite par le concepteur du module'; } } @@ -358,4 +368,4 @@ class addon extends common { 'view' => 'import' ]); } -} \ No newline at end of file +} From f95d8a79611e2b7a7595cdf3f4a059a34a44c485 Mon Sep 17 00:00:00 2001 From: SylvainLelievre Date: Fri, 19 Feb 2021 07:49:04 +0100 Subject: [PATCH 16/18] addon messages en cas de delete --- core/module/addon/addon.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/core/module/addon/addon.php b/core/module/addon/addon.php index d2a84268..b8d5f379 100644 --- a/core/module/addon/addon.php +++ b/core/module/addon/addon.php @@ -47,9 +47,23 @@ class addon extends common { } else{ // Suppression des dossiers - if( $this->removeDir('./module/'.$this->getUrl(2) ) === true){ + $infoModules = helper::getModules(); + $module = $this->getUrl(2); + //Liste des dossiers associés au module non effacés + $list = ''; + foreach( $infoModules[$module]['dataDirectory'] as $moduleId){ + if (strpos($moduleId,'module.json') === false && strpos($moduleId,'page.json') === false) { + $list === '' ? $list = self::DATA_DIR.$moduleId : $list .= ', '.self::DATA_DIR. $moduleId; + } + } + if( $this->removeDir('./module/'.$module ) === true){ $success = true; - $notification = 'Module '.$this->getUrl(2) .' effacé du dossier /module/, il peut rester des données dans d\'autres dossiers'; + if( $list === ''){ + $notification = 'Module '.$module .' désinstallé'; + } + else{ + $notification = 'Module '.$module .' désinstallé, il reste des données dans '.$list; + } } else{ $success = false; From 887ce73f027f53130ed2e1a3ed9d3bef1f9da0fa Mon Sep 17 00:00:00 2001 From: SylvainLelievre Date: Fri, 19 Feb 2021 07:53:34 +0100 Subject: [PATCH 17/18] correction colonnes tableau addon --- core/module/addon/view/index/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/module/addon/view/index/index.php b/core/module/addon/view/index/index.php index 6da3c716..5248fdc9 100644 --- a/core/module/addon/view/index/index.php +++ b/core/module/addon/view/index/index.php @@ -40,7 +40,7 @@ - + From 95c269873febef0d950ae89feb2536d0c5be1bf6 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Fri, 19 Feb 2021 09:08:56 +0100 Subject: [PATCH 18/18] =?UTF-8?q?Constante=20data=20directory=20par=20d?= =?UTF-8?q?=C3=A9faut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/blog/blog.php | 4 +--- module/form/form.php | 4 +--- module/gallery/gallery.php | 4 +--- module/news/news.php | 4 +--- module/redirection/redirection.php | 4 +--- module/search/search.php | 4 +--- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/module/blog/blog.php b/module/blog/blog.php index 2e7e0538..646e6310 100755 --- a/module/blog/blog.php +++ b/module/blog/blog.php @@ -18,9 +18,7 @@ class blog extends common { const REALNAME = 'Blog'; const DELETE = true; const UPDATE = true; - const DATADIRECTORY = [ - 'fr/module.json' - ]; + const DATADIRECTORY = []; // Contenu localisé inclus par défaut (page.json et module.json) const EDIT_OWNER = 'owner'; const EDIT_GROUP = 'group'; diff --git a/module/form/form.php b/module/form/form.php index 597a0323..841977e2 100755 --- a/module/form/form.php +++ b/module/form/form.php @@ -20,9 +20,7 @@ class form extends common { const REALNAME = 'Formulaire'; const DELETE = true; const UPDATE = true; - const DATADIRECTORY = [ - 'fr/module.json' - ]; + const DATADIRECTORY = []; // Contenu localisé inclus par défaut (page.json et module.json) public static $actions = [ 'config' => self::GROUP_MODERATOR, diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php index a3bb4618..bc6e4b04 100755 --- a/module/gallery/gallery.php +++ b/module/gallery/gallery.php @@ -21,9 +21,7 @@ class gallery extends common { const REALNAME = 'Galerie'; const DELETE = true; const UPDATE = true; - const DATADIRECTORY = [ - 'fr/module.json' - ]; + const DATADIRECTORY = []; // Contenu localisé inclus par défaut (page.json et module.json) const SORT_ASC = 'SORT_ASC'; const SORT_DSC = 'SORT_DSC'; diff --git a/module/news/news.php b/module/news/news.php index 89eb1aca..ce975f71 100755 --- a/module/news/news.php +++ b/module/news/news.php @@ -18,9 +18,7 @@ class news extends common { const REALNAME = 'Actualités'; const DELETE = true; const UPDATE = true; - const DATADIRECTORY = [ - 'fr/module.json' - ]; + const DATADIRECTORY = []; // Contenu localisé inclus par défaut (page.json et module.json) public static $actions = [ 'add' => self::GROUP_MODERATOR, diff --git a/module/redirection/redirection.php b/module/redirection/redirection.php index e39d70d4..3051ee56 100755 --- a/module/redirection/redirection.php +++ b/module/redirection/redirection.php @@ -18,9 +18,7 @@ class redirection extends common { const REALNAME = 'Redirection'; const DELETE = true; const UPDATE = true; - const DATADIRECTORY = [ - 'fr/module.json' - ]; + const DATADIRECTORY = []; // Contenu localisé inclus par défaut (page.json et module.json) public static $actions = [ 'config' => self::GROUP_MODERATOR, diff --git a/module/search/search.php b/module/search/search.php index 56e71f05..f07a2200 100755 --- a/module/search/search.php +++ b/module/search/search.php @@ -22,9 +22,7 @@ class search extends common { const REALNAME = 'Recherche'; const DELETE = true; const UPDATE = true; - const DATADIRECTORY = [ - 'fr/module.json' - ]; + const DATADIRECTORY = []; // Contenu localisé inclus par défaut (page.json et module.json) public static $actions = [ 'index' => self::GROUP_VISITOR,