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

Lity suite et fin

This commit is contained in:
Fred Tempez 2021-03-30 14:15:29 +02:00
parent cb254d9a31
commit 88b716a448
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/core.php
View File

@ -2057,7 +2057,6 @@ class core extends common {
'</a> &#8250; '. '</a> &#8250; '.
$this->getData(['page', $this->getUrl(0), 'title']); $this->getData(['page', $this->getUrl(0), 'title']);
} }
// Importe la page // Importe la page
if( if(
$this->getData(['page', $this->getUrl(0)]) !== null $this->getData(['page', $this->getUrl(0)]) !== null
@ -2075,12 +2074,6 @@ class core extends common {
'contentRight' => $this->getData(['page',$this->getData(['page',$this->getUrl(0),'barRight']),'content']), 'contentRight' => $this->getData(['page',$this->getData(['page',$this->getUrl(0),'barRight']),'content']),
'contentLeft' => $this->getData(['page',$this->getData(['page',$this->getUrl(0),'barLeft']),'content']), 'contentLeft' => $this->getData(['page',$this->getData(['page',$this->getUrl(0),'barLeft']),'content']),
]); ]);
if ( $this->getData(['page', $this->getUrl(0), 'lity']) === true
&& $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') ) {
$this->addOutput([
'display' => self::DISPLAY_LAYOUT_LITY
]);
}
} }
// Importe le module // Importe le module
else { else {
@ -2102,11 +2095,13 @@ class core extends common {
'contentLeft' => $this->getData(['page',$this->getData(['page',$this->getUrl(0),'barLeft']),'content']) 'contentLeft' => $this->getData(['page',$this->getData(['page',$this->getUrl(0),'barLeft']),'content'])
]); ]);
$pageContent = $this->getData(['page', $this->getUrl(0), 'content']); $pageContent = $this->getData(['page', $this->getUrl(0), 'content']);
//echo $this->output['display'];
} }
else { else {
$moduleId = $this->getUrl(0); $moduleId = $this->getUrl(0);
$pageContent = ''; $pageContent = '';
} }
// Check l'existence du module // Check l'existence du module
if(class_exists($moduleId)) { if(class_exists($moduleId)) {
/** @var common $module */ /** @var common $module */
@ -2176,13 +2171,7 @@ class core extends common {
} }
// Données en sortie applicables même lorsqu'une notice est présente // Données en sortie applicables même lorsqu'une notice est présente
// Affichage // Affichage
if($output['display']) {
if ( $this->getData(['page', $this->getUrl(0), 'lity']) === true
&& $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') ) {
$this->addOutput([
'display' =>self::DISPLAY_LAYOUT_LITY
]);
} else {
$this->addOutput([ $this->addOutput([
'display' =>self::DISPLAY_LAYOUT_MAIN 'display' =>self::DISPLAY_LAYOUT_MAIN
]); ]);
@ -2353,7 +2342,20 @@ class core extends common {
'metaDescription' => $this->getData(['locale', 'metaDescription']) 'metaDescription' => $this->getData(['locale', 'metaDescription'])
]); ]);
} }
// Layout Lity lorsque l'option est active.
if ( $this->getData(['page', $this->getUrl(0), 'lity']) === true ) {
// Mode connecté pas de menu en mode connecté
if ( $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') ) {
$this->addOutput([
'display' => self::DISPLAY_LAYOUT_MAIN
]);
} else {
$this->addOutput([
'display' => self::DISPLAY_LAYOUT_LITY
]);
}
}
switch($this->output['display']) { switch($this->output['display']) {
// Layout brut // Layout brut
case self::DISPLAY_RAW: case self::DISPLAY_RAW: