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

v9.0.0 : import du thème ok + correction readData

Browse Source
This commit is contained in:
fredtempez 2018-12-30 18:33:37 +01:00
parent 9f60b97a62
commit 6a3150ef2c
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/core.php
View File

@ -526,19 +526,17 @@ class common {
}
public function readData() {
if($this->data === []) {
// Trois tentatives
for($i = 0; $i < 3; $i++) {
$this->setData([json_decode(file_get_contents('site/data/core.json'), true) + json_decode(file_get_contents('site/data/theme.json'), true)]);
if($this->data) {
break;
}
elseif($i === 2) {
exit('Unable to read data file.');
}
// Pause de 10 millisecondes
usleep(10000);
// Trois tentatives
for($i = 0; $i < 3; $i++) {
$this->setData([json_decode(file_get_contents('site/data/core.json'), true) + json_decode(file_get_contents('site/data/theme.json'), true)]);
if($this->data) {
break;
}
elseif($i === 2) {
exit('Unable to read data file.');
}
// Pause de 10 millisecondes
usleep(10000);
}
}
@ -1244,11 +1242,9 @@ class core extends common {
'content' => $this->getData(['page', $this->getUrl(0), 'content']),
'metaDescription' => $this->getData(['page', $this->getUrl(0), 'metaDescription']),
'metaTitle' => $this->getData(['page', $this->getUrl(0), 'metaTitle']),
// Menu image
'typeMenu' => $this->getData(['page', $this->getUrl(0), 'typeMenu']),
'iconUrl' => $this->getData(['page', $this->getUrl(0), 'iconUrl']),
'disable' => $this->getData(['page', $this->getUrl(0), 'disable'])
// Menu Image
]);
}
// Importe le module
@ -1260,11 +1256,9 @@ class core extends common {
'title' => $this->getData(['page', $this->getUrl(0), 'title']),
'metaDescription' => $this->getData(['page', $this->getUrl(0), 'metaDescription']),
'metaTitle' => $this->getData(['page', $this->getUrl(0), 'metaTitle']),
// Menu image
'typeMenu' => $this->getData(['page', $this->getUrl(0), 'typeMenu']),
'iconUrl' => $this->getData(['page', $this->getUrl(0), 'iconUrl']),
'disable' => $this->getData(['page', $this->getUrl(0), 'disable'])
// Menu image
]);
$pageContent = $this->getData(['page', $this->getUrl(0), 'content']);
}

7
core/module/theme/theme.php
View File

@ -454,14 +454,9 @@ class theme extends common {
if ($zip->open('site/file/source/'.$zipFilename) === TRUE) {
$zip->extractTo('.');
$zip->close();
file_put_contents('site/data/custom.css', file_get_contents('core/module/theme/resource/custom.css'));
// Import du thème
die();
// Valeurs en sortie
$this->addOutput([
'notification' => 'Le thème <b>'.$zipFilename.'</b> a été importé',
'redirect' => helper::baseUrl() . 'theme',
'state' => true
'redirect' => helper::baseUrl() . 'theme'
]);
} else {
$this->addOutput([