From 0ac987b5a6a59469ef5e62cfd78ef6a22d49ff83 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Sat, 23 Mar 2019 13:51:48 +0100 Subject: [PATCH 1/8] [9.0.09] Lity + SimpleLightbox --- core/core.js.php | 2 +- core/core.php | 2 +- core/vendor/tinymce/init.js | 2 +- core/vendor/tinymce/link_list.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/core.js.php b/core/core.js.php index aaf44495..0a45d9cc 100755 --- a/core/core.js.php +++ b/core/core.js.php @@ -329,7 +329,7 @@ core.start = function() { }).trigger("resize"); // Ajouter l'attribut data-lity afin de faire la liaison avec lity - //$("a[rel='data-lity']").attr("data-lity",""); + $("a[rel='data-lity']").attr("data-lity",""); // Ajouter la classe Gallery afin de faire la liaison avec simplelightbox $("a[rel='gallery']").addClass("gallery",""); diff --git a/core/core.php b/core/core.php index fc8ce230..532ae1ee 100644 --- a/core/core.php +++ b/core/core.php @@ -28,7 +28,7 @@ class common { const GROUP_ADMIN = 3; // Numéro de version stable - const ZWII_VERSION = '9.0.08'; + const ZWII_VERSION = '9.0.09'; public static $actions = []; public static $coreModuleIds = [ diff --git a/core/vendor/tinymce/init.js b/core/vendor/tinymce/init.js index ace3d44f..d63b7b70 100755 --- a/core/vendor/tinymce/init.js +++ b/core/vendor/tinymce/init.js @@ -34,7 +34,7 @@ tinymce.init({ // Target pour lightbox rel_list: [ {title: 'None', value: ''}, - // {title: 'Lightbox', value: 'data-lity'}, + {title: 'Lity', value: 'data-lity'}, {title: 'SimpleLightbox', value: 'gallery'} ], // Titre des image diff --git a/core/vendor/tinymce/link_list.json b/core/vendor/tinymce/link_list.json index 572c1e6a..668b8d25 100644 --- a/core/vendor/tinymce/link_list.json +++ b/core/vendor/tinymce/link_list.json @@ -1 +1 @@ -[{"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 +[{"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 From 3cc657519198864d96f91052df9433154a0dda90 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Sat, 23 Mar 2019 16:42:40 +0100 Subject: [PATCH 2/8] [9.0.09] activation Lity --- core/vendor/tinymce/init.js | 4 ++-- core/vendor/tinymce/langs/fr_FR.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/vendor/tinymce/init.js b/core/vendor/tinymce/init.js index d63b7b70..07788c92 100755 --- a/core/vendor/tinymce/init.js +++ b/core/vendor/tinymce/init.js @@ -34,8 +34,8 @@ tinymce.init({ // Target pour lightbox rel_list: [ {title: 'None', value: ''}, - {title: 'Lity', value: 'data-lity'}, - {title: 'SimpleLightbox', value: 'gallery'} + {title: 'Popup Lity', value: 'data-lity'}, + {title: 'Diaporama SimpleLightbox', value: 'gallery'} ], // Titre des image image_title: true, diff --git a/core/vendor/tinymce/langs/fr_FR.js b/core/vendor/tinymce/langs/fr_FR.js index 907a81e5..35f079e4 100755 --- a/core/vendor/tinymce/langs/fr_FR.js +++ b/core/vendor/tinymce/langs/fr_FR.js @@ -161,7 +161,7 @@ tinymce.addI18n('fr_FR',{ "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "L'URL que vous avez entr\u00e9e semble \u00eatre une adresse e-mail. Voulez-vous ajouter le pr\u00e9fixe mailto: n\u00e9cessaire?", "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "L'URL que vous avez entr\u00e9e semble \u00eatre un lien externe. Voulez-vous ajouter le pr\u00e9fixe http:\/\/ n\u00e9cessaire?", "Link list": "Page", -"Rel": "Ouvrir avec", +"Rel": "Afficher dans", "Insert video": "Ins\u00e9rer une vid\u00e9o", "Insert\/edit video": "Ins\u00e9rer\/modifier une vid\u00e9o", "Insert\/edit media": "Ins\u00e9rer\/modifier un m\u00e9dia", From 0a622dc1cd1f00651c7a44425ad1027e0abc9005 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Sat, 23 Mar 2019 18:41:05 +0100 Subject: [PATCH 3/8] [9.0.09] cleaning update datas --- core/core.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/core/core.php b/core/core.php index 532ae1ee..3caaa2cd 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,13 @@ 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 +892,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}'; } From 211901b64d09a0b649856230902d07a0be347007 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Sat, 23 Mar 2019 18:41:22 +0100 Subject: [PATCH 4/8] [9.0.09] comma deleted --- CHANGES.md | 2 ++ core/module/theme/theme.php | 2 +- core/vendor/tinymce/link_list.json | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index dcbaa6ac..876aefbc 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,7 @@ # ChangeLog +## Version 9.0.09 + ## 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/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/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 From 6fffc4f098d5dd291af58519db71cdda28459cd4 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Sat, 23 Mar 2019 18:44:35 +0100 Subject: [PATCH 5/8] [9.0.09] cleaning config RFM --- core/vendor/filemanager/config/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 7492d453c4d73d973fddc56041e65f62852906b4 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Sat, 23 Mar 2019 18:57:19 +0100 Subject: [PATCH 6/8] [9.0.09] cleaning + changes --- .gitignore | 2 -- CHANGES.md | 2 ++ core/core.php | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fc7be1e4..f404646a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,8 +7,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 876aefbc..33ab76bf 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,8 @@ # ChangeLog ## Version 9.0.09 +- Corrections : + - Nettoyage du code, petites corrections. ## Version 9.0.08 - Modifications : diff --git a/core/core.php b/core/core.php index 3caaa2cd..80e561c6 100644 --- a/core/core.php +++ b/core/core.php @@ -767,6 +767,7 @@ class common { $this->deleteData(['theme', 'site', 'block','12']); $this->setData(['core', 'dataVersion', 9009]); $this->SaveData(); + } } } From 167ba534a1b112a78c4209d3dfb9abbb93f269b0 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Sat, 23 Mar 2019 19:30:58 +0100 Subject: [PATCH 7/8] [9.0.09] gitignore --- .gitignore | 3 ++- site/tmp/.htaccess | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 site/tmp/.htaccess diff --git a/.gitignore b/.gitignore index f404646a..af0962bc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # Fichiers temporaires -site/tmp/* +site/tmp/*.zip +site/tmp/*.gz # Sauvegardes site/backup/* 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 From 6deac16d34a8d5b3c662a38828abb05f0051464d Mon Sep 17 00:00:00 2001 From: fredtempez Date: Sat, 23 Mar 2019 21:13:11 +0100 Subject: [PATCH 8/8] [9.0.09] Core cleaning --- core/core.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core.php b/core/core.php index 80e561c6..5a49a74e 100644 --- a/core/core.php +++ b/core/core.php @@ -740,6 +740,7 @@ class common { } // Version 9.0.0 if($this->getData(['core', 'dataVersion']) < 9000) { + $this->deleteData(['theme', 'site', 'block']); if ($this->getData(['theme','menu','position']) === 'body-top') { $this->setData(['theme','menu','position','top']); } @@ -764,7 +765,6 @@ class common { } // Version 9.0.09 if($this->getData(['core', 'dataVersion']) < 9009) { - $this->deleteData(['theme', 'site', 'block','12']); $this->setData(['core', 'dataVersion', 9009]); $this->SaveData(); }