open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Set the data from the template

Browse Source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/6515/head
Joas Schilling 8 years ago
parent c9af36a9ab
commit 3119fd41ce
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
9 changed files with 46 additions and 113 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      apps/sharebymail/lib/ShareByMailProvider.php
  2. 40
      apps/sharebymail/tests/ShareByMailProviderTest.php
  3. 4
      core/Controller/LostController.php
  4. 4
      lib/private/Share20/Manager.php
  5. 4
      settings/Controller/MailSettingsController.php
  6. 10
      settings/Hooks.php
  7. 4
      settings/Mailer/NewUserMailHelper.php
  8. 57
      tests/Core/Controller/LostControllerTest.php
  9. 24
      tests/Settings/Mailer/NewUserMailHelperTest.php

12
apps/sharebymail/lib/ShareByMailProvider.php
Unescape View File

@ -427,9 +427,7 @@ class ShareByMailProvider implements IShareProvider {
$emailTemplate->addFooter();
}
$message->setSubject($emailTemplate->renderSubject());
$message->setPlainBody($emailTemplate->renderText());
$message->setHtmlBody($emailTemplate->renderHtml());
$message->useTemplate($emailTemplate);
$this->mailer->send($message);
}
@ -491,9 +489,7 @@ class ShareByMailProvider implements IShareProvider {
}
$message->setTo([$shareWith]);
$message->setSubject($emailTemplate->renderSubject());
$message->setBody($emailTemplate->renderText(), 'text/plain');
$message->setHtmlBody($emailTemplate->renderHtml());
$message->useTemplate($emailTemplate);
$this->mailer->send($message);
$this->createPasswordSendActivity($share, $shareWith, false);
@ -547,9 +543,7 @@ class ShareByMailProvider implements IShareProvider {
$message->setFrom([$initiatorEMailAddress => $initiatorDisplayName]);
}
$message->setTo([$initiatorEMailAddress => $initiatorDisplayName]);
$message->setSubject($emailTemplate->renderSubject());
$message->setBody($emailTemplate->renderText(), 'text/plain');
$message->setHtmlBody($emailTemplate->renderHtml());
$message->useTemplate($emailTemplate);
$this->mailer->send($message);
$this->createPasswordSendActivity($share, $shareWith, true);

40
apps/sharebymail/tests/ShareByMailProviderTest.php
Unescape View File

@ -835,26 +835,14 @@ class ShareByMailProviderTest extends TestCase {
->expects($this->once())
->method('addFooter')
->with('UnitTestCloud - Testing like 1990');
$message
->expects($this->once())
->method('setSubject')
->willReturn('Mrs. Owner User shared »file.txt« with you');
$template
->expects($this->once())
->method('renderText')
->willReturn('Text Render');
$message
->expects($this->once())
->method('setPlainBody')
->with('Text Render');
$template
->expects($this->once())
->method('renderHtml')
->willReturn('HTML Render');
->method('setSubject')
->with('Mrs. Owner User shared »file.txt« with you');
$message
->expects($this->once())
->method('setHtmlBody')
->with('HTML Render');
->method('useTemplate')
->with($template);
$this->mailer
->expects($this->once())
->method('send')
@ -936,26 +924,14 @@ class ShareByMailProviderTest extends TestCase {
->expects($this->once())
->method('addFooter')
->with('');
$message
->expects($this->once())
->method('setSubject')
->willReturn('Mr. Initiator User shared »file.txt« with you');
$template
->expects($this->once())
->method('renderText')
->willReturn('Text Render');
$message
->expects($this->once())
->method('setPlainBody')
->with('Text Render');
$template
->expects($this->once())
->method('renderHtml')
->willReturn('HTML Render');
->method('setSubject')
->with('Mr. Initiator User shared »file.txt« with you');
$message
->expects($this->once())
->method('setHtmlBody')
->with('HTML Render');
->method('useTemplate')
->with($template);
$this->mailer
->expects($this->once())
->method('send')

4
core/Controller/LostController.php
Unescape View File

@ -328,10 +328,8 @@ class LostController extends Controller {
try {
$message = $this->mailer->createMessage();
$message->setTo([$email => $user->getUID()]);
$message->setSubject($emailTemplate->renderSubject());
$message->setPlainBody($emailTemplate->renderText());
$message->setHtmlBody($emailTemplate->renderHtml());
$message->setFrom([$this->from => $this->defaults->getName()]);
$message->useTemplate($emailTemplate);
$this->mailer->send($message);
} catch (\Exception $e) {
throw new \Exception($this->l10n->t(

4
lib/private/Share20/Manager.php
Unescape View File

@ -750,9 +750,7 @@ class Manager implements IManager {
$emailTemplate->addFooter();
}
$message->setSubject($emailTemplate->renderSubject());
$message->setPlainBody($emailTemplate->renderText());
$message->setHtmlBody($emailTemplate->renderHtml());
$message->useTemplate($emailTemplate);
$this->mailer->send($message);
}

4
settings/Controller/MailSettingsController.php
Unescape View File

@ -159,9 +159,7 @@ class MailSettingsController extends Controller {
$message = $this->mailer->createMessage();
$message->setTo([$email => $displayName]);
$message->setSubject($template->renderSubject());
$message->setHtmlBody($template->renderHtml());
$message->setPlainBody($template->renderText());
$message->useTemplate($template);
$errors = $this->mailer->send($message);
if (!empty($errors)) {
throw new \RuntimeException($this->l10n->t('Email could not be sent. Check your mail server log'));

10
settings/Hooks.php
Unescape View File

@ -132,10 +132,7 @@ class Hooks {
$message = $this->mailer->createMessage();
$message->setTo([$user->getEMailAddress() => $user->getDisplayName()]);
$message->setSubject($template->renderSubject());
$message->setBody($template->renderText(), 'text/plain');
$message->setHtmlBody($template->renderHtml());
$message->useTemplate($template);
$this->mailer->send($message);
}
}
@ -208,10 +205,7 @@ class Hooks {
$message = $this->mailer->createMessage();
$message->setTo([$oldMailAddress => $user->getDisplayName()]);
$message->setSubject($template->renderSubject());
$message->setBody($template->renderText(), 'text/plain');
$message->setHtmlBody($template->renderHtml());
$message->useTemplate($template);
$this->mailer->send($message);
}
}

4
settings/Mailer/NewUserMailHelper.php
Unescape View File

@ -160,10 +160,8 @@ class NewUserMailHelper {
IEMailTemplate $emailTemplate) {
$message = $this->mailer->createMessage();
$message->setTo([$user->getEMailAddress() => $user->getDisplayName()]);
$message->setSubject($emailTemplate->renderSubject());
$message->setHtmlBody($emailTemplate->renderHtml());
$message->setPlainBody($emailTemplate->renderText());
$message->setFrom([$this->fromAddress => $this->themingDefaults->getName()]);
$message->useTemplate($emailTemplate);
$this->mailer->send($message);
}
}

57
tests/Core/Controller/LostControllerTest.php
Unescape View File

@ -324,20 +324,9 @@ class LostControllerTest extends \Test\TestCase {
->with(['test@example.com' => 'ExistingUser']);
$message
->expects($this->at(1))
->method('setSubject')
->with(' password reset');
$message
->expects($this->at(2))
->method('setPlainBody')
->with('text body');
$message
->expects($this->at(3))
->method('setHtmlBody')
->with('HTML body');
$message
->expects($this->at(4))
->method('setFrom')
->with(['lostpassword-noreply@localhost' => null]);
$emailTemplate = $this->createMock(IEMailTemplate::class);
$emailTemplate->expects($this->any())
->method('renderHtml')
@ -345,6 +334,12 @@ class LostControllerTest extends \Test\TestCase {
$emailTemplate->expects($this->any())
->method('renderText')
->willReturn('text body');
$message
->expects($this->at(2))
->method('useTemplate')
->with($emailTemplate);
$this->mailer
->expects($this->at(0))
->method('createEMailTemplate')
@ -407,20 +402,9 @@ class LostControllerTest extends \Test\TestCase {
->with(['test@example.com' => 'ExistingUser']);
$message
->expects($this->at(1))
->method('setSubject')
->with(' password reset');
$message
->expects($this->at(2))
->method('setPlainBody')
->with('text body');
$message
->expects($this->at(3))
->method('setHtmlBody')
->with('HTML body');
$message
->expects($this->at(4))
->method('setFrom')
->with(['lostpassword-noreply@localhost' => null]);
$emailTemplate = $this->createMock(IEMailTemplate::class);
$emailTemplate->expects($this->any())
->method('renderHtml')
@ -428,6 +412,12 @@ class LostControllerTest extends \Test\TestCase {
$emailTemplate->expects($this->any())
->method('renderText')
->willReturn('text body');
$message
->expects($this->at(2))
->method('useTemplate')
->with($emailTemplate);
$this->mailer
->expects($this->at(0))
->method('createEMailTemplate')
@ -484,20 +474,9 @@ class LostControllerTest extends \Test\TestCase {
->with(['test@example.com' => 'ExistingUser']);
$message
->expects($this->at(1))
->method('setSubject')
->with(' password reset');
$message
->expects($this->at(2))
->method('setPlainBody')
->with('text body');
$message
->expects($this->at(3))
->method('setHtmlBody')
->with('HTML body');
$message
->expects($this->at(4))
->method('setFrom')
->with(['lostpassword-noreply@localhost' => null]);
$emailTemplate = $this->createMock(IEMailTemplate::class);
$emailTemplate->expects($this->any())
->method('renderHtml')
@ -505,6 +484,12 @@ class LostControllerTest extends \Test\TestCase {
$emailTemplate->expects($this->any())
->method('renderText')
->willReturn('text body');
$message
->expects($this->at(2))
->method('useTemplate')
->with($emailTemplate);
$this->mailer
->expects($this->at(0))
->method('createEMailTemplate')

24
tests/Settings/Mailer/NewUserMailHelperTest.php
Unescape View File

@ -620,26 +620,18 @@ EOF;
->expects($this->at(0))
->method('setTo')
->with(['recipient@example.com' => 'John Doe']);
$this->defaults
->expects($this->exactly(2))
->method('getName')
->willReturn('TestCloud');
$message
->expects($this->at(1))
->method('setSubject')
->with('Your TestCloud account was created');
$message
->expects($this->at(2))
->method('setHtmlBody')
->with($emailTemplate->renderHtml());
$message
->expects($this->at(3))
->method('setPlainBody')
->with($emailTemplate->renderText());
$message
->expects($this->at(4))
->method('setFrom')
->with(['no-reply@nextcloud.com' => 'TestCloud']);
$message
->expects($this->at(2))
->method('useTemplate')
->with($emailTemplate);
$this->defaults
->expects($this->exactly(1))
->method('getName')
->willReturn('TestCloud');
$this->mailer
->expects($this->once())
->method('createMessage')

Write Preview
Loading…
Cancel
Save