WordImpress / Google-Maps-Builder

google-maps-builder.php

Spacing +25 added lines, -25 removed lines

@@ -15,7 +15,7 @@ 
  */
 
 // If this file is called directly, abort.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,34 +23,34 @@ 
  * 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.1' );
+if ( ! defined('GMB_VERSION')) {
+	define('GMB_VERSION', '2.1');
 }
 // Plugin Root File
-if ( ! defined( 'GMB_PLUGIN_FILE' ) ) {
-	define( 'GMB_PLUGIN_FILE', __FILE__ );
+if ( ! defined('GMB_PLUGIN_FILE')) {
+	define('GMB_PLUGIN_FILE', __FILE__);
 }
 
 
-if ( ! class_exists( 'Google_Maps_Builder' ) ) :
+if ( ! class_exists('Google_Maps_Builder')) :
 
 	/**
 	 * Load plugin if core lib is present
 	 */
-	if ( ! file_exists( GMB_PLUGIN_PATH . 'vendor/wordimpress/maps-builder-core/core.php' ) ) {
-		add_action( 'admin_notices', 'gmb_no_core_lib' );
+	if ( ! file_exists(GMB_PLUGIN_PATH.'vendor/wordimpress/maps-builder-core/core.php')) {
+		add_action('admin_notices', 'gmb_no_core_lib');
 
 		/**
 		 * Print admin notice if no dependencies
@@ -58,10 +58,10 @@ 
 		 * @uses "admin_notice" hook
 		 */
 		function gmb_no_core_lib() {
-			printf( '<div class="notice notice-error"><p>%s</p></div>', esc_html__( 'Your install of Maps Builder is missing its Composer dependencies and can not load.', 'maps-builder-pro' ) );
+			printf('<div class="notice notice-error"><p>%s</p></div>', esc_html__('Your install of Maps Builder is missing its Composer dependencies and can not load.', 'maps-builder-pro'));
 		}
 	} else {
-		require_once GMB_PLUGIN_PATH . 'vendor/wordimpress/maps-builder-core/core.php';
+		require_once GMB_PLUGIN_PATH.'vendor/wordimpress/maps-builder-core/core.php';
 
 		/**
 		 * Main Maps Builder Class
@@ -109,11 +109,11 @@ 
 			 * @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();
 
-					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();
@@ -121,17 +121,17 @@ 
 					self::$instance->settings = new Google_Maps_Builder_Settings();
 					self::$instance->engine   = new Google_Maps_Builder_Engine();
 
-					register_activation_hook( __FILE__, array(
+					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);
 
 				}
 
@@ -152,9 +152,9 @@ 
 
 				$this->cmb2_load();
 				$this->load_files();
-				require_once GMB_PLUGIN_PATH . 'includes/class-gmb-scripts.php';
+				require_once GMB_PLUGIN_PATH.'includes/class-gmb-scripts.php';
 
-				if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+				if (is_admin() || (defined('WP_CLI') && WP_CLI)) {
 
 					$this->load_admin();
 					//Admin

includes/class-gmb-scripts.php

Spacing +4 added lines, -4 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -28,12 +28,12 @@ 
 	 *
 	 * @param $hook
 	 */
-	public function admin_hooks( $hook ) {
+	public function admin_hooks($hook) {
 		global $post;
-		$js_dir = GMB_PLUGIN_URL . 'assets/js/admin/';
+		$js_dir = GMB_PLUGIN_URL.'assets/js/admin/';
 		$suffix = $this->paths->suffix();
 
-		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) {
 
 			//free only
 

includes/class-gmb-engine.php

Spacing +29 added lines, -29 removed lines

@@ -37,7 +37,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function google_maps_shortcode( $atts ) {
+	public function google_maps_shortcode($atts) {
 
 		$atts = shortcode_atts(
 			array(
@@ -48,26 +48,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(
@@ -76,41 +76,41 @@ 
 					'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,
 				'plugin_url'       => GMB_PLUGIN_URL,
 				'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());
 
 	}
 

includes/admin/class-gmb-settings.php

Spacing +20 added lines, -20 removed lines

@@ -18,14 +18,14 @@ 
 	 */
 	public function __construct() {
 		parent::__construct();
-		$this->page_name = __( 'Google Maps Builder Settings', $this->plugin_slug );
+		$this->page_name = __('Google Maps Builder Settings', $this->plugin_slug);
 
 		$this->plugin_slug = Google_Maps_Builder()->get_plugin_slug();
-		add_action( 'cmb2_render_lat_lng_default', array( $this, 'cmb2_render_lat_lng_default' ), 10, 2 );
+		add_action('cmb2_render_lat_lng_default', array($this, 'cmb2_render_lat_lng_default'), 10, 2);
 
 		//upsell markup
-		add_action( 'gmb_settings_page_after_logo', array( $this, 'settings_upsell' ) );
-		add_action( 'gmb_social_media_after_logo', array( $this, 'settings_social_media_upsell' ) );
+		add_action('gmb_settings_page_after_logo', array($this, 'settings_upsell'));
+		add_action('gmb_social_media_after_logo', array($this, 'settings_social_media_upsell'));
 	}
 
 
@@ -36,13 +36,13 @@ 
 	 *
 	 * @return mixed
 	 */
-	function add_plugin_page_links( $links, $file ) {
+	function add_plugin_page_links($links, $file) {
 
-		if ( $file == GMB_PLUGIN_BASE ) {
+		if ($file == GMB_PLUGIN_BASE) {
 
 			// Add Widget Page link to our plugin
-			$settings_link = '<a href="edit.php?post_type=google_maps&page=' . self::$key . '" title="' . __( 'Visit the Google Maps Builder plugin settings page', $this->plugin_slug ) . '">' . __( 'Settings', $this->plugin_slug ) . '</a>';
-			array_unshift( $links, $settings_link );
+			$settings_link = '<a href="edit.php?post_type=google_maps&page='.self::$key.'" title="'.__('Visit the Google Maps Builder plugin settings page', $this->plugin_slug).'">'.__('Settings', $this->plugin_slug).'</a>';
+			array_unshift($links, $settings_link);
 		}
 
 		return $links;
@@ -58,14 +58,14 @@ 
 	 *
 	 * @return array
 	 */
-	function add_plugin_meta_links( $meta, $file ) {
+	function add_plugin_meta_links($meta, $file) {
 
-		if ( $file == GMB_PLUGIN_BASE ) {
-			$meta[] = "<a href='http://wordpress.org/support/view/plugin-reviews/google-maps-builder' target='_blank' title='" . __( 'Rate Google Maps Builder on WordPress.org', $this->plugin_slug ) . "'>" . __( 'Rate Plugin', $this->plugin_slug ) . "</a>";
-			$meta[] = "<a href='https://wordimpress.com/documentation/maps-builder-pro/' target='_blank' title='" . __( 'View the plugin documentation', $this->plugin_slug ) . "'>" . __( 'Documentation', $this->plugin_slug ) . "</a>";
-			$meta[] = '<a href="http://wordpress.org/support/plugin/google-maps-builder/" target="_blank" title="' . __( 'Get plugin support via the WordPress community', $this->plugin_slug ) . '">' . __( 'Support', $this->plugin_slug ) . '</a>';
+		if ($file == GMB_PLUGIN_BASE) {
+			$meta[] = "<a href='http://wordpress.org/support/view/plugin-reviews/google-maps-builder' target='_blank' title='".__('Rate Google Maps Builder on WordPress.org', $this->plugin_slug)."'>".__('Rate Plugin', $this->plugin_slug)."</a>";
+			$meta[] = "<a href='https://wordimpress.com/documentation/maps-builder-pro/' target='_blank' title='".__('View the plugin documentation', $this->plugin_slug)."'>".__('Documentation', $this->plugin_slug)."</a>";
+			$meta[] = '<a href="http://wordpress.org/support/plugin/google-maps-builder/" target="_blank" title="'.__('Get plugin support via the WordPress community', $this->plugin_slug).'">'.__('Support', $this->plugin_slug).'</a>';
 			$meta[] = '<a href="
-https://wordimpress.com/plugins/maps-builder-pro?utm_source=MBF&utm_medium=BANNER&utm_content=LISTING&utm_campaign=MBF%20LISTING" title="' . __( 'Upgrade to Maps Builder Pro', $this->plugin_slug ) . '" target="_blank">' . __( 'Upgrade to Pro', $this->plugin_slug ) . ' &raquo;</a>';
+https://wordimpress.com/plugins/maps-builder-pro?utm_source=MBF&utm_medium=BANNER&utm_content=LISTING&utm_campaign=MBF%20LISTING" title="' . __('Upgrade to Maps Builder Pro', $this->plugin_slug).'" target="_blank">'.__('Upgrade to Pro', $this->plugin_slug).' &raquo;</a>';
 		}
 
 		return $meta;
@@ -80,7 +80,7 @@ 
 	 */
 	public function settings_upsell() { ?>
 		<a href="https://wordimpress.com/plugins/maps-builder-pro?utm_source=MBF&utm_medium=BANNER&utm_content=SETTINGS&utm_campaign=MBF%20Settings" target="_blank" class="button button-primary gmb-orange-btn gmb-settings-header-btn">
-			<?php _e( 'Upgrade to Pro', $this->plugin_slug ); ?>
+			<?php _e('Upgrade to Pro', $this->plugin_slug); ?>
 		</a>
 		<?php
 	}
@@ -96,7 +96,7 @@ 
 		?>
 		<div class="go-pro">
 			<a href="https://wordimpress.com/plugins/maps-builder-pro?utm_source=MBF&amp;utm_medium=BANNER&amp;utm_content=SETTINGS&amp;utm_campaign=MBF%20Settings" target="_blank" class="button button-primary button-small gmb-orange-btn gmb-settings-header-btn">
-				<?php esc_html_e( 'Upgrade to Pro', 'google-maps-builder' ); ?>
+				<?php esc_html_e('Upgrade to Pro', 'google-maps-builder'); ?>
 			</a>
 		</div>
 		<?php
@@ -112,11 +112,11 @@ 
 	protected function settings_page_data() {
 		//place holder
 		$data = array(
-			'welcome'     => sprintf( '%1s Maps Builder %s', __( 'Welcome to', 'maps-builder-pro' ), Google_Maps_Builder()->meta['Version'] ),
+			'welcome'     => sprintf('%1s Maps Builder %s', __('Welcome to', 'maps-builder-pro'), Google_Maps_Builder()->meta['Version']),
 			'sub_heading' => $this->sub_heading()
 		);
 
-		return $this->view_data( $data, true );
+		return $this->view_data($data, true);
 	}
 
 	/**
@@ -127,8 +127,8 @@ 
 	 * @return string
 	 */
 	protected function sub_heading() {
-		$out = __( 'Thanks for using Maps Builder', 'google-maps-pro' );
-		$out .= sprintf( __( 'To get started, read over the %1$sdocumentation%2$s, take a gander at the settings, and build yourself some maps! If you enjoy this plugin please consider telling a friend, rating it %3$s5-stars%2$s, or purchasing the %4$sPro%2$s edition.', $this->plugin_slug ), '<a href="https://wordimpress.com/documentation/maps-builder-pro/" target="_blank">', '</a>', '<a href="https://wordpress.org/support/view/plugin-reviews/google-maps-builder?filter=5#postform" target="_blank">', '<a href="https://wordimpress.com/plugins/maps-builder-pro?utm_source=MBF&amp;utm_medium=BANNER&amp;utm_content=SETTINGS&amp;utm_campaign=MBF%20Settings" target="_blank">' );
+		$out = __('Thanks for using Maps Builder', 'google-maps-pro');
+		$out .= sprintf(__('To get started, read over the %1$sdocumentation%2$s, take a gander at the settings, and build yourself some maps! If you enjoy this plugin please consider telling a friend, rating it %3$s5-stars%2$s, or purchasing the %4$sPro%2$s edition.', $this->plugin_slug), '<a href="https://wordimpress.com/documentation/maps-builder-pro/" target="_blank">', '</a>', '<a href="https://wordpress.org/support/view/plugin-reviews/google-maps-builder?filter=5#postform" target="_blank">', '<a href="https://wordimpress.com/plugins/maps-builder-pro?utm_source=MBF&amp;utm_medium=BANNER&amp;utm_content=SETTINGS&amp;utm_campaign=MBF%20Settings" target="_blank">');
 
 		return $out;
 

includes/admin/class-gmb-admin.php

Spacing +31 added lines, -31 removed lines

@@ -35,18 +35,18 @@ 
 
 		parent::__construct();
 
-		add_action( 'cmb2_render_google_maps_preview', array( $this, 'cmb2_render_google_maps_preview' ), 10, 2 );
+		add_action('cmb2_render_google_maps_preview', array($this, 'cmb2_render_google_maps_preview'), 10, 2);
 		// Load admin style sheet and JavaScript.
-		add_action( 'wp_ajax_hide_welcome', array( $this, 'hide_welcome_callback' ) );
+		add_action('wp_ajax_hide_welcome', array($this, 'hide_welcome_callback'));
 
 		//Add links/information to plugin row meta
-		add_filter( 'cmb2_get_metabox_form_format', array( $this, 'gmb_modify_cmb2_form_output' ), 10, 3 );
+		add_filter('cmb2_get_metabox_form_format', array($this, 'gmb_modify_cmb2_form_output'), 10, 3);
 
 		//Widget upsell
-		add_action( 'gmb_after_widget_form', array( $this, 'widget_upsell' ) );
+		add_action('gmb_after_widget_form', array($this, 'widget_upsell'));
 
 		//Useful class for free-only styling
-		add_filter( 'admin_body_class', array( $this, 'admin_body_classes' ) );
+		add_filter('admin_body_class', array($this, 'admin_body_classes'));
 
 	}
 
@@ -55,32 +55,32 @@ 
 	 *
 	 * @since  1.0.0
 	 */
-	function cmb2_render_google_maps_preview( $field, $meta ) {
+	function cmb2_render_google_maps_preview($field, $meta) {
 
 		/* @var $post */
 		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
@@ -91,9 +91,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>';
@@ -103,8 +103,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>';
@@ -115,9 +115,9 @@ 
 		$output .= '<div class="warning-message wpgp-message"></div>';
 
 		//Markers Modal
-		gmb_include_view( 'admin/views/markers.php', false, $this->view_data() );
+		gmb_include_view('admin/views/markers.php', false, $this->view_data());
 
-		echo apply_filters( 'google_maps_preview', $output );
+		echo apply_filters('google_maps_preview', $output);
 
 	}
 
@@ -134,12 +134,12 @@ 
 	 *
 	 * @return string
 	 */
-	function gmb_modify_cmb2_form_output( $form_format, $object_id, $cmb ) {
+	function gmb_modify_cmb2_form_output($form_format, $object_id, $cmb) {
 
 		//only modify the give settings form
-		if ( 'gmb_settings' == $object_id && 'plugin_options' == $cmb->cmb_id ) {
+		if ('gmb_settings' == $object_id && 'plugin_options' == $cmb->cmb_id) {
 
-			return '<form class="cmb-form" method="post" id="%1$s" enctype="multipart/form-data" encoding="multipart/form-data"><input type="hidden" name="object_id" value="%2$s">%3$s<div class="gmb-submit-wrap"><input type="submit" name="submit-cmb" value="' . __( 'Save Settings', 'give' ) . '" class="button-primary"></div></form>';
+			return '<form class="cmb-form" method="post" id="%1$s" enctype="multipart/form-data" encoding="multipart/form-data"><input type="hidden" name="object_id" value="%2$s">%3$s<div class="gmb-submit-wrap"><input type="submit" name="submit-cmb" value="'.__('Save Settings', 'give').'" class="button-primary"></div></form>';
 		}
 
 		return $form_format;
@@ -159,7 +159,7 @@ 
 		<div class="gmb-widget-upgrade clear">
 			<span class="powered-by"></span>
 			<a href="https://wordimpress.com/plugins/maps-builder-pro?utm_source=MBF&utm_medium=BANNER&utm_content=WIDGET&utm_campaign=MBF%20Widgets" target="_blank" class="button button-small">
-				<?php _e( 'Upgrade to Pro', $this->plugin_slug ); ?>
+				<?php _e('Upgrade to Pro', $this->plugin_slug); ?>
 				<span class="new-window"></span>
 			</a>
 		</div>
@@ -175,11 +175,11 @@ 
 	 *
 	 * @return String          Altered body classes.
 	 */
-	function admin_body_classes( $classes ) {
+	function admin_body_classes($classes) {
 
 		global $post;
 
-		if ( isset( $post->post_type ) && $post->post_type == 'google_maps' ) {
+		if (isset($post->post_type) && $post->post_type == 'google_maps') {
 			$classes .= 'maps-builder-free';
 		}
 

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

Spacing +29 added lines, -29 removed lines

@@ -14,8 +14,8 @@ 
 	 */
 	public function __construct() {
 		parent::__construct();
-		add_action( 'gmb_after_shortcode_form', array( $this, 'form_upsell') );
-		add_action( 'gmb_shortcode_iframe_style', array( $this, 'upsell_css' ) );
+		add_action('gmb_after_shortcode_form', array($this, 'form_upsell'));
+		add_action('gmb_shortcode_iframe_style', array($this, 'upsell_css'));
 	}
 
 	
@@ -29,7 +29,7 @@ 
 	 *
 	 * @return string
 	 */
-	public static function select( $args = array() ) {
+	public static function select($args = array()) {
 
 		$defaults = array(
 			'options'          => array(),
@@ -40,59 +40,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>';
 			}
 		}
 
@@ -108,9 +108,9 @@ 
 	 *
 	 * @uses "gmb_after_shortcode_form"
 	 */
-	public function form_upsell(){?>
+	public function form_upsell() {?>
 		<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' ); ?>
+			<?php _e('Go Pro', 'google-maps-builder'); ?>
 			<span class="dashicons dashicons-external"></span>
 		</a>
 	<?php
@@ -124,7 +124,7 @@ 
 	 *
 	 * @uses "gmb_shortcode_iframe_style" action
 	 */
-	public function upsell_css(){ ?>
+	public function upsell_css() { ?>
 		.shortcode-upsell {
 			position: absolute;
 			bottom: 10px;