diff --git a/wp-content/plugins/wp-mail-smtp/assets/languages/wp-mail-smtp.pot b/wp-content/plugins/wp-mail-smtp/assets/languages/wp-mail-smtp.pot index e4d3ff7..e493502 100644 --- a/wp-content/plugins/wp-mail-smtp/assets/languages/wp-mail-smtp.pot +++ b/wp-content/plugins/wp-mail-smtp/assets/languages/wp-mail-smtp.pot @@ -1,13 +1,13 @@ msgid "" msgstr "" -"Project-Id-Version: WP Mail SMTP 2.1.1\n" +"Project-Id-Version: WP Mail SMTP 2.2.1\n" "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wp-mail-smtp\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2020-06-08T15:01:32+03:00\n" +"POT-Creation-Date: 2020-07-09T12:48:03+03:00\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "X-Generator: WP-CLI 2.4.0\n" "X-Domain: wp-mail-smtp\n" @@ -33,1274 +33,1005 @@ msgid "https://wpforms.com/" msgstr "" #. translators: %s - error code, returned by Google API. -#: build/wp-mail-smtp-pro/src/Admin/Area.php:125 #: src/Admin/Area.php:125 msgid "There was an error while processing the authentication request: %s. Please try again." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:133 #: src/Admin/Area.php:133 msgid "There was an error while processing the authentication request. Please try again." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:140 #: src/Admin/Area.php:140 msgid "There was an error while processing the authentication request. Please make sure that you have Client ID and Client Secret both valid and saved." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:149 #: src/Admin/Area.php:149 msgid "You have successfully linked the current site with your Google API project. Now you can start sending emails through Gmail." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:155 #: src/Admin/Area.php:155 msgid "You have successfully linked the current site with your Microsoft API project. Now you can start sending emails through Outlook." msgstr "" #. translators: %s - Mailer anchor link. -#: build/wp-mail-smtp-pro/src/Admin/Area.php:186 #: src/Admin/Area.php:186 msgid "Thanks for using WP Mail SMTP! To complete the plugin setup and start sending emails, please select and configure your Mailer." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:209 -#: build/wp-mail-smtp-pro/src/Admin/Area.php:210 -#: build/wp-mail-smtp-pro/src/SiteHealth.php:40 #: src/Admin/Area.php:209 #: src/Admin/Area.php:210 #: src/SiteHealth.php:40 msgid "WP Mail SMTP" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:220 -#: build/wp-mail-smtp-pro/src/Admin/Area.php:221 -#: build/wp-mail-smtp-pro/src/Admin/Area.php:864 #: src/Admin/Area.php:220 #: src/Admin/Area.php:221 -#: src/Admin/Area.php:864 +#: src/Admin/Area.php:862 msgid "Settings" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:228 -#: build/wp-mail-smtp-pro/src/Admin/Area.php:229 -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:627 -#: build/wp-mail-smtp-pro/src/Admin/Pages/Logs.php:49 -#: build/wp-mail-smtp-pro/src/Admin/Pages/LogsTab.php:30 #: src/Admin/Area.php:228 #: src/Admin/Area.php:229 -#: src/Admin/Pages/About.php:627 -#: src/Admin/Pages/Logs.php:49 +#: src/Admin/Pages/About.php:651 +#: src/Admin/Pages/Logs.php:48 #: src/Admin/Pages/LogsTab.php:30 msgid "Email Log" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:238 -#: build/wp-mail-smtp-pro/src/Admin/Area.php:239 -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:105 #: src/Admin/Area.php:238 #: src/Admin/Area.php:239 -#: src/Admin/Pages/About.php:105 +#: src/Admin/Pages/About.php:106 msgid "About Us" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:302 #: src/Admin/Area.php:302 msgid "Are you sure you want to reset the current provider connection? You will need to immediately create a new one to be able to send emails." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:303 #: src/Admin/Area.php:303 msgid "Changes that you made to the settings are not saved!" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:305 #: src/Admin/Area.php:305 msgid "Heads up!" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:307 #: src/Admin/Area.php:307 msgid "

The Default (PHP) mailer is currently selected, but is not recommended because in most cases it does not resolve email delivery issues.

Please consider selecting and configuring one of the other mailers.

" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:312 -#: build/wp-mail-smtp-pro/src/Admin/PageAbstract.php:81 -#: src/Admin/Area.php:312 -#: src/Admin/PageAbstract.php:81 +#: src/Admin/Area.php:310 +#: src/Admin/PageAbstract.php:83 msgid "Save Settings" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:313 -#: src/Admin/Area.php:313 +#: src/Admin/Area.php:311 msgid "Cancel" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:314 -#: src/Admin/Area.php:314 +#: src/Admin/Area.php:312 msgid "Warning icon" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:319 -#: src/Admin/Area.php:319 +#: src/Admin/Area.php:317 msgid "%name% is a PRO Feature" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:320 -#: src/Admin/Area.php:320 +#: src/Admin/Area.php:318 msgid "Upgrade to Pro" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:324 -#: src/Admin/Area.php:324 +#: src/Admin/Area.php:322 msgid "Bonus: WP Mail SMTP users get $50 off regular price,
applied at checkout." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:333 -#: src/Admin/Area.php:333 +#: src/Admin/Area.php:331 msgid "Already purchased?" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:400 -#: build/wp-mail-smtp-pro/src/Admin/Area.php:407 -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:308 -#: src/Admin/Area.php:400 -#: src/Admin/Area.php:407 -#: src/Admin/Pages/About.php:308 +#: src/Admin/Area.php:398 +#: src/Admin/Area.php:405 +#: src/Admin/Pages/About.php:332 msgid "Activate" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:401 -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:300 -#: src/Admin/Area.php:401 -#: src/Admin/Pages/About.php:300 +#: src/Admin/Area.php:399 +#: src/Admin/Pages/About.php:324 msgid "Activated" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:402 -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:297 -#: src/Admin/Area.php:402 -#: src/Admin/Pages/About.php:297 +#: src/Admin/Area.php:400 +#: src/Admin/Pages/About.php:321 msgid "Active" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:403 -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:305 -#: src/Admin/Area.php:403 -#: src/Admin/Pages/About.php:305 +#: src/Admin/Area.php:401 +#: src/Admin/Pages/About.php:329 msgid "Inactive" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:404 -#: src/Admin/Area.php:404 +#: src/Admin/Area.php:402 msgid "Processing..." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:405 -#: src/Admin/Area.php:405 +#: src/Admin/Area.php:403 msgid "Could not install a plugin. Please download from WordPress.org and install manually." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:406 -#: src/Admin/Area.php:406 +#: src/Admin/Area.php:404 msgid "Install and Activate" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:408 -#: src/Admin/Area.php:408 +#: src/Admin/Area.php:406 msgid "Download" msgstr "" #. translators: %1$s - WP.org link; %2$s - same WP.org link. -#: build/wp-mail-smtp-pro/src/Admin/Area.php:468 -#: src/Admin/Area.php:468 +#: src/Admin/Area.php:466 msgid "Please rate WP Mail SMTP ★★★★★ on WordPress.org to help us spread the word. Thank you from the WP Mail SMTP team!" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:805 -#: src/Admin/Area.php:805 +#: src/Admin/Area.php:803 msgid "WP Mail SMTP Pro related message was successfully dismissed." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:824 -#: src/Admin/Area.php:824 +#: src/Admin/Area.php:822 msgid "Educational notice for this mailer was successfully dismissed." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:863 -#: src/Admin/Area.php:863 +#: src/Admin/Area.php:861 msgid "Go to WP Mail SMTP Settings page" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:870 -#: src/Admin/Area.php:870 +#: src/Admin/Area.php:868 msgid "Go to WP Mail SMTP Lite vs Pro comparison page" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Area.php:871 -#: src/Admin/Area.php:871 +#: src/Admin/Area.php:869 msgid "Premium Support" msgstr "" #. translators: %s - plugin current license type. -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:98 -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:526 -#: src/Admin/Pages/About.php:98 -#: src/Admin/Pages/About.php:526 +#: src/Admin/Pages/About.php:99 +#: src/Admin/Pages/About.php:550 msgid "%s vs Pro" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:170 -#: src/Admin/Pages/About.php:170 +#: src/Admin/Pages/About.php:171 msgid "Hello and welcome to WP Mail SMTP, the easiest and most popular WordPress SMTP plugin. We build software that helps your site reliably deliver emails every time." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:174 -#: src/Admin/Pages/About.php:174 +#: src/Admin/Pages/About.php:175 msgid "Email deliverability has been a well-documented problem for all WordPress websites. However as WPForms grew, we became more aware of this painful issue that affects our users and the larger WordPress community. So we decided to solve this problem and make a solution that's beginner friendly." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:177 -#: src/Admin/Pages/About.php:177 +#: src/Admin/Pages/About.php:178 msgid "Our goal is to make reliable email deliverability easy for WordPress." msgstr "" #. translators: %1$s - WPForms URL, %2$s - WPBeginner URL, %3$s - OptinMonster URL, %4$s - MonsterInsights URL, %5$s - RafflePress URL -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:184 -#: src/Admin/Pages/About.php:184 +#: src/Admin/Pages/About.php:185 msgid "WP Mail SMTP is brought to you by the same team that's behind the most user friendly WordPress forms, WPForms, the largest WordPress resource site, WPBeginner, the most popular lead-generation software, OptinMonster, the best WordPress analytics plugin, MonsterInsights, and the most powerful WordPress contest plugin, RafflePress." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:202 -#: src/Admin/Pages/About.php:202 +#: src/Admin/Pages/About.php:203 msgid "Yup, we know a thing or two about building awesome products that customers love." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:208 -#: src/Admin/Pages/About.php:208 +#: src/Admin/Pages/About.php:209 msgid "The WPForms Team photo" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:210 -#: src/Admin/Pages/About.php:210 +#: src/Admin/Pages/About.php:211 msgid "The WPForms Team" msgstr "" +#: src/Admin/Pages/About.php:260 +msgid "Plugin icon" +msgstr "" + #. translators: %s - status HTML text. -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:250 -#: src/Admin/Pages/About.php:250 +#: src/Admin/Pages/About.php:274 msgid "Status: %s" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:316 -#: src/Admin/Pages/About.php:316 +#: src/Admin/Pages/About.php:340 msgid "Not Installed" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:319 -#: src/Admin/Pages/About.php:319 +#: src/Admin/Pages/About.php:343 msgid "Install Plugin" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:340 -#: src/Admin/Pages/About.php:340 +#: src/Admin/Pages/About.php:364 msgid "MonsterInsights" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:341 -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:347 -#: src/Admin/Pages/About.php:341 -#: src/Admin/Pages/About.php:347 +#: src/Admin/Pages/About.php:365 +#: src/Admin/Pages/About.php:371 msgid "MonsterInsights makes it “effortless” to properly connect your WordPress site with Google Analytics, so you can start making data-driven decisions to grow your business." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:346 -#: src/Admin/Pages/About.php:346 +#: src/Admin/Pages/About.php:370 msgid "MonsterInsights Pro" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:354 -#: src/Admin/Pages/About.php:354 +#: src/Admin/Pages/About.php:378 msgid "OptinMonster" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:355 -#: src/Admin/Pages/About.php:355 +#: src/Admin/Pages/About.php:379 msgid "Our high-converting optin forms like Exit-Intent® popups, Fullscreen Welcome Mats, and Scroll boxes help you dramatically boost conversions and get more email subscribers." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:361 -#: src/Admin/Pages/About.php:361 +#: src/Admin/Pages/About.php:385 msgid "Contact Forms by WPForms" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:362 -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:368 -#: src/Admin/Pages/About.php:362 -#: src/Admin/Pages/About.php:368 +#: src/Admin/Pages/About.php:386 +#: src/Admin/Pages/About.php:392 msgid "The best WordPress contact form plugin. Drag & Drop online form builder that helps you create beautiful contact forms with just a few clicks." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:367 -#: src/Admin/Pages/About.php:367 +#: src/Admin/Pages/About.php:391 msgid "WPForms Pro" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:375 -#: src/Admin/Pages/About.php:375 +#: src/Admin/Pages/About.php:399 msgid "RafflePress" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:376 -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:382 -#: src/Admin/Pages/About.php:376 -#: src/Admin/Pages/About.php:382 +#: src/Admin/Pages/About.php:400 +#: src/Admin/Pages/About.php:406 msgid "Turn your visitors into brand ambassadors! Easily grow your email list, website traffic, and social media followers with powerful viral giveaways & contests." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:381 -#: src/Admin/Pages/About.php:381 +#: src/Admin/Pages/About.php:405 msgid "RafflePress Pro" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:401 -#: src/Admin/Pages/About.php:401 +#: src/Admin/Pages/About.php:425 msgid "Could not activate the plugin. Please activate it from the Plugins page." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:413 -#: src/Admin/Pages/About.php:413 +#: src/Admin/Pages/About.php:437 msgid "Plugin activated." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:430 -#: src/Admin/Pages/About.php:430 +#: src/Admin/Pages/About.php:454 msgid "Could not install the plugin." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:491 -#: src/Admin/Pages/About.php:491 +#: src/Admin/Pages/About.php:515 msgid "Plugin installed & activated." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:499 -#: src/Admin/Pages/About.php:499 +#: src/Admin/Pages/About.php:523 msgid "Plugin installed." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:534 -#: src/Admin/Pages/About.php:534 +#: src/Admin/Pages/About.php:558 msgid "Get the most out of WP Mail SMTP by upgrading to Pro and unlocking all of the powerful features." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:543 -#: src/Admin/Pages/About.php:543 +#: src/Admin/Pages/About.php:567 msgid "Feature" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:553 -#: src/Admin/Pages/About.php:553 +#: src/Admin/Pages/About.php:577 msgid "Pro" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:594 -#: src/Admin/Pages/About.php:594 +#: src/Admin/Pages/About.php:618 msgid "Get WP Mail SMTP Pro Today and Unlock all of these Powerful Features" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:601 -#: src/Admin/Pages/About.php:601 +#: src/Admin/Pages/About.php:625 msgid "Bonus: WP Mail SMTP Lite users get $50 off regular price, automatically applied at checkout." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:628 -#: build/wp-mail-smtp-pro/src/Admin/Pages/ControlTab.php:27 -#: src/Admin/Pages/About.php:628 +#: src/Admin/Pages/About.php:652 #: src/Admin/Pages/ControlTab.php:27 msgid "Email Controls" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:629 -#: src/Admin/Pages/About.php:629 +#: src/Admin/Pages/About.php:653 msgid "Additional Mailers" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:630 -#: src/Admin/Pages/About.php:630 +#: src/Admin/Pages/About.php:654 msgid "Customer Support" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:651 -#: src/Admin/Pages/About.php:651 +#: src/Admin/Pages/About.php:675 msgid "Emails are not logged" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:657 -#: src/Admin/Pages/About.php:657 +#: src/Admin/Pages/About.php:681 msgid "Complete Email Log management inside WordPress" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:665 -#: src/Admin/Pages/About.php:665 +#: src/Admin/Pages/About.php:689 msgid "No controls over whether default WordPress emails are sent" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:671 -#: src/Admin/Pages/About.php:671 +#: src/Admin/Pages/About.php:695 msgid "Complete Email Controls management for most default WordPress emails" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:679 -#: src/Admin/Pages/About.php:679 +#: src/Admin/Pages/About.php:703 msgid "Only default list of mailers" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:685 -#: src/Admin/Pages/About.php:685 +#: src/Admin/Pages/About.php:709 msgid "Additional mailers: Microsoft Outlook (with Office365 support) and Amazon SES" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:693 -#: src/Admin/Pages/About.php:693 +#: src/Admin/Pages/About.php:717 msgid "Limited Support" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/About.php:699 -#: src/Admin/Pages/About.php:699 +#: src/Admin/Pages/About.php:723 msgid "Priority Support" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/ControlTab.php:48 #: src/Admin/Pages/ControlTab.php:48 msgid "Comment Notifications" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/ControlTab.php:49 #: src/Admin/Pages/ControlTab.php:49 msgid "Manage emails sent when comments are published or awaiting moderation." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/ControlTab.php:53 #: src/Admin/Pages/ControlTab.php:53 msgid "Site Admin Email Change Notifications" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/ControlTab.php:54 #: src/Admin/Pages/ControlTab.php:54 msgid "Manage emails sent when site admin's account has been changed." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/ControlTab.php:58 #: src/Admin/Pages/ControlTab.php:58 msgid "User Change Notifications" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/ControlTab.php:59 #: src/Admin/Pages/ControlTab.php:59 msgid "Limit emails triggered by password changed/reset, email changed, and more." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/ControlTab.php:63 #: src/Admin/Pages/ControlTab.php:63 msgid "Personal Data Requests Notifications" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/ControlTab.php:64 #: src/Admin/Pages/ControlTab.php:64 msgid "Control emails for data requests and data removal actions." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/ControlTab.php:68 #: src/Admin/Pages/ControlTab.php:68 msgid "Automatic Update Notifications" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/ControlTab.php:69 #: src/Admin/Pages/ControlTab.php:69 msgid "Manage emails sent by the core automatic update process." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/ControlTab.php:73 #: src/Admin/Pages/ControlTab.php:73 msgid "New User Notifications" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/ControlTab.php:74 #: src/Admin/Pages/ControlTab.php:74 msgid "Toggle emails sent to both user and site administrator about new user accounts." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/ControlTab.php:92 #: src/Admin/Pages/ControlTab.php:92 msgid "Unlock Email Controls" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/ControlTab.php:95 #: src/Admin/Pages/ControlTab.php:95 msgid "Email Controls allows you to granularly manage emails sent by WordPress.
" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/ControlTab.php:119 -#: build/wp-mail-smtp-pro/src/Admin/Pages/LogsTab.php:67 #: src/Admin/Pages/ControlTab.php:119 #: src/Admin/Pages/LogsTab.php:67 msgid "Upgrade to WP Mail SMTP Pro" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/LogsTab.php:53 #: src/Admin/Pages/LogsTab.php:53 msgid "Unlock Email Logging" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/LogsTab.php:56 #: src/Admin/Pages/LogsTab.php:56 msgid "Keep track of every email sent from your WordPress site with email logging.
" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/LogsTab.php:57 #: src/Admin/Pages/LogsTab.php:57 msgid "Troubleshoot sending issues, recover lost emails, and more!" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/LogsTab.php:61 #: src/Admin/Pages/LogsTab.php:61 msgid "Logs Archive Page Screenshot" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/LogsTab.php:62 #: src/Admin/Pages/LogsTab.php:62 msgid "Logs Single Page Screenshot" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/MiscTab.php:24 #: src/Admin/Pages/MiscTab.php:24 msgid "Misc" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/MiscTab.php:56 #: src/Admin/Pages/MiscTab.php:56 msgid "Do Not Send" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/MiscTab.php:65 #: src/Admin/Pages/MiscTab.php:65 msgid "Check this if you would like to stop sending all emails." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/MiscTab.php:71 #: src/Admin/Pages/MiscTab.php:71 msgid "Some plugins, like BuddyPress and Events Manager, are using their own email delivery solutions. By default, this option does not block their emails, as those plugins do not use default wp_mail() function to send emails." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/MiscTab.php:79 #: src/Admin/Pages/MiscTab.php:79 msgid "You will need to consult with their documentation to switch them to use default WordPress email delivery." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/MiscTab.php:81 #: src/Admin/Pages/MiscTab.php:81 msgid "Test emails are allowed to be sent, regardless of this option." msgstr "" #. translators: %1$s - constant that was used; %2$s - file where it was used. -#: build/wp-mail-smtp-pro/src/Admin/Pages/MiscTab.php:86 -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:468 #: src/Admin/Pages/MiscTab.php:86 #: src/Providers/OptionsAbstract.php:468 msgid "The value of this field was set using a constant %1$s most likely inside %2$s of your WordPress installation." msgstr "" #. translators: %s - The URL to the constants support article. -#: build/wp-mail-smtp-pro/src/Admin/Pages/MiscTab.php:93 #: src/Admin/Pages/MiscTab.php:93 msgid "Please read this support article if you want to enable this option using constants." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/MiscTab.php:114 #: src/Admin/Pages/MiscTab.php:114 msgid "Hide Announcements" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/MiscTab.php:123 #: src/Admin/Pages/MiscTab.php:123 msgid "Check this if you would like to hide plugin announcements and update details." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/MiscTab.php:133 #: src/Admin/Pages/MiscTab.php:133 msgid "Hide Email Delivery Errors" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/MiscTab.php:149 #: src/Admin/Pages/MiscTab.php:149 msgid "Check this if you would like to hide warnings alerting of email delivery errors." msgstr "" #. translators: %s - filter that was used to disabled. -#: build/wp-mail-smtp-pro/src/Admin/Pages/MiscTab.php:156 #: src/Admin/Pages/MiscTab.php:156 msgid "Email Delivery Errors were disabled using a %s filter." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/MiscTab.php:165 #: src/Admin/Pages/MiscTab.php:165 msgid "This is not recommended and should only be done for staging or development sites." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/MiscTab.php:180 #: src/Admin/Pages/MiscTab.php:180 msgid "Uninstall WP Mail SMTP" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/MiscTab.php:188 #: src/Admin/Pages/MiscTab.php:188 msgid "Check this if you would like to remove ALL WP Mail SMTP data upon plugin deletion. All settings will be unrecoverable." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/MiscTab.php:223 -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:540 -#: src/Admin/Pages/MiscTab.php:223 -#: src/Admin/Pages/SettingsTab.php:540 +#: src/Admin/Pages/MiscTab.php:234 +#: src/Admin/Pages/SettingsTab.php:583 msgid "Settings were successfully saved." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:36 -#: src/Admin/Pages/SettingsTab.php:36 +#: src/Admin/Pages/SettingsTab.php:37 msgid "General" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:64 -#: src/Admin/Pages/SettingsTab.php:64 +#: src/Admin/Pages/SettingsTab.php:67 msgid "License" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:67 -#: src/Admin/Pages/SettingsTab.php:67 +#: src/Admin/Pages/SettingsTab.php:70 msgid "Your license key provides access to updates and support." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:75 -#: src/Admin/Pages/SettingsTab.php:75 +#: src/Admin/Pages/SettingsTab.php:78 msgid "License Key" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:85 -#: src/Admin/Pages/SettingsTab.php:85 +#: src/Admin/Pages/SettingsTab.php:88 msgid "Mail" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:92 -#: src/Admin/Pages/SettingsTab.php:92 +#: src/Admin/Pages/SettingsTab.php:95 msgid "From Email" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:103 -#: src/Admin/Pages/SettingsTab.php:103 +#: src/Admin/Pages/SettingsTab.php:113 +msgid "Please first authorize the Gmail mailer below" +msgstr "" + +#: src/Admin/Pages/SettingsTab.php:127 msgid "The email address which emails are sent from." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:104 -#: src/Admin/Pages/SettingsTab.php:104 -msgid "If you using an email provider (Gmail, Yahoo, Outlook.com, etc) this should be your email address for that account." +#: src/Admin/Pages/SettingsTab.php:128 +msgid "If you're using an email provider (Yahoo, Outlook.com, etc) this should be your email address for that account." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:107 -#: src/Admin/Pages/SettingsTab.php:107 +#: src/Admin/Pages/SettingsTab.php:131 msgid "Please note that other plugins can change this, to prevent this use the setting below." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:119 -#: src/Admin/Pages/SettingsTab.php:119 +#: src/Admin/Pages/SettingsTab.php:149 msgid "Force From Email" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:124 -#: src/Admin/Pages/SettingsTab.php:124 +#: src/Admin/Pages/SettingsTab.php:156 msgid "Current provider will automatically force From Email to be the email address that you use to set up the connection below." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:128 -#: src/Admin/Pages/SettingsTab.php:128 +#: src/Admin/Pages/SettingsTab.php:158 +msgid "Gmail mailer will automatically force From Email to be the email address that you selected above." +msgstr "" + +#: src/Admin/Pages/SettingsTab.php:164 msgid "If checked, the From Email setting above will be used for all emails, ignoring values set by other plugins." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:138 -#: src/Admin/Pages/SettingsTab.php:138 +#: src/Admin/Pages/SettingsTab.php:174 msgid "From Name" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:149 -#: src/Admin/Pages/SettingsTab.php:149 +#: src/Admin/Pages/SettingsTab.php:185 msgid "The name which emails are sent from." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:161 -#: src/Admin/Pages/SettingsTab.php:161 +#: src/Admin/Pages/SettingsTab.php:197 msgid "Force From Name" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:166 -#: src/Admin/Pages/SettingsTab.php:166 +#: src/Admin/Pages/SettingsTab.php:202 msgid "Current provider doesn't support setting and forcing From Name. Emails will be sent on behalf of the account name used to setup the connection below." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:170 -#: src/Admin/Pages/SettingsTab.php:170 +#: src/Admin/Pages/SettingsTab.php:206 msgid "If checked, the From Name setting above will be used for all emails, ignoring values set by other plugins." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:179 -#: src/Admin/Pages/SettingsTab.php:179 +#: src/Admin/Pages/SettingsTab.php:215 msgid "Return Path" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:188 -#: src/Admin/Pages/SettingsTab.php:188 +#: src/Admin/Pages/SettingsTab.php:224 msgid "Set the return-path to match the From Email" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:192 -#: src/Admin/Pages/SettingsTab.php:192 +#: src/Admin/Pages/SettingsTab.php:228 msgid "Return Path indicates where non-delivery receipts - or bounce messages - are to be sent." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:193 -#: src/Admin/Pages/SettingsTab.php:193 +#: src/Admin/Pages/SettingsTab.php:229 msgid "If unchecked, bounce messages may be lost. Some providers may ignore this option." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:201 -#: src/Admin/Pages/SettingsTab.php:201 +#: src/Admin/Pages/SettingsTab.php:237 msgid "Mailer" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:242 -#: src/Admin/Pages/SettingsTab.php:242 +#: src/Admin/Pages/SettingsTab.php:278 msgid "Don't see what you're looking for?" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:244 -#: src/Admin/Pages/SettingsTab.php:244 +#: src/Admin/Pages/SettingsTab.php:280 msgid "Suggest a Mailer" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:272 -#: src/Admin/Pages/SettingsTab.php:272 +#: src/Admin/Pages/SettingsTab.php:308 msgid "Dismiss this notice" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:314 -#: src/Admin/Pages/SettingsTab.php:314 +#: src/Admin/Pages/SettingsTab.php:355 msgid "You're using WP Mail SMTP Lite - no license needed. Enjoy!" msgstr "" #. translators: %s - WPMailSMTP.com upgrade URL. -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:320 -#: src/Admin/Pages/SettingsTab.php:320 +#: src/Admin/Pages/SettingsTab.php:361 msgid "To unlock more features consider upgrading to PRO." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:339 -#: src/Admin/Pages/SettingsTab.php:339 +#: src/Admin/Pages/SettingsTab.php:380 msgid "As a valued WP Mail SMTP Lite user you receive $50 off, automatically applied at checkout!" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:400 -#: src/Admin/Pages/SettingsTab.php:400 +#: src/Admin/Pages/SettingsTab.php:441 msgid "Get WP Mail SMTP Pro and Unlock all the Powerful Features" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:404 -#: src/Admin/Pages/SettingsTab.php:404 +#: src/Admin/Pages/SettingsTab.php:445 msgid "Thanks for being a loyal WP Mail SMTP user. Upgrade to WP Mail SMTP Pro to unlock more awesome features and experience why WP Mail SMTP is the most popular SMTP plugin." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:408 -#: src/Admin/Pages/SettingsTab.php:408 +#: src/Admin/Pages/SettingsTab.php:449 msgid "We know that you will truly love WP Mail SMTP. It's used by over 1,000,000 websites." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:411 -#: src/Admin/Pages/SettingsTab.php:411 +#: src/Admin/Pages/SettingsTab.php:452 msgid "Pro Features:" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:415 -#: src/Admin/Pages/SettingsTab.php:415 +#: src/Admin/Pages/SettingsTab.php:456 msgid "Manage Notifications - control which emails your site sends" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:416 -#: src/Admin/Pages/SettingsTab.php:416 +#: src/Admin/Pages/SettingsTab.php:457 msgid "Email Logging - keep track of every email sent from your site" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:417 -#: src/Admin/Pages/SettingsTab.php:417 +#: src/Admin/Pages/SettingsTab.php:458 msgid "Office 365 - send emails using your Office 365 account" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:418 -#: src/Admin/Pages/SettingsTab.php:418 +#: src/Admin/Pages/SettingsTab.php:459 msgid "Amazon SES - harness the power of AWS" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:419 -#: src/Admin/Pages/SettingsTab.php:419 +#: src/Admin/Pages/SettingsTab.php:460 msgid "Outlook.com - send emails using your Outlook.com account" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:420 -#: src/Admin/Pages/SettingsTab.php:420 +#: src/Admin/Pages/SettingsTab.php:461 msgid "Access to our world class support team" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:423 -#: src/Admin/Pages/SettingsTab.php:423 +#: src/Admin/Pages/SettingsTab.php:464 msgid "White Glove Setup - sit back and relax while we handle everything for you" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:424 -#: src/Admin/Pages/SettingsTab.php:424 +#: src/Admin/Pages/SettingsTab.php:465 msgid "Install WP Mail SMTP Pro plugin" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:425 -#: src/Admin/Pages/SettingsTab.php:425 +#: src/Admin/Pages/SettingsTab.php:466 msgid "Set up domain name verification (DNS)" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:426 -#: src/Admin/Pages/SettingsTab.php:426 +#: src/Admin/Pages/SettingsTab.php:467 msgid "Configure Mailgun service" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:427 -#: src/Admin/Pages/SettingsTab.php:427 +#: src/Admin/Pages/SettingsTab.php:468 msgid "Set up WP Mail SMTP Pro plugin" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:428 -#: src/Admin/Pages/SettingsTab.php:428 +#: src/Admin/Pages/SettingsTab.php:469 msgid "Test and verify email delivery" msgstr "" #. translators: %s - WPMailSMTP.com URL. -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:436 -#: src/Admin/Pages/SettingsTab.php:436 +#: src/Admin/Pages/SettingsTab.php:477 msgid "Get WP Mail SMTP Pro Today and Unlock all the Powerful Features »" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/SettingsTab.php:454 -#: src/Admin/Pages/SettingsTab.php:454 +#: src/Admin/Pages/SettingsTab.php:495 msgid "Bonus: WP Mail SMTP users get $50 off regular price, automatically applied at checkout." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:37 #: src/Admin/Pages/TestTab.php:37 msgid "Email Test" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:59 #: src/Admin/Pages/TestTab.php:59 msgid "Send a Test Email" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:66 #: src/Admin/Pages/TestTab.php:66 msgid "Send To" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:72 #: src/Admin/Pages/TestTab.php:72 msgid "Enter email address where test email will be sent." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:80 #: src/Admin/Pages/TestTab.php:80 msgid "HTML" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:86 -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:264 -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:286 #: src/Admin/Pages/TestTab.php:86 #: src/Providers/OptionsAbstract.php:264 #: src/Providers/OptionsAbstract.php:286 msgid "On" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:87 -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:265 -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:287 #: src/Admin/Pages/TestTab.php:87 #: src/Providers/OptionsAbstract.php:265 #: src/Providers/OptionsAbstract.php:287 msgid "Off" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:90 #: src/Admin/Pages/TestTab.php:90 msgid "Send this email in HTML or in plain text format." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:110 #: src/Admin/Pages/TestTab.php:110 msgid "You cannot send an email. Mailer is not properly configured. Please check your settings." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:114 #: src/Admin/Pages/TestTab.php:114 msgid "Send Email" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:142 #: src/Admin/Pages/TestTab.php:142 msgid "Test failed. Please use a valid email address and try to resend the test email." msgstr "" #. translators: %s - email address a test email will be sent to. -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:154 -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:160 #: src/Admin/Pages/TestTab.php:154 #: src/Admin/Pages/TestTab.php:160 msgid "Test email to %s" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:186 #: src/Admin/Pages/TestTab.php:186 msgid "Test plain text email was sent successfully!" msgstr "" #. translators: %s - "HTML" in bold. -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:190 #: src/Admin/Pages/TestTab.php:190 msgid "Test %s email was sent successfully! Please check your inbox to make sure it is delivered." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:510 #: src/Admin/Pages/TestTab.php:510 msgid "SSL certificate issue." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:511 #: src/Admin/Pages/TestTab.php:511 msgid "This means your web server cannot reliably make secure connections (make requests to HTTPS sites)." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:512 -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:560 #: src/Admin/Pages/TestTab.php:512 #: src/Admin/Pages/TestTab.php:560 msgid "Typically this error is returned when web server is not configured properly." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:515 #: src/Admin/Pages/TestTab.php:515 msgid "Contact your web hosting provider and inform them your site has an issue with SSL certificates." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:516 -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:564 #: src/Admin/Pages/TestTab.php:516 #: src/Admin/Pages/TestTab.php:564 msgid "The exact error you can provide them is in the Error log, available at the bottom of this page." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:517 -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:565 #: src/Admin/Pages/TestTab.php:517 #: src/Admin/Pages/TestTab.php:565 msgid "Ask them to resolve the issue then try again." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:528 #: src/Admin/Pages/TestTab.php:528 msgid "Could not connect to host." msgstr "" #. translators: %s - SMTP host address. -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:531 -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:556 -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:658 #: src/Admin/Pages/TestTab.php:531 #: src/Admin/Pages/TestTab.php:556 #: src/Admin/Pages/TestTab.php:658 msgid "This means your web server was unable to connect to %s." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:534 -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:559 -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:661 #: src/Admin/Pages/TestTab.php:534 #: src/Admin/Pages/TestTab.php:559 #: src/Admin/Pages/TestTab.php:661 msgid "This means your web server was unable to connect to the host server." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:535 #: src/Admin/Pages/TestTab.php:535 msgid "Typically this error is returned your web server is blocking the connections or the SMTP host denying the request." msgstr "" #. translators: %s - SMTP host address. -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:539 #: src/Admin/Pages/TestTab.php:539 msgid "Contact your web hosting provider and ask them to verify your server can connect to %s. Additionally, ask them if a firewall or security policy may be preventing the connection." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:542 #: src/Admin/Pages/TestTab.php:542 msgid "If using \"Other SMTP\" Mailer, triple check your SMTP settings including host address, email, and password." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:543 #: src/Admin/Pages/TestTab.php:543 msgid "If using \"Other SMTP\" Mailer, contact your SMTP host to confirm they are accepting outside connections with the settings you have configured (address, username, port, security, etc)." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:553 #: src/Admin/Pages/TestTab.php:553 msgid "Could not connect to your host." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:563 #: src/Admin/Pages/TestTab.php:563 msgid "Contact your web hosting provider and inform them you are having issues making outbound connections." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:575 #: src/Admin/Pages/TestTab.php:575 msgid "Could not authenticate your SMTP account." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:576 #: src/Admin/Pages/TestTab.php:576 msgid "This means we were able to connect to your SMTP host, but were not able to proceed using the email/password in the settings." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:577 #: src/Admin/Pages/TestTab.php:577 msgid "Typically this error is returned when the email or password is not correct or is not what the SMTP host is expecting." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:580 #: src/Admin/Pages/TestTab.php:580 msgid "Triple check your SMTP settings including host address, email, and password. If you have recently reset your password you will need to update the settings." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:581 -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:686 #: src/Admin/Pages/TestTab.php:581 #: src/Admin/Pages/TestTab.php:686 msgid "Contact your SMTP host to confirm you are using the correct username and password." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:582 -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:687 #: src/Admin/Pages/TestTab.php:582 #: src/Admin/Pages/TestTab.php:687 msgid "Verify with your SMTP host that your account has permissions to send emails using outside connections." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:592 #: src/Admin/Pages/TestTab.php:592 msgid "Error due to unsolicited and/or bulk e-mail." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:593 #: src/Admin/Pages/TestTab.php:593 msgid "This means the connection to your SMTP host was made successfully, but the host rejected the email." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:594 #: src/Admin/Pages/TestTab.php:594 msgid "Typically this error is returned when you are sending too many e-mails or e-mails that have been identified as spam." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:597 #: src/Admin/Pages/TestTab.php:597 msgid "Check the emails that are sending are sending individually. Example: email is not sending to 30 recipients. You can install any WordPress e-mail logging plugin to do that." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:598 #: src/Admin/Pages/TestTab.php:598 msgid "Contact your SMTP host to ask about sending/rate limits." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:599 #: src/Admin/Pages/TestTab.php:599 msgid "Verify with them your SMTP account is in good standing and your account has not been flagged." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:609 #: src/Admin/Pages/TestTab.php:609 msgid "Unauthenticated senders are not allowed." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:610 #: src/Admin/Pages/TestTab.php:610 msgid "This means the connection to your SMTP host was made successfully, but you should enable Authentication and provide correct Username and Password." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:613 #: src/Admin/Pages/TestTab.php:613 msgid "Go to WP Mail SMTP plugin Settings page." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:614 #: src/Admin/Pages/TestTab.php:614 msgid "Enable Authentication" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:615 #: src/Admin/Pages/TestTab.php:615 msgid "Enter correct SMTP Username (usually this is an email address) and Password in the appropriate fields." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:627 #: src/Admin/Pages/TestTab.php:627 msgid "Misconfigured server certificate." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:628 #: src/Admin/Pages/TestTab.php:628 msgid "This means OpenSSL on your server isn't able to verify the host certificate." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:629 #: src/Admin/Pages/TestTab.php:629 msgid "There are a few reasons why this is happening. It could be that the host certificate is misconfigured, or this server's OpenSSL is using an outdated CA bundle." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:632 #: src/Admin/Pages/TestTab.php:632 msgid "Verify that the host's SSL certificate is valid." msgstr "" #. translators: %s - URL to the PHP openssl manual -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:635 #: src/Admin/Pages/TestTab.php:635 msgid "Contact your hosting support, show them the \"full Error Log for debugging\" below and share this link with them." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:655 #: src/Admin/Pages/TestTab.php:655 msgid "Could not connect to the SMTP host." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:662 -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1048 #: src/Admin/Pages/TestTab.php:662 #: src/Admin/Pages/TestTab.php:1048 msgid "Typically this error is returned for one of the following reasons:" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:663 #: src/Admin/Pages/TestTab.php:663 msgid "SMTP settings are incorrect (wrong port, security setting, incorrect host)." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:664 -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1050 #: src/Admin/Pages/TestTab.php:664 #: src/Admin/Pages/TestTab.php:1050 msgid "Your web server is blocking the connection." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:665 #: src/Admin/Pages/TestTab.php:665 msgid "Your SMTP host is rejecting the connection." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:668 #: src/Admin/Pages/TestTab.php:668 msgid "Triple check your SMTP settings including host address, email, and password, port, and security." msgstr "" #. translators: %1$s - SMTP host address, %2$s - SMTP port, %3$s - SMTP encryption. -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:671 #: src/Admin/Pages/TestTab.php:671 msgid "Contact your web hosting provider and ask them to verify your server can connect to %1$s on port %2$s using %3$s encryption. Additionally, ask them if a firewall or security policy may be preventing the connection - many shared hosts block certain ports.
Note: this is the most common cause of this issue." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:684 #: src/Admin/Pages/TestTab.php:684 msgid "no" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:697 -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:712 -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:728 #: src/Admin/Pages/TestTab.php:697 #: src/Admin/Pages/TestTab.php:712 #: src/Admin/Pages/TestTab.php:728 msgid "Mailgun failed." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:698 #: src/Admin/Pages/TestTab.php:698 msgid "It seems that you forgot to activate your Mailgun account." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:701 #: src/Admin/Pages/TestTab.php:701 msgid "Check your inbox you used to create a Mailgun account. Click the activation link in an email from Mailgun." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:702 #: src/Admin/Pages/TestTab.php:702 msgid "If you do not see activation email, go to your Mailgun control panel and resend the activation email." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:713 #: src/Admin/Pages/TestTab.php:713 msgid "Typically this error is because there is an issue with your Mailgun settings, in many cases the API key." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:716 #: src/Admin/Pages/TestTab.php:716 msgid "Verify your API key is correct." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:717 #: src/Admin/Pages/TestTab.php:717 msgid "Go to your Mailgun account and view your API key." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:718 #: src/Admin/Pages/TestTab.php:718 msgid "Note that the API key includes the \"key\" prefix, so make sure that it is in the WP Mail SMTP Mailgun API setting." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:729 #: src/Admin/Pages/TestTab.php:729 msgid "Your Mailgun account does not have access to send emails." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:730 #: src/Admin/Pages/TestTab.php:730 msgid "Typically this error is because you have not set up and/or complete domain name verification for your Mailgun account." msgstr "" #. translators: %s - Mailgun documentation URL. -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:735 #: src/Admin/Pages/TestTab.php:735 msgid "Go to our how-to guide for setting up Mailgun with WP Mail SMTP." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:746 #: src/Admin/Pages/TestTab.php:746 msgid "Complete the steps in section \"2. Verify Your Domain\"." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:756 -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:805 -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:825 -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:851 -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:867 -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:919 -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:945 #: src/Admin/Pages/TestTab.php:756 #: src/Admin/Pages/TestTab.php:805 #: src/Admin/Pages/TestTab.php:825 @@ -1311,767 +1042,642 @@ msgstr "" msgid "Google API Error." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:757 #: src/Admin/Pages/TestTab.php:757 msgid "You have not properly configured Gmail mailer." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:758 #: src/Admin/Pages/TestTab.php:758 msgid "Make sure that you have clicked the \"Allow plugin to send emails using your Google account\" button under Gmail settings." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:761 #: src/Admin/Pages/TestTab.php:761 msgid "Go to plugin Settings page and click the \"Allow plugin to send emails using your Google account\" button." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:762 #: src/Admin/Pages/TestTab.php:762 msgid "After the click you should be redirected to a Gmail authorization screen, where you will be asked a permission to send emails on your behalf." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:763 #: src/Admin/Pages/TestTab.php:763 msgid "Please click \"Agree\", if you see that button. If not - you will need to enable less secure apps first:" msgstr "" #. translators: %s - Google support article URL. -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:768 #: src/Admin/Pages/TestTab.php:768 msgid "if you are using regular Gmail account, please read this article to proceed." msgstr "" #. translators: %s - Google support article URL. -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:783 #: src/Admin/Pages/TestTab.php:783 msgid "if you are using G Suite, please read this article to proceed." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:806 #: src/Admin/Pages/TestTab.php:806 msgid "Typically this error is because address the email was sent to is invalid or was empty." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:809 #: src/Admin/Pages/TestTab.php:809 msgid "Check the \"Send To\" email address used and confirm it is a valid email and was not empty." msgstr "" #. translators: 1 - correct email address example. 2 - incorrect email address example. -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:811 #: src/Admin/Pages/TestTab.php:811 msgid "It should be something like this: %1$s. These are incorrect values: %2$s." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:815 #: src/Admin/Pages/TestTab.php:815 msgid "Make sure that the generated email has a TO header, useful when you are responsible for email creation." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:826 #: src/Admin/Pages/TestTab.php:826 msgid "Unfortunately, this error can be due to many different reasons." msgstr "" #. translators: %s - Blog article URL. -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:831 #: src/Admin/Pages/TestTab.php:831 msgid "Please read this article to learn more about what can cause this error and how it can be resolved." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:852 #: src/Admin/Pages/TestTab.php:852 msgid "Authentication code that Google returned to you has already been used on your previous auth attempt." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:855 #: src/Admin/Pages/TestTab.php:855 msgid "Make sure that you are not trying to manually clean up the plugin options to retry the \"Allow...\" step." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:856 #: src/Admin/Pages/TestTab.php:856 msgid "Reinstall the plugin with clean plugin data turned on on Misc page. This will remove all the plugin options and you will be safe to retry." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:857 #: src/Admin/Pages/TestTab.php:857 msgid "Make sure there is no aggressive caching on site admin area pages or try to clean cache between attempts." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:868 #: src/Admin/Pages/TestTab.php:868 msgid "There are various reasons for that, please review the steps below." msgstr "" #. translators: %s - Google G Suite Admin area URL. -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:873 #: src/Admin/Pages/TestTab.php:873 msgid "Make sure that your G Suite trial period has not expired. You can check the status here." msgstr "" #. translators: %s - Google G Suite Admin area URL. -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:886 #: src/Admin/Pages/TestTab.php:886 msgid "Make sure that Gmail app in your G Suite is actually enabled. You can check that in Apps list in G Suite Admin area." msgstr "" #. translators: %s - Google Developers Console URL. -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:899 #: src/Admin/Pages/TestTab.php:899 msgid "Make sure that you have Gmail API enabled, and you can do that here." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:922 -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:949 #: src/Admin/Pages/TestTab.php:922 #: src/Admin/Pages/TestTab.php:949 msgid "Make sure that the used Client ID/Secret correspond to a proper project that has Gmail API enabled." msgstr "" #. translators: %s - Gmail documentation URL. -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:925 #: src/Admin/Pages/TestTab.php:925 msgid "Please follow our Gmail tutorial to be sure that all the correct project and data is applied." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:946 #: src/Admin/Pages/TestTab.php:946 msgid "You may have added a new API to a project" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:950 #: src/Admin/Pages/TestTab.php:950 msgid "Try to use a separate project for your emails, so the project has only 1 Gmail API in it enabled. You will need to remove the old project and create a new one from scratch." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:960 #: src/Admin/Pages/TestTab.php:960 msgid "SMTP.com API Error." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:961 #: src/Admin/Pages/TestTab.php:961 msgid "Your Sender Name option is incorrect." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:964 #: src/Admin/Pages/TestTab.php:964 msgid "Please make sure you entered an accurate Sender Name in WP Mail SMTP plugin settings." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:974 #: src/Admin/Pages/TestTab.php:974 msgid "GuzzleHttp requirements." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:975 #: src/Admin/Pages/TestTab.php:975 msgid "GuzzleHttp requires cURL, the allow_url_fopen ini setting, or a custom HTTP handler." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:978 #: src/Admin/Pages/TestTab.php:978 msgid "Edit your php.ini file on your hosting server." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:979 #: src/Admin/Pages/TestTab.php:979 msgid "(Recommended) Enable PHP extension: cURL, by adding \"extension=curl\" to the php.ini file (without the quotation marks) OR" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:980 #: src/Admin/Pages/TestTab.php:980 msgid "(If cURL can't be enabled on your hosting server) Enable PHP setting: allow_url_fopen, by adding \"allow_url_fopen = On\" to the php.ini file (without the quotation marks)" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:981 #: src/Admin/Pages/TestTab.php:981 msgid "If you don't know how to do the above we strongly suggest contacting your hosting support and provide them the \"full Error Log for debugging\" below and these steps. They should be able to fix this issue for you." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1003 #: src/Admin/Pages/TestTab.php:1003 msgid "PCRE library issue" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1004 #: src/Admin/Pages/TestTab.php:1004 msgid "It looks like your server is running PHP version 7.4.x with an outdated PCRE library (libpcre2) that has a known issue with email address validation." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1005 #: src/Admin/Pages/TestTab.php:1005 msgid "There is a known issue with PHP version 7.4.x, when using libpcre2 library version lower than 10.33." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1008 #: src/Admin/Pages/TestTab.php:1008 msgid "Contact your web hosting provider and inform them you are having issues with libpcre2 library on PHP 7.4." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1009 #: src/Admin/Pages/TestTab.php:1009 msgid "They should be able to resolve this issue for you." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1010 #: src/Admin/Pages/TestTab.php:1010 msgid "For a quick fix, until your web hosting resolves this, you can downgrade to PHP version 7.3 on your server." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1046 #: src/Admin/Pages/TestTab.php:1046 msgid "An issue was detected." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1047 #: src/Admin/Pages/TestTab.php:1047 msgid "This means your test email was unable to be sent." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1049 #: src/Admin/Pages/TestTab.php:1049 msgid "Plugin settings are incorrect (wrong SMTP settings, invalid Mailer configuration, etc)." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1051 #: src/Admin/Pages/TestTab.php:1051 msgid "Your host is rejecting the connection." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1054 #: src/Admin/Pages/TestTab.php:1054 msgid "Triple check the plugin settings, consider reconfiguring to make sure everything is correct (eg bad copy and paste)." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1056 #: src/Admin/Pages/TestTab.php:1056 msgid "Contact your web hosting provider and ask them to verify your server can make outside connections. Additionally, ask them if a firewall or security policy may be preventing the connection - many shared hosts block certain ports.
Note: this is the most common cause of this issue." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1062 #: src/Admin/Pages/TestTab.php:1062 msgid "Try using a different mailer." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1081 #: src/Admin/Pages/TestTab.php:1081 msgid "There was a problem while sending the test email." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1091 #: src/Admin/Pages/TestTab.php:1091 msgid "Recommended next steps:" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1101 #: src/Admin/Pages/TestTab.php:1101 msgid "Need support?" msgstr "" #. translators: %s - WPMailSMTP.com account area link. -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1109 #: src/Admin/Pages/TestTab.php:1109 msgid "As a WP Mail SMTP Pro user you have access to WP Mail SMTP priority support. Please log in to your WPMailSMTP.com account and submit a support ticket." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1126 #: src/Admin/Pages/TestTab.php:1126 msgid "WP Mail SMTP is a free plugin, and the team behind WPForms maintains it to give back to the WordPress community." msgstr "" #. translators: %s - WPMailSMTP.com URL. -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1133 #: src/Admin/Pages/TestTab.php:1133 msgid "To access our world class support, please upgrade to WP Mail SMTP Pro. Along with getting expert support, you will also get Notification controls, Email Logging, and integrations for Amazon SES, Office 365, and Outlook.com." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1148 #: src/Admin/Pages/TestTab.php:1148 msgid "Additionally, you can take advantage of our White Glove Setup. Sit back and relax while we handle everything for you! If you simply don't have time or maybe you feel a bit in over your head - we got you covered." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1154 #: src/Admin/Pages/TestTab.php:1154 msgid "As a valued WP Mail SMTP user, you will get $50 off regular pricing, automatically applied at checkout!" msgstr "" #. translators: %1$s - WP Mail SMTP support policy URL, %2$s - WP Mail SMTP support forum URL, %3$s - WPMailSMTP.com URL. -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1168 #: src/Admin/Pages/TestTab.php:1168 msgid "Alternatively, we also offer limited support on the WordPress.org support forums. You can create a support thread there, but please understand that free support is not guaranteed and is limited to simple issues. If you have an urgent or complex issue, then please consider upgrading to WP Mail SMTP Pro to access our priority support ticket system." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1189 #: src/Admin/Pages/TestTab.php:1189 msgid "Click here to view the full Error Log for debugging" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Pages/TestTab.php:1198 #: src/Admin/Pages/TestTab.php:1198 msgid "Please copy only the content of the error debug message above, identified with an orange left border, into the support forum topic if you experience any issues." msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Review.php:119 #: src/Admin/Review.php:119 msgid "Are you enjoying WP Mail SMTP?" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Review.php:121 #: src/Admin/Review.php:121 msgid "Yes" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Review.php:122 #: src/Admin/Review.php:122 msgid "Not Really" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Review.php:126 #: src/Admin/Review.php:126 msgid "We're sorry to hear you aren't enjoying WP Mail SMTP. We would love a chance to improve. Could you take a minute and let us know what we can do better?" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Review.php:129 #: src/Admin/Review.php:129 msgid "Give Feedback" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Review.php:132 #: src/Admin/Review.php:132 msgid "No thanks" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Review.php:137 #: src/Admin/Review.php:137 msgid "That’s awesome! Could you please do me a BIG favor and give it a 5-star rating on WordPress to help us spread the word and boost our motivation?" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Review.php:138 #: src/Admin/Review.php:138 msgid "~ Jared Atchison
Lead Developer, WP Mail SMTP" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Review.php:141 #: src/Admin/Review.php:141 msgid "Ok, you deserve it" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Review.php:143 #: src/Admin/Review.php:143 msgid "Nope, maybe later" msgstr "" -#: build/wp-mail-smtp-pro/src/Admin/Review.php:144 #: src/Admin/Review.php:144 msgid "I already did" msgstr "" #. translators: %1$s - Plugin name causing conflict; %2$s - Plugin name causing conflict. -#: build/wp-mail-smtp-pro/src/Conflicts.php:159 #: src/Conflicts.php:159 msgid "Heads up! WP Mail SMTP has detected %1$s is activated. Please deactivate %2$s to prevent conflicts." msgstr "" #. translators: %1$s - WP Mail SMTP plugin name; %2$s - WPMailSMTP.com URL to a related doc. -#: build/wp-mail-smtp-pro/src/Core.php:367 -#: src/Core.php:367 +#: src/Core.php:381 msgid "Your site is running an outdated version of PHP that is no longer supported and may cause issues with %1$s. Read more for additional information." msgstr "" -#: build/wp-mail-smtp-pro/src/Core.php:381 -#: src/Core.php:381 +#: src/Core.php:395 msgid "Please Note: Support for PHP 5.5 will be discontinued in 2020. After this, if no further action is taken, WP Mail SMTP functionality will be disabled." msgstr "" #. translators: %s - plugin name and its version. -#: build/wp-mail-smtp-pro/src/Core.php:415 -#: src/Core.php:415 +#: src/Core.php:429 msgid "EMAILING DISABLED: The %s is currently blocking all emails from being sent." msgstr "" #. translators: %1$s - constant name; %2$s - constant value. -#: build/wp-mail-smtp-pro/src/Core.php:426 -#: src/Core.php:426 +#: src/Core.php:440 msgid "To send emails, change the value of the %1$s constant to %2$s." msgstr "" #. translators: %s - plugin Misc settings page URL. -#: build/wp-mail-smtp-pro/src/Core.php:437 -#: src/Core.php:437 +#: src/Core.php:451 msgid "To send emails, go to plugin Misc settings and disable the \"Do Not Send\" option." msgstr "" #. translators: %s - plugin name and its version. -#: build/wp-mail-smtp-pro/src/Core.php:469 -#: src/Core.php:469 +#: src/Core.php:482 msgid "EMAIL DELIVERY ERROR: the plugin %s logged this error during the last time it tried to send an email:" msgstr "" -#: build/wp-mail-smtp-pro/src/Core.php:499 -#: src/Core.php:499 +#: src/Core.php:512 msgid "Consider running an email test after fixing it." msgstr "" #. translators: %1$s - WP Mail SMTP, %2$s - error message. -#: build/wp-mail-smtp-pro/src/Migration.php:137 #: src/Migration.php:137 msgid "There was an error while upgrading the database. Please contact %1$s support with this information: %2$s." msgstr "" -#: build/wp-mail-smtp-pro/src/Pro/Providers/Providers.php:158 #: src/Pro/Providers/Providers.php:158 msgid "OK" msgstr "" -#: build/wp-mail-smtp-pro/src/Pro/SiteHealth.php:58 #: src/Pro/SiteHealth.php:58 msgid "Is wpmailsmtp.com reachable?" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/AmazonSES/Options.php:25 #: src/Providers/AmazonSES/Options.php:25 msgid "Amazon SES" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/AmazonSES/Options.php:39 #: src/Providers/AmazonSES/Options.php:39 msgid "We're sorry, the Amazon SES mailer is not available on your plan. Please upgrade to the PRO plan to unlock all these awesome features." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Gmail/Auth.php:170 -#: src/Providers/Gmail/Auth.php:170 +#: src/Providers/Gmail/Auth.php:182 msgid "There was an error while processing the Google authentication request. Please make sure that you have Client ID and Client Secret both valid and saved." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Gmail/Mailer.php:258 -#: src/Providers/Gmail/Mailer.php:258 +#: src/Providers/Gmail/Mailer.php:255 msgid "Please re-grant Google app permissions!" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Gmail/Mailer.php:259 -#: src/Providers/Gmail/Mailer.php:259 +#: src/Providers/Gmail/Mailer.php:256 msgid "Go to WP Mail SMTP plugin settings page. Click the “Remove Connection” button." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Gmail/Mailer.php:260 -#: src/Providers/Gmail/Mailer.php:260 +#: src/Providers/Gmail/Mailer.php:257 msgid "Then click the “Allow plugin to send emails using your Google account” button and re-enable access." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Gmail/Options.php:32 #: src/Providers/Gmail/Options.php:32 msgid "Gmail" msgstr "" #. translators: %s - URL to our Gmail doc. -#: build/wp-mail-smtp-pro/src/Providers/Gmail/Options.php:35 #: src/Providers/Gmail/Options.php:35 msgid "Send emails using your Gmail or G Suite (formerly Google Apps) account, all while keeping your login credentials safe. Other Google SMTP methods require enabling less secure apps in your account and entering your password. However, this integration uses the Google API to improve email delivery issues while keeping your site secure.

Read our Gmail documentation to learn how to configure Gmail or G Suite." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Gmail/Options.php:48 #: src/Providers/Gmail/Options.php:48 msgid "The Gmail mailer works well for sites that send low numbers of emails. However, Gmail's API has rate limitations and a number of additional restrictions that can lead to challenges during setup. If you expect to send a high volume of emails, or if you find that your web host is not compatible with the Gmail API restrictions, then we recommend considering a different mailer option." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Gmail/Options.php:72 #: src/Providers/Gmail/Options.php:72 msgid "Client ID" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Gmail/Options.php:87 #: src/Providers/Gmail/Options.php:87 msgid "Client Secret" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Gmail/Options.php:109 #: src/Providers/Gmail/Options.php:109 msgid "Authorized redirect URI" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Gmail/Options.php:117 #: src/Providers/Gmail/Options.php:117 msgid "Copy URL to clipboard" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Gmail/Options.php:122 #: src/Providers/Gmail/Options.php:122 msgid "Please copy this URL into the \"Authorized redirect URIs\" field of your Google web application." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Gmail/Options.php:131 #: src/Providers/Gmail/Options.php:131 msgid "Authorization" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Gmail/Options.php:159 #: src/Providers/Gmail/Options.php:159 msgid "Allow plugin to send emails using your Google account" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Gmail/Options.php:162 #: src/Providers/Gmail/Options.php:162 msgid "Click the button above to confirm authorization." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Gmail/Options.php:168 #: src/Providers/Gmail/Options.php:168 msgid "Remove Connection" msgstr "" #. translators: %s - email address, as received from Google API. -#: build/wp-mail-smtp-pro/src/Providers/Gmail/Options.php:177 #: src/Providers/Gmail/Options.php:177 msgid "Connected as %s" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Gmail/Options.php:184 -#: src/Providers/Gmail/Options.php:184 +#. translators: %s - URL to Google Gmail alias documentation page. +#: src/Providers/Gmail/Options.php:187 +msgid "If you want to use a different From Email address you can set-up a Google email alias. Follow these instructions and then select the From Email at the top of this page." +msgstr "" + +#: src/Providers/Gmail/Options.php:201 msgid "Removing the connection will give you an ability to redo the connection or link to another Google account." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Gmail/Options.php:192 -#: src/Providers/Gmail/Options.php:192 +#: src/Providers/Gmail/Options.php:209 msgid "You need to save settings with Client ID and Client Secret before you can proceed." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Mail/Options.php:25 #: src/Providers/Mail/Options.php:25 msgid "Default (none)" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Mail/Options.php:37 #: src/Providers/Mail/Options.php:37 msgid "You currently have the native WordPress option selected. Please select any other Mailer option above to continue the setup." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Mailgun/Options.php:25 +#: src/Providers/Mailgun/Mailer.php:392 +msgid "Mailgun API request was successful, but it could not queue the email for delivery." +msgstr "" + +#: src/Providers/Mailgun/Mailer.php:393 +msgid "This could point to an incorrect Domain Name in the plugin settings." +msgstr "" + +#: src/Providers/Mailgun/Mailer.php:394 +msgid "Please check the WP Mail SMTP plugin settings and make sure the Mailgun Domain Name setting is correct." +msgstr "" + #: src/Providers/Mailgun/Options.php:25 msgid "Mailgun" msgstr "" #. translators: %1$s - opening link tag; %2$s - closing link tag; %3$s - opening link tag; %4$s - closing link tag. -#: build/wp-mail-smtp-pro/src/Providers/Mailgun/Options.php:29 #: src/Providers/Mailgun/Options.php:29 msgid "%1$sMailgun%2$s is one of the leading transactional email services trusted by over 150,000+ businesses. They provide 5,000 free emails per month for 3 months.

Read our %3$sMailgun documentation%4$s to learn how to configure Mailgun and improve your email deliverability." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Mailgun/Options.php:57 #: src/Providers/Mailgun/Options.php:57 msgid "Private API Key" msgstr "" #. translators: %s - API key link. -#: build/wp-mail-smtp-pro/src/Providers/Mailgun/Options.php:76 #: src/Providers/Mailgun/Options.php:76 msgid "Follow this link to get an API Key from Mailgun: %s." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Mailgun/Options.php:78 #: src/Providers/Mailgun/Options.php:78 msgid "Get a Private API Key" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Mailgun/Options.php:89 #: src/Providers/Mailgun/Options.php:89 msgid "Domain Name" msgstr "" #. translators: %s - Domain Name link. -#: build/wp-mail-smtp-pro/src/Providers/Mailgun/Options.php:101 #: src/Providers/Mailgun/Options.php:101 msgid "Follow this link to get a Domain Name from Mailgun: %s." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Mailgun/Options.php:103 #: src/Providers/Mailgun/Options.php:103 msgid "Get a Domain Name" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Mailgun/Options.php:114 #: src/Providers/Mailgun/Options.php:114 msgid "Region" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Mailgun/Options.php:124 #: src/Providers/Mailgun/Options.php:124 msgid "US" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Mailgun/Options.php:133 #: src/Providers/Mailgun/Options.php:133 msgid "EU" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Mailgun/Options.php:137 #: src/Providers/Mailgun/Options.php:137 msgid "Define which endpoint you want to use for sending messages." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Mailgun/Options.php:138 #: src/Providers/Mailgun/Options.php:138 msgid "If you are operating under EU laws, you may be required to use EU region." msgstr "" #. translators: %s - URL to Mailgun.com page. -#: build/wp-mail-smtp-pro/src/Providers/Mailgun/Options.php:143 #: src/Providers/Mailgun/Options.php:143 msgid "More information on Mailgun.com." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:186 #: src/Providers/OptionsAbstract.php:186 msgid "SMTP Host" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:200 #: src/Providers/OptionsAbstract.php:200 msgid "Encryption" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:210 #: src/Providers/OptionsAbstract.php:210 msgid "None" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:219 #: src/Providers/OptionsAbstract.php:219 msgid "SSL" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:228 #: src/Providers/OptionsAbstract.php:228 msgid "TLS" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:232 #: src/Providers/OptionsAbstract.php:232 msgid "For most servers TLS is the recommended option. If your SMTP provider offers both SSL and TLS options, we recommend using TLS." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:240 #: src/Providers/OptionsAbstract.php:240 msgid "SMTP Port" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:254 #: src/Providers/OptionsAbstract.php:254 msgid "Auto TLS" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:268 #: src/Providers/OptionsAbstract.php:268 msgid "By default TLS encryption is automatically used if the server supports it, which is recommended. In some cases, due to server misconfigurations, this can cause issues and may need to be disabled." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:276 #: src/Providers/OptionsAbstract.php:276 msgid "Authentication" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:295 #: src/Providers/OptionsAbstract.php:295 msgid "SMTP Username" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:309 #: src/Providers/OptionsAbstract.php:309 msgid "SMTP Password" msgstr "" #. translators: %s - constant name: WPMS_SMTP_PASS. -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:321 #: src/Providers/OptionsAbstract.php:321 msgid "To change the password you need to change the value of the constant there: %s" msgstr "" #. translators: %1$s - wp-config.php file, %2$s - WPMS_ON constant name. -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:329 #: src/Providers/OptionsAbstract.php:329 msgid "If you want to disable the use of constants, find in %1$s file the constant %2$s and turn if off:" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:339 #: src/Providers/OptionsAbstract.php:339 msgid "All the defined constants will stop working and you will be able to change all the values on this page." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:347 #: src/Providers/OptionsAbstract.php:347 msgid "The password will be stored in plain text. For improved security, we highly recommend using your site's WordPress configuration file to set your password." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:350 #: src/Providers/OptionsAbstract.php:350 msgid "Learn More" msgstr "" #. translators: %1$s - Provider name; %2$s - PHP version required by Provider; %3$s - current PHP version. -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:410 #: src/Providers/OptionsAbstract.php:410 msgid "%1$s requires PHP %2$s to work and does not support your current PHP version %3$s. Please contact your host and request a PHP upgrade to the latest one." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:417 #: src/Providers/OptionsAbstract.php:417 msgid "Meanwhile you can switch to some other mailers." msgstr "" #. translators: %s - Provider name -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:436 #: src/Providers/OptionsAbstract.php:436 msgid "%s requires an SSL certificate, and so is not currently compatible with your site. Please contact your host to request a SSL certificate, or check out WPBeginner's tutorial on how to set up SSL." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/OptionsAbstract.php:449 #: src/Providers/OptionsAbstract.php:449 msgid "If you'd prefer not to set up SSL, or need an SMTP solution in the meantime, please select a different mailer option." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Outlook/Options.php:25 #: src/Providers/Outlook/Options.php:25 msgid "Outlook" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Outlook/Options.php:39 #: src/Providers/Outlook/Options.php:39 msgid "We're sorry, the Microsoft Outlook mailer is not available on your plan. Please upgrade to the PRO plan to unlock all these awesome features." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Pepipost/Options.php:25 #: src/Providers/Pepipost/Options.php:25 msgid "Pepipost SMTP" msgstr "" +#: src/Providers/PepipostAPI/Mailer.php:339 +msgid "General error" +msgstr "" + +#: src/Providers/PepipostAPI/Mailer.php:340 +msgid "Error" +msgstr "" + #. translators: %1$s - URL to pepipost.com site. -#: build/wp-mail-smtp-pro/src/Providers/PepipostAPI/Options.php:31 #: src/Providers/PepipostAPI/Options.php:31 msgid "Pepipost is a recommended transactional email service. Every month Pepipost delivers over 8 billion emails from 20,000+ customers. Their mission is to reliably send emails in the most efficient way and at the most disruptive pricing ever. Pepipost provides users 30,000 free emails the first 30 days." msgstr "" #. translators: %1$s - URL to wpmailsmtp.com doc. -#: build/wp-mail-smtp-pro/src/Providers/PepipostAPI/Options.php:34 #: src/Providers/PepipostAPI/Options.php:34 msgid "Read our Pepipost documentation to learn how to configure Pepipost and improve your email deliverability." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/PepipostAPI/Options.php:53 #: src/Providers/PepipostAPI/Options.php:53 msgid "Get Started with Pepipost" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/PepipostAPI/Options.php:61 #: src/Providers/PepipostAPI/Options.php:61 msgid "Pepipost" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/PepipostAPI/Options.php:88 -#: build/wp-mail-smtp-pro/src/Providers/Sendgrid/Options.php:57 -#: build/wp-mail-smtp-pro/src/Providers/Sendinblue/Options.php:76 -#: build/wp-mail-smtp-pro/src/Providers/SMTPcom/Options.php:83 #: src/Providers/PepipostAPI/Options.php:88 #: src/Providers/Sendgrid/Options.php:57 #: src/Providers/Sendinblue/Options.php:76 @@ -2080,222 +1686,215 @@ msgid "API Key" msgstr "" #. translators: %s - link to get an API Key. -#: build/wp-mail-smtp-pro/src/Providers/PepipostAPI/Options.php:107 -#: build/wp-mail-smtp-pro/src/Providers/Sendinblue/Options.php:95 #: src/Providers/PepipostAPI/Options.php:107 #: src/Providers/Sendinblue/Options.php:95 msgid "Follow this link to get an API Key: %s." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/PepipostAPI/Options.php:109 #: src/Providers/PepipostAPI/Options.php:109 msgid "Get the API Key" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Sendgrid/Options.php:25 #: src/Providers/Sendgrid/Options.php:25 msgid "SendGrid" msgstr "" #. translators: %1$s - opening link tag; %2$s - closing link tag; %3$s - opening link tag; %4$s - closing link tag. -#: build/wp-mail-smtp-pro/src/Providers/Sendgrid/Options.php:29 #: src/Providers/Sendgrid/Options.php:29 msgid "%1$sSendGrid%2$s is one of the leading transactional email services, sending over 35 billion emails every month. They provide users 100 free emails per day.

Read our %3$sSendGrid documentation%4$s to learn how to set up SendGrid and improve your email deliverability." msgstr "" #. translators: %s - API key link. -#: build/wp-mail-smtp-pro/src/Providers/Sendgrid/Options.php:76 #: src/Providers/Sendgrid/Options.php:76 msgid "Follow this link to get an API Key from SendGrid: %s." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Sendgrid/Options.php:78 #: src/Providers/Sendgrid/Options.php:78 msgid "Create API Key" msgstr "" #. translators: %s - SendGrid access level. -#: build/wp-mail-smtp-pro/src/Providers/Sendgrid/Options.php:86 #: src/Providers/Sendgrid/Options.php:86 msgid "To send emails you will need only a %s access level for this API key." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Sendinblue/Options.php:33 #: src/Providers/Sendinblue/Options.php:33 msgid "Sendinblue" msgstr "" #. translators: %1$s - URL to sendinblue.com site. -#: build/wp-mail-smtp-pro/src/Providers/Sendinblue/Options.php:37 #: src/Providers/Sendinblue/Options.php:37 msgid "Sendinblue serves 80,000+ growing companies around the world and sends over 30 million emails each day. They provide users 300 free emails per day." msgstr "" #. translators: %2$s - URL to wpmailsmtp.com doc. -#: build/wp-mail-smtp-pro/src/Providers/Sendinblue/Options.php:40 #: src/Providers/Sendinblue/Options.php:40 msgid "Read our Sendinblue documentation to learn how to configure Sendinblue and improve your email deliverability." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/Sendinblue/Options.php:97 #: src/Providers/Sendinblue/Options.php:97 msgid "Get v3 API Key" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/SMTP/Options.php:25 #: src/Providers/SMTP/Options.php:25 msgid "Other SMTP" msgstr "" #. translators: %s - URL to SMTP documentation. -#: build/wp-mail-smtp-pro/src/Providers/SMTP/Options.php:29 #: src/Providers/SMTP/Options.php:29 msgid "Use the SMTP details provided by your hosting provider or email service.

To see recommended settings for the popular services as well as troubleshooting tips, check out our SMTP documentation." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/SMTPcom/Mailer.php:433 -#: src/Providers/SMTPcom/Mailer.php:433 +#: src/Providers/SMTPcom/Mailer.php:434 msgid "Api Key:" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/SMTPcom/Mailer.php:435 -#: src/Providers/SMTPcom/Mailer.php:435 +#: src/Providers/SMTPcom/Mailer.php:436 msgid "Channel:" msgstr "" #. translators: %s - URL to smtp.com site. -#: build/wp-mail-smtp-pro/src/Providers/SMTPcom/Options.php:41 #: src/Providers/SMTPcom/Options.php:41 msgid "SMTP.com is a recommended transactional email service. With a 22 years of track record of reliable email delivery, SMTP.com is a premiere solution for WordPress developers and website owners. SMTP.com has been around for almost as long as email itself. Their super simple integration interface makes it easy to get started while a powerful API and robust documentation make it a preferred choice among developers. Start a 30-day free trial with 50,000 emails." msgstr "" #. translators: %s - URL to wpmailsmtp.com doc page for stmp.com. -#: build/wp-mail-smtp-pro/src/Providers/SMTPcom/Options.php:49 #: src/Providers/SMTPcom/Options.php:49 msgid "Read our SMTP.com documentation to learn how to configure SMTP.com and improve your email deliverability." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/SMTPcom/Options.php:59 #: src/Providers/SMTPcom/Options.php:59 msgid "Get Started with SMTP.com" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/SMTPcom/Options.php:67 #: src/Providers/SMTPcom/Options.php:67 msgid "SMTP.com" msgstr "" #. translators: %s - API key link. -#: build/wp-mail-smtp-pro/src/Providers/SMTPcom/Options.php:101 #: src/Providers/SMTPcom/Options.php:101 msgid "Follow this link to get an API Key from SMTP.com: %s." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/SMTPcom/Options.php:103 #: src/Providers/SMTPcom/Options.php:103 msgid "Get API Key" msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/SMTPcom/Options.php:114 #: src/Providers/SMTPcom/Options.php:114 msgid "Sender Name" msgstr "" #. translators: %s - Channel/Sender Name link for smtp.com documentation. -#: build/wp-mail-smtp-pro/src/Providers/SMTPcom/Options.php:130 #: src/Providers/SMTPcom/Options.php:130 msgid "Follow this link to get a Sender Name from SMTP.com: %s." msgstr "" -#: build/wp-mail-smtp-pro/src/Providers/SMTPcom/Options.php:132 #: src/Providers/SMTPcom/Options.php:132 msgid "Get Sender Name" msgstr "" -#: build/wp-mail-smtp-pro/src/SiteHealth.php:67 #: src/SiteHealth.php:67 msgid "Is WP Mail SMTP mailer setup complete?" msgstr "" -#: build/wp-mail-smtp-pro/src/SiteHealth.php:92 -#: src/SiteHealth.php:92 +#: src/SiteHealth.php:72 +msgid "Do WP Mail SMTP DB tables exist?" +msgstr "" + +#: src/SiteHealth.php:98 msgid "Version" msgstr "" -#: build/wp-mail-smtp-pro/src/SiteHealth.php:96 -#: src/SiteHealth.php:96 +#: src/SiteHealth.php:102 msgid "License key type" msgstr "" -#: build/wp-mail-smtp-pro/src/SiteHealth.php:100 -#: src/SiteHealth.php:100 +#: src/SiteHealth.php:106 msgid "Debug" msgstr "" -#: build/wp-mail-smtp-pro/src/SiteHealth.php:101 -#: src/SiteHealth.php:101 +#: src/SiteHealth.php:107 msgid "No debug notices found." msgstr "" -#: build/wp-mail-smtp-pro/src/SiteHealth.php:131 -#: src/SiteHealth.php:131 +#: src/SiteHealth.php:110 +msgid "DB tables" +msgstr "" + +#: src/SiteHealth.php:112 +msgid "No DB tables found." +msgstr "" + +#: src/SiteHealth.php:142 msgid "Current mailer" msgstr "" -#: build/wp-mail-smtp-pro/src/SiteHealth.php:136 -#: src/SiteHealth.php:136 +#: src/SiteHealth.php:147 msgid "WP Mail SMTP mailer setup is complete" msgstr "" -#: build/wp-mail-smtp-pro/src/SiteHealth.php:145 -#: src/SiteHealth.php:145 +#: src/SiteHealth.php:156 msgid "The WP Mail SMTP plugin mailer setup is complete. You can send a test email, to make sure it's working properly." msgstr "" -#: build/wp-mail-smtp-pro/src/SiteHealth.php:150 -#: src/SiteHealth.php:150 +#: src/SiteHealth.php:161 msgid "Test email sending" msgstr "" -#: build/wp-mail-smtp-pro/src/SiteHealth.php:158 -#: src/SiteHealth.php:158 +#: src/SiteHealth.php:169 msgid "You currently have the default mailer selected, which means that you haven’t set up SMTP yet." msgstr "" -#: build/wp-mail-smtp-pro/src/SiteHealth.php:163 -#: src/SiteHealth.php:163 +#: src/SiteHealth.php:174 msgid "WP Mail SMTP mailer setup is incomplete" msgstr "" -#: build/wp-mail-smtp-pro/src/SiteHealth.php:169 -#: src/SiteHealth.php:169 +#: src/SiteHealth.php:180 msgid "The WP Mail SMTP plugin mailer setup is incomplete. Please click on the link below to access plugin settings and configure the mailer." msgstr "" -#: build/wp-mail-smtp-pro/src/SiteHealth.php:174 -#: src/SiteHealth.php:174 +#: src/SiteHealth.php:185 msgid "Configure mailer" msgstr "" +#: src/SiteHealth.php:202 +msgid "WP Mail SMTP DB tables are created" +msgstr "" + +#: src/SiteHealth.php:208 +msgid "WP Mail SMTP is using custom database tables for some of its features. In order to work properly, the custom tables should be created, and it looks like they exist in your database." +msgstr "" + +#: src/SiteHealth.php:216 +msgid "WP Mail SMTP DB tables check has failed" +msgstr "" + +#. translators: %s - the list of missing tables separated by comma. +#: src/SiteHealth.php:222 +msgid "Missing table: %s" +msgid_plural "Missing tables: %s" +msgstr[0] "" +msgstr[1] "" + +#: src/SiteHealth.php:225 +msgid "WP Mail SMTP is using custom database tables for some of its features. In order to work properly, the custom tables should be created, and it seems they are missing. Please try to re-install the WP Mail SMTP plugin. If this issue persists, please contact our support." +msgstr "" + #. translators: %1$s - date, \a\t - specially escaped "at", %2$s - time. -#: build/wp-mail-smtp-pro/src/WP.php:190 #: src/WP.php:190 msgid "%1$s \\a\\t %2$s" msgstr "" -#: build/wp-mail-smtp-pro/wp_mail_smtp.php:135 #: wp_mail_smtp.php:135 msgid "Please deactivate the free version of the WP Mail SMTP plugin before activating WP Mail SMTP Pro." msgstr "" #. translators: %1$s - WPBeginner URL for recommended WordPress hosting. -#: build/wp-mail-smtp-pro/wp_mail_smtp.php:163 #: wp_mail_smtp.php:163 msgid "Your site is running an insecure version of PHP that is no longer supported. Please contact your web hosting provider to update your PHP version or switch to a recommended WordPress hosting company." msgstr "" #. translators: %s - WPMailSMTP.com docs URL with more details. -#: build/wp-mail-smtp-pro/wp_mail_smtp.php:180 #: wp_mail_smtp.php:180 msgid "WP Mail SMTP plugin is disabled on your site until you fix the issue. Read more for additional information." msgstr "" diff --git a/wp-content/plugins/wp-mail-smtp/readme.txt b/wp-content/plugins/wp-mail-smtp/readme.txt index af20fb5..eb0001e 100644 --- a/wp-content/plugins/wp-mail-smtp/readme.txt +++ b/wp-content/plugins/wp-mail-smtp/readme.txt @@ -3,7 +3,7 @@ Contributors: wpforms, jaredatch, smub, slaFFik Tags: smtp, wp mail smtp, wordpress smtp, gmail smtp, sendgrid smtp, mailgun smtp, mail, mailer, phpmailer, wp_mail, email, mailgun, sengrid, gmail, pepipost, sendinblue, wp smtp Requires at least: 4.9 Tested up to: 5.4 -Stable tag: 2.1.1 +Stable tag: 2.2.1 Requires PHP: 5.5.0 The most popular WordPress SMTP and PHP Mailer plugin. Trusted by over 1 million sites. @@ -229,6 +229,14 @@ By all means please contact us to discuss features or options you'd like to see == Changelog == += 2.2.1 - 2020-07-09 = +* Added: Gmail mailer now supports aliases. +* Added: Support both old PHPMailer v5 (WordPress <=5.4) and PHPMailer v6 (WordPress >=5.5). +* Changed: Pepipost mailer is now using the native API v5 instead of the SendGrid migration API. +* Fixed: Incorrect Mailgun Domain Name option was not showing an email delivery error. +* Fixed: Empty debug errors for the Sendinblue mailer are no more. +* Fixed: Properly compare From Email option value with a correct default email address from WP core. + = 2.1.1 - 2020-06-08 = * Changed: Remove current automatic default reply-to address and add WP filter `wp_mail_smtp_processor_set_default_reply_to` for setting default reply-to addresses. * Changed: Improve description for several options with links to an article about how to properly use constants. diff --git a/wp-content/plugins/wp-mail-smtp/src/Admin/Area.php b/wp-content/plugins/wp-mail-smtp/src/Admin/Area.php index 7c6f731..ed7260c 100644 --- a/wp-content/plugins/wp-mail-smtp/src/Admin/Area.php +++ b/wp-content/plugins/wp-mail-smtp/src/Admin/Area.php @@ -271,7 +271,7 @@ class Area { * @since 1.5.0 Added new assets for new pages. * @since 1.7.0 Added jQuery Confirm library css/js files. * - * @param string $hook + * @param string $hook Current hook. */ public function enqueue_assets( $hook ) { @@ -305,9 +305,7 @@ class Area { 'title' => esc_html__( 'Heads up!', 'wp-mail-smtp' ), 'content' => wp_kses( __( '

The Default (PHP) mailer is currently selected, but is not recommended because in most cases it does not resolve email delivery issues.

Please consider selecting and configuring one of the other mailers.

', 'wp-mail-smtp' ), - array( - 'p' => true, - ) + [ 'p' => [] ] ), 'save_button' => esc_html__( 'Save Settings', 'wp-mail-smtp' ), 'cancel_button' => esc_html__( 'Cancel', 'wp-mail-smtp' ), @@ -322,11 +320,11 @@ class Area { 'upgrade_bonus' => '

' . wp_kses( __( 'Bonus: WP Mail SMTP users get $50 off regular price,
applied at checkout.', 'wp-mail-smtp' ), - array( - 'strong' => true, - 'span' => true, - 'br' => true, - ) + [ + 'strong' => [], + 'span' => [], + 'br' => [], + ] ) . '

', 'upgrade_doc' => ' @@ -893,7 +891,7 @@ class Area { return add_query_arg( 'page', $page, - admin_url( 'admin.php' ) + WP::admin_url( 'admin.php' ) ); } diff --git a/wp-content/plugins/wp-mail-smtp/src/Admin/PageAbstract.php b/wp-content/plugins/wp-mail-smtp/src/Admin/PageAbstract.php index 70b556d..f1cecc8 100644 --- a/wp-content/plugins/wp-mail-smtp/src/Admin/PageAbstract.php +++ b/wp-content/plugins/wp-mail-smtp/src/Admin/PageAbstract.php @@ -1,87 +1,89 @@ -slug, - admin_url( 'admin.php?page=' . Area::SLUG ) - ) - ); - } - - /** - * Process tab form submission ($_POST ). - * - * @since 1.0.0 - * - * @param array $data $_POST data specific for the plugin. - */ - public function process_post( $data ) { - } - - /** - * Process tab & mailer specific Auth actions. - * - * @since 1.0.0 - */ - public function process_auth() { - } - - /** - * Print the nonce field for a specific tab. - * - * @since 1.0.0 - */ - public function wp_nonce_field() { - - wp_nonce_field( Area::SLUG . '-' . $this->slug ); - } - - /** - * Make sure that a user was referred from plugin admin page. - * To avoid security problems. - * - * @since 1.0.0 - */ - public function check_admin_referer() { - - check_admin_referer( Area::SLUG . '-' . $this->slug ); - } - - /** - * Save button to be reused on other tabs. - * - * @since 1.5.0 - */ - public function display_save_btn() { - - ?> - -

- -

- - slug, + WP::admin_url( 'admin.php?page=' . Area::SLUG ) + ) + ); + } + + /** + * Process tab form submission ($_POST ). + * + * @since 1.0.0 + * + * @param array $data $_POST data specific for the plugin. + */ + public function process_post( $data ) { + } + + /** + * Process tab & mailer specific Auth actions. + * + * @since 1.0.0 + */ + public function process_auth() { + } + + /** + * Print the nonce field for a specific tab. + * + * @since 1.0.0 + */ + public function wp_nonce_field() { + + wp_nonce_field( Area::SLUG . '-' . $this->slug ); + } + + /** + * Make sure that a user was referred from plugin admin page. + * To avoid security problems. + * + * @since 1.0.0 + */ + public function check_admin_referer() { + + check_admin_referer( Area::SLUG . '-' . $this->slug ); + } + + /** + * Save button to be reused on other tabs. + * + * @since 1.5.0 + */ + public function display_save_btn() { + + ?> + +

+ +

+ + get_defined_tab( $tab ), - admin_url( 'admin.php?page=' . Area::SLUG . '-' . $this->slug ) + WP::admin_url( 'admin.php?page=' . Area::SLUG . '-' . $this->slug ) ); } @@ -214,6 +215,24 @@ class About extends PageAbstract { + display_plugins(); + } + + /** + * Display the plugins section. + * + * @since 2.2.0 + */ + protected function display_plugins() { + ?> +
get_about_plugins_data( $plugin, true ) ); } + // Do not display a plugin which has to be installed and the user can't install it. + if ( ! current_user_can( 'install_plugins' ) && $data['status_class'] === 'status-download' ) { + continue; + } + ?>
- + <?php esc_attr_e( 'Plugin icon', 'wp-mail-smtp' ); ?>
@@ -430,7 +454,7 @@ class About extends PageAbstract { $error = \esc_html__( 'Could not install the plugin.', 'wp-mail-smtp' ); // Check for permissions. - if ( ! \current_user_can( 'activate_plugins' ) ) { + if ( ! \current_user_can( 'install_plugins' ) ) { \wp_send_json_error( $error ); } diff --git a/wp-content/plugins/wp-mail-smtp/src/Admin/Pages/Logs.php b/wp-content/plugins/wp-mail-smtp/src/Admin/Pages/Logs.php index 9910f13..ed3690b 100644 --- a/wp-content/plugins/wp-mail-smtp/src/Admin/Pages/Logs.php +++ b/wp-content/plugins/wp-mail-smtp/src/Admin/Pages/Logs.php @@ -4,11 +4,10 @@ namespace WPMailSMTP\Admin\Pages; use WPMailSMTP\Admin\Area; use WPMailSMTP\Admin\PageAbstract; +use WPMailSMTP\WP; /** * Class Logs - * - * @since 1.5.0 */ class Logs extends PageAbstract { @@ -34,7 +33,7 @@ class Logs extends PageAbstract { return add_query_arg( 'tab', $this->slug, - admin_url( 'admin.php?page=' . Area::SLUG ) + WP::admin_url( 'admin.php?page=' . Area::SLUG ) ); } diff --git a/wp-content/plugins/wp-mail-smtp/src/Admin/Pages/MiscTab.php b/wp-content/plugins/wp-mail-smtp/src/Admin/Pages/MiscTab.php index 799253c..6e563b0 100644 --- a/wp-content/plugins/wp-mail-smtp/src/Admin/Pages/MiscTab.php +++ b/wp-content/plugins/wp-mail-smtp/src/Admin/Pages/MiscTab.php @@ -198,7 +198,12 @@ class MiscTab extends PageAbstract { } /** - * @inheritdoc + * Process tab form submission ($_POST). + * + * @since 1.0.0 + * @since 2.2.0 Fixed checkbox saving and use the correct merge to prevent breaking other 'general' checkboxes. + * + * @param array $data Tab data specific for the plugin ($_POST). */ public function process_post( $data ) { @@ -207,14 +212,20 @@ class MiscTab extends PageAbstract { $options = new Options(); // Unchecked checkboxes doesn't exist in $_POST, so we need to ensure we actually have them in data to save. + if ( empty( $data['general']['do_not_send'] ) ) { + $data['general']['do_not_send'] = false; + } if ( empty( $data['general']['am_notifications_hidden'] ) ) { $data['general']['am_notifications_hidden'] = false; } + if ( empty( $data['general']['email_delivery_errors_hidden'] ) ) { + $data['general']['email_delivery_errors_hidden'] = false; + } if ( empty( $data['general']['uninstall'] ) ) { $data['general']['uninstall'] = false; } - $to_save = array_merge( $options->get_all(), $data ); + $to_save = Options::array_merge_recursive( $options->get_all(), $data ); // All the sanitization is done there. $options->set( $to_save ); diff --git a/wp-content/plugins/wp-mail-smtp/src/Admin/Pages/SettingsTab.php b/wp-content/plugins/wp-mail-smtp/src/Admin/Pages/SettingsTab.php index 0308160..feedf76 100644 --- a/wp-content/plugins/wp-mail-smtp/src/Admin/Pages/SettingsTab.php +++ b/wp-content/plugins/wp-mail-smtp/src/Admin/Pages/SettingsTab.php @@ -5,6 +5,7 @@ namespace WPMailSMTP\Admin\Pages; use WPMailSMTP\Admin\PageAbstract; use WPMailSMTP\Debug; use WPMailSMTP\Options; +use WPMailSMTP\Providers\Gmail\Auth; use WPMailSMTP\WP; /** @@ -58,6 +59,8 @@ class SettingsTab extends PageAbstract {
wp_nonce_field(); ?> + +
@@ -92,16 +95,37 @@ class SettingsTab extends PageAbstract {
- is_const_defined( 'mail', 'from_email' ) || ! empty( $disabled_email ) ? 'disabled' : ''; ?> - id="wp-mail-smtp-setting-from_email" spellcheck="false" - placeholder="get_processor()->get_default_email() ); ?>"> + + is_const_defined( 'mail', 'from_email' ) || ! empty( $disabled_email ) ? 'disabled' : ''; ?> + id="wp-mail-smtp-setting-from_email" spellcheck="false" + placeholder="get_processor()->get_default_email() ); ?>"> + + is_clients_saved() ? $gmail_auth->get_user_possible_send_from_addresses() : []; + ?> + + + + + + + +


- +

@@ -110,10 +134,16 @@ class SettingsTab extends PageAbstract {

- get( 'mail', 'from_email_force' ) ); ?> - is_const_defined( 'mail', 'from_email_force' ) || ! empty( $disabled_email ) ? 'disabled' : ''; ?> - id="wp-mail-smtp-setting-from_email_force"> + + get( 'mail', 'from_email_force' ) ); ?> + is_const_defined( 'mail', 'from_email_force' ) || ! empty( $disabled_email ) ? 'disabled' : ''; ?> + id="wp-mail-smtp-setting-from_email_force"> + + +
+ + display_save_btn(); ?> @@ -525,6 +566,8 @@ class SettingsTab extends PageAbstract { } } + $data = apply_filters( 'wp_mail_smtp_settings_tab_process_post', $data ); + // New gmail clients data will be added from new $data. $to_save = Options::array_merge_recursive( $old_opt, $data ); diff --git a/wp-content/plugins/wp-mail-smtp/src/Admin/Pages/TestTab.php b/wp-content/plugins/wp-mail-smtp/src/Admin/Pages/TestTab.php index b5faa67..eabc4ec 100644 --- a/wp-content/plugins/wp-mail-smtp/src/Admin/Pages/TestTab.php +++ b/wp-content/plugins/wp-mail-smtp/src/Admin/Pages/TestTab.php @@ -4,7 +4,7 @@ namespace WPMailSMTP\Admin\Pages; use WPMailSMTP\Conflicts; use WPMailSMTP\Debug; -use WPMailSMTP\MailCatcher; +use WPMailSMTP\MailCatcherInterface; use WPMailSMTP\Options; use WPMailSMTP\WP; use WPMailSMTP\Admin\PageAbstract; @@ -393,8 +393,8 @@ Lead Developer, WP Mail SMTP'; * * @since 1.0.0 * - * @param MailCatcher $phpmailer - * @param string $smtp_debug + * @param MailCatcherInterface $phpmailer The MailCatcher object. + * @param string $smtp_debug The SMTP debug message. * * @return string */ diff --git a/wp-content/plugins/wp-mail-smtp/src/Core.php b/wp-content/plugins/wp-mail-smtp/src/Core.php index 62ec474..7f5eedd 100644 --- a/wp-content/plugins/wp-mail-smtp/src/Core.php +++ b/wp-content/plugins/wp-mail-smtp/src/Core.php @@ -59,6 +59,10 @@ class Core { if ( $this->is_not_loadable() ) { add_action( 'admin_notices', 'wp_mail_smtp_insecure_php_version_notice' ); + if ( WP::use_global_plugin_settings() ) { + add_action( 'network_admin_notices', 'wp_mail_smtp_insecure_php_version_notice' ); + } + return; } @@ -95,8 +99,13 @@ class Core { */ public function hooks() { + // Force from_email_force to always return true if current mailer is Gmail. + if ( ( new Options() )->get( 'mail', 'mailer' ) === 'gmail' ) { + add_filter( 'wp_mail_smtp_options_get', [ $this, 'gmail_mailer_get_from_email_force' ], 1, 3 ); + } + // Action Scheduler requires a special early loading procedure. - add_action( 'plugins_loaded', array( $this, 'load_action_scheduler' ), -10 ); + add_action( 'plugins_loaded', array( $this, 'load_action_scheduler' ), - 10 ); // Activation hook. register_activation_hook( WPMS_PLUGIN_FILE, array( $this, 'activate' ) ); @@ -148,6 +157,11 @@ class Core { if ( current_user_can( 'manage_options' ) ) { add_action( 'admin_notices', array( '\WPMailSMTP\WP', 'display_admin_notices' ) ); add_action( 'admin_notices', array( $this, 'display_general_notices' ) ); + + if ( WP::use_global_plugin_settings() ) { + add_action( 'network_admin_notices', array( '\WPMailSMTP\WP', 'display_admin_notices' ) ); + add_action( 'network_admin_notices', array( $this, 'display_general_notices' ) ); + } } } @@ -455,7 +469,6 @@ class Core { } if ( wp_mail_smtp()->get_admin()->is_error_delivery_notice_enabled() ) { - $notice = Debug::get_last(); if ( ! empty( $notice ) ) { @@ -556,7 +569,7 @@ class Core { * * @since 1.0.0 * - * @return \WPMailSMTP\MailCatcher + * @return MailCatcherInterface */ public function replace_phpmailer() { @@ -573,11 +586,11 @@ class Core { * * @param null $obj PhpMailer object to override with own implementation. * - * @return \WPMailSMTP\MailCatcher + * @return MailCatcherInterface */ protected function replace_w_fake_phpmailer( &$obj = null ) { - $obj = new MailCatcher( true ); + $obj = $this->generate_mail_catcher( true ); return $obj; } @@ -725,7 +738,7 @@ class Core { /** * Require the action scheduler in an early plugins_loaded hook (-10). * - * @see https://actionscheduler.org/usage/#load-order + * @see https://actionscheduler.org/usage/#load-order * * @since 2.1.0 */ @@ -733,4 +746,99 @@ class Core { require_once $this->plugin_path . '/vendor/woocommerce/action-scheduler/action-scheduler.php'; } + + /** + * Get the list of all custom DB tables that should be present in the DB. + * + * @since 2.1.2 + * + * @return array List of table names. + */ + public function get_custom_db_tables() { + + $tables = [ + \WPMailSMTP\Tasks\Meta::get_table_name(), + ]; + + return apply_filters( 'wp_mail_smtp_core_get_custom_db_tables', $tables ); + } + + /** + * Generate the correct MailCatcher object based on the PHPMailer version used in WP. + * + * Also conditionally require the needed class files. + * + * @see https://make.wordpress.org/core/2020/07/01/external-library-updates-in-wordpress-5-5-call-for-testing/ + * + * @since 2.2.0 + * + * @param bool $exceptions True if external exceptions should be thrown. + * + * @return MailCatcherInterface + */ + public function generate_mail_catcher( $exceptions = null ) { + + if ( version_compare( get_bloginfo( 'version' ), '5.5-alpha', '<' ) ) { + if ( ! class_exists( '\PHPMailer', false ) ) { + require_once ABSPATH . WPINC . '/class-phpmailer.php'; + } + + $mail_catcher = new MailCatcher( $exceptions ); + } else { + if ( ! class_exists( '\PHPMailer\PHPMailer\PHPMailer', false ) ) { + require_once ABSPATH . WPINC . '/PHPMailer/PHPMailer.php'; + } + + if ( ! class_exists( '\PHPMailer\PHPMailer\Exception', false ) ) { + require_once ABSPATH . WPINC . '/PHPMailer/Exception.php'; + } + + if ( ! class_exists( '\PHPMailer\PHPMailer\SMTP', false ) ) { + require_once ABSPATH . WPINC . '/PHPMailer/SMTP.php'; + } + + $mail_catcher = new MailCatcherV6( $exceptions ); + } + + return $mail_catcher; + } + + /** + * Check if the passed object is a valid PHPMailer object. + * + * @since 2.2.0 + * + * @param object $phpmailer A potential PHPMailer object to be tested. + * + * @return bool + */ + public function is_valid_phpmailer( $phpmailer ) { + + return $phpmailer instanceof MailCatcherInterface || + $phpmailer instanceof \PHPMailer || + $phpmailer instanceof \PHPMailer\PHPMailer\PHPMailer; + } + + /** + * Force the `mail.from_email_force` plugin option to always return true if the current saved mailer is Gmail. + * Alters the plugin options retrieving via the Options::get method. + * + * The gmail mailer check is performed when this filter is added. + * + * @since 2.2.0 + * + * @param mixed $value The value of the plugin option that is being retrieved via Options::get method. + * @param string $group The group of the plugin option that is being retrieved via Options::get method. + * @param string $key The key of the plugin option that is being retrieved via Options::get method. + * + * @return mixed + */ + public function gmail_mailer_get_from_email_force( $value, $group, $key ) { + + if ( $group === 'mail' && $key === 'from_email_force' ) { + $value = true; + } + + return $value; + } } diff --git a/wp-content/plugins/wp-mail-smtp/src/MailCatcher.php b/wp-content/plugins/wp-mail-smtp/src/MailCatcher.php index 9778fe7..4706646 100644 --- a/wp-content/plugins/wp-mail-smtp/src/MailCatcher.php +++ b/wp-content/plugins/wp-mail-smtp/src/MailCatcher.php @@ -13,7 +13,7 @@ if ( ! class_exists( 'PHPMailer', false ) ) { * * @since 1.0.0 */ -class MailCatcher extends \PHPMailer { +class MailCatcher extends \PHPMailer implements MailCatcherInterface { /** * Callback Action function name. @@ -77,6 +77,9 @@ class MailCatcher extends \PHPMailer { $mail_mailer === 'pepipost' ) { try { + // Allow to hook early to catch any early failed emails. + do_action( 'wp_mail_smtp_mailcatcher_smtp_pre_send_before', $this ); + // Prepare all the headers. if ( ! $this->preSend() ) { return false; @@ -151,4 +154,16 @@ class MailCatcher extends \PHPMailer { return $this->CustomHeader; } + + /** + * Get the PHPMailer line ending. + * + * @since 2.2.0 + * + * @return string + */ + public function get_line_ending() { + + return $this->LE; // phpcs:ignore + } } diff --git a/wp-content/plugins/wp-mail-smtp/src/MailCatcherInterface.php b/wp-content/plugins/wp-mail-smtp/src/MailCatcherInterface.php new file mode 100644 index 0000000..653c804 --- /dev/null +++ b/wp-content/plugins/wp-mail-smtp/src/MailCatcherInterface.php @@ -0,0 +1,33 @@ +get( 'mail', 'mailer' ) ); + + $is_emailing_blocked = false; + + if ( wp_mail_smtp()->is_blocked() ) { + $is_emailing_blocked = true; + } + + // Always allow a test email - check for the specific header. + foreach ( (array) $this->getCustomHeaders() as $header ) { + if ( + ! empty( $header[0] ) && + ! empty( $header[1] ) && + $header[0] === 'X-Mailer-Type' && + trim( $header[1] ) === 'WPMailSMTP/Admin/Test' + ) { + $is_emailing_blocked = false; + } + }; + + // Do not send emails if admin desired that. + if ( $is_emailing_blocked ) { + return false; + } + + // Define a custom header, that will be used to identify the plugin and the mailer. + $this->XMailer = 'WPMailSMTP/Mailer/' . $mail_mailer . ' ' . WPMS_PLUGIN_VER; // phpcs:ignore + + // Use the default PHPMailer, as we inject our settings there for certain providers. + if ( + $mail_mailer === 'mail' || + $mail_mailer === 'smtp' || + $mail_mailer === 'pepipost' + ) { + try { + // Allow to hook early to catch any early failed emails. + do_action( 'wp_mail_smtp_mailcatcher_smtp_pre_send_before', $this ); + + // Prepare all the headers. + if ( ! $this->preSend() ) { + return false; + } + + // Allow to hook after all the preparation before the actual sending. + do_action( 'wp_mail_smtp_mailcatcher_smtp_send_before', $this ); + + return $this->postSend(); + } catch ( \PHPMailer\PHPMailer\Exception $e ) { + $this->mailHeader = ''; // phpcs:ignore + $this->setError( $e->getMessage() ); + + // Set the debug error, but not for default PHP mailer. + if ( $mail_mailer !== 'mail' ) { + Debug::set( + 'Mailer: ' . esc_html( wp_mail_smtp()->get_providers()->get_options( $mail_mailer )->get_title() ) . PHP_EOL . + $e->getMessage() + ); + } + + if ( $this->exceptions ) { + throw $e; + } + + return false; + } + } + + // We need this so that the PHPMailer class will correctly prepare all the headers. + $this->Mailer = 'mail'; // phpcs:ignore + + // Prepare everything (including the message) for sending. + if ( ! $this->preSend() ) { + return false; + } + + $mailer = wp_mail_smtp()->get_providers()->get_mailer( $mail_mailer, $this ); + + if ( ! $mailer ) { + return false; + } + + if ( ! $mailer->is_php_compatible() ) { + return false; + } + + /* + * Send the actual email. + * We reuse everything, that was preprocessed for usage in PHPMailer. + */ + $mailer->send(); + + $is_sent = $mailer->is_email_sent(); + + // Allow to perform any actions with the data. + do_action( 'wp_mail_smtp_mailcatcher_send_after', $mailer, $this ); + + return $is_sent; + } + + /** + * Get the PHPMailer line ending. + * + * @since 2.2.0 + * + * @return string + */ + public function get_line_ending() { + + return static::$LE; // phpcs:ignore + } +} diff --git a/wp-content/plugins/wp-mail-smtp/src/Options.php b/wp-content/plugins/wp-mail-smtp/src/Options.php index b39e191..555496a 100644 --- a/wp-content/plugins/wp-mail-smtp/src/Options.php +++ b/wp-content/plugins/wp-mail-smtp/src/Options.php @@ -170,9 +170,11 @@ class Options { * Retrieve all options of the plugin. * * @since 1.0.0 + * @since 2.2.0 Added the filter. */ protected function populate_options() { - $this->_options = get_option( self::META_KEY, array() ); + + $this->_options = apply_filters( 'wp_mail_smtp_populate_options', get_option( self::META_KEY, [] ) ); } /** diff --git a/wp-content/plugins/wp-mail-smtp/src/Processor.php b/wp-content/plugins/wp-mail-smtp/src/Processor.php index 9c99591..ce4c0a1 100644 --- a/wp-content/plugins/wp-mail-smtp/src/Processor.php +++ b/wp-content/plugins/wp-mail-smtp/src/Processor.php @@ -146,28 +146,19 @@ class Processor { $forced = $options->get( 'mail', 'from_email_force' ); $from_email = $options->get( 'mail', 'from_email' ); - if ( ! empty( $reply_to ) ) { + if ( ! empty( $reply_to ) || empty( $this->wp_mail_from ) ) { return false; } - if ( in_array( $mailer, array( 'gmail', 'outlook' ), true ) ) { + if ( $mailer === 'gmail' ) { $forced = true; - - switch ( $mailer ) { - case 'gmail': - $sender = wp_mail_smtp()->get_providers()->get_auth( 'gmail' )->get_user_info(); - break; - - case 'outlook': - $sender = $options->get( 'outlook', 'user_details' ); - break; - } - + } elseif ( $mailer === 'outlook' ) { + $sender = $options->get( 'outlook', 'user_details' ); $from_email = ! empty( $sender['email'] ) ? $sender['email'] : ''; + $forced = true; } if ( - empty( $this->wp_mail_from ) || $from_email === $this->wp_mail_from || ! $forced ) { @@ -213,7 +204,7 @@ class Processor { * @since 1.3.0 Forcing email rewrite if option is selected. * @since 1.7.0 Default email may be empty, so pay attention to that as well. * - * @param string $wp_email + * @param string $wp_email The email address passed by the filter. * * @return string */ @@ -222,11 +213,11 @@ class Processor { $options = new Options(); $forced = $options->get( 'mail', 'from_email_force' ); $from_email = $options->get( 'mail', 'from_email' ); - $def_email = $this->get_default_email(); + $def_email = WP::get_default_email(); // Save the "original" set WP email from address for later use. if ( $wp_email !== $def_email ) { - $this->wp_mail_from = $wp_email; + $this->wp_mail_from = filter_var( $wp_email, FILTER_VALIDATE_EMAIL ); } // Return FROM EMAIL if forced in settings. @@ -308,7 +299,7 @@ class Processor { * * @since 1.9.0 * - * @return \WPMailSMTP\MailCatcher + * @return MailCatcherInterface */ public function get_phpmailer() { @@ -316,8 +307,7 @@ class Processor { // Make sure the PHPMailer class has been instantiated. if ( ! is_object( $phpmailer ) || ! is_a( $phpmailer, 'PHPMailer' ) ) { - require_once ABSPATH . WPINC . '/class-phpmailer.php'; - $phpmailer = new MailCatcher( true ); // phpcs:ignore + $phpmailer = wp_mail_smtp()->generate_mail_catcher( true ); // phpcs:ignore } return $phpmailer; @@ -330,7 +320,7 @@ class Processor { * * @since 2.1.1 * - * @param \PHPMailer $phpmailer The PHPMailer object. + * @param MailCatcherInterface $phpmailer The PHPMailer object. */ private function set_default_reply_to( $phpmailer ) { diff --git a/wp-content/plugins/wp-mail-smtp/src/Providers/Gmail/Auth.php b/wp-content/plugins/wp-mail-smtp/src/Providers/Gmail/Auth.php index 9619294..fb674e0 100644 --- a/wp-content/plugins/wp-mail-smtp/src/Providers/Gmail/Auth.php +++ b/wp-content/plugins/wp-mail-smtp/src/Providers/Gmail/Auth.php @@ -1,283 +1,331 @@ -mailer_slug = $options->get( 'mail', 'mailer' ); - - if ( $this->mailer_slug !== Options::SLUG ) { - return; - } - - $this->options = $options->get_group( $this->mailer_slug ); - - if ( $this->is_clients_saved() ) { - - $this->include_vendor_lib(); - - $this->client = $this->get_client(); - } - } - - /** - * Get the url, that users will be redirected back to finish the OAuth process. - * - * @since 1.5.2 Returned to the old, pre-1.5, structure of the link to preserve BC. - * - * @return string - */ - public static function get_plugin_auth_url() { - - return add_query_arg( - array( - 'page' => Area::SLUG, - 'tab' => 'auth', - ), - admin_url( 'options-general.php' ) - ); - } - - /** - * Init and get the Google Client object. - * - * @since 1.0.0 - * @since 1.5.0 Add ability to apply custom options to the client via a filter. - * - * @return \Google_Client - */ - public function get_client() { - - // Doesn't load client twice + gives ability to overwrite. - if ( ! empty( $this->client ) ) { - return $this->client; - } - - $this->include_vendor_lib(); - - $client = new \Google_Client( - array( - 'client_id' => $this->options['client_id'], - 'client_secret' => $this->options['client_secret'], - 'redirect_uris' => array( - self::get_plugin_auth_url(), - ), - ) - ); - $client->setApplicationName( 'WP Mail SMTP v' . WPMS_PLUGIN_VER ); - $client->setAccessType( 'offline' ); - $client->setApprovalPrompt( 'force' ); - $client->setIncludeGrantedScopes( true ); - // We request only the sending capability, as it's what we only need to do. - $client->setScopes( array( \Google_Service_Gmail::MAIL_GOOGLE_COM ) ); - $client->setRedirectUri( self::get_plugin_auth_url() ); - - // Apply custom options to the client. - $client = apply_filters( 'wp_mail_smtp_providers_gmail_auth_get_client_custom_options', $client ); - - if ( - $this->is_auth_required() && - ! empty( $this->options['auth_code'] ) - ) { - try { - $creds = $client->fetchAccessTokenWithAuthCode( $this->options['auth_code'] ); - } catch ( \Exception $e ) { - $creds['error'] = $e->getMessage(); - Debug::set( - 'Mailer: Gmail' . "\r\n" . - $creds['error'] - ); - } - - // Bail if we have an error. - if ( ! empty( $creds['error'] ) ) { - return $client; - } - - $this->update_access_token( $client->getAccessToken() ); - $this->update_refresh_token( $client->getRefreshToken() ); - } - - if ( ! empty( $this->options['access_token'] ) ) { - $client->setAccessToken( $this->options['access_token'] ); - } - - // Refresh the token if it's expired. - if ( $client->isAccessTokenExpired() ) { - $refresh = $client->getRefreshToken(); - if ( empty( $refresh ) && isset( $this->options['refresh_token'] ) ) { - $refresh = $this->options['refresh_token']; - } - - if ( ! empty( $refresh ) ) { - try { - $creds = $client->fetchAccessTokenWithRefreshToken( $refresh ); - } catch ( \Exception $e ) { - $creds['error'] = $e->getMessage(); - Debug::set( - 'Mailer: Gmail' . "\r\n" . - $e->getMessage() - ); - } - - // Bail if we have an error. - if ( ! empty( $creds['error'] ) ) { - return $client; - } - - $this->update_access_token( $client->getAccessToken() ); - $this->update_refresh_token( $client->getRefreshToken() ); - } - } - - return $client; - } - - /** - * Get the auth code from the $_GET and save it. - * Redirect user back to settings with an error message, if failed. - * - * @since 1.0.0 - */ - public function process() { - - if ( ! ( isset( $_GET['tab'] ) && $_GET['tab'] === 'auth' ) ) { - wp_safe_redirect( wp_mail_smtp()->get_admin()->get_admin_page_url() ); - exit; - } - - // We can't process without saved client_id/secret. - if ( ! $this->is_clients_saved() ) { - Debug::set( - esc_html__( 'There was an error while processing the Google authentication request. Please make sure that you have Client ID and Client Secret both valid and saved.', 'wp-mail-smtp' ) - ); - wp_safe_redirect( - add_query_arg( - 'error', - 'google_no_clients', - wp_mail_smtp()->get_admin()->get_admin_page_url() - ) - ); - exit; - } - - $this->include_vendor_lib(); - - $code = ''; - $scope = ''; - $error = ''; - - if ( isset( $_GET['error'] ) ) { - $error = sanitize_key( $_GET['error'] ); - } - - // In case of any error: display a message to a user. - if ( ! empty( $error ) ) { - wp_safe_redirect( - add_query_arg( - 'error', - 'google_' . $error, - wp_mail_smtp()->get_admin()->get_admin_page_url() - ) - ); - exit; - } - - if ( isset( $_GET['code'] ) ) { - $code = $_GET['code']; - } - if ( isset( $_GET['scope'] ) ) { - $scope = urldecode( $_GET['scope'] ); - } - - // Let's try to get the access token. - if ( - ! empty( $code ) && - ( - $scope === \Google_Service_Gmail::MAIL_GOOGLE_COM . ' ' . \Google_Service_Gmail::GMAIL_SEND || - $scope === \Google_Service_Gmail::GMAIL_SEND . ' ' . \Google_Service_Gmail::MAIL_GOOGLE_COM || - $scope === \Google_Service_Gmail::GMAIL_SEND || - $scope === \Google_Service_Gmail::MAIL_GOOGLE_COM - ) - ) { - // Save the auth code. So \Google_Client can reuse it to retrieve the access token. - $this->update_auth_code( $code ); - } else { - wp_safe_redirect( - add_query_arg( - 'error', - 'google_no_code_scope', - wp_mail_smtp()->get_admin()->get_admin_page_url() - ) - ); - exit; - } - - wp_safe_redirect( - add_query_arg( - 'success', - 'google_site_linked', - wp_mail_smtp()->get_admin()->get_admin_page_url() - ) - ); - exit; - } - - /** - * Get the auth URL used to proceed to Provider to request access to send emails. - * - * @since 1.0.0 - * - * @return string - */ - public function get_auth_url() { - - if ( - ! empty( $this->client ) && - class_exists( 'Google_Client', false ) && - $this->client instanceof \Google_Client - ) { - return filter_var( $this->client->createAuthUrl(), FILTER_SANITIZE_URL ); - } - - return '#'; - } - - /** - * Get user information (like email etc) that is associated with the current connection. - * - * @since 1.5.0 - * - * @return array - */ - public function get_user_info() { - - $gmail = new \Google_Service_Gmail( $this->get_client() ); - - try { - $email = $gmail->users->getProfile( 'me' )->getEmailAddress(); - } catch ( \Exception $e ) { - $email = ''; - } - - return array( 'email' => $email ); - } -} +mailer_slug = $options->get( 'mail', 'mailer' ); + + if ( $this->mailer_slug !== Options::SLUG ) { + return; + } + + $this->options = $options->get_group( $this->mailer_slug ); + + if ( $this->is_clients_saved() ) { + + $this->include_vendor_lib(); + + $this->client = $this->get_client(); + } + } + + /** + * Get the url, that users will be redirected back to finish the OAuth process. + * + * @since 1.5.2 Returned to the old, pre-1.5, structure of the link to preserve BC. + * + * @return string + */ + public static function get_plugin_auth_url() { + + return apply_filters( + 'wp_mail_smtp_gmail_get_plugin_auth_url', + add_query_arg( + array( + 'page' => Area::SLUG, + 'tab' => 'auth', + ), + admin_url( 'options-general.php' ) + ) + ); + } + + /** + * Init and get the Google Client object. + * + * @since 1.0.0 + * @since 1.5.0 Add ability to apply custom options to the client via a filter. + * + * @return \Google_Client + */ + public function get_client() { + + // Doesn't load client twice + gives ability to overwrite. + if ( ! empty( $this->client ) ) { + return $this->client; + } + + $this->include_vendor_lib(); + + $client = new \Google_Client( + array( + 'client_id' => $this->options['client_id'], + 'client_secret' => $this->options['client_secret'], + 'redirect_uris' => array( + self::get_plugin_auth_url(), + ), + ) + ); + $client->setApplicationName( 'WP Mail SMTP v' . WPMS_PLUGIN_VER ); + $client->setAccessType( 'offline' ); + $client->setApprovalPrompt( 'force' ); + $client->setIncludeGrantedScopes( true ); + // We request only the sending capability, as it's what we only need to do. + $client->setScopes( array( \Google_Service_Gmail::MAIL_GOOGLE_COM ) ); + $client->setRedirectUri( self::get_plugin_auth_url() ); + + // Apply custom options to the client. + $client = apply_filters( 'wp_mail_smtp_providers_gmail_auth_get_client_custom_options', $client ); + + if ( + $this->is_auth_required() && + ! empty( $this->options['auth_code'] ) + ) { + try { + $creds = $client->fetchAccessTokenWithAuthCode( $this->options['auth_code'] ); + } catch ( \Exception $e ) { + $creds['error'] = $e->getMessage(); + Debug::set( + 'Mailer: Gmail' . "\r\n" . + $creds['error'] + ); + } + + // Bail if we have an error. + if ( ! empty( $creds['error'] ) ) { + return $client; + } + + $this->update_access_token( $client->getAccessToken() ); + $this->update_refresh_token( $client->getRefreshToken() ); + } + + if ( ! empty( $this->options['access_token'] ) ) { + $client->setAccessToken( $this->options['access_token'] ); + } + + // Refresh the token if it's expired. + if ( $client->isAccessTokenExpired() ) { + $refresh = $client->getRefreshToken(); + if ( empty( $refresh ) && isset( $this->options['refresh_token'] ) ) { + $refresh = $this->options['refresh_token']; + } + + if ( ! empty( $refresh ) ) { + try { + $creds = $client->fetchAccessTokenWithRefreshToken( $refresh ); + } catch ( \Exception $e ) { + $creds['error'] = $e->getMessage(); + Debug::set( + 'Mailer: Gmail' . "\r\n" . + $e->getMessage() + ); + } + + // Bail if we have an error. + if ( ! empty( $creds['error'] ) ) { + return $client; + } + + $this->update_access_token( $client->getAccessToken() ); + $this->update_refresh_token( $client->getRefreshToken() ); + } + } + + return $client; + } + + /** + * Get the auth code from the $_GET and save it. + * Redirect user back to settings with an error message, if failed. + * + * @since 1.0.0 + */ + public function process() { + + if ( ! ( isset( $_GET['tab'] ) && $_GET['tab'] === 'auth' ) ) { + wp_safe_redirect( wp_mail_smtp()->get_admin()->get_admin_page_url() ); + exit; + } + + // We can't process without saved client_id/secret. + if ( ! $this->is_clients_saved() ) { + Debug::set( + esc_html__( 'There was an error while processing the Google authentication request. Please make sure that you have Client ID and Client Secret both valid and saved.', 'wp-mail-smtp' ) + ); + wp_safe_redirect( + add_query_arg( + 'error', + 'google_no_clients', + wp_mail_smtp()->get_admin()->get_admin_page_url() + ) + ); + exit; + } + + $this->include_vendor_lib(); + + $code = ''; + $scope = ''; + $error = ''; + + if ( isset( $_GET['error'] ) ) { + $error = sanitize_key( $_GET['error'] ); + } + + // In case of any error: display a message to a user. + if ( ! empty( $error ) ) { + wp_safe_redirect( + add_query_arg( + 'error', + 'google_' . $error, + wp_mail_smtp()->get_admin()->get_admin_page_url() + ) + ); + exit; + } + + if ( isset( $_GET['code'] ) ) { + $code = $_GET['code']; + } + if ( isset( $_GET['scope'] ) ) { + $scope = urldecode( $_GET['scope'] ); + } + + // Let's try to get the access token. + if ( + ! empty( $code ) && + ( + $scope === \Google_Service_Gmail::MAIL_GOOGLE_COM . ' ' . \Google_Service_Gmail::GMAIL_SEND || + $scope === \Google_Service_Gmail::GMAIL_SEND . ' ' . \Google_Service_Gmail::MAIL_GOOGLE_COM || + $scope === \Google_Service_Gmail::GMAIL_SEND || + $scope === \Google_Service_Gmail::MAIL_GOOGLE_COM + ) + ) { + // Save the auth code. So \Google_Client can reuse it to retrieve the access token. + $this->update_auth_code( $code ); + } else { + wp_safe_redirect( + add_query_arg( + 'error', + 'google_no_code_scope', + wp_mail_smtp()->get_admin()->get_admin_page_url() + ) + ); + exit; + } + + wp_safe_redirect( + add_query_arg( + 'success', + 'google_site_linked', + wp_mail_smtp()->get_admin()->get_admin_page_url() + ) + ); + exit; + } + + /** + * Get the auth URL used to proceed to Provider to request access to send emails. + * + * @since 1.0.0 + * + * @return string + */ + public function get_auth_url() { + + if ( + ! empty( $this->client ) && + class_exists( 'Google_Client', false ) && + $this->client instanceof \Google_Client + ) { + return filter_var( $this->client->createAuthUrl(), FILTER_SANITIZE_URL ); + } + + return '#'; + } + + /** + * Get user information (like email etc) that is associated with the current connection. + * + * @since 1.5.0 + * + * @return array + */ + public function get_user_info() { + + $gmail = new \Google_Service_Gmail( $this->get_client() ); + + try { + $email = $gmail->users->getProfile( 'me' )->getEmailAddress(); + } catch ( \Exception $e ) { + $email = ''; + } + + return array( 'email' => $email ); + } + + /** + * Get the registered email addresses that the user can use as the "from email". + * + * @since 2.2.0 + * + * @return array The list of possible from email addresses. + */ + public function get_user_possible_send_from_addresses() { + + if ( isset( $this->aliases ) ) { + return $this->aliases; + } + + $gmail = new \Google_Service_Gmail( $this->get_client() ); + + try { + $response = $gmail->users_settings_sendAs->listUsersSettingsSendAs( 'me' ); // phpcs:ignore + + // phpcs:disable + if ( isset( $response->sendAs ) ) { + $this->aliases = array_map( + function( $sendAsObject ) { + return $sendAsObject->sendAsEmail; + }, + $response->sendAs + ); + } + // phpcs:enable + + } catch ( \Exception $exception ) { + $this->aliases = []; + } + + return $this->aliases; + } +} diff --git a/wp-content/plugins/wp-mail-smtp/src/Providers/Gmail/Mailer.php b/wp-content/plugins/wp-mail-smtp/src/Providers/Gmail/Mailer.php index 5fb87da..b3fcb23 100644 --- a/wp-content/plugins/wp-mail-smtp/src/Providers/Gmail/Mailer.php +++ b/wp-content/plugins/wp-mail-smtp/src/Providers/Gmail/Mailer.php @@ -3,7 +3,7 @@ namespace WPMailSMTP\Providers\Gmail; use WPMailSMTP\Debug; -use WPMailSMTP\MailCatcher; +use WPMailSMTP\MailCatcherInterface; use WPMailSMTP\Providers\MailerAbstract; /** @@ -37,10 +37,11 @@ class Mailer extends MailerAbstract { * * @since 1.0.0 * - * @param \WPMailSMTP\MailCatcher $phpmailer + * @param MailCatcherInterface $phpmailer The MailCatcher object. */ public function __construct( $phpmailer ) { - parent::__construct( $phpmailer ); + + parent::__construct( $phpmailer ); if ( ! $this->is_php_compatible() ) { return; @@ -52,14 +53,12 @@ class Mailer extends MailerAbstract { * * @since 1.2.0 * - * @param \WPMailSMTP\MailCatcher $phpmailer + * @param MailCatcherInterface $phpmailer The MailCatcher object. */ public function process_phpmailer( $phpmailer ) { - // Make sure that we have access to MailCatcher class methods. - if ( - ! $phpmailer instanceof MailCatcher && - ! $phpmailer instanceof \PHPMailer - ) { + + // Make sure that we have access to PHPMailer class methods. + if ( ! wp_mail_smtp()->is_valid_phpmailer( $phpmailer ) ) { return; } @@ -79,25 +78,23 @@ class Mailer extends MailerAbstract { $auth = new Auth(); $message = new \Google_Service_Gmail_Message(); - /* - * Right now Gmail doesn't allow to redefine From and Sender email headers. - * It always uses the email address that was used to connect to its API. - * With code below we are making sure that Email Log archive and single Email Log - * have the save value for From email header. - */ - $gmail_creds = $auth->get_user_info(); + // Set the authorized Gmail email address as the "from email" if the set email is not on the list of aliases. + $possible_from_emails = $auth->get_user_possible_send_from_addresses(); - if ( ! empty( $gmail_creds['email'] ) ) { - $this->phpmailer->From = $gmail_creds['email']; - $this->phpmailer->Sender = $gmail_creds['email']; + if ( ! in_array( $this->phpmailer->From, $possible_from_emails, true ) ) { + $user_info = $auth->get_user_info(); + + if ( ! empty( $user_info['email'] ) ) { + $this->phpmailer->From = $user_info['email']; + $this->phpmailer->Sender = $user_info['email']; + } } try { - // Prepare a message for sending. + // Prepare a message for sending if any changes happened above. $this->phpmailer->preSend(); - // Get the raw MIME email using MailCatcher data. - // We need here to make base64URL-safe string. + // Get the raw MIME email using MailCatcher data. We need to make base64URL-safe string. $base64 = str_replace( [ '+', '/', '=' ], [ '-', '_', '' ], diff --git a/wp-content/plugins/wp-mail-smtp/src/Providers/Gmail/Options.php b/wp-content/plugins/wp-mail-smtp/src/Providers/Gmail/Options.php index 563712c..791e8f7 100644 --- a/wp-content/plugins/wp-mail-smtp/src/Providers/Gmail/Options.php +++ b/wp-content/plugins/wp-mail-smtp/src/Providers/Gmail/Options.php @@ -1,234 +1,251 @@ - wp_mail_smtp()->assets_url . '/images/providers/google.svg', - 'slug' => self::SLUG, - 'title' => esc_html__( 'Gmail', 'wp-mail-smtp' ), - 'description' => sprintf( - wp_kses( /* translators: %s - URL to our Gmail doc. */ - __( 'Send emails using your Gmail or G Suite (formerly Google Apps) account, all while keeping your login credentials safe. Other Google SMTP methods require enabling less secure apps in your account and entering your password. However, this integration uses the Google API to improve email delivery issues while keeping your site secure.

Read our Gmail documentation to learn how to configure Gmail or G Suite.', 'wp-mail-smtp' ), - array( - 'br' => array(), - 'a' => array( - 'href' => array(), - 'rel' => array(), - 'target' => array(), - ), - ) - ), - 'https://wpmailsmtp.com/docs/how-to-set-up-the-gmail-mailer-in-wp-mail-smtp/' - ), - 'notices' => array( - 'educational' => esc_html__( 'The Gmail mailer works well for sites that send low numbers of emails. However, Gmail\'s API has rate limitations and a number of additional restrictions that can lead to challenges during setup. If you expect to send a high volume of emails, or if you find that your web host is not compatible with the Gmail API restrictions, then we recommend considering a different mailer option.', 'wp-mail-smtp' ), - ), - 'php' => '5.5', - ) - ); - } - - /** - * @inheritdoc - */ - public function display_options() { - - // Do not display options if PHP version is not correct. - if ( ! $this->is_php_correct() ) { - $this->display_php_warning(); - - return; - } - ?> - - -
-
- -
-
- options->is_const_defined( $this->get_slug(), 'client_id' ) ? 'disabled' : ''; ?> - id="wp-mail-smtp-setting-get_slug() ); ?>-client_id" spellcheck="false" - /> -
-
- - -
-
- -
-
- options->is_const_defined( $this->get_slug(), 'client_secret' ) ) : ?> - - display_const_set_message( 'WPMS_GMAIL_CLIENT_SECRET' ); ?> - - - -
-
- - -
-
- -
-
- - -

- -

-
-
- - -
-
- -
-
- display_auth_setting_action(); ?> -
-
- - process_provider_remove(); - - $auth = new Auth(); - ?> - - is_clients_saved() ) : ?> - - is_auth_required() ) : ?> - - - - -

- -

- - - - - - - - get_user_info(); - - if ( ! empty( $user['email'] ) ) { - printf( - /* translators: %s - email address, as received from Google API. */ - esc_html__( 'Connected as %s', 'wp-mail-smtp' ), - '' . esc_html( $user['email'] ) . '' - ); - } - ?> - -

- -

- - - - - -

- -

- - get( 'mail', 'mailer' ) !== $this->get_slug() ) { - return; - } - - $old_opt = $options->get_all(); - - foreach ( $old_opt[ $this->get_slug() ] as $key => $value ) { - // Unset everything except Client ID and Secret. - if ( ! in_array( $key, array( 'client_id', 'client_secret' ), true ) ) { - unset( $old_opt[ $this->get_slug() ][ $key ] ); - } - } - - $options->set( $old_opt ); - } -} + wp_mail_smtp()->assets_url . '/images/providers/google.svg', + 'slug' => self::SLUG, + 'title' => esc_html__( 'Gmail', 'wp-mail-smtp' ), + 'description' => sprintf( + wp_kses( /* translators: %s - URL to our Gmail doc. */ + __( 'Send emails using your Gmail or G Suite (formerly Google Apps) account, all while keeping your login credentials safe. Other Google SMTP methods require enabling less secure apps in your account and entering your password. However, this integration uses the Google API to improve email delivery issues while keeping your site secure.

Read our Gmail documentation to learn how to configure Gmail or G Suite.', 'wp-mail-smtp' ), + array( + 'br' => array(), + 'a' => array( + 'href' => array(), + 'rel' => array(), + 'target' => array(), + ), + ) + ), + 'https://wpmailsmtp.com/docs/how-to-set-up-the-gmail-mailer-in-wp-mail-smtp/' + ), + 'notices' => array( + 'educational' => esc_html__( 'The Gmail mailer works well for sites that send low numbers of emails. However, Gmail\'s API has rate limitations and a number of additional restrictions that can lead to challenges during setup. If you expect to send a high volume of emails, or if you find that your web host is not compatible with the Gmail API restrictions, then we recommend considering a different mailer option.', 'wp-mail-smtp' ), + ), + 'php' => '5.5', + ) + ); + } + + /** + * @inheritdoc + */ + public function display_options() { + + // Do not display options if PHP version is not correct. + if ( ! $this->is_php_correct() ) { + $this->display_php_warning(); + + return; + } + ?> + + +
+
+ +
+
+ options->is_const_defined( $this->get_slug(), 'client_id' ) ? 'disabled' : ''; ?> + id="wp-mail-smtp-setting-get_slug() ); ?>-client_id" spellcheck="false" + /> +
+
+ + +
+
+ +
+
+ options->is_const_defined( $this->get_slug(), 'client_secret' ) ) : ?> + + display_const_set_message( 'WPMS_GMAIL_CLIENT_SECRET' ); ?> + + + +
+
+ + +
+
+ +
+
+ + +

+ +

+
+
+ + +
+
+ +
+
+ display_auth_setting_action(); ?> +
+
+ + process_provider_remove(); + + $auth = new Auth(); + ?> + + is_clients_saved() ) : ?> + + is_auth_required() ) : ?> + + + + +

+ +

+ + + + + + + + get_user_info(); + + if ( ! empty( $user['email'] ) ) { + printf( + /* translators: %s - email address, as received from Google API. */ + esc_html__( 'Connected as %s', 'wp-mail-smtp' ), + '' . esc_html( $user['email'] ) . '' + ); + } + ?> + +

+ Follow these instructions and then select the From Email at the top of this page.', 'wp-mail-smtp' ), + [ + 'a' => [ + 'href' => [], + 'rel' => [], + 'target' => [], + ], + ] + ), + 'https://support.google.com/a/answer/33327' + ); + ?> +

+

+ +

+ + + + + +

+ +

+ + get( 'mail', 'mailer' ) !== $this->get_slug() ) { + return; + } + + $old_opt = $options->get_all(); + + foreach ( $old_opt[ $this->get_slug() ] as $key => $value ) { + // Unset everything except Client ID and Secret. + if ( ! in_array( $key, array( 'client_id', 'client_secret' ), true ) ) { + unset( $old_opt[ $this->get_slug() ][ $key ] ); + } + } + + $options->set( $old_opt ); + } +} diff --git a/wp-content/plugins/wp-mail-smtp/src/Providers/Loader.php b/wp-content/plugins/wp-mail-smtp/src/Providers/Loader.php index 506af82..154c9fc 100644 --- a/wp-content/plugins/wp-mail-smtp/src/Providers/Loader.php +++ b/wp-content/plugins/wp-mail-smtp/src/Providers/Loader.php @@ -3,7 +3,7 @@ namespace WPMailSMTP\Providers; use WPMailSMTP\Debug; -use WPMailSMTP\MailCatcher; +use WPMailSMTP\MailCatcherInterface; use WPMailSMTP\Options; /** @@ -39,7 +39,7 @@ class Loader { /** * @since 1.0.0 * - * @var MailCatcher + * @var MailCatcherInterface */ private $phpmailer; @@ -132,17 +132,14 @@ class Loader { * * @since 1.0.0 * - * @param string $provider The provider name. - * @param MailCatcher|\PHPMailer $phpmailer The MailCatcher object. + * @param string $provider The provider name. + * @param MailCatcherInterface $phpmailer The MailCatcher object. * * @return MailerAbstract|null */ public function get_mailer( $provider, $phpmailer ) { - if ( - $phpmailer instanceof MailCatcher || - $phpmailer instanceof \PHPMailer - ) { + if ( wp_mail_smtp()->is_valid_phpmailer( $phpmailer ) ) { $this->phpmailer = $phpmailer; } diff --git a/wp-content/plugins/wp-mail-smtp/src/Providers/MailerAbstract.php b/wp-content/plugins/wp-mail-smtp/src/Providers/MailerAbstract.php index b0e2441..9d58402 100644 --- a/wp-content/plugins/wp-mail-smtp/src/Providers/MailerAbstract.php +++ b/wp-content/plugins/wp-mail-smtp/src/Providers/MailerAbstract.php @@ -4,7 +4,7 @@ namespace WPMailSMTP\Providers; use WPMailSMTP\Conflicts; use WPMailSMTP\Debug; -use WPMailSMTP\MailCatcher; +use WPMailSMTP\MailCatcherInterface; use WPMailSMTP\Options; use WPMailSMTP\WP; @@ -32,7 +32,7 @@ abstract class MailerAbstract implements MailerInterface { /** * @since 1.0.0 * - * @var MailCatcher + * @var MailCatcherInterface */ protected $phpmailer; /** @@ -74,9 +74,9 @@ abstract class MailerAbstract implements MailerInterface { * * @since 1.0.0 * - * @param MailCatcher $phpmailer + * @param MailCatcherInterface $phpmailer The MailCatcher object. */ - public function __construct( MailCatcher $phpmailer ) { + public function __construct( MailCatcherInterface $phpmailer ) { $this->options = new Options(); $this->mailer = $this->options->get( 'mail', 'mailer' ); @@ -94,15 +94,12 @@ abstract class MailerAbstract implements MailerInterface { * * @since 1.0.0 * - * @param MailCatcher $phpmailer + * @param MailCatcherInterface $phpmailer The MailCatcher object. */ public function process_phpmailer( $phpmailer ) { - // Make sure that we have access to MailCatcher class methods. - if ( - ! $phpmailer instanceof MailCatcher && - ! $phpmailer instanceof \PHPMailer - ) { + // Make sure that we have access to PHPMailer class methods. + if ( ! wp_mail_smtp()->is_valid_phpmailer( $phpmailer ) ) { return; } diff --git a/wp-content/plugins/wp-mail-smtp/src/Providers/MailerInterface.php b/wp-content/plugins/wp-mail-smtp/src/Providers/MailerInterface.php index a2aea08..6205b4d 100644 --- a/wp-content/plugins/wp-mail-smtp/src/Providers/MailerInterface.php +++ b/wp-content/plugins/wp-mail-smtp/src/Providers/MailerInterface.php @@ -1,83 +1,86 @@ -url = self::API_BASE_US; - - // We want to prefill everything from \WPMailSMTP\MailCatcher class, which extends \PHPMailer. - parent::__construct( $phpmailer ); - - // We have a special API URL to query in case of EU region. - if ( 'EU' === $this->options->get( $this->mailer, 'region' ) ) { - $this->url = self::API_BASE_EU; - } - - /* - * Append the url with a domain, - * to avoid passing the domain name as a query parameter with all requests. - */ - $this->url .= sanitize_text_field( $this->options->get( $this->mailer, 'domain' ) . '/messages' ); - - $this->set_header( 'Authorization', 'Basic ' . base64_encode( 'api:' . $this->options->get( $this->mailer, 'api_key' ) ) ); - } - - /** - * @inheritdoc - */ - public function set_from( $email, $name = '' ) { - - if ( ! filter_var( $email, FILTER_VALIDATE_EMAIL ) ) { - return; - } - - if ( ! empty( $name ) ) { - $this->set_body_param( - array( - 'from' => $name . ' <' . $email . '>', - ) - ); - } else { - $this->set_body_param( - array( - 'from' => $email, - ) - ); - } - } - - /** - * @inheritdoc - */ - public function set_recipients( $recipients ) { - - if ( empty( $recipients ) ) { - return; - } - - $default = array( 'to', 'cc', 'bcc' ); - - foreach ( $recipients as $kind => $emails ) { - if ( - ! in_array( $kind, $default, true ) || - empty( $emails ) || - ! is_array( $emails ) - ) { - continue; - } - - $data = array(); - - foreach ( $emails as $email ) { - $addr = isset( $email[0] ) ? $email[0] : false; - $name = isset( $email[1] ) ? $email[1] : false; - - if ( ! filter_var( $addr, FILTER_VALIDATE_EMAIL ) ) { - continue; - } - - if ( ! empty( $name ) ) { - $data[] = $name . ' <' . $addr . '>'; - } else { - $data[] = $addr; - } - } - - if ( ! empty( $data ) ) { - $this->set_body_param( - array( - $kind => implode( ', ', $data ), - ) - ); - } - } - } - - /** - * @inheritdoc - */ - public function set_content( $content ) { - - if ( is_array( $content ) ) { - - $default = array( 'text', 'html' ); - - foreach ( $content as $type => $mail ) { - if ( - ! in_array( $type, $default, true ) || - empty( $mail ) - ) { - continue; - } - - $this->set_body_param( - array( - $type => $mail, - ) - ); - } - } else { - - $type = 'html'; - - if ( $this->phpmailer->ContentType === 'text/plain' ) { - $type = 'text'; - } - - if ( ! empty( $content ) ) { - $this->set_body_param( - array( - $type => $content, - ) - ); - } - } - } - - /** - * Redefine the way custom headers are process for this mailer - they should be in body. - * - * @since 1.5.0 - * - * @param array $headers - */ - public function set_headers( $headers ) { - - foreach ( $headers as $header ) { - $name = isset( $header[0] ) ? $header[0] : false; - $value = isset( $header[1] ) ? $header[1] : false; - - $this->set_body_header( $name, $value ); - } - - // Add custom PHPMailer-specific header. - $this->set_body_header( 'X-Mailer', 'WPMailSMTP/Mailer/' . $this->mailer . ' ' . WPMS_PLUGIN_VER ); - } - - /** - * This mailer supports email-related custom headers inside a body of the message with a special prefix "h:". - * - * @since 1.5.0 - */ - public function set_body_header( $name, $value ) { - - $name = sanitize_text_field( $name ); - - $this->set_body_param( - array( - 'h:' . $name => WP::sanitize_value( $value ), - ) - ); - } - - /** - * It's the last one, so we can modify the whole body. - * - * @since 1.0.0 - * - * @param array $attachments - */ - public function set_attachments( $attachments ) { - - if ( empty( $attachments ) ) { - return; - } - - $payload = ''; - $data = array(); - - foreach ( $attachments as $attachment ) { - $file = false; - - /* - * We are not using WP_Filesystem API as we can't reliably work with it. - * It is not always available, same as credentials for FTP. - */ - try { - if ( is_file( $attachment[0] ) && is_readable( $attachment[0] ) ) { - $file = file_get_contents( $attachment[0] ); - } - } - catch ( \Exception $e ) { - $file = false; - } - - if ( $file === false ) { - continue; - } - - $data[] = array( - 'content' => $file, - 'name' => $attachment[2], - ); - } - - if ( ! empty( $data ) ) { - - // First, generate a boundary for the multipart message. - $boundary = base_convert( uniqid( 'boundary', true ), 10, 36 ); - - // Iterate through pre-built params and build a payload. - foreach ( $this->body as $key => $value ) { - if ( is_array( $value ) ) { - foreach ( $value as $child_key => $child_value ) { - $payload .= '--' . $boundary; - $payload .= "\r\n"; - $payload .= 'Content-Disposition: form-data; name="' . $key . "\"\r\n\r\n"; - $payload .= $child_value; - $payload .= "\r\n"; - } - } else { - $payload .= '--' . $boundary; - $payload .= "\r\n"; - $payload .= 'Content-Disposition: form-data; name="' . $key . '"' . "\r\n\r\n"; - $payload .= $value; - $payload .= "\r\n"; - } - } - - // Now iterate through our attachments, and add them too. - foreach ( $data as $key => $attachment ) { - $payload .= '--' . $boundary; - $payload .= "\r\n"; - $payload .= 'Content-Disposition: form-data; name="attachment[' . $key . ']"; filename="' . $attachment['name'] . '"' . "\r\n\r\n"; - $payload .= $attachment['content']; - $payload .= "\r\n"; - } - - $payload .= '--' . $boundary . '--'; - - // Redefine the body the "dirty way". - $this->body = $payload; - - $this->set_header( 'Content-Type', 'multipart/form-data; boundary=' . $boundary ); - } - } - - /** - * @inheritdoc - */ - public function set_reply_to( $reply_to ) { - - if ( empty( $reply_to ) ) { - return; - } - - $data = array(); - - foreach ( $reply_to as $key => $emails ) { - if ( - empty( $emails ) || - ! is_array( $emails ) - ) { - continue; - } - - $addr = isset( $emails[0] ) ? $emails[0] : false; - $name = isset( $emails[1] ) ? $emails[1] : false; - - if ( ! filter_var( $addr, FILTER_VALIDATE_EMAIL ) ) { - continue; - } - - if ( ! empty( $name ) ) { - $data[] = $name . ' <' . $addr . '>'; - } else { - $data[] = $addr; - } - } - - if ( ! empty( $data ) ) { - $this->set_body_param( - array( - 'h:Reply-To' => implode( ',', $data ), - ) - ); - } - } - - /** - * @inheritdoc - */ - public function set_return_path( $email ) { - - if ( - $this->options->get( 'mail', 'return_path' ) !== true || - ! filter_var( $email, FILTER_VALIDATE_EMAIL ) - ) { - return; - } - - $this->set_body_param( - array( - 'sender' => $email, - ) - ); - } - - /** - * Get a Mailgun-specific response with a helpful error. - * - * @since 1.2.0 - * - * @return string - */ - protected function get_response_error() { - - $body = (array) wp_remote_retrieve_body( $this->response ); - - $error_text = array(); - - if ( ! empty( $body['message'] ) ) { - if ( is_string( $body['message'] ) ) { - $error_text[] = $body['message']; - } else { - $error_text[] = \json_encode( $body['message'] ); - } - } elseif ( ! empty( $body[0] ) ) { - if ( is_string( $body[0] ) ) { - $error_text[] = $body[0]; - } else { - $error_text[] = \json_encode( $body[0] ); - } - } - - return implode( '
', array_map( 'esc_textarea', $error_text ) ); - } - - /** - * @inheritdoc - */ - public function get_debug_info() { - - $mg_text = array(); - - $options = new \WPMailSMTP\Options(); - $mailgun = $options->get_group( 'mailgun' ); - - $mg_text[] = 'Api Key / Domain: ' . ( ! empty( $mailgun['api_key'] ) && ! empty( $mailgun['domain'] ) ? 'Yes' : 'No' ); - - return implode( '
', $mg_text ); - } - - /** - * @inheritdoc - */ - public function is_mailer_complete() { - - $options = $this->options->get_group( $this->mailer ); - - // API key is the only required option. - if ( - ! empty( $options['api_key'] ) && - ! empty( $options['domain'] ) - ) { - return true; - } - - return false; - } -} +url = self::API_BASE_US; + + // We want to prefill everything from MailCatcher class, which extends PHPMailer. + parent::__construct( $phpmailer ); + + // We have a special API URL to query in case of EU region. + if ( 'EU' === $this->options->get( $this->mailer, 'region' ) ) { + $this->url = self::API_BASE_EU; + } + + /* + * Append the url with a domain, + * to avoid passing the domain name as a query parameter with all requests. + */ + $this->url .= sanitize_text_field( $this->options->get( $this->mailer, 'domain' ) . '/messages' ); + + $this->set_header( 'Authorization', 'Basic ' . base64_encode( 'api:' . $this->options->get( $this->mailer, 'api_key' ) ) ); + } + + /** + * @inheritdoc + */ + public function set_from( $email, $name = '' ) { + + if ( ! filter_var( $email, FILTER_VALIDATE_EMAIL ) ) { + return; + } + + if ( ! empty( $name ) ) { + $this->set_body_param( + array( + 'from' => $name . ' <' . $email . '>', + ) + ); + } else { + $this->set_body_param( + array( + 'from' => $email, + ) + ); + } + } + + /** + * @inheritdoc + */ + public function set_recipients( $recipients ) { + + if ( empty( $recipients ) ) { + return; + } + + $default = array( 'to', 'cc', 'bcc' ); + + foreach ( $recipients as $kind => $emails ) { + if ( + ! in_array( $kind, $default, true ) || + empty( $emails ) || + ! is_array( $emails ) + ) { + continue; + } + + $data = array(); + + foreach ( $emails as $email ) { + $addr = isset( $email[0] ) ? $email[0] : false; + $name = isset( $email[1] ) ? $email[1] : false; + + if ( ! filter_var( $addr, FILTER_VALIDATE_EMAIL ) ) { + continue; + } + + if ( ! empty( $name ) ) { + $data[] = $name . ' <' . $addr . '>'; + } else { + $data[] = $addr; + } + } + + if ( ! empty( $data ) ) { + $this->set_body_param( + array( + $kind => implode( ', ', $data ), + ) + ); + } + } + } + + /** + * @inheritdoc + */ + public function set_content( $content ) { + + if ( is_array( $content ) ) { + + $default = array( 'text', 'html' ); + + foreach ( $content as $type => $mail ) { + if ( + ! in_array( $type, $default, true ) || + empty( $mail ) + ) { + continue; + } + + $this->set_body_param( + array( + $type => $mail, + ) + ); + } + } else { + + $type = 'html'; + + if ( $this->phpmailer->ContentType === 'text/plain' ) { + $type = 'text'; + } + + if ( ! empty( $content ) ) { + $this->set_body_param( + array( + $type => $content, + ) + ); + } + } + } + + /** + * Redefine the way custom headers are process for this mailer - they should be in body. + * + * @since 1.5.0 + * + * @param array $headers + */ + public function set_headers( $headers ) { + + foreach ( $headers as $header ) { + $name = isset( $header[0] ) ? $header[0] : false; + $value = isset( $header[1] ) ? $header[1] : false; + + $this->set_body_header( $name, $value ); + } + + // Add custom PHPMailer-specific header. + $this->set_body_header( 'X-Mailer', 'WPMailSMTP/Mailer/' . $this->mailer . ' ' . WPMS_PLUGIN_VER ); + } + + /** + * This mailer supports email-related custom headers inside a body of the message with a special prefix "h:". + * + * @since 1.5.0 + */ + public function set_body_header( $name, $value ) { + + $name = sanitize_text_field( $name ); + + $this->set_body_param( + array( + 'h:' . $name => WP::sanitize_value( $value ), + ) + ); + } + + /** + * It's the last one, so we can modify the whole body. + * + * @since 1.0.0 + * + * @param array $attachments + */ + public function set_attachments( $attachments ) { + + if ( empty( $attachments ) ) { + return; + } + + $payload = ''; + $data = array(); + + foreach ( $attachments as $attachment ) { + $file = false; + + /* + * We are not using WP_Filesystem API as we can't reliably work with it. + * It is not always available, same as credentials for FTP. + */ + try { + if ( is_file( $attachment[0] ) && is_readable( $attachment[0] ) ) { + $file = file_get_contents( $attachment[0] ); + } + } + catch ( \Exception $e ) { + $file = false; + } + + if ( $file === false ) { + continue; + } + + $data[] = array( + 'content' => $file, + 'name' => $attachment[2], + ); + } + + if ( ! empty( $data ) ) { + + // First, generate a boundary for the multipart message. + $boundary = base_convert( uniqid( 'boundary', true ), 10, 36 ); + + // Iterate through pre-built params and build a payload. + foreach ( $this->body as $key => $value ) { + if ( is_array( $value ) ) { + foreach ( $value as $child_key => $child_value ) { + $payload .= '--' . $boundary; + $payload .= "\r\n"; + $payload .= 'Content-Disposition: form-data; name="' . $key . "\"\r\n\r\n"; + $payload .= $child_value; + $payload .= "\r\n"; + } + } else { + $payload .= '--' . $boundary; + $payload .= "\r\n"; + $payload .= 'Content-Disposition: form-data; name="' . $key . '"' . "\r\n\r\n"; + $payload .= $value; + $payload .= "\r\n"; + } + } + + // Now iterate through our attachments, and add them too. + foreach ( $data as $key => $attachment ) { + $payload .= '--' . $boundary; + $payload .= "\r\n"; + $payload .= 'Content-Disposition: form-data; name="attachment[' . $key . ']"; filename="' . $attachment['name'] . '"' . "\r\n\r\n"; + $payload .= $attachment['content']; + $payload .= "\r\n"; + } + + $payload .= '--' . $boundary . '--'; + + // Redefine the body the "dirty way". + $this->body = $payload; + + $this->set_header( 'Content-Type', 'multipart/form-data; boundary=' . $boundary ); + } + } + + /** + * @inheritdoc + */ + public function set_reply_to( $reply_to ) { + + if ( empty( $reply_to ) ) { + return; + } + + $data = array(); + + foreach ( $reply_to as $key => $emails ) { + if ( + empty( $emails ) || + ! is_array( $emails ) + ) { + continue; + } + + $addr = isset( $emails[0] ) ? $emails[0] : false; + $name = isset( $emails[1] ) ? $emails[1] : false; + + if ( ! filter_var( $addr, FILTER_VALIDATE_EMAIL ) ) { + continue; + } + + if ( ! empty( $name ) ) { + $data[] = $name . ' <' . $addr . '>'; + } else { + $data[] = $addr; + } + } + + if ( ! empty( $data ) ) { + $this->set_body_param( + array( + 'h:Reply-To' => implode( ',', $data ), + ) + ); + } + } + + /** + * @inheritdoc + */ + public function set_return_path( $email ) { + + if ( + $this->options->get( 'mail', 'return_path' ) !== true || + ! filter_var( $email, FILTER_VALIDATE_EMAIL ) + ) { + return; + } + + $this->set_body_param( + array( + 'sender' => $email, + ) + ); + } + + /** + * Whether the email is sent or not. + * We basically check the response code from a request to provider. + * Might not be 100% correct, not guarantees that email is delivered. + * + * In Mailgun's case it looks like we have to check if the response body has the message ID. + * All successful API responses should have `id` key in the response body. + * + * @since 2.2.0 + * + * @return bool + */ + public function is_email_sent() { + + $is_sent = parent::is_email_sent(); + + if ( + $is_sent && + isset( $this->response['body'] ) && + ! array_key_exists( 'id', (array) $this->response['body'] ) + ) { + $message = 'Mailer: Mailgun' . PHP_EOL . + esc_html__( 'Mailgun API request was successful, but it could not queue the email for delivery.', 'wp-mail-smtp' ) . PHP_EOL . + esc_html__( 'This could point to an incorrect Domain Name in the plugin settings.', 'wp-mail-smtp' ) . PHP_EOL . + esc_html__( 'Please check the WP Mail SMTP plugin settings and make sure the Mailgun Domain Name setting is correct.', 'wp-mail-smtp' ); + + Debug::set( $message ); + + return false; + } + + return $is_sent; + } + + /** + * Get a Mailgun-specific response with a helpful error. + * + * @since 1.2.0 + * + * @return string + */ + protected function get_response_error() { + + $body = (array) wp_remote_retrieve_body( $this->response ); + + $error_text = array(); + + if ( ! empty( $body['message'] ) ) { + if ( is_string( $body['message'] ) ) { + $error_text[] = $body['message']; + } else { + $error_text[] = \json_encode( $body['message'] ); + } + } elseif ( ! empty( $body[0] ) ) { + if ( is_string( $body[0] ) ) { + $error_text[] = $body[0]; + } else { + $error_text[] = \json_encode( $body[0] ); + } + } + + return implode( '
', array_map( 'esc_textarea', $error_text ) ); + } + + /** + * @inheritdoc + */ + public function get_debug_info() { + + $mg_text = array(); + + $options = new \WPMailSMTP\Options(); + $mailgun = $options->get_group( 'mailgun' ); + + $mg_text[] = 'Api Key / Domain: ' . ( ! empty( $mailgun['api_key'] ) && ! empty( $mailgun['domain'] ) ? 'Yes' : 'No' ); + + return implode( '
', $mg_text ); + } + + /** + * @inheritdoc + */ + public function is_mailer_complete() { + + $options = $this->options->get_group( $this->mailer ); + + // API key is the only required option. + if ( + ! empty( $options['api_key'] ) && + ! empty( $options['domain'] ) + ) { + return true; + } + + return false; + } +} diff --git a/wp-content/plugins/wp-mail-smtp/src/Providers/PepipostAPI/Mailer.php b/wp-content/plugins/wp-mail-smtp/src/Providers/PepipostAPI/Mailer.php index b5b919b..9e562a4 100644 --- a/wp-content/plugins/wp-mail-smtp/src/Providers/PepipostAPI/Mailer.php +++ b/wp-content/plugins/wp-mail-smtp/src/Providers/PepipostAPI/Mailer.php @@ -2,14 +2,16 @@ namespace WPMailSMTP\Providers\PepipostAPI; +use WPMailSMTP\MailCatcherInterface; +use WPMailSMTP\Options as PluginOptions; use WPMailSMTP\Providers\MailerAbstract; use WPMailSMTP\WP; /** - * Class Mailer is basically a Sendgrid copy-paste, as Pepipost support SG migration. - * In the future we may rewrite the class to use the native Pepipost API. + * Pepipost API mailer. * - * @since 1.8.0 + * @since 1.8.0 Pepipost - SendGrid migration API. + * @since 2.2.0 Rewrote this class to use native Pepipost API. */ class Mailer extends MailerAbstract { @@ -26,24 +28,26 @@ class Mailer extends MailerAbstract { * URL to make an API request to. * * @since 1.8.0 + * @since 2.2.0 Changed the API url to Pepipost API v5. * * @var string */ - protected $url = 'https://sgapi.pepipost.com/v3/mail/send'; + protected $url = 'https://api.pepipost.com/v5/mail/send'; /** * Mailer constructor. * * @since 1.8.0 + * @since 2.2.0 Changed the API key header (API v5 changes). * - * @param \WPMailSMTP\MailCatcher $phpmailer + * @param MailCatcherInterface $phpmailer The MailCatcher instance. */ public function __construct( $phpmailer ) { - // We want to prefill everything from \WPMailSMTP\MailCatcher class, which extends \PHPMailer. + // We want to prefill everything from MailCatcher class, which extends PHPMailer. parent::__construct( $phpmailer ); - $this->set_header( 'Authorization', 'Bearer ' . $this->options->get( $this->mailer, 'api_key' ) ); + $this->set_header( 'api_key', $this->options->get( $this->mailer, 'api_key' ) ); $this->set_header( 'content-type', 'application/json' ); } @@ -67,6 +71,7 @@ class Mailer extends MailerAbstract { * Set the FROM header of the email. * * @since 1.8.0 + * @since 2.2.0 Changed the attribute names (API v5 changes). * * @param string $email From mail. * @param string $name From name. @@ -84,9 +89,9 @@ class Mailer extends MailerAbstract { } $this->set_body_param( - array( + [ 'from' => $from, - ) + ] ); } @@ -94,6 +99,7 @@ class Mailer extends MailerAbstract { * Set the names/emails of people who will receive the email. * * @since 1.8.0 + * @since 2.2.0 change the attribute names (API v5 changes). * * @param array $recipients List of recipients: cc/bcc/to. */ @@ -103,62 +109,29 @@ class Mailer extends MailerAbstract { return; } - // Allow for now only these recipient types. - $default = array( 'to', 'cc', 'bcc' ); - $data = array(); + $data = []; - foreach ( $recipients as $type => $emails ) { - if ( - ! in_array( $type, $default, true ) || - empty( $emails ) || - ! is_array( $emails ) - ) { - continue; - } - - $data[ $type ] = array(); - - // Iterate over all emails for each type. - // There might be multiple cc/to/bcc emails. - foreach ( $emails as $email ) { - $holder = array(); - $addr = isset( $email[0] ) ? $email[0] : false; - $name = isset( $email[1] ) ? $email[1] : false; - - if ( ! filter_var( $addr, FILTER_VALIDATE_EMAIL ) ) { - continue; - } - - $holder['email'] = $addr; - if ( ! empty( $name ) ) { - $holder['name'] = $name; - } - - array_push( $data[ $type ], $holder ); - } + if ( ! empty( $recipients['to'] ) ) { + $data['to'] = $this->prepare_list_of_to_emails( $recipients['to'] ); } - if ( ! empty( $data ) ) { - $this->set_body_param( - array( - 'personalizations' => array( $data ), - ) - ); - - if ( ! empty( $data['bcc'] ) ) { - // Only the 1st BCC email address, ignore the rest - is not supported by Pepipost. - $bcc['mail_settings']['bcc']['email'] = $data['bcc'][0]['email']; - $this->set_body_param( - $bcc - ); - } + if ( ! empty( $recipients['cc'] ) ) { + $data['cc'] = $this->prepare_list_of_emails( $recipients['cc'] ); } + + if ( ! empty( $recipients['bcc'] ) ) { + $data['bcc'] = $this->prepare_list_of_emails( $recipients['bcc'] ); + } + + $this->set_body_personalizations( $data ); } /** * Set the email content. + * Pepipost API only supports HTML emails, so we have to replace new lines in plain text emails with
. * * @since 1.8.0 + * @since 2.2.0 Change the way the content is prepared (API v5 changes). * * @param array|string $content Email content. */ @@ -168,109 +141,70 @@ class Mailer extends MailerAbstract { return; } - if ( is_array( $content ) ) { + $html = ''; - $default = array( 'text', 'html' ); - $data = array(); - - foreach ( $content as $type => $body ) { - if ( - ! in_array( $type, $default, true ) || - empty( $body ) - ) { - continue; - } - - $content_type = 'text/plain'; - $content_value = $body; - - if ( $type === 'html' ) { - $content_type = 'text/html'; - } else { - $content_value = nl2br( $content_value ); - } - - $data[] = array( - 'type' => $content_type, - 'value' => $content_value, - ); - } - - $this->set_body_param( - array( - 'content' => $data, - ) - ); - } else { - $data['type'] = 'text/html'; - $data['value'] = $content; + if ( ! is_array( $content ) ) { + $html = $content; if ( $this->phpmailer->ContentType === 'text/plain' ) { - $data['type'] = 'text/plain'; - $data['value'] = nl2br( $data['value'] ); + $html = nl2br( $html ); } + } else { - $this->set_body_param( - array( - 'content' => array( $data ), - ) - ); + if ( ! empty( $content['html'] ) ) { + $html = $content['html']; + } elseif ( ! empty( $content['text'] ) ) { + $html = nl2br( $content['text'] ); + } } + + $this->set_body_param( + [ + 'content' => [ + [ + 'type' => 'html', + 'value' => $html, + ], + ], + ] + ); } /** - * Redefine the way custom headers are processed for this mailer - they should be in body. + * Redefine the way custom headers are processed for this mailer - they should be in body (personalizations). * * @since 1.8.0 + * @since 2.2.0 Change the way the headers are processed (API v5 changes). * - * @param array $headers + * @param array $headers The email headers to be applied. */ public function set_headers( $headers ) { + $valid_headers = []; + foreach ( $headers as $header ) { $name = isset( $header[0] ) ? $header[0] : false; $value = isset( $header[1] ) ? $header[1] : false; - $this->set_body_header( $name, $value ); + $valid_headers[ $name ] = WP::sanitize_value( $value ); } // Add custom PHPMailer-specific header. - $this->set_body_header( 'X-Mailer', 'WPMailSMTP/Mailer/' . $this->mailer . ' ' . WPMS_PLUGIN_VER ); - } + $valid_headers['X-Mailer'] = WP::sanitize_value( 'WPMailSMTP/Mailer/' . $this->mailer . ' ' . WPMS_PLUGIN_VER ); - /** - * This mailer supports email-related custom headers inside a body of the message. - * - * @since 1.8.0 - * - * @param string $name - * @param string $value - */ - public function set_body_header( $name, $value ) { - - $name = sanitize_text_field( $name ); - if ( empty( $name ) ) { - return; + if ( ! empty( $valid_headers ) ) { + $this->set_body_personalizations( [ 'headers' => $valid_headers ] ); } - - $headers = isset( $this->body['headers'] ) ? (array) $this->body['headers'] : array(); - - $headers[ $name ] = WP::sanitize_value( $value ); - - $this->set_body_param( - array( - 'headers' => $headers, - ) - ); } /** - * Pepipost accepts an array of files content in body, so we will include all files and send. - * Doesn't handle exceeding the limits etc, as this is done and reported by SendGrid API. + * Pepipost API accepts an array of files content in body, so we will include all files and send. + * Doesn't handle exceeding the limits etc, as this will be reported by the API response. * * @since 1.8.0 + * @since 2.2.0 Change the way the attachments are processed (API v5 changes). * - * @param array $attachments + * @param array $attachments The list of attachments data. */ public function set_attachments( $attachments ) { @@ -278,7 +212,29 @@ class Mailer extends MailerAbstract { return; } - $data = array(); + $data = $this->prepare_attachments( $attachments ); + + if ( ! empty( $data ) ) { + $this->set_body_param( + [ + 'attachments' => $data, + ] + ); + } + } + + /** + * Prepare the attachments data for Pepipost API. + * + * @since 2.2.0 + * + * @param array $attachments Array of attachments. + * + * @return array + */ + protected function prepare_attachments( $attachments ) { + + $data = []; foreach ( $attachments as $attachment ) { $file = false; @@ -291,8 +247,7 @@ class Mailer extends MailerAbstract { if ( is_file( $attachment[0] ) && is_readable( $attachment[0] ) ) { $file = file_get_contents( $attachment[0] ); // phpcs:ignore } - } - catch ( \Exception $e ) { + } catch ( \Exception $e ) { $file = false; } @@ -300,27 +255,21 @@ class Mailer extends MailerAbstract { continue; } - $data[] = array( - 'content' => base64_encode( $file ), - 'type' => $attachment[4], - 'filename' => $attachment[2], - 'disposition' => $attachment[6], - ); + $data[] = [ + 'content' => base64_encode( $file ), // phpcs:ignore + 'name' => $attachment[2], + ]; } - if ( ! empty( $data ) ) { - $this->set_body_param( - array( - 'attachments' => $data, - ) - ); - } + return $data; } /** * Set the reply-to property of the email. + * Pepipost API only supports one reply_to email, so we take the first one and discard the rest. * * @since 1.8.0 + * @since 2.2.0 Change the way the reply_to is processed (API v5 changes). * * @param array $reply_to Name/email for reply-to feature. */ @@ -330,54 +279,44 @@ class Mailer extends MailerAbstract { return; } - $data = array(); + $email_array = array_shift( $reply_to ); - foreach ( $reply_to as $key => $emails ) { - if ( - empty( $emails ) || - ! is_array( $emails ) - ) { - continue; - } - - $addr = isset( $emails[0] ) ? $emails[0] : false; - $name = isset( $emails[1] ) ? $emails[1] : false; - - if ( ! filter_var( $addr, FILTER_VALIDATE_EMAIL ) ) { - continue; - } - - $data['email'] = $addr; - if ( ! empty( $name ) ) { - $data['name'] = $name; - } + if ( empty( $email_array[0] ) ) { + return; } - if ( ! empty( $data ) ) { + $email = $email_array[0]; + + if ( ! filter_var( $email, FILTER_VALIDATE_EMAIL ) ) { + return; + } + + if ( ! empty( $email ) ) { $this->set_body_param( - array( - 'reply_to' => $data, - ) + [ + 'reply_to' => $email, + ] ); } } /** - * Pepipost doesn't support sender or return_path params. + * Pepipost API doesn't support sender or return_path params. * So we do nothing. * * @since 1.8.0 * - * @param string $from_email + * @param string $from_email The from email address. */ public function set_return_path( $from_email ) {} /** * Get a Pepipost-specific response with a helpful error. * - * @see https://developers.pepipost.com/migration-api/new-subpage/errorcodes + * @see https://developers.pepipost.com/email-api/email-api/sendemail#responses * * @since 1.8.0 + * @since 2.2.0 Change the way the response error message is processed (API v5 changes). * * @return string */ @@ -385,27 +324,26 @@ class Mailer extends MailerAbstract { $body = (array) wp_remote_retrieve_body( $this->response ); - $error_text = array(); + $error = ! empty( $body['error'] ) ? $body['error'] : ''; + $info = ! empty( $body['info'] ) ? $body['info'] : ''; + $message = ''; - if ( ! empty( $body['errors'] ) ) { - foreach ( $body['errors'] as $error ) { - if ( property_exists( $error, 'message' ) ) { - // Prepare additional information from SendGrid API. - $extra = ''; - if ( property_exists( $error, 'field' ) && ! empty( $error->field ) ) { - $extra .= $error->field . '; '; - } - if ( property_exists( $error, 'help' ) && ! empty( $error->help ) ) { - $extra .= $error->help; - } + if ( is_string( $error ) ) { + $message = $error . ( ( ! empty( $info ) ) ? ' - ' . $info : '' ); + } elseif ( is_array( $error ) ) { + $message = ''; - // Assign both the main message and perhaps extra information, if exists. - $error_text[] = $error->message . ( ! empty( $extra ) ? ' - ' . $extra : '' ); - } + foreach ( $error as $item ) { + $message .= sprintf( + '%1$s (%2$s - %3$s)', + ! empty( $item->description ) ? $item->description : esc_html__( 'General error', 'wp-mail-smtp' ), + ! empty( $item->message ) ? $item->message : esc_html__( 'Error', 'wp-mail-smtp' ), + ! empty( $item->field ) ? $item->field : '' + ) . PHP_EOL; } } - return implode( '
', array_map( 'esc_textarea', $error_text ) ); + return $message; } /** @@ -440,4 +378,98 @@ class Mailer extends MailerAbstract { return false; } + + /** + * A special set method for Pepipost API "personalizations" attribute. + * We are sending one email at a time, so we should set just the first + * personalization item. + * + * Mainly used in set_headers and set_recipients. + * + * @see https://developers.pepipost.com/email-api/email-api/sendemail + * + * @since 2.2.0 + * + * @param array $data The personalizations array of data (array of arrays). + */ + private function set_body_personalizations( $data ) { + + if ( empty( $data ) ) { + return; + } + + if ( ! empty( $this->body['personalizations'][0] ) ) { + $this->body['personalizations'][0] = PluginOptions::array_merge_recursive( + $this->body['personalizations'][0], + $data + ); + } else { + $this->set_body_param( + [ + 'personalizations' => [ + $data, + ], + ] + ); + } + } + + /** + * Prepare list of emails by filtering valid emails first. + * + * @since 2.2.0 + * + * @param array $items A 2D array of email and name pair items (0 = email, 1 = name). + * + * @return array 2D array with 'email' keys. + */ + private function prepare_list_of_emails( $items ) { + + $valid_emails = array_filter( + array_column( $items, 0 ), + function ( $email ) { + return filter_var( $email, FILTER_VALIDATE_EMAIL ); + } + ); + + return array_map( + function( $email ) { + return [ 'email' => $email ]; + }, + $valid_emails + ); + } + + /** + * Prepare list of TO emails by filtering valid emails first + * and returning array of arrays (email, name). + * + * @since 2.2.0 + * + * @param array $items A 2D array of email and name pair items (0 = email, 1 = name). + * + * @return array 2D array with 'email' and optional 'name' attributes. + */ + private function prepare_list_of_to_emails( $items ) { + + $data = []; + + foreach ( $items as $item ) { + $email = filter_var( $item[0], FILTER_VALIDATE_EMAIL ); + + if ( empty( $email ) ) { + continue; + } + + $pair['email'] = $email; + + if ( ! empty( $item[1] ) ) { + $pair['name'] = $item[1]; + } + + $data[] = $pair; + } + + return $data; + } } diff --git a/wp-content/plugins/wp-mail-smtp/src/Providers/SMTPcom/Mailer.php b/wp-content/plugins/wp-mail-smtp/src/Providers/SMTPcom/Mailer.php index 29f81e3..f5c1b2c 100644 --- a/wp-content/plugins/wp-mail-smtp/src/Providers/SMTPcom/Mailer.php +++ b/wp-content/plugins/wp-mail-smtp/src/Providers/SMTPcom/Mailer.php @@ -2,6 +2,7 @@ namespace WPMailSMTP\Providers\SMTPcom; +use WPMailSMTP\MailCatcherInterface; use WPMailSMTP\Providers\MailerAbstract; use WPMailSMTP\WP; @@ -37,11 +38,11 @@ class Mailer extends MailerAbstract { * * @since 2.0.0 * - * @param \WPMailSMTP\MailCatcher $phpmailer + * @param MailCatcherInterface $phpmailer The MailCatcher object. */ public function __construct( $phpmailer ) { - // We want to prefill everything from \WPMailSMTP\MailCatcher class, which extends \PHPMailer. + // We want to prefill everything from MailCatcher class, which extends PHPMailer. parent::__construct( $phpmailer ); // Set mailer specific headers. diff --git a/wp-content/plugins/wp-mail-smtp/src/Providers/Sendgrid/Mailer.php b/wp-content/plugins/wp-mail-smtp/src/Providers/Sendgrid/Mailer.php index b4b48a9..d0fe364 100644 --- a/wp-content/plugins/wp-mail-smtp/src/Providers/Sendgrid/Mailer.php +++ b/wp-content/plugins/wp-mail-smtp/src/Providers/Sendgrid/Mailer.php @@ -2,6 +2,7 @@ namespace WPMailSMTP\Providers\Sendgrid; +use WPMailSMTP\MailCatcherInterface; use WPMailSMTP\Providers\MailerAbstract; use WPMailSMTP\WP; @@ -35,11 +36,11 @@ class Mailer extends MailerAbstract { * * @since 1.0.0 * - * @param \WPMailSMTP\MailCatcher $phpmailer + * @param MailCatcherInterface $phpmailer The MailCatcher object. */ public function __construct( $phpmailer ) { - // We want to prefill everything from \WPMailSMTP\MailCatcher class, which extends \PHPMailer. + // We want to prefill everything from MailCatcher class, which extends PHPMailer. parent::__construct( $phpmailer ); $this->set_header( 'Authorization', 'Bearer ' . $this->options->get( $this->mailer, 'api_key' ) ); diff --git a/wp-content/plugins/wp-mail-smtp/src/Providers/Sendinblue/Mailer.php b/wp-content/plugins/wp-mail-smtp/src/Providers/Sendinblue/Mailer.php index 8459085..501d7a0 100644 --- a/wp-content/plugins/wp-mail-smtp/src/Providers/Sendinblue/Mailer.php +++ b/wp-content/plugins/wp-mail-smtp/src/Providers/Sendinblue/Mailer.php @@ -1,393 +1,391 @@ -is_php_compatible() ) { - return; - } - } - - /** - * @inheritDoc - * - * @since 1.6.0 - */ - public function set_header( $name, $value ) { - - $name = sanitize_text_field( $name ); - - $this->body['headers'][ $name ] = WP::sanitize_value( $value ); - } - - /** - * Set the From information for an email. - * - * @since 1.6.0 - * - * @param string $email - * @param string $name - */ - public function set_from( $email, $name ) { - - if ( ! filter_var( $email, FILTER_VALIDATE_EMAIL ) ) { - return; - } - - $this->body['sender'] = array( - 'email' => $email, - 'name' => ! empty( $name ) ? WP::sanitize_value( $name ) : '', - ); - } - - /** - * Set email recipients: to, cc, bcc. - * - * @since 1.6.0 - * - * @param array $recipients - */ - public function set_recipients( $recipients ) { - - if ( empty( $recipients ) ) { - return; - } - - // Allow for now only these recipient types. - $default = array( 'to', 'cc', 'bcc' ); - $data = array(); - - foreach ( $recipients as $type => $emails ) { - - if ( - ! in_array( $type, $default, true ) || - empty( $emails ) || - ! is_array( $emails ) - ) { - continue; - } - - $data[ $type ] = array(); - - // Iterate over all emails for each type. - // There might be multiple cc/to/bcc emails. - foreach ( $emails as $email ) { - $holder = array(); - $addr = isset( $email[0] ) ? $email[0] : false; - $name = isset( $email[1] ) ? $email[1] : false; - - if ( ! filter_var( $addr, FILTER_VALIDATE_EMAIL ) ) { - continue; - } - - $holder['email'] = $addr; - if ( ! empty( $name ) ) { - $holder['name'] = $name; - } - - array_push( $data[ $type ], $holder ); - } - } - - foreach ( $data as $type => $type_recipients ) { - $this->body[ $type ] = $type_recipients; - } - } - - /** - * @inheritDoc - * - * @since 1.6.0 - */ - public function set_subject( $subject ) { - - $this->body['subject'] = $subject; - } - - /** - * Set email content. - * - * @since 1.6.0 - * - * @param string|array $content - */ - public function set_content( $content ) { - - if ( empty( $content ) ) { - return; - } - - if ( is_array( $content ) ) { - - if ( ! empty( $content['text'] ) ) { - $this->body['textContent'] = $content['text']; - } - - if ( ! empty( $content['html'] ) ) { - $this->body['htmlContent'] = $content['html']; - } - } else { - if ( $this->phpmailer->ContentType === 'text/plain' ) { - $this->body['textContent'] = $content; - } else { - $this->body['htmlContent'] = $content; - } - } - } - - /** - * Doesn't support this. - * - * @since 1.6.0 - * - * @param string $email - */ - public function set_return_path( $email ) { - - } - - /** - * Set the Reply To headers if not set already. - * - * @since 1.6.0 - * - * @param array $emails - */ - public function set_reply_to( $emails ) { - - if ( empty( $emails ) ) { - return; - } - - $data = array(); - - foreach ( $emails as $user ) { - $holder = array(); - $addr = isset( $user[0] ) ? $user[0] : false; - $name = isset( $user[1] ) ? $user[1] : false; - - if ( ! filter_var( $addr, FILTER_VALIDATE_EMAIL ) ) { - continue; - } - - $holder['email'] = $addr; - if ( ! empty( $name ) ) { - $holder['name'] = $name; - } - - $data[] = $holder; - } - - if ( ! empty( $data ) ) { - $this->body['replyTo'] = $data[0]; - } - } - - /** - * Set attachments for an email. - * - * @since 1.6.0 - * - * @param array $attachments - */ - public function set_attachments( $attachments ) { - - if ( empty( $attachments ) ) { - return; - } - - foreach ( $attachments as $attachment ) { - $file = false; - - /* - * We are not using WP_Filesystem API as we can't reliably work with it. - * It is not always available, same as credentials for FTP. - */ - try { - if ( is_file( $attachment[0] ) && is_readable( $attachment[0] ) ) { - $ext = pathinfo( $attachment[0], PATHINFO_EXTENSION ); - - if ( in_array( $ext, $this->allowed_attach_ext, true ) ) { - $file = file_get_contents( $attachment[0] ); // phpcs:ignore - } - } - } - catch ( \Exception $e ) { - $file = false; - } - - if ( $file === false ) { - continue; - } - - $this->body['attachment'][] = array( - 'name' => $attachment[2], - 'content' => base64_encode( $file ), - ); - } - } - - /** - * @inheritDoc - * - * @since 1.6.0 - * - * @return \SendinBlue\Client\Model\SendSmtpEmail - */ - public function get_body() { - - return new \SendinBlue\Client\Model\SendSmtpEmail( $this->body ); - } - - /** - * Use a library to send emails. - * - * @since 1.6.0 - */ - public function send() { - - try { - $api = new Api(); - - $response = $api->get_smtp_client()->sendTransacEmail( $this->get_body() ); - - $this->process_response( $response ); - } - catch ( \SendinBlue\Client\ApiException $e ) { - $error = json_decode( $e->getResponseBody() ); - if ( json_last_error() === JSON_ERROR_NONE ) { - Debug::set( - 'Mailer: Sendinblue' . "\r\n" . - '[' . sanitize_key( $error->code ) . ']: ' . esc_html( $error->message ) - ); - } - } - catch ( \Exception $e ) { - Debug::set( - 'Mailer: Sendinblue' . "\r\n" . - $e->getMessage() - ); - - return; - } - } - - /** - * Save response from the API to use it later. - * All the actually response processing is done in send() method, - * because SendinBlue throws exception if any error occurs. - * - * @since 1.6.0 - * - * @param \SendinBlue\Client\Model\CreateSmtpEmail $response - */ - protected function process_response( $response ) { - - $this->response = $response; - } - - /** - * Check whether the email was sent. - * - * @since 1.6.0 - * - * @return bool - */ - public function is_email_sent() { - - $is_sent = false; - - if ( $this->response instanceof \SendinBlue\Client\Model\CreateSmtpEmail ) { - $is_sent = $this->response->valid(); - } - - // Clear debug messages if email is successfully sent. - if ( $is_sent ) { - Debug::clear(); - } - - return $is_sent; - } - - /** - * @inheritdoc - * - * @since 1.6.0 - */ - public function get_debug_info() { - - $mailjet_text[] = 'API Key: ' . ( $this->is_mailer_complete() ? 'Yes' : 'No' ); - - return implode( '
', $mailjet_text ); - } - - /** - * @inheritdoc - * - * @since 1.6.0 - */ - public function is_mailer_complete() { - - $options = $this->options->get_group( $this->mailer ); - - // API key is the only required option. - if ( ! empty( $options['api_key'] ) ) { - return true; - } - - return false; - } -} +is_php_compatible() ) { + return; + } + } + + /** + * @inheritDoc + * + * @since 1.6.0 + */ + public function set_header( $name, $value ) { + + $name = sanitize_text_field( $name ); + + $this->body['headers'][ $name ] = WP::sanitize_value( $value ); + } + + /** + * Set the From information for an email. + * + * @since 1.6.0 + * + * @param string $email + * @param string $name + */ + public function set_from( $email, $name ) { + + if ( ! filter_var( $email, FILTER_VALIDATE_EMAIL ) ) { + return; + } + + $this->body['sender'] = array( + 'email' => $email, + 'name' => ! empty( $name ) ? WP::sanitize_value( $name ) : '', + ); + } + + /** + * Set email recipients: to, cc, bcc. + * + * @since 1.6.0 + * + * @param array $recipients + */ + public function set_recipients( $recipients ) { + + if ( empty( $recipients ) ) { + return; + } + + // Allow for now only these recipient types. + $default = array( 'to', 'cc', 'bcc' ); + $data = array(); + + foreach ( $recipients as $type => $emails ) { + + if ( + ! in_array( $type, $default, true ) || + empty( $emails ) || + ! is_array( $emails ) + ) { + continue; + } + + $data[ $type ] = array(); + + // Iterate over all emails for each type. + // There might be multiple cc/to/bcc emails. + foreach ( $emails as $email ) { + $holder = array(); + $addr = isset( $email[0] ) ? $email[0] : false; + $name = isset( $email[1] ) ? $email[1] : false; + + if ( ! filter_var( $addr, FILTER_VALIDATE_EMAIL ) ) { + continue; + } + + $holder['email'] = $addr; + if ( ! empty( $name ) ) { + $holder['name'] = $name; + } + + array_push( $data[ $type ], $holder ); + } + } + + foreach ( $data as $type => $type_recipients ) { + $this->body[ $type ] = $type_recipients; + } + } + + /** + * @inheritDoc + * + * @since 1.6.0 + */ + public function set_subject( $subject ) { + + $this->body['subject'] = $subject; + } + + /** + * Set email content. + * + * @since 1.6.0 + * + * @param string|array $content + */ + public function set_content( $content ) { + + if ( empty( $content ) ) { + return; + } + + if ( is_array( $content ) ) { + + if ( ! empty( $content['text'] ) ) { + $this->body['textContent'] = $content['text']; + } + + if ( ! empty( $content['html'] ) ) { + $this->body['htmlContent'] = $content['html']; + } + } else { + if ( $this->phpmailer->ContentType === 'text/plain' ) { + $this->body['textContent'] = $content; + } else { + $this->body['htmlContent'] = $content; + } + } + } + + /** + * Doesn't support this. + * + * @since 1.6.0 + * + * @param string $email + */ + public function set_return_path( $email ) { + + } + + /** + * Set the Reply To headers if not set already. + * + * @since 1.6.0 + * + * @param array $emails + */ + public function set_reply_to( $emails ) { + + if ( empty( $emails ) ) { + return; + } + + $data = array(); + + foreach ( $emails as $user ) { + $holder = array(); + $addr = isset( $user[0] ) ? $user[0] : false; + $name = isset( $user[1] ) ? $user[1] : false; + + if ( ! filter_var( $addr, FILTER_VALIDATE_EMAIL ) ) { + continue; + } + + $holder['email'] = $addr; + if ( ! empty( $name ) ) { + $holder['name'] = $name; + } + + $data[] = $holder; + } + + if ( ! empty( $data ) ) { + $this->body['replyTo'] = $data[0]; + } + } + + /** + * Set attachments for an email. + * + * @since 1.6.0 + * + * @param array $attachments + */ + public function set_attachments( $attachments ) { + + if ( empty( $attachments ) ) { + return; + } + + foreach ( $attachments as $attachment ) { + $file = false; + + /* + * We are not using WP_Filesystem API as we can't reliably work with it. + * It is not always available, same as credentials for FTP. + */ + try { + if ( is_file( $attachment[0] ) && is_readable( $attachment[0] ) ) { + $ext = pathinfo( $attachment[0], PATHINFO_EXTENSION ); + + if ( in_array( $ext, $this->allowed_attach_ext, true ) ) { + $file = file_get_contents( $attachment[0] ); // phpcs:ignore + } + } + } + catch ( \Exception $e ) { + $file = false; + } + + if ( $file === false ) { + continue; + } + + $this->body['attachment'][] = array( + 'name' => $attachment[2], + 'content' => base64_encode( $file ), + ); + } + } + + /** + * @inheritDoc + * + * @since 1.6.0 + * + * @return \SendinBlue\Client\Model\SendSmtpEmail + */ + public function get_body() { + + return new \SendinBlue\Client\Model\SendSmtpEmail( $this->body ); + } + + /** + * Use a library to send emails. + * + * @since 1.6.0 + */ + public function send() { + + try { + $api = new Api(); + + $response = $api->get_smtp_client()->sendTransacEmail( $this->get_body() ); + + $this->process_response( $response ); + } catch ( \SendinBlue\Client\ApiException $e ) { + $error = json_decode( $e->getResponseBody() ); + + if ( json_last_error() === JSON_ERROR_NONE && ! empty( $error ) ) { + $message = '[' . sanitize_key( $error->code ) . ']: ' . esc_html( $error->message ); + } else { + $message = $e->getMessage(); + } + + Debug::set( 'Mailer: Sendinblue' . PHP_EOL . $message ); + } catch ( \Exception $e ) { + Debug::set( 'Mailer: Sendinblue' . PHP_EOL . $e->getMessage() ); + + return; + } + } + + /** + * Save response from the API to use it later. + * All the actually response processing is done in send() method, + * because SendinBlue throws exception if any error occurs. + * + * @since 1.6.0 + * + * @param \SendinBlue\Client\Model\CreateSmtpEmail $response + */ + protected function process_response( $response ) { + + $this->response = $response; + } + + /** + * Check whether the email was sent. + * + * @since 1.6.0 + * + * @return bool + */ + public function is_email_sent() { + + $is_sent = false; + + if ( $this->response instanceof \SendinBlue\Client\Model\CreateSmtpEmail ) { + $is_sent = $this->response->valid(); + } + + // Clear debug messages if email is successfully sent. + if ( $is_sent ) { + Debug::clear(); + } + + return $is_sent; + } + + /** + * @inheritdoc + * + * @since 1.6.0 + */ + public function get_debug_info() { + + $mailjet_text[] = 'API Key: ' . ( $this->is_mailer_complete() ? 'Yes' : 'No' ); + + return implode( '
', $mailjet_text ); + } + + /** + * @inheritdoc + * + * @since 1.6.0 + */ + public function is_mailer_complete() { + + $options = $this->options->get_group( $this->mailer ); + + // API key is the only required option. + if ( ! empty( $options['api_key'] ) ) { + return true; + } + + return false; + } +} diff --git a/wp-content/plugins/wp-mail-smtp/src/SiteHealth.php b/wp-content/plugins/wp-mail-smtp/src/SiteHealth.php index 0cf5ab0..3b07638 100644 --- a/wp-content/plugins/wp-mail-smtp/src/SiteHealth.php +++ b/wp-content/plugins/wp-mail-smtp/src/SiteHealth.php @@ -68,6 +68,11 @@ class SiteHealth { 'test' => array( $this, 'mailer_setup_complete_test' ), ); + $tests['direct']['wp_mail_smtp_db_tables_exist'] = array( + 'label' => esc_html__( 'Do WP Mail SMTP DB tables exist?', 'wp-mail-smtp' ), + 'test' => [ $this, 'db_tables_test' ], + ); + return $tests; } @@ -84,24 +89,30 @@ class SiteHealth { public function register_debug_information( $debug_info ) { $debug_notices = Debug::get(); + $db_tables = $this->get_db_tables( 'existing' ); - $debug_info[ self::DEBUG_INFO_SLUG ] = array( + $debug_info[ self::DEBUG_INFO_SLUG ] = [ 'label' => $this->get_label(), - 'fields' => array( - 'version' => array( + 'fields' => [ + 'version' => [ 'label' => esc_html__( 'Version', 'wp-mail-smtp' ), 'value' => WPMS_PLUGIN_VER, - ), - 'license_key_type' => array( + ], + 'license_key_type' => [ 'label' => esc_html__( 'License key type', 'wp-mail-smtp' ), 'value' => wp_mail_smtp()->get_license_type(), - ), - 'debug' => array( + ], + 'debug' => [ 'label' => esc_html__( 'Debug', 'wp-mail-smtp' ), 'value' => ! empty( $debug_notices ) ? implode( '. ', $debug_notices ) : esc_html__( 'No debug notices found.', 'wp-mail-smtp' ), - ), - ), - ); + ], + 'db_tables' => [ + 'label' => esc_html__( 'DB tables', 'wp-mail-smtp' ), + 'value' => ! empty( $db_tables ) ? + implode( ', ', $db_tables ) : esc_html__( 'No DB tables found.', 'wp-mail-smtp' ), + ], + ], + ]; return $debug_info; } @@ -177,4 +188,75 @@ class SiteHealth { return $result; } + + /** + * Perform the test for checking if all custom plugin DB tables exist. + * + * @since 2.1.2 + * + * @return array + */ + public function db_tables_test() { + + $result = array( + 'label' => esc_html__( 'WP Mail SMTP DB tables are created', 'wp-mail-smtp' ), + 'status' => 'good', + 'badge' => array( + 'label' => $this->get_label(), + 'color' => self::BADGE_COLOR, + ), + 'description' => esc_html__( 'WP Mail SMTP is using custom database tables for some of its features. In order to work properly, the custom tables should be created, and it looks like they exist in your database.', 'wp-mail-smtp' ), + 'actions' => '', + 'test' => 'wp_mail_smtp_db_tables_exist', + ); + + $missing_tables = $this->get_db_tables( 'missing' ); + + if ( ! empty( $missing_tables ) ) { + $result['label'] = esc_html__( 'WP Mail SMTP DB tables check has failed', 'wp-mail-smtp' ); + $result['status'] = 'critical'; + $result['badge']['color'] = 'red'; + $result['description'] = sprintf( + '

%s

%s

', + sprintf( /* translators: %s - the list of missing tables separated by comma. */ + esc_html( _n( 'Missing table: %s', 'Missing tables: %s', count( $missing_tables ), 'wp-mail-smtp' ) ), + esc_html( implode( ', ', $missing_tables ) ) + ), + esc_html__( 'WP Mail SMTP is using custom database tables for some of its features. In order to work properly, the custom tables should be created, and it seems they are missing. Please try to re-install the WP Mail SMTP plugin. If this issue persists, please contact our support.', 'wp-mail-smtp' ) + ); + } + + return $result; + } + + /** + * Check DB: + * - if any required plugin DB table is missing, + * - which of the required plugin DB tables exist. + * + * @since 2.1.2 + * + * @param string $check Which type of tables to return: 'missing' or 'existing'. + * + * @return array Missing or existing tables. + */ + private function get_db_tables( $check = 'missing' ) { + + global $wpdb; + + $tables = wp_mail_smtp()->get_custom_db_tables(); + + $missing_tables = []; + $existing_tables = []; + + foreach ( $tables as $table ) { + if ( $wpdb->get_var( $wpdb->prepare( 'SHOW TABLES LIKE %s', $table ) ) !== $table ) { // phpcs:ignore + $missing_tables[] = $table; + } else { + $existing_tables[] = $table; + } + } + + return ( $check === 'existing' ) ? $existing_tables : $missing_tables; + } } diff --git a/wp-content/plugins/wp-mail-smtp/src/Tasks/Task.php b/wp-content/plugins/wp-mail-smtp/src/Tasks/Task.php index ed39ce7..bd95fd2 100644 --- a/wp-content/plugins/wp-mail-smtp/src/Tasks/Task.php +++ b/wp-content/plugins/wp-mail-smtp/src/Tasks/Task.php @@ -195,7 +195,7 @@ class Task { $this->meta_id = $task_meta->add( [ 'action' => $this->action, - 'data' => $this->params, + 'data' => isset( $this->params ) ? $this->params : [], ] ); diff --git a/wp-content/plugins/wp-mail-smtp/src/WP.php b/wp-content/plugins/wp-mail-smtp/src/WP.php index 1b4e153..b2f68c2 100644 --- a/wp-content/plugins/wp-mail-smtp/src/WP.php +++ b/wp-content/plugins/wp-mail-smtp/src/WP.php @@ -238,4 +238,63 @@ class WP { return $filtered; } + + /** + * Get default email address. + * + * This is the same code as used in WP core for getting the default email address. + * + * @see https://github.com/WordPress/WordPress/blob/master/wp-includes/pluggable.php#L332 + * + * @since 2.2.0 + * + * @return string + */ + public static function get_default_email() { + + $sitename = strtolower( $_SERVER['SERVER_NAME'] ); // phpcs:ignore + + if ( 'www.' === substr( $sitename, 0, 4 ) ) { + $sitename = substr( $sitename, 4 ); + } + + return 'wordpress@' . $sitename; + } + + /** + * Wrapper for the WP `admin_url` method that should be used in the plugin. + * + * We can filter into it, to maybe call `network_admin_url` for multisite support. + * + * @since 2.2.0 + * + * @param string $path Optional path relative to the admin URL. + * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). + * 'http' or 'https' can be passed to force those schemes. + * + * @return string Admin URL link with optional path appended. + */ + public static function admin_url( $path = '', $scheme = 'admin' ) { + + return apply_filters( 'wp_mail_smtp_admin_url', \admin_url( $path, $scheme ), $path, $scheme ); + } + + /** + * Check if the global plugin option in a multisite should be used. + * If the global plugin option "multisite" is set and true. + * + * @since 2.2.0 + * + * @return bool + */ + public static function use_global_plugin_settings() { + + if ( ! is_multisite() ) { + return false; + } + + $main_site_options = get_blog_option( get_main_site_id(), Options::META_KEY, [] ); + + return ! empty( $main_site_options['general']['network_wide'] ); + } } diff --git a/wp-content/plugins/wp-mail-smtp/uninstall.php b/wp-content/plugins/wp-mail-smtp/uninstall.php index 43fc412..3953be4 100644 --- a/wp-content/plugins/wp-mail-smtp/uninstall.php +++ b/wp-content/plugins/wp-mail-smtp/uninstall.php @@ -12,17 +12,14 @@ if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) { // Load plugin file. require_once 'wp_mail_smtp.php'; +require_once dirname( __FILE__ ) . '/vendor/woocommerce/action-scheduler/action-scheduler.php'; -// Confirm user has decided to remove all data, otherwise stop. -$settings = get_option( 'wp_mail_smtp', array() ); -if ( empty( $settings['general']['uninstall'] ) ) { - return; -} +global $wpdb; /* * Remove Legacy options. */ -$options = array( +$options = [ '_amn_smtp_last_checked', 'pepipost_ssl', 'pepipost_port', @@ -38,62 +35,145 @@ $options = array( 'mailer', 'mail_from_name', 'mail_from', -); +]; -foreach ( $options as $option ) { - delete_option( $option ); -} - -global $wpdb; - -// Delete plugin settings. -$wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE 'wp\_mail\_smtp%'" ); - -// Delete plugin user meta. -$wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE meta_key LIKE 'wp\_mail\_smtp\_%'" ); - -// Remove any transients we've left behind. -$wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE '\_transient\_wp\_mail\_smtp\_%'" ); -$wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE '\_site\_transient\_wp\_mail\_smtp\_%'" ); -$wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE '\_transient\_timeout\_wp\_mail\_smtp\_%'" ); -$wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE '\_site\_transient\_timeout\_wp\_mail\_smtp\_%'" ); - -/* - * Remove product announcements. +/** + * Remove AM announcement posts. */ -$announcements = get_posts( - array( - 'post_type' => array( 'amn_smtp' ), - 'post_status' => 'any', - 'numberposts' => - 1, - 'fields' => 'ids', - ) -); -if ( ! empty( $announcements ) ) { - foreach ( $announcements as $announcement ) { - wp_delete_post( $announcement, true ); +$am_announcement_params = [ + 'post_type' => [ 'amn_smtp' ], + 'post_status' => 'any', + 'numberposts' => - 1, + 'fields' => 'ids', +]; + +// WP MS uninstall process. +if ( is_multisite() ) { + $main_site_settings = get_blog_option( get_main_site_id(), 'wp_mail_smtp', [] ); + $network_wide = ! empty( $main_site_settings['general']['network_wide'] ); + $network_uninstall = ! empty( $main_site_settings['general']['uninstall'] ); + + $sites = get_sites(); + + foreach ( $sites as $site ) { + $settings = get_blog_option( $site->blog_id, 'wp_mail_smtp', [] ); + + // Confirm network site admin has decided to remove all data, otherwise skip. + if ( + ( $network_wide && ! $network_uninstall ) || + ( ! $network_wide && empty( $settings['general']['uninstall'] ) ) + ) { + continue; + } + + /* + * Delete network site plugin options. + */ + foreach ( $options as $option ) { + delete_blog_option( $site->blog_id, $option ); + } + + // Switch to the current network site. + switch_to_blog( $site->blog_id ); + + // Delete plugin settings. + $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE 'wp\_mail\_smtp%'" ); // phpcs:ignore WordPress.DB + + // Delete plugin user meta. + $wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE meta_key LIKE 'wp\_mail\_smtp\_%'" ); // phpcs:ignore WordPress.DB + + // Remove any transients we've left behind. + $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE '\_transient\_wp\_mail\_smtp\_%'" ); // phpcs:ignore WordPress.DB + $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE '\_site\_transient\_wp\_mail\_smtp\_%'" ); // phpcs:ignore WordPress.DB + $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE '\_transient\_timeout\_wp\_mail\_smtp\_%'" ); // phpcs:ignore WordPress.DB + $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE '\_site\_transient\_timeout\_wp\_mail\_smtp\_%'" ); // phpcs:ignore WordPress.DB + + /* + * Delete network site product announcements. + */ + $announcements = get_posts( $am_announcement_params ); + + if ( ! empty( $announcements ) ) { + foreach ( $announcements as $announcement ) { + wp_delete_post( $announcement, true ); + } + } + + /* + * Delete network site Logs for Pro plugin only. + */ + if ( + function_exists( 'wp_mail_smtp' ) && + is_readable( wp_mail_smtp()->plugin_path . '/src/Pro/Pro.php' ) + ) { + $table = \WPMailSMTP\Pro\Emails\Logs\Logs::get_table_name(); + $wpdb->query( "DROP TABLE IF EXISTS $table;" ); // phpcs:ignore WordPress.DB + } + + /* + * Drop all Action Scheduler data and unschedule all plugin ActionScheduler actions. + */ + ( new \WPMailSMTP\Tasks\Tasks() )->cancel_all(); + + $meta_table = \WPMailSMTP\Tasks\Meta::get_table_name(); + $wpdb->query( "DROP TABLE IF EXISTS $meta_table;" ); // phpcs:ignore WordPress.DB + + // Restore the current network site back to the original one. + restore_current_blog(); } +} else { // Non WP MS uninstall process (for normal WP installs). + + // Confirm user has decided to remove all data, otherwise stop. + $settings = get_option( 'wp_mail_smtp', [] ); + if ( empty( $settings['general']['uninstall'] ) ) { + return; + } + + /* + * Delete plugin options. + */ + foreach ( $options as $option ) { + delete_option( $option ); + } + + // Delete plugin settings. + $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE 'wp\_mail\_smtp%'" ); // phpcs:ignore WordPress.DB + + // Delete plugin user meta. + $wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE meta_key LIKE 'wp\_mail\_smtp\_%'" ); // phpcs:ignore WordPress.DB + + // Remove any transients we've left behind. + $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE '\_transient\_wp\_mail\_smtp\_%'" ); // phpcs:ignore WordPress.DB + $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE '\_site\_transient\_wp\_mail\_smtp\_%'" ); // phpcs:ignore WordPress.DB + $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE '\_transient\_timeout\_wp\_mail\_smtp\_%'" ); // phpcs:ignore WordPress.DB + $wpdb->query( "DELETE FROM {$wpdb->options} WHERE option_name LIKE '\_site\_transient\_timeout\_wp\_mail\_smtp\_%'" ); // phpcs:ignore WordPress.DB + + /* + * Remove product announcements. + */ + $announcements = get_posts( $am_announcement_params ); + if ( ! empty( $announcements ) ) { + foreach ( $announcements as $announcement ) { + wp_delete_post( $announcement, true ); + } + } + + /* + * Logs for Pro plugin only. + */ + if ( + function_exists( 'wp_mail_smtp' ) && + is_readable( wp_mail_smtp()->plugin_path . '/src/Pro/Pro.php' ) + ) { + $table = \WPMailSMTP\Pro\Emails\Logs\Logs::get_table_name(); + $wpdb->query( "DROP TABLE IF EXISTS $table;" ); // phpcs:ignore WordPress.DB + } + + /* + * Drop all Action Scheduler data and unschedule all plugin ActionScheduler actions. + */ + ( new \WPMailSMTP\Tasks\Tasks() )->cancel_all(); + + $meta_table = \WPMailSMTP\Tasks\Meta::get_table_name(); + $wpdb->query( "DROP TABLE IF EXISTS $meta_table;" ); // phpcs:ignore WordPress.DB } - -/* - * Logs for Pro plugin only. - */ -if ( - function_exists( 'wp_mail_smtp' ) && - is_readable( wp_mail_smtp()->plugin_path . '/src/Pro/Pro.php' ) -) { - // DB table. - $logs_table = \WPMailSMTP\Pro\Emails\Logs\Logs::get_table_name(); - $wpdb->query( "DROP TABLE IF EXISTS $logs_table;" ); // phpcs:ignore WordPress.DB -} - -/* - * Drop all Action Scheduler data. - */ -require_once dirname( __FILE__ ) . '/vendor/woocommerce/action-scheduler/action-scheduler.php'; - -// Unschedule all plugin ActionScheduler actions. -( new \WPMailSMTP\Tasks\Tasks() )->cancel_all(); - -$meta_table = \WPMailSMTP\Tasks\Meta::get_table_name(); -$wpdb->query( "DROP TABLE IF EXISTS $meta_table;" ); // phpcs:ignore WordPress.DB diff --git a/wp-content/plugins/wp-mail-smtp/vendor/google/auth/src/Credentials/UserRefreshCredentials.php b/wp-content/plugins/wp-mail-smtp/vendor/google/auth/src/Credentials/UserRefreshCredentials.php index cc1bbf1..720ef08 100644 --- a/wp-content/plugins/wp-mail-smtp/vendor/google/auth/src/Credentials/UserRefreshCredentials.php +++ b/wp-content/plugins/wp-mail-smtp/vendor/google/auth/src/Credentials/UserRefreshCredentials.php @@ -34,11 +34,6 @@ use Google\Auth\OAuth2; */ class UserRefreshCredentials extends CredentialsLoader implements GetQuotaProjectInterface { - const CLOUD_SDK_CLIENT_ID = - '764086051850-6qr4p6gpi6hn506pt8ejuq83di341hur.apps.googleusercontent.com'; - - const SUPPRESS_CLOUD_SDK_CREDS_WARNING_ENV = 'SUPPRESS_GCLOUD_CREDS_WARNING'; - /** * The OAuth2 instance used to conduct authorization. * @@ -97,24 +92,6 @@ class UserRefreshCredentials extends CredentialsLoader implements GetQuotaProjec if (array_key_exists('quota_project', $jsonKey)) { $this->quotaProject = (string) $jsonKey['quota_project']; } - if ($jsonKey['client_id'] === self::CLOUD_SDK_CLIENT_ID - && is_null($this->quotaProject) - && getenv(self::SUPPRESS_CLOUD_SDK_CREDS_WARNING_ENV) !== 'true') { - trigger_error( - 'Your application has authenticated using end user credentials ' - . 'from Google Cloud SDK. We recommend that most server ' - . 'applications use service accounts instead. If your ' - . 'application continues to use end user credentials ' - . 'from Cloud SDK, you might receive a "quota exceeded" ' - . 'or "API not enabled" error. For more information about ' - . 'service accounts, see ' - . 'https://cloud.google.com/docs/authentication/. ' - . 'To disable this warning, set ' - . self::SUPPRESS_CLOUD_SDK_CREDS_WARNING_ENV - . ' environment variable to "true".', - E_USER_WARNING - ); - } } /** diff --git a/wp-content/plugins/wp-mail-smtp/vendor/google/auth/src/CredentialsLoader.php b/wp-content/plugins/wp-mail-smtp/vendor/google/auth/src/CredentialsLoader.php index fdc7d94..7cc5aa9 100644 --- a/wp-content/plugins/wp-mail-smtp/vendor/google/auth/src/CredentialsLoader.php +++ b/wp-content/plugins/wp-mail-smtp/vendor/google/auth/src/CredentialsLoader.php @@ -20,6 +20,7 @@ namespace Google\Auth; use Google\Auth\Credentials\InsecureCredentials; use Google\Auth\Credentials\ServiceAccountCredentials; use Google\Auth\Credentials\UserRefreshCredentials; +use GuzzleHttp\ClientInterface; /** * CredentialsLoader contains the behaviour used to locate and find default @@ -54,6 +55,24 @@ abstract class CredentialsLoader implements FetchAuthTokenInterface return strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'; } + /** + * Returns the currently available major Guzzle version. + * + * @return int + */ + private static function getGuzzleMajorVersion() + { + if (defined('GuzzleHttp\ClientInterface::MAJOR_VERSION')) { + return ClientInterface::MAJOR_VERSION; + } + + if (defined('GuzzleHttp\ClientInterface::VERSION')) { + return (int) substr(ClientInterface::VERSION, 0, 1); + } + + throw new \Exception('Version not supported'); + } + /** * Load a JSON key from the path specified in the environment. * @@ -145,35 +164,30 @@ abstract class CredentialsLoader implements FetchAuthTokenInterface callable $httpHandler = null, callable $tokenCallback = null ) { - $version = \GuzzleHttp\ClientInterface::VERSION; - - switch ($version[0]) { - case '5': - $client = new \GuzzleHttp\Client($httpClientOptions); - $client->setDefaultOption('auth', 'google_auth'); - $subscriber = new Subscriber\AuthTokenSubscriber( - $fetcher, - $httpHandler, - $tokenCallback - ); - $client->getEmitter()->attach($subscriber); - return $client; - case '6': - $middleware = new Middleware\AuthTokenMiddleware( - $fetcher, - $httpHandler, - $tokenCallback - ); - $stack = \GuzzleHttp\HandlerStack::create(); - $stack->push($middleware); - - return new \GuzzleHttp\Client([ - 'handler' => $stack, - 'auth' => 'google_auth', - ] + $httpClientOptions); - default: - throw new \Exception('Version not supported'); + if (self::getGuzzleMajorVersion() === 5) { + $client = new \GuzzleHttp\Client($httpClientOptions); + $client->setDefaultOption('auth', 'google_auth'); + $subscriber = new Subscriber\AuthTokenSubscriber( + $fetcher, + $httpHandler, + $tokenCallback + ); + $client->getEmitter()->attach($subscriber); + return $client; } + + $middleware = new Middleware\AuthTokenMiddleware( + $fetcher, + $httpHandler, + $tokenCallback + ); + $stack = \GuzzleHttp\HandlerStack::create(); + $stack->push($middleware); + + return new \GuzzleHttp\Client([ + 'handler' => $stack, + 'auth' => 'google_auth', + ] + $httpClientOptions); } /** diff --git a/wp-content/plugins/wp-mail-smtp/vendor/google/auth/src/HttpHandler/Guzzle6HttpHandler.php b/wp-content/plugins/wp-mail-smtp/vendor/google/auth/src/HttpHandler/Guzzle6HttpHandler.php index ecf78e0..aaa7b43 100644 --- a/wp-content/plugins/wp-mail-smtp/vendor/google/auth/src/HttpHandler/Guzzle6HttpHandler.php +++ b/wp-content/plugins/wp-mail-smtp/vendor/google/auth/src/HttpHandler/Guzzle6HttpHandler.php @@ -1,5 +1,19 @@ 'a', 'B' => 'b', 'C' => 'c', @@ -510,6 +510,138 @@ return array( 'Ⴥ' => 'ⴥ', 'Ⴧ' => 'ⴧ', 'Ⴭ' => 'ⴭ', + 'Ꭰ' => 'ꭰ', + 'Ꭱ' => 'ꭱ', + 'Ꭲ' => 'ꭲ', + 'Ꭳ' => 'ꭳ', + 'Ꭴ' => 'ꭴ', + 'Ꭵ' => 'ꭵ', + 'Ꭶ' => 'ꭶ', + 'Ꭷ' => 'ꭷ', + 'Ꭸ' => 'ꭸ', + 'Ꭹ' => 'ꭹ', + 'Ꭺ' => 'ꭺ', + 'Ꭻ' => 'ꭻ', + 'Ꭼ' => 'ꭼ', + 'Ꭽ' => 'ꭽ', + 'Ꭾ' => 'ꭾ', + 'Ꭿ' => 'ꭿ', + 'Ꮀ' => 'ꮀ', + 'Ꮁ' => 'ꮁ', + 'Ꮂ' => 'ꮂ', + 'Ꮃ' => 'ꮃ', + 'Ꮄ' => 'ꮄ', + 'Ꮅ' => 'ꮅ', + 'Ꮆ' => 'ꮆ', + 'Ꮇ' => 'ꮇ', + 'Ꮈ' => 'ꮈ', + 'Ꮉ' => 'ꮉ', + 'Ꮊ' => 'ꮊ', + 'Ꮋ' => 'ꮋ', + 'Ꮌ' => 'ꮌ', + 'Ꮍ' => 'ꮍ', + 'Ꮎ' => 'ꮎ', + 'Ꮏ' => 'ꮏ', + 'Ꮐ' => 'ꮐ', + 'Ꮑ' => 'ꮑ', + 'Ꮒ' => 'ꮒ', + 'Ꮓ' => 'ꮓ', + 'Ꮔ' => 'ꮔ', + 'Ꮕ' => 'ꮕ', + 'Ꮖ' => 'ꮖ', + 'Ꮗ' => 'ꮗ', + 'Ꮘ' => 'ꮘ', + 'Ꮙ' => 'ꮙ', + 'Ꮚ' => 'ꮚ', + 'Ꮛ' => 'ꮛ', + 'Ꮜ' => 'ꮜ', + 'Ꮝ' => 'ꮝ', + 'Ꮞ' => 'ꮞ', + 'Ꮟ' => 'ꮟ', + 'Ꮠ' => 'ꮠ', + 'Ꮡ' => 'ꮡ', + 'Ꮢ' => 'ꮢ', + 'Ꮣ' => 'ꮣ', + 'Ꮤ' => 'ꮤ', + 'Ꮥ' => 'ꮥ', + 'Ꮦ' => 'ꮦ', + 'Ꮧ' => 'ꮧ', + 'Ꮨ' => 'ꮨ', + 'Ꮩ' => 'ꮩ', + 'Ꮪ' => 'ꮪ', + 'Ꮫ' => 'ꮫ', + 'Ꮬ' => 'ꮬ', + 'Ꮭ' => 'ꮭ', + 'Ꮮ' => 'ꮮ', + 'Ꮯ' => 'ꮯ', + 'Ꮰ' => 'ꮰ', + 'Ꮱ' => 'ꮱ', + 'Ꮲ' => 'ꮲ', + 'Ꮳ' => 'ꮳ', + 'Ꮴ' => 'ꮴ', + 'Ꮵ' => 'ꮵ', + 'Ꮶ' => 'ꮶ', + 'Ꮷ' => 'ꮷ', + 'Ꮸ' => 'ꮸ', + 'Ꮹ' => 'ꮹ', + 'Ꮺ' => 'ꮺ', + 'Ꮻ' => 'ꮻ', + 'Ꮼ' => 'ꮼ', + 'Ꮽ' => 'ꮽ', + 'Ꮾ' => 'ꮾ', + 'Ꮿ' => 'ꮿ', + 'Ᏸ' => 'ᏸ', + 'Ᏹ' => 'ᏹ', + 'Ᏺ' => 'ᏺ', + 'Ᏻ' => 'ᏻ', + 'Ᏼ' => 'ᏼ', + 'Ᏽ' => 'ᏽ', + 'Ა' => 'ა', + 'Ბ' => 'ბ', + 'Გ' => 'გ', + 'Დ' => 'დ', + 'Ე' => 'ე', + 'Ვ' => 'ვ', + 'Ზ' => 'ზ', + 'Თ' => 'თ', + 'Ი' => 'ი', + 'Კ' => 'კ', + 'Ლ' => 'ლ', + 'Მ' => 'მ', + 'Ნ' => 'ნ', + 'Ო' => 'ო', + 'Პ' => 'პ', + 'Ჟ' => 'ჟ', + 'Რ' => 'რ', + 'Ს' => 'ს', + 'Ტ' => 'ტ', + 'Უ' => 'უ', + 'Ფ' => 'ფ', + 'Ქ' => 'ქ', + 'Ღ' => 'ღ', + 'Ყ' => 'ყ', + 'Შ' => 'შ', + 'Ჩ' => 'ჩ', + 'Ც' => 'ც', + 'Ძ' => 'ძ', + 'Წ' => 'წ', + 'Ჭ' => 'ჭ', + 'Ხ' => 'ხ', + 'Ჯ' => 'ჯ', + 'Ჰ' => 'ჰ', + 'Ჱ' => 'ჱ', + 'Ჲ' => 'ჲ', + 'Ჳ' => 'ჳ', + 'Ჴ' => 'ჴ', + 'Ჵ' => 'ჵ', + 'Ჶ' => 'ჶ', + 'Ჷ' => 'ჷ', + 'Ჸ' => 'ჸ', + 'Ჹ' => 'ჹ', + 'Ჺ' => 'ჺ', + 'Ჽ' => 'ჽ', + 'Ჾ' => 'ჾ', + 'Ჿ' => 'ჿ', 'Ḁ' => 'ḁ', 'Ḃ' => 'ḃ', 'Ḅ' => 'ḅ', @@ -993,8 +1125,24 @@ return array( 'Ɜ' => 'ɜ', 'Ɡ' => 'ɡ', 'Ɬ' => 'ɬ', + 'Ɪ' => 'ɪ', 'Ʞ' => 'ʞ', 'Ʇ' => 'ʇ', + 'Ʝ' => 'ʝ', + 'Ꭓ' => 'ꭓ', + 'Ꞵ' => 'ꞵ', + 'Ꞷ' => 'ꞷ', + 'Ꞹ' => 'ꞹ', + 'Ꞻ' => 'ꞻ', + 'Ꞽ' => 'ꞽ', + 'Ꞿ' => 'ꞿ', + 'Ꟃ' => 'ꟃ', + 'Ꞔ' => 'ꞔ', + 'Ʂ' => 'ʂ', + 'Ᶎ' => 'ᶎ', + 'Ꟈ' => 'ꟈ', + 'Ꟊ' => 'ꟊ', + 'Ꟶ' => 'ꟶ', 'Ａ' => 'ａ', 'Ｂ' => 'ｂ', 'Ｃ' => 'ｃ', @@ -1061,6 +1209,93 @@ return array( '𐐥' => '𐑍', '𐐦' => '𐑎', '𐐧' => '𐑏', + '𐒰' => '𐓘', + '𐒱' => '𐓙', + '𐒲' => '𐓚', + '𐒳' => '𐓛', + '𐒴' => '𐓜', + '𐒵' => '𐓝', + '𐒶' => '𐓞', + '𐒷' => '𐓟', + '𐒸' => '𐓠', + '𐒹' => '𐓡', + '𐒺' => '𐓢', + '𐒻' => '𐓣', + '𐒼' => '𐓤', + '𐒽' => '𐓥', + '𐒾' => '𐓦', + '𐒿' => '𐓧', + '𐓀' => '𐓨', + '𐓁' => '𐓩', + '𐓂' => '𐓪', + '𐓃' => '𐓫', + '𐓄' => '𐓬', + '𐓅' => '𐓭', + '𐓆' => '𐓮', + '𐓇' => '𐓯', + '𐓈' => '𐓰', + '𐓉' => '𐓱', + '𐓊' => '𐓲', + '𐓋' => '𐓳', + '𐓌' => '𐓴', + '𐓍' => '𐓵', + '𐓎' => '𐓶', + '𐓏' => '𐓷', + '𐓐' => '𐓸', + '𐓑' => '𐓹', + '𐓒' => '𐓺', + '𐓓' => '𐓻', + '𐲀' => '𐳀', + '𐲁' => '𐳁', + '𐲂' => '𐳂', + '𐲃' => '𐳃', + '𐲄' => '𐳄', + '𐲅' => '𐳅', + '𐲆' => '𐳆', + '𐲇' => '𐳇', + '𐲈' => '𐳈', + '𐲉' => '𐳉', + '𐲊' => '𐳊', + '𐲋' => '𐳋', + '𐲌' => '𐳌', + '𐲍' => '𐳍', + '𐲎' => '𐳎', + '𐲏' => '𐳏', + '𐲐' => '𐳐', + '𐲑' => '𐳑', + '𐲒' => '𐳒', + '𐲓' => '𐳓', + '𐲔' => '𐳔', + '𐲕' => '𐳕', + '𐲖' => '𐳖', + '𐲗' => '𐳗', + '𐲘' => '𐳘', + '𐲙' => '𐳙', + '𐲚' => '𐳚', + '𐲛' => '𐳛', + '𐲜' => '𐳜', + '𐲝' => '𐳝', + '𐲞' => '𐳞', + '𐲟' => '𐳟', + '𐲠' => '𐳠', + '𐲡' => '𐳡', + '𐲢' => '𐳢', + '𐲣' => '𐳣', + '𐲤' => '𐳤', + '𐲥' => '𐳥', + '𐲦' => '𐳦', + '𐲧' => '𐳧', + '𐲨' => '𐳨', + '𐲩' => '𐳩', + '𐲪' => '𐳪', + '𐲫' => '𐳫', + '𐲬' => '𐳬', + '𐲭' => '𐳭', + '𐲮' => '𐳮', + '𐲯' => '𐳯', + '𐲰' => '𐳰', + '𐲱' => '𐳱', + '𐲲' => '𐳲', '𑢠' => '𑣀', '𑢡' => '𑣁', '𑢢' => '𑣂', @@ -1093,4 +1328,70 @@ return array( '𑢽' => '𑣝', '𑢾' => '𑣞', '𑢿' => '𑣟', + '𖹀' => '𖹠', + '𖹁' => '𖹡', + '𖹂' => '𖹢', + '𖹃' => '𖹣', + '𖹄' => '𖹤', + '𖹅' => '𖹥', + '𖹆' => '𖹦', + '𖹇' => '𖹧', + '𖹈' => '𖹨', + '𖹉' => '𖹩', + '𖹊' => '𖹪', + '𖹋' => '𖹫', + '𖹌' => '𖹬', + '𖹍' => '𖹭', + '𖹎' => '𖹮', + '𖹏' => '𖹯', + '𖹐' => '𖹰', + '𖹑' => '𖹱', + '𖹒' => '𖹲', + '𖹓' => '𖹳', + '𖹔' => '𖹴', + '𖹕' => '𖹵', + '𖹖' => '𖹶', + '𖹗' => '𖹷', + '𖹘' => '𖹸', + '𖹙' => '𖹹', + '𖹚' => '𖹺', + '𖹛' => '𖹻', + '𖹜' => '𖹼', + '𖹝' => '𖹽', + '𖹞' => '𖹾', + '𖹟' => '𖹿', + '𞤀' => '𞤢', + '𞤁' => '𞤣', + '𞤂' => '𞤤', + '𞤃' => '𞤥', + '𞤄' => '𞤦', + '𞤅' => '𞤧', + '𞤆' => '𞤨', + '𞤇' => '𞤩', + '𞤈' => '𞤪', + '𞤉' => '𞤫', + '𞤊' => '𞤬', + '𞤋' => '𞤭', + '𞤌' => '𞤮', + '𞤍' => '𞤯', + '𞤎' => '𞤰', + '𞤏' => '𞤱', + '𞤐' => '𞤲', + '𞤑' => '𞤳', + '𞤒' => '𞤴', + '𞤓' => '𞤵', + '𞤔' => '𞤶', + '𞤕' => '𞤷', + '𞤖' => '𞤸', + '𞤗' => '𞤹', + '𞤘' => '𞤺', + '𞤙' => '𞤻', + '𞤚' => '𞤼', + '𞤛' => '𞤽', + '𞤜' => '𞤾', + '𞤝' => '𞤿', + '𞤞' => '𞥀', + '𞤟' => '𞥁', + '𞤠' => '𞥂', + '𞤡' => '𞥃', ); diff --git a/wp-content/plugins/wp-mail-smtp/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php b/wp-content/plugins/wp-mail-smtp/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php index b8103b2..ecbc158 100644 --- a/wp-content/plugins/wp-mail-smtp/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php +++ b/wp-content/plugins/wp-mail-smtp/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php @@ -1,6 +1,6 @@ 'A', 'b' => 'B', 'c' => 'C', @@ -225,6 +225,7 @@ return array( 'ɦ' => 'Ɦ', 'ɨ' => 'Ɨ', 'ɩ' => 'Ɩ', + 'ɪ' => 'Ɪ', 'ɫ' => 'Ɫ', 'ɬ' => 'Ɬ', 'ɯ' => 'Ɯ', @@ -233,6 +234,7 @@ return array( 'ɵ' => 'Ɵ', 'ɽ' => 'Ɽ', 'ʀ' => 'Ʀ', + 'ʂ' => 'Ʂ', 'ʃ' => 'Ʃ', 'ʇ' => 'Ʇ', 'ʈ' => 'Ʈ', @@ -241,6 +243,7 @@ return array( 'ʋ' => 'Ʋ', 'ʌ' => 'Ʌ', 'ʒ' => 'Ʒ', + 'ʝ' => 'Ʝ', 'ʞ' => 'Ʞ', 'ͅ' => 'Ι', 'ͱ' => 'Ͱ', @@ -493,8 +496,70 @@ return array( 'ք' => 'Ք', 'օ' => 'Օ', 'ֆ' => 'Ֆ', + 'ა' => 'Ა', + 'ბ' => 'Ბ', + 'გ' => 'Გ', + 'დ' => 'Დ', + 'ე' => 'Ე', + 'ვ' => 'Ვ', + 'ზ' => 'Ზ', + 'თ' => 'Თ', + 'ი' => 'Ი', + 'კ' => 'Კ', + 'ლ' => 'Ლ', + 'მ' => 'Მ', + 'ნ' => 'Ნ', + 'ო' => 'Ო', + 'პ' => 'Პ', + 'ჟ' => 'Ჟ', + 'რ' => 'Რ', + 'ს' => 'Ს', + 'ტ' => 'Ტ', + 'უ' => 'Უ', + 'ფ' => 'Ფ', + 'ქ' => 'Ქ', + 'ღ' => 'Ღ', + 'ყ' => 'Ყ', + 'შ' => 'Შ', + 'ჩ' => 'Ჩ', + 'ც' => 'Ც', + 'ძ' => 'Ძ', + 'წ' => 'Წ', + 'ჭ' => 'Ჭ', + 'ხ' => 'Ხ', + 'ჯ' => 'Ჯ', + 'ჰ' => 'Ჰ', + 'ჱ' => 'Ჱ', + 'ჲ' => 'Ჲ', + 'ჳ' => 'Ჳ', + 'ჴ' => 'Ჴ', + 'ჵ' => 'Ჵ', + 'ჶ' => 'Ჶ', + 'ჷ' => 'Ჷ', + 'ჸ' => 'Ჸ', + 'ჹ' => 'Ჹ', + 'ჺ' => 'Ჺ', + 'ჽ' => 'Ჽ', + 'ჾ' => 'Ჾ', + 'ჿ' => 'Ჿ', + 'ᏸ' => 'Ᏸ', + 'ᏹ' => 'Ᏹ', + 'ᏺ' => 'Ᏺ', + 'ᏻ' => 'Ᏻ', + 'ᏼ' => 'Ᏼ', + 'ᏽ' => 'Ᏽ', + 'ᲀ' => 'В', + 'ᲁ' => 'Д', + 'ᲂ' => 'О', + 'ᲃ' => 'С', + 'ᲄ' => 'Т', + 'ᲅ' => 'Т', + 'ᲆ' => 'Ъ', + 'ᲇ' => 'Ѣ', + 'ᲈ' => 'Ꙋ', 'ᵹ' => 'Ᵹ', 'ᵽ' => 'Ᵽ', + 'ᶎ' => 'Ᶎ', 'ḁ' => 'Ḁ', 'ḃ' => 'Ḃ', 'ḅ' => 'Ḅ', @@ -993,6 +1058,7 @@ return array( 'ꞌ' => 'Ꞌ', 'ꞑ' => 'Ꞑ', 'ꞓ' => 'Ꞓ', + 'ꞔ' => 'Ꞔ', 'ꞗ' => 'Ꞗ', 'ꞙ' => 'Ꞙ', 'ꞛ' => 'Ꞛ', @@ -1003,6 +1069,97 @@ return array( 'ꞥ' => 'Ꞥ', 'ꞧ' => 'Ꞧ', 'ꞩ' => 'Ꞩ', + 'ꞵ' => 'Ꞵ', + 'ꞷ' => 'Ꞷ', + 'ꞹ' => 'Ꞹ', + 'ꞻ' => 'Ꞻ', + 'ꞽ' => 'Ꞽ', + 'ꞿ' => 'Ꞿ', + 'ꟃ' => 'Ꟃ', + 'ꟈ' => 'Ꟈ', + 'ꟊ' => 'Ꟊ', + 'ꟶ' => 'Ꟶ', + 'ꭓ' => 'Ꭓ', + 'ꭰ' => 'Ꭰ', + 'ꭱ' => 'Ꭱ', + 'ꭲ' => 'Ꭲ', + 'ꭳ' => 'Ꭳ', + 'ꭴ' => 'Ꭴ', + 'ꭵ' => 'Ꭵ', + 'ꭶ' => 'Ꭶ', + 'ꭷ' => 'Ꭷ', + 'ꭸ' => 'Ꭸ', + 'ꭹ' => 'Ꭹ', + 'ꭺ' => 'Ꭺ', + 'ꭻ' => 'Ꭻ', + 'ꭼ' => 'Ꭼ', + 'ꭽ' => 'Ꭽ', + 'ꭾ' => 'Ꭾ', + 'ꭿ' => 'Ꭿ', + 'ꮀ' => 'Ꮀ', + 'ꮁ' => 'Ꮁ', + 'ꮂ' => 'Ꮂ', + 'ꮃ' => 'Ꮃ', + 'ꮄ' => 'Ꮄ', + 'ꮅ' => 'Ꮅ', + 'ꮆ' => 'Ꮆ', + 'ꮇ' => 'Ꮇ', + 'ꮈ' => 'Ꮈ', + 'ꮉ' => 'Ꮉ', + 'ꮊ' => 'Ꮊ', + 'ꮋ' => 'Ꮋ', + 'ꮌ' => 'Ꮌ', + 'ꮍ' => 'Ꮍ', + 'ꮎ' => 'Ꮎ', + 'ꮏ' => 'Ꮏ', + 'ꮐ' => 'Ꮐ', + 'ꮑ' => 'Ꮑ', + 'ꮒ' => 'Ꮒ', + 'ꮓ' => 'Ꮓ', + 'ꮔ' => 'Ꮔ', + 'ꮕ' => 'Ꮕ', + 'ꮖ' => 'Ꮖ', + 'ꮗ' => 'Ꮗ', + 'ꮘ' => 'Ꮘ', + 'ꮙ' => 'Ꮙ', + 'ꮚ' => 'Ꮚ', + 'ꮛ' => 'Ꮛ', + 'ꮜ' => 'Ꮜ', + 'ꮝ' => 'Ꮝ', + 'ꮞ' => 'Ꮞ', + 'ꮟ' => 'Ꮟ', + 'ꮠ' => 'Ꮠ', + 'ꮡ' => 'Ꮡ', + 'ꮢ' => 'Ꮢ', + 'ꮣ' => 'Ꮣ', + 'ꮤ' => 'Ꮤ', + 'ꮥ' => 'Ꮥ', + 'ꮦ' => 'Ꮦ', + 'ꮧ' => 'Ꮧ', + 'ꮨ' => 'Ꮨ', + 'ꮩ' => 'Ꮩ', + 'ꮪ' => 'Ꮪ', + 'ꮫ' => 'Ꮫ', + 'ꮬ' => 'Ꮬ', + 'ꮭ' => 'Ꮭ', + 'ꮮ' => 'Ꮮ', + 'ꮯ' => 'Ꮯ', + 'ꮰ' => 'Ꮰ', + 'ꮱ' => 'Ꮱ', + 'ꮲ' => 'Ꮲ', + 'ꮳ' => 'Ꮳ', + 'ꮴ' => 'Ꮴ', + 'ꮵ' => 'Ꮵ', + 'ꮶ' => 'Ꮶ', + 'ꮷ' => 'Ꮷ', + 'ꮸ' => 'Ꮸ', + 'ꮹ' => 'Ꮹ', + 'ꮺ' => 'Ꮺ', + 'ꮻ' => 'Ꮻ', + 'ꮼ' => 'Ꮼ', + 'ꮽ' => 'Ꮽ', + 'ꮾ' => 'Ꮾ', + 'ꮿ' => 'Ꮿ', 'ａ' => 'Ａ', 'ｂ' => 'Ｂ', 'ｃ' => 'Ｃ', @@ -1069,6 +1226,93 @@ return array( '𐑍' => '𐐥', '𐑎' => '𐐦', '𐑏' => '𐐧', + '𐓘' => '𐒰', + '𐓙' => '𐒱', + '𐓚' => '𐒲', + '𐓛' => '𐒳', + '𐓜' => '𐒴', + '𐓝' => '𐒵', + '𐓞' => '𐒶', + '𐓟' => '𐒷', + '𐓠' => '𐒸', + '𐓡' => '𐒹', + '𐓢' => '𐒺', + '𐓣' => '𐒻', + '𐓤' => '𐒼', + '𐓥' => '𐒽', + '𐓦' => '𐒾', + '𐓧' => '𐒿', + '𐓨' => '𐓀', + '𐓩' => '𐓁', + '𐓪' => '𐓂', + '𐓫' => '𐓃', + '𐓬' => '𐓄', + '𐓭' => '𐓅', + '𐓮' => '𐓆', + '𐓯' => '𐓇', + '𐓰' => '𐓈', + '𐓱' => '𐓉', + '𐓲' => '𐓊', + '𐓳' => '𐓋', + '𐓴' => '𐓌', + '𐓵' => '𐓍', + '𐓶' => '𐓎', + '𐓷' => '𐓏', + '𐓸' => '𐓐', + '𐓹' => '𐓑', + '𐓺' => '𐓒', + '𐓻' => '𐓓', + '𐳀' => '𐲀', + '𐳁' => '𐲁', + '𐳂' => '𐲂', + '𐳃' => '𐲃', + '𐳄' => '𐲄', + '𐳅' => '𐲅', + '𐳆' => '𐲆', + '𐳇' => '𐲇', + '𐳈' => '𐲈', + '𐳉' => '𐲉', + '𐳊' => '𐲊', + '𐳋' => '𐲋', + '𐳌' => '𐲌', + '𐳍' => '𐲍', + '𐳎' => '𐲎', + '𐳏' => '𐲏', + '𐳐' => '𐲐', + '𐳑' => '𐲑', + '𐳒' => '𐲒', + '𐳓' => '𐲓', + '𐳔' => '𐲔', + '𐳕' => '𐲕', + '𐳖' => '𐲖', + '𐳗' => '𐲗', + '𐳘' => '𐲘', + '𐳙' => '𐲙', + '𐳚' => '𐲚', + '𐳛' => '𐲛', + '𐳜' => '𐲜', + '𐳝' => '𐲝', + '𐳞' => '𐲞', + '𐳟' => '𐲟', + '𐳠' => '𐲠', + '𐳡' => '𐲡', + '𐳢' => '𐲢', + '𐳣' => '𐲣', + '𐳤' => '𐲤', + '𐳥' => '𐲥', + '𐳦' => '𐲦', + '𐳧' => '𐲧', + '𐳨' => '𐲨', + '𐳩' => '𐲩', + '𐳪' => '𐲪', + '𐳫' => '𐲫', + '𐳬' => '𐲬', + '𐳭' => '𐲭', + '𐳮' => '𐲮', + '𐳯' => '𐲯', + '𐳰' => '𐲰', + '𐳱' => '𐲱', + '𐳲' => '𐲲', '𑣀' => '𑢠', '𑣁' => '𑢡', '𑣂' => '𑢢', @@ -1101,4 +1345,70 @@ return array( '𑣝' => '𑢽', '𑣞' => '𑢾', '𑣟' => '𑢿', + '𖹠' => '𖹀', + '𖹡' => '𖹁', + '𖹢' => '𖹂', + '𖹣' => '𖹃', + '𖹤' => '𖹄', + '𖹥' => '𖹅', + '𖹦' => '𖹆', + '𖹧' => '𖹇', + '𖹨' => '𖹈', + '𖹩' => '𖹉', + '𖹪' => '𖹊', + '𖹫' => '𖹋', + '𖹬' => '𖹌', + '𖹭' => '𖹍', + '𖹮' => '𖹎', + '𖹯' => '𖹏', + '𖹰' => '𖹐', + '𖹱' => '𖹑', + '𖹲' => '𖹒', + '𖹳' => '𖹓', + '𖹴' => '𖹔', + '𖹵' => '𖹕', + '𖹶' => '𖹖', + '𖹷' => '𖹗', + '𖹸' => '𖹘', + '𖹹' => '𖹙', + '𖹺' => '𖹚', + '𖹻' => '𖹛', + '𖹼' => '𖹜', + '𖹽' => '𖹝', + '𖹾' => '𖹞', + '𖹿' => '𖹟', + '𞤢' => '𞤀', + '𞤣' => '𞤁', + '𞤤' => '𞤂', + '𞤥' => '𞤃', + '𞤦' => '𞤄', + '𞤧' => '𞤅', + '𞤨' => '𞤆', + '𞤩' => '𞤇', + '𞤪' => '𞤈', + '𞤫' => '𞤉', + '𞤬' => '𞤊', + '𞤭' => '𞤋', + '𞤮' => '𞤌', + '𞤯' => '𞤍', + '𞤰' => '𞤎', + '𞤱' => '𞤏', + '𞤲' => '𞤐', + '𞤳' => '𞤑', + '𞤴' => '𞤒', + '𞤵' => '𞤓', + '𞤶' => '𞤔', + '𞤷' => '𞤕', + '𞤸' => '𞤖', + '𞤹' => '𞤗', + '𞤺' => '𞤘', + '𞤻' => '𞤙', + '𞤼' => '𞤚', + '𞤽' => '𞤛', + '𞤾' => '𞤜', + '𞤿' => '𞤝', + '𞥀' => '𞤞', + '𞥁' => '𞤟', + '𞥂' => '𞤠', + '𞥃' => '𞤡', ); diff --git a/wp-content/plugins/wp-mail-smtp/wp_mail_smtp.php b/wp-content/plugins/wp-mail-smtp/wp_mail_smtp.php index b6f5926..230943f 100644 --- a/wp-content/plugins/wp-mail-smtp/wp_mail_smtp.php +++ b/wp-content/plugins/wp-mail-smtp/wp_mail_smtp.php @@ -1,7 +1,7 @@ wp_mail() function to use Gmail/Mailgun/SendGrid/SMTP instead of the default mail() and creates an options page to manage the settings. * Author: WPForms @@ -203,7 +203,7 @@ if ( ! function_exists( 'wp_mail_smtp_insecure_php_version_notice' ) ) { } if ( ! defined( 'WPMS_PLUGIN_VER' ) ) { - define( 'WPMS_PLUGIN_VER', '2.1.1' ); + define( 'WPMS_PLUGIN_VER', '2.2.1' ); } if ( ! defined( 'WPMS_PHP_VER' ) ) { define( 'WPMS_PHP_VER', '5.5.0' );