Skip to content

Commit cdcabc1

Browse files
alextuanalextuan
committed
Release new version 2.4.9
= 2.4.9 - 2022/01/21 = * This is a maintenance release for compatibility with WordPress major version 5.9 * Tweak - Test for compatibility with WordPress 5.9 * Framework - Update a3rev Plugin Framework to version 2.5.0
1 parent efd6002 commit cdcabc1

8 files changed

+218
-71
lines changed

‎a3-lazy-load.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
/*
33
Plugin Name: a3 Lazy Load
44
Description: Speed up your site and enhance frontend user's visual experience in PC's, Tablets and mobile with a3 Lazy Load.
5-
Version: 2.4.8
5+
Version: 2.4.9
66
Author: a3rev Software
77
Author URI: https://a3rev.com/
8-
Requires at least: 5.0
9-
Tested up to: 5.8
8+
Requires at least: 5.6
9+
Tested up to: 5.9
1010
Text Domain: a3-lazy-load
1111
Domain Path: /languages
1212
License: GPLv2 or later
@@ -31,7 +31,7 @@
3131

3232
define( 'A3_LAZY_LOAD_KEY', 'a3_lazy_load' );
3333
define( 'A3_LAZY_LOAD_PREFIX', 'a3_lazy_load_' );
34-
define( 'A3_LAZY_VERSION', '2.4.8' );
34+
define( 'A3_LAZY_VERSION', '2.4.9' );
3535
define( 'A3_LAZY_LOAD_G_FONTS', false );
3636

3737
use \A3Rev\LazyLoad\FrameWork;

‎admin/admin-interface.php

+76-9
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,49 @@ public function a3_admin_ui_event() {
235235
);
236236
echo json_encode( $response_data );
237237
break;
238+
239+
case 'validate_google_api_key':
240+
$g_key = sanitize_text_field( $_REQUEST['g_key'] );
241+
$g_key_type = sanitize_text_field( $_REQUEST['g_key_type'] );
242+
243+
$is_valid = false;
244+
if ( ! empty( $g_key ) ) {
245+
if ( 'font' == $g_key_type ) {
246+
$response_fonts = $GLOBALS[$this->plugin_prefix.'fonts_face']->validate_google_api_key( $g_key );
247+
if ( ! isset( $response_fonts['error'] ) ) {
248+
$is_valid = true;
249+
}
250+
251+
if ( $is_valid ) {
252+
$google_api_key_status = 'valid';
253+
} else {
254+
$google_api_key_status = 'invalid';
255+
}
256+
257+
//caching google api status for 24 hours
258+
set_transient( $this->google_api_key_option . '_status', $google_api_key_status, 86400 );
259+
260+
update_option( $this->google_api_key_option . '_enable', 1 );
261+
update_option( $this->google_api_key_option, trim( $g_key ) );
262+
} else {
263+
$is_valid = $this->validate_google_map_api_key( $g_key );
264+
update_option( $this->google_map_api_key_option . '_enable', 1 );
265+
update_option( $this->google_map_api_key_option, trim( $g_key ) );
266+
}
267+
}
268+
269+
if ( $is_valid ) {
270+
$is_valid = 1;
271+
} else {
272+
$is_valid = 0;
273+
}
274+
275+
$response_data = array(
276+
'is_valid' => $is_valid,
277+
);
278+
echo json_encode( $response_data );
279+
280+
break;
238281
}
239282

240283
}
@@ -1458,7 +1501,7 @@ public function admin_forms( $options, $form_key, $option_name = '', $form_messa
14581501
$description = $tip = '';
14591502
}
14601503

1461-
if ( $description && in_array( $value['type'], array( 'manual_check_version', 'ajax_submit', 'ajax_multi_submit', 'textarea', 'radio', 'onoff_radio', 'typography', 'border', 'border_styles', 'array_textfields', 'wp_editor', 'upload' ) ) ) {
1504+
if ( $description && in_array( $value['type'], array( 'manual_check_version', 'ajax_submit', 'ajax_multi_submit', 'textarea', 'radio', 'onoff_radio', 'typography', 'border', 'border_styles', 'array_textfields', 'wp_editor', 'upload', 'google_api_key', 'google_map_api_key' ) ) ) {
14621505
$description = '<div class="desc" style="margin-bottom:5px;">' . wptexturize( $description ) . '</div>';
14631506
} elseif ( $description ) {
14641507
$description = '<span class="description" style="margin-left:5px;">' . wptexturize( $description ) . '</span>';
@@ -1882,7 +1925,13 @@ class="a3rev-ui-onoff_checkbox a3rev-ui-onoff_google_api_key_enable"
18821925

18831926
<div>&nbsp;</div>
18841927
<div class="a3rev-ui-google-api-key-container" style="<?php if( 1 != $google_api_key_enable ) { echo 'display: none;'; } ?>">
1885-
<div class="a3rev-ui-google-api-key-description"><?php echo sprintf( __( "Enter your existing Google Fonts API Key below. Don't have a key? Visit <a href='%s' target='_blank'>Google Developer API</a> to create a key", 'a3-lazy-load' ), 'https://developers.google.com/fonts/docs/developer_api#APIKey' ); ?></div>
1928+
<?php
1929+
if ( ! empty( $description ) ) {
1930+
echo $description; /* phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped */
1931+
} else {
1932+
?>
1933+
<div class="a3rev-ui-google-api-key-description"><?php echo sprintf( __( "Enter your existing Google Fonts API Key below. Don't have a key? Visit <a href='%s' target='_blank'>Google Developer API</a> to create a key" ), 'https://developers.google.com/fonts/docs/developer_api#APIKey' ); ?></div>
1934+
<?php } ?>
18861935
<div class="a3rev-ui-google-api-key-inside
18871936
<?php
18881937
if ( $GLOBALS[$this->plugin_prefix.'fonts_face']->is_valid_google_api_key() ) {
@@ -1893,17 +1942,23 @@ class="a3rev-ui-onoff_checkbox a3rev-ui-onoff_google_api_key_enable"
18931942
?>
18941943
">
18951944
<input
1945+
data-type="font"
18961946
name="<?php echo esc_attr( $this->google_api_key_option ); ?>"
18971947
id="<?php echo esc_attr( $this->google_api_key_option ); ?>"
18981948
type="text"
18991949
style="<?php echo esc_attr( $value['css'] ); ?>"
19001950
value="<?php echo esc_attr( $google_api_key ); ?>"
1901-
class="a3rev-ui-text a3rev-ui-<?php echo esc_attr( sanitize_title( $value['type'] ) ); ?> <?php echo esc_attr( $value['class'] ); ?>"
1902-
placeholder="<?php echo __( 'Google Fonts API Key', 'a3-lazy-load' ); ?>"
1951+
class="a3rev-ui-text a3rev-ui-google-api-key a3rev-ui-<?php echo esc_attr( sanitize_title( $value['type'] ) ); ?> <?php echo esc_attr( $value['class'] ); ?>"
1952+
placeholder="<?php echo __( 'Google Fonts API Key' ); ?>"
19031953
<?php echo implode( ' ', $custom_attributes ); // XSS ok ?>
19041954
/>
1905-
<p class="a3rev-ui-google-valid-key-message"><?php echo __( 'Your Google API Key is valid and automatic font updates are enabled.', 'a3-lazy-load' ); ?></p>
1906-
<p class="a3rev-ui-google-unvalid-key-message"><?php echo __( 'Please enter a valid Google API Key.', 'a3-lazy-load' ); ?></p>
1955+
<button
1956+
name="<?php echo esc_attr( $this->google_api_key_option ); ?>_validate_bt"
1957+
id="<?php echo esc_attr( $this->google_api_key_option ); ?>_validate_bt"
1958+
type="button"
1959+
class="a3rev-ui-google-api-key-validate-button a3rev-ui-<?php echo esc_attr( sanitize_title( $value['type'] ) ); ?>-button"><?php echo __( 'Validate' ); ?></button>
1960+
<p class="a3rev-ui-google-valid-key-message"><?php echo __( 'Your Google API Key is valid and automatic font updates are enabled.' ); ?></p>
1961+
<p class="a3rev-ui-google-unvalid-key-message"><?php echo __( 'Please enter a valid Google API Key.' ); ?></p>
19071962
</div>
19081963
</div>
19091964
</td>
@@ -1938,7 +1993,13 @@ class="a3rev-ui-onoff_checkbox a3rev-ui-onoff_google_api_key_enable"
19381993

19391994
<div>&nbsp;</div>
19401995
<div class="a3rev-ui-google-api-key-container" style="<?php if( 1 != $google_map_api_key_enable ) { echo 'display: none;'; } ?>">
1941-
<div class="a3rev-ui-google-api-key-description"><?php echo sprintf( __( "Enter your existing Google Map API Key below. Don't have a key? Visit <a href='%s' target='_blank'>Google Maps API</a> to create a key", 'a3-lazy-load' ), 'https://developers.google.com/maps/documentation/javascript/get-api-key' ); ?></div>
1996+
<?php
1997+
if ( ! empty( $description ) ) {
1998+
echo $description; /* phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped */
1999+
} else {
2000+
?>
2001+
<div class="a3rev-ui-google-api-key-description" style="margin-bottom:5px;"><?php echo sprintf( __( "Enter your Google Maps API Key and save changes, or go to <a href='%s' target='_blank'>Google Maps API</a> to create a new key. The key must have the Geocoding API, Maps Embed API and Maps JavaScript API as a minimum." ), 'https://developers.google.com/maps/documentation/javascript/get-api-key' ); ?></div>
2002+
<?php } ?>
19422003
<div class="a3rev-ui-google-api-key-inside
19432004
<?php
19442005
if ( $this->is_valid_google_map_api_key() ) {
@@ -1949,6 +2010,7 @@ class="a3rev-ui-onoff_checkbox a3rev-ui-onoff_google_api_key_enable"
19492010
?>
19502011
">
19512012
<input
2013+
data-type="map"
19522014
name="<?php echo esc_attr( $this->google_map_api_key_option ); ?>"
19532015
id="<?php echo esc_attr( $this->google_map_api_key_option ); ?>"
19542016
type="text"
@@ -1958,8 +2020,13 @@ class="a3rev-ui-text a3rev-ui-<?php echo esc_attr( sanitize_title( $value['type'
19582020
placeholder="<?php echo __( 'Google Map API Key', 'a3-lazy-load' ); ?>"
19592021
<?php echo implode( ' ', $custom_attributes ); // XSS ok ?>
19602022
/>
1961-
<p class="a3rev-ui-google-valid-key-message"><?php echo __( 'Your Google API Key is valid and automatic font updates are enabled.', 'a3-lazy-load' ); ?></p>
1962-
<p class="a3rev-ui-google-unvalid-key-message"><?php echo __( 'Please enter a valid Google API Key.', 'a3-lazy-load' ); ?></p>
2023+
<button
2024+
name="<?php echo esc_attr( $this->google_map_api_key_option ); ?>_validate_bt"
2025+
id="<?php echo esc_attr( $this->google_map_api_key_option ); ?>_validate_bt"
2026+
type="button"
2027+
class="a3rev-ui-google-api-key-validate-button a3rev-ui-<?php echo esc_attr( sanitize_title( $value['type'] ) ); ?>-button"><?php echo __( 'Validate' ); ?></button>
2028+
<p class="a3rev-ui-google-valid-key-message"><?php echo __( 'Your Google API Key is valid.' ); ?></p>
2029+
<p class="a3rev-ui-google-unvalid-key-message"><?php echo __( 'Please enter a valid Google API Key.' ); ?></p>
19632030
</div>
19642031
</div>
19652032
</td>

‎admin/admin-ui.php

+42-35
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Admin_UI
3333
* You must change to correct plugin name that you are working
3434
*/
3535

36-
public $framework_version = '2.4.1';
36+
public $framework_version = '2.5.0';
3737
public $plugin_name = A3_LAZY_LOAD_KEY;
3838
public $plugin_path = A3_LAZY_LOAD_NAME;
3939
public $google_api_key_option = '';
@@ -132,40 +132,50 @@ public function is_valid_google_map_api_key( $cache=true ) {
132132
}
133133

134134
if ( ! $google_map_api_key_status ) {
135-
$respone_api = wp_remote_get( "https://maps.googleapis.com/maps/api/geocode/json?address=Australia&key=" . trim( $this->google_map_api_key ),
136-
array(
137-
'sslverify' => false,
138-
'timeout' => 45
139-
)
140-
);
141-
142-
$response_map = array();
143-
144-
// Check it is a valid request
145-
if ( ! is_wp_error( $respone_api ) ) {
146-
147-
$json_string = version_compare( PHP_VERSION, '7.4', '>=' ) || get_magic_quotes_gpc() ? stripslashes( $respone_api['body'] ) : $respone_api['body'];
148-
$response_map = json_decode( $json_string, true );
149-
150-
// Make sure that the valid response from google is not an error message
151-
if ( ! isset( $response_map['error_message'] ) ) {
152-
$google_map_api_key_status = 'valid';
153-
} else {
154-
$google_map_api_key_status = 'invalid';
155-
}
156-
157-
} else {
158-
$google_map_api_key_status = 'invalid';
159-
}
135+
$is_valid = $this->validate_google_map_api_key( $this->google_map_api_key );
136+
} elseif ( 'valid' == $google_map_api_key_status ) {
137+
$is_valid = true;
138+
}
160139

161-
//caching google map api status for 24 hours
162-
set_transient( $this->google_map_api_key_option . '_status', $google_map_api_key_status, 86400 );
140+
}
141+
142+
return $is_valid;
143+
}
144+
145+
public function validate_google_map_api_key( $g_key = '' ) {
146+
$g_key = trim( $g_key );
147+
$is_valid = false;
148+
149+
if ( ! empty( $g_key ) ) {
150+
$respone_api = wp_remote_get( "https://maps.googleapis.com/maps/api/geocode/json?address=Australia&key=" . $g_key,
151+
array(
152+
'sslverify' => false,
153+
'timeout' => 45
154+
)
155+
);
156+
157+
$response_map = array();
158+
159+
// Check it is a valid request
160+
if ( ! is_wp_error( $respone_api ) ) {
161+
162+
$json_string = version_compare( PHP_VERSION, '7.4', '>=' ) || get_magic_quotes_gpc() ? stripslashes( $respone_api['body'] ) : $respone_api['body']; // @codingStandardsIgnoreLine // phpcs:ignore
163+
$response_map = json_decode( $json_string, true );
164+
165+
// Make sure that the valid response from google is not an error message
166+
if ( ! isset( $response_map['error_message'] ) ) {
167+
$is_valid = true;
168+
}
163169
}
164170

165-
if ( 'valid' == $google_map_api_key_status ) {
166-
$is_valid = true;
171+
if ( $is_valid ) {
172+
$google_map_api_key_status = 'valid';
173+
} else {
174+
$google_map_api_key_status = 'invalid';
167175
}
168176

177+
//caching google map api status for 24 hours
178+
set_transient( $this->google_map_api_key_option . '_status', $google_map_api_key_status, 86400 );
169179
}
170180

171181
return $is_valid;
@@ -179,12 +189,9 @@ public function update_google_map_api_key() {
179189
update_option( $this->google_map_api_key_option . '_enable', 1 );
180190

181191
$option_value = trim( sanitize_text_field( $_POST[ $this->google_map_api_key_option ] ) );
192+
update_option( $this->google_map_api_key_option, $option_value );
182193

183-
$old_google_map_api_key_option = get_option( $this->google_map_api_key_option );
184-
185-
if ( 1 != $old_google_map_api_key_enable || $option_value != $old_google_map_api_key_option ) {
186-
187-
update_option( $this->google_map_api_key_option, $option_value );
194+
if ( 1 != $old_google_map_api_key_enable ) {
188195

189196
// Clear cached of google map api key status
190197
delete_transient( $this->google_map_api_key_option . '_status' );

‎admin/assets/css/admin-ui-style.css

+13
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,16 @@
260260
.a3rev_panel_container .a3rev-ui-google-valid-key .a3rev-ui-google-valid-key-message,
261261
.a3rev_panel_container .a3rev-ui-google-unvalid-key .a3rev-ui-google-unvalid-key-message { display: block; }
262262

263+
.a3rev_panel_container .a3rev-ui-google-api-key-container .a3rev-ui-google-api-key-validate-button.validating,
264+
.a3rev_panel_container .a3rev-ui-google-api-key-container .a3rev-ui-google-api-key-validate-button.validating:hover {
265+
animation: progress-bar 1s infinite linear;
266+
-ms-animation: progress-bar 1s infinite linear;
267+
-moz-animation: progress-bar 1s infinite linear;
268+
-webkit-animation: progress-bar 1s infinite linear;
269+
background: rgba(0, 0, 0, 0) repeating-linear-gradient(-45deg, #0077ff, #0077ff 10px, #c3defd 10px, #c3defd 24px) repeat scroll 0 0 / 68px 68px;
270+
transition: width 2s ease 0.1s;
271+
}
272+
263273
/* Manual Check New Version Control */
264274
.a3rev_panel_container .a3rev-ui-version-checking { display: none; margin-top: 6px; background-image: url('../images/loading-bottom.gif'); background-repeat: no-repeat; background-size: 100% auto; width: 16px; height: 16px; }
265275
.a3rev_panel_container .a3rev-ui-check-version-message { font-size: 13px; }
@@ -274,6 +284,7 @@
274284
margin-bottom: 6px;
275285
position: relative;
276286
}
287+
.a3rev_panel_container .a3rev-ui-google-api-key-container .a3rev-ui-google-api-key-validate-button,
277288
.a3rev_panel_container .a3rev-ui-ajax_submit-control .a3rev-ui-ajax_submit-button,
278289
.a3rev_panel_container .a3rev-ui-ajax_multi_submit-control .a3rev-ui-ajax_multi_submit-button {
279290
border-radius: 5px;
@@ -288,10 +299,12 @@
288299
box-sizing: border-box;
289300
margin-bottom: 5px;
290301
}
302+
.a3rev_panel_container .a3rev-ui-google-api-key-container .a3rev-ui-google-api-key-validate-button:hover,
291303
.a3rev_panel_container .a3rev-ui-ajax_submit-control .a3rev-ui-ajax_submit-button:hover,
292304
.a3rev_panel_container .a3rev-ui-ajax_multi_submit-control .a3rev-ui-ajax_multi_submit-button:hover {
293305
background: #f4741b;
294306
}
307+
.a3rev_panel_container .a3rev-ui-google-api-key-container .a3rev-ui-google-api-key-validate-button.disabled,
295308
.a3rev_panel_container .a3rev-ui-ajax_submit-control .a3rev-ui-ajax_submit-button.disabled,
296309
.a3rev_panel_container .a3rev-ui-ajax_multi_submit-control .a3rev-ui-ajax_multi_submit-button.disabled {
297310
background: #999;

‎admin/assets/css/admin-ui-style.min.css

+6
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,9 @@
105105
.a3rev_panel_container .a3rev-ui-google-valid-key .a3rev-ui-google-valid-key-message,
106106
.a3rev_panel_container .a3rev-ui-google-unvalid-key .a3rev-ui-google-unvalid-key-message{display:block;}
107107

108+
.a3rev_panel_container .a3rev-ui-google-api-key-container .a3rev-ui-google-api-key-validate-button.validating,
109+
.a3rev_panel_container .a3rev-ui-google-api-key-container .a3rev-ui-google-api-key-validate-button.validating:hover{animation: progress-bar 1s infinite linear;-ms-animation: progress-bar 1s infinite linear;-moz-animation: progress-bar 1s infinite linear;-webkit-animation: progress-bar 1s infinite linear;background: rgba(0, 0, 0, 0) repeating-linear-gradient(-45deg, #0077ff, #0077ff 10px, #c3defd 10px, #c3defd 24px) repeat scroll 0 0 / 68px 68px;transition: width 2s ease 0.1s;}
110+
108111
/* Manual Check New Version Control */
109112
.a3rev_panel_container .a3rev-ui-version-checking{display:none;margin-top:6px;background-image:url('../images/loading-bottom.gif');background-repeat:no-repeat;background-size:100% auto;width:16px;height:16px;}
110113
.a3rev_panel_container .a3rev-ui-check-version-message{font-size:13px;}
@@ -116,10 +119,13 @@
116119
/* Ajax Submit Control */
117120
.a3rev_panel_container .a3rev-ui-ajax_submit-control,
118121
.a3rev_panel_container .a3rev-ui-ajax_multi_submit-control{margin-bottom:6px;position:relative;}
122+
.a3rev_panel_container .a3rev-ui-google-api-key-container .a3rev-ui-google-api-key-validate-button,
119123
.a3rev_panel_container .a3rev-ui-ajax_submit-control .a3rev-ui-ajax_submit-button,
120124
.a3rev_panel_container .a3rev-ui-ajax_multi_submit-control .a3rev-ui-ajax_multi_submit-button{border-radius:5px;border:none;background:#2186fa;color:#fff;font-size:16px;padding:8px 15px;transition:all 0.5s ease 0.1s;cursor:pointer;height:40px;box-sizing:border-box;margin-bottom:5px;}
125+
.a3rev_panel_container .a3rev-ui-google-api-key-container .a3rev-ui-google-api-key-validate-button:hover,
121126
.a3rev_panel_container .a3rev-ui-ajax_submit-control .a3rev-ui-ajax_submit-button:hover,
122127
.a3rev_panel_container .a3rev-ui-ajax_multi_submit-control .a3rev-ui-ajax_multi_submit-button:hover{background:#f4741b;}
128+
.a3rev_panel_container .a3rev-ui-google-api-key-container .a3rev-ui-google-api-key-validate-button.disabled,
123129
.a3rev_panel_container .a3rev-ui-ajax_submit-control .a3rev-ui-ajax_submit-button.disabled,
124130
.a3rev_panel_container .a3rev-ui-ajax_multi_submit-control .a3rev-ui-ajax_multi_submit-button.disabled{background:#999;cursor:default;}
125131
.a3rev_panel_container .a3rev-ui-ajax_submit-control .a3rev-ui-ajax_submit-successed,

‎admin/assets/js/admin-ui-script.js

+35
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,41 @@
350350
}
351351
});
352352

353+
/* Apply Validate Google API Key Submit */
354+
$(document).on( 'click', '.a3rev-ui-google-api-key-validate-button', function(){
355+
var bt_validate = $(this);
356+
var g_api_key_container = $(this).parents('.a3rev-ui-google-api-key-inside');
357+
var g_api_key_field = g_api_key_container.children('.a3rev-ui-google-api-key');
358+
var g_api_key = g_api_key_field.val();
359+
var g_api_key_type = g_api_key_field.data('type');
360+
if ( ! bt_validate.hasClass('validating') && '' != g_api_key ) {
361+
bt_validate.addClass('validating');
362+
g_api_key_container.removeClass('a3rev-ui-google-valid-key a3rev-ui-google-unvalid-key');
363+
364+
var check_data = {
365+
action: a3_admin_ui_script_params.plugin + '_a3_admin_ui_event',
366+
type: 'validate_google_api_key',
367+
g_key: g_api_key,
368+
g_key_type: g_api_key_type,
369+
security: a3_admin_ui_script_params.security
370+
};
371+
372+
$.post( a3_admin_ui_script_params.ajax_url, check_data, function(response){
373+
bt_validate.removeClass('validating');
374+
375+
// Get response
376+
data = JSON.parse( response );
377+
if ( 0 == data.is_valid ) {
378+
g_api_key_container.removeClass('a3rev-ui-google-valid-key');
379+
g_api_key_container.addClass('a3rev-ui-google-unvalid-key');
380+
} else {
381+
g_api_key_container.addClass('a3rev-ui-google-valid-key');
382+
g_api_key_container.removeClass('a3rev-ui-google-unvalid-key');
383+
}
384+
});
385+
}
386+
});
387+
353388
/* Apply Ajax Submit */
354389
$(document).on( 'click', '.a3rev-ui-ajax_submit-button', function(){
355390
var bt_ajax_submit = $(this);

0 commit comments

Comments
 (0)