Changeset 3795449

mailhawk/tags/1.5.2/admin/admin.php

-              r3794810
+              r3795449
 use function MailHawk\dismiss_notice;
 use function MailHawk\get_array_var;
+use function MailHawk\get_test_email;
+use function MailHawk\set_next_alt_body;
 use function MailHawk\get_dismissible_notices;
 use function MailHawk\get_hostname;
 …
+                }
+                $to      = sanitize_email( get_post_var( 'to_address' ) );
+                $subject = sanitize_text_field( get_post_var( 'subject' ) );
+                $body    = sanitize_textarea_field( get_post_var( 'content' ) );
+                $this->test_data['to']      = $to;
+                $this->test_data['subject'] = $subject;
+                $this->test_data['body']    = $body;
+                $to   = sanitize_email( get_post_var( 'to_address' ) );
+                $from = sanitize_email( get_post_var( 'from_address' ) );
+                $this->test_data['to']   = $to;
+                $this->test_data['from'] = $from;
                 if ( ! $to ) {
 …
                 add_action( 'wp_mail_failed', [ $this, 'maybe_email_failed' ] );
+                $success = wp_mail( $to, $subject, $body, [
+                        'sender' => 'app@mailhawk.io'
+                ] );
+                // Always the same email, what is being tested is whether it arrives and where
+                $email   = get_test_email( $to, $from );
+                $headers = [ 'Content-Type: text/html' ];
+                // From the address that was picked, with the default from name. Without one it is the default from address.
+                if ( $from ) {
+                        $name      = (string) get_option( 'mailhawk_default_from_name' );
+                        $headers[] = $name ? sprintf( 'From: %s <%s>', $name, $from ) : sprintf( 'From: %s', $from );
+                }
+                $alt_body = set_next_alt_body( $email['text'] );
+                $success = wp_mail( $to, $email['subject'], $email['html'], $headers );
+                remove_action( 'phpmailer_init', $alt_body, 99 );
                 if ( $success ) {
 …
                 wp_localize_script( 'mailhawk-admin', 'MailHawkConnect', [
                         'connecting_text' => '<span class="dashicons dashicons-admin-generic"></span>' . __( 'Connecting You To MailHawk...', 'mailhawk' )
+                ] );
+                // What the DNS screen says when a name is copied
+                wp_localize_script( 'mailhawk-admin', 'MailHawkDns', [
+                        'host_copied'     => __( 'Host copied', 'mailhawk' ),
+                        'hostname_copied' => __( 'Full hostname copied', 'mailhawk' ),
                 ] );
 …
             <p>
                                 <?php if ( $suspension['reason'] ) : ?>
+                                        <?php printf( __( '<b>Attention:</b> MailHawk has suspended your account, so email from this site is not being sent. The reason given: %s', 'mailhawk' ), esc_html( $suspension['reason'] ) ); ?>
+                                        <?php
+                                        /* translators: %s: the reason MailHawk gave for suspending the account */
+                                        printf( __( '<b>Attention:</b> MailHawk has suspended your account, so email from this site is not being sent. Reason: %s', 'mailhawk' ), esc_html( $suspension['reason'] ) );
+                                        ?>
                                 <?php else : ?>
                                         <?php _e( '<b>Attention:</b> It looks like your account has been suspended. To continue sending email you must reactivate your account.', 'mailhawk' ); ?>
                                 <?php endif; ?>
-                                <?php if ( $since ) : ?>
-                                        <?php printf( esc_html__( 'Suspended since %s.', 'mailhawk' ), esc_html( $since ) ); ?>
-                                <?php endif; ?>
-                                <?php if ( 'organization' === $suspension['scope'] ) : ?>
-                                        <?php _e( 'The whole MailHawk account is suspended, so none of its sites can send email.', 'mailhawk' ); ?>
-                                <?php endif; ?>
             </p>
+                        <?php if ( $since || 'organization' === $suspension['scope'] ) : ?>
+                <p>
+                                        <?php if ( $since ) : ?>
+                                                <?php
+                                                /* translators: %s: date and time the account was suspended */
+                                                printf( esc_html__( 'Suspended since %s.', 'mailhawk' ), esc_html( $since ) );
+                                                ?>
+                                        <?php endif; ?>
+                                        <?php if ( 'organization' === $suspension['scope'] ) : ?>
+                                                <?php _e( 'The whole MailHawk account is suspended, so none of its sites can send email.', 'mailhawk' ); ?>
+                                        <?php endif; ?>
+                </p>
+                        <?php endif; ?>
             <p>
                 <a href="<?php echo esc_url( mailhawk_account_url() ); ?>" target="_blank" rel="noopener"
 …
                 ?>
         <div class="notice notice-success is-dismissible">
+            <p><?php printf( __( 'We sent a test email to %s.', 'mailhawk' ), "<code>" . esc_html( get_array_var( $this->test_data, 'to' ) ) . "</code>" ); ?></p>
+            <p><?php
+                                if ( get_array_var( $this->test_data, 'from' ) ) {
+                                        /* translators: 1: recipient of the test email, 2: the address it was sent from */
+                                        printf( __( 'We sent a test email to %1$s from %2$s.', 'mailhawk' ), "<code>" . esc_html( get_array_var( $this->test_data, 'to' ) ) . "</code>", "<code>" . esc_html( get_array_var( $this->test_data, 'from' ) ) . "</code>" );
+                                } else {
+                                        /* translators: %s: recipient of the test email */
+                                        printf( __( 'We sent a test email to %s.', 'mailhawk' ), "<code>" . esc_html( get_array_var( $this->test_data, 'to' ) ) . "</code>" );
+                                }
+                                ?></p>
         </div>
                 <?php

mailhawk/tags/1.5.2/admin/views/dns-single.php

-              r3788980
+              r3795449
 use MailHawk\Api\Postal\Domains;
 use function MailHawk\mailhawk_admin_page;
+use function MailHawk\get_dns_instructions;
+use function MailHawk\get_dns_record_names;
+use function MailHawk\is_maybe_subdomain;
 use function MailHawk\get_spf_record;
 use function MailHawk\get_url_var;
 …
         <?php endif; ?>
+        <?php
+        // The same pair for every record: what goes in the Host or Name field, and the hostname it ends up as
+        $dkim_names        = get_dns_record_names( $domain->dkim->dkim_record_name, $domain->name );
+        $return_path_names = get_dns_record_names( $domain->return_path->return_path_domain, $domain->name );
+        $spf_names         = get_dns_record_names( '@', $domain->name );
+        /**
+         * The full hostname in one pill, with the host inside it as a pill of its own. The host copies just the host, the
+         * rest of it copies the full hostname.
+         *
+         * @param array $names
+         */
+        $name_fields = function ( $names ) use ( $domain ) {
+                // The domain itself has no part before the domain, so it is shown after the @
+                $rest = '@' === $names['host'] ? strtolower( $domain->name ) : substr( $names['hostname'], strlen( $names['host'] ) );
+                ?>
+        <div class="mailhawk-dns-name code" role="button" tabindex="0"
+             data-copy="<?php echo esc_attr( $names['hostname'] ); ?>"
+             title="<?php esc_attr_e( 'Copy the full hostname', 'mailhawk' ); ?>"
+             aria-label="<?php echo esc_attr( sprintf(
+                                 /* translators: %s: the full hostname of a DNS record */
+                                 __( 'Copy the full hostname %s', 'mailhawk' ), $names['hostname'] ) ); ?>">
+            <button type="button" class="mailhawk-dns-host"
+                    data-copy="<?php echo esc_attr( $names['host'] ); ?>"
+                    title="<?php esc_attr_e( 'Copy the host', 'mailhawk' ); ?>"
+                    aria-label="<?php echo esc_attr( sprintf(
+                                                /* translators: %s: the host of a DNS record, relative to the domain */
+                                                __( 'Copy the host %s', 'mailhawk' ), $names['host'] ) ); ?>"><?php echo esc_html( $names['host'] ); ?></button>
+            <span class="mailhawk-dns-rest<?php echo '@' === $names['host'] ? ' is-domain' : ''; ?>"><?php echo esc_html( $rest ); ?></span>
+            <span class="mailhawk-dns-copied" aria-live="polite"></span>
+            <span class="dashicons dashicons-admin-page" aria-hidden="true"></span>
+        </div>
+                <?php
+        };
+        /**
+         * A pill like the name, without a part of its own: the whole of it copies the value
+         *
+         * @param string $value
+         * @param string $label what the value is, for a screen reader
+         */
+        $copy_field = function ( $value, $label ) {
+                ?>
+        <div class="mailhawk-dns-name mailhawk-copy-value code" role="button" tabindex="0"
+             data-copy="<?php echo esc_attr( $value ); ?>"
+             data-copied="<?php esc_attr_e( 'Copied', 'mailhawk' ); ?>"
+             title="<?php echo esc_attr( $value ); ?>"
+             aria-label="<?php echo esc_attr( sprintf(
+                                 /* translators: 1: what is copied, like TTL or value, 2: the text that is copied */
+                                 __( 'Copy the %1$s %2$s', 'mailhawk' ), $label, $value ) ); ?>">
+            <span class="mailhawk-copy-text"><?php echo esc_html( $value ); ?></span>
+            <span class="mailhawk-dns-copied" aria-live="polite"></span>
+            <span class="dashicons dashicons-admin-page" aria-hidden="true"></span>
+        </div>
+                <?php
+        };
+        $ttl_label   = __( 'TTL', 'mailhawk' );
+        $value_label = __( 'value', 'mailhawk' );
+        ?>
+    <p class="description">
+                <?php _e( 'Click the highlighted <b>host</b> to copy just that part, which is what most DNS providers ask for, or anywhere else on the name to copy the <b>full hostname</b>.', 'mailhawk' ); ?>
+                <?php if ( is_maybe_subdomain( $domain->name ) ) : ?>
+                        <?php _e( 'If the records of a subdomain go in the DNS of its parent domain, add the subdomain to the host: for <code>academy.example.com</code> in the DNS of <code>example.com</code>, <code>postal-abc._domainkey</code> becomes <code>postal-abc._domainkey.academy</code>.', 'mailhawk' ); ?>
+                <?php endif; ?>
+    </p>
     <table class="wp-list-table widefat fixed striped dns-list">
         <thead>
 …
         <tr>
             <td><?php _e( '<code>TXT</code> (DKIM)' ) ?></td>
+            <td><input class="code" onfocus="this.select()" type="text"
+                       value="<?php esc_attr_e( strtolower( $domain->dkim->dkim_record_name ) ); ?>"
+                       readonly></td>
+            <td><input class="code" onfocus="this.select()" type="text"
+                       value="3600"
+                       readonly></td>
+            <td><input class="code" onfocus="this.select()" type="text"
+                       value="<?php esc_attr_e( $domain->dkim->dkim_record ); ?>"
+                       readonly></td>
+            <td><?php $name_fields( $dkim_names ); ?></td>
+            <td><?php $copy_field( '3600', $ttl_label ); ?></td>
+            <td><?php $copy_field( (string) $domain->dkim->dkim_record, $value_label ); ?></td>
             <td><?php echo $domain->dkim->dkim_status === 'OK' ? "<span class='tag yes'>" . __( 'Verified', 'mailhawk' ) . "</span>" : "<span class='tag no'>" . __( 'Unverified' ) . "</span>"; ?>
             </td>
 …
         <tr>
             <td><?php _e( '<code>CNAME</code>' ) ?></td>
+            <td><input class="code" onfocus="this.select()" type="text"
+                       value="<?php esc_attr_e( strtolower( $domain->return_path->return_path_domain ) ); ?>"
+                       readonly></td>
+            <td><input class="code" onfocus="this.select()" type="text"
+                       value="3600"
+                       readonly></td>
+            <td><input class="code" onfocus="this.select()" type="text"
+                       value="rp.mta01.mailhawk.io"
+                       readonly></td>
+            <td><?php $name_fields( $return_path_names ); ?></td>
+            <td><?php $copy_field( '3600', $ttl_label ); ?></td>
+            <td><?php $copy_field( 'rp.mta01.mailhawk.io', $value_label ); ?></td>
             <td><?php echo $domain->return_path->return_path_status === 'OK' ? "<span class='tag yes'>" . __( 'Verified', 'mailhawk' ) . "</span>" : "<span class='tag no'>" . __( 'Unverified' ) . "</span>"; ?>
             </td>
 …
         <tr>
             <td><?php _e( '<code>TXT</code> (SPF)' ) ?></td>
+            <td><input class="code" onfocus="this.select()" type="text"
+                       value="@"
+                       readonly></td>
+            <td><input class="code" onfocus="this.select()" type="text"
+                       value="3600"
+                       readonly></td>
+            <td><?php $name_fields( $spf_names ); ?></td>
+            <td><?php $copy_field( '3600', $ttl_label ); ?></td>
             <td>
 …
                         endif; ?>
+                <input class="code" onfocus="this.select()" type="text"
+                       value="<?php esc_attr_e( $spf_record ); ?>"
+                       readonly></td>
+                                <?php $copy_field( (string) $spf_record, $value_label ); ?></td>
             <td><?php echo $domain->spf->spf_status === 'OK' ? "<span class='tag yes'>" . __( 'Verified', 'mailhawk' ) . "</span>" : "<span class='tag no'>" . __( 'Unverified' ) . "</span>"; ?>
             </td>
 …
             <a href="https://mailhawk.io/configure-dns/"
                target="_blank"><?php _e( 'Learn how to configure your DNS', 'mailhawk' ); ?></a></p>
+        <p class="mailhawk-dns-handoff">
+                        <?php _e( 'Someone else manages your DNS, like an agency, a developer or an AI assistant?', 'mailhawk' ); ?>
+            <button type="button" class="button button-secondary mailhawk-copy-button"
+                    data-copy="<?php echo esc_attr( get_dns_instructions( $domain ) ); ?>"
+                    data-copied="<?php esc_attr_e( 'Instructions copied', 'mailhawk' ); ?>">
+                <span class="dashicons dashicons-clipboard" aria-hidden="true"></span>
+                <span class="mailhawk-copy-button-label"><?php _e( 'Copy instructions', 'mailhawk' ); ?></span>
+            </button>
+        </p>
     </div>
     <p>

mailhawk/tags/1.5.2/admin/views/dns.php

-              r3788980
+              r3795449
 // Todo get domains from API
 use MailHawk\Api\Postal\Domains;
+use function MailHawk\get_dns_record_names;
+use function MailHawk\is_maybe_subdomain;
 use function MailHawk\mailhawk_admin_page;
 …
                    readonly>
             <h3><?php _e( 'DKIM Record' ); ?></h3>
+            <p class="description"><?php printf( __( 'You need to add a new TXT record with the name <code>%s</code> with the following content.', 'mailhawk' ), esc_html( strtolower( $domain->dkim->dkim_record_name ) ) ); ?></p>
+                        <?php $dkim_names = get_dns_record_names( $domain->dkim->dkim_record_name, $domain->name ); ?>
+            <p class="description"><?php printf(
+                                        /* translators: 1: the record host, relative to the domain, 2: the full hostname */
+                                        __( 'You need to add a new TXT record with the host <code>%1$s</code> (full hostname <code>%2$s</code>) with the following content.', 'mailhawk' ),
+                                        esc_html( $dkim_names['host'] ),
+                                        esc_html( $dkim_names['hostname'] )
+                                ); ?>
+                                <?php if ( is_maybe_subdomain( $domain->name ) ) : ?>
+                                        <?php _e( 'If you add it in the DNS of a parent domain, add the subdomain to the host.', 'mailhawk' ); ?>
+                                <?php endif; ?></p>
             <input class="code" onfocus="this.select()" type="text"
                    value="<?php esc_attr_e( $domain->dkim->dkim_record ); ?>"

mailhawk/tags/1.5.2/admin/views/overview.php

-              r3794810
+              r3795449
 <?php if ( $is_throttled ): ?>
     <div class="mailhawk-content-box mailhawk-throttle-notice">
         <h2><?php _e( 'Email is being held back', 'mailhawk' ); ?></h2>
+        <h2><?php _e( 'Your monthly email limit is reached', 'mailhawk' ); ?></h2>
         <p>
                         <?php _e( "This site has used all of its emails for the month, so MailHawk is turning email away instead of sending it. The emails it turns away are marked as failed in the log.", 'mailhawk' ); ?>
                         <?php if ( $resets_at ): ?>
+                                <?php printf( __( 'Sending starts again when the limit resets on %s (UTC), or as soon as the plan is upgraded.', 'mailhawk' ), esc_html( date_i18n( get_option( 'date_format' ), $resets_at, true ) ) ); ?>
+                                <?php
+                                /* translators: %s: date the monthly limit resets */
+                                printf( __( 'Sending starts again when the limit resets on %s (UTC), or as soon as the plan is upgraded.', 'mailhawk' ), esc_html( date_i18n( get_option( 'date_format' ), $resets_at, true ) ) );
+                                ?>
                         <?php else: ?>
                                 <?php _e( 'Sending starts again when the limit resets, or as soon as the plan is upgraded.', 'mailhawk' ); ?>
 …
     </div>
     <p>
+                <?php printf( 'Used: <b>%s</b> / %s', number_format_i18n( $usage ), number_format_i18n( $limit ) ); ?>
+                <?php
+                /* translators: 1: emails used this month, 2: monthly limit */
+                printf( __( 'Used: %1$s / %2$s', 'mailhawk' ), '<b>' . number_format_i18n( $usage ) . '</b>', number_format_i18n( $limit ) );
+                ?>
                 <?php if ( $resets_at ): ?>
+            <span class="usage-resets">&middot; <?php printf( __( 'Resets on %s (UTC)', 'mailhawk' ), esc_html( date_i18n( get_option( 'date_format' ), $resets_at, true ) ) ); ?></span>
+            <span class="usage-resets">&middot; <?php
+                                /* translators: %s: date the monthly limit resets */
+                                printf( __( 'Resets on %s (UTC)', 'mailhawk' ), esc_html( date_i18n( get_option( 'date_format' ), $resets_at, true ) ) );
+                                ?></span>
                 <?php endif; ?>
     </p>
 …
                                         <?php _e( 'Upgrade your plan so your email keeps going out.', 'mailhawk' ); ?>
                                 <?php else: ?>
+                    <b><?php printf( __( "You've used %s%% of this month's emails.", 'mailhawk' ), number_format_i18n( $percent_usage ) ); ?></b>
+                    <b><?php
+                                                /* translators: %s: percentage of this month's emails used */
+                                                printf( __( "You've used %s%% of this month's emails.", 'mailhawk' ), number_format_i18n( $percent_usage ) );
+                                                ?></b>
                                         <?php _e( 'Upgrade your plan before you run out.', 'mailhawk' ); ?>
                                 <?php endif; ?>

mailhawk/tags/1.5.2/admin/views/suspended.php

-              r3793271
+              r3795449
                 <?php endif; ?>
                 <?php if ( $since ) : ?>
+            <p><?php printf( esc_html__( 'Suspended since %s.', 'mailhawk' ), esc_html( $since ) ); ?></p>
+            <p><?php
+                                /* translators: %s: date and time the account was suspended */
+                                printf( esc_html__( 'Suspended since %s.', 'mailhawk' ), esc_html( $since ) );
+                                ?></p>
                 <?php endif; ?>
                 <?php if ( 'organization' === $suspension['scope'] ) : ?>
             <p><?php _e( 'The whole MailHawk account is suspended, so none of its sites can send email.', 'mailhawk' ); ?></p>
                 <?php endif; ?>
         <p><?php _e( 'Your MailHawk account page says what to do next, for example to renew the subscription or to send an incident report.', 'mailhawk' ); ?></p>
+        <p><?php _e( 'Your MailHawk account page says what to do next, for example, renewing your subscription or sending an incident report.', 'mailhawk' ); ?></p>
         <a class="button button-primary big-button mailhawk-cta" href="<?php echo esc_url( mailhawk_account_url() ); ?>" target="_blank" rel="noopener">
             <span class="dashicons dashicons-external" aria-hidden="true"></span>

mailhawk/tags/1.5.2/admin/views/test.php

-              r2309454
+              r3795449
 <?php
+use MailHawk\Api\Postal\Domains;
+use function MailHawk\get_array_var;
+use function MailHawk\get_default_from_email_address;
+use function MailHawk\get_test_email_faq;
+use function MailHawk\get_test_from_addresses;
+use function MailHawk\mailhawk_admin_page;
+// The domains MailHawk knows, to suggest addresses to send from and to warn about ones that are not authenticated
+$domains = Domains::query_all();
+$from    = get_test_from_addresses( is_wp_error( $domains ) ? [] : $domains );
+// What was sent last stays, the default from address the first time
+$from_address = get_array_var( $this->test_data, 'from' ) ?: strtolower( (string) get_default_from_email_address() );
 ?>
 <div class="mailhawk-content-box domains">
+<div class="mailhawk-content-box domains mailhawk-test-email">
         <p><b><?php _e( 'Send a test email:', 'mailhawk' ); ?></b></p>
     <form method="post">
             <?php wp_nonce_field( 'send_test_email', '_mailhawk_nonce' ); ?>
+                <?php
+                // The default first, then the addresses on verified domains, then the rest
+                $groups = [ 'default' => [], 'verified' => [], 'unverified' => [] ];
+                foreach ( $from['addresses'] as $address ) {
+                        $groups[ $address['default'] ? 'default' : ( $address['authenticated'] ? 'verified' : 'unverified' ) ][] = $address['email'];
+                }
+                $suggested = in_array( $from_address, wp_list_pluck( $from['addresses'], 'email' ), true );
+                ?>
         <p>
+            <input type="text" name="subject" class="regular-text" placeholder="<?php esc_attr_e( 'Subject line...', 'mailhawk' ); ?>" value="<?php esc_attr_e( 'MailHawk is connected!', 'mailhawk' );?>" >
+            <label for="mailhawk-test-from-select"><?php _e( 'From', 'mailhawk' ); ?></label><br>
+            <select id="mailhawk-test-from-select" class="regular-text" hidden>
+                                <?php foreach ( $groups['default'] as $email ) : ?>
+                    <option value="<?php echo esc_attr( $email ); ?>" <?php selected( $email, $from_address ); ?>><?php
+                                                /* translators: %s: the default from email address */
+                                                echo esc_html( sprintf( __( '%s (default)', 'mailhawk' ), $email ) );
+                                                ?></option>
+                                <?php endforeach; ?>
+                                <?php if ( $groups['verified'] ) : ?>
+                    <optgroup label="<?php esc_attr_e( 'Verified domains', 'mailhawk' ); ?>">
+                                                <?php foreach ( $groups['verified'] as $email ) : ?>
+                            <option value="<?php echo esc_attr( $email ); ?>" <?php selected( $email, $from_address ); ?>><?php echo esc_html( $email ); ?></option>
+                                                <?php endforeach; ?>
+                    </optgroup>
+                                <?php endif; ?>
+                                <?php if ( $groups['unverified'] ) : ?>
+                    <optgroup label="<?php esc_attr_e( 'Domains that are not verified', 'mailhawk' ); ?>">
+                                                <?php foreach ( $groups['unverified'] as $email ) : ?>
+                            <option value="<?php echo esc_attr( $email ); ?>" <?php selected( $email, $from_address ); ?>><?php echo esc_html( $email ); ?></option>
+                                                <?php endforeach; ?>
+                    </optgroup>
+                                <?php endif; ?>
+                <option value="" <?php selected( ! $suggested ); ?>><?php _e( 'Other address&hellip;', 'mailhawk' ); ?></option>
+            </select>
+                        <?php // What is sent. Without JavaScript it is the field, with it the select fills it in and it is only shown for another address. ?>
+            <input type="email" name="from_address" id="mailhawk-test-from" class="regular-text"
+                   aria-label="<?php esc_attr_e( 'From address', 'mailhawk' ); ?>"
+                   placeholder="<?php esc_attr_e( 'name@yourdomain.com', 'mailhawk' ); ?>"
+                   value="<?php echo esc_attr( $from_address ); ?>"
+                   data-domains="<?php echo esc_attr( wp_json_encode( (object) $from['domains'] ) ); ?>">
         </p>
+        <div class="mailhawk-test-from-warning notice notice-warning inline" hidden
+             data-unverified="<?php
+                                /* translators: %s: the domain of the from address */
+                                echo esc_attr__( 'The DNS records of %s are not all verified, so this email may go to spam or be refused.', 'mailhawk' );
+                                ?>"
+             data-unknown="<?php
+                                /* translators: %s: the domain of the from address */
+                                echo esc_attr__( '%s is not one of your MailHawk domains, so this email can not be authenticated and may go to spam or be refused.', 'mailhawk' );
+                                ?>"
+             data-dns-url="<?php echo esc_attr( mailhawk_admin_page( [ 'view' => 'domains', 'domain' => '%s' ] ) ); ?>"
+             data-domains-url="<?php echo esc_attr( mailhawk_admin_page( [ 'view' => 'domains' ] ) ); ?>">
+            <p>
+                <span class="mailhawk-test-from-warning-text"></span>
+                <a class="mailhawk-test-from-warning-link" href="#"
+                   data-unverified="<?php esc_attr_e( 'Check the DNS records', 'mailhawk' ); ?>"
+                   data-unknown="<?php esc_attr_e( 'Add the domain', 'mailhawk' ); ?>"></a>
+            </p>
+        </div>
         <p>
+            <textarea name="content" class="regular-text" rows="4" placeholder="<?php esc_attr_e( 'Content...', 'mailhawk' ); ?>"><?php esc_html_e( 'Hello World!', 'mailhawk' ); ?></textarea>
+        </p>
+        <p>
+            <input type="email" name="to_address" class="regular-text"
+            <label for="mailhawk-test-to"><?php _e( 'To', 'mailhawk' ); ?></label><br>
+            <input type="email" name="to_address" id="mailhawk-test-to" class="regular-text"
                    value="<?php esc_attr_e( wp_get_current_user()->user_email ); ?>">
             <input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Send Test' ); ?>">
         </p>
     </form>
     <p class="description"><?php _e( 'Send a test email to yourself to ensure MailHawk is properly connected and your deliverability is good.', 'mailhawk' ); ?></p>
+    <p class="description"><?php _e( 'MailHawk sends a short email that confirms the site can send, with tips on what it means for where it lands. Send it to an address of your own at Gmail, Outlook or wherever your customers are, and see where it ends up.', 'mailhawk' ); ?></p>
 </div>
+<div class="mailhawk-content-box mailhawk-test-faq">
+    <p><b><?php _e( 'Where did it land?', 'mailhawk' ); ?></b></p>
+        <?php foreach ( get_test_email_faq( true ) as $item ) : ?>
+        <details>
+            <summary><?php echo esc_html( $item['question'] ); ?></summary>
+            <p><?php echo wp_kses( $item['answer'], [ 'a' => [ 'href' => true ], 'b' => [], 'i' => [] ] ); ?></p>
+        </details>
+        <?php endforeach; ?>
+</div>

mailhawk/tags/1.5.2/assets/css/admin.css

-              r3793271
+              r3795449
 .not-sure-dns {
+    border-color: #e1e5ea;
     border-radius: 0 0 10px 10px;
+}
+/* The test email */
+.mailhawk-test-email label {
+    font-weight: 600;
+}
+.mailhawk-test-email .mailhawk-test-from-warning {
+    max-width: 25em;
+    margin: -4px 0 12px;
+}
+.mailhawk-test-email .mailhawk-test-from-warning[hidden],
+.mailhawk-test-email [hidden] {
+    display: none;
+}
+/* The field for another address sits under the select */
+.mailhawk-test-email #mailhawk-test-from-select + #mailhawk-test-from {
+    display: block;
+    margin-top: 8px;
+}
+.mailhawk-test-email #mailhawk-test-from-select + #mailhawk-test-from[hidden] {
+    display: none;
+}
+/* Where the test email landed, one question open at a time is plenty */
+.mailhawk-test-faq details {
+    border-top: 1px solid #e1e5ea;
+}
+.mailhawk-test-faq details:last-child {
+    border-bottom: 1px solid #e1e5ea;
+}
+.mailhawk-test-faq summary {
+    padding: 12px 0;
+    font-weight: 600;
+    cursor: pointer;
+}
+.mailhawk-test-faq details p {
+    max-width: 50em;
+    margin: 0 0 14px;
+    color: #50575e;
+}
+/* Handing the DNS records to someone else */
+.not-sure-dns .mailhawk-dns-handoff {
+    margin: 0;
+    padding: 12px 0;
+    border-top: 1px solid #e1e5ea;
+    color: #50575e;
+}
+/* The ID matches the rule that makes every button in a content box a block */
+#wpbody .mailhawk-content-box .mailhawk-copy-button.button {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+    margin-left: 6px;
+    vertical-align: middle;
+}
+.mailhawk-copy-button .dashicons {
+    font-size: 16px;
+    width: 16px;
+    height: 16px;
+}
+.mailhawk-copy-button.button.copied,
+.mailhawk-copy-button.button.copied:hover,
+.mailhawk-copy-button.button.copied:focus {
+    border-color: #2ba123;
+    background: #e3f5e8;
+    color: #146c2e;
+}
+/* The DNS table and the help under it are one card, so the table only rounds its top corners */
+.mailhawk-view-content .wp-list-table.dns-list {
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+}
 …
+    }
+}
+/* DNS record names: the full hostname as a pill, with the host as a pill inside it */
+.mailhawk-dns-name {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 0;
+    box-sizing: border-box;
+    width: 100%;
+    min-height: 40px;
+    padding: 4px 10px 4px 4px;
+    border: 1px solid #cfd6de;
+    border-radius: 6px;
+    background: #f6f7f7;
+    color: #1d2327;
+    font-family: Consolas, Monaco, monospace;
+    font-size: 14px;
+    line-height: 1.4;
+    cursor: copy;
+    word-break: break-all;
+    transition: border-color .15s, background-color .15s;
+}
+.mailhawk-dns-name:hover,
+.mailhawk-dns-name:focus-visible {
+    border-color: #2271b1;
+    background: #f0f6fc;
+    outline: none;
+}
+.mailhawk-dns-name .mailhawk-dns-host {
+    padding: 3px 7px;
+    border: 1px solid #2271b1;
+    border-radius: 4px;
+    background: #fff;
+    color: #2271b1;
+    font: inherit;
+    cursor: copy;
+    transition: background-color .15s, color .15s;
+}
+.mailhawk-dns-name .mailhawk-dns-host:hover,
+.mailhawk-dns-name .mailhawk-dns-host:focus-visible {
+    background: #2271b1;
+    color: #fff;
+    outline: none;
+}
+.mailhawk-dns-name .mailhawk-dns-rest {
+    padding-left: 1px;
+    color: #50575e;
+}
+/* The domain itself, shown after the @ */
+.mailhawk-dns-name .mailhawk-dns-rest.is-domain {
+    padding-left: 8px;
+}
+.mailhawk-dns-name .dashicons {
+    margin-left: auto;
+    padding-left: 8px;
+    color: #8c8f94;
+    font-size: 16px;
+    line-height: 20px;
+}
+.mailhawk-dns-name:hover .dashicons {
+    color: #2271b1;
+}
+.mailhawk-dns-name .mailhawk-dns-copied {
+    margin-left: auto;
+    padding-left: 8px;
+    color: #146c2e;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
+    font-size: 12px;
+    white-space: nowrap;
+}
+.mailhawk-dns-name .mailhawk-dns-copied:empty {
+    display: none;
+}
+/* Copied: the icon makes way for what was copied, and the part that was copied shows it */
+.mailhawk-dns-name.copied-host .dashicons,
+.mailhawk-dns-name.copied-hostname .dashicons {
+    display: none;
+}
+.mailhawk-dns-name.copied-hostname {
+    border-color: #2ba123;
+    background: #e3f5e8;
+}
+.mailhawk-dns-name.copied-host .mailhawk-dns-host {
+    border-color: #2ba123;
+    background: #2ba123;
+    color: #fff;
+}
+/* The TTL and value: one line, a long value is cut short on screen but copied whole */
+.mailhawk-dns-name.mailhawk-copy-value {
+    flex-wrap: nowrap;
+    padding-left: 10px;
+    text-align: left;
+    word-break: normal;
+}
+.mailhawk-copy-value .mailhawk-copy-text {
+    flex: 1 1 auto;
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}

mailhawk/tags/1.5.2/assets/js/admin.js

-              r3788980
+              r3795449
+(function ($, connect, review, groundhogg) {
+(function ($, connect, review, groundhogg, dns) {
+    // Copy text, with a fallback for wp-admin served without HTTPS, where the clipboard API is not there
+    function copyText(text) {
+        if (navigator.clipboard && window.isSecureContext) {
+            return navigator.clipboard.writeText(text);
+        }
+        var $field = $('<textarea readonly>').val(text).css({position: 'fixed', top: 0, left: 0, opacity: 0}).appendTo('body');
+        $field[0].select();
+        var copied = document.execCommand('copy');
+        $field.remove();
+        return copied ? $.Deferred().resolve().promise() : $.Deferred().reject().promise();
+    }
+    // The names on the DNS screen: the host inside copies just the host, the rest of the pill the full hostname. The
+    // TTL and value pills copy what they show.
+    $(document).on('click', '.mailhawk-dns-name, .mailhawk-dns-host', function (e) {
+        e.stopPropagation();
+        var $target = $(this);
+        var $name = $target.closest('.mailhawk-dns-name');
+        var isHost = $target.is('.mailhawk-dns-host');
+        $.when(copyText($target.attr('data-copy'))).done(function () {
+            // A value says it in its own words, a name says which part
+            $name.find('.mailhawk-dns-copied').text($name.attr('data-copied') || (isHost ? dns.host_copied : dns.hostname_copied));
+            $name.toggleClass('copied-host', isHost).toggleClass('copied-hostname', !isHost);
+            clearTimeout($name.data('copiedTimer'));
+            $name.data('copiedTimer', setTimeout(function () {
+                $name.removeClass('copied-host copied-hostname').find('.mailhawk-dns-copied').text('');
+            }, 1500));
+        });
+    });
+    // A button that copies a block of text, like the DNS instructions, and says so on itself for a moment
+    $(document).on('click', '.mailhawk-copy-button', function () {
+        var $button = $(this);
+        var $label = $button.find('.mailhawk-copy-button-label');
+        if (!$button.data('label')) {
+            $button.data('label', $label.text());
+        }
+        $.when(copyText($button.attr('data-copy'))).done(function () {
+            $label.text($button.attr('data-copied'));
+            $button.addClass('copied');
+            clearTimeout($button.data('copiedTimer'));
+            $button.data('copiedTimer', setTimeout(function () {
+                $label.text($button.data('label'));
+                $button.removeClass('copied');
+            }, 2000));
+        });
+    });
+    // The test email: say so when the address it is sent from is on a domain that is not verified, or not MailHawk's
+    $(function () {
+        var $from = $('#mailhawk-test-from');
+        var $warning = $('.mailhawk-test-from-warning');
+        if (!$from.length || !$warning.length) {
+            return;
+        }
+        var domains = $from.data('domains') || {};
+        var $link = $warning.find('.mailhawk-test-from-warning-link');
+        var $select = $('#mailhawk-test-from-select');
+        // The select picks a suggested address, its last choice opens the field for any other
+        function pick() {
+            var value = $select.val();
+            $from.prop('hidden', value !== '');
+            if (value !== '') {
+                $from.val(value);
+            } else if ($select.find('option[value="' + $from.val() + '"]').length) {
+                // Coming from a suggestion, start the other address empty
+                $from.val('').trigger('focus');
+            }
+            check();
+        }
+        $select.prop('hidden', false).on('change', pick);
+        function check() {
+            var email = $.trim($from.val()).toLowerCase();
+            var at = email.lastIndexOf('@');
+            var domain = at > 0 ? email.slice(at + 1) : '';
+            // Nothing to say until there is an address to say it about, or when its domain is verified
+            if (!domain || domain.indexOf('.') === -1 || domains[domain] === true) {
+                $warning.prop('hidden', true);
+                return;
+            }
+            var known = Object.prototype.hasOwnProperty.call(domains, domain);
+            var kind = known ? 'unverified' : 'unknown';
+            $warning.find('.mailhawk-test-from-warning-text').text($warning.attr('data-' + kind).replace('%s', domain));
+            $link.text($link.attr('data-' + kind)).attr('href', known
+                ? $warning.attr('data-dns-url').replace('%s', encodeURIComponent(domain))
+                : $warning.attr('data-domains-url'));
+            $warning.prop('hidden', false);
+        }
+        $from.on('input change', check);
+        pick();
+    });
+    // The pill is not a button element, it holds one, so Enter and Space are handled here
+    $(document).on('keydown', '.mailhawk-dns-name', function (e) {
+        if (e.target === this && (e.key === 'Enter' || e.key === ' ')) {
+            e.preventDefault();
+            $(this).trigger('click');
+        }
+    });
     // The suggestions to look at Groundhogg, on the overview and the recipients screen. Learn more opens WordPress' own
 …
 })(jQuery, MailHawkConnect, MailHawkReview, MailHawkGroundhogg);
+})(jQuery, MailHawkConnect, MailHawkReview, MailHawkGroundhogg, MailHawkDns);

mailhawk/tags/1.5.2/includes/abilities/ability.php

r3793271	r3795449
134	134
135	135	if ( mailhawk_is_suspended() ) {
136		return $this->error( 'suspended', __( 'The MailHawk account is suspended~~, mailhawk/get-status says why and where to g~~o next.', 'mailhawk' ), 409 );
	136	return $this->error( 'suspended', __( 'The MailHawk account is suspended. Use mailhawk/get-status to see why and what to do next.', 'mailhawk' ), 409 );
137	137	}
138	138

mailhawk/tags/1.5.2/includes/abilities/email/send-test-email.php

-              r3788980
+              r3795449
 use MailHawk\Plugin;
 use WP_Error;
+use function MailHawk\get_test_email;
+use function MailHawk\set_next_alt_body;
 if ( ! defined( 'ABSPATH' ) ) {
 …
+                }
                 $site    = wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
                 $subject = sprintf( __( 'MailHawk test email from %s', 'mailhawk' ), $site );
                 $message = sprintf( __( "This is a test email from %s, sent through MailHawk to check that email is delivered.\n\nYou can ignore it.", 'mailhawk' ), $site );
+                // The same email the Test screen sends
+                $email   = get_test_email( $to );
+                $subject = $email['subject'];
                 $table = Plugin::instance()->log->get_table_name();
 …
                 add_action( 'wp_mail_failed', $catch );
+                $alt_body = set_next_alt_body( $email['text'] );
                 // Straight to MailHawk's mailer, which is what wp_mail() is while the site is connected. A test that went through
                 // whatever else is hooked in would not say anything about MailHawk.
                 try {
                         $sent = mailhawk_mail( $to, $subject, $message );
+                        $sent = mailhawk_mail( $to, $subject, $email['html'], [ 'Content-Type: text/html' ] );
                 } catch ( \Exception $e ) {
                         $sent    = false;
 …
                 } finally {
                         remove_action( 'wp_mail_failed', $catch );
+                        remove_action( 'phpmailer_init', $alt_body, 99 );
+                }

mailhawk/tags/1.5.2/includes/abilities/formatter.php

-              r3788980
+              r3795449
 use MailHawk\DB\Recipients;
+use function MailHawk\get_dns_record_names;
 use function MailHawk\get_email_status_pretty_name;
 use function MailHawk\get_spf_record;
 …
+                }
+                // What goes in the Host field, relative to the domain, and the full hostname, as the DNS screen shows them
+                $dkim_names        = get_dns_record_names( $domain->dkim->dkim_record_name ?? '', (string) $domain->name );
+                $return_path_names = get_dns_record_names( $domain->return_path->return_path_domain ?? '', (string) $domain->name );
+                $spf_names         = get_dns_record_names( '@', (string) $domain->name );
                 return [
                         'records'             => [
 …
                                         'purpose'  => 'dkim',
                                         'type'     => 'TXT',
+                                        'host'     => $dkim_names['host'],
+                                        'hostname' => $dkim_names['hostname'],
                                         'name'     => strtolower( (string) ( $domain->dkim->dkim_record_name ?? '' ) ),
                                         'value'    => (string) ( $domain->dkim->dkim_record ?? '' ),
 …
                                         'purpose'  => 'return_path',
                                         'type'     => 'CNAME',
+                                        'host'     => $return_path_names['host'],
+                                        'hostname' => $return_path_names['hostname'],
                                         'name'     => strtolower( (string) ( $domain->return_path->return_path_domain ?? '' ) ),
                                         'value'    => self::RETURN_PATH_TARGET,
 …
                                         'purpose'  => 'spf',
                                         'type'     => 'TXT',
+                                        'host'     => $spf_names['host'],
+                                        'hostname' => $spf_names['hostname'],
                                         'name'     => '@',
                                         'value'    => $spf_record,
 …
                                 'records'             => [
                                         'type'        => 'array',
                                         'description' => __( 'The records to add at the DNS host of the domain, as they are shown on the MailHawk DNS screen. A name of @ is the domain itself.', 'mailhawk' ),
+                                        'description' => __( 'The records to add at the DNS host of the domain, as they are shown on the MailHawk DNS screen. host is what goes in the Host or Name field, relative to the domain, and @ is the domain itself. hostname is the full name. For a subdomain whose records are added in the DNS of its parent domain, the subdomain is added to host. name is kept for compatibility: the DKIM name is relative and the return path name is full.', 'mailhawk' ),
                                         'items'       => [
                                                 'type'       => 'object',
 …
                                                                 'enum' => [ 'TXT', 'CNAME' ],
                                                         ],
+                                                        'host'     => [ 'type' => 'string' ],
+                                                        'hostname' => [ 'type' => 'string' ],
                                                         'name'     => [ 'type' => 'string' ],
                                                         'value'    => [ 'type' => 'string' ],
 …
                                                         'verified' => [ 'type' => 'boolean' ],
                                                 ],
                                                 'required'   => [ 'purpose', 'type', 'name', 'value', 'ttl', 'status', 'verified' ],
+                                                'required'   => [ 'purpose', 'type', 'host', 'hostname', 'name', 'value', 'ttl', 'status', 'verified' ],
                                         ],
                                 ],

mailhawk/tags/1.5.2/includes/abilities/status/get-status.php

-              r3793271
+              r3795449
                         $message = $details['reason']
+                                /* translators: %s: the reason MailHawk gave for suspending the account */
                                 ? sprintf( __( 'The MailHawk account is suspended: %s', 'mailhawk' ), $details['reason'] )
                                 : __( 'The MailHawk account is suspended.', 'mailhawk' );
+                        /* translators: %s: URL of the MailHawk account page */
                         $issues[] = [ 'code' => 'suspended', 'message' => $message . ' ' . sprintf( __( 'What to do next is on the MailHawk account page, %s, where a person has to sign in.', 'mailhawk' ), mailhawk_account_url() ) ];
+                }
 …
                 if ( $usage && $usage['percent'] >= 90 ) {
+                        /* translators: 1: percentage of the monthly allowance used, 2: emails left */
                         $issues[] = [ 'code' => 'usage_high', 'message' => sprintf( __( '%1$s%% of the monthly sending allowance is used, %2$s emails are left.', 'mailhawk' ), $usage['percent'], number_format_i18n( $usage['remaining'] ) ) ];
+                }

mailhawk/tags/1.5.2/includes/api/postal/messages.php

r3788980	r3795449
62	62
63	63	if ( ! $api_key ) {
64		return new \WP_Error( 'mailhawk_rejected', ~~'Invalid API key.'~~ );
	64	return new \WP_Error( 'mailhawk_rejected', __( 'Invalid API key.', 'mailhawk' ) );
65	65	}
66	66

mailhawk/tags/1.5.2/includes/api/postal/postal.php

-              r3793271
+              r3795449
                         if ( ! $api_key ){
                                 return new \WP_Error( 'error', 'Invalid API key.' );
+                                return new \WP_Error( 'error', __( 'Invalid API key.', 'mailhawk' ) );
+                        }
 …
                         return new \WP_Error(
                                 'mailhawk_rate_limited',
                                 __( 'MailHawk is slowing down email from this site, usually because the monthly sending limit of the plan is reached. Upgrade the plan, or wait for the limit to reset.', 'mailhawk' ),
+                                __( "MailHawk is slowing down email from this site, usually because the plan's monthly sending limit has been reached. Upgrade the plan, or wait for the limit to reset.", 'mailhawk' ),
                                 [ 'retry_after' => $retry_after ? $retry_after : 5 * MINUTE_IN_SECONDS ]
                         );
+                }
                 $result = new \WP_Error( 'error', 'Unable to complete request.' );
+                $result = new \WP_Error( 'error', __( 'Unable to complete request.', 'mailhawk' ) );
                 // Postal
 …
                                         break;
                                 case 'parameter-error':
                                         $result = new \WP_Error( 'parameter-error', $json->data->message ?? 'Invalid request.' );
+                                        $result = new \WP_Error( 'parameter-error', $json->data->message ?? __( 'Invalid request.', 'mailhawk' ) );
                                         break;
                                 case 'error':
 …
                                                 $message = __( 'MailHawk has suspended this account.', 'mailhawk' );
                                         } else {
+                                                $message = sprintf( 'MailHawk returned an error: %s', $code );
+                                                /* translators: %s: error code returned by MailHawk */
+                                                $message = sprintf( __( 'MailHawk returned an error: %s', 'mailhawk' ), $code );
+                                        }

mailhawk/tags/1.5.2/includes/functions.php

-              r3794810
+              r3795449
 /**
+ * A DNS record name as the two things a DNS provider may ask for: the host, which is the part before the sending
+ * domain, and the full hostname. The MTA gives the DKIM name relative to the domain (postal-abc._domainkey) and the
+ * return path as a full hostname (psrp.example.com), so both are turned into the same pair.
+ *
+ * @param string $name   the record name, relative to the domain or in full, @ for the domain itself
+ * @param string $domain the sending domain
+ *
+ * @return array host and hostname, both lower case
+ */
+function get_dns_record_names( $name, $domain ) {
+        $name   = strtolower( trim( (string) $name, " \t\n\r\0\x0B." ) );
+        $domain = strtolower( trim( (string) $domain, " \t\n\r\0\x0B." ) );
+        if ( '' === $name || '@' === $name || $name === $domain ) {
+                return [ 'host' => '@', 'hostname' => $domain ];
+        }
+        $suffix = '.' . $domain;
+        // Already the full hostname
+        if ( '' !== $domain && substr( $name, - strlen( $suffix ) ) === $suffix ) {
+                return [ 'host' => substr( $name, 0, - strlen( $suffix ) ), 'hostname' => $name ];
+        }
+        return [ 'host' => $name, 'hostname' => '' !== $domain ? $name . $suffix : $name ];
+}
+/**
+ * Whether the domain may be a subdomain, so its records may have to go in the DNS of a parent domain. A domain of two
+ * parts never is. One of three parts is not when the last two are a suffix people register domains under, like
+ * co.uk. Anything else may be, it is better to say too much than to leave someone without the note they need.
+ *
+ * @param string $domain
+ *
+ * @return bool
+ */
+function is_maybe_subdomain( $domain ) {
+        $labels = explode( '.', strtolower( trim( (string) $domain, '. ' ) ) );
+        if ( count( $labels ) <= 2 ) {
+                return false;
+        }
+        /**
+         * Suffixes of two parts that domains are registered under, like co.uk, so example.co.uk is not taken for a subdomain
+         *
+         * @param string[] $suffixes
+         */
+        $suffixes = apply_filters( 'mailhawk/second_level_suffixes', [
+                'co.uk', 'org.uk', 'me.uk', 'ltd.uk', 'plc.uk', 'net.uk', 'ac.uk', 'gov.uk', 'sch.uk',
+                'com.au', 'net.au', 'org.au', 'edu.au', 'gov.au', 'id.au', 'asn.au',
+                'co.nz', 'net.nz', 'org.nz', 'ac.nz', 'govt.nz',
+                'co.za', 'org.za', 'net.za',
+                'co.in', 'net.in', 'org.in', 'firm.in', 'gen.in', 'ind.in',
+                'co.jp', 'ne.jp', 'or.jp', 'ac.jp', 'go.jp',
+                'co.kr', 'or.kr', 'co.il', 'org.il', 'co.id', 'or.id', 'co.th', 'in.th',
+                'com.br', 'net.br', 'org.br', 'com.mx', 'org.mx', 'com.ar', 'com.co', 'com.pe', 'com.ve', 'com.ec', 'com.uy',
+                'com.cn', 'net.cn', 'org.cn', 'com.hk', 'org.hk', 'com.tw', 'org.tw', 'com.sg', 'org.sg', 'com.my', 'org.my',
+                'com.ph', 'com.vn', 'com.pk', 'com.bd', 'com.tr', 'org.tr', 'com.sa', 'com.eg', 'com.ng', 'com.gh', 'co.ke',
+                'com.ua', 'org.ua', 'com.pl', 'org.pl', 'com.es', 'org.es', 'com.pt', 'com.gr', 'co.at', 'or.at', 'com.cy',
+        ] );
+        return ! ( 3 === count( $labels ) && in_array( $labels[1] . '.' . $labels[2], (array) $suffixes, true ) );
+}
+/**
+ * Plain text instructions for adding a domain's records to its DNS, for whoever does it: an agency, the site's
+ * developer or an AI agent. Everything needed is in the text, nobody has to see the DNS screen.
+ *
+ * @param object $domain a domain from the MTA
+ *
+ * @return string
+ */
+function get_dns_instructions( $domain ) {
+        $name    = strtolower( (string) $domain->name );
+        $dns     = \MailHawk\Abilities\Formatter::dns_records( $domain );
+        $records = $dns['records'];
+        $labels = [
+                'dkim'        => __( 'DKIM, which signs the email so receivers can tell it really came from this domain', 'mailhawk' ),
+                'return_path' => __( 'Return path, where bounces go', 'mailhawk' ),
+                'spf'         => __( 'SPF, which says MailHawk may send email for this domain', 'mailhawk' ),
+        ];
+        $to_add = array_filter( $records, function ( $record ) {
+                return ! $record['verified'];
+        } );
+        $lines = [];
+        /* translators: %s: the sending domain */
+        $lines[] = sprintf( __( 'DNS records for %s', 'mailhawk' ), $name );
+        $lines[] = '';
+        /* translators: %s: the sending domain */
+        $lines[] = sprintf( __( 'The WordPress site sends its email through MailHawk (mailhawk.io). Add the records below at the DNS provider of %s so that email is authenticated with SPF, DKIM and a return path, and reaches the inbox.', 'mailhawk' ), $name );
+        if ( empty( $to_add ) ) {
+                $lines[] = __( 'All of them are already in place and verified, nothing needs to change.', 'mailhawk' );
+        } else if ( count( $to_add ) < count( $records ) ) {
+                $lines[] = __( 'Records marked "already verified" are in place already and can be left alone.', 'mailhawk' );
+        }
+        $lines[] = '';
+        $lines[] = __( 'How to enter the names:', 'mailhawk' );
+        /* translators: %s: the sending domain */
+        $lines[] = '- ' . sprintf( __( 'Each record has a Host, the part of the name before %s, and a Full hostname. Most DNS providers ask for the Host in a field called Host or Name. Use the Full hostname only if the provider asks for the whole name.', 'mailhawk' ), $name );
+        $lines[] = '- ' . __( 'If the provider adds the domain to the name by itself, enter the Host, or the domain ends up in the name twice.', 'mailhawk' );
+        if ( is_maybe_subdomain( $name ) ) {
+                /* translators: %s: the sending domain */
+                $lines[] = '- ' . sprintf( __( 'If %s is a subdomain and its records are kept in the DNS of a parent domain, the Host is the Full hostname without that parent domain. For example, for academy.example.com in the DNS of example.com, postal-abc._domainkey becomes postal-abc._domainkey.academy.', 'mailhawk' ), $name );
+        }
+        $lines[] = '- ' . __( 'An @ as the Host means the domain itself. Some providers want the field left empty for that.', 'mailhawk' );
+        foreach ( $records as $i => $record ) {
+                $lines[] = '';
+                $lines[] = sprintf( '%d. %s%s', $i + 1, $labels[ $record['purpose'] ] ?? $record['purpose'], $record['verified'] ? ' ' . __( '(already verified)', 'mailhawk' ) : '' );
+                /* translators: %s: DNS record type, like TXT or CNAME */
+                $lines[] = '   ' . sprintf( __( 'Type: %s', 'mailhawk' ), $record['type'] );
+                /* translators: %s: the host of the DNS record */
+                $lines[] = '   ' . sprintf( __( 'Host: %s', 'mailhawk' ), $record['host'] );
+                /* translators: %s: the full hostname of the DNS record */
+                $lines[] = '   ' . sprintf( __( 'Full hostname: %s', 'mailhawk' ), $record['hostname'] );
+                /* translators: %s: the value of the DNS record */
+                $lines[] = '   ' . sprintf( __( 'Value: %s', 'mailhawk' ), $record['value'] );
+                /* translators: %d: time to live of the DNS record, in seconds */
+                $lines[] = '   ' . sprintf( __( 'TTL: %d (or the provider\'s default)', 'mailhawk' ), $record['ttl'] );
+                if ( 'return_path' === $record['purpose'] ) {
+                        $lines[] = '   ' . __( 'A CNAME can not share its name with any other record. If the provider proxies DNS records (like Cloudflare), set this one to DNS only.', 'mailhawk' );
+                }
+                if ( 'spf' === $record['purpose'] && ! $record['verified'] ) {
+                        if ( $dns['existing_spf_record'] ) {
+                                /* translators: %s: the SPF record the domain has now */
+                                $lines[] = '   ' . sprintf( __( 'The domain already has an SPF record: %s. A name can only have one, so do not add a second TXT record starting with v=spf1. Replace the existing one with the value above, which is the same record with MailHawk added.', 'mailhawk' ), $dns['existing_spf_record'] );
+                        } else {
+                                $lines[] = '   ' . __( 'A name can only have one SPF record. If a TXT record starting with v=spf1 is there already, add the include: part of the value above to it, before the last part (like ~all), instead of adding a second one.', 'mailhawk' );
+                        }
+                }
+        }
+        $lines[] = '';
+        $lines[] = __( 'When the records are added:', 'mailhawk' );
+        $lines[] = '- ' . __( 'DNS changes usually show up within minutes, but can take up to 24 hours.', 'mailhawk' );
+        /* translators: %s: URL of the DNS screen of this domain in wp-admin */
+        $lines[] = '- ' . sprintf( __( 'Then click Verify on the MailHawk DNS screen in WordPress: %s', 'mailhawk' ), mailhawk_admin_page( [ 'view' => 'domains', 'domain' => $name ] ) );
+        return implode( "\n", $lines );
+}
+/**
  * Get the value of the SPF record or false if it doesn't exist.
+ *
 …
 function get_default_from_email_address() {
         return get_option( 'mailhawk_default_from_email_address' );
+}
+/**
+ * The addresses to suggest sending a test email from: the default from address first, then the same name at each of
+ * the domains registered with MailHawk, and the current user's and the site's own address when their domain is one of
+ * them. Each says whether its domain is authenticated, so a test from it can be expected to reach the inbox.
+ *
+ * @param object[]|mixed $domains the domains from the MTA, anything else is treated as none
+ *
+ * @return array{addresses: array[], domains: bool[]} addresses with email, default and authenticated (null when the
+ *                                                    domain is not registered), and each registered domain with whether
+ *                                                    it is authenticated
+ */
+function get_test_from_addresses( $domains ) {
+        $authenticated = [];
+        foreach ( is_array( $domains ) ? $domains : [] as $domain ) {
+                if ( is_object( $domain ) && ! empty( $domain->name ) ) {
+                        $authenticated[ strtolower( (string) $domain->name ) ] = is_domain_authenticated( $domain );
+                }
+        }
+        // Authenticated domains first, then by name
+        $flags = $authenticated;
+        uksort( $authenticated, function ( $a, $b ) use ( $flags ) {
+                return [ ! $flags[ $a ], $a ] <=> [ ! $flags[ $b ], $b ];
+        } );
+        $default = strtolower( (string) get_default_from_email_address() );
+        $local   = is_email( $default ) ? strstr( $default, '@', true ) : 'wordpress';
+        $emails = [ $default ];
+        foreach ( array_keys( $authenticated ) as $name ) {
+                $emails[] = $local . '@' . $name;
+        }
+        // People's own addresses, only on a domain MailHawk can send for
+        foreach ( [ wp_get_current_user()->user_email, get_option( 'admin_email' ) ] as $email ) {
+                $email = strtolower( (string) $email );
+                if ( is_email( $email ) && isset( $authenticated[ substr( strrchr( $email, '@' ), 1 ) ] ) ) {
+                        $emails[] = $email;
+                }
+        }
+        $addresses = [];
+        foreach ( array_unique( array_filter( $emails, 'is_email' ) ) as $email ) {
+                $domain = substr( strrchr( $email, '@' ), 1 );
+                $addresses[] = [
+                        'email'         => $email,
+                        'default'       => $email === $default,
+                        'authenticated' => $authenticated[ $domain ] ?? null,
+                ];
+        }
+        return [ 'addresses' => $addresses, 'domains' => $authenticated ];
+}
+/**
+ * Where a test email can end up and what to make of it, for the test email itself and for the Test screen. Answers are
+ * HTML with only links and emphasis.
+ *
+ * @param bool $not_arrived whether to include what to do when it never arrived, which only makes sense on the screen
+ *
+ * @return array[] each with key, question and answer
+ */
+function get_test_email_faq( $not_arrived = false ) {
+        $domains = mailhawk_admin_page( [ 'view' => 'domains' ] );
+        $log     = mailhawk_admin_page( [ 'view' => 'log' ] );
+        $faq = [
+                [
+                        'key'      => 'inbox',
+                        'question' => __( 'It landed in the inbox', 'mailhawk' ),
+                        'answer'   => __( 'MailHawk is working, and the mailbox trusts email from this site. There is nothing else to do.', 'mailhawk' ),
+                ],
+                [
+                        'key'      => 'updates',
+                        'question' => __( 'Gmail put it in Updates', 'mailhawk' ),
+                        'answer'   => __( 'That is normal. Gmail puts receipts, password resets and other notifications in Updates, and they still arrive. To keep email from this address in Primary, drag it to the Primary tab and choose to do the same for future messages.', 'mailhawk' ),
+                ],
+                [
+                        'key'      => 'promotions',
+                        'question' => __( 'Gmail put it in Promotions', 'mailhawk' ),
+                        'answer'   => __( 'That is normal too, and not a delivery problem. Gmail sorts email into tabs by what it looks like, and branded emails with images often go to Promotions. Your newsletters probably will as well. Order and account emails that are plain and personal usually end up in Primary or Updates. You can drag it to Primary to teach your own inbox.', 'mailhawk' ),
+                ],
+                [
+                        'key'      => 'other',
+                        'question' => __( 'Outlook put it in Other', 'mailhawk' ),
+                        'answer'   => __( 'That is normal. Outlook\'s Focused Inbox puts email from senders it has not seen before in Other. Move it to Focused and choose to always move email from this address there.', 'mailhawk' ),
+                ],
+                [
+                        'key'      => 'spam',
+                        'question' => __( 'It landed in spam', 'mailhawk' ),
+                        'answer'   => sprintf(
+                        /* translators: %s: URL of the Domains screen in wp-admin */
+                                __( 'Check that the domain of the address it came from has all its DNS records verified on the <a href="%s">Domains screen</a>. An address on a domain that is not verified, or on a free provider like gmail.com, can not be authenticated and is often treated as spam. Then mark the email as not spam, which teaches your mailbox to trust it. A new domain can take a few days of sending to build trust. If it keeps happening, let MailHawk support know.', 'mailhawk' ),
+                                esc_url( $domains )
+                        ),
+                ],
+        ];
+        if ( $not_arrived ) {
+                $faq[] = [
+                        'key'      => 'missing',
+                        'question' => __( 'It did not arrive at all', 'mailhawk' ),
+                        'answer'   => sprintf(
+                        /* translators: %s: URL of the Email Log screen in wp-admin */
+                                __( 'Give it a minute, then look in spam and in every tab or folder. The <a href="%s">Email Log</a> says what happened to it: failed emails say why, and an email held for review can be released from there. Also check the address it was sent to for typos.', 'mailhawk' ),
+                                esc_url( $log )
+                        ),
+                ];
+        }
+        return $faq;
+}
+/**
+ * The test email: its subject, a branded HTML version and the same in plain text. Its text is fixed, the test is to see
+ * that email arrives and where, and an email anyone could put any text in would be a way to send spam.
+ *
+ * @param string $to   who it is sent to
+ * @param string $from the address it is sent from, the default from address when empty
+ *
+ * @return array{subject: string, html: string, text: string}
+ */
+function get_test_email( $to, $from = '' ) {
+        $site    = wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
+        $from    = $from ?: (string) get_default_from_email_address();
+        $sent_at = wp_date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ) );
+        $faq     = get_test_email_faq();
+        /* translators: %s: the name of the site */
+        $subject = sprintf( __( 'MailHawk test email from %s', 'mailhawk' ), $site );
+        ob_start();
+        include dirname( __DIR__ ) . '/templates/emails/test-email.php';
+        $html = ob_get_clean();
+        $text = [
+                __( 'It works!', 'mailhawk' ),
+                '',
+                /* translators: 1: the name of the site, 2: the address it was sent from, 3: the address it was sent to, 4: date and time it was sent */
+                sprintf( __( 'This test email from %1$s went out through MailHawk, from %2$s to %3$s on %4$s.', 'mailhawk' ), $site, $from, $to, $sent_at ),
+                '',
+                __( 'Where did it land?', 'mailhawk' ),
+        ];
+        foreach ( $faq as $item ) {
+                $text[] = '';
+                $text[] = $item['question'];
+                // Links keep their address in plain text
+                $text[] = html_entity_decode( wp_strip_all_tags( preg_replace( '/<a [^>]*href="([^"]+)"[^>]*>(.*?)<\/a>/', '$2 ($1)', $item['answer'] ) ), ENT_QUOTES, 'UTF-8' );
+        }
+        $text[] = '';
+        /* translators: %s: the address of the site */
+        $text[] = sprintf( __( 'Sent by the MailHawk plugin on %s. You can ignore this email.', 'mailhawk' ), home_url_no_scheme() );
+        return [ 'subject' => $subject, 'html' => $html, 'text' => implode( "\n", $text ) ];
+}
+/**
+ * Give the next email that is sent this plain text version, for an HTML email whose own text would read badly
+ *
+ * @param string $text
+ *
+ * @return \Closure the hook, to remove when the email failed before it got to it, so the next email does not get it
+ */
+function set_next_alt_body( $text ) {
+        $set = function ( $phpmailer ) use ( $text, &$set ) {
+                $phpmailer->AltBody = $text;
+                remove_action( 'phpmailer_init', $set, 99 );
+        };
+        add_action( 'phpmailer_init', $set, 99 );
+        return $set;
+}
 …
         $risk = 0;
         // Test quarantine system using + synatx
+        // Test quarantine system using + syntax
         if ( str_contains( $email_address, '+test-quarantine@' ) ) {
                 return 999;

mailhawk/tags/1.5.2/includes/quarantine.php

r3788980	r3795449
104	104	] );
105	105
106		// Someone must have take care of it already
	106	// Someone must have taken care of it already
107	107	if ( $count_quarantined === 0 ) {
108	108	return;

mailhawk/tags/1.5.2/includes/site-health.php

-              r3794810
+              r3795449
                                 'recommended',
                                 __( 'MailHawk is not connected', 'mailhawk' ),
                                 __( 'Email from this site is not going out through MailHawk, so it is sent the way WordPress does it by default, and it may not reach the inbox.', 'mailhawk' ),
+                                __( 'Email from this site is not going out through MailHawk, so it is sent with the default WordPress mailer and may not reach the inbox.', 'mailhawk' ),
                                 $this->link( mailhawk_admin_page(), __( 'Connect MailHawk', 'mailhawk' ) )
                         );
 …
                         $description = [ __( 'The MailHawk service is not accepting email from this site, so none of it is going out.', 'mailhawk' ) ];
                         // Older MTA builds do not say why
+                        // Older MTA builds do not say why. The reason may not end in a period, so it gets its own.
                         $description[] = $suspension['reason']
+                                ? sprintf( __( 'The reason given: %s', 'mailhawk' ), $suspension['reason'] )
+                                /* translators: %s: the reason MailHawk gave for suspending the account */
+                                ? sprintf( __( 'Reason: %s.', 'mailhawk' ), rtrim( $suspension['reason'], '. ' ) )
                                 : __( 'This is usually a problem with the account or the subscription.', 'mailhawk' );
                         if ( $since ) {
+                                /* translators: %s: date and time the account was suspended */
                                 $description[] = sprintf( __( 'Suspended since %s.', 'mailhawk' ), $since );
+                        }
 …
                                 'critical',
                                 __( 'MailHawk is turning email away', 'mailhawk' ),
                                 __( "This site has used all of its emails for the month, so MailHawk is not sending what it is asked to. The emails it turned away are marked as failed in the log. Sending starts again when the limit resets, or as soon as the plan is upgraded.", 'mailhawk' ),
+                                __( "This site has used all of its emails for the month, so MailHawk is not sending new email. The emails it turned away are marked as failed in the log. Sending starts again when the limit resets, or as soon as the plan is upgraded.", 'mailhawk' ),
                                 $this->upgrade_link() . $this->link( mailhawk_admin_page( [ 'view' => 'log', 'status' => 'failed' ] ), __( 'See the failed emails', 'mailhawk' ) )
                         );
 …
                                 'critical',
                                 __( 'This site used all of its emails for the month', 'mailhawk' ),
+                                /* translators: 1: emails sent this month, 2: emails in the plan */
                                 sprintf( __( 'This site sent %1$s of the %2$s emails in its plan. MailHawk turns email away until the limit resets.', 'mailhawk' ), number_format_i18n( $used ), number_format_i18n( $limit ) ),
                                 $this->upgrade_link()
 …
                                 'recommended',
                                 __( 'This site is close to the limit of its plan', 'mailhawk' ),
+                                /* translators: 1: emails sent this month, 2: emails in the plan */
                                 sprintf( __( 'This site sent %1$s of the %2$s emails in its plan this month. When they are used up, MailHawk turns email away until the limit resets.', 'mailhawk' ), number_format_i18n( $used ), number_format_i18n( $limit ) ),
                                 $this->upgrade_link()
 …
                         'good',
                         __( 'This site has emails left this month', 'mailhawk' ),
+                        /* translators: 1: emails sent this month, 2: emails in the plan */
                         sprintf( __( 'This site sent %1$s of the %2$s emails in its plan this month.', 'mailhawk' ), number_format_i18n( $used ), number_format_i18n( $limit ) )
                 );

mailhawk/tags/1.5.2/mailhawk.php

-              r3794810
+              r3795449
  * Plugin URI: https://mailhawk.io
  * Description: Send better email that will reach the inbox with MailHawk.
  * Version: 1.5.1
+ * Version: 1.5.2
  * Requires at least: 6.9
  * Requires PHP: 7.4
 …
 if ( ! defined( 'ABSPATH' ) ) exit;
 define( 'MAILHAWK_VERSION', '1.5.1' );
 define( 'MAILHAWK_PREVIOUS_STABLE_VERSION', '1.5.0' );
+define( 'MAILHAWK_VERSION', '1.5.2' );
+define( 'MAILHAWK_PREVIOUS_STABLE_VERSION', '1.5.1' );
 define( 'MAILHAWK_LICENSE_SERVER_URL', 'https://mailhawk.io' );

mailhawk/tags/1.5.2/readme.txt

-              r3794810
+              r3795449
 Requires at least: 6.9
 Tested up to: 7.1
 Stable tag: 1.5.1
+Stable tag: 1.5.2
 Requires PHP: 7.4
 License: GPLv3 or later
 …
 == Changelog ==
+= 1.5.2 (2026-11-10) =
+* ADDED The test email can be sent from any address. A dropdown suggests the default from address and the same name at each of your domains, and a warning says when the domain of the address you pick is not verified, or not one of your MailHawk domains.
+* IMPROVED The test email is now a branded email that says what it means for where it landed: the inbox, Gmail's Updates or Promotions tabs, Outlook's Other folder, or spam. The Test screen has the same tips, and what to do when it did not arrive at all.
+* ADDED A "Copy instructions" button on the DNS screen copies everything someone else needs to add the records, like an agency, a developer or an AI assistant: every record with its host, full hostname, value and TTL, what to do with an SPF record that is already there, and where to verify.
+* IMPROVED Record names on the DNS screen copy with one click: the highlighted host copies just the host, anywhere else copies the full hostname. The screen also explains what to enter when the records of a subdomain go in the DNS of its parent domain, and the host of the return path no longer includes your domain, so DNS providers that add it themselves don't end up with it twice.
+* TWEAKED Clearer wording on the overview, in Site Health, and on the suspended screen and notice. When the monthly limit is reached, the notice on the overview is titled "Your monthly email limit is reached".
+* FIXED Some error messages and the usage line on the overview could not be translated.
+* DEV The `mailhawk/get-domain-dns` ability returns the `host` and the full `hostname` of each record.
+* DEV New filter `mailhawk/second_level_suffixes` lists the suffixes like co.uk that domains are registered under, so the DNS screen does not take example.co.uk for a subdomain.
 = 1.5.1 (2026-11-10) =

mailhawk/tags/1.5.2/uninstall.php

-              r3793271
+              r3795449
  * @package     MailHawk
  * @subpackage  Uninstall
  * @copyright   Copyright (c) 2015, Pippin Williamson
  * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
  * @since       1.4.3
+ * @copyright   Copyright (c) MailHawk Inc.
+ * @license     https://www.gnu.org/licenses/gpl-3.0.html GNU General Public License v3 or later
+ * @since       1.0.0
  */
 …
 if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) exit;
 // Load WPGH file.
+// Load the plugin so its tables can be dropped.
 include_once __DIR__ . '/mailhawk.php';

mailhawk/trunk/admin/admin.php

-              r3794810
+              r3795449
 use function MailHawk\dismiss_notice;
 use function MailHawk\get_array_var;
+use function MailHawk\get_test_email;
+use function MailHawk\set_next_alt_body;
 use function MailHawk\get_dismissible_notices;
 use function MailHawk\get_hostname;
 …
+                }
+                $to      = sanitize_email( get_post_var( 'to_address' ) );
+                $subject = sanitize_text_field( get_post_var( 'subject' ) );
+                $body    = sanitize_textarea_field( get_post_var( 'content' ) );
+                $this->test_data['to']      = $to;
+                $this->test_data['subject'] = $subject;
+                $this->test_data['body']    = $body;
+                $to   = sanitize_email( get_post_var( 'to_address' ) );
+                $from = sanitize_email( get_post_var( 'from_address' ) );
+                $this->test_data['to']   = $to;
+                $this->test_data['from'] = $from;
                 if ( ! $to ) {
 …
                 add_action( 'wp_mail_failed', [ $this, 'maybe_email_failed' ] );
+                $success = wp_mail( $to, $subject, $body, [
+                        'sender' => 'app@mailhawk.io'
+                ] );
+                // Always the same email, what is being tested is whether it arrives and where
+                $email   = get_test_email( $to, $from );
+                $headers = [ 'Content-Type: text/html' ];
+                // From the address that was picked, with the default from name. Without one it is the default from address.
+                if ( $from ) {
+                        $name      = (string) get_option( 'mailhawk_default_from_name' );
+                        $headers[] = $name ? sprintf( 'From: %s <%s>', $name, $from ) : sprintf( 'From: %s', $from );
+                }
+                $alt_body = set_next_alt_body( $email['text'] );
+                $success = wp_mail( $to, $email['subject'], $email['html'], $headers );
+                remove_action( 'phpmailer_init', $alt_body, 99 );
                 if ( $success ) {
 …
                 wp_localize_script( 'mailhawk-admin', 'MailHawkConnect', [
                         'connecting_text' => '<span class="dashicons dashicons-admin-generic"></span>' . __( 'Connecting You To MailHawk...', 'mailhawk' )
+                ] );
+                // What the DNS screen says when a name is copied
+                wp_localize_script( 'mailhawk-admin', 'MailHawkDns', [
+                        'host_copied'     => __( 'Host copied', 'mailhawk' ),
+                        'hostname_copied' => __( 'Full hostname copied', 'mailhawk' ),
                 ] );
 …
             <p>
                                 <?php if ( $suspension['reason'] ) : ?>
+                                        <?php printf( __( '<b>Attention:</b> MailHawk has suspended your account, so email from this site is not being sent. The reason given: %s', 'mailhawk' ), esc_html( $suspension['reason'] ) ); ?>
+                                        <?php
+                                        /* translators: %s: the reason MailHawk gave for suspending the account */
+                                        printf( __( '<b>Attention:</b> MailHawk has suspended your account, so email from this site is not being sent. Reason: %s', 'mailhawk' ), esc_html( $suspension['reason'] ) );
+                                        ?>
                                 <?php else : ?>
                                         <?php _e( '<b>Attention:</b> It looks like your account has been suspended. To continue sending email you must reactivate your account.', 'mailhawk' ); ?>
                                 <?php endif; ?>
-                                <?php if ( $since ) : ?>
-                                        <?php printf( esc_html__( 'Suspended since %s.', 'mailhawk' ), esc_html( $since ) ); ?>
-                                <?php endif; ?>
-                                <?php if ( 'organization' === $suspension['scope'] ) : ?>
-                                        <?php _e( 'The whole MailHawk account is suspended, so none of its sites can send email.', 'mailhawk' ); ?>
-                                <?php endif; ?>
             </p>
+                        <?php if ( $since || 'organization' === $suspension['scope'] ) : ?>
+                <p>
+                                        <?php if ( $since ) : ?>
+                                                <?php
+                                                /* translators: %s: date and time the account was suspended */
+                                                printf( esc_html__( 'Suspended since %s.', 'mailhawk' ), esc_html( $since ) );
+                                                ?>
+                                        <?php endif; ?>
+                                        <?php if ( 'organization' === $suspension['scope'] ) : ?>
+                                                <?php _e( 'The whole MailHawk account is suspended, so none of its sites can send email.', 'mailhawk' ); ?>
+                                        <?php endif; ?>
+                </p>
+                        <?php endif; ?>
             <p>
                 <a href="<?php echo esc_url( mailhawk_account_url() ); ?>" target="_blank" rel="noopener"
 …
                 ?>
         <div class="notice notice-success is-dismissible">
+            <p><?php printf( __( 'We sent a test email to %s.', 'mailhawk' ), "<code>" . esc_html( get_array_var( $this->test_data, 'to' ) ) . "</code>" ); ?></p>
+            <p><?php
+                                if ( get_array_var( $this->test_data, 'from' ) ) {
+                                        /* translators: 1: recipient of the test email, 2: the address it was sent from */
+                                        printf( __( 'We sent a test email to %1$s from %2$s.', 'mailhawk' ), "<code>" . esc_html( get_array_var( $this->test_data, 'to' ) ) . "</code>", "<code>" . esc_html( get_array_var( $this->test_data, 'from' ) ) . "</code>" );
+                                } else {
+                                        /* translators: %s: recipient of the test email */
+                                        printf( __( 'We sent a test email to %s.', 'mailhawk' ), "<code>" . esc_html( get_array_var( $this->test_data, 'to' ) ) . "</code>" );
+                                }
+                                ?></p>
         </div>
                 <?php

mailhawk/trunk/admin/views/dns-single.php

-              r3788980
+              r3795449
 use MailHawk\Api\Postal\Domains;
 use function MailHawk\mailhawk_admin_page;
+use function MailHawk\get_dns_instructions;
+use function MailHawk\get_dns_record_names;
+use function MailHawk\is_maybe_subdomain;
 use function MailHawk\get_spf_record;
 use function MailHawk\get_url_var;
 …
         <?php endif; ?>
+        <?php
+        // The same pair for every record: what goes in the Host or Name field, and the hostname it ends up as
+        $dkim_names        = get_dns_record_names( $domain->dkim->dkim_record_name, $domain->name );
+        $return_path_names = get_dns_record_names( $domain->return_path->return_path_domain, $domain->name );
+        $spf_names         = get_dns_record_names( '@', $domain->name );
+        /**
+         * The full hostname in one pill, with the host inside it as a pill of its own. The host copies just the host, the
+         * rest of it copies the full hostname.
+         *
+         * @param array $names
+         */
+        $name_fields = function ( $names ) use ( $domain ) {
+                // The domain itself has no part before the domain, so it is shown after the @
+                $rest = '@' === $names['host'] ? strtolower( $domain->name ) : substr( $names['hostname'], strlen( $names['host'] ) );
+                ?>
+        <div class="mailhawk-dns-name code" role="button" tabindex="0"
+             data-copy="<?php echo esc_attr( $names['hostname'] ); ?>"
+             title="<?php esc_attr_e( 'Copy the full hostname', 'mailhawk' ); ?>"
+             aria-label="<?php echo esc_attr( sprintf(
+                                 /* translators: %s: the full hostname of a DNS record */
+                                 __( 'Copy the full hostname %s', 'mailhawk' ), $names['hostname'] ) ); ?>">
+            <button type="button" class="mailhawk-dns-host"
+                    data-copy="<?php echo esc_attr( $names['host'] ); ?>"
+                    title="<?php esc_attr_e( 'Copy the host', 'mailhawk' ); ?>"
+                    aria-label="<?php echo esc_attr( sprintf(
+                                                /* translators: %s: the host of a DNS record, relative to the domain */
+                                                __( 'Copy the host %s', 'mailhawk' ), $names['host'] ) ); ?>"><?php echo esc_html( $names['host'] ); ?></button>
+            <span class="mailhawk-dns-rest<?php echo '@' === $names['host'] ? ' is-domain' : ''; ?>"><?php echo esc_html( $rest ); ?></span>
+            <span class="mailhawk-dns-copied" aria-live="polite"></span>
+            <span class="dashicons dashicons-admin-page" aria-hidden="true"></span>
+        </div>
+                <?php
+        };
+        /**
+         * A pill like the name, without a part of its own: the whole of it copies the value
+         *
+         * @param string $value
+         * @param string $label what the value is, for a screen reader
+         */
+        $copy_field = function ( $value, $label ) {
+                ?>
+        <div class="mailhawk-dns-name mailhawk-copy-value code" role="button" tabindex="0"
+             data-copy="<?php echo esc_attr( $value ); ?>"
+             data-copied="<?php esc_attr_e( 'Copied', 'mailhawk' ); ?>"
+             title="<?php echo esc_attr( $value ); ?>"
+             aria-label="<?php echo esc_attr( sprintf(
+                                 /* translators: 1: what is copied, like TTL or value, 2: the text that is copied */
+                                 __( 'Copy the %1$s %2$s', 'mailhawk' ), $label, $value ) ); ?>">
+            <span class="mailhawk-copy-text"><?php echo esc_html( $value ); ?></span>
+            <span class="mailhawk-dns-copied" aria-live="polite"></span>
+            <span class="dashicons dashicons-admin-page" aria-hidden="true"></span>
+        </div>
+                <?php
+        };
+        $ttl_label   = __( 'TTL', 'mailhawk' );
+        $value_label = __( 'value', 'mailhawk' );
+        ?>
+    <p class="description">
+                <?php _e( 'Click the highlighted <b>host</b> to copy just that part, which is what most DNS providers ask for, or anywhere else on the name to copy the <b>full hostname</b>.', 'mailhawk' ); ?>
+                <?php if ( is_maybe_subdomain( $domain->name ) ) : ?>
+                        <?php _e( 'If the records of a subdomain go in the DNS of its parent domain, add the subdomain to the host: for <code>academy.example.com</code> in the DNS of <code>example.com</code>, <code>postal-abc._domainkey</code> becomes <code>postal-abc._domainkey.academy</code>.', 'mailhawk' ); ?>
+                <?php endif; ?>
+    </p>
     <table class="wp-list-table widefat fixed striped dns-list">
         <thead>
 …
         <tr>
             <td><?php _e( '<code>TXT</code> (DKIM)' ) ?></td>
+            <td><input class="code" onfocus="this.select()" type="text"
+                       value="<?php esc_attr_e( strtolower( $domain->dkim->dkim_record_name ) ); ?>"
+                       readonly></td>
+            <td><input class="code" onfocus="this.select()" type="text"
+                       value="3600"
+                       readonly></td>
+            <td><input class="code" onfocus="this.select()" type="text"
+                       value="<?php esc_attr_e( $domain->dkim->dkim_record ); ?>"
+                       readonly></td>
+            <td><?php $name_fields( $dkim_names ); ?></td>
+            <td><?php $copy_field( '3600', $ttl_label ); ?></td>
+            <td><?php $copy_field( (string) $domain->dkim->dkim_record, $value_label ); ?></td>
             <td><?php echo $domain->dkim->dkim_status === 'OK' ? "<span class='tag yes'>" . __( 'Verified', 'mailhawk' ) . "</span>" : "<span class='tag no'>" . __( 'Unverified' ) . "</span>"; ?>
             </td>
 …
         <tr>
             <td><?php _e( '<code>CNAME</code>' ) ?></td>
+            <td><input class="code" onfocus="this.select()" type="text"
+                       value="<?php esc_attr_e( strtolower( $domain->return_path->return_path_domain ) ); ?>"
+                       readonly></td>
+            <td><input class="code" onfocus="this.select()" type="text"
+                       value="3600"
+                       readonly></td>
+            <td><input class="code" onfocus="this.select()" type="text"
+                       value="rp.mta01.mailhawk.io"
+                       readonly></td>
+            <td><?php $name_fields( $return_path_names ); ?></td>
+            <td><?php $copy_field( '3600', $ttl_label ); ?></td>
+            <td><?php $copy_field( 'rp.mta01.mailhawk.io', $value_label ); ?></td>
             <td><?php echo $domain->return_path->return_path_status === 'OK' ? "<span class='tag yes'>" . __( 'Verified', 'mailhawk' ) . "</span>" : "<span class='tag no'>" . __( 'Unverified' ) . "</span>"; ?>
             </td>
 …
         <tr>
             <td><?php _e( '<code>TXT</code> (SPF)' ) ?></td>
+            <td><input class="code" onfocus="this.select()" type="text"
+                       value="@"
+                       readonly></td>
+            <td><input class="code" onfocus="this.select()" type="text"
+                       value="3600"
+                       readonly></td>
+            <td><?php $name_fields( $spf_names ); ?></td>
+            <td><?php $copy_field( '3600', $ttl_label ); ?></td>
             <td>
 …
                         endif; ?>
+                <input class="code" onfocus="this.select()" type="text"
+                       value="<?php esc_attr_e( $spf_record ); ?>"
+                       readonly></td>
+                                <?php $copy_field( (string) $spf_record, $value_label ); ?></td>
             <td><?php echo $domain->spf->spf_status === 'OK' ? "<span class='tag yes'>" . __( 'Verified', 'mailhawk' ) . "</span>" : "<span class='tag no'>" . __( 'Unverified' ) . "</span>"; ?>
             </td>
 …
             <a href="https://mailhawk.io/configure-dns/"
                target="_blank"><?php _e( 'Learn how to configure your DNS', 'mailhawk' ); ?></a></p>
+        <p class="mailhawk-dns-handoff">
+                        <?php _e( 'Someone else manages your DNS, like an agency, a developer or an AI assistant?', 'mailhawk' ); ?>
+            <button type="button" class="button button-secondary mailhawk-copy-button"
+                    data-copy="<?php echo esc_attr( get_dns_instructions( $domain ) ); ?>"
+                    data-copied="<?php esc_attr_e( 'Instructions copied', 'mailhawk' ); ?>">
+                <span class="dashicons dashicons-clipboard" aria-hidden="true"></span>
+                <span class="mailhawk-copy-button-label"><?php _e( 'Copy instructions', 'mailhawk' ); ?></span>
+            </button>
+        </p>
     </div>
     <p>

mailhawk/trunk/admin/views/dns.php

-              r3788980
+              r3795449
 // Todo get domains from API
 use MailHawk\Api\Postal\Domains;
+use function MailHawk\get_dns_record_names;
+use function MailHawk\is_maybe_subdomain;
 use function MailHawk\mailhawk_admin_page;
 …
                    readonly>
             <h3><?php _e( 'DKIM Record' ); ?></h3>
+            <p class="description"><?php printf( __( 'You need to add a new TXT record with the name <code>%s</code> with the following content.', 'mailhawk' ), esc_html( strtolower( $domain->dkim->dkim_record_name ) ) ); ?></p>
+                        <?php $dkim_names = get_dns_record_names( $domain->dkim->dkim_record_name, $domain->name ); ?>
+            <p class="description"><?php printf(
+                                        /* translators: 1: the record host, relative to the domain, 2: the full hostname */
+                                        __( 'You need to add a new TXT record with the host <code>%1$s</code> (full hostname <code>%2$s</code>) with the following content.', 'mailhawk' ),
+                                        esc_html( $dkim_names['host'] ),
+                                        esc_html( $dkim_names['hostname'] )
+                                ); ?>
+                                <?php if ( is_maybe_subdomain( $domain->name ) ) : ?>
+                                        <?php _e( 'If you add it in the DNS of a parent domain, add the subdomain to the host.', 'mailhawk' ); ?>
+                                <?php endif; ?></p>
             <input class="code" onfocus="this.select()" type="text"
                    value="<?php esc_attr_e( $domain->dkim->dkim_record ); ?>"

mailhawk/trunk/admin/views/overview.php

-              r3794810
+              r3795449
 <?php if ( $is_throttled ): ?>
     <div class="mailhawk-content-box mailhawk-throttle-notice">
         <h2><?php _e( 'Email is being held back', 'mailhawk' ); ?></h2>
+        <h2><?php _e( 'Your monthly email limit is reached', 'mailhawk' ); ?></h2>
         <p>
                         <?php _e( "This site has used all of its emails for the month, so MailHawk is turning email away instead of sending it. The emails it turns away are marked as failed in the log.", 'mailhawk' ); ?>
                         <?php if ( $resets_at ): ?>
+                                <?php printf( __( 'Sending starts again when the limit resets on %s (UTC), or as soon as the plan is upgraded.', 'mailhawk' ), esc_html( date_i18n( get_option( 'date_format' ), $resets_at, true ) ) ); ?>
+                                <?php
+                                /* translators: %s: date the monthly limit resets */
+                                printf( __( 'Sending starts again when the limit resets on %s (UTC), or as soon as the plan is upgraded.', 'mailhawk' ), esc_html( date_i18n( get_option( 'date_format' ), $resets_at, true ) ) );
+                                ?>
                         <?php else: ?>
                                 <?php _e( 'Sending starts again when the limit resets, or as soon as the plan is upgraded.', 'mailhawk' ); ?>
 …
     </div>
     <p>
+                <?php printf( 'Used: <b>%s</b> / %s', number_format_i18n( $usage ), number_format_i18n( $limit ) ); ?>
+                <?php
+                /* translators: 1: emails used this month, 2: monthly limit */
+                printf( __( 'Used: %1$s / %2$s', 'mailhawk' ), '<b>' . number_format_i18n( $usage ) . '</b>', number_format_i18n( $limit ) );
+                ?>
                 <?php if ( $resets_at ): ?>
+            <span class="usage-resets">&middot; <?php printf( __( 'Resets on %s (UTC)', 'mailhawk' ), esc_html( date_i18n( get_option( 'date_format' ), $resets_at, true ) ) ); ?></span>
+            <span class="usage-resets">&middot; <?php
+                                /* translators: %s: date the monthly limit resets */
+                                printf( __( 'Resets on %s (UTC)', 'mailhawk' ), esc_html( date_i18n( get_option( 'date_format' ), $resets_at, true ) ) );
+                                ?></span>
                 <?php endif; ?>
     </p>
 …
                                         <?php _e( 'Upgrade your plan so your email keeps going out.', 'mailhawk' ); ?>
                                 <?php else: ?>
+                    <b><?php printf( __( "You've used %s%% of this month's emails.", 'mailhawk' ), number_format_i18n( $percent_usage ) ); ?></b>
+                    <b><?php
+                                                /* translators: %s: percentage of this month's emails used */
+                                                printf( __( "You've used %s%% of this month's emails.", 'mailhawk' ), number_format_i18n( $percent_usage ) );
+                                                ?></b>
                                         <?php _e( 'Upgrade your plan before you run out.', 'mailhawk' ); ?>
                                 <?php endif; ?>

mailhawk/trunk/admin/views/suspended.php

-              r3793271
+              r3795449
                 <?php endif; ?>
                 <?php if ( $since ) : ?>
+            <p><?php printf( esc_html__( 'Suspended since %s.', 'mailhawk' ), esc_html( $since ) ); ?></p>
+            <p><?php
+                                /* translators: %s: date and time the account was suspended */
+                                printf( esc_html__( 'Suspended since %s.', 'mailhawk' ), esc_html( $since ) );
+                                ?></p>
                 <?php endif; ?>
                 <?php if ( 'organization' === $suspension['scope'] ) : ?>
             <p><?php _e( 'The whole MailHawk account is suspended, so none of its sites can send email.', 'mailhawk' ); ?></p>
                 <?php endif; ?>
         <p><?php _e( 'Your MailHawk account page says what to do next, for example to renew the subscription or to send an incident report.', 'mailhawk' ); ?></p>
+        <p><?php _e( 'Your MailHawk account page says what to do next, for example, renewing your subscription or sending an incident report.', 'mailhawk' ); ?></p>
         <a class="button button-primary big-button mailhawk-cta" href="<?php echo esc_url( mailhawk_account_url() ); ?>" target="_blank" rel="noopener">
             <span class="dashicons dashicons-external" aria-hidden="true"></span>

mailhawk/trunk/admin/views/test.php

-              r2309454
+              r3795449
 <?php
+use MailHawk\Api\Postal\Domains;
+use function MailHawk\get_array_var;
+use function MailHawk\get_default_from_email_address;
+use function MailHawk\get_test_email_faq;
+use function MailHawk\get_test_from_addresses;
+use function MailHawk\mailhawk_admin_page;
+// The domains MailHawk knows, to suggest addresses to send from and to warn about ones that are not authenticated
+$domains = Domains::query_all();
+$from    = get_test_from_addresses( is_wp_error( $domains ) ? [] : $domains );
+// What was sent last stays, the default from address the first time
+$from_address = get_array_var( $this->test_data, 'from' ) ?: strtolower( (string) get_default_from_email_address() );
 ?>
 <div class="mailhawk-content-box domains">
+<div class="mailhawk-content-box domains mailhawk-test-email">
         <p><b><?php _e( 'Send a test email:', 'mailhawk' ); ?></b></p>
     <form method="post">
             <?php wp_nonce_field( 'send_test_email', '_mailhawk_nonce' ); ?>
+                <?php
+                // The default first, then the addresses on verified domains, then the rest
+                $groups = [ 'default' => [], 'verified' => [], 'unverified' => [] ];
+                foreach ( $from['addresses'] as $address ) {
+                        $groups[ $address['default'] ? 'default' : ( $address['authenticated'] ? 'verified' : 'unverified' ) ][] = $address['email'];
+                }
+                $suggested = in_array( $from_address, wp_list_pluck( $from['addresses'], 'email' ), true );
+                ?>
         <p>
+            <input type="text" name="subject" class="regular-text" placeholder="<?php esc_attr_e( 'Subject line...', 'mailhawk' ); ?>" value="<?php esc_attr_e( 'MailHawk is connected!', 'mailhawk' );?>" >
+            <label for="mailhawk-test-from-select"><?php _e( 'From', 'mailhawk' ); ?></label><br>
+            <select id="mailhawk-test-from-select" class="regular-text" hidden>
+                                <?php foreach ( $groups['default'] as $email ) : ?>
+                    <option value="<?php echo esc_attr( $email ); ?>" <?php selected( $email, $from_address ); ?>><?php
+                                                /* translators: %s: the default from email address */
+                                                echo esc_html( sprintf( __( '%s (default)', 'mailhawk' ), $email ) );
+                                                ?></option>
+                                <?php endforeach; ?>
+                                <?php if ( $groups['verified'] ) : ?>
+                    <optgroup label="<?php esc_attr_e( 'Verified domains', 'mailhawk' ); ?>">
+                                                <?php foreach ( $groups['verified'] as $email ) : ?>
+                            <option value="<?php echo esc_attr( $email ); ?>" <?php selected( $email, $from_address ); ?>><?php echo esc_html( $email ); ?></option>
+                                                <?php endforeach; ?>
+                    </optgroup>
+                                <?php endif; ?>
+                                <?php if ( $groups['unverified'] ) : ?>
+                    <optgroup label="<?php esc_attr_e( 'Domains that are not verified', 'mailhawk' ); ?>">
+                                                <?php foreach ( $groups['unverified'] as $email ) : ?>
+                            <option value="<?php echo esc_attr( $email ); ?>" <?php selected( $email, $from_address ); ?>><?php echo esc_html( $email ); ?></option>
+                                                <?php endforeach; ?>
+                    </optgroup>
+                                <?php endif; ?>
+                <option value="" <?php selected( ! $suggested ); ?>><?php _e( 'Other address&hellip;', 'mailhawk' ); ?></option>
+            </select>
+                        <?php // What is sent. Without JavaScript it is the field, with it the select fills it in and it is only shown for another address. ?>
+            <input type="email" name="from_address" id="mailhawk-test-from" class="regular-text"
+                   aria-label="<?php esc_attr_e( 'From address', 'mailhawk' ); ?>"
+                   placeholder="<?php esc_attr_e( 'name@yourdomain.com', 'mailhawk' ); ?>"
+                   value="<?php echo esc_attr( $from_address ); ?>"
+                   data-domains="<?php echo esc_attr( wp_json_encode( (object) $from['domains'] ) ); ?>">
         </p>
+        <div class="mailhawk-test-from-warning notice notice-warning inline" hidden
+             data-unverified="<?php
+                                /* translators: %s: the domain of the from address */
+                                echo esc_attr__( 'The DNS records of %s are not all verified, so this email may go to spam or be refused.', 'mailhawk' );
+                                ?>"
+             data-unknown="<?php
+                                /* translators: %s: the domain of the from address */
+                                echo esc_attr__( '%s is not one of your MailHawk domains, so this email can not be authenticated and may go to spam or be refused.', 'mailhawk' );
+                                ?>"
+             data-dns-url="<?php echo esc_attr( mailhawk_admin_page( [ 'view' => 'domains', 'domain' => '%s' ] ) ); ?>"
+             data-domains-url="<?php echo esc_attr( mailhawk_admin_page( [ 'view' => 'domains' ] ) ); ?>">
+            <p>
+                <span class="mailhawk-test-from-warning-text"></span>
+                <a class="mailhawk-test-from-warning-link" href="#"
+                   data-unverified="<?php esc_attr_e( 'Check the DNS records', 'mailhawk' ); ?>"
+                   data-unknown="<?php esc_attr_e( 'Add the domain', 'mailhawk' ); ?>"></a>
+            </p>
+        </div>
         <p>
+            <textarea name="content" class="regular-text" rows="4" placeholder="<?php esc_attr_e( 'Content...', 'mailhawk' ); ?>"><?php esc_html_e( 'Hello World!', 'mailhawk' ); ?></textarea>
+        </p>
+        <p>
+            <input type="email" name="to_address" class="regular-text"
+            <label for="mailhawk-test-to"><?php _e( 'To', 'mailhawk' ); ?></label><br>
+            <input type="email" name="to_address" id="mailhawk-test-to" class="regular-text"
                    value="<?php esc_attr_e( wp_get_current_user()->user_email ); ?>">
             <input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Send Test' ); ?>">
         </p>
     </form>
     <p class="description"><?php _e( 'Send a test email to yourself to ensure MailHawk is properly connected and your deliverability is good.', 'mailhawk' ); ?></p>
+    <p class="description"><?php _e( 'MailHawk sends a short email that confirms the site can send, with tips on what it means for where it lands. Send it to an address of your own at Gmail, Outlook or wherever your customers are, and see where it ends up.', 'mailhawk' ); ?></p>
 </div>
+<div class="mailhawk-content-box mailhawk-test-faq">
+    <p><b><?php _e( 'Where did it land?', 'mailhawk' ); ?></b></p>
+        <?php foreach ( get_test_email_faq( true ) as $item ) : ?>
+        <details>
+            <summary><?php echo esc_html( $item['question'] ); ?></summary>
+            <p><?php echo wp_kses( $item['answer'], [ 'a' => [ 'href' => true ], 'b' => [], 'i' => [] ] ); ?></p>
+        </details>
+        <?php endforeach; ?>
+</div>

mailhawk/trunk/assets/css/admin.css

-              r3793271
+              r3795449
 .not-sure-dns {
+    border-color: #e1e5ea;
     border-radius: 0 0 10px 10px;
+}
+/* The test email */
+.mailhawk-test-email label {
+    font-weight: 600;
+}
+.mailhawk-test-email .mailhawk-test-from-warning {
+    max-width: 25em;
+    margin: -4px 0 12px;
+}
+.mailhawk-test-email .mailhawk-test-from-warning[hidden],
+.mailhawk-test-email [hidden] {
+    display: none;
+}
+/* The field for another address sits under the select */
+.mailhawk-test-email #mailhawk-test-from-select + #mailhawk-test-from {
+    display: block;
+    margin-top: 8px;
+}
+.mailhawk-test-email #mailhawk-test-from-select + #mailhawk-test-from[hidden] {
+    display: none;
+}
+/* Where the test email landed, one question open at a time is plenty */
+.mailhawk-test-faq details {
+    border-top: 1px solid #e1e5ea;
+}
+.mailhawk-test-faq details:last-child {
+    border-bottom: 1px solid #e1e5ea;
+}
+.mailhawk-test-faq summary {
+    padding: 12px 0;
+    font-weight: 600;
+    cursor: pointer;
+}
+.mailhawk-test-faq details p {
+    max-width: 50em;
+    margin: 0 0 14px;
+    color: #50575e;
+}
+/* Handing the DNS records to someone else */
+.not-sure-dns .mailhawk-dns-handoff {
+    margin: 0;
+    padding: 12px 0;
+    border-top: 1px solid #e1e5ea;
+    color: #50575e;
+}
+/* The ID matches the rule that makes every button in a content box a block */
+#wpbody .mailhawk-content-box .mailhawk-copy-button.button {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+    margin-left: 6px;
+    vertical-align: middle;
+}
+.mailhawk-copy-button .dashicons {
+    font-size: 16px;
+    width: 16px;
+    height: 16px;
+}
+.mailhawk-copy-button.button.copied,
+.mailhawk-copy-button.button.copied:hover,
+.mailhawk-copy-button.button.copied:focus {
+    border-color: #2ba123;
+    background: #e3f5e8;
+    color: #146c2e;
+}
+/* The DNS table and the help under it are one card, so the table only rounds its top corners */
+.mailhawk-view-content .wp-list-table.dns-list {
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+}
 …
+    }
+}
+/* DNS record names: the full hostname as a pill, with the host as a pill inside it */
+.mailhawk-dns-name {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 0;
+    box-sizing: border-box;
+    width: 100%;
+    min-height: 40px;
+    padding: 4px 10px 4px 4px;
+    border: 1px solid #cfd6de;
+    border-radius: 6px;
+    background: #f6f7f7;
+    color: #1d2327;
+    font-family: Consolas, Monaco, monospace;
+    font-size: 14px;
+    line-height: 1.4;
+    cursor: copy;
+    word-break: break-all;
+    transition: border-color .15s, background-color .15s;
+}
+.mailhawk-dns-name:hover,
+.mailhawk-dns-name:focus-visible {
+    border-color: #2271b1;
+    background: #f0f6fc;
+    outline: none;
+}
+.mailhawk-dns-name .mailhawk-dns-host {
+    padding: 3px 7px;
+    border: 1px solid #2271b1;
+    border-radius: 4px;
+    background: #fff;
+    color: #2271b1;
+    font: inherit;
+    cursor: copy;
+    transition: background-color .15s, color .15s;
+}
+.mailhawk-dns-name .mailhawk-dns-host:hover,
+.mailhawk-dns-name .mailhawk-dns-host:focus-visible {
+    background: #2271b1;
+    color: #fff;
+    outline: none;
+}
+.mailhawk-dns-name .mailhawk-dns-rest {
+    padding-left: 1px;
+    color: #50575e;
+}
+/* The domain itself, shown after the @ */
+.mailhawk-dns-name .mailhawk-dns-rest.is-domain {
+    padding-left: 8px;
+}
+.mailhawk-dns-name .dashicons {
+    margin-left: auto;
+    padding-left: 8px;
+    color: #8c8f94;
+    font-size: 16px;
+    line-height: 20px;
+}
+.mailhawk-dns-name:hover .dashicons {
+    color: #2271b1;
+}
+.mailhawk-dns-name .mailhawk-dns-copied {
+    margin-left: auto;
+    padding-left: 8px;
+    color: #146c2e;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
+    font-size: 12px;
+    white-space: nowrap;
+}
+.mailhawk-dns-name .mailhawk-dns-copied:empty {
+    display: none;
+}
+/* Copied: the icon makes way for what was copied, and the part that was copied shows it */
+.mailhawk-dns-name.copied-host .dashicons,
+.mailhawk-dns-name.copied-hostname .dashicons {
+    display: none;
+}
+.mailhawk-dns-name.copied-hostname {
+    border-color: #2ba123;
+    background: #e3f5e8;
+}
+.mailhawk-dns-name.copied-host .mailhawk-dns-host {
+    border-color: #2ba123;
+    background: #2ba123;
+    color: #fff;
+}
+/* The TTL and value: one line, a long value is cut short on screen but copied whole */
+.mailhawk-dns-name.mailhawk-copy-value {
+    flex-wrap: nowrap;
+    padding-left: 10px;
+    text-align: left;
+    word-break: normal;
+}
+.mailhawk-copy-value .mailhawk-copy-text {
+    flex: 1 1 auto;
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}

mailhawk/trunk/assets/js/admin.js

-              r3788980
+              r3795449
+(function ($, connect, review, groundhogg) {
+(function ($, connect, review, groundhogg, dns) {
+    // Copy text, with a fallback for wp-admin served without HTTPS, where the clipboard API is not there
+    function copyText(text) {
+        if (navigator.clipboard && window.isSecureContext) {
+            return navigator.clipboard.writeText(text);
+        }
+        var $field = $('<textarea readonly>').val(text).css({position: 'fixed', top: 0, left: 0, opacity: 0}).appendTo('body');
+        $field[0].select();
+        var copied = document.execCommand('copy');
+        $field.remove();
+        return copied ? $.Deferred().resolve().promise() : $.Deferred().reject().promise();
+    }
+    // The names on the DNS screen: the host inside copies just the host, the rest of the pill the full hostname. The
+    // TTL and value pills copy what they show.
+    $(document).on('click', '.mailhawk-dns-name, .mailhawk-dns-host', function (e) {
+        e.stopPropagation();
+        var $target = $(this);
+        var $name = $target.closest('.mailhawk-dns-name');
+        var isHost = $target.is('.mailhawk-dns-host');
+        $.when(copyText($target.attr('data-copy'))).done(function () {
+            // A value says it in its own words, a name says which part
+            $name.find('.mailhawk-dns-copied').text($name.attr('data-copied') || (isHost ? dns.host_copied : dns.hostname_copied));
+            $name.toggleClass('copied-host', isHost).toggleClass('copied-hostname', !isHost);
+            clearTimeout($name.data('copiedTimer'));
+            $name.data('copiedTimer', setTimeout(function () {
+                $name.removeClass('copied-host copied-hostname').find('.mailhawk-dns-copied').text('');
+            }, 1500));
+        });
+    });
+    // A button that copies a block of text, like the DNS instructions, and says so on itself for a moment
+    $(document).on('click', '.mailhawk-copy-button', function () {
+        var $button = $(this);
+        var $label = $button.find('.mailhawk-copy-button-label');
+        if (!$button.data('label')) {
+            $button.data('label', $label.text());
+        }
+        $.when(copyText($button.attr('data-copy'))).done(function () {
+            $label.text($button.attr('data-copied'));
+            $button.addClass('copied');
+            clearTimeout($button.data('copiedTimer'));
+            $button.data('copiedTimer', setTimeout(function () {
+                $label.text($button.data('label'));
+                $button.removeClass('copied');
+            }, 2000));
+        });
+    });
+    // The test email: say so when the address it is sent from is on a domain that is not verified, or not MailHawk's
+    $(function () {
+        var $from = $('#mailhawk-test-from');
+        var $warning = $('.mailhawk-test-from-warning');
+        if (!$from.length || !$warning.length) {
+            return;
+        }
+        var domains = $from.data('domains') || {};
+        var $link = $warning.find('.mailhawk-test-from-warning-link');
+        var $select = $('#mailhawk-test-from-select');
+        // The select picks a suggested address, its last choice opens the field for any other
+        function pick() {
+            var value = $select.val();
+            $from.prop('hidden', value !== '');
+            if (value !== '') {
+                $from.val(value);
+            } else if ($select.find('option[value="' + $from.val() + '"]').length) {
+                // Coming from a suggestion, start the other address empty
+                $from.val('').trigger('focus');
+            }
+            check();
+        }
+        $select.prop('hidden', false).on('change', pick);
+        function check() {
+            var email = $.trim($from.val()).toLowerCase();
+            var at = email.lastIndexOf('@');
+            var domain = at > 0 ? email.slice(at + 1) : '';
+            // Nothing to say until there is an address to say it about, or when its domain is verified
+            if (!domain || domain.indexOf('.') === -1 || domains[domain] === true) {
+                $warning.prop('hidden', true);
+                return;
+            }
+            var known = Object.prototype.hasOwnProperty.call(domains, domain);
+            var kind = known ? 'unverified' : 'unknown';
+            $warning.find('.mailhawk-test-from-warning-text').text($warning.attr('data-' + kind).replace('%s', domain));
+            $link.text($link.attr('data-' + kind)).attr('href', known
+                ? $warning.attr('data-dns-url').replace('%s', encodeURIComponent(domain))
+                : $warning.attr('data-domains-url'));
+            $warning.prop('hidden', false);
+        }
+        $from.on('input change', check);
+        pick();
+    });
+    // The pill is not a button element, it holds one, so Enter and Space are handled here
+    $(document).on('keydown', '.mailhawk-dns-name', function (e) {
+        if (e.target === this && (e.key === 'Enter' || e.key === ' ')) {
+            e.preventDefault();
+            $(this).trigger('click');
+        }
+    });
     // The suggestions to look at Groundhogg, on the overview and the recipients screen. Learn more opens WordPress' own
 …
 })(jQuery, MailHawkConnect, MailHawkReview, MailHawkGroundhogg);
+})(jQuery, MailHawkConnect, MailHawkReview, MailHawkGroundhogg, MailHawkDns);

mailhawk/trunk/includes/abilities/ability.php

r3793271	r3795449
134	134
135	135	if ( mailhawk_is_suspended() ) {
136		return $this->error( 'suspended', __( 'The MailHawk account is suspended~~, mailhawk/get-status says why and where to g~~o next.', 'mailhawk' ), 409 );
	136	return $this->error( 'suspended', __( 'The MailHawk account is suspended. Use mailhawk/get-status to see why and what to do next.', 'mailhawk' ), 409 );
137	137	}
138	138

mailhawk/trunk/includes/abilities/email/send-test-email.php

-              r3788980
+              r3795449
 use MailHawk\Plugin;
 use WP_Error;
+use function MailHawk\get_test_email;
+use function MailHawk\set_next_alt_body;
 if ( ! defined( 'ABSPATH' ) ) {
 …
+                }
                 $site    = wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
                 $subject = sprintf( __( 'MailHawk test email from %s', 'mailhawk' ), $site );
                 $message = sprintf( __( "This is a test email from %s, sent through MailHawk to check that email is delivered.\n\nYou can ignore it.", 'mailhawk' ), $site );
+                // The same email the Test screen sends
+                $email   = get_test_email( $to );
+                $subject = $email['subject'];
                 $table = Plugin::instance()->log->get_table_name();
 …
                 add_action( 'wp_mail_failed', $catch );
+                $alt_body = set_next_alt_body( $email['text'] );
                 // Straight to MailHawk's mailer, which is what wp_mail() is while the site is connected. A test that went through
                 // whatever else is hooked in would not say anything about MailHawk.
                 try {
                         $sent = mailhawk_mail( $to, $subject, $message );
+                        $sent = mailhawk_mail( $to, $subject, $email['html'], [ 'Content-Type: text/html' ] );
                 } catch ( \Exception $e ) {
                         $sent    = false;
 …
                 } finally {
                         remove_action( 'wp_mail_failed', $catch );
+                        remove_action( 'phpmailer_init', $alt_body, 99 );
+                }

mailhawk/trunk/includes/abilities/formatter.php

-              r3788980
+              r3795449
 use MailHawk\DB\Recipients;
+use function MailHawk\get_dns_record_names;
 use function MailHawk\get_email_status_pretty_name;
 use function MailHawk\get_spf_record;
 …
+                }
+                // What goes in the Host field, relative to the domain, and the full hostname, as the DNS screen shows them
+                $dkim_names        = get_dns_record_names( $domain->dkim->dkim_record_name ?? '', (string) $domain->name );
+                $return_path_names = get_dns_record_names( $domain->return_path->return_path_domain ?? '', (string) $domain->name );
+                $spf_names         = get_dns_record_names( '@', (string) $domain->name );
                 return [
                         'records'             => [
 …
                                         'purpose'  => 'dkim',
                                         'type'     => 'TXT',
+                                        'host'     => $dkim_names['host'],
+                                        'hostname' => $dkim_names['hostname'],
                                         'name'     => strtolower( (string) ( $domain->dkim->dkim_record_name ?? '' ) ),
                                         'value'    => (string) ( $domain->dkim->dkim_record ?? '' ),
 …
                                         'purpose'  => 'return_path',
                                         'type'     => 'CNAME',
+                                        'host'     => $return_path_names['host'],
+                                        'hostname' => $return_path_names['hostname'],
                                         'name'     => strtolower( (string) ( $domain->return_path->return_path_domain ?? '' ) ),
                                         'value'    => self::RETURN_PATH_TARGET,
 …
                                         'purpose'  => 'spf',
                                         'type'     => 'TXT',
+                                        'host'     => $spf_names['host'],
+                                        'hostname' => $spf_names['hostname'],
                                         'name'     => '@',
                                         'value'    => $spf_record,
 …
                                 'records'             => [
                                         'type'        => 'array',
                                         'description' => __( 'The records to add at the DNS host of the domain, as they are shown on the MailHawk DNS screen. A name of @ is the domain itself.', 'mailhawk' ),
+                                        'description' => __( 'The records to add at the DNS host of the domain, as they are shown on the MailHawk DNS screen. host is what goes in the Host or Name field, relative to the domain, and @ is the domain itself. hostname is the full name. For a subdomain whose records are added in the DNS of its parent domain, the subdomain is added to host. name is kept for compatibility: the DKIM name is relative and the return path name is full.', 'mailhawk' ),
                                         'items'       => [
                                                 'type'       => 'object',
 …
                                                                 'enum' => [ 'TXT', 'CNAME' ],
                                                         ],
+                                                        'host'     => [ 'type' => 'string' ],
+                                                        'hostname' => [ 'type' => 'string' ],
                                                         'name'     => [ 'type' => 'string' ],
                                                         'value'    => [ 'type' => 'string' ],
 …
                                                         'verified' => [ 'type' => 'boolean' ],
                                                 ],
                                                 'required'   => [ 'purpose', 'type', 'name', 'value', 'ttl', 'status', 'verified' ],
+                                                'required'   => [ 'purpose', 'type', 'host', 'hostname', 'name', 'value', 'ttl', 'status', 'verified' ],
                                         ],
                                 ],

mailhawk/trunk/includes/abilities/status/get-status.php

-              r3793271
+              r3795449
                         $message = $details['reason']
+                                /* translators: %s: the reason MailHawk gave for suspending the account */
                                 ? sprintf( __( 'The MailHawk account is suspended: %s', 'mailhawk' ), $details['reason'] )
                                 : __( 'The MailHawk account is suspended.', 'mailhawk' );
+                        /* translators: %s: URL of the MailHawk account page */
                         $issues[] = [ 'code' => 'suspended', 'message' => $message . ' ' . sprintf( __( 'What to do next is on the MailHawk account page, %s, where a person has to sign in.', 'mailhawk' ), mailhawk_account_url() ) ];
+                }
 …
                 if ( $usage && $usage['percent'] >= 90 ) {
+                        /* translators: 1: percentage of the monthly allowance used, 2: emails left */
                         $issues[] = [ 'code' => 'usage_high', 'message' => sprintf( __( '%1$s%% of the monthly sending allowance is used, %2$s emails are left.', 'mailhawk' ), $usage['percent'], number_format_i18n( $usage['remaining'] ) ) ];
+                }

mailhawk/trunk/includes/api/postal/messages.php

r3788980	r3795449
62	62
63	63	if ( ! $api_key ) {
64		return new \WP_Error( 'mailhawk_rejected', ~~'Invalid API key.'~~ );
	64	return new \WP_Error( 'mailhawk_rejected', __( 'Invalid API key.', 'mailhawk' ) );
65	65	}
66	66

mailhawk/trunk/includes/api/postal/postal.php

-              r3793271
+              r3795449
                         if ( ! $api_key ){
                                 return new \WP_Error( 'error', 'Invalid API key.' );
+                                return new \WP_Error( 'error', __( 'Invalid API key.', 'mailhawk' ) );
+                        }
 …
                         return new \WP_Error(
                                 'mailhawk_rate_limited',
                                 __( 'MailHawk is slowing down email from this site, usually because the monthly sending limit of the plan is reached. Upgrade the plan, or wait for the limit to reset.', 'mailhawk' ),
+                                __( "MailHawk is slowing down email from this site, usually because the plan's monthly sending limit has been reached. Upgrade the plan, or wait for the limit to reset.", 'mailhawk' ),
                                 [ 'retry_after' => $retry_after ? $retry_after : 5 * MINUTE_IN_SECONDS ]
                         );
+                }
                 $result = new \WP_Error( 'error', 'Unable to complete request.' );
+                $result = new \WP_Error( 'error', __( 'Unable to complete request.', 'mailhawk' ) );
                 // Postal
 …
                                         break;
                                 case 'parameter-error':
                                         $result = new \WP_Error( 'parameter-error', $json->data->message ?? 'Invalid request.' );
+                                        $result = new \WP_Error( 'parameter-error', $json->data->message ?? __( 'Invalid request.', 'mailhawk' ) );
                                         break;
                                 case 'error':
 …
                                                 $message = __( 'MailHawk has suspended this account.', 'mailhawk' );
                                         } else {
+                                                $message = sprintf( 'MailHawk returned an error: %s', $code );
+                                                /* translators: %s: error code returned by MailHawk */
+                                                $message = sprintf( __( 'MailHawk returned an error: %s', 'mailhawk' ), $code );
+                                        }

mailhawk/trunk/includes/functions.php

-              r3794810
+              r3795449
 /**
+ * A DNS record name as the two things a DNS provider may ask for: the host, which is the part before the sending
+ * domain, and the full hostname. The MTA gives the DKIM name relative to the domain (postal-abc._domainkey) and the
+ * return path as a full hostname (psrp.example.com), so both are turned into the same pair.
+ *
+ * @param string $name   the record name, relative to the domain or in full, @ for the domain itself
+ * @param string $domain the sending domain
+ *
+ * @return array host and hostname, both lower case
+ */
+function get_dns_record_names( $name, $domain ) {
+        $name   = strtolower( trim( (string) $name, " \t\n\r\0\x0B." ) );
+        $domain = strtolower( trim( (string) $domain, " \t\n\r\0\x0B." ) );
+        if ( '' === $name || '@' === $name || $name === $domain ) {
+                return [ 'host' => '@', 'hostname' => $domain ];
+        }
+        $suffix = '.' . $domain;
+        // Already the full hostname
+        if ( '' !== $domain && substr( $name, - strlen( $suffix ) ) === $suffix ) {
+                return [ 'host' => substr( $name, 0, - strlen( $suffix ) ), 'hostname' => $name ];
+        }
+        return [ 'host' => $name, 'hostname' => '' !== $domain ? $name . $suffix : $name ];
+}
+/**
+ * Whether the domain may be a subdomain, so its records may have to go in the DNS of a parent domain. A domain of two
+ * parts never is. One of three parts is not when the last two are a suffix people register domains under, like
+ * co.uk. Anything else may be, it is better to say too much than to leave someone without the note they need.
+ *
+ * @param string $domain
+ *
+ * @return bool
+ */
+function is_maybe_subdomain( $domain ) {
+        $labels = explode( '.', strtolower( trim( (string) $domain, '. ' ) ) );
+        if ( count( $labels ) <= 2 ) {
+                return false;
+        }
+        /**
+         * Suffixes of two parts that domains are registered under, like co.uk, so example.co.uk is not taken for a subdomain
+         *
+         * @param string[] $suffixes
+         */
+        $suffixes = apply_filters( 'mailhawk/second_level_suffixes', [
+                'co.uk', 'org.uk', 'me.uk', 'ltd.uk', 'plc.uk', 'net.uk', 'ac.uk', 'gov.uk', 'sch.uk',
+                'com.au', 'net.au', 'org.au', 'edu.au', 'gov.au', 'id.au', 'asn.au',
+                'co.nz', 'net.nz', 'org.nz', 'ac.nz', 'govt.nz',
+                'co.za', 'org.za', 'net.za',
+                'co.in', 'net.in', 'org.in', 'firm.in', 'gen.in', 'ind.in',
+                'co.jp', 'ne.jp', 'or.jp', 'ac.jp', 'go.jp',
+                'co.kr', 'or.kr', 'co.il', 'org.il', 'co.id', 'or.id', 'co.th', 'in.th',
+                'com.br', 'net.br', 'org.br', 'com.mx', 'org.mx', 'com.ar', 'com.co', 'com.pe', 'com.ve', 'com.ec', 'com.uy',
+                'com.cn', 'net.cn', 'org.cn', 'com.hk', 'org.hk', 'com.tw', 'org.tw', 'com.sg', 'org.sg', 'com.my', 'org.my',
+                'com.ph', 'com.vn', 'com.pk', 'com.bd', 'com.tr', 'org.tr', 'com.sa', 'com.eg', 'com.ng', 'com.gh', 'co.ke',
+                'com.ua', 'org.ua', 'com.pl', 'org.pl', 'com.es', 'org.es', 'com.pt', 'com.gr', 'co.at', 'or.at', 'com.cy',
+        ] );
+        return ! ( 3 === count( $labels ) && in_array( $labels[1] . '.' . $labels[2], (array) $suffixes, true ) );
+}
+/**
+ * Plain text instructions for adding a domain's records to its DNS, for whoever does it: an agency, the site's
+ * developer or an AI agent. Everything needed is in the text, nobody has to see the DNS screen.
+ *
+ * @param object $domain a domain from the MTA
+ *
+ * @return string
+ */
+function get_dns_instructions( $domain ) {
+        $name    = strtolower( (string) $domain->name );
+        $dns     = \MailHawk\Abilities\Formatter::dns_records( $domain );
+        $records = $dns['records'];
+        $labels = [
+                'dkim'        => __( 'DKIM, which signs the email so receivers can tell it really came from this domain', 'mailhawk' ),
+                'return_path' => __( 'Return path, where bounces go', 'mailhawk' ),
+                'spf'         => __( 'SPF, which says MailHawk may send email for this domain', 'mailhawk' ),
+        ];
+        $to_add = array_filter( $records, function ( $record ) {
+                return ! $record['verified'];
+        } );
+        $lines = [];
+        /* translators: %s: the sending domain */
+        $lines[] = sprintf( __( 'DNS records for %s', 'mailhawk' ), $name );
+        $lines[] = '';
+        /* translators: %s: the sending domain */
+        $lines[] = sprintf( __( 'The WordPress site sends its email through MailHawk (mailhawk.io). Add the records below at the DNS provider of %s so that email is authenticated with SPF, DKIM and a return path, and reaches the inbox.', 'mailhawk' ), $name );
+        if ( empty( $to_add ) ) {
+                $lines[] = __( 'All of them are already in place and verified, nothing needs to change.', 'mailhawk' );
+        } else if ( count( $to_add ) < count( $records ) ) {
+                $lines[] = __( 'Records marked "already verified" are in place already and can be left alone.', 'mailhawk' );
+        }
+        $lines[] = '';
+        $lines[] = __( 'How to enter the names:', 'mailhawk' );
+        /* translators: %s: the sending domain */
+        $lines[] = '- ' . sprintf( __( 'Each record has a Host, the part of the name before %s, and a Full hostname. Most DNS providers ask for the Host in a field called Host or Name. Use the Full hostname only if the provider asks for the whole name.', 'mailhawk' ), $name );
+        $lines[] = '- ' . __( 'If the provider adds the domain to the name by itself, enter the Host, or the domain ends up in the name twice.', 'mailhawk' );
+        if ( is_maybe_subdomain( $name ) ) {
+                /* translators: %s: the sending domain */
+                $lines[] = '- ' . sprintf( __( 'If %s is a subdomain and its records are kept in the DNS of a parent domain, the Host is the Full hostname without that parent domain. For example, for academy.example.com in the DNS of example.com, postal-abc._domainkey becomes postal-abc._domainkey.academy.', 'mailhawk' ), $name );
+        }
+        $lines[] = '- ' . __( 'An @ as the Host means the domain itself. Some providers want the field left empty for that.', 'mailhawk' );
+        foreach ( $records as $i => $record ) {
+                $lines[] = '';
+                $lines[] = sprintf( '%d. %s%s', $i + 1, $labels[ $record['purpose'] ] ?? $record['purpose'], $record['verified'] ? ' ' . __( '(already verified)', 'mailhawk' ) : '' );
+                /* translators: %s: DNS record type, like TXT or CNAME */
+                $lines[] = '   ' . sprintf( __( 'Type: %s', 'mailhawk' ), $record['type'] );
+                /* translators: %s: the host of the DNS record */
+                $lines[] = '   ' . sprintf( __( 'Host: %s', 'mailhawk' ), $record['host'] );
+                /* translators: %s: the full hostname of the DNS record */
+                $lines[] = '   ' . sprintf( __( 'Full hostname: %s', 'mailhawk' ), $record['hostname'] );
+                /* translators: %s: the value of the DNS record */
+                $lines[] = '   ' . sprintf( __( 'Value: %s', 'mailhawk' ), $record['value'] );
+                /* translators: %d: time to live of the DNS record, in seconds */
+                $lines[] = '   ' . sprintf( __( 'TTL: %d (or the provider\'s default)', 'mailhawk' ), $record['ttl'] );
+                if ( 'return_path' === $record['purpose'] ) {
+                        $lines[] = '   ' . __( 'A CNAME can not share its name with any other record. If the provider proxies DNS records (like Cloudflare), set this one to DNS only.', 'mailhawk' );
+                }
+                if ( 'spf' === $record['purpose'] && ! $record['verified'] ) {
+                        if ( $dns['existing_spf_record'] ) {
+                                /* translators: %s: the SPF record the domain has now */
+                                $lines[] = '   ' . sprintf( __( 'The domain already has an SPF record: %s. A name can only have one, so do not add a second TXT record starting with v=spf1. Replace the existing one with the value above, which is the same record with MailHawk added.', 'mailhawk' ), $dns['existing_spf_record'] );
+                        } else {
+                                $lines[] = '   ' . __( 'A name can only have one SPF record. If a TXT record starting with v=spf1 is there already, add the include: part of the value above to it, before the last part (like ~all), instead of adding a second one.', 'mailhawk' );
+                        }
+                }
+        }
+        $lines[] = '';
+        $lines[] = __( 'When the records are added:', 'mailhawk' );
+        $lines[] = '- ' . __( 'DNS changes usually show up within minutes, but can take up to 24 hours.', 'mailhawk' );
+        /* translators: %s: URL of the DNS screen of this domain in wp-admin */
+        $lines[] = '- ' . sprintf( __( 'Then click Verify on the MailHawk DNS screen in WordPress: %s', 'mailhawk' ), mailhawk_admin_page( [ 'view' => 'domains', 'domain' => $name ] ) );
+        return implode( "\n", $lines );
+}
+/**
  * Get the value of the SPF record or false if it doesn't exist.
+ *
 …
 function get_default_from_email_address() {
         return get_option( 'mailhawk_default_from_email_address' );
+}
+/**
+ * The addresses to suggest sending a test email from: the default from address first, then the same name at each of
+ * the domains registered with MailHawk, and the current user's and the site's own address when their domain is one of
+ * them. Each says whether its domain is authenticated, so a test from it can be expected to reach the inbox.
+ *
+ * @param object[]|mixed $domains the domains from the MTA, anything else is treated as none
+ *
+ * @return array{addresses: array[], domains: bool[]} addresses with email, default and authenticated (null when the
+ *                                                    domain is not registered), and each registered domain with whether
+ *                                                    it is authenticated
+ */
+function get_test_from_addresses( $domains ) {
+        $authenticated = [];
+        foreach ( is_array( $domains ) ? $domains : [] as $domain ) {
+                if ( is_object( $domain ) && ! empty( $domain->name ) ) {
+                        $authenticated[ strtolower( (string) $domain->name ) ] = is_domain_authenticated( $domain );
+                }
+        }
+        // Authenticated domains first, then by name
+        $flags = $authenticated;
+        uksort( $authenticated, function ( $a, $b ) use ( $flags ) {
+                return [ ! $flags[ $a ], $a ] <=> [ ! $flags[ $b ], $b ];
+        } );
+        $default = strtolower( (string) get_default_from_email_address() );
+        $local   = is_email( $default ) ? strstr( $default, '@', true ) : 'wordpress';
+        $emails = [ $default ];
+        foreach ( array_keys( $authenticated ) as $name ) {
+                $emails[] = $local . '@' . $name;
+        }
+        // People's own addresses, only on a domain MailHawk can send for
+        foreach ( [ wp_get_current_user()->user_email, get_option( 'admin_email' ) ] as $email ) {
+                $email = strtolower( (string) $email );
+                if ( is_email( $email ) && isset( $authenticated[ substr( strrchr( $email, '@' ), 1 ) ] ) ) {
+                        $emails[] = $email;
+                }
+        }
+        $addresses = [];
+        foreach ( array_unique( array_filter( $emails, 'is_email' ) ) as $email ) {
+                $domain = substr( strrchr( $email, '@' ), 1 );
+                $addresses[] = [
+                        'email'         => $email,
+                        'default'       => $email === $default,
+                        'authenticated' => $authenticated[ $domain ] ?? null,
+                ];
+        }
+        return [ 'addresses' => $addresses, 'domains' => $authenticated ];
+}
+/**
+ * Where a test email can end up and what to make of it, for the test email itself and for the Test screen. Answers are
+ * HTML with only links and emphasis.
+ *
+ * @param bool $not_arrived whether to include what to do when it never arrived, which only makes sense on the screen
+ *
+ * @return array[] each with key, question and answer
+ */
+function get_test_email_faq( $not_arrived = false ) {
+        $domains = mailhawk_admin_page( [ 'view' => 'domains' ] );
+        $log     = mailhawk_admin_page( [ 'view' => 'log' ] );
+        $faq = [
+                [
+                        'key'      => 'inbox',
+                        'question' => __( 'It landed in the inbox', 'mailhawk' ),
+                        'answer'   => __( 'MailHawk is working, and the mailbox trusts email from this site. There is nothing else to do.', 'mailhawk' ),
+                ],
+                [
+                        'key'      => 'updates',
+                        'question' => __( 'Gmail put it in Updates', 'mailhawk' ),
+                        'answer'   => __( 'That is normal. Gmail puts receipts, password resets and other notifications in Updates, and they still arrive. To keep email from this address in Primary, drag it to the Primary tab and choose to do the same for future messages.', 'mailhawk' ),
+                ],
+                [
+                        'key'      => 'promotions',
+                        'question' => __( 'Gmail put it in Promotions', 'mailhawk' ),
+                        'answer'   => __( 'That is normal too, and not a delivery problem. Gmail sorts email into tabs by what it looks like, and branded emails with images often go to Promotions. Your newsletters probably will as well. Order and account emails that are plain and personal usually end up in Primary or Updates. You can drag it to Primary to teach your own inbox.', 'mailhawk' ),
+                ],
+                [
+                        'key'      => 'other',
+                        'question' => __( 'Outlook put it in Other', 'mailhawk' ),
+                        'answer'   => __( 'That is normal. Outlook\'s Focused Inbox puts email from senders it has not seen before in Other. Move it to Focused and choose to always move email from this address there.', 'mailhawk' ),
+                ],
+                [
+                        'key'      => 'spam',
+                        'question' => __( 'It landed in spam', 'mailhawk' ),
+                        'answer'   => sprintf(
+                        /* translators: %s: URL of the Domains screen in wp-admin */
+                                __( 'Check that the domain of the address it came from has all its DNS records verified on the <a href="%s">Domains screen</a>. An address on a domain that is not verified, or on a free provider like gmail.com, can not be authenticated and is often treated as spam. Then mark the email as not spam, which teaches your mailbox to trust it. A new domain can take a few days of sending to build trust. If it keeps happening, let MailHawk support know.', 'mailhawk' ),
+                                esc_url( $domains )
+                        ),
+                ],
+        ];
+        if ( $not_arrived ) {
+                $faq[] = [
+                        'key'      => 'missing',
+                        'question' => __( 'It did not arrive at all', 'mailhawk' ),
+                        'answer'   => sprintf(
+                        /* translators: %s: URL of the Email Log screen in wp-admin */
+                                __( 'Give it a minute, then look in spam and in every tab or folder. The <a href="%s">Email Log</a> says what happened to it: failed emails say why, and an email held for review can be released from there. Also check the address it was sent to for typos.', 'mailhawk' ),
+                                esc_url( $log )
+                        ),
+                ];
+        }
+        return $faq;
+}
+/**
+ * The test email: its subject, a branded HTML version and the same in plain text. Its text is fixed, the test is to see
+ * that email arrives and where, and an email anyone could put any text in would be a way to send spam.
+ *
+ * @param string $to   who it is sent to
+ * @param string $from the address it is sent from, the default from address when empty
+ *
+ * @return array{subject: string, html: string, text: string}
+ */
+function get_test_email( $to, $from = '' ) {
+        $site    = wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
+        $from    = $from ?: (string) get_default_from_email_address();
+        $sent_at = wp_date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ) );
+        $faq     = get_test_email_faq();
+        /* translators: %s: the name of the site */
+        $subject = sprintf( __( 'MailHawk test email from %s', 'mailhawk' ), $site );
+        ob_start();
+        include dirname( __DIR__ ) . '/templates/emails/test-email.php';
+        $html = ob_get_clean();
+        $text = [
+                __( 'It works!', 'mailhawk' ),
+                '',
+                /* translators: 1: the name of the site, 2: the address it was sent from, 3: the address it was sent to, 4: date and time it was sent */
+                sprintf( __( 'This test email from %1$s went out through MailHawk, from %2$s to %3$s on %4$s.', 'mailhawk' ), $site, $from, $to, $sent_at ),
+                '',
+                __( 'Where did it land?', 'mailhawk' ),
+        ];
+        foreach ( $faq as $item ) {
+                $text[] = '';
+                $text[] = $item['question'];
+                // Links keep their address in plain text
+                $text[] = html_entity_decode( wp_strip_all_tags( preg_replace( '/<a [^>]*href="([^"]+)"[^>]*>(.*?)<\/a>/', '$2 ($1)', $item['answer'] ) ), ENT_QUOTES, 'UTF-8' );
+        }
+        $text[] = '';
+        /* translators: %s: the address of the site */
+        $text[] = sprintf( __( 'Sent by the MailHawk plugin on %s. You can ignore this email.', 'mailhawk' ), home_url_no_scheme() );
+        return [ 'subject' => $subject, 'html' => $html, 'text' => implode( "\n", $text ) ];
+}
+/**
+ * Give the next email that is sent this plain text version, for an HTML email whose own text would read badly
+ *
+ * @param string $text
+ *
+ * @return \Closure the hook, to remove when the email failed before it got to it, so the next email does not get it
+ */
+function set_next_alt_body( $text ) {
+        $set = function ( $phpmailer ) use ( $text, &$set ) {
+                $phpmailer->AltBody = $text;
+                remove_action( 'phpmailer_init', $set, 99 );
+        };
+        add_action( 'phpmailer_init', $set, 99 );
+        return $set;
+}
 …
         $risk = 0;
         // Test quarantine system using + synatx
+        // Test quarantine system using + syntax
         if ( str_contains( $email_address, '+test-quarantine@' ) ) {
                 return 999;

mailhawk/trunk/includes/quarantine.php

r3788980	r3795449
104	104	] );
105	105
106		// Someone must have take care of it already
	106	// Someone must have taken care of it already
107	107	if ( $count_quarantined === 0 ) {
108	108	return;

mailhawk/trunk/includes/site-health.php

-              r3794810
+              r3795449
                                 'recommended',
                                 __( 'MailHawk is not connected', 'mailhawk' ),
                                 __( 'Email from this site is not going out through MailHawk, so it is sent the way WordPress does it by default, and it may not reach the inbox.', 'mailhawk' ),
+                                __( 'Email from this site is not going out through MailHawk, so it is sent with the default WordPress mailer and may not reach the inbox.', 'mailhawk' ),
                                 $this->link( mailhawk_admin_page(), __( 'Connect MailHawk', 'mailhawk' ) )
                         );
 …
                         $description = [ __( 'The MailHawk service is not accepting email from this site, so none of it is going out.', 'mailhawk' ) ];
                         // Older MTA builds do not say why
+                        // Older MTA builds do not say why. The reason may not end in a period, so it gets its own.
                         $description[] = $suspension['reason']
+                                ? sprintf( __( 'The reason given: %s', 'mailhawk' ), $suspension['reason'] )
+                                /* translators: %s: the reason MailHawk gave for suspending the account */
+                                ? sprintf( __( 'Reason: %s.', 'mailhawk' ), rtrim( $suspension['reason'], '. ' ) )
                                 : __( 'This is usually a problem with the account or the subscription.', 'mailhawk' );
                         if ( $since ) {
+                                /* translators: %s: date and time the account was suspended */
                                 $description[] = sprintf( __( 'Suspended since %s.', 'mailhawk' ), $since );
+                        }
 …
                                 'critical',
                                 __( 'MailHawk is turning email away', 'mailhawk' ),
                                 __( "This site has used all of its emails for the month, so MailHawk is not sending what it is asked to. The emails it turned away are marked as failed in the log. Sending starts again when the limit resets, or as soon as the plan is upgraded.", 'mailhawk' ),
+                                __( "This site has used all of its emails for the month, so MailHawk is not sending new email. The emails it turned away are marked as failed in the log. Sending starts again when the limit resets, or as soon as the plan is upgraded.", 'mailhawk' ),
                                 $this->upgrade_link() . $this->link( mailhawk_admin_page( [ 'view' => 'log', 'status' => 'failed' ] ), __( 'See the failed emails', 'mailhawk' ) )
                         );
 …
                                 'critical',
                                 __( 'This site used all of its emails for the month', 'mailhawk' ),
+                                /* translators: 1: emails sent this month, 2: emails in the plan */
                                 sprintf( __( 'This site sent %1$s of the %2$s emails in its plan. MailHawk turns email away until the limit resets.', 'mailhawk' ), number_format_i18n( $used ), number_format_i18n( $limit ) ),
                                 $this->upgrade_link()
 …
                                 'recommended',
                                 __( 'This site is close to the limit of its plan', 'mailhawk' ),
+                                /* translators: 1: emails sent this month, 2: emails in the plan */
                                 sprintf( __( 'This site sent %1$s of the %2$s emails in its plan this month. When they are used up, MailHawk turns email away until the limit resets.', 'mailhawk' ), number_format_i18n( $used ), number_format_i18n( $limit ) ),
                                 $this->upgrade_link()
 …
                         'good',
                         __( 'This site has emails left this month', 'mailhawk' ),
+                        /* translators: 1: emails sent this month, 2: emails in the plan */
                         sprintf( __( 'This site sent %1$s of the %2$s emails in its plan this month.', 'mailhawk' ), number_format_i18n( $used ), number_format_i18n( $limit ) )
                 );

mailhawk/trunk/mailhawk.php

-              r3794810
+              r3795449
  * Plugin URI: https://mailhawk.io
  * Description: Send better email that will reach the inbox with MailHawk.
  * Version: 1.5.1
+ * Version: 1.5.2
  * Requires at least: 6.9
  * Requires PHP: 7.4
 …
 if ( ! defined( 'ABSPATH' ) ) exit;
 define( 'MAILHAWK_VERSION', '1.5.1' );
 define( 'MAILHAWK_PREVIOUS_STABLE_VERSION', '1.5.0' );
+define( 'MAILHAWK_VERSION', '1.5.2' );
+define( 'MAILHAWK_PREVIOUS_STABLE_VERSION', '1.5.1' );
 define( 'MAILHAWK_LICENSE_SERVER_URL', 'https://mailhawk.io' );

mailhawk/trunk/readme.txt

-              r3794810
+              r3795449
 Requires at least: 6.9
 Tested up to: 7.1
 Stable tag: 1.5.1
+Stable tag: 1.5.2
 Requires PHP: 7.4
 License: GPLv3 or later
 …
 == Changelog ==
+= 1.5.2 (2026-11-10) =
+* ADDED The test email can be sent from any address. A dropdown suggests the default from address and the same name at each of your domains, and a warning says when the domain of the address you pick is not verified, or not one of your MailHawk domains.
+* IMPROVED The test email is now a branded email that says what it means for where it landed: the inbox, Gmail's Updates or Promotions tabs, Outlook's Other folder, or spam. The Test screen has the same tips, and what to do when it did not arrive at all.
+* ADDED A "Copy instructions" button on the DNS screen copies everything someone else needs to add the records, like an agency, a developer or an AI assistant: every record with its host, full hostname, value and TTL, what to do with an SPF record that is already there, and where to verify.
+* IMPROVED Record names on the DNS screen copy with one click: the highlighted host copies just the host, anywhere else copies the full hostname. The screen also explains what to enter when the records of a subdomain go in the DNS of its parent domain, and the host of the return path no longer includes your domain, so DNS providers that add it themselves don't end up with it twice.
+* TWEAKED Clearer wording on the overview, in Site Health, and on the suspended screen and notice. When the monthly limit is reached, the notice on the overview is titled "Your monthly email limit is reached".
+* FIXED Some error messages and the usage line on the overview could not be translated.
+* DEV The `mailhawk/get-domain-dns` ability returns the `host` and the full `hostname` of each record.
+* DEV New filter `mailhawk/second_level_suffixes` lists the suffixes like co.uk that domains are registered under, so the DNS screen does not take example.co.uk for a subdomain.
 = 1.5.1 (2026-11-10) =

mailhawk/trunk/uninstall.php

-              r3793271
+              r3795449
  * @package     MailHawk
  * @subpackage  Uninstall
  * @copyright   Copyright (c) 2015, Pippin Williamson
  * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
  * @since       1.4.3
+ * @copyright   Copyright (c) MailHawk Inc.
+ * @license     https://www.gnu.org/licenses/gpl-3.0.html GNU General Public License v3 or later
+ * @since       1.0.0
  */
 …
 if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) exit;
 // Load WPGH file.
+// Load the plugin so its tables can be dropped.
 include_once __DIR__ . '/mailhawk.php';

Context Navigation

Legend:

Download in other formats: