bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Fix indents

Browse source
This commit is contained in:
nupplaPhil 2020-02-02 09:22:30 +01:00
parent 6700467ed4
commit 262c94f12f
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
5 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mod/lostpass.php
View file

@ -65,11 +65,11 @@ 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((!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'])
->build(); ->build();
DI::emailer()->send($email); DI::emailer()->send($email);
DI::baseUrl()->redirect(); DI::baseUrl()->redirect();

15
mod/removeme.php
View file

@ -42,13 +42,14 @@ function removeme_post(App $a)
} }
$email = DI::emailer() $email = DI::emailer()
->newSystemMail((!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('On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups.'), DI::l10n()->t('[Friendica System Notify]') . ' ' . DI::l10n()->t('User deleted their account'),
DI::l10n()->t('The user id is %d', local_user())) DI::l10n()->t('On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups.'),
->forUser($admin['uid'] ?? 0) DI::l10n()->t('The user id is %d', local_user()))
->withRecipient($admin['email']) ->forUser($admin['uid'] ?? 0)
->build(); ->withRecipient($admin['email'])
->build();
DI::emailer()->send($email); DI::emailer()->send($email);
} }

20
src/Core/Update.php
View file

@ -264,11 +264,11 @@ 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($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'])
->build(); ->build();
DI::emailer()->send($email); DI::emailer()->send($email);
} }
@ -300,11 +300,11 @@ class Update
$from_build, $to_build)); $from_build, $to_build));
$email = DI::emailer() $email = DI::emailer()
->newSystemMail($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'])
->build(); ->build();
DI::emailer()->send($email); DI::emailer()->send($email);
} }
} }

20
src/Model/User.php
View file

@ -898,11 +898,11 @@ class User
)); ));
$email = DI::emailer() $email = DI::emailer()
->newSystemMail(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'])
->build(); ->build();
return DI::emailer()->send($email); return DI::emailer()->send($email);
} }
@ -966,11 +966,11 @@ class User
)); ));
$email = DI::emailer() $email = DI::emailer()
->newSystemMail($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'])
->build(); ->build();
return DI::emailer()->send($email); return DI::emailer()->send($email);
} }

10
src/Module/Admin/Users.php
View file

@ -77,11 +77,11 @@ 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((!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'])
->build(); ->build();
return DI::emailer()->send($email); return DI::emailer()->send($email);
} }