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

[9.2.15] Popup notification + modif

This commit is contained in:
fredtempez 2019-12-08 18:40:30 +01:00
parent b9039fe685
commit 37f69c3fcb
2 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
core/core.php
View File

@ -1527,40 +1527,40 @@ class core extends common {
'metaDescription' => $this->getData(['config', 'metaDescription']) 'metaDescription' => $this->getData(['config', 'metaDescription'])
]); ]);
} }
// Traitement de la popup hors connexion.
if( $this->output['targetLity'] && if( $this->output['targetLity'] &&
$this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')
) { ) {
require 'core/layout/popup.php'; $this->output['display'] = self::DISPLAY_LAYOUT_POPUP;
} else {
switch($this->output['display']) {
// Layout vide
case self::DISPLAY_LAYOUT_BLANK:
require 'core/layout/blank.php';
break;
// Affichage en JSON
case self::DISPLAY_JSON:
header('Content-Type: application/json');
echo json_encode($this->output['content']);
break;
// Layout alléger
case self::DISPLAY_LAYOUT_LIGHT:
require 'core/layout/light.php';
break;
// Layout principal
case self::DISPLAY_LAYOUT_MAIN:
require 'core/layout/main.php';
break;
// Layout poup lity
case self::DISPLAY_LAYOUT_POPUP:
break;
// Layout brut
case self::DISPLAY_RAW:
echo $this->output['content'];
break;
}
} }
switch($this->output['display']) {
// Layout vide
case self::DISPLAY_LAYOUT_BLANK:
require 'core/layout/blank.php';
break;
// Affichage en JSON
case self::DISPLAY_JSON:
header('Content-Type: application/json');
echo json_encode($this->output['content']);
break;
// Layout alléger
case self::DISPLAY_LAYOUT_LIGHT:
require 'core/layout/light.php';
break;
// Layout principal
case self::DISPLAY_LAYOUT_MAIN:
require 'core/layout/main.php';
break;
// Layout poup lity
case self::DISPLAY_LAYOUT_POPUP:
require 'core/layout/popup.php';
break;
// Layout brut
case self::DISPLAY_RAW:
echo $this->output['content'];
break;
}
} }
} }

3
core/layout/popup.php
View File

@ -19,7 +19,8 @@
include('site/data/head.inc.html'); include('site/data/head.inc.html');
}?> }?>
</head> </head>
<body> <body>
<?php $layout->showNotification(); ?>
<!-- Corps de page --> <!-- Corps de page -->
<section> <section>
<?php <?php