WordImpress / Google-Maps-Builder

google-maps-builder.php

Doc Comments +1 added lines, -1 removed lines

@@ -314,7 +314,7 @@
  * Example: <?php $gmb = Give(); ?>
  *
  * @since 2.0
- * @return object - The one true Give Instance
+ * @return Google_Maps_Builder - The one true Give Instance
  */
 function Google_Maps_Builder() {
 	return Google_Maps_Builder::instance();

Spacing +50 added lines, -50 removed lines

@@ -15,7 +15,7 @@ 
  */
 
 // If this file is called directly, abort.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -31,7 +31,7 @@ 
 //add_action( 'plugins_loaded', array( 'Google_Maps_Builder_Engine', 'get_instance' ) );
 
 
-if ( ! class_exists( 'Google_Maps_Builder' ) ) : /**
+if ( ! class_exists('Google_Maps_Builder')) : /**
  * Main Give Class
  *
  * @since 2.0
@@ -119,12 +119,12 @@ 
 		 * @return    Google_Maps_Builder
 		 */
 		public static function instance() {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof Google_Maps_Builder ) ) {
+			if ( ! isset(self::$instance) && ! (self::$instance instanceof Google_Maps_Builder)) {
 
 				self::$instance = new Google_Maps_Builder();
 				self::$instance->setup_constants();
 
-				add_action( 'plugins_loaded', array( self::$instance, 'load_textdomain' ) );
+				add_action('plugins_loaded', array(self::$instance, 'load_textdomain'));
 
 				self::$instance->includes();
 				self::$instance->activate = new Google_Maps_Builder_Activate();
@@ -132,14 +132,14 @@ 
 				self::$instance->settings = new Google_Maps_Builder_Settings();
 				self::$instance->engine   = new Google_Maps_Builder_Engine();
 
-				register_activation_hook( __FILE__, array( self::$instance->activate, 'activation_flush_rewrites' ) );
+				register_activation_hook(__FILE__, array(self::$instance->activate, 'activation_flush_rewrites'));
 
 				// Read plugin meta
 				// Check that function get_plugin_data exists
-				if ( ! function_exists( 'get_plugin_data' ) ) {
-					require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+				if ( ! function_exists('get_plugin_data')) {
+					require_once(ABSPATH.'wp-admin/includes/plugin.php');
 				}
-				self::$instance->meta = get_plugin_data( GMB_PLUGIN_FILE, false );
+				self::$instance->meta = get_plugin_data(GMB_PLUGIN_FILE, false);
 
 			}
 
@@ -158,7 +158,7 @@ 
 		 */
 		public function __clone() {
 			// Cloning instances of the class is forbidden
-			_doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'gmb' ), '2.0' );
+			_doing_it_wrong(__FUNCTION__, __('Cheatin’ huh?', 'gmb'), '2.0');
 		}
 
 		/**
@@ -170,7 +170,7 @@ 
 		 */
 		public function __wakeup() {
 			// Unserializing instances of the class is forbidden
-			_doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'gmb' ), '2.0' );
+			_doing_it_wrong(__FUNCTION__, __('Cheatin’ huh?', 'gmb'), '2.0');
 		}
 
 		/**
@@ -184,24 +184,24 @@ 
 
 			// Define Constants
 			// Plugin Folder Path
-			if ( ! defined( 'GMB_PLUGIN_PATH' ) ) {
-				define( 'GMB_PLUGIN_PATH', plugin_dir_path( __FILE__ ) );
+			if ( ! defined('GMB_PLUGIN_PATH')) {
+				define('GMB_PLUGIN_PATH', plugin_dir_path(__FILE__));
 			}
 			// Plugin Folder URL
-			if ( ! defined( 'GMB_PLUGIN_URL' ) ) {
-				define( 'GMB_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
+			if ( ! defined('GMB_PLUGIN_URL')) {
+				define('GMB_PLUGIN_URL', plugin_dir_url(__FILE__));
 			}
 			// Plugin base
-			if ( ! defined( 'GMB_PLUGIN_BASE' ) ) {
-				define( 'GMB_PLUGIN_BASE', plugin_basename( __FILE__ ) );
+			if ( ! defined('GMB_PLUGIN_BASE')) {
+				define('GMB_PLUGIN_BASE', plugin_basename(__FILE__));
 			}
 			// Plugin version
-			if ( ! defined( 'GMB_VERSION' ) ) {
-				define( 'GMB_VERSION', '2.0.2' );
+			if ( ! defined('GMB_VERSION')) {
+				define('GMB_VERSION', '2.0.2');
 			}
 			// Plugin Root File
-			if ( ! defined( 'GMB_PLUGIN_FILE' ) ) {
-				define( 'GMB_PLUGIN_FILE', __FILE__ );
+			if ( ! defined('GMB_PLUGIN_FILE')) {
+				define('GMB_PLUGIN_FILE', __FILE__);
 			}
 
 		}
@@ -215,7 +215,7 @@ 
 		 */
 		private function includes() {
 
-			require_once GMB_PLUGIN_PATH . 'includes/class-gmb-activate.php';
+			require_once GMB_PLUGIN_PATH.'includes/class-gmb-activate.php';
 
 			/**
 			 * Get the CMB2 bootstrap!
@@ -223,31 +223,31 @@ 
 			 * @description: Checks to see if CMB2 plugin is installed first the uses included CMB2; we can still use it even it it's not active. This prevents fatal error conflicts with other themes and users of the CMB2 WP.org plugin
 			 *
 			 */
-			if ( file_exists( WP_PLUGIN_DIR . '/cmb2/init.php' ) && ! defined( 'CMB2_LOADED' ) ) {
-				require_once WP_PLUGIN_DIR . '/cmb2/init.php';
-			} elseif ( file_exists( GMB_PLUGIN_PATH . '/includes/libraries/metabox/init.php' ) && ! defined( 'CMB2_LOADED' ) ) {
-				require_once GMB_PLUGIN_PATH . '/includes/libraries/metabox/init.php';
-			} elseif ( file_exists( GMB_PLUGIN_PATH . '/includes/libraries/CMB2/init.php' ) && ! defined( 'CMB2_LOADED' ) ) {
-				require_once GMB_PLUGIN_PATH . '/includes/libraries/CMB2/init.php';
+			if (file_exists(WP_PLUGIN_DIR.'/cmb2/init.php') && ! defined('CMB2_LOADED')) {
+				require_once WP_PLUGIN_DIR.'/cmb2/init.php';
+			} elseif (file_exists(GMB_PLUGIN_PATH.'/includes/libraries/metabox/init.php') && ! defined('CMB2_LOADED')) {
+				require_once GMB_PLUGIN_PATH.'/includes/libraries/metabox/init.php';
+			} elseif (file_exists(GMB_PLUGIN_PATH.'/includes/libraries/CMB2/init.php') && ! defined('CMB2_LOADED')) {
+				require_once GMB_PLUGIN_PATH.'/includes/libraries/CMB2/init.php';
 			}
 
-			require_once GMB_PLUGIN_PATH . 'includes/class-gmb-scripts.php';
-			require_once GMB_PLUGIN_PATH . 'includes/class-gmb-widget.php';
-			require_once GMB_PLUGIN_PATH . 'includes/class-gmb-engine.php';
-			require_once GMB_PLUGIN_PATH . 'includes/admin/class-gmb-settings.php';
-			require_once GMB_PLUGIN_PATH . 'includes/misc-functions.php';
+			require_once GMB_PLUGIN_PATH.'includes/class-gmb-scripts.php';
+			require_once GMB_PLUGIN_PATH.'includes/class-gmb-widget.php';
+			require_once GMB_PLUGIN_PATH.'includes/class-gmb-engine.php';
+			require_once GMB_PLUGIN_PATH.'includes/admin/class-gmb-settings.php';
+			require_once GMB_PLUGIN_PATH.'includes/misc-functions.php';
 
-			if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+			if (is_admin() || (defined('WP_CLI') && WP_CLI)) {
 
 				//Upgrades
-				require_once GMB_PLUGIN_PATH . 'includes/admin/upgrades/upgrade-functions.php';
-				require_once GMB_PLUGIN_PATH . 'includes/admin/upgrades/upgrades.php';
+				require_once GMB_PLUGIN_PATH.'includes/admin/upgrades/upgrade-functions.php';
+				require_once GMB_PLUGIN_PATH.'includes/admin/upgrades/upgrades.php';
 
 				//Admin
-				require_once GMB_PLUGIN_PATH . 'includes/admin/admin-actions.php';
-				require_once GMB_PLUGIN_PATH . 'includes/admin/class-gmb-admin.php';
-				require_once GMB_PLUGIN_PATH . 'includes/admin/class-gmb-shortcode-generator.php';
-				require_once GMB_PLUGIN_PATH . 'includes/admin/system-info.php';
+				require_once GMB_PLUGIN_PATH.'includes/admin/admin-actions.php';
+				require_once GMB_PLUGIN_PATH.'includes/admin/class-gmb-admin.php';
+				require_once GMB_PLUGIN_PATH.'includes/admin/class-gmb-shortcode-generator.php';
+				require_once GMB_PLUGIN_PATH.'includes/admin/system-info.php';
 
 			}
 
@@ -262,26 +262,26 @@ 
 		 */
 		public function load_textdomain() {
 			// Set filter for Give's languages directory
-			$gmb_lang_dir = dirname( plugin_basename( GMB_PLUGIN_FILE ) ) . '/languages/';
-			$gmb_lang_dir = apply_filters( 'gmb_languages_directory', $gmb_lang_dir );
+			$gmb_lang_dir = dirname(plugin_basename(GMB_PLUGIN_FILE)).'/languages/';
+			$gmb_lang_dir = apply_filters('gmb_languages_directory', $gmb_lang_dir);
 
 			// Traditional WordPress plugin locale filter
-			$locale = apply_filters( 'plugin_locale', get_locale(), 'gmb' );
-			$mofile = sprintf( '%1$s-%2$s.mo', 'gmb', $locale );
+			$locale = apply_filters('plugin_locale', get_locale(), 'gmb');
+			$mofile = sprintf('%1$s-%2$s.mo', 'gmb', $locale);
 
 			// Setup paths to current locale file
-			$mofile_local  = $gmb_lang_dir . $mofile;
-			$mofile_global = WP_LANG_DIR . '/gmb/' . $mofile;
+			$mofile_local  = $gmb_lang_dir.$mofile;
+			$mofile_global = WP_LANG_DIR.'/gmb/'.$mofile;
 
-			if ( file_exists( $mofile_global ) ) {
+			if (file_exists($mofile_global)) {
 				// Look in global /wp-content/languages/gmb folder
-				load_textdomain( 'gmb', $mofile_global );
-			} elseif ( file_exists( $mofile_local ) ) {
+				load_textdomain('gmb', $mofile_global);
+			} elseif (file_exists($mofile_local)) {
 				// Look in local /wp-content/plugins/gmb/languages/ folder
-				load_textdomain( 'gmb', $mofile_local );
+				load_textdomain('gmb', $mofile_local);
 			} else {
 				// Load the default language files
-				load_plugin_textdomain( 'gmb', false, $gmb_lang_dir );
+				load_plugin_textdomain('gmb', false, $gmb_lang_dir);
 			}
 		}
 

includes/admin/class-gmb-shortcode-generator.php

Doc Comments -1 removed lines

@@ -143,7 +143,6 @@
 	 * Display the contents of the iframe used when the GPR Shortcode Generator is clicked
 	 * TinyMCE button is clicked.
 	 *
-	 * @param int $ver
 	 *
 	 * @return int
 	 */

Spacing +73 added lines, -73 removed lines

@@ -16,13 +16,13 @@ 
 
 		$this->plugin_slug = Google_Maps_Builder()->get_plugin_slug();
 
-		add_action( 'admin_head', array( $this, 'add_shortcode_button' ), 20 );
-		add_filter( 'tiny_mce_version', array( $this, 'refresh_mce' ), 20 );
-		add_filter( 'mce_external_languages', array( $this, 'add_tinymce_lang' ), 20, 1 );
+		add_action('admin_head', array($this, 'add_shortcode_button'), 20);
+		add_filter('tiny_mce_version', array($this, 'refresh_mce'), 20);
+		add_filter('mce_external_languages', array($this, 'add_tinymce_lang'), 20, 1);
 
 		// Tiny MCE button icon
-		add_action( 'admin_head', array( $this, 'set_tinymce_button_icon' ) );
-		add_action( 'wp_ajax_gmb_shortcode_iframe', array( $this, 'gmb_shortcode_iframe' ), 9 );
+		add_action('admin_head', array($this, 'set_tinymce_button_icon'));
+		add_action('wp_ajax_gmb_shortcode_iframe', array($this, 'gmb_shortcode_iframe'), 9);
 	}
 
 	/**
@@ -31,22 +31,22 @@ 
 	public function add_shortcode_button() {
 		global $post, $pagenow;
 
-		if ( ! current_user_can( 'edit_posts' ) && ! current_user_can( 'edit_pages' ) ) {
+		if ( ! current_user_can('edit_posts') && ! current_user_can('edit_pages')) {
 			return;
 		}
 		//Be sure to not allow on out post type
-		if ( ! isset( $post->post_type ) || $post->post_type === 'google_maps' ) {
+		if ( ! isset($post->post_type) || $post->post_type === 'google_maps') {
 			return;
 		}
 
-		if ( ! in_array( $pagenow, array( 'post.php', 'post-new.php' ) ) ) {
+		if ( ! in_array($pagenow, array('post.php', 'post-new.php'))) {
 			return;
 		}
 
 		// check if WYSIWYG is enabled
-		if ( get_user_option( 'rich_editing' ) == 'true' ) {
-			add_filter( 'mce_external_plugins', array( $this, 'add_shortcode_tinymce_plugin' ), 10 );
-			add_filter( 'mce_buttons', array( $this, 'register_shortcode_button' ), 10 );
+		if (get_user_option('rich_editing') == 'true') {
+			add_filter('mce_external_plugins', array($this, 'add_shortcode_tinymce_plugin'), 10);
+			add_filter('mce_buttons', array($this, 'register_shortcode_button'), 10);
 		}
 	}
 
@@ -57,8 +57,8 @@ 
 	 *
 	 * @return array
 	 */
-	public function add_tinymce_lang( $arr ) {
-		$arr['gmb_shortcode_button'] = GMB_PLUGIN_PATH . '/includes/admin/shortcode-generator-i18n.php';
+	public function add_tinymce_lang($arr) {
+		$arr['gmb_shortcode_button'] = GMB_PLUGIN_PATH.'/includes/admin/shortcode-generator-i18n.php';
 
 		return $arr;
 	}
@@ -70,9 +70,9 @@ 
 	 *
 	 * @return array
 	 */
-	public function register_shortcode_button( $buttons ) {
+	public function register_shortcode_button($buttons) {
 
-		array_push( $buttons, '|', 'gmb_shortcode_button' );
+		array_push($buttons, '|', 'gmb_shortcode_button');
 
 		return $buttons;
 	}
@@ -84,9 +84,9 @@ 
 	 *
 	 * @return array
 	 */
-	public function add_shortcode_tinymce_plugin( $plugin_array ) {
+	public function add_shortcode_tinymce_plugin($plugin_array) {
 
-		$plugin_array['gmb_shortcode_button'] = GMB_PLUGIN_URL . 'assets/js/admin/admin-shortcode.js';
+		$plugin_array['gmb_shortcode_button'] = GMB_PLUGIN_URL.'assets/js/admin/admin-shortcode.js';
 
 		return $plugin_array;
 	}
@@ -98,7 +98,7 @@ 
 	 *
 	 * @return int
 	 */
-	public function refresh_mce( $ver ) {
+	public function refresh_mce($ver) {
 		$ver += 3;
 
 		return $ver;
@@ -148,12 +148,12 @@ 
 	 * @return int
 	 */
 	public static function gmb_shortcode_iframe() {
-		set_current_screen( 'google-maps-builder' );
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		set_current_screen('google-maps-builder');
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
 		//Shortcode Generator Specific JS
-		wp_register_script( 'gmb-shortcode-generator', GMB_PLUGIN_URL . 'assets/js/admin/shortcode-iframe' . $suffix . '.js', array( 'jquery' ) );
-		wp_enqueue_script( 'gmb-shortcode-generator' );
+		wp_register_script('gmb-shortcode-generator', GMB_PLUGIN_URL.'assets/js/admin/shortcode-iframe'.$suffix.'.js', array('jquery'));
+		wp_enqueue_script('gmb-shortcode-generator');
 
 		iframe_header(); ?>
 
@@ -209,31 +209,31 @@ 
 		</style>
 		<div class="wrap" id="gmb-wrap">
 			<form id="gmb_settings" style="float: left; width: 100%;">
-				<?php do_action( 'gmb_shortcode_iframe_before' ); ?>
+				<?php do_action('gmb_shortcode_iframe_before'); ?>
 				<fieldset id="gmb_location_lookup_fields" class="gmb-place-search-wrap clear" style="margin:1em 0;">
 					<div class="gmb-map-select">
-						<label for="gmb_location_lookup"><strong><?php _e( 'Choose a Map', 'google-maps-builder' ); ?></strong></label>
+						<label for="gmb_location_lookup"><strong><?php _e('Choose a Map', 'google-maps-builder'); ?></strong></label>
 						<?php echo self::maps_dropdown(); ?>
 					</div>
 				</fieldset>
 
 				<div class="updated new-shortcode">
-					<p><?php _e( '<strong>Insert Shortcode</strong>: Select your desired map from the dropdown above then click create shortcode below.', 'google-maps-builder' ); ?></p>
+					<p><?php _e('<strong>Insert Shortcode</strong>: Select your desired map from the dropdown above then click create shortcode below.', 'google-maps-builder'); ?></p>
 				</div>
 
 				<div class="updated gmb-edit-shortcode" style="display: none;">
-					<p><?php _e( '<strong>Edit Active Shortcode:</strong> Customize the map for this shortcode by modifying the map selection above.', 'google-maps-builder' ); ?></p>
+					<p><?php _e('<strong>Edit Active Shortcode:</strong> Customize the map for this shortcode by modifying the map selection above.', 'google-maps-builder'); ?></p>
 				</div>
 
-				<?php do_action( 'gmb_shortcode_iframe_after' ); ?>
+				<?php do_action('gmb_shortcode_iframe_after'); ?>
 
 				<fieldset class="gmb-shortcode-submit">
-					<input id="gmb_submit" type="submit" class="button-small button-primary" value="<?php _e( 'Create Shortcode', 'google-maps-builder' ); ?>" />
-					<input id="gmb_cancel" type="button" class="button-small button-secondary" value="<?php _e( 'Cancel', 'google-maps-builder' ); ?>" />
+					<input id="gmb_submit" type="submit" class="button-small button-primary" value="<?php _e('Create Shortcode', 'google-maps-builder'); ?>" />
+					<input id="gmb_cancel" type="button" class="button-small button-secondary" value="<?php _e('Cancel', 'google-maps-builder'); ?>" />
 				</fieldset>
 
 			</form>
-			<a href="https://wordimpress.com/plugins/maps-builder-pro?utm_source=MBF&utm_medium=BANNER&utm_content=SHORTCODE&utm_campaign=MBF%20Shortcode" class="button button-small shortcode-upsell" target="_blank"><?php _e( 'Go Pro', 'google-maps-builder' ); ?>
+			<a href="https://wordimpress.com/plugins/maps-builder-pro?utm_source=MBF&utm_medium=BANNER&utm_content=SHORTCODE&utm_campaign=MBF%20Shortcode" class="button button-small shortcode-upsell" target="_blank"><?php _e('Go Pro', 'google-maps-builder'); ?>
 				<span class="dashicons dashicons-external"></span></a>
 		</div>
 
@@ -253,7 +253,7 @@ 
 	 *
 	 * @return string $output Give forms dropdown
 	 */
-	public static function maps_dropdown( $args = array() ) {
+	public static function maps_dropdown($args = array()) {
 
 		$defaults = array(
 			'name'        => 'gmb-maps',
@@ -263,43 +263,43 @@ 
 			'selected'    => 0,
 			'chosen'      => false,
 			'number'      => 30,
-			'placeholder' => __( 'Select a Map', 'google-maps-builder' )
+			'placeholder' => __('Select a Map', 'google-maps-builder')
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		$maps = get_posts( array(
+		$maps = get_posts(array(
 			'post_type'      => 'google_maps',
 			'orderby'        => 'title',
 			'order'          => 'ASC',
 			'posts_per_page' => $args['number']
-		) );
+		));
 
 		$options = array();
 
-		if ( $maps ) {
-			$options[0] = __( 'Select a Map', 'google-maps-builder' );
-			foreach ( $maps as $map ) {
-				$options[ absint( $map->ID ) ] = esc_html( $map->post_title );
+		if ($maps) {
+			$options[0] = __('Select a Map', 'google-maps-builder');
+			foreach ($maps as $map) {
+				$options[absint($map->ID)] = esc_html($map->post_title);
 			}
 		} else {
-			$options[0] = __( 'No Maps Found', 'google-maps-builder' );
+			$options[0] = __('No Maps Found', 'google-maps-builder');
 		}
 
 		// This ensures that any selected maps are included in the drop down
-		if ( is_array( $args['selected'] ) ) {
-			foreach ( $args['selected'] as $item ) {
-				if ( ! in_array( $item, $options ) ) {
-					$options[ $item ] = get_the_title( $item );
+		if (is_array($args['selected'])) {
+			foreach ($args['selected'] as $item) {
+				if ( ! in_array($item, $options)) {
+					$options[$item] = get_the_title($item);
 				}
 			}
-		} elseif ( is_numeric( $args['selected'] ) && $args['selected'] !== 0 ) {
-			if ( ! in_array( $args['selected'], $options ) ) {
-				$options[ $args['selected'] ] = get_the_title( $args['selected'] );
+		} elseif (is_numeric($args['selected']) && $args['selected'] !== 0) {
+			if ( ! in_array($args['selected'], $options)) {
+				$options[$args['selected']] = get_the_title($args['selected']);
 			}
 		}
 
-		$output = self::select( array(
+		$output = self::select(array(
 			'name'             => $args['name'],
 			'selected'         => $args['selected'],
 			'id'               => $args['id'],
@@ -310,7 +310,7 @@ 
 			'placeholder'      => $args['placeholder'],
 			'show_option_all'  => false,
 			'show_option_none' => false
-		) );
+		));
 
 		return $output;
 	}
@@ -325,7 +325,7 @@ 
 	 *
 	 * @return string
 	 */
-	public static function select( $args = array() ) {
+	public static function select($args = array()) {
 
 		$defaults = array(
 			'options'          => array(),
@@ -336,59 +336,59 @@ 
 			'chosen'           => false,
 			'placeholder'      => null,
 			'multiple'         => false,
-			'show_option_all'  => _x( 'All', 'all dropdown items', 'google-maps-builder' ),
-			'show_option_none' => _x( 'None', 'no dropdown items', 'google-maps-builder' )
+			'show_option_all'  => _x('All', 'all dropdown items', 'google-maps-builder'),
+			'show_option_none' => _x('None', 'no dropdown items', 'google-maps-builder')
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		if ( $args['multiple'] ) {
+		if ($args['multiple']) {
 			$multiple = ' MULTIPLE';
 		} else {
 			$multiple = '';
 		}
 
-		if ( $args['chosen'] ) {
+		if ($args['chosen']) {
 			$args['class'] .= 'gmb-select-chosen';
 		}
 
-		if ( $args['placeholder'] ) {
+		if ($args['placeholder']) {
 			$placeholder = $args['placeholder'];
 		} else {
 			$placeholder = '';
 		}
 
-		$output = '<select name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( sanitize_key( str_replace( '-', '_', $args['id'] ) ) ) . '" class="gmb-select ' . esc_attr( $args['class'] ) . '"' . $multiple . ' data-placeholder="' . $placeholder . '">';
+		$output = '<select name="'.esc_attr($args['name']).'" id="'.esc_attr(sanitize_key(str_replace('-', '_', $args['id']))).'" class="gmb-select '.esc_attr($args['class']).'"'.$multiple.' data-placeholder="'.$placeholder.'">';
 
-		if ( $args['show_option_all'] ) {
-			if ( $args['multiple'] ) {
-				$selected = selected( true, in_array( 0, $args['selected'] ), false );
+		if ($args['show_option_all']) {
+			if ($args['multiple']) {
+				$selected = selected(true, in_array(0, $args['selected']), false);
 			} else {
-				$selected = selected( $args['selected'], 0, false );
+				$selected = selected($args['selected'], 0, false);
 			}
-			$output .= '<option value="all"' . $selected . '>' . esc_html( $args['show_option_all'] ) . '</option>';
+			$output .= '<option value="all"'.$selected.'>'.esc_html($args['show_option_all']).'</option>';
 		}
 
-		if ( ! empty( $args['options'] ) ) {
+		if ( ! empty($args['options'])) {
 
-			if ( $args['show_option_none'] ) {
-				if ( $args['multiple'] ) {
-					$selected = selected( true, in_array( - 1, $args['selected'] ), false );
+			if ($args['show_option_none']) {
+				if ($args['multiple']) {
+					$selected = selected(true, in_array( - 1, $args['selected'] ), false);
 				} else {
-					$selected = selected( $args['selected'], - 1, false );
+					$selected = selected($args['selected'], - 1, false);
 				}
-				$output .= '<option value="-1"' . $selected . '>' . esc_html( $args['show_option_none'] ) . '</option>';
+				$output .= '<option value="-1"'.$selected.'>'.esc_html($args['show_option_none']).'</option>';
 			}
 
-			foreach ( $args['options'] as $key => $option ) {
+			foreach ($args['options'] as $key => $option) {
 
-				if ( $args['multiple'] && is_array( $args['selected'] ) ) {
-					$selected = selected( true, in_array( $key, $args['selected'] ), false );
+				if ($args['multiple'] && is_array($args['selected'])) {
+					$selected = selected(true, in_array($key, $args['selected']), false);
 				} else {
-					$selected = selected( $args['selected'], $key, false );
+					$selected = selected($args['selected'], $key, false);
 				}
 
-				$output .= '<option value="' . esc_attr( $key ) . '"' . $selected . '>' . esc_html( $option ) . '</option>';
+				$output .= '<option value="'.esc_attr($key).'"'.$selected.'>'.esc_html($option).'</option>';
 			}
 		}
 

includes/class-gmb-scripts.php

Doc Comments +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 	 *
 	 * @description: Determine if Google Maps API script has already been loaded
 	 * @since      : 1.0.3
-	 * @return bool $multiple_google_maps_api
+	 * @return false|null $multiple_google_maps_api
 	 */
 	function check_for_multiple_google_maps_api_calls() {
 

Spacing +100 added lines, -100 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -32,23 +32,23 @@ 
 		$this->plugin_slug = Google_Maps_Builder()->get_plugin_slug();
 
 		//Frontend
-		add_action( 'wp_enqueue_scripts', array( $this, 'load_frontend_scripts' ), 11 );
+		add_action('wp_enqueue_scripts', array($this, 'load_frontend_scripts'), 11);
 
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_frontend_styles' ) );
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_frontend_styles'));
 
-		add_action( 'wp_print_scripts', array( $this, 'check_for_multiple_google_maps_api_calls' ) );
+		add_action('wp_print_scripts', array($this, 'check_for_multiple_google_maps_api_calls'));
 
 
 		//Admin
-		add_action( 'admin_init', array( $this, 'multiple_maps_enqueued_warning_ignore' ) );
+		add_action('admin_init', array($this, 'multiple_maps_enqueued_warning_ignore'));
 
-		add_action( 'admin_notices', array( $this, 'multiple_maps_enqueued_warning' ) );
+		add_action('admin_notices', array($this, 'multiple_maps_enqueued_warning'));
 
-		add_action( 'admin_head', array( $this, 'icon_style' ) );
+		add_action('admin_head', array($this, 'icon_style'));
 
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_styles' ) );
+		add_action('admin_enqueue_scripts', array($this, 'enqueue_admin_styles'));
 
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ) );
+		add_action('admin_enqueue_scripts', array($this, 'enqueue_admin_scripts'));
 	}
 
 
@@ -69,35 +69,35 @@ 
 	function load_frontend_scripts() {
 
 		//Google Maps API
-		$google_maps_settings     = get_option( 'gmb_settings' );
+		$google_maps_settings     = get_option('gmb_settings');
 		$google_maps_api_url_args = array(
 			'sensor'    => 'false',
 			'libraries' => 'places'
 		);
 		//Google Maps API key present?
-		if ( ! empty( $google_maps_settings['gmb_maps_api_key'] ) ) {
+		if ( ! empty($google_maps_settings['gmb_maps_api_key'])) {
 			$google_maps_api_url_args['key'] = $google_maps_settings['gmb_maps_api_key'];
 		}
 
-		$google_maps_api_url = add_query_arg( $google_maps_api_url_args, 'https://maps.googleapis.com/maps/api/js?v=3.exp' );
+		$google_maps_api_url = add_query_arg($google_maps_api_url_args, 'https://maps.googleapis.com/maps/api/js?v=3.exp');
 
-		wp_register_script( 'google-maps-builder-gmaps', $google_maps_api_url, array( 'jquery' ), false, true );
-		wp_enqueue_script( 'google-maps-builder-gmaps' );
+		wp_register_script('google-maps-builder-gmaps', $google_maps_api_url, array('jquery'), false, true);
+		wp_enqueue_script('google-maps-builder-gmaps');
 
 
-		$js_dir     = GMB_PLUGIN_URL . 'assets/js/frontend/';
-		$js_plugins = GMB_PLUGIN_URL . 'assets/js/plugins/';
-		$suffix     = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$js_dir     = GMB_PLUGIN_URL.'assets/js/frontend/';
+		$js_plugins = GMB_PLUGIN_URL.'assets/js/plugins/';
+		$suffix     = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
 		// Use minified libraries if SCRIPT_DEBUG is turned off
-		wp_register_script( $this->plugin_slug . '-plugin-script', $js_dir . 'google-maps-builder' . $suffix . '.js', array( 'jquery' ), GMB_VERSION, true );
-		wp_register_script( 'google-maps-builder-maps-icons', GMB_PLUGIN_URL . 'includes/libraries/map-icons/js/map-icons.js', array( 'jquery' ), GMB_VERSION, true );
+		wp_register_script($this->plugin_slug.'-plugin-script', $js_dir.'google-maps-builder'.$suffix.'.js', array('jquery'), GMB_VERSION, true);
+		wp_register_script('google-maps-builder-maps-icons', GMB_PLUGIN_URL.'includes/libraries/map-icons/js/map-icons.js', array('jquery'), GMB_VERSION, true);
 
-		wp_enqueue_script( 'google-maps-builder-gmaps' );
-		wp_enqueue_script( 'google-maps-builder-plugin-script' );
-		wp_enqueue_script( 'google-maps-builder-maps-icons' );
+		wp_enqueue_script('google-maps-builder-gmaps');
+		wp_enqueue_script('google-maps-builder-plugin-script');
+		wp_enqueue_script('google-maps-builder-maps-icons');
 
-		wp_localize_script( $this->plugin_slug . '-plugin-script', 'gmb_data', array() );
+		wp_localize_script($this->plugin_slug.'-plugin-script', 'gmb_data', array());
 
 
 	}
@@ -111,13 +111,13 @@ 
 	function enqueue_frontend_styles() {
 
 		//Plugin Frontend Styles
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
-		wp_register_style( 'google-maps-builder-plugin-styles', GMB_PLUGIN_URL . 'assets/css/google-maps-builder' . $suffix . '.css', array(), GMB_VERSION );
-		wp_enqueue_style( 'google-maps-builder-plugin-styles' );
+		wp_register_style('google-maps-builder-plugin-styles', GMB_PLUGIN_URL.'assets/css/google-maps-builder'.$suffix.'.css', array(), GMB_VERSION);
+		wp_enqueue_style('google-maps-builder-plugin-styles');
 
-		wp_register_style( 'google-maps-builder-map-icons', GMB_PLUGIN_URL . 'includes/libraries/map-icons/css/map-icons.css', array(), GMB_VERSION );
-		wp_enqueue_style( 'google-maps-builder-map-icons' );
+		wp_register_style('google-maps-builder-map-icons', GMB_PLUGIN_URL.'includes/libraries/map-icons/css/map-icons.css', array(), GMB_VERSION);
+		wp_enqueue_style('google-maps-builder-map-icons');
 
 
 	}
@@ -134,27 +134,27 @@ 
 
 		global $wp_scripts;
 
-		if ( ! $wp_scripts ) {
+		if ( ! $wp_scripts) {
 			return false;
 		}
 
 		//loop through registered scripts
-		foreach ( $wp_scripts->registered as $registered_script ) {
+		foreach ($wp_scripts->registered as $registered_script) {
 			//find any that have the google script as the source, ensure it's not enqueud by this plugin
 			if (
-				strpos( $registered_script->src, 'maps.googleapis.com/maps/api/js' ) !== false &&
-				strpos( $registered_script->handle, 'google-maps-builder' ) === false
+				strpos($registered_script->src, 'maps.googleapis.com/maps/api/js') !== false &&
+				strpos($registered_script->handle, 'google-maps-builder') === false
 			) {
 
 				//Remove this script from loading
-				wp_deregister_script( $registered_script->handle );
-				wp_dequeue_script( $registered_script->handle );
+				wp_deregister_script($registered_script->handle);
+				wp_dequeue_script($registered_script->handle);
 
 
 				$this->google_maps_conflict = true;
 				//ensure we can detect scripts on the frontend from backend; we'll use an option to do this
-				if ( ! is_admin() ) {
-					update_option( 'gmb_google_maps_conflict', true );
+				if ( ! is_admin()) {
+					update_option('gmb_google_maps_conflict', true);
 				}
 
 			}
@@ -162,8 +162,8 @@ 
 		}
 
 		//Ensure that if user resolved conflict on frontend we remove the option flag
-		if ( $this->google_maps_conflict === false && ! is_admin() ) {
-			update_option( 'gmb_google_maps_conflict', false );
+		if ($this->google_maps_conflict === false && ! is_admin()) {
+			update_option('gmb_google_maps_conflict', false);
 		}
 
 	}
@@ -178,8 +178,8 @@ 
 		global $current_user;
 		$user_id = $current_user->ID;
 		/* If user clicks to ignore the notice, add that to their user meta */
-		if ( isset( $_GET['gmb_ignore_maps_notice'] ) && $_GET['gmb_ignore_maps_notice'] == '0' ) {
-			add_user_meta( $user_id, 'gmb_ignore_maps_notice', 'true', true );
+		if (isset($_GET['gmb_ignore_maps_notice']) && $_GET['gmb_ignore_maps_notice'] == '0') {
+			add_user_meta($user_id, 'gmb_ignore_maps_notice', 'true', true);
 		}
 	}
 
@@ -198,18 +198,18 @@ 
 
 		global $current_user;
 		$user_id                  = $current_user->ID;
-		$gmb_google_maps_conflict = get_option( 'gmb_google_maps_conflict' );
+		$gmb_google_maps_conflict = get_option('gmb_google_maps_conflict');
 
 		// Check that the user hasn't already clicked to ignore the message and that they have appropriate permissions
 		// And, most importantly, that Google Maps are actually being enqueued twice
-		if ( ! get_user_meta( $user_id, 'gmb_ignore_maps_notice' ) && current_user_can( 'install_plugins' ) && $this->google_maps_conflict === true || ! get_user_meta( $user_id, 'gmb_ignore_maps_notice' ) && current_user_can( 'install_plugins' ) && $gmb_google_maps_conflict === '1' ) {
+		if ( ! get_user_meta($user_id, 'gmb_ignore_maps_notice') && current_user_can('install_plugins') && $this->google_maps_conflict === true || ! get_user_meta($user_id, 'gmb_ignore_maps_notice') && current_user_can('install_plugins') && $gmb_google_maps_conflict === '1') {
 
 			echo '<div class="updated error clearfix"><p>';
-			parse_str( $_SERVER['QUERY_STRING'], $params );
-			_e( '<strong>Google Maps API Conflict Detected:</strong> It appears that a plugin or theme that you are using is also including the Google Maps API JavaScript on your website. This means there may be a conflict with the Maps Builder plugin. Please verify your maps are functioning properly prior to dismissing this notice.' );
+			parse_str($_SERVER['QUERY_STRING'], $params);
+			_e('<strong>Google Maps API Conflict Detected:</strong> It appears that a plugin or theme that you are using is also including the Google Maps API JavaScript on your website. This means there may be a conflict with the Maps Builder plugin. Please verify your maps are functioning properly prior to dismissing this notice.');
 			echo '</p>';
 
-			printf( __( '<a href="%1$s" rel="nofollow" class="button" style="display:inline-block; margin: 0 0 10px;">Hide Warning</a>' ), '?' . http_build_query( array_merge( $params, array( 'gmb_ignore_maps_notice' => '0' ) ) ) );
+			printf(__('<a href="%1$s" rel="nofollow" class="button" style="display:inline-block; margin: 0 0 10px;">Hide Warning</a>'), '?'.http_build_query(array_merge($params, array('gmb_ignore_maps_notice' => '0'))));
 
 			echo '</div>';
 
@@ -245,19 +245,19 @@ 
 	 * @return    null
 	 *
 	 */
-	function enqueue_admin_styles( $hook ) {
+	function enqueue_admin_styles($hook) {
 
 		global $post;
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
 		//Only enqueue scripts for CPT on post type screen
-		if ( ( $hook == 'post-new.php' || $hook == 'post.php' ) && 'google_maps' === $post->post_type || $hook == 'google_maps_page_gmb_settings' ) {
+		if (($hook == 'post-new.php' || $hook == 'post.php') && 'google_maps' === $post->post_type || $hook == 'google_maps_page_gmb_settings') {
 
-			wp_register_style( $this->plugin_slug . '-admin-styles', GMB_PLUGIN_URL . 'assets/css/gmb-admin' . $suffix . '.css', array(), GMB_VERSION );
-			wp_enqueue_style( $this->plugin_slug . '-admin-styles' );
+			wp_register_style($this->plugin_slug.'-admin-styles', GMB_PLUGIN_URL.'assets/css/gmb-admin'.$suffix.'.css', array(), GMB_VERSION);
+			wp_enqueue_style($this->plugin_slug.'-admin-styles');
 
-			wp_register_style( $this->plugin_slug . '-map-icons', GMB_PLUGIN_URL . 'includes/libraries/map-icons/css/map-icons.css', array(), GMB_VERSION );
-			wp_enqueue_style( $this->plugin_slug . '-map-icons' );
+			wp_register_style($this->plugin_slug.'-map-icons', GMB_PLUGIN_URL.'includes/libraries/map-icons/css/map-icons.css', array(), GMB_VERSION);
+			wp_enqueue_style($this->plugin_slug.'-map-icons');
 
 		}
 
@@ -272,100 +272,100 @@ 
 	 *
 	 * @return    null    Return early if no settings page is registered.
 	 */
-	function enqueue_admin_scripts( $hook ) {
+	function enqueue_admin_scripts($hook) {
 		global $post;
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+		$suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '' : '.min';
 
-		$js_dir     = GMB_PLUGIN_URL . 'assets/js/admin/';
-		$js_plugins = GMB_PLUGIN_URL . 'assets/js/plugins/';
+		$js_dir     = GMB_PLUGIN_URL.'assets/js/admin/';
+		$js_plugins = GMB_PLUGIN_URL.'assets/js/plugins/';
 
 		//Builder Google Maps API URL
-		$google_maps_api_key      = gmb_get_option( 'gmb_maps_api_key' );
+		$google_maps_api_key      = gmb_get_option('gmb_maps_api_key');
 		$google_maps_api_url_args = array(
 			'sensor'    => 'false',
 			'libraries' => 'places'
 		);
 		//Google Maps API key present?
-		if ( ! empty( $google_maps_api_key ) ) {
+		if ( ! empty($google_maps_api_key)) {
 			$google_maps_api_url_args['key'] = $google_maps_api_key;
 		}
-		$google_maps_api_url = add_query_arg( $google_maps_api_url_args, 'https://maps.googleapis.com/maps/api/js?v=3.exp' );
+		$google_maps_api_url = add_query_arg($google_maps_api_url_args, 'https://maps.googleapis.com/maps/api/js?v=3.exp');
 
 		//Only enqueue scripts for CPT on post type screen
-		if ( ( $hook == 'post-new.php' || $hook == 'post.php' ) && 'google_maps' === $post->post_type ) {
+		if (($hook == 'post-new.php' || $hook == 'post.php') && 'google_maps' === $post->post_type) {
 
-			wp_enqueue_style( 'wp-color-picker' );
+			wp_enqueue_style('wp-color-picker');
 
-			wp_register_script( $this->plugin_slug . '-admin-magnific-popup', $js_plugins . 'gmb-magnific' . $suffix . '.js', array( 'jquery' ), GMB_VERSION );
-			wp_enqueue_script( $this->plugin_slug . '-admin-magnific-popup' );
+			wp_register_script($this->plugin_slug.'-admin-magnific-popup', $js_plugins.'gmb-magnific'.$suffix.'.js', array('jquery'), GMB_VERSION);
+			wp_enqueue_script($this->plugin_slug.'-admin-magnific-popup');
 
-			wp_register_script( $this->plugin_slug . '-admin-gmaps', $google_maps_api_url, array( 'jquery' ) );
-			wp_enqueue_script( $this->plugin_slug . '-admin-gmaps' );
+			wp_register_script($this->plugin_slug.'-admin-gmaps', $google_maps_api_url, array('jquery'));
+			wp_enqueue_script($this->plugin_slug.'-admin-gmaps');
 
-			wp_register_script( $this->plugin_slug . '-map-icons', GMB_PLUGIN_URL . 'includes/libraries/map-icons/js/map-icons.js', array( 'jquery' ) );
-			wp_enqueue_script( $this->plugin_slug . '-map-icons' );
+			wp_register_script($this->plugin_slug.'-map-icons', GMB_PLUGIN_URL.'includes/libraries/map-icons/js/map-icons.js', array('jquery'));
+			wp_enqueue_script($this->plugin_slug.'-map-icons');
 
-			wp_register_script( $this->plugin_slug . '-admin-qtip', $js_plugins . 'jquery.qtip' . $suffix . '.js', array( 'jquery' ), GMB_VERSION, true );
-			wp_enqueue_script( $this->plugin_slug . '-admin-qtip' );
+			wp_register_script($this->plugin_slug.'-admin-qtip', $js_plugins.'jquery.qtip'.$suffix.'.js', array('jquery'), GMB_VERSION, true);
+			wp_enqueue_script($this->plugin_slug.'-admin-qtip');
 
 			//Map base
-			wp_register_script( $this->plugin_slug . '-admin-map-builder', $js_dir . 'admin-google-map' . $suffix . '.js', array(
+			wp_register_script($this->plugin_slug.'-admin-map-builder', $js_dir.'admin-google-map'.$suffix.'.js', array(
 				'jquery',
 				'wp-color-picker'
-			), GMB_VERSION );
-			wp_enqueue_script( $this->plugin_slug . '-admin-map-builder' );
+			), GMB_VERSION);
+			wp_enqueue_script($this->plugin_slug.'-admin-map-builder');
 
 			//Modal builder
-			wp_register_script( $this->plugin_slug . '-admin-magnific-builder', $js_dir . 'admin-maps-magnific' . $suffix . '.js', array(
+			wp_register_script($this->plugin_slug.'-admin-magnific-builder', $js_dir.'admin-maps-magnific'.$suffix.'.js', array(
 				'jquery',
 				'wp-color-picker'
-			), GMB_VERSION );
-			wp_enqueue_script( $this->plugin_slug . '-admin-magnific-builder' );
+			), GMB_VERSION);
+			wp_enqueue_script($this->plugin_slug.'-admin-magnific-builder');
 
 
 			//Map Controls
-			wp_register_script( $this->plugin_slug . '-admin-map-controls', $js_dir . 'admin-maps-controls' . $suffix . '.js', array( 'jquery' ), GMB_VERSION );
-			wp_enqueue_script( $this->plugin_slug . '-admin-map-controls' );
+			wp_register_script($this->plugin_slug.'-admin-map-controls', $js_dir.'admin-maps-controls'.$suffix.'.js', array('jquery'), GMB_VERSION);
+			wp_enqueue_script($this->plugin_slug.'-admin-map-controls');
 
-			$api_key     = gmb_get_option( 'gmb_maps_api_key' );
-			$geolocate   = gmb_get_option( 'gmb_lat_lng' );
-			$post_status = get_post_status( $post->ID );
+			$api_key     = gmb_get_option('gmb_maps_api_key');
+			$geolocate   = gmb_get_option('gmb_lat_lng');
+			$post_status = get_post_status($post->ID);
 
 			$maps_data = array(
 				'api_key'           => $api_key,
-				'geolocate_setting' => isset( $geolocate['geolocate_map'] ) ? $geolocate['geolocate_map'] : 'yes',
-				'default_lat'       => isset( $geolocate['latitude'] ) ? $geolocate['latitude'] : '32.715738',
-				'default_lng'       => isset( $geolocate['longitude'] ) ? $geolocate['longitude'] : '-117.16108380000003',
+				'geolocate_setting' => isset($geolocate['geolocate_map']) ? $geolocate['geolocate_map'] : 'yes',
+				'default_lat'       => isset($geolocate['latitude']) ? $geolocate['latitude'] : '32.715738',
+				'default_lng'       => isset($geolocate['longitude']) ? $geolocate['longitude'] : '-117.16108380000003',
 				'plugin_url'        => GMB_PLUGIN_URL,
-				'default_marker'    => apply_filters( 'gmb_default_marker', GMB_PLUGIN_URL . 'assets/img/spotlight-poi.png' ),
-				'ajax_loader'       => set_url_scheme( apply_filters( 'gmb_ajax_preloader_img', GMB_PLUGIN_URL . 'assets/images/spinner.gif' ), 'relative' ),
-				'snazzy'            => GMB_PLUGIN_URL . 'assets/js/admin/snazzy.json',
-				'modal_default'     => gmb_get_option( 'gmb_open_builder' ),
+				'default_marker'    => apply_filters('gmb_default_marker', GMB_PLUGIN_URL.'assets/img/spotlight-poi.png'),
+				'ajax_loader'       => set_url_scheme(apply_filters('gmb_ajax_preloader_img', GMB_PLUGIN_URL.'assets/images/spinner.gif'), 'relative'),
+				'snazzy'            => GMB_PLUGIN_URL.'assets/js/admin/snazzy.json',
+				'modal_default'     => gmb_get_option('gmb_open_builder'),
 				'post_status'       => $post_status,
 				'i18n'              => array(
-					'update_map'               => $post_status == 'publish' ? __( 'Update Map', $this->plugin_slug ) : __( 'Publish Map', $this->plugin_slug ),
-					'set_place_types'          => __( 'Update Map', $this->plugin_slug ),
-					'places_selection_changed' => __( 'Place selections have changed.', $this->plugin_slug ),
-					'multiple_places'          => __( 'Hmm, it looks like there are multiple places in this area. Please confirm which place you would like this marker to display:', $this->plugin_slug ),
-					'btn_drop_marker'          => '<span class="dashicons dashicons-location"></span>' . __( 'Drop a Marker', $this->plugin_slug ),
-					'btn_drop_marker_click'    => __( 'Click on the Map', $this->plugin_slug ),
-					'btn_edit_marker'          => __( 'Edit Marker', $this->plugin_slug ),
-					'btn_delete_marker'        => __( 'Delete Marker', $this->plugin_slug ),
+					'update_map'               => $post_status == 'publish' ? __('Update Map', $this->plugin_slug) : __('Publish Map', $this->plugin_slug),
+					'set_place_types'          => __('Update Map', $this->plugin_slug),
+					'places_selection_changed' => __('Place selections have changed.', $this->plugin_slug),
+					'multiple_places'          => __('Hmm, it looks like there are multiple places in this area. Please confirm which place you would like this marker to display:', $this->plugin_slug),
+					'btn_drop_marker'          => '<span class="dashicons dashicons-location"></span>'.__('Drop a Marker', $this->plugin_slug),
+					'btn_drop_marker_click'    => __('Click on the Map', $this->plugin_slug),
+					'btn_edit_marker'          => __('Edit Marker', $this->plugin_slug),
+					'btn_delete_marker'        => __('Delete Marker', $this->plugin_slug),
 				),
 			);
-			wp_localize_script( $this->plugin_slug . '-admin-map-builder', 'gmb_data', $maps_data );
+			wp_localize_script($this->plugin_slug.'-admin-map-builder', 'gmb_data', $maps_data);
 
 		}
 
 		//Setting Scripts
-		if ( $hook == 'google_maps_page_gmb_settings' ) {
+		if ($hook == 'google_maps_page_gmb_settings') {
 
-			wp_register_script( $this->plugin_slug . '-admin-settings', $js_dir . 'admin-settings' . $suffix . '.js', array( 'jquery' ), GMB_VERSION );
-			wp_enqueue_script( $this->plugin_slug . '-admin-settings' );
+			wp_register_script($this->plugin_slug.'-admin-settings', $js_dir.'admin-settings'.$suffix.'.js', array('jquery'), GMB_VERSION);
+			wp_enqueue_script($this->plugin_slug.'-admin-settings');
 
 		}
 
-		wp_enqueue_style( 'dashicons' );
+		wp_enqueue_style('dashicons');
 
 	}
 

uninstall.php

Spacing +1 added lines, -1 removed lines

@@ -10,6 +10,6 @@
  */
 
 // If uninstall not called from WordPress, then exit
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+if ( ! defined('WP_UNINSTALL_PLUGIN')) {
 	exit;
 }
\ No newline at end of file

includes/class-gmb-activate.php

Spacing +61 added lines, -61 removed lines

@@ -22,13 +22,13 @@ 
 		$this->plugin_slug = Google_Maps_Builder()->get_plugin_slug();
 
 		// Activate plugin when new blog is added
-		add_action( 'wpmu_new_blog', array( $this, 'activate_new_site' ) );
+		add_action('wpmu_new_blog', array($this, 'activate_new_site'));
 
 		//Activation tooltips
-		add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_pointer_script_style' ) );
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_pointer_script_style'));
 
 		//Init CPT (after CMB2 -> hence the 10000 priority)
-		add_action( 'init', array( $this, 'setup_post_type' ), 10000 );
+		add_action('init', array($this, 'setup_post_type'), 10000);
 
 	}
 
@@ -43,34 +43,34 @@ 
 	 *                                       WPMU is disabled or plugin is
 	 *                                       activated on an individual blog.
 	 */
-	public static function activate( $network_wide ) {
+	public static function activate($network_wide) {
 
 		//Remove Welcome Message Meta so User Sees it Again
 		global $current_user;
 		$user_id = $current_user->ID;
-		delete_user_meta( $user_id, 'gmb_hide_welcome' );
+		delete_user_meta($user_id, 'gmb_hide_welcome');
 
 		//Display Tooltip
-		$dismissed_pointers = explode( ',', get_user_meta( $user_id, 'dismissed_wp_pointers', true ) );
+		$dismissed_pointers = explode(',', get_user_meta($user_id, 'dismissed_wp_pointers', true));
 
 		// Check if our pointer is among dismissed ones and delete that mofo
-		if ( in_array( 'gmb_welcome_pointer', $dismissed_pointers ) ) {
-			$key = array_search( 'gmb_welcome_pointer', $dismissed_pointers );
-			delete_user_meta( $user_id, 'dismissed_wp_pointers', $key['gmb_welcome_pointer'] );
+		if (in_array('gmb_welcome_pointer', $dismissed_pointers)) {
+			$key = array_search('gmb_welcome_pointer', $dismissed_pointers);
+			delete_user_meta($user_id, 'dismissed_wp_pointers', $key['gmb_welcome_pointer']);
 		}
 
 
 		//Multisite Checks
-		if ( function_exists( 'is_multisite' ) && is_multisite() ) {
+		if (function_exists('is_multisite') && is_multisite()) {
 
-			if ( $network_wide ) {
+			if ($network_wide) {
 
 				// Get all blog ids
 				$blog_ids = self::get_blog_ids();
 
-				foreach ( $blog_ids as $blog_id ) {
+				foreach ($blog_ids as $blog_id) {
 
-					switch_to_blog( $blog_id );
+					switch_to_blog($blog_id);
 					self::single_activate();
 				}
 
@@ -96,18 +96,18 @@ 
 	 *                                       WPMU is disabled or plugin is
 	 *                                       deactivated on an individual blog.
 	 */
-	public static function deactivate( $network_wide ) {
+	public static function deactivate($network_wide) {
 
-		if ( function_exists( 'is_multisite' ) && is_multisite() ) {
+		if (function_exists('is_multisite') && is_multisite()) {
 
-			if ( $network_wide ) {
+			if ($network_wide) {
 
 				// Get all blog ids
 				$blog_ids = self::get_blog_ids();
 
-				foreach ( $blog_ids as $blog_id ) {
+				foreach ($blog_ids as $blog_id) {
 
-					switch_to_blog( $blog_id );
+					switch_to_blog($blog_id);
 					self::single_deactivate();
 
 				}
@@ -129,7 +129,7 @@ 
 	 *
 	 * @param $hook
 	 */
-	function admin_enqueue_pointer_script_style( $hook ) {
+	function admin_enqueue_pointer_script_style($hook) {
 
 		global $post;
 
@@ -140,29 +140,29 @@ 
 		//delete_user_meta( get_current_user_id(), 'dismissed_wp_pointers' );
 
 		// Get array list of dismissed pointers for current user and convert it to array
-		$dismissed_pointers = explode( ',', get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );
-		$key                = array_search( 'gmb_welcome_pointer', $dismissed_pointers ); // $key = 2;
+		$dismissed_pointers = explode(',', get_user_meta(get_current_user_id(), 'dismissed_wp_pointers', true));
+		$key                = array_search('gmb_welcome_pointer', $dismissed_pointers); // $key = 2;
 
 		// Check if our pointer is not among dismissed ones
-		if ( ! in_array( 'gmb_welcome_pointer', $dismissed_pointers ) ) {
+		if ( ! in_array('gmb_welcome_pointer', $dismissed_pointers)) {
 			$enqueue_pointer_script_style = true;
 
 			// Add footer scripts using callback function
-			add_action( 'admin_print_footer_scripts', array( $this, 'welcome_pointer_print_scripts' ) );
+			add_action('admin_print_footer_scripts', array($this, 'welcome_pointer_print_scripts'));
 		}
 
 		// Map Customizer Tooltip - Check if our pointer is not among dismissed ones
-		if ( ! in_array( 'gmb_customizer_pointer', $dismissed_pointers ) && isset( $post->post_type ) && $post->post_type === 'google_maps' ) {
+		if ( ! in_array('gmb_customizer_pointer', $dismissed_pointers) && isset($post->post_type) && $post->post_type === 'google_maps') {
 			$enqueue_pointer_script_style = true;
 
 			// Add footer scripts using callback function
-			add_action( 'admin_print_footer_scripts', array( $this, 'maps_customizer_tooltip' ) );
+			add_action('admin_print_footer_scripts', array($this, 'maps_customizer_tooltip'));
 		}
 
 		// Enqueue pointer CSS and JS files, if needed
-		if ( $enqueue_pointer_script_style ) {
-			wp_enqueue_style( 'wp-pointer' );
-			wp_enqueue_script( 'wp-pointer' );
+		if ($enqueue_pointer_script_style) {
+			wp_enqueue_style('wp-pointer');
+			wp_enqueue_script('wp-pointer');
 		}
 
 	}
@@ -174,9 +174,9 @@ 
 		global $current_user;
 		get_currentuserinfo();
 
-		$pointer_content = '<h3>' . __( 'Welcome to Maps Builder', $this->plugin_slug ) . '</h3>';
-		$pointer_content .= '<p class="map-builder-welcome">' . __( 'Thank you for activating Maps Builder for WordPress. To stay up to date on the latest plugin updates, enhancements, and news please sign up for our newsletter.', $this->plugin_slug ) . '</p>';
-		$pointer_content .= '<div id="mc_embed_signup" style="padding: 0 15px;"><form action="http://wordimpress.us3.list-manage2.com/subscribe/post?u=3ccb75d68bda4381e2f45794c&amp;id=83609e2883" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate><div class="mc-field-group" style="margin: 0 0 10px;"><input type="email" value="' . $current_user->user_email . '" name="EMAIL" class="required email" id="mce-EMAIL" style="margin-right:5px;width:230px;"><input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="button"></div><div id="mce-responses" class="clear"><div class="response" id="mce-error-response" style="display:none"></div><div class="response" id="mce-success-response" style="display:none"></div></div><div style="position: absolute; left: -5000px;"><input type="text" name="b_3ccb75d68bda4381e2f45794c_83609e2883" value=""></div></form></div>';
+		$pointer_content = '<h3>'.__('Welcome to Maps Builder', $this->plugin_slug).'</h3>';
+		$pointer_content .= '<p class="map-builder-welcome">'.__('Thank you for activating Maps Builder for WordPress. To stay up to date on the latest plugin updates, enhancements, and news please sign up for our newsletter.', $this->plugin_slug).'</p>';
+		$pointer_content .= '<div id="mc_embed_signup" style="padding: 0 15px;"><form action="http://wordimpress.us3.list-manage2.com/subscribe/post?u=3ccb75d68bda4381e2f45794c&amp;id=83609e2883" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate><div class="mc-field-group" style="margin: 0 0 10px;"><input type="email" value="'.$current_user->user_email.'" name="EMAIL" class="required email" id="mce-EMAIL" style="margin-right:5px;width:230px;"><input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="button"></div><div id="mce-responses" class="clear"><div class="response" id="mce-error-response" style="display:none"></div><div class="response" id="mce-success-response" style="display:none"></div></div><div style="position: absolute; left: -5000px;"><input type="text" name="b_3ccb75d68bda4381e2f45794c_83609e2883" value=""></div></form></div>';
 		?>
 
 		<script type="text/javascript">
@@ -210,8 +210,8 @@ 
 
 		get_currentuserinfo();
 
-		$pointer_content = '<h3>' . __( 'Introducing the Map Builder', $this->plugin_slug ) . '</h3>';
-		$pointer_content .= '<p>' . sprintf( __( '%1$sWe have upgraded your map building experience!%2$s Click here to experience the new interface. All controls are within your reach and the map always stays in view. If you like it, you can enable the view by default within the %3$splugin settings%4$s. We hope you enjoy it!', $this->plugin_slug ), '<strong>', '</strong>', '<a href="' . admin_url( 'edit.php?post_type=google_maps&page=gmb_settings&tab=general_settings' ) . '">', '</a>' ) . '</p>';
+		$pointer_content = '<h3>'.__('Introducing the Map Builder', $this->plugin_slug).'</h3>';
+		$pointer_content .= '<p>'.sprintf(__('%1$sWe have upgraded your map building experience!%2$s Click here to experience the new interface. All controls are within your reach and the map always stays in view. If you like it, you can enable the view by default within the %3$splugin settings%4$s. We hope you enjoy it!', $this->plugin_slug), '<strong>', '</strong>', '<a href="'.admin_url('edit.php?post_type=google_maps&page=gmb_settings&tab=general_settings').'">', '</a>').'</p>';
 		?>
 
 		<script type="text/javascript">
@@ -245,13 +245,13 @@ 
 	 *
 	 * @param    int $blog_id ID of the new blog.
 	 */
-	public function activate_new_site( $blog_id ) {
+	public function activate_new_site($blog_id) {
 
-		if ( 1 !== did_action( 'wpmu_new_blog' ) ) {
+		if (1 !== did_action('wpmu_new_blog')) {
 			return;
 		}
 
-		switch_to_blog( $blog_id );
+		switch_to_blog($blog_id);
 		self::single_activate();
 		restore_current_blog();
 
@@ -276,7 +276,7 @@ 
 			WHERE archived = '0' AND spam = '0'
 			AND deleted = '0'";
 
-		return $wpdb->get_col( $sql );
+		return $wpdb->get_col($sql);
 
 	}
 
@@ -308,7 +308,7 @@ 
 
 		// call CPT registration function here (it should also be hooked into 'init')
 		$this->setup_post_type();
-		flush_rewrite_rules( false );
+		flush_rewrite_rules(false);
 
 	}
 
@@ -322,26 +322,26 @@ 
 	 */
 	public function setup_post_type() {
 
-		$settings      = get_option( 'gmb_settings' );
-		$post_slug     = isset( $settings['gmb_custom_slug'] ) ? $settings['gmb_custom_slug'] : '';
-		$menu_position = isset( $settings['gmb_menu_position'] ) ? $settings['gmb_menu_position'] : '';
-		$has_archive   = isset( $settings['gmb_has_archive'] ) ? filter_var( $settings['gmb_has_archive'], FILTER_VALIDATE_BOOLEAN ) : '';
+		$settings      = get_option('gmb_settings');
+		$post_slug     = isset($settings['gmb_custom_slug']) ? $settings['gmb_custom_slug'] : '';
+		$menu_position = isset($settings['gmb_menu_position']) ? $settings['gmb_menu_position'] : '';
+		$has_archive   = isset($settings['gmb_has_archive']) ? filter_var($settings['gmb_has_archive'], FILTER_VALIDATE_BOOLEAN) : '';
 
 		$labels = array(
-			'name'               => _x( 'Google Maps', 'post type general name', $this->plugin_slug ),
-			'singular_name'      => _x( 'Map', 'post type singular name', $this->plugin_slug ),
-			'menu_name'          => _x( 'Google Maps', 'admin menu', $this->plugin_slug ),
-			'name_admin_bar'     => _x( 'Google Maps', 'add new on admin bar', $this->plugin_slug ),
-			'add_new'            => _x( 'Add New', 'map', $this->plugin_slug ),
-			'add_new_item'       => __( 'Add New Map', $this->plugin_slug ),
-			'new_item'           => __( 'New Map', $this->plugin_slug ),
-			'edit_item'          => __( 'Edit Map', $this->plugin_slug ),
-			'view_item'          => __( 'View Map', $this->plugin_slug ),
-			'all_items'          => __( 'All Maps', $this->plugin_slug ),
-			'search_items'       => __( 'Search Maps', $this->plugin_slug ),
-			'parent_item_colon'  => __( 'Parent Maps:', $this->plugin_slug ),
-			'not_found'          => __( 'No Maps found.', $this->plugin_slug ),
-			'not_found_in_trash' => __( 'No Maps found in Trash.', $this->plugin_slug ),
+			'name'               => _x('Google Maps', 'post type general name', $this->plugin_slug),
+			'singular_name'      => _x('Map', 'post type singular name', $this->plugin_slug),
+			'menu_name'          => _x('Google Maps', 'admin menu', $this->plugin_slug),
+			'name_admin_bar'     => _x('Google Maps', 'add new on admin bar', $this->plugin_slug),
+			'add_new'            => _x('Add New', 'map', $this->plugin_slug),
+			'add_new_item'       => __('Add New Map', $this->plugin_slug),
+			'new_item'           => __('New Map', $this->plugin_slug),
+			'edit_item'          => __('Edit Map', $this->plugin_slug),
+			'view_item'          => __('View Map', $this->plugin_slug),
+			'all_items'          => __('All Maps', $this->plugin_slug),
+			'search_items'       => __('Search Maps', $this->plugin_slug),
+			'parent_item_colon'  => __('Parent Maps:', $this->plugin_slug),
+			'not_found'          => __('No Maps found.', $this->plugin_slug),
+			'not_found_in_trash' => __('No Maps found in Trash.', $this->plugin_slug),
 		);
 
 		$args = array(
@@ -352,16 +352,16 @@ 
 			'show_in_menu'       => true,
 			'query_var'          => true,
 			'rewrite'            => array(
-				'slug' => isset( $post_slug ) ? sanitize_title( $post_slug ) : 'google-maps'
+				'slug' => isset($post_slug) ? sanitize_title($post_slug) : 'google-maps'
 			),
 			'capability_type'    => 'post',
-			'has_archive'        => isset( $has_archive ) ? $has_archive : true,
+			'has_archive'        => isset($has_archive) ? $has_archive : true,
 			'hierarchical'       => false,
-			'menu_position'      => ! empty( $menu_position ) ? intval( $menu_position ) : '23.1',
-			'supports'           => array( 'title' )
+			'menu_position'      => ! empty($menu_position) ? intval($menu_position) : '23.1',
+			'supports'           => array('title')
 		);
 
-		register_post_type( 'google_maps', $args );
+		register_post_type('google_maps', $args);
 
 	}
 

includes/class-gmb-engine.php

Spacing +48 added lines, -48 removed lines

@@ -26,10 +26,10 @@ 
 		$this->plugin_slug = Google_Maps_Builder()->get_plugin_slug();
 
 		// Filter to automatically add maps to post type content
-		add_filter( 'the_content', array( $this, 'the_content' ), 2 );
+		add_filter('the_content', array($this, 'the_content'), 2);
 
 		//add shortcode support
-		add_shortcode( 'google_maps', array( $this, 'google_maps_shortcode' ) );
+		add_shortcode('google_maps', array($this, 'google_maps_shortcode'));
 
 	}
 
@@ -43,14 +43,14 @@ 
 	 *
 	 * @return mixed
 	 */
-	function the_content( $content ) {
+	function the_content($content) {
 
 		global $post;
 
-		if ( is_main_query() && is_singular('google_maps') || is_post_type_archive('google_maps') ) {
+		if (is_main_query() && is_singular('google_maps') || is_post_type_archive('google_maps')) {
 
 			$shortcode = '[google_maps ';
-			$shortcode .= 'id="' . $post->ID . '"';
+			$shortcode .= 'id="'.$post->ID.'"';
 			$shortcode .= ']';
 
 			//Output shortcode
@@ -70,12 +70,12 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_google_maps_template( $single_template ) {
+	public function get_google_maps_template($single_template) {
 
-		if ( file_exists( get_stylesheet_directory() . '/google-maps/' . $single_template ) ) {
-			$output = get_stylesheet_directory() . '/google-maps/' . $single_template;
+		if (file_exists(get_stylesheet_directory().'/google-maps/'.$single_template)) {
+			$output = get_stylesheet_directory().'/google-maps/'.$single_template;
 		} else {
-			$output = dirname( __FILE__ ) . '/views/' . $single_template;
+			$output = dirname(__FILE__).'/views/'.$single_template;
 		}
 
 		return $output;
@@ -91,7 +91,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function google_maps_shortcode( $atts ) {
+	public function google_maps_shortcode($atts) {
 
 		$atts = shortcode_atts(
 			array(
@@ -102,26 +102,26 @@ 
 		);
 
 		//gather data for this shortcode
-		$post     = get_post( $atts['id'] );
-		$all_meta = get_post_custom( $atts['id'] );
+		$post     = get_post($atts['id']);
+		$all_meta = get_post_custom($atts['id']);
 
-		$visual_info = maybe_unserialize( $all_meta['gmb_width_height'][0] );
-		$lat_lng     = maybe_unserialize( $all_meta['gmb_lat_lng'][0] );
+		$visual_info = maybe_unserialize($all_meta['gmb_width_height'][0]);
+		$lat_lng     = maybe_unserialize($all_meta['gmb_lat_lng'][0]);
 
 		//Put markers into an array for JS usage
 		$map_marker_array   = array();
-		$markers_repeatable = isset( $all_meta['gmb_markers_group'][0] ) ? maybe_unserialize( $all_meta['gmb_markers_group'][0] ) : '';
+		$markers_repeatable = isset($all_meta['gmb_markers_group'][0]) ? maybe_unserialize($all_meta['gmb_markers_group'][0]) : '';
 
-		if ( is_array( $markers_repeatable ) ) {
-			foreach ( $markers_repeatable as $marker ) {
-				array_push( $map_marker_array, $marker );
+		if (is_array($markers_repeatable)) {
+			foreach ($markers_repeatable as $marker) {
+				array_push($map_marker_array, $marker);
 			}
 		}
 
 		//Send data for AJAX usage
 		//Add params to AJAX for Shortcode Usage
 		//@see: http://benjaminrojas.net/using-wp_localize_script-dynamically/
-		$localized_data = apply_filters( 'gmb_localized_data', array(
+		$localized_data = apply_filters('gmb_localized_data', array(
 			$post->ID => array(
 				'id'               => $atts['id'],
 				'map_params'       => array(
@@ -130,40 +130,40 @@ 
 					'height'         => $visual_info['height'],
 					'latitude'       => $lat_lng['latitude'],
 					'longitude'      => $lat_lng['longitude'],
-					'zoom'           => ! empty( $all_meta['gmb_zoom'][0] ) ? $all_meta['gmb_zoom'][0] : '15',
-					'default_marker' => apply_filters( 'gmb_default_marker', GMB_PLUGIN_URL . 'assets/img/spotlight-poi.png' ),
+					'zoom'           => ! empty($all_meta['gmb_zoom'][0]) ? $all_meta['gmb_zoom'][0] : '15',
+					'default_marker' => apply_filters('gmb_default_marker', GMB_PLUGIN_URL.'assets/img/spotlight-poi.png'),
 				),
 				'map_controls'     => array(
-					'zoom_control'      => ! empty( $all_meta['gmb_zoom_control'][0] ) ? strtoupper( $all_meta['gmb_zoom_control'][0] ) : 'STANDARD',
-					'pan_control'       => ! empty( $all_meta['gmb_pan'][0] ) ? $all_meta['gmb_pan'][0] : 'none',
-					'map_type_control'  => ! empty( $all_meta['gmb_map_type_control'][0] ) ? $all_meta['gmb_map_type_control'][0] : 'none',
-					'draggable'         => ! empty( $all_meta['gmb_draggable'][0] ) ? $all_meta['gmb_draggable'][0] : 'none',
-					'double_click_zoom' => ! empty( $all_meta['gmb_double_click'][0] ) ? $all_meta['gmb_double_click'][0] : 'none',
-					'wheel_zoom'        => ! empty( $all_meta['gmb_wheel_zoom'][0] ) ? $all_meta['gmb_wheel_zoom'][0] : 'none',
-					'street_view'       => ! empty( $all_meta['gmb_street_view'][0] ) ? $all_meta['gmb_street_view'][0] : 'none',
+					'zoom_control'      => ! empty($all_meta['gmb_zoom_control'][0]) ? strtoupper($all_meta['gmb_zoom_control'][0]) : 'STANDARD',
+					'pan_control'       => ! empty($all_meta['gmb_pan'][0]) ? $all_meta['gmb_pan'][0] : 'none',
+					'map_type_control'  => ! empty($all_meta['gmb_map_type_control'][0]) ? $all_meta['gmb_map_type_control'][0] : 'none',
+					'draggable'         => ! empty($all_meta['gmb_draggable'][0]) ? $all_meta['gmb_draggable'][0] : 'none',
+					'double_click_zoom' => ! empty($all_meta['gmb_double_click'][0]) ? $all_meta['gmb_double_click'][0] : 'none',
+					'wheel_zoom'        => ! empty($all_meta['gmb_wheel_zoom'][0]) ? $all_meta['gmb_wheel_zoom'][0] : 'none',
+					'street_view'       => ! empty($all_meta['gmb_street_view'][0]) ? $all_meta['gmb_street_view'][0] : 'none',
 				),
 				'map_theme'        => array(
-					'map_type'       => ! empty( $all_meta['gmb_type'][0] ) ? $all_meta['gmb_type'][0] : 'RoadMap',
-					'map_theme_json' => ! empty( $all_meta['gmb_theme_json'][0] ) ? $all_meta['gmb_theme_json'][0] : 'none',
+					'map_type'       => ! empty($all_meta['gmb_type'][0]) ? $all_meta['gmb_type'][0] : 'RoadMap',
+					'map_theme_json' => ! empty($all_meta['gmb_theme_json'][0]) ? $all_meta['gmb_theme_json'][0] : 'none',
 
 				),
 				'map_markers'      => $map_marker_array,
 				'places_api'       => array(
-					'show_places'   => ! empty( $all_meta['gmb_show_places'][0] ) ? $all_meta['gmb_show_places'][0] : 'no',
-					'search_radius' => ! empty( $all_meta['gmb_search_radius'][0] ) ? $all_meta['gmb_search_radius'][0] : '3000',
-					'search_places' => ! empty( $all_meta['gmb_places_search_multicheckbox'][0] ) ? maybe_unserialize( $all_meta['gmb_places_search_multicheckbox'][0] ) : '',
+					'show_places'   => ! empty($all_meta['gmb_show_places'][0]) ? $all_meta['gmb_show_places'][0] : 'no',
+					'search_radius' => ! empty($all_meta['gmb_search_radius'][0]) ? $all_meta['gmb_search_radius'][0] : '3000',
+					'search_places' => ! empty($all_meta['gmb_places_search_multicheckbox'][0]) ? maybe_unserialize($all_meta['gmb_places_search_multicheckbox'][0]) : '',
 				),
-				'map_markers_icon' => ! empty( $all_meta['gmb_map_marker'] ) ? $all_meta['gmb_map_marker'][0] : 'none',
+				'map_markers_icon' => ! empty($all_meta['gmb_map_marker']) ? $all_meta['gmb_map_marker'][0] : 'none',
 			)
-		) );
+		));
 
-		$this->array_push_localized_script( $localized_data );
+		$this->array_push_localized_script($localized_data);
 
 		ob_start();
 
-		include $this->get_google_maps_template( 'public.php' );
+		include $this->get_google_maps_template('public.php');
 
-		return apply_filters( 'gmb_shortcode_output', ob_get_clean() );
+		return apply_filters('gmb_shortcode_output', ob_get_clean());
 
 	}
 
@@ -175,26 +175,26 @@ 
 	 *
 	 * @param $localized_data
 	 */
-	function array_push_localized_script( $localized_data ) {
+	function array_push_localized_script($localized_data) {
 		global $wp_scripts;
-		$data = $wp_scripts->get_data( $this->plugin_slug . '-plugin-script', 'data' );
+		$data = $wp_scripts->get_data($this->plugin_slug.'-plugin-script', 'data');
 
-		if ( empty( $data ) ) {
-			wp_localize_script( $this->plugin_slug . '-plugin-script', 'gmb_data', $localized_data );
+		if (empty($data)) {
+			wp_localize_script($this->plugin_slug.'-plugin-script', 'gmb_data', $localized_data);
 		} else {
 
-			if ( ! is_array( $data ) ) {
+			if ( ! is_array($data)) {
 
-				$data = json_decode( str_replace( 'var gmb_data = ', '', substr( $data, 0, - 1 ) ), true );
+				$data = json_decode(str_replace('var gmb_data = ', '', substr($data, 0, - 1)), true);
 
 			}
 
-			foreach ( $data as $key => $value ) {
-				$localized_data[ $key ] = $value;
+			foreach ($data as $key => $value) {
+				$localized_data[$key] = $value;
 			}
 
-			$wp_scripts->add_data( $this->plugin_slug . '-plugin-script', 'data', '' );
-			wp_localize_script( $this->plugin_slug . '-plugin-script', 'gmb_data', $localized_data );
+			$wp_scripts->add_data($this->plugin_slug.'-plugin-script', 'data', '');
+			wp_localize_script($this->plugin_slug.'-plugin-script', 'gmb_data', $localized_data);
 
 		}
 

includes/views/public.php

Spacing +5 added lines, -5 removed lines

@@ -9,14 +9,14 @@
  * @copyright 2015 WordImpress, Devin Walker
  */
 
-$map_width = isset( $visual_info['width'] ) ? $visual_info['width'] : '100';
-$map_width .= isset( $visual_info['map_width_unit'] ) ? $visual_info['map_width_unit'] : '%';
-$map_height = isset( $visual_info['height'] ) ? $visual_info['height'] : '500';
-$map_height .= isset( $visual_info['map_height_unit'] ) ? $visual_info['map_height_unit'] : 'px';
+$map_width = isset($visual_info['width']) ? $visual_info['width'] : '100';
+$map_width .= isset($visual_info['map_width_unit']) ? $visual_info['map_width_unit'] : '%';
+$map_height = isset($visual_info['height']) ? $visual_info['height'] : '500';
+$map_height .= isset($visual_info['map_height_unit']) ? $visual_info['map_height_unit'] : 'px';
 ?>
 
 <div class="google-maps-builder-wrap">
 
-	<div id="google-maps-builder-<?php echo $atts['id']; ?>" class="google-maps-builder" <?php echo ! empty( $atts['id'] ) ? ' data-map-id="' . $atts['id'] . '"' : '">Error: NO MAP ID'; ?> style="width:<?php echo  $map_width; ?>; height:<?php echo $map_height; ?>"></div>
+	<div id="google-maps-builder-<?php echo $atts['id']; ?>" class="google-maps-builder" <?php echo ! empty($atts['id']) ? ' data-map-id="'.$atts['id'].'"' : '">Error: NO MAP ID'; ?> style="width:<?php echo  $map_width; ?>; height:<?php echo $map_height; ?>"></div>
 
 </div>
\ No newline at end of file

includes/misc-functions.php

Spacing +45 added lines, -45 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,10 +24,10 @@ 
  *
  * @return bool Whether or not function is disabled.
  */
-function gmb_is_func_disabled( $function ) {
-	$disabled = explode( ',', ini_get( 'disable_functions' ) );
+function gmb_is_func_disabled($function) {
+	$disabled = explode(',', ini_get('disable_functions'));
 
-	return in_array( $function, $disabled );
+	return in_array($function, $disabled);
 }
 
 /**
@@ -38,10 +38,10 @@ 
  * @since  2.0
  * @return void
  */
-function gmb_die( $message = '', $title = '', $status = 400 ) {
-	add_filter( 'wp_die_ajax_handler', '_gmb_die_handler', 10, 3 );
-	add_filter( 'wp_die_handler', '_gmb_die_handler', 10, 3 );
-	wp_die( $message, $title, array( 'response' => $status ) );
+function gmb_die($message = '', $title = '', $status = 400) {
+	add_filter('wp_die_ajax_handler', '_gmb_die_handler', 10, 3);
+	add_filter('wp_die_handler', '_gmb_die_handler', 10, 3);
+	wp_die($message, $title, array('response' => $status));
 }
 
 
@@ -54,27 +54,27 @@ 
 function gmb_test_ajax_works() {
 
 	// Check if the Airplane Mode plugin is installed
-	if ( class_exists( 'Airplane_Mode_Core' ) ) {
+	if (class_exists('Airplane_Mode_Core')) {
 
 		$airplane = Airplane_Mode_Core::getInstance();
 
-		if ( method_exists( $airplane, 'enabled' ) ) {
+		if (method_exists($airplane, 'enabled')) {
 
-			if ( $airplane->enabled() ) {
+			if ($airplane->enabled()) {
 				return true;
 			}
 
 		} else {
 
-			if ( $airplane->check_status() == 'on' ) {
+			if ($airplane->check_status() == 'on') {
 				return true;
 			}
 		}
 	}
 
-	add_filter( 'block_local_requests', '__return_false' );
+	add_filter('block_local_requests', '__return_false');
 
-	if ( get_transient( '_gmb_ajax_works' ) ) {
+	if (get_transient('_gmb_ajax_works')) {
 		return true;
 	}
 
@@ -86,35 +86,35 @@ 
 		)
 	);
 
-	$ajax  = wp_remote_post( gmb_get_ajax_url(), $params );
+	$ajax  = wp_remote_post(gmb_get_ajax_url(), $params);
 	$works = true;
 
-	if ( is_wp_error( $ajax ) ) {
+	if (is_wp_error($ajax)) {
 
 		$works = false;
 
 	} else {
 
-		if( empty( $ajax['response'] ) ) {
+		if (empty($ajax['response'])) {
 			$works = false;
 		}
 
-		if( empty( $ajax['response']['code'] ) || 200 !== (int) $ajax['response']['code'] ) {
+		if (empty($ajax['response']['code']) || 200 !== (int) $ajax['response']['code']) {
 			$works = false;
 		}
 
-		if( empty( $ajax['response']['message'] ) || 'OK' !== $ajax['response']['message'] ) {
+		if (empty($ajax['response']['message']) || 'OK' !== $ajax['response']['message']) {
 			$works = false;
 		}
 
-		if( ! isset( $ajax['body'] ) || 0 !== (int) $ajax['body'] ) {
+		if ( ! isset($ajax['body']) || 0 !== (int) $ajax['body']) {
 			$works = false;
 		}
 
 	}
 
-	if ( $works ) {
-		set_transient( '_gmb_ajax_works', '1', DAY_IN_SECONDS );
+	if ($works) {
+		set_transient('_gmb_ajax_works', '1', DAY_IN_SECONDS);
 	}
 
 	return $works;
@@ -130,16 +130,16 @@ 
  * @return string
  */
 function gmb_get_ajax_url() {
-	$scheme = defined( 'FORCE_SSL_ADMIN' ) && FORCE_SSL_ADMIN ? 'https' : 'admin';
+	$scheme = defined('FORCE_SSL_ADMIN') && FORCE_SSL_ADMIN ? 'https' : 'admin';
 
 	$current_url = gmb_get_current_page_url();
-	$ajax_url    = admin_url( 'admin-ajax.php', $scheme );
+	$ajax_url    = admin_url('admin-ajax.php', $scheme);
 
-	if ( preg_match( '/^https/', $current_url ) && ! preg_match( '/^https/', $ajax_url ) ) {
-		$ajax_url = preg_replace( '/^http/', 'https', $ajax_url );
+	if (preg_match('/^https/', $current_url) && ! preg_match('/^https/', $ajax_url)) {
+		$ajax_url = preg_replace('/^http/', 'https', $ajax_url);
 	}
 
-	return apply_filters( 'gmb_ajax_url', $ajax_url );
+	return apply_filters('gmb_ajax_url', $ajax_url);
 }
 
 /**
@@ -150,25 +150,25 @@ 
  */
 function gmb_get_current_page_url() {
 
-	if ( is_front_page() ) :
+	if (is_front_page()) :
 		$page_url = home_url();
 	else :
 		$page_url = 'http';
 
-		if ( isset( $_SERVER["HTTPS"] ) && $_SERVER["HTTPS"] == "on" ) {
+		if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {
 			$page_url .= "s";
 		}
 
 		$page_url .= "://";
 
-		if ( isset( $_SERVER["SERVER_PORT"] ) && $_SERVER["SERVER_PORT"] != "80" ) {
-			$page_url .= $_SERVER["SERVER_NAME"] . ":" . $_SERVER["SERVER_PORT"] . $_SERVER["REQUEST_URI"];
+		if (isset($_SERVER["SERVER_PORT"]) && $_SERVER["SERVER_PORT"] != "80") {
+			$page_url .= $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"];
 		} else {
-			$page_url .= $_SERVER["SERVER_NAME"] . $_SERVER["REQUEST_URI"];
+			$page_url .= $_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"];
 		}
 	endif;
 
-	return apply_filters( 'gmb_get_current_page_url', esc_url( $page_url ) );
+	return apply_filters('gmb_get_current_page_url', esc_url($page_url));
 }
 
 
@@ -183,31 +183,31 @@ 
 function gmb_get_host() {
 	$host = false;
 
-	if ( defined( 'WPE_APIKEY' ) ) {
+	if (defined('WPE_APIKEY')) {
 		$host = 'WP Engine';
-	} elseif ( defined( 'PAGELYBIN' ) ) {
+	} elseif (defined('PAGELYBIN')) {
 		$host = 'Pagely';
-	} elseif ( DB_HOST == 'localhost:/tmp/mysql5.sock' ) {
+	} elseif (DB_HOST == 'localhost:/tmp/mysql5.sock') {
 		$host = 'ICDSoft';
-	} elseif ( DB_HOST == 'mysqlv5' ) {
+	} elseif (DB_HOST == 'mysqlv5') {
 		$host = 'NetworkSolutions';
-	} elseif ( strpos( DB_HOST, 'ipagemysql.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, 'ipagemysql.com') !== false) {
 		$host = 'iPage';
-	} elseif ( strpos( DB_HOST, 'ipowermysql.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, 'ipowermysql.com') !== false) {
 		$host = 'IPower';
-	} elseif ( strpos( DB_HOST, '.gridserver.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, '.gridserver.com') !== false) {
 		$host = 'MediaTemple Grid';
-	} elseif ( strpos( DB_HOST, '.pair.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, '.pair.com') !== false) {
 		$host = 'pair Networks';
-	} elseif ( strpos( DB_HOST, '.stabletransit.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, '.stabletransit.com') !== false) {
 		$host = 'Rackspace Cloud';
-	} elseif ( strpos( DB_HOST, '.sysfix.eu' ) !== false ) {
+	} elseif (strpos(DB_HOST, '.sysfix.eu') !== false) {
 		$host = 'SysFix.eu Power Hosting';
-	} elseif ( strpos( $_SERVER['SERVER_NAME'], 'Flywheel' ) !== false ) {
+	} elseif (strpos($_SERVER['SERVER_NAME'], 'Flywheel') !== false) {
 		$host = 'Flywheel';
 	} else {
 		// Adding a general fallback for data gathering
-		$host = 'DBH: ' . DB_HOST . ', SRV: ' . $_SERVER['SERVER_NAME'];
+		$host = 'DBH: '.DB_HOST.', SRV: '.$_SERVER['SERVER_NAME'];
 	}
 
 	return $host;

Braces +3 added lines, -1 removed lines

@@ -152,8 +152,10 @@
 
 	if ( is_front_page() ) :
 		$page_url = home_url();
-	else :
+	else {
+		:
 		$page_url = 'http';
+	}
 
 		if ( isset( $_SERVER["HTTPS"] ) && $_SERVER["HTTPS"] == "on" ) {
 			$page_url .= "s";

includes/admin/class-gmb-admin.php

Indentation +2 added lines, -2 removed lines

@@ -678,8 +678,8 @@
 		);
 
 		echo '<div class="autocomplete-wrap"><input type="text" name="' . $field->args( 'id' ) . '[geocode]" id="' . $field->args( 'id' ) . '" value="" class="search-autocomplete" /><p class="autocomplete-description">' .
-		     sprintf( __( 'Enter the name of a place or an address above to create a map marker or %1$sDrop a Marker%2$s', $this->plugin_slug ), '<a href="#" class="drop-marker button button-small"><span class="dashicons dashicons-location"></span>', '</a>' ) .
-		     '</p></div>';
+			 sprintf( __( 'Enter the name of a place or an address above to create a map marker or %1$sDrop a Marker%2$s', $this->plugin_slug ), '<a href="#" class="drop-marker button button-small"><span class="dashicons dashicons-location"></span>', '</a>' ) .
+			 '</p></div>';
 
 	}
 

Spacing +338 added lines, -338 removed lines

@@ -53,20 +53,20 @@ 
 		$this->plugin_slug = Google_Maps_Builder()->get_plugin_slug();
 
 		//CPT
-		add_filter( 'manage_edit-google_maps_columns', array( $this, 'setup_custom_columns' ) );
-		add_action( 'manage_google_maps_posts_custom_column', array( $this, 'configure_custom_columns' ), 10, 2 );
-		add_filter( 'get_user_option_closedpostboxes_google_maps', array( $this, 'closed_meta_boxes' ) );
+		add_filter('manage_edit-google_maps_columns', array($this, 'setup_custom_columns'));
+		add_action('manage_google_maps_posts_custom_column', array($this, 'configure_custom_columns'), 10, 2);
+		add_filter('get_user_option_closedpostboxes_google_maps', array($this, 'closed_meta_boxes'));
 
 		//Custom Meta Fields
-		add_action( 'cmb2_render_google_geocoder', array( $this, 'cmb2_render_google_geocoder' ), 10, 2 );
-		add_action( 'cmb2_render_google_maps_preview', array( $this, 'cmb2_render_google_maps_preview' ), 10, 2 );
-		add_action( 'cmb2_render_search_options', array( $this, 'cmb2_render_search_options' ), 10, 2 );
-		add_action( 'cmb2_render_width_height', array( $this, 'cmb2_render_width_height' ), 10, 2 );
-		add_action( 'cmb2_render_lat_lng', array( $this, 'cmb2_render_lat_lng' ), 10, 2 );
-		add_action( 'post_submitbox_misc_actions', array( $this, 'gmb_add_shortcode_to_publish_metabox' ) );
+		add_action('cmb2_render_google_geocoder', array($this, 'cmb2_render_google_geocoder'), 10, 2);
+		add_action('cmb2_render_google_maps_preview', array($this, 'cmb2_render_google_maps_preview'), 10, 2);
+		add_action('cmb2_render_search_options', array($this, 'cmb2_render_search_options'), 10, 2);
+		add_action('cmb2_render_width_height', array($this, 'cmb2_render_width_height'), 10, 2);
+		add_action('cmb2_render_lat_lng', array($this, 'cmb2_render_lat_lng'), 10, 2);
+		add_action('post_submitbox_misc_actions', array($this, 'gmb_add_shortcode_to_publish_metabox'));
 
 		//Add metaboxes and fields to CPT
-		add_action( 'cmb2_init', array( $this, 'cpt2_metaboxes_fields' ) );
+		add_action('cmb2_init', array($this, 'cpt2_metaboxes_fields'));
 
 	}
 
@@ -76,18 +76,18 @@ 
 	 */
 	public function gmb_add_shortcode_to_publish_metabox() {
 
-		if ( 'google_maps' !== get_post_type() ) {
+		if ('google_maps' !== get_post_type()) {
 			return false;
 		}
 
 		global $post;
 
 		//Only enqueue scripts for CPT on post type screen
-		if ( 'google_maps' === $post->post_type ) {
-			echo '<a href="#" class="button button-primary" id="map-builder"><span class="dashicons dashicons-location-alt"></span>' . __( 'Open Map Builder', $this->plugin_slug ) . '</a>';
+		if ('google_maps' === $post->post_type) {
+			echo '<a href="#" class="button button-primary" id="map-builder"><span class="dashicons dashicons-location-alt"></span>'.__('Open Map Builder', $this->plugin_slug).'</a>';
 			//Shortcode column with select all input
-			$shortcode = htmlentities( '[google_maps id="' . $post->ID . '"]' );
-			echo '<div class="shortcode-wrap box-sizing"><label>' . __( 'Map Shortcode:', $this->plugin_slug ) . '</label><input onClick="this.setSelectionRange(0, this.value.length)" type="text" class="shortcode-input" readonly value="' . $shortcode . '"></div>';
+			$shortcode = htmlentities('[google_maps id="'.$post->ID.'"]');
+			echo '<div class="shortcode-wrap box-sizing"><label>'.__('Map Shortcode:', $this->plugin_slug).'</label><input onClick="this.setSelectionRange(0, this.value.length)" type="text" class="shortcode-input" readonly value="'.$shortcode.'"></div>';
 
 		}
 
@@ -102,13 +102,13 @@ 
 	 */
 	public function get_default_map_options() {
 
-		$width_height = gmb_get_option( 'gmb_width_height' );
+		$width_height = gmb_get_option('gmb_width_height');
 
 		$defaults = array(
-			'width'       => ( isset( $width_height['width'] ) ) ? $width_height['width'] : '100',
-			'width_unit'  => ( isset( $width_height['map_width_unit'] ) ) ? $width_height['map_width_unit'] : '%',
-			'height'      => ( isset( $width_height['height'] ) ) ? $width_height['height'] : '600',
-			'height_unit' => ( isset( $width_height['map_height_unit'] ) ) ? $width_height['map_height_unit'] : 'px'
+			'width'       => (isset($width_height['width'])) ? $width_height['width'] : '100',
+			'width_unit'  => (isset($width_height['map_width_unit'])) ? $width_height['map_width_unit'] : '%',
+			'height'      => (isset($width_height['height'])) ? $width_height['height'] : '600',
+			'height_unit' => (isset($width_height['map_height_unit'])) ? $width_height['map_height_unit'] : 'px'
 		);
 
 		return $defaults;
@@ -120,7 +120,7 @@ 
 	 * @since  1.0.0
 	 */
 	public function settings_init() {
-		register_setting( $this->plugin_slug, $this->plugin_slug );
+		register_setting($this->plugin_slug, $this->plugin_slug);
 	}
 
 
@@ -135,331 +135,331 @@ 
 		$default_options = $this->get_default_map_options();
 
 		// MARKER WITH AUTOCOMPLETE
-		$marker_box = cmb2_get_metabox( array(
+		$marker_box = cmb2_get_metabox(array(
 			'id'           => 'google_maps_markers',
-			'title'        => __( 'Map Markers', $this->plugin_slug ),
-			'object_types' => array( 'google_maps' ), // post type
+			'title'        => __('Map Markers', $this->plugin_slug),
+			'object_types' => array('google_maps'), // post type
 			'context'      => 'normal', //  'normal', 'advanced', or 'side'
 			'priority'     => 'high', //  'high', 'core', 'default' or 'low'
 			'show_names'   => true, // Show field names on the left
-		) );
-		$marker_box->add_field( array(
-			'name' => __( 'Create Marker', $this->plugin_slug ),
-			'id'   => $prefix . 'geocoder',
+		));
+		$marker_box->add_field(array(
+			'name' => __('Create Marker', $this->plugin_slug),
+			'id'   => $prefix.'geocoder',
 			'type' => 'google_geocoder'
-		) );
-		$group_field_id = $marker_box->add_field( array(
-			'name'        => __( 'Existing Markers', $this->plugin_slug ),
-			'id'          => $prefix . 'markers_group',
+		));
+		$group_field_id = $marker_box->add_field(array(
+			'name'        => __('Existing Markers', $this->plugin_slug),
+			'id'          => $prefix.'markers_group',
 			'type'        => 'group',
-			'description' => __( 'Map marker data is contained within the repeatable fields below. You may add or update marker data here or directly on the map.', $this->plugin_slug ) . '<a href="#" class="button button-small toggle-repeater-groups">' . __( 'Toggle Marker Groups', $this->plugin_slug ) . '</a>',
+			'description' => __('Map marker data is contained within the repeatable fields below. You may add or update marker data here or directly on the map.', $this->plugin_slug).'<a href="#" class="button button-small toggle-repeater-groups">'.__('Toggle Marker Groups', $this->plugin_slug).'</a>',
 			'options'     => array(
-				'group_title'   => __( 'Marker: {#}', 'cmb' ),
-				'add_button'    => __( 'Add Another Marker', $this->plugin_slug ),
-				'remove_button' => __( 'Remove Marker', $this->plugin_slug ),
+				'group_title'   => __('Marker: {#}', 'cmb'),
+				'add_button'    => __('Add Another Marker', $this->plugin_slug),
+				'remove_button' => __('Remove Marker', $this->plugin_slug),
 				'sortable'      => true, // beta
 			),
-		) );
-		$marker_box->add_group_field( $group_field_id, array(
-			'name' => __( 'Marker Title', $this->plugin_slug ),
+		));
+		$marker_box->add_group_field($group_field_id, array(
+			'name' => __('Marker Title', $this->plugin_slug),
 			'id'   => 'title',
 			'type' => 'text',
-		) );
-		$marker_box->add_group_field( $group_field_id, array(
-			'name'        => __( 'Marker Description', $this->plugin_slug ),
-			'description' => __( 'Write a short description for this marker', $this->plugin_slug ),
+		));
+		$marker_box->add_group_field($group_field_id, array(
+			'name'        => __('Marker Description', $this->plugin_slug),
+			'description' => __('Write a short description for this marker', $this->plugin_slug),
 			'id'          => 'description',
 			'type'        => 'textarea_small',
-		) );
-		$marker_box->add_group_field( $group_field_id, array(
-			'name' => __( 'Marker Reference', $this->plugin_slug ),
+		));
+		$marker_box->add_group_field($group_field_id, array(
+			'name' => __('Marker Reference', $this->plugin_slug),
 			'id'   => 'reference',
 			'type' => 'text',
-		) );
-		$marker_box->add_group_field( $group_field_id, array(
-			'name' => __( 'Marker Place ID', $this->plugin_slug ),
+		));
+		$marker_box->add_group_field($group_field_id, array(
+			'name' => __('Marker Place ID', $this->plugin_slug),
 			'id'   => 'place_id',
 			'type' => 'text',
-		) );
-		$marker_box->add_group_field( $group_field_id, array(
-			'name' => __( 'Hide Place Details', $this->plugin_slug ),
+		));
+		$marker_box->add_group_field($group_field_id, array(
+			'name' => __('Hide Place Details', $this->plugin_slug),
 			'id'   => 'hide_details',
 			'type' => 'checkbox',
-		) );
-		$marker_box->add_group_field( $group_field_id, array(
-			'name' => __( 'Marker Latitude', $this->plugin_slug ),
+		));
+		$marker_box->add_group_field($group_field_id, array(
+			'name' => __('Marker Latitude', $this->plugin_slug),
 			'id'   => 'lat',
 			'type' => 'text',
-		) );
-		$marker_box->add_group_field( $group_field_id, array(
-			'name' => __( 'Marker Longitude', $this->plugin_slug ),
+		));
+		$marker_box->add_group_field($group_field_id, array(
+			'name' => __('Marker Longitude', $this->plugin_slug),
 			'id'   => 'lng',
 			'type' => 'text',
-		) );
-		$marker_box->add_group_field( $group_field_id, array(
-			'name'        => __( 'Marker Image', $this->plugin_slug ),
+		));
+		$marker_box->add_group_field($group_field_id, array(
+			'name'        => __('Marker Image', $this->plugin_slug),
 			'id'          => 'marker_img',
 			'type'        => 'file',
 			'row_classes' => 'gmb-hidden',
 			'options'     => array(
 				'url'                  => false,
-				'add_upload_file_text' => __( 'Add Marker Image', $this->plugin_slug )
+				'add_upload_file_text' => __('Add Marker Image', $this->plugin_slug)
 			),
-		) );
-		$marker_box->add_group_field( $group_field_id, array(
-			'name'        => __( 'Marker Data', $this->plugin_slug ),
+		));
+		$marker_box->add_group_field($group_field_id, array(
+			'name'        => __('Marker Data', $this->plugin_slug),
 			'id'          => 'marker',
 			'row_classes' => 'gmb-hidden',
 			'type'        => 'textarea_code',
-		) );
-		$marker_box->add_group_field( $group_field_id, array(
-			'name'        => __( 'Marker Label Data', $this->plugin_slug ),
+		));
+		$marker_box->add_group_field($group_field_id, array(
+			'name'        => __('Marker Label Data', $this->plugin_slug),
 			'id'          => 'label',
 			'row_classes' => 'gmb-hidden',
 			'type'        => 'textarea_code',
-		) );
+		));
 
 		// PREVIEW
-		$preview_box = cmb2_get_metabox( array(
+		$preview_box = cmb2_get_metabox(array(
 			'id'           => 'google_maps_preview_metabox',
-			'title'        => __( 'Google Map Preview', $this->plugin_slug ),
-			'object_types' => array( 'google_maps' ), // post type
+			'title'        => __('Google Map Preview', $this->plugin_slug),
+			'object_types' => array('google_maps'), // post type
 			'context'      => 'normal', //  'normal', 'advanced', or 'side'
 			'priority'     => 'high', //  'high', 'core', 'default' or 'low'
 			'show_names'   => false, // Show field names on the left
-		) );
+		));
 
-		$preview_box->add_field( array(
-			'name'    => __( 'Map Preview', $this->plugin_slug ),
-			'id'      => $prefix . 'preview',
+		$preview_box->add_field(array(
+			'name'    => __('Map Preview', $this->plugin_slug),
+			'id'      => $prefix.'preview',
 			'type'    => 'google_maps_preview',
 			'default' => '',
-		) );
+		));
 
 		// SEARCH OPTIONS
-		$search_options = cmb2_get_metabox( array(
+		$search_options = cmb2_get_metabox(array(
 			'id'           => 'google_maps_search_options',
-			'title'        => __( 'Google Places', $this->plugin_slug ),
-			'object_types' => array( 'google_maps' ), // post type
+			'title'        => __('Google Places', $this->plugin_slug),
+			'object_types' => array('google_maps'), // post type
 			'context'      => 'normal', //  'normal', 'advanced', or 'side'
 			'priority'     => 'core', //  'high', 'core', 'default' or 'low'
 			'show_names'   => true, // Show field names on the left
-		) );
+		));
 
 		$search_options->add_field(
 			array(
-				'name'    => __( 'Show Places?', $this->plugin_slug ),
-				'desc'    => __( 'Display establishments, prominent points of interest, geographic locations, and more.', $this->plugin_slug ),
-				'id'      => $prefix . 'show_places',
+				'name'    => __('Show Places?', $this->plugin_slug),
+				'desc'    => __('Display establishments, prominent points of interest, geographic locations, and more.', $this->plugin_slug),
+				'id'      => $prefix.'show_places',
 				'type'    => 'radio_inline',
 				'options' => array(
-					'yes' => __( 'Yes', 'cmb' ),
-					'no'  => __( 'No', 'cmb' ),
+					'yes' => __('Yes', 'cmb'),
+					'no'  => __('No', 'cmb'),
 				),
 			)
 		);
 
 		$search_options->add_field(
 			array(
-				'name'    => __( 'Search Radius', $this->plugin_slug ),
-				'desc'    => __( 'Defines the distance (in meters) within which to return Place results. The maximum allowed radius is 50,000 meters.', $this->plugin_slug ),
+				'name'    => __('Search Radius', $this->plugin_slug),
+				'desc'    => __('Defines the distance (in meters) within which to return Place results. The maximum allowed radius is 50,000 meters.', $this->plugin_slug),
 				'default' => '1000',
-				'id'      => $prefix . 'search_radius',
+				'id'      => $prefix.'search_radius',
 				'type'    => 'text_small'
 			)
 		);
 
 		$search_options->add_field(
 			array(
-				'name'    => __( 'Place Types', $this->plugin_slug ),
-				'desc'    => __( 'Select which type of places you would like to display on this map.', $this->plugin_slug ),
-				'id'      => $prefix . 'places_search_multicheckbox',
+				'name'    => __('Place Types', $this->plugin_slug),
+				'desc'    => __('Select which type of places you would like to display on this map.', $this->plugin_slug),
+				'id'      => $prefix.'places_search_multicheckbox',
 				'type'    => 'multicheck',
-				'options' => apply_filters( 'gmb_place_types', array(
-					'accounting'              => __( 'Accounting', $this->plugin_slug ),
-					'airport'                 => __( 'Airport', $this->plugin_slug ),
-					'amusement_park'          => __( 'Amusement Park', $this->plugin_slug ),
-					'aquarium'                => __( 'Aquarium', $this->plugin_slug ),
-					'art_gallery'             => __( 'Art Gallery', $this->plugin_slug ),
-					'atm'                     => __( 'ATM', $this->plugin_slug ),
-					'bakery'                  => __( 'Bakery', $this->plugin_slug ),
-					'bank'                    => __( 'Bank', $this->plugin_slug ),
-					'bar'                     => __( 'Bar', $this->plugin_slug ),
-					'beauty_salon'            => __( 'Beauty Salon', $this->plugin_slug ),
-					'bicycle_store'           => __( 'Bicycle Store', $this->plugin_slug ),
-					'book_store'              => __( 'Book Store', $this->plugin_slug ),
-					'bowling_alley'           => __( 'Bowling Alley', $this->plugin_slug ),
-					'bus_station'             => __( 'Bus Station', $this->plugin_slug ),
-					'cafe'                    => __( 'Cafe', $this->plugin_slug ),
-					'campground'              => __( 'Campground', $this->plugin_slug ),
-					'car_dealer'              => __( 'Car Dealer', $this->plugin_slug ),
-					'car_rental'              => __( 'Car Rental', $this->plugin_slug ),
-					'car_repair'              => __( 'Car Repair', $this->plugin_slug ),
-					'car_wash'                => __( 'Car Wash', $this->plugin_slug ),
-					'casino'                  => __( 'Casino', $this->plugin_slug ),
-					'cemetery'                => __( 'Cemetery', $this->plugin_slug ),
-					'church'                  => __( 'Church', $this->plugin_slug ),
-					'city_hall'               => __( 'City Hall', $this->plugin_slug ),
-					'clothing_store'          => __( 'Clothing Store', $this->plugin_slug ),
-					'convenience_store'       => __( 'Convenience Store', $this->plugin_slug ),
-					'courthouse'              => __( 'Courthouse', $this->plugin_slug ),
-					'dentist'                 => __( 'Dentist', $this->plugin_slug ),
-					'department_store'        => __( 'Department Store', $this->plugin_slug ),
-					'doctor'                  => __( 'Doctor', $this->plugin_slug ),
-					'electrician'             => __( 'Electrician', $this->plugin_slug ),
-					'electronics_store'       => __( 'Electronics Store', $this->plugin_slug ),
-					'embassy'                 => __( 'Embassy', $this->plugin_slug ),
-					'establishment'           => __( 'Establishment', $this->plugin_slug ),
-					'finance'                 => __( 'Finance', $this->plugin_slug ),
-					'fire_station'            => __( 'Fire Station', $this->plugin_slug ),
-					'florist'                 => __( 'Florist', $this->plugin_slug ),
-					'food'                    => __( 'Food', $this->plugin_slug ),
-					'funeral_home'            => __( 'Funeral Home', $this->plugin_slug ),
-					'furniture_store'         => __( 'Furniture_store', $this->plugin_slug ),
-					'gas_station'             => __( 'Gas Station', $this->plugin_slug ),
-					'general_contractor'      => __( 'General Contractor', $this->plugin_slug ),
-					'grocery_or_supermarket'  => __( 'Grocery or Supermarket', $this->plugin_slug ),
-					'gym'                     => __( 'Gym', $this->plugin_slug ),
-					'hair_care'               => __( 'Hair Care', $this->plugin_slug ),
-					'hardware_store'          => __( 'Hardware Store', $this->plugin_slug ),
-					'health'                  => __( 'Health', $this->plugin_slug ),
-					'hindu_temple'            => __( 'Hindu Temple', $this->plugin_slug ),
-					'home_goods_store'        => __( 'Home Goods Store', $this->plugin_slug ),
-					'hospital'                => __( 'Hospital', $this->plugin_slug ),
-					'insurance_agency'        => __( 'Insurance Agency', $this->plugin_slug ),
-					'jewelry_store'           => __( 'Jewelry Store', $this->plugin_slug ),
-					'laundry'                 => __( 'Laundry', $this->plugin_slug ),
-					'lawyer'                  => __( 'Lawyer', $this->plugin_slug ),
-					'library'                 => __( 'Library', $this->plugin_slug ),
-					'liquor_store'            => __( 'Liquor Store', $this->plugin_slug ),
-					'local_government_office' => __( 'Local Government Office', $this->plugin_slug ),
-					'locksmith'               => __( 'Locksmith', $this->plugin_slug ),
-					'lodging'                 => __( 'Lodging', $this->plugin_slug ),
-					'meal_delivery'           => __( 'Meal Delivery', $this->plugin_slug ),
-					'meal_takeaway'           => __( 'Meal Takeaway', $this->plugin_slug ),
-					'mosque'                  => __( 'Mosque', $this->plugin_slug ),
-					'movie_rental'            => __( 'Movie Rental', $this->plugin_slug ),
-					'movie_theater'           => __( 'Movie Theater', $this->plugin_slug ),
-					'moving_company'          => __( 'Moving Company', $this->plugin_slug ),
-					'museum'                  => __( 'Museum', $this->plugin_slug ),
-					'night_club'              => __( 'Night Club', $this->plugin_slug ),
-					'painter'                 => __( 'Painter', $this->plugin_slug ),
-					'park'                    => __( 'Park', $this->plugin_slug ),
-					'parking'                 => __( 'Parking', $this->plugin_slug ),
-					'pet_store'               => __( 'Pet Store', $this->plugin_slug ),
-					'pharmacy'                => __( 'Pharmacy', $this->plugin_slug ),
-					'physiotherapist'         => __( 'Physiotherapist', $this->plugin_slug ),
-					'place_of_worship'        => __( 'Place of Worship', $this->plugin_slug ),
-					'plumber'                 => __( 'Plumber', $this->plugin_slug ),
-					'police'                  => __( 'Police', $this->plugin_slug ),
-					'post_office'             => __( 'Post Office', $this->plugin_slug ),
-					'real_estate_agency'      => __( 'Real Estate Agency', $this->plugin_slug ),
-					'restaurant'              => __( 'Restaurant', $this->plugin_slug ),
-					'roofing_contractor'      => __( 'Roofing Contractor', $this->plugin_slug ),
-					'rv_park'                 => __( 'RV Park', $this->plugin_slug ),
-					'school'                  => __( 'School', $this->plugin_slug ),
-					'shoe_store'              => __( 'Shoe Store', $this->plugin_slug ),
-					'shopping_mall'           => __( 'Shopping Mall', $this->plugin_slug ),
-					'spa'                     => __( 'Spa', $this->plugin_slug ),
-					'stadium'                 => __( 'Stadium', $this->plugin_slug ),
-					'storage'                 => __( 'Storage', $this->plugin_slug ),
-					'store'                   => __( 'Store', $this->plugin_slug ),
-					'subway_station'          => __( 'Subway Station', $this->plugin_slug ),
-					'synagogue'               => __( 'Synagogue', $this->plugin_slug ),
-					'taxi_stand'              => __( 'Taxi Stand', $this->plugin_slug ),
-					'train_station'           => __( 'Train Station', $this->plugin_slug ),
-					'travel_agency'           => __( 'Travel Agency', $this->plugin_slug ),
-					'university'              => __( 'University', $this->plugin_slug ),
-					'veterinary_care'         => __( 'Veterinary Care', $this->plugin_slug ),
-					'zoo'                     => __( 'Zoo', $this->plugin_slug )
-				) )
+				'options' => apply_filters('gmb_place_types', array(
+					'accounting'              => __('Accounting', $this->plugin_slug),
+					'airport'                 => __('Airport', $this->plugin_slug),
+					'amusement_park'          => __('Amusement Park', $this->plugin_slug),
+					'aquarium'                => __('Aquarium', $this->plugin_slug),
+					'art_gallery'             => __('Art Gallery', $this->plugin_slug),
+					'atm'                     => __('ATM', $this->plugin_slug),
+					'bakery'                  => __('Bakery', $this->plugin_slug),
+					'bank'                    => __('Bank', $this->plugin_slug),
+					'bar'                     => __('Bar', $this->plugin_slug),
+					'beauty_salon'            => __('Beauty Salon', $this->plugin_slug),
+					'bicycle_store'           => __('Bicycle Store', $this->plugin_slug),
+					'book_store'              => __('Book Store', $this->plugin_slug),
+					'bowling_alley'           => __('Bowling Alley', $this->plugin_slug),
+					'bus_station'             => __('Bus Station', $this->plugin_slug),
+					'cafe'                    => __('Cafe', $this->plugin_slug),
+					'campground'              => __('Campground', $this->plugin_slug),
+					'car_dealer'              => __('Car Dealer', $this->plugin_slug),
+					'car_rental'              => __('Car Rental', $this->plugin_slug),
+					'car_repair'              => __('Car Repair', $this->plugin_slug),
+					'car_wash'                => __('Car Wash', $this->plugin_slug),
+					'casino'                  => __('Casino', $this->plugin_slug),
+					'cemetery'                => __('Cemetery', $this->plugin_slug),
+					'church'                  => __('Church', $this->plugin_slug),
+					'city_hall'               => __('City Hall', $this->plugin_slug),
+					'clothing_store'          => __('Clothing Store', $this->plugin_slug),
+					'convenience_store'       => __('Convenience Store', $this->plugin_slug),
+					'courthouse'              => __('Courthouse', $this->plugin_slug),
+					'dentist'                 => __('Dentist', $this->plugin_slug),
+					'department_store'        => __('Department Store', $this->plugin_slug),
+					'doctor'                  => __('Doctor', $this->plugin_slug),
+					'electrician'             => __('Electrician', $this->plugin_slug),
+					'electronics_store'       => __('Electronics Store', $this->plugin_slug),
+					'embassy'                 => __('Embassy', $this->plugin_slug),
+					'establishment'           => __('Establishment', $this->plugin_slug),
+					'finance'                 => __('Finance', $this->plugin_slug),
+					'fire_station'            => __('Fire Station', $this->plugin_slug),
+					'florist'                 => __('Florist', $this->plugin_slug),
+					'food'                    => __('Food', $this->plugin_slug),
+					'funeral_home'            => __('Funeral Home', $this->plugin_slug),
+					'furniture_store'         => __('Furniture_store', $this->plugin_slug),
+					'gas_station'             => __('Gas Station', $this->plugin_slug),
+					'general_contractor'      => __('General Contractor', $this->plugin_slug),
+					'grocery_or_supermarket'  => __('Grocery or Supermarket', $this->plugin_slug),
+					'gym'                     => __('Gym', $this->plugin_slug),
+					'hair_care'               => __('Hair Care', $this->plugin_slug),
+					'hardware_store'          => __('Hardware Store', $this->plugin_slug),
+					'health'                  => __('Health', $this->plugin_slug),
+					'hindu_temple'            => __('Hindu Temple', $this->plugin_slug),
+					'home_goods_store'        => __('Home Goods Store', $this->plugin_slug),
+					'hospital'                => __('Hospital', $this->plugin_slug),
+					'insurance_agency'        => __('Insurance Agency', $this->plugin_slug),
+					'jewelry_store'           => __('Jewelry Store', $this->plugin_slug),
+					'laundry'                 => __('Laundry', $this->plugin_slug),
+					'lawyer'                  => __('Lawyer', $this->plugin_slug),
+					'library'                 => __('Library', $this->plugin_slug),
+					'liquor_store'            => __('Liquor Store', $this->plugin_slug),
+					'local_government_office' => __('Local Government Office', $this->plugin_slug),
+					'locksmith'               => __('Locksmith', $this->plugin_slug),
+					'lodging'                 => __('Lodging', $this->plugin_slug),
+					'meal_delivery'           => __('Meal Delivery', $this->plugin_slug),
+					'meal_takeaway'           => __('Meal Takeaway', $this->plugin_slug),
+					'mosque'                  => __('Mosque', $this->plugin_slug),
+					'movie_rental'            => __('Movie Rental', $this->plugin_slug),
+					'movie_theater'           => __('Movie Theater', $this->plugin_slug),
+					'moving_company'          => __('Moving Company', $this->plugin_slug),
+					'museum'                  => __('Museum', $this->plugin_slug),
+					'night_club'              => __('Night Club', $this->plugin_slug),
+					'painter'                 => __('Painter', $this->plugin_slug),
+					'park'                    => __('Park', $this->plugin_slug),
+					'parking'                 => __('Parking', $this->plugin_slug),
+					'pet_store'               => __('Pet Store', $this->plugin_slug),
+					'pharmacy'                => __('Pharmacy', $this->plugin_slug),
+					'physiotherapist'         => __('Physiotherapist', $this->plugin_slug),
+					'place_of_worship'        => __('Place of Worship', $this->plugin_slug),
+					'plumber'                 => __('Plumber', $this->plugin_slug),
+					'police'                  => __('Police', $this->plugin_slug),
+					'post_office'             => __('Post Office', $this->plugin_slug),
+					'real_estate_agency'      => __('Real Estate Agency', $this->plugin_slug),
+					'restaurant'              => __('Restaurant', $this->plugin_slug),
+					'roofing_contractor'      => __('Roofing Contractor', $this->plugin_slug),
+					'rv_park'                 => __('RV Park', $this->plugin_slug),
+					'school'                  => __('School', $this->plugin_slug),
+					'shoe_store'              => __('Shoe Store', $this->plugin_slug),
+					'shopping_mall'           => __('Shopping Mall', $this->plugin_slug),
+					'spa'                     => __('Spa', $this->plugin_slug),
+					'stadium'                 => __('Stadium', $this->plugin_slug),
+					'storage'                 => __('Storage', $this->plugin_slug),
+					'store'                   => __('Store', $this->plugin_slug),
+					'subway_station'          => __('Subway Station', $this->plugin_slug),
+					'synagogue'               => __('Synagogue', $this->plugin_slug),
+					'taxi_stand'              => __('Taxi Stand', $this->plugin_slug),
+					'train_station'           => __('Train Station', $this->plugin_slug),
+					'travel_agency'           => __('Travel Agency', $this->plugin_slug),
+					'university'              => __('University', $this->plugin_slug),
+					'veterinary_care'         => __('Veterinary Care', $this->plugin_slug),
+					'zoo'                     => __('Zoo', $this->plugin_slug)
+				))
 			)
 		);
 
 		/**
 		 * Display Options
 		 */
-		$display_options = cmb2_get_metabox( array(
+		$display_options = cmb2_get_metabox(array(
 			'id'           => 'google_maps_options',
-			'title'        => __( 'Display Options', $this->plugin_slug ),
-			'object_types' => array( 'google_maps' ), // post type
+			'title'        => __('Display Options', $this->plugin_slug),
+			'object_types' => array('google_maps'), // post type
 			'context'      => 'side', //  'normal', 'advanced', or 'side'
 			'priority'     => 'default', //  'high', 'core', 'default' or 'low'
 			'show_names'   => true, // Show field names on the left
-		) );
+		));
 
-		$display_options->add_field( array(
-			'name'           => __( 'Map Size', $this->plugin_slug ),
-			'id'             => $prefix . 'width_height',
+		$display_options->add_field(array(
+			'name'           => __('Map Size', $this->plugin_slug),
+			'id'             => $prefix.'width_height',
 			'type'           => 'width_height',
 			'width_std'      => $default_options['width'],
 			'width_unit_std' => $default_options['width_unit'],
 			'height_std'     => $default_options['height'],
 			'desc'           => '',
-		) );
-		$display_options->add_field( array(
-			'name'    => __( 'Map Location', $this->plugin_slug ),
-			'id'      => $prefix . 'lat_lng',
+		));
+		$display_options->add_field(array(
+			'name'    => __('Map Location', $this->plugin_slug),
+			'id'      => $prefix.'lat_lng',
 			'type'    => 'lat_lng',
 			'lat_std' => '',
 			'lng_std' => '',
 			'desc'    => '',
-		) );
-		$display_options->add_field( array(
-			'name'    => __( 'Map Type', $this->plugin_slug ),
-			'id'      => $prefix . 'type',
+		));
+		$display_options->add_field(array(
+			'name'    => __('Map Type', $this->plugin_slug),
+			'id'      => $prefix.'type',
 			'type'    => 'select',
 			'default' => 'default',
 			'options' => array(
-				'RoadMap'   => __( 'Road Map', $this->plugin_slug ),
-				'Satellite' => __( 'Satellite', $this->plugin_slug ),
-				'Hybrid'    => __( 'Hybrid', $this->plugin_slug ),
-				'Terrain'   => __( 'Terrain', $this->plugin_slug )
+				'RoadMap'   => __('Road Map', $this->plugin_slug),
+				'Satellite' => __('Satellite', $this->plugin_slug),
+				'Hybrid'    => __('Hybrid', $this->plugin_slug),
+				'Terrain'   => __('Terrain', $this->plugin_slug)
 			),
-		) );
+		));
 
-		$display_options->add_field( array(
+		$display_options->add_field(array(
 			'name'    => 'Map Theme',
-			'desc'    => sprintf( __( 'Set optional preconfigured %1$sSnazzy Maps%2$s styles. %3$sUpgrade to Pro%2$s for more styles and to set your own.', $this->plugin_slug ), '<a href="' . esc_url( 'http://snazzymaps.com' ) . '" class="snazzy-link new-window"  target="_blank">', '</a>', '<a href="' . esc_url( 'https://wordimpress.com/plugins/maps-builder-pro/?utm_source=MBF&utm_medium=BANNER&utm_term=MAP_OPTIONS&utm_campaign=MBF' ) . '" class="new-window"  target="_blank">' ),
-			'id'      => $prefix . 'theme',
+			'desc'    => sprintf(__('Set optional preconfigured %1$sSnazzy Maps%2$s styles. %3$sUpgrade to Pro%2$s for more styles and to set your own.', $this->plugin_slug), '<a href="'.esc_url('http://snazzymaps.com').'" class="snazzy-link new-window"  target="_blank">', '</a>', '<a href="'.esc_url('https://wordimpress.com/plugins/maps-builder-pro/?utm_source=MBF&utm_medium=BANNER&utm_term=MAP_OPTIONS&utm_campaign=MBF').'" class="new-window"  target="_blank">'),
+			'id'      => $prefix.'theme',
 			'type'    => 'select',
 			'default' => 'none',
 			'options' => array(
-				'none' => __( 'None', $this->plugin_slug ),
-				'68'   => __( 'Aqua', $this->plugin_slug ),
-				'73'   => __( 'A Dark World', $this->plugin_slug ),
-				'28'   => __( 'Bluish', $this->plugin_slug ),
-				'80'   => __( 'Cool Grey', $this->plugin_slug ),
-				'77'   => __( 'Clean Cut', $this->plugin_slug ),
-				'36'   => __( 'Flat Green', $this->plugin_slug ),
-				'44'   => __( 'MapBox', $this->plugin_slug ),
-				'83'   => __( 'Muted Blue', $this->plugin_slug ),
-				'22'   => __( 'Old Timey', $this->plugin_slug ),
-				'1'    => __( 'Pale Dawn', $this->plugin_slug ),
-				'19'   => __( 'Paper', $this->plugin_slug ),
-				'37'   => __( 'Lunar Landscape', $this->plugin_slug ),
-				'75'   => __( 'Shade of Green', $this->plugin_slug ),
-				'27'   => __( 'Shift Worker', $this->plugin_slug ),
-				'15'   => __( 'Subtle Grayscale', $this->plugin_slug ),
-				'50'   => __( 'The Endless Atlas', $this->plugin_slug ),
+				'none' => __('None', $this->plugin_slug),
+				'68'   => __('Aqua', $this->plugin_slug),
+				'73'   => __('A Dark World', $this->plugin_slug),
+				'28'   => __('Bluish', $this->plugin_slug),
+				'80'   => __('Cool Grey', $this->plugin_slug),
+				'77'   => __('Clean Cut', $this->plugin_slug),
+				'36'   => __('Flat Green', $this->plugin_slug),
+				'44'   => __('MapBox', $this->plugin_slug),
+				'83'   => __('Muted Blue', $this->plugin_slug),
+				'22'   => __('Old Timey', $this->plugin_slug),
+				'1'    => __('Pale Dawn', $this->plugin_slug),
+				'19'   => __('Paper', $this->plugin_slug),
+				'37'   => __('Lunar Landscape', $this->plugin_slug),
+				'75'   => __('Shade of Green', $this->plugin_slug),
+				'27'   => __('Shift Worker', $this->plugin_slug),
+				'15'   => __('Subtle Grayscale', $this->plugin_slug),
+				'50'   => __('The Endless Atlas', $this->plugin_slug),
 			)
-		) );
-		$display_options->add_field( array(
-			'name'        => __( 'Map Theme JSON', $this->plugin_slug ),
+		));
+		$display_options->add_field(array(
+			'name'        => __('Map Theme JSON', $this->plugin_slug),
 			'desc'        => 'Contains the map theme JSON',
 			'row_classes' => 'hidden',
 			'default'     => 'none',
-			'id'          => $prefix . 'theme_json',
+			'id'          => $prefix.'theme_json',
 			'type'        => 'textarea_code'
-		) );
+		));
 
-		$display_options->add_field( array(
+		$display_options->add_field(array(
 			'name'    => 'Zoom',
-			'desc'    => __( 'Adjust the map zoom (0-21)', $this->plugin_slug ),
-			'id'      => $prefix . 'zoom',
+			'desc'    => __('Adjust the map zoom (0-21)', $this->plugin_slug),
+			'id'      => $prefix.'zoom',
 			'type'    => 'select',
 			'default' => '15',
-			'options' => apply_filters( 'gmb_map_zoom_levels', array(
+			'options' => apply_filters('gmb_map_zoom_levels', array(
 					'21' => '21',
 					'20' => '20',
 					'19' => '19',
@@ -484,100 +484,100 @@ 
 					'0'  => '0',
 				)
 			)
-		) );
+		));
 
 		// CONTROL OPTIONS
 
-		$control_options = cmb2_get_metabox( array(
+		$control_options = cmb2_get_metabox(array(
 			'id'           => 'google_maps_control_options',
-			'title'        => __( 'Map Controls', $this->plugin_slug ),
-			'object_types' => array( 'google_maps' ), // post type
+			'title'        => __('Map Controls', $this->plugin_slug),
+			'object_types' => array('google_maps'), // post type
 			'context'      => 'side', //  'normal', 'advanced', or 'side'
 			'priority'     => 'default', //  'high', 'core', 'default' or 'low'
 			'show_names'   => true, // Show field names on the left
-		) );
+		));
 
-		$control_options->add_field( array(
-			'name'        => __( 'Zoom Control', $this->plugin_slug ),
-			'before'      => '<span class="gmb-tooltip-text">' . __( 'Test test 123', $this->plugin_slug ) . '</span>',
+		$control_options->add_field(array(
+			'name'        => __('Zoom Control', $this->plugin_slug),
+			'before'      => '<span class="gmb-tooltip-text">'.__('Test test 123', $this->plugin_slug).'</span>',
 			'row_classes' => 'gmb-tooltip-field',
-			'id'          => $prefix . 'zoom_control',
+			'id'          => $prefix.'zoom_control',
 			'type'        => 'select',
 			'default'     => 'default',
 			'options'     => array(
-				'none'    => __( 'None', $this->plugin_slug ),
-				'small'   => __( 'Small', $this->plugin_slug ),
-				'large'   => __( 'Large', $this->plugin_slug ),
-				'default' => __( 'Default', $this->plugin_slug ),
+				'none'    => __('None', $this->plugin_slug),
+				'small'   => __('Small', $this->plugin_slug),
+				'large'   => __('Large', $this->plugin_slug),
+				'default' => __('Default', $this->plugin_slug),
 			),
-		) );
+		));
 
-		$control_options->add_field( array(
-			'name'    => __( 'Street View', $this->plugin_slug ),
-			'id'      => $prefix . 'street_view',
+		$control_options->add_field(array(
+			'name'    => __('Street View', $this->plugin_slug),
+			'id'      => $prefix.'street_view',
 			'type'    => 'select',
 			'default' => 'true',
 			'options' => array(
-				'none' => __( 'None', $this->plugin_slug ),
-				'true' => __( 'Standard', $this->plugin_slug ),
+				'none' => __('None', $this->plugin_slug),
+				'true' => __('Standard', $this->plugin_slug),
 			),
-		) );
+		));
 
-		$control_options->add_field( array(
-			'name'    => __( 'Pan Control', $this->plugin_slug ),
-			'id'      => $prefix . 'pan',
+		$control_options->add_field(array(
+			'name'    => __('Pan Control', $this->plugin_slug),
+			'id'      => $prefix.'pan',
 			'type'    => 'select',
 			'default' => 'true',
 			'options' => array(
-				'none' => __( 'None', $this->plugin_slug ),
-				'true' => __( 'Standard', $this->plugin_slug ),
+				'none' => __('None', $this->plugin_slug),
+				'true' => __('Standard', $this->plugin_slug),
 			),
-		) );
+		));
 
-		$control_options->add_field( array(
-			'name'    => __( 'Map Type Control', $this->plugin_slug ),
-			'id'      => $prefix . 'map_type_control',
+		$control_options->add_field(array(
+			'name'    => __('Map Type Control', $this->plugin_slug),
+			'id'      => $prefix.'map_type_control',
 			'type'    => 'select',
 			'default' => 'horizontal_bar',
 			'options' => array(
-				'none'           => __( 'None', $this->plugin_slug ),
-				'dropdown_menu'  => __( 'Dropdown Menu', $this->plugin_slug ),
-				'horizontal_bar' => __( 'Horizontal Bar', $this->plugin_slug ),
+				'none'           => __('None', $this->plugin_slug),
+				'dropdown_menu'  => __('Dropdown Menu', $this->plugin_slug),
+				'horizontal_bar' => __('Horizontal Bar', $this->plugin_slug),
 			),
-		) );
+		));
 
-		$control_options->add_field( array(
-			'name'    => __( 'Draggable Map', $this->plugin_slug ),
-			'id'      => $prefix . 'draggable',
+		$control_options->add_field(array(
+			'name'    => __('Draggable Map', $this->plugin_slug),
+			'id'      => $prefix.'draggable',
 			'type'    => 'select',
 			'default' => 'true',
 			'options' => array(
-				'none' => __( 'None', $this->plugin_slug ),
-				'true' => __( 'Standard', $this->plugin_slug ),
+				'none' => __('None', $this->plugin_slug),
+				'true' => __('Standard', $this->plugin_slug),
 			),
-		) );
+		));
 
-		$control_options->add_field( array(
-			'name'    => __( 'Double Click to Zoom', $this->plugin_slug ),
-			'id'      => $prefix . 'double_click',
+		$control_options->add_field(array(
+			'name'    => __('Double Click to Zoom', $this->plugin_slug),
+			'id'      => $prefix.'double_click',
 			'type'    => 'select',
 			'default' => 'true',
 			'options' => array(
-				'none' => __( 'None', $this->plugin_slug ),
-				'true' => __( 'Standard', $this->plugin_slug ),
+				'none' => __('None', $this->plugin_slug),
+				'true' => __('Standard', $this->plugin_slug),
 			),
-		) );
+		));
 
-		$control_options->add_field( array(
-			'name'    => __( 'Mouse Wheel to Zoom', $this->plugin_slug ),
-			'id'      => $prefix . 'wheel_zoom',
+		$control_options->add_field(array(
+			'name'    => __('Mouse Wheel to Zoom', $this->plugin_slug),
+			'id'      => $prefix.'wheel_zoom',
 			'type'    => 'select',
 			'default' => 'true',
 			'options' => array(
-				'none' => __( 'Disabled', $this->plugin_slug ),
-				'true' => __( 'Standard', $this->plugin_slug ),
+				'none' => __('Disabled', $this->plugin_slug),
+				'true' => __('Standard', $this->plugin_slug),
 			),
-		) );
+		));
 
 	}
 
@@ -589,7 +589,7 @@ 
 	 * @param $field
 	 * @param $meta
 	 */
-	function cmb2_render_width_height( $field, $meta ) {
+	function cmb2_render_width_height($field, $meta) {
 		$default_options = $this->get_default_map_options();
 		$meta            = wp_parse_args(
 			$meta, array(
@@ -603,24 +603,24 @@ 
 		$output = '<div id="width_height_wrap" class="clear clearfix">';
 		//width
 		$output .= '<div id="width_wrap" class="clear">';
-		$output .= '<label class="width-label size-label">' . __( 'Width', $this->plugin_slug ) . '</label><input type="text" class="regular-text map-width" name="' . $field->args( 'id' ) . '[width]" id="' . $field->args( 'id' ) . '-width" value="' . ( $meta['width'] ? $meta['width'] : $field->args( 'width_std' ) ) . '" />';
+		$output .= '<label class="width-label size-label">'.__('Width', $this->plugin_slug).'</label><input type="text" class="regular-text map-width" name="'.$field->args('id').'[width]" id="'.$field->args('id').'-width" value="'.($meta['width'] ? $meta['width'] : $field->args('width_std')).'" />';
 		$output .= '<div class="size-labels-wrap">';
-		$output .= '<input id="width_unit_percent" type="radio" name="' . $field->args( 'id' ) . '[map_width_unit]" class="width_radio" value="%" ' . ( $meta['map_width_unit'] === '%' || $field->args( 'width_unit_std' ) === '%' ? 'checked="checked"' : '' ) . '><label class="width_unit_label">%</label>';
-		$output .= '<input id="width_unit_px" type="radio" name="' . $field->args( 'id' ) . '[map_width_unit]" class="width_radio" value="px" ' . ( $meta['map_width_unit'] === 'px' ? 'checked="checked"' : '' ) . ' ><label class="width_unit_label">px</label>';
+		$output .= '<input id="width_unit_percent" type="radio" name="'.$field->args('id').'[map_width_unit]" class="width_radio" value="%" '.($meta['map_width_unit'] === '%' || $field->args('width_unit_std') === '%' ? 'checked="checked"' : '').'><label class="width_unit_label">%</label>';
+		$output .= '<input id="width_unit_px" type="radio" name="'.$field->args('id').'[map_width_unit]" class="width_radio" value="px" '.($meta['map_width_unit'] === 'px' ? 'checked="checked"' : '').' ><label class="width_unit_label">px</label>';
 		$output .= '</div>';
 		$output .= '</div>';
 
 		//height
 		$output .= '<div id="height_wrap" class="clear clearfix">';
-		$output .= '<label for="' . $field->args( 'id' ) . '[height]" class="height-label size-label">' . __( 'Height', $this->plugin_slug ) . ':</label><input type="text" class="regular-text map-height" name="' . $field->args( 'id' ) . '[height]" id="' . $field->args( 'id' ) . '-height" value="' . ( $meta['height'] ? $meta['height'] : $field->args( 'height_std' ) ) . '" />';
+		$output .= '<label for="'.$field->args('id').'[height]" class="height-label size-label">'.__('Height', $this->plugin_slug).':</label><input type="text" class="regular-text map-height" name="'.$field->args('id').'[height]" id="'.$field->args('id').'-height" value="'.($meta['height'] ? $meta['height'] : $field->args('height_std')).'" />';
 
 		$output .= '<div class="size-labels-wrap">';
-		$output .= '<input id="height_unit_percent" type="radio" name="' . $field->args( 'id' ) . '[map_height_unit]" class="height_radio" value="%" ' . ( $meta['map_height_unit'] === '%' || $field->args( 'height_unit_std' ) === '%' ? 'checked="checked"' : '' ) . '><label class="height_unit_label">%</label>';
-		$output .= '<input id="height_unit_px" type="radio" name="' . $field->args( 'id' ) . '[map_height_unit]" class="height_radio" value="px" ' . ( $meta['map_height_unit'] === 'px' ? 'checked="checked"' : '' ) . ' ><label class="height_unit_label">px</label>';
+		$output .= '<input id="height_unit_percent" type="radio" name="'.$field->args('id').'[map_height_unit]" class="height_radio" value="%" '.($meta['map_height_unit'] === '%' || $field->args('height_unit_std') === '%' ? 'checked="checked"' : '').'><label class="height_unit_label">%</label>';
+		$output .= '<input id="height_unit_px" type="radio" name="'.$field->args('id').'[map_height_unit]" class="height_radio" value="px" '.($meta['map_height_unit'] === 'px' ? 'checked="checked"' : '').' ><label class="height_unit_label">px</label>';
 		$output .= '</div>';
 		$output .= '</div>';
 
-		$output .= '<p class="cmb2-metabox-description">' . __( 'Configure the default map width and height.', $this->plugin_slug ) . '</p>';
+		$output .= '<p class="cmb2-metabox-description">'.__('Configure the default map width and height.', $this->plugin_slug).'</p>';
 
 		$output .= '</div>'; //end #width_height_wrap
 
@@ -637,7 +637,7 @@ 
 	 * @param $field
 	 * @param $meta
 	 */
-	function cmb2_render_lat_lng( $field, $meta ) {
+	function cmb2_render_lat_lng($field, $meta) {
 		$meta = wp_parse_args(
 			$meta, array(
 				'latitude'  => '',
@@ -648,13 +648,13 @@ 
 		//lat lng
 		$output = '<div id="lat-lng-wrap">
 					<div class="coordinates-wrap clear">
-							<div class="lat-lng-wrap lat-wrap clear"><span>' . __( 'Latitude:', $this->plugin_slug ) . '</span>
-							<input type="text" class="regular-text latitude" name="' . $field->args( 'id' ) . '[latitude]" id="' . $field->args( 'id' ) . '-latitude" value="' . ( $meta['latitude'] ? $meta['latitude'] : $field->args( 'lat_std' ) ) . '" />
+							<div class="lat-lng-wrap lat-wrap clear"><span>' . __('Latitude:', $this->plugin_slug).'</span>
+							<input type="text" class="regular-text latitude" name="' . $field->args('id').'[latitude]" id="'.$field->args('id').'-latitude" value="'.($meta['latitude'] ? $meta['latitude'] : $field->args('lat_std')).'" />
 							</div>
-							<div class="lat-lng-wrap lng-wrap clear"><span>' . __( 'Longitude:', $this->plugin_slug ) . '</span>
-							<input type="text" class="regular-text longitude" name="' . $field->args( 'id' ) . '[longitude]" id="' . $field->args( 'id' ) . '-longitude" value="' . ( $meta['longitude'] ? $meta['longitude'] : $field->args( 'lng_std' ) ) . '" />
+							<div class="lat-lng-wrap lng-wrap clear"><span>' . __('Longitude:', $this->plugin_slug).'</span>
+							<input type="text" class="regular-text longitude" name="' . $field->args('id').'[longitude]" id="'.$field->args('id').'-longitude" value="'.($meta['longitude'] ? $meta['longitude'] : $field->args('lng_std')).'" />
 							</div>';
-		$output .= '<div class="wpgp-message lat-lng-change-message clear"><p>' . __( 'Lat/lng changed', $this->plugin_slug ) . '</p><a href="#" class="button lat-lng-update-btn button-small" data-lat="" data-lng="">' . __( 'Update', $this->plugin_slug ) . '</a></div>';
+		$output .= '<div class="wpgp-message lat-lng-change-message clear"><p>'.__('Lat/lng changed', $this->plugin_slug).'</p><a href="#" class="button lat-lng-update-btn button-small" data-lat="" data-lng="">'.__('Update', $this->plugin_slug).'</a></div>';
 		$output .= '</div><!-- /.coordinates-wrap -->
 						</div>';
 
@@ -669,7 +669,7 @@ 
 	 * @since  1.0.0
 	 * @return array
 	 */
-	function cmb2_render_google_geocoder( $field, $meta ) {
+	function cmb2_render_google_geocoder($field, $meta) {
 
 		$meta = wp_parse_args(
 			$meta, array(
@@ -677,8 +677,8 @@ 
 			)
 		);
 
-		echo '<div class="autocomplete-wrap"><input type="text" name="' . $field->args( 'id' ) . '[geocode]" id="' . $field->args( 'id' ) . '" value="" class="search-autocomplete" /><p class="autocomplete-description">' .
-		     sprintf( __( 'Enter the name of a place or an address above to create a map marker or %1$sDrop a Marker%2$s', $this->plugin_slug ), '<a href="#" class="drop-marker button button-small"><span class="dashicons dashicons-location"></span>', '</a>' ) .
+		echo '<div class="autocomplete-wrap"><input type="text" name="'.$field->args('id').'[geocode]" id="'.$field->args('id').'" value="" class="search-autocomplete" /><p class="autocomplete-description">'.
+		     sprintf(__('Enter the name of a place or an address above to create a map marker or %1$sDrop a Marker%2$s', $this->plugin_slug), '<a href="#" class="drop-marker button button-small"><span class="dashicons dashicons-location"></span>', '</a>').
 		     '</p></div>';
 
 	}
@@ -687,29 +687,29 @@ 
 	 *  Custom Google Geocoder field
 	 * @since  1.0.0
 	 */
-	function cmb2_render_google_maps_preview( $field, $meta ) {
+	function cmb2_render_google_maps_preview($field, $meta) {
 		global $post;
-		$meta            = wp_parse_args( $meta, array() );
-		$wh_value        = get_post_meta( $post->ID, 'gmb_width_height', true );
-		$lat_lng         = get_post_meta( $post->ID, 'gmb_lat_lng', true );
+		$meta            = wp_parse_args($meta, array());
+		$wh_value        = get_post_meta($post->ID, 'gmb_width_height', true);
+		$lat_lng         = get_post_meta($post->ID, 'gmb_lat_lng', true);
 		$default_options = $this->get_default_map_options();
 
-		$output = '<div class="places-loading wpgp-loading">' . __( 'Loading Places', $this->plugin_slug ) . '</div><div id="google-map-wrap">';
+		$output = '<div class="places-loading wpgp-loading">'.__('Loading Places', $this->plugin_slug).'</div><div id="google-map-wrap">';
 		$output .= '<div id="map" style="height:600px; width:100%;"></div>';
 
-		$output .= '<div class="map-modal-upsell"><p class="upsell-intro">' . __( 'Want more?', $this->plugin_slug ) . '</p><a href="https://wordimpress.com/plugins/maps-builder-pro?utm_source=MBF&utm_medium=BANNER&utm_content=MODAL&utm_campaign=MBF%20Modal" class="button button-small upsell-button" target="_blank">' . __( 'Go Pro!', $this->plugin_slug ) . '</a></div>';
+		$output .= '<div class="map-modal-upsell"><p class="upsell-intro">'.__('Want more?', $this->plugin_slug).'</p><a href="https://wordimpress.com/plugins/maps-builder-pro?utm_source=MBF&utm_medium=BANNER&utm_content=MODAL&utm_campaign=MBF%20Modal" class="button button-small upsell-button" target="_blank">'.__('Go Pro!', $this->plugin_slug).'</a></div>';
 
 		//Toolbar
 		$output .= '<div id="map-toolbar">';
-		$output .= '<button class="add-location button button-small gmb-magnific-inline" data-target="cmb2-id-gmb-geocoder" data-auto-focus="true"><span class="dashicons dashicons-pressthis"></span>' . __( 'Add Location', $this->plugin_slug ) . '</button>';
-		$output .= '<button class="drop-marker button button-small"><span class="dashicons dashicons-location"></span>' . __( 'Drop a Marker', $this->plugin_slug ) . '</button>';
-		$output .= '<button class="goto-location button button-small gmb-magnific-inline" data-target="map-autocomplete-wrap" data-auto-focus="true"><span class="dashicons dashicons-admin-site"></span>' . __( 'Goto Location', $this->plugin_slug ) . '</button>';
-		$output .= '<button class="edit-title button  button-small gmb-magnific-inline" data-target="map-title-wrap" data-auto-focus="true"><span class="dashicons dashicons-edit"></span>' . __( 'Edit Map Title', $this->plugin_slug ) . '</button>';
+		$output .= '<button class="add-location button button-small gmb-magnific-inline" data-target="cmb2-id-gmb-geocoder" data-auto-focus="true"><span class="dashicons dashicons-pressthis"></span>'.__('Add Location', $this->plugin_slug).'</button>';
+		$output .= '<button class="drop-marker button button-small"><span class="dashicons dashicons-location"></span>'.__('Drop a Marker', $this->plugin_slug).'</button>';
+		$output .= '<button class="goto-location button button-small gmb-magnific-inline" data-target="map-autocomplete-wrap" data-auto-focus="true"><span class="dashicons dashicons-admin-site"></span>'.__('Goto Location', $this->plugin_slug).'</button>';
+		$output .= '<button class="edit-title button  button-small gmb-magnific-inline" data-target="map-title-wrap" data-auto-focus="true"><span class="dashicons dashicons-edit"></span>'.__('Edit Map Title', $this->plugin_slug).'</button>';
 
 		$output .= '<div class="live-lat-lng-wrap clearfix">';
-		$output .= '<button disabled class="update-lat-lng button button-small">' . __( 'Set Lat/Lng', $this->plugin_slug ) . '</button>';
-		$output .= '<div class="live-latitude-wrap"><span class="live-latitude-label">' . __( 'Lat:', $this->plugin_slug ) . '</span><span class="live-latitude">' . ( isset( $lat_lng['latitude'] ) ? $lat_lng['latitude'] : '' ) . '</span></div>';
-		$output .= '<div class="live-longitude-wrap"><span class="live-longitude-label">' . __( 'Lng:', $this->plugin_slug ) . '</span><span class="live-longitude">' . ( isset( $lat_lng['longitude'] ) ? $lat_lng['longitude'] : '' ) . '</span></div>';
+		$output .= '<button disabled class="update-lat-lng button button-small">'.__('Set Lat/Lng', $this->plugin_slug).'</button>';
+		$output .= '<div class="live-latitude-wrap"><span class="live-latitude-label">'.__('Lat:', $this->plugin_slug).'</span><span class="live-latitude">'.(isset($lat_lng['latitude']) ? $lat_lng['latitude'] : '').'</span></div>';
+		$output .= '<div class="live-longitude-wrap"><span class="live-longitude-label">'.__('Lng:', $this->plugin_slug).'</span><span class="live-longitude">'.(isset($lat_lng['longitude']) ? $lat_lng['longitude'] : '').'</span></div>';
 		$output .= '</div>'; //End .live-lat-lng-wrap
 		$output .= '</div>'; //End #map-toolbar
 		$output .= '</div>'; //End #map
@@ -720,9 +720,9 @@ 
 		$output .= '<div class="inner-modal-wrap">';
 		$output .= '<div class="inner-modal-container">';
 		$output .= '<div class="inner-modal clearfix">';
-		$output .= '<label for="post_title" class="map-title">' . __( 'Map Title', $this->plugin_slug ) . '</label>';
-		$output .= '<p class="cmb2-metabox-description">' . __( 'Give your Map a descriptive title', $this->plugin_slug ) . '</p>';
-		$output .= '<button type="button" class="gmb-modal-close">&times;</button><input type="text" name="model_post_title" size="30" value="' . get_the_title() . '" id="modal_title" spellcheck="true" autocomplete="off" placeholder="' . __( 'Enter map title', $this->plugin_slug ) . '">';
+		$output .= '<label for="post_title" class="map-title">'.__('Map Title', $this->plugin_slug).'</label>';
+		$output .= '<p class="cmb2-metabox-description">'.__('Give your Map a descriptive title', $this->plugin_slug).'</p>';
+		$output .= '<button type="button" class="gmb-modal-close">&times;</button><input type="text" name="model_post_title" size="30" value="'.get_the_title().'" id="modal_title" spellcheck="true" autocomplete="off" placeholder="'.__('Enter map title', $this->plugin_slug).'">';
 		$output .= '</div>';
 		$output .= '</div>';
 		$output .= '</div>';
@@ -732,8 +732,8 @@ 
 		$output .= '<div class="inner-modal-wrap">';
 		$output .= '<div class="inner-modal-container">';
 		$output .= '<div class="inner-modal clearfix">';
-		$output .= '<label for="map-location-autocomplete" class="map-title">' . __( 'Enter a Location', $this->plugin_slug ) . '</label>';
-		$output .= '<p class="cmb2-metabox-description">' . __( 'Type your point of interest below and the map will be re-centered over that location', $this->plugin_slug ) . '</p>';
+		$output .= '<label for="map-location-autocomplete" class="map-title">'.__('Enter a Location', $this->plugin_slug).'</label>';
+		$output .= '<p class="cmb2-metabox-description">'.__('Type your point of interest below and the map will be re-centered over that location', $this->plugin_slug).'</p>';
 		$output .= '<button type="button" class="gmb-modal-close">&times;</button>';
 		$output .= '<input type="text" name="" size="30" id="map-location-autocomplete">';
 		$output .= '</div>';
@@ -744,9 +744,9 @@ 
 		$output .= '<div class="warning-message wpgp-message"></div>';
 
 		//Markers Modal
-		include( 'views/markers.php' );
+		include('views/markers.php');
 
-		echo apply_filters( 'google_maps_preview', $output );
+		echo apply_filters('google_maps_preview', $output);
 
 	}
 
@@ -757,12 +757,12 @@ 
 	 *
 	 * @return array
 	 */
-	function setup_custom_columns( $columns ) {
+	function setup_custom_columns($columns) {
 		$columns = array(
 			'cb'        => '<input type="checkbox" />',
-			'title'     => __( 'Google Map Title', $this->plugin_slug ),
-			'shortcode' => __( 'Shortcode', $this->plugin_slug ),
-			'date'      => __( 'Creation Date', $this->plugin_slug )
+			'title'     => __('Google Map Title', $this->plugin_slug),
+			'shortcode' => __('Shortcode', $this->plugin_slug),
+			'date'      => __('Creation Date', $this->plugin_slug)
 		);
 
 		return $columns;
@@ -777,13 +777,13 @@ 
 	 * @param $column
 	 * @param $post_id
 	 */
-	function configure_custom_columns( $column, $post_id ) {
-		switch ( $column ) {
+	function configure_custom_columns($column, $post_id) {
+		switch ($column) {
 			case 'shortcode' :
 
 				//Shortcode column with select all input
-				$shortcode = htmlentities( '[google_maps id="' . $post_id . '"]' );
-				echo '<input onClick="this.setSelectionRange(0, this.value.length)" type="text" class="shortcode-input" readonly value="' . $shortcode . '">';
+				$shortcode = htmlentities('[google_maps id="'.$post_id.'"]');
+				echo '<input onClick="this.setSelectionRange(0, this.value.length)" type="text" class="shortcode-input" readonly value="'.$shortcode.'">';
 
 				break;
 			/* Just break out of the switch statement for everything else. */
@@ -800,10 +800,10 @@ 
 	 *
 	 * @return array
 	 */
-	function closed_meta_boxes( $closed ) {
+	function closed_meta_boxes($closed) {
 
-		if ( false === $closed ) {
-			$closed = array( 'google_maps_options', 'google_maps_control_options', 'google_maps_markers' );
+		if (false === $closed) {
+			$closed = array('google_maps_options', 'google_maps_control_options', 'google_maps_markers');
 		}
 
 		return $closed;