fix(email): complete mail settings and templates
This commit is contained in:
kate522 committed
1 parent
4f8ab94fac
commit
4833053a5c
29 files changed
+716
-426
No files matched your search
+23
-33
@@ -18,50 +18,40 @@ add_filter('show_admin_bar', '__return_false');
|
||||
// ============================================================
|
||||
|
||||
add_action('phpmailer_init', function ($phpmailer) {
|
||||
$mail = get_option('aksrt_mail_smtp', array());
|
||||
$mail = class_exists('\AKSRT\Settings\Settings')
|
||||
? \AKSRT\Settings\Settings::get_smtp()
|
||||
: [];
|
||||
if (empty($mail['enabled']) || empty($mail['host'])) return;
|
||||
|
||||
$phpmailer->isSMTP();
|
||||
$phpmailer->Host = $mail['host'];
|
||||
$phpmailer->Port = (int) (isset($mail['port']) ? $mail['port'] : 465);
|
||||
$phpmailer->SMTPAuth = !empty($mail['username']);
|
||||
$phpmailer->Username = $mail['username'];
|
||||
$phpmailer->Password = $mail['password'];
|
||||
$phpmailer->SMTPSecure = isset($mail['encryption']) ? $mail['encryption'] : 'ssl';
|
||||
$phpmailer->Port = (int) ($mail['port'] ?? 465);
|
||||
$phpmailer->SMTPAuth = !empty($mail['auth']) && !empty($mail['username']);
|
||||
$phpmailer->Username = (string) ($mail['username'] ?? '');
|
||||
$phpmailer->Password = (string) ($mail['password'] ?? '');
|
||||
$phpmailer->SMTPSecure = (string) ($mail['encryption'] ?? 'ssl');
|
||||
$phpmailer->Timeout = 10;
|
||||
$phpmailer->Timelimit = 15;
|
||||
|
||||
// 性能优化：超时 + 连接保持
|
||||
$phpmailer->Timeout = 10; // 连接/读取超时 10 秒
|
||||
$phpmailer->Timelimit = 15; // 总执行上限 15 秒
|
||||
|
||||
if (!empty($mail['from_address'])) {
|
||||
$from_name = isset($mail['from_name']) ? $mail['from_name'] : '';
|
||||
// mail_showname 覆盖 from_name
|
||||
if (class_exists('\AKSRT\Settings\Settings')) {
|
||||
$branding = \AKSRT\Settings\Settings::get_mail_branding();
|
||||
if ($branding['showname'] !== '') {
|
||||
$from_name = $branding['showname'];
|
||||
}
|
||||
}
|
||||
$phpmailer->setFrom($mail['from_address'], $from_name);
|
||||
}
|
||||
if (!empty($mail['from_name'])) {
|
||||
$phpmailer->FromName = $mail['from_name'];
|
||||
}
|
||||
// mail_showname 全局覆盖 FromName
|
||||
if (class_exists('\AKSRT\Settings\Settings')) {
|
||||
$branding = \AKSRT\Settings\Settings::get_mail_branding();
|
||||
if ($branding['showname'] !== '') {
|
||||
$phpmailer->FromName = $branding['showname'];
|
||||
}
|
||||
$from_address = sanitize_email((string) ($mail['from_address'] ?? ''));
|
||||
if ($from_address !== '') {
|
||||
$from_name = (string) ($mail['from_name'] ?? get_bloginfo('name'));
|
||||
$phpmailer->setFrom($from_address, $from_name);
|
||||
}
|
||||
$phpmailer->FromName = (string) ($mail['from_name'] ?? get_bloginfo('name'));
|
||||
});
|
||||
|
||||
// mail_title_prefix：为所有邮件主题添加前缀
|
||||
// mail_title_prefix is applied by the canonical renderer and by third-party wp_mail callers.
|
||||
add_filter('wp_mail', function ($atts) {
|
||||
if (!class_exists('\AKSRT\Settings\Settings') || empty($atts['subject'])) return $atts;
|
||||
$branding = \AKSRT\Settings\Settings::get_mail_branding();
|
||||
if ($branding['title_prefix'] !== '' && strpos($atts['subject'], $branding['title_prefix']) !== 0) {
|
||||
$atts['subject'] = $branding['title_prefix'] . ' ' . $atts['subject'];
|
||||
$subject = (string) $atts['subject'];
|
||||
$site = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
|
||||
$subject = preg_replace('/^\[' . preg_quote($site, '/') . '\]\s*/u', '', $subject);
|
||||
if ($branding['title_prefix'] !== '' && strpos($subject, $branding['title_prefix']) !== 0) {
|
||||
$atts['subject'] = $branding['title_prefix'] . ' ' . $subject;
|
||||
} else {
|
||||
$atts['subject'] = $subject;
|
||||
}
|
||||
return $atts;
|
||||
});
|
||||
|
||||
@@ -219,7 +219,7 @@ function aksrt_add_user_notification(int $user_id, array $payload): void {
|
||||
|
||||
if ($table === '') return;
|
||||
|
||||
$wpdb->insert($table, [
|
||||
$inserted = $wpdb->insert($table, [
|
||||
'user_id' => $user_id,
|
||||
'type' => $type,
|
||||
'title' => sanitize_text_field((string) ($payload['title'] ?? '')),
|
||||
@@ -229,6 +229,13 @@ function aksrt_add_user_notification(int $user_id, array $payload): void {
|
||||
'created_at' => $created_at,
|
||||
'read_at' => !empty($payload['read']) ? current_time('mysql', true) : null,
|
||||
], ['%d', '%s', '%s', '%s', '%s', '%d', '%s', '%s']);
|
||||
if ($inserted !== false) {
|
||||
do_action('aksrt_notification_sent', $user_id, $type, [
|
||||
'title' => (string) ($payload['title'] ?? ''),
|
||||
'description' => (string) ($payload['desc'] ?? ''),
|
||||
'target_url' => (string) ($payload['url'] ?? ''),
|
||||
]);
|
||||
}
|
||||
}
|
||||
endif;
|
||||
|
||||
|
||||
@@ -151,18 +151,10 @@ add_action('wp_ajax_aksrt_send_email_code', function () {
|
||||
$code = str_pad( (string) random_int( 0, 999999 ), 6, '0', STR_PAD_LEFT );
|
||||
|
||||
$site_name = get_bloginfo( 'name' );
|
||||
$default_subject = '[' . $site_name . '] ' . __( '邮箱验证码', 'aksrt' );
|
||||
$default_content = sprintf(
|
||||
__( "您好 %s，\n\n您正在进行敏感操作验证，验证码为：\n\n【%s】\n\n验证码有效期为 5 分钟。如非本人操作，请忽略此邮件。", 'aksrt' ),
|
||||
$current_user->display_name,
|
||||
$code
|
||||
$sent = \AKSRT\Settings\Settings::send_event_email(
|
||||
'change_code', $target_email, '', '',
|
||||
[ '{username}' => $current_user->display_name, '{site_name}' => $site_name, '{code}' => $code ]
|
||||
);
|
||||
$sent = class_exists( '\AKSRT\Settings\Settings' )
|
||||
? \AKSRT\Settings\Settings::send_event_email(
|
||||
'change_code', $target_email, $default_subject, $default_content,
|
||||
[ '{username}' => $current_user->display_name, '{site_name}' => $site_name, '{code}' => $code ]
|
||||
)
|
||||
: wp_mail( $target_email, $default_subject, $default_content, [ 'Content-Type: text/plain; charset=UTF-8' ] );
|
||||
|
||||
if ( ! $sent ) {
|
||||
delete_transient( $rate_key );
|
||||
@@ -301,20 +293,10 @@ add_action('wp_ajax_aksrt_change_email', function () {
|
||||
|
||||
if ( is_email( $old_email ) ) {
|
||||
$site_name = get_bloginfo( 'name' );
|
||||
$default_subject = '[' . $site_name . '] ' . __( '账号邮箱已变更', 'aksrt' );
|
||||
$default_content = sprintf(
|
||||
__( "您好 %s，\n\n您的账号邮箱已成功修改为：%s\n\n如果这不是您的操作，请立即联系站点管理员。", 'aksrt' ),
|
||||
$current_user->display_name,
|
||||
$new_email
|
||||
\AKSRT\Settings\Settings::send_event_email(
|
||||
'change_notice', $old_email, '', '',
|
||||
[ '{username}' => $current_user->display_name, '{site_name}' => $site_name, '{new_email}' => $new_email ]
|
||||
);
|
||||
if ( class_exists( '\AKSRT\Settings\Settings' ) ) {
|
||||
\AKSRT\Settings\Settings::send_event_email(
|
||||
'change_notice', $old_email, $default_subject, $default_content,
|
||||
[ '{username}' => $current_user->display_name, '{site_name}' => $site_name, '{new_email}' => $new_email ]
|
||||
);
|
||||
} else {
|
||||
wp_mail( $old_email, $default_subject, $default_content, [ 'Content-Type: text/plain; charset=UTF-8' ] );
|
||||
}
|
||||
}
|
||||
|
||||
$verify_url = '';
|
||||
|
||||
Reference in new issue
Block a user