diff --git a/.gitignore b/.gitignore index fc7be1e4..af0962bc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # Fichiers temporaires -site/tmp/* +site/tmp/*.zip +site/tmp/*.gz # Sauvegardes site/backup/* @@ -7,8 +8,6 @@ site/backup/* # Fichiers de données site/data/* -# Fichiers temporaires -site/temp/* # Fichiers uploadés site/file/source/* diff --git a/CHANGES.md b/CHANGES.md index dcbaa6ac..33ab76bf 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,9 @@ # ChangeLog +## Version 9.0.09 +- Corrections : + - Nettoyage du code, petites corrections. + ## Version 9.0.08 - Modifications : - Core : les données par défaut ne sont chargées qu'à installation afin d'alléger l'empreinte mémoire du noyau diff --git a/core/core.php b/core/core.php index 532ae1ee..80e561c6 100644 --- a/core/core.php +++ b/core/core.php @@ -720,8 +720,7 @@ class common { $this->SaveData(); } // Version 8.4.6 - if($this->getData(['core', 'dataVersion']) < 846) { - $this->getData(['core', 'dataVersion']); + if($this->getData(['core', 'dataVersion']) < 846) { $this->setData(['config','itemsperPage',10]); $this->setData(['core', 'dataVersion', 846]); $this->SaveData(); @@ -734,7 +733,6 @@ class common { } // Version 8.5.1 if($this->getData(['core', 'dataVersion']) < 851) { - $this->getData(['core', 'dataVersion']); $this->setData(['config','itemsperPage',10]); $this->deleteData(['config','ItemsperPage']); $this->setData(['core', 'dataVersion', 851]); @@ -742,7 +740,6 @@ class common { } // Version 9.0.0 if($this->getData(['core', 'dataVersion']) < 9000) { - $this->setData(['theme', 'site', 'block','12']); if ($this->getData(['theme','menu','position']) === 'body-top') { $this->setData(['theme','menu','position','top']); } @@ -764,7 +761,14 @@ class common { $this->setData(['theme', 'footer', 'font','Open+Sans']); $this->setData(['core', 'dataVersion', 9008]); $this->SaveData(); - } + } + // Version 9.0.09 + if($this->getData(['core', 'dataVersion']) < 9009) { + $this->deleteData(['theme', 'site', 'block','12']); + $this->setData(['core', 'dataVersion', 9009]); + $this->SaveData(); + } + } } @@ -889,7 +893,7 @@ class core extends common { if($this->getData(['theme', 'menu', 'margin'])) { if( $this->getData(['theme', 'menu', 'position']) === 'site-first' - OR $this->getData(['theme', 'header', 'position']) === 'body' + OR $this->getData(['theme', 'menu', 'position']) === 'site-second' ) { $css .= 'nav{margin:20px 20px 0 20px}'; } diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index 921ef714..e05c7ca8 100755 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -205,7 +205,7 @@ class theme extends common { 'auto auto' => 'Automatique', //'contain' => 'Responsive (contain)', 'cover' => 'Responsive', - '100% 100%' => 'Image étirée', + '100% 100%' => 'Image étirée' ]; diff --git a/core/vendor/filemanager/config/config.php b/core/vendor/filemanager/config/config.php index b21dff25..9e01f83c 100755 --- a/core/vendor/filemanager/config/config.php +++ b/core/vendor/filemanager/config/config.php @@ -450,7 +450,7 @@ $config = array( # 3 / auto = auto; # 4 / crop= resize and crop; */ - 'fixed_image_creation_option' => array( 'landscape', 'portrait' ), //set the type of the crop + 'fixed_image_creation_option' => array( 'landscape' ), //set the type of the crop // New image resized creation with relative path inside to upload folder after uploading (thumbnails in relative mode) diff --git a/core/vendor/tinymce/link_list.json b/core/vendor/tinymce/link_list.json index 668b8d25..572c1e6a 100644 --- a/core/vendor/tinymce/link_list.json +++ b/core/vendor/tinymce/link_list.json @@ -1 +1 @@ -[{"title":"Priv\u00e9e","value":"?privee"},{"title":"Blog","value":"?blog"},{"title":"Galeries","value":"?galeries"},{"title":"Site de Zwii","value":"?site-de-zwii"},{"title":"Contact","value":"?contact"},{"title":"Accueil","value":"?accueil","menu":[{"title":"Enfant","value":"?enfant"},{"title":"Mise en page","value":"?mise-en-page"}]}] \ No newline at end of file +[{"title":"Accueil","value":"?accueil","menu":[{"title":"Enfant","value":"?enfant"},{"title":"Mise en page","value":"?mise-en-page"}]},{"title":"Priv\u00e9e","value":"?privee"},{"title":"Blog","value":"?blog"},{"title":"Galeries","value":"?galeries"},{"title":"Site de Zwii","value":"?site-de-zwii"},{"title":"Contact","value":"?contact"}] \ No newline at end of file diff --git a/site/tmp/.htaccess b/site/tmp/.htaccess new file mode 100644 index 00000000..dd7f084e --- /dev/null +++ b/site/tmp/.htaccess @@ -0,0 +1,5 @@ +# Bloque l'accès htaccess + + Order deny,allow + Deny from all + \ No newline at end of file