ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 143 Activity

Merge branch 'master' into 10400

This commit is contained in:
fredtempez 2020-12-13 17:37:12 +01:00
parent cd73ac6996 0aad617a33
commit 3fe2e76741
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGES.md
View File

@ -18,10 +18,17 @@
- Traduction automatique dans la langue du navigateur. - Traduction automatique dans la langue du navigateur.
- Amélioration de la structure du flux RSS. - Amélioration de la structure du flux RSS.
## Version 10.3.11
Modification :
- Message sur l'utilisation des cookies
Coorection :
- Recherche inopérante dans les articles des blogs.
## Version 10.3.10 ## Version 10.3.10
Corrections : Corrections :
- Conflit page inactive et droit d'un membre. - Conflit page inactive et droit d'un membre.
- Module de recherche, correction dans les pages enfants. - Module de recherche, correction dans les pages enfants.
- Module formulaire, perte des données en cas d'édition du fomulaire ou des champs.
Modification : Modification :
- TinyMCE nettoyage init.js d'options non supportées. - TinyMCE nettoyage init.js d'options non supportées.

22
core/core.php
View File

@ -44,7 +44,7 @@ class common {
const ACCESS_TIMER = 1800; const ACCESS_TIMER = 1800;
// Numéro de version // Numéro de version
const ZWII_VERSION = '10.4.00.009'; const ZWII_VERSION = '10.4.00.010';
const ZWII_UPDATE_CHANNEL = "v10"; const ZWII_UPDATE_CHANNEL = "v10";
public static $actions = []; public static $actions = [];
@ -1929,9 +1929,9 @@ class core extends common {
} }
// Empêcher l'accès aux page désactivée par URL directe // Empêcher l'accès aux page désactivée par URL directe
if ( ( $this->getData(['page', $this->getUrl(0),'disable']) === true if ( ( $this->getData(['page', $this->getUrl(0),'disable']) === true
AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')
) OR ( ) OR (
$this->getData(['page', $this->getUrl(0),'disable']) === true $this->getData(['page', $this->getUrl(0),'disable']) === true
AND $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') AND $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
AND $this->getUser('group') < self::GROUP_MODERATOR AND $this->getUser('group') < self::GROUP_MODERATOR
) )
@ -2297,7 +2297,7 @@ class layout extends common {
* Affiche le script Google Analytics * Affiche le script Google Analytics
*/ */
public function showAnalytics() { public function showAnalytics() {
if($code = $this->getData(['config', 'analyticsId']) if($code = $this->getData(['config', 'analyticsId'])
AND $this->getInput('ZWII_COOKIE_CONSENT') === 'true') { AND $this->getInput('ZWII_COOKIE_CONSENT') === 'true') {
echo '<!-- Global site tag (gtag.js) - Google Analytics --> echo '<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id='. $code .'"></script> <script async src="https://www.googletagmanager.com/gtag/js?id='. $code .'"></script>
@ -2567,9 +2567,9 @@ class layout extends common {
$itemsLeft .= '<li>'; $itemsLeft .= '<li>';
if ( ( $this->getData(['page',$parentPageId,'disable']) === true if ( ( $this->getData(['page',$parentPageId,'disable']) === true
AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')
) OR ( ) OR (
$this->getData(['page',$parentPageId,'disable']) === true $this->getData(['page',$parentPageId,'disable']) === true
AND $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') AND $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
AND $this->getUser('group') < self::GROUP_MODERATOR AND $this->getUser('group') < self::GROUP_MODERATOR
) )
@ -2627,9 +2627,9 @@ class layout extends common {
// Mise en page du sous-item // Mise en page du sous-item
$itemsLeft .= '<li>'; $itemsLeft .= '<li>';
if ( ( $this->getData(['page',$childKey,'disable']) === true if ( ( $this->getData(['page',$childKey,'disable']) === true
AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')
) OR ( ) OR (
$this->getData(['page',$childKey,'disable']) === true $this->getData(['page',$childKey,'disable']) === true
AND $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') AND $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
AND $this->getUser('group') < self::GROUP_MODERATOR AND $this->getUser('group') < self::GROUP_MODERATOR
) )

4
module/search/search.php
View File

@ -126,8 +126,8 @@ class search extends common {
foreach($childIds as $childId) { foreach($childIds as $childId) {
// Sous page // Sous page
if ($this->getData(['page', $childId, 'disable']) === false && if ($this->getData(['page', $childId, 'disable']) === false &&
$this->getUser('group') >= $this->getData(['page', $childId, 'group']) && $this->getUser('group') >= $this->getData(['page', $parentId, 'group']) &&
$this->getData(['page', $childId, 'block']) !== 'bar') { $this->getData(['page', $parentId, 'block']) !== 'bar') {
$url = $childId; $url = $childId;
$titre = $this->getData(['page', $childId, 'title']); $titre = $this->getData(['page', $childId, 'title']);
$contenu = ' ' . $titre . ' ' . $this->getData(['page', $childId, 'content']); $contenu = ' ' . $titre . ' ' . $this->getData(['page', $childId, 'content']);