diff options
| author | Josh <josh.t.richards@gmail.com> | 2024-07-12 18:59:45 -0400 |
|---|---|---|
| committer | Robin Appelman <robin@icewind.nl> | 2024-09-16 15:20:29 +0200 |
| commit | 87aa1267a84cef6f8d6bd43956fab2787c80627c (patch) | |
| tree | 75fbb9d77784d3407123b18e030dd0d6dca6e80a /apps/settings | |
| parent | cfed24cb0254caf570b2a520979a83435a677cc8 (diff) | |
| download | nextcloud-server-87aa1267a84cef6f8d6bd43956fab2787c80627c.tar.gz nextcloud-server-87aa1267a84cef6f8d6bd43956fab2787c80627c.zip | |
fix(Mailer): Fix sendmail binary fallbackfix/mailer-binaryfinder-fallback
feat: add debug logging to sendmail binary finder
Signed-off-by: Josh <josh.t.richards@gmail.com>
Diffstat (limited to 'apps/settings')
| -rw-r--r-- | apps/settings/lib/Settings/Admin/Mail.php | 3 | ||||
| -rw-r--r-- | apps/settings/tests/Settings/Admin/MailTest.php | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/apps/settings/lib/Settings/Admin/Mail.php b/apps/settings/lib/Settings/Admin/Mail.php index 0775b50aaa1..a94e3da18fe 100644 --- a/apps/settings/lib/Settings/Admin/Mail.php +++ b/apps/settings/lib/Settings/Admin/Mail.php @@ -6,6 +6,7 @@ namespace OCA\Settings\Settings\Admin; use OCP\AppFramework\Http\TemplateResponse; +use OCP\IBinaryFinder; use OCP\IConfig; use OCP\IL10N; use OCP\Settings\IDelegatedSettings; @@ -32,7 +33,7 @@ class Mail implements IDelegatedSettings { public function getForm() { $parameters = [ // Mail - 'sendmail_is_available' => (bool)\OC_Helper::findBinaryPath('sendmail'), + 'sendmail_is_available' => (bool)\OCP\Server::get(IBinaryFinder::class)->findBinaryPath('sendmail'), 'mail_domain' => $this->config->getSystemValue('mail_domain', ''), 'mail_from_address' => $this->config->getSystemValue('mail_from_address', ''), 'mail_smtpmode' => $this->config->getSystemValue('mail_smtpmode', ''), diff --git a/apps/settings/tests/Settings/Admin/MailTest.php b/apps/settings/tests/Settings/Admin/MailTest.php index 021dbac241b..8ea0ea9bb0c 100644 --- a/apps/settings/tests/Settings/Admin/MailTest.php +++ b/apps/settings/tests/Settings/Admin/MailTest.php @@ -7,6 +7,7 @@ namespace OCA\Settings\Tests\Settings\Admin; use OCA\Settings\Settings\Admin\Mail; use OCP\AppFramework\Http\TemplateResponse; +use OCP\IBinaryFinder; use OCP\IConfig; use OCP\IL10N; use Test\TestCase; @@ -51,7 +52,7 @@ class MailTest extends TestCase { 'settings', 'settings/admin/additional-mail', [ - 'sendmail_is_available' => (bool)\OC_Helper::findBinaryPath('sendmail'), + 'sendmail_is_available' => (bool)\OCP\Server::get(IBinaryFinder::class)->findBinaryPath('sendmail'), 'mail_domain' => 'mx.nextcloud.com', 'mail_from_address' => 'no-reply@nextcloud.com', 'mail_smtpmode' => 'smtp', |