clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove DI::app() dependency again

This commit is contained in:
nupplaPhil 2020-02-01 23:34:50 +01:00
parent 0b309245b1
commit 97e708f2e2
No known key found for this signature in database
GPG Key ID: D8365C3D36B77D90
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/lostpass.php
View File

@ -65,7 +65,7 @@ function lostpass_post(App $a)
Login Name: %3$s', $resetlink, DI::baseUrl(), $user['nickname'])); Login Name: %3$s', $resetlink, DI::baseUrl(), $user['nickname']));
$email = DI::emailer() $email = DI::emailer()
->newSystemMail(DI::app(), (!empty($user['language'])) ? DI::l10n()->withLang($user['language']) : DI::l10n()) ->newSystemMail((!empty($user['language'])) ? DI::l10n()->withLang($user['language']) : DI::l10n())
->withMessage(DI::l10n()->t('Password reset requested at %s', $sitename), $preamble, $body) ->withMessage(DI::l10n()->t('Password reset requested at %s', $sitename), $preamble, $body)
->forUser($user['uid'] ?? 0) ->forUser($user['uid'] ?? 0)
->withRecipient($user['email']) ->withRecipient($user['email'])
@ -157,7 +157,7 @@ function lostpass_generate_password($user)
', DI::baseUrl(), $user['nickname'], $new_password)); ', DI::baseUrl(), $user['nickname'], $new_password));
$email = DI::emailer() $email = DI::emailer()
->newSystemMail(DI::app(), (!empty($user['language'])) ? DI::l10n()->withLang($user['language']) : DI::l10n()) ->newSystemMail((!empty($user['language'])) ? DI::l10n()->withLang($user['language']) : DI::l10n())
->withMessage(DI::l10n()->t('Your password has been changed at %s', $sitename), $preamble, $body) ->withMessage(DI::l10n()->t('Your password has been changed at %s', $sitename), $preamble, $body)
->forUser($user['uid'] ?? 0) ->forUser($user['uid'] ?? 0)
->withRecipient($user['email']) ->withRecipient($user['email'])

2
mod/removeme.php
View File

@ -42,7 +42,7 @@ function removeme_post(App $a)
} }
$email = DI::emailer() $email = DI::emailer()
->newSystemMail(DI::app(), (!empty($admin['language'])) ? DI::l10n()->withLang($admin['language']) : DI::l10n()->withLang('en')) ->newSystemMail((!empty($admin['language'])) ? DI::l10n()->withLang($admin['language']) : DI::l10n()->withLang('en'))
->withMessage(DI::l10n()->t('[Friendica System Notify]') . ' ' . DI::l10n()->t('User deleted their account'), ->withMessage(DI::l10n()->t('[Friendica System Notify]') . ' ' . DI::l10n()->t('User deleted their account'),
DI::l10n()->t('On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups.'), DI::l10n()->t('On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups.'),
DI::l10n()->t('The user id is %d', local_user())) DI::l10n()->t('The user id is %d', local_user()))

4
src/Core/Update.php
View File

@ -264,7 +264,7 @@ class Update
$body = $l10n->t("The error message is\n[pre]%s[/pre]", $error_message); $body = $l10n->t("The error message is\n[pre]%s[/pre]", $error_message);
$email = DI::emailer() $email = DI::emailer()
->newSystemMail(DI::app(), $l10n) ->newSystemMail($l10n)
->withMessage($l10n->t('[Friendica Notify] Database update'), $preamble, $body) ->withMessage($l10n->t('[Friendica Notify] Database update'), $preamble, $body)
->forUser($admin['uid'] ?? 0) ->forUser($admin['uid'] ?? 0)
->withRecipient($admin['email']) ->withRecipient($admin['email'])
@ -300,7 +300,7 @@ class Update
$from_build, $to_build)); $from_build, $to_build));
$email = DI::emailer() $email = DI::emailer()
->newSystemMail(DI::app(), $l10n) ->newSystemMail($l10n)
->withMessage($l10n->t('[Friendica Notify] Database update'), $preamble) ->withMessage($l10n->t('[Friendica Notify] Database update'), $preamble)
->forUser($admin['uid'] ?? 0) ->forUser($admin['uid'] ?? 0)
->withRecipient($admin['email']) ->withRecipient($admin['email'])

4
src/Model/User.php
View File

@ -898,7 +898,7 @@ class User
)); ));
$email = DI::emailer() $email = DI::emailer()
->newSystemMail(DI::app(), DI::l10n()) ->newSystemMail(DI::l10n())
->withMessage(DI::l10n()->t('Registration at %s', $sitename), $body) ->withMessage(DI::l10n()->t('Registration at %s', $sitename), $body)
->forUser($user['uid'] ?? 0) ->forUser($user['uid'] ?? 0)
->withRecipient($user['email']) ->withRecipient($user['email'])
@ -966,7 +966,7 @@ class User
)); ));
$email = DI::emailer() $email = DI::emailer()
->newSystemMail(DI::app(), $l10n) ->newSystemMail($l10n)
->withMessage(DI::l10n()->t('Registration details for %s', $sitename), $preamble, $body) ->withMessage(DI::l10n()->t('Registration details for %s', $sitename), $preamble, $body)
->forUser($user['uid'] ?? 0) ->forUser($user['uid'] ?? 0)
->withRecipient($user['email']) ->withRecipient($user['email'])

2
src/Module/Admin/Users.php
View File

@ -77,7 +77,7 @@ class Users extends BaseAdmin
$body = sprintf($body, DI::baseUrl()->get(), $user['nickname'], $result['password'], DI::config()->get('config', 'sitename')); $body = sprintf($body, DI::baseUrl()->get(), $user['nickname'], $result['password'], DI::config()->get('config', 'sitename'));
$email = DI::emailer() $email = DI::emailer()
->newSystemMail(DI::app(), (!empty($user['language'])) ? DI::l10n()->withLang($user['language']) : DI::l10n()) ->newSystemMail((!empty($user['language'])) ? DI::l10n()->withLang($user['language']) : DI::l10n())
->withMessage(DI::l10n()->t('Registration details for %s', DI::config()->get('config', 'sitename')), $preamble, $body) ->withMessage(DI::l10n()->t('Registration details for %s', DI::config()->get('config', 'sitename')), $preamble, $body)
->forUser($user['uid'] ?? 0) ->forUser($user['uid'] ?? 0)
->withRecipient($user['email']) ->withRecipient($user['email'])