ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team/ZwiiCMS
10
9
Fork 3
Code Releases 153 Activity

Vérification de type dans import de 11307 + suppression baseUrl de core + numéro de version de defaultdata

Browse Source
This commit is contained in:
Fred Tempez 2022-04-27 16:30:51 +02:00
parent 8a96138620
commit ab37ed0ea9
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -924,7 +924,8 @@ if ($this->getData(['core', 'dataVersion']) < 11400) {
$files = $this->getData(['fonts', 'files']); $files = $this->getData(['fonts', 'files']);
if (is_array($files)) { if (is_array($files)) {
foreach ($files as $fontId => $fontName) { foreach ($files as $fontId => $fontName) {
if (file_exists(self::DATA_DIR . 'fonts/' . $fontName)) { if ( gettype($fontName) === 'string'
&& file_exists(self::DATA_DIR . 'fonts/' . $fontName)) {
$this->setData(['fonts', 'files', $fontId, [ $this->setData(['fonts', 'files', $fontId, [
'name' => ucfirst($fontId), 'name' => ucfirst($fontId),
'font-family'=> '\'' . ucfirst($fontId) . '\', sans-serif', 'font-family'=> '\'' . ucfirst($fontId) . '\', sans-serif',
@ -938,11 +939,13 @@ if ($this->getData(['core', 'dataVersion']) < 11400) {
$imported = $this->getData(['fonts', 'imported']); $imported = $this->getData(['fonts', 'imported']);
if (is_array($imported)) { if (is_array($imported)) {
foreach ($imported as $fontId => $fontUrl) { foreach ($imported as $fontId => $fontUrl) {
$this->setData(['fonts', 'imported', $fontId, [ if ( gettype($fontUrl) === 'string' ) {
'name' => ucfirst($fontId), $this->setData(['fonts', 'imported', $fontId, [
'font-family'=> '\'' . ucfirst($fontId) . '\', sans-serif', 'name' => ucfirst($fontId),
'resource' => 'https:\\fonts.cdnfonts.com\css' . $fontUrl 'font-family'=> '\'' . ucfirst($fontId) . '\', sans-serif',
]]); 'resource' => 'https:\\fonts.cdnfonts.com\css' . $fontUrl
]]);
}
} }
} }
// Importation des fontes exemples // Importation des fontes exemples
@ -974,7 +977,7 @@ if ($this->getData(['core', 'dataVersion']) < 11400) {
*/ */
// Suppression de la variable URL dans core // Suppression de la variable URL dans core
//$this->deleteData(['core', 'baseUrl']); $this->deleteData(['core', 'baseUrl']);
// Mise à jour // Mise à jour
$this->setData(['core', 'dataVersion', 11400]); $this->setData(['core', 'dataVersion', 11400]);

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

@ -573,8 +573,6 @@ class config extends common {
// Change le statut de la réécriture d'URL (pour le helper::baseUrl() de la redirection) // Change le statut de la réécriture d'URL (pour le helper::baseUrl() de la redirection)
helper::$rewriteStatus = false; helper::$rewriteStatus = false;
} }
// Met à jour la baseUrl
$this->setData(['core', 'baseUrl', helper::baseUrl(true,false) ]);
} }
// Générer robots.txt et sitemap // Générer robots.txt et sitemap
$this->siteMap(); $this->siteMap();

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

@ -122,9 +122,6 @@ class install extends common {
mkdir(self::DATA_DIR . 'fonts'); mkdir(self::DATA_DIR . 'fonts');
} }
// Stocker le dossier d'installation
$this->setData(['core', 'baseUrl', helper::baseUrl(false,false) ]);
// Installation du thème sélectionné // Installation du thème sélectionné
$dataThemes = file_get_contents('core/module/install/ressource/themes/themes.json'); $dataThemes = file_get_contents('core/module/install/ressource/themes/themes.json');
$dataThemes = json_decode($dataThemes, true); $dataThemes = json_decode($dataThemes, true);

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

@ -57,12 +57,11 @@ class init extends common {
] ]
], ],
'core' => [ 'core' => [
'dataVersion' => 11300, 'dataVersion' => 11400,
'lastBackup' => 0, 'lastBackup' => 0,
'lastClearTmp' => 0, 'lastClearTmp' => 0,
'lastAutoUpdate' => 0, 'lastAutoUpdate' => 0,
'updateAvailable' => false, 'updateAvailable' => false
'baseUrl' => ''
], ],
'locale' => [ 'locale' => [
'homePageId' => 'accueil', 'homePageId' => 'accueil',