From 2b94ba426a01de5ca34952938a170147a067dfe8 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Thu, 22 Apr 2021 20:39:33 +0200 Subject: [PATCH 01/21] Fautes de frappe dans un commentaire --- core/class/helper.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/class/helper.class.php b/core/class/helper.class.php index 67b5f815..014ac226 100755 --- a/core/class/helper.class.php +++ b/core/class/helper.class.php @@ -21,9 +21,9 @@ class helper { /** - * Récupérer l'adresse IP sans tenit compte du proxy + * Récupérer l'adresse IP sans tenir compte du proxy * @return string IP adress - * Cette focntion est utilisé par user + * Cette fonction est utilisée par user */ public static function getIp() { From b1b77d767cdf18fd693430e06821b268eb264885 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Thu, 22 Apr 2021 20:48:32 +0200 Subject: [PATCH 02/21] =?UTF-8?q?news=20effet=20blur=20avec=20arri=C3=A8re?= =?UTF-8?q?=20plan=20contrast=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/news/news.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/news/news.php b/module/news/news.php index cdd91409..5a0aa2d6 100755 --- a/module/news/news.php +++ b/module/news/news.php @@ -184,7 +184,7 @@ class news extends common { // Générer la feuille de CSS $style = '.newsContent {height:' . $this->getInput('newsConfigItemsHeight',helper::FILTER_STRING_SHORT) . ';}'; - $style .= '.newsBlur {background: linear-gradient(#333 ' . $this->getInput('newsConfigItemsBlur',helper::FILTER_STRING_SHORT) . ',#FFF );'; + $style .= '.newsBlur {background: linear-gradient(#333 ' . $this->getInput('newsConfigItemsBlur',helper::FILTER_STRING_SHORT) . ',rgba(255,255,255,0) );'; $style .= ' background-clip: text;-webkit-background-clip: text;-webkit-text-fill-color: transparent;}'; // Dossier de l'instance From 97374fafb4b6869cdd0c84a46598c4f26755ce1d Mon Sep 17 00:00:00 2001 From: SylvainLelievre Date: Sun, 25 Apr 2021 08:56:28 +0200 Subject: [PATCH 03/21] =?UTF-8?q?Page.php,=20mise=20=C3=A0=20jour=20et=20e?= =?UTF-8?q?ffacement=20du=20dossier=20au=20nom=20du=20module=20et=20de=20l?= =?UTF-8?q?'instance?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/module/page/page.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/core/module/page/page.php b/core/module/page/page.php index 744e5eda..b8d361b2 100755 --- a/core/module/page/page.php +++ b/core/module/page/page.php @@ -262,8 +262,8 @@ class page extends common { // Effacer le dossier du module $moduleId = $this->getData(['page',$url[0],'moduleId']); $modulesData = helper::getModules(); - if (is_dir($modulesData[$moduleId]['dataDirectory'])) { - $this->removeDir( $modulesData[$moduleId]['dataDirectory'] ); + if (is_dir($modulesData[$moduleId]['dataDirectory'].$url[0])) { + $this->removeDir( $modulesData[$moduleId]['dataDirectory'].$url[0] ); } // Effacer la page $this->deleteData(['page', $url[0]]); @@ -322,12 +322,13 @@ class page extends common { // Renommer le dossier du module $moduleId = $this->getData(['page',$this->getUrl(2),'moduleId']); $modulesData = helper::getModules(); - if (is_dir($modulesData[$moduleId]['dataDirectory'])) { - // Renommer la feuille de style - rename( $modulesData[$moduleId]['dataDirectory'],str_replace($this->geturl(2),$pageId, $modulesData[$moduleId]['dataDirectory'])); - $this->removeDir($modulesData[$moduleId]['dataDirectory']); - // Mettre à jour le nom de la feuille de site - $this->setData(['module',$pageId,'theme','style',str_replace($this->geturl(2),$pageId, $modulesData[$moduleId]['dataDirectory'])]); + if (is_dir($modulesData[$moduleId]['dataDirectory'].$this->getUrl(2))) { + // Placer la feuille de style dans un dossier au nom de la nouvelle instance + mkdir( $modulesData[$moduleId]['dataDirectory'].$pageId ); + copy( $modulesData[$moduleId]['dataDirectory'].$this->getUrl(2), $modulesData[$moduleId]['dataDirectory'].$pageId); + $this->removeDir($modulesData[$moduleId]['dataDirectory'].$this->getUrl(2)); + // Mettre à jour le nom de la feuille de style + $this->setData(['module',$pageId,'theme','style', $modulesData[$moduleId]['dataDirectory'].$pageId]); } } // Si la page correspond à la page d'accueil, change l'id dans la configuration du site From a55c2b9de4f6b42b7a9b13847dc695c51c8503b9 Mon Sep 17 00:00:00 2001 From: SylvainLelievre Date: Mon, 26 Apr 2021 13:59:21 +0200 Subject: [PATCH 04/21] Chemin des feuilles de style .../class_du_module/pages/instance/theme.css --- core/module/page/page.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/module/page/page.php b/core/module/page/page.php index b8d361b2..7438c5b4 100755 --- a/core/module/page/page.php +++ b/core/module/page/page.php @@ -262,8 +262,8 @@ class page extends common { // Effacer le dossier du module $moduleId = $this->getData(['page',$url[0],'moduleId']); $modulesData = helper::getModules(); - if (is_dir($modulesData[$moduleId]['dataDirectory'].$url[0])) { - $this->removeDir( $modulesData[$moduleId]['dataDirectory'].$url[0] ); + if (is_dir($modulesData[$moduleId]['dataDirectory'].'pages/'.$url[0])) { + $this->removeDir( $modulesData[$moduleId]['dataDirectory'].'pages/'.$url[0] ); } // Effacer la page $this->deleteData(['page', $url[0]]); @@ -322,13 +322,13 @@ class page extends common { // Renommer le dossier du module $moduleId = $this->getData(['page',$this->getUrl(2),'moduleId']); $modulesData = helper::getModules(); - if (is_dir($modulesData[$moduleId]['dataDirectory'].$this->getUrl(2))) { + if (is_dir($modulesData[$moduleId]['dataDirectory'].'pages/'.$this->getUrl(2))) { // Placer la feuille de style dans un dossier au nom de la nouvelle instance - mkdir( $modulesData[$moduleId]['dataDirectory'].$pageId ); - copy( $modulesData[$moduleId]['dataDirectory'].$this->getUrl(2), $modulesData[$moduleId]['dataDirectory'].$pageId); - $this->removeDir($modulesData[$moduleId]['dataDirectory'].$this->getUrl(2)); + mkdir( $modulesData[$moduleId]['dataDirectory'].'pages/'.$pageId ); + copy( $modulesData[$moduleId]['dataDirectory'].'pages/'.$this->getUrl(2), $modulesData[$moduleId]['dataDirectory'].'pages/'.$pageId); + $this->removeDir($modulesData[$moduleId]['dataDirectory'].'pages/'.$this->getUrl(2)); // Mettre à jour le nom de la feuille de style - $this->setData(['module',$pageId,'theme','style', $modulesData[$moduleId]['dataDirectory'].$pageId]); + $this->setData(['module',$pageId,'theme','style', $modulesData[$moduleId]['dataDirectory'].'pages/'.$pageId]); } } // Si la page correspond à la page d'accueil, change l'id dans la configuration du site From 0b8ae49b700b1800c14e0e1d9e53703768aa3bc2 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 26 Apr 2021 21:18:32 +0200 Subject: [PATCH 05/21] DATADIRECTORY supprimer le dossier modules --- module/gallery/gallery.php | 2 +- module/news/news.php | 2 +- module/search/search.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php index 7e0d406d..c9c7c1ab 100755 --- a/module/gallery/gallery.php +++ b/module/gallery/gallery.php @@ -21,7 +21,7 @@ class gallery extends common { const REALNAME = 'Galerie'; const DELETE = true; const UPDATE = '0.0'; - const DATADIRECTORY = self::DATA_DIR . 'modules/gallery/'; + const DATADIRECTORY = self::DATA_DIR . 'gallery/'; const SORT_ASC = 'SORT_ASC'; const SORT_DSC = 'SORT_DSC'; diff --git a/module/news/news.php b/module/news/news.php index 5a0aa2d6..4dbb69da 100755 --- a/module/news/news.php +++ b/module/news/news.php @@ -19,7 +19,7 @@ class news extends common { const REALNAME = 'Actualités'; const DELETE = true; const UPDATE = '0.0'; - const DATADIRECTORY = self::DATA_DIR . 'modules/news/'; + const DATADIRECTORY = self::DATA_DIR . 'news/'; public static $actions = [ 'add' => self::GROUP_MODERATOR, diff --git a/module/search/search.php b/module/search/search.php index 15a8a690..f4b6d259 100755 --- a/module/search/search.php +++ b/module/search/search.php @@ -23,7 +23,7 @@ class search extends common { const REALNAME = 'Recherche'; const DELETE = true; const UPDATE = '0.0'; - const DATADIRECTORY = self::DATA_DIR . 'modules/search/'; + const DATADIRECTORY = self::DATA_DIR . 'search/'; public static $actions = [ 'index' => self::GROUP_VISITOR, From 54426593d550e4c740a4cdda7d13f3468f5b5995 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 26 Apr 2021 22:03:49 +0200 Subject: [PATCH 06/21] Blog 5.1 bug bouton effacement des commentaires --- module/blog/blog.php | 2 +- module/blog/view/comment/comment.js.php | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/module/blog/blog.php b/module/blog/blog.php index e9959dfb..43627c37 100755 --- a/module/blog/blog.php +++ b/module/blog/blog.php @@ -15,7 +15,7 @@ class blog extends common { - const VERSION = '5.0'; + const VERSION = '5.1'; const REALNAME = 'Blog'; const DELETE = true; const UPDATE = '0.0'; diff --git a/module/blog/view/comment/comment.js.php b/module/blog/view/comment/comment.js.php index fa9fe18d..636d55e5 100755 --- a/module/blog/view/comment/comment.js.php +++ b/module/blog/view/comment/comment.js.php @@ -17,7 +17,7 @@ */ $(".blogCommentDelete").on("click", function() { var _this = $(this); - var nom = "getData(['module', $this->getUrl(0), $this->getUrl(2), 'title' ]); ?>"; + var nom = "getData(['module', $this->getUrl(0), 'posts', $this->getUrl(2), 'title' ]); ?>"; return core.confirm("Supprimer le commentaire de l'article " + nom + " ?", function() { $(location).attr("href", _this.attr("href")); }); @@ -28,7 +28,7 @@ $(".blogCommentDelete").on("click", function() { */ $(".blogCommentApproved").on("click", function() { var _this = $(this); - var nom = "getData(['module', $this->getUrl(0), $this->getUrl(2), 'title' ]); ?>"; + var nom = "getData(['module', $this->getUrl(0), 'posts', $this->getUrl(2), 'title' ]); ?>"; return core.confirm("Approuver le commentaire de l'article " + nom + " ?", function() { $(location).attr("href", _this.attr("href")); }); @@ -39,7 +39,7 @@ $(".blogCommentApproved").on("click", function() { */ $(".blogCommentRejected").on("click", function() { var _this = $(this); - var nom = "getData(['module', $this->getUrl(0), $this->getUrl(2), 'title' ]); ?>"; + var nom = "getData(['module', $this->getUrl(0), 'posts', $this->getUrl(2), 'title' ]); ?>"; return core.confirm("Rejeter le commentaire de l'article " + nom + " ?", function() { $(location).attr("href", _this.attr("href")); }); @@ -50,11 +50,11 @@ $(".blogCommentRejected").on("click", function() { */ $(".blogCommentDeleteAll").on("click", function() { var _this = $(this); - var nombre = "getData(['module', $this->getUrl(0), $this->getUrl(2), 'comment' ])); ?>"; + var nombre = "getData(['module', $this->getUrl(0), 'posts', $this->getUrl(2), 'comment' ])); ?>"; var nom = "getData(['module', $this->getUrl(0), $this->getUrl(2), 'title' ]); ?>"; if( nombre === "1"){ var message = "Supprimer le commentaire de l'article " + nom + " ?"; - } else{ + } else { var message = "Supprimer les " + nombre + " commentaires de l'article " + nom + " ?"; } return core.confirm(message, function() { From 78f18afab8cd5105101b0e34ddc948d82cdd9dea Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 26 Apr 2021 22:05:46 +0200 Subject: [PATCH 07/21] Blog bug effacement commentaires --- module/blog/view/comment/comment.js.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module/blog/view/comment/comment.js.php b/module/blog/view/comment/comment.js.php index fa9fe18d..bf03e041 100755 --- a/module/blog/view/comment/comment.js.php +++ b/module/blog/view/comment/comment.js.php @@ -17,7 +17,7 @@ */ $(".blogCommentDelete").on("click", function() { var _this = $(this); - var nom = "getData(['module', $this->getUrl(0), $this->getUrl(2), 'title' ]); ?>"; + var nom = "getData(['module', $this->getUrl(0), 'posts', $this->getUrl(2), 'title' ]); ?>"; return core.confirm("Supprimer le commentaire de l'article " + nom + " ?", function() { $(location).attr("href", _this.attr("href")); }); @@ -28,7 +28,7 @@ $(".blogCommentDelete").on("click", function() { */ $(".blogCommentApproved").on("click", function() { var _this = $(this); - var nom = "getData(['module', $this->getUrl(0), $this->getUrl(2), 'title' ]); ?>"; + var nom = "getData(['module', $this->getUrl(0), 'posts', $this->getUrl(2), 'title' ]); ?>"; return core.confirm("Approuver le commentaire de l'article " + nom + " ?", function() { $(location).attr("href", _this.attr("href")); }); @@ -39,7 +39,7 @@ $(".blogCommentApproved").on("click", function() { */ $(".blogCommentRejected").on("click", function() { var _this = $(this); - var nom = "getData(['module', $this->getUrl(0), $this->getUrl(2), 'title' ]); ?>"; + var nom = "getData(['module', $this->getUrl(0), 'posts', $this->getUrl(2), 'title' ]); ?>"; return core.confirm("Rejeter le commentaire de l'article " + nom + " ?", function() { $(location).attr("href", _this.attr("href")); }); @@ -50,7 +50,7 @@ $(".blogCommentRejected").on("click", function() { */ $(".blogCommentDeleteAll").on("click", function() { var _this = $(this); - var nombre = "getData(['module', $this->getUrl(0), $this->getUrl(2), 'comment' ])); ?>"; + var nombre = "getData(['module', $this->getUrl(0), 'posts', $this->getUrl(2), 'comment' ])); ?>"; var nom = "getData(['module', $this->getUrl(0), $this->getUrl(2), 'title' ]); ?>"; if( nombre === "1"){ var message = "Supprimer le commentaire de l'article " + nom + " ?"; From d79861cbdfa1c9bbb67d53bebb1a6993ca1509ff Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 26 Apr 2021 22:07:04 +0200 Subject: [PATCH 08/21] =?UTF-8?q?Version=205.0=20(mise=20=C3=A0=20jour=20d?= =?UTF-8?q?u=20bug=20effacement=20des=20commentaires=20dans=2010504)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/blog/blog.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/blog/blog.php b/module/blog/blog.php index 43627c37..e9959dfb 100755 --- a/module/blog/blog.php +++ b/module/blog/blog.php @@ -15,7 +15,7 @@ class blog extends common { - const VERSION = '5.1'; + const VERSION = '5.0'; const REALNAME = 'Blog'; const DELETE = true; const UPDATE = '0.0'; From 59f0fe537f35d478c4f6b535847a4fdbe2126388 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Tue, 27 Apr 2021 08:53:16 +0200 Subject: [PATCH 09/21] DATADIRECTORY chemins corrects --- module/gallery/gallery.php | 2 +- module/news/news.php | 2 +- module/search/search.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php index c9c7c1ab..687bf911 100755 --- a/module/gallery/gallery.php +++ b/module/gallery/gallery.php @@ -21,7 +21,7 @@ class gallery extends common { const REALNAME = 'Galerie'; const DELETE = true; const UPDATE = '0.0'; - const DATADIRECTORY = self::DATA_DIR . 'gallery/'; + const DATADIRECTORY = self::DATA_DIR . 'gallery/pages/'; const SORT_ASC = 'SORT_ASC'; const SORT_DSC = 'SORT_DSC'; diff --git a/module/news/news.php b/module/news/news.php index 4dbb69da..3eb8ffb9 100755 --- a/module/news/news.php +++ b/module/news/news.php @@ -19,7 +19,7 @@ class news extends common { const REALNAME = 'Actualités'; const DELETE = true; const UPDATE = '0.0'; - const DATADIRECTORY = self::DATA_DIR . 'news/'; + const DATADIRECTORY = self::DATA_DIR . 'news/pages/'; public static $actions = [ 'add' => self::GROUP_MODERATOR, diff --git a/module/search/search.php b/module/search/search.php index f4b6d259..69b5c1d5 100755 --- a/module/search/search.php +++ b/module/search/search.php @@ -23,7 +23,7 @@ class search extends common { const REALNAME = 'Recherche'; const DELETE = true; const UPDATE = '0.0'; - const DATADIRECTORY = self::DATA_DIR . 'search/'; + const DATADIRECTORY = self::DATA_DIR . 'search/pages/'; public static $actions = [ 'index' => self::GROUP_VISITOR, From b58113a8ef27a2cf2b8357ea072605f388b48d77 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Tue, 27 Apr 2021 09:25:54 +0200 Subject: [PATCH 10/21] Sitemap articles par date --- core/module/sitemap/view/index/index.css | 18 +++++++++++- core/module/sitemap/view/index/index.php | 37 ++++++++++++++++++------ 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/core/module/sitemap/view/index/index.css b/core/module/sitemap/view/index/index.css index d7c543b0..05c72d6a 100755 --- a/core/module/sitemap/view/index/index.css +++ b/core/module/sitemap/view/index/index.css @@ -1 +1,17 @@ -/* Vide */ \ No newline at end of file +/** + * 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/ + */ + + ul { + list-style-type: circle; + } \ No newline at end of file diff --git a/core/module/sitemap/view/index/index.php b/core/module/sitemap/view/index/index.php index 6ae5361c..e52b486c 100755 --- a/core/module/sitemap/view/index/index.php +++ b/core/module/sitemap/view/index/index.php @@ -23,13 +23,22 @@
    - getData(['page', $childId, 'moduleId']) === 'blog') { ?> - - getData(['module',$childId]) as $articleId => $article): ?> - getData(['module',$childId,'posts',$articleId,'state']) === true) {?> + getData(['page', $childId, 'moduleId']) === 'blog' && + !empty($this->getData(['module', $childId, 'posts' ])) ) { ?> + getData(['module', $childId,'posts']), 'publishedOn', 'SORT_DESC'); + $articleIdsStates = helper::arrayCollumn($this->getData(['module', $childId, 'posts']), 'state', 'SORT_DESC'); + $articleIds = []; + foreach($articleIdsPublishedOns as $articleId => $articlePublishedOn) { + if($articlePublishedOn <= time() AND $articleIdsStates[$articleId]) { + $articleIds[] = $articleId; + } + } + foreach($articleIds as $articleId => $article): ?> + getData(['module',$childId,'posts',$article,'state']) === true) {?>
  • - + getData(['module',$childId,'posts',$article,'title']); ?>
    • getData(['page', $parentId, 'moduleId']) === 'blog' && !empty($this->getData(['module',$parentId, 'posts' ])) ) { ?> - getData(['module',$parentId, 'posts' ]) as $articleId => $article): ?> - getData(['module',$parentId,'posts',$articleId,'state']) === true ): ?> + getData(['module', $parentId,'posts']), 'publishedOn', 'SORT_DESC'); + $articleIdsStates = helper::arrayCollumn($this->getData(['module', $parentId, 'posts']), 'state', 'SORT_DESC'); + $articleIds = []; + foreach($articleIdsPublishedOns as $articleId => $articlePublishedOn) { + if($articlePublishedOn <= time() AND $articleIdsStates[$articleId]) { + $articleIds[] = $articleId; + } + } + foreach($articleIds as $articleId => $article): ?> + getData(['module',$parentId,'posts',$article,'state']) === true ): ?>
  • - + getData(['module',$parentId,'posts',$article,'title']); ?>
    • Date: Tue, 27 Apr 2021 10:07:46 +0200 Subject: [PATCH 11/21] changes et readme --- CHANGES.md | 6 +++++- README.md | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 302924a8..22b736c7 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,9 +1,13 @@ # Changelog +## version 10.5.04 +- Modifications : + - Sitemap : tri des articles de blog selon la date de publication + ## version 10.5.03 - Correction : - Options de configuration SMTP invisibles. -- Modification : +- Modification : - Libellé des erreurs 403 et 404. ## version 10.5.02 diff --git a/README.md b/README.md index 80eb8988..733f731a 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# ZwiiCMS 10.5.03 +# ZwiiCMS 10.5.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. From 01da51ac9bf398351bbcce483739254b85726f37 Mon Sep 17 00:00:00 2001 From: SylvainLelievre Date: Mon, 3 May 2021 09:02:58 +0200 Subject: [PATCH 12/21] =?UTF-8?q?Logo=20dans=20le=20mail=20envoy=C3=A9=20p?= =?UTF-8?q?ar=20form?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/layout/mail.php | 15 ++++++-- module/form/form.php | 16 ++++++++- module/form/view/config/config.js.php | 49 ++++++++++++++++++++++++--- module/form/view/config/config.php | 21 ++++++++++++ 4 files changed, 93 insertions(+), 8 deletions(-) diff --git a/core/layout/mail.php b/core/layout/mail.php index 5c588a95..10ed6083 100755 --- a/core/layout/mail.php +++ b/core/layout/mail.php @@ -109,7 +109,18 @@
    - getData(['locale', 'title']); ?> + + getData(['module', $this->getUrl(0), 'config', 'signature' ]) === 'logo' && is_file( 'site/file/source/'. $this->getData(['module', $this->getUrl(0), 'config', 'logoUrl' ]))){ + $imageFile = helper::baseUrl(false).'site/file/source/'. $this->getData(['module', $this->getUrl(0), 'config', 'logoUrl' ]) ; + $imageBase64 = base64_encode(file_get_contents($imageFile)); + ?> + getData(['locale', 'title']); + } ?> +
    @@ -124,4 +135,4 @@ - \ No newline at end of file + diff --git a/module/form/form.php b/module/form/form.php index c6a360be..373b6b40 100755 --- a/module/form/form.php +++ b/module/form/form.php @@ -63,6 +63,17 @@ class form extends common { public static $listUsers = [ ]; + public static $signature = [ + 'text' => 'Nom du site', + 'logo' => 'Logo du site' + ]; + + public static $logoWidth = [ + '40' => '40%', + '60' => '60%', + '80' => '80%', + '100' => '100%' + ]; /** * Configuration @@ -90,7 +101,10 @@ class form extends common { 'mail' => $this->getInput('formConfigMail') , 'pageId' => $this->getInput('formConfigPageIdToggle', helper::FILTER_BOOLEAN) === true ? $this->getInput('formConfigPageId', helper::FILTER_ID) : '', 'subject' => $this->getInput('formConfigSubject'), - 'replyto' => $this->getInput('formConfigMailReplyTo', helper::FILTER_BOOLEAN) + 'replyto' => $this->getInput('formConfigMailReplyTo', helper::FILTER_BOOLEAN), + 'signature' => $this->getInput('formConfigSignature'), + 'logoUrl' => $this->getInput('formConfigLogo'), + 'logoWidth' => $this->getInput('formConfigLogoWidth') ] ]); // Génération des données vides diff --git a/module/form/view/config/config.js.php b/module/form/view/config/config.js.php index 4d0788d2..ba0d3d13 100755 --- a/module/form/view/config/config.js.php +++ b/module/form/view/config/config.js.php @@ -133,13 +133,13 @@ $("#formConfigInputs") case "label": _this.parents(".formConfigInput").find("label[for*=formConfigRequired]").hide(); _this.parents(".formConfigInput").find(".formConfigLabelWrapper").slideDown(); - _this.parents(".formConfigInput").find(".formConfigValuesWrapper").slideUp(); + _this.parents(".formConfigInput").find(".formConfigValuesWrapper").slideUp(); break; default: _this.parents(".formConfigInput").find("label[for*=formConfigRequired]").show(); - _this.parents(".formConfigInput").find(".formConfigValuesWrapper").slideUp(); - _this.parents(".formConfigInput").find(".formConfigLabelWrapper").slideUp(); - } + _this.parents(".formConfigInput").find(".formConfigValuesWrapper").slideUp(); + _this.parents(".formConfigInput").find(".formConfigLabelWrapper").slideUp(); + } }); // Simule un changement de type au chargement de la page $(".formConfigType").trigger("change"); @@ -173,4 +173,43 @@ $("#formConfigPageIdToggle").on("change", function() { $("#formConfigPageId").val(""); }); } -}).trigger("change"); \ No newline at end of file +}).trigger("change"); + +/** +* Paramètres par défaut au chargement +*/ +$( document ).ready(function() { + + /** + * Masquer ou afficher la sélection du logo + */ + if ($("#formConfigSignature").val() !== "text") { + $("#formConfigLogoWrapper").addClass("disabled"); + $("#formConfigLogoWrapper").slideDown(); + $("#formConfigLogoWidthWrapper").addClass("disabled"); + $("#formConfigLogoWidthWrapper").slideDown(); + } else { + $("#formConfigLogoWrapper").removeClass("disabled"); + $("#formConfigLogoWrapper").slideUp(); + $("#formConfigLogoWidthWrapper").removeClass("disabled"); + $("#formConfigLogoWidthWrapper").slideUp(); + } +}); + +/** + * Masquer ou afficher la sélection du logo + */ +var formConfigSignatureDOM = $("#formConfigSignature"); +formConfigSignatureDOM.on("change", function() { + if ($(this).val() !== "text") { + $("#formConfigLogoWrapper").addClass("disabled"); + $("#formConfigLogoWrapper").slideDown(); + $("#formConfigLogoWidthWrapper").addClass("disabled"); + $("#formConfigLogoWidthWrapper").slideDown(); + } else { + $("#formConfigLogoWrapper").removeClass("disabled"); + $("#formConfigLogoWrapper").slideUp(); + $("#formConfigLogoWidthWrapper").removeClass("disabled"); + $("#formConfigLogoWidthWrapper").slideUp(); + } +}); diff --git a/module/form/view/config/config.php b/module/form/view/config/config.php index fea6d9ff..6631a20a 100755 --- a/module/form/view/config/config.php +++ b/module/form/view/config/config.php @@ -128,6 +128,27 @@ +
    +
    + 'Sélectionner le type de signature', + 'selected' => $this->getData(['module', $this->getUrl(0), 'config', 'signature']) + ]); ?> +
    +
    + 'Sélectionnez le logo du site', + 'label' => 'Logo', + 'value' => $this->getData(['module', $this->getUrl(0), 'config', 'logoUrl']) + ]); ?> +
    +
    + 'Sélectionner la largeur du logo', + 'selected' => $this->getData(['module', $this->getUrl(0), 'config', 'logoWidth']) + ]); ?> +
    +
    Date: Mon, 3 May 2021 16:32:36 +0200 Subject: [PATCH 13/21] Structure datadirectory dossier racine --- module/gallery/gallery.php | 22 ++++++++++---------- module/news/news.php | 24 +++++++++++----------- module/search/search.php | 24 +++++++++++----------- site/data/news/pages/accueil/theme.css | 1 + site/data/search/pages/recherche/theme.css | 1 + 5 files changed, 37 insertions(+), 35 deletions(-) create mode 100644 site/data/news/pages/accueil/theme.css create mode 100644 site/data/search/pages/recherche/theme.css diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php index 687bf911..ab4032bc 100755 --- a/module/gallery/gallery.php +++ b/module/gallery/gallery.php @@ -21,7 +21,7 @@ class gallery extends common { const REALNAME = 'Galerie'; const DELETE = true; const UPDATE = '0.0'; - const DATADIRECTORY = self::DATA_DIR . 'gallery/pages/'; + const DATADIRECTORY = self::DATA_DIR . 'gallery/'; const SORT_ASC = 'SORT_ASC'; const SORT_DSC = 'SORT_DSC'; @@ -171,7 +171,7 @@ class gallery extends common { $this->deleteData(['theme','gallery']); $this->setData(['module', $this->getUrl(0), 'theme', $data]); // Nom de la feuille de style - $this->setData(['module', $this->getUrl(0), 'theme', 'style', self::DATADIRECTORY . $this->getUrl(0) . '/theme.css']); + $this->setData(['module', $this->getUrl(0), 'theme', 'style', self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css']); } // Nouvelle version $this->setData(['module', $this->getUrl(0), 'config', 'versionData', '3.0']); @@ -186,7 +186,7 @@ class gallery extends common { */ private function init() { // Variable commune - $fileCSS = self::DATADIRECTORY . $this->getUrl(0) . '/theme.css' ; + $fileCSS = self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css' ; // Check la présence du thème if ( $this->getData(['module', $this->getUrl(0), 'theme']) === null ) { require_once('module/gallery/ressource/defaultdata.php'); @@ -195,10 +195,10 @@ class gallery extends common { $this->setData(['module', $this->getUrl(0), 'theme', 'style', $fileCSS]); } // Check la présence de la feuille de style - if ( !file_exists(self::DATADIRECTORY . $this->getUrl(0) . '/theme.css')) { + if ( !file_exists(self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css')) { // Dossier de l'instance - if (!is_dir(self::DATADIRECTORY . $this->getUrl(0) )) { - mkdir (self::DATADIRECTORY . $this->getUrl(0), 0777, true); + if (!is_dir(self::DATADIRECTORY . 'pages/' . $this->getUrl(0) )) { + mkdir (self::DATADIRECTORY . 'pages/' . $this->getUrl(0), 0777, true); } // Générer la feuille de CSS $content = file_get_contents('module/gallery/ressource/vartheme.css'); @@ -220,7 +220,7 @@ class gallery extends common { $content = str_replace('#legendTextColor#',$this->getData(['module', $this->getUrl(0), 'theme', 'legendTextColor']),$content ); $content = str_replace('#legendBgColor#',$this->getData(['module', $this->getUrl(0), 'theme', 'legendBgColor']),$content ); // Ecriture de la feuille de style - file_put_contents(self::DATADIRECTORY . $this->getUrl(0) . '/theme.css' , $content . $themeCss); + file_put_contents(self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css' , $content . $themeCss); // Nom de la feuille de style $this->setData(['module', $this->getUrl(0), 'theme', 'style', $fileCSS]); } @@ -728,8 +728,8 @@ class gallery extends common { // Soumission du formulaire if($this->isPost()) { // Dossier de l'instance - if (!is_dir(self::DATADIRECTORY . $this->getUrl(0) )) { - mkdir (self::DATADIRECTORY . $this->getUrl(0), 0777, true); + if (!is_dir(self::DATADIRECTORY . 'pages/' . $this->getUrl(0) )) { + mkdir (self::DATADIRECTORY . 'pages/' . $this->getUrl(0), 0777, true); } $this->setData(['module', $this->getUrl(0), 'theme', [ 'thumbAlign' => $this->getinput('galleryThemeThumbAlign', helper::FILTER_STRING_SHORT), @@ -746,7 +746,7 @@ class gallery extends common { 'legendAlign' => $this->getinput('galleryThemeLegendAlign', helper::FILTER_STRING_SHORT), 'legendTextColor' => $this->getinput('galleryThemeLegendTextColor', helper::FILTER_STRING_SHORT), 'legendBgColor' => $this->getinput('galleryThemeLegendBgColor', helper::FILTER_STRING_SHORT), - 'style' => self::DATADIRECTORY . $this->getUrl(0) . '/theme.css' + 'style' => self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css' ]]); // Création des fichiers CSS $content = file_get_contents('module/gallery/ressource/vartheme.css'); @@ -766,7 +766,7 @@ class gallery extends common { $content = str_replace('#legendHeight#',$this->getinput('galleryThemeLegendHeight'),$content ); $content = str_replace('#legendTextColor#',$this->getinput('galleryThemeLegendTextColor'),$content ); $content = str_replace('#legendBgColor#',$this->getinput('galleryThemeLegendBgColor'),$content ); - $success = file_put_contents(self::DATADIRECTORY . $this->getUrl(0) . '/theme.css', $content . $themeCss); + $success = file_put_contents(self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css', $content . $themeCss); // Valeurs en sortie $this->addOutput([ 'redirect' => helper::baseUrl() . $this->getUrl() . '/theme', diff --git a/module/news/news.php b/module/news/news.php index 3eb8ffb9..cc8d3189 100755 --- a/module/news/news.php +++ b/module/news/news.php @@ -19,7 +19,7 @@ class news extends common { const REALNAME = 'Actualités'; const DELETE = true; const UPDATE = '0.0'; - const DATADIRECTORY = self::DATA_DIR . 'news/pages/'; + const DATADIRECTORY = self::DATA_DIR . 'news/'; public static $actions = [ 'add' => self::GROUP_MODERATOR, @@ -188,16 +188,16 @@ class news extends common { $style .= ' background-clip: text;-webkit-background-clip: text;-webkit-text-fill-color: transparent;}'; // Dossier de l'instance - if (!is_dir(self::DATADIRECTORY . $this->getUrl(0))) { - mkdir (self::DATADIRECTORY . $this->getUrl(0) . '/theme.css', 0777, true); + if (!is_dir(self::DATADIRECTORY . 'pages/' . $this->getUrl(0))) { + mkdir (self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css', 0777, true); } - $success = file_put_contents(self::DATADIRECTORY . $this->getUrl(0) . '/theme.css', $style ); + $success = file_put_contents(self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css', $style ); // Fin feuille de style $this->setData(['module', $this->getUrl(0), 'theme',[ - 'style' => $success ? self::DATADIRECTORY . $this->getUrl(0) . '/theme.css' : '', + 'style' => $success ? self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css' : '', 'itemsHeight' => $this->getInput('newsConfigItemsHeight',helper::FILTER_STRING_SHORT), 'itemsBlur' => $this->getInput('newsConfigItemsBlur',helper::FILTER_STRING_SHORT) ]]); @@ -458,7 +458,7 @@ class news extends common { */ private function init() { - $fileCSS = self::DATADIRECTORY . $this->getUrl(0) . '/theme.css'; + $fileCSS = self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css'; // Données du module if ($this->getData(['module', $this->getUrl(0) ]) === null) { @@ -466,24 +466,24 @@ class news extends common { $this->setData(['module', $this->getUrl(0), 'config', init::$defaultData]); // Données de thème $this->setData(['module', $this->getUrl(0), 'theme', init::$defaultTheme]); - $this->setData(['module', $this->getUrl(0), 'theme', 'style', self::DATADIRECTORY . $this->getUrl(0) . '/theme.css' ]); + $this->setData(['module', $this->getUrl(0), 'theme', 'style', self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css' ]); } // Dossier de l'instance - if (!is_dir(self::DATADIRECTORY . $this->getUrl(0) )) { - mkdir (self::DATADIRECTORY . $this->getUrl(0) , 0777, true); + if (!is_dir(self::DATADIRECTORY . 'pages/' . $this->getUrl(0) )) { + mkdir (self::DATADIRECTORY . 'pages/' . $this->getUrl(0) , 0777, true); } // Check la présence de la feuille de style - if ( !file_exists(self::DATADIRECTORY . $this->getUrl(0) . '/theme.css')) { + if ( !file_exists(self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css')) { // Générer la feuille de CSS $style = '.newsContent {height: ' . $this->getData([ 'module', $this->getUrl(0), 'theme', 'itemsHeight' ]) .';}'; $style .= '.newsBlur {background: linear-gradient(#333 ' . $this->getData([ 'module', $this->getUrl(0), 'theme', 'itemsBlur' ]) . ',#FFF );'; $style .= ' background-clip: text;-webkit-background-clip: text;-webkit-text-fill-color: transparent;}'; // Sauver la feuille de style - file_put_contents(self::DATADIRECTORY . $this->getUrl(0) . '/theme.css' , $style ); + file_put_contents(self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css' , $style ); // Stocker le nom de la feuille de style - $this->setData(['module', $this->getUrl(0), 'theme', 'style', self::DATADIRECTORY . $this->getUrl(0) . '/theme.css']); + $this->setData(['module', $this->getUrl(0), 'theme', 'style', self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css']); } } } diff --git a/module/search/search.php b/module/search/search.php index 69b5c1d5..0fcf2b29 100755 --- a/module/search/search.php +++ b/module/search/search.php @@ -23,7 +23,7 @@ class search extends common { const REALNAME = 'Recherche'; const DELETE = true; const UPDATE = '0.0'; - const DATADIRECTORY = self::DATA_DIR . 'search/pages/'; + const DATADIRECTORY = self::DATA_DIR . 'search/'; public static $actions = [ 'index' => self::GROUP_VISITOR, @@ -56,7 +56,7 @@ class search extends common { if ($this->getData(['module', $this->getUrl(0), 'previewLength']) ) { $data = $this->getData(['module', $this->getUrl(0)]); // Feuille de style - $fileCSS = self::DATADIRECTORY . $this->getUrl(0) . '/theme.css' ; + $fileCSS = self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css' ; $this->setData(['module', $this->getUrl(0), 'config', [ 'submitText' => $this->getData(['module', $this->getUrl(0), 'submitText']), 'placeHolder' => $this->getData(['module', $this->getUrl(0), 'placeHolder']), @@ -70,8 +70,8 @@ class search extends common { ]]); // Dossier de l'instance - if (!is_dir(self::DATADIRECTORY . $this->getUrl(0) )) { - mkdir (self::DATADIRECTORY . $this->getUrl(0), 0777, true); + if (!is_dir(self::DATADIRECTORY . 'pages/' . $this->getUrl(0) )) { + mkdir (self::DATADIRECTORY . 'pages/' . $this->getUrl(0), 0777, true); } // Générer la feuille de CSS $style = '.keywordColor {background: ' . $this->getData(['module', $this->getUrl(0), 'theme', 'keywordColor']) . ';}'; @@ -94,7 +94,7 @@ class search extends common { private function init(){ - $fileCSS = self::DATADIRECTORY . $this->getUrl(0) . '/theme.css' ; + $fileCSS = self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css' ; if ($this->getData(['module', $this->getUrl(0)]) === null) { // Données du module @@ -102,20 +102,20 @@ class search extends common { $this->setData(['module', $this->getUrl(0), 'config',init::$defaultConfig ]); // Données de thème $this->setData(['module', $this->getUrl(0), 'theme',init::$defaultTheme ]); - $this->setData(['module', $this->getUrl(0), 'theme', 'style', self::DATADIRECTORY . $this->getUrl(0) . '/theme.css' ]); + $this->setData(['module', $this->getUrl(0), 'theme', 'style', self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css' ]); } // Dossier de l'instance - if (!is_dir(self::DATADIRECTORY . $this->getUrl(0))) { - mkdir (self::DATADIRECTORY . $this->getUrl(0), 0777, true); + if (!is_dir(self::DATADIRECTORY . 'pages/' . $this->getUrl(0))) { + mkdir (self::DATADIRECTORY . 'pages/' . $this->getUrl(0), 0777, true); } // Check la présence de la feuille de style - if ( !file_exists(self::DATADIRECTORY . $this->getUrl(0) . '/theme.css')) { + if ( !file_exists(self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css')) { // Générer la feuille de CSS $style = '.keywordColor {background: ' . $this->getData([ 'module', $this->getUrl(0), 'theme', 'keywordColor' ]) . ';}'; // Sauver la feuille de style - file_put_contents(self::DATADIRECTORY . $this->getUrl(0) . '/theme.css', $style ); + file_put_contents(self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css', $style ); // Stocker le nom de la feuille de style $this->setData(['module', $this->getUrl(0) , 'theme', 'style', $fileCSS]); } @@ -137,7 +137,7 @@ class search extends common { // Générer la feuille de CSS $style = '.keywordColor {background:' . $this->getInput('searchKeywordColor') . ';}'; - $success = file_put_contents(self::DATADIRECTORY . $this->getUrl(0) . '/theme.css' , $style ); + $success = file_put_contents(self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css' , $style ); // Fin feuille de style // Soumission du formulaire @@ -150,7 +150,7 @@ class search extends common { ]]); $this->setData(['module', $this->getUrl(0), 'theme',[ 'keywordColor' => $this->getInput('searchKeywordColor'), - 'style' => $success ? self::DATADIRECTORY . $this->getUrl(0) . '/theme.css' : '', + 'style' => $success ? self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css' : '', ]]); diff --git a/site/data/news/pages/accueil/theme.css b/site/data/news/pages/accueil/theme.css new file mode 100644 index 00000000..bb8e5fb5 --- /dev/null +++ b/site/data/news/pages/accueil/theme.css @@ -0,0 +1 @@ +.newsContent {height:200px;}.newsBlur {background: linear-gradient(#333 90%,rgba(255,255,255,0) ); background-clip: text;-webkit-background-clip: text;-webkit-text-fill-color: transparent;} \ No newline at end of file diff --git a/site/data/search/pages/recherche/theme.css b/site/data/search/pages/recherche/theme.css new file mode 100644 index 00000000..06f458a6 --- /dev/null +++ b/site/data/search/pages/recherche/theme.css @@ -0,0 +1 @@ +.keywordColor {background:rgba(1, 41, 229, 1);} \ No newline at end of file From 12e59b0b4bf69b92c4354574dcd15d3e5326c0b9 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 3 May 2021 18:35:06 +0200 Subject: [PATCH 14/21] Supp module download --- module/download/download.php | 978 ---------------- module/download/ressource/feed-icon-16.gif | Bin 652 -> 0 bytes module/download/vendor/FeedWriter/ATOM.php | 38 - module/download/vendor/FeedWriter/Feed.php | 1017 ----------------- .../FeedWriter/InvalidOperationException.php | 33 - module/download/vendor/FeedWriter/Item.php | 413 ------- module/download/vendor/FeedWriter/README.md | 42 - module/download/vendor/FeedWriter/RSS1.php | 37 - module/download/vendor/FeedWriter/RSS2.php | 37 - module/download/view/add/add.css | 18 - module/download/view/add/add.js.php | 54 - module/download/view/add/add.php | 139 --- module/download/view/comment/comment.css | 18 - module/download/view/comment/comment.js.php | 62 - module/download/view/comment/comment.php | 22 - module/download/view/config/config.css | 18 - module/download/view/config/config.js.php | 21 - module/download/view/config/config.php | 60 - module/download/view/edit/edit.css | 18 - module/download/view/edit/edit.js.php | 66 -- module/download/view/edit/edit.php | 159 --- module/download/view/index/index.css | 69 -- module/download/view/item/item.css | 63 - module/download/view/item/item.js.php | 43 - module/download/view/list/list.php | 1 - module/download/view/rss/rss.php | 1 - module/download/view/stats/stats.css | 18 - module/download/view/stats/stats.js.php | 22 - module/download/view/stats/stats.php | 36 - 29 files changed, 3503 deletions(-) delete mode 100644 module/download/download.php delete mode 100644 module/download/ressource/feed-icon-16.gif delete mode 100644 module/download/vendor/FeedWriter/ATOM.php delete mode 100644 module/download/vendor/FeedWriter/Feed.php delete mode 100644 module/download/vendor/FeedWriter/InvalidOperationException.php delete mode 100644 module/download/vendor/FeedWriter/Item.php delete mode 100644 module/download/vendor/FeedWriter/README.md delete mode 100644 module/download/vendor/FeedWriter/RSS1.php delete mode 100644 module/download/vendor/FeedWriter/RSS2.php delete mode 100644 module/download/view/add/add.css delete mode 100644 module/download/view/add/add.js.php delete mode 100644 module/download/view/add/add.php delete mode 100644 module/download/view/comment/comment.css delete mode 100644 module/download/view/comment/comment.js.php delete mode 100644 module/download/view/comment/comment.php delete mode 100644 module/download/view/config/config.css delete mode 100644 module/download/view/config/config.js.php delete mode 100644 module/download/view/config/config.php delete mode 100644 module/download/view/edit/edit.css delete mode 100644 module/download/view/edit/edit.js.php delete mode 100644 module/download/view/edit/edit.php delete mode 100644 module/download/view/index/index.css delete mode 100644 module/download/view/item/item.css delete mode 100644 module/download/view/item/item.js.php delete mode 100644 module/download/view/list/list.php delete mode 100644 module/download/view/rss/rss.php delete mode 100644 module/download/view/stats/stats.css delete mode 100644 module/download/view/stats/stats.js.php delete mode 100644 module/download/view/stats/stats.php diff --git a/module/download/download.php b/module/download/download.php deleted file mode 100644 index ce14d0d7..00000000 --- a/module/download/download.php +++ /dev/null @@ -1,978 +0,0 @@ - - * @copyright Copyright (C) 2008-2018, Rémi Jean - * @license GNU General Public License, version 3 - * @link http://zwiicms.fr/ - */ - -class download extends common { - - const VERSION = '1.2'; - const REALNAME = 'Téléchargement'; - const DELETE = true; - const UPDATE = '0.0'; - const DATADIRECTORY = ''; // Contenu localisé inclus par défaut (page.json et module.json) - - // Constantes du module - const EDIT_OWNER = 'owner'; - const EDIT_GROUP = 'group'; - const EDIT_ALL = 'all'; - - public static $actions = [ - 'add' => self::GROUP_MODERATOR, - 'comment' => self::GROUP_MODERATOR, - 'commentApprove' => self::GROUP_MODERATOR, - 'commentDelete' => self::GROUP_MODERATOR, - 'commentDeleteAll' => self::GROUP_MODERATOR, - 'config' => self::GROUP_MODERATOR, - 'delete' => self::GROUP_MODERATOR, - 'edit' => self::GROUP_MODERATOR, - 'stats' => self::GROUP_MODERATOR, - 'statsDeleteAll' => self::GROUP_MODERATOR, - 'index' => self::GROUP_VISITOR, - 'rss' => self::GROUP_VISITOR, - 'downloadFile' => self::GROUP_VISITOR, - 'list' =>self::GROUP_VISITOR - ]; - - public static $items = []; - - // Signature de l'item - public static $itemSignature = ''; - - // Signature du commentaire - public static $editCommentSignature = ''; - - public static $comments = []; - - public static $nbCommentsApproved = 0; - - public static $commentsDelete; - - // Signatures des commentaires déjà saisis - public static $commentsSignature = []; - - public static $pages; - - // Nombre de téléchargements - public static $statSum = 0; - - public static $states = [ - false => 'Brouillon', - true => 'Publié' - ]; - - public static $pictureSizes = [ - '20' => 'Très petite', - '30' => 'Petite', - '40' => 'Grande', - '50' => 'Très Grande', - '100' => 'Pleine largeur', - ]; - - public static $picturePositions = [ - 'left' => 'À gauche', - 'right' => 'À droite ', - ]; - - //Paramètre longueur maximale des commentaires en nb de caractères - public static $commentLength = [ - '500' => '500', - '1000' => '1000', - '2000' => '2000', - '5000' => '5000', - '10000' => '10000' - ]; - - // Nombre d'objets par page - public static $ItemsList = [ - 4 => '4 articles', - 8 => '8 articles', - 12 => '12 articles', - 16 => '16 articles', - 22 => '22 articles' - ]; - - // Permissions d'un item - public static $itemConsent = [ - self::EDIT_ALL => 'Tous les groupes', - self::EDIT_GROUP => 'Groupe du propriétaire', - self::EDIT_OWNER => 'Propriétaire' - ]; - - - public static $itemLicense = [ - 'none'=> 'Non définie', - 'cc' => 'Licence libre Creative Common, partage autorisé', - 'gnu' => 'Licence libre GNU, partage autorisé', - 'mit' => 'Licence libre MIT, partage autorisé', - 'owner' => 'Licence Propriétaire' - ]; - - public static $users = []; - - /** - * Mise à jour du module - * Appelée par les fonctions index et config - */ - private function update() { - // Version 5.0 - if (version_compare($this->getData(['module', $this->getUrl(0), 'config', 'versionData']), '1.1', '<') ) { - $this->setData(['module', $this->getUrl(0), 'config', 'itemsperPage', 6]); - $this->setData(['module', $this->getUrl(0), 'config', 'versionData','1.2']); - } - } - - /** - * Flux RSS - */ - public function rss() { - // Inclure les classes - include_once 'module/news/vendor/FeedWriter/Item.php'; - include_once 'module/news/vendor/FeedWriter/Feed.php'; - include_once 'module/news/vendor/FeedWriter/RSS2.php'; - include_once 'module/news/vendor/FeedWriter/InvalidOperationException.php'; - - date_default_timezone_set('UTC'); - $feeds = new \FeedWriter\RSS2(); - - // En-tête - $feeds->setTitle($this->getData (['page', $this->getUrl(0), 'title'])); - $feeds->setLink(helper::baseUrl() . $this->getUrl(0)); - $feeds->setDescription($this->getData (['page', $this->getUrl(0), 'metaDescription'])); - $feeds->setChannelElement('language', 'fr-FR'); - $feeds->setDate(date('r',time())); - $feeds->addGenerator(); - // Corps des items - $itemIdsPublishedOns = helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'items']), 'publishedOn', 'SORT_DESC'); - $itemIdsStates = helper::arrayCollumn($this->getData(['module', $this->getUrl(0),'items']), 'state', 'SORT_DESC'); - foreach($itemIdsPublishedOns as $itemId => $itemPublishedOn) { - if($itemPublishedOn <= time() AND $itemIdsStates[$itemId]) { - // Miniature - $parts = explode('/',$this->getData(['module', $this->getUrl(0), 'items', $itemId, 'picture'])); - $thumb = str_replace ($parts[(count($parts)-1)],'mini_' . $parts[(count($parts)-1)], $this->getData(['module', $this->getUrl(0), 'items', $itemId, 'picture'])); - // Créer les items du flux - $newsitem = $feeds->createNewItem(); - // Signature de l'item - $author = $this->signature($this->getData(['module', $this->getUrl(0), 'items', $itemId, 'userId'])); - $newsitem->addElementArray([ - 'title' => $this->getData(['module', $this->getUrl(0), 'items', $itemId, 'title']), - 'link' => helper::baseUrl() .$this->getUrl(0) . '/' . $itemId, - 'description' => '' . $this->getData(['module', $this->getUrl(0), 'items', $itemId, 'title']) - . '' . - $this->getData(['module', $this->getUrl(0), 'items', $itemId, 'content']), - ]); - $newsitem->setAuthor($author,'no@mail.com'); - $newsitem->setId(helper::baseUrl() .$this->getUrl(0) . '/' . $itemId); - $newsitem->setDate(date('r', $this->getData(['module', $this->getUrl(0), 'items', $itemId, 'publishedOn']))); - $imageData = getimagesize(helper::baseUrl(false) . self::FILE_DIR . 'thumb/' . $thumb); - $newsitem->addEnclosure( helper::baseUrl(false) . self::FILE_DIR . 'thumb/' . $thumb, - $imageData[0] * $imageData[1], - $imageData['mime'] - ); - $feeds->addItem($newsitem); - } - } - - // Valeurs en sortie - $this->addOutput([ - 'display' => self::DISPLAY_RSS, - 'content' => $feeds->generateFeed(), - 'view' => 'rss' - ]); - } - - /** - * Édition - */ - public function add() { - // Soumission du formulaire - if($this->isPost()) { - // Modification de l'userId - if($this->getUser('group') === self::GROUP_ADMIN){ - $newuserid = $this->getInput('downloadAddUserId', helper::FILTER_STRING_SHORT, true); - } - else{ - $newuserid = $this->getUser('id'); - } - // Incrémente l'id de l'item - $itemId = helper::increment($this->getInput('downloadAddTitle', helper::FILTER_ID), $this->getData(['page'])); - $itemId = helper::increment($itemId, (array) $this->getData(['module', $this->getUrl(0)])); - $itemId = helper::increment($itemId, array_keys(self::$actions)); - // Crée l'item - $this->setData(['module', - $this->getUrl(0), - 'items', - $itemId, [ - 'comment' => $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'comment']), - 'content' => $this->getInput('downloadAddContent', null), - 'picture' => $this->getInput('downloadAddPicture', helper::FILTER_STRING_SHORT, true), - 'file' => $this->getInput('downloadAddFile', helper::FILTER_STRING_SHORT, true), - 'fileVersion' => $this->getInput('downloadAddFileVersion', helper::FILTER_STRING_SHORT, true), - 'fileDate' => $this->getInput('downloadAddFileDate', helper::FILTER_DATETIME, true), - 'fileLicense' => $this->getInput('downloadAddFileLicense', helper::FILTER_STRING_SHORT, true), - 'fileAuthor' => $this->getInput('downloadAddFileAuthor', helper::FILTER_STRING_SHORT, true), - 'fileStats' => [], - 'publishedOn' => $this->getInput('downloadAddPublishedOn', helper::FILTER_DATETIME, true), - 'state' => $this->getInput('downloadAddState', helper::FILTER_BOOLEAN), - 'title' => $this->getInput('downloadAddTitle', helper::FILTER_STRING_SHORT, true), - 'userId' => $newuserid, - 'editConsent' => $this->getInput('downloadAddConsent') === self::EDIT_GROUP ? $this->getUser('group') : $this->getInput('downloadAddConsent'), - 'commentMaxlength' => $this->getInput('downloadAddCommentMaxlength'), - 'commentApproved' => $this->getInput('downloadAddCommentApproved', helper::FILTER_BOOLEAN), - 'commentClose' => $this->getInput('downloadAddCommentClose', helper::FILTER_BOOLEAN), - 'commentNotification' => $this->getInput('downloadAddCommentNotification', helper::FILTER_BOOLEAN), - 'commentGroupNotification' => $this->getInput('downloadAddCommentGroupNotification', helper::FILTER_INT) - ] - ]); - // Valeurs en sortie - $this->addOutput([ - 'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config', - 'notification' => 'Nouvel item créé', - 'state' => true - ]); - } - // Liste des utilisateurs - self::$users = helper::arrayCollumn($this->getData(['user']), 'firstname'); - ksort(self::$users); - foreach(self::$users as $userId => &$userFirstname) { - $userFirstname = $userFirstname . ' ' . $this->getData(['user', $userId, 'lastname']); - } - unset($userFirstname); - // Valeurs en sortie - $this->addOutput([ - 'title' => 'Nouvel item', - 'vendor' => [ - 'flatpickr', - 'tinymce' - ], - 'view' => 'add' - ]); - } - - /** - * Liste des commentaires - */ - public function comment() { - $comments = $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2),'comment']); - self::$commentsDelete = template::button('downloadCommentDeleteAll', [ - 'class' => 'downloadCommentDeleteAll buttonRed', - 'href' => helper::baseUrl() . $this->getUrl(0) . '/commentDeleteAll/' . $this->getUrl(2).'/' . $_SESSION['csrf'] , - 'ico' => 'cancel', - 'value' => 'Tout effacer' - ]); - // Ids des commentaires par ordre de création - $commentIds = array_keys(helper::arrayCollumn($comments, 'createdOn', 'SORT_DESC')); - // Pagination - $pagination = helper::pagination($commentIds, $this->getUrl(), $this->getData(['module', $this->getUrl(0),'config', 'itemsperPage'])); - // Liste des pages - self::$pages = $pagination['pages']; - // Commentaires en fonction de la pagination - for($i = $pagination['first']; $i < $pagination['last']; $i++) { - // Met en forme le tableau - $comment = $comments[$commentIds[$i]]; - // Bouton d'approbation - $buttonApproval = ''; - // Compatibilité avec les commentaires des versions précédentes, les valider - $comment['approval'] = array_key_exists('approval', $comment) === false ? true : $comment['approval'] ; - if ( $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2),'commentApproved']) === true) { - $buttonApproval = template::button('downloadCommentApproved' . $commentIds[$i], [ - 'class' => $comment['approval'] === true ? 'downloadCommentRejected buttonGreen' : 'downloadCommentApproved buttonRed' , - 'href' => helper::baseUrl() . $this->getUrl(0) . '/commentApprove/' . $this->getUrl(2) . '/' . $commentIds[$i] . '/' . $_SESSION['csrf'] , - 'value' => $comment['approval'] === true ? 'A' : 'R' - ]); - } - self::$comments[] = [ - mb_detect_encoding(strftime('%d %B %Y - %H:%M', $comment['createdOn']), 'UTF-8', true) - ? strftime('%d %B %Y - %H:%M', $comment['createdOn']) - : utf8_encode(strftime('%d %B %Y - %H:%M', $comment['createdOn'])), - $comment['content'], - $comment['userId'] ? $this->getData(['user', $comment['userId'], 'firstname']) . ' ' . $this->getData(['user', $comment['userId'], 'lastname']) : $comment['author'], - $buttonApproval, - template::button('downloadCommentDelete' . $commentIds[$i], [ - 'class' => 'downloadCommentDelete buttonRed', - 'href' => helper::baseUrl() . $this->getUrl(0) . '/commentDelete/' . $this->getUrl(2) . '/' . $commentIds[$i] . '/' . $_SESSION['csrf'] , - 'value' => template::ico('cancel') - ]) - ]; - } - // Valeurs en sortie - $this->addOutput([ - 'title' => 'Gestion des commentaires : '. $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'title']), - 'view' => 'comment' - ]); - } - - /** - * Suppression de commentaire - */ - public function commentDelete() { - // Le commentaire n'existe pas - if($this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'comment', $this->getUrl(3)]) === null) { - // Valeurs en sortie - $this->addOutput([ - 'access' => false - ]); - } - // Jeton incorrect - elseif ($this->getUrl(4) !== $_SESSION['csrf']) { - // Valeurs en sortie - $this->addOutput([ - 'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config', - 'notification' => 'Action non autorisée' - ]); - } - // Suppression - else { - $this->deleteData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'comment', $this->getUrl(3)]); - // Valeurs en sortie - $this->addOutput([ - 'redirect' => helper::baseUrl() . $this->getUrl(0) . '/comment/'.$this->getUrl(2), - 'notification' => 'Commentaire supprimé', - 'state' => true - ]); - } - } - - /** - * Suppression de tous les commentaires de l'item $this->getUrl(2) - */ - public function commentDeleteAll() { - // Jeton incorrect - if ($this->getUrl(3) !== $_SESSION['csrf']) { - // Valeurs en sortie - $this->addOutput([ - 'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config', - 'notification' => 'Action non autorisée' - ]); - } - // Suppression - else { - $this->setData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'comment',[] ]); - // Valeurs en sortie - $this->addOutput([ - 'redirect' => helper::baseUrl() . $this->getUrl(0) . '/comment', - 'notification' => 'Commentaires supprimés', - 'state' => true - ]); - } - } - - /** - * Approbation oou désapprobation de commentaire - */ - public function commentApprove() { - // Le commentaire n'existe pas - if($this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'comment', $this->getUrl(3)]) === null) { - // Valeurs en sortie - $this->addOutput([ - 'access' => false - ]); - } - // Jeton incorrect - elseif ($this->getUrl(4) !== $_SESSION['csrf']) { - // Valeurs en sortie - $this->addOutput([ - 'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config', - 'notification' => 'Action non autorisée' - ]); - } - // Inversion du statut - else { - $approved = !$this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'comment', $this->getUrl(3), 'approval']) ; - $this->setData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'comment', $this->getUrl(3), [ - 'author' => $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'comment', $this->getUrl(3), 'author']), - 'content' => $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'comment', $this->getUrl(3), 'content']), - 'createdOn' => $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'comment', $this->getUrl(3), 'createdOn']), - 'userId' => $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'comment', $this->getUrl(3), 'userId']), - 'approval' => $approved - ]]); - - // Valeurs en sortie - $this->addOutput([ - 'redirect' => helper::baseUrl() . $this->getUrl(0) . '/comment/'.$this->getUrl(2), - 'notification' => $approved ? 'Commentaire approuvé' : 'Commentaire rejeté', - 'state' => $approved - ]); - } - } - - /** - * Configuration - */ - public function config() { - // Mise à jour des données de module - $this->update(); - // Soumission du formulaire - if($this->isPost()) { - $this->setData(['module', $this->getUrl(0), 'config',[ - 'feeds' => $this->getInput('downloadConfigShowFeeds',helper::FILTER_BOOLEAN), - 'feedsLabel' => $this->getInput('downloadConfigFeedslabel',helper::FILTER_STRING_SHORT), - 'itemsperPage' => $this->getInput('blogConfigItemsperPage', helper::FILTER_INT,true), - 'versionData' => $this->getData(['module', $this->getUrl(0), 'config', 'versionData']) - ]]); - // Valeurs en sortie - $this->addOutput([ - 'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config', - 'notification' => 'Modifications enregistrées', - 'state' => true - ]); - } else { - // Ids des items par ordre de publication - $itemIds = array_keys(helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'items']), 'publishedOn', 'SORT_DESC')); - // Gestion des droits d'accès - $filterData=[]; - foreach ($itemIds as $key => $value) { - if ( - ( // Propriétaire - $this->getData(['module', $this->getUrl(0), 'items', $value,'editConsent']) === self::EDIT_OWNER - AND ( $this->getData(['module', $this->getUrl(0), 'items', $value,'userId']) === $this->getUser('id') - OR $this->getUser('group') === self::GROUP_ADMIN ) - ) - - OR ( - // Groupe - $this->getData(['module', $this->getUrl(0), 'items', $value,'editConsent']) !== self::EDIT_OWNER - AND $this->getUser('group') >= $this->getData(['module',$this->getUrl(0), 'items', $value,'editConsent']) - ) - OR ( - // Tout le monde - $this->getData(['module', $this->getUrl(0), 'items', $value,'editConsent']) === self::EDIT_ALL - ) - ) { - $filterData[] = $value; - } - } - $itemIds = $filterData; - // Pagination - $pagination = helper::pagination($itemIds, $this->getUrl(), $this->getData(['module', $this->getUrl(0),'config', 'itemsperPage'])); - // Liste des pages - self::$pages = $pagination['pages']; - // items en fonction de la pagination - for($i = $pagination['first']; $i < $pagination['last']; $i++) { - // Nombre de commentaires à approuver et approuvés - $approvals = helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i], 'comment' ]),'approval', 'SORT_DESC'); - if ( is_array($approvals) ) { - $a = array_values($approvals); - $toApprove = count(array_keys($a,false)); - $approved = count(array_keys($a,true)); - } else { - $toApprove = 0; - $approved = count($this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i],'comment'])); - } - // Met en forme le tableau - $date = mb_detect_encoding(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i], 'fileDate'])), 'UTF-8', true) - ? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i], 'fileDate'])) - : utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i], 'fileDate']))); - $heure = mb_detect_encoding(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i], 'fileDate'])), 'UTF-8', true) - ? strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i], 'fileDate'])) - : utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i], 'fileDate']))); - $stat = count(helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i],'fileStats']), 'time') ) === 0 - ? '0' - : '' . - count(helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i],'fileStats']), 'time') ) . - ''; - self::$items[] = [ - '' . - $this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i], 'title']) . - '', - $this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i], 'fileVersion']), - $date .' à '. $heure, - $stat, - self::$states[$this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i], 'state'])], - // Bouton pour afficher les commentaires de l'item - template::button('downloadConfigComment' . $itemIds[$i], [ - 'class' => ($toApprove || $approved ) > 0 ? 'buttonBlue' : 'buttonGrey' , - 'href' => ($toApprove || $approved ) > 0 ? helper::baseUrl() . $this->getUrl(0) . '/comment/' . $itemIds[$i] : '', - 'value' => $toApprove > 0 ? $toApprove . '/' . $approved : $approved - ]), - template::button('downloadConfigEdit' . $itemIds[$i], [ - 'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $itemIds[$i] . '/' . $_SESSION['csrf'], - 'value' => template::ico('pencil') - ]), - template::button('downloadConfigDelete' . $itemIds[$i], [ - 'class' => 'downloadConfigDelete buttonRed', - 'href' => helper::baseUrl() . $this->getUrl(0) . '/delete/' . $itemIds[$i] . '/' . $_SESSION['csrf'], - 'value' => template::ico('cancel') - ]) - ]; - } - // Valeurs en sortie - $this->addOutput([ - 'title' => 'Configuration du module', - 'view' => 'config' - ]); - } - } - - /** - * Suppression - */ - public function delete() { - if($this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2)]) === null) { - // Valeurs en sortie - $this->addOutput([ - 'access' => false - ]); - } - // Jeton incorrect - elseif ($this->getUrl(3) !== $_SESSION['csrf']) { - // Valeurs en sortie - $this->addOutput([ - 'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config', - 'notification' => 'Action non autorisée' - ]); - } - // Suppression - else { - $this->deleteData(['module', $this->getUrl(0), 'items', $this->getUrl(2)]); - // Valeurs en sortie - $this->addOutput([ - 'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config', - 'notification' => 'Item supprimé', - 'state' => true - ]); - } - } - - /** - * Édition - */ - public function edit() { - // Jeton incorrect - if ($this->getUrl(3) !== $_SESSION['csrf']) { - // Valeurs en sortie - $this->addOutput([ - 'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config', - 'notification' => 'Action non autorisée' - ]); - } - // L'item n'existe pas - if($this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2)]) === null) { - // Valeurs en sortie - $this->addOutput([ - 'access' => false - ]); - } - // L'item existe - else { - // Soumission du formulaire - if($this->isPost()) { - if($this->getUser('group') === self::GROUP_ADMIN){ - $newuserid = $this->getInput('downloadEditUserId', helper::FILTER_STRING_SHORT, true); - } - else{ - $newuserid = $this->getUser('id'); - } - $itemId = $this->getInput('downloadEditTitle', helper::FILTER_ID, true); - // Incrémente le nouvel id de l'item - if($itemId !== $this->getUrl(2)) { - $itemId = helper::increment($itemId, $this->getData(['page'])); - $itemId = helper::increment($itemId, $this->getData(['module', $this->getUrl(0),'items'])); - $itemId = helper::increment($itemId, array_keys(self::$actions)); - } - $this->setData(['module', - $this->getUrl(0), - 'items', - $itemId, [ - 'comment' => $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'comment']), - 'content' => $this->getInput('downloadEditContent', null), - 'picture' => $this->getInput('downloadEditPicture', helper::FILTER_STRING_SHORT, true), - 'file' => $this->getInput('downloadEditFile', helper::FILTER_STRING_SHORT, true), - 'fileVersion' => $this->getInput('downloadEditFileVersion', helper::FILTER_STRING_SHORT, true), - 'fileDate' => $this->getInput('downloadEditFileDate', helper::FILTER_DATETIME, true), - 'fileStats' => $this->getData(['module',$this->getUrl(0), 'items', $this->getUrl(2), 'fileStats']), - 'fileLicense' => $this->getInput('downloadEditFileLicense', helper::FILTER_STRING_SHORT, true), - 'fileAuthor' => $this->getInput('downloadEditFileAuthor', helper::FILTER_STRING_SHORT, true), - 'publishedOn' => $this->getInput('downloadEditPublishedOn', helper::FILTER_DATETIME, true), - 'state' => $this->getInput('downloadEditState', helper::FILTER_BOOLEAN), - 'title' => $this->getInput('downloadEditTitle', helper::FILTER_STRING_SHORT, true), - 'userId' => $newuserid, - 'editConsent' => $this->getInput('downloadEditConsent') === self::EDIT_GROUP ? $this->getUser('group') : $this->getInput('downloadEditConsent'), - 'commentMaxlength' => $this->getInput('downloadEditCommentMaxlength'), - 'commentApproved' => $this->getInput('downloadEditCommentApproved', helper::FILTER_BOOLEAN), - 'commentClose' => $this->getInput('downloadEditCommentClose', helper::FILTER_BOOLEAN), - 'commentNotification' => $this->getInput('downloadEditCommentNotification', helper::FILTER_BOOLEAN), - 'commentGroupNotification' => $this->getInput('downloadEditCommentGroupNotification', helper::FILTER_INT) - ] - ]); - // Supprime l'ancien item - if($itemId !== $this->getUrl(2)) { - $this->deleteData(['module', $this->getUrl(0), 'items', $this->getUrl(2)]); - } - // Valeurs en sortie - $this->addOutput([ - 'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config', - 'notification' => 'Modifications enregistrées', - 'state' => true - ]); - } - // Liste des utilisateurs - self::$users = helper::arrayCollumn($this->getData(['user']), 'firstname'); - ksort(self::$users); - foreach(self::$users as $userId => &$userFirstname) { - // Les membres ne sont pas éditeurs, les exclure de la liste - if ( $this->getData(['user', $userId, 'group']) < self::GROUP_MODERATOR) { - unset(self::$users[$userId]); - } - $userFirstname = $userFirstname . ' ' . $this->getData(['user', $userId, 'lastname']) . ' (' . self::$groupEdits[$this->getData(['user', $userId, 'group'])] . ')'; - } - unset($userFirstname); - // Valeurs en sortie - $this->addOutput([ - 'title' => $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'title']), - 'vendor' => [ - 'flatpickr', - 'tinymce' - ], - 'view' => 'edit' - ]); - } - } - - /** - * Accueil (deux affichages en un pour éviter une url à rallonge) - */ - public function index() { - // Mise à jour des données de module - $this->update(); - // Affichage d'un item - if( - $this->getUrl(1) - // Protection pour la pagination, un ID ne peut pas être un entier, une page oui - AND intval($this->getUrl(1)) === 0 - ) { - // L'item n'existe pas - if($this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1)]) === null) { - // Valeurs en sortie - $this->addOutput([ - 'access' => false - ]); - } - // L'item existe - else { - // Soumission du formulaire - if($this->isPost()) { - // Check la captcha - if( - $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') - //AND $this->getInput('downloaditemcaptcha', helper::FILTER_INT) !== $this->getInput('downloaditemcaptchaFirstNumber', helper::FILTER_INT) + $this->getInput('downloaditemcaptchaSecondNumber', helper::FILTER_INT)) - AND password_verify($this->getInput('downloadItemCaptcha', helper::FILTER_INT), $this->getInput('downloadItemCaptchaResult') ) === false ) - { - self::$inputNotices['downloadItemCaptcha'] = 'Incorrect'; - } - // Crée le commentaire - $commentId = helper::increment(uniqid(), $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'comment'])); - $content = $this->getInput('downloadItemContent', false); - $this->setData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'comment', $commentId, [ - 'author' => $this->getInput('downloadItemAuthor', helper::FILTER_STRING_SHORT, empty($this->getInput('downloadItemUserId')) ? TRUE : FALSE), - 'content' => $content, - 'createdOn' => time(), - 'userId' => $this->getInput('downloadItemUserId'), - 'approval' => !$this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'commentApproved']) // true commentaire publié false en attente de publication - ]]); - // Envoi d'une notification aux administrateurs - // Init tableau - $to = []; - // Liste des destinataires - foreach($this->getData(['user']) as $userId => $user) { - if ($user['group'] >= $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'commentGroupNotification']) ) { - $to[] = $user['mail']; - $firstname[] = $user['firstname']; - $lastname[] = $user['lastname']; - } - } - // Envoi du mail $sent code d'erreur ou de réussite - $notification = $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'commentApproved']) === true ? 'Commentaire déposé en attente d\'approbation': 'Commentaire déposé'; - if ($this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'commentNotification']) === true) { - $error = 0; - foreach($to as $key => $adress){ - $sent = $this->sendMail( - $adress, - 'Nouveau commentaire déposé', - 'Bonjour' . ' ' . $firstname[$key] . ' ' . $lastname[$key] . ',

    ' . - 'L\'item ' . $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'title']) . ' a reçu un nouveau commentaire.

    ', - '' - ); - if( $sent === false) $error++; - } - // Valeurs en sortie - $this->addOutput([ - 'redirect' => helper::baseUrl() . $this->getUrl() . '#comment', - 'notification' => ($error === 0 ? $notification . '
    Une notification a été envoyée.' : $notification . '
    Erreur de notification : ' . $sent), - 'state' => ($sent === true ? true : null) - ]); - - } else { - // Valeurs en sortie - $this->addOutput([ - 'redirect' => helper::baseUrl() . $this->getUrl() . '#comment', - 'notification' => $notification, - 'state' => true - ]); - } - - } - // Ids des commentaires approuvés par ordre de publication - $commentsApproved = $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'comment']); - if ($commentsApproved) { - foreach( $commentsApproved as $key => $value){ - if($value['approval']===false) unset($commentsApproved[$key]); - } - // Ligne suivante si affichage du nombre total de commentaires approuvés sous l'item - self::$nbCommentsApproved = count($commentsApproved); - } - $commentIds = array_keys(helper::arrayCollumn($commentsApproved, 'createdOn', 'SORT_DESC')); - // Pagination - $pagination = helper::pagination($commentIds, $this->getUrl(), $this->getData(['module', $this->getUrl(0),'config', 'itemsperPage']),'#comment'); - // Nombre de téléchargements - self::$statSum = count(helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'items',$this->getUrl(1),'fileStats']), 'time') ) === 0 - ? '0' - : count(helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1),'fileStats']), 'time') ) ; - // Liste des pages - self::$pages = $pagination['pages']; - // Signature de l'item - self::$itemSignature = $this->signature($this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'userId'])); - // Signature du commentaire édité - if($this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')) { - self::$editCommentSignature = $this->signature($this->getUser('id')); - } - // Commentaires en fonction de la pagination - for($i = $pagination['first']; $i < $pagination['last']; $i++) { - // Signatures des commentaires - $e = $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'comment', $commentIds[$i],'userId']); - if ($e) { - self::$commentsSignature[$commentIds[$i]] = $this->signature($e); - } else { - self::$commentsSignature[$commentIds[$i]] = $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'comment', $commentIds[$i],'author']); - } - // Données du commentaire si approuvé - if ($this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'comment', $commentIds[$i],'approval']) === true ) { - self::$comments[$commentIds[$i]] = $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'comment', $commentIds[$i]]); - } - } - // Valeurs en sortie - $this->addOutput([ - 'showBarEditButton' => true, - 'title' => $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'title']), - 'vendor' => [ - 'tinymce' - ], - 'view' => 'item' - ]); - } - - } - // Liste des items - else { - // Ids des items par ordre de publication - $itemIdsPublishedOns = helper::arrayCollumn($this->getData(['module', $this->getUrl(0),'items']), 'publishedOn', 'SORT_DESC'); - $itemIdsStates = helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'items']), 'state', 'SORT_DESC'); - $itemIds = []; - foreach($itemIdsPublishedOns as $itemId => $itemPublishedOn) { - if($itemPublishedOn <= time() AND $itemIdsStates[$itemId]) { - $itemIds[] = $itemId; - } - } - // Pagination - $pagination = helper::pagination($itemIds, $this->getUrl(), $this->getData(['module', $this->getUrl(0),'config', 'itemsperPage'])); - // Liste des pages - self::$pages = $pagination['pages']; - // Items en fonction de la pagination - for($i = $pagination['first']; $i < $pagination['last']; $i++) { - self::$items[$itemIds[$i]] = $this->getData(['module', $this->getUrl(0), 'items', $itemIds[$i]]); - } - // Valeurs en sortie - $this->addOutput([ - 'showBarEditButton' => true, - 'showPageContent' => true, - 'view' => 'index' - ]); - } - } - - /** - * Retourne la signature d'un utilisateur - */ - private function signature($userId) { - switch ($this->getData(['user', $userId, 'signature'])){ - case 1: - return $userId; - break; - case 2: - return $this->getData(['user', $userId, 'pseudo']); - break; - case 3: - return $this->getData(['user', $userId, 'firstname']) . ' ' . $this->getData(['user', $userId, 'lastname']); - break; - case 4: - return $this->getData(['user', $userId, 'lastname']) . ' ' . $this->getData(['user', $userId, 'firstname']); - break; - default: - return $this->getData(['user', $userId, 'firstname']); - } - } - - /** - * Initie un téléchargement protégé - */ - public function downloadFile() { - - if($this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2)]) === null) { - // Valeurs en sortie - $this->addOutput([ - 'access' => false - ]); - } - // Jeton incorrect - elseif ($this->getUrl(3) !== $_SESSION['csrf']) { - // Valeurs en sortie - $this->addOutput([ - 'redirect' => helper::baseUrl() . $this->getUrl(0), - 'notification' => 'Action non autorisée' - ]); - } - // Téléchargement - else { - $filePath = self::FILE_DIR . 'source/' . $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'file']); - $fileName = $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'file']); - if (file_exists($filePath)) { - // Statistiques de téléchargement - $statId = helper::increment(uniqid(), $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'fileStats'])); - $this->setData(['module', - $this->getUrl(0), - 'items', - $this->getUrl(2), - 'fileStats', - $statId, [ - 'time' => time(), - 'ip' => helper::getIp() - ]]); - // Formatage http - header('Content-Type: application/octet-stream'); - header('Content-Disposition: attachment; filename="' . $fileName . '"'); - header('Content-Length: ' . filesize($filePath)); - readfile( $filePath); - // Valeurs en sortie - $this->addOutput([ - 'display' => self::DISPLAY_RAW - ]); - // Valeurs en sortie - $this->addOutput([ - 'title' => 'Configuration', - 'view' => 'index' - ]); - } else { - // Valeurs en sortie - $this->addOutput([ - 'redirect' => helper::baseUrl() . $this->getUrl(0), - 'notification' => 'Le fichier n\'existe pas', - 'state' => false - ]); - } - } - } - - /** - * Ecran de consultation des données statistiques - */ - - public function stats() { - - // Construction de la page des statistiques - $itemIds = array_keys($this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'fileStats'])); - // Total des téléchargements - self::$statSum = count ($itemIds); - // Pagination - $pagination = helper::pagination($itemIds, $this->getUrl(), $this->getData(['module', $this->getUrl(0),'config', 'itemsperPage'])); - - // Liste des pages - self::$pages = $pagination['pages']; - - for($i = $pagination['first']; $i < $pagination['last']; $i++) { - - // Format des variables - $date = mb_detect_encoding(strftime('%d %B %Y - %H:%M', $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'fileStats', $itemIds[$i], 'time'])), 'UTF-8', true) - ? strftime('%d %B %Y - %H:%M',$this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'fileStats', $itemIds[$i], 'time'])) - : utf8_encode(strftime('%d %B %Y - %H:%M', $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'fileStats', $itemIds[$i], 'time']))); - - // Met en forme le tableau - self::$items[] = [ - $date, - $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'fileStats', $itemIds[$i], 'ip']) - ]; - - } - $this->addOutput([ - 'title' => 'Statistiques de téléchargement', - 'view' => 'stats' - ]); - } - - public function statsDeleteAll() { - // Validité de la page demandée - if($this->getData(['module', $this->getUrl(0), 'items']) === null) { - // Valeurs en sortie - $this->addOutput([ - 'access' => false - ]); - } - // Jeton incorrect - elseif ($this->getUrl(3) !== $_SESSION['csrf']) { - // Valeurs en sortie - $this->addOutput([ - 'redirect' => helper::baseUrl() . $this->getUrl(0), - 'notification' => 'Action non autorisée' - ]); - } - // Téléchargement - else { - $this->setData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'fileStats', [] ]); - // Valeurs en sortie - $this->addOutput([ - 'redirect' => helper::baseUrl() . $this->getUrl(0) . '/stats/' . $this->getUrl(2), - 'notification' => 'Purge des statistiques', - 'state' => true - ]); - } - } - - /*** - * Retourne une chaîne json contenant la liste des téléchargements disponibles - */ - public function list() { - $itemIdsPublishedOns = helper::arrayCollumn($this->getData(['module', $this->getUrl(0),'items']), 'publishedOn', 'SORT_DESC'); - $itemIdsStates = helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'items']), 'state', 'SORT_DESC'); - $itemIds = []; - foreach($itemIdsPublishedOns as $itemId => $itemPublishedOn) { - if($itemPublishedOn <= time() AND $itemIdsStates[$itemId]) { - $itemIds[] = $itemId; - } - } - foreach ($itemIds as $key) { - self::$items[$key] = [ - 'title' => $this->getData(['module', $this->getUrl(0), 'items', $key, 'title']), - 'content' => $this->getData(['module', $this->getUrl(0), 'items', $key, 'content']), - 'picture' => $this->getData(['module', $this->getUrl(0), 'items', $key, 'picture']), - 'file' =>$this->getData(['module', $this->getUrl(0), 'items', $key, 'file']), - 'fileVersion' => $this->getData(['module', $this->getUrl(0), 'items', $key, 'fileVersion']), - 'fileDate' =>$this->getData(['module', $this->getUrl(0), 'items', $key, 'fileDate']), - 'fileAuthor' =>$this->getData(['module', $this->getUrl(0), 'items', $key, 'fileAuthor']), - 'fileLicense' =>$this->getData(['module', $this->getUrl(0), 'items', $key, 'fileLicense']), - ]; - } - $this->addOutput([ - 'display' => self::DISPLAY_JSON, - 'content' => self::$items - ]); - } -} \ No newline at end of file diff --git a/module/download/ressource/feed-icon-16.gif b/module/download/ressource/feed-icon-16.gif deleted file mode 100644 index 26fa274454d016fdafa1b371e6d172030b61ac7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 652 zcmZ?wbhEHb6krfwI9AB;Wun>ZdZS-+EPv0n`Z3e;&({zCe|~<~YVxAe@L9d_w<+eI zdQG2|=)Y_={m^OhuGRS8k57;D^!|N%b}LTnd4>L)F0+RfhHn~;9%Sjhsx^FEY4o_# z@aJ5|7tJR3Qg!}*e0DEi|9+vtokZ=wx3)ekF?ii+`l8kJ-}g^XOY|O<89r|`zE@!I zw8rQ~lgXb$Ew9>5@8;=0sWy6AYxJ_i?AMyOU+0$pSfBZBqR*FQ>F;Kx{5&!HWu4`h zy)%Byb9vwE_-=LQzc;sjE)9COY3j%A(|_+Qe^BcBc}e>FxhY@P6#u!o_50e)zxNOR z`}pkB;X?tj(k`Srkzulr~IeR}rieAnO4Zv4Ey|51V2uYJwG*T+4nasRbB>(}MY z-=|yroMriSlKIDO(^nhX|C0g~f3h%gG1N2YFaQB4P8irutD!|K07BTzlA_-oNcc1hVb)@I$C@&8w%Mnm^}*x>=-$uWM@XE3q3K( z+n30}qshBGH{_PjB8AT4CPx+_eKXyakCM*VXfpa8x!9!W!fBS3&{_Cd#ZQtY`q7^c z42zs*YqCAMQjx5}C&}jgh(nMu*=?1A*RH1rgcN%xD+z}kc=+HAgLSinO~;G`HX#{d V-YAuXg^H}50tyKne}y?1tN}38S(N|) diff --git a/module/download/vendor/FeedWriter/ATOM.php b/module/download/vendor/FeedWriter/ATOM.php deleted file mode 100644 index 28494501..00000000 --- a/module/download/vendor/FeedWriter/ATOM.php +++ /dev/null @@ -1,38 +0,0 @@ - - * - * This file is part of the "Universal Feed Writer" project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * Wrapper for creating ATOM feeds - * - * @package UniversalFeedWriter - */ -class ATOM extends Feed -{ - /** - * {@inheritdoc} - */ - public function __construct() - { - parent::__construct(Feed::ATOM); - } - -} diff --git a/module/download/vendor/FeedWriter/Feed.php b/module/download/vendor/FeedWriter/Feed.php deleted file mode 100644 index d33a2059..00000000 --- a/module/download/vendor/FeedWriter/Feed.php +++ /dev/null @@ -1,1017 +0,0 @@ - - * Copyright (C) 2010-2016 Michael Bemmerl - * - * This file is part of the "Universal Feed Writer" project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * Universal Feed Writer class - * - * Generate RSS 1.0, RSS2.0 and ATOM Feeds - * - * @package UniversalFeedWriter - * @author Anis uddin Ahmad - * @link http://www.ajaxray.com/projects/rss - */ -abstract class Feed -{ - // RSS 0.90 Officially obsoleted by 1.0 - // RSS 0.91, 0.92, 0.93 and 0.94 Officially obsoleted by 2.0 - // So, define constants for RSS 1.0, RSS 2.0 and ATOM - - const RSS1 = 'RSS 1.0'; - const RSS2 = 'RSS 2.0'; - const ATOM = 'ATOM'; - - const VERSION = '1.1.0'; - - /** - * Collection of all channel elements - */ - private $channels = array(); - - /** - * Collection of items as object of \FeedWriter\Item class. - */ - private $items = array(); - - /** - * Collection of other version wise data. - * - * Currently used to store the 'rdf:about' attribute and image element of the channel (both RSS1 only). - */ - private $data = array(); - - /** - * The tag names which have to encoded as CDATA - */ - private $CDATAEncoding = array(); - - /** - * Collection of XML namespaces - */ - private $namespaces = array(); - - /** - * Contains the format of this feed. - */ - private $version = null; - - /** - * Constructor - * - * If no version is given, a feed in RSS 2.0 format will be generated. - * - * @param string $version the version constant (RSS1/RSS2/ATOM). - */ - protected function __construct($version = Feed::RSS2) - { - $this->version = $version; - - // Setting default encoding - $this->encoding = 'utf-8'; - - // Setting default value for essential channel element - $this->setTitle($version . ' Feed'); - - // Add some default XML namespaces - $this->namespaces['content'] = 'http://purl.org/rss/1.0/modules/content/'; - $this->namespaces['wfw'] = 'http://wellformedweb.org/CommentAPI/'; - $this->namespaces['atom'] = 'http://www.w3.org/2005/Atom'; - $this->namespaces['rdf'] = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'; - $this->namespaces['rss1'] = 'http://purl.org/rss/1.0/'; - $this->namespaces['dc'] = 'http://purl.org/dc/elements/1.1/'; - $this->namespaces['sy'] = 'http://purl.org/rss/1.0/modules/syndication/'; - - // Tag names to encode in CDATA - $this->addCDATAEncoding(array('description', 'content:encoded', 'summary')); - } - - // Start # public functions --------------------------------------------- - - /** - * Set the URLs for feed pagination. - * - * See RFC 5005, chapter 3. At least one page URL must be specified. - * - * @param string $nextURL The URL to the next page of this feed. Optional. - * @param string $previousURL The URL to the previous page of this feed. Optional. - * @param string $firstURL The URL to the first page of this feed. Optional. - * @param string $lastURL The URL to the last page of this feed. Optional. - * @link http://tools.ietf.org/html/rfc5005#section-3 - * @return self - * @throws \LogicException if none of the parameters are set. - */ - public function setPagination($nextURL = null, $previousURL = null, $firstURL = null, $lastURL = null) - { - if (empty($nextURL) && empty($previousURL) && empty($firstURL) && empty($lastURL)) - throw new \LogicException('At least one URL must be specified for pagination to work.'); - - if (!empty($nextURL)) - $this->setAtomLink($nextURL, 'next'); - - if (!empty($previousURL)) - $this->setAtomLink($previousURL, 'previous'); - - if (!empty($firstURL)) - $this->setAtomLink($firstURL, 'first'); - - if (!empty($lastURL)) - $this->setAtomLink($lastURL, 'last'); - - return $this; - } - - /** - * Add a channel element indicating the program used to generate the feed. - * - * @return self - * @throws InvalidOperationException if this method is called on an RSS1 feed. - */ - public function addGenerator() - { - if ($this->version == Feed::ATOM) - $this->setChannelElement('atom:generator', 'FeedWriter', array('uri' => 'https://github.com/mibe/FeedWriter')); - else if ($this->version == Feed::RSS2) - $this->setChannelElement('generator', 'FeedWriter'); - else - throw new InvalidOperationException('The generator element is not supported in RSS1 feeds.'); - - return $this; - } - - /** - * Add a XML namespace to the internal list of namespaces. After that, - * custom channel elements can be used properly to generate a valid feed. - * - * @access public - * @param string $prefix namespace prefix - * @param string $uri namespace name (URI) - * @return self - * @link http://www.w3.org/TR/REC-xml-names/ - * @throws \InvalidArgumentException if the prefix or uri is empty or NULL. - */ - public function addNamespace($prefix, $uri) - { - if (empty($prefix)) - throw new \InvalidArgumentException('The prefix may not be emtpy or NULL.'); - if (empty($uri)) - throw new \InvalidArgumentException('The uri may not be empty or NULL.'); - - $this->namespaces[$prefix] = $uri; - - return $this; - } - - /** - * Add a channel element to the feed. - * - * @access public - * @param string $elementName name of the channel tag - * @param string $content content of the channel tag - * @param array array of element attributes with attribute name as array key - * @param bool TRUE if this element can appear multiple times - * @return self - * @throws \InvalidArgumentException if the element name is not a string, empty or NULL. - */ - public function setChannelElement($elementName, $content, array $attributes = null, $multiple = false) - { - if (empty($elementName)) - throw new \InvalidArgumentException('The element name may not be empty or NULL.'); - if (!is_string($elementName)) - throw new \InvalidArgumentException('The element name must be a string.'); - - $entity['content'] = $content; - $entity['attributes'] = $attributes; - - if ($multiple === TRUE) - $this->channels[$elementName][] = $entity; - else - $this->channels[$elementName] = $entity; - - return $this; - } - - /** - * Set multiple channel elements from an array. Array elements - * should be 'channelName' => 'channelContent' format. - * - * @access public - * @param array array of channels - * @return self - */ - public function setChannelElementsFromArray(array $elementArray) - { - foreach ($elementArray as $elementName => $content) { - $this->setChannelElement($elementName, $content); - } - - return $this; - } - - /** - * Get the appropriate MIME type string for the current feed. - * - * @access public - * @return string The MIME type string. - */ - public function getMIMEType() - { - switch ($this->version) { - case Feed::RSS2 : $mimeType = "application/rss+xml"; - break; - case Feed::RSS1 : $mimeType = "application/rdf+xml"; - break; - case Feed::ATOM : $mimeType = "application/atom+xml"; - break; - default : $mimeType = "text/xml"; - } - - return $mimeType; - } - - /** - * Print the actual RSS/ATOM file - * - * Sets a Content-Type header and echoes the contents of the feed. - * Should only be used in situations where direct output is desired; - * if you need to pass a string around, use generateFeed() instead. - * - * @access public - * @param bool FALSE if the specific feed media type should be sent. - * @return void - * @throws \InvalidArgumentException if the useGenericContentType parameter is not boolean. - */ - public function printFeed($useGenericContentType = false) - { - if (!is_bool($useGenericContentType)) - throw new \InvalidArgumentException('The useGenericContentType parameter must be boolean.'); - - $contentType = "text/xml"; - - if (!$useGenericContentType) { - $contentType = $this->getMIMEType(); - } - - // Generate the feed before setting the header, so Exceptions will be nicely visible. - $feed = $this->generateFeed(); - header("Content-Type: " . $contentType . "; charset=" . $this->encoding); - echo $feed; - } - - /** - * Generate the feed. - * - * @access public - * @return string The complete feed XML. - * @throws InvalidOperationException if the link element of the feed is not set. - */ - public function generateFeed() - { - if ($this->version != Feed::ATOM && !array_key_exists('link', $this->channels)) - throw new InvalidOperationException('RSS1 & RSS2 feeds need a link element. Call the setLink method before this method.'); - - return $this->makeHeader() - . $this->makeChannels() - . $this->makeItems() - . $this->makeFooter(); - } - - /** - * Create a new Item. - * - * @access public - * @return Item instance of Item class - */ - public function createNewItem() - { - $Item = new Item($this->version); - - return $Item; - } - - /** - * Add one or more tags to the list of CDATA encoded tags - * - * @access public - * @param array $tags An array of tag names that are merged into the list of tags which should be encoded as CDATA - * @return self - */ - public function addCDATAEncoding(array $tags) - { - $this->CDATAEncoding = array_merge($this->CDATAEncoding, $tags); - - return $this; - } - - /** - * Get list of CDATA encoded properties - * - * @access public - * @return array Return an array of CDATA properties that are to be encoded as CDATA - */ - public function getCDATAEncoding() - { - return $this->CDATAEncoding; - } - - /** - * Remove tags from the list of CDATA encoded tags - * - * @access public - * @param array $tags An array of tag names that should be removed. - * @return void - */ - public function removeCDATAEncoding(array $tags) - { - // Call array_values to re-index the array. - $this->CDATAEncoding = array_values(array_diff($this->CDATAEncoding, $tags)); - } - - /** - * Add a FeedItem to the main class - * - * @access public - * @param Item $feedItem instance of Item class - * @return self - * @throws \InvalidArgumentException if the given item version mismatches. - */ - public function addItem(Item $feedItem) - { - if ($feedItem->getVersion() != $this->version) - { - $msg = sprintf('Feed type mismatch: This instance can handle %s feeds only, but item for %s feeds given.', $this->version, $feedItem->getVersion()); - throw new \InvalidArgumentException($msg); - } - - $this->items[] = $feedItem; - - return $this; - } - - // Wrapper functions ------------------------------------------------------------------- - - /** - * Set the 'encoding' attribute in the XML prolog. - * - * @access public - * @param string $encoding value of 'encoding' attribute - * @return self - * @throws \InvalidArgumentException if the encoding is not a string, empty or NULL. - */ - public function setEncoding($encoding) - { - if (empty($encoding)) - throw new \InvalidArgumentException('The encoding may not be empty or NULL.'); - if (!is_string($encoding)) - throw new \InvalidArgumentException('The encoding must be a string.'); - - $this->encoding = $encoding; - - return $this; - } - - /** - * Set the 'title' channel element - * - * @access public - * @param string $title value of 'title' channel tag - * @return self - */ - public function setTitle($title) - { - return $this->setChannelElement('title', $title); - } - - /** - * Set the date when the feed was lastly updated. - * - * This adds the 'updated' element to the feed. The value of the date parameter - * can be either an instance of the DateTime class, an integer containing a UNIX - * timestamp or a string which is parseable by PHP's 'strtotime' function. - * - * Not supported in RSS1 feeds. - * - * @access public - * @param DateTime|int|string Date which should be used. - * @return self - * @throws \InvalidArgumentException if the given date is not an instance of DateTime, a UNIX timestamp or a date string. - * @throws InvalidOperationException if this method is called on an RSS1 feed. - */ - public function setDate($date) - { - if ($this->version == Feed::RSS1) - throw new InvalidOperationException('The publication date is not supported in RSS1 feeds.'); - - // The feeds have different date formats. - $format = $this->version == Feed::ATOM ? \DATE_ATOM : \DATE_RSS; - - if ($date instanceof DateTime) - $date = $date->format($format); - else if(is_numeric($date) && $date >= 0) - $date = date($format, $date); - else if (is_string($date)) - { - $timestamp = strtotime($date); - if ($timestamp === FALSE) - throw new \InvalidArgumentException('The given date was not parseable.'); - - $date = date($format, $timestamp); - } - else - throw new \InvalidArgumentException('The given date is not an instance of DateTime, a UNIX timestamp or a date string.'); - - if ($this->version == Feed::ATOM) - $this->setChannelElement('updated', $date); - else - $this->setChannelElement('lastBuildDate', $date); - - return $this; - } - - /** - * Set a phrase or sentence describing the feed. - * - * @access public - * @param string $description Description of the feed. - * @return self - */ - public function setDescription($description) - { - if ($this->version != Feed::ATOM) - $this->setChannelElement('description', $description); - else - $this->setChannelElement('subtitle', $description); - - return $this; - } - - /** - * Set the 'link' channel element - * - * @access public - * @param string $link value of 'link' channel tag - * @return self - */ - public function setLink($link) - { - if ($this->version == Feed::ATOM) - $this->setAtomLink($link); - else - $this->setChannelElement('link', $link); - - return $this; - } - - /** - * Set custom 'link' channel elements. - * - * In ATOM feeds, only one link with alternate relation and the same combination of - * type and hreflang values. - * - * @access public - * @param string $href URI of this link - * @param string $rel relation type of the resource - * @param string $type MIME type of the target resource - * @param string $hreflang language of the resource - * @param string $title human-readable information about the resource - * @param int $length length of the resource in bytes - * @link https://www.iana.org/assignments/link-relations/link-relations.xml - * @link https://tools.ietf.org/html/rfc4287#section-4.2.7 - * @return self - * @throws \InvalidArgumentException on multiple occasions. - * @throws InvalidOperationException if the same link with the same attributes was already added to the feed. - */ - public function setAtomLink($href, $rel = null, $type = null, $hreflang = null, $title = null, $length = null) - { - $data = array('href' => $href); - - if ($rel != null) { - if (!is_string($rel) || empty($rel)) - throw new \InvalidArgumentException('rel parameter must be a string and a valid relation identifier.'); - - $data['rel'] = $rel; - } - if ($type != null) { - // Regex used from RFC 4287, page 41 - if (!is_string($type) || preg_match('/.+\/.+/', $type) != 1) - throw new \InvalidArgumentException('type parameter must be a string and a MIME type.'); - - $data['type'] = $type; - } - if ($hreflang != null) { - // Regex used from RFC 4287, page 41 - if (!is_string($hreflang) || preg_match('/[A-Za-z]{1,8}(-[A-Za-z0-9]{1,8})*/', $hreflang) != 1) - throw new \InvalidArgumentException('hreflang parameter must be a string and a valid language code.'); - - $data['hreflang'] = $hreflang; - } - if ($title != null) { - if (!is_string($title) || empty($title)) - throw new \InvalidArgumentException('title parameter must be a string and not empty.'); - - $data['title'] = $title; - } - if ($length != null) { - if (!is_int($length) || $length < 0) - throw new \InvalidArgumentException('length parameter must be a positive integer.'); - - $data['length'] = (string) $length; - } - - // ATOM spec. has some restrictions on atom:link usage - // See RFC 4287, page 12 (4.1.1) - if ($this->version == Feed::ATOM) { - foreach ($this->channels as $key => $value) { - if ($key != 'atom:link') - continue; - - // $value is an array , so check every element - foreach ($value as $linkItem) { - $attrib = $linkItem['attributes']; - // Only one link with relation alternate and same hreflang & type is allowed. - if (@$attrib['rel'] == 'alternate' && @$attrib['hreflang'] == $hreflang && @$attrib['type'] == $type) - throw new InvalidOperationException('The feed must not contain more than one link element with a' - . ' relation of "alternate" that has the same combination of type and hreflang attribute values.'); - } - } - } - - return $this->setChannelElement('atom:link', '', $data, true); - } - - /** - * Set an 'atom:link' channel element with relation=self attribute. - * Needs the full URL to this feed. - * - * @link http://www.rssboard.org/rss-profile#namespace-elements-atom-link - * @access public - * @param string $url URL to this feed - * @return self - */ - public function setSelfLink($url) - { - return $this->setAtomLink($url, 'self', $this->getMIMEType()); - } - - /** - * Set the 'image' channel element - * - * @access public - * @param string $url URL of the image - * @param string $title Title of the image. RSS only. - * @param string $link Link target URL of the image. RSS only. - * @return self - * @throws \InvalidArgumentException if the url is invalid. - * @throws \InvalidArgumentException if the title and link parameter are not a string or empty. - */ - public function setImage($url, $title = null, $link = null) - { - if (!is_string($url) || empty($url)) - throw new \InvalidArgumentException('url parameter must be a string and may not be empty or NULL.'); - - // RSS feeds have support for a title & link element. - if ($this->version != Feed::ATOM) - { - if (!is_string($title) || empty($title)) - throw new \InvalidArgumentException('title parameter must be a string and may not be empty or NULL.'); - if (!is_string($link) || empty($link)) - throw new \InvalidArgumentException('link parameter must be a string and may not be empty or NULL.'); - - $data = array('title'=>$title, 'link'=>$link, 'url'=>$url); - $name = 'image'; - } - else - { - $name = 'logo'; - $data = $url; - } - - // Special handling for RSS1 again (since RSS1 is a bit strange...) - if ($this->version == Feed::RSS1) - { - $this->data['Image'] = $data; - return $this->setChannelElement($name, '', array('rdf:resource' => $url), false); - } - else - return $this->setChannelElement($name, $data); - } - - /** - * Set the channel 'rdf:about' attribute, which is used in RSS1 feeds only. - * - * @access public - * @param string $url value of 'rdf:about' attribute of the channel element - * @return self - * @throws InvalidOperationException if this method is called and the feed is not of type RSS1. - * @throws \InvalidArgumentException if the given URL is invalid. - */ - public function setChannelAbout($url) - { - if ($this->version != Feed::RSS1) - throw new InvalidOperationException("This method is only supported in RSS1 feeds."); - if (empty($url)) - throw new \InvalidArgumentException('The about URL may not be empty or NULL.'); - if (!is_string($url)) - throw new \InvalidArgumentException('The about URL must be a string.'); - - $this->data['ChannelAbout'] = $url; - - return $this; - } - - /** - * Generate an UUID. - * - * The UUID is based on an MD5 hash. If no key is given, a unique ID as the input - * for the MD5 hash is generated. - * - * @author Anis uddin Ahmad - * @access public - * @param string $key optional key on which the UUID is generated - * @param string $prefix an optional prefix - * @return string the formatted UUID - */ - public static function uuid($key = null, $prefix = '') - { - $key = ($key == null) ? uniqid(rand()) : $key; - $chars = md5($key); - $uuid = substr($chars,0,8) . '-'; - $uuid .= substr($chars,8,4) . '-'; - $uuid .= substr($chars,12,4) . '-'; - $uuid .= substr($chars,16,4) . '-'; - $uuid .= substr($chars,20,12); - - return $prefix . $uuid; - } - - /** - * Replace invalid XML characters. - * - * @link http://www.phpwact.org/php/i18n/charsets#xml See utf8_for_xml() function - * @link http://www.w3.org/TR/REC-xml/#charsets - * @link https://github.com/mibe/FeedWriter/issues/30 - * - * @access public - * @param string $string string which should be filtered - * @param string $replacement replace invalid characters with this string - * @return string the filtered string - */ - public static function filterInvalidXMLChars($string, $replacement = '_') // default to '\x{FFFD}' ??? - { - $result = preg_replace('/[^\x{0009}\x{000a}\x{000d}\x{0020}-\x{D7FF}\x{E000}-\x{FFFD}\x{10000}-\x{10FFFF}]+/u', $replacement, $string); - - // Did the PCRE replace failed because of bad UTF-8 data? - // If yes, try a non-multibyte regex and without the UTF-8 mode enabled. - if ($result == NULL && preg_last_error() == PREG_BAD_UTF8_ERROR) - $result = preg_replace('/[^\x09\x0a\x0d\x20-\xFF]+/', $replacement, $string); - - // In case the regex replacing failed completely, return the whole unfiltered string. - if ($result == NULL) - $result = $string; - - return $result; - } - // End # public functions ---------------------------------------------- - - // Start # private functions ---------------------------------------------- - - /** - * Returns all used XML namespace prefixes in this instance. - * This includes all channel elements and feed items. - * Unfortunately some namespace prefixes are not included, - * because they are hardcoded, e.g. rdf. - * - * @access private - * @return array Array with namespace prefix as value. - */ - private function getNamespacePrefixes() - { - $prefixes = array(); - - // Get all tag names from channel elements... - $tags = array_keys($this->channels); - - // ... and now all names from feed items - foreach ($this->items as $item) { - foreach (array_keys($item->getElements()) as $key) { - if (!in_array($key, $tags)) { - $tags[] = $key; - } - } - } - - // Look for prefixes in those tag names - foreach ($tags as $tag) { - $elements = explode(':', $tag); - - if (count($elements) != 2) - continue; - - $prefixes[] = $elements[0]; - } - - return array_unique($prefixes); - } - - /** - * Returns the XML header and root element, depending on the feed type. - * - * @access private - * @return string The XML header of the feed. - * @throws InvalidOperationException if an unknown XML namespace prefix is encountered. - */ - private function makeHeader() - { - $out = 'encoding.'" ?>' . PHP_EOL; - - $prefixes = $this->getNamespacePrefixes(); - $attributes = array(); - $tagName = ''; - $defaultNamespace = ''; - - if ($this->version == Feed::RSS2) { - $tagName = 'rss'; - $attributes['version'] = '2.0'; - } elseif ($this->version == Feed::RSS1) { - $tagName = 'rdf:RDF'; - $prefixes[] = 'rdf'; - $defaultNamespace = $this->namespaces['rss1']; - } elseif ($this->version == Feed::ATOM) { - $tagName = 'feed'; - $defaultNamespace = $this->namespaces['atom']; - - // Ugly hack to remove the 'atom' value from the prefixes array. - $prefixes = array_flip($prefixes); - unset($prefixes['atom']); - $prefixes = array_flip($prefixes); - } - - // Iterate through every namespace prefix and add it to the element attributes. - foreach ($prefixes as $prefix) { - if (!isset($this->namespaces[$prefix])) - throw new InvalidOperationException('Unknown XML namespace prefix: \'' . $prefix . '\'.' - . ' Use the addNamespace method to add support for this prefix.'); - else - $attributes['xmlns:' . $prefix] = $this->namespaces[$prefix]; - } - - // Include default namepsace, if required - if (!empty($defaultNamespace)) - $attributes['xmlns'] = $defaultNamespace; - - $out .= $this->makeNode($tagName, '', $attributes, true); - - return $out; - } - - /** - * Closes the open tags at the end of file - * - * @access private - * @return string The XML footer of the feed. - */ - private function makeFooter() - { - if ($this->version == Feed::RSS2) { - return '' . PHP_EOL . ''; - } elseif ($this->version == Feed::RSS1) { - return ''; - } elseif ($this->version == Feed::ATOM) { - return ''; - } - } - - /** - * Creates a single node in XML format - * - * @access private - * @param string $tagName name of the tag - * @param mixed $tagContent tag value as string or array of nested tags in 'tagName' => 'tagValue' format - * @param array $attributes Attributes (if any) in 'attrName' => 'attrValue' format - * @param bool $omitEndTag True if the end tag should be omitted. Defaults to false. - * @return string formatted xml tag - * @throws \InvalidArgumentException if the tagContent is not an array and not a string. - */ - private function makeNode($tagName, $tagContent, array $attributes = null, $omitEndTag = false) - { - $nodeText = ''; - $attrText = ''; - - if ($attributes != null) { - foreach ($attributes as $key => $value) { - $value = self::filterInvalidXMLChars($value); - $value = htmlspecialchars($value); - $attrText .= " $key=\"$value\""; - } - } - - $attrText .= (in_array($tagName, $this->CDATAEncoding) && $this->version == Feed::ATOM) ? ' type="html"' : ''; - $nodeText .= "<{$tagName}{$attrText}>"; - $nodeText .= (in_array($tagName, $this->CDATAEncoding)) ? ' $value) { - if (is_array($value)) { - $nodeText .= PHP_EOL; - foreach ($value as $subValue) { - $nodeText .= $this->makeNode($key, $subValue); - } - } else if (is_string($value)) { - $nodeText .= $this->makeNode($key, $value); - } else { - throw new \InvalidArgumentException("Unknown node-value type for $key"); - } - } - } else { - $tagContent = self::filterInvalidXMLChars($tagContent); - $nodeText .= (in_array($tagName, $this->CDATAEncoding)) ? $this->sanitizeCDATA($tagContent) : htmlspecialchars($tagContent); - } - - $nodeText .= (in_array($tagName, $this->CDATAEncoding)) ? ']]>' : ''; - - if (!$omitEndTag) - $nodeText .= ""; - - $nodeText .= PHP_EOL; - - return $nodeText; - } - - /** - * Make the channels. - * - * @access private - * @return string The feed header as XML containing all the feed metadata. - */ - private function makeChannels() - { - $out = ''; - - //Start channel tag - switch ($this->version) { - case Feed::RSS2: - $out .= '' . PHP_EOL; - break; - case Feed::RSS1: - $out .= (isset($this->data['ChannelAbout']))? "data['ChannelAbout']}\">" : "channels['link']['content']}\">"; - break; - } - - //Print Items of channel - foreach ($this->channels as $key => $value) { - // In ATOM feeds, strip all ATOM namespace prefixes from the tag name. They are not needed here, - // because the ATOM namespace name is set as default namespace. - if ($this->version == Feed::ATOM && strncmp($key, 'atom', 4) == 0) { - $key = substr($key, 5); - } - - // The channel element can occur multiple times, when the key 'content' is not in the array. - if (!array_key_exists('content', $value)) { - // If this is the case, iterate through the array with the multiple elements. - foreach ($value as $singleElement) { - $out .= $this->makeNode($key, $singleElement['content'], $singleElement['attributes']); - } - } else { - $out .= $this->makeNode($key, $value['content'], $value['attributes']); - } - } - - if ($this->version == Feed::RSS1) { - //RSS 1.0 have special tag with channel - $out .= "" . PHP_EOL . "" . PHP_EOL; - foreach ($this->items as $item) { - $thisItems = $item->getElements(); - $out .= "" . PHP_EOL; - } - $out .= "" . PHP_EOL . "" . PHP_EOL . "" . PHP_EOL; - - // An image has its own element after the channel elements. - if (array_key_exists('image', $this->data)) - $out .= $this->makeNode('image', $this->data['Image'], array('rdf:about' => $this->data['Image']['url'])); - } else if ($this->version == Feed::ATOM) { - // ATOM feeds have a unique feed ID. Use the title channel element as key. - $out .= $this->makeNode('id', Feed::uuid($this->channels['title']['content'], 'urn:uuid:')); - } - - return $out; - } - - /** - * Prints formatted feed items - * - * @access private - * @return string The XML of every feed item. - */ - private function makeItems() - { - $out = ''; - - foreach ($this->items as $item) { - $thisItems = $item->getElements(); - - // The argument is printed as rdf:about attribute of item in RSS 1.0 - // We're using the link set in the item (which is mandatory) as the about attribute. - if ($this->version == Feed::RSS1) - $out .= $this->startItem($thisItems['link']['content']); - else - $out .= $this->startItem(); - - foreach ($thisItems as $feedItem) { - $name = $feedItem['name']; - - // Strip all ATOM namespace prefixes from tags when feed is an ATOM feed. - // Not needed here, because the ATOM namespace name is used as default namespace. - if ($this->version == Feed::ATOM && strncmp($name, 'atom', 4) == 0) - $name = substr($name, 5); - - $out .= $this->makeNode($name, $feedItem['content'], $feedItem['attributes']); - } - $out .= $this->endItem(); - } - - return $out; - } - - /** - * Make the starting tag of channels - * - * @access private - * @param string $about The value of about attribute which is used for RSS 1.0 only. - * @return string The starting XML tag of an feed item. - * @throws InvalidOperationException if this object misses the data for the about attribute. - */ - private function startItem($about = false) - { - $out = ''; - - if ($this->version == Feed::RSS2) { - $out .= '
    ' . PHP_EOL; - } elseif ($this->version == Feed::RSS1) { - if ($about) { - $out .= "" . PHP_EOL; - } else { - throw new InvalidOperationException("Missing data for about attribute. Call setChannelAbout method."); - } - } elseif ($this->version == Feed::ATOM) { - $out .= "" . PHP_EOL; - } - - return $out; - } - - /** - * Closes feed item tag - * - * @access private - * @return string The ending XML tag of an feed item. - */ - private function endItem() - { - if ($this->version == Feed::RSS2 || $this->version == Feed::RSS1) { - return '
    ' . PHP_EOL; - } elseif ($this->version == Feed::ATOM) { - return '' . PHP_EOL; - } - } - - /** - * Sanitizes data which will be later on returned as CDATA in the feed. - * - * A "]]>" respectively "", "]]>", $text); - $text = str_replace(" - * - * This file is part of the "Universal Feed Writer" project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * The exception that is thrown when an invalid operation is performed on - * the object. - * - * @package UniversalFeedWriter - */ -class InvalidOperationException extends LogicException -{ -} diff --git a/module/download/vendor/FeedWriter/Item.php b/module/download/vendor/FeedWriter/Item.php deleted file mode 100644 index c4f21a93..00000000 --- a/module/download/vendor/FeedWriter/Item.php +++ /dev/null @@ -1,413 +0,0 @@ - - * Copyright (C) 2010-2013, 2015-2016 Michael Bemmerl - * - * This file is part of the "Universal Feed Writer" project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * Universal Feed Writer - * - * Item class - Used as feed element in Feed class - * - * @package UniversalFeedWriter - * @author Anis uddin Ahmad - * @link http://www.ajaxray.com/projects/rss - */ -class Item -{ - /** - * Collection of feed item elements - */ - private $elements = array(); - - /** - * Contains the format of this feed. - */ - private $version; - - /** - * Is used as a suffix when multiple elements have the same name. - **/ - private $_cpt = 0; - - /** - * Constructor - * - * @param string $version constant (RSS1/RSS2/ATOM) RSS2 is default. - */ - public function __construct($version = Feed::RSS2) - { - $this->version = $version; - } - - /** - * Return an unique number - * - * @access private - * @return int - **/ - private function cpt() - { - return $this->_cpt++; - } - - /** - * Add an element to elements array - * - * @access public - * @param string $elementName The tag name of an element - * @param string $content The content of tag - * @param array $attributes Attributes (if any) in 'attrName' => 'attrValue' format - * @param boolean $overwrite Specifies if an already existing element is overwritten. - * @param boolean $allowMultiple Specifies if multiple elements of the same name are allowed. - * @return self - * @throws \InvalidArgumentException if the element name is not a string, empty or NULL. - */ - public function addElement($elementName, $content, array $attributes = null, $overwrite = FALSE, $allowMultiple = FALSE) - { - if (empty($elementName)) - throw new \InvalidArgumentException('The element name may not be empty or NULL.'); - if (!is_string($elementName)) - throw new \InvalidArgumentException('The element name must be a string.'); - - $key = $elementName; - - // return if element already exists & if overwriting is disabled - // & if multiple elements are not allowed. - if (isset($this->elements[$elementName]) && !$overwrite) { - if (!$allowMultiple) - return $this; - - $key .= '-' . $this->cpt(); - } - - $this->elements[$key]['name'] = $elementName; - $this->elements[$key]['content'] = $content; - $this->elements[$key]['attributes'] = $attributes; - - return $this; - } - - /** - * Set multiple feed elements from an array. - * Elements which have attributes cannot be added by this method - * - * @access public - * @param array array of elements in 'tagName' => 'tagContent' format. - * @return self - */ - public function addElementArray(array $elementArray) - { - foreach ($elementArray as $elementName => $content) { - $this->addElement($elementName, $content); - } - - return $this; - } - - /** - * Return the collection of elements in this feed item - * - * @access public - * @return array All elements of this item. - * @throws InvalidOperationException on ATOM feeds if either a content or link element is missing. - * @throws InvalidOperationException on RSS1 feeds if a title or link element is missing. - */ - public function getElements() - { - // ATOM feeds have some specific requirements... - if ($this->version == Feed::ATOM) - { - // Add an 'id' element, if it was not added by calling the setLink method. - // Use the value of the title element as key, since no link element was specified. - if (!array_key_exists('id', $this->elements)) - $this->setId(Feed::uuid($this->elements['title']['content'], 'urn:uuid:')); - - // Either a 'link' or 'content' element is needed. - if (!array_key_exists('content', $this->elements) && !array_key_exists('link', $this->elements)) - throw new InvalidOperationException('ATOM feed entries need a link or a content element. Call the setLink or setContent method.'); - } - // ...same with RSS1 feeds. - else if ($this->version == Feed::RSS1) - { - if (!array_key_exists('title', $this->elements)) - throw new InvalidOperationException('RSS1 feed entries need a title element. Call the setTitle method.'); - if (!array_key_exists('link', $this->elements)) - throw new InvalidOperationException('RSS1 feed entries need a link element. Call the setLink method.'); - } - - return $this->elements; - } - - /** - * Return the type of this feed item - * - * @access public - * @return string The feed type, as defined in Feed.php - */ - public function getVersion() - { - return $this->version; - } - - // Wrapper functions ------------------------------------------------------ - - /** - * Set the 'description' element of feed item - * - * @access public - * @param string $description The content of the 'description' or 'summary' element - * @return self - */ - public function setDescription($description) - { - $tag = ($this->version == Feed::ATOM) ? 'summary' : 'description'; - - return $this->addElement($tag, $description); - } - - /** - * Set the 'content' element of the feed item - * For ATOM feeds only - * - * @access public - * @param string $content Content for the item (i.e., the body of a download post). - * @return self - * @throws InvalidOperationException if this method is called on non-ATOM feeds. - */ - public function setContent($content) - { - if ($this->version != Feed::ATOM) - throw new InvalidOperationException('The content element is supported in ATOM feeds only.'); - - return $this->addElement('content', $content, array('type' => 'html')); - } - - /** - * Set the 'title' element of feed item - * - * @access public - * @param string $title The content of 'title' element - * @return self - */ - public function setTitle($title) - { - return $this->addElement('title', $title); - } - - /** - * Set the 'date' element of the feed item. - * - * The value of the date parameter can be either an instance of the - * DateTime class, an integer containing a UNIX timestamp or a string - * which is parseable by PHP's 'strtotime' function. - * - * @access public - * @param DateTime|int|string $date Date which should be used. - * @return self - * @throws \InvalidArgumentException if the given date was not parseable. - */ - public function setDate($date) - { - if (!is_numeric($date)) { - if ($date instanceof DateTime) - $date = $date->getTimestamp(); - else { - $date = strtotime($date); - - if ($date === FALSE) - throw new \InvalidArgumentException('The given date string was not parseable.'); - } - } elseif ($date < 0) - throw new \InvalidArgumentException('The given date is not an UNIX timestamp.'); - - if ($this->version == Feed::ATOM) { - $tag = 'updated'; - $value = date(\DATE_ATOM, $date); - } elseif ($this->version == Feed::RSS2) { - $tag = 'pubDate'; - $value = date(\DATE_RSS, $date); - } else { - $tag = 'dc:date'; - $value = date("Y-m-d", $date); - } - - return $this->addElement($tag, $value); - } - - /** - * Set the 'link' element of feed item - * - * @access public - * @param string $link The content of 'link' element - * @return self - */ - public function setLink($link) - { - if ($this->version == Feed::RSS2 || $this->version == Feed::RSS1) { - $this->addElement('link', $link); - } else { - $this->addElement('link','',array('href'=>$link)); - $this->setId(Feed::uuid($link,'urn:uuid:')); - } - - return $this; - } - - /** - * Attach a external media to the feed item. - * Not supported in RSS 1.0 feeds. - * - * See RFC 4288 for syntactical correct MIME types. - * - * Note that you should avoid the use of more than one enclosure in one item, - * since some RSS aggregators don't support it. - * - * @access public - * @param string $url The URL of the media. - * @param integer $length The length of the media. - * @param string $type The MIME type attribute of the media. - * @param boolean $multiple Specifies if multiple enclosures are allowed - * @return self - * @link https://tools.ietf.org/html/rfc4288 - * @throws \InvalidArgumentException if the length or type parameter is invalid. - * @throws InvalidOperationException if this method is called on RSS1 feeds. - */ - public function addEnclosure($url, $length, $type, $multiple = TRUE) - { - if ($this->version == Feed::RSS1) - throw new InvalidOperationException('Media attachment is not supported in RSS1 feeds.'); - - // the length parameter should be set to 0 if it can't be determined - // see http://www.rssboard.org/rss-profile#element-channel-item-enclosure - if (!is_numeric($length) || $length < 0) - throw new \InvalidArgumentException('The length parameter must be an integer and greater or equals to zero.'); - - // Regex used from RFC 4287, page 41 - if (!is_string($type) || preg_match('/.+\/.+/', $type) != 1) - throw new \InvalidArgumentException('type parameter must be a string and a MIME type.'); - - $attributes = array('length' => $length, 'type' => $type); - - if ($this->version == Feed::RSS2) { - $attributes['url'] = $url; - $this->addElement('enclosure', '', $attributes, FALSE, $multiple); - } else { - $attributes['href'] = $url; - $attributes['rel'] = 'enclosure'; - $this->addElement('atom:link', '', $attributes, FALSE, $multiple); - } - - return $this; - } - - /** - * Set the 'author' element of feed item. - * Not supported in RSS 1.0 feeds. - * - * @access public - * @param string $author The author of this item - * @param string|null $email Optional email address of the author - * @param string|null $uri Optional URI related to the author - * @return self - * @throws \InvalidArgumentException if the provided email address is syntactically incorrect. - * @throws InvalidOperationException if this method is called on RSS1 feeds. - */ - public function setAuthor($author, $email = null, $uri = null) - { - if ($this->version == Feed::RSS1) - throw new InvalidOperationException('The author element is not supported in RSS1 feeds.'); - - // Regex from RFC 4287 page 41 - if ($email != null && preg_match('/.+@.+/', $email) != 1) - throw new \InvalidArgumentException('The email address is syntactically incorrect.'); - - if ($this->version == Feed::RSS2) - { - if ($email != null) - $author = $email . ' (' . $author . ')'; - - $this->addElement('author', $author); - } - else - { - $elements = array('name' => $author); - - if ($email != null) - $elements['email'] = $email; - - if ($uri != null) - $elements['uri'] = $uri; - - $this->addElement('author', $elements); - } - - return $this; - } - - /** - * Set the unique identifier of the feed item - * - * On ATOM feeds, the identifier must begin with an valid URI scheme. - * - * @access public - * @param string $id The unique identifier of this item - * @param boolean $permaLink The value of the 'isPermaLink' attribute in RSS 2 feeds. - * @return self - * @throws \InvalidArgumentException if the permaLink parameter is not boolean. - * @throws InvalidOperationException if this method is called on RSS1 feeds. - */ - public function setId($id, $permaLink = false) - { - if ($this->version == Feed::RSS2) { - if (!is_bool($permaLink)) - throw new \InvalidArgumentException('The permaLink parameter must be boolean.'); - - $permaLink = $permaLink ? 'true' : 'false'; - - $this->addElement('guid', $id, array('isPermaLink' => $permaLink)); - } elseif ($this->version == Feed::ATOM) { - // Check if the given ID is an valid URI scheme (see RFC 4287 4.2.6) - // The list of valid schemes was generated from http://www.iana.org/assignments/uri-schemes - // by using only permanent or historical schemes. - $validSchemes = array('aaa', 'aaas', 'about', 'acap', 'acct', 'cap', 'cid', 'coap', 'coaps', 'crid', 'data', 'dav', 'dict', 'dns', 'example', 'fax', 'file', 'filesystem', 'ftp', 'geo', 'go', 'gopher', 'h323', 'http', 'https', 'iax', 'icap', 'im', 'imap', 'info', 'ipp', 'ipps', 'iris', 'iris.beep', 'iris.lwz', 'iris.xpc', 'iris.xpcs', 'jabber', 'ldap', 'mailserver', 'mailto', 'mid', 'modem', 'msrp', 'msrps', 'mtqp', 'mupdate', 'news', 'nfs', 'ni', 'nih', 'nntp', 'opaquelocktoken', 'pack', 'pkcs11', 'pop', 'pres', 'prospero', 'reload', 'rtsp', 'rtsps', 'rtspu', 'service', 'session', 'shttp', 'sieve', 'sip', 'sips', 'sms', 'snews', 'snmp', 'soap.beep', 'soap.beeps', 'stun', 'stuns', 'tag', 'tel', 'telnet', 'tftp', 'thismessage', 'tip', 'tn3270', 'turn', 'turns', 'tv', 'urn', 'vemmi', 'videotex', 'vnc', 'wais', 'ws', 'wss', 'xcon', 'xcon-userid', 'xmlrpc.beep', 'xmlrpc.beeps', 'xmpp', 'z39.50', 'z39.50r', 'z39.50s'); - $found = FALSE; - $checkId = strtolower($id); - - foreach($validSchemes as $scheme) - if (strrpos($checkId, $scheme . ':', -strlen($checkId)) !== FALSE) - { - $found = TRUE; - break; - } - - if (!$found) - throw new \InvalidArgumentException("The ID must begin with an IANA-registered URI scheme."); - - $this->addElement('id', $id, NULL, TRUE); - } else - throw new InvalidOperationException('A unique ID is not supported in RSS1 feeds.'); - - return $this; - } - - } // end of class Item diff --git a/module/download/vendor/FeedWriter/README.md b/module/download/vendor/FeedWriter/README.md deleted file mode 100644 index f630af99..00000000 --- a/module/download/vendor/FeedWriter/README.md +++ /dev/null @@ -1,42 +0,0 @@ -# Generate **RSS 1.0**, **RSS 2.0** or **ATOM** Formatted Feeds - -This package can be used to generate feeds in either **RSS 1.0**, **RSS 2.0** or **ATOM** format. - -Applications can create a feed object, several feed item objects, set several types of properties of either feed and feed items, and add items to the feed. - -Once a feed is fully composed with its items, the feed class can generate the necessary XML structure to describe the feed in **RSS** or **ATOM** format. This structure can be directly sent to the browser, or just returned as string. - -## Requirements - -- PHP 5.3 or higher - -If you don't have **PHP 5.3** available on your system there is a version supporting **PHP 5.0** and above. See the `legacy-php-5.0` branch. - -## Documentation - -The documentation can be found in the `gh-pages` branch, or on [GitHub Pages](https://mibe.github.io/FeedWriter/). - -See the `/examples` directory for usage examples. - -See the `CHANGELOG.md` file for changes between the different versions. - -## Authors - -In chronological order: - -- [Anis uddin Ahmad](https://github.com/ajaxray) -- [Michael Bemmerl](https://github.com/mibe) -- Phil Freo -- Paul Ferrett -- Brennen Bearnes -- Michael Robinson -- Baptiste Fontaine -- Kristián Valentín -- Brandtley McMinn -- Julian Bogdani -- Cedric Gampert -- Yamek -- Thielj -- Pavel Khakhlou -- Daniel -- Tino Goratsch diff --git a/module/download/vendor/FeedWriter/RSS1.php b/module/download/vendor/FeedWriter/RSS1.php deleted file mode 100644 index a0465cf5..00000000 --- a/module/download/vendor/FeedWriter/RSS1.php +++ /dev/null @@ -1,37 +0,0 @@ - - * - * This file is part of the "Universal Feed Writer" project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * Wrapper for creating RSS1 feeds - * - * @package UniversalFeedWriter - */ -class RSS1 extends Feed -{ - /** - * {@inheritdoc} - */ - public function __construct() - { - parent::__construct(Feed::RSS1); - } -} diff --git a/module/download/vendor/FeedWriter/RSS2.php b/module/download/vendor/FeedWriter/RSS2.php deleted file mode 100644 index 9e36a728..00000000 --- a/module/download/vendor/FeedWriter/RSS2.php +++ /dev/null @@ -1,37 +0,0 @@ - - * - * This file is part of the "Universal Feed Writer" project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * Wrapper for creating RSS2 feeds - * - * @package UniversalFeedWriter - */ -class RSS2 extends Feed -{ - /** - * {@inheritdoc} - */ - public function __construct() - { - parent::__construct(Feed::RSS2); - } -} diff --git a/module/download/view/add/add.css b/module/download/view/add/add.css deleted file mode 100644 index 805e9150..00000000 --- a/module/download/view/add/add.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * 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-2020, 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/module/download/view/add/add.js.php b/module/download/view/add/add.js.php deleted file mode 100644 index d88ff563..00000000 --- a/module/download/view/add/add.js.php +++ /dev/null @@ -1,54 +0,0 @@ -/** - * 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 - * @license GNU General Public License, version 3 - * @link http://zwiicms.fr/ - */ - -/** - * Soumission du formulaire pour enregistrer en brouillon - */ -$("#downloadAddDraft").on("click", function() { - $("#downloadAddState").val(0); - $("#downloadAddForm").trigger("submit"); -}); - -/** - * Options de commentaires - */ -$("#downloadAddCommentClose").on("change", function() { - if ($(this).is(':checked') ) { - $(".commentOptionsWrapper").slideUp(); - } else { - $(".commentOptionsWrapper").slideDown(); - } -}); - -$("#downloadAddCommentNotification").on("change", function() { - if ($(this).is(':checked') ) { - $("#downloadAddCommentGroupNotification").slideDown(); - } else { - $("#downloadAddCommentGroupNotification").slideUp(); - } -}); - - -$( document).ready(function() { - - if ($("#downloadAddCloseComment").is(':checked') ) { - $(".commentOptionsWrapper").slideUp(); - } else { - $(".commentOptionsWrapper").slideDown(); - } - - if ($("#downloadAddCommentNotification").is(':checked') ) { - $("#downloadAddCommentGroupNotification").slideDown(); - } else { - $("#downloadAddCommentGroupNotification").slideUp(); - } -}); \ No newline at end of file diff --git a/module/download/view/add/add.php b/module/download/view/add/add.php deleted file mode 100644 index e33f4df8..00000000 --- a/module/download/view/add/add.php +++ /dev/null @@ -1,139 +0,0 @@ - -
    -
    - 'buttonGrey', - 'href' => helper::baseUrl() . $this->getUrl(0) . '/config', - 'ico' => 'left', - 'value' => 'Retour' - ]); ?> -
    -
    - true, - 'value' => 'Enregistrer en brouillon' - ]); ?> - true - ]); ?> -
    -
    - 'Publier' - ]); ?> -
    -
    -
    -
    -
    -

    Informations générales

    -
    -
    - 'Titre' - ]); ?> -
    -
    - 'Version' - ]); ?> -
    -
    - 'Date' - ]); ?> -
    -
    -
    -
    - 'Archive du fichier' - ]); ?> -
    -
    - 'Capture d\'écran', - 'type' => 1 - ]); ?> -
    -
    -
    -
    - 'Auteur', - 'value' => $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'fileAuthor']) - ]); ?> -
    -
    - 'Licence', - 'selected' => $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'fileLicense']) - ]); ?> -
    -
    -
    -
    -
    - 'editorWysiwyg' - ]); ?> -
    -
    -
    -

    Options de publication

    -
    -
    - 'Auteur', - 'selected' => $this->getUser('id'), - 'disabled' => $this->getUser('group') !== self::GROUP_ADMIN ? true : false - ]); ?> -
    -
    - 'L\'item n\'est visible qu\'après la date de publication prévue.', - 'label' => 'Date de publication', - 'value' => time() - ]); ?> -
    -
    - 'Edition / Suppression', - 'selected' => $module::EDIT_ALL, - 'help' => 'Les utilisateurs des groupes supérieurs accèdent à l\'item sans restriction' - ]); ?> -
    -
    -
    -
    -
    -
    -
    -
    -

    Commentaires

    -
    -
    - -
    -
    - -
    -
    - 'Choix du nombre maximum de caractères pour chaque commentaire de l\'item, mise en forme html comprise.', - 'label' => 'Caractères par commentaire' - ]); ?> -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    -
    - diff --git a/module/download/view/comment/comment.css b/module/download/view/comment/comment.css deleted file mode 100644 index 805e9150..00000000 --- a/module/download/view/comment/comment.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * 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-2020, 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/module/download/view/comment/comment.js.php b/module/download/view/comment/comment.js.php deleted file mode 100644 index fe2f99d5..00000000 --- a/module/download/view/comment/comment.js.php +++ /dev/null @@ -1,62 +0,0 @@ -/** - * 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 - * @license GNU General Public License, version 3 - * @link http://zwiicms.fr/ - */ - - -/** - * Confirmation de suppression - */ -$(".downloadCommentDelete").on("click", function() { - var _this = $(this); - var nom = "getData(['module', $this->getUrl(0), $this->getUrl(2), 'title' ]); ?>"; - return core.confirm("Supprimer le commentaire de l'item " + nom + " ?", function() { - $(location).attr("href", _this.attr("href")); - }); -}); - -/** - * Confirmation d'approbation - */ -$(".downloadCommentApproved").on("click", function() { - var _this = $(this); - var nom = "getData(['module', $this->getUrl(0), $this->getUrl(2), 'title' ]); ?>"; - return core.confirm("Approuver le commentaire de l'item " + nom + " ?", function() { - $(location).attr("href", _this.attr("href")); - }); -}); - -/** - * Confirmation de rejet - */ -$(".downloadCommentRejected").on("click", function() { - var _this = $(this); - var nom = "getData(['module', $this->getUrl(0), $this->getUrl(2), 'title' ]); ?>"; - return core.confirm("Rejeter le commentaire de l'item " + nom + " ?", function() { - $(location).attr("href", _this.attr("href")); - }); -}); - -/** - * Confirmation de suppression en masse - */ -$(".downloadCommentDeleteAll").on("click", function() { - var _this = $(this); - var nombre = "getData(['module', $this->getUrl(0), $this->getUrl(2), 'comment' ])); ?>"; - var nom = "getData(['module', $this->getUrl(0), $this->getUrl(2), 'title' ]); ?>"; - if( nombre === "1"){ - var message = "Supprimer le commentaire de l'item " + nom + " ?"; - } else{ - var message = "Supprimer les " + nombre + " commentaires de l'item " + nom + " ?"; - } - return core.confirm(message, function() { - $(location).attr("href", _this.attr("href")); - }); -}); diff --git a/module/download/view/comment/comment.php b/module/download/view/comment/comment.php deleted file mode 100644 index 76c50a61..00000000 --- a/module/download/view/comment/comment.php +++ /dev/null @@ -1,22 +0,0 @@ -
    -
    - 'buttonGrey', - 'href' => helper::baseUrl() . $this->getUrl(0) . '/config', - 'ico' => 'left', - 'value' => 'Retour' - ]); ?> -
    - - -
    - -
    - -
    - - '; ?> - -
    - - diff --git a/module/download/view/config/config.css b/module/download/view/config/config.css deleted file mode 100644 index 805e9150..00000000 --- a/module/download/view/config/config.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * 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-2020, 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/module/download/view/config/config.js.php b/module/download/view/config/config.js.php deleted file mode 100644 index bc462697..00000000 --- a/module/download/view/config/config.js.php +++ /dev/null @@ -1,21 +0,0 @@ -/** - * 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 - * @license GNU General Public License, version 3 - * @link http://zwiicms.fr/ - */ - -/** - * Confirmation de suppression - */ -$(".downloadConfigDelete").on("click", function() { - var _this = $(this); - return core.confirm("Êtes-vous sûr de vouloir supprimer cet item ?", function() { - $(location).attr("href", _this.attr("href")); - }); -}); \ No newline at end of file diff --git a/module/download/view/config/config.php b/module/download/view/config/config.php deleted file mode 100644 index 8ac3cd4d..00000000 --- a/module/download/view/config/config.php +++ /dev/null @@ -1,60 +0,0 @@ - -
    -
    - 'buttonGrey', - 'href' => helper::baseUrl() . 'page/edit/' . $this->getUrl(0), 'items', - 'ico' => 'left', - 'value' => 'Retour' - ]); ?> -
    -
    - helper::baseUrl() . $this->getUrl(0) . '/add', - 'ico' => 'plus', - 'value' => 'Fichier' - ]); ?> -
    -
    - -
    -
    -
    -
    -
    -

    Paramètres du module

    -
    -
    - $this->getData(['module', $this->getUrl(0), 'config', 'feeds']), - ]); ?> -
    -
    - 'Etiquette du flux', - 'value' => $this->getData(['module', $this->getUrl(0), 'config', 'feedsLabel']) - ]); ?> -
    -
    -
    -
    - 'Articles par page', - 'selected' => $this->getData(['module', $this->getUrl(0),'config', 'itemsperPage']) - ]); ?> -
    -
    -
    -
    -
    - - - - - - - -
    Version n° - -
    - diff --git a/module/download/view/edit/edit.css b/module/download/view/edit/edit.css deleted file mode 100644 index 805e9150..00000000 --- a/module/download/view/edit/edit.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * 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-2020, 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/module/download/view/edit/edit.js.php b/module/download/view/edit/edit.js.php deleted file mode 100644 index 148e937a..00000000 --- a/module/download/view/edit/edit.js.php +++ /dev/null @@ -1,66 +0,0 @@ -/** - * 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 - * @license GNU General Public License, version 3 - * @link http://zwiicms.fr/ - */ - - -// Lien de connexion -$("#downloadEditMailNotification").on("change", function() { - if($(this).is(":checked")) { - $("#formConfigGroup").show(); - } - else { - $("#formConfigGroup").hide(); - } -}).trigger("change"); - - -/** - * Soumission du formulaire pour enregistrer en brouillon - */ -$("#downloadEditDraft").on("click", function() { - $("#downloadEditState").val(0); - $("#downloadEditForm").trigger("submit"); -}); - -/** - * Options de commentaires - */ -$("#downloadEditCommentClose").on("change", function() { - if ($(this).is(':checked') ) { - $(".commentOptionsWrapper").slideUp(); - } else { - $(".commentOptionsWrapper").slideDown(); - } -}); - -$("#downloadEditCommentNotification").on("change", function() { - if ($(this).is(':checked') ) { - $("#downloadEditCommentGroupNotification").slideDown(); - } else { - $("#downloadEditCommentGroupNotification").slideUp(); - } -}); - - -$( document).ready(function() { - - if ($("#downloadEditCloseComment").is(':checked') ) { - $(".commentOptionsWrapper").slideUp(); - } else { - $(".commentOptionsWrapper").slideDown(); - } - - if ($("#downloadEditCommentNotification").is(':checked') ) { - $("#downloadEditCommentGroupNotification").slideDown(); - } else { - $("#downloadEditCommentGroupNotification").slideUp(); - } -}); \ No newline at end of file diff --git a/module/download/view/edit/edit.php b/module/download/view/edit/edit.php deleted file mode 100644 index db0b5477..00000000 --- a/module/download/view/edit/edit.php +++ /dev/null @@ -1,159 +0,0 @@ - -
    -
    - 'buttonGrey', - 'href' => helper::baseUrl() . $this->getUrl(0) . '/config', - 'ico' => 'left', - 'value' => 'Retour' - ]); ?> -
    -
    - true, - 'value' => 'Enregistrer en brouillon' - ]); ?> - true - ]); ?> -
    -
    - 'Publier' - ]); ?> - -
    -
    -
    -
    -
    -

    Informations générales

    - -
    -
    - 'Titre', - 'value' => $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'title']) - ]); ?> -
    -
    - 'Version', - 'value' => $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'fileVersion']) - ]); ?> -
    -
    - 'Date', - 'value' => $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'fileDate']) - ]); ?> -
    -
    -
    -
    - 'Archive du fichier', - 'value' => $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'file']) - ]); ?> -
    -
    - 'Capture d\'écran', - 'type' => 1, - 'value' => $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'picture']) - ]); ?> -
    -
    -
    -
    - 'Auteur', - 'value' => $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'fileAuthor']) - ]); ?> -
    -
    - 'Licence', - 'selected' => $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'fileLicense']) - ]); ?> -
    -
    -
    -
    -
    - 'editorWysiwyg', - 'value' => $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'content']) - ]); ?> -
    -
    -
    -

    Options de publication

    -
    -
    - 'Auteur', - 'selected' => $this->getUser('id'), - 'disabled' => $this->getUser('group') !== self::GROUP_ADMIN ? true : false - ]); ?> -
    -
    - 'L\'item n\'est visible qu\'après la date de publication prévue.', - 'label' => 'Date de publication', - 'value' => time() - ]); ?> -
    -
    - 'Edition / Suppression', - 'selected' => is_numeric($this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'editConsent'])) ? $module::EDIT_GROUP : $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'editConsent']), - 'help' => 'Les utilisateurs des groupes supérieurs accèdent à l\'item sans restriction' - ]); ?> -
    -
    -
    -
    -
    -
    -
    -
    -

    Commentaires

    -
    -
    - $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'commentClose']) - ]); ?> -
    -
    - $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'commentApproved']), - '' - ]); ?> -
    -
    - 'Choix du nombre maximum de caractères pour chaque commentaire de l\'item, mise en forme html comprise.', - 'label' => 'Caractères par commentaire', - 'selected' => $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'commentMaxlength']) - ]); ?> -
    - -
    -
    -
    - $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'commentNotification']), - ]); ?> -
    -
    - $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(2), 'commentGroupNotification']), - 'help' => 'Editeurs = éditeurs + administrateurs
    Membres = membres + éditeurs + administrateurs' - ]); ?> -
    -
    -
    -
    -
    - diff --git a/module/download/view/index/index.css b/module/download/view/index/index.css deleted file mode 100644 index b958b637..00000000 --- a/module/download/view/index/index.css +++ /dev/null @@ -1,69 +0,0 @@ -.rowitem { - margin-bottom: 10px !important; -} -.downloadPicture { - float: none; - border: 1px; -} -.downloadPicture img { - width: 100%; - height: auto; - /* - border:1px solid lightgray; - box-shadow: 1px 1px 5px darkgray; - */ -} - -.downloadPicture:hover { - opacity: .7; -} -.row:after { - content: " "; - display: table; - clear: both; -} -.downloadComment { - padding-right: 10px; - float: right; -} -h2{ - margin-bottom: 5px; - margin-top: 0px; - padding: 0px; - -} -.downloadContent { - float: left; - margin-top: 5px; -} -.downloadDate { - font-size:0.8em; - font-style: italic; - /* - color: grey; - */ -} -@media (max-width: 768px) { - .downloadContent { - display: none; - } - - .downloadPicture img { - width: 50% ; - display: block; - margin-left: auto; - margin-right: auto; - } -} - -/* -* Flux RSS -*/ -#rssFeed { - text-align: right; - float: right; -} -#rssFeed p { - display: inline; - vertical-align: top; -} \ No newline at end of file diff --git a/module/download/view/item/item.css b/module/download/view/item/item.css deleted file mode 100644 index 445f719d..00000000 --- a/module/download/view/item/item.css +++ /dev/null @@ -1,63 +0,0 @@ - -#sectionTitle { - margin-top: 0; - margin-bottom: 5px; -} -.downloaditemPicture { - height: auto; - border:1px solid lightgray; - box-shadow: 1px 1px 5px; -} -.downloaditemPictureleft { - float: left; - margin: 15px 10px 5px 0 ; -} -.downloaditemPictureright { - float: right; - margin: 15px 0 5px 10px ; -} - - -.pict20{ - width: 20%; -} -.pict30{ - width: 30%; -} -.pict40{ - width: 40%; -} -.pict50{ - width: 50%; -} -.pict100{ - width: 100%; - margin: 15px 0 20px 0 ; -} - -#downloaditemCommentShow { - cursor: text; -} -#downloaditemOr { - padding: 10px; -} -.downloadDate { - font-size:0.8em; - font-style: italic; - color: grey; -} -@media (max-width: 767px) { - .downloaditemPicture { - height:auto; - max-width: 100%;} - } - - -#rssFeed { - text-align: right; - float: right; -} -#rssFeed p { - display: inline; - vertical-align: top; -} diff --git a/module/download/view/item/item.js.php b/module/download/view/item/item.js.php deleted file mode 100644 index cb07dcd2..00000000 --- a/module/download/view/item/item.js.php +++ /dev/null @@ -1,43 +0,0 @@ -/** - * 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 - * @license GNU General Public License, version 3 - * @link http://zwiicms.fr/ - */ - -/** - * Affiche le bloc pour rédiger un commentaire - */ -var commentShowDOM = $("#downloadItemCommentShow"); -commentShowDOM.on("click focus", function() { - $("#downloadItemCommentShowWrapper").fadeOut(function() { - $("#downloadItemCommentWrapper").fadeIn(); - $("#downloadItemCommentContent").trigger("focus"); - }); -}); -if($("#downloadItemCommentWrapper").find("textarea.notice,input.notice").length) { - commentShowDOM.trigger("click"); -} - -/** - * Cache le bloc pour rédiger un commentaire - */ -$("#downloadItemCommentHide").on("click focus", function() { - $("#downloadItemCommentWrapper").fadeOut(function() { - $("#downloadItemCommentShowWrapper").fadeIn(); - $("#downloadItemCommentContent").val(""); - $("#downloadItemCommentAuthor").val(""); - }); -}); - -/** - * Force le scroll vers les commentaires en cas d'erreur - */ -$("#downloadItemCommentForm").on("submit", function() { - $(location).attr("href", "#comment"); -}); \ No newline at end of file diff --git a/module/download/view/list/list.php b/module/download/view/list/list.php deleted file mode 100644 index 4b8f6d3c..00000000 --- a/module/download/view/list/list.php +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/module/download/view/rss/rss.php b/module/download/view/rss/rss.php deleted file mode 100644 index 4b8f6d3c..00000000 --- a/module/download/view/rss/rss.php +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/module/download/view/stats/stats.css b/module/download/view/stats/stats.css deleted file mode 100644 index 805e9150..00000000 --- a/module/download/view/stats/stats.css +++ /dev/null @@ -1,18 +0,0 @@ -/** - * 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-2020, 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/module/download/view/stats/stats.js.php b/module/download/view/stats/stats.js.php deleted file mode 100644 index fbeffea1..00000000 --- a/module/download/view/stats/stats.js.php +++ /dev/null @@ -1,22 +0,0 @@ -/** - * 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 - * @license GNU General Public License, version 3 - * @link http://zwiicms.fr/ - */ - - -/** - * Confirmation de suppression - */ -$(".statsDeleteAll").on("click", function() { - var _this = $(this); - return core.confirm("Êtes-vous sûr de vouloir purger les statistiques ?", function() { - $(location).attr("href", _this.attr("href")); - }); -}); \ No newline at end of file diff --git a/module/download/view/stats/stats.php b/module/download/view/stats/stats.php deleted file mode 100644 index 5b778f3b..00000000 --- a/module/download/view/stats/stats.php +++ /dev/null @@ -1,36 +0,0 @@ - -
    -
    - 'buttonGrey', - 'href' => helper::baseUrl() . $this->getUrl(0) . '/config', - 'ico' => 'left', - 'value' => 'Retour' - ]); ?> -
    -
    - 'statsDeleteAll buttonRed', - 'href' => helper::baseUrl() . $this->getUrl(0) . '/statsDeleteAll' . '/' . $this->getUrl(2) . '/'. $_SESSION['csrf'] , - 'ico' => 'cancel', - 'value' => 'Purger' - ]); ?> -
    -
    - -
    -
    -

    Nombre de téléchargements : - -

    -
    -
    - - - - - - -
    Version n° - -
    \ No newline at end of file From f8decc4ce324d74ed954afc3cab97deab6add9e8 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 3 May 2021 18:35:31 +0200 Subject: [PATCH 15/21] =?UTF-8?q?News=20bug=20import=20+=20bug=20couleur?= =?UTF-8?q?=20arri=C3=A8re-plan=20sombre?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/news/news.php | 14 ++++++++------ module/news/view/index/index.css | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/module/news/news.php b/module/news/news.php index cc8d3189..f48081d4 100755 --- a/module/news/news.php +++ b/module/news/news.php @@ -184,7 +184,7 @@ class news extends common { // Générer la feuille de CSS $style = '.newsContent {height:' . $this->getInput('newsConfigItemsHeight',helper::FILTER_STRING_SHORT) . ';}'; - $style .= '.newsBlur {background: linear-gradient(#333 ' . $this->getInput('newsConfigItemsBlur',helper::FILTER_STRING_SHORT) . ',rgba(255,255,255,0) );'; + $style .= '.newsBlur {background: linear-gradient(' . $this->getData(['theme', 'text', 'textColor']) . ' ' . $this->getInput('newsConfigItemsBlur',helper::FILTER_STRING_SHORT) . ',rgba(255,255,255,0) );'; $style .= ' background-clip: text;-webkit-background-clip: text;-webkit-text-fill-color: transparent;}'; // Dossier de l'instance @@ -358,7 +358,7 @@ class news extends common { $this->update(); // Initialisation d'un nouveau module - $this->init(); + $this->init(); // Affichage d'un article if( @@ -446,7 +446,8 @@ class news extends common { */ private function update() { - // Version 3.0 + // Créer la structure de configuration si absente + // Il n'existait aucun paramétrage dans les version précédentes if ($this->getData(['module', $this->getUrl(0), 'config']) === NULL ) { // Données config et theme absentes du précédent module $this->init(); @@ -458,10 +459,11 @@ class news extends common { */ private function init() { + $fileCSS = self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css'; - // Données du module - if ($this->getData(['module', $this->getUrl(0) ]) === null) { + // Données du module absentes + if ($this->getData(['module', $this->getUrl(0), 'config' ]) === null) { require_once('module/news/ressource/defaultdata.php'); $this->setData(['module', $this->getUrl(0), 'config', init::$defaultData]); // Données de thème @@ -478,7 +480,7 @@ class news extends common { if ( !file_exists(self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css')) { // Générer la feuille de CSS $style = '.newsContent {height: ' . $this->getData([ 'module', $this->getUrl(0), 'theme', 'itemsHeight' ]) .';}'; - $style .= '.newsBlur {background: linear-gradient(#333 ' . $this->getData([ 'module', $this->getUrl(0), 'theme', 'itemsBlur' ]) . ',#FFF );'; + $style .= '.newsBlur {background: linear-gradient(' . $this->getData(['theme', 'text', 'textColor']) . ' ' . $this->getData([ 'module', $this->getUrl(0), 'theme', 'itemsBlur' ]) . ',rgba(255,255,255,0) );'; $style .= ' background-clip: text;-webkit-background-clip: text;-webkit-text-fill-color: transparent;}'; // Sauver la feuille de style file_put_contents(self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css' , $style ); diff --git a/module/news/view/index/index.css b/module/news/view/index/index.css index 04b5023c..1b57571c 100755 --- a/module/news/view/index/index.css +++ b/module/news/view/index/index.css @@ -26,7 +26,7 @@ position: relative; clear: left; margin-left: 10px; - margin-bottom: 5px; + margin-bottom: 30px; } /* .newsBlur { From a89f3e9329a33dafb24d041114f71ca109535aaf Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 3 May 2021 18:35:42 +0200 Subject: [PATCH 16/21] Commentaire --- module/search/search.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/search/search.php b/module/search/search.php index 0fcf2b29..8571d43d 100755 --- a/module/search/search.php +++ b/module/search/search.php @@ -53,6 +53,7 @@ class search extends common { private function update() { // Déplacement des données d'une version ultérieure + // selon la présence de previewLenght if ($this->getData(['module', $this->getUrl(0), 'previewLength']) ) { $data = $this->getData(['module', $this->getUrl(0)]); // Feuille de style From 3a88ae8dca4966f4a65d63865fe302a20a6309fe Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 3 May 2021 18:35:47 +0200 Subject: [PATCH 17/21] gitignore --- .gitignore | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 060401b3..879f1ffd 100755 --- a/.gitignore +++ b/.gitignore @@ -38,13 +38,4 @@ site/data/journal.log .DS_Store site/.DS_Store site/file/.DS_Store -site/data/es/locale.json -site/data/es/module.json -site/data/es/page.json -site/data/en/locale.json -site/data/en/module.json -site/data/en/page.json -site/data/de/locale.json -site/data/de/module.json -site/data/de/page.json -site/data/modules/* \ No newline at end of file +site/data/* From 65066794669d7b4fdc37e6cf1bace3f2cfda9686 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 3 May 2021 18:54:07 +0200 Subject: [PATCH 18/21] News : Bug theme par defaut --- module/news/news.php | 8 ++++++-- module/news/ressource/defaultdata.php | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/module/news/news.php b/module/news/news.php index f48081d4..0700eda7 100755 --- a/module/news/news.php +++ b/module/news/news.php @@ -448,9 +448,13 @@ class news extends common { // Créer la structure de configuration si absente // Il n'existait aucun paramétrage dans les version précédentes - if ($this->getData(['module', $this->getUrl(0), 'config']) === NULL ) { + if ($this->getData(['module', $this->getUrl(0), 'config', 'itemsperPage']) === NULL ) { // Données config et theme absentes du précédent module - $this->init(); + require_once('module/news/ressource/defaultdata.php'); + $this->setData(['module', $this->getUrl(0), 'config', init::$defaultData]); + // Données de thème + $this->setData(['module', $this->getUrl(0), 'theme', init::$defaultTheme]); + $this->setData(['module', $this->getUrl(0), 'theme', 'style', self::DATADIRECTORY . 'pages/' . $this->getUrl(0) . '/theme.css' ]); } } diff --git a/module/news/ressource/defaultdata.php b/module/news/ressource/defaultdata.php index cf2d5649..4bb863a4 100644 --- a/module/news/ressource/defaultdata.php +++ b/module/news/ressource/defaultdata.php @@ -8,7 +8,7 @@ class init extends search { 'versionData' => '3.0' ]; public static $defaultTheme = [ - 'itemsHeight' => '200px', - 'itemsBlur' => '0%' + 'itemsHeight' => 'auto', + 'itemsBlur' => '100%' ]; } \ No newline at end of file From bd3630f7180d8ee1d449ff9022e02d16d2e46076 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 3 May 2021 18:55:41 +0200 Subject: [PATCH 19/21] Bug core version --- core/core.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core.php b/core/core.php index b8baadbc..ba1036d4 100755 --- a/core/core.php +++ b/core/core.php @@ -1587,7 +1587,7 @@ class common { } // Version 10.6.00 - if ($this->getData(['core', 'dataVersion']) < 106) { + if ($this->getData(['core', 'dataVersion']) < 10600) { // Mise à jour des données des modules autonomes From 1fe067aa25b5cbdd05f0714f59fcc4693284ffda Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 3 May 2021 18:57:21 +0200 Subject: [PATCH 20/21] gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 879f1ffd..7404a186 100755 --- a/.gitignore +++ b/.gitignore @@ -38,4 +38,3 @@ site/data/journal.log .DS_Store site/.DS_Store site/file/.DS_Store -site/data/* From 3908d752405c398d2672e818a8888c214032394f Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 3 May 2021 19:04:28 +0200 Subject: [PATCH 21/21] =?UTF-8?q?News=20:=20titre=20d'article=20h1=20en=20?= =?UTF-8?q?h2=20pour=20respecter=20la=20hi=C3=A9rarchie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/news/view/index/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/news/view/index/index.php b/module/news/view/index/index.php index 62d28a53..545ab702 100755 --- a/module/news/view/index/index.php +++ b/module/news/view/index/index.php @@ -2,9 +2,9 @@
    $news): ?>
    -

    +

    getUrl(0) . '/' . $newsId . '">' . $news['title'] . ''; ?> -

    +