Changeset 3056457
- Timestamp:
- 03/22/2024 01:38:00 AM (4 months ago)
- Location:
- smtp-amazon-ses/trunk
- Files:
-
- 2 added
- 1 deleted
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
smtp-amazon-ses/trunk/includes/Functions.php
r3012662 r3056457 77 77 update_option( YAY_SMTP_AMAZONSES_PREFIX . '_settings', $yaysmtpSettings ); 78 78 79 wp_send_json_success( array( 'mess' => __( 'Settings saved.', ' yay-smtp-amazonses' ) ) );80 } 81 wp_send_json_error( array( 'mess' => __( 'Settings Failed.', ' yay-smtp-amazonses' ) ) );79 wp_send_json_success( array( 'mess' => __( 'Settings saved.', 'ses' ) ) ); 80 } 81 wp_send_json_error( array( 'mess' => __( 'Settings Failed.', 'ses' ) ) ); 82 82 } catch ( \Exception $ex ) { 83 83 LogErrors::getMessageException( $ex, true ); … … 94 94 // check email 95 95 if ( ! is_email( $emailAddress ) ) { 96 wp_send_json_error( array( 'mess' => __( 'Invalid email format!', ' yay-smtp-amazonses' ) ) );96 wp_send_json_error( array( 'mess' => __( 'Invalid email format!', 'ses' ) ) ); 97 97 } 98 98 99 99 $headers = "Content-Type: text/html\r\n"; 100 $subjectEmail = __( 'YaySMTP - Test email was sent successfully!', ' yay-smtp-amazonses' );101 $html = __( 'Yay! Your test email was sent successfully! Thanks for using <a href="https://yaycommerce.com/yaysmtp-wordpress-mail-smtp/">YaySMTP</a><br><br>Best regards,<br>YayCommerce', ' yay-smtp-amazonses' );100 $subjectEmail = __( 'YaySMTP - Test email was sent successfully!', 'ses' ); 101 $html = __( 'Yay! Your test email was sent successfully! Thanks for using <a href="https://yaycommerce.com/yaysmtp-wordpress-mail-smtp/">YaySMTP</a><br><br>Best regards,<br>YayCommerce', 'ses' ); 102 102 103 103 if ( ! empty( $emailAddress ) ) { … … 105 105 if ( $sendMailSucc ) { 106 106 Utils::setYaySmtpSetting( 'succ_sent_mail_last', true ); 107 wp_send_json_success( array( 'mess' => __( 'Email has been sent.', ' yay-smtp-amazonses' ) ) );107 wp_send_json_success( array( 'mess' => __( 'Email has been sent.', 'ses' ) ) ); 108 108 } else { 109 109 Utils::setYaySmtpSetting( 'succ_sent_mail_last', false ); … … 120 120 'mess' => __( 121 121 'Email sent failed.', 122 ' yay-smtp-amazonses'122 'ses' 123 123 ), 124 124 ) … … 127 127 } 128 128 } else { 129 wp_send_json_error( array( 'mess' => __( 'Email Address is not empty.', ' yay-smtp-amazonses' ) ) );130 } 131 wp_send_json_error( array( 'mess' => __( 'Error send mail!', ' yay-smtp-amazonses' ) ) );129 wp_send_json_error( array( 'mess' => __( 'Email Address is not empty.', 'ses' ) ) ); 130 } 131 wp_send_json_error( array( 'mess' => __( 'Error send mail!', 'ses' ) ) ); 132 132 } catch ( \Exception $ex ) { 133 133 LogErrors::getMessageException( $ex, true ); … … 236 236 'limit' => $limit, 237 237 'showColSettings' => $showColSettings, 238 'mess' => __( 'Successful', ' yay-smtp-amazonses' ),238 'mess' => __( 'Successful', 'ses' ), 239 239 ) 240 240 ); 241 241 } 242 wp_send_json_error( array( 'mess' => __( 'Failed.', ' yay-smtp-amazonses' ) ) );242 wp_send_json_error( array( 'mess' => __( 'Failed.', 'ses' ) ) ); 243 243 } catch ( \Exception $ex ) { 244 244 LogErrors::getMessageException( $ex, true ); … … 258 258 wp_send_json_success( 259 259 array( 260 'mess' => __( 'Save Settings Successful', ' yay-smtp-amazonses' ),260 'mess' => __( 'Save Settings Successful', 'ses' ), 261 261 ) 262 262 ); 263 263 } 264 wp_send_json_error( array( 'mess' => __( 'Save Settings Failed.', ' yay-smtp-amazonses' ) ) );264 wp_send_json_error( array( 'mess' => __( 'Save Settings Failed.', 'ses' ) ) ); 265 265 } catch ( \Exception $ex ) { 266 266 LogErrors::getMessageException( $ex, true ); … … 279 279 280 280 if ( empty( $ids ) ) { 281 wp_send_json_error( array( 'mess' => __( 'No email log id found', ' yay-smtp-amazonses' ) ) );281 wp_send_json_error( array( 'mess' => __( 'No email log id found', 'ses' ) ) ); 282 282 } 283 283 … … 285 285 286 286 if ( '' !== $wpdb->last_error ) { 287 wp_send_json_error( array( 'mess' => __( $wpdb->last_error, ' yay-smtp-amazonses' ) ) );287 wp_send_json_error( array( 'mess' => __( $wpdb->last_error, 'ses' ) ) ); 288 288 } 289 289 290 290 if ( ! $deleted ) { 291 wp_send_json_error( array( 'mess' => __( 'Something wrong, Email logs not deleted', ' yay-smtp-amazonses' ) ) );291 wp_send_json_error( array( 'mess' => __( 'Something wrong, Email logs not deleted', 'ses' ) ) ); 292 292 } 293 293 294 294 wp_send_json_success( 295 295 array( 296 'mess' => __( 'Delete successful.', ' yay-smtp-amazonses' ),296 'mess' => __( 'Delete successful.', 'ses' ), 297 297 ) 298 298 ); 299 299 } 300 wp_send_json_error( array( 'mess' => __( 'No email log id found.', ' yay-smtp-amazonses' ) ) );300 wp_send_json_error( array( 'mess' => __( 'No email log id found.', 'ses' ) ) ); 301 301 302 302 } catch ( \Exception $ex ) { … … 315 315 wp_send_json_success( 316 316 array( 317 'mess' => __( 'Delete successful.', ' yay-smtp-amazonses' ),317 'mess' => __( 'Delete successful.', 'ses' ), 318 318 ) 319 319 ); … … 335 335 336 336 if ( empty( $id ) ) { 337 wp_send_json_error( array( 'mess' => __( 'No email log id found', ' yay-smtp-amazonses' ) ) );337 wp_send_json_error( array( 'mess' => __( 'No email log id found', 'ses' ) ) ); 338 338 } 339 339 … … 341 341 342 342 if ( '' !== $wpdb->last_error ) { 343 wp_send_json_error( array( 'mess' => __( $wpdb->last_error, ' yay-smtp-amazonses' ) ) );343 wp_send_json_error( array( 'mess' => __( $wpdb->last_error, 'ses' ) ) ); 344 344 } 345 345 … … 368 368 wp_send_json_success( 369 369 array( 370 'mess' => __( 'Get email log #' . $id . ' successful.', ' yay-smtp-amazonses' ),370 'mess' => __( 'Get email log #' . $id . ' successful.', 'ses' ), 371 371 'data' => $resultArr, 372 372 ) 373 373 ); 374 374 } else { 375 wp_send_json_error( array( 'mess' => __( 'No email log found.', ' yay-smtp-amazonses' ) ) );376 } 377 } 378 wp_send_json_error( array( 'mess' => __( 'No email log id found.', ' yay-smtp-amazonses' ) ) );375 wp_send_json_error( array( 'mess' => __( 'No email log found.', 'ses' ) ) ); 376 } 377 } 378 wp_send_json_error( array( 'mess' => __( 'No email log id found.', 'ses' ) ) ); 379 379 380 380 } catch ( \Exception $ex ) { -
smtp-amazon-ses/trunk/includes/Page/Settings.php
r3012662 r3056457 35 35 public function settingsMenu() { 36 36 $this->hook_suffix[ YAY_SMTP_AMAZONSES_PREFIX . '_main_page' ] = add_menu_page( 37 __( 'YaySMTP for Amazon SES', ' yay-smtp-amazonses' ),38 __( 'YaySMTP', ' yay-smtp-amazonses' ),37 __( 'YaySMTP for Amazon SES', 'ses' ), 38 __( 'YaySMTP', 'ses' ), 39 39 'manage_options', 40 40 'yaysmtp-amazonses', … … 46 46 public function pluginActionLinks( $links ) { 47 47 $action_links = array( 48 'settings' => '<a href="' . admin_url( 'admin.php?page=yaysmtp-amazonses' ) . '" aria-label="' . esc_attr__( 'YaySMTP', ' yay-smtp-amazonses' ) . '">' . esc_html__( 'Settings', 'yay-smtp-amazonses' ) . '</a>',48 'settings' => '<a href="' . admin_url( 'admin.php?page=yaysmtp-amazonses' ) . '" aria-label="' . esc_attr__( 'YaySMTP', 'ses' ) . '</a>', 49 49 ); 50 50 return array_merge( $action_links, $links ); -
smtp-amazon-ses/trunk/includes/Views/mail-logs.php
r2781678 r3056457 145 145 </div> 146 146 <div class="toggle-label"> 147 <span class="yay-smtp-delete-all-mail-logs"><?php echo esc_html__( 'Delete All Mail Logs', ' yay-smtp-amazonses' ); ?></span>147 <span class="yay-smtp-delete-all-mail-logs"><?php echo esc_html__( 'Delete All Mail Logs', 'ses' ); ?></span> 148 148 </div> 149 149 </label> -
smtp-amazon-ses/trunk/includes/Views/template-part/amazonses-tpl.php
r2982850 r3056457 10 10 $mailer = 'amazonses'; 11 11 $regionArr = array( 12 'us-east-1' => __( 'US East (N. Virginia)', ' yay-smtp-amazonses' ),13 'us-east-2' => __( 'US East (Ohio)', ' yay-smtp-amazonses' ),14 'us-west-1' => __( 'US West (N. California)', ' yay-smtp-amazonses' ),15 'us-west-2' => __( 'US West (Oregon)', ' yay-smtp-amazonses' ),16 'af-south-1' => __( 'Cape Town South Africa', ' yay-smtp-amazonses' ),17 'ca-central-1' => __( 'Canada (Central)', ' yay-smtp-amazonses' ),18 'eu-west-1' => __( 'EU (Ireland)', ' yay-smtp-amazonses' ),19 'eu-west-2' => __( 'EU (London)', ' yay-smtp-amazonses' ),20 'eu-west-3' => __( 'EU (Paris)', ' yay-smtp-amazonses' ),21 'eu-central-1' => __( 'EU (Frankfurt)', ' yay-smtp-amazonses' ),22 'eu-south-1' => __( 'EU (Milan)', ' yay-smtp-amazonses' ),23 'eu-north-1' => __( 'EU (Stockholm)', ' yay-smtp-amazonses' ),24 'ap-south-1' => __( 'Asia Pacific (Mumbai)', ' yay-smtp-amazonses' ),25 'ap-northeast-2' => __( 'Asia Pacific (Seoul)', ' yay-smtp-amazonses' ),26 'ap-southeast-1' => __( 'Asia Pacific (Singapore)', ' yay-smtp-amazonses' ),27 'ap-southeast-2' => __( 'Asia Pacific (Sydney)', ' yay-smtp-amazonses' ),28 'ap-northeast-1' => __( 'Asia Pacific (Tokyo)', ' yay-smtp-amazonses' ),29 'ap-northeast-3' => __( 'Asia Pacific (Osaka)', ' yay-smtp-amazonses' ),30 'sa-east-1' => __( 'South America (São Paulo)', ' yay-smtp-amazonses' ),31 'me-south-1' => __( 'Middle East (Bahrain)', ' yay-smtp-amazonses' ),12 'us-east-1' => __( 'US East (N. Virginia)', 'ses' ), 13 'us-east-2' => __( 'US East (Ohio)', 'ses' ), 14 'us-west-1' => __( 'US West (N. California)', 'ses' ), 15 'us-west-2' => __( 'US West (Oregon)', 'ses' ), 16 'af-south-1' => __( 'Cape Town South Africa', 'ses' ), 17 'ca-central-1' => __( 'Canada (Central)', 'ses' ), 18 'eu-west-1' => __( 'EU (Ireland)', 'ses' ), 19 'eu-west-2' => __( 'EU (London)', 'ses' ), 20 'eu-west-3' => __( 'EU (Paris)', 'ses' ), 21 'eu-central-1' => __( 'EU (Frankfurt)', 'ses' ), 22 'eu-south-1' => __( 'EU (Milan)', 'ses' ), 23 'eu-north-1' => __( 'EU (Stockholm)', 'ses' ), 24 'ap-south-1' => __( 'Asia Pacific (Mumbai)', 'ses' ), 25 'ap-northeast-2' => __( 'Asia Pacific (Seoul)', 'ses' ), 26 'ap-southeast-1' => __( 'Asia Pacific (Singapore)', 'ses' ), 27 'ap-southeast-2' => __( 'Asia Pacific (Sydney)', 'ses' ), 28 'ap-northeast-1' => __( 'Asia Pacific (Tokyo)', 'ses' ), 29 'ap-northeast-3' => __( 'Asia Pacific (Osaka)', 'ses' ), 30 'sa-east-1' => __( 'South America (São Paulo)', 'ses' ), 31 'me-south-1' => __( 'Middle East (Bahrain)', 'ses' ), 32 32 ); 33 33 -
smtp-amazon-ses/trunk/includes/Views/template-part/debug-card.php
r2781678 r3056457 21 21 <div class="yay-smtp-card-title-wrapper"> 22 22 <h3 class="yay-smtp-card-title yay-smtp-card-header-item"> 23 <?php echo esc_html__( 'Email Delivery Issue', ' yay-smtp-amazonses' ); ?>23 <?php echo esc_html__( 'Email Delivery Issue', 'ses' ); ?> 24 24 </h3> 25 25 </div> … … 27 27 <div class="yay-smtp-card-body"> 28 28 <p class="setting-description"> 29 <?php echo esc_html__( 'YaySMTP noticed this error (yikes!) while trying to send the most recent emails:', ' yay-smtp-amazonses' ); ?>29 <?php echo esc_html__( 'YaySMTP noticed this error (yikes!) while trying to send the most recent emails:', 'ses' ); ?> 30 30 </p> 31 31 <p class="setting-description yay-smtp-card-debug-text"> … … 33 33 </p> 34 34 <p class="setting-description" style="font-weight: 450;"> 35 <?php echo wp_kses_post( 'Please fix it and send a test email afterwards. <a href="https://yaycommerce.com/support/" target="_blank">Contact us</a> if you need any helps.', ' yay-smtp-amazonses' ); ?>35 <?php echo wp_kses_post( 'Please fix it and send a test email afterwards. <a href="https://yaycommerce.com/support/" target="_blank">Contact us</a> if you need any helps.', 'ses' ); ?> 36 36 </p> 37 37 </div> -
smtp-amazon-ses/trunk/includes/Views/yay-smtp.php
r2781678 r3056457 114 114 <div class="yay-tooltip icon-tootip-wrap"> 115 115 <span class="icon-inst-tootip"></span> 116 <span class="yay-tooltiptext yay-tooltip-bottom"><?php echo esc_html__( 'Always send emails with the above From Email address, overriding other plugins settings.', ' yay-smtp-amazonses' ); ?></span>116 <span class="yay-tooltiptext yay-tooltip-bottom"><?php echo esc_html__( 'Always send emails with the above From Email address, overriding other plugins settings.', 'ses' ); ?></span> 117 117 </div> 118 118 </div> … … 143 143 <div class="yay-tooltip icon-tootip-wrap"> 144 144 <span class="icon-inst-tootip"></span> 145 <span class="yay-tooltiptext yay-tooltip-bottom"><?php echo esc_html__( 'Always send emails with the above From Name, overriding other plugins settings.', ' yay-smtp-amazonses' ); ?></span>145 <span class="yay-tooltiptext yay-tooltip-bottom"><?php echo esc_html__( 'Always send emails with the above From Name, overriding other plugins settings.', 'ses' ); ?></span> 146 146 </div> 147 147 </div> -
smtp-amazon-ses/trunk/readme.txt
r3038302 r3056457 4 4 Requires at least: 4.0 5 5 Requires PHP: 5.3 6 Tested up to: 6. 4.37 Stable tag: 1.7 6 Tested up to: 6. 7 Stable tag: 1.7 8 8 License: GPL-2.0+ 9 9 License URI: http://www.gnu.org/licenses/gpl-2.0.txt … … 72 72 73 73 == Screenshots == 74 1. 75 2. 74 1. 75 2. 76 76 77 77 == Changelog == 78 79 80 78 81 79 82 = 1.7 - Dec 21, 2023 = -
smtp-amazon-ses/trunk/vendor_amazon/Aws/Api/Serializer/QuerySerializer.php
r2535235 r3056457 39 39 $body += call_user_func($this->paramBuilder, $operation->getInput(), $params); 40 40 } 41 $body = http_build_query($body, null, '&', PHP_QUERY_RFC3986);41 $body = http_build_query($body, , '&', PHP_QUERY_RFC3986); 42 42 return new \YaySMTPAmazonSES\Aws3\GuzzleHttp\Psr7\Request('POST', $this->endpoint, ['Content-Length' => strlen($body), 'Content-Type' => 'application/x-www-form-urlencoded'], $body); 43 43 } -
smtp-amazon-ses/trunk/vendor_amazon/Aws/Credentials/Credentials.php
r2535235 r3056457 59 59 public function serialize() 60 60 { 61 return json_encode($this->toArray());61 return ()); 62 62 } 63 63 public function unserialize($serialized) 64 64 { 65 $data = json_decode($serialized, true); 65 $data = \json_decode($serialized, \true); 66 $this->__unserialize($data); 67 } 68 public function __serialize() 69 { 70 return $this->toArray(); 71 } 72 public function __unserialize($data) 73 { 66 74 $this->key = $data['key']; 67 75 $this->secret = $data['secret']; -
smtp-amazon-ses/trunk/yay-smtp.php
r3012662 r3056457 1 1 <?php 2 2 /** 3 * Plugin Name: SMTP for Amazon SES -YaySMTP3 * Plugin Name: SMTP for Amazon YaySMTP 4 4 * Plugin URI: https://yaycommerce.com/yaysmtp-wordpress-mail-smtp 5 5 * Description: This plugin helps you send emails from your WordPress website via your Amazon SES SMTP. 6 * Version: 1.7 6 * Version: 1.7 7 7 * Author: YayCommerce 8 8 * Author URI: https://yaycommerce.com 9 * Text Domain: yaysmtp_amazonses9 * Text Domain: ses 10 10 * Domain Path: /i18n/languages/ 11 11 */ … … 19 19 } 20 20 if ( ! defined( 'YAY_SMTP_AMAZONSES_VERSION' ) ) { 21 define( 'YAY_SMTP_AMAZONSES_VERSION', '1.7 ' );21 define( 'YAY_SMTP_AMAZONSES_VERSION', '1.7' ); 22 22 } 23 23 … … 82 82 Schedule::getInstance(); 83 83 Plugin::getInstance(); 84 84 85 } 85 86 add_action( 'plugins_loaded', 'YaySMTPAmazonSES\\init' );
Note: See TracChangeset
for help on using the changeset viewer.