diff --git a/core/core.php b/core/core.php index 6ca1ab00..e901a60c 100755 --- a/core/core.php +++ b/core/core.php @@ -21,7 +21,6 @@ class common { const DISPLAY_LAYOUT_BLANK = 3; const DISPLAY_LAYOUT_MAIN = 4; const DISPLAY_LAYOUT_LIGHT = 5; - const DISPLAY_LAYOUT_LITY = 6; const GROUP_BANNED = -1; const GROUP_VISITOR = 0; const GROUP_MEMBER = 1; @@ -2107,14 +2106,7 @@ class core extends common { 'disable' => $this->getData(['page', $this->getUrl(0), 'disable']), 'contentRight' => $this->getData(['page',$this->getData(['page',$this->getUrl(0),'barRight']),'content']), 'contentLeft' => $this->getData(['page',$this->getData(['page',$this->getUrl(0),'barLeft']),'content']), - 'display' => $this->getData(['page', $this->getUrl(0), 'lity']) ? self:: DISPLAY_LAYOUT_LITY : $this->output['display'] ]); - // Mode connecté, désactiver lity - if ( $this->getData(['page', $this->getUrl(0), 'lity']) === true && $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') ) { - $this->addOutput([ - 'display' => self::DISPLAY_LAYOUT_MAIN - ]); - } } // Importe le module @@ -2210,20 +2202,11 @@ class core extends common { } } // Données en sortie applicables même lorsqu'une notice est présente - // Affichage changer lity en main si connexion - 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 { - if($output['display']) { - $this->addOutput([ - 'display' => $output['display'] - ]); - } + // Affichage + if($output['display']) { + $this->addOutput([ + 'display' => $output['display'] + ]); } // Contenu brut if($output['content']) { @@ -2423,10 +2406,6 @@ class core extends common { case self::DISPLAY_LAYOUT_MAIN: require 'core/layout/main.php'; break; - // Layout Lity - case self::DISPLAY_LAYOUT_LITY: - require 'core/layout/lity.php'; - break; } } } @@ -2578,19 +2557,16 @@ class layout extends common { $items .= ''; // Affichage du module de recherche $items .= '
'; // Affichage des mentions légales $items .= ' '; // Affichage du lien de connexion @@ -2713,9 +2689,6 @@ class layout extends common { // Propriétés de l'item $active = ($parentPageId === $currentPageId OR in_array($currentPageId, $childrenPageIds)) ? 'active ' : ''; $targetBlank = $this->getData(['page', $parentPageId, 'targetBlank']) ? ' target="_blank"' : ''; - $targetLity = $this->getData(['page', $parentPageId, 'lity']) - && $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') - ? ' rel="data-lity" ' : ''; // Mise en page de l'item $itemsLeft .= '