Don't use plain URL on the subject

Many servers classify emails with plain URLs on subject as spam, or can event reject/discard it completely. Don't use it and display Instance Name instead.

`550 5.2.0 GIuMngdpZqS9h Mail rejected. OFR_506 [506]`

diff --git a/apps/settings/lib/Hooks.php b/apps/settings/lib/Hooks.php
index 4f005272b93a69c231790b9591942e1c612b961f..b7b78c49b121f495acee4cd995255aad300b7cda 100644 (file)
--- a/apps/settings/lib/Hooks.php
+++ b/apps/settings/lib/Hooks.php
@@ -28,6 +28,7 @@ namespace OCA\Settings;
 
 use OCA\Settings\Activity\Provider;
 use OCP\Activity\IManager as IActivityManager;
+use OCP\Defaults;
 use OCP\IConfig;
 use OCP\IGroupManager;
 use OCP\IURLGenerator;
@@ -55,6 +56,8 @@ class Hooks {
        protected $config;
        /** @var IFactory */
        protected $languageFactory;
+       /** @var Defaults */
+       protected $defaults;
 
        public function __construct(IActivityManager $activityManager,
                                                                IGroupManager $groupManager,
@@ -63,7 +66,8 @@ class Hooks {
                                                                IURLGenerator $urlGenerator,
                                                                IMailer $mailer,
                                                                IConfig $config,
-                                                               IFactory $languageFactory) {
+                                                               IFactory $languageFactory,
+                                                               Defaults $defaults) {
                $this->activityManager = $activityManager;
                $this->groupManager = $groupManager;
                $this->userManager = $userManager;
@@ -72,6 +76,7 @@ class Hooks {
                $this->mailer = $mailer;
                $this->config = $config;
                $this->languageFactory = $languageFactory;
+               $this->defaults = $defaults;
        }
 
        /**
@@ -93,6 +98,7 @@ class Hooks {
                        ->setType('personal_settings')
                        ->setAffectedUser($user->getUID());
 
+               $instanceName = $this->defaults->getName();
                $instanceUrl = $this->urlGenerator->getAbsoluteURL('/');
                $language = $this->languageFactory->getUserLanguage($user);
                $l = $this->languageFactory->get('settings', $language);
@@ -131,7 +137,7 @@ class Hooks {
                                'instanceUrl' => $instanceUrl,
                        ]);
 
-                       $template->setSubject($l->t('Password for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
+                       $template->setSubject($l->t('Password for %1$s changed on %2$s', [$user->getDisplayName(), $instanceName]));
                        $template->addHeader();
                        $template->addHeading($l->t('Password changed for %s', [$user->getDisplayName()]), false);
                        $template->addBodyText($text . ' ' . $l->t('If you did not request this, please contact an administrator.'));