eventespresso / event-espresso-core

core/middleware/EE_Middleware.core.php

Indentation +23 added lines, -23 removed lines

@@ -20,27 +20,27 @@
 abstract class EE_Middleware implements EEI_Request_Decorator
 {
 
-    /**
-     * @deprecated
-     * @param    EE_Request  $request
-     * @param    EE_Response $response
-     * @return    EE_Response
-     */
-    protected function process_request_stack(EE_Request $request, EE_Response $response)
-    {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            sprintf(
-                esc_html__(
-                    'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
-                    'event_espresso'
-                ),
-                'EventEspresso\core\services\request\middleware\Middleware',
-                '\core\services\request',
-                'EventEspresso\core\services\request'
-            ),
-            '4.9.52'
-        );
-        return $response;
-    }
+	/**
+	 * @deprecated
+	 * @param    EE_Request  $request
+	 * @param    EE_Response $response
+	 * @return    EE_Response
+	 */
+	protected function process_request_stack(EE_Request $request, EE_Response $response)
+	{
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			sprintf(
+				esc_html__(
+					'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
+					'event_espresso'
+				),
+				'EventEspresso\core\services\request\middleware\Middleware',
+				'\core\services\request',
+				'EventEspresso\core\services\request'
+			),
+			'4.9.52'
+		);
+		return $response;
+	}
 }

core/middleware/EE_Alpha_Banner_Warning.core.php

Indentation +77 added lines, -77 removed lines

@@ -14,87 +14,87 @@
 {
 
 
-    /**
-     * @deprecated 4.9.53
-     * @param    EE_Request  $request
-     * @param    EE_Response $response
-     * @return    EE_Response
-     */
-    public function handle_request(EE_Request $request, EE_Response $response)
-    {
-        $this->_request = $request;
-        $this->_response = $response;
-        $this->display_alpha_banner_warning();
-        $this->_response = $this->process_request_stack($this->_request, $this->_response);
-        return $this->_response;
-    }
+	/**
+	 * @deprecated 4.9.53
+	 * @param    EE_Request  $request
+	 * @param    EE_Response $response
+	 * @return    EE_Response
+	 */
+	public function handle_request(EE_Request $request, EE_Response $response)
+	{
+		$this->_request = $request;
+		$this->_response = $response;
+		$this->display_alpha_banner_warning();
+		$this->_response = $this->process_request_stack($this->_request, $this->_response);
+		return $this->_response;
+	}
 
 
-    /**
-     * @deprecated
-     * @return    string
-     */
-    public function display_alpha_banner_warning()
-    {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            sprintf(
-                esc_html__(
-                    'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
-                    'event_espresso'
-                ),
-                'EventEspresso\core\services\request\middleware\PreProductionVersionWarning::displayPreProductionVersionWarning()',
-                '\core\services\request',
-                'EventEspresso\core\services\request'
-            ),
-            '4.9.52',
-            '4.10.0'
-        );
-    }
+	/**
+	 * @deprecated
+	 * @return    string
+	 */
+	public function display_alpha_banner_warning()
+	{
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			sprintf(
+				esc_html__(
+					'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
+					'event_espresso'
+				),
+				'EventEspresso\core\services\request\middleware\PreProductionVersionWarning::displayPreProductionVersionWarning()',
+				'\core\services\request',
+				'EventEspresso\core\services\request'
+			),
+			'4.9.52',
+			'4.10.0'
+		);
+	}
 
 
-    /**
-     * @deprecated
-     * @return void
-     */
-    public function alpha_banner_admin_notice()
-    {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            sprintf(
-                esc_html__(
-                    'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
-                    'event_espresso'
-                ),
-                'EventEspresso\core\services\request\middleware\PreProductionVersionWarning::preProductionVersionAdminNotice()',
-                '\core\services\request',
-                'EventEspresso\core\services\request'
-            ),
-            '4.9.52',
-            '4.10.0'
-        );
-    }
+	/**
+	 * @deprecated
+	 * @return void
+	 */
+	public function alpha_banner_admin_notice()
+	{
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			sprintf(
+				esc_html__(
+					'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
+					'event_espresso'
+				),
+				'EventEspresso\core\services\request\middleware\PreProductionVersionWarning::preProductionVersionAdminNotice()',
+				'\core\services\request',
+				'EventEspresso\core\services\request'
+			),
+			'4.9.52',
+			'4.10.0'
+		);
+	}
 
 
-    /**
-     * @deprecated
-     * @return void
-     */
-    public function alpha_banner_warning_notice()
-    {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            sprintf(
-                esc_html__(
-                    'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
-                    'event_espresso'
-                ),
-                'EventEspresso\core\services\request\middleware\PreProductionVersionWarning::preProductionVersionWarningNotice()',
-                '\core\services\request',
-                'EventEspresso\core\services\request'
-            ),
-            '4.9.52',
-            '4.10.0'
-        );
-    }
+	/**
+	 * @deprecated
+	 * @return void
+	 */
+	public function alpha_banner_warning_notice()
+	{
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			sprintf(
+				esc_html__(
+					'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
+					'event_espresso'
+				),
+				'EventEspresso\core\services\request\middleware\PreProductionVersionWarning::preProductionVersionWarningNotice()',
+				'\core\services\request',
+				'EventEspresso\core\services\request'
+			),
+			'4.9.52',
+			'4.10.0'
+		);
+	}
 }

core/EE_Encryption.core.php

Spacing +11 added lines, -11 removed lines

@@ -103,7 +103,7 @@ 
      */
     protected function __construct()
     {
-        if (! defined('ESPRESSO_ENCRYPT')) {
+        if ( ! defined('ESPRESSO_ENCRYPT')) {
             define('ESPRESSO_ENCRYPT', true);
         }
         if (extension_loaded('openssl')) {
@@ -125,7 +125,7 @@ 
     public static function instance()
     {
         // check if class object is instantiated
-        if (! EE_Encryption::$_instance instanceof EE_Encryption) {
+        if ( ! EE_Encryption::$_instance instanceof EE_Encryption) {
             EE_Encryption::$_instance = new self();
         }
         return EE_Encryption::$_instance;
@@ -332,7 +332,7 @@ 
             $iv
         );
         // append the initialization vector
-        $encrypted_text .= EE_Encryption::OPENSSL_IV_DELIMITER . $iv;
+        $encrypted_text .= EE_Encryption::OPENSSL_IV_DELIMITER.$iv;
         // trim and maybe encode
         return $this->_use_base64_encode
             ? trim(base64_encode($encrypted_text))
@@ -525,8 +525,8 @@ 
         );
         $string_bits = str_split($text_string);
         foreach ($string_bits as $k => $v) {
-            $temp = ord($v) + ord($key_bits[ $k ]);
-            $string_bits[ $k ] = chr($temp > 255 ? ($temp - 256) : $temp);
+            $temp = ord($v) + ord($key_bits[$k]);
+            $string_bits[$k] = chr($temp > 255 ? ($temp - 256) : $temp);
         }
         $encrypted_text = implode('', $string_bits);
         $encrypted_text .= EE_Encryption::ACME_ENCRYPTION_FLAG;
@@ -570,8 +570,8 @@ 
         );
         $string_bits = str_split($encrypted_text);
         foreach ($string_bits as $k => $v) {
-            $temp = ord($v) - ord($key_bits[ $k ]);
-            $string_bits[ $k ] = chr($temp < 0 ? ($temp + 256) : $temp);
+            $temp = ord($v) - ord($key_bits[$k]);
+            $string_bits[$k] = chr($temp < 0 ? ($temp + 256) : $temp);
         }
         return implode('', $string_bits);
     }
@@ -585,16 +585,16 @@ 
     protected function valid_base_64($string)
     {
         // ensure data is a string
-        if (! is_string($string) || ! $this->_use_base64_encode) {
+        if ( ! is_string($string) || ! $this->_use_base64_encode) {
             return false;
         }
         $decoded = base64_decode($string, true);
         // Check if there is no invalid character in string
-        if (! preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $string)) {
+        if ( ! preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $string)) {
             return false;
         }
         // Decode the string in strict mode and send the response
-        if (! base64_decode($string, true)) {
+        if ( ! base64_decode($string, true)) {
             return false;
         }
         // Encode and compare it to original one
@@ -614,7 +614,7 @@ 
         $iterations = ceil($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 = substr($random_string, 0, $length);
         return $random_string;

Indentation +577 added lines, -577 removed lines

@@ -25,581 +25,581 @@
 class EE_Encryption implements InterminableInterface
 {
 
-    /**
-     * key used for saving the encryption key to the wp_options table
-     */
-    const ENCRYPTION_OPTION_KEY = 'ee_encryption_key';
-
-    /**
-     * the OPENSSL cipher method used
-     */
-    const OPENSSL_CIPHER_METHOD = 'AES-128-CBC';
-
-    /**
-     * WP "options_name" used to store a verified available cipher method
-     */
-    const OPENSSL_CIPHER_METHOD_OPTION_NAME = 'ee_openssl_cipher_method';
-
-    /**
-     * the OPENSSL digest method used
-     */
-    const OPENSSL_DIGEST_METHOD = 'sha512';
-
-    /**
-     * separates the encrypted text from the initialization vector
-     */
-    const OPENSSL_IV_DELIMITER = ':iv:';
-
-    /**
-     * appended to text encrypted using the acme encryption
-     */
-    const ACME_ENCRYPTION_FLAG = '::ae';
-
-
-    /**
-     * instance of the EE_Encryption object
-     */
-    protected static $_instance;
-
-    /**
-     * @var string $_encryption_key
-     */
-    protected $_encryption_key;
-
-    /**
-     * @var string $cipher_method
-     */
-    private $cipher_method = '';
-
-    /**
-     * @var array $cipher_methods
-     */
-    private $cipher_methods = array();
-
-    /**
-     * @var array $digest_methods
-     */
-    private $digest_methods = array();
-
-    /**
-     * @var boolean $_use_openssl_encrypt
-     */
-    protected $_use_openssl_encrypt = false;
-
-    /**
-     * @var boolean $_use_base64_encode
-     */
-    protected $_use_base64_encode = false;
-
-
-    /**
-     * protected constructor to prevent direct creation
-     */
-    protected function __construct()
-    {
-        if (! defined('ESPRESSO_ENCRYPT')) {
-            define('ESPRESSO_ENCRYPT', true);
-        }
-        if (extension_loaded('openssl')) {
-            $this->_use_openssl_encrypt = true;
-        }
-        if (function_exists('base64_encode')) {
-            $this->_use_base64_encode = true;
-        }
-    }
-
-
-    /**
-     * singleton method used to instantiate class object
-     *
-     * @return EE_Encryption
-     */
-    public static function instance()
-    {
-        // check if class object is instantiated
-        if (! EE_Encryption::$_instance instanceof EE_Encryption) {
-            EE_Encryption::$_instance = new self();
-        }
-        return EE_Encryption::$_instance;
-    }
-
-
-    /**
-     * get encryption key
-     *
-     * @return string
-     */
-    public function get_encryption_key()
-    {
-        // if encryption key has not been set
-        if (empty($this->_encryption_key)) {
-            // retrieve encryption_key from db
-            $this->_encryption_key = get_option(EE_Encryption::ENCRYPTION_OPTION_KEY, '');
-            // WHAT?? No encryption_key in the db ??
-            if ($this->_encryption_key === '') {
-                // let's make one. And md5 it to make it just the right size for a key
-                $new_key = md5($this->generate_random_string());
-                // now save it to the db for later
-                add_option(EE_Encryption::ENCRYPTION_OPTION_KEY, $new_key);
-                // here's the key - FINALLY !
-                $this->_encryption_key = $new_key;
-            }
-        }
-        return $this->_encryption_key;
-    }
-
-
-    /**
-     * encrypts data
-     *
-     * @param string $text_string - the text to be encrypted
-     * @return string
-     * @throws RuntimeException
-     */
-    public function encrypt($text_string = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($text_string)) {
-            return $text_string;
-        }
-        if ($this->_use_openssl_encrypt) {
-            $encrypted_text = $this->openssl_encrypt($text_string);
-        } else {
-            $encrypted_text = $this->acme_encrypt($text_string);
-        }
-        return $encrypted_text;
-    }
-
-
-    /**
-     * decrypts data
-     *
-     * @param string $encrypted_text - the text to be decrypted
-     * @return string
-     * @throws RuntimeException
-     */
-    public function decrypt($encrypted_text = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($encrypted_text)) {
-            return $encrypted_text;
-        }
-        // if PHP's mcrypt functions are installed then we'll use them
-        if ($this->_use_openssl_encrypt) {
-            $decrypted_text = $this->openssl_decrypt($encrypted_text);
-        } else {
-            $decrypted_text = $this->acme_decrypt($encrypted_text);
-        }
-        return $decrypted_text;
-    }
-
-
-    /**
-     * encodes string with PHP's base64 encoding
-     *
-     * @see http://php.net/manual/en/function.base64-encode.php
-     * @param string $text_string the text to be encoded
-     * @return string
-     */
-    public function base64_string_encode($text_string = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($text_string) || ! $this->_use_base64_encode) {
-            return $text_string;
-        }
-        // encode
-        return base64_encode($text_string);
-    }
-
-
-    /**
-     * decodes string that has been encoded with PHP's base64 encoding
-     *
-     * @see http://php.net/manual/en/function.base64-encode.php
-     * @param string $encoded_string the text to be decoded
-     * @return string
-     * @throws RuntimeException
-     */
-    public function base64_string_decode($encoded_string = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($encoded_string) || ! $this->valid_base_64($encoded_string)) {
-            return $encoded_string;
-        }
-        // decode
-        $decoded_string = base64_decode($encoded_string);
-        if ($decoded_string === false) {
-            throw new RuntimeException(
-                esc_html__('Base 64 decoding failed.', 'event_espresso')
-            );
-        }
-        return $decoded_string;
-    }
-
-
-    /**
-     * encodes  url string with PHP's base64 encoding
-     *
-     * @see http://php.net/manual/en/function.base64-encode.php
-     * @param string $text_string the text to be encoded
-     * @return string
-     */
-    public function base64_url_encode($text_string = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($text_string) || ! $this->_use_base64_encode) {
-            return $text_string;
-        }
-        // encode
-        $encoded_string = base64_encode($text_string);
-        // remove chars to make encoding more URL friendly
-        return strtr($encoded_string, '+/=', '-_,');
-    }
-
-
-    /**
-     * decodes  url string that has been encoded with PHP's base64 encoding
-     *
-     * @see http://php.net/manual/en/function.base64-encode.php
-     * @param string $encoded_string the text to be decoded
-     * @return string
-     * @throws RuntimeException
-     */
-    public function base64_url_decode($encoded_string = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($encoded_string) || ! $this->valid_base_64($encoded_string)) {
-            return $encoded_string;
-        }
-        // replace previously removed characters
-        $encoded_string = strtr($encoded_string, '-_,', '+/=');
-        // decode
-        $decoded_string = base64_decode($encoded_string);
-        if ($decoded_string === false) {
-            throw new RuntimeException(
-                esc_html__('Base 64 decoding failed.', 'event_espresso')
-            );
-        }
-        return $decoded_string;
-    }
-
-
-    /**
-     * encrypts data using PHP's openssl functions
-     *
-     * @param string $text_string the text to be encrypted
-     * @param string $cipher_method
-     * @param string $encryption_key
-     * @return string
-     * @throws RuntimeException
-     */
-    protected function openssl_encrypt(
-        $text_string = '',
-        $cipher_method = EE_Encryption::OPENSSL_CIPHER_METHOD,
-        $encryption_key = ''
-    ) {
-        // you give me nothing??? GET OUT !
-        if (empty($text_string)) {
-            return $text_string;
-        }
-        $this->cipher_method = $this->getCipherMethod($cipher_method);
-        // get initialization vector size
-        $iv_size = openssl_cipher_iv_length($this->cipher_method);
-        // generate initialization vector.
-        // The second parameter ("crypto_strong") is passed by reference,
-        // and is used to determines if the algorithm used was "cryptographically strong"
-        // openssl_random_pseudo_bytes() will toggle it to either true or false
-        $iv = openssl_random_pseudo_bytes($iv_size, $is_strong);
-        if ($iv === false || $is_strong === false) {
-            throw new RuntimeException(
-                esc_html__('Failed to generate OpenSSL initialization vector.', 'event_espresso')
-            );
-        }
-        // encrypt it
-        $encrypted_text = openssl_encrypt(
-            $text_string,
-            $this->cipher_method,
-            $this->getDigestHashValue(EE_Encryption::OPENSSL_DIGEST_METHOD, $encryption_key),
-            0,
-            $iv
-        );
-        // append the initialization vector
-        $encrypted_text .= EE_Encryption::OPENSSL_IV_DELIMITER . $iv;
-        // trim and maybe encode
-        return $this->_use_base64_encode
-            ? trim(base64_encode($encrypted_text))
-            : trim($encrypted_text);
-    }
-
-
-    /**
-     * Returns a cipher method that has been verified to work.
-     * First checks if the cached cipher has been set already and if so, returns that.
-     * Then tests the incoming default and returns that if it's good.
-     * If not, then it retrieves the previously tested and saved cipher method.
-     * But if that doesn't exist, then calls getAvailableCipherMethod()
-     * to see what is available on the server, and returns the results.
-     *
-     * @param string $cipher_method
-     * @return string
-     * @throws RuntimeException
-     */
-    protected function getCipherMethod($cipher_method = EE_Encryption::OPENSSL_CIPHER_METHOD)
-    {
-        if ($this->cipher_method !== '') {
-            return $this->cipher_method;
-        }
-        // verify that the default cipher method can produce an initialization vector
-        if (openssl_cipher_iv_length($cipher_method) === false) {
-            // nope? okay let's get what we found in the past to work
-            $cipher_method = get_option(EE_Encryption::OPENSSL_CIPHER_METHOD_OPTION_NAME, '');
-            // oops... haven't tested available cipher methods yet
-            if ($cipher_method === '' || openssl_cipher_iv_length($cipher_method) === false) {
-                $cipher_method = $this->getAvailableCipherMethod($cipher_method);
-            }
-        }
-        return $cipher_method;
-    }
-
-
-    /**
-     * @param string $cipher_method
-     * @return string
-     * @throws \RuntimeException
-     */
-    protected function getAvailableCipherMethod($cipher_method)
-    {
-        // verify that the incoming cipher method can produce an initialization vector
-        if (openssl_cipher_iv_length($cipher_method) === false) {
-            // nope? then check the next cipher in the list of available cipher methods
-            $cipher_method = next($this->cipher_methods);
-            // what? there's no list? then generate that list and cache it,
-            if (empty($this->cipher_methods)) {
-                $this->cipher_methods = openssl_get_cipher_methods();
-                // then grab the first item from the list
-                $cipher_method = reset($this->cipher_methods);
-            }
-            if ($cipher_method === false) {
-                throw new RuntimeException(
-                    esc_html__(
-                        'OpenSSL support appears to be enabled on the server, but no cipher methods are available. Please contact the server administrator.',
-                        'event_espresso'
-                    )
-                );
-            }
-            // verify that the next cipher method works
-            return $this->getAvailableCipherMethod($cipher_method);
-        }
-        // if we've gotten this far, then we found an available cipher method that works
-        // so save that for next time
-        update_option(
-            EE_Encryption::OPENSSL_CIPHER_METHOD_OPTION_NAME,
-            $cipher_method
-        );
-        return $cipher_method;
-    }
-
-
-    /**
-     * decrypts data that has been encrypted with PHP's openssl functions
-     *
-     * @param string $encrypted_text the text to be decrypted
-     * @param string $cipher_method
-     * @param string $encryption_key
-     * @return string
-     * @throws RuntimeException
-     */
-    protected function openssl_decrypt(
-        $encrypted_text = '',
-        $cipher_method = EE_Encryption::OPENSSL_CIPHER_METHOD,
-        $encryption_key = ''
-    ) {
-        // you give me nothing??? GET OUT !
-        if (empty($encrypted_text)) {
-            return $encrypted_text;
-        }
-        // decode
-        $encrypted_text = $this->valid_base_64($encrypted_text)
-            ? $this->base64_url_decode($encrypted_text)
-            : $encrypted_text;
-        $encrypted_components = explode(
-            EE_Encryption::OPENSSL_IV_DELIMITER,
-            $encrypted_text,
-            2
-        );
-        // decrypt it
-        $decrypted_text = openssl_decrypt(
-            $encrypted_components[0],
-            $this->getCipherMethod($cipher_method),
-            $this->getDigestHashValue(EE_Encryption::OPENSSL_DIGEST_METHOD, $encryption_key),
-            0,
-            $encrypted_components[1]
-        );
-        $decrypted_text = trim($decrypted_text);
-        return $decrypted_text;
-    }
-
-
-    /**
-     * Computes the digest hash value using the specified digest method.
-     * If that digest method fails to produce a valid hash value,
-     * then we'll grab the next digest method and recursively try again until something works.
-     *
-     * @param string $digest_method
-     * @param string $encryption_key
-     * @return string
-     * @throws RuntimeException
-     */
-    protected function getDigestHashValue($digest_method = EE_Encryption::OPENSSL_DIGEST_METHOD, $encryption_key = '')
-    {
-        $encryption_key = $encryption_key !== ''
-            ? $encryption_key
-            : $this->get_encryption_key();
-        $digest_hash_value = openssl_digest($encryption_key, $digest_method);
-        if ($digest_hash_value === false) {
-            return $this->getDigestHashValue($this->getDigestMethod());
-        }
-        return $digest_hash_value;
-    }
-
-
-    /**
-     * Returns the NEXT element in the $digest_methods array.
-     * If the $digest_methods array is empty, then we populate it
-     * with the available values returned from openssl_get_md_methods().
-     *
-     * @return string
-     * @throws \RuntimeException
-     */
-    protected function getDigestMethod()
-    {
-        $digest_method = prev($this->digest_methods);
-        if (empty($this->digest_methods)) {
-            $this->digest_methods = openssl_get_md_methods();
-            $digest_method = end($this->digest_methods);
-        }
-        if ($digest_method === false) {
-            throw new RuntimeException(
-                esc_html__(
-                    'OpenSSL support appears to be enabled on the server, but no digest methods are available. Please contact the server administrator.',
-                    'event_espresso'
-                )
-            );
-        }
-        return $digest_method;
-    }
-
-
-    /**
-     * encrypts data for acme servers that didn't bother to install PHP mcrypt
-     *
-     * @see http://stackoverflow.com/questions/800922/how-to-encrypt-string-without-mcrypt-library-in-php
-     * @param string $text_string the text to be decrypted
-     * @return string
-     */
-    protected function acme_encrypt($text_string = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($text_string)) {
-            return $text_string;
-        }
-        $key_bits = str_split(
-            str_pad(
-                '',
-                strlen($text_string),
-                $this->get_encryption_key(),
-                STR_PAD_RIGHT
-            )
-        );
-        $string_bits = str_split($text_string);
-        foreach ($string_bits as $k => $v) {
-            $temp = ord($v) + ord($key_bits[ $k ]);
-            $string_bits[ $k ] = chr($temp > 255 ? ($temp - 256) : $temp);
-        }
-        $encrypted_text = implode('', $string_bits);
-        $encrypted_text .= EE_Encryption::ACME_ENCRYPTION_FLAG;
-        return $this->_use_base64_encode
-            ? base64_encode($encrypted_text)
-            : $encrypted_text;
-    }
-
-
-    /**
-     * decrypts data for acme servers that didn't bother to install PHP mcrypt
-     *
-     * @see http://stackoverflow.com/questions/800922/how-to-encrypt-string-without-mcrypt-library-in-php
-     * @param string $encrypted_text the text to be decrypted
-     * @return string
-     * @throws RuntimeException
-     */
-    protected function acme_decrypt($encrypted_text = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($encrypted_text)) {
-            return $encrypted_text;
-        }
-        // decode the data ?
-        $encrypted_text = $this->valid_base_64($encrypted_text)
-            ? $this->base64_url_decode($encrypted_text)
-            : $encrypted_text;
-        $encrypted_text = substr($encrypted_text, 0, -4);
-        $key_bits = str_split(
-            str_pad(
-                '',
-                strlen($encrypted_text),
-                $this->get_encryption_key(),
-                STR_PAD_RIGHT
-            )
-        );
-        $string_bits = str_split($encrypted_text);
-        foreach ($string_bits as $k => $v) {
-            $temp = ord($v) - ord($key_bits[ $k ]);
-            $string_bits[ $k ] = chr($temp < 0 ? ($temp + 256) : $temp);
-        }
-        return implode('', $string_bits);
-    }
-
-
-    /**
-     * @see http://stackoverflow.com/questions/2556345/detect-base64-encoding-in-php#30231906
-     * @param $string
-     * @return bool
-     */
-    protected function valid_base_64($string)
-    {
-        // ensure data is a string
-        if (! is_string($string) || ! $this->_use_base64_encode) {
-            return false;
-        }
-        $decoded = base64_decode($string, true);
-        // Check if there is no invalid character in string
-        if (! preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $string)) {
-            return false;
-        }
-        // Decode the string in strict mode and send the response
-        if (! base64_decode($string, true)) {
-            return false;
-        }
-        // Encode and compare it to original one
-        return base64_encode($decoded) === $string;
-    }
-
-
-    /**
-     * generate random string
-     *
-     * @see http://stackoverflow.com/questions/637278/what-is-the-best-way-to-generate-a-random-key-within-php
-     * @param int $length number of characters for random string
-     * @return string
-     */
-    public function generate_random_string($length = 40)
-    {
-        $iterations = ceil($length / 40);
-        $random_string = '';
-        for ($i = 0; $i < $iterations; $i++) {
-            $random_string .= sha1(microtime(true) . mt_rand(10000, 90000));
-        }
-        $random_string = substr($random_string, 0, $length);
-        return $random_string;
-    }
+	/**
+	 * key used for saving the encryption key to the wp_options table
+	 */
+	const ENCRYPTION_OPTION_KEY = 'ee_encryption_key';
+
+	/**
+	 * the OPENSSL cipher method used
+	 */
+	const OPENSSL_CIPHER_METHOD = 'AES-128-CBC';
+
+	/**
+	 * WP "options_name" used to store a verified available cipher method
+	 */
+	const OPENSSL_CIPHER_METHOD_OPTION_NAME = 'ee_openssl_cipher_method';
+
+	/**
+	 * the OPENSSL digest method used
+	 */
+	const OPENSSL_DIGEST_METHOD = 'sha512';
+
+	/**
+	 * separates the encrypted text from the initialization vector
+	 */
+	const OPENSSL_IV_DELIMITER = ':iv:';
+
+	/**
+	 * appended to text encrypted using the acme encryption
+	 */
+	const ACME_ENCRYPTION_FLAG = '::ae';
+
+
+	/**
+	 * instance of the EE_Encryption object
+	 */
+	protected static $_instance;
+
+	/**
+	 * @var string $_encryption_key
+	 */
+	protected $_encryption_key;
+
+	/**
+	 * @var string $cipher_method
+	 */
+	private $cipher_method = '';
+
+	/**
+	 * @var array $cipher_methods
+	 */
+	private $cipher_methods = array();
+
+	/**
+	 * @var array $digest_methods
+	 */
+	private $digest_methods = array();
+
+	/**
+	 * @var boolean $_use_openssl_encrypt
+	 */
+	protected $_use_openssl_encrypt = false;
+
+	/**
+	 * @var boolean $_use_base64_encode
+	 */
+	protected $_use_base64_encode = false;
+
+
+	/**
+	 * protected constructor to prevent direct creation
+	 */
+	protected function __construct()
+	{
+		if (! defined('ESPRESSO_ENCRYPT')) {
+			define('ESPRESSO_ENCRYPT', true);
+		}
+		if (extension_loaded('openssl')) {
+			$this->_use_openssl_encrypt = true;
+		}
+		if (function_exists('base64_encode')) {
+			$this->_use_base64_encode = true;
+		}
+	}
+
+
+	/**
+	 * singleton method used to instantiate class object
+	 *
+	 * @return EE_Encryption
+	 */
+	public static function instance()
+	{
+		// check if class object is instantiated
+		if (! EE_Encryption::$_instance instanceof EE_Encryption) {
+			EE_Encryption::$_instance = new self();
+		}
+		return EE_Encryption::$_instance;
+	}
+
+
+	/**
+	 * get encryption key
+	 *
+	 * @return string
+	 */
+	public function get_encryption_key()
+	{
+		// if encryption key has not been set
+		if (empty($this->_encryption_key)) {
+			// retrieve encryption_key from db
+			$this->_encryption_key = get_option(EE_Encryption::ENCRYPTION_OPTION_KEY, '');
+			// WHAT?? No encryption_key in the db ??
+			if ($this->_encryption_key === '') {
+				// let's make one. And md5 it to make it just the right size for a key
+				$new_key = md5($this->generate_random_string());
+				// now save it to the db for later
+				add_option(EE_Encryption::ENCRYPTION_OPTION_KEY, $new_key);
+				// here's the key - FINALLY !
+				$this->_encryption_key = $new_key;
+			}
+		}
+		return $this->_encryption_key;
+	}
+
+
+	/**
+	 * encrypts data
+	 *
+	 * @param string $text_string - the text to be encrypted
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	public function encrypt($text_string = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($text_string)) {
+			return $text_string;
+		}
+		if ($this->_use_openssl_encrypt) {
+			$encrypted_text = $this->openssl_encrypt($text_string);
+		} else {
+			$encrypted_text = $this->acme_encrypt($text_string);
+		}
+		return $encrypted_text;
+	}
+
+
+	/**
+	 * decrypts data
+	 *
+	 * @param string $encrypted_text - the text to be decrypted
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	public function decrypt($encrypted_text = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($encrypted_text)) {
+			return $encrypted_text;
+		}
+		// if PHP's mcrypt functions are installed then we'll use them
+		if ($this->_use_openssl_encrypt) {
+			$decrypted_text = $this->openssl_decrypt($encrypted_text);
+		} else {
+			$decrypted_text = $this->acme_decrypt($encrypted_text);
+		}
+		return $decrypted_text;
+	}
+
+
+	/**
+	 * encodes string with PHP's base64 encoding
+	 *
+	 * @see http://php.net/manual/en/function.base64-encode.php
+	 * @param string $text_string the text to be encoded
+	 * @return string
+	 */
+	public function base64_string_encode($text_string = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($text_string) || ! $this->_use_base64_encode) {
+			return $text_string;
+		}
+		// encode
+		return base64_encode($text_string);
+	}
+
+
+	/**
+	 * decodes string that has been encoded with PHP's base64 encoding
+	 *
+	 * @see http://php.net/manual/en/function.base64-encode.php
+	 * @param string $encoded_string the text to be decoded
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	public function base64_string_decode($encoded_string = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($encoded_string) || ! $this->valid_base_64($encoded_string)) {
+			return $encoded_string;
+		}
+		// decode
+		$decoded_string = base64_decode($encoded_string);
+		if ($decoded_string === false) {
+			throw new RuntimeException(
+				esc_html__('Base 64 decoding failed.', 'event_espresso')
+			);
+		}
+		return $decoded_string;
+	}
+
+
+	/**
+	 * encodes  url string with PHP's base64 encoding
+	 *
+	 * @see http://php.net/manual/en/function.base64-encode.php
+	 * @param string $text_string the text to be encoded
+	 * @return string
+	 */
+	public function base64_url_encode($text_string = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($text_string) || ! $this->_use_base64_encode) {
+			return $text_string;
+		}
+		// encode
+		$encoded_string = base64_encode($text_string);
+		// remove chars to make encoding more URL friendly
+		return strtr($encoded_string, '+/=', '-_,');
+	}
+
+
+	/**
+	 * decodes  url string that has been encoded with PHP's base64 encoding
+	 *
+	 * @see http://php.net/manual/en/function.base64-encode.php
+	 * @param string $encoded_string the text to be decoded
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	public function base64_url_decode($encoded_string = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($encoded_string) || ! $this->valid_base_64($encoded_string)) {
+			return $encoded_string;
+		}
+		// replace previously removed characters
+		$encoded_string = strtr($encoded_string, '-_,', '+/=');
+		// decode
+		$decoded_string = base64_decode($encoded_string);
+		if ($decoded_string === false) {
+			throw new RuntimeException(
+				esc_html__('Base 64 decoding failed.', 'event_espresso')
+			);
+		}
+		return $decoded_string;
+	}
+
+
+	/**
+	 * encrypts data using PHP's openssl functions
+	 *
+	 * @param string $text_string the text to be encrypted
+	 * @param string $cipher_method
+	 * @param string $encryption_key
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	protected function openssl_encrypt(
+		$text_string = '',
+		$cipher_method = EE_Encryption::OPENSSL_CIPHER_METHOD,
+		$encryption_key = ''
+	) {
+		// you give me nothing??? GET OUT !
+		if (empty($text_string)) {
+			return $text_string;
+		}
+		$this->cipher_method = $this->getCipherMethod($cipher_method);
+		// get initialization vector size
+		$iv_size = openssl_cipher_iv_length($this->cipher_method);
+		// generate initialization vector.
+		// The second parameter ("crypto_strong") is passed by reference,
+		// and is used to determines if the algorithm used was "cryptographically strong"
+		// openssl_random_pseudo_bytes() will toggle it to either true or false
+		$iv = openssl_random_pseudo_bytes($iv_size, $is_strong);
+		if ($iv === false || $is_strong === false) {
+			throw new RuntimeException(
+				esc_html__('Failed to generate OpenSSL initialization vector.', 'event_espresso')
+			);
+		}
+		// encrypt it
+		$encrypted_text = openssl_encrypt(
+			$text_string,
+			$this->cipher_method,
+			$this->getDigestHashValue(EE_Encryption::OPENSSL_DIGEST_METHOD, $encryption_key),
+			0,
+			$iv
+		);
+		// append the initialization vector
+		$encrypted_text .= EE_Encryption::OPENSSL_IV_DELIMITER . $iv;
+		// trim and maybe encode
+		return $this->_use_base64_encode
+			? trim(base64_encode($encrypted_text))
+			: trim($encrypted_text);
+	}
+
+
+	/**
+	 * Returns a cipher method that has been verified to work.
+	 * First checks if the cached cipher has been set already and if so, returns that.
+	 * Then tests the incoming default and returns that if it's good.
+	 * If not, then it retrieves the previously tested and saved cipher method.
+	 * But if that doesn't exist, then calls getAvailableCipherMethod()
+	 * to see what is available on the server, and returns the results.
+	 *
+	 * @param string $cipher_method
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	protected function getCipherMethod($cipher_method = EE_Encryption::OPENSSL_CIPHER_METHOD)
+	{
+		if ($this->cipher_method !== '') {
+			return $this->cipher_method;
+		}
+		// verify that the default cipher method can produce an initialization vector
+		if (openssl_cipher_iv_length($cipher_method) === false) {
+			// nope? okay let's get what we found in the past to work
+			$cipher_method = get_option(EE_Encryption::OPENSSL_CIPHER_METHOD_OPTION_NAME, '');
+			// oops... haven't tested available cipher methods yet
+			if ($cipher_method === '' || openssl_cipher_iv_length($cipher_method) === false) {
+				$cipher_method = $this->getAvailableCipherMethod($cipher_method);
+			}
+		}
+		return $cipher_method;
+	}
+
+
+	/**
+	 * @param string $cipher_method
+	 * @return string
+	 * @throws \RuntimeException
+	 */
+	protected function getAvailableCipherMethod($cipher_method)
+	{
+		// verify that the incoming cipher method can produce an initialization vector
+		if (openssl_cipher_iv_length($cipher_method) === false) {
+			// nope? then check the next cipher in the list of available cipher methods
+			$cipher_method = next($this->cipher_methods);
+			// what? there's no list? then generate that list and cache it,
+			if (empty($this->cipher_methods)) {
+				$this->cipher_methods = openssl_get_cipher_methods();
+				// then grab the first item from the list
+				$cipher_method = reset($this->cipher_methods);
+			}
+			if ($cipher_method === false) {
+				throw new RuntimeException(
+					esc_html__(
+						'OpenSSL support appears to be enabled on the server, but no cipher methods are available. Please contact the server administrator.',
+						'event_espresso'
+					)
+				);
+			}
+			// verify that the next cipher method works
+			return $this->getAvailableCipherMethod($cipher_method);
+		}
+		// if we've gotten this far, then we found an available cipher method that works
+		// so save that for next time
+		update_option(
+			EE_Encryption::OPENSSL_CIPHER_METHOD_OPTION_NAME,
+			$cipher_method
+		);
+		return $cipher_method;
+	}
+
+
+	/**
+	 * decrypts data that has been encrypted with PHP's openssl functions
+	 *
+	 * @param string $encrypted_text the text to be decrypted
+	 * @param string $cipher_method
+	 * @param string $encryption_key
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	protected function openssl_decrypt(
+		$encrypted_text = '',
+		$cipher_method = EE_Encryption::OPENSSL_CIPHER_METHOD,
+		$encryption_key = ''
+	) {
+		// you give me nothing??? GET OUT !
+		if (empty($encrypted_text)) {
+			return $encrypted_text;
+		}
+		// decode
+		$encrypted_text = $this->valid_base_64($encrypted_text)
+			? $this->base64_url_decode($encrypted_text)
+			: $encrypted_text;
+		$encrypted_components = explode(
+			EE_Encryption::OPENSSL_IV_DELIMITER,
+			$encrypted_text,
+			2
+		);
+		// decrypt it
+		$decrypted_text = openssl_decrypt(
+			$encrypted_components[0],
+			$this->getCipherMethod($cipher_method),
+			$this->getDigestHashValue(EE_Encryption::OPENSSL_DIGEST_METHOD, $encryption_key),
+			0,
+			$encrypted_components[1]
+		);
+		$decrypted_text = trim($decrypted_text);
+		return $decrypted_text;
+	}
+
+
+	/**
+	 * Computes the digest hash value using the specified digest method.
+	 * If that digest method fails to produce a valid hash value,
+	 * then we'll grab the next digest method and recursively try again until something works.
+	 *
+	 * @param string $digest_method
+	 * @param string $encryption_key
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	protected function getDigestHashValue($digest_method = EE_Encryption::OPENSSL_DIGEST_METHOD, $encryption_key = '')
+	{
+		$encryption_key = $encryption_key !== ''
+			? $encryption_key
+			: $this->get_encryption_key();
+		$digest_hash_value = openssl_digest($encryption_key, $digest_method);
+		if ($digest_hash_value === false) {
+			return $this->getDigestHashValue($this->getDigestMethod());
+		}
+		return $digest_hash_value;
+	}
+
+
+	/**
+	 * Returns the NEXT element in the $digest_methods array.
+	 * If the $digest_methods array is empty, then we populate it
+	 * with the available values returned from openssl_get_md_methods().
+	 *
+	 * @return string
+	 * @throws \RuntimeException
+	 */
+	protected function getDigestMethod()
+	{
+		$digest_method = prev($this->digest_methods);
+		if (empty($this->digest_methods)) {
+			$this->digest_methods = openssl_get_md_methods();
+			$digest_method = end($this->digest_methods);
+		}
+		if ($digest_method === false) {
+			throw new RuntimeException(
+				esc_html__(
+					'OpenSSL support appears to be enabled on the server, but no digest methods are available. Please contact the server administrator.',
+					'event_espresso'
+				)
+			);
+		}
+		return $digest_method;
+	}
+
+
+	/**
+	 * encrypts data for acme servers that didn't bother to install PHP mcrypt
+	 *
+	 * @see http://stackoverflow.com/questions/800922/how-to-encrypt-string-without-mcrypt-library-in-php
+	 * @param string $text_string the text to be decrypted
+	 * @return string
+	 */
+	protected function acme_encrypt($text_string = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($text_string)) {
+			return $text_string;
+		}
+		$key_bits = str_split(
+			str_pad(
+				'',
+				strlen($text_string),
+				$this->get_encryption_key(),
+				STR_PAD_RIGHT
+			)
+		);
+		$string_bits = str_split($text_string);
+		foreach ($string_bits as $k => $v) {
+			$temp = ord($v) + ord($key_bits[ $k ]);
+			$string_bits[ $k ] = chr($temp > 255 ? ($temp - 256) : $temp);
+		}
+		$encrypted_text = implode('', $string_bits);
+		$encrypted_text .= EE_Encryption::ACME_ENCRYPTION_FLAG;
+		return $this->_use_base64_encode
+			? base64_encode($encrypted_text)
+			: $encrypted_text;
+	}
+
+
+	/**
+	 * decrypts data for acme servers that didn't bother to install PHP mcrypt
+	 *
+	 * @see http://stackoverflow.com/questions/800922/how-to-encrypt-string-without-mcrypt-library-in-php
+	 * @param string $encrypted_text the text to be decrypted
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	protected function acme_decrypt($encrypted_text = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($encrypted_text)) {
+			return $encrypted_text;
+		}
+		// decode the data ?
+		$encrypted_text = $this->valid_base_64($encrypted_text)
+			? $this->base64_url_decode($encrypted_text)
+			: $encrypted_text;
+		$encrypted_text = substr($encrypted_text, 0, -4);
+		$key_bits = str_split(
+			str_pad(
+				'',
+				strlen($encrypted_text),
+				$this->get_encryption_key(),
+				STR_PAD_RIGHT
+			)
+		);
+		$string_bits = str_split($encrypted_text);
+		foreach ($string_bits as $k => $v) {
+			$temp = ord($v) - ord($key_bits[ $k ]);
+			$string_bits[ $k ] = chr($temp < 0 ? ($temp + 256) : $temp);
+		}
+		return implode('', $string_bits);
+	}
+
+
+	/**
+	 * @see http://stackoverflow.com/questions/2556345/detect-base64-encoding-in-php#30231906
+	 * @param $string
+	 * @return bool
+	 */
+	protected function valid_base_64($string)
+	{
+		// ensure data is a string
+		if (! is_string($string) || ! $this->_use_base64_encode) {
+			return false;
+		}
+		$decoded = base64_decode($string, true);
+		// Check if there is no invalid character in string
+		if (! preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $string)) {
+			return false;
+		}
+		// Decode the string in strict mode and send the response
+		if (! base64_decode($string, true)) {
+			return false;
+		}
+		// Encode and compare it to original one
+		return base64_encode($decoded) === $string;
+	}
+
+
+	/**
+	 * generate random string
+	 *
+	 * @see http://stackoverflow.com/questions/637278/what-is-the-best-way-to-generate-a-random-key-within-php
+	 * @param int $length number of characters for random string
+	 * @return string
+	 */
+	public function generate_random_string($length = 40)
+	{
+		$iterations = ceil($length / 40);
+		$random_string = '';
+		for ($i = 0; $i < $iterations; $i++) {
+			$random_string .= sha1(microtime(true) . mt_rand(10000, 90000));
+		}
+		$random_string = substr($random_string, 0, $length);
+		return $random_string;
+	}
 }

core/EE_Data_Mapper.core.php

Indentation +94 added lines, -94 removed lines

@@ -15,98 +15,98 @@
 {
 
 
-    /**
-     * instance of the EE_Data_Mapper Object
-     *
-     * @private _instance
-     */
-    private static $_instance = null;
-
-
-    public $data = array();
-
-
-    /**
-     *private constructor to prevent direct creation
-     *
-     * @Constructor
-     * @access private
-     * @return void
-     */
-    private function __construct()
-    {
-    }
-
-
-    /**
-     *@ singleton method used to instantiate class object
-     *@ access public
-     *@ return class instance
-     */
-    public function &instance()
-    {
-        // check if class object is instantiated
-        if (self::$_instance === null
-            || ! is_object(self::$_instance)
-            || ! self::$_instance instanceof EE_Data_Mapper
-        ) {
-            self::$_instance = new self();
-        }
-        return self::$_instance;
-    }
-
-
-    /**
-     *        @ override magic methods
-     *        @ return void
-     */
-    final public function __destruct()
-    {
-    }
-
-    final public function __call($a, $b)
-    {
-    }
-
-    public static function __callStatic($a, $b)
-    {
-    }
-
-    final public function __get($a)
-    {
-    }
-
-    final public function __set($a, $b)
-    {
-    }
-
-    final public function __isset($a)
-    {
-    }
-
-    final public function __unset($a)
-    {
-    }
-
-    final public function __sleep()
-    {
-        return array();
-    }
-
-    final public function __wakeup()
-    {
-    }
-
-    final public function __toString()
-    {
-        return '';
-    }
-
-    final public function __invoke()
-    {
-    }
-
-    final public function __clone()
-    {
-    }
+	/**
+	 * instance of the EE_Data_Mapper Object
+	 *
+	 * @private _instance
+	 */
+	private static $_instance = null;
+
+
+	public $data = array();
+
+
+	/**
+	 *private constructor to prevent direct creation
+	 *
+	 * @Constructor
+	 * @access private
+	 * @return void
+	 */
+	private function __construct()
+	{
+	}
+
+
+	/**
+	 *@ singleton method used to instantiate class object
+	 *@ access public
+	 *@ return class instance
+	 */
+	public function &instance()
+	{
+		// check if class object is instantiated
+		if (self::$_instance === null
+			|| ! is_object(self::$_instance)
+			|| ! self::$_instance instanceof EE_Data_Mapper
+		) {
+			self::$_instance = new self();
+		}
+		return self::$_instance;
+	}
+
+
+	/**
+	 *        @ override magic methods
+	 *        @ return void
+	 */
+	final public function __destruct()
+	{
+	}
+
+	final public function __call($a, $b)
+	{
+	}
+
+	public static function __callStatic($a, $b)
+	{
+	}
+
+	final public function __get($a)
+	{
+	}
+
+	final public function __set($a, $b)
+	{
+	}
+
+	final public function __isset($a)
+	{
+	}
+
+	final public function __unset($a)
+	{
+	}
+
+	final public function __sleep()
+	{
+		return array();
+	}
+
+	final public function __wakeup()
+	{
+	}
+
+	final public function __toString()
+	{
+		return '';
+	}
+
+	final public function __invoke()
+	{
+	}
+
+	final public function __clone()
+	{
+	}
 }

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 _e(
-            'loading...',
-            'event_espresso'
-        ); ?></span>
+			'loading...',
+			'event_espresso'
+		); ?></span>
 </div>
 
 <div id="espresso-ajax-notices">

core/EE_Bootstrap.core.php

Indentation +62 added lines, -62 removed lines

@@ -14,78 +14,78 @@
 {
 
 
-    /**
-     * load_espresso_addons
-     * runs during the WP 'plugins_loaded' action at priority 1
-     * and is the initial loading phase for EE addons
-     * no other logic should be performed at this point
-     */
-    public static function load_espresso_addons()
-    {
-        do_action('AHEE__EE_Bootstrap__load_espresso_addons');
-    }
+	/**
+	 * load_espresso_addons
+	 * runs during the WP 'plugins_loaded' action at priority 1
+	 * and is the initial loading phase for EE addons
+	 * no other logic should be performed at this point
+	 */
+	public static function load_espresso_addons()
+	{
+		do_action('AHEE__EE_Bootstrap__load_espresso_addons');
+	}
 
 
-    /**
-     * detect_activations_or_upgrades
-     * runs during the WP 'plugins_loaded' action at priority 3
-     * Now that all of the addons have been loaded,
-     * we can determine if anything needs activating or upgrading
-     */
-    public static function detect_activations_or_upgrades()
-    {
-        do_action('AHEE__EE_Bootstrap__detect_activations_or_upgrades');
-    }
+	/**
+	 * detect_activations_or_upgrades
+	 * runs during the WP 'plugins_loaded' action at priority 3
+	 * Now that all of the addons have been loaded,
+	 * we can determine if anything needs activating or upgrading
+	 */
+	public static function detect_activations_or_upgrades()
+	{
+		do_action('AHEE__EE_Bootstrap__detect_activations_or_upgrades');
+	}
 
 
-    /**
-     * load_core_configuration
-     * runs during the WP 'plugins_loaded' action at priority 5
-     * Now that the database is assumed to be at the correct version
-     * we can load and set all of the system configurations
-     */
-    public static function load_core_configuration()
-    {
-        do_action('AHEE__EE_Bootstrap__load_core_configuration');
-    }
+	/**
+	 * load_core_configuration
+	 * runs during the WP 'plugins_loaded' action at priority 5
+	 * Now that the database is assumed to be at the correct version
+	 * we can load and set all of the system configurations
+	 */
+	public static function load_core_configuration()
+	{
+		do_action('AHEE__EE_Bootstrap__load_core_configuration');
+	}
 
 
-    /**
-     * register_shortcodes_modules_and_widgets
-     * runs during the WP 'plugins_loaded' action at priority 7
-     * and handles registering all o four shortcodes, modules and widgets
-     * so that they are ready to be used throughout the system
-     */
-    public static function register_shortcodes_modules_and_widgets()
-    {
-        do_action('AHEE__EE_Bootstrap__register_shortcodes_modules_and_widgets');
-    }
+	/**
+	 * register_shortcodes_modules_and_widgets
+	 * runs during the WP 'plugins_loaded' action at priority 7
+	 * and handles registering all o four shortcodes, modules and widgets
+	 * so that they are ready to be used throughout the system
+	 */
+	public static function register_shortcodes_modules_and_widgets()
+	{
+		do_action('AHEE__EE_Bootstrap__register_shortcodes_modules_and_widgets');
+	}
 
 
-    /**
-     * brew_espresso
-     * runs during the WP 'plugins_loaded' action at priority 9
-     * bootstrapping is considered complete at this point,
-     * so let the fun begin...
-     */
-    public static function brew_espresso()
-    {
-        do_action('AHEE__EE_Bootstrap__brew_espresso');
-    }
+	/**
+	 * brew_espresso
+	 * runs during the WP 'plugins_loaded' action at priority 9
+	 * bootstrapping is considered complete at this point,
+	 * so let the fun begin...
+	 */
+	public static function brew_espresso()
+	{
+		do_action('AHEE__EE_Bootstrap__brew_espresso');
+	}
 
 
-    /**
-     * @deprecated 4.9.53
-     */
-    public function run_request_stack()
-    {
-    }
+	/**
+	 * @deprecated 4.9.53
+	 */
+	public function run_request_stack()
+	{
+	}
 
 
-    /**
-     * @deprecated 4.9.53
-     */
-    public function build_request_stack()
-    {
-    }
+	/**
+	 * @deprecated 4.9.53
+	 */
+	public function build_request_stack()
+	{
+	}
 }

core/helpers/EEH_Parse_Shortcodes.helper.php

Indentation +264 added lines, -264 removed lines

@@ -13,268 +13,268 @@
 {
 
 
-    /**
-     * holds the template
-     *
-     * @access private
-     * @var mixed (string|array)
-     */
-    private $_template;
-
-
-    /**
-     * holds the incoming data object
-     *
-     * @access private
-     * @var object
-     */
-    private $_data;
-
-
-    /**
-     * will hold an array of EE_Shortcodes library objects.
-     *
-     * @access private
-     * @var EE_Shortcodes[]
-     */
-    private $_shortcode_objs = array();
-
-
-    public function __construct()
-    {
-    }
-
-
-    /**
-     * This kicks off the parsing of shortcodes in message templates
-     *
-     * @param  string                $template         This is the incoming string to be parsed
-     * @param  EE_Messages_Addressee $data             This is the incoming data object
-     * @param  array                 $valid_shortcodes An array of strings that correspond to EE_Shortcode libraries
-     * @param EE_message_type        $message_type     The message type that called the parser
-     * @param EE_messenger           $messenger        The active messenger for this parsing session.
-     * @param EE_Message             $message
-     * @return string                   The parsed template string
-     */
-    public function parse_message_template(
-        $template,
-        EE_Messages_Addressee $data,
-        $valid_shortcodes,
-        EE_message_type $message_type,
-        EE_messenger $messenger,
-        EE_Message $message
-    ) {
-        $extra_data = array(
-            'messenger'    => $messenger,
-            'message_type' => $message_type,
-            'message'      => $message,
-        );
-        $this->_init_data($template, $data, $valid_shortcodes, $extra_data);
-        $this->_template = is_array($template) ? $template['main'] : $template;
-        return $this->_parse_message_template();
-    }
-
-
-    public function parse_attendee_list_template(
-        $template,
-        EE_Registration $registration,
-        $valid_shortcodes,
-        $extra_data = array()
-    ) {
-        $this->_init_data($template, $registration, $valid_shortcodes, $extra_data);
-        $this->_template = is_array($template) ? $template['attendee_list'] : $template;
-        return $this->_parse_message_template();
-    }
-
-    public function parse_event_list_template($template, EE_Event $event, $valid_shortcodes, $extra_data = array())
-    {
-        $this->_init_data($template, $event, $valid_shortcodes, $extra_data);
-        $this->_template = is_array($template) ? $template['event_list'] : $template;
-        return $this->_parse_message_template();
-    }
-
-
-    public function parse_ticket_list_template($template, EE_Ticket $ticket, $valid_shortcodes, $extra_data = array())
-    {
-        $this->_init_data($template, $ticket, $valid_shortcodes, $extra_data);
-        $this->_template = is_array($template) ? $template['ticket_list'] : $template;
-        return $this->_parse_message_template();
-    }
-
-
-    public function parse_line_item_list_template(
-        $template,
-        EE_Line_Item $line_item,
-        $valid_shortcodes,
-        $extra_data = array()
-    ) {
-        $this->_init_data($template, $line_item, $valid_shortcodes, $extra_data);
-        $this->_template = is_array($template) ? $template['ticket_line_item_no_pms'] : $template;
-        return $this->_parse_message_template();
-    }
-
-
-    public function parse_payment_list_template(
-        $template,
-        EE_Payment $payment_item,
-        $valid_shortcodes,
-        $extra_data = array()
-    ) {
-        $this->_init_data($template, $payment_item, $valid_shortcodes, $extra_data);
-        $this->_template = is_array($template) ? $template['payment_list'] : $template;
-        return $this->_parse_message_template();
-    }
-
-
-    public function parse_datetime_list_template(
-        $template,
-        EE_Datetime $datetime,
-        $valid_shortcodes,
-        $extra_data = array()
-    ) {
-        $this->_init_data($template, $datetime, $valid_shortcodes, $extra_data);
-        $this->_template = is_array($template) ? $template['datetime_list'] : $template;
-        return $this->_parse_message_template();
-    }
-
-
-    public function parse_question_list_template($template, EE_Answer $answer, $valid_shortcodes, $extra_data = array())
-    {
-        $this->_init_data($template, $answer, $valid_shortcodes, $extra_data);
-        $this->_template = is_array($template) ? $template['question_list'] : $template;
-        return $this->_parse_message_template();
-    }
-
-
-    private function _init_data($template, $data, $valid_shortcodes, $extra_data = array())
-    {
-        $this->_reset_props();
-        $this->_data['template']   = $template;
-        $this->_data['data']       = $data;
-        $this->_data['extra_data'] = $extra_data;
-        $this->_set_shortcodes($valid_shortcodes);
-    }
-
-
-    private function _reset_props()
-    {
-        $this->_template       = $this->_data = null;
-        $this->_shortcode_objs = array();
-    }
-
-
-    /**
-     * takes the given template and parses it with the $_shortcodes property
-     *
-     * @access private
-     * @return string
-     */
-    private function _parse_message_template()
-    {
-        // now let's get a list of shortcodes that are found in the given template
-        preg_match_all('/(\[.+?\])/', $this->_template, $matches);
-        $shortcodes = (array) $matches[0]; // this should be an array of shortcodes in the template string.
-
-        $matched_code = array();
-        $sc_values    = array();
-
-        $list_type_shortcodes = array(
-            '[ATTENDEE_LIST]',
-            '[EVENT_LIST]',
-            '[TICKET_LIST]',
-            '[DATETIME_LIST]',
-            '[QUESTION_LIST]',
-            '[RECIPIENT_QUESTION_LIST]',
-            '[PRIMARY_REGISTRANT_QUESTION_LIST]',
-            '[RECIPIENT_TICKET_LIST]',
-            '[PRIMARY_REGISTRANT_TICKET_LIST]',
-            '[RECIPIENT_DATETIME_LIST]',
-            '[PRIMARY_REGISTRANT_DATETIME_LIST]',
-            '[TICKET_LINE_ITEM_LIST]',
-            '[TAX_LINE_ITEM_LIST]',
-            '[ADDITIONAL_LINE_ITEM_LIST]',
-            '[PRICE_MODIFIER_LINE_ITEM_LIST]',
-            '[PAYMENT_LIST_*]',
-        );
-
-        $list_type_shortcodes = apply_filters(
-            'FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes',
-            $list_type_shortcodes
-        );
-
-        // now lets go ahead and loop through our parsers for each shortcode and setup the values
-        foreach ($shortcodes as $shortcode) {
-            foreach ($this->_shortcode_objs as $sc_obj) {
-                if ($sc_obj instanceof EE_Shortcodes) {
-                    // we need to setup any dynamic shortcodes so that they work with the array_key_exists
-                    preg_match_all('/(\[[A-Za-z0-9\_]+_\*)/', $shortcode, $matches);
-                    $sc_to_verify = ! empty($matches[0]) ? $matches[0][0] . ']' : $shortcode;
-
-                    if (! array_key_exists($sc_to_verify, $sc_obj->get_shortcodes())) {
-                        continue; // the given shortcode isn't in this object
-                    }
-
-                    // if this isn't  a "list" type shortcode then we'll send along the data vanilla instead of in an array.
-                    if (! in_array($sc_to_verify, $list_type_shortcodes)) {
-                        $data_send = ! is_object($this->_data) && isset($this->_data['data']) ? $this->_data['data'] : $this->_data;
-                    } else {
-                        $data_send = $this->_data;
-                    }
-
-                    // is this a conditional type shortcode?  If it is then we actually parse the template here.
-                    if ($this->_is_conditional_shortcode($shortcode)) {
-                        // most shortcode parsers are not going to have a match for this shortcode and will return an
-                        // empty string so we need to make sure that we're only replacing the template when there is a non empty string.
-                        $parsed = $sc_obj->parser($shortcode, $data_send, $this->_data['extra_data']);
-                        if ($parsed) {
-                            $this->_template = $parsed;
-                        }
-                    }
-
-                    $parsed = $sc_obj->parser($shortcode, $data_send, $this->_data['extra_data']);
-
-                    $matched_code[] = $shortcode;
-                    $sc_values[]    = $parsed;
-                }
-            }
-        }
-
-        // now we've got parsed values for all the shortcodes in the template so we can go ahead and swap the shortcodes out.
-        $parsed = str_replace(array_values($matched_code), array_values($sc_values), $this->_template);
-        return $parsed;
-    }
-
-
-    /**
-     * Simply returns whether the given shortcode matches the structure for a conditional shortcode.
-     *
-     * Does it match this format: `[IF_`
-     *
-     * @param $shortcode
-     */
-    protected function _is_conditional_shortcode($shortcode)
-    {
-        return strpos($shortcode, '[IF_') === 0;
-    }
-
-
-    /**
-     * This sets the shortcodes property from the incoming array of valid shortcodes that corresponds to names of
-     * various EE_Shortcode library objects
-     *
-     * @access private
-     * @param array $valid_shortcodes an array of strings corresponding to EE_Shortcode Library objects
-     * @return void
-     */
-    private function _set_shortcodes($valid_shortcodes)
-    {
-        foreach ($valid_shortcodes as $shortcode_ref) {
-            $ref       = ucwords(str_replace('_', ' ', $shortcode_ref));
-            $ref       = str_replace(' ', '_', $ref);
-            $classname = 'EE_' . $ref . '_Shortcodes';
-            if (class_exists($classname)) {
-                $this->_shortcode_objs[] = new $classname;
-            }
-        }
-    }
+	/**
+	 * holds the template
+	 *
+	 * @access private
+	 * @var mixed (string|array)
+	 */
+	private $_template;
+
+
+	/**
+	 * holds the incoming data object
+	 *
+	 * @access private
+	 * @var object
+	 */
+	private $_data;
+
+
+	/**
+	 * will hold an array of EE_Shortcodes library objects.
+	 *
+	 * @access private
+	 * @var EE_Shortcodes[]
+	 */
+	private $_shortcode_objs = array();
+
+
+	public function __construct()
+	{
+	}
+
+
+	/**
+	 * This kicks off the parsing of shortcodes in message templates
+	 *
+	 * @param  string                $template         This is the incoming string to be parsed
+	 * @param  EE_Messages_Addressee $data             This is the incoming data object
+	 * @param  array                 $valid_shortcodes An array of strings that correspond to EE_Shortcode libraries
+	 * @param EE_message_type        $message_type     The message type that called the parser
+	 * @param EE_messenger           $messenger        The active messenger for this parsing session.
+	 * @param EE_Message             $message
+	 * @return string                   The parsed template string
+	 */
+	public function parse_message_template(
+		$template,
+		EE_Messages_Addressee $data,
+		$valid_shortcodes,
+		EE_message_type $message_type,
+		EE_messenger $messenger,
+		EE_Message $message
+	) {
+		$extra_data = array(
+			'messenger'    => $messenger,
+			'message_type' => $message_type,
+			'message'      => $message,
+		);
+		$this->_init_data($template, $data, $valid_shortcodes, $extra_data);
+		$this->_template = is_array($template) ? $template['main'] : $template;
+		return $this->_parse_message_template();
+	}
+
+
+	public function parse_attendee_list_template(
+		$template,
+		EE_Registration $registration,
+		$valid_shortcodes,
+		$extra_data = array()
+	) {
+		$this->_init_data($template, $registration, $valid_shortcodes, $extra_data);
+		$this->_template = is_array($template) ? $template['attendee_list'] : $template;
+		return $this->_parse_message_template();
+	}
+
+	public function parse_event_list_template($template, EE_Event $event, $valid_shortcodes, $extra_data = array())
+	{
+		$this->_init_data($template, $event, $valid_shortcodes, $extra_data);
+		$this->_template = is_array($template) ? $template['event_list'] : $template;
+		return $this->_parse_message_template();
+	}
+
+
+	public function parse_ticket_list_template($template, EE_Ticket $ticket, $valid_shortcodes, $extra_data = array())
+	{
+		$this->_init_data($template, $ticket, $valid_shortcodes, $extra_data);
+		$this->_template = is_array($template) ? $template['ticket_list'] : $template;
+		return $this->_parse_message_template();
+	}
+
+
+	public function parse_line_item_list_template(
+		$template,
+		EE_Line_Item $line_item,
+		$valid_shortcodes,
+		$extra_data = array()
+	) {
+		$this->_init_data($template, $line_item, $valid_shortcodes, $extra_data);
+		$this->_template = is_array($template) ? $template['ticket_line_item_no_pms'] : $template;
+		return $this->_parse_message_template();
+	}
+
+
+	public function parse_payment_list_template(
+		$template,
+		EE_Payment $payment_item,
+		$valid_shortcodes,
+		$extra_data = array()
+	) {
+		$this->_init_data($template, $payment_item, $valid_shortcodes, $extra_data);
+		$this->_template = is_array($template) ? $template['payment_list'] : $template;
+		return $this->_parse_message_template();
+	}
+
+
+	public function parse_datetime_list_template(
+		$template,
+		EE_Datetime $datetime,
+		$valid_shortcodes,
+		$extra_data = array()
+	) {
+		$this->_init_data($template, $datetime, $valid_shortcodes, $extra_data);
+		$this->_template = is_array($template) ? $template['datetime_list'] : $template;
+		return $this->_parse_message_template();
+	}
+
+
+	public function parse_question_list_template($template, EE_Answer $answer, $valid_shortcodes, $extra_data = array())
+	{
+		$this->_init_data($template, $answer, $valid_shortcodes, $extra_data);
+		$this->_template = is_array($template) ? $template['question_list'] : $template;
+		return $this->_parse_message_template();
+	}
+
+
+	private function _init_data($template, $data, $valid_shortcodes, $extra_data = array())
+	{
+		$this->_reset_props();
+		$this->_data['template']   = $template;
+		$this->_data['data']       = $data;
+		$this->_data['extra_data'] = $extra_data;
+		$this->_set_shortcodes($valid_shortcodes);
+	}
+
+
+	private function _reset_props()
+	{
+		$this->_template       = $this->_data = null;
+		$this->_shortcode_objs = array();
+	}
+
+
+	/**
+	 * takes the given template and parses it with the $_shortcodes property
+	 *
+	 * @access private
+	 * @return string
+	 */
+	private function _parse_message_template()
+	{
+		// now let's get a list of shortcodes that are found in the given template
+		preg_match_all('/(\[.+?\])/', $this->_template, $matches);
+		$shortcodes = (array) $matches[0]; // this should be an array of shortcodes in the template string.
+
+		$matched_code = array();
+		$sc_values    = array();
+
+		$list_type_shortcodes = array(
+			'[ATTENDEE_LIST]',
+			'[EVENT_LIST]',
+			'[TICKET_LIST]',
+			'[DATETIME_LIST]',
+			'[QUESTION_LIST]',
+			'[RECIPIENT_QUESTION_LIST]',
+			'[PRIMARY_REGISTRANT_QUESTION_LIST]',
+			'[RECIPIENT_TICKET_LIST]',
+			'[PRIMARY_REGISTRANT_TICKET_LIST]',
+			'[RECIPIENT_DATETIME_LIST]',
+			'[PRIMARY_REGISTRANT_DATETIME_LIST]',
+			'[TICKET_LINE_ITEM_LIST]',
+			'[TAX_LINE_ITEM_LIST]',
+			'[ADDITIONAL_LINE_ITEM_LIST]',
+			'[PRICE_MODIFIER_LINE_ITEM_LIST]',
+			'[PAYMENT_LIST_*]',
+		);
+
+		$list_type_shortcodes = apply_filters(
+			'FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes',
+			$list_type_shortcodes
+		);
+
+		// now lets go ahead and loop through our parsers for each shortcode and setup the values
+		foreach ($shortcodes as $shortcode) {
+			foreach ($this->_shortcode_objs as $sc_obj) {
+				if ($sc_obj instanceof EE_Shortcodes) {
+					// we need to setup any dynamic shortcodes so that they work with the array_key_exists
+					preg_match_all('/(\[[A-Za-z0-9\_]+_\*)/', $shortcode, $matches);
+					$sc_to_verify = ! empty($matches[0]) ? $matches[0][0] . ']' : $shortcode;
+
+					if (! array_key_exists($sc_to_verify, $sc_obj->get_shortcodes())) {
+						continue; // the given shortcode isn't in this object
+					}
+
+					// if this isn't  a "list" type shortcode then we'll send along the data vanilla instead of in an array.
+					if (! in_array($sc_to_verify, $list_type_shortcodes)) {
+						$data_send = ! is_object($this->_data) && isset($this->_data['data']) ? $this->_data['data'] : $this->_data;
+					} else {
+						$data_send = $this->_data;
+					}
+
+					// is this a conditional type shortcode?  If it is then we actually parse the template here.
+					if ($this->_is_conditional_shortcode($shortcode)) {
+						// most shortcode parsers are not going to have a match for this shortcode and will return an
+						// empty string so we need to make sure that we're only replacing the template when there is a non empty string.
+						$parsed = $sc_obj->parser($shortcode, $data_send, $this->_data['extra_data']);
+						if ($parsed) {
+							$this->_template = $parsed;
+						}
+					}
+
+					$parsed = $sc_obj->parser($shortcode, $data_send, $this->_data['extra_data']);
+
+					$matched_code[] = $shortcode;
+					$sc_values[]    = $parsed;
+				}
+			}
+		}
+
+		// now we've got parsed values for all the shortcodes in the template so we can go ahead and swap the shortcodes out.
+		$parsed = str_replace(array_values($matched_code), array_values($sc_values), $this->_template);
+		return $parsed;
+	}
+
+
+	/**
+	 * Simply returns whether the given shortcode matches the structure for a conditional shortcode.
+	 *
+	 * Does it match this format: `[IF_`
+	 *
+	 * @param $shortcode
+	 */
+	protected function _is_conditional_shortcode($shortcode)
+	{
+		return strpos($shortcode, '[IF_') === 0;
+	}
+
+
+	/**
+	 * This sets the shortcodes property from the incoming array of valid shortcodes that corresponds to names of
+	 * various EE_Shortcode library objects
+	 *
+	 * @access private
+	 * @param array $valid_shortcodes an array of strings corresponding to EE_Shortcode Library objects
+	 * @return void
+	 */
+	private function _set_shortcodes($valid_shortcodes)
+	{
+		foreach ($valid_shortcodes as $shortcode_ref) {
+			$ref       = ucwords(str_replace('_', ' ', $shortcode_ref));
+			$ref       = str_replace(' ', '_', $ref);
+			$classname = 'EE_' . $ref . '_Shortcodes';
+			if (class_exists($classname)) {
+				$this->_shortcode_objs[] = new $classname;
+			}
+		}
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -208,14 +208,14 @@ 
                 if ($sc_obj instanceof EE_Shortcodes) {
                     // we need to setup any dynamic shortcodes so that they work with the array_key_exists
                     preg_match_all('/(\[[A-Za-z0-9\_]+_\*)/', $shortcode, $matches);
-                    $sc_to_verify = ! empty($matches[0]) ? $matches[0][0] . ']' : $shortcode;
+                    $sc_to_verify = ! empty($matches[0]) ? $matches[0][0].']' : $shortcode;
 
-                    if (! array_key_exists($sc_to_verify, $sc_obj->get_shortcodes())) {
+                    if ( ! array_key_exists($sc_to_verify, $sc_obj->get_shortcodes())) {
                         continue; // the given shortcode isn't in this object
                     }
 
                     // if this isn't  a "list" type shortcode then we'll send along the data vanilla instead of in an array.
-                    if (! in_array($sc_to_verify, $list_type_shortcodes)) {
+                    if ( ! in_array($sc_to_verify, $list_type_shortcodes)) {
                         $data_send = ! is_object($this->_data) && isset($this->_data['data']) ? $this->_data['data'] : $this->_data;
                     } else {
                         $data_send = $this->_data;
@@ -271,7 +271,7 @@ 
         foreach ($valid_shortcodes as $shortcode_ref) {
             $ref       = ucwords(str_replace('_', ' ', $shortcode_ref));
             $ref       = str_replace(' ', '_', $ref);
-            $classname = 'EE_' . $ref . '_Shortcodes';
+            $classname = 'EE_'.$ref.'_Shortcodes';
             if (class_exists($classname)) {
                 $this->_shortcode_objs[] = new $classname;
             }

core/helpers/EEH_Address.helper.php

Indentation +111 added lines, -111 removed lines

@@ -13,124 +13,124 @@
 
 
 
-    /**
-     *    format - output formatted EE object address information
-     *
-     * @access public
-     * @param         object      EEI_Address $obj_with_address
-     * @param string  $type       how the address is formatted. for example: 'multiline' or 'inline'
-     * @param boolean $use_schema whether to apply schema.org formatting to the address
-     * @param bool    $add_wrapper
-     * @return string
-     */
-    public static function format(
-        $obj_with_address = null,
-        $type = 'multiline',
-        $use_schema = true,
-        $add_wrapper = true
-    ) {
-        // check that incoming object implements the EEI_Address interface
-        if (! $obj_with_address instanceof EEI_Address) {
-            $msg = __('The address could not be formatted.', 'event_espresso');
-            $dev_msg = __(
-                'The Address Formatter requires passed objects to implement the EEI_Address interface.',
-                'event_espresso'
-            );
-            EE_Error::add_error($msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__);
-            return null;
-        }
-        // obtain an address formatter
-        $formatter = EEH_Address::_get_formatter($type);
-        // apply schema.org formatting ?
-        $use_schema = ! is_admin() ? $use_schema : false;
-        $formatted_address = $use_schema
-            ? EEH_Address::_schema_formatting($formatter, $obj_with_address)
-            : EEH_Address::_regular_formatting($formatter, $obj_with_address, $add_wrapper);
-        $formatted_address = $add_wrapper && ! $use_schema
-            ? '<div class="espresso-address-dv">' . $formatted_address . '</div>'
-            : $formatted_address;
-        // return the formatted address
-        return $formatted_address;
-    }
+	/**
+	 *    format - output formatted EE object address information
+	 *
+	 * @access public
+	 * @param         object      EEI_Address $obj_with_address
+	 * @param string  $type       how the address is formatted. for example: 'multiline' or 'inline'
+	 * @param boolean $use_schema whether to apply schema.org formatting to the address
+	 * @param bool    $add_wrapper
+	 * @return string
+	 */
+	public static function format(
+		$obj_with_address = null,
+		$type = 'multiline',
+		$use_schema = true,
+		$add_wrapper = true
+	) {
+		// check that incoming object implements the EEI_Address interface
+		if (! $obj_with_address instanceof EEI_Address) {
+			$msg = __('The address could not be formatted.', 'event_espresso');
+			$dev_msg = __(
+				'The Address Formatter requires passed objects to implement the EEI_Address interface.',
+				'event_espresso'
+			);
+			EE_Error::add_error($msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__);
+			return null;
+		}
+		// obtain an address formatter
+		$formatter = EEH_Address::_get_formatter($type);
+		// apply schema.org formatting ?
+		$use_schema = ! is_admin() ? $use_schema : false;
+		$formatted_address = $use_schema
+			? EEH_Address::_schema_formatting($formatter, $obj_with_address)
+			: EEH_Address::_regular_formatting($formatter, $obj_with_address, $add_wrapper);
+		$formatted_address = $add_wrapper && ! $use_schema
+			? '<div class="espresso-address-dv">' . $formatted_address . '</div>'
+			: $formatted_address;
+		// return the formatted address
+		return $formatted_address;
+	}
 
 
 
-    /**
-     *    _get_formatter - obtain the requester formatter class
-     *
-     * @access private
-     * @param string $type how the address is formatted. for example: 'multiline' or 'inline'
-     * @return EEI_Address_Formatter
-     */
-    private static function _get_formatter($type)
-    {
-        switch ($type) {
-            case 'multiline':
-                return new EventEspresso\core\services\address\formatters\MultiLineAddressFormatter();
-            case 'inline':
-                return new EventEspresso\core\services\address\formatters\InlineAddressFormatter();
-            default:
-                return new EventEspresso\core\services\address\formatters\NullAddressFormatter();
-        }
-    }
+	/**
+	 *    _get_formatter - obtain the requester formatter class
+	 *
+	 * @access private
+	 * @param string $type how the address is formatted. for example: 'multiline' or 'inline'
+	 * @return EEI_Address_Formatter
+	 */
+	private static function _get_formatter($type)
+	{
+		switch ($type) {
+			case 'multiline':
+				return new EventEspresso\core\services\address\formatters\MultiLineAddressFormatter();
+			case 'inline':
+				return new EventEspresso\core\services\address\formatters\InlineAddressFormatter();
+			default:
+				return new EventEspresso\core\services\address\formatters\NullAddressFormatter();
+		}
+	}
 
 
 
-    /**
-     *    _regular_formatting
-     *    adds formatting to an address
-     *
-     * @access private
-     * @param      object EEI_Address_Formatter $formatter
-     * @param      object EEI_Address $obj_with_address
-     * @param bool $add_wrapper
-     * @return string
-     */
-    private static function _regular_formatting(
-        EEI_Address_Formatter $formatter,
-        EEI_Address $obj_with_address,
-        $add_wrapper = true
-    ) {
-        $formatted_address = $add_wrapper ? '<div>' : '';
-        $formatted_address .= $formatter->format(
-            $obj_with_address->address(),
-            $obj_with_address->address2(),
-            $obj_with_address->city(),
-            $obj_with_address->state_name(),
-            $obj_with_address->zip(),
-            $obj_with_address->country_name(),
-            $obj_with_address->country_ID()
-        );
-        $formatted_address .= $add_wrapper ? '</div>' : '';
-        // return the formatted address
-        return $formatted_address;
-    }
+	/**
+	 *    _regular_formatting
+	 *    adds formatting to an address
+	 *
+	 * @access private
+	 * @param      object EEI_Address_Formatter $formatter
+	 * @param      object EEI_Address $obj_with_address
+	 * @param bool $add_wrapper
+	 * @return string
+	 */
+	private static function _regular_formatting(
+		EEI_Address_Formatter $formatter,
+		EEI_Address $obj_with_address,
+		$add_wrapper = true
+	) {
+		$formatted_address = $add_wrapper ? '<div>' : '';
+		$formatted_address .= $formatter->format(
+			$obj_with_address->address(),
+			$obj_with_address->address2(),
+			$obj_with_address->city(),
+			$obj_with_address->state_name(),
+			$obj_with_address->zip(),
+			$obj_with_address->country_name(),
+			$obj_with_address->country_ID()
+		);
+		$formatted_address .= $add_wrapper ? '</div>' : '';
+		// return the formatted address
+		return $formatted_address;
+	}
 
 
 
-    /**
-     *    _schema_formatting
-     *    adds schema.org formatting to an address
-     *
-     * @access private
-     * @param object EEI_Address_Formatter $formatter
-     * @param object EEI_Address $obj_with_address
-     * @return string
-     */
-    private static function _schema_formatting(EEI_Address_Formatter $formatter, EEI_Address $obj_with_address)
-    {
-        $formatted_address = '<div itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">';
-        $formatted_address .= $formatter->format(
-            EEH_Schema::streetAddress($obj_with_address),
-            EEH_Schema::postOfficeBoxNumber($obj_with_address),
-            EEH_Schema::addressLocality($obj_with_address),
-            EEH_Schema::addressRegion($obj_with_address),
-            EEH_Schema::postalCode($obj_with_address),
-            EEH_Schema::addressCountry($obj_with_address),
-            $obj_with_address->country_ID()
-        );
-        $formatted_address .= '</div>';
-        // return the formatted address
-        return $formatted_address;
-    }
+	/**
+	 *    _schema_formatting
+	 *    adds schema.org formatting to an address
+	 *
+	 * @access private
+	 * @param object EEI_Address_Formatter $formatter
+	 * @param object EEI_Address $obj_with_address
+	 * @return string
+	 */
+	private static function _schema_formatting(EEI_Address_Formatter $formatter, EEI_Address $obj_with_address)
+	{
+		$formatted_address = '<div itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">';
+		$formatted_address .= $formatter->format(
+			EEH_Schema::streetAddress($obj_with_address),
+			EEH_Schema::postOfficeBoxNumber($obj_with_address),
+			EEH_Schema::addressLocality($obj_with_address),
+			EEH_Schema::addressRegion($obj_with_address),
+			EEH_Schema::postalCode($obj_with_address),
+			EEH_Schema::addressCountry($obj_with_address),
+			$obj_with_address->country_ID()
+		);
+		$formatted_address .= '</div>';
+		// return the formatted address
+		return $formatted_address;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -30,13 +30,13 @@ 
         $add_wrapper = true
     ) {
         // check that incoming object implements the EEI_Address interface
-        if (! $obj_with_address instanceof EEI_Address) {
+        if ( ! $obj_with_address instanceof EEI_Address) {
             $msg = __('The address could not be formatted.', 'event_espresso');
             $dev_msg = __(
                 'The Address Formatter requires passed objects to implement the EEI_Address interface.',
                 'event_espresso'
             );
-            EE_Error::add_error($msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__);
+            EE_Error::add_error($msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__);
             return null;
         }
         // obtain an address formatter
@@ -47,7 +47,7 @@ 
             ? EEH_Address::_schema_formatting($formatter, $obj_with_address)
             : EEH_Address::_regular_formatting($formatter, $obj_with_address, $add_wrapper);
         $formatted_address = $add_wrapper && ! $use_schema
-            ? '<div class="espresso-address-dv">' . $formatted_address . '</div>'
+            ? '<div class="espresso-address-dv">'.$formatted_address.'</div>'
             : $formatted_address;
         // return the formatted address
         return $formatted_address;

core/helpers/EEH_Venue_View.helper.php

Spacing +17 added lines, -17 removed lines

@@ -58,9 +58,9 @@ 
                     // 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 )) {
+                    if (isset($post->EE_Venue) && ($VNU_ID == $post->ID || ! $VNU_ID)) {
                         // use existing related EE_Venue object
-                        EEH_Venue_View::$_venue =  $post->EE_Venue;
+                        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);
@@ -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);
         }
@@ -171,7 +171,7 @@ 
     public static function is_venue_private($VNU_ID = false)
     {
         $venue = EEH_Venue_View::get_venue($VNU_ID, true, true);
-        if (! $venue instanceof EE_Venue) {
+        if ( ! $venue instanceof EE_Venue) {
             return null;
         }
 
@@ -250,8 +250,8 @@ 
         $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(), __('more', 'event_espresso') . '…');
-            return ! empty($excerpt) ? wp_trim_words($excerpt, 25, '') . $venue_link : '';
+            $venue_link = ' '.EEH_Venue_View::venue_details_link($venue->ID(), __('more', 'event_espresso').'…');
+            return ! empty($excerpt) ? wp_trim_words($excerpt, 25, '').$venue_link : '';
         }
         return '';
     }
@@ -276,8 +276,8 @@ 
                 // 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) != __('uncategorized', 'event_espresso')) || ! $hide_uncategorized )) {
-                        $category_links[] = '<a href="' . esc_url($url) . '" rel="tag">' . $term->name . '</a> ';
+                    if ( ! is_wp_error($url) && (($hide_uncategorized && strtolower($term->name) != __('uncategorized', 'event_espresso')) || ! $hide_uncategorized)) {
+                        $category_links[] = '<a href="'.esc_url($url).'" rel="tag">'.$term->name.'</a> ';
                     }
                 }
             }
@@ -341,7 +341,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;" . __('(Private)', 'event_espresso')
+                    ? EEH_Venue_View::$_venue->name()."&nbsp;".__('(Private)', 'event_espresso')
                     : EEH_Venue_View::$_venue->name(),
                 EEH_Venue_View::$_venue
             );
@@ -450,7 +450,7 @@ 
             if ($map_cfg->use_google_maps && $venue->enable_for_gmap()) {
                 $details_page = is_single();
                 $options = array();
-                $options['map_ID'] = $map_ID && $map_ID != $venue->ID() ? $map_ID . '-' . $venue->ID()/* . '-' . $static_map_id*/ : $venue->ID()/* . '-' . $static_map_id*/;
+                $options['map_ID'] = $map_ID && $map_ID != $venue->ID() ? $map_ID.'-'.$venue->ID()/* . '-' . $static_map_id*/ : $venue->ID()/* . '-' . $static_map_id*/;
 
                 $options['location'] = EEH_Address::format($venue, 'inline', false, false);
 
@@ -468,15 +468,15 @@ 
                 ;
 
                 $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_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_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_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();
+                $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);
             }
@@ -535,13 +535,13 @@ 
                 // generate nonce
                 $nonce = wp_create_nonce('edit_nonce');
                 // generate url to venue editor for this venue
-                $url = add_query_arg(array( 'page' => 'espresso_venues', 'action' => 'edit', 'post' => $venue->ID(), 'edit_nonce' => $nonce ), admin_url('admin.php'));
+                $url = add_query_arg(array('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>';
+                $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 $before.apply_filters('edit_post_link', $link, $venue->ID()).$after;
             }
         }
         return '';

Indentation +534 added lines, -535 removed lines

@@ -11,539 +11,538 @@
 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
-     */
-    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 : array();
-                        // 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
-     */
-    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[]
-     */
-    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 array();
-    }
-
-
-
-
-    /**
-     * 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
-     */
-    public static function is_venue_private($VNU_ID = false)
-    {
-        $venue = EEH_Venue_View::get_venue($VNU_ID, true, true);
-        if (! $venue instanceof EE_Venue) {
-            return null;
-        }
-
-        return $venue->status() == 'private' ? true : false;
-    }
-
-
-
-
-    /**
-     * 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
-     */
-    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
-     */
-    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
-     */
-    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
-     */
-    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(), __('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
-     */
-    public static function venue_categories($VNU_ID = 0, $hide_uncategorized = true)
-    {
-        $category_links = array();
-        $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) != __('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
-     */
-    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
-     */
-    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
-     */
-    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;" . __('(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);
-                break;
-
-                case 'website':
-                    return EEH_Venue_View::venue_website_link($venue->ID(), $venue_name);
-                break;
-
-                default:
-                    return $venue_name;
-            }
-        }
-        return '';
-    }
-
-
-
-    /**
-     *    venue_details_link
-     *
-     * @access    public
-     * @param int $VNU_ID
-     * @param    string $text
-     * @return string
-     */
-    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
-     */
-    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) : '';
-        }
-        return '';
-    }
-
-
-
-    /**
-     *    venue_phone
-     *
-     * @access    public
-     * @param int $VNU_ID
-     * @return string
-     */
-    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
-     */
-    public static function venue_gmap($VNU_ID = 0, $map_ID = false, $gmap = array())
-    {
-
-        $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 = array();
-                $options['map_ID'] = $map_ID && $map_ID != $venue->ID() ? $map_ID . '-' . $venue->ID()/* . '-' . $static_map_id*/ : $venue->ID()/* . '-' . $static_map_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 $atts like EEH_Maps::google_map_link
-     * @return string
-     */
-    public static function espresso_google_static_map(EE_Venue $venue, $atts = array())
-    {
-        $state = $venue->state_obj();
-        $country = $venue->country_obj();
-        $atts = shortcode_atts(
-            array(
-                    '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
-                    ),
-            $atts
-        );
-        return EEH_Maps::google_map_link($atts);
-    }
-
-
-
-    /**
-     *    edit_venue_link
-     *
-     * @access    public
-     * @param int $VNU_ID
-     * @param string $link
-     * @param string $before
-     * @param string $after
-     * @return string
-     */
-    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 : __('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(array( '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
+	 */
+	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 : array();
+						// 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
+	 */
+	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[]
+	 */
+	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 array();
+	}
+
+
+
+
+	/**
+	 * 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
+	 */
+	public static function is_venue_private($VNU_ID = false)
+	{
+		$venue = EEH_Venue_View::get_venue($VNU_ID, true, true);
+		if (! $venue instanceof EE_Venue) {
+			return null;
+		}
+
+		return $venue->status() == 'private' ? true : false;
+	}
+
+
+
+
+	/**
+	 * 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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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(), __('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
+	 */
+	public static function venue_categories($VNU_ID = 0, $hide_uncategorized = true)
+	{
+		$category_links = array();
+		$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) != __('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
+	 */
+	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
+	 */
+	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
+	 */
+	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;" . __('(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);
+				break;
+
+				case 'website':
+					return EEH_Venue_View::venue_website_link($venue->ID(), $venue_name);
+				break;
+
+				default:
+					return $venue_name;
+			}
+		}
+		return '';
+	}
+
+
+
+	/**
+	 *    venue_details_link
+	 *
+	 * @access    public
+	 * @param int $VNU_ID
+	 * @param    string $text
+	 * @return string
+	 */
+	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
+	 */
+	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) : '';
+		}
+		return '';
+	}
+
+
+
+	/**
+	 *    venue_phone
+	 *
+	 * @access    public
+	 * @param int $VNU_ID
+	 * @return string
+	 */
+	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
+	 */
+	public static function venue_gmap($VNU_ID = 0, $map_ID = false, $gmap = array())
+	{
+
+		$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 = array();
+				$options['map_ID'] = $map_ID && $map_ID != $venue->ID() ? $map_ID . '-' . $venue->ID()/* . '-' . $static_map_id*/ : $venue->ID()/* . '-' . $static_map_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 $atts like EEH_Maps::google_map_link
+	 * @return string
+	 */
+	public static function espresso_google_static_map(EE_Venue $venue, $atts = array())
+	{
+		$state = $venue->state_obj();
+		$country = $venue->country_obj();
+		$atts = shortcode_atts(
+			array(
+					'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
+					),
+			$atts
+		);
+		return EEH_Maps::google_map_link($atts);
+	}
+
+
+
+	/**
+	 *    edit_venue_link
+	 *
+	 * @access    public
+	 * @param int $VNU_ID
+	 * @param string $link
+	 * @param string $before
+	 * @param string $after
+	 * @return string
+	 */
+	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 : __('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(array( '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 '';
+	}
 }