ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Issues Releases 100 Activity
Browse Source

[9.1.08] Placer des constantes pour les dossiers dir file tmp et backup

pull/5/head
fredtempez 3 years ago
parent
0696046446
commit
40933f3121
15 changed files with 57 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      core/layout/blank.php
  2. 4
      core/layout/light.php
  3. 4
      core/layout/main.php
  4. 12
      core/module/config/config.php
  5. 2
      core/module/config/view/index/index.php
  6. 30
      core/module/install/install.php
  7. 4
      core/module/install/ressource/defaultdata.php
  8. 34
      core/module/theme/theme.php
  9. 2
      core/module/theme/view/advanced/advanced.php
  10. 2
      core/module/theme/view/body/body.php
  11. 2
      core/module/theme/view/header/header.php
  12. 4
      module/blog/view/article/article.php
  13. 2
      module/blog/view/index/index.php
  14. 6
      module/form/form.php
  15. 2
      module/gallery/gallery.php

4
core/layout/blank.php
Unescape View File

@ -12,8 +12,8 @@
<?php $layout->showVendor(); ?>
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/common.css">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/blank.css">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/theme.css?<?php echo md5_file('site/data/theme.css'); ?>">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/custom.css?<?php echo md5_file('site/data/custom.css'); ?>"></head>
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/theme.css?<?php echo md5_file(self::DATA_DIR.'theme.css'); ?>">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/custom.css?<?php echo md5_file(self::DATA_DIR.'custom.css'); ?>"></head>
<body>
<?php $layout->showStyle(); ?>
<?php $layout->showContent(); ?>

4
core/layout/light.php
Unescape View File

@ -12,8 +12,8 @@
<?php $layout->showVendor(); ?>
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/common.css">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/light.css">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/theme.css?<?php echo md5_file('site/data/theme.css'); ?>">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/custom.css?<?php echo md5_file('site/data/custom.css'); ?>">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/theme.css?<?php echo md5_file(self::DATA_DIR.'theme.css'); ?>">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/custom.css?<?php echo md5_file(self::DATA_DIR.'custom.css'); ?>">
</head>
<body>
<?php $layout->showStyle(); ?>

4
core/layout/main.php
Unescape View File

@ -12,8 +12,8 @@
<?php $layout->showVendor(); ?>
<?php $layout->showAnalytics(); ?>
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>core/layout/common.css">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/theme.css?<?php echo md5_file('site/data/theme.css'); ?>">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/custom.css?<?php echo md5_file('site/data/custom.css'); ?>">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/theme.css?<?php echo md5_file(self::DATA_DIR.'theme.css'); ?>">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/custom.css?<?php echo md5_file(self::DATA_DIR.'custom.css'); ?>">
</head>
<body>
<?php $layout->showStyle(); ?>

12
core/module/config/config.php
Unescape View File

@ -203,7 +203,7 @@ class config extends common {
// Creation du ZIP
$fileName = date('Y-m-d-h-i-s', time()) . '.zip';
$zip = new ZipArchive();
if($zip->open('site/tmp/' . $fileName, ZipArchive::CREATE) === TRUE){
if($zip->open(self::TEMP_DIR . $fileName, ZipArchive::CREATE) === TRUE){
foreach(configHelper::scanDir('site/') as $file) {
$zip->addFile($file);
}
@ -212,13 +212,13 @@ class config extends common {
// Téléchargement du ZIP
header('Content-Transfer-Encoding: binary');
header('Content-Disposition: attachment; filename="' . $fileName . '"');
header('Content-Length: ' . filesize('site/tmp/' . $fileName));
readfile('site/tmp/' . $fileName);
header('Content-Length: ' . filesize(self::TEMP_DIR . $fileName));
readfile(self::TEMP_DIR . $fileName);
// Valeurs en sortie
$this->addOutput([
'display' => self::DISPLAY_RAW
]);
unlink('site/tmp/' . $fileName);
unlink(self::TEMP_DIR . $fileName);
}
/**
@ -237,7 +237,7 @@ class config extends common {
$screenshot = str_replace(array('_','-'),array('/','+'),$screenshot);
$data = 'data:image/jpeg;base64,'.$screenshot;
$data = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $data));
file_put_contents( 'site/file/source/screenshot.png',$data);
file_put_contents( self::FILE_DIR.'source/screenshot.png',$data);
// Valeurs en sortie
$this->addOutput([
@ -323,7 +323,7 @@ class config extends common {
]);
}
// Initialisation du screen
if (!file_exists('site/file/source/screenshot.png')) {
if (!file_exists(self::FILE_DIR.'source/screenshot.png')) {
$this->configMetaImage();
}
// Valeurs en sortie

2
core/module/config/view/index/index.php
Unescape View File

@ -63,7 +63,7 @@
<h4>Copie d'écran OpenGraph</h4>
<div class="row">
<div class="col8 offset2">
<img src='<?php echo helper::baseUrl(false) . 'site/file/source/screenshot.png';?>' />
<img src='<?php echo helper::baseUrl(false) . self::FILE_DIR.'source/screenshot.png';?>' />
</div>
</div>
<div class="row">

30
core/module/install/install.php
Unescape View File

@ -62,9 +62,9 @@ class install extends common {
// Ajouter ici la liste des pages privées qui ne sont pas vues lors de l'installation.
$this->deleteData(['page', 'privee']);
// Effacer les fichiers par défaut
if (is_dir('site/file/source/galerie')) {
$this->removeAll('site/file/source/galerie');
$this->removeAll('site/file/thumb/galerie');
if (is_dir(self::FILE_DIR.'source/galerie')) {
$this->removeAll(self::FILE_DIR.'source/galerie');
$this->removeAll(self::FILE_DIR.'thumb/galerie');
}
} else {
$this->setData(['module', 'blog', 'mon-premier-article', 'userId', $userId]);
@ -123,14 +123,14 @@ class install extends common {
case 1:
$success = true;
// Copie du fichier de données
copy('site/data/core.json', 'site/backup/' . date('Y-m-d', time()) . '-core-update.json');
copy('site/data/theme.json', 'site/backup/' . date('Y-m-d', time()) . '-theme-update.json');
copy(self::DATA_DIR.'core.json', self::BACKUP_DIR . date('Y-m-d', time()) . '-core-update.json');
copy(self::DATA_DIR.'theme.json', self::BACKUP_DIR . date('Y-m-d', time()) . '-theme-update.json');
// Nettoyage des fichiers temporaires
if(file_exists('site/tmp/update.tar.gz')) {
$success = unlink('site/tmp/update.tar.gz');
if(file_exists(self::TEMP_DIR.'update.tar.gz')) {
$success = unlink(self::TEMP_DIR.'update.tar.gz');
}
if(file_exists('site/tmp/update.tar')) {
$success = unlink('site/tmp/update.tar');
if(file_exists(self::TEMP_DIR.'update.tar')) {
$success = unlink(self::TEMP_DIR.'update.tar');
}
// Valeurs en sortie
$this->addOutput([
@ -144,7 +144,7 @@ class install extends common {
// Téléchargement
case 2:
// Téléchargement depuis le serveur de Zwii
$success = (file_put_contents('site/tmp/update.tar.gz', file_get_contents('https://zwiicms.com/update/update.tar.gz')) !== false);
$success = (file_put_contents(self::TEMP_DIR.'update.tar.gz', file_get_contents('https://zwiicms.com/update/update.tar.gz')) !== false);
// Valeurs en sortie
$this->addOutput([
'display' => self::DISPLAY_JSON,
@ -162,7 +162,7 @@ class install extends common {
// Décompression et installation
try {
// Décompression dans le dossier de fichier temporaires
$pharData = new PharData('site/tmp/update.tar.gz');
$pharData = new PharData(self::TEMP_DIR.'update.tar.gz');
$pharData->decompress();
// Installation
$pharData->extractTo(__DIR__ . '/../../../', null, true);
@ -170,11 +170,11 @@ class install extends common {
$success = $e->getMessage();
}
// Netooyage du dossier
if(file_exists('site/tmp/update.tar.gz')) {
unlink('site/tmp/update.tar.gz');
if(file_exists(self::TEMP_DIR.'update.tar.gz')) {
unlink(self::TEMP_DIR.'update.tar.gz');
}
if(file_exists('site/tmp/update.tar')) {
unlink('site/tmp/update.tar');
if(file_exists(self::TEMP_DIR.'update.tar')) {
unlink(self::TEMP_DIR.'update.tar');
}
// Valeurs en sortie
$this->addOutput([

4
core/module/install/ressource/defaultdata.php
Unescape View File

@ -356,7 +356,7 @@ class install extends common {
'beaux-paysages' => [
'config' => [
'name' => 'Beaux paysages',
'directory' => 'site/file/source/galerie/landscape'
'directory' => self::FILE_DIR.'source/galerie/landscape'
],
'legend' => [
'desert.jpg' => 'Un désert',
@ -367,7 +367,7 @@ class install extends common {
'espace' => [
'config' => [
'name' => 'Espace',
'directory' => 'site/file/source/galerie/space'
'directory' => self::FILE_DIR.'source/galerie/space'
],
'legend' => [
'earth.jpg' => 'La Terre et la Lune',

34
core/module/theme/theme.php
Unescape View File

@ -216,7 +216,7 @@ class theme extends common {
// Soumission du formulaire
if($this->isPost()) {
// Enregistre le CSS
file_put_contents('site/data/custom.css', $this->getInput('themeAdvancedCss', null));
file_put_contents(self::DATA_DIR.'custom.css', $this->getInput('themeAdvancedCss', null));
// Valeurs en sortie
$this->addOutput([
'notification' => 'Modifications enregistrées',
@ -432,7 +432,7 @@ class theme extends common {
*/
public function reset() {
// Supprime le fichier de personnalisation avancée
unlink('site/data/custom.css');
unlink(self::DATA_DIR.'custom.css');
// Valeurs en sortie
$this->addOutput([
'notification' => 'Personnalisation avancée réinitialisée',
@ -492,7 +492,7 @@ class theme extends common {
$zipFilename = $this->getInput('themeManageImport', helper::FILTER_STRING_SHORT, true);
$zip = new ZipArchive();
if ($zip->open('site/file/source/'.$zipFilename) === TRUE) {
if ($zip->open(self::FILE_DIR.'source/'.$zipFilename) === TRUE) {
$zip->extractTo('.');
$zip->close();
// Valeurs en sortie
@ -527,10 +527,10 @@ class theme extends common {
header('Content-Type: application/octet-stream');
header('Content-Transfer-Encoding: binary');
header('Content-Disposition: attachment; filename="' . $zipFilename . '"');
header('Content-Length: ' . filesize('site/tmp/' . $zipFilename));
readfile('site/tmp/' . $zipFilename);
header('Content-Length: ' . filesize(self::TEMP_DIR . $zipFilename));
readfile(self::TEMP_DIR . $zipFilename);
// Nettoyage du dossier
unlink ('site/tmp/' . $zipFilename);
unlink (self::TEMP_DIR . $zipFilename);
die();
}
@ -541,10 +541,10 @@ class theme extends common {
// Make zip
$zipFilename = $this->makezip();
// Téléchargement du ZIP
mkdir('site/file/source/theme');
copy ('site/tmp/' . $zipFilename , 'site/file/source/theme/' . $zipFilename);
mkdir(self::FILE_DIR.'source/theme');
copy (self::TEMP_DIR . $zipFilename , self::FILE_DIR.'source/theme/' . $zipFilename);
// Nettoyage du dossier
unlink ('site/tmp/' . $zipFilename);
unlink (self::TEMP_DIR . $zipFilename);
// Valeurs en sortie
$this->addOutput([
'notification' => 'Archive <b>'.$zipFilename.'</b> sauvegardée dans fichiers',
@ -561,18 +561,18 @@ class theme extends common {
// $zipFilename = 'theme-'.date('dmY').'-'.date('hm').'-'.rand(10,99).'.zip';
$zipFilename = 'theme '.date('d m Y').' '.date('H i s ').'.zip';
$zip = new ZipArchive();
if ($zip->open('site/tmp/' . $zipFilename, ZipArchive::CREATE | ZipArchive::OVERWRITE ) === TRUE) {
$zip->addFile('site/data/theme.json','site/data/theme.json');
$zip->addFile('site/data/theme.json','site/data/theme.css');
$zip->addFile('site/data/theme.json','site/data/custom.css');
if ($zip->open(self::TEMP_DIR . $zipFilename, ZipArchive::CREATE | ZipArchive::OVERWRITE ) === TRUE) {
$zip->addFile(self::DATA_DIR.'theme.json',self::DATA_DIR.'theme.json');
$zip->addFile(self::DATA_DIR.'theme.json',self::DATA_DIR.'theme.css');
$zip->addFile(self::DATA_DIR.'theme.json',self::DATA_DIR.'custom.css');
if ($this->getData(['theme','body','image']) !== '' ) {
$zip->addFile('site/file/source/'.$this->getData(['theme','body','image']),
'site/file/source/'.$this->getData(['theme','body','image'])
$zip->addFile(self::FILE_DIR.'source/'.$this->getData(['theme','body','image']),
self::FILE_DIR.'source/'.$this->getData(['theme','body','image'])
);
}
if ($this->getData(['theme','header','image']) !== '' ) {
$zip->addFile('site/file/source/'.$this->getData(['theme','header','image']),
'site/file/source/'.$this->getData(['theme','header','image'])
$zip->addFile(self::FILE_DIR.'source/'.$this->getData(['theme','header','image']),
self::FILE_DIR.'source/'.$this->getData(['theme','header','image'])
);
}
$ret = $zip->close();

2
core/module/theme/view/advanced/advanced.php
Unescape View File

@ -23,7 +23,7 @@
<div class="row">
<div class="col12">
<?php echo template::textarea('themeAdvancedCss', [
'value' => file_get_contents('site/data/custom.css'),
'value' => file_get_contents(self::DATA_DIR.'custom.css'),
'class' => 'editorCss'
]); ?>
</div>

2
core/module/theme/view/body/body.php
Unescape View File

@ -28,7 +28,7 @@
<div class="block">
<h4>Image</h4>
<?php
$imageFile = file_exists('site/file/source/'.$this->getData(['theme', 'body', 'image'])) ? $this->getData(['theme', 'body', 'image']) : "";
$imageFile = file_exists(self::FILE_DIR.'source/'.$this->getData(['theme', 'body', 'image'])) ? $this->getData(['theme', 'body', 'image']) : "";
echo template::file('themeBodyImage', [
'label' => 'Fond',
'type' => 1,

2
core/module/theme/view/header/header.php
Unescape View File

@ -40,7 +40,7 @@
<div class="block">
<h4>Image</h4>
<?php
$imageFile = file_exists('site/file/source/'.$this->getData(['theme', 'header', 'image'])) ? $this->getData(['theme', 'header', 'image']) : "";
$imageFile = file_exists(self::FILE_DIR.'source/'.$this->getData(['theme', 'header', 'image'])) ? $this->getData(['theme', 'header', 'image']) : "";
echo template::file('themeHeaderImage', [
'label' => 'Fond',
'type' => 1,

4
module/blog/view/article/article.php
Unescape View File

@ -5,8 +5,8 @@
</div>
<?php if ($this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'hidePicture']) == false) {
// echo '<div id="blogArticlePicture" style="background-image:url(' . helper::baseUrl(false) . 'site/file/source/' . $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'picture']) . ');"></div>';
echo '<div id="blogArticlePicture"><img id="blogArticlePicture" src="' . helper::baseUrl(false) . 'site/file/source/' . $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'picture']) . '"></div>';
// echo '<div id="blogArticlePicture" style="background-image:url(' . helper::baseUrl(false) . self::FILE_DIR.'source/' . $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'picture']) . ');"></div>';
echo '<div id="blogArticlePicture"><img id="blogArticlePicture" src="' . helper::baseUrl(false) . self::FILE_DIR.'source/' . $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'picture']) . '"></div>';
} ?>
<?php echo $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'content']); ?>

2
module/blog/view/index/index.php
Unescape View File

@ -5,7 +5,7 @@
<div class="row">
<div class="col3">
<a href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/' . $articleId; ?>" class="blogPicture">
<img src="<?php echo helper::baseUrl(false) . 'site/file/thumb/' . $article['picture']; ?>">
<img src="<?php echo helper::baseUrl(false) . self::FILE_DIR.'thumb/' . $article['picture']; ?>">
</a>
</div>
<div class="col9">

6
module/form/form.php
Unescape View File

@ -178,10 +178,10 @@ class form extends common {
$data = $this->getData(['module', $this->getUrl(0), 'data']);
if ($data !== []) {
$csvfilename = 'data-'.date('dmY').'-'.date('hm').'-'.rand(10,99).'.csv';
if (!file_exists('site/file/source/data')) {
mkdir('site/file/source/data');
if (!file_exists(self::FILE_DIR.'source/data')) {
mkdir(self::FILE_DIR.'source/data');
}
$fp = fopen('site/file/source/data/'.$csvfilename, 'w');
$fp = fopen(self::FILE_DIR.'source/data/'.$csvfilename, 'w');
fputcsv($fp, array_keys($data[1]), ';','"');
foreach ($data as $fields) {
fputcsv($fp, $fields, ';','"');

2
module/gallery/gallery.php
Unescape View File

@ -130,7 +130,7 @@ class gallery extends common {
// Valeurs en sortie
$this->addOutput([
'display' => self::DISPLAY_JSON,
'content' => galleriesHelper::scanDir('site/file/source')
'content' => galleriesHelper::scanDir(self::FILE_DIR.'source')
]);
}

Write Preview
Loading…
Cancel
Save