From 6f42bb480ff0a065c6c25a2e707e3e60694ac6e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= Date: Sun, 20 Mar 2022 10:11:30 +0100 Subject: [PATCH] directory iterator wip --- core/module/theme/theme.php | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index da5eac0e..c3ee98e6 100644 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -958,17 +958,23 @@ class theme extends common { if ($zip->open(self::TEMP_DIR . $zipFilename, ZipArchive::CREATE | ZipArchive::OVERWRITE ) === TRUE) { switch ($modele) { case 'admin': - $zip->addFile(self::DATA_DIR.'admin.json',self::DATA_DIR.'admin.json'); - $zip->addFile(self::DATA_DIR.'admin.css',self::DATA_DIR.'admin.css'); + $zip->addFile(self::DATA_DIR.'admin.json'); + $zip->addFile(self::DATA_DIR.'admin.css'); // Ajoute les fontes $zip->addEmptyDir(self::DATA_DIR .'fonts'); - $pathdir = self::DATA_DIR .'fonts'; - $dir = opendir(self::DATA_DIR .'fonts'); - while($file = readdir($dir)) { - if(is_file($pathdir.$file)) { - $zip -> addFile($pathdir.$file, $file); + $path = realpath('site/data/fonts'); + foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path)) as $fileName) + { + echo $fileName; + //var_dump($fileName !== $path . '/..' ); + echo "

"; + if ($fileName !== $path . '/.' || $fileName !== $path . '/..') { + $zip->addFile($fileName); + //echo $fileName; + //echo '

'; } } + die(); break; case 'theme': $zip->addFile(self::DATA_DIR.'theme.json',self::DATA_DIR.'theme.json');