From 3ac87753908875fa43bb5eda93dedd22baba6c0e Mon Sep 17 00:00:00 2001 From: Joschua Becker Date: Fri, 21 Jun 2024 06:23:34 +0200 Subject: [PATCH] fix: added missing mailer-options var --- src/owa/README.md | 9 ++++++++- src/owa/mail.php | 51 +++++++++++++++++++++++++---------------------- 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/src/owa/README.md b/src/owa/README.md index 7894162..3a32f1e 100644 --- a/src/owa/README.md +++ b/src/owa/README.md @@ -60,7 +60,7 @@ services: define('OWA_AUTH_KEY', 'yourauthkeygoeshere'); define('OWA_AUTH_SALT', 'yourauthsaltgoeshere'); define('OWA_PUBLIC_URL', 'http://domain/path/to/owa/'); - define('OWA_MAILER_HOST', 'ssl://your_smtp_host'); + define('OWA_MAILER_HOST', 'your_smtp_host'); define('OWA_MAILER_PORT', 465); define('OWA_MAILER_USE_SMTP', true); define('OWA_MAILER_SMTP_AUTH', true); @@ -68,6 +68,13 @@ services: define('OWA_MAILER_PASSWORD', 'your_smtp_password'); define('OWA_MAILER_FROM_ADDRESS', 'owa@yourdomain.com'); define('OWA_MAILER_FROM_NAME', 'OWA Server'); + define('OWA_MAILER_OPTIONS', array( + 'ssl' => [ + 'verify_peer' => true, + 'verify_depth' => 3, + 'allow_self_signed' => false, + ], + )); ?> volumes: diff --git a/src/owa/mail.php b/src/owa/mail.php index 0704f7e..c6aa8aa 100644 --- a/src/owa/mail.php +++ b/src/owa/mail.php @@ -1,24 +1,27 @@ - if (defined('OWA_MAILER_HOST')) { - $this->set('base', 'mailer-host', OWA_MAILER_HOST); - } - if (defined('OWA_MAILER_PORT')) { - $this->set('base', 'mailer-port', OWA_MAILER_PORT); - } - if (defined('OWA_MAILER_USE_SMTP')) { - $this->set('base', 'mailer-use-smtp', OWA_MAILER_USE_SMTP); - } - if (defined('OWA_MAILER_SMTP_AUTH')) { - $this->set('base', 'mailer-smtpAuth', OWA_MAILER_SMTP_AUTH); - } - if (defined('OWA_MAILER_USERNAME')) { - $this->set('base', 'mailer-username', OWA_MAILER_USERNAME); - } - if (defined('OWA_MAILER_PASSWORD')) { - $this->set('base', 'mailer-password', OWA_MAILER_PASSWORD); - } - if (defined('OWA_MAILER_FROM_ADDRESS')) { - $this->set('base', 'mailer-from', OWA_MAILER_FROM_ADDRESS); - } - if (defined('OWA_MAILER_FROM_NAME')) { - $this->set('base', 'mailer-fromName', OWA_MAILER_FROM_NAME); - } + if (defined('OWA_MAILER_HOST')) { + $this->set('base', 'mailer-host', OWA_MAILER_HOST); + } + if (defined('OWA_MAILER_PORT')) { + $this->set('base', 'mailer-port', OWA_MAILER_PORT); + } + if (defined('OWA_MAILER_USE_SMTP')) { + $this->set('base', 'mailer-use-smtp', OWA_MAILER_USE_SMTP); + } + if (defined('OWA_MAILER_SMTP_AUTH')) { + $this->set('base', 'mailer-smtpAuth', OWA_MAILER_SMTP_AUTH); + } + if (defined('OWA_MAILER_USERNAME')) { + $this->set('base', 'mailer-username', OWA_MAILER_USERNAME); + } + if (defined('OWA_MAILER_PASSWORD')) { + $this->set('base', 'mailer-password', OWA_MAILER_PASSWORD); + } + if (defined('OWA_MAILER_FROM_ADDRESS')) { + $this->set('base', 'mailer-from', OWA_MAILER_FROM_ADDRESS); + } + if (defined('OWA_MAILER_FROM_NAME')) { + $this->set('base', 'mailer-fromName', OWA_MAILER_FROM_NAME); + } + if (defined('OWA_MAILER_OPTIONS')) { + $this->set('base', 'mailer-options', OWA_MAILER_OPTIONS); + }