From ef006d00111c8bb2e98bfd322698b78fd94a50af Mon Sep 17 00:00:00 2001 From: Marc-Antoine Thevenet Date: Thu, 29 Jun 2023 21:44:48 +0200 Subject: [PATCH 1/4] Update languages.yaml (#169) ## Easy fix Fr typo fix --- languages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages.yaml b/languages.yaml index 4cb044c..fd77b4b 100644 --- a/languages.yaml +++ b/languages.yaml @@ -130,7 +130,7 @@ fr: QUEUE_FLUSH_MSG_LIMIT: "Messages par Flush" QUEUE_FLUSH_MSG_LIMIT_APPEND: "Messages" QUEUE_FLUSH_TIME_LIMIT: "Délai de Flush" - QUEUE_FLUSH_TIME_LIMIT_APPEND: "Seconds" + QUEUE_FLUSH_TIME_LIMIT_APPEND: "Secondes" hr: PLUGIN_EMAIL: From 51ec377bd595bc385f89cb68e9261e9c3211b337 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Thevenet Date: Thu, 29 Jun 2023 21:45:35 +0200 Subject: [PATCH 2/4] Update languages.yaml (#172) ##EASY FIX Fr t9n update Co-authored-by: Andy Miller <1084697+rhukster@users.noreply.github.com> --- languages.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/languages.yaml b/languages.yaml index fd77b4b..9f1fc7f 100644 --- a/languages.yaml +++ b/languages.yaml @@ -78,6 +78,7 @@ fr: PLUGIN_EMAIL: MAIL_ENGINE: "Moteur de messagerie" MAIL_ENGINE_DISABLED: "Désactivé" + MAIL_ENGINE_DESC: "NOTE : Si vous sélectionnez un moteur fourni par un autre plugin, vous devez configurer les options dans ce même plugin." CONTENT_TYPE: "Type de contenu" CONTENT_TYPE_PLAIN_TEXT: "Texte brut" CHARSET: "Jeu de caractères" @@ -131,6 +132,8 @@ fr: QUEUE_FLUSH_MSG_LIMIT_APPEND: "Messages" QUEUE_FLUSH_TIME_LIMIT: "Délai de Flush" QUEUE_FLUSH_TIME_LIMIT_APPEND: "Secondes" + EMAIL_FORMAT: "Utilisez le format `addr` : `email@adresse.org` ou le format `name-addr` : `Votre nom `. Séparer par des virgules pour plusieurs adresses." + hr: PLUGIN_EMAIL: From f04292aab52b5a091290ce041980e96a0f56408e Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Mon, 10 Jul 2023 15:59:31 -0600 Subject: [PATCH 3/4] fix for email file attachments using stream --- CHANGELOG.md | 6 ++++++ email.php | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b47ce53..d6d0119 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v4.0.4 +## mm/dd/2023 + +1. [](#bugfix) + * Fix for email file attachments using stream + # v4.0.3 ## 06/29/2023 diff --git a/email.php b/email.php index b96ff36..da59047 100644 --- a/email.php +++ b/email.php @@ -125,6 +125,7 @@ protected function sendFormEmail($form, $params, $vars) { // Build message $message = $this->email->buildMessage($params, $vars); + $locator = $this->grav['locator']; if (isset($params['attachments'])) { $filesToAttach = (array)$params['attachments']; @@ -135,9 +136,11 @@ protected function sendFormEmail($form, $params, $vars) if (isset($fileValues['file'])) { $filename = $fileValues['file']; } else { - $filename = ROOT_DIR . $fileValues['path']; + $filename = $fileValues['path']; } + $filename = $locator->findResource($filename, true, true); + try { $message->attachFromPath($filename); } catch (\Exception $e) { From 856426d0bc02e5fb8cc9abbc02983c35b46bbd7b Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Mon, 10 Jul 2023 16:04:01 -0600 Subject: [PATCH 4/4] prepare for release --- CHANGELOG.md | 2 +- blueprints.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6d0119..78971ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # v4.0.4 -## mm/dd/2023 +## 07/10/2023 1. [](#bugfix) * Fix for email file attachments using stream diff --git a/blueprints.yaml b/blueprints.yaml index 442a62c..d3a66a0 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,7 +1,7 @@ name: Email slug: email type: plugin -version: 4.0.3 +version: 4.0.4 testing: false description: Enables the emailing system for Grav icon: envelope