eventespresso / event-espresso-core

core/services/encryption/EncryptionKeyManager.php

Indentation +297 added lines, -297 removed lines

@@ -16,301 +16,301 @@
  */
 class EncryptionKeyManager implements EncryptionKeyManagerInterface
 {
-    /**
-     * @var Base64Encoder
-     */
-    protected $base64_encoder;
-
-    /**
-     * name used for a default encryption key in case no others are set
-     *
-     * @var string
-     */
-    private $default_encryption_key_id;
-
-    /**
-     * name used for saving encryption keys to the wp_options table
-     *
-     * @var string
-     */
-    private $encryption_keys_option_name;
-
-    /**
-     * @var array
-     */
-    private $encryption_keys = null;
-
-    /**
-     * number of bits used when generating cryptographically secure keys
-     *
-     * @var int
-     */
-    private $bit_depth = 128;
-
-    /**
-     * @var int[]
-     */
-    private $bit_depth_options = [64, 128, 192, 256];
-
-    /**
-     * number of characters used when generating cryptographically weak keys
-     *
-     * @var int
-     */
-    private $key_length = 40;
-
-
-    /**
-     * @param Base64Encoder $base64_encoder
-     * @param string        $default_encryption_key_id
-     * @param string        $encryption_keys_option_name
-     */
-    public function __construct(Base64Encoder $base64_encoder, $default_encryption_key_id, $encryption_keys_option_name)
-    {
-        $this->base64_encoder              = $base64_encoder;
-        $this->default_encryption_key_id   = $default_encryption_key_id;
-        $this->encryption_keys_option_name = $encryption_keys_option_name;
-    }
-
-
-    /**
-     * add an encryption key
-     *
-     * @param string $encryption_key_identifier - name of the encryption key to use
-     * @param string $encryption_key            - cryptographically secure passphrase. will generate if necessary
-     * @param bool   $overwrite                 - prevents accidental overwriting of an existing key which would be bad
-     * @return bool
-     * @throws Exception
-     */
-    public function addEncryptionKey($encryption_key_identifier, $encryption_key = '', $overwrite = false)
-    {
-        $encryption_key_identifier = $encryption_key_identifier ?: $this->default_encryption_key_id;
-        if ($this->encryptionKeyExists($encryption_key_identifier) && ! $overwrite) {
-            // WOAH!!! that key already exists and we don't want to overwrite it
-            throw new RuntimeException(
-                sprintf(
-                    esc_html__(
-                        'The "%1$s" encryption key already exists and can not be overwritten because previously encrypted values would no longer be capable of being decrypted.',
-                        'event_espresso'
-                    ),
-                    $encryption_key_identifier
-                )
-            );
-        }
-        $this->encryption_keys[ $encryption_key_identifier ] = $encryption_key ?: $this->generateEncryptionKey();
-        return $this->saveEncryptionKeys();
-    }
-
-
-    /**
-     * returns true if encryption key has already been generated
-     *
-     * @param string $encryption_key_identifier - encryption key name
-     * @return bool
-     * @throws Exception
-     * @throws OutOfBoundsException
-     */
-    public function encryptionKeyExists($encryption_key_identifier = '')
-    {
-        // ensure keys are loaded
-        $this->retrieveEncryptionKeys();
-        return isset($this->encryption_keys[ $encryption_key_identifier ]);
-    }
-
-
-    /**
-     * returns cryptographically secure passphrase. will use default if necessary
-     *
-     * @param string $encryption_key_identifier - encryption key name. will use default if necessary
-     * @param bool   $generate                  - will generate a new key if the requested one does not exist
-     * @param bool   $throw_exception           - if TRUE (default), will throw an exception if key is not found
-     * @return string
-     * @throws Exception
-     */
-    public function getEncryptionKey($encryption_key_identifier = '', $generate = true, $throw_exception = true)
-    {
-        $encryption_key_identifier = $encryption_key_identifier ?: $this->default_encryption_key_id;
-        // if encryption key has not been set
-        if (! $this->encryptionKeyExists($encryption_key_identifier)) {
-            if ($generate) {
-                $this->addEncryptionKey($encryption_key_identifier);
-            } else {
-                if (! $throw_exception) {
-                    return '';
-                }
-                throw new OutOfBoundsException(
-                    sprintf(
-                        esc_html__('The "%1$s" encryption key was not found or is invalid.', 'event_espresso'),
-                        $encryption_key_identifier
-                    )
-                );
-            }
-        }
-        return $this->encryption_keys[ $encryption_key_identifier ];
-    }
-
-
-    /**
-     * creates a new encryption key
-     *
-     * @param bool $strong if true (default) will attempt to generate a cryptographically secure key
-     * @return string
-     * @throws Exception
-     */
-    public function generateEncryptionKey($strong = true)
-    {
-        return $strong && PHP_VERSION_ID >= 70100
-            ? $this->generateStrongEncryptionKey()
-            : $this->generateWeakEncryptionKey();
-    }
-
-
-    /**
-     * creates a new cryptographically secure encryption key
-     *
-     * @return string
-     * @throws Exception
-     */
-    protected function generateStrongEncryptionKey()
-    {
-        // bit_depth needs to be divided by 8 to convert to bytes
-        return $this->base64_encoder->encodeString(random_bytes($this->bit_depth / 8));
-    }
-
-
-    /**
-     * creates a new encryption key that should not be trusted to be cryptographically secure
-     *
-     * @return string
-     * @throws Exception
-     */
-    protected function generateWeakEncryptionKey()
-    {
-        // @see http://stackoverflow.com/questions/637278/what-is-the-best-way-to-generate-a-random-key-within-php
-        $iterations    = ceil($this->key_length / 40);
-        $random_string = '';
-        for ($i = 0; $i < $iterations; $i++) {
-            $random_string .= sha1(microtime(true) . mt_rand(10000, 90000));
-        }
-        $random_string = (string) substr($random_string, 0, $this->key_length);
-        return $this->base64_encoder->encodeString($random_string);
-    }
-
-
-    /**
-     * @return int
-     */
-    public function bitDepth()
-    {
-        return $this->bit_depth;
-    }
-
-
-    /**
-     * @param int $bit_depth options are 64, 128, 192, or 256
-     */
-    public function setBitDepth($bit_depth)
-    {
-        $bit_depth       = absint($bit_depth);
-        $this->bit_depth = in_array($bit_depth, $this->bit_depth_options, true) ? $bit_depth : 128;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function keyLength()
-    {
-        return $this->key_length;
-    }
-
-
-    /**
-     * @param int $key_length
-     */
-    public function setKeyLength($key_length)
-    {
-        // let's not let the key length go below 8 or above 128
-        $this->key_length = min(max(absint($key_length), 8), 128);
-    }
-
-
-    /**
-     * deletes ALL existing encryption keys from the db
-     *
-     * @return bool true if keys successfully deleted, false otherwise.
-     */
-    public function removeAllEncryptionKeys()
-    {
-        return delete_option($this->encryption_keys_option_name);
-    }
-
-
-    /**
-     * deletes an existing encryption key from those saved in the db
-     *
-     * @param string $encryption_key_identifier encryption key name
-     * @return int  1: key removed successfully.
-     *              0: key did not exist.
-     *             -1: failed to remove key
-     * @throws Exception
-     */
-    public function removeEncryptionKey($encryption_key_identifier = '')
-    {
-        // if encryption key has not been set
-        if (! $this->encryptionKeyExists($encryption_key_identifier)) {
-            return 0;
-        }
-        unset($this->encryption_keys[ $encryption_key_identifier ]);
-        return $this->saveEncryptionKeys() ? 1 : -1;
-    }
-
-
-    /**
-     * retrieves encryption keys from db
-     *
-     * @return array
-     * @throws Exception
-     * @throws RuntimeException
-     */
-    protected function retrieveEncryptionKeys()
-    {
-        // if encryption key has not been set
-        if (empty($this->encryption_keys)) {
-            // retrieve encryption_key from db
-            $this->encryption_keys = get_option($this->encryption_keys_option_name, null);
-            // WHAT?? No encryption keys in the db ??
-            if ($this->encryption_keys === null) {
-                $this->encryption_keys = [];
-                // let's create the default key and save it
-                $new_key                                                   = $this->generateEncryptionKey();
-                $this->encryption_keys[ $this->default_encryption_key_id ] = $new_key;
-                if (! $this->saveEncryptionKeys(true)) {
-                    throw new RuntimeException(
-                        sprintf(
-                            esc_html__(
-                                'Failed to save the "%1$s" encryption keys array to the database.',
-                                'event_espresso'
-                            ),
-                            $this->encryption_keys_option_name
-                        )
-                    );
-                }
-            }
-        }
-        return $this->encryption_keys;
-    }
-
-
-    /**
-     * saves encryption keys from db
-     *
-     * @return bool
-     */
-    protected function saveEncryptionKeys($initialize = false)
-    {
-        return $initialize
-            ? add_option($this->encryption_keys_option_name, $this->encryption_keys, '', false)
-            : update_option($this->encryption_keys_option_name, $this->encryption_keys, false);
-    }
+	/**
+	 * @var Base64Encoder
+	 */
+	protected $base64_encoder;
+
+	/**
+	 * name used for a default encryption key in case no others are set
+	 *
+	 * @var string
+	 */
+	private $default_encryption_key_id;
+
+	/**
+	 * name used for saving encryption keys to the wp_options table
+	 *
+	 * @var string
+	 */
+	private $encryption_keys_option_name;
+
+	/**
+	 * @var array
+	 */
+	private $encryption_keys = null;
+
+	/**
+	 * number of bits used when generating cryptographically secure keys
+	 *
+	 * @var int
+	 */
+	private $bit_depth = 128;
+
+	/**
+	 * @var int[]
+	 */
+	private $bit_depth_options = [64, 128, 192, 256];
+
+	/**
+	 * number of characters used when generating cryptographically weak keys
+	 *
+	 * @var int
+	 */
+	private $key_length = 40;
+
+
+	/**
+	 * @param Base64Encoder $base64_encoder
+	 * @param string        $default_encryption_key_id
+	 * @param string        $encryption_keys_option_name
+	 */
+	public function __construct(Base64Encoder $base64_encoder, $default_encryption_key_id, $encryption_keys_option_name)
+	{
+		$this->base64_encoder              = $base64_encoder;
+		$this->default_encryption_key_id   = $default_encryption_key_id;
+		$this->encryption_keys_option_name = $encryption_keys_option_name;
+	}
+
+
+	/**
+	 * add an encryption key
+	 *
+	 * @param string $encryption_key_identifier - name of the encryption key to use
+	 * @param string $encryption_key            - cryptographically secure passphrase. will generate if necessary
+	 * @param bool   $overwrite                 - prevents accidental overwriting of an existing key which would be bad
+	 * @return bool
+	 * @throws Exception
+	 */
+	public function addEncryptionKey($encryption_key_identifier, $encryption_key = '', $overwrite = false)
+	{
+		$encryption_key_identifier = $encryption_key_identifier ?: $this->default_encryption_key_id;
+		if ($this->encryptionKeyExists($encryption_key_identifier) && ! $overwrite) {
+			// WOAH!!! that key already exists and we don't want to overwrite it
+			throw new RuntimeException(
+				sprintf(
+					esc_html__(
+						'The "%1$s" encryption key already exists and can not be overwritten because previously encrypted values would no longer be capable of being decrypted.',
+						'event_espresso'
+					),
+					$encryption_key_identifier
+				)
+			);
+		}
+		$this->encryption_keys[ $encryption_key_identifier ] = $encryption_key ?: $this->generateEncryptionKey();
+		return $this->saveEncryptionKeys();
+	}
+
+
+	/**
+	 * returns true if encryption key has already been generated
+	 *
+	 * @param string $encryption_key_identifier - encryption key name
+	 * @return bool
+	 * @throws Exception
+	 * @throws OutOfBoundsException
+	 */
+	public function encryptionKeyExists($encryption_key_identifier = '')
+	{
+		// ensure keys are loaded
+		$this->retrieveEncryptionKeys();
+		return isset($this->encryption_keys[ $encryption_key_identifier ]);
+	}
+
+
+	/**
+	 * returns cryptographically secure passphrase. will use default if necessary
+	 *
+	 * @param string $encryption_key_identifier - encryption key name. will use default if necessary
+	 * @param bool   $generate                  - will generate a new key if the requested one does not exist
+	 * @param bool   $throw_exception           - if TRUE (default), will throw an exception if key is not found
+	 * @return string
+	 * @throws Exception
+	 */
+	public function getEncryptionKey($encryption_key_identifier = '', $generate = true, $throw_exception = true)
+	{
+		$encryption_key_identifier = $encryption_key_identifier ?: $this->default_encryption_key_id;
+		// if encryption key has not been set
+		if (! $this->encryptionKeyExists($encryption_key_identifier)) {
+			if ($generate) {
+				$this->addEncryptionKey($encryption_key_identifier);
+			} else {
+				if (! $throw_exception) {
+					return '';
+				}
+				throw new OutOfBoundsException(
+					sprintf(
+						esc_html__('The "%1$s" encryption key was not found or is invalid.', 'event_espresso'),
+						$encryption_key_identifier
+					)
+				);
+			}
+		}
+		return $this->encryption_keys[ $encryption_key_identifier ];
+	}
+
+
+	/**
+	 * creates a new encryption key
+	 *
+	 * @param bool $strong if true (default) will attempt to generate a cryptographically secure key
+	 * @return string
+	 * @throws Exception
+	 */
+	public function generateEncryptionKey($strong = true)
+	{
+		return $strong && PHP_VERSION_ID >= 70100
+			? $this->generateStrongEncryptionKey()
+			: $this->generateWeakEncryptionKey();
+	}
+
+
+	/**
+	 * creates a new cryptographically secure encryption key
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	protected function generateStrongEncryptionKey()
+	{
+		// bit_depth needs to be divided by 8 to convert to bytes
+		return $this->base64_encoder->encodeString(random_bytes($this->bit_depth / 8));
+	}
+
+
+	/**
+	 * creates a new encryption key that should not be trusted to be cryptographically secure
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	protected function generateWeakEncryptionKey()
+	{
+		// @see http://stackoverflow.com/questions/637278/what-is-the-best-way-to-generate-a-random-key-within-php
+		$iterations    = ceil($this->key_length / 40);
+		$random_string = '';
+		for ($i = 0; $i < $iterations; $i++) {
+			$random_string .= sha1(microtime(true) . mt_rand(10000, 90000));
+		}
+		$random_string = (string) substr($random_string, 0, $this->key_length);
+		return $this->base64_encoder->encodeString($random_string);
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function bitDepth()
+	{
+		return $this->bit_depth;
+	}
+
+
+	/**
+	 * @param int $bit_depth options are 64, 128, 192, or 256
+	 */
+	public function setBitDepth($bit_depth)
+	{
+		$bit_depth       = absint($bit_depth);
+		$this->bit_depth = in_array($bit_depth, $this->bit_depth_options, true) ? $bit_depth : 128;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function keyLength()
+	{
+		return $this->key_length;
+	}
+
+
+	/**
+	 * @param int $key_length
+	 */
+	public function setKeyLength($key_length)
+	{
+		// let's not let the key length go below 8 or above 128
+		$this->key_length = min(max(absint($key_length), 8), 128);
+	}
+
+
+	/**
+	 * deletes ALL existing encryption keys from the db
+	 *
+	 * @return bool true if keys successfully deleted, false otherwise.
+	 */
+	public function removeAllEncryptionKeys()
+	{
+		return delete_option($this->encryption_keys_option_name);
+	}
+
+
+	/**
+	 * deletes an existing encryption key from those saved in the db
+	 *
+	 * @param string $encryption_key_identifier encryption key name
+	 * @return int  1: key removed successfully.
+	 *              0: key did not exist.
+	 *             -1: failed to remove key
+	 * @throws Exception
+	 */
+	public function removeEncryptionKey($encryption_key_identifier = '')
+	{
+		// if encryption key has not been set
+		if (! $this->encryptionKeyExists($encryption_key_identifier)) {
+			return 0;
+		}
+		unset($this->encryption_keys[ $encryption_key_identifier ]);
+		return $this->saveEncryptionKeys() ? 1 : -1;
+	}
+
+
+	/**
+	 * retrieves encryption keys from db
+	 *
+	 * @return array
+	 * @throws Exception
+	 * @throws RuntimeException
+	 */
+	protected function retrieveEncryptionKeys()
+	{
+		// if encryption key has not been set
+		if (empty($this->encryption_keys)) {
+			// retrieve encryption_key from db
+			$this->encryption_keys = get_option($this->encryption_keys_option_name, null);
+			// WHAT?? No encryption keys in the db ??
+			if ($this->encryption_keys === null) {
+				$this->encryption_keys = [];
+				// let's create the default key and save it
+				$new_key                                                   = $this->generateEncryptionKey();
+				$this->encryption_keys[ $this->default_encryption_key_id ] = $new_key;
+				if (! $this->saveEncryptionKeys(true)) {
+					throw new RuntimeException(
+						sprintf(
+							esc_html__(
+								'Failed to save the "%1$s" encryption keys array to the database.',
+								'event_espresso'
+							),
+							$this->encryption_keys_option_name
+						)
+					);
+				}
+			}
+		}
+		return $this->encryption_keys;
+	}
+
+
+	/**
+	 * saves encryption keys from db
+	 *
+	 * @return bool
+	 */
+	protected function saveEncryptionKeys($initialize = false)
+	{
+		return $initialize
+			? add_option($this->encryption_keys_option_name, $this->encryption_keys, '', false)
+			: update_option($this->encryption_keys_option_name, $this->encryption_keys, false);
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -97,7 +97,7 @@ 
                 )
             );
         }
-        $this->encryption_keys[ $encryption_key_identifier ] = $encryption_key ?: $this->generateEncryptionKey();
+        $this->encryption_keys[$encryption_key_identifier] = $encryption_key ?: $this->generateEncryptionKey();
         return $this->saveEncryptionKeys();
     }
 
@@ -114,7 +114,7 @@ 
     {
         // ensure keys are loaded
         $this->retrieveEncryptionKeys();
-        return isset($this->encryption_keys[ $encryption_key_identifier ]);
+        return isset($this->encryption_keys[$encryption_key_identifier]);
     }
 
 
@@ -131,11 +131,11 @@ 
     {
         $encryption_key_identifier = $encryption_key_identifier ?: $this->default_encryption_key_id;
         // if encryption key has not been set
-        if (! $this->encryptionKeyExists($encryption_key_identifier)) {
+        if ( ! $this->encryptionKeyExists($encryption_key_identifier)) {
             if ($generate) {
                 $this->addEncryptionKey($encryption_key_identifier);
             } else {
-                if (! $throw_exception) {
+                if ( ! $throw_exception) {
                     return '';
                 }
                 throw new OutOfBoundsException(
@@ -146,7 +146,7 @@ 
                 );
             }
         }
-        return $this->encryption_keys[ $encryption_key_identifier ];
+        return $this->encryption_keys[$encryption_key_identifier];
     }
 
 
@@ -190,7 +190,7 @@ 
         $iterations    = ceil($this->key_length / 40);
         $random_string = '';
         for ($i = 0; $i < $iterations; $i++) {
-            $random_string .= sha1(microtime(true) . mt_rand(10000, 90000));
+            $random_string .= sha1(microtime(true).mt_rand(10000, 90000));
         }
         $random_string = (string) substr($random_string, 0, $this->key_length);
         return $this->base64_encoder->encodeString($random_string);
@@ -258,10 +258,10 @@ 
     public function removeEncryptionKey($encryption_key_identifier = '')
     {
         // if encryption key has not been set
-        if (! $this->encryptionKeyExists($encryption_key_identifier)) {
+        if ( ! $this->encryptionKeyExists($encryption_key_identifier)) {
             return 0;
         }
-        unset($this->encryption_keys[ $encryption_key_identifier ]);
+        unset($this->encryption_keys[$encryption_key_identifier]);
         return $this->saveEncryptionKeys() ? 1 : -1;
     }
 
@@ -284,8 +284,8 @@ 
                 $this->encryption_keys = [];
                 // let's create the default key and save it
                 $new_key                                                   = $this->generateEncryptionKey();
-                $this->encryption_keys[ $this->default_encryption_key_id ] = $new_key;
-                if (! $this->saveEncryptionKeys(true)) {
+                $this->encryption_keys[$this->default_encryption_key_id] = $new_key;
+                if ( ! $this->saveEncryptionKeys(true)) {
                     throw new RuntimeException(
                         sprintf(
                             esc_html__(

public/Espresso_Arabica_2014/content-espresso_venues-thumbnail.php

Spacing +6 added lines, -6 removed lines

@@ -3,12 +3,12 @@ 
 
 global $post;
 
-do_action( 'AHEE__content_espresso_venues_template__before_featured_img', $post );
+do_action('AHEE__content_espresso_venues_template__before_featured_img', $post);
 
-if ( has_post_thumbnail( $post->ID )) :
-	if ( $img_ID = get_post_thumbnail_id( $post->ID )) :
-		if ( $featured_img = wp_get_attachment_image_src( $img_ID, 'large' )) :
-			$caption = get_post( get_post( $img_ID ))->post_excerpt;
+if (has_post_thumbnail($post->ID)) :
+	if ($img_ID = get_post_thumbnail_id($post->ID)) :
+		if ($featured_img = wp_get_attachment_image_src($img_ID, 'large')) :
+			$caption = get_post(get_post($img_ID))->post_excerpt;
 			$wrap_class .= ' has-img';
 			?>
 <div id="ee-venue-img-dv-<?php echo esc_attr($post->ID); ?>" class="ee-venue-img-dv">
@@ -26,5 +26,5 @@ 
 	endif;
 endif;
 ?>		
-<?php do_action( 'AHEE__content_espresso_venues_template__after_featured_img', $post );?>
+<?php do_action('AHEE__content_espresso_venues_template__after_featured_img', $post); ?>
 <!-- .venue-content -->

public/Espresso_Arabica_2014/content-espresso_events-details.php

Indentation +11 added lines, -11 removed lines

@@ -13,20 +13,20 @@
 	    <?php if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) : ?>
 	    <span class="comments-link">
         <?php comments_popup_link(
-            esc_html__( 'Leave a comment', 'event_espresso' ),
-            esc_html__( '1 Comment', 'event_espresso' ),
-            esc_html__( '% Comments', 'event_espresso' )
-        ); ?>
+			esc_html__( 'Leave a comment', 'event_espresso' ),
+			esc_html__( '1 Comment', 'event_espresso' ),
+			esc_html__( '% Comments', 'event_espresso' )
+		); ?>
         </span>
 
         <?php
-            endif;
-            edit_post_link(
-                esc_html__( 'Edit', 'event_espresso' ),
-                '<span class="edit-link">',
-                '</span>'
-            );
-        ?>
+			endif;
+			edit_post_link(
+				esc_html__( 'Edit', 'event_espresso' ),
+				'<span class="edit-link">',
+				'</span>'
+			);
+		?>
 	</div>
 
 <?php endif;

Spacing +15 added lines, -15 removed lines

@@ -4,27 +4,27 @@ 
 <div class="event-content">
 <?php use EventEspresso\core\services\request\sanitizers\AllowedTags;
 
-if ( apply_filters( 'FHEE__content_espresso_events_details_template__display_entry_meta', TRUE )): ?>
+if (apply_filters('FHEE__content_espresso_events_details_template__display_entry_meta', TRUE)): ?>
 
 	<div class="entry-meta">
 
 		<span class="tags-links">
-            <?php espresso_event_categories( $post->ID, TRUE, TRUE ); ?>
+            <?php espresso_event_categories($post->ID, TRUE, TRUE); ?>
         </span>
 
-	    <?php if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) : ?>
+	    <?php if ( ! post_password_required() && (comments_open() || get_comments_number())) : ?>
 	    <span class="comments-link">
         <?php comments_popup_link(
-            esc_html__( 'Leave a comment', 'event_espresso' ),
-            esc_html__( '1 Comment', 'event_espresso' ),
-            esc_html__( '% Comments', 'event_espresso' )
+            esc_html__('Leave a comment', 'event_espresso'),
+            esc_html__('1 Comment', 'event_espresso'),
+            esc_html__('% Comments', 'event_espresso')
         ); ?>
         </span>
 
         <?php
             endif;
             edit_post_link(
-                esc_html__( 'Edit', 'event_espresso' ),
+                esc_html__('Edit', 'event_espresso'),
                 '<span class="edit-link">',
                 '</span>'
             );
@@ -32,25 +32,25 @@ 
 	</div>
 
 <?php endif;
-	$event_phone = espresso_event_phone( $post->ID, FALSE );
+	$event_phone = espresso_event_phone($post->ID, FALSE);
 
-	if ( $event_phone != '' ) : ?>
+	if ($event_phone != '') : ?>
 	<p class="event-phone">
 		<span class="small-text">
-            <strong><?php esc_html_e( 'Event Phone:', 'event_espresso' ); ?> </strong>
+            <strong><?php esc_html_e('Event Phone:', 'event_espresso'); ?> </strong>
         </span>
         <?php echo wp_kses($event_phone, AllowedTags::getAllowedTags()); ?>
 	</p>
-<?php endif;  ?>
+<?php endif; ?>
 
 <?php
-	if ( apply_filters( 'FHEE__content_espresso_events_details_template__display_the_content', true ) ) {
-		do_action( 'AHEE_event_details_before_the_content', $post );
+	if (apply_filters('FHEE__content_espresso_events_details_template__display_the_content', true)) {
+		do_action('AHEE_event_details_before_the_content', $post);
 		echo apply_filters(
 			'FHEE__content_espresso_events_details_template__the_content',
-			espresso_event_content_or_excerpt( 55, null, false ) 
+			espresso_event_content_or_excerpt(55, null, false) 
 		);
-		do_action( 'AHEE_event_details_after_the_content', $post );
+		do_action('AHEE_event_details_after_the_content', $post);
 	}
  ?>
 </div>

public/Espresso_Arabica_2014/content-espresso_venues-location.php

Spacing +4 added lines, -4 removed lines

@@ -1,16 +1,16 @@
 <?php //echo '<h1>' . __FILE__ . '</h1>'; 
 global $post; 
-if ( espresso_venue_has_address( $post->ID )) :
+if (espresso_venue_has_address($post->ID)) :
 ?>
 <div class="venue-location">
 	
 	<h3 class="venue-address-h3 ee-venue-h3">
-		<span class="dashicons dashicons-location-alt"></span><?php esc_html_e( 'Location', 'event_espresso' ); ?>
+		<span class="dashicons dashicons-location-alt"></span><?php esc_html_e('Location', 'event_espresso'); ?>
 	</h3>
-	<span class="small-text"><strong><?php esc_html_e( 'Address:', 'event_espresso' ); ?></strong></span><?php espresso_venue_address( 'inline', $post->ID ); ?>
+	<span class="small-text"><strong><?php esc_html_e('Address:', 'event_espresso'); ?></strong></span><?php espresso_venue_address('inline', $post->ID); ?>
 	<div class="clear"></div>
 
-	<div class="venue-gmap"><?php espresso_venue_gmap( $post->ID ); ?></div>
+	<div class="venue-gmap"><?php espresso_venue_gmap($post->ID); ?></div>
 	<div class="clear"></div>
 	
 </div>

public/Espresso_Arabica_2014/content-espresso_events-venues.php

Braces +10 added lines, -4 removed lines

@@ -51,8 +51,11 @@ 
 		<?php echo do_shortcode( $venue_description ); ?>
 	</p>
 		<?php endif;  ?>
-	<?php else : ?>
-		<?php $venue_excerpt = espresso_venue_excerpt( $VNU_ID, FALSE ); ?>
+	<?php else {
+	: ?>
+		<?php $venue_excerpt = espresso_venue_excerpt( $VNU_ID, FALSE );
+}
+?>
 		<?php if ( $venue_excerpt ) : ?>
 	<p>
 		<strong><?php esc_html_e( 'Description:', 'event_espresso' ); ?></strong><br/>
@@ -64,12 +67,15 @@ 
 <!-- .espresso-venue-dv -->
 <?php
 do_action( 'AHEE_event_details_after_venue_details', $post );
-else :
+else {
+	:
 	if ( espresso_venue_is_password_protected() ) :
 ?>
 	<div class="espresso-venue-dv  espresso-password-protected-venue-dv" >
 		<h3 class="event-venues-h3 ee-event-h3">
-			<?php esc_html_e( 'Location', 'event_espresso' );?>
+			<?php esc_html_e( 'Location', 'event_espresso' );
+}
+?>
 		</h3>
 		<?php echo espresso_password_protected_venue_form(); ?>
 	</div>

Spacing +32 added lines, -32 removed lines

@@ -3,75 +3,75 @@
 use EventEspresso\core\services\request\sanitizers\AllowedTags;
 
 if (
-	( is_single() && espresso_display_venue_in_event_details() )
-	|| ( is_archive() && espresso_display_venue_in_event_list() )
+	(is_single() && espresso_display_venue_in_event_details())
+	|| (is_archive() && espresso_display_venue_in_event_list())
 ) :
 	global $post;
-	do_action( 'AHEE_event_details_before_venue_details', $post );
-	$venue_name = espresso_venue_name( 0, 'details', FALSE );
-	if ( empty( $venue_name ) && espresso_is_venue_private() ) {
-		do_action( 'AHEE_event_details_after_venue_details', $post );
+	do_action('AHEE_event_details_before_venue_details', $post);
+	$venue_name = espresso_venue_name(0, 'details', FALSE);
+	if (empty($venue_name) && espresso_is_venue_private()) {
+		do_action('AHEE_event_details_after_venue_details', $post);
 		return '';
 	}
 ?>
 
 <div class="espresso-venue-dv<?php echo espresso_is_venue_private() ? ' espresso-private-venue-dv' : ''; ?>">
 	<h4>
-        <strong><?php esc_html_e( 'Venue:', 'event_espresso' ); ?></strong>&nbsp;&nbsp;
+        <strong><?php esc_html_e('Venue:', 'event_espresso'); ?></strong>&nbsp;&nbsp;
         <strong> <?php echo wp_kses($venue_name, AllowedTags::getAllowedTags()); ?></strong>
     </h4>
 	<p><span class="smaller-text tags-links"><?php echo espresso_venue_categories(); ?></span></p>
-<?php  if ( $venue_phone = espresso_venue_phone( $post->ID, FALSE )) : ?>
+<?php  if ($venue_phone = espresso_venue_phone($post->ID, FALSE)) : ?>
 	<p>
 		<span class="small-text">
-            <strong><?php esc_html_e( 'Venue Phone:', 'event_espresso' ); ?></strong>
+            <strong><?php esc_html_e('Venue Phone:', 'event_espresso'); ?></strong>
         </span>
         <?php echo wp_kses($venue_phone, AllowedTags::getAllowedTags()); ?>
 	</p>
-<?php endif;  ?>
-<?php if ( $venue_website = espresso_venue_website( $post->ID, FALSE )) : ?>
+<?php endif; ?>
+<?php if ($venue_website = espresso_venue_website($post->ID, FALSE)) : ?>
 	<p>
 		<span class="small-text">
-            <strong><?php esc_html_e( 'Venue Website:', 'event_espresso' ); ?></strong>
+            <strong><?php esc_html_e('Venue Website:', 'event_espresso'); ?></strong>
         </span>
         <?php echo wp_kses($venue_website, AllowedTags::getAllowedTags()); ?>
 	</p>
 <?php endif; ?>
-<?php  if ( espresso_venue_has_address( $post->ID )) : ?>
-	<strong><span class="dashicons dashicons-location-alt"></span><?php esc_html_e( 'Address:', 'event_espresso' ); ?></strong>
-	<?php espresso_venue_address( 'inline' ); // already escaped ?>
-	<?php espresso_venue_gmap( $post->ID ); // already escaped ?>
+<?php  if (espresso_venue_has_address($post->ID)) : ?>
+	<strong><span class="dashicons dashicons-location-alt"></span><?php esc_html_e('Address:', 'event_espresso'); ?></strong>
+	<?php espresso_venue_address('inline'); // already escaped ?>
+	<?php espresso_venue_gmap($post->ID); // already escaped ?>
 	<div class="clear"><br/></div>
-<?php endif;  ?>
+<?php endif; ?>
 
-	<?php $VNU_ID = espresso_venue_id( $post->ID ); ?>
-	<?php if ( is_single() ) : ?>
-		<?php $venue_description = espresso_venue_description( $VNU_ID, FALSE ); ?>
-		<?php if ( $venue_description ) : ?>
+	<?php $VNU_ID = espresso_venue_id($post->ID); ?>
+	<?php if (is_single()) : ?>
+		<?php $venue_description = espresso_venue_description($VNU_ID, FALSE); ?>
+		<?php if ($venue_description) : ?>
 	<p>
-		<strong><?php esc_html_e( 'Description:', 'event_espresso' ); ?></strong><br/>
-		<?php echo do_shortcode( $venue_description ); ?>
+		<strong><?php esc_html_e('Description:', 'event_espresso'); ?></strong><br/>
+		<?php echo do_shortcode($venue_description); ?>
 	</p>
-		<?php endif;  ?>
+		<?php endif; ?>
 	<?php else : ?>
-		<?php $venue_excerpt = espresso_venue_excerpt( $VNU_ID, FALSE ); ?>
-		<?php if ( $venue_excerpt ) : ?>
+		<?php $venue_excerpt = espresso_venue_excerpt($VNU_ID, FALSE); ?>
+		<?php if ($venue_excerpt) : ?>
 	<p>
-		<strong><?php esc_html_e( 'Description:', 'event_espresso' ); ?></strong><br/>
+		<strong><?php esc_html_e('Description:', 'event_espresso'); ?></strong><br/>
 		<?php echo wp_kses($venue_excerpt, AllowedTags::getAllowedTags()); ?>
 	</p>
-			<?php endif;  ?>
-		<?php endif;  ?>
+			<?php endif; ?>
+		<?php endif; ?>
 </div>
 <!-- .espresso-venue-dv -->
 <?php
-do_action( 'AHEE_event_details_after_venue_details', $post );
+do_action('AHEE_event_details_after_venue_details', $post);
 else :
-	if ( espresso_venue_is_password_protected() ) :
+	if (espresso_venue_is_password_protected()) :
 ?>
 	<div class="espresso-venue-dv  espresso-password-protected-venue-dv" >
 		<h3 class="event-venues-h3 ee-event-h3">
-			<?php esc_html_e( 'Location', 'event_espresso' );?>
+			<?php esc_html_e('Location', 'event_espresso'); ?>
 		</h3>
 		<?php echo espresso_password_protected_venue_form(); ?>
 	</div>

public/Espresso_Arabica_2014/content-espresso_events-header.php

Spacing +2 added lines, -2 removed lines

@@ -7,10 +7,10 @@
 	<?php echo "<{$tag}  id=\"event-details-{$tag}-{$post->ID}\" class=\"entry-title\">"; ?>
 		<a class="ee-event-header-lnk"
            href="<?php the_permalink(); ?>"
-           <?php echo \EED_Events_Archive::link_target();?>
+           <?php echo \EED_Events_Archive::link_target(); ?>
         >
             <?php the_title(); ?>
         </a>
 	<?php echo "</{$tag}>"; ?>
-	<?php if ( ! is_archive() && has_excerpt( $post->ID )): the_excerpt(); endif;?>
+	<?php if ( ! is_archive() && has_excerpt($post->ID)): the_excerpt(); endif; ?>
 </header>

ui/blocks/event-attendees.php

Indentation +20 added lines, -20 removed lines

@@ -13,25 +13,25 @@ 
 <div id="ee-block-event-attendees" class="ee-core-blocks event-espresso-blocks event-attendees">
     <ul>
         <?php
-        foreach ($attendees as $attendee) {
-            $attendee_name = esc_html($attendee->full_name());
+		foreach ($attendees as $attendee) {
+			$attendee_name = esc_html($attendee->full_name());
 
-            $gravatar = $attributes['showGravatar']
-                ? get_avatar_url(
-                    $attendee->email(),
-                    array(
-                        'width'   => $attributes['avatarSize'],
-                        'height'  => $attributes['avatarSize']
-                    )
-                )
-                : '';
+			$gravatar = $attributes['showGravatar']
+				? get_avatar_url(
+					$attendee->email(),
+					array(
+						'width'   => $attributes['avatarSize'],
+						'height'  => $attributes['avatarSize']
+					)
+				)
+				: '';
 
-            $gravatar_class = $attributes['avatarClass']
-                ? $attributes['avatarClass'] . ' contact-avatar-img avatar'
-                : 'contact-avatar-img avatar';
+			$gravatar_class = $attributes['avatarClass']
+				? $attributes['avatarClass'] . ' contact-avatar-img avatar'
+				: 'contact-avatar-img avatar';
 
-            $gravatar = $gravatar !== ''
-                ? '
+			$gravatar = $gravatar !== ''
+				? '
                 <div class="contact-image-wrap-div">
                     <img class="' . esc_attr($gravatar_class) . '"
                          width="' . esc_attr($attributes['avatarSize']) . '"
@@ -40,13 +40,13 @@ 
                          alt="contact avatar"
                      >
                  </div>'
-                : '';
+				: '';
 
-            echo "
+			echo "
             <li>
                 {$gravatar}<span>{$attendee_name}</span>
             </li>";
-        }
-        ?>
+		}
+		?>
     </ul>
 </div>

Spacing +5 added lines, -5 removed lines

@@ -27,16 +27,16 @@
                 : '';
 
             $gravatar_class = $attributes['avatarClass']
-                ? $attributes['avatarClass'] . ' contact-avatar-img avatar'
+                ? $attributes['avatarClass'].' contact-avatar-img avatar'
                 : 'contact-avatar-img avatar';
 
             $gravatar = $gravatar !== ''
                 ? '
                 <div class="contact-image-wrap-div">
-                    <img class="' . esc_attr($gravatar_class) . '"
-                         width="' . esc_attr($attributes['avatarSize']) . '"
-                         height="' . esc_attr($attributes['avatarSize']) . '"
-                         src="' . esc_url_raw($gravatar) . '" 
+                    <img class="' . esc_attr($gravatar_class).'"
+                         width="' . esc_attr($attributes['avatarSize']).'"
+                         height="' . esc_attr($attributes['avatarSize']).'"
+                         src="' . esc_url_raw($gravatar).'" 
                          alt="contact avatar"
                      >
                  </div>'

core/templates/espresso-ajax-notices.template.php

Indentation +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <div id="espresso-ajax-loading" style="display:none;">
     <span class="ee-spinner ee-spin"></span><span style="display:none;">
         <?php esc_html_e(
-            'loading...',
-            'event_espresso'
-        ); ?></span>
+			'loading...',
+			'event_espresso'
+		); ?></span>
 </div>
 
 <div id="espresso-ajax-notices">

core/helpers/EEH_Venue_View.helper.php

Spacing +11 added lines, -11 removed lines

@@ -99,7 +99,7 @@ 
             }
         }
         // now if we STILL do NOT have an EE_Venue model object, BUT we have a Venue ID...
-        if (! EEH_Venue_View::$_venue instanceof EE_Venue && $VNU_ID) {
+        if ( ! EEH_Venue_View::$_venue instanceof EE_Venue && $VNU_ID) {
             // sigh... pull it from the db
             EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
         }
@@ -175,7 +175,7 @@ 
     public static function is_venue_private($VNU_ID = false)
     {
         $venue = EEH_Venue_View::get_venue($VNU_ID);
-        if (! $venue instanceof EE_Venue) {
+        if ( ! $venue instanceof EE_Venue) {
             return null;
         }
 
@@ -260,11 +260,11 @@ 
         $venue = EEH_Venue_View::get_venue($VNU_ID);
         if ($venue instanceof EE_Venue) {
             $excerpt    = $venue->excerpt() != null && $venue->excerpt() ? $venue->excerpt() : $venue->description();
-            $venue_link = ' ' . EEH_Venue_View::venue_details_link(
+            $venue_link = ' '.EEH_Venue_View::venue_details_link(
                 $venue->ID(),
-                esc_html__('more', 'event_espresso') . '…'
+                esc_html__('more', 'event_espresso').'…'
             );
-            return ! empty($excerpt) ? wp_trim_words($excerpt, 25, '') . $venue_link : '';
+            return ! empty($excerpt) ? wp_trim_words($excerpt, 25, '').$venue_link : '';
         }
         return '';
     }
@@ -299,7 +299,7 @@ 
                              ))
                             || ! $hide_uncategorized)
                     ) {
-                        $category_links[] = '<a href="' . esc_url($url) . '" rel="tag">' . $term->name . '</a> ';
+                        $category_links[] = '<a href="'.esc_url($url).'" rel="tag">'.$term->name.'</a> ';
                     }
                 }
             }
@@ -367,7 +367,7 @@ 
             $venue_name = apply_filters(
                 'FHEE__EEH_Venue__venue_name__append_private_venue_name',
                 EEH_Venue_View::is_venue_private()
-                    ? EEH_Venue_View::$_venue->name() . "&nbsp;" . esc_html__('(Private)', 'event_espresso')
+                    ? EEH_Venue_View::$_venue->name()."&nbsp;".esc_html__('(Private)', 'event_espresso')
                     : EEH_Venue_View::$_venue->name(),
                 EEH_Venue_View::$_venue
             );
@@ -480,7 +480,7 @@ 
                 $options      = [];
 
                 $options['map_ID'] = $map_ID && $map_ID != $venue->ID()
-                    ? $map_ID . '-' . $venue->ID()
+                    ? $map_ID.'-'.$venue->ID()
                     : $venue->ID();
 
                 $options['location'] = EEH_Address::format($venue, 'inline', false, false);
@@ -627,11 +627,11 @@ 
                 $post_type_obj = get_post_type_object('espresso_venues');
                 // build final link html
                 $link =
-                    '<a class="post-edit-link" href="' . $url . '" title="' . esc_attr(
+                    '<a class="post-edit-link" href="'.$url.'" title="'.esc_attr(
                         $post_type_obj->labels->edit_item
-                    ) . '">' . $link . '</a>';
+                    ).'">'.$link.'</a>';
                 // put it all together
-                return $before . apply_filters('edit_post_link', $link, $venue->ID()) . $after;
+                return $before.apply_filters('edit_post_link', $link, $venue->ID()).$after;
             }
         }
         return '';

Indentation +626 added lines, -626 removed lines

@@ -9,630 +9,630 @@
  */
 class EEH_Venue_View extends EEH_Base
 {
-    /**
-     * @access    private
-     * @var EE_Venue
-     */
-    private static $_venue = null;
-
-
-    /**
-     *    get_venue
-     *    attempts to retrieve an EE_Venue object any way it can
-     *
-     * @access    public
-     * @param int  $VNU_ID
-     * @param bool $look_in_event
-     * @param bool $privacy_check   Defaults to true.
-     *                              When false, means even if the venue is private we return it regardless of access.
-     * @param bool $password_check
-     * @return EE_Venue|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function get_venue($VNU_ID = 0, $look_in_event = true, $privacy_check = true, $password_check = true)
-    {
-        $VNU_ID = absint($VNU_ID);
-        // do we already have the Venue you are looking for?
-        if (EEH_Venue_View::$_venue instanceof EE_Venue && $VNU_ID) {
-            // If the Venue ID matches $VNU_ID, return the venue.
-            if (EEH_Venue_View::$_venue->ID() === $VNU_ID) {
-                return EEH_Venue_View::_get_venue($privacy_check);
-            }
-            // If the Venue ID does not match, try pulling a venue using $VNU_ID.
-            $venue = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
-            if ($venue instanceof EE_Venue) {
-                EEH_Venue_View::$_venue = $venue;
-                return EEH_Venue_View::_get_venue($privacy_check);
-            }
-        }
-        // international newspaper?
-        global $post;
-        if ($post instanceof WP_Post) {
-            switch ($post->post_type) {
-                // if this is being called from an EE_Venue post,
-                // and the EE_Venue post corresponds to the EE_Venue that is being asked for,
-                // then we can try to just grab the attached EE_Venue object
-                case 'espresso_venues':
-                    // the post already contains the related EE_Venue object AND one of the following is TRUE:
-                    // the requested Venue ID matches the post ID OR...
-                    // there was no specific Venue ID requested
-                    if (isset($post->EE_Venue) && ($VNU_ID == $post->ID || ! $VNU_ID)) {
-                        // use existing related EE_Venue object
-                        EEH_Venue_View::$_venue = $post->EE_Venue;
-                    } elseif ($VNU_ID) {
-                        // there WAS a specific Venue ID requested, but it's NOT the current post object
-                        EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
-                    } else {
-                        // no specific Venue ID requested, so use post ID to generate EE_Venue object
-                        EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID($post->ID);
-                    }
-                    break;
-
-                case 'espresso_events':
-                    if ($look_in_event) {
-                        // grab the events related venues
-                        $venues = EEH_Venue_View::get_event_venues();
-                        // make sure the result is an array
-                        $venues = is_array($venues) ? $venues : [];
-                        // do we have an ID for a specific venue?
-                        if ($VNU_ID) {
-                            // loop thru the related venues
-                            foreach ($venues as $venue) {
-                                if ($venue instanceof EE_Venue) {
-                                    // until we find the venue we're looking for
-                                    if ($venue->ID() == $VNU_ID) {
-                                        EEH_Venue_View::$_venue = $venue;
-                                        break;
-                                    }
-                                }
-                            }
-                            // no venue ID ?
-                            // then the global post is an events post and this function was called with no argument
-                        } else {
-                            // just grab the first related event venue
-                            EEH_Venue_View::$_venue = reset($venues);
-                        }
-                    }
-                    break;
-            }
-        }
-        // now if we STILL do NOT have an EE_Venue model object, BUT we have a Venue ID...
-        if (! EEH_Venue_View::$_venue instanceof EE_Venue && $VNU_ID) {
-            // sigh... pull it from the db
-            EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
-        }
-        return EEH_Venue_View::_get_venue($privacy_check, $password_check);
-    }
-
-
-    /**
-     * return a single venue
-     *
-     * @param bool $privacy_check   Defaults to true.
-     *                              When false, means even if the venue is private we return it regardless of access.
-     * @param bool $password_check
-     * @return  EE_Venue
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected static function _get_venue($privacy_check = true, $password_check = true)
-    {
-        // check for private venues.
-        if (
-            EEH_Venue_View::$_venue instanceof EE_Venue
-            && EEH_Venue_View::$_venue->status() == 'private'
-            && $privacy_check
-            && ! EE_Registry::instance()->CAP->current_user_can('ee_read_private_venues', 'get_venues')
-        ) {
-            return null;
-        }
-        // check for password protected venues
-        if (
-            EEH_Venue_View::$_venue instanceof EE_Venue
-            && $password_check
-            && post_password_required(EEH_Venue_View::$_venue->ID())
-        ) {
-            return null;
-        }
-        return EEH_Venue_View::$_venue instanceof EE_Venue ? EEH_Venue_View::$_venue : null;
-    }
-
-
-    /**
-     *  get_event_venues
-     *
-     * @access     public
-     * @return     EE_Venue[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function get_event_venues()
-    {
-        global $post;
-        if ($post->post_type == 'espresso_events') {
-            if (isset($post->EE_Event) && $post->EE_Event instanceof EE_Event) {
-                return $post->EE_Event->venues();
-            }
-        }
-        return [];
-    }
-
-
-    /**
-     * Simply checks whether a venue for the given ID (or the internally derived venue is private).
-     *
-     * Note: This will return true if its private, null if the venue doesn't exist, and false, if the venue exists but
-     * is not private.  So it is important to do explicit boolean checks when using this conditional.
-     *
-     * @param bool $VNU_ID venue to check (optional). If not included will use internally derived venue object.
-     *
-     * @return bool|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function is_venue_private($VNU_ID = false)
-    {
-        $venue = EEH_Venue_View::get_venue($VNU_ID);
-        if (! $venue instanceof EE_Venue) {
-            return null;
-        }
-
-        return $venue->status() == 'private';
-    }
-
-
-    /**
-     * returns true or false if a venue is password protected or not
-     *
-     * @param bool $VNU_ID venue to check (optional). If not included will use internally derived venue object.
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function is_venue_password_protected($VNU_ID = false)
-    {
-        $venue = EEH_Venue_View::get_venue($VNU_ID, true, true, false);
-        if (
-            $venue instanceof EE_Venue
-            && post_password_required($venue->ID())
-        ) {
-            return true;
-        }
-        return false;
-    }
-
-
-    /**
-     * If a venue is password protected, this will return the password form for gaining access
-     * returns an empty string otherwise
-     *
-     * @param bool $VNU_ID venue to check (optional). If not included will use internally derived venue object.
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function password_protected_venue_form($VNU_ID = false)
-    {
-        $venue = EEH_Venue_View::get_venue($VNU_ID, true, true, false);
-        if (
-            $venue instanceof EE_Venue
-            && post_password_required($venue->ID())
-        ) {
-            return get_the_password_form($venue->ID());
-        }
-        return '';
-    }
-
-
-    /**
-     *    venue_description
-     *
-     * @access    public
-     * @param int $VNU_ID
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function venue_description($VNU_ID = 0)
-    {
-        $venue = EEH_Venue_View::get_venue($VNU_ID);
-        if ($venue instanceof EE_Venue) {
-            return $venue->get_pretty('VNU_desc');
-        }
-        return '';
-    }
-
-
-    /**
-     *    venue_excerpt
-     *
-     * @access    public
-     * @param int $VNU_ID
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function venue_excerpt($VNU_ID = 0)
-    {
-        $venue = EEH_Venue_View::get_venue($VNU_ID);
-        if ($venue instanceof EE_Venue) {
-            $excerpt    = $venue->excerpt() != null && $venue->excerpt() ? $venue->excerpt() : $venue->description();
-            $venue_link = ' ' . EEH_Venue_View::venue_details_link(
-                $venue->ID(),
-                esc_html__('more', 'event_espresso') . '…'
-            );
-            return ! empty($excerpt) ? wp_trim_words($excerpt, 25, '') . $venue_link : '';
-        }
-        return '';
-    }
-
-
-    /**
-     *    venue_categories
-     *
-     * @access    public
-     * @param int  $VNU_ID
-     * @param bool $hide_uncategorized
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function venue_categories($VNU_ID = 0, $hide_uncategorized = true)
-    {
-        $category_links = [];
-        $venue          = EEH_Venue_View::get_venue($VNU_ID);
-        if ($venue instanceof EE_Venue) {
-            // get category terms
-            if ($venue_categories = get_the_terms($venue->ID(), 'espresso_venue_categories')) {
-                // loop thru terms and create links
-                foreach ($venue_categories as $term) {
-                    $url = get_term_link($term, 'espresso_venue_categories');
-                    if (
-                        ! is_wp_error($url)
-                        && (($hide_uncategorized
-                             && strtolower($term->name) != esc_html__(
-                                 'uncategorized',
-                                 'event_espresso'
-                             ))
-                            || ! $hide_uncategorized)
-                    ) {
-                        $category_links[] = '<a href="' . esc_url($url) . '" rel="tag">' . $term->name . '</a> ';
-                    }
-                }
-            }
-        }
-        return implode(', ', $category_links);
-    }
-
-
-    /**
-     *    venue_address
-     *
-     * @access    public
-     * @param string $type
-     * @param int    $VNU_ID
-     * @param bool   $use_schema
-     * @param bool   $add_wrapper
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function venue_address($type = 'multiline', $VNU_ID = 0, $use_schema = true, $add_wrapper = true)
-    {
-        $venue = EEH_Venue_View::get_venue($VNU_ID);
-        if ($venue instanceof EE_Venue) {
-            return EEH_Address::format($venue, $type, $use_schema, $add_wrapper);
-        }
-        return '';
-    }
-
-
-    /**
-     *    venue_has_address
-     *
-     * @access    public
-     * @param int $VNU_ID
-     * @return bool|string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function venue_has_address($VNU_ID = 0)
-    {
-        $venue = EEH_Venue_View::get_venue($VNU_ID);
-        if ($venue instanceof EE_Venue) {
-            return EEH_Address::format($venue, 'inline', false, false);
-        }
-        return false;
-    }
-
-
-    /**
-     *    venue_name
-     *
-     * @access    public
-     * @param string $link_to - options( details, website, none ) whether to turn Venue name into a clickable link to
-     *                        the Venue's details page or website
-     * @param int    $VNU_ID
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function venue_name($link_to = 'details', $VNU_ID = 0)
-    {
-        $venue = EEH_Venue_View::get_venue($VNU_ID);
-        if ($venue instanceof EE_Venue) {
-            $venue_name = apply_filters(
-                'FHEE__EEH_Venue__venue_name__append_private_venue_name',
-                EEH_Venue_View::is_venue_private()
-                    ? EEH_Venue_View::$_venue->name() . "&nbsp;" . esc_html__('(Private)', 'event_espresso')
-                    : EEH_Venue_View::$_venue->name(),
-                EEH_Venue_View::$_venue
-            );
-            $venue_name = EEH_Schema::name($venue_name);
-
-            // if venue is trashed then ignore the "link to" setting because the venue is trashed.
-            if ($venue->get('status') == 'trash') {
-                $link_to = '';
-            }
-            switch ($link_to) {
-                case 'details':
-                    return EEH_Venue_View::venue_details_link($venue->ID(), $venue_name);
-
-                case 'website':
-                    return EEH_Venue_View::venue_website_link($venue->ID(), $venue_name);
-
-                default:
-                    return $venue_name;
-            }
-        }
-        return '';
-    }
-
-
-    /**
-     *    venue_details_link
-     *
-     * @access    public
-     * @param int    $VNU_ID
-     * @param string $text
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function venue_details_link($VNU_ID = 0, $text = '')
-    {
-        $venue = EEH_Venue_View::get_venue($VNU_ID);
-        if ($venue instanceof EE_Venue) {
-            return EEH_Schema::url(get_permalink($venue->ID()), $text);
-        }
-        return '';
-    }
-
-
-    /**
-     *    venue_website_link
-     *
-     * @access    public
-     * @param int    $VNU_ID
-     * @param string $text
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function venue_website_link($VNU_ID = 0, $text = '')
-    {
-        $venue = EEH_Venue_View::get_venue($VNU_ID);
-        if ($venue instanceof EE_Venue) {
-            $url  = $venue->venue_url();
-            $text = ! empty($text) ? $text : $url;
-            return ! empty($url) ? EEH_Schema::url($url, $text, ['target' => '_blank']) : '';
-        }
-        return '';
-    }
-
-
-    /**
-     *    venue_phone
-     *
-     * @access    public
-     * @param int $VNU_ID
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function venue_phone($VNU_ID = 0)
-    {
-        $venue = EEH_Venue_View::get_venue($VNU_ID);
-        if ($venue instanceof EE_Venue) {
-            return EEH_Schema::telephone($venue->phone());
-        }
-        return '';
-    }
-
-
-    /**
-     *    venue_gmap
-     *
-     * @access    public
-     * @param int         $VNU_ID
-     * @param bool|string $map_ID a unique identifier for this map
-     * @param array       $gmap   map options
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function venue_gmap($VNU_ID = 0, $map_ID = false, $gmap = [])
-    {
-
-        $venue = EEH_Venue_View::get_venue($VNU_ID);
-        if ($venue instanceof EE_Venue) {
-            // check for global espresso_events post and use it's ID if no map_ID is set
-            global $post;
-            $map_ID = empty($map_ID) && $post->post_type == 'espresso_events' ? $post->ID : $map_ID;
-            // grab map settings
-            $map_cfg = EE_Registry::instance()->CFG->map_settings;
-            // are maps enabled ?
-            if ($map_cfg->use_google_maps && $venue->enable_for_gmap()) {
-                $details_page = is_single();
-                $options      = [];
-
-                $options['map_ID'] = $map_ID && $map_ID != $venue->ID()
-                    ? $map_ID . '-' . $venue->ID()
-                    : $venue->ID();
-
-                $options['location'] = EEH_Address::format($venue, 'inline', false, false);
-
-                $options['ee_map_width'] = $details_page
-                    ? $map_cfg->event_details_map_width
-                    : $map_cfg->event_list_map_width;
-
-                $options['ee_map_width'] = isset($gmap['ee_map_width']) && ! empty($gmap['ee_map_width'])
-                    ? $gmap['ee_map_width']
-                    : $options['ee_map_width'];
-
-                $options['ee_map_height'] = $details_page
-                    ? $map_cfg->event_details_map_height
-                    : $map_cfg->event_list_map_height;
-
-                $options['ee_map_height'] = isset($gmap['ee_map_height']) && ! empty($gmap['ee_map_height'])
-                    ? $gmap['ee_map_height']
-                    : $options['ee_map_height'];
-
-                $options['ee_map_zoom'] = $details_page
-                    ? $map_cfg->event_details_map_zoom
-                    : $map_cfg->event_list_map_zoom;
-
-                $options['ee_map_zoom'] = isset($gmap['ee_map_zoom']) && ! empty($gmap['ee_map_zoom'])
-                    ? $gmap['ee_map_zoom']
-                    : $options['ee_map_zoom'];
-
-                $options['ee_map_nav_display'] = $details_page
-                    ? $map_cfg->event_details_display_nav
-                    : $map_cfg->event_list_display_nav;
-
-                $options['ee_map_nav_display'] =
-                    isset($gmap['ee_map_nav_display']) && ! empty($gmap['ee_map_nav_display'])
-                        ? 'true'
-                        : $options['ee_map_nav_display'];
-
-                $options['ee_map_nav_size'] = $details_page
-                    ? $map_cfg->event_details_nav_size
-                    : $map_cfg->event_list_nav_size;
-
-                $options['ee_map_nav_size'] = isset($gmap['ee_map_nav_size']) && ! empty($gmap['ee_map_nav_size'])
-                    ? $gmap['ee_map_nav_size']
-                    : $options['ee_map_nav_size'];
-
-                $options['ee_map_type_control'] = $details_page
-                    ? $map_cfg->event_details_control_type
-                    : $map_cfg->event_list_control_type;
-
-                $options['ee_map_type_control'] =
-                    isset($gmap['ee_map_type_control']) && ! empty($gmap['ee_map_type_control'])
-                        ? $gmap['ee_map_type_control']
-                        : $options['ee_map_type_control'];
-
-                $options['ee_map_align'] = $details_page
-                    ? $map_cfg->event_details_map_align
-                    : $map_cfg->event_list_map_align;
-
-                $options['ee_map_align'] = isset($gmap['ee_map_align']) && ! empty($gmap['ee_map_align'])
-                    ? $gmap['ee_map_align']
-                    : $options['ee_map_align'];
-
-                $options['ee_static_url'] = isset($gmap['ee_static_url']) && ! empty($gmap['ee_static_url'])
-                    ? (bool) absint($gmap['ee_static_url'])
-                    : $venue->google_map_link();
-
-                return EEH_Maps::google_map($options);
-            }
-        }
-
-        return '';
-    }
-
-
-    /**
-     * Gets the HTML to display a static map of the venue
-     *
-     * @param EE_Venue $venue
-     * @param array    $attributes like EEH_Maps::google_map_link
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function espresso_google_static_map(EE_Venue $venue, $attributes = [])
-    {
-        $state      = $venue->state_obj();
-        $country    = $venue->country_obj();
-        $attributes = shortcode_atts(
-            [
-                'id'      => $venue->ID(),
-                'address' => $venue->get('VNU_address'),
-                'city'    => $venue->get('VNU_city'),
-                'state'   => $state instanceof EE_State ? $state->name() : '',
-                'zip'     => $venue->get('VNU_zip'),
-                'country' => $country instanceof EE_Country ? $country->name() : '',
-                'type'    => 'map',
-                'map_w'   => 200,
-                'map_h'   => 200,
-            ],
-            $attributes
-        );
-        return EEH_Maps::google_map_link($attributes);
-    }
-
-
-    /**
-     *    edit_venue_link
-     *
-     * @access    public
-     * @param int    $VNU_ID
-     * @param string $link
-     * @param string $before
-     * @param string $after
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function edit_venue_link(
-        $VNU_ID = 0,
-        $link = '',
-        $before = '<p class="edit-venue-lnk small-txt">',
-        $after = '</p>'
-    ) {
-        $venue = EEH_Venue_View::get_venue($VNU_ID);
-        if ($venue instanceof EE_Venue) {
-            // can the user edit this post ?
-            if (current_user_can('edit_post', $venue->ID())) {
-                // set link text
-                $link = ! empty($link) ? $link : esc_html__('edit this venue', 'event_espresso');
-                // generate nonce
-                $nonce = wp_create_nonce('edit_nonce');
-                // generate url to venue editor for this venue
-                $url =
-                    add_query_arg(
-                        [
-                            'page'       => 'espresso_venues',
-                            'action'     => 'edit',
-                            'post'       => $venue->ID(),
-                            'edit_nonce' => $nonce,
-                        ],
-                        admin_url('admin.php')
-                    );
-                // get edit CPT text
-                $post_type_obj = get_post_type_object('espresso_venues');
-                // build final link html
-                $link =
-                    '<a class="post-edit-link" href="' . $url . '" title="' . esc_attr(
-                        $post_type_obj->labels->edit_item
-                    ) . '">' . $link . '</a>';
-                // put it all together
-                return $before . apply_filters('edit_post_link', $link, $venue->ID()) . $after;
-            }
-        }
-        return '';
-    }
+	/**
+	 * @access    private
+	 * @var EE_Venue
+	 */
+	private static $_venue = null;
+
+
+	/**
+	 *    get_venue
+	 *    attempts to retrieve an EE_Venue object any way it can
+	 *
+	 * @access    public
+	 * @param int  $VNU_ID
+	 * @param bool $look_in_event
+	 * @param bool $privacy_check   Defaults to true.
+	 *                              When false, means even if the venue is private we return it regardless of access.
+	 * @param bool $password_check
+	 * @return EE_Venue|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function get_venue($VNU_ID = 0, $look_in_event = true, $privacy_check = true, $password_check = true)
+	{
+		$VNU_ID = absint($VNU_ID);
+		// do we already have the Venue you are looking for?
+		if (EEH_Venue_View::$_venue instanceof EE_Venue && $VNU_ID) {
+			// If the Venue ID matches $VNU_ID, return the venue.
+			if (EEH_Venue_View::$_venue->ID() === $VNU_ID) {
+				return EEH_Venue_View::_get_venue($privacy_check);
+			}
+			// If the Venue ID does not match, try pulling a venue using $VNU_ID.
+			$venue = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
+			if ($venue instanceof EE_Venue) {
+				EEH_Venue_View::$_venue = $venue;
+				return EEH_Venue_View::_get_venue($privacy_check);
+			}
+		}
+		// international newspaper?
+		global $post;
+		if ($post instanceof WP_Post) {
+			switch ($post->post_type) {
+				// if this is being called from an EE_Venue post,
+				// and the EE_Venue post corresponds to the EE_Venue that is being asked for,
+				// then we can try to just grab the attached EE_Venue object
+				case 'espresso_venues':
+					// the post already contains the related EE_Venue object AND one of the following is TRUE:
+					// the requested Venue ID matches the post ID OR...
+					// there was no specific Venue ID requested
+					if (isset($post->EE_Venue) && ($VNU_ID == $post->ID || ! $VNU_ID)) {
+						// use existing related EE_Venue object
+						EEH_Venue_View::$_venue = $post->EE_Venue;
+					} elseif ($VNU_ID) {
+						// there WAS a specific Venue ID requested, but it's NOT the current post object
+						EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
+					} else {
+						// no specific Venue ID requested, so use post ID to generate EE_Venue object
+						EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID($post->ID);
+					}
+					break;
+
+				case 'espresso_events':
+					if ($look_in_event) {
+						// grab the events related venues
+						$venues = EEH_Venue_View::get_event_venues();
+						// make sure the result is an array
+						$venues = is_array($venues) ? $venues : [];
+						// do we have an ID for a specific venue?
+						if ($VNU_ID) {
+							// loop thru the related venues
+							foreach ($venues as $venue) {
+								if ($venue instanceof EE_Venue) {
+									// until we find the venue we're looking for
+									if ($venue->ID() == $VNU_ID) {
+										EEH_Venue_View::$_venue = $venue;
+										break;
+									}
+								}
+							}
+							// no venue ID ?
+							// then the global post is an events post and this function was called with no argument
+						} else {
+							// just grab the first related event venue
+							EEH_Venue_View::$_venue = reset($venues);
+						}
+					}
+					break;
+			}
+		}
+		// now if we STILL do NOT have an EE_Venue model object, BUT we have a Venue ID...
+		if (! EEH_Venue_View::$_venue instanceof EE_Venue && $VNU_ID) {
+			// sigh... pull it from the db
+			EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
+		}
+		return EEH_Venue_View::_get_venue($privacy_check, $password_check);
+	}
+
+
+	/**
+	 * return a single venue
+	 *
+	 * @param bool $privacy_check   Defaults to true.
+	 *                              When false, means even if the venue is private we return it regardless of access.
+	 * @param bool $password_check
+	 * @return  EE_Venue
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected static function _get_venue($privacy_check = true, $password_check = true)
+	{
+		// check for private venues.
+		if (
+			EEH_Venue_View::$_venue instanceof EE_Venue
+			&& EEH_Venue_View::$_venue->status() == 'private'
+			&& $privacy_check
+			&& ! EE_Registry::instance()->CAP->current_user_can('ee_read_private_venues', 'get_venues')
+		) {
+			return null;
+		}
+		// check for password protected venues
+		if (
+			EEH_Venue_View::$_venue instanceof EE_Venue
+			&& $password_check
+			&& post_password_required(EEH_Venue_View::$_venue->ID())
+		) {
+			return null;
+		}
+		return EEH_Venue_View::$_venue instanceof EE_Venue ? EEH_Venue_View::$_venue : null;
+	}
+
+
+	/**
+	 *  get_event_venues
+	 *
+	 * @access     public
+	 * @return     EE_Venue[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function get_event_venues()
+	{
+		global $post;
+		if ($post->post_type == 'espresso_events') {
+			if (isset($post->EE_Event) && $post->EE_Event instanceof EE_Event) {
+				return $post->EE_Event->venues();
+			}
+		}
+		return [];
+	}
+
+
+	/**
+	 * Simply checks whether a venue for the given ID (or the internally derived venue is private).
+	 *
+	 * Note: This will return true if its private, null if the venue doesn't exist, and false, if the venue exists but
+	 * is not private.  So it is important to do explicit boolean checks when using this conditional.
+	 *
+	 * @param bool $VNU_ID venue to check (optional). If not included will use internally derived venue object.
+	 *
+	 * @return bool|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function is_venue_private($VNU_ID = false)
+	{
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if (! $venue instanceof EE_Venue) {
+			return null;
+		}
+
+		return $venue->status() == 'private';
+	}
+
+
+	/**
+	 * returns true or false if a venue is password protected or not
+	 *
+	 * @param bool $VNU_ID venue to check (optional). If not included will use internally derived venue object.
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function is_venue_password_protected($VNU_ID = false)
+	{
+		$venue = EEH_Venue_View::get_venue($VNU_ID, true, true, false);
+		if (
+			$venue instanceof EE_Venue
+			&& post_password_required($venue->ID())
+		) {
+			return true;
+		}
+		return false;
+	}
+
+
+	/**
+	 * If a venue is password protected, this will return the password form for gaining access
+	 * returns an empty string otherwise
+	 *
+	 * @param bool $VNU_ID venue to check (optional). If not included will use internally derived venue object.
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function password_protected_venue_form($VNU_ID = false)
+	{
+		$venue = EEH_Venue_View::get_venue($VNU_ID, true, true, false);
+		if (
+			$venue instanceof EE_Venue
+			&& post_password_required($venue->ID())
+		) {
+			return get_the_password_form($venue->ID());
+		}
+		return '';
+	}
+
+
+	/**
+	 *    venue_description
+	 *
+	 * @access    public
+	 * @param int $VNU_ID
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function venue_description($VNU_ID = 0)
+	{
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			return $venue->get_pretty('VNU_desc');
+		}
+		return '';
+	}
+
+
+	/**
+	 *    venue_excerpt
+	 *
+	 * @access    public
+	 * @param int $VNU_ID
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function venue_excerpt($VNU_ID = 0)
+	{
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			$excerpt    = $venue->excerpt() != null && $venue->excerpt() ? $venue->excerpt() : $venue->description();
+			$venue_link = ' ' . EEH_Venue_View::venue_details_link(
+				$venue->ID(),
+				esc_html__('more', 'event_espresso') . '&hellip;'
+			);
+			return ! empty($excerpt) ? wp_trim_words($excerpt, 25, '') . $venue_link : '';
+		}
+		return '';
+	}
+
+
+	/**
+	 *    venue_categories
+	 *
+	 * @access    public
+	 * @param int  $VNU_ID
+	 * @param bool $hide_uncategorized
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function venue_categories($VNU_ID = 0, $hide_uncategorized = true)
+	{
+		$category_links = [];
+		$venue          = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			// get category terms
+			if ($venue_categories = get_the_terms($venue->ID(), 'espresso_venue_categories')) {
+				// loop thru terms and create links
+				foreach ($venue_categories as $term) {
+					$url = get_term_link($term, 'espresso_venue_categories');
+					if (
+						! is_wp_error($url)
+						&& (($hide_uncategorized
+							 && strtolower($term->name) != esc_html__(
+								 'uncategorized',
+								 'event_espresso'
+							 ))
+							|| ! $hide_uncategorized)
+					) {
+						$category_links[] = '<a href="' . esc_url($url) . '" rel="tag">' . $term->name . '</a> ';
+					}
+				}
+			}
+		}
+		return implode(', ', $category_links);
+	}
+
+
+	/**
+	 *    venue_address
+	 *
+	 * @access    public
+	 * @param string $type
+	 * @param int    $VNU_ID
+	 * @param bool   $use_schema
+	 * @param bool   $add_wrapper
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function venue_address($type = 'multiline', $VNU_ID = 0, $use_schema = true, $add_wrapper = true)
+	{
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			return EEH_Address::format($venue, $type, $use_schema, $add_wrapper);
+		}
+		return '';
+	}
+
+
+	/**
+	 *    venue_has_address
+	 *
+	 * @access    public
+	 * @param int $VNU_ID
+	 * @return bool|string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function venue_has_address($VNU_ID = 0)
+	{
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			return EEH_Address::format($venue, 'inline', false, false);
+		}
+		return false;
+	}
+
+
+	/**
+	 *    venue_name
+	 *
+	 * @access    public
+	 * @param string $link_to - options( details, website, none ) whether to turn Venue name into a clickable link to
+	 *                        the Venue's details page or website
+	 * @param int    $VNU_ID
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function venue_name($link_to = 'details', $VNU_ID = 0)
+	{
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			$venue_name = apply_filters(
+				'FHEE__EEH_Venue__venue_name__append_private_venue_name',
+				EEH_Venue_View::is_venue_private()
+					? EEH_Venue_View::$_venue->name() . "&nbsp;" . esc_html__('(Private)', 'event_espresso')
+					: EEH_Venue_View::$_venue->name(),
+				EEH_Venue_View::$_venue
+			);
+			$venue_name = EEH_Schema::name($venue_name);
+
+			// if venue is trashed then ignore the "link to" setting because the venue is trashed.
+			if ($venue->get('status') == 'trash') {
+				$link_to = '';
+			}
+			switch ($link_to) {
+				case 'details':
+					return EEH_Venue_View::venue_details_link($venue->ID(), $venue_name);
+
+				case 'website':
+					return EEH_Venue_View::venue_website_link($venue->ID(), $venue_name);
+
+				default:
+					return $venue_name;
+			}
+		}
+		return '';
+	}
+
+
+	/**
+	 *    venue_details_link
+	 *
+	 * @access    public
+	 * @param int    $VNU_ID
+	 * @param string $text
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function venue_details_link($VNU_ID = 0, $text = '')
+	{
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			return EEH_Schema::url(get_permalink($venue->ID()), $text);
+		}
+		return '';
+	}
+
+
+	/**
+	 *    venue_website_link
+	 *
+	 * @access    public
+	 * @param int    $VNU_ID
+	 * @param string $text
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function venue_website_link($VNU_ID = 0, $text = '')
+	{
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			$url  = $venue->venue_url();
+			$text = ! empty($text) ? $text : $url;
+			return ! empty($url) ? EEH_Schema::url($url, $text, ['target' => '_blank']) : '';
+		}
+		return '';
+	}
+
+
+	/**
+	 *    venue_phone
+	 *
+	 * @access    public
+	 * @param int $VNU_ID
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function venue_phone($VNU_ID = 0)
+	{
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			return EEH_Schema::telephone($venue->phone());
+		}
+		return '';
+	}
+
+
+	/**
+	 *    venue_gmap
+	 *
+	 * @access    public
+	 * @param int         $VNU_ID
+	 * @param bool|string $map_ID a unique identifier for this map
+	 * @param array       $gmap   map options
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function venue_gmap($VNU_ID = 0, $map_ID = false, $gmap = [])
+	{
+
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			// check for global espresso_events post and use it's ID if no map_ID is set
+			global $post;
+			$map_ID = empty($map_ID) && $post->post_type == 'espresso_events' ? $post->ID : $map_ID;
+			// grab map settings
+			$map_cfg = EE_Registry::instance()->CFG->map_settings;
+			// are maps enabled ?
+			if ($map_cfg->use_google_maps && $venue->enable_for_gmap()) {
+				$details_page = is_single();
+				$options      = [];
+
+				$options['map_ID'] = $map_ID && $map_ID != $venue->ID()
+					? $map_ID . '-' . $venue->ID()
+					: $venue->ID();
+
+				$options['location'] = EEH_Address::format($venue, 'inline', false, false);
+
+				$options['ee_map_width'] = $details_page
+					? $map_cfg->event_details_map_width
+					: $map_cfg->event_list_map_width;
+
+				$options['ee_map_width'] = isset($gmap['ee_map_width']) && ! empty($gmap['ee_map_width'])
+					? $gmap['ee_map_width']
+					: $options['ee_map_width'];
+
+				$options['ee_map_height'] = $details_page
+					? $map_cfg->event_details_map_height
+					: $map_cfg->event_list_map_height;
+
+				$options['ee_map_height'] = isset($gmap['ee_map_height']) && ! empty($gmap['ee_map_height'])
+					? $gmap['ee_map_height']
+					: $options['ee_map_height'];
+
+				$options['ee_map_zoom'] = $details_page
+					? $map_cfg->event_details_map_zoom
+					: $map_cfg->event_list_map_zoom;
+
+				$options['ee_map_zoom'] = isset($gmap['ee_map_zoom']) && ! empty($gmap['ee_map_zoom'])
+					? $gmap['ee_map_zoom']
+					: $options['ee_map_zoom'];
+
+				$options['ee_map_nav_display'] = $details_page
+					? $map_cfg->event_details_display_nav
+					: $map_cfg->event_list_display_nav;
+
+				$options['ee_map_nav_display'] =
+					isset($gmap['ee_map_nav_display']) && ! empty($gmap['ee_map_nav_display'])
+						? 'true'
+						: $options['ee_map_nav_display'];
+
+				$options['ee_map_nav_size'] = $details_page
+					? $map_cfg->event_details_nav_size
+					: $map_cfg->event_list_nav_size;
+
+				$options['ee_map_nav_size'] = isset($gmap['ee_map_nav_size']) && ! empty($gmap['ee_map_nav_size'])
+					? $gmap['ee_map_nav_size']
+					: $options['ee_map_nav_size'];
+
+				$options['ee_map_type_control'] = $details_page
+					? $map_cfg->event_details_control_type
+					: $map_cfg->event_list_control_type;
+
+				$options['ee_map_type_control'] =
+					isset($gmap['ee_map_type_control']) && ! empty($gmap['ee_map_type_control'])
+						? $gmap['ee_map_type_control']
+						: $options['ee_map_type_control'];
+
+				$options['ee_map_align'] = $details_page
+					? $map_cfg->event_details_map_align
+					: $map_cfg->event_list_map_align;
+
+				$options['ee_map_align'] = isset($gmap['ee_map_align']) && ! empty($gmap['ee_map_align'])
+					? $gmap['ee_map_align']
+					: $options['ee_map_align'];
+
+				$options['ee_static_url'] = isset($gmap['ee_static_url']) && ! empty($gmap['ee_static_url'])
+					? (bool) absint($gmap['ee_static_url'])
+					: $venue->google_map_link();
+
+				return EEH_Maps::google_map($options);
+			}
+		}
+
+		return '';
+	}
+
+
+	/**
+	 * Gets the HTML to display a static map of the venue
+	 *
+	 * @param EE_Venue $venue
+	 * @param array    $attributes like EEH_Maps::google_map_link
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function espresso_google_static_map(EE_Venue $venue, $attributes = [])
+	{
+		$state      = $venue->state_obj();
+		$country    = $venue->country_obj();
+		$attributes = shortcode_atts(
+			[
+				'id'      => $venue->ID(),
+				'address' => $venue->get('VNU_address'),
+				'city'    => $venue->get('VNU_city'),
+				'state'   => $state instanceof EE_State ? $state->name() : '',
+				'zip'     => $venue->get('VNU_zip'),
+				'country' => $country instanceof EE_Country ? $country->name() : '',
+				'type'    => 'map',
+				'map_w'   => 200,
+				'map_h'   => 200,
+			],
+			$attributes
+		);
+		return EEH_Maps::google_map_link($attributes);
+	}
+
+
+	/**
+	 *    edit_venue_link
+	 *
+	 * @access    public
+	 * @param int    $VNU_ID
+	 * @param string $link
+	 * @param string $before
+	 * @param string $after
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function edit_venue_link(
+		$VNU_ID = 0,
+		$link = '',
+		$before = '<p class="edit-venue-lnk small-txt">',
+		$after = '</p>'
+	) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			// can the user edit this post ?
+			if (current_user_can('edit_post', $venue->ID())) {
+				// set link text
+				$link = ! empty($link) ? $link : esc_html__('edit this venue', 'event_espresso');
+				// generate nonce
+				$nonce = wp_create_nonce('edit_nonce');
+				// generate url to venue editor for this venue
+				$url =
+					add_query_arg(
+						[
+							'page'       => 'espresso_venues',
+							'action'     => 'edit',
+							'post'       => $venue->ID(),
+							'edit_nonce' => $nonce,
+						],
+						admin_url('admin.php')
+					);
+				// get edit CPT text
+				$post_type_obj = get_post_type_object('espresso_venues');
+				// build final link html
+				$link =
+					'<a class="post-edit-link" href="' . $url . '" title="' . esc_attr(
+						$post_type_obj->labels->edit_item
+					) . '">' . $link . '</a>';
+				// put it all together
+				return $before . apply_filters('edit_post_link', $link, $venue->ID()) . $after;
+			}
+		}
+		return '';
+	}
 }