updated plugin WP Mail SMTP version 2.5.1

This commit is contained in:
KawaiiPunk 2020-10-31 15:29:55 +00:00 committed by Gitium
parent 0505659506
commit 1b332b2abc
15 changed files with 96 additions and 92 deletions

File diff suppressed because one or more lines are too long

View File

@ -1,19 +1,24 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WP Mail SMTP 2.5.0\n" "Project-Id-Version: WP Mail SMTP 2.5.1\n"
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wp-mail-smtp\n" "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wp-mail-smtp\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"POT-Creation-Date: 2020-10-22T11:59:56+03:00\n" "POT-Creation-Date: 2020-10-28T07:52:42+00:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"X-Generator: WP-CLI 2.4.0\n" "X-Generator: WP-CLI 2.4.0\n"
"X-Domain: wp-mail-smtp\n" "X-Domain: wp-mail-smtp\n"
#. Plugin Name of the plugin #. Plugin Name of the plugin
msgid "WP Mail SMTP Pro" #: src/Admin/Area.php:206
#: src/Admin/Area.php:207
#: src/Admin/Area.php:252
#: src/Admin/Area.php:253
#: src/SiteHealth.php:40
msgid "WP Mail SMTP"
msgstr "" msgstr ""
#. Plugin URI of the plugin #. Plugin URI of the plugin
@ -54,14 +59,6 @@ msgstr ""
msgid "Thanks for using WP Mail SMTP! To complete the plugin setup and start sending emails, <strong>please select and configure your <a href=\"%s\">Mailer</a></strong>." msgid "Thanks for using WP Mail SMTP! To complete the plugin setup and start sending emails, <strong>please select and configure your <a href=\"%s\">Mailer</a></strong>."
msgstr "" msgstr ""
#: src/Admin/Area.php:206
#: src/Admin/Area.php:207
#: src/Admin/Area.php:252
#: src/Admin/Area.php:253
#: src/SiteHealth.php:40
msgid "WP Mail SMTP"
msgstr ""
#: src/Admin/Area.php:217 #: src/Admin/Area.php:217
#: src/Admin/Area.php:218 #: src/Admin/Area.php:218
#: src/Admin/Area.php:956 #: src/Admin/Area.php:956
@ -96,6 +93,10 @@ msgstr ""
msgid "Pro+ badge icon" msgid "Pro+ badge icon"
msgstr "" msgstr ""
#: src/Admin/Area.php:298
msgid "Simply enable network-wide settings and every site on your network will inherit the same SMTP settings. Save time and only configure your SMTP provider once."
msgstr ""
#: src/Admin/Area.php:305 #: src/Admin/Area.php:305
msgid "Settings control" msgid "Settings control"
msgstr "" msgstr ""

View File

@ -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, sendinblue, wp smtp Tags: smtp, wp mail smtp, wordpress smtp, gmail smtp, sendgrid smtp, mailgun smtp, mail, mailer, phpmailer, wp_mail, email, mailgun, sengrid, gmail, sendinblue, wp smtp
Requires at least: 4.9 Requires at least: 4.9
Tested up to: 5.5 Tested up to: 5.5
Stable tag: 2.5.0 Stable tag: 2.5.1
Requires PHP: 5.5.0 Requires PHP: 5.5.0
Make email delivery easy for WordPress. Connect with SMTP, Gmail, Outlook, SendGrid, Mailgun, Zoho, SES, and more. Make email delivery easy for WordPress. Connect with SMTP, Gmail, Outlook, SendGrid, Mailgun, Zoho, SES, and more.
@ -228,6 +228,10 @@ By all means please contact us to discuss features or options you'd like to see
== Changelog == == Changelog ==
= 2.5.1 - 2020-10-28 =
* The automatic updates issue with Gmail mailer token refresh.
* The 'wp-amil-smtp' typo in a plugin text-domain and a HTML class.
= 2.5.0 - 2020-10-22 = = 2.5.0 - 2020-10-22 =
* Added: Other SMTP mailer password encryption/decryption. * Added: Other SMTP mailer password encryption/decryption.
* Changed: Gmail mailer suggested steps for `invalid_grant` error on the Settings > Email Test page. * Changed: Gmail mailer suggested steps for `invalid_grant` error on the Settings > Email Test page.

View File

@ -295,7 +295,7 @@ class Area {
<img src="<?php echo esc_url( wp_mail_smtp()->assets_url . '/images/pro-badge.svg' ); ?>" class="badge" alt="<?php esc_attr_e( 'Pro+ badge icon', 'wp-mail-smtp' ); ?>"> <img src="<?php echo esc_url( wp_mail_smtp()->assets_url . '/images/pro-badge.svg' ); ?>" class="badge" alt="<?php esc_attr_e( 'Pro+ badge icon', 'wp-mail-smtp' ); ?>">
</div> </div>
<p> <p>
<?php esc_html_e( 'Simply enable network-wide settings and every site on your network will inherit the same SMTP settings. Save time and only configure your SMTP provider once.', 'wp-amil-smtp' ); ?> <?php esc_html_e( 'Simply enable network-wide settings and every site on your network will inherit the same SMTP settings. Save time and only configure your SMTP provider once.', 'wp-mail-smtp' ); ?>
</p> </p>
</div> </div>

View File

@ -59,7 +59,7 @@ class Education {
printf( printf(
'<div id="wp-mail-smtp-notice-bar"> '<div id="wp-mail-smtp-notice-bar">
<div class="wp-amil-smtp-notice-bar-container"> <div class="wp-mail-smtp-notice-bar-container">
<span class="wp-mail-smtp-notice-bar-message">%s</span> <span class="wp-mail-smtp-notice-bar-message">%s</span>
<button type="button" class="dismiss" title="%s" /> <button type="button" class="dismiss" title="%s" />
</div> </div>

View File

@ -77,18 +77,16 @@ abstract class AuthAbstract implements AuthInterface {
protected function update_auth_code( $code ) { protected function update_auth_code( $code ) {
$options = new PluginOptions(); $options = new PluginOptions();
$all = $options->get_all();
// To save in DB. // To save in DB.
$updated_settings = [ $all[ $this->mailer_slug ]['auth_code'] = $code;
$this->mailer_slug => [
'auth_code' => $code,
],
];
// To save in currently retrieved options array. // To save in currently retrieved options array.
$this->options['auth_code'] = $code; $this->options['auth_code'] = $code;
$options->set( $updated_settings, false, false ); // NOTE: These options need to be saved by overwriting all options, because WP automatic updates can cause an issue: GH #575!
$options->set( $all, false, true );
} }
/** /**
@ -101,18 +99,16 @@ abstract class AuthAbstract implements AuthInterface {
protected function update_access_token( $token ) { protected function update_access_token( $token ) {
$options = new PluginOptions(); $options = new PluginOptions();
$all = $options->get_all();
// To save in DB. // To save in DB.
$updated_settings = [ $all[ $this->mailer_slug ]['access_token'] = $token;
$this->mailer_slug => [
'access_token' => $token,
],
];
// To save in currently retrieved options array. // To save in currently retrieved options array.
$this->options['access_token'] = $token; $this->options['access_token'] = $token;
$options->set( $updated_settings, false, false ); // NOTE: These options need to be saved by overwriting all options, because WP automatic updates can cause an issue: GH #575!
$options->set( $all, false, true );
} }
/** /**
@ -125,18 +121,16 @@ abstract class AuthAbstract implements AuthInterface {
protected function update_refresh_token( $token ) { protected function update_refresh_token( $token ) {
$options = new PluginOptions(); $options = new PluginOptions();
$all = $options->get_all();
// To save in DB. // To save in DB.
$updated_settings = [ $all[ $this->mailer_slug ]['refresh_token'] = $token;
$this->mailer_slug => [
'refresh_token' => $token,
],
];
// To save in currently retrieved options array. // To save in currently retrieved options array.
$this->options['refresh_token'] = $token; $this->options['refresh_token'] = $token;
$options->set( $updated_settings, false, false ); // NOTE: These options need to be saved by overwriting all options, because WP automatic updates can cause an issue: GH #575!
$options->set( $all, false, true );
} }
/** /**

View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php'; require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit982434b9fa67b618e1fee7385b7ec239::getLoader(); return ComposerAutoloaderInit43034736f284196d23971ba5470288b6::getLoader();

View File

@ -60,7 +60,7 @@ class ClassLoader
public function getPrefixes() public function getPrefixes()
{ {
if (!empty($this->prefixesPsr0)) { if (!empty($this->prefixesPsr0)) {
return call_user_func_array('array_merge', array_values($this->prefixesPsr0)); return call_user_func_array('array_merge', $this->prefixesPsr0);
} }
return array(); return array();

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer // autoload_real.php @generated by Composer
class ComposerAutoloaderInit982434b9fa67b618e1fee7385b7ec239 class ComposerAutoloaderInit43034736f284196d23971ba5470288b6
{ {
private static $loader; private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit982434b9fa67b618e1fee7385b7ec239
return self::$loader; return self::$loader;
} }
spl_autoload_register(array('ComposerAutoloaderInit982434b9fa67b618e1fee7385b7ec239', 'loadClassLoader'), true, true); spl_autoload_register(array('ComposerAutoloaderInit43034736f284196d23971ba5470288b6', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(); self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit982434b9fa67b618e1fee7385b7ec239', 'loadClassLoader')); spl_autoload_unregister(array('ComposerAutoloaderInit43034736f284196d23971ba5470288b6', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) { if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php'; require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit982434b9fa67b618e1fee7385b7ec239::getInitializer($loader)); call_user_func(\Composer\Autoload\ComposerStaticInit43034736f284196d23971ba5470288b6::getInitializer($loader));
} else { } else {
$map = require __DIR__ . '/autoload_namespaces.php'; $map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) { foreach ($map as $namespace => $path) {
@ -51,19 +51,19 @@ class ComposerAutoloaderInit982434b9fa67b618e1fee7385b7ec239
$loader->register(true); $loader->register(true);
if ($useStaticLoader) { if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit982434b9fa67b618e1fee7385b7ec239::$files; $includeFiles = Composer\Autoload\ComposerStaticInit43034736f284196d23971ba5470288b6::$files;
} else { } else {
$includeFiles = require __DIR__ . '/autoload_files.php'; $includeFiles = require __DIR__ . '/autoload_files.php';
} }
foreach ($includeFiles as $fileIdentifier => $file) { foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire982434b9fa67b618e1fee7385b7ec239($fileIdentifier, $file); composerRequire43034736f284196d23971ba5470288b6($fileIdentifier, $file);
} }
return $loader; return $loader;
} }
} }
function composerRequire982434b9fa67b618e1fee7385b7ec239($fileIdentifier, $file) function composerRequire43034736f284196d23971ba5470288b6($fileIdentifier, $file)
{ {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file; require $file;

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload; namespace Composer\Autoload;
class ComposerStaticInit982434b9fa67b618e1fee7385b7ec239 class ComposerStaticInit43034736f284196d23971ba5470288b6
{ {
public static $files = array ( public static $files = array (
'5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php', '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php',
@ -597,9 +597,9 @@ class ComposerStaticInit982434b9fa67b618e1fee7385b7ec239
public static function getInitializer(ClassLoader $loader) public static function getInitializer(ClassLoader $loader)
{ {
return \Closure::bind(function () use ($loader) { return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit982434b9fa67b618e1fee7385b7ec239::$prefixLengthsPsr4; $loader->prefixLengthsPsr4 = ComposerStaticInit43034736f284196d23971ba5470288b6::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit982434b9fa67b618e1fee7385b7ec239::$prefixDirsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInit43034736f284196d23971ba5470288b6::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit982434b9fa67b618e1fee7385b7ec239::$classMap; $loader->classMap = ComposerStaticInit43034736f284196d23971ba5470288b6::$classMap;
}, null, ClassLoader::class); }, null, ClassLoader::class);
} }

View File

@ -514,10 +514,11 @@ final class Mbstring
{ {
$encoding = self::getEncoding($encoding); $encoding = self::getEncoding($encoding);
if ('CP850' === $encoding || 'ASCII' === $encoding) { if ('CP850' === $encoding || 'ASCII' === $encoding) {
return \strrchr($haystack, $needle, $part); $pos = \strrpos($haystack, $needle);
} else {
$needle = self::mb_substr($needle, 0, 1, $encoding);
$pos = \iconv_strrpos($haystack, $needle, $encoding);
} }
$needle = self::mb_substr($needle, 0, 1, $encoding);
$pos = \iconv_strrpos($haystack, $needle, $encoding);
return self::getSubpart($pos, $part, $haystack, $encoding); return self::getSubpart($pos, $part, $haystack, $encoding);
} }
public static function mb_strrichr($haystack, $needle, $part = \false, $encoding = null) public static function mb_strrichr($haystack, $needle, $part = \false, $encoding = null)

View File

@ -12,28 +12,28 @@
use WPMailSMTP\Vendor\Symfony\Polyfill\Mbstring as p; use WPMailSMTP\Vendor\Symfony\Polyfill\Mbstring as p;
if (!function_exists('mb_convert_encoding')) { if (!function_exists('mb_convert_encoding')) {
function mb_convert_encoding($s, $to, $from = null) { return p\Mbstring::mb_convert_encoding($s, $to, $from); } function mb_convert_encoding($string, $to_encoding, $from_encoding = null) { return p\Mbstring::mb_convert_encoding($string, $to_encoding, $from_encoding); }
} }
if (!function_exists('mb_decode_mimeheader')) { if (!function_exists('mb_decode_mimeheader')) {
function mb_decode_mimeheader($s) { return p\Mbstring::mb_decode_mimeheader($s); } function mb_decode_mimeheader($string) { return p\Mbstring::mb_decode_mimeheader($string); }
} }
if (!function_exists('mb_encode_mimeheader')) { if (!function_exists('mb_encode_mimeheader')) {
function mb_encode_mimeheader($s, $charset = null, $transferEnc = null, $lf = null, $indent = null) { return p\Mbstring::mb_encode_mimeheader($s, $charset, $transferEnc, $lf, $indent); } function mb_encode_mimeheader($string, $charset = null, $transfer_encoding = null, $newline = null, $indent = null) { return p\Mbstring::mb_encode_mimeheader($string, $charset, $transfer_encoding, $newline, $indent); }
} }
if (!function_exists('mb_decode_numericentity')) { if (!function_exists('mb_decode_numericentity')) {
function mb_decode_numericentity($s, $convmap, $enc = null) { return p\Mbstring::mb_decode_numericentity($s, $convmap, $enc); } function mb_decode_numericentity($string, $map, $encoding = null) { return p\Mbstring::mb_decode_numericentity($string, $map, $encoding); }
} }
if (!function_exists('mb_encode_numericentity')) { if (!function_exists('mb_encode_numericentity')) {
function mb_encode_numericentity($s, $convmap, $enc = null, $is_hex = false) { return p\Mbstring::mb_encode_numericentity($s, $convmap, $enc, $is_hex); } function mb_encode_numericentity($string, $map, $encoding = null, $hex = false) { return p\Mbstring::mb_encode_numericentity($string, $map, $encoding, $hex); }
} }
if (!function_exists('mb_convert_case')) { if (!function_exists('mb_convert_case')) {
function mb_convert_case($s, $mode, $enc = null) { return p\Mbstring::mb_convert_case($s, $mode, $enc); } function mb_convert_case($string, $mode, $encoding = null) { return p\Mbstring::mb_convert_case($string, $mode, $encoding); }
} }
if (!function_exists('mb_internal_encoding')) { if (!function_exists('mb_internal_encoding')) {
function mb_internal_encoding($enc = null) { return p\Mbstring::mb_internal_encoding($enc); } function mb_internal_encoding($encoding = null) { return p\Mbstring::mb_internal_encoding($encoding); }
} }
if (!function_exists('mb_language')) { if (!function_exists('mb_language')) {
function mb_language($lang = null) { return p\Mbstring::mb_language($lang); } function mb_language($language = null) { return p\Mbstring::mb_language($language); }
} }
if (!function_exists('mb_list_encodings')) { if (!function_exists('mb_list_encodings')) {
function mb_list_encodings() { return p\Mbstring::mb_list_encodings(); } function mb_list_encodings() { return p\Mbstring::mb_list_encodings(); }
@ -42,88 +42,92 @@ if (!function_exists('mb_encoding_aliases')) {
function mb_encoding_aliases($encoding) { return p\Mbstring::mb_encoding_aliases($encoding); } function mb_encoding_aliases($encoding) { return p\Mbstring::mb_encoding_aliases($encoding); }
} }
if (!function_exists('mb_check_encoding')) { if (!function_exists('mb_check_encoding')) {
function mb_check_encoding($var = null, $encoding = null) { return p\Mbstring::mb_check_encoding($var, $encoding); } function mb_check_encoding($value = null, $encoding = null) { return p\Mbstring::mb_check_encoding($value, $encoding); }
} }
if (!function_exists('mb_detect_encoding')) { if (!function_exists('mb_detect_encoding')) {
function mb_detect_encoding($str, $encodingList = null, $strict = false) { return p\Mbstring::mb_detect_encoding($str, $encodingList, $strict); } function mb_detect_encoding($string, $encodings = null, $strict = false) { return p\Mbstring::mb_detect_encoding($string, $encodings, $strict); }
} }
if (!function_exists('mb_detect_order')) { if (!function_exists('mb_detect_order')) {
function mb_detect_order($encodingList = null) { return p\Mbstring::mb_detect_order($encodingList); } function mb_detect_order($encoding = null) { return p\Mbstring::mb_detect_order($encoding); }
} }
if (!function_exists('mb_parse_str')) { if (!function_exists('mb_parse_str')) {
function mb_parse_str($s, &$result = array()) { parse_str($s, $result); } function mb_parse_str($string, &$result = array()) { parse_str($string, $result); }
} }
if (!function_exists('mb_strlen')) { if (!function_exists('mb_strlen')) {
function mb_strlen($s, $enc = null) { return p\Mbstring::mb_strlen($s, $enc); } function mb_strlen($string, $encoding = null) { return p\Mbstring::mb_strlen($string, $encoding); }
} }
if (!function_exists('mb_strpos')) { if (!function_exists('mb_strpos')) {
function mb_strpos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strpos($s, $needle, $offset, $enc); } function mb_strpos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_strpos($haystack, $needle, $offset, $encoding); }
} }
if (!function_exists('mb_strtolower')) { if (!function_exists('mb_strtolower')) {
function mb_strtolower($s, $enc = null) { return p\Mbstring::mb_strtolower($s, $enc); } function mb_strtolower($string, $encoding = null) { return p\Mbstring::mb_strtolower($string, $encoding); }
} }
if (!function_exists('mb_strtoupper')) { if (!function_exists('mb_strtoupper')) {
function mb_strtoupper($s, $enc = null) { return p\Mbstring::mb_strtoupper($s, $enc); } function mb_strtoupper($string, $encoding = null) { return p\Mbstring::mb_strtoupper($string, $encoding); }
} }
if (!function_exists('mb_substitute_character')) { if (!function_exists('mb_substitute_character')) {
function mb_substitute_character($char = null) { return p\Mbstring::mb_substitute_character($char); } function mb_substitute_character($substitute_character = null) { return p\Mbstring::mb_substitute_character($substitute_character); }
} }
if (!function_exists('mb_substr')) { if (!function_exists('mb_substr')) {
function mb_substr($s, $start, $length = 2147483647, $enc = null) { return p\Mbstring::mb_substr($s, $start, $length, $enc); } function mb_substr($string, $start, $length = 2147483647, $encoding = null) { return p\Mbstring::mb_substr($string, $start, $length, $encoding); }
} }
if (!function_exists('mb_stripos')) { if (!function_exists('mb_stripos')) {
function mb_stripos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_stripos($s, $needle, $offset, $enc); } function mb_stripos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_stripos($haystack, $needle, $offset, $encoding); }
} }
if (!function_exists('mb_stristr')) { if (!function_exists('mb_stristr')) {
function mb_stristr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_stristr($s, $needle, $part, $enc); } function mb_stristr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_stristr($haystack, $needle, $before_needle, $encoding); }
} }
if (!function_exists('mb_strrchr')) { if (!function_exists('mb_strrchr')) {
function mb_strrchr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strrchr($s, $needle, $part, $enc); } function mb_strrchr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_strrchr($haystack, $needle, $before_needle, $encoding); }
} }
if (!function_exists('mb_strrichr')) { if (!function_exists('mb_strrichr')) {
function mb_strrichr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strrichr($s, $needle, $part, $enc); } function mb_strrichr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_strrichr($haystack, $needle, $before_needle, $encoding); }
} }
if (!function_exists('mb_strripos')) { if (!function_exists('mb_strripos')) {
function mb_strripos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strripos($s, $needle, $offset, $enc); } function mb_strripos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_strripos($haystack, $needle, $offset, $encoding); }
} }
if (!function_exists('mb_strrpos')) { if (!function_exists('mb_strrpos')) {
function mb_strrpos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strrpos($s, $needle, $offset, $enc); } function mb_strrpos($haystack, $needle, $offset = 0, $encoding = null) { return p\Mbstring::mb_strrpos($haystack, $needle, $offset, $encoding); }
} }
if (!function_exists('mb_strstr')) { if (!function_exists('mb_strstr')) {
function mb_strstr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strstr($s, $needle, $part, $enc); } function mb_strstr($haystack, $needle, $before_needle = false, $encoding = null) { return p\Mbstring::mb_strstr($haystack, $needle, $before_needle, $encoding); }
} }
if (!function_exists('mb_get_info')) { if (!function_exists('mb_get_info')) {
function mb_get_info($type = 'all') { return p\Mbstring::mb_get_info($type); } function mb_get_info($type = 'all') { return p\Mbstring::mb_get_info($type); }
} }
if (!function_exists('mb_http_output')) { if (!function_exists('mb_http_output')) {
function mb_http_output($enc = null) { return p\Mbstring::mb_http_output($enc); } function mb_http_output($encoding = null) { return p\Mbstring::mb_http_output($encoding); }
} }
if (!function_exists('mb_strwidth')) { if (!function_exists('mb_strwidth')) {
function mb_strwidth($s, $enc = null) { return p\Mbstring::mb_strwidth($s, $enc); } function mb_strwidth($string, $encoding = null) { return p\Mbstring::mb_strwidth($string, $encoding); }
} }
if (!function_exists('mb_substr_count')) { if (!function_exists('mb_substr_count')) {
function mb_substr_count($haystack, $needle, $enc = null) { return p\Mbstring::mb_substr_count($haystack, $needle, $enc); } function mb_substr_count($haystack, $needle, $encoding = null) { return p\Mbstring::mb_substr_count($haystack, $needle, $encoding); }
} }
if (!function_exists('mb_output_handler')) { if (!function_exists('mb_output_handler')) {
function mb_output_handler($contents, $status) { return p\Mbstring::mb_output_handler($contents, $status); } function mb_output_handler($string, $status) { return p\Mbstring::mb_output_handler($string, $status); }
} }
if (!function_exists('mb_http_input')) { if (!function_exists('mb_http_input')) {
function mb_http_input($type = '') { return p\Mbstring::mb_http_input($type); } function mb_http_input($type = '') { return p\Mbstring::mb_http_input($type); }
} }
if (!function_exists('mb_convert_variables')) {
if (PHP_VERSION_ID >= 80000) {
require_once __DIR__.'/Resources/mb_convert_variables.php8';
} elseif (!function_exists('mb_convert_variables')) {
function mb_convert_variables($toEncoding, $fromEncoding, &$a = null, &$b = null, &$c = null, &$d = null, &$e = null, &$f = null) { return p\Mbstring::mb_convert_variables($toEncoding, $fromEncoding, $a, $b, $c, $d, $e, $f); } function mb_convert_variables($toEncoding, $fromEncoding, &$a = null, &$b = null, &$c = null, &$d = null, &$e = null, &$f = null) { return p\Mbstring::mb_convert_variables($toEncoding, $fromEncoding, $a, $b, $c, $d, $e, $f); }
} }
if (!function_exists('mb_ord')) { if (!function_exists('mb_ord')) {
function mb_ord($s, $enc = null) { return p\Mbstring::mb_ord($s, $enc); } function mb_ord($string, $encoding = null) { return p\Mbstring::mb_ord($string, $encoding); }
} }
if (!function_exists('mb_chr')) { if (!function_exists('mb_chr')) {
function mb_chr($code, $enc = null) { return p\Mbstring::mb_chr($code, $enc); } function mb_chr($codepoint, $encoding = null) { return p\Mbstring::mb_chr($codepoint, $encoding); }
} }
if (!function_exists('mb_scrub')) { if (!function_exists('mb_scrub')) {
function mb_scrub($s, $enc = null) { $enc = null === $enc ? mb_internal_encoding() : $enc; return mb_convert_encoding($s, $enc, $enc); } function mb_scrub($string, $encoding = null) { $encoding = null === $encoding ? mb_internal_encoding() : $encoding; return mb_convert_encoding($string, $encoding, $encoding); }
} }
if (!function_exists('mb_str_split')) { if (!function_exists('mb_str_split')) {
function mb_str_split($string, $split_length = 1, $encoding = null) { return p\Mbstring::mb_str_split($string, $split_length, $encoding); } function mb_str_split($string, $length = 1, $encoding = null) { return p\Mbstring::mb_str_split($string, $length, $encoding); }
} }
if (extension_loaded('mbstring')) { if (extension_loaded('mbstring')) {

View File

@ -153,7 +153,7 @@ final class Php72
} }
public static function mb_ord($s, $encoding = null) public static function mb_ord($s, $encoding = null)
{ {
if (null == $encoding) { if (null === $encoding) {
$s = \mb_convert_encoding($s, 'UTF-8'); $s = \mb_convert_encoding($s, 'UTF-8');
} elseif ('UTF-8' !== $encoding) { } elseif ('UTF-8' !== $encoding) {
$s = \mb_convert_encoding($s, 'UTF-8', $encoding); $s = \mb_convert_encoding($s, 'UTF-8', $encoding);

View File

@ -38,20 +38,20 @@ if (!function_exists('stream_isatty')) {
function stream_isatty($stream) { return p\Php72::stream_isatty($stream); } function stream_isatty($stream) { return p\Php72::stream_isatty($stream); }
} }
if (!function_exists('utf8_encode')) { if (!function_exists('utf8_encode')) {
function utf8_encode($s) { return p\Php72::utf8_encode($s); } function utf8_encode($string) { return p\Php72::utf8_encode($string); }
} }
if (!function_exists('utf8_decode')) { if (!function_exists('utf8_decode')) {
function utf8_decode($s) { return p\Php72::utf8_decode($s); } function utf8_decode($string) { return p\Php72::utf8_decode($string); }
} }
if (!function_exists('spl_object_id')) { if (!function_exists('spl_object_id')) {
function spl_object_id($s) { return p\Php72::spl_object_id($s); } function spl_object_id($object) { return p\Php72::spl_object_id($object); }
} }
if (!function_exists('mb_ord')) { if (!function_exists('mb_ord')) {
function mb_ord($s, $enc = null) { return p\Php72::mb_ord($s, $enc); } function mb_ord($string, $encoding = null) { return p\Php72::mb_ord($string, $encoding); }
} }
if (!function_exists('mb_chr')) { if (!function_exists('mb_chr')) {
function mb_chr($code, $enc = null) { return p\Php72::mb_chr($code, $enc); } function mb_chr($codepoint, $encoding = null) { return p\Php72::mb_chr($codepoint, $encoding); }
} }
if (!function_exists('mb_scrub')) { if (!function_exists('mb_scrub')) {
function mb_scrub($s, $enc = null) { $enc = null === $enc ? mb_internal_encoding() : $enc; return mb_convert_encoding($s, $enc, $enc); } function mb_scrub($string, $encoding = null) { $encoding = null === $encoding ? mb_internal_encoding() : $encoding; return mb_convert_encoding($string, $encoding, $encoding); }
} }

View File

@ -1,7 +1,7 @@
<?php <?php
/** /**
* Plugin Name: WP Mail SMTP * Plugin Name: WP Mail SMTP
* Version: 2.5.0 * Version: 2.5.1
* Requires at least: 4.9 * Requires at least: 4.9
* Requires PHP: 5.5 * Requires PHP: 5.5
* Plugin URI: https://wpmailsmtp.com/ * Plugin URI: https://wpmailsmtp.com/
@ -205,7 +205,7 @@ if ( ! function_exists( 'wp_mail_smtp_insecure_php_version_notice' ) ) {
} }
if ( ! defined( 'WPMS_PLUGIN_VER' ) ) { if ( ! defined( 'WPMS_PLUGIN_VER' ) ) {
define( 'WPMS_PLUGIN_VER', '2.5.0' ); define( 'WPMS_PLUGIN_VER', '2.5.1' );
} }
if ( ! defined( 'WPMS_PHP_VER' ) ) { if ( ! defined( 'WPMS_PHP_VER' ) ) {
define( 'WPMS_PHP_VER', '5.5.0' ); define( 'WPMS_PHP_VER', '5.5.0' );