get_render_attribute_string('style_wrapper')); ?>>
$pin) {
$key = 'map_marker_' . $index;
+ // Sanitize data before use
+ $latitude = isset($pin['map_latitude']) ? sanitize_text_field($pin['map_latitude']) : '';
+ $longitude = isset($pin['map_longitude']) ? sanitize_text_field($pin['map_longitude']) : '';
+ $icon_url = isset($pin['pin_icon']['url']) ? esc_url($pin['pin_icon']['url']) : '';
+ $icon_active_url = isset($pin['pin_active_icon']['url']) ? esc_url($pin['pin_active_icon']['url']) : '';
+ $icon_size = isset($pin['pin_icon_size']['size']) ? intval($pin['pin_icon_size']['size']) : '';
+ $data_max_width = isset($marker_width) ? intval($marker_width) : '';
+ $data_id = intval($index);
$this->add_render_attribute(
$key,
array(
'class' => 'alpha-pin',
- 'data-lng' => $pin['map_longitude'],
- 'data-lat' => $pin['map_latitude'],
- 'data-icon' => $pin['pin_icon']['url'],
- 'data-icon-active' => $pin['pin_active_icon']['url'],
- 'data-icon-size' => $pin['pin_icon_size']['size'],
- 'data-max-width' => $marker_width,
- 'data-id' => $index,
+ 'data-lng' => $longitude,
+ 'data-lat' => $latitude,
+ 'data-icon' => $icon_url,
+ 'data-icon-active' => $icon_active_url,
+ 'data-icon-size' => $icon_size,
+ 'data-max-width' => $data_max_width,
+ 'data-id' => $data_id,
)
);
- $ids = wp_list_pluck($pin['pin_desc_gallery'], 'id');
+ // Sanitize IDs
+ $ids = array_map('intval', wp_list_pluck($pin['pin_desc_gallery'], 'id'));
$count = count($ids);
+ $data_count = absint($count - 4);
$this->add_render_attribute('shortcode' . $index, 'ids', implode(',', $ids));
?>
@@ -1055,7 +1097,7 @@ protected function render()
get_render_attribute_string('shortcode' . $index) . ']');
diff --git a/include/class-alpha-google-map.php b/include/class-alpha-google-map.php
index c307b3a..1c8a3cd 100644
--- a/include/class-alpha-google-map.php
+++ b/include/class-alpha-google-map.php
@@ -1,6 +1,6 @@
is_compatible()) {
add_action('elementor/init', [$this, 'init']);
@@ -79,7 +79,7 @@ public function __construct()
/**
* Load the plugin text domain.
*/
- public function i18n()
+ public function i18n(): void
{
load_plugin_textdomain('alpha-google-map-for-elementor', false, ALPHAMAP_PL_LANGUAGES);
}
@@ -92,7 +92,7 @@ public function i18n()
* @since 1.0.0
* @access public
*/
- public function is_compatible()
+ public function is_compatible(): bool
{
// Check if Elementor installed and activated
@@ -119,7 +119,7 @@ public function is_compatible()
/**
* Initialize the plugin.
*/
- public function init()
+ public function init(): void
{
$this->i18n();
@@ -133,21 +133,40 @@ public function init()
/**
* Loading plugin media assets.
*/
- public function add_assets()
+ function add_assets(): void
{
- require_once ABSPATH . 'wp-admin/includes/file.php';
- require_once ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php';
- require_once ABSPATH . 'wp-admin/includes/class-wp-filesystem-direct.php';
+ if (! function_exists('WP_Filesystem')) {
+ require_once ABSPATH . 'wp-admin/includes/file.php';
+ }
+ WP_Filesystem();
+ global $wp_filesystem;
+
$upload_dir = wp_upload_dir(null, true);
- $dir = $upload_dir['basedir'];
- if (!empty($dir)) {
- wp_mkdir_p($dir . '/alpha-map');
- $wp_file_sys = new \WP_Filesystem_Direct('direct');
- if (!$wp_file_sys->exists($dir . '/alpha-map/alpha-pin.png')) {
- $wp_file_sys->put_contents($dir . '/alpha-map/alpha-pin.png', $wp_file_sys->get_contents(ALPHAMAP_PL_ASSETS . 'img/alpha-pin.png'));
- }
- if (!$wp_file_sys->exists($dir . '/alpha-map/alpha-pin-hover.png')) {
- $wp_file_sys->put_contents($dir . '/alpha-map/alpha-pin-hover.png', $wp_file_sys->get_contents(ALPHAMAP_PL_ASSETS . 'img/alpha-pin-hover.png'));
+ $dir = trailingslashit($upload_dir['basedir']) . 'alpha-map/';
+
+ if (! $wp_filesystem->is_dir($dir)) {
+ $wp_filesystem->mkdir($dir);
+ }
+
+
+ $plugin_assets_dir = ALPHAMAP_PL_ASSETS . 'img/';
+
+ $files = [
+ 'alpha-pin.png',
+ 'alpha-pin-hover.png',
+ ];
+
+ foreach ($files as $file) {
+ $destination = $dir . $file;
+ if (! $wp_filesystem->exists($destination)) {
+ $source = $plugin_assets_dir . $file;
+
+ if ($wp_filesystem->exists($source)) {
+ $contents = $wp_filesystem->get_contents($source);
+ if (! empty($contents)) {
+ $wp_filesystem->put_contents($destination, $contents, FS_CHMOD_FILE);
+ }
+ }
}
}
}
@@ -160,10 +179,8 @@ public function add_assets()
* @since 1.0.0
* @access public
*/
- public function admin_notice_missing_main_plugin()
+ public function admin_notice_missing_main_plugin(): void
{
- if (isset($_GET['activate'])) unset($_GET['activate']);
-
$message = sprintf(
/* translators: 1: Plugin name 2: Elementor */
esc_html__('"%1$s" requires "%2$s" to be installed and activated.', 'alpha-google-map-for-elementor'),
@@ -183,7 +200,11 @@ public function admin_notice_missing_main_plugin()
$button_text = esc_html__('Install Elementor', 'alpha-google-map-for-elementor');
}
$button = '
' . $button_text . '
';
- printf('
', $message, $button);
+ printf(
+ '
',
+ esc_html($message),
+ wp_kses_post($button)
+ );
}
/**
@@ -194,11 +215,8 @@ public function admin_notice_missing_main_plugin()
* @since 1.0.0
* @access public
*/
- public function admin_notice_minimum_elementor_version()
+ public function admin_notice_minimum_elementor_version(): void
{
-
- if (isset($_GET['activate'])) unset($_GET['activate']);
-
$message = sprintf(
/* translators: 1: Plugin name 2: Elementor 3: Required Elementor version */
esc_html__('"%1$s" requires "%2$s" version %3$s or greater.', 'alpha-google-map-for-elementor'),
@@ -207,7 +225,7 @@ public function admin_notice_minimum_elementor_version()
self::MINIMUM_ELEMENTOR_VERSION
);
- printf('
', $message);
+ printf('
', esc_html($message));
}
/**
@@ -218,11 +236,8 @@ public function admin_notice_minimum_elementor_version()
* @since 1.0.0
* @access public
*/
- public function admin_notice_minimum_php_version()
+ public function admin_notice_minimum_php_version(): void
{
-
- if (isset($_GET['activate'])) unset($_GET['activate']);
-
$message = sprintf(
/* translators: 1: Plugin name 2: PHP 3: Required PHP version */
esc_html__('"%1$s" requires "%2$s" version %3$s or greater.', 'alpha-google-map-for-elementor'),
@@ -231,13 +246,13 @@ public function admin_notice_minimum_php_version()
self::MINIMUM_PHP_VERSION
);
- printf('
', $message);
+ printf('
', esc_html($message));
}
/**
* Loading plugin css.
*/
- public function frontend_styles()
+ public function frontend_styles(): void
{
wp_enqueue_style('alphamap-widget', ALPHAMAP_PL_ASSETS . 'css/alpha-map-widget.css', '', ALPHAMAP_VERSION);
}
@@ -245,10 +260,10 @@ public function frontend_styles()
/**
* Loading plugin JavaScript.
*/
- public function frontend_scripts()
+ public function frontend_scripts(): void
{
// Script register.
- wp_enqueue_script('alphamap', ALPHAMAP_PL_ASSETS . 'js/alpha-map.js', array('jquery', 'alpha-api-js'), ALPHAMAP_VERSION, array(
+ wp_enqueue_script('alphamap', ALPHAMAP_PL_ASSETS . 'js/alpha-map.js', ['jquery', 'alpha-api-js'], ALPHAMAP_VERSION, array(
'in_footer' => true,
'strategy' => 'defer',
));
@@ -278,11 +293,11 @@ public function frontend_scripts()
*
* @param \Elementor\Widgets_Manager $widgets_manager Elementor widgets manager.
*/
- public function register_widgets($widgets_manager)
+ public function register_widgets($widgets_manager): void
{
// Include Widget files.
require_once ALPHAMAP_PL_INCLUDE . '/class-alpha-google-map-widget.php';
// Register widget.
- $widgets_manager->register(new \Elementor_Alpha_Google_Map_Addon\Alpha_Google_Map_Widget());
+ $widgets_manager->register(new \AlphaGoogleMap\Alpha_Google_Map_Widget());
}
}
diff --git a/index.php b/index.php
index 0968031..6220032 100644
--- a/index.php
+++ b/index.php
@@ -1,9 +1,2 @@
Add New in your WordPress dashboard.
+3. Search for 'Alpha Google Map For Elementor'.
+4. Install and activate the plugin.
+
+**Manual Installation:**
+
+1. Upload the 'alpha-google-map-for-elementor' folder to `/wp-content/plugins/`.
+2. Activate the plugin via the 'Plugins' screen in WordPress.
== Upgrade Notice ==
-= 1.2.0 =
-Compatibility for WP 6.6 and refactor the integration with Elementor.
+= 1.2.1 =
+Compatibility for WP 6.7 and security improvements, code modernization, and compatibility updates.
== Frequently Asked Questions ==
-**Can I use Alpha Google Map For Elementor as stand-alone plugin**
+**Can I use Alpha Google Map For Elementor as a stand-alone plugin?**
-No. You need to install Elementor Website Builder first.
+No. Elementor Website Builder must be installed and activated.
== Screenshots ==
@@ -87,6 +84,12 @@ No. You need to install Elementor Website Builder first.
== Changelog ==
+= 1.2.1 - 2024-11-16 =
+* Enhanced compatibility with the latest WordPress and Elementor versions.
+* Adhered to WordPress coding standards throughout the codebase.
+* Refactored JavaScript code to use modern standards and practices.
+* Fixed bugs and optimized performance.
+
= 1.2.0 - 2024-07-20 =
* Compatibility for WP 6.6 and refactor the integration with Elementor.