Skip to content

[stable23] Don't use plain URL on the email subject #32247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 1 commit into from
May 16, 2022
Merged

[stable23] Don't use plain URL on the email subject #32247

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions apps/settings/lib/Hooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

use OCA\Settings\Activity\Provider;
use OCP\Activity\IManager as IActivityManager;
use OCP\Defaults;
use OCP\IConfig;
use OCP\IGroupManager;
use OCP\IURLGenerator;
Expand Down Expand Up @@ -55,6 +56,8 @@ class Hooks {
protected $config;
/** @var IFactory */
protected $languageFactory;
/** @var Defaults */
protected $defaults;

public function __construct(IActivityManager $activityManager,
IGroupManager $groupManager,
Expand All @@ -63,7 +66,8 @@ public function __construct(IActivityManager $activityManager,
IURLGenerator $urlGenerator,
IMailer $mailer,
IConfig $config,
IFactory $languageFactory) {
IFactory $languageFactory,
Defaults $defaults) {
$this->activityManager = $activityManager;
$this->groupManager = $groupManager;
$this->userManager = $userManager;
Expand All @@ -72,6 +76,7 @@ public function __construct(IActivityManager $activityManager,
$this->mailer = $mailer;
$this->config = $config;
$this->languageFactory = $languageFactory;
$this->defaults = $defaults;
}

/**
Expand All @@ -93,6 +98,7 @@ public function onChangePassword($uid) {
->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);
Expand Down Expand Up @@ -131,7 +137,7 @@ public function onChangePassword($uid) {
'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.'));
Expand Down