diff --git a/core/layout/blank.php b/core/layout/blank.php index 5cda91ce..60544b37 100755 --- a/core/layout/blank.php +++ b/core/layout/blank.php @@ -12,8 +12,8 @@ showVendor(); ?> - - + + showStyle(); ?> showContent(); ?> diff --git a/core/layout/light.php b/core/layout/light.php index ad4776f8..5dde1966 100755 --- a/core/layout/light.php +++ b/core/layout/light.php @@ -12,8 +12,8 @@ showVendor(); ?> - - + + showStyle(); ?> diff --git a/core/layout/main.php b/core/layout/main.php index 4d9d7a8f..2ac89899 100755 --- a/core/layout/main.php +++ b/core/layout/main.php @@ -12,8 +12,8 @@ showVendor(); ?> showAnalytics(); ?> - - + + showStyle(); ?> diff --git a/core/module/config/config.php b/core/module/config/config.php index 17608d03..a976c4ec 100755 --- a/core/module/config/config.php +++ b/core/module/config/config.php @@ -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 diff --git a/core/module/config/view/index/index.php b/core/module/config/view/index/index.php index c2099a89..a15b4f19 100755 --- a/core/module/config/view/index/index.php +++ b/core/module/config/view/index/index.php @@ -63,7 +63,7 @@

Copie d'écran OpenGraph

- ' /> + ' />
diff --git a/core/module/install/install.php b/core/module/install/install.php index c4933652..1199e5f6 100755 --- a/core/module/install/install.php +++ b/core/module/install/install.php @@ -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([ diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php index aa1c5ac0..c93fb094 100644 --- a/core/module/install/ressource/defaultdata.php +++ b/core/module/install/ressource/defaultdata.php @@ -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', diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index d68f689b..9d524052 100755 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -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 '.$zipFilename.' 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(); diff --git a/core/module/theme/view/advanced/advanced.php b/core/module/theme/view/advanced/advanced.php index bec93378..613164cb 100755 --- a/core/module/theme/view/advanced/advanced.php +++ b/core/module/theme/view/advanced/advanced.php @@ -23,7 +23,7 @@
file_get_contents('site/data/custom.css'), + 'value' => file_get_contents(self::DATA_DIR.'custom.css'), 'class' => 'editorCss' ]); ?>
diff --git a/core/module/theme/view/body/body.php b/core/module/theme/view/body/body.php index 16695055..47ada5e1 100755 --- a/core/module/theme/view/body/body.php +++ b/core/module/theme/view/body/body.php @@ -28,7 +28,7 @@

Image

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, diff --git a/core/module/theme/view/header/header.php b/core/module/theme/view/header/header.php index 1ae91233..2c6ecd6b 100755 --- a/core/module/theme/view/header/header.php +++ b/core/module/theme/view/header/header.php @@ -40,7 +40,7 @@

Image

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, diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php index cd4f7344..c6f03501 100644 --- a/module/blog/view/article/article.php +++ b/module/blog/view/article/article.php @@ -5,8 +5,8 @@
getData(['module', $this->getUrl(0), $this->getUrl(1), 'hidePicture']) == false) { - // echo '
'; - echo '
'; + // echo '
'; + echo '
'; } ?> getData(['module', $this->getUrl(0), $this->getUrl(1), 'content']); ?> diff --git a/module/blog/view/index/index.php b/module/blog/view/index/index.php index b8b55e03..9670adb2 100644 --- a/module/blog/view/index/index.php +++ b/module/blog/view/index/index.php @@ -5,7 +5,7 @@
- +
diff --git a/module/form/form.php b/module/form/form.php index 659aec56..8713116d 100644 --- a/module/form/form.php +++ b/module/form/form.php @@ -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, ';','"'); diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php index e5956541..c36c5844 100644 --- a/module/gallery/gallery.php +++ b/module/gallery/gallery.php @@ -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') ]); }