From 44d32d0677aff51c30cb200d7367cfa758f0138a Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Fri, 9 Apr 2021 11:11:12 +0200 Subject: [PATCH 1/4] Supprimer 'module/download/view/index/index.php' --- module/download/view/index/index.php | 67 ---------------------------- 1 file changed, 67 deletions(-) delete mode 100644 module/download/view/index/index.php diff --git a/module/download/view/index/index.php b/module/download/view/index/index.php deleted file mode 100644 index c177964e..00000000 --- a/module/download/view/index/index.php +++ /dev/null @@ -1,67 +0,0 @@ - -
-
- $item): ?> -
-
- makeThumb( self::FILE_DIR . 'source/' . $item['picture'], - self::FILE_DIR . 'thumb/' . $thumb, - self::THUMBS_WIDTH); - } - - ?> - - <?php echo $item['picture']; ?> - -
-
- -
-
- -
-
- - getData(['module',$this->getUrl(0), 'config', 'feeds'])): ?> -
- - - ' . $this->getData(['module',$this->getUrl(0), 'config', 'feedsLabel']) . '

' ; - ?> - -
- - - - \ No newline at end of file From 16a95dc510dd594af0aaaf1ba64d29baba80a0c7 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Fri, 9 Apr 2021 11:11:19 +0200 Subject: [PATCH 2/4] Supprimer 'module/download/view/item/item.php' --- module/download/view/item/item.php | 211 ----------------------------- 1 file changed, 211 deletions(-) delete mode 100644 module/download/view/item/item.php diff --git a/module/download/view/item/item.php b/module/download/view/item/item.php deleted file mode 100644 index e66f16ee..00000000 --- a/module/download/view/item/item.php +++ /dev/null @@ -1,211 +0,0 @@ -
-
-
-
- getData(['module', $this->getUrl(0),'items', $this->getUrl(1), 'content']); ?> -
-
-
-
- - - getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'publishedOn'])), 'UTF-8', true) - ? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'publishedOn'])) - : utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'publishedOn']))); - $heure = mb_detect_encoding(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'publishedOn'])), 'UTF-8', true) - ? strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'publishedOn'])) - : utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'publishedOn']))); - echo $date . ' à ' . $heure; - ?> - - - getUser('password') === $this->getInput('ZWII_USER_PASSWORD') - AND - ( // Propriétaire - ( - $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1),'editConsent']) === $module::EDIT_OWNER - AND ( $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1),'userId']) === $this->getUser('id') - OR $this->getUser('group') === self::GROUP_ADMIN ) - ) - OR ( - // Groupe - ( $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1),'editConsent']) === self::GROUP_ADMIN - OR $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1),'editConsent']) === self::GROUP_MODERATOR) - AND $this->getUser('group') >= $this->getData(['module',$this->getUrl(0), 'items', $this->getUrl(1),'editConsent']) - ) - OR ( - // Tout le monde - $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1),'editConsent']) === $module::EDIT_ALL - AND $this->getUser('group') >= $module::$actions['config'] - ) - ) - ): ?> - - Editer - - - - getData(['module',$this->getUrl(0), 'config', 'feeds'])): ?> - - -
-
-
-
-
-
- getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'pictureSize']) === null ? '100' : $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'pictureSize']); ?> - getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'picture']) . - '" alt="' . $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'picture']) . '">'; - ?> -
-
-
-
- self::FILE_DIR . 'source/' . $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'file']), - 'href' => helper::baseUrl() . $this->getUrl(0) . '/downloadFile/' . $this->getUrl(1) . '/' . $_SESSION['csrf'], - 'value' => 'Télécharger' - ]); ?> -
-
-
-
- getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'fileVersion']); ?> -
-
-
-
- getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'fileDate'])), 'UTF-8', true) - ? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'fileDate'])) - : utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'fileDate']))); - ?> - -
-
-
-
- Auteur : - getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'fileAuthor']); ?> - -
-
-
-
- Licence : - getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'fileLicense'])]; ?> - -
-
-
-
- Téléchargements : - - -
-
-
-
- -
-
- getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'commentClose'])): ?> -

Cet item ne reçoit pas de commentaire.

- -

- - - - 0 ? $commentsNb . ' ' . 'commentaire' . $s : 'Pas encore de commentaire'; ?> -

- - 'Rédiger un commentaire...', - 'readonly' => true - ]); ?> -
- getUser('password') === $this->getInput('ZWII_USER_PASSWORD')): ?> - 'Nom', - 'readonly' => true, - 'value' => $module::$editCommentSignature - ]); ?> - $this->getUser('id') - ]); ?> - -
-
- 'Nom' - ]); ?> -
-
-
Ou
-
-
- helper::baseUrl() . 'user/login/' . str_replace('/', '_', $this->getUrl()) . '__comment', - 'value' => 'Connexion' - ]); ?> -
-
- - 'Commentaire avec maximum '.$this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'commentMaxlength']).' caractères', - 'class' => 'editorWysiwygComment', - 'noDirty' => true, - 'maxlength' => $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'commentMaxlength']) - ]); ?> -
- getUser('password') !== $this->getInput('ZWII_USER_PASSWORD')): ?> -
-
- $this->getData(['config','captchaStrong']) - ]); ?> -
-
- -
-
- 'buttonGrey', - 'value' => 'Annuler' - ]); ?> -
-
- 'Envoyer', - 'ico' => '' - ]); ?> -
-
-
- -
-
- $comment): ?> -
-

- le - -

- -
-
-
-
- \ No newline at end of file From a07775f25ab9c551c1ea22efc920b8c66c7c2f6d Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 12 Apr 2021 11:44:03 +0200 Subject: [PATCH 3/4] Sample site defaultdata fix --- core/module/install/ressource/defaultdata.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php index e6e89524..2abb3c3d 100755 --- a/core/module/install/ressource/defaultdata.php +++ b/core/module/install/ressource/defaultdata.php @@ -650,13 +650,7 @@ class init extends common { 'blog' => [ 'config' => [ 'feeds' => true, - 'feedsLabel' => "Syndication RSS", - "editConsent" => "all", - "commentMaxlength" => "500", - "commentApproved" => false, - "commentClose" => false, - "commentNotification" => false, - "commentGroupNotification" => 1 + 'feedsLabel' => "Syndication RSS" ], 'posts' => [ 'mon-premier-article' => [ @@ -672,6 +666,7 @@ class init extends common { ], 'content' => '

Et eodem impetu Domitianum praecipitem per scalas itidem funibus constrinxerunt, eosque coniunctos per ampla spatia civitatis acri raptavere discursu. iamque artuum et membrorum divulsa conpage superscandentes corpora mortuorum ad ultimam truncata deformitatem velut exsaturati mox abiecerunt in flumen.

Ex his quidam aeternitati se commendari posse per statuas aestimantes eas ardenter adfectant quasi plus praemii de figmentis aereis sensu carentibus adepturi, quam ex conscientia honeste recteque factorum, easque auro curant inbracteari, quod Acilio Glabrioni delatum est primo, cum consiliis armisque regem superasset Antiochum. quam autem sit pulchrum exigua haec spernentem et minima ad ascensus verae gloriae tendere longos et arduos, ut memorat vates Ascraeus, Censorius Cato monstravit. qui interrogatus quam ob rem inter multos... statuam non haberet malo inquit ambigere bonos quam ob rem id non meruerim, quam quod est gravius cur inpetraverim mussitare.

Latius iam disseminata licentia onerosus bonis omnibus Caesar nullum post haec adhibens modum orientis latera cuncta vexabat nec honoratis parcens nec urbium primatibus nec plebeiis.

', 'picture' => 'galerie/landscape/meadow.jpg', + 'picturePosition' => 'left', 'hidePicture' => false, 'pictureSize' => 20, 'publishedOn' => 1548790902, @@ -691,6 +686,7 @@ class init extends common { 'content' => '

Et prima post Osdroenam quam, ut dictum est, ab hac descriptione discrevimus, Commagena, nunc Euphratensis, clementer adsurgit, Hierapoli, vetere Nino et Samosata civitatibus amplis inlustris.

Ob haec et huius modi multa, quae cernebantur in paucis, omnibus timeri sunt coepta. et ne tot malis dissimulatis paulatimque serpentibus acervi crescerent aerumnarum, nobilitatis decreto legati mittuntur: Praetextatus ex urbi praefecto et ex vicario Venustus et ex consulari Minervius oraturi, ne delictis supplicia sint grandiora, neve senator quisquam inusitato et inlicito more tormentis exponeretur.

Sed ut tum ad senem senex de senectute, sic hoc libro ad amicum amicissimus scripsi de amicitia. Tum est Cato locutus, quo erat nemo fere senior temporibus illis, nemo prudentior; nunc Laelius et sapiens (sic enim est habitus) et amicitiae gloria excellens de amicitia loquetur. Tu velim a me animum parumper avertas, Laelium loqui ipsum putes. C. Fannius et Q. Mucius ad socerum veniunt post mortem Africani; ab his sermo oritur, respondet Laelius, cuius tota disputatio est de amicitia, quam legens te ipse cognosces.

', 'picture' => 'galerie/landscape/desert.jpg', 'hidePicture' => false, + 'picturePosition' => 'right', 'pictureSize' => 40, 'publishedOn' => 1550432502, 'state' => true, @@ -709,6 +705,7 @@ class init extends common { 'content' => '

Rogatus ad ultimum admissusque in consistorium ambage nulla praegressa inconsiderate et leviter proficiscere inquit ut praeceptum est, Caesar sciens quod si cessaveris, et tuas et palatii tui auferri iubebo prope diem annonas. hocque solo contumaciter dicto subiratus abscessit nec in conspectum eius postea venit saepius arcessitus.

Proinde concepta rabie saeviore, quam desperatio incendebat et fames, amplificatis viribus ardore incohibili in excidium urbium matris Seleuciae efferebantur, quam comes tuebatur Castricius tresque legiones bellicis sudoribus induratae.

Inter has ruinarum varietates a Nisibi quam tuebatur accitus Vrsicinus, cui nos obsecuturos iunxerat imperiale praeceptum, dispicere litis exitialis certamina cogebatur abnuens et reclamans, adulatorum oblatrantibus turmis, bellicosus sane milesque semper et militum ductor sed forensibus iurgiis longe discretus, qui metu sui discriminis anxius cum accusatores quaesitoresque subditivos sibi consociatos ex isdem foveis cerneret emergentes, quae clam palamve agitabantur, occultis Constantium litteris edocebat inplorans subsidia, quorum metu tumor notissimus Caesaris exhalaret.

', 'picture' => 'galerie/landscape/iceberg.jpg', 'hidePicture' => false, + 'picturePosition' => 'left', 'pictureSize' => 100, 'publishedOn' => 1550864502, 'state' => true, From 93c13f3f163c2a5563cde9664c26d0c0d4455f2c Mon Sep 17 00:00:00 2001 From: fredtempez Date: Mon, 12 Apr 2021 18:29:10 +0200 Subject: [PATCH 4/4] 10503 bug smtp --- CHANGES.md | 4 ++ README.md | 2 +- core/core.php | 2 +- .../config/view/advanced/advanced.js.php | 44 +++++++++---------- core/module/config/view/advanced/advanced.php | 4 +- 5 files changed, 30 insertions(+), 26 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 480b46a3..94370aa6 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,9 @@ # Changelog +## version 10.5.03 +- Correction : + - Options de configuration SMTP invisibles. + ## version 10.5.02 - Corrections : - Erreur de positionnement de marge dans le thème du site. diff --git a/README.md b/README.md index 45e8d589..80eb8988 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# ZwiiCMS 10.5.02 +# ZwiiCMS 10.5.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 3ae75036..ca748022 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.5.02'; + const ZWII_VERSION = '10.5.03'; const ZWII_UPDATE_CHANNEL = "v10"; public static $actions = []; diff --git a/core/module/config/view/advanced/advanced.js.php b/core/module/config/view/advanced/advanced.js.php index cc6664e6..903e0fc5 100644 --- a/core/module/config/view/advanced/advanced.js.php +++ b/core/module/config/view/advanced/advanced.js.php @@ -14,24 +14,24 @@ $( document).ready(function() { /** * Afficher et masquer options SMTP */ - if ($("input[name=configSmtpEnable]").is(':checked')) { - $("#configSmtpParam").addClass("disabled"); - $("#configSmtpParam").slideDown(); + if ($("input[name=configAdvancedSmtpEnable]").is(':checked')) { + $("#configAdvancedSmtpParam").addClass("disabled"); + $("#configAdvancedSmtpParam").slideDown(); } else { - $("#configSmtpParam").removeClass("disabled"); - $("#configSmtpParam").slideUp(); + $("#configAdvancedSmtpParam").removeClass("disabled"); + $("#configAdvancedSmtpParam").slideUp(); } /** * Afficher et masquer options Auth */ - if ($("select[name=configSmtpAuth]").val() == true) { - $("#configSmtpAuthParam").addClass("disabled"); - $("#configSmtpAuthParam").slideDown(); + if ($("select[name=configAdvancedSmtpEnable]").val() == true) { + $("#configAdvancedSmtpAuthParam").addClass("disabled"); + $("#configAdvancedSmtpAuthParam").slideDown(); } else { - $("#configSmtpAuthParam").removeClass("disabled"); - $("#configSmtpAuthParam").slideUp(); + $("#configAdvancedSmtpAuthParam").removeClass("disabled"); + $("#configAdvancedSmtpAuthParam").slideUp(); } @@ -72,13 +72,13 @@ $( document).ready(function() { /** * Afficher et masquer options SMTP */ - $("input[name=configSmtpEnable]").on("change", function() { - if ($("input[name=configSmtpEnable]").is(':checked')) { - $("#configSmtpParam").addClass("disabled"); - $("#configSmtpParam").slideDown(); + $("input[name=configAdvancedSmtpEnable]").on("change", function() { + if ($("input[name=configAdvancedSmtpEnable]").is(':checked')) { + $("#configAdvancedSmtpParam").addClass("disabled"); + $("#configAdvancedSmtpParam").slideDown(); } else { - $("#configSmtpParam").removeClass("disabled"); - $("#configSmtpParam").slideUp(); + $("#configAdvancedSmtpParam").removeClass("disabled"); + $("#configAdvancedSmtpParam").slideUp(); } }); @@ -86,13 +86,13 @@ $( document).ready(function() { * Afficher et masquer options Auth */ - $("select[name=configSmtpAuth]").on("change", function() { - if ($("select[name=configSmtpAuth]").val() == true) { - $("#configSmtpAuthParam").addClass("disabled"); - $("#configSmtpAuthParam").slideDown(); + $("select[name=configAdvancedSmtpAuth]").on("change", function() { + if ($("select[name=configAdvancedSmtpAuth]").val() == true) { + $("#configAdvancedSmtpAuthParam").addClass("disabled"); + $("#configAdvancedSmtpAuthParam").slideDown(); } else { - $("#configSmtpAuthParam").removeClass("disabled"); - $("#configSmtpAuthParam").slideUp(); + $("#configAdvancedSmtpAuthParam").removeClass("disabled"); + $("#configAdvancedSmtpAuthParam").slideUp(); } }); diff --git a/core/module/config/view/advanced/advanced.php b/core/module/config/view/advanced/advanced.php index 0d11fe06..48ce0162 100644 --- a/core/module/config/view/advanced/advanced.php +++ b/core/module/config/view/advanced/advanced.php @@ -413,7 +413,7 @@ ]); ?> -
+
-
+