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

Correction paramètres null dans getHierarchy et effacement des données de session et de cookies relatif aux langues lors de la réinstallation

Browse Source
This commit is contained in:
Fred Tempez 2023-07-18 22:26:07 +02:00
parent d13b01791b
commit e242d7ecab
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core.php
View File

@ -1010,7 +1010,7 @@ class common
$datetime = new DateTime(date('c'));
$datetime->format(DateTime::ATOM); // Updated ISO8601
foreach ($this->getHierarchy(null, null, null) as $parentPageId => $childrenPageIds) {
foreach ($this->getHierarchy() as $parentPageId => $childrenPageIds) {
// Exclure les barres et les pages non publiques et les pages masquées
if (
$this->getData(['page', $parentPageId, 'group']) !== 0 ||

18
core/include/update.inc.php
View File

@ -19,7 +19,7 @@ if ($this->getData(['core', 'dataVersion']) < 10000) {
//----------------------------------------
// Mettre à jour les données des galeries
$pageList = array();
foreach ($this->getHierarchy(null, null, null) as $parentKey => $parentValue) {
foreach ($this->getHierarchy() as $parentKey => $parentValue) {
$pageList[] = $parentKey;
foreach ($parentValue as $childKey) {
$pageList[] = $childKey;
@ -179,7 +179,7 @@ if ($this->getData(['core', 'dataVersion']) < 10300) {
$this->setData(['config', 'searchPageId', '']);
// Mettre à jour les données des galeries
$pageList = array(); foreach ($this->getHierarchy(null, null, null) as $parentKey => $parentValue) {
$pageList = array(); foreach ($this->getHierarchy() as $parentKey => $parentValue) {
$pageList[] = $parentKey;
foreach ($parentValue as $childKey) {
$pageList[] = $childKey;
@ -240,7 +240,7 @@ if ($this->getData(['core', 'dataVersion']) < 10304) {
if ($this->getData(['core', 'dataVersion']) < 10306) {
// Liste des pages
$pageList = array();
foreach ($this->getHierarchy(null, null, null) as $parentKey => $parentValue) {
foreach ($this->getHierarchy() as $parentKey => $parentValue) {
$pageList[] = $parentKey;
foreach ($parentValue as $childKey) {
$pageList[] = $childKey;
@ -298,7 +298,7 @@ if ($this->getData(['core', 'dataVersion']) < 10400) {
// Ajouter les champs de blog v3
// Liste des pages dans pageList
$pageList = array();
foreach ($this->getHierarchy(null, null, null) as $parentKey => $parentValue) {
foreach ($this->getHierarchy() as $parentKey => $parentValue) {
$pageList[] = $parentKey;
foreach ($parentValue as $childKey) {
$pageList[] = $childKey;
@ -389,7 +389,7 @@ if ($this->getData(['core', 'dataVersion']) < 10600) {
// Liste des pages dans pageList
$pageList = array();
foreach ($this->getHierarchy(null, null, null) as $parentKey => $parentValue) {
foreach ($this->getHierarchy() as $parentKey => $parentValue) {
$pageList[] = $parentKey;
foreach ($parentValue as $childKey) {
$pageList[] = $childKey;
@ -451,7 +451,7 @@ if ($this->getData(['core', 'dataVersion']) < 11000) {
if (!is_dir(self::DATA_DIR . self::$i18nContent . '/content')) {
mkdir(self::DATA_DIR . self::$i18nContent . '/content', 0755);
}
foreach ($this->getHierarchy(null, null, null) as $parentKey => $parentValue) {
foreach ($this->getHierarchy() as $parentKey => $parentValue) {
$pageList[] = $parentKey;
foreach ($parentValue as $childKey) {
$pageList[] = $childKey;
@ -509,7 +509,7 @@ if ($this->getData(['core', 'dataVersion']) < 11200) {
$this->setData(['config', 'connect', 'captchaType', 'alpha']);
// Ajout de la variable shortTitle basée sur Title
foreach ($this->getHierarchy(null, null, null) as $parentKey => $parentValue) {
foreach ($this->getHierarchy() as $parentKey => $parentValue) {
$pageList[] = $parentKey;
foreach ($parentValue as $childKey) {
$pageList[] = $childKey;
@ -573,7 +573,7 @@ if ($this->getData(['core', 'dataVersion']) < 11203) {
$c3 = 0;
$success = false;
// Boucler sur les pages
foreach ($this->getHierarchy(null, null, null) as $parentId => $childIds) {
foreach ($this->getHierarchy() as $parentId => $childIds) {
$content = $this->getPage($parentId, self::$i18nContent);
$titre = $this->getData(['page', $parentId, 'title']);
$content = $titre . ' ' . $content;
@ -669,7 +669,7 @@ if ($this->getData(['core', 'dataVersion']) < 11300) {
if ($this->getData(['core', 'dataVersion']) < 11303) {
// Ajout de la variable shortTitle basée sur Title
foreach ($this->getHierarchy(null, null, null) as $parentKey => $parentValue) {
foreach ($this->getHierarchy() as $parentKey => $parentValue) {
$pageList[] = $parentKey;
foreach ($parentValue as $childKey) {
$pageList[] = $childKey;

5
core/module/install/install.php
View File

@ -75,6 +75,11 @@ class install extends common
self::$i18nFiles[$lang] = self::$languages[$lang];
}
}
// Effacer le cookie de l'UI et de contenu
unset($_SESSION['ZWII_UI']);
unset($_SESSION['ZWII_CONTENT']);
setcookie('ZWII_UI', '', time() - 3600, helper::baseUrl(false, false));
$this->addOutput([
'display' => self::DISPLAY_LAYOUT_LIGHT,

2
core/module/plugin/plugin.php
View File

@ -830,7 +830,7 @@ class plugin extends common
* Liste des pages sans module
* et ne sont pas des barres latérales
*/
self::$pagesList = $this->getHierarchy(null, null, null);
self::$pagesList = $this->getHierarchy();
foreach (self::$pagesList as $page => $value) {
if (
$this->getData(['page', $page, 'block']) === 'bar' ||