WordImpress / Google-Maps-Builder

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;