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

ENH Add Exception with list of invilid emails

Browse Source
This commit is contained in:
Sabina Talipova 2023-04-12 10:45:36 +12:00
parent 24766e4e5a
commit 36d3718581
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Tasks/ContentReviewEmails.php
View File

@ -3,6 +3,7 @@
namespace SilverStripe\ContentReview\Tasks; namespace SilverStripe\ContentReview\Tasks;
use Page; use Page;
use RuntimeException;
use SilverStripe\ContentReview\Compatibility\ContentReviewCompatability; use SilverStripe\ContentReview\Compatibility\ContentReviewCompatability;
use SilverStripe\Control\Email\Email; use SilverStripe\Control\Email\Email;
use SilverStripe\Control\HTTPRequest; use SilverStripe\Control\HTTPRequest;
@ -21,11 +22,23 @@ use SilverStripe\View\SSViewer;
*/ */
class ContentReviewEmails extends BuildTask class ContentReviewEmails extends BuildTask
{ {
private array $invalid_emails = [];
/** /**
* @param HTTPRequest $request * @param HTTPRequest $request
* @throws RuntimeException
*/ */
public function run($request) public function run($request)
{ {
if (!$this->isValidEmail($senderEmail = SiteConfig::current_site_config()->ReviewFrom)) {
throw new RuntimeException(
sprintf(
'Provided sender email address is invalid: "%s".',
$senderEmail
)
);
}
$compatibility = ContentReviewCompatability::start(); $compatibility = ContentReviewCompatability::start();
// First grab all the pages with a custom setting // First grab all the pages with a custom setting
@ -41,6 +54,16 @@ class ContentReviewEmails extends BuildTask
} }
ContentReviewCompatability::done($compatibility); ContentReviewCompatability::done($compatibility);
if (is_array($this->invalid_emails) && count($this->invalid_emails) > 0) {
$plural = count($this->invalid_emails) > 1 ? 's are' : ' is';
throw new RuntimeException(
sprintf(
'Provided email' . $plural . ' invalid: "%s".',
implode(', ', $this->invalid_emails)
)
);
}
} }
/** /**
@ -93,8 +116,9 @@ class ContentReviewEmails extends BuildTask
$siteConfig = SiteConfig::current_site_config(); $siteConfig = SiteConfig::current_site_config();
$owner = Member::get()->byID($ownerID); $owner = Member::get()->byID($ownerID);
if (!$this->isValidEmail($owner->Email) if (!$this->isValidEmail($owner->Email)) {
|| !$this->isValidEmail($siteConfig->ReviewFrom)) { $this->invalid_emails[] = $owner->Name . ': ' . $owner->Email;
return; return;
} }
@ -170,13 +194,6 @@ class ContentReviewEmails extends BuildTask
*/ */
protected function isValidEmail(?string $email): bool protected function isValidEmail(?string $email): bool
{ {
if (!$email return (bool) filter_var($email, FILTER_VALIDATE_EMAIL);
|| empty($email)
|| !filter_var($email, FILTER_VALIDATE_EMAIL)
) {
return false;
}
return true;
} }
} }

1
tests/php/ContentReviewNotificationTest.php
View File

@ -150,6 +150,7 @@ class ContentReviewNotificationTest extends SapphireTest
$this->assertFalse($method->invokeArgs($task, [null])); $this->assertFalse($method->invokeArgs($task, [null]));
$this->assertFalse($method->invokeArgs($task, ['broken.email'])); $this->assertFalse($method->invokeArgs($task, ['broken.email']));
$this->assertFalse($method->invokeArgs($task, ['broken@email']));
} }
/** /**