diff --git a/CHANGES.md b/CHANGES.md index d089513a..92502a8f 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,9 @@ # Changelog +## version 10.6.03 +- Modification : + - Livraison des fichiers de thème lors d'une primo installation avec site de test dans une archive. Désormais, le dossier site ne contiendra que les fichiers de sécurité htaccess. Cette procédure permettra de ne plus différencier les archives d'installation et de mise à jour. + ## version 10.6.02 - Correction : - Débordement lors du téléchargement des fichiers journaux. diff --git a/README.md b/README.md index a4ce499d..e10d3f42 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# ZwiiCMS 10.6.02 +# ZwiiCMS 10.6.03 Zwii est un CMS sans base de données (flat-file) qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation. diff --git a/core/core.php b/core/core.php index da4ad5dc..3144a376 100755 --- a/core/core.php +++ b/core/core.php @@ -44,7 +44,7 @@ class common { const ACCESS_TIMER = 1800; // Numéro de version - const ZWII_VERSION = '10.6.02'; + const ZWII_VERSION = '10.6.03'; const ZWII_UPDATE_CHANNEL = "v10"; public static $actions = []; diff --git a/core/module/install/install.php b/core/module/install/install.php index d5c7a419..6013e774 100755 --- a/core/module/install/install.php +++ b/core/module/install/install.php @@ -81,26 +81,36 @@ class install extends common { 'Identifiant du compte : ' . $this->getInput('installId') . '
', null ); - // Créer les dossiers - if (!is_dir(self::FILE_DIR.'source/banniere/')) { - mkdir(self::FILE_DIR.'source/banniere/');} - if (!is_dir(self::FILE_DIR.'thumb/banniere/')) { - mkdir(self::FILE_DIR.'thumb/banniere/'); - } - // Copier les fichiers - copy('core/module/install/ressource/file/source/banniere960.jpg',self::FILE_DIR.'source/banniere/banniere960.jpg'); - copy('core/module/install/ressource/file/thumb/banniere960.jpg',self::FILE_DIR.'thumb/banniere/banniere960.jpg'); - // Copie des icônes - copy('core/module/install/ressource/file/source/favicon.ico',self::FILE_DIR.'source/favicon.ico'); - copy('core/module/install/ressource/file/source/faviconDark.ico',self::FILE_DIR.'source/faviconDark.ico'); - // Configure certaines données par défaut + // Installation du site de test if ($this->getInput('installDefaultData',helper::FILTER_BOOLEAN) === FALSE) { $this->initData('page','fr',true); $this->initData('module','fr',true); $this->setData(['module', 'blog', 'posts', 'mon-premier-article', 'userId', $userId]); $this->setData(['module', 'blog', 'posts', 'mon-deuxieme-article', 'userId', $userId]); $this->setData(['module', 'blog', 'posts', 'mon-troisieme-article', 'userId', $userId]); + // Décompression et installation + try { + // Décompression dans le dossier de fichier temporaires + if (file_exists(self::TEMP_DIR . 'files.tar.gz')) { + unlink(self::TEMP_DIR . 'files.tar.gz'); + } + if (file_exists(self::TEMP_DIR . 'files.tar')) { + unlink(self::TEMP_DIR . 'files.tar'); + } + copy('core/module/install/ressource/files.tar.gz', self::TEMP_DIR . 'files.tar.gz'); + $pharData = new PharData(self::TEMP_DIR . 'files.tar.gz'); + $pharData->decompress(); + // Installation + $pharData->extractTo(__DIR__ . '/../../../', null, true); + } catch (Exception $e) { + $success = $e->getMessage(); + } + unlink(self::TEMP_DIR . 'files.tar.gz'); + unlink(self::TEMP_DIR . 'files.tar'); } + // Copie des favicons + copy('core/module/install/ressource/favicon.ico', self::FILE_DIR . 'source/favicon.ico'); + copy('core/module/install/ressource/faviconDark.ico', self::FILE_DIR . 'source/faviconDark.ico'); // Stocker le dossier d'installation $this->setData(['core', 'baseUrl', helper::baseUrl(false,false) ]); // Créer sitemap @@ -108,8 +118,8 @@ class install extends common { // Valeurs en sortie $this->addOutput([ 'redirect' => helper::baseUrl(false), - 'notification' => ($sent === true ? 'Installation terminée' : $sent), - 'state' => ($sent === true ? true : null) + 'notification' => $sent === true ? 'Installation terminée' : $sent, + 'state' => ($sent === true && $success === true) ? true : null ]); } } diff --git a/core/module/install/ressource/file/source/favicon.ico b/core/module/install/ressource/favicon.ico similarity index 100% rename from core/module/install/ressource/file/source/favicon.ico rename to core/module/install/ressource/favicon.ico diff --git a/core/module/install/ressource/file/source/faviconDark.ico b/core/module/install/ressource/faviconDark.ico similarity index 100% rename from core/module/install/ressource/file/source/faviconDark.ico rename to core/module/install/ressource/faviconDark.ico diff --git a/core/module/install/ressource/file/source/banniere960.jpg b/core/module/install/ressource/file/source/banniere960.jpg deleted file mode 100755 index 158e0608..00000000 Binary files a/core/module/install/ressource/file/source/banniere960.jpg and /dev/null differ diff --git a/core/module/install/ressource/file/thumb/banniere960.jpg b/core/module/install/ressource/file/thumb/banniere960.jpg deleted file mode 100755 index 8a65fb5b..00000000 Binary files a/core/module/install/ressource/file/thumb/banniere960.jpg and /dev/null differ diff --git a/core/module/install/ressource/files.tar.gz b/core/module/install/ressource/files.tar.gz new file mode 100644 index 00000000..6a626a4b Binary files /dev/null and b/core/module/install/ressource/files.tar.gz differ diff --git a/site/file/source/banniere/zwii_banniere-1170px.jpg b/site/file/source/banniere/zwii_banniere-1170px.jpg deleted file mode 100755 index 8f54a8a6..00000000 Binary files a/site/file/source/banniere/zwii_banniere-1170px.jpg and /dev/null differ diff --git a/site/file/source/banniere/zwii_banniere-750px.jpg b/site/file/source/banniere/zwii_banniere-750px.jpg deleted file mode 100755 index 30dd3e84..00000000 Binary files a/site/file/source/banniere/zwii_banniere-750px.jpg and /dev/null differ diff --git a/site/file/source/banniere/zwii_banniere-960px.jpg b/site/file/source/banniere/zwii_banniere-960px.jpg deleted file mode 100755 index f17abe69..00000000 Binary files a/site/file/source/banniere/zwii_banniere-960px.jpg and /dev/null differ diff --git a/site/file/source/banniere/zwii_banniere_norvege-1170px.jpg b/site/file/source/banniere/zwii_banniere_norvege-1170px.jpg deleted file mode 100755 index 36d8c49e..00000000 Binary files a/site/file/source/banniere/zwii_banniere_norvege-1170px.jpg and /dev/null differ diff --git a/site/file/source/banniere/zwii_banniere_norvege-750px.jpg b/site/file/source/banniere/zwii_banniere_norvege-750px.jpg deleted file mode 100755 index 8fcc6ff3..00000000 Binary files a/site/file/source/banniere/zwii_banniere_norvege-750px.jpg and /dev/null differ diff --git a/site/file/source/banniere/zwii_banniere_norvege-960px.jpg b/site/file/source/banniere/zwii_banniere_norvege-960px.jpg deleted file mode 100755 index 0e7ed202..00000000 Binary files a/site/file/source/banniere/zwii_banniere_norvege-960px.jpg and /dev/null differ diff --git a/site/file/source/favicon.ico b/site/file/source/favicon.ico deleted file mode 100755 index 218421a9..00000000 Binary files a/site/file/source/favicon.ico and /dev/null differ diff --git a/site/file/source/faviconDark.ico b/site/file/source/faviconDark.ico deleted file mode 100755 index 2063f4bf..00000000 Binary files a/site/file/source/faviconDark.ico and /dev/null differ diff --git a/site/file/source/galerie/landscape/desert.jpg b/site/file/source/galerie/landscape/desert.jpg deleted file mode 100755 index 88a02cc5..00000000 Binary files a/site/file/source/galerie/landscape/desert.jpg and /dev/null differ diff --git a/site/file/source/galerie/landscape/iceberg.jpg b/site/file/source/galerie/landscape/iceberg.jpg deleted file mode 100755 index 2c224ccb..00000000 Binary files a/site/file/source/galerie/landscape/iceberg.jpg and /dev/null differ diff --git a/site/file/source/galerie/landscape/meadow.jpg b/site/file/source/galerie/landscape/meadow.jpg deleted file mode 100755 index 9cb9540f..00000000 Binary files a/site/file/source/galerie/landscape/meadow.jpg and /dev/null differ diff --git a/site/file/source/galerie/space/cosmos.jpg b/site/file/source/galerie/space/cosmos.jpg deleted file mode 100755 index fda440cc..00000000 Binary files a/site/file/source/galerie/space/cosmos.jpg and /dev/null differ diff --git a/site/file/source/galerie/space/earth.jpg b/site/file/source/galerie/space/earth.jpg deleted file mode 100755 index 69bc0c90..00000000 Binary files a/site/file/source/galerie/space/earth.jpg and /dev/null differ diff --git a/site/file/source/galerie/space/nebula.jpg b/site/file/source/galerie/space/nebula.jpg deleted file mode 100755 index e2557aa4..00000000 Binary files a/site/file/source/galerie/space/nebula.jpg and /dev/null differ diff --git a/site/file/source/icones/home_black.png b/site/file/source/icones/home_black.png deleted file mode 100755 index 0cb1cb8c..00000000 Binary files a/site/file/source/icones/home_black.png and /dev/null differ diff --git a/site/file/source/icones/home_blue.png b/site/file/source/icones/home_blue.png deleted file mode 100755 index fcb39b66..00000000 Binary files a/site/file/source/icones/home_blue.png and /dev/null differ diff --git a/site/file/source/icones/loupe.png b/site/file/source/icones/loupe.png deleted file mode 100755 index c3366253..00000000 Binary files a/site/file/source/icones/loupe.png and /dev/null differ diff --git a/site/file/thumb/banniere/mini_zwii_banniere-1170px.jpg b/site/file/thumb/banniere/mini_zwii_banniere-1170px.jpg deleted file mode 100755 index afc4026a..00000000 Binary files a/site/file/thumb/banniere/mini_zwii_banniere-1170px.jpg and /dev/null differ diff --git a/site/file/thumb/banniere/mini_zwii_banniere-750px.jpg b/site/file/thumb/banniere/mini_zwii_banniere-750px.jpg deleted file mode 100755 index 8d866670..00000000 Binary files a/site/file/thumb/banniere/mini_zwii_banniere-750px.jpg and /dev/null differ diff --git a/site/file/thumb/banniere/mini_zwii_banniere-960px.jpg b/site/file/thumb/banniere/mini_zwii_banniere-960px.jpg deleted file mode 100755 index cef60a20..00000000 Binary files a/site/file/thumb/banniere/mini_zwii_banniere-960px.jpg and /dev/null differ diff --git a/site/file/thumb/banniere/mini_zwii_banniere_norvege-1170px.jpg b/site/file/thumb/banniere/mini_zwii_banniere_norvege-1170px.jpg deleted file mode 100755 index 6b429b0c..00000000 Binary files a/site/file/thumb/banniere/mini_zwii_banniere_norvege-1170px.jpg and /dev/null differ diff --git a/site/file/thumb/banniere/mini_zwii_banniere_norvege-750px.jpg b/site/file/thumb/banniere/mini_zwii_banniere_norvege-750px.jpg deleted file mode 100755 index 51dd103e..00000000 Binary files a/site/file/thumb/banniere/mini_zwii_banniere_norvege-750px.jpg and /dev/null differ diff --git a/site/file/thumb/banniere/mini_zwii_banniere_norvege-960px.jpg b/site/file/thumb/banniere/mini_zwii_banniere_norvege-960px.jpg deleted file mode 100755 index 49a81c25..00000000 Binary files a/site/file/thumb/banniere/mini_zwii_banniere_norvege-960px.jpg and /dev/null differ diff --git a/site/file/thumb/banniere/zwii_banniere-1170px.jpg b/site/file/thumb/banniere/zwii_banniere-1170px.jpg deleted file mode 100755 index c42f541f..00000000 Binary files a/site/file/thumb/banniere/zwii_banniere-1170px.jpg and /dev/null differ diff --git a/site/file/thumb/banniere/zwii_banniere-750px.jpg b/site/file/thumb/banniere/zwii_banniere-750px.jpg deleted file mode 100755 index 4a32f655..00000000 Binary files a/site/file/thumb/banniere/zwii_banniere-750px.jpg and /dev/null differ diff --git a/site/file/thumb/banniere/zwii_banniere-960px.jpg b/site/file/thumb/banniere/zwii_banniere-960px.jpg deleted file mode 100755 index 47e3743b..00000000 Binary files a/site/file/thumb/banniere/zwii_banniere-960px.jpg and /dev/null differ diff --git a/site/file/thumb/banniere/zwii_banniere_norvege-1170px.jpg b/site/file/thumb/banniere/zwii_banniere_norvege-1170px.jpg deleted file mode 100755 index 4d56f267..00000000 Binary files a/site/file/thumb/banniere/zwii_banniere_norvege-1170px.jpg and /dev/null differ diff --git a/site/file/thumb/banniere/zwii_banniere_norvege-750px.jpg b/site/file/thumb/banniere/zwii_banniere_norvege-750px.jpg deleted file mode 100755 index 419145e4..00000000 Binary files a/site/file/thumb/banniere/zwii_banniere_norvege-750px.jpg and /dev/null differ diff --git a/site/file/thumb/banniere/zwii_banniere_norvege-960px.jpg b/site/file/thumb/banniere/zwii_banniere_norvege-960px.jpg deleted file mode 100755 index fe6fa7ad..00000000 Binary files a/site/file/thumb/banniere/zwii_banniere_norvege-960px.jpg and /dev/null differ diff --git a/site/file/thumb/galerie/landscape/desert.jpg b/site/file/thumb/galerie/landscape/desert.jpg deleted file mode 100755 index 9d797d37..00000000 Binary files a/site/file/thumb/galerie/landscape/desert.jpg and /dev/null differ diff --git a/site/file/thumb/galerie/landscape/iceberg.jpg b/site/file/thumb/galerie/landscape/iceberg.jpg deleted file mode 100755 index 5a28146a..00000000 Binary files a/site/file/thumb/galerie/landscape/iceberg.jpg and /dev/null differ diff --git a/site/file/thumb/galerie/landscape/meadow.jpg b/site/file/thumb/galerie/landscape/meadow.jpg deleted file mode 100755 index 5f697b53..00000000 Binary files a/site/file/thumb/galerie/landscape/meadow.jpg and /dev/null differ diff --git a/site/file/thumb/galerie/landscape/mini_desert.jpg b/site/file/thumb/galerie/landscape/mini_desert.jpg deleted file mode 100755 index c5b19837..00000000 Binary files a/site/file/thumb/galerie/landscape/mini_desert.jpg and /dev/null differ diff --git a/site/file/thumb/galerie/landscape/mini_iceberg.jpg b/site/file/thumb/galerie/landscape/mini_iceberg.jpg deleted file mode 100755 index b35d3cd4..00000000 Binary files a/site/file/thumb/galerie/landscape/mini_iceberg.jpg and /dev/null differ diff --git a/site/file/thumb/galerie/landscape/mini_meadow.jpg b/site/file/thumb/galerie/landscape/mini_meadow.jpg deleted file mode 100755 index bb6f27a7..00000000 Binary files a/site/file/thumb/galerie/landscape/mini_meadow.jpg and /dev/null differ diff --git a/site/file/thumb/galerie/space/cosmos.jpg b/site/file/thumb/galerie/space/cosmos.jpg deleted file mode 100755 index bc382898..00000000 Binary files a/site/file/thumb/galerie/space/cosmos.jpg and /dev/null differ diff --git a/site/file/thumb/galerie/space/earth.jpg b/site/file/thumb/galerie/space/earth.jpg deleted file mode 100755 index 2b30b7e2..00000000 Binary files a/site/file/thumb/galerie/space/earth.jpg and /dev/null differ diff --git a/site/file/thumb/galerie/space/mini_cosmos.jpg b/site/file/thumb/galerie/space/mini_cosmos.jpg deleted file mode 100755 index bc382898..00000000 Binary files a/site/file/thumb/galerie/space/mini_cosmos.jpg and /dev/null differ diff --git a/site/file/thumb/galerie/space/mini_earth.jpg b/site/file/thumb/galerie/space/mini_earth.jpg deleted file mode 100755 index 2b30b7e2..00000000 Binary files a/site/file/thumb/galerie/space/mini_earth.jpg and /dev/null differ diff --git a/site/file/thumb/galerie/space/mini_nebula.jpg b/site/file/thumb/galerie/space/mini_nebula.jpg deleted file mode 100755 index 028d4b4a..00000000 Binary files a/site/file/thumb/galerie/space/mini_nebula.jpg and /dev/null differ diff --git a/site/file/thumb/galerie/space/nebula.jpg b/site/file/thumb/galerie/space/nebula.jpg deleted file mode 100755 index 028d4b4a..00000000 Binary files a/site/file/thumb/galerie/space/nebula.jpg and /dev/null differ diff --git a/site/file/thumb/icones/home_black.png b/site/file/thumb/icones/home_black.png deleted file mode 100755 index 7f6f535d..00000000 Binary files a/site/file/thumb/icones/home_black.png and /dev/null differ diff --git a/site/file/thumb/icones/home_blue.png b/site/file/thumb/icones/home_blue.png deleted file mode 100755 index 49146eb2..00000000 Binary files a/site/file/thumb/icones/home_blue.png and /dev/null differ diff --git a/site/file/thumb/icones/loupe.png b/site/file/thumb/icones/loupe.png deleted file mode 100755 index 4bb22f17..00000000 Binary files a/site/file/thumb/icones/loupe.png and /dev/null differ