eventespresso / event-espresso-core

core/services/collections/LooseCollection.php

Indentation +33 added lines, -33 removed lines

@@ -2,7 +2,7 @@ 
 namespace EventEspresso\core\services\collections;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -20,38 +20,38 @@ 
 
 
 
-    /**
-     * setCollectionInterface
-     *
-     * @access protected
-     * @param  string $collection_interface
-     * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
-     */
-    protected function setCollectionInterface($collection_interface )
-    {
-        $this->collection_interface = '';
-    }
-
-
-
-    /**
-     * add
-     * attaches an object to the Collection
-     * and sets any supplied data associated with the current iterator entry
-     * by calling EE_Object_Collection::set_identifier()
-     *
-     * @access public
-     * @param  mixed $object
-     * @param  mixed $identifier
-     * @return bool
-     * @throws \EventEspresso\core\exceptions\InvalidEntityException
-     */
-    public function add($object, $identifier = null)
-    {
-        $this->attach($object);
-        $this->setIdentifier($object, $identifier);
-        return $this->contains($object);
-    }
+	/**
+	 * setCollectionInterface
+	 *
+	 * @access protected
+	 * @param  string $collection_interface
+	 * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
+	 */
+	protected function setCollectionInterface($collection_interface )
+	{
+		$this->collection_interface = '';
+	}
+
+
+
+	/**
+	 * add
+	 * attaches an object to the Collection
+	 * and sets any supplied data associated with the current iterator entry
+	 * by calling EE_Object_Collection::set_identifier()
+	 *
+	 * @access public
+	 * @param  mixed $object
+	 * @param  mixed $identifier
+	 * @return bool
+	 * @throws \EventEspresso\core\exceptions\InvalidEntityException
+	 */
+	public function add($object, $identifier = null)
+	{
+		$this->attach($object);
+		$this->setIdentifier($object, $identifier);
+		return $this->contains($object);
+	}
 
 
 

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
      * @param  string $collection_interface
      * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
      */
-    protected function setCollectionInterface($collection_interface )
+    protected function setCollectionInterface($collection_interface)
     {
         $this->collection_interface = '';
     }

core/services/container/ContainerInterface.php

Indentation +21 added lines, -21 removed lines

@@ -2,7 +2,7 @@ 
 namespace EventEspresso\core\services\container;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -18,26 +18,26 @@ 
 interface ContainerInterface
 {
 
-    /**
-     * Finds an entry of the container by its identifier and returns it.
-     *
-     * @param string $id Identifier of the entry to look for.
-     * @return mixed Entry.
-     */
-    public function get($id);
-
-
-
-    /**
-     * Returns true if the container can return an entry for the given identifier.
-     * Returns false otherwise.
-     * `has($id)` returning true does not mean that `get($id)` will not throw an exception.
-     * It does however mean that `get($id)` will not throw a `NotFoundException`.
-     *
-     * @param string $id Identifier of the entry to look for.
-     * @return boolean
-     */
-    public function has($id);
+	/**
+	 * Finds an entry of the container by its identifier and returns it.
+	 *
+	 * @param string $id Identifier of the entry to look for.
+	 * @return mixed Entry.
+	 */
+	public function get($id);
+
+
+
+	/**
+	 * Returns true if the container can return an entry for the given identifier.
+	 * Returns false otherwise.
+	 * `has($id)` returning true does not mean that `get($id)` will not throw an exception.
+	 * It does however mean that `get($id)` will not throw a `NotFoundException`.
+	 *
+	 * @param string $id Identifier of the entry to look for.
+	 * @return boolean
+	 */
+	public function has($id);
 
 
 }

core/services/container/CoffeeMakerInterface.php

Indentation +19 added lines, -19 removed lines

@@ -2,7 +2,7 @@ 
 namespace EventEspresso\core\services\container;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -17,33 +17,33 @@ 
 interface CoffeeMakerInterface
 {
 
-    /**
-     * @return array
-     */
-    public static function getTypes();
+	/**
+	 * @return array
+	 */
+	public static function getTypes();
 
 
 
-    /**
-     * @param $type
-     */
-    public static function validateType($type);
+	/**
+	 * @param $type
+	 */
+	public static function validateType($type);
 
 
 
-    /**
-     * @param RecipeInterface $recipe
-     * @param array           $arguments
-     * @return mixed
-     */
-    public function brew(RecipeInterface $recipe, $arguments = array());
+	/**
+	 * @param RecipeInterface $recipe
+	 * @param array           $arguments
+	 * @return mixed
+	 */
+	public function brew(RecipeInterface $recipe, $arguments = array());
 
 
 
-    /**
-     * @return string
-     */
-    public function type();
+	/**
+	 * @return string
+	 */
+	public function type();
 
 }
 // End of file CoffeeMakerInterface.php

core/services/container/LoadOnlyCoffeeMaker.php

Indentation +21 added lines, -21 removed lines

@@ -2,7 +2,7 @@ 
 namespace EventEspresso\core\services\container;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -24,26 +24,26 @@ 
 class LoadOnlyCoffeeMaker extends CoffeeMaker
 {
 
-    /**
-     * @return string
-     */
-    public function type()
-    {
-        return CoffeeMaker::BREW_LOAD_ONLY;
-    }
-
-
-
-    /**
-     * @param RecipeInterface $recipe
-     * @param array           $arguments
-     * @return mixed
-     */
-    public function brew(RecipeInterface $recipe, $arguments = array())
-    {
-        $this->resolveClassAndFilepath($recipe);
-        return null;
-    }
+	/**
+	 * @return string
+	 */
+	public function type()
+	{
+		return CoffeeMaker::BREW_LOAD_ONLY;
+	}
+
+
+
+	/**
+	 * @param RecipeInterface $recipe
+	 * @param array           $arguments
+	 * @return mixed
+	 */
+	public function brew(RecipeInterface $recipe, $arguments = array())
+	{
+		$this->resolveClassAndFilepath($recipe);
+		return null;
+	}
 
 
 

core/services/container/exceptions/InstantiationException.php

Indentation +22 added lines, -22 removed lines

@@ -4,7 +4,7 @@ 
 use BadMethodCallException;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -20,27 +20,27 @@ 
 class InstantiationException extends BadMethodCallException
 {
 
-    /**
-     * InstantiationException constructor.
-     *
-     * @param string $identifier the name of the requested entity or service
-     * @param string     $message
-     * @param int        $code
-     * @param \Exception $previous
-     */
-    public function __construct($identifier, $message = '', $code = 0, \Exception $previous = null)
-    {
-        if (empty($message)) {
-            $message = sprintf(
-                __(
-                    'The "%1$s" class could not be constructed.',
-                    'event_espresso'
-                ),
-                $identifier
-            );
-        }
-        parent::__construct($message, $code, $previous);
-    }
+	/**
+	 * InstantiationException constructor.
+	 *
+	 * @param string $identifier the name of the requested entity or service
+	 * @param string     $message
+	 * @param int        $code
+	 * @param \Exception $previous
+	 */
+	public function __construct($identifier, $message = '', $code = 0, \Exception $previous = null)
+	{
+		if (empty($message)) {
+			$message = sprintf(
+				__(
+					'The "%1$s" class could not be constructed.',
+					'event_espresso'
+				),
+				$identifier
+			);
+		}
+		parent::__construct($message, $code, $previous);
+	}
 
 }
 // End of file InstantiationException.php

core/services/container/CoffeePotInterface.php

Indentation +50 added lines, -50 removed lines

@@ -2,7 +2,7 @@ 
 namespace EventEspresso\core\services\container;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -18,70 +18,70 @@ 
 
 
 
-    /**
-     * returns an instance of the requested entity type using the supplied arguments.
-     * If a shared service is requested and an instance is already in the carafe, then it will be returned.
-     * If it is not already in the carafe, then the service will be constructed, added to the carafe, and returned
-     * If the request is for a new entity and a closure exists in the reservoir for creating it,
-     * then a new entity will be instantiated from the closure and returned.
-     * If a closure does not exist, then one will be built and added to the reservoir
-     * before instantiating the requested entity.
-     *
-     * @param  string $identifier Identifier for the entity class to be constructed.
-     *                            Typically a Fully Qualified Class Name
-     * @param array   $arguments  an array of arguments to be passed to the entity constructor
-     * @param string  $type
-     * @return mixed
-     */
-    public function brew($identifier, $arguments = array(), $type = '');
+	/**
+	 * returns an instance of the requested entity type using the supplied arguments.
+	 * If a shared service is requested and an instance is already in the carafe, then it will be returned.
+	 * If it is not already in the carafe, then the service will be constructed, added to the carafe, and returned
+	 * If the request is for a new entity and a closure exists in the reservoir for creating it,
+	 * then a new entity will be instantiated from the closure and returned.
+	 * If a closure does not exist, then one will be built and added to the reservoir
+	 * before instantiating the requested entity.
+	 *
+	 * @param  string $identifier Identifier for the entity class to be constructed.
+	 *                            Typically a Fully Qualified Class Name
+	 * @param array   $arguments  an array of arguments to be passed to the entity constructor
+	 * @param string  $type
+	 * @return mixed
+	 */
+	public function brew($identifier, $arguments = array(), $type = '');
 
 
 
-    /**
-     * @param string   $identifier
-     * @param callable $closure
-     */
-    public function addClosure($identifier, $closure);
+	/**
+	 * @param string   $identifier
+	 * @param callable $closure
+	 */
+	public function addClosure($identifier, $closure);
 
 
 
-    /**
-     * @param string $identifier
-     * @param mixed  $service
-     * @return boolean
-     */
-    public function addService($identifier, $service);
+	/**
+	 * @param string $identifier
+	 * @param mixed  $service
+	 * @return boolean
+	 */
+	public function addService($identifier, $service);
 
 
 
-    /**
-     * Adds instructions on how to brew objects
-     *
-     * @param RecipeInterface $recipe
-     * @return mixed
-     */
-    public function addRecipe(RecipeInterface $recipe);
+	/**
+	 * Adds instructions on how to brew objects
+	 *
+	 * @param RecipeInterface $recipe
+	 * @return mixed
+	 */
+	public function addRecipe(RecipeInterface $recipe);
 
 
 
-    /**
-     * Get instructions on how to brew objects
-     *
-     * @param string $identifier
-     * @return Recipe
-     */
-    public function getRecipe($identifier);
+	/**
+	 * Get instructions on how to brew objects
+	 *
+	 * @param string $identifier
+	 * @return Recipe
+	 */
+	public function getRecipe($identifier);
 
 
 
-    /**
-     * adds class name aliases to list of filters
-     *
-     * @param  string $identifier
-     * @param  array  $aliases
-     * @return string
-     */
-    public function addAliases($identifier, $aliases);
+	/**
+	 * adds class name aliases to list of filters
+	 *
+	 * @param  string $identifier
+	 * @param  array  $aliases
+	 * @return string
+	 */
+	public function addAliases($identifier, $aliases);
 
 
 

core/libraries/rest_api/controllers/config/Read.php

Spacing +8 added lines, -8 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace EventEspresso\core\libraries\rest_api\controllers\config;
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -21,11 +21,11 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \EE_Config|\WP_Error
 	 */
-	public static function handle_request( \WP_REST_Request $request) {
+	public static function handle_request(\WP_REST_Request $request) {
 		$cap = \EE_Restriction_Generator_Base::get_default_restrictions_cap();
-		if( \EE_Capabilities::instance()->current_user_can( $cap, 'read_over_api' ) ){
+		if (\EE_Capabilities::instance()->current_user_can($cap, 'read_over_api')) {
 			return \EE_Config::instance();
-		}else{
+		} else {
 			return new \WP_Error(
 				'cannot_read_config',
 				sprintf(
@@ -35,7 +35,7 @@ 
 					),
 					$cap
 				),
-				array( 'status' => 403 )
+				array('status' => 403)
 			);
 		}
 	}
@@ -45,11 +45,11 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \EE_Config|\WP_Error
 	 */
-	public static function handle_request_site_info( \WP_REST_Request $request) {
+	public static function handle_request_site_info(\WP_REST_Request $request) {
 		return array(
 			'default_timezone' => array(
 				'pretty' => \EEH_DTT_Helper::get_timezone_string_for_display(),
-				'string' => get_option( 'timezone_string' ),
+				'string' => get_option('timezone_string'),
 				'offset' => \EEH_DTT_Helper::get_site_timezone_gmt_offset(),
 			),
 			'default_currency' => \EE_Config::instance()->currency

Braces +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 		$cap = \EE_Restriction_Generator_Base::get_default_restrictions_cap();
 		if( \EE_Capabilities::instance()->current_user_can( $cap, 'read_over_api' ) ){
 			return \EE_Config::instance();
-		}else{
+		} else{
 			return new \WP_Error(
 				'cannot_read_config',
 				sprintf(

core/libraries/form_sections/strategies/display/EE_Checkbox_Display_Strategy.strategy.php

Spacing +21 added lines, -21 removed lines

@@ -18,43 +18,43 @@
 	 * @throws EE_Error
 	 * @return string of html to display the field
 	 */
-	public function display(){
+	public function display() {
 		$input = $this->get_input();
 		//d( $input );
-		$multi = count( $input->options() ) > 1 ? TRUE : FALSE;
+		$multi = count($input->options()) > 1 ? TRUE : FALSE;
 		$input->set_label_sizes();
 		$label_size_class = $input->get_label_size_class();
 		$html = '';
-		if ( ! is_array( $input->raw_value() ) && $input->raw_value() !== NULL ) {
+		if ( ! is_array($input->raw_value()) && $input->raw_value() !== NULL) {
 			EE_Error::doing_it_wrong(
 				'EE_Checkbox_Display_Strategy::display()',
 				sprintf(
-					__( 'Input values for checkboxes should be an array of values, but the value for input "%1$s" is "%2$s". Please verify that the input name is exactly "%3$s"', 'event_espresso'),
+					__('Input values for checkboxes should be an array of values, but the value for input "%1$s" is "%2$s". Please verify that the input name is exactly "%3$s"', 'event_espresso'),
 					$input->html_id(),
-					var_export( $input->raw_value(), true),
-					$input->html_name() . '[]'
+					var_export($input->raw_value(), true),
+					$input->html_name().'[]'
 				),
 				'4.8.1'
 			);
 		}
-		$input_raw_value = (array)$input->raw_value();
-		foreach( $input->options() as $value => $display_text ){
-			$value = $input->get_normalization_strategy()->unnormalize_one( $value );
-			$html_id = $this->get_sub_input_id( $value );
-			$html .= EEH_HTML::nl( 0, 'checkbox' );
-			$html .= '<label for="' . $html_id . '" id="' . $html_id . '-lbl" class="ee-checkbox-label-after' . $label_size_class . '">';
-			$html .= EEH_HTML::nl( 1, 'checkbox' );
+		$input_raw_value = (array) $input->raw_value();
+		foreach ($input->options() as $value => $display_text) {
+			$value = $input->get_normalization_strategy()->unnormalize_one($value);
+			$html_id = $this->get_sub_input_id($value);
+			$html .= EEH_HTML::nl(0, 'checkbox');
+			$html .= '<label for="'.$html_id.'" id="'.$html_id.'-lbl" class="ee-checkbox-label-after'.$label_size_class.'">';
+			$html .= EEH_HTML::nl(1, 'checkbox');
 			$html .= '<input type="checkbox"';
-			$html .= ' name="' . $input->html_name() . '[]"';
-			$html .= ' id="' . $html_id . '"';
-			$html .= ' class="' . $input->html_class() . '"';
-			$html .= ' style="' . $input->html_style() . '"';
-			$html .= ' value="' . esc_attr( $value ) . '"';
-			$html .= ! empty( $input_raw_value ) && in_array( $value, $input_raw_value ) ? ' checked="checked"' : '';
-			$html .= ' ' . $this->_input->other_html_attributes();
+			$html .= ' name="'.$input->html_name().'[]"';
+			$html .= ' id="'.$html_id.'"';
+			$html .= ' class="'.$input->html_class().'"';
+			$html .= ' style="'.$input->html_style().'"';
+			$html .= ' value="'.esc_attr($value).'"';
+			$html .= ! empty($input_raw_value) && in_array($value, $input_raw_value) ? ' checked="checked"' : '';
+			$html .= ' '.$this->_input->other_html_attributes();
 			$html .= '>&nbsp;';
 			$html .= $display_text;
-			$html .= EEH_HTML::nl( -1, 'checkbox' ) . '</label>';
+			$html .= EEH_HTML::nl( -1, 'checkbox' ).'</label>';
 		}
 		return $html;
 	}

core/helpers/EEH_Maps.helper.php

Spacing +31 added lines, -31 removed lines

@@ -21,18 +21,18 @@ 
 	 * @param  array $ee_gmaps_opts array of attributes required for the map link generation
 	 * @return string (link to map!)
 	 */
-	public static function google_map( $ee_gmaps_opts ){
-
-		$ee_map_width = isset( $ee_gmaps_opts['ee_map_width'] ) && ! empty( $ee_gmaps_opts['ee_map_width'] ) ? $ee_gmaps_opts['ee_map_width'] : '300';
-		$ee_map_height = isset( $ee_gmaps_opts['ee_map_height'] ) && ! empty( $ee_gmaps_opts['ee_map_height'] ) ? $ee_gmaps_opts['ee_map_height'] : '185';
-		$ee_map_zoom = isset( $ee_gmaps_opts['ee_map_zoom'] ) && ! empty( $ee_gmaps_opts['ee_map_zoom'] ) ? $ee_gmaps_opts['ee_map_zoom'] : '12';
-		$ee_map_nav_display = isset( $ee_gmaps_opts['ee_map_nav_display'] ) && ! empty( $ee_gmaps_opts['ee_map_nav_display'] ) ? 'true' : 'false';
-		$ee_map_nav_size =  isset( $ee_gmaps_opts['ee_map_nav_size'] ) && ! empty( $ee_gmaps_opts['ee_map_nav_size'] )? $ee_gmaps_opts['ee_map_nav_size'] : 'default';
-		$ee_map_type_control =  isset( $ee_gmaps_opts['ee_map_type_control'] ) && ! empty( $ee_gmaps_opts['ee_map_type_control'] )? $ee_gmaps_opts['ee_map_type_control'] : 'default';
-		$static_url =  isset( $ee_gmaps_opts['ee_static_url'] ) && ! empty( $ee_gmaps_opts['ee_static_url'] )? $ee_gmaps_opts['ee_static_url'] : FALSE;
-
-		if( isset( $ee_gmaps_opts['ee_map_align'] ) && ! empty( $ee_gmaps_opts['ee_map_align'] )){
-			switch( $ee_gmaps_opts['ee_map_align'] ){
+	public static function google_map($ee_gmaps_opts) {
+
+		$ee_map_width = isset($ee_gmaps_opts['ee_map_width']) && ! empty($ee_gmaps_opts['ee_map_width']) ? $ee_gmaps_opts['ee_map_width'] : '300';
+		$ee_map_height = isset($ee_gmaps_opts['ee_map_height']) && ! empty($ee_gmaps_opts['ee_map_height']) ? $ee_gmaps_opts['ee_map_height'] : '185';
+		$ee_map_zoom = isset($ee_gmaps_opts['ee_map_zoom']) && ! empty($ee_gmaps_opts['ee_map_zoom']) ? $ee_gmaps_opts['ee_map_zoom'] : '12';
+		$ee_map_nav_display = isset($ee_gmaps_opts['ee_map_nav_display']) && ! empty($ee_gmaps_opts['ee_map_nav_display']) ? 'true' : 'false';
+		$ee_map_nav_size = isset($ee_gmaps_opts['ee_map_nav_size']) && ! empty($ee_gmaps_opts['ee_map_nav_size']) ? $ee_gmaps_opts['ee_map_nav_size'] : 'default';
+		$ee_map_type_control = isset($ee_gmaps_opts['ee_map_type_control']) && ! empty($ee_gmaps_opts['ee_map_type_control']) ? $ee_gmaps_opts['ee_map_type_control'] : 'default';
+		$static_url = isset($ee_gmaps_opts['ee_static_url']) && ! empty($ee_gmaps_opts['ee_static_url']) ? $ee_gmaps_opts['ee_static_url'] : FALSE;
+
+		if (isset($ee_gmaps_opts['ee_map_align']) && ! empty($ee_gmaps_opts['ee_map_align'])) {
+			switch ($ee_gmaps_opts['ee_map_align']) {
 				case "left":
 					$map_align = 'ee-gmap-align-left left';
 					break;
@@ -53,18 +53,18 @@ 
 
 		// Determine whether user has set a hardoded url to use and
 		// if so display a Google static iframe map else run V3 api
-		if( $static_url ) {
+		if ($static_url) {
 
-			$html = '<div class="ee-gmap-iframewrap ee-gmap-wrapper ' . $map_align . '">';
-			$html .= '<iframe src="' . $static_url . '&output=embed" style="width: ' . $ee_map_width  .'px; height: ' . $ee_map_height . 'px;" frameborder="0" scrolling="no">';
+			$html = '<div class="ee-gmap-iframewrap ee-gmap-wrapper '.$map_align.'">';
+			$html .= '<iframe src="'.$static_url.'&output=embed" style="width: '.$ee_map_width.'px; height: '.$ee_map_height.'px;" frameborder="0" scrolling="no">';
 			$html .= '</iframe>';
-			$html .= '<a href="' . $static_url . '">View Large map</a>';
+			$html .= '<a href="'.$static_url.'">View Large map</a>';
 			$html .= '</div>';
 			return $html;
 
 		 } else {
 
-			EEH_Maps::$gmap_vars[ $ee_gmaps_opts['map_ID'] ] = array(
+			EEH_Maps::$gmap_vars[$ee_gmaps_opts['map_ID']] = array(
 				'map_ID' => $ee_gmaps_opts['map_ID'],
 				'ee_map_zoom' => $ee_map_zoom,
 				'ee_map_nav_display' => $ee_map_nav_display,
@@ -74,12 +74,12 @@ 
 			);
 
 			$html = '<div class="ee-gmap-wrapper '.$map_align.';">';
-			$html .= '<div class="ee-gmap" id="map_canvas_' . $ee_gmaps_opts['map_ID'] .'" style="width: '.$ee_map_width.'px; height: '.$ee_map_height.'px;"></div>';  //
+			$html .= '<div class="ee-gmap" id="map_canvas_'.$ee_gmaps_opts['map_ID'].'" style="width: '.$ee_map_width.'px; height: '.$ee_map_height.'px;"></div>'; //
 			$html .= '</div>';
 
-			wp_enqueue_script( 'gmap_api' );
-			wp_enqueue_script( 'ee_gmap' );
-			add_action( 'wp_footer', array( 'EEH_Maps', 'footer_enqueue_script' ));
+			wp_enqueue_script('gmap_api');
+			wp_enqueue_script('ee_gmap');
+			add_action('wp_footer', array('EEH_Maps', 'footer_enqueue_script'));
 
 			return $html;
 
@@ -94,7 +94,7 @@ 
 	 * @return void
 	 */
 	public static function footer_enqueue_script() {
-		wp_localize_script( 'ee_gmap', 'ee_gmap_vars', EEH_Maps::$gmap_vars );
+		wp_localize_script('ee_gmap', 'ee_gmap_vars', EEH_Maps::$gmap_vars);
 	}
 
 
@@ -105,10 +105,10 @@ 
 	public static function espresso_google_map_js() {
 		$api_url = sprintf(
 			"https://maps.googleapis.com/maps/api/js?key=%s",
-			apply_filters( 'FHEE__EEH_Maps__espresso_google_maps_js__api_key', EE_Registry::instance()->CFG->map_settings->google_map_api_key )
+			apply_filters('FHEE__EEH_Maps__espresso_google_maps_js__api_key', EE_Registry::instance()->CFG->map_settings->google_map_api_key)
 		);
-		wp_register_script( 'gmap_api', $api_url, array('jquery'), NULL, TRUE );
-		wp_register_script( 'ee_gmap', plugin_dir_url(__FILE__) . 'assets/ee_gmap.js', array('gmap_api'), '1.0', TRUE );
+		wp_register_script('gmap_api', $api_url, array('jquery'), NULL, TRUE);
+		wp_register_script('ee_gmap', plugin_dir_url(__FILE__).'assets/ee_gmap.js', array('gmap_api'), '1.0', TRUE);
 	}
 
 	/**
@@ -117,7 +117,7 @@ 
 	 * @return string (link to map!)
 	 */
 	public static function google_map_link($atts) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		extract($atts);
 		/** @var string $address */
 		/** @var string $city */
@@ -136,9 +136,9 @@ 
 		$id = isset($id) ? $id : 'not_set';
 		$map_image_class = isset($map_image_class) ? $map_image_class : 'ee_google_map_view';
 
-		$address_string = ($address != '' ? $address : '') . ($city != '' ? ',' . $city : '') . ($state != '' ? ',' . $state : '') . ($zip != '' ? ',' . $zip : '') . ($country != '' ? ',' . $country : '');
+		$address_string = ($address != '' ? $address : '').($city != '' ? ','.$city : '').($state != '' ? ','.$state : '').($zip != '' ? ','.$zip : '').($country != '' ? ','.$country : '');
 
-		$google_map = htmlentities2('http://maps.google.com/maps?q=' . urlencode( $address_string ));
+		$google_map = htmlentities2('http://maps.google.com/maps?q='.urlencode($address_string));
 
 		switch ($type) {
 			case 'text':
@@ -153,12 +153,12 @@ 
 			case 'map':
 				$scheme = is_ssl() ? 'https://' : 'http://';
 
-				$api_key = apply_filters( 'FHEE__EEH_Maps__espresso_google_maps_link__api_key', EE_Registry::instance()->CFG->map_settings->google_map_api_key );
+				$api_key = apply_filters('FHEE__EEH_Maps__espresso_google_maps_link__api_key', EE_Registry::instance()->CFG->map_settings->google_map_api_key);
 
-				return '<a class="a_map_image_link" href="' . $google_map . '" target="_blank">' . '<img class="map_image_link" id="venue_map_' . $id . '" ' . $map_image_class . ' src="' . htmlentities2( $scheme . 'maps.googleapis.com/maps/api/staticmap?center=' . urlencode( $address_string ) . '&amp;zoom=14&amp;size=' . $map_w . 'x' . $map_h . '&amp;markers=color:green|label:|' . urlencode( $address_string ) . '&amp;sensor=false&amp;key=' . $api_key ) . '" /></a>';
+				return '<a class="a_map_image_link" href="'.$google_map.'" target="_blank">'.'<img class="map_image_link" id="venue_map_'.$id.'" '.$map_image_class.' src="'.htmlentities2($scheme.'maps.googleapis.com/maps/api/staticmap?center='.urlencode($address_string).'&amp;zoom=14&amp;size='.$map_w.'x'.$map_h.'&amp;markers=color:green|label:|'.urlencode($address_string).'&amp;sensor=false&amp;key='.$api_key).'" /></a>';
 		}
 
-		return '<a href="' . $google_map . '" target="_blank">' . $text . '</a>';
+		return '<a href="'.$google_map.'" target="_blank">'.$text.'</a>';
 	}