WordImpress / Google-Maps-Builder

includes/admin/admin-actions.php

Spacing +6 added lines, -6 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 
 /**
  * Processes all GMB actions sent via POST and GET by looking for the 'gmb-action'
@@ -20,12 +20,12 @@ 
  * @return void
  */
 function gmb_process_actions() {
-	if ( isset( $_POST['gmb_action'] ) ) {
-		do_action( 'gmb_' . $_POST['gmb_action'], $_POST );
+	if (isset($_POST['gmb_action'])) {
+		do_action('gmb_'.$_POST['gmb_action'], $_POST);
 	}
 
-	if ( isset( $_GET['gmb_action'] ) ) {
-		do_action( 'gmb_' . $_GET['gmb_action'], $_GET );
+	if (isset($_GET['gmb_action'])) {
+		do_action('gmb_'.$_GET['gmb_action'], $_GET);
 	}
 }
-add_action( 'admin_init', 'gmb_process_actions' );
+add_action('admin_init', 'gmb_process_actions');

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Processes all GMB actions sent via POST and GET by looking for the 'gmb-action'

includes/admin/system-info.php

Spacing +106 added lines, -106 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,7 +24,7 @@ 
  */
 function gmb_system_info_callback() {
 
-	if ( ! current_user_can( 'install_plugins' ) ) {
+	if ( ! current_user_can('install_plugins')) {
 		return;
 	}
 
@@ -32,7 +32,7 @@ 
 	<textarea readonly="readonly" onclick="this.focus(); this.select()" id="system-info-textarea" name="gmb-sysinfo" title="To copy the system info, click below then press Ctrl + C (PC) or Cmd + C (Mac)."><?php echo gmb_tools_sysinfo_get(); ?></textarea>
 	<p class="submit">
 		<input type="hidden" name="gmb_action" value="download_sysinfo" />
-		<?php submit_button( __( 'Download System Info File', 'google-maps-builder' ), 'secondary', 'gmb-download-sysinfo', false ); ?>
+		<?php submit_button(__('Download System Info File', 'google-maps-builder'), 'secondary', 'gmb-download-sysinfo', false); ?>
 	</p>
 	<style>
 		.gmb_forms_page_gmb-settings .gmb-submit-wrap {
@@ -55,63 +55,63 @@ 
 function gmb_tools_sysinfo_get() {
 	global $wpdb, $gmb_options;
 
-	if ( ! class_exists( 'Browser' ) ) {
-		require_once GMB_PLUGIN_PATH . 'includes/libraries/browser.php';
+	if ( ! class_exists('Browser')) {
+		require_once GMB_PLUGIN_PATH.'includes/libraries/browser.php';
 	}
 
 	$browser = new Browser();
 
 	// Get theme info
-	if ( get_bloginfo( 'version' ) < '3.4' ) {
-		$theme_data = get_theme_data( get_stylesheet_directory() . '/style.css' );
-		$theme      = $theme_data['Name'] . ' ' . $theme_data['Version'];
+	if (get_bloginfo('version') < '3.4') {
+		$theme_data = get_theme_data(get_stylesheet_directory().'/style.css');
+		$theme      = $theme_data['Name'].' '.$theme_data['Version'];
 	} else {
 		$theme_data = wp_get_theme();
-		$theme      = $theme_data->Name . ' ' . $theme_data->Version;
+		$theme      = $theme_data->Name.' '.$theme_data->Version;
 	}
 
 	// Try to identify the hosting provider
 	$host = gmb_get_host();
 
-	$return = '### Begin System Info ###' . "\n\n";
+	$return = '### Begin System Info ###'."\n\n";
 
 	// Start with the basics...
-	$return .= '-- Site Info' . "\n\n";
-	$return .= 'Site URL:                 ' . site_url() . "\n";
-	$return .= 'Home URL:                 ' . home_url() . "\n";
-	$return .= 'Multisite:                ' . ( is_multisite() ? 'Yes' : 'No' ) . "\n";
+	$return .= '-- Site Info'."\n\n";
+	$return .= 'Site URL:                 '.site_url()."\n";
+	$return .= 'Home URL:                 '.home_url()."\n";
+	$return .= 'Multisite:                '.(is_multisite() ? 'Yes' : 'No')."\n";
 
-	$return = apply_filters( 'gmb_sysinfo_after_site_info', $return );
+	$return = apply_filters('gmb_sysinfo_after_site_info', $return);
 
 	// Can we determine the site's host?
-	if ( $host ) {
-		$return .= "\n" . '-- Hosting Provider' . "\n\n";
-		$return .= 'Host:                     ' . $host . "\n";
+	if ($host) {
+		$return .= "\n".'-- Hosting Provider'."\n\n";
+		$return .= 'Host:                     '.$host."\n";
 
-		$return = apply_filters( 'gmb_sysinfo_after_host_info', $return );
+		$return = apply_filters('gmb_sysinfo_after_host_info', $return);
 	}
 
 	// The local users' browser information, handled by the Browser class
-	$return .= "\n" . '-- User Browser' . "\n\n";
+	$return .= "\n".'-- User Browser'."\n\n";
 	$return .= $browser;
 
-	$return = apply_filters( 'gmb_sysinfo_after_user_browser', $return );
+	$return = apply_filters('gmb_sysinfo_after_user_browser', $return);
 
 	// WordPress configuration
-	$return .= "\n" . '-- WordPress Configuration' . "\n\n";
-	$return .= 'Version:                  ' . get_bloginfo( 'version' ) . "\n";
-	$return .= 'Language:                 ' . ( defined( 'WPLANG' ) && WPLANG ? WPLANG : 'en_US' ) . "\n";
-	$return .= 'Permalink Structure:      ' . ( get_option( 'permalink_structure' ) ? get_option( 'permalink_structure' ) : 'Default' ) . "\n";
-	$return .= 'Active Theme:             ' . $theme . "\n";
-	$return .= 'Show On Front:            ' . get_option( 'show_on_front' ) . "\n";
+	$return .= "\n".'-- WordPress Configuration'."\n\n";
+	$return .= 'Version:                  '.get_bloginfo('version')."\n";
+	$return .= 'Language:                 '.(defined('WPLANG') && WPLANG ? WPLANG : 'en_US')."\n";
+	$return .= 'Permalink Structure:      '.(get_option('permalink_structure') ? get_option('permalink_structure') : 'Default')."\n";
+	$return .= 'Active Theme:             '.$theme."\n";
+	$return .= 'Show On Front:            '.get_option('show_on_front')."\n";
 
 	// Only show page specs if frontpage is set to 'page'
-	if ( get_option( 'show_on_front' ) == 'page' ) {
-		$front_page_id = get_option( 'page_on_front' );
-		$blog_page_id  = get_option( 'page_for_posts' );
+	if (get_option('show_on_front') == 'page') {
+		$front_page_id = get_option('page_on_front');
+		$blog_page_id  = get_option('page_for_posts');
 
-		$return .= 'Page On Front:            ' . ( $front_page_id != 0 ? get_the_title( $front_page_id ) . ' (#' . $front_page_id . ')' : 'Unset' ) . "\n";
-		$return .= 'Page For Posts:           ' . ( $blog_page_id != 0 ? get_the_title( $blog_page_id ) . ' (#' . $blog_page_id . ')' : 'Unset' ) . "\n";
+		$return .= 'Page On Front:            '.($front_page_id != 0 ? get_the_title($front_page_id).' (#'.$front_page_id.')' : 'Unset')."\n";
+		$return .= 'Page For Posts:           '.($blog_page_id != 0 ? get_the_title($blog_page_id).' (#'.$blog_page_id.')' : 'Unset')."\n";
 	}
 
 	// Make sure wp_remote_post() is working
@@ -120,140 +120,140 @@ 
 	$params = array(
 		'sslverify'  => false,
 		'timeout'    => 60,
-		'user-agent' => 'Maps Builder/' . GMB_VERSION,
+		'user-agent' => 'Maps Builder/'.GMB_VERSION,
 		'body'       => $request
 	);
 
-	$response = wp_remote_post( 'https://www.paypal.com/cgi-bin/webscr', $params );
+	$response = wp_remote_post('https://www.paypal.com/cgi-bin/webscr', $params);
 
-	if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+	if ( ! is_wp_error($response) && $response['response']['code'] >= 200 && $response['response']['code'] < 300) {
 		$WP_REMOTE_POST = 'wp_remote_post() works';
 	} else {
 		$WP_REMOTE_POST = 'wp_remote_post() does not work';
 	}
 
-	$return .= 'Remote Post:              ' . $WP_REMOTE_POST . "\n";
-	$return .= 'Table Prefix:             ' . 'Length: ' . strlen( $wpdb->prefix ) . '   Status: ' . ( strlen( $wpdb->prefix ) > 16 ? 'ERROR: Too long' : 'Acceptable' ) . "\n";
-	$return .= 'Admin AJAX:               ' . ( gmb_test_ajax_works() ? 'Accessible' : 'Inaccessible' ) . "\n";
-	$return .= 'WP_DEBUG:                 ' . ( defined( 'WP_DEBUG' ) ? WP_DEBUG ? 'Enabled' : 'Disabled' : 'Not set' ) . "\n";
-	$return .= 'Memory Limit:             ' . WP_MEMORY_LIMIT . "\n";
-	$return .= 'Registered Post Stati:    ' . implode( ', ', get_post_stati() ) . "\n";
+	$return .= 'Remote Post:              '.$WP_REMOTE_POST."\n";
+	$return .= 'Table Prefix:             '.'Length: '.strlen($wpdb->prefix).'   Status: '.(strlen($wpdb->prefix) > 16 ? 'ERROR: Too long' : 'Acceptable')."\n";
+	$return .= 'Admin AJAX:               '.(gmb_test_ajax_works() ? 'Accessible' : 'Inaccessible')."\n";
+	$return .= 'WP_DEBUG:                 '.(defined('WP_DEBUG') ? WP_DEBUG ? 'Enabled' : 'Disabled' : 'Not set')."\n";
+	$return .= 'Memory Limit:             '.WP_MEMORY_LIMIT."\n";
+	$return .= 'Registered Post Stati:    '.implode(', ', get_post_stati())."\n";
 
-	$return = apply_filters( 'gmb_sysinfo_after_wordpress_config', $return );
+	$return = apply_filters('gmb_sysinfo_after_wordpress_config', $return);
 
 	// GMB configuration
-	$return .= "\n" . '-- Maps Builder Configuration' . "\n\n";
-	$return .= 'Version:                  ' . GMB_VERSION . "\n";
-	$return .= 'Upgraded From:            ' . get_option( 'gmb_version_upgraded_from', 'None' ) . "\n";
+	$return .= "\n".'-- Maps Builder Configuration'."\n\n";
+	$return .= 'Version:                  '.GMB_VERSION."\n";
+	$return .= 'Upgraded From:            '.get_option('gmb_version_upgraded_from', 'None')."\n";
 
-	$return = apply_filters( 'gmb_sysinfo_after_gmb_config', $return );
+	$return = apply_filters('gmb_sysinfo_after_gmb_config', $return);
 
 
 	// Must-use plugins
 	$muplugins = get_mu_plugins();
-	if ( count( $muplugins > 0 ) ) {
-		$return .= "\n" . '-- Must-Use Plugins' . "\n\n";
+	if (count($muplugins > 0)) {
+		$return .= "\n".'-- Must-Use Plugins'."\n\n";
 
-		foreach ( $muplugins as $plugin => $plugin_data ) {
-			$return .= $plugin_data['Name'] . ': ' . $plugin_data['Version'] . "\n";
+		foreach ($muplugins as $plugin => $plugin_data) {
+			$return .= $plugin_data['Name'].': '.$plugin_data['Version']."\n";
 		}
 
-		$return = apply_filters( 'gmb_sysinfo_after_wordpress_mu_plugins', $return );
+		$return = apply_filters('gmb_sysinfo_after_wordpress_mu_plugins', $return);
 	}
 
 	// WordPress active plugins
-	$return .= "\n" . '-- WordPress Active Plugins' . "\n\n";
+	$return .= "\n".'-- WordPress Active Plugins'."\n\n";
 
 	$plugins        = get_plugins();
-	$active_plugins = get_option( 'active_plugins', array() );
+	$active_plugins = get_option('active_plugins', array());
 
-	foreach ( $plugins as $plugin_path => $plugin ) {
-		if ( ! in_array( $plugin_path, $active_plugins ) ) {
+	foreach ($plugins as $plugin_path => $plugin) {
+		if ( ! in_array($plugin_path, $active_plugins)) {
 			continue;
 		}
 
-		$return .= $plugin['Name'] . ': ' . $plugin['Version'] . "\n";
+		$return .= $plugin['Name'].': '.$plugin['Version']."\n";
 	}
 
-	$return = apply_filters( 'gmb_sysinfo_after_wordpress_plugins', $return );
+	$return = apply_filters('gmb_sysinfo_after_wordpress_plugins', $return);
 
 	// WordPress inactive plugins
-	$return .= "\n" . '-- WordPress Inactive Plugins' . "\n\n";
+	$return .= "\n".'-- WordPress Inactive Plugins'."\n\n";
 
-	foreach ( $plugins as $plugin_path => $plugin ) {
-		if ( in_array( $plugin_path, $active_plugins ) ) {
+	foreach ($plugins as $plugin_path => $plugin) {
+		if (in_array($plugin_path, $active_plugins)) {
 			continue;
 		}
 
-		$return .= $plugin['Name'] . ': ' . $plugin['Version'] . "\n";
+		$return .= $plugin['Name'].': '.$plugin['Version']."\n";
 	}
 
-	$return = apply_filters( 'gmb_sysinfo_after_wordpress_plugins_inactive', $return );
+	$return = apply_filters('gmb_sysinfo_after_wordpress_plugins_inactive', $return);
 
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		// WordPress Multisite active plugins
-		$return .= "\n" . '-- Network Active Plugins' . "\n\n";
+		$return .= "\n".'-- Network Active Plugins'."\n\n";
 
 		$plugins        = wp_get_active_network_plugins();
-		$active_plugins = get_site_option( 'active_sitewide_plugins', array() );
+		$active_plugins = get_site_option('active_sitewide_plugins', array());
 
-		foreach ( $plugins as $plugin_path ) {
-			$plugin_base = plugin_basename( $plugin_path );
+		foreach ($plugins as $plugin_path) {
+			$plugin_base = plugin_basename($plugin_path);
 
-			if ( ! array_key_exists( $plugin_base, $active_plugins ) ) {
+			if ( ! array_key_exists($plugin_base, $active_plugins)) {
 				continue;
 			}
 
-			$plugin = get_plugin_data( $plugin_path );
-			$return .= $plugin['Name'] . ': ' . $plugin['Version'] . "\n";
+			$plugin = get_plugin_data($plugin_path);
+			$return .= $plugin['Name'].': '.$plugin['Version']."\n";
 		}
 
-		$return = apply_filters( 'gmb_sysinfo_after_wordpress_ms_plugins', $return );
+		$return = apply_filters('gmb_sysinfo_after_wordpress_ms_plugins', $return);
 	}
 
 	// Server configuration (really just versioning)
-	$return .= "\n" . '-- Webserver Configuration' . "\n\n";
-	$return .= 'PHP Version:              ' . PHP_VERSION . "\n";
-	$return .= 'MySQL Version:            ' . $wpdb->db_version() . "\n";
-	$return .= 'Webserver Info:           ' . $_SERVER['SERVER_SOFTWARE'] . "\n";
+	$return .= "\n".'-- Webserver Configuration'."\n\n";
+	$return .= 'PHP Version:              '.PHP_VERSION."\n";
+	$return .= 'MySQL Version:            '.$wpdb->db_version()."\n";
+	$return .= 'Webserver Info:           '.$_SERVER['SERVER_SOFTWARE']."\n";
 
-	$return = apply_filters( 'gmb_sysinfo_after_webserver_config', $return );
+	$return = apply_filters('gmb_sysinfo_after_webserver_config', $return);
 
 	// PHP configs... now we're getting to the important stuff
-	$return .= "\n" . '-- PHP Configuration' . "\n\n";
-	$return .= 'Safe Mode:                ' . ( ini_get( 'safe_mode' ) ? 'Enabled' : 'Disabled' . "\n" );
-	$return .= 'Memory Limit:             ' . ini_get( 'memory_limit' ) . "\n";
-	$return .= 'Upload Max Size:          ' . ini_get( 'upload_max_filesize' ) . "\n";
-	$return .= 'Post Max Size:            ' . ini_get( 'post_max_size' ) . "\n";
-	$return .= 'Upload Max Filesize:      ' . ini_get( 'upload_max_filesize' ) . "\n";
-	$return .= 'Time Limit:               ' . ini_get( 'max_execution_time' ) . "\n";
-	$return .= 'Max Input Vars:           ' . ini_get( 'max_input_vars' ) . "\n";
-	$return .= 'Display Errors:           ' . ( ini_get( 'display_errors' ) ? 'On (' . ini_get( 'display_errors' ) . ')' : 'N/A' ) . "\n";
-
-	$return = apply_filters( 'gmb_sysinfo_after_php_config', $return );
+	$return .= "\n".'-- PHP Configuration'."\n\n";
+	$return .= 'Safe Mode:                '.(ini_get('safe_mode') ? 'Enabled' : 'Disabled'."\n");
+	$return .= 'Memory Limit:             '.ini_get('memory_limit')."\n";
+	$return .= 'Upload Max Size:          '.ini_get('upload_max_filesize')."\n";
+	$return .= 'Post Max Size:            '.ini_get('post_max_size')."\n";
+	$return .= 'Upload Max Filesize:      '.ini_get('upload_max_filesize')."\n";
+	$return .= 'Time Limit:               '.ini_get('max_execution_time')."\n";
+	$return .= 'Max Input Vars:           '.ini_get('max_input_vars')."\n";
+	$return .= 'Display Errors:           '.(ini_get('display_errors') ? 'On ('.ini_get('display_errors').')' : 'N/A')."\n";
+
+	$return = apply_filters('gmb_sysinfo_after_php_config', $return);
 
 	// PHP extensions and such
-	$return .= "\n" . '-- PHP Extensions' . "\n\n";
-	$return .= 'cURL:                     ' . ( function_exists( 'curl_init' ) ? 'Supported' : 'Not Supported' ) . "\n";
-	$return .= 'fsockopen:                ' . ( function_exists( 'fsockopen' ) ? 'Supported' : 'Not Supported' ) . "\n";
-	$return .= 'SOAP Client:              ' . ( class_exists( 'SoapClient' ) ? 'Installed' : 'Not Installed' ) . "\n";
-	$return .= 'Suhosin:                  ' . ( extension_loaded( 'suhosin' ) ? 'Installed' : 'Not Installed' ) . "\n";
+	$return .= "\n".'-- PHP Extensions'."\n\n";
+	$return .= 'cURL:                     '.(function_exists('curl_init') ? 'Supported' : 'Not Supported')."\n";
+	$return .= 'fsockopen:                '.(function_exists('fsockopen') ? 'Supported' : 'Not Supported')."\n";
+	$return .= 'SOAP Client:              '.(class_exists('SoapClient') ? 'Installed' : 'Not Installed')."\n";
+	$return .= 'Suhosin:                  '.(extension_loaded('suhosin') ? 'Installed' : 'Not Installed')."\n";
 
-	$return = apply_filters( 'gmb_sysinfo_after_php_ext', $return );
+	$return = apply_filters('gmb_sysinfo_after_php_ext', $return);
 
 
 	// The rest of this is only relevant is session is enabled
-	if ( isset( $_SESSION ) ) {
-		$return .= 'Session Name:             ' . esc_html( ini_get( 'session.name' ) ) . "\n";
-		$return .= 'Cookie Path:              ' . esc_html( ini_get( 'session.cookie_path' ) ) . "\n";
-		$return .= 'Save Path:                ' . esc_html( ini_get( 'session.save_path' ) ) . "\n";
-		$return .= 'Use Cookies:              ' . ( ini_get( 'session.use_cookies' ) ? 'On' : 'Off' ) . "\n";
-		$return .= 'Use Only Cookies:         ' . ( ini_get( 'session.use_only_cookies' ) ? 'On' : 'Off' ) . "\n";
+	if (isset($_SESSION)) {
+		$return .= 'Session Name:             '.esc_html(ini_get('session.name'))."\n";
+		$return .= 'Cookie Path:              '.esc_html(ini_get('session.cookie_path'))."\n";
+		$return .= 'Save Path:                '.esc_html(ini_get('session.save_path'))."\n";
+		$return .= 'Use Cookies:              '.(ini_get('session.use_cookies') ? 'On' : 'Off')."\n";
+		$return .= 'Use Only Cookies:         '.(ini_get('session.use_only_cookies') ? 'On' : 'Off')."\n";
 	}
 
-	$return = apply_filters( 'gmb_sysinfo_after_session_config', $return );
+	$return = apply_filters('gmb_sysinfo_after_session_config', $return);
 
-	$return .= "\n" . '### End System Info ###';
+	$return .= "\n".'### End System Info ###';
 
 	return $return;
 }
@@ -267,17 +267,17 @@ 
  */
 function gmb_tools_sysinfo_download() {
 
-	if ( ! current_user_can( 'install_plugins' ) ) {
+	if ( ! current_user_can('install_plugins')) {
 		return;
 	}
 
 	nocache_headers();
 
-	header( 'Content-Type: text/plain' );
-	header( 'Content-Disposition: attachment; filename="gmb-system-info.txt"' );
+	header('Content-Type: text/plain');
+	header('Content-Disposition: attachment; filename="gmb-system-info.txt"');
 
-	echo wp_strip_all_tags( $_POST['gmb-sysinfo'] );
+	echo wp_strip_all_tags($_POST['gmb-sysinfo']);
 	gmb_die();
 }
 
-add_action( 'gmb_download_sysinfo', 'gmb_tools_sysinfo_download' );
\ No newline at end of file
+add_action('gmb_download_sysinfo', 'gmb_tools_sysinfo_download');
\ No newline at end of file

includes/admin/views/tab-system-info.php

Spacing +2 added lines, -2 removed lines

@@ -15,9 +15,9 @@
 	<div class="row">
 		<div class="gmb-col-md-10">
 
-			<h3><?php _e( 'System Info', $this->plugin_slug ); ?></h3>
+			<h3><?php _e('System Info', $this->plugin_slug); ?></h3>
 
-			<p><?php _e( 'The following displays useful information about your website that may be requested from you for support reasons.', $this->plugin_slug ); ?></p>
+			<p><?php _e('The following displays useful information about your website that may be requested from you for support reasons.', $this->plugin_slug); ?></p>
 
 			<form class="gmb-form" method="post" id="system_settings" enctype="multipart/form-data" encoding="multipart/form-data">
 				<?php gmb_system_info_callback(); ?>

includes/admin/views/tab-general-settings.php

Spacing +3 added lines, -3 removed lines

@@ -15,11 +15,11 @@
 	<div class="row">
 		<div class="gmb-col-md-10">
 
-			<h3><?php _e( 'General Settings', $this->plugin_slug ); ?></h3>
+			<h3><?php _e('General Settings', $this->plugin_slug); ?></h3>
 
-			<p><?php _e( 'Customize how Google Maps Builder functions within WordPress.', $this->plugin_slug ); ?></p>
+			<p><?php _e('Customize how Google Maps Builder functions within WordPress.', $this->plugin_slug); ?></p>
 
-			<?php cmb2_metabox_form( $this->general_option_fields(), self::$key ); ?>
+			<?php cmb2_metabox_form($this->general_option_fields(), self::$key); ?>
 		</div>
 		<div class="gmb-col-md-2">
 

includes/admin/views/markers.php

Spacing +179 added lines, -179 removed lines

@@ -13,33 +13,33 @@ 
 			<div class="inner-modal">
 				<button type="button" class="gmb-modal-close">&times;</button>
 				<div class="marker-description-wrap clear">
-					<h3><?php _e( 'Customize Map Marker', $this->plugin_slug ); ?></h3>
+					<h3><?php _e('Customize Map Marker', $this->plugin_slug); ?></h3>
 
-					<p><?php _e( 'Customize your Google Maps markers by selecting a marker graphic and icon. Integration made possible from the excellent Maps Icon library.', $this->plugin_slug ); ?></p>
+					<p><?php _e('Customize your Google Maps markers by selecting a marker graphic and icon. Integration made possible from the excellent Maps Icon library.', $this->plugin_slug); ?></p>
 				</div>
 
 				<div class="marker-row clear">
-					<h3><?php _e( 'Step 1: Select a Marker', $this->plugin_slug ); ?></h3>
+					<h3><?php _e('Step 1: Select a Marker', $this->plugin_slug); ?></h3>
 
 					<div class="marker-item" data-marker="MAP_PIN" data-toggle="map-svg-icons">
 						<div class="marker-svg">
 							<svg version="1.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="50px" height="50px" viewBox="0 0 100 165" enable-background="new 0 0 100 165" xml:space="preserve"><path fill="#428BCA" d="M50,0C22.382,0,0,21.966,0,49.054C0,76.151,50,165,50,165s50-88.849,50-115.946C100,21.966,77.605,0,50,0z"></path>
 				</svg>
 						</div>
-						<div class="marker-description"><?php _e( 'Map Pin', $this->plugin_slug ); ?></div>
+						<div class="marker-description"><?php _e('Map Pin', $this->plugin_slug); ?></div>
 					</div>
 
 					<div class="marker-item" data-marker="SQUARE_PIN" data-toggle="map-svg-icons">
 						<div class="marker-svg">
 							<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="50px" height="50px" viewBox="0 0 100 120" enable-background="new 0 0 100 120" xml:space="preserve"><polygon fill="#428BCA" points="100,0 0,0 0,100 36.768,100 50.199,119.876 63.63,100 100,100 "></polygon></svg>
 						</div>
-						<div class="marker-description"><?php _e( 'Square Pin', $this->plugin_slug ); ?></div>
+						<div class="marker-description"><?php _e('Square Pin', $this->plugin_slug); ?></div>
 					</div>
 					<div class="marker-item" data-marker="default" data-toggle="default-icons-row">
 						<div class="marker-svg default-marker">
-							<img src="<?php echo apply_filters( 'gmb_default_marker', GMB_PLUGIN_URL . 'assets/img/spotlight-poi.png' ); ?>" class="default-marker" />
+							<img src="<?php echo apply_filters('gmb_default_marker', GMB_PLUGIN_URL.'assets/img/spotlight-poi.png'); ?>" class="default-marker" />
 						</div>
-						<div class="marker-description"><?php _e( 'Default', $this->plugin_slug ); ?></div>
+						<div class="marker-description"><?php _e('Default', $this->plugin_slug); ?></div>
 					</div>
 
 				</div>
@@ -50,10 +50,10 @@ 
 						<div class="marker-color-picker-wrap">
 							<input type="text" name="color" id="color" value="#428BCA" class="color-picker marker-color" />
 						</div>
-						<p class="color-desc"><?php _e( 'Customize the marker color?', $this->plugin_slug ); ?></p>
+						<p class="color-desc"><?php _e('Customize the marker color?', $this->plugin_slug); ?></p>
 					</div>
 
-					<h3><?php _e( 'Step 2: Select a Marker Icon', $this->plugin_slug ); ?></h3>
+					<h3><?php _e('Step 2: Select a Marker Icon', $this->plugin_slug); ?></h3>
 
 					<div class="icon">
 						<div class="icon-inner">
@@ -216,7 +216,7 @@ 
 						<div class="marker-color-picker-wrap">
 							<input type="text" name="color" id="color" class="color-picker label-color" value="#444444" />
 						</div>
-						<p class="color-desc"><?php _e( 'Customize the icon color?', $this->plugin_slug ); ?></p>
+						<p class="color-desc"><?php _e('Customize the icon color?', $this->plugin_slug); ?></p>
 					</div>
 
 				</div>
@@ -225,515 +225,515 @@ 
 
 				<div class="marker-icon-row default-icons-row gmb-hidden clear">
 
-					<h3><?php _e( 'Step 2: Select a Marker Icon', $this->plugin_slug ); ?></h3>
+					<h3><?php _e('Step 2: Select a Marker Icon', $this->plugin_slug); ?></h3>
 
 					<ul class="map-icons-list">
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue-blank.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue-blank.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue-dot.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue-dot.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerA.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerA.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerB.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerB.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerC.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerC.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerD.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerD.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerE.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerE.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerF.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerF.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerG.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerG.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerH.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerH.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerI.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerI.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerJ.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerJ.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerK.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerK.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerL.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerL.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerM.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerM.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerN.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerN.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerO.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerO.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerP.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerP.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerQ.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerQ.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerR.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerR.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerS.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerS.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerT.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerT.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerU.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerU.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerV.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerV.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerW.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerW.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerX.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerX.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerY.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerY.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/blue_MarkerZ.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/blue_MarkerZ.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown-blank.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown-blank.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown-dot.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown-dot.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerA.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerA.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerB.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerB.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerC.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerC.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerD.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerD.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerE.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerE.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerF.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerF.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerG.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerG.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerH.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerH.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerI.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerI.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerJ.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerJ.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerK.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerK.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerL.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerL.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerM.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerM.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerN.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerN.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerO.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerO.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerP.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerP.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerQ.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerQ.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerR.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerR.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerS.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerS.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerT.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerT.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerU.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerU.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerV.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerV.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerW.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerW.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerX.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerX.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerY.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerY.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/brown_MarkerZ.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/brown_MarkerZ.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen-blank.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen-blank.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen-dot.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen-dot.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerA.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerA.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerB.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerB.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerC.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerC.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerD.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerD.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerE.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerE.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerF.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerF.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerG.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerG.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerH.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerH.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerI.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerI.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerJ.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerJ.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerK.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerK.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerL.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerL.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerM.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerM.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerN.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerN.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerO.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerO.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerP.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerP.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerQ.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerQ.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerR.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerR.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerS.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerS.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerT.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerT.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerU.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerU.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerV.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerV.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerW.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerW.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerX.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerX.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerY.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerY.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/darkgreen_MarkerZ.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/darkgreen_MarkerZ.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green-blank.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green-blank.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green-dot.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green-dot.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerA.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerA.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerB.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerB.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerC.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerC.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerD.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerD.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerE.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerE.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerF.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerF.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerG.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerG.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerH.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerH.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerI.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerI.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerJ.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerJ.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerK.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerK.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerL.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerL.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerM.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerM.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerN.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerN.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerO.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerO.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerP.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerP.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerQ.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerQ.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerR.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerR.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerS.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerS.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerT.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerT.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerU.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerU.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerV.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerV.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerW.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerW.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerX.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerX.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/green_MarkerY.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/green_MarkerY.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange-blank.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange-blank.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange-dot.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange-dot.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerA.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerA.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerB.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerB.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerC.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerC.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerD.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerD.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerE.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerE.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerF.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerF.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerG.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerG.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerH.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerH.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerI.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerI.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerJ.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerJ.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerK.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerK.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerL.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerL.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerM.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerM.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerN.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerN.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerO.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerO.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerP.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerP.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerQ.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerQ.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerR.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerR.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerS.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerS.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerT.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerT.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerU.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerU.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerV.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerV.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerW.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerW.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerX.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerX.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerY.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerY.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/orange_MarkerZ.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/orange_MarkerZ.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue-blank.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue-blank.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue-dot.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue-dot.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerA.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerA.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerB.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerB.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerC.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerC.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerD.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerD.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerE.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerE.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerF.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerF.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerG.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerG.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerH.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerH.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerI.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerI.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerJ.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerJ.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerK.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerK.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerL.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerL.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerM.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerM.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerN.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerN.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerO.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerO.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerP.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerP.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerQ.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerQ.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerR.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerR.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerS.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerS.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerT.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerT.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerU.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerU.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerV.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerV.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerW.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerW.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerX.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerX.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerY.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerY.png' ?>" alt=""></a>
 						</li>
 						<li>
-							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL . 'assets/img/default-icons/paleblue_MarkerZ.png' ?>" alt=""></a>
+							<a href="#" class="maps-icon"><img src="<?php echo GMB_PLUGIN_URL.'assets/img/default-icons/paleblue_MarkerZ.png' ?>" alt=""></a>
 						</li>
 					</ul>
 				</div>
 
 				<div class="save-marker-icon clear">
-					<p class="save-text"><?php _e( 'Marker is ready to be set.', $this->plugin_slug ); ?></p>
+					<p class="save-text"><?php _e('Marker is ready to be set.', $this->plugin_slug); ?></p>
 					<button class="button button-primary button-large save-marker-button" data-marker="" data-marker-color="#428BCA" data-label="" data-label-color="#FFFFFF" data-marker-index="">Set Marker</button>
 				</div>
 

includes/admin/views/tab-map-options.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
 			<h3><?php _e('Default Map Settings', $this->plugin_slug); ?></h3>
 			<p><?php _e('The following settings allow you to customize how Google Maps Builder functions within WordPress.', $this->plugin_slug); ?></p>
-			<?php cmb2_metabox_form( $this->map_option_fields(), self::$key ); ?>
+			<?php cmb2_metabox_form($this->map_option_fields(), self::$key); ?>
 		</div>
 
 		<div class="gmb-col-md-2">

includes/admin/views/social-media.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 	<!--/.google-plus -->
 
 	<div class="wordimpress-logo">
-		<a href="https://wordimpress.com/" title="<?php _e( 'Visit the Developers site of Google Maps Builder', $this->plugin_slug ); ?>" target="_blank" class="logo-link"></a>
+		<a href="https://wordimpress.com/" title="<?php _e('Visit the Developers site of Google Maps Builder', $this->plugin_slug); ?>" target="_blank" class="logo-link"></a>
 	</div>
 
 	<div class="go-pro">
@@ -44,5 +44,5 @@ 
 <!-- /.social-items-wrap -->
 
 
-<a href="#" class="hide-welcome" title="<?php _e( 'Hide the Google Maps Builder Welcome Message', $this->plugin_slug ); ?>"><?php _e( 'Hide Welcome', $this->plugin_slug ); ?>
+<a href="#" class="hide-welcome" title="<?php _e('Hide the Google Maps Builder Welcome Message', $this->plugin_slug); ?>"><?php _e('Hide Welcome', $this->plugin_slug); ?>
 	<span></span></a>

includes/admin/upgrades/upgrade-functions.php

Spacing +43 added lines, -43 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,31 +23,31 @@ 
 	//delete_option( 'gmb_refid_upgraded' );
 
 	// Don't show notices on the upgrades page
-	if ( isset( $_GET['page'] ) && $_GET['page'] == 'gmb-upgrades' ) {
+	if (isset($_GET['page']) && $_GET['page'] == 'gmb-upgrades') {
 		return;
 	}
 
 	//Check to see if we have any posts
-	$gmb_posts = get_posts( array( 'post_type' => 'google_maps', 'posts_per_page' => 10 ) );
-	if(empty($gmb_posts)){
-		update_option( 'gmb_refid_upgraded', 'upgraded' );//mark as updated
+	$gmb_posts = get_posts(array('post_type' => 'google_maps', 'posts_per_page' => 10));
+	if (empty($gmb_posts)) {
+		update_option('gmb_refid_upgraded', 'upgraded'); //mark as updated
 		return; //Don't run if there's no posts!
 	}
 
-	$gmb_version = get_option( 'gmb_version' );
+	$gmb_version = get_option('gmb_version');
 
-	if ( ! $gmb_version ) {
+	if ( ! $gmb_version) {
 		// 2.0 is the first version to use this option so we must add it
 		$gmb_version = '2.0';
 	}
-	update_option( 'gmb_version', GMB_VERSION );
+	update_option('gmb_version', GMB_VERSION);
 
-	$gmb_version = preg_replace( '/[^0-9.].*/', '', $gmb_version );
+	$gmb_version = preg_replace('/[^0-9.].*/', '', $gmb_version);
 
-	if ( version_compare( $gmb_version, '2.0', '<=' ) && ! get_option( 'gmb_refid_upgraded' ) ) {
+	if (version_compare($gmb_version, '2.0', '<=') && ! get_option('gmb_refid_upgraded')) {
 		printf(
-			'<div class="updated"><p><strong>Google Maps Builder Notice:</strong> ' . esc_html__( 'Google has updated their Maps API to use the new Google Places ID rather than previous Reference ID. The old method will soon be deprecated and eventually go offline. We are being proactive and would like to update your maps to use the new Places ID. Once you upgrade, your maps should work just fine but remember to make a backup prior to upgrading. If you choose not to upgrade Google will eventually take the old reference ID offline (no date has been given). Please contact WordImpress support via our website if you have any further questions or issues. %sClick here to upgrade your maps to use the new Places ID%s', 'gmb' ) . '</p></div>',
-			'<br><a href="' . esc_url( admin_url( 'options.php?page=gmb-upgrades' ) ) . '" class="button button-primary" style="margin-top:10px;">',
+			'<div class="updated"><p><strong>Google Maps Builder Notice:</strong> '.esc_html__('Google has updated their Maps API to use the new Google Places ID rather than previous Reference ID. The old method will soon be deprecated and eventually go offline. We are being proactive and would like to update your maps to use the new Places ID. Once you upgrade, your maps should work just fine but remember to make a backup prior to upgrading. If you choose not to upgrade Google will eventually take the old reference ID offline (no date has been given). Please contact WordImpress support via our website if you have any further questions or issues. %sClick here to upgrade your maps to use the new Places ID%s', 'gmb').'</p></div>',
+			'<br><a href="'.esc_url(admin_url('options.php?page=gmb-upgrades')).'" class="button button-primary" style="margin-top:10px;">',
 			'</a>'
 		);
 	}
@@ -55,7 +55,7 @@ 
 
 }
 
-add_action( 'admin_notices', 'gmb_show_upgrade_notices' );
+add_action('admin_notices', 'gmb_show_upgrade_notices');
 
 
 /**
@@ -67,11 +67,11 @@ 
  */
 function gmb_add_upgrade_submenu_page() {
 
-	$gmb_upgrades_screen = add_submenu_page( null, __( 'Maps Builder Upgrades', 'gmb' ), __( 'Maps Builder Upgrades', 'gmb' ), 'activate_plugins', 'gmb-upgrades', 'gmb_upgrades_screen' );
+	$gmb_upgrades_screen = add_submenu_page(null, __('Maps Builder Upgrades', 'gmb'), __('Maps Builder Upgrades', 'gmb'), 'activate_plugins', 'gmb-upgrades', 'gmb_upgrades_screen');
 
 }
 
-add_action( 'admin_menu', 'gmb_add_upgrade_submenu_page', 10 );
+add_action('admin_menu', 'gmb_add_upgrade_submenu_page', 10);
 
 /**
  * Triggers all upgrade functions
@@ -83,31 +83,31 @@ 
  */
 function gmb_trigger_upgrades() {
 
-	if ( ! current_user_can( 'activate_plugins' ) ) {
-		wp_die( __( 'You do not have permission to do plugin upgrades', 'gmb' ), __( 'Error', 'gmb' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('activate_plugins')) {
+		wp_die(__('You do not have permission to do plugin upgrades', 'gmb'), __('Error', 'gmb'), array('response' => 403));
 	}
 
-	$gmb_version = get_option( 'gmb_version' );
+	$gmb_version = get_option('gmb_version');
 
 	//Is the option above in the db?
-	if ( ! $gmb_version ) {
+	if ( ! $gmb_version) {
 		// 2.0 is the first version to use this option so we must add it
 		$gmb_version = '2.0';
-		add_option( 'gmb_version', $gmb_version );
+		add_option('gmb_version', $gmb_version);
 	}
 
-	if ( version_compare( GMB_VERSION, $gmb_version, '>=' ) && ! get_option( 'gmb_refid_upgraded' ) ) {
+	if (version_compare(GMB_VERSION, $gmb_version, '>=') && ! get_option('gmb_refid_upgraded')) {
 		gmb_v2_upgrades();
 	}
 
-	update_option( 'gmb_version', $gmb_version );
+	update_option('gmb_version', $gmb_version);
 
-	if ( DOING_AJAX ) {
-		die( 'complete' );
+	if (DOING_AJAX) {
+		die('complete');
 	} // Let AJAX know that the upgrade is complete
 }
 
-add_action( 'wp_ajax_gmb_trigger_upgrades', 'gmb_trigger_upgrades' );
+add_action('wp_ajax_gmb_trigger_upgrades', 'gmb_trigger_upgrades');
 
 
 /**
@@ -120,7 +120,7 @@ 
 function gmb_v2_upgrades() {
 
 	//Set key variables
-	$google_api_key = gmb_get_option( 'gmb_api_key' );
+	$google_api_key = gmb_get_option('gmb_api_key');
 
 	//Loop through maps
 	$args = array(
@@ -129,28 +129,28 @@ 
 	);
 
 	// The Query
-	$the_query = new WP_Query( $args );
+	$the_query = new WP_Query($args);
 
 	// The CPT Loop
-	if ( $the_query->have_posts() ) : while ( $the_query->have_posts() ) : $the_query->the_post();
+	if ($the_query->have_posts()) : while ($the_query->have_posts()) : $the_query->the_post();
 
 		//Repeater markers data
-		$markers = get_post_meta( get_the_ID(), 'gmb_markers_group', true );
+		$markers = get_post_meta(get_the_ID(), 'gmb_markers_group', true);
 
 		//If no markers skip
-		if ( ! empty( $markers ) ) {
+		if ( ! empty($markers)) {
 
 			//Markers loop
-			foreach ( $markers as $key => $marker ) {
+			foreach ($markers as $key => $marker) {
 
-				$ref_id   = isset( $marker['reference'] ) ? $marker['reference'] : '';
-				$place_id = isset( $marker['place_id'] ) ? $marker['place_id'] : '';
+				$ref_id   = isset($marker['reference']) ? $marker['reference'] : '';
+				$place_id = isset($marker['place_id']) ? $marker['place_id'] : '';
 
 				//No ref ID -> skip; If place_id already there skip
-				if ( empty( $ref_id ) ) {
+				if (empty($ref_id)) {
 					continue;
 				}
-				if ( ! empty( $place_id ) ) {
+				if ( ! empty($place_id)) {
 					continue;
 				}
 				//cURL the Google API for the Google Place ID
@@ -162,7 +162,7 @@ 
 					'https://maps.googleapis.com/maps/api/place/details/json'
 				);
 
-				$response = wp_remote_get( $google_places_url,
+				$response = wp_remote_get($google_places_url,
 					array(
 						'timeout'   => 15,
 						'sslverify' => false
@@ -170,29 +170,29 @@ 
 				);
 
 				// make sure the response came back okay
-				if ( is_wp_error( $response ) ) {
+				if (is_wp_error($response)) {
 					return;
 				}
 
 				// decode the license data
-				$response = json_decode( $response['body'], true );
+				$response = json_decode($response['body'], true);
 
 				//Place ID is there, now let's update the widget data
-				if ( isset( $response['result']['place_id'] ) ) {
+				if (isset($response['result']['place_id'])) {
 
 					//Add Place ID to markers array
-					$markers[ $key ]['place_id'] = $response['result']['place_id'];
+					$markers[$key]['place_id'] = $response['result']['place_id'];
 
 				}
 
 				//Pause for 2 seconds so we don't overwhelm the Google API with requests
-				sleep( 2 );
+				sleep(2);
 
 
 			} //end foreach
 
 			//Update repeater data with new data
-			update_post_meta( get_the_ID(), 'gmb_markers_group', $markers );
+			update_post_meta(get_the_ID(), 'gmb_markers_group', $markers);
 
 		} //endif
 
@@ -202,6 +202,6 @@ 
 	wp_reset_postdata();
 
 	//Update our options and GTF out
-	update_option( 'gmb_refid_upgraded', 'upgraded' );
+	update_option('gmb_refid_upgraded', 'upgraded');
 
 }

includes/admin/upgrades/upgrades.php

Spacing +16 added lines, -16 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,12 +21,12 @@ 
  */
 function gmb_upgrades_screen() {
 
-	$action = isset( $_GET['gmb-upgrade'] ) ? sanitize_text_field( $_GET['gmb-upgrade'] ) : '';
-	$step   = isset( $_GET['step'] ) ? absint( $_GET['step'] ) : 1;
-	$total  = isset( $_GET['total'] ) ? absint( $_GET['total'] ) : false;
-	$custom = isset( $_GET['custom'] ) ? absint( $_GET['custom'] ) : 0;
-	$number = isset( $_GET['number'] ) ? absint( $_GET['number'] ) : 100;
-	$steps  = round( ( $total / $number ), 0 );
+	$action = isset($_GET['gmb-upgrade']) ? sanitize_text_field($_GET['gmb-upgrade']) : '';
+	$step   = isset($_GET['step']) ? absint($_GET['step']) : 1;
+	$total  = isset($_GET['total']) ? absint($_GET['total']) : false;
+	$custom = isset($_GET['custom']) ? absint($_GET['custom']) : 0;
+	$number = isset($_GET['number']) ? absint($_GET['number']) : 100;
+	$steps  = round(($total / $number), 0);
 
 	$doing_upgrade_args = array(
 		'page'        => 'gmb-upgrades',
@@ -36,23 +36,23 @@ 
 		'custom'      => $custom,
 		'steps'       => $steps
 	);
-	update_option( 'gmb_doing_upgrade', $doing_upgrade_args );
-	if ( $step > $steps ) {
+	update_option('gmb_doing_upgrade', $doing_upgrade_args);
+	if ($step > $steps) {
 		// Prevent a weird case where the estimate was off. Usually only a couple.
 		$steps = $step;
 	}
 	?>
 	<div class="wrap">
-		<h2><?php _e( 'Maps Builder - Upgrade', 'gmb' ); ?></h2>
+		<h2><?php _e('Maps Builder - Upgrade', 'gmb'); ?></h2>
 
-		<?php if ( ! empty( $action ) ) : ?>
+		<?php if ( ! empty($action)) : ?>
 
 			<div id="gmb-upgrade-status">
-				<p><?php _e( 'The upgrade process has started, please be patient. This could take several minutes. You will be automatically redirected when the upgrade is finished.', 'gmb' ); ?></p>
+				<p><?php _e('The upgrade process has started, please be patient. This could take several minutes. You will be automatically redirected when the upgrade is finished.', 'gmb'); ?></p>
 
-				<?php if ( ! empty( $total ) ) : ?>
+				<?php if ( ! empty($total)) : ?>
 					<p>
-						<strong><?php printf( __( 'Step %d of approximately %d running', 'gmb' ), $step, $steps ); ?></strong>
+						<strong><?php printf(__('Step %d of approximately %d running', 'gmb'), $step, $steps); ?></strong>
 					</p>
 				<?php endif; ?>
 			</div>
@@ -66,8 +66,8 @@ 
 
 			<div id="gmb-upgrade-status" class="updated" style="margin-top:15px;">
 				<p style="margin-bottom:8px;">
-					<?php _e( 'The upgrade process has started, please do not close your browser or refresh. This could take several minutes. You will be automatically redirected when the upgrade has finished.', 'gmb' ); ?>
-					<img src="<?php echo GMB_PLUGIN_URL . '/assets/img/loading.gif'; ?>" id="gmb-upgrade-loader" style="position:relative; top:3px;" />
+					<?php _e('The upgrade process has started, please do not close your browser or refresh. This could take several minutes. You will be automatically redirected when the upgrade has finished.', 'gmb'); ?>
+					<img src="<?php echo GMB_PLUGIN_URL.'/assets/img/loading.gif'; ?>" id="gmb-upgrade-loader" style="position:relative; top:3px;" />
 				</p>
 			</div>
 			<script type="text/javascript">

Braces +5 added lines, -2 removed lines

@@ -62,11 +62,14 @@
 				}, 250 );
 			</script>
 
-		<?php else : ?>
+		<?php else {
+	: ?>
 
 			<div id="gmb-upgrade-status" class="updated" style="margin-top:15px;">
 				<p style="margin-bottom:8px;">
-					<?php _e( 'The upgrade process has started, please do not close your browser or refresh. This could take several minutes. You will be automatically redirected when the upgrade has finished.', 'gmb' ); ?>
+					<?php _e( 'The upgrade process has started, please do not close your browser or refresh. This could take several minutes. You will be automatically redirected when the upgrade has finished.', 'gmb' );
+}
+?>
 					<img src="<?php echo GMB_PLUGIN_URL . '/assets/img/loading.gif'; ?>" id="gmb-upgrade-loader" style="position:relative; top:3px;" />
 				</p>
 			</div>