version 2.0.2 released

Author: manchumahara

assets/css/cbxgooglemap-admin.css

@@ -16,7 +16,7 @@
  * Plugin Name:       CBX Map for Google Map & OpenStreetMap
  * Plugin URI:        https://codeboxr.com/product/cbx-google-map-for-wordpress/
  * Description:       Easy responsive embed of google map and openstreet map
- * Version:           2.0.1
+ * Version:           2.0.2
  * Author:            Codeboxr
  * Author URI:        https://codeboxr.com
  * License:           GPL-2.0+
@@ -33,7 +33,7 @@
 }
 
 defined( 'CBXGOOGLEMAP_PLUGIN_NAME' ) or define( 'CBXGOOGLEMAP_PLUGIN_NAME', 'cbxgooglemap' );
-defined( 'CBXGOOGLEMAP_PLUGIN_VERSION' ) or define( 'CBXGOOGLEMAP_PLUGIN_VERSION', '2.0.1' );
+defined( 'CBXGOOGLEMAP_PLUGIN_VERSION' ) or define( 'CBXGOOGLEMAP_PLUGIN_VERSION', '2.0.2' );
 defined( 'CBXGOOGLEMAP_BASE_NAME' ) or define( 'CBXGOOGLEMAP_BASE_NAME', plugin_basename( __FILE__ ) );
 defined( 'CBXGOOGLEMAP_ROOT_PATH' ) or define( 'CBXGOOGLEMAP_ROOT_PATH', plugin_dir_path( __FILE__ ) );
 defined( 'CBXGOOGLEMAP_ROOT_URL' ) or define( 'CBXGOOGLEMAP_ROOT_URL', plugin_dir_url( __FILE__ ) );
@@ -82,14 +82,14 @@ function cbxgooglemap_compatible_php_version( $version = '' ) {
     return true;
 }//end method cbxgooglemap_compatible_php_version
 
-register_activation_hook( __FILE__, 'activate_cbxgooglemap' );
-register_deactivation_hook( __FILE__, 'deactivate_cbxgooglemap' );
+register_activation_hook( __FILE__, 'cbxgooglemap_activate' );
+register_deactivation_hook( __FILE__, 'cbxgooglemap_deactivate' );
 
 /**
  * The code that runs during plugin activation.
  * This action is documented in includes/class-cbxgooglemap-activator.php
  */
-function activate_cbxgooglemap() {
+function cbxgooglemap_activate() {
 	$wp_version  = CBXGOOGLEMAP_WP_MIN_VERSION;
 	$php_version = CBXGOOGLEMAP_PHP_MIN_VERSION;
 
@@ -114,13 +114,13 @@ function activate_cbxgooglemap() {
         cbxgooglemap_core();
         CBXGooglemapHelper::activate();
     }
-}//end method activate_cbxgooglemap
+}//end method cbxgooglemap_activate
 
 /**
  * The code that runs during plugin deactivation.
  * This action is documented in includes/class-cbxgooglemap-deactivator.php
  */
-function deactivate_cbxgooglemap() {
+function cbxgooglemap_deactivate() {
 	CBXGooglemapHelper::deactivate();
 }
 
@@ -133,7 +133,7 @@ function cbxgooglemap_core() { // phpcs:ignore WordPress.NamingConventions.Valid
 	global $cbxgooglemap_core;
 
 	if ( ! isset( $cbxgooglemap_core ) ) {
-		$cbxgooglemap_core = run_cbxgooglemap();
+		$cbxgooglemap_core = cbxgooglemap_run();
 	}
 
 	return $cbxgooglemap_core;
@@ -148,8 +148,8 @@ function cbxgooglemap_core() { // phpcs:ignore WordPress.NamingConventions.Valid
  *
  * @since    1.0.0
  */
-function run_cbxgooglemap() {
+function cbxgooglemap_run() {
 	return CBXGoogleMap::instance();
-}//end method run_cbxgooglemap
+}//end method cbxgooglemap_run
 
-$GLOBALS['cbxgooglemap_core'] = run_cbxgooglemap();
+$GLOBALS['cbxgooglemap_core'] = cbxgooglemap_run();

assets/css/cbxgooglemap-block.css

@@ -101,7 +101,7 @@ private function include_files() {
 	 * Ensures only one instance of cbxgooglemap is loaded or can be loaded.
 	 *
 	 * @return self Main instance.
-	 * @see run_cbxgooglemap()
+	 * @see cbxgooglemap_run()
 	 * @since  1.1.12
 	 * @static
 	 */
@@ -116,10 +116,6 @@ public static function instance() {
 	private function define_common_hooks() {
 		$misc = new CBXGoogleMapMisc();
 
-		//add_action( 'plugins_loaded', [ $misc, 'load_plugin_textdomain' ] );
-
-
-
 		//upgrade process
 		//add_action('admin_init', [$misc, 'admin_init_upgrader_process']);
 		//add_action( 'upgrader_process_complete', [ $misc, 'plugin_upgrader_process_complete' ], 10, 2 );

assets/css/cbxgooglemap-elementor.css

@@ -487,20 +487,28 @@ public function metabox_save($post_id, $post, $update)
                 if (isset($_POST[$meta_prefix.$id])) {
 
                     if (isset($_POST[$meta_prefix.$id])) {
-                        $updated_value = wp_unslash($_POST[$meta_prefix.$id]);
+                        $updated_value = wp_unslash($_POST[$meta_prefix.$id]);//phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+						$updated_value = is_array($updated_value) ? cbxgooglemap_decode_entities_array($updated_value) : html_entity_decode($updated_value);
 
-                        if ($field_type == 'text') {
-                            $updated_value = sanitize_text_field($updated_value);
-                        } elseif ($field_type == 'textarea') {
-                            $updated_value = sanitize_textarea_field($updated_value);
-                        } else {
-                            if ($sanitize_callback !== null && is_callable($sanitize_callback)) {
-                                $updated_value = call_user_func($sanitize_callback, $updated_value);
-                            }
-                            else{
-                                $updated_value = sanitize_text_field($updated_value);
-                            }
+                        $sanitized = false;
+
+						if ($sanitize_callback !== null && is_callable($sanitize_callback)) {
+							$sanitized = true;
+                            $updated_value = call_user_func($sanitize_callback, $updated_value);
                         }
+	                    elseif ($field_type == 'text') {
+		                    $sanitized = true;
+		                    $updated_value = sanitize_text_field($updated_value);
+	                    } elseif ($field_type == 'textarea') {
+							$sanitized = true;
+		                    $updated_value = sanitize_textarea_field( $updated_value );
+	                    }
+
+                        if(!$sanitized) {
+                            $updated_value = wp_kses_post($updated_value);//general sanitization
+                        }
+
+	                    $updated_value = apply_filters('cbxgooglemap_meta_sanitize_admin', $updated_value, $id, $field, $fields);
 
                         $is_sortable = isset($field['sortable']) ? $field['sortable'] : false;
 

assets/css/cbxgooglemap-public.css

@@ -24,14 +24,6 @@ public function __construct() {
 
 	}//end constructor
 
-	/**
-	 * Load the plugin text domain for translation.
-	 *
-	 * @since    1.0.0
-	 */
-	public function load_plugin_textdomain() {
-		//load_plugin_textdomain('cbxgooglemap',false,CBXGOOGLEMAP_ROOT_PATH . 'languages/');
-	}//end method load_plugin_textdomain
 
 	/**
 	 * Show a notice to anyone who has just installed the plugin for the first time
@@ -117,6 +109,7 @@ public function pro_addon_compatibility_campaign() {
 		}
 
 		//if the pro addon is active or installed
+		//phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
 		if ( defined( 'CBXGOOGLEMAPPRO_PLUGIN_NAME' ) || in_array( 'cbxgooglemappro/cbxgooglemappro.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) ) ) {
 			//plugin is activated
 
@@ -207,7 +200,7 @@ public function custom_plugin_row_meta( $links_array, $plugin_file_name, $plugin
 			$links_array[] = '<a style="color:#39A96B; font-weight: bold;" href="https://wordpress.org/plugins/cbxgooglemap/#reviews" target="_blank">' . esc_attr__( 'Reviews', 'cbxgooglemap' ) . '</a>';
 			$links_array[] = '<a target="_blank" style="color:#f44336 !important; font-weight: bold;" href="https://codeboxr.com/doc/cbxmap-doc/" aria-label="' . esc_attr__( 'Documentation', 'cbxgooglemap' ) . '">' . esc_html__( 'Documentation', 'cbxgooglemap' ) . '</a>';
 
-
+			//phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound
 			if ( in_array( 'cbxgooglemappro/cbxgooglemappro.php', apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) ) || defined( 'CBXGOOGLEMAPPRO_PLUGIN_NAME' ) ) {
 				$links_array[] = '<a style="color:#39A96B; font-weight: bold;" href="https://codeboxr.com/contact-us/" target="_blank">' . esc_attr__( 'Pro Support', 'cbxgooglemap' ) . '</a>';
 			} else {
@@ -236,7 +229,7 @@ public function custom_message_after_plugin_row_proaddon( $plugin_file, $plugin_
 		}
 
 		$pro_addon_version  = CBXGooglemapHelper::get_any_plugin_version( 'cbxgooglemappro/cbxgooglemappro.php' );
-		$pro_latest_version = '2.0.0';
+		$pro_latest_version = '2.0.2';
 
 		if ( $pro_addon_version != '' && version_compare( $pro_addon_version, $pro_latest_version, '<' ) ) {
 			// Custom message to display

assets/css/cbxgooglemap-setting.css

@@ -255,6 +255,7 @@ public function cbxgooglemap_shortcode( $atts ) {
 			'data-post-id' => $id
 		];
 
+
 		$output_html  = '';
 
 		if ( $id > 0 ) {
@@ -296,6 +297,8 @@ public function cbxgooglemap_shortcode( $atts ) {
 
 		}
         else {
+			$atts = cbxgooglemap_decode_entities_array($atts);
+
 			//show map from shortcode params only
 			$lat = isset( $atts['lat'] ) ? floatval( $atts['lat'] ) : '';
 			$lng = isset( $atts['lat'] ) ? floatval( $atts['lng'] ) : '';
@@ -321,8 +324,6 @@ public function cbxgooglemap_shortcode( $atts ) {
 			$showinfo    = isset( $atts['showinfo'] ) ? absint( $atts['showinfo'] ) : $showinfo_default;
 			$infow_open  = isset( $atts['infow_open'] ) ? absint( $atts['infow_open'] ) : $infow_open_default;
 			$scrollwheel = isset( $atts['scrollwheel'] ) ? absint( $atts['scrollwheel'] ) : $scrollwheel_default;
-
-
 		}
 
 		if ( $heading == '' && $website == '' ) {
@@ -342,7 +343,7 @@ public function cbxgooglemap_shortcode( $atts ) {
 
 		$data_custom_attrs_html = ' ';
 		foreach ( $data_custom_attrs as $custom_attr_key => $custom_attr_value ) {
-			$data_custom_attrs_html .= ' ' . $custom_attr_key . '="' . esc_attr( $custom_attr_value ) . '" ';
+			$data_custom_attrs_html .= ' ' . $custom_attr_key . '="' . esc_attr( html_entity_decode($custom_attr_value) ) . '" ';
 		}
 
 		$output_html .= '<div class="cbxgooglemap_wrapper ' . esc_attr( $extra_class ) . '">';