From 10ba4df5828a4bc8328a878382fbffa3e90b4c43 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Sat, 1 Jun 2019 13:07:38 +0200 Subject: [PATCH] [9.1.08] validation du code html --- core/core.php | 11 +++++++---- core/module/page/view/edit/edit.php | 2 +- core/module/theme/theme.php | 4 ++-- module/blog/view/article/article.php | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/core/core.php b/core/core.php index f44d3a38..9fa01687 100644 --- a/core/core.php +++ b/core/core.php @@ -2139,7 +2139,7 @@ class layout extends common { $items .= ''; } $items .= $this->getData(['page', $parentPageId, 'title']); - $items .= ''; + $items .= ''; } $itemsChildren = ''; foreach($childrenPageIds as $childKey) { @@ -2169,7 +2169,10 @@ class layout extends common { $items .= ''; + } else { + $items .= ''; } + } if ($onlyChildren === false) { $items .= ''; @@ -2456,13 +2459,13 @@ class template { 'href' => 'javascript:void(0);', 'ico' => '', 'id' => $nameId, - 'name' => $nameId, + //'name' => $nameId, 'target' => '', 'uniqueSubmission' => false, 'value' => 'Bouton' ], $attributes); // Retourne le html - return sprintf( + return sprintf( '%s', helper::sprintAttributes($attributes, ['class', 'disabled', 'ico', 'value']), $attributes['disabled'] ? 'disabled' : '', @@ -3015,7 +3018,7 @@ class template { 'value' => 'Enregistrer' ], $attributes); // Retourne le html - return sprintf( + return sprintf( '', $attributes['class'], $attributes['uniqueSubmission'] ? 'uniqueSubmission' : '', diff --git a/core/module/page/view/edit/edit.php b/core/module/page/view/edit/edit.php index bfcef3db..50d3cae9 100755 --- a/core/module/page/view/edit/edit.php +++ b/core/module/page/view/edit/edit.php @@ -160,7 +160,7 @@ echo template::formOpen('pageEditForm'); ?>
- $this->getData(['page', $this->getUrl(2), 'hideTitle']) ]); ?>
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index 9d524052..495bd61b 100755 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -157,7 +157,7 @@ class theme extends common { 'hide' => 'Caché' ]; public static $radius = [ - '0' => 'Aucun', + '0px' => 'Aucun', '5px' => 'Très léger', '10px' => 'Léger', '15px' => 'Moyen', @@ -171,7 +171,7 @@ class theme extends common { 'repeat' => 'Sur les deux axes' ]; public static $shadows = [ - '0' => 'Aucune', + '0px' => 'Aucune', '1px 1px 5px' => 'Très légère', '1px 1px 10px' => 'Légère', '1px 1px 15px' => 'Moyenne', diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php index 715a394a..8e7090c5 100644 --- a/module/blog/view/article/article.php +++ b/module/blog/view/article/article.php @@ -5,7 +5,7 @@
getData(['module', $this->getUrl(0), $this->getUrl(1), 'hidePicture']) == false) { - echo '
'; + echo '
' . $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'picture']) . '
'; } ?> getData(['module', $this->getUrl(0), $this->getUrl(1), 'content']); ?>