mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix existing usages 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2018-02-15 12:18:51 +01:00
parent 350e38396f
commit 339e320064
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/sharebymail/lib/ShareByMailProvider.php
View File

@ -404,7 +404,7 @@ class ShareByMailProvider implements IShareProvider {
$text = $this->l->t('%s shared »%s« with you.', [$initiatorDisplayName, $filename]); $text = $this->l->t('%s shared »%s« with you.', [$initiatorDisplayName, $filename]);
$emailTemplate->addBodyText( $emailTemplate->addBodyText(
$text . ' ' . $this->l->t('Click the button below to open it.'), htmlspecialchars($text . ' ' . $this->l->t('Click the button below to open it.')),
$text $text
); );
$emailTemplate->addBodyButton( $emailTemplate->addBodyButton(
@ -476,7 +476,7 @@ class ShareByMailProvider implements IShareProvider {
$emailTemplate->setSubject($this->l->t('Password to access »%s« shared to you by %s', [$filename, $initiatorDisplayName])); $emailTemplate->setSubject($this->l->t('Password to access »%s« shared to you by %s', [$filename, $initiatorDisplayName]));
$emailTemplate->addHeader(); $emailTemplate->addHeader();
$emailTemplate->addHeading($this->l->t('Password to access »%s«', [$filename]), false); $emailTemplate->addHeading($this->l->t('Password to access »%s«', [$filename]), false);
$emailTemplate->addBodyText($htmlBodyPart, $plainBodyPart); $emailTemplate->addBodyText(htmlspecialchars($htmlBodyPart), $plainBodyPart);
$emailTemplate->addBodyText($this->l->t('It is protected with the following password: %s', [$password])); $emailTemplate->addBodyText($this->l->t('It is protected with the following password: %s', [$password]));
// The "From" contains the sharers name // The "From" contains the sharers name

4
core/Controller/LostController.php
View File

@ -321,12 +321,12 @@ class LostController extends Controller {
$emailTemplate->addHeading($this->l10n->t('Password reset')); $emailTemplate->addHeading($this->l10n->t('Password reset'));
$emailTemplate->addBodyText( $emailTemplate->addBodyText(
$this->l10n->t('Click the following button to reset your password. If you have not requested the password reset, then ignore this email.'), htmlspecialchars($this->l10n->t('Click the following button to reset your password. If you have not requested the password reset, then ignore this email.')),
$this->l10n->t('Click the following link to reset your password. If you have not requested the password reset, then ignore this email.') $this->l10n->t('Click the following link to reset your password. If you have not requested the password reset, then ignore this email.')
); );
$emailTemplate->addBodyButton( $emailTemplate->addBodyButton(
$this->l10n->t('Reset your password'), htmlspecialchars($this->l10n->t('Reset your password')),
$link, $link,
false false
); );

2
lib/private/Share20/Manager.php
View File

@ -735,7 +735,7 @@ class Manager implements IManager {
$text = $l->t('%s shared »%s« with you.', [$initiatorDisplayName, $filename]); $text = $l->t('%s shared »%s« with you.', [$initiatorDisplayName, $filename]);
$emailTemplate->addBodyText( $emailTemplate->addBodyText(
$text . ' ' . $l->t('Click the button below to open it.'), htmlspecialchars($text . ' ' . $l->t('Click the button below to open it.')),
$text $text
); );
$emailTemplate->addBodyButton( $emailTemplate->addBodyButton(