updated plugin WP Mail SMTP version 2.4.0

This commit is contained in:
2020-09-25 14:44:17 +00:00
committed by Gitium
parent 4f3d745449
commit 3053837189
673 changed files with 31869 additions and 65613 deletions

View File

@ -50,15 +50,15 @@ class Geo {
* @since 1.6.0 Added new geo API endpoint, provided by WPForms.
* @since 2.0.0 Updated the WPForms geo API endpoint to v3.
*
* @param string $ip
* @param string $ip The IP address.
*
* @return array Empty array for localhost.
*/
public static function get_location_by_ip( $ip ) {
// Check for a non-local IP.
if ( empty( $ip ) || in_array( $ip, array( '127.0.0.1', '::1' ), true ) ) {
return array();
if ( empty( $ip ) || in_array( $ip, [ '127.0.0.1', '::1' ], true ) ) {
return [];
}
$request = wp_remote_get( 'https://geo.wpforms.com/v3/geolocate/json/' . $ip );
@ -66,14 +66,14 @@ class Geo {
if ( ! is_wp_error( $request ) ) {
$request = json_decode( wp_remote_retrieve_body( $request ), true );
if ( ! empty( $request['latitude'] ) && ! empty( $request['longitude'] ) ) {
$data = array(
$data = [
'latitude' => sanitize_text_field( $request['latitude'] ),
'longitude' => sanitize_text_field( $request['longitude'] ),
'city' => sanitize_text_field( $request['city'] ),
'region' => sanitize_text_field( $request['region_name'] ),
'country' => sanitize_text_field( $request['country_iso'] ),
'postal' => sanitize_text_field( $request['zip_code'] ),
);
'city' => isset( $request['city'] ) ? sanitize_text_field( $request['city'] ) : '',
'region' => isset( $request['region_name'] ) ? sanitize_text_field( $request['region_name'] ) : '',
'country' => isset( $request['country_iso'] ) ? sanitize_text_field( $request['country_iso'] ) : '',
'postal' => isset( $request['zip_code'] ) ? sanitize_text_field( $request['zip_code'] ) : '',
];
return $data;
}
@ -87,14 +87,14 @@ class Geo {
if ( ! empty( $request['latitude'] ) && ! empty( $request['longitude'] ) ) {
$data = array(
$data = [
'latitude' => sanitize_text_field( $request['latitude'] ),
'longitude' => sanitize_text_field( $request['longitude'] ),
'city' => sanitize_text_field( $request['city'] ),
'region' => sanitize_text_field( $request['region'] ),
'country' => sanitize_text_field( $request['country'] ),
'postal' => sanitize_text_field( $request['postal'] ),
);
'city' => isset( $request['city'] ) ? sanitize_text_field( $request['city'] ) : '',
'region' => isset( $request['region'] ) ? sanitize_text_field( $request['region'] ) : '',
'country' => isset( $request['country'] ) ? sanitize_text_field( $request['country'] ) : '',
'postal' => isset( $request['postal'] ) ? sanitize_text_field( $request['postal'] ) : '',
];
return $data;
}
@ -108,20 +108,20 @@ class Geo {
if ( ! empty( $request['data']['geo']['latitude'] ) && ! empty( $request['data']['geo']['longitude'] ) ) {
$data = array(
$data = [
'latitude' => sanitize_text_field( $request['data']['geo']['latitude'] ),
'longitude' => sanitize_text_field( $request['data']['geo']['longitude'] ),
'city' => sanitize_text_field( $request['data']['geo']['city'] ),
'region' => sanitize_text_field( $request['data']['geo']['region_name'] ),
'country' => sanitize_text_field( $request['data']['geo']['country_code'] ),
'postal' => sanitize_text_field( $request['data']['geo']['postal_code'] ),
);
'city' => isset( $request['data']['geo']['city'] ) ? sanitize_text_field( $request['data']['geo']['city'] ) : '',
'region' => isset( $request['data']['geo']['region_name'] ) ? sanitize_text_field( $request['data']['geo']['region_name'] ) : '',
'country' => isset( $request['data']['geo']['country_code'] ) ? sanitize_text_field( $request['data']['geo']['country_code'] ) : '',
'postal' => isset( $request['data']['geo']['postal_code'] ) ? sanitize_text_field( $request['data']['geo']['postal_code'] ) : '',
];
return $data;
}
}
return array();
return [];
}
/**