remijean/ZwiiCMS
2
1
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Pull Requests Activity

site map et page site map

Browse Source
This commit is contained in:
Fred Tempez 2021-12-09 18:28:37 +01:00
parent b593bf86fe
commit e1abf734c4
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/core.php
View File

@ -45,7 +45,7 @@ class common {
// Numéro de version // Numéro de version
const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/update/raw/branch/master/'; const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/update/raw/branch/master/';
const ZWII_VERSION = '11.2.00.20'; const ZWII_VERSION = '11.2.00.21';
const ZWII_UPDATE_CHANNEL = "test"; const ZWII_UPDATE_CHANNEL = "test";
public static $actions = []; public static $actions = [];
@ -912,7 +912,9 @@ class common {
} }
// Page désactivée, traiter les sous-pages sans prendre en compte la page parente. // Page désactivée, traiter les sous-pages sans prendre en compte la page parente.
if ($this->getData(['page', $parentPageId, 'disable']) !== true ) { if ($this->getData(['page', $parentPageId, 'disable']) !== true ) {
$sitemap->addUrl ('/' . $parentPageId,$datetime); // Cas de la page d'accueil ne pas dupliquer l'URL
$pageId = ($parentPageId !== $this->getData(['locale', 'homePageId'])) ? $parentPageId : '';
$sitemap->addUrl ('/' . $pageId, $datetime);
} }
// Articles du blog // Articles du blog
if ($this->getData(['page', $parentPageId, 'moduleId']) === 'blog' && if ($this->getData(['page', $parentPageId, 'moduleId']) === 'blog' &&
@ -929,6 +931,8 @@ class common {
if ($this->getData(['page',$childKey,'group']) !== 0 || $this->getData(['page', $childKey, 'disable']) === true) { if ($this->getData(['page',$childKey,'group']) !== 0 || $this->getData(['page', $childKey, 'disable']) === true) {
continue; continue;
} }
// Cas de la page d'accueil ne pas dupliquer l'URL
$pageId = ($childKey !== $this->getData(['locale', 'homePageId'])) ? $childKey : '';
$sitemap->addUrl('/' . $childKey,$datetime); $sitemap->addUrl('/' . $childKey,$datetime);
// La sous-page est un blog // La sous-page est un blog
@ -2838,6 +2842,7 @@ class core extends common {
} }
} }
// Erreurs // Erreurs
if($access === 'login') { if($access === 'login') {
http_response_code(302); http_response_code(302);

6
core/module/sitemap/view/index/index.php
View File

@ -4,7 +4,8 @@
<?php <?php
if ($this->getData(['page', $parentId, 'disable']) === false && $this->getUser('group') >= $this->getData(['page', $parentId, 'group'])) if ($this->getData(['page', $parentId, 'disable']) === false && $this->getUser('group') >= $this->getData(['page', $parentId, 'group']))
{ ?> { ?>
<a href="<?php echo helper::baseUrl() . $parentId; ?>"><?php echo $this->getData(['page', $parentId, 'title']); ?></a> <?php $pageUrl = ($parentId !== $this->getData(['locale', 'homePageId'])) ? helper::baseUrl() . $parentId : helper::baseUrl(false) ; ?>
<a href="<?php echo $pageUrl; ?>"><?php echo $this->getData(['page', $parentId, 'title']); ?></a>
<?php <?php
} else { } else {
// page désactivée // page désactivée
@ -16,7 +17,8 @@
<!-- Sous-page --> <!-- Sous-page -->
<?php if ($this->getData(['page', $childId, 'disable']) === false && $this->getUser('group') >= $this->getData(['page', $parentId, 'group'])) <?php if ($this->getData(['page', $childId, 'disable']) === false && $this->getUser('group') >= $this->getData(['page', $parentId, 'group']))
{ ?> { ?>
<a href="<?php echo helper::baseUrl() . $childId; ?>"><?php echo $this->getData(['page', $childId, 'title']); ?></a> <?php $pageUrl = ($childId !== $this->getData(['locale', 'homePageId'])) ? helper::baseUrl() . $childId : helper::baseUrl(false) ; ?>
<a href="<?php echo $pageUrl ; ?>"><?php echo $this->getData(['page', $childId, 'title']); ?></a>
<?php } else { ?> <?php } else { ?>
<!-- page désactivée --> <!-- page désactivée -->
<?php echo $this->getData(['page', $childId, 'title']); }?> <?php echo $this->getData(['page', $childId, 'title']); }?>