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

10.2 numéro de la version

Browse Source
This commit is contained in:
Fred Tempez 2020-05-24 20:21:00 +02:00
parent 77c930d737
commit a358d8d4da
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/core.php
View File

@ -36,7 +36,7 @@ class common {
const THUMBS_WIDTH = 640; const THUMBS_WIDTH = 640;
// Numéro de version // Numéro de version
const ZWII_VERSION = '10.2.00.dev3'; const ZWII_VERSION = '10.2.000.dev3';
const ZWII_UPDATE_CHANNEL = "v10"; const ZWII_UPDATE_CHANNEL = "v10";
public static $actions = []; public static $actions = [];
@ -1624,7 +1624,7 @@ class core extends common {
} }
// Check l'accès à la page // Check l'accès à la page
$access = null; $access = null;
$accessInfo['user'] = ''; $accessInfo['userName'] = '';
if($this->getData(['page', $this->getUrl(0)]) !== null) { if($this->getData(['page', $this->getUrl(0)]) !== null) {
if( if(
$this->getData(['page', $this->getUrl(0), 'group']) === self::GROUP_VISITOR $this->getData(['page', $this->getUrl(0), 'group']) === self::GROUP_VISITOR
@ -1651,7 +1651,7 @@ class core extends common {
$userId !== $this->getuser('id') && $userId !== $this->getuser('id') &&
array_intersect($t,self::$accessList) ) { array_intersect($t,self::$accessList) ) {
$access = false; $access = false;
$accessInfo['user'] = $this->getData(['user', $userId, 'lastname']) . ' ' . $this->getData(['user', $userId, 'firstname']); $accessInfo['userName'] = $this->getData(['user', $userId, 'lastname']) . ' ' . $this->getData(['user', $userId, 'firstname']);
} }
} }
// Accès concurrent stocke la page visitée // Accès concurrent stocke la page visitée
@ -1876,10 +1876,10 @@ class core extends common {
} }
if($access === false) { if($access === false) {
http_response_code(403); http_response_code(403);
if ($accessInfo['user']) { if ($accessInfo['userName']) {
$this->addOutput([ $this->addOutput([
'title' => 'Accès verrouillé', 'title' => 'Accès verrouillé',
'content' => template::speech('La page demandée est ouverte par l\'utilisateur <strong>' . $accessInfo['user'] . '</strong>. Merci de patienter.') 'content' => template::speech('La page demandée est ouverte par l\'utilisateur <strong>' . $accessInfo['userName'] . '</strong>')
]); ]);
} else { } else {
$this->addOutput([ $this->addOutput([