tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 17:05:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #986 from creative-commoners/pulls/5.6/trim-recipient-email

Browse Source 
FIX Trim recipient email addresses before write
This commit is contained in:
Steve Boyd 2020-07-15 09:01:24 +12:00 committed by GitHub
commit de5a671645
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
code/Model/Recipient/EmailRecipient.php
View File

@ -116,6 +116,17 @@ class EmailRecipient extends DataObject
DB::query("UPDATE \"UserDefinedForm_EmailRecipient\" SET \"FormClass\" = 'Page' WHERE \"FormClass\" IS NULL"); DB::query("UPDATE \"UserDefinedForm_EmailRecipient\" SET \"FormClass\" = 'Page' WHERE \"FormClass\" IS NULL");
} }
public function onBeforeWrite()
{
parent::onBeforeWrite();
// email addresses have trim() applied to them during validation for a slightly nicer UX
// apply trim() here too before saving to the database
$this->EmailAddress = trim($this->EmailAddress);
$this->EmailFrom = trim($this->EmailFrom);
$this->EmailReplyTo = trim($this->EmailReplyTo);
}
public function summaryFields() public function summaryFields()
{ {
$fields = parent::summaryFields(); $fields = parent::summaryFields();

12
tests/Model/Recipient/EmailRecipientTest.php
View File

@ -38,4 +38,16 @@ class EmailRecipientTest extends SapphireTest
$recipient->EmailFrom = 'test@example.com'; $recipient->EmailFrom = 'test@example.com';
$recipient->write(); $recipient->write();
} }
public function testEmailAddressesTrimmed()
{
$recipient = new EmailRecipient();
$recipient->EmailAddress = 'test1@example.com ';
$recipient->EmailFrom = 'test2@example.com ';
$recipient->EmailReplyTo = 'test3@example.com ';
$recipient->write();
$this->assertSame('test1@example.com', $recipient->EmailAddress);
$this->assertSame('test2@example.com', $recipient->EmailFrom);
$this->assertSame('test3@example.com', $recipient->EmailReplyTo);
}
} }