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

ajout des fontes ok

Browse Source
This commit is contained in:
Fred Tempez 2022-03-20 18:56:31 +01:00
parent 6f42bb480f
commit 3f65b79e82
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -958,23 +958,18 @@ class theme extends common {
if ($zip->open(self::TEMP_DIR . $zipFilename, ZipArchive::CREATE | ZipArchive::OVERWRITE ) === TRUE) { if ($zip->open(self::TEMP_DIR . $zipFilename, ZipArchive::CREATE | ZipArchive::OVERWRITE ) === TRUE) {
switch ($modele) { switch ($modele) {
case 'admin': case 'admin':
$zip->addFile(self::DATA_DIR.'admin.json'); $zip->addFile(self::DATA_DIR.'admin.json',self::DATA_DIR.'admin.json');
$zip->addFile(self::DATA_DIR.'admin.css'); $zip->addFile(self::DATA_DIR.'admin.css',self::DATA_DIR.'admin.css');
// Ajoute les fontes // Ajoute les fontes
$zip->addEmptyDir(self::DATA_DIR .'fonts'); $zip->addEmptyDir(self::DATA_DIR .'fonts');
$path = realpath('site/data/fonts'); $fonts = $this->getData(['fonts', 'files']);
foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path)) as $fileName) foreach ($fonts as $fontId => $fontName) {
{ $zip->addFile(self::DATA_DIR .'fonts/' . $fontName, self::DATA_DIR.'fonts/' . $fontName);
echo $fileName;
//var_dump($fileName !== $path . '/..' );
echo "<p>";
if ($fileName !== $path . '/.' || $fileName !== $path . '/..') {
$zip->addFile($fileName);
//echo $fileName;
//echo '<p>';
} }
if (file_exists(self::DATA_DIR .'fonts/fonts.html')) {
$zip->addFile(self::DATA_DIR .'fonts/fonts.html', self::DATA_DIR .'fonts/fonts.html');
} }
die();
break; break;
case 'theme': case 'theme':
$zip->addFile(self::DATA_DIR.'theme.json',self::DATA_DIR.'theme.json'); $zip->addFile(self::DATA_DIR.'theme.json',self::DATA_DIR.'theme.json');
@ -1001,13 +996,15 @@ class theme extends common {
} }
// Ajoute les fontes // Ajoute les fontes
$zip->addEmptyDir(self::DATA_DIR .'fonts'); $zip->addEmptyDir(self::DATA_DIR .'fonts');
$pathdir = self::DATA_DIR .'fonts'; $fonts = $this->getData(['fonts', 'files']);
$dir = opendir(self::DATA_DIR .'fonts'); foreach ($fonts as $fontId => $fontName) {
while($file = readdir($dir)) { $zip->addFile(self::DATA_DIR .'fonts/' . $fontName, self::DATA_DIR.'fonts/' . $fontName);
if(is_file($pathdir.$file)) {
$zip -> addFile($pathdir.$file, $file);
} }
if (file_exists(self::DATA_DIR .'fonts/fonts.html')) {
$zip->addFile(self::DATA_DIR .'fonts/fonts.html', self::DATA_DIR .'fonts/fonts.html');
} }
break; break;
} }
$ret = $zip->close(); $ret = $zip->close();