Skip to content

fix: link SES mailbox add-on guidance #1441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
superdav42 merged 2 commits into from
Jun 16, 2026
Merged

fix: link SES mailbox add-on guidance #1441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff2784b
fix: link SES mailbox add-on guidance
superdav42 Jun 16, 2026
5f7d07a
fix: correct SES email accounts add-on typo
superdav42 Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 41 additions & 13 deletions inc/integrations/providers/amazon-ses/class-amazon-ses-transactional-email.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,17 @@ public function get_explainer_lines(): array {

return [
'will' => [
'intercept_wp_mail' => __('Intercept wp_mail() calls and route them through Amazon SES using the current site\'s domain as the from-address', 'ultimate-multisite'),
'domain_verify' => __('Automatically initiate domain verification in SES when a new domain is added to the network', 'ultimate-multisite'),
'domain_cleanup' => __('Optionally remove the SES email identity when a domain is removed from the network', 'ultimate-multisite'),
'intercept_wp_mail' => __('Intercept wp_mail() calls and route them through Amazon SES using the current site\'s domain as the from-address', 'ultimate-multisite'),
'domain_verify' => __('Automatically initiate domain verification in SES when a new domain is added to the network', 'ultimate-multisite'),
'domain_cleanup' => __('Optionally remove the SES email identity when a domain is removed from the network', 'ultimate-multisite'),
],
'will_not' => [
'mailbox_provision' => __('Provision mailboxes or IMAP/POP3 accounts (use the Email Selling capability for that)', 'ultimate-multisite'),
'dns_auto_create' => __('Automatically create DNS records (you must add the provided SPF/DKIM records to your DNS manually, unless a supported DNS provider is configured)', 'ultimate-multisite'),
'mailbox_provision' => sprintf(
/* translators: %s is the Ultimate Multisite Email Accounts add-on product URL. */
__('Provision mailboxes or IMAP/POP3 accounts <a href="%s">Install Email Accounts Add-on for that</a>', 'ultimate-multisite'),
esc_url('https://ultimatemultisite.com/product/ultimate-multisite-emails/')
),
'dns_auto_create' => __('Automatically create DNS records (you must add the provided SPF/DKIM records to your DNS manually, unless a supported DNS provider is configured)', 'ultimate-multisite'),
],
];
}
Expand Down Expand Up @@ -124,14 +128,14 @@ private function get_ses(): Amazon_SES_Integration {
*
* @since 2.5.0
*
* @param null|bool $return Short-circuit return value (null to proceed normally).
* @param array $atts wp_mail() arguments: to, subject, message, headers, attachments.
* @param null|bool $short_circuit Short-circuit return value (null to proceed normally).
* @param array $atts wp_mail() arguments: to, subject, message, headers, attachments.
* @return bool|null True on success, false on failure, null to fall through to default.
*/
public function intercept_wp_mail($return, array $atts) {
public function intercept_wp_mail($short_circuit, array $atts) {

if (null !== $return) {
return $return;
if (null !== $short_circuit) {
return $short_circuit;
}

$to = $atts['to'];
Expand Down Expand Up @@ -307,14 +311,17 @@ public function on_domain_removed(string $domain, int $site_id): void {

/**
* {@inheritdoc}
*
* @param string $domain The domain name to verify.
* @return array Verification result with DNS records when available.
*/
public function verify_domain(string $domain): array {

$result = $this->get_ses()->ses_api_call(
'identities',
'POST',
[
'EmailIdentity' => $domain,
'EmailIdentity' => $domain,
'DkimSigningAttributes' => [
'NextSigningKeyLength' => 'RSA_2048_BIT',
],
Expand All @@ -338,6 +345,9 @@ public function verify_domain(string $domain): array {

/**
* {@inheritdoc}
*
* @param string $domain The domain name to check.
* @return array Verification status result.
*/
public function get_domain_verification_status(string $domain): array {

Expand Down Expand Up @@ -365,6 +375,9 @@ public function get_domain_verification_status(string $domain): array {

/**
* {@inheritdoc}
*
* @param string $domain The domain name to fetch DNS records for.
* @return array DNS records result.
*/
public function get_domain_dns_records(string $domain): array {

Expand All @@ -389,6 +402,13 @@ public function get_domain_dns_records(string $domain): array {

/**
* {@inheritdoc}
*
* @param string $from Sender email address.
* @param string $to Recipient email address.
* @param string $subject Email subject.
* @param string $body Email body.
* @param array $headers Optional email headers.
* @return array Send result.
*/
public function send_email(string $from, string $to, string $subject, string $body, array $headers = []): array {

Expand Down Expand Up @@ -427,6 +447,10 @@ public function send_email(string $from, string $to, string $subject, string $bo

/**
* {@inheritdoc}
*
* @param string $domain Domain name to fetch statistics for.
* @param string $period Reporting period.
* @return array Sending statistics result.
*/
public function get_sending_statistics(string $domain, string $period = '24h'): array {

Expand Down Expand Up @@ -456,6 +480,10 @@ public function get_sending_statistics(string $domain, string $period = '24h'):

/**
* {@inheritdoc}
*
* @param string $domain Domain name to set quota for.
* @param int $max_per_day Maximum messages allowed per day.
* @return array Quota update result.
*/
public function set_sending_quota(string $domain, int $max_per_day): array {

Expand Down Expand Up @@ -543,8 +571,8 @@ private function parse_mail_headers($headers): array {
}

[$name, $value] = explode(':', $header, 2);
$name = strtolower(trim($name));
$value = trim($value);
$name = strtolower(trim($name));
$value = trim($value);

switch ($name) {
case 'from':
Expand Down
5 changes: 2 additions & 3 deletions views/wizards/host-integrations/activation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

<li class="wu-flex wu-content-center wu-py-2 wu-px-4 wu-bg-gray-100 wu-border-t-0 wu-border-solid wu-border-l-0 wu-border-r-0 wu-border-b wu-border-gray-300 wu-m-0">
<span class="dashicons dashicons-yes-alt wu-text-green-400 wu-self-center wu-mr-2"></span>
<span><?php echo esc_html($line); ?></span>
<span><?php echo wp_kses($line, wu_kses_allowed_html()); ?></span>
</li>

<?php endforeach; ?>
Expand All @@ -65,7 +65,7 @@

<li class="wu-flex wu-content-center wu-py-2 wu-px-4 wu-bg-gray-100 wu-border-t-0 wu-border-solid wu-border-l-0 wu-border-r-0 wu-border-b wu-border-gray-300 wu-m-0">
<span class="dashicons dashicons-dismiss wu-text-red-400 wu-self-center wu-mr-2"></span>
<span><?php echo esc_html($line); ?></span>
<span><?php echo wp_kses($line, wu_kses_allowed_html()); ?></span>
</li>

<?php endforeach; ?>
Expand Down Expand Up @@ -109,4 +109,3 @@

</div>
<!-- End Submit Box -->

Loading