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

11506 bug barre de membres

Browse Source
This commit is contained in:
Fred Tempez 2022-07-02 14:27:45 +02:00
parent 61c14b4189
commit ece2ed97ad
5 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/core.php
View File

@ -1551,7 +1551,7 @@ class common {
} }
// Affichage de la barre de membre simple // Affichage de la barre de membre simple
if ( $this->getUser('group') === self::GROUP_MEMBER if ( $this->getUser('group') === self::GROUP_MEMBER
&& $this->getData(['theme','footer','displayMemberBar']) === true && $this->getData(['theme','footer','memberBar']) === true
) { ) {
$items .= '<span id="footerDisplayMemberAccount"'; $items .= '<span id="footerDisplayMemberAccount"';
$items .= $this->getData(['theme','footer','displaymemberAccount']) === false ? ' class="displayNone"' : ''; $items .= $this->getData(['theme','footer','displaymemberAccount']) === false ? ' class="displayNone"' : '';
@ -1669,9 +1669,7 @@ class common {
} }
// Commandes pour les membres simples // Commandes pour les membres simples
if($this->getUser('group') == self::GROUP_MEMBER if($this->getUser('group') == self::GROUP_MEMBER
&& ( $this->getData(['theme','menu','memberBar']) === true && $this->getData(['theme','menu','memberBar']) === true
|| $this->getData(['theme','footer','displayMemberBar']) === false
)
) { ) {
if( $this->getData(['user', $this->getUser('id') , 'files']) === true) $itemsRight .= '<li><a href="' . helper::baseUrl(false) . 'core/vendor/filemanager/dialog.php?type=0&akey=' . md5_file(self::DATA_DIR.'core.json') .'" data-tippy-content="Gérer les fichiers" data-lity>' . template::ico('folder') . '</a></li>'; if( $this->getData(['user', $this->getUser('id') , 'files']) === true) $itemsRight .= '<li><a href="' . helper::baseUrl(false) . 'core/vendor/filemanager/dialog.php?type=0&akey=' . md5_file(self::DATA_DIR.'core.json') .'" data-tippy-content="Gérer les fichiers" data-lity>' . template::ico('folder') . '</a></li>';
$itemsRight .= '<li><a href="' . helper::baseUrl() . 'user/edit/' . $this->getUser('id'). '/' . $_SESSION['csrf'] . '" data-tippy-content="Gérer mon compte">' . template::ico('user', 'right') . '</a></li>'; $itemsRight .= '<li><a href="' . helper::baseUrl() . 'user/edit/' . $this->getUser('id'). '/' . $_SESSION['csrf'] . '" data-tippy-content="Gérer mon compte">' . template::ico('user', 'right') . '</a></li>';

12
core/include/update.inc.php
View File

@ -837,7 +837,17 @@ if ($this->getData(['core', 'dataVersion']) < 11400) {
// Mise à jour // Mise à jour
$this->setData(['core', 'dataVersion', 11400]); $this->setData(['core', 'dataVersion', 11400]);
} }
// Version 11.5.06
if ($this->getData(['core', 'dataVersion']) < 11506) {
// Renommage de la barre de membre dans le pied de page
$data = $this->getData(['theme', 'footer', 'displayMemberBar']);
$this->setData(['theme', 'footer', 'memberBar', $data]);
$this->deleteData(['theme', 'footer', 'displayMemberBar']);
// Mise à jour
$this->setData(['core', 'dataVersion', 11506]);
}
// Version 12.0.00 // Version 12.0.00
if ($this->getData(['core', 'dataVersion']) < 12000) { if ($this->getData(['core', 'dataVersion']) < 12000) {
// Supprime un cookie non nécessaire // Supprime un cookie non nécessaire
@ -850,4 +860,4 @@ if ($this->getData(['core', 'dataVersion']) < 12000) {
// Mise à jour // Mise à jour
$this->setData(['core', 'dataVersion', 11400]); $this->setData(['core', 'dataVersion', 11400]);
} }

4
core/module/install/ressource/defaultdata.php
View File

@ -255,7 +255,7 @@ class init extends common {
'displayCookie' => false, 'displayCookie' => false,
'displayLegal' => false, 'displayLegal' => false,
'displaySearch' => false, 'displaySearch' => false,
'displayMemberBar' => false, 'memberBar' => true,
'template' => '3' 'template' => '3'
], ],
'header' => [ 'header' => [
@ -298,7 +298,7 @@ class init extends common {
'activeColor' => 'rgba(255, 255, 255, 1)', 'activeColor' => 'rgba(255, 255, 255, 1)',
'activeTextColor' => 'rgba(255, 255, 255, 1)', 'activeTextColor' => 'rgba(255, 255, 255, 1)',
'radius' => '0px', 'radius' => '0px',
'memberBar' => true, 'memberBar' => false,
'burgerLogo' => '', 'burgerLogo' => '',
'burgerContent' => 'title', 'burgerContent' => 'title',
'width' => 'container' 'width' => 'container'

2
core/module/theme/theme.php
View File

@ -379,7 +379,7 @@ class theme extends common {
'displayCookie' => $this->getInput('themefooterDisplayCookie', helper::FILTER_BOOLEAN), 'displayCookie' => $this->getInput('themefooterDisplayCookie', helper::FILTER_BOOLEAN),
'displayLegal' => $this->getInput('themeFooterDisplayLegal', helper::FILTER_BOOLEAN), 'displayLegal' => $this->getInput('themeFooterDisplayLegal', helper::FILTER_BOOLEAN),
'displaySearch' => $this->getInput('themeFooterDisplaySearch', helper::FILTER_BOOLEAN), 'displaySearch' => $this->getInput('themeFooterDisplaySearch', helper::FILTER_BOOLEAN),
'displayMemberBar'=> $this->getInput('themeFooterDisplayMemberBar', helper::FILTER_BOOLEAN), 'memberBar'=> $this->getInput('themeFooterMemberBar', helper::FILTER_BOOLEAN),
'template' => $this->getInput('themeFooterTemplate') 'template' => $this->getInput('themeFooterTemplate')
]]); ]]);

4
core/module/theme/view/footer/footer.php
View File

@ -118,8 +118,8 @@
]); ?> ]); ?>
</div> </div>
<div class="col3"> <div class="col3">
<?php echo template::checkbox('themeFooterDisplayMemberBar', true, 'Barre du membre', [ <?php echo template::checkbox('themeFooterMemberBar', true, 'Barre du membre', [
'checked' => $this->getData(['theme', 'footer', 'displayMemberBar']), 'checked' => $this->getData(['theme', 'footer', 'memberBar']),
'help' => 'Affiche les icônes de gestion du compte et de déconnexion des membres simples connectés, ne s\'applique pas aux éditeurs et administrateurs.' 'help' => 'Affiche les icônes de gestion du compte et de déconnexion des membres simples connectés, ne s\'applique pas aux éditeurs et administrateurs.'
]); ?> ]); ?>
</div> </div>