eventespresso / event-espresso-core

core/EE_Encryption.core.php

Doc Comments +1 added lines, -1 removed lines

@@ -396,7 +396,7 @@
 
     /**
      * @see http://stackoverflow.com/questions/2556345/detect-base64-encoding-in-php#30231906
-     * @param $string
+     * @param string $string
      * @return bool
      */
     protected function valid_base_64($string)

Indentation +663 added lines, -663 removed lines

@@ -16,669 +16,669 @@
 class EE_Encryption
 {
 
-    /**
-     * 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_mcrypt
-     */
-    protected $_use_mcrypt = 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;
-        } else if (extension_loaded('mcrypt')) {
-            $this->_use_mcrypt = 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 (! self::$_instance instanceof EE_Encryption) {
-            self::$_instance = new self();
-        }
-        return self::$_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
-     */
-    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
-        return base64_decode($encoded_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
-     */
-    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
-        return base64_decode($encoded_string);
-    }
-
-
-
-    /**
-     * encrypts data using PHP's openssl functions
-     *
-     * @param string $text_string the text to be encrypted
-     * @return string
-     * @throws RuntimeException
-     */
-    protected function openssl_encrypt($text_string = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($text_string)) {
-            return $text_string;
-        }
-        $this->cipher_method = $this->getCipherMethod();
-        // 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(),
-            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
-     * @return string
-     * @throws RuntimeException
-     */
-    protected function openssl_decrypt($encrypted_text = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($encrypted_text)) {
-            return $encrypted_text;
-        }
-        // decode
-        $encrypted_text = $this->valid_base_64($encrypted_text)
-            ? base64_decode($encrypted_text)
-            : $encrypted_text;
-        $encrypted_components = explode(
-            EE_Encryption::OPENSSL_IV_DELIMITER,
-            $encrypted_text,
-            2
-        );
-        // check that iv exists, and if not, maybe text was encoded using mcrypt?
-        if ($this->_use_mcrypt && ! isset($encrypted_components[1])) {
-            return $this->m_decrypt($encrypted_text);
-        }
-        // decrypt it
-        $decrypted_text = openssl_decrypt(
-            $encrypted_components[0],
-            $this->getCipherMethod(),
-            $this->getDigestHashValue(),
-            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
-     * @return string
-     * @throws RuntimeException
-     */
-    protected function getDigestHashValue($digest_method = EE_Encryption::OPENSSL_DIGEST_METHOD){
-        $digest_hash_value = openssl_digest($this->get_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)
-            ? base64_decode($encrypted_text)
-            : $encrypted_text;
-        if (
-            $this->_use_mcrypt
-            && strpos($encrypted_text, EE_Encryption::ACME_ENCRYPTION_FLAG) === false
-        ){
-            return $this->m_decrypt($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;
-    }
-
-
-
-    /**
-     * encrypts data using PHP's mcrypt functions
-     *
-     * @deprecated 4.9.39
-     * @param string $text_string
-     * @internal   param $string - the text to be encrypted
-     * @return string
-     * @throws RuntimeException
-     */
-    protected function m_encrypt($text_string = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($text_string)) {
-            return $text_string;
-        }
-        // get the initialization vector size
-        $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
-        // initialization vector
-        $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
-        if ($iv === false) {
-            throw new RuntimeException(
-                esc_html__('Failed to generate mcrypt initialization vector.', 'event_espresso')
-            );
-        }
-        // encrypt it
-        $encrypted_text = mcrypt_encrypt(
-            MCRYPT_RIJNDAEL_256,
-            $this->get_encryption_key(),
-            $text_string,
-            MCRYPT_MODE_ECB,
-            $iv
-        );
-        // trim and maybe encode
-        return $this->_use_base64_encode
-            ? trim(base64_encode($encrypted_text))
-            : trim($encrypted_text);
-    }
-
-
-
-    /**
-     * decrypts data that has been encrypted with PHP's mcrypt functions
-     *
-     * @deprecated 4.9.39
-     * @param string $encrypted_text the text to be decrypted
-     * @return string
-     * @throws RuntimeException
-     */
-    protected function m_decrypt($encrypted_text = '')
-    {
-        // you give me nothing??? GET OUT !
-        if (empty($encrypted_text)) {
-            return $encrypted_text;
-        }
-        // decode
-        $encrypted_text = $this->valid_base_64($encrypted_text)
-            ? base64_decode($encrypted_text)
-            : $encrypted_text;
-        // get the initialization vector size
-        $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
-        $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
-        if ($iv === false) {
-            throw new RuntimeException(
-                esc_html__('Failed to generate mcrypt initialization vector.', 'event_espresso')
-            );
-        }
-        // decrypt it
-        $decrypted_text = mcrypt_decrypt(
-            MCRYPT_RIJNDAEL_256,
-            $this->get_encryption_key(),
-            $encrypted_text,
-            MCRYPT_MODE_ECB,
-            $iv
-        );
-        $decrypted_text = trim($decrypted_text);
-        return $decrypted_text;
-    }
+	/**
+	 * 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_mcrypt
+	 */
+	protected $_use_mcrypt = 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;
+		} else if (extension_loaded('mcrypt')) {
+			$this->_use_mcrypt = 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 (! self::$_instance instanceof EE_Encryption) {
+			self::$_instance = new self();
+		}
+		return self::$_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
+	 */
+	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
+		return base64_decode($encoded_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
+	 */
+	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
+		return base64_decode($encoded_string);
+	}
+
+
+
+	/**
+	 * encrypts data using PHP's openssl functions
+	 *
+	 * @param string $text_string the text to be encrypted
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	protected function openssl_encrypt($text_string = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($text_string)) {
+			return $text_string;
+		}
+		$this->cipher_method = $this->getCipherMethod();
+		// 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(),
+			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
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	protected function openssl_decrypt($encrypted_text = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($encrypted_text)) {
+			return $encrypted_text;
+		}
+		// decode
+		$encrypted_text = $this->valid_base_64($encrypted_text)
+			? base64_decode($encrypted_text)
+			: $encrypted_text;
+		$encrypted_components = explode(
+			EE_Encryption::OPENSSL_IV_DELIMITER,
+			$encrypted_text,
+			2
+		);
+		// check that iv exists, and if not, maybe text was encoded using mcrypt?
+		if ($this->_use_mcrypt && ! isset($encrypted_components[1])) {
+			return $this->m_decrypt($encrypted_text);
+		}
+		// decrypt it
+		$decrypted_text = openssl_decrypt(
+			$encrypted_components[0],
+			$this->getCipherMethod(),
+			$this->getDigestHashValue(),
+			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
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	protected function getDigestHashValue($digest_method = EE_Encryption::OPENSSL_DIGEST_METHOD){
+		$digest_hash_value = openssl_digest($this->get_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)
+			? base64_decode($encrypted_text)
+			: $encrypted_text;
+		if (
+			$this->_use_mcrypt
+			&& strpos($encrypted_text, EE_Encryption::ACME_ENCRYPTION_FLAG) === false
+		){
+			return $this->m_decrypt($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;
+	}
+
+
+
+	/**
+	 * encrypts data using PHP's mcrypt functions
+	 *
+	 * @deprecated 4.9.39
+	 * @param string $text_string
+	 * @internal   param $string - the text to be encrypted
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	protected function m_encrypt($text_string = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($text_string)) {
+			return $text_string;
+		}
+		// get the initialization vector size
+		$iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
+		// initialization vector
+		$iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
+		if ($iv === false) {
+			throw new RuntimeException(
+				esc_html__('Failed to generate mcrypt initialization vector.', 'event_espresso')
+			);
+		}
+		// encrypt it
+		$encrypted_text = mcrypt_encrypt(
+			MCRYPT_RIJNDAEL_256,
+			$this->get_encryption_key(),
+			$text_string,
+			MCRYPT_MODE_ECB,
+			$iv
+		);
+		// trim and maybe encode
+		return $this->_use_base64_encode
+			? trim(base64_encode($encrypted_text))
+			: trim($encrypted_text);
+	}
+
+
+
+	/**
+	 * decrypts data that has been encrypted with PHP's mcrypt functions
+	 *
+	 * @deprecated 4.9.39
+	 * @param string $encrypted_text the text to be decrypted
+	 * @return string
+	 * @throws RuntimeException
+	 */
+	protected function m_decrypt($encrypted_text = '')
+	{
+		// you give me nothing??? GET OUT !
+		if (empty($encrypted_text)) {
+			return $encrypted_text;
+		}
+		// decode
+		$encrypted_text = $this->valid_base_64($encrypted_text)
+			? base64_decode($encrypted_text)
+			: $encrypted_text;
+		// get the initialization vector size
+		$iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
+		$iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
+		if ($iv === false) {
+			throw new RuntimeException(
+				esc_html__('Failed to generate mcrypt initialization vector.', 'event_espresso')
+			);
+		}
+		// decrypt it
+		$decrypted_text = mcrypt_decrypt(
+			MCRYPT_RIJNDAEL_256,
+			$this->get_encryption_key(),
+			$encrypted_text,
+			MCRYPT_MODE_ECB,
+			$iv
+		);
+		$decrypted_text = trim($decrypted_text);
+		return $decrypted_text;
+	}
 
 }
 /* End of file EE_Encryption.class.php */

Spacing +13 added lines, -13 removed lines

@@ -95,7 +95,7 @@ 
      */
     protected function __construct()
     {
-        if (! defined('ESPRESSO_ENCRYPT')) {
+        if ( ! defined('ESPRESSO_ENCRYPT')) {
             define('ESPRESSO_ENCRYPT', true);
         }
         if (extension_loaded('openssl')) {
@@ -118,7 +118,7 @@ 
     public static function instance()
     {
         // check if class object is instantiated
-        if (! self::$_instance instanceof EE_Encryption) {
+        if ( ! self::$_instance instanceof EE_Encryption) {
             self::$_instance = new self();
         }
         return self::$_instance;
@@ -314,7 +314,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))
@@ -337,7 +337,7 @@ 
      */
     protected function getCipherMethod($cipher_method = EE_Encryption::OPENSSL_CIPHER_METHOD)
     {
-        if($this->cipher_method !== ''){
+        if ($this->cipher_method !== '') {
             return $this->cipher_method;
         }
         // verify that the default cipher method can produce an initialization vector
@@ -345,7 +345,7 @@ 
             // 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) {
+            if ($cipher_method === '' || openssl_cipher_iv_length($cipher_method) === false) {
                 $cipher_method = $this->getAvailableCipherMethod($cipher_method);
             }
         }
@@ -371,7 +371,7 @@ 
                 // then grab the first item from the list
                 $cipher_method = reset($this->cipher_methods);
             }
-            if($cipher_method === false){
+            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.',
@@ -442,7 +442,7 @@ 
      * @return string
      * @throws RuntimeException
      */
-    protected function getDigestHashValue($digest_method = EE_Encryption::OPENSSL_DIGEST_METHOD){
+    protected function getDigestHashValue($digest_method = EE_Encryption::OPENSSL_DIGEST_METHOD) {
         $digest_hash_value = openssl_digest($this->get_encryption_key(), $digest_method);
         if ($digest_hash_value === false) {
             return $this->getDigestHashValue($this->getDigestMethod());
@@ -460,7 +460,7 @@ 
      * @return string
      * @throws \RuntimeException
      */
-    protected function getDigestMethod(){
+    protected function getDigestMethod() {
         $digest_method = prev($this->digest_methods);
         if (empty($this->digest_methods)) {
             $this->digest_methods = openssl_get_md_methods();
@@ -534,7 +534,7 @@ 
         if (
             $this->_use_mcrypt
             && strpos($encrypted_text, EE_Encryption::ACME_ENCRYPTION_FLAG) === false
-        ){
+        ) {
             return $this->m_decrypt($encrypted_text);
         }
         $encrypted_text = substr($encrypted_text, 0, -4);
@@ -564,16 +564,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
@@ -594,7 +594,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;

caffeinated/admin/extend/messages/Custom_Messages_Template_List_Table.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -409,7 +409,7 @@
      * This provides a count of events using this custom template
      *
      * @param  EE_Message_Template_Group $item message_template group data
-     * @return string column output
+     * @return integer column output
      */
     function column_events($item)
     {

Indentation +476 added lines, -476 removed lines

@@ -12,481 +12,481 @@
 class Custom_Messages_Template_List_Table extends EE_Admin_List_Table
 {
 
-    /**
-     * Custom_Messages_Template_List_Table constructor.
-     *
-     * @param EE_Admin_Page $admin_page
-     */
-    public function __construct($admin_page)
-    {
-        //Set parent defaults
-        parent::__construct($admin_page);
-    }
-
-
-    /**
-     * @return Messages_Admin_Page
-     */
-    public function get_admin_page()
-    {
-        return $this->_admin_page;
-    }
-
-    /**
-     * Setup initial data.
-     */
-    protected function _setup_data()
-    {
-        $this->_data           = $this->get_admin_page()->get_message_templates(
-            $this->_per_page,
-            $this->_view,
-            false,
-            false,
-            false
-        );
-        $this->_all_data_count = $this->get_admin_page()->get_message_templates(
-            $this->_per_page,
-            $this->_view,
-            true,
-            true,
-            false
-        );
-    }
-
-
-    /**
-     * Set initial properties
-     */
-    protected function _set_properties()
-    {
-        $this->_wp_list_args = array(
-            'singular' => esc_html__('Message Template Group', 'event_espresso'),
-            'plural'   => esc_html__('Message Template', 'event_espresso'),
-            'ajax'     => true, //for now,
-            'screen'   => $this->get_admin_page()->get_current_screen()->id,
-        );
-
-        $this->_columns = array(
-            'cb'           => '<input type="checkbox" />',
-            'name'         => esc_html__('Template Name', 'event_espresso'),
-            'message_type' => esc_html__('Message Type', 'event_espresso'),
-            'messenger'    => esc_html__('Messenger', 'event_espresso'),
-            'description'  => esc_html__('Description', 'event_espresso'),
-            'events'       => esc_html__('Events', 'event_espresso'),
-            //count of events using this template.
-            'actions'      => ''
-        );
-
-        $this->_sortable_columns = array(
-            'messenger' => array('MTP_messenger' => true),
-        );
-
-        $this->_hidden_columns = array();
-    }
-
-
-    /**
-     * Overriding the single_row method from parent to verify whether the $item has an accessible
-     * message_type or messenger object before generating the row.
-     *
-     * @param EE_Message_Template_Group $item
-     * @return string
-     */
-    public function single_row($item)
-    {
-        $message_type = $item->message_type_obj();
-        $messenger    = $item->messenger_obj();
-
-        if (! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger) {
-            echo '';
-            return;
-        }
-
-        parent::single_row($item);
-    }
-
-
-    /**
-     * @return array
-     */
-    protected function _get_table_filters()
-    {
-        $filters = array();
-
-        //get select inputs
-        $select_inputs = array(
-            $this->_get_messengers_dropdown_filter(),
-            $this->_get_message_types_dropdown_filter(),
-        );
-
-        //set filters to select inputs if they aren't empty
-        foreach ($select_inputs as $select_input) {
-            if ($select_input) {
-                $filters[] = $select_input;
-            }
-        }
-        return $filters;
-    }
-
-    /**
-     * we're just removing the search box for message templates, not needed.
-     *
-     * @return string (empty);
-     */
-    function search_box($text, $input_id)
-    {
-        return '';
-    }
-
-
-    /**
-     * Set the view counts on the _views property
-     */
-    protected function _add_view_counts()
-    {
-        foreach ($this->_views as $view => $args) {
-            $this->_views[$view]['count'] = $this->get_admin_page()->get_message_templates(
-                $this->_per_page,
-                $view,
-                true,
-                true,
-                false
-            );
-        }
-    }
-
-
-    /**
-     * Custom message for when there are no items found.
-     *
-     * @since 4.3.0
-     * @return string
-     */
-    public function no_items()
-    {
-        if ($this->_view !== 'trashed') {
-            printf(
-                esc_html__(
-                    '%sNo Custom Templates found.%s To create your first custom message template, go to the "Default Message Templates" tab and click the "Create Custom" button next to the template you want to use as a base for the new one.',
-                    'event_espresso'
-                ),
-                '<strong>',
-                '</strong>'
-            );
-        } else {
-            parent::no_items();
-        }
-    }
-
-
-    /**
-     * @param EE_Message_Template_Group $item
-     * @return string
-     */
-    public function column_cb($item)
-    {
-        return sprintf('<input type="checkbox" name="checkbox[%s] value="1" />', $item->GRP_ID());
-    }
-
-
-    /**
-     * @param EE_Message_Template_Group $item
-     * @return string
-     */
-    function column_name($item)
-    {
-        return '<p>' . $item->name() . '</p>';
-    }
-
-
-    /**
-     * @param EE_Message_Template_Group $item
-     * @return string
-     */
-    function column_description($item)
-    {
-        return '<p>' . $item->description() . '</p>';
-    }
-
-
-    /**
-     * @param EE_Message_Template_Group $item
-     * @return string
-     */
-    function column_actions($item)
-    {
-        if (EE_Registry::instance()->CAP->current_user_can(
-            'ee_edit_messages',
-            'espresso_messages_add_new_message_template'
-        )) {
-            $create_args = array(
-                'GRP_ID'       => $item->ID(),
-                'messenger'    => $item->messenger(),
-                'message_type' => $item->message_type(),
-                'action'       => 'add_new_message_template',
-            );
-            $create_link = EE_Admin_Page::add_query_args_and_nonce($create_args, EE_MSG_ADMIN_URL);
-            return sprintf(
-                '<p><a href="%s" class="button button-small">%s</a></p>',
-                $create_link,
-                esc_html__('Create Custom', 'event_espresso')
-            );
-        }
-        return '';
-    }
-
-
-    /**
-     * Return the content for the messenger column
-     * @param EE_Message_Template_Group $item
-     * @return string
-     */
-    function column_messenger($item)
-    {
-
-        //Build row actions
-        $actions = array();
-        $edit_lnk_url = '';
-
-        // edit link but only if item isn't trashed.
-        if (! $item->get('MTP_deleted')
-            && EE_Registry::instance()->CAP->current_user_can(
-                'ee_edit_message',
-                'espresso_messages_edit_message_template',
-                $item->ID()
-            )
-        ) {
-            $edit_lnk_url    = EE_Admin_Page::add_query_args_and_nonce(array(
-                'action' => 'edit_message_template',
-                'id'     => $item->GRP_ID(),
-            ), EE_MSG_ADMIN_URL);
-            $actions['edit'] = '<a href="' . $edit_lnk_url . '"'
-                               . ' class="' . $item->message_type() . '-edit-link"'
-                               . ' title="'
-                               . esc_attr__('Edit Template', 'event_espresso')
-                               . '">'
-                               . esc_html__('Edit', 'event_espresso')
-                               . '</a>';
-        }
-
-        $name_link     = ! $item->get('MTP_deleted')
-                         && EE_Registry::instance()->CAP->current_user_can(
-                             'ee_edit_message',
-                             'espresso_messages_edit_message_template',
-                             $item->ID()
-                         )
-                        && $edit_lnk_url
-            ? '<a href="'
-              . $edit_lnk_url
-              . '" title="'
-              . esc_attr__('Edit Template', 'event_espresso')
-              . '">'
-              . ucwords($item->messenger_obj()->label['singular'])
-              . '</a>'
-            : ucwords($item->messenger_obj()->label['singular']);
-        $trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'   => 'trash_message_template',
-                                                                       'id'       => $item->GRP_ID(),
-                                                                       'noheader' => true,
-        ), EE_MSG_ADMIN_URL);
-        // restore link
-        $restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'   => 'restore_message_template',
-                                                                         'id'       => $item->GRP_ID(),
-                                                                         'noheader' => true,
-        ), EE_MSG_ADMIN_URL);
-        // delete price link
-        $delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'   => 'delete_message_template',
-                                                                        'id'       => $item->GRP_ID(),
-                                                                        'noheader' => true,
-        ), EE_MSG_ADMIN_URL);
-
-        if (! $item->get('MTP_deleted')
-            && EE_Registry::instance()->CAP->current_user_can(
-                'ee_delete_message',
-                'espresso_messages_trash_message_template',
-                $item->ID()
-            )
-        ) {
-            $actions['trash'] = '<a href="'
-                                . $trash_lnk_url
-                                . '" title="'
-                                . esc_attr__('Move Template Group to Trash', 'event_espresso')
-                                . '">'
-                                . esc_html__('Move to Trash', 'event_espresso')
-                                . '</a>';
-        } else {
-            if (EE_Registry::instance()->CAP->current_user_can(
-                'ee_delete_message',
-                'espresso_messages_restore_message_template',
-                $item->ID()
-            )) {
-                $actions['restore'] = '<a href="'
-                                      . $restore_lnk_url
-                                      . '" title="'
-                                      . esc_attr__('Restore Message Template', 'event_espresso')
-                                      . '">'
-                                      . esc_html__('Restore', 'event_espresso') . '</a>';
-            }
-
-            if ($this->_view == 'trashed'
-                && EE_Registry::instance()->CAP->current_user_can(
-                    'ee_delete_message',
-                    'espresso_messages_delete_message_template',
-                    $item->ID()
-                )) {
-                $actions['delete'] = '<a href="'
-                                     . $delete_lnk_url
-                                     . '" title="'
-                                     . esc_attr__('Delete Template Group Permanently', 'event_espresso')
-                                     . '">'
-                                     . esc_html__('Delete Permanently', 'event_espresso')
-                                     . '</a>';
-            }
-        }
-
-        //we want to display the contexts in here so we need to set them up
-        $c_label           = $item->context_label();
-        $c_configs         = $item->contexts_config();
-        $ctxt              = array();
-        $context_templates = $item->context_templates();
-        foreach ($context_templates as $context => $template_fields) {
-            $mtp_to        = ! empty($context_templates[$context]['to'])
-                             && $context_templates[$context]['to'] instanceof EE_Message_Template
-                ? $context_templates[$context]['to']->get('MTP_content')
-                : null;
-            $inactive      = empty($mtp_to) && ! empty($context_templates[$context]['to'])
-                ? ' class="mtp-inactive"'
-                : '';
-            $context_title = ucwords($c_configs[$context]['label']);
-            $edit_link     = EE_Admin_Page::add_query_args_and_nonce(array('action'  => 'edit_message_template',
-                                                                           'id'      => $item->GRP_ID(),
-                                                                           'context' => $context,
-            ), EE_MSG_ADMIN_URL);
-            $ctxt[]        = EE_Registry::instance()->CAP->current_user_can(
-                'ee_edit_message',
-                'espresso_messages_edit_message_template',
-                $item->ID()
-            )
-                ? '<a'
-                  . $inactive
-                  . ' class="' . $item->message_type() . '-' . $context . '-edit-link"'
-                  . ' href="' . $edit_link . '"'
-                  . ' title="' . esc_attr__('Edit Context', 'event_espresso') . '">'
-                  . $context_title
-                  . '</a>'
-                : $context_title;
-        }
-
-        $ctx_content = ! $item->get('MTP_deleted')
-                       && EE_Registry::instance()->CAP->current_user_can(
-                           'ee_edit_message',
-                           'espresso_messages_edit_message_template',
-                           $item->ID()
-                       )
-            ? sprintf(
-                '<strong>%s:</strong> ',
-                ucwords($c_label['plural'])
-            )
-              . implode(' | ', $ctxt)
-            : '';
-
-
-        //Return the name contents
-        return sprintf(
-            '%1$s <span style="color:silver">(id:%2$s)</span><br />%3$s%4$s',
-            /* $1%s */
-            $name_link,
-            /* $2%s */
-            $item->GRP_ID(),
-            /* %4$s */
-            $ctx_content,
-            /* $3%s */
-            $this->row_actions($actions)
-        );
-    }
-
-    /**
-     * column_events
-     * This provides a count of events using this custom template
-     *
-     * @param  EE_Message_Template_Group $item message_template group data
-     * @return string column output
-     */
-    function column_events($item)
-    {
-        return $item->count_events();
-    }
-
-    /**
-     * column_message_type
-     *
-     * @param  EE_Message_Template_Group $item message info for the row
-     * @return string       message_type name
-     */
-    function column_message_type($item)
-    {
-        return ucwords($item->message_type_obj()->label['singular']);
-    }
-
-
-    /**
-     * Generate dropdown filter select input for messengers
-     *
-     * @return string
-     */
-    protected function _get_messengers_dropdown_filter()
-    {
-        $messenger_options                                   = array();
-        $active_message_template_groups_grouped_by_messenger = EEM_Message_Template_Group::instance()->get_all(
-            array(
-                array(
-                    'MTP_is_active' => true,
-                    'MTP_is_global' => false,
-                ),
-                'group_by' => 'MTP_messenger',
-            )
-        );
-
-        foreach ($active_message_template_groups_grouped_by_messenger as $active_message_template_group) {
-            if ($active_message_template_group instanceof EE_Message_Template_Group) {
-                $messenger                                                      = $active_message_template_group->messenger_obj();
-                $messenger_label                                                = $messenger instanceof EE_messenger
-                    ? $messenger->label['singular']
-                    : $active_message_template_group->messenger();
-                $messenger_options[$active_message_template_group->messenger()] = ucwords($messenger_label);
-            }
-        }
-        return $this->get_admin_page()->get_messengers_select_input($messenger_options);
-    }
-
-
-    /**
-     * Generate dropdown filter select input for message types
-     *
-     * @return string
-     */
-    protected function _get_message_types_dropdown_filter()
-    {
-        $message_type_options                                   = array();
-        $active_message_template_groups_grouped_by_message_type = EEM_Message_Template_Group::instance()->get_all(
-            array(
-                array(
-                    'MTP_is_active' => true,
-                    'MTP_is_global' => false,
-                ),
-                'group_by' => 'MTP_message_type',
-            )
-        );
-
-        foreach ($active_message_template_groups_grouped_by_message_type as $active_message_template_group) {
-            if ($active_message_template_group instanceof EE_Message_Template_Group) {
-                $message_type                                                         = $active_message_template_group->message_type_obj();
-                $message_type_label                                                   = $message_type instanceof EE_message_type
-                    ? $message_type->label['singular']
-                    : $active_message_template_group->message_type();
-                $message_type_options[$active_message_template_group->message_type()] = ucwords($message_type_label);
-            }
-        }
-        return $this->get_admin_page()->get_message_types_select_input($message_type_options);
-    }
+	/**
+	 * Custom_Messages_Template_List_Table constructor.
+	 *
+	 * @param EE_Admin_Page $admin_page
+	 */
+	public function __construct($admin_page)
+	{
+		//Set parent defaults
+		parent::__construct($admin_page);
+	}
+
+
+	/**
+	 * @return Messages_Admin_Page
+	 */
+	public function get_admin_page()
+	{
+		return $this->_admin_page;
+	}
+
+	/**
+	 * Setup initial data.
+	 */
+	protected function _setup_data()
+	{
+		$this->_data           = $this->get_admin_page()->get_message_templates(
+			$this->_per_page,
+			$this->_view,
+			false,
+			false,
+			false
+		);
+		$this->_all_data_count = $this->get_admin_page()->get_message_templates(
+			$this->_per_page,
+			$this->_view,
+			true,
+			true,
+			false
+		);
+	}
+
+
+	/**
+	 * Set initial properties
+	 */
+	protected function _set_properties()
+	{
+		$this->_wp_list_args = array(
+			'singular' => esc_html__('Message Template Group', 'event_espresso'),
+			'plural'   => esc_html__('Message Template', 'event_espresso'),
+			'ajax'     => true, //for now,
+			'screen'   => $this->get_admin_page()->get_current_screen()->id,
+		);
+
+		$this->_columns = array(
+			'cb'           => '<input type="checkbox" />',
+			'name'         => esc_html__('Template Name', 'event_espresso'),
+			'message_type' => esc_html__('Message Type', 'event_espresso'),
+			'messenger'    => esc_html__('Messenger', 'event_espresso'),
+			'description'  => esc_html__('Description', 'event_espresso'),
+			'events'       => esc_html__('Events', 'event_espresso'),
+			//count of events using this template.
+			'actions'      => ''
+		);
+
+		$this->_sortable_columns = array(
+			'messenger' => array('MTP_messenger' => true),
+		);
+
+		$this->_hidden_columns = array();
+	}
+
+
+	/**
+	 * Overriding the single_row method from parent to verify whether the $item has an accessible
+	 * message_type or messenger object before generating the row.
+	 *
+	 * @param EE_Message_Template_Group $item
+	 * @return string
+	 */
+	public function single_row($item)
+	{
+		$message_type = $item->message_type_obj();
+		$messenger    = $item->messenger_obj();
+
+		if (! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger) {
+			echo '';
+			return;
+		}
+
+		parent::single_row($item);
+	}
+
+
+	/**
+	 * @return array
+	 */
+	protected function _get_table_filters()
+	{
+		$filters = array();
+
+		//get select inputs
+		$select_inputs = array(
+			$this->_get_messengers_dropdown_filter(),
+			$this->_get_message_types_dropdown_filter(),
+		);
+
+		//set filters to select inputs if they aren't empty
+		foreach ($select_inputs as $select_input) {
+			if ($select_input) {
+				$filters[] = $select_input;
+			}
+		}
+		return $filters;
+	}
+
+	/**
+	 * we're just removing the search box for message templates, not needed.
+	 *
+	 * @return string (empty);
+	 */
+	function search_box($text, $input_id)
+	{
+		return '';
+	}
+
+
+	/**
+	 * Set the view counts on the _views property
+	 */
+	protected function _add_view_counts()
+	{
+		foreach ($this->_views as $view => $args) {
+			$this->_views[$view]['count'] = $this->get_admin_page()->get_message_templates(
+				$this->_per_page,
+				$view,
+				true,
+				true,
+				false
+			);
+		}
+	}
+
+
+	/**
+	 * Custom message for when there are no items found.
+	 *
+	 * @since 4.3.0
+	 * @return string
+	 */
+	public function no_items()
+	{
+		if ($this->_view !== 'trashed') {
+			printf(
+				esc_html__(
+					'%sNo Custom Templates found.%s To create your first custom message template, go to the "Default Message Templates" tab and click the "Create Custom" button next to the template you want to use as a base for the new one.',
+					'event_espresso'
+				),
+				'<strong>',
+				'</strong>'
+			);
+		} else {
+			parent::no_items();
+		}
+	}
+
+
+	/**
+	 * @param EE_Message_Template_Group $item
+	 * @return string
+	 */
+	public function column_cb($item)
+	{
+		return sprintf('<input type="checkbox" name="checkbox[%s] value="1" />', $item->GRP_ID());
+	}
+
+
+	/**
+	 * @param EE_Message_Template_Group $item
+	 * @return string
+	 */
+	function column_name($item)
+	{
+		return '<p>' . $item->name() . '</p>';
+	}
+
+
+	/**
+	 * @param EE_Message_Template_Group $item
+	 * @return string
+	 */
+	function column_description($item)
+	{
+		return '<p>' . $item->description() . '</p>';
+	}
+
+
+	/**
+	 * @param EE_Message_Template_Group $item
+	 * @return string
+	 */
+	function column_actions($item)
+	{
+		if (EE_Registry::instance()->CAP->current_user_can(
+			'ee_edit_messages',
+			'espresso_messages_add_new_message_template'
+		)) {
+			$create_args = array(
+				'GRP_ID'       => $item->ID(),
+				'messenger'    => $item->messenger(),
+				'message_type' => $item->message_type(),
+				'action'       => 'add_new_message_template',
+			);
+			$create_link = EE_Admin_Page::add_query_args_and_nonce($create_args, EE_MSG_ADMIN_URL);
+			return sprintf(
+				'<p><a href="%s" class="button button-small">%s</a></p>',
+				$create_link,
+				esc_html__('Create Custom', 'event_espresso')
+			);
+		}
+		return '';
+	}
+
+
+	/**
+	 * Return the content for the messenger column
+	 * @param EE_Message_Template_Group $item
+	 * @return string
+	 */
+	function column_messenger($item)
+	{
+
+		//Build row actions
+		$actions = array();
+		$edit_lnk_url = '';
+
+		// edit link but only if item isn't trashed.
+		if (! $item->get('MTP_deleted')
+			&& EE_Registry::instance()->CAP->current_user_can(
+				'ee_edit_message',
+				'espresso_messages_edit_message_template',
+				$item->ID()
+			)
+		) {
+			$edit_lnk_url    = EE_Admin_Page::add_query_args_and_nonce(array(
+				'action' => 'edit_message_template',
+				'id'     => $item->GRP_ID(),
+			), EE_MSG_ADMIN_URL);
+			$actions['edit'] = '<a href="' . $edit_lnk_url . '"'
+							   . ' class="' . $item->message_type() . '-edit-link"'
+							   . ' title="'
+							   . esc_attr__('Edit Template', 'event_espresso')
+							   . '">'
+							   . esc_html__('Edit', 'event_espresso')
+							   . '</a>';
+		}
+
+		$name_link     = ! $item->get('MTP_deleted')
+						 && EE_Registry::instance()->CAP->current_user_can(
+							 'ee_edit_message',
+							 'espresso_messages_edit_message_template',
+							 $item->ID()
+						 )
+						&& $edit_lnk_url
+			? '<a href="'
+			  . $edit_lnk_url
+			  . '" title="'
+			  . esc_attr__('Edit Template', 'event_espresso')
+			  . '">'
+			  . ucwords($item->messenger_obj()->label['singular'])
+			  . '</a>'
+			: ucwords($item->messenger_obj()->label['singular']);
+		$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'   => 'trash_message_template',
+																	   'id'       => $item->GRP_ID(),
+																	   'noheader' => true,
+		), EE_MSG_ADMIN_URL);
+		// restore link
+		$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'   => 'restore_message_template',
+																		 'id'       => $item->GRP_ID(),
+																		 'noheader' => true,
+		), EE_MSG_ADMIN_URL);
+		// delete price link
+		$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'   => 'delete_message_template',
+																		'id'       => $item->GRP_ID(),
+																		'noheader' => true,
+		), EE_MSG_ADMIN_URL);
+
+		if (! $item->get('MTP_deleted')
+			&& EE_Registry::instance()->CAP->current_user_can(
+				'ee_delete_message',
+				'espresso_messages_trash_message_template',
+				$item->ID()
+			)
+		) {
+			$actions['trash'] = '<a href="'
+								. $trash_lnk_url
+								. '" title="'
+								. esc_attr__('Move Template Group to Trash', 'event_espresso')
+								. '">'
+								. esc_html__('Move to Trash', 'event_espresso')
+								. '</a>';
+		} else {
+			if (EE_Registry::instance()->CAP->current_user_can(
+				'ee_delete_message',
+				'espresso_messages_restore_message_template',
+				$item->ID()
+			)) {
+				$actions['restore'] = '<a href="'
+									  . $restore_lnk_url
+									  . '" title="'
+									  . esc_attr__('Restore Message Template', 'event_espresso')
+									  . '">'
+									  . esc_html__('Restore', 'event_espresso') . '</a>';
+			}
+
+			if ($this->_view == 'trashed'
+				&& EE_Registry::instance()->CAP->current_user_can(
+					'ee_delete_message',
+					'espresso_messages_delete_message_template',
+					$item->ID()
+				)) {
+				$actions['delete'] = '<a href="'
+									 . $delete_lnk_url
+									 . '" title="'
+									 . esc_attr__('Delete Template Group Permanently', 'event_espresso')
+									 . '">'
+									 . esc_html__('Delete Permanently', 'event_espresso')
+									 . '</a>';
+			}
+		}
+
+		//we want to display the contexts in here so we need to set them up
+		$c_label           = $item->context_label();
+		$c_configs         = $item->contexts_config();
+		$ctxt              = array();
+		$context_templates = $item->context_templates();
+		foreach ($context_templates as $context => $template_fields) {
+			$mtp_to        = ! empty($context_templates[$context]['to'])
+							 && $context_templates[$context]['to'] instanceof EE_Message_Template
+				? $context_templates[$context]['to']->get('MTP_content')
+				: null;
+			$inactive      = empty($mtp_to) && ! empty($context_templates[$context]['to'])
+				? ' class="mtp-inactive"'
+				: '';
+			$context_title = ucwords($c_configs[$context]['label']);
+			$edit_link     = EE_Admin_Page::add_query_args_and_nonce(array('action'  => 'edit_message_template',
+																		   'id'      => $item->GRP_ID(),
+																		   'context' => $context,
+			), EE_MSG_ADMIN_URL);
+			$ctxt[]        = EE_Registry::instance()->CAP->current_user_can(
+				'ee_edit_message',
+				'espresso_messages_edit_message_template',
+				$item->ID()
+			)
+				? '<a'
+				  . $inactive
+				  . ' class="' . $item->message_type() . '-' . $context . '-edit-link"'
+				  . ' href="' . $edit_link . '"'
+				  . ' title="' . esc_attr__('Edit Context', 'event_espresso') . '">'
+				  . $context_title
+				  . '</a>'
+				: $context_title;
+		}
+
+		$ctx_content = ! $item->get('MTP_deleted')
+					   && EE_Registry::instance()->CAP->current_user_can(
+						   'ee_edit_message',
+						   'espresso_messages_edit_message_template',
+						   $item->ID()
+					   )
+			? sprintf(
+				'<strong>%s:</strong> ',
+				ucwords($c_label['plural'])
+			)
+			  . implode(' | ', $ctxt)
+			: '';
+
+
+		//Return the name contents
+		return sprintf(
+			'%1$s <span style="color:silver">(id:%2$s)</span><br />%3$s%4$s',
+			/* $1%s */
+			$name_link,
+			/* $2%s */
+			$item->GRP_ID(),
+			/* %4$s */
+			$ctx_content,
+			/* $3%s */
+			$this->row_actions($actions)
+		);
+	}
+
+	/**
+	 * column_events
+	 * This provides a count of events using this custom template
+	 *
+	 * @param  EE_Message_Template_Group $item message_template group data
+	 * @return string column output
+	 */
+	function column_events($item)
+	{
+		return $item->count_events();
+	}
+
+	/**
+	 * column_message_type
+	 *
+	 * @param  EE_Message_Template_Group $item message info for the row
+	 * @return string       message_type name
+	 */
+	function column_message_type($item)
+	{
+		return ucwords($item->message_type_obj()->label['singular']);
+	}
+
+
+	/**
+	 * Generate dropdown filter select input for messengers
+	 *
+	 * @return string
+	 */
+	protected function _get_messengers_dropdown_filter()
+	{
+		$messenger_options                                   = array();
+		$active_message_template_groups_grouped_by_messenger = EEM_Message_Template_Group::instance()->get_all(
+			array(
+				array(
+					'MTP_is_active' => true,
+					'MTP_is_global' => false,
+				),
+				'group_by' => 'MTP_messenger',
+			)
+		);
+
+		foreach ($active_message_template_groups_grouped_by_messenger as $active_message_template_group) {
+			if ($active_message_template_group instanceof EE_Message_Template_Group) {
+				$messenger                                                      = $active_message_template_group->messenger_obj();
+				$messenger_label                                                = $messenger instanceof EE_messenger
+					? $messenger->label['singular']
+					: $active_message_template_group->messenger();
+				$messenger_options[$active_message_template_group->messenger()] = ucwords($messenger_label);
+			}
+		}
+		return $this->get_admin_page()->get_messengers_select_input($messenger_options);
+	}
+
+
+	/**
+	 * Generate dropdown filter select input for message types
+	 *
+	 * @return string
+	 */
+	protected function _get_message_types_dropdown_filter()
+	{
+		$message_type_options                                   = array();
+		$active_message_template_groups_grouped_by_message_type = EEM_Message_Template_Group::instance()->get_all(
+			array(
+				array(
+					'MTP_is_active' => true,
+					'MTP_is_global' => false,
+				),
+				'group_by' => 'MTP_message_type',
+			)
+		);
+
+		foreach ($active_message_template_groups_grouped_by_message_type as $active_message_template_group) {
+			if ($active_message_template_group instanceof EE_Message_Template_Group) {
+				$message_type                                                         = $active_message_template_group->message_type_obj();
+				$message_type_label                                                   = $message_type instanceof EE_message_type
+					? $message_type->label['singular']
+					: $active_message_template_group->message_type();
+				$message_type_options[$active_message_template_group->message_type()] = ucwords($message_type_label);
+			}
+		}
+		return $this->get_admin_page()->get_message_types_select_input($message_type_options);
+	}
 
 }

Spacing +15 added lines, -15 removed lines

@@ -37,7 +37,7 @@ 
      */
     protected function _setup_data()
     {
-        $this->_data           = $this->get_admin_page()->get_message_templates(
+        $this->_data = $this->get_admin_page()->get_message_templates(
             $this->_per_page,
             $this->_view,
             false,
@@ -97,7 +97,7 @@ 
         $message_type = $item->message_type_obj();
         $messenger    = $item->messenger_obj();
 
-        if (! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger) {
+        if ( ! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger) {
             echo '';
             return;
         }
@@ -195,7 +195,7 @@ 
      */
     function column_name($item)
     {
-        return '<p>' . $item->name() . '</p>';
+        return '<p>'.$item->name().'</p>';
     }
 
 
@@ -205,7 +205,7 @@ 
      */
     function column_description($item)
     {
-        return '<p>' . $item->description() . '</p>';
+        return '<p>'.$item->description().'</p>';
     }
 
 
@@ -249,19 +249,19 @@ 
         $edit_lnk_url = '';
 
         // edit link but only if item isn't trashed.
-        if (! $item->get('MTP_deleted')
+        if ( ! $item->get('MTP_deleted')
             && EE_Registry::instance()->CAP->current_user_can(
                 'ee_edit_message',
                 'espresso_messages_edit_message_template',
                 $item->ID()
             )
         ) {
-            $edit_lnk_url    = EE_Admin_Page::add_query_args_and_nonce(array(
+            $edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array(
                 'action' => 'edit_message_template',
                 'id'     => $item->GRP_ID(),
             ), EE_MSG_ADMIN_URL);
-            $actions['edit'] = '<a href="' . $edit_lnk_url . '"'
-                               . ' class="' . $item->message_type() . '-edit-link"'
+            $actions['edit'] = '<a href="'.$edit_lnk_url.'"'
+                               . ' class="'.$item->message_type().'-edit-link"'
                                . ' title="'
                                . esc_attr__('Edit Template', 'event_espresso')
                                . '">'
@@ -269,7 +269,7 @@ 
                                . '</a>';
         }
 
-        $name_link     = ! $item->get('MTP_deleted')
+        $name_link = ! $item->get('MTP_deleted')
                          && EE_Registry::instance()->CAP->current_user_can(
                              'ee_edit_message',
                              'espresso_messages_edit_message_template',
@@ -299,7 +299,7 @@ 
                                                                         'noheader' => true,
         ), EE_MSG_ADMIN_URL);
 
-        if (! $item->get('MTP_deleted')
+        if ( ! $item->get('MTP_deleted')
             && EE_Registry::instance()->CAP->current_user_can(
                 'ee_delete_message',
                 'espresso_messages_trash_message_template',
@@ -324,7 +324,7 @@ 
                                       . '" title="'
                                       . esc_attr__('Restore Message Template', 'event_espresso')
                                       . '">'
-                                      . esc_html__('Restore', 'event_espresso') . '</a>';
+                                      . esc_html__('Restore', 'event_espresso').'</a>';
             }
 
             if ($this->_view == 'trashed'
@@ -361,16 +361,16 @@ 
                                                                            'id'      => $item->GRP_ID(),
                                                                            'context' => $context,
             ), EE_MSG_ADMIN_URL);
-            $ctxt[]        = EE_Registry::instance()->CAP->current_user_can(
+            $ctxt[] = EE_Registry::instance()->CAP->current_user_can(
                 'ee_edit_message',
                 'espresso_messages_edit_message_template',
                 $item->ID()
             )
                 ? '<a'
                   . $inactive
-                  . ' class="' . $item->message_type() . '-' . $context . '-edit-link"'
-                  . ' href="' . $edit_link . '"'
-                  . ' title="' . esc_attr__('Edit Context', 'event_espresso') . '">'
+                  . ' class="'.$item->message_type().'-'.$context.'-edit-link"'
+                  . ' href="'.$edit_link.'"'
+                  . ' title="'.esc_attr__('Edit Context', 'event_espresso').'">'
                   . $context_title
                   . '</a>'
                 : $context_title;

admin_pages/messages/Messages_Template_List_Table.class.php

Indentation +320 added lines, -320 removed lines

@@ -13,325 +13,325 @@
 {
 
 
-    /**
-     * @return Messages_Admin_Page
-     */
-    public function get_admin_page()
-    {
-        return $this->_admin_page;
-    }
-
-
-    /**
-     * Setup data object
-     */
-    protected function _setup_data()
-    {
-        $this->_data           = $this->get_admin_page()->get_message_templates(
-            $this->_per_page,
-            $this->_view,
-            false
-        );
-        $this->_all_data_count = $this->get_admin_page()->get_message_templates(
-            $this->_per_page,
-            $this->_view,
-            true,
-            true
-        );
-    }
-
-
-    /**
-     * Set internal properties
-     */
-    protected function _set_properties()
-    {
-        $this->_wp_list_args = array(
-            'singular' => esc_html__('Message Template Group', 'event_espresso'),
-            'plural'   => esc_html__('Message Template', 'event_espresso'),
-            'ajax'     => true, //for now,
-            'screen'   => $this->get_admin_page()->get_current_screen()->id,
-        );
-        $this->_columns      = array(
-            //'cb' => '<input type="checkbox" />', //no deleting default (global) templates!
-            'message_type' => esc_html__('Message Type', 'event_espresso'),
-            'messenger'    => esc_html__('Messenger', 'event_espresso'),
-            'description'  => esc_html__('Description', 'event_espresso'),
-        );
-
-        $this->_sortable_columns = array(
-            'messenger' => array('MTP_messenger' => true),
-        );
-
-        $this->_hidden_columns = array();
-    }
-
-
-    /**
-     * Overriding the single_row method from parent to verify whether the $item has an accessible
-     * message_type or messenger object before generating the row.
-     *
-     * @param EE_Message_Template_Group $item
-     * @return string
-     */
-    public function single_row($item)
-    {
-        $message_type = $item->message_type_obj();
-        $messenger    = $item->messenger_obj();
-
-        if (! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger) {
-            echo '';
-            return;
-        }
-
-        parent::single_row($item);
-    }
-
-
-    /**
-     * @return array
-     */
-    protected function _get_table_filters()
-    {
-        $filters = array();
-
-        //get select inputs
-        $select_inputs = array(
-            $this->_get_messengers_dropdown_filter(),
-            $this->_get_message_types_dropdown_filter(),
-        );
-
-        //set filters to select inputs if they aren't empty
-        foreach ($select_inputs as $select_input) {
-            if ($select_input) {
-                $filters[] = $select_input;
-            }
-        }
-        return $filters;
-    }
-
-    /**
-     * we're just removing the search box for message templates, not needed.
-     *
-     * @return string (empty);
-     */
-    function search_box($text, $input_id)
-    {
-        return '';
-    }
-
-
-    /**
-     * Add counts to the _views property
-     */
-    protected function _add_view_counts()
-    {
-        foreach ($this->_views as $view => $args) {
-            $this->_views[$view]['count'] = $this->get_admin_page()->get_message_templates(
-                $this->_per_page,
-                $view,
-                true,
-                true
-            );
-        }
-    }
-
-
-    /**
-     * @param EE_Message_Template_Group $item
-     * @return string
-     */
-    public function column_cb($item)
-    {
-        return '';
-    }
-
-
-    /**
-     * @param EE_Message_Template_Group $item
-     * @return string
-     */
-    function column_description($item)
-    {
-        return '<p>' . $item->message_type_obj()->description . '</p>';
-    }
-
-
-    /**
-     * @param EE_Message_Template_Group $item
-     * @return string
-     */
-    function column_messenger($item)
-    {
-        //Build row actions
-        $actions = array();
-
-        // edit link but only if item isn't trashed.
-        if (! $item->get('MTP_deleted')
-            && EE_Registry::instance()->CAP->current_user_can(
-                'ee_edit_message',
-                'espresso_messages_edit_message_template',
-                $item->ID()
-            )) {
-            $edit_lnk_url    = EE_Admin_Page::add_query_args_and_nonce(
-                array(
-                    'action' => 'edit_message_template',
-                    'id'     => $item->GRP_ID(),
-                ),
-                EE_MSG_ADMIN_URL
-            );
-            $actions['edit'] = '<a href="' . $edit_lnk_url . '"'
-                               . ' class="' . $item->message_type() . '-edit-link"'
-                               . ' title="' . esc_attr__('Edit Template Group', 'event_espresso') . '">'
-                               . esc_html__('Edit', 'event_espresso')
-                               . '</a>';
-        }
-
-        $name_link = ! $item->get('MTP_deleted')
-                     && EE_Registry::instance()->CAP->current_user_can(
-                         'ee_edit_message',
-                         'espresso_messages_edit_message_template',
-                         $item->ID()
-                     )
-            ? '<a href="' . $edit_lnk_url . '"'
-              . ' title="' . esc_attr__('Edit Template Group', 'event_espresso') . '">'
-              . ucwords($item->messenger_obj()->label['singular'])
-              . '</a>'
-            : ucwords($item->messenger_obj()->label['singular']);
-
-        //we want to display the contexts in here so we need to set them up
-        $c_label           = $item->context_label();
-        $c_configs         = $item->contexts_config();
-        $ctxt              = array();
-        $context_templates = $item->context_templates();
-        foreach ($context_templates as $context => $template_fields) {
-            $mtp_to        = ! empty($context_templates[$context]['to'])
-                             && $context_templates[$context]['to'] instanceof EE_Message_Template
-                ? $context_templates[$context]['to']->get('MTP_content')
-                : null;
-            $inactive      = empty($mtp_to)
-                             && ! empty($context_templates[$context]['to'])
-                ? ' class="mtp-inactive"'
-                : '';
-            $context_title = ucwords($c_configs[$context]['label']);
-            $edit_link     = EE_Admin_Page::add_query_args_and_nonce(array('action'  => 'edit_message_template',
-                                                                           'id'      => $item->GRP_ID(),
-                                                                           'context' => $context,
-            ), EE_MSG_ADMIN_URL);
-            $ctxt[]        = EE_Registry::instance()->CAP->current_user_can(
-                'ee_edit_message',
-                'espresso_messages_edit_message_template',
-                $item->ID()
-            )
-                ? '<a' . $inactive
-                  . ' href="' . $edit_link . '"'
-                  . ' class="' . $item->message_type() . '-' . $context . '-edit-link"'
-                  . ' title="' . esc_attr__('Edit Context', 'event_espresso') . '">'
-                  . $context_title
-                  . '</a>'
-                : $context_title;
-        }
-
-        $ctx_content = ! $item->get('MTP_deleted')
-                       && EE_Registry::instance()->CAP->current_user_can(
-                           'ee_edit_message',
-                           'espresso_messages_edit_message_template',
-                           $item->ID()
-                       )
-            ? sprintf(
-                '<strong>%s:</strong> ',
-                ucwords($c_label['plural'])
-            )
-              . implode(' | ', $ctxt)
-            : '';
-
-
-        //Return the name contents
-        return sprintf(
-            '%1$s <span style="color:silver">(id:%2$s)</span><br />%3$s%4$s',
-            /* $1%s */
-            $name_link,
-            /* $2%s */
-            $item->GRP_ID(),
-            /* %4$s */
-            $ctx_content,
-            /* $3%s */
-            $this->row_actions($actions)
-        );
-    }
-
-    /**
-     * column_message_type
-     *
-     * @param  EE_Message_Template_Group  $item message info for the row
-     * @return string       message_type name
-     */
-    function column_message_type($item)
-    {
-        return ucwords($item->message_type_obj()->label['singular']);
-    }
-
-
-
-    /**
-     * Generate dropdown filter select input for messengers
-     *
-     * @return string
-     */
-    protected function _get_messengers_dropdown_filter()
-    {
-        $messenger_options                                   = array();
-        $active_message_template_groups_grouped_by_messenger = EEM_Message_Template_Group::instance()->get_all(
-            array(
-                array(
-                    'MTP_is_active' => true,
-                    'MTP_is_global' => true,
-                ),
-                'group_by' => 'MTP_messenger',
-            )
-        );
-
-        foreach ($active_message_template_groups_grouped_by_messenger as $active_message_template_group) {
-            if ($active_message_template_group instanceof EE_Message_Template_Group) {
-                $messenger                                                      = $active_message_template_group->messenger_obj();
-                $messenger_label                                                = $messenger instanceof EE_messenger
-                    ? $messenger->label['singular']
-                    : $active_message_template_group->messenger();
-                $messenger_options[$active_message_template_group->messenger()] = ucwords($messenger_label);
-            }
-        }
-        return $this->get_admin_page()->get_messengers_select_input($messenger_options);
-    }
-
-
-    /**
-     * Generate dropdown filter select input for message types
-     *
-     * @return string
-     */
-    protected function _get_message_types_dropdown_filter()
-    {
-        $message_type_options                                   = array();
-        $active_message_template_groups_grouped_by_message_type = EEM_Message_Template_Group::instance()->get_all(
-            array(
-                array(
-                    'MTP_is_active' => true,
-                    'MTP_is_global' => true,
-                ),
-                'group_by' => 'MTP_message_type',
-            )
-        );
-
-        foreach ($active_message_template_groups_grouped_by_message_type as $active_message_template_group) {
-            if ($active_message_template_group instanceof EE_Message_Template_Group) {
-                $message_type                                                         = $active_message_template_group->message_type_obj();
-                $message_type_label                                                   = $message_type instanceof EE_message_type
-                    ? $message_type->label['singular']
-                    : $active_message_template_group->message_type();
-                $message_type_options[$active_message_template_group->message_type()] = ucwords($message_type_label);
-            }
-        }
-        return $this->get_admin_page()->get_message_types_select_input($message_type_options);
-    }
+	/**
+	 * @return Messages_Admin_Page
+	 */
+	public function get_admin_page()
+	{
+		return $this->_admin_page;
+	}
+
+
+	/**
+	 * Setup data object
+	 */
+	protected function _setup_data()
+	{
+		$this->_data           = $this->get_admin_page()->get_message_templates(
+			$this->_per_page,
+			$this->_view,
+			false
+		);
+		$this->_all_data_count = $this->get_admin_page()->get_message_templates(
+			$this->_per_page,
+			$this->_view,
+			true,
+			true
+		);
+	}
+
+
+	/**
+	 * Set internal properties
+	 */
+	protected function _set_properties()
+	{
+		$this->_wp_list_args = array(
+			'singular' => esc_html__('Message Template Group', 'event_espresso'),
+			'plural'   => esc_html__('Message Template', 'event_espresso'),
+			'ajax'     => true, //for now,
+			'screen'   => $this->get_admin_page()->get_current_screen()->id,
+		);
+		$this->_columns      = array(
+			//'cb' => '<input type="checkbox" />', //no deleting default (global) templates!
+			'message_type' => esc_html__('Message Type', 'event_espresso'),
+			'messenger'    => esc_html__('Messenger', 'event_espresso'),
+			'description'  => esc_html__('Description', 'event_espresso'),
+		);
+
+		$this->_sortable_columns = array(
+			'messenger' => array('MTP_messenger' => true),
+		);
+
+		$this->_hidden_columns = array();
+	}
+
+
+	/**
+	 * Overriding the single_row method from parent to verify whether the $item has an accessible
+	 * message_type or messenger object before generating the row.
+	 *
+	 * @param EE_Message_Template_Group $item
+	 * @return string
+	 */
+	public function single_row($item)
+	{
+		$message_type = $item->message_type_obj();
+		$messenger    = $item->messenger_obj();
+
+		if (! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger) {
+			echo '';
+			return;
+		}
+
+		parent::single_row($item);
+	}
+
+
+	/**
+	 * @return array
+	 */
+	protected function _get_table_filters()
+	{
+		$filters = array();
+
+		//get select inputs
+		$select_inputs = array(
+			$this->_get_messengers_dropdown_filter(),
+			$this->_get_message_types_dropdown_filter(),
+		);
+
+		//set filters to select inputs if they aren't empty
+		foreach ($select_inputs as $select_input) {
+			if ($select_input) {
+				$filters[] = $select_input;
+			}
+		}
+		return $filters;
+	}
+
+	/**
+	 * we're just removing the search box for message templates, not needed.
+	 *
+	 * @return string (empty);
+	 */
+	function search_box($text, $input_id)
+	{
+		return '';
+	}
+
+
+	/**
+	 * Add counts to the _views property
+	 */
+	protected function _add_view_counts()
+	{
+		foreach ($this->_views as $view => $args) {
+			$this->_views[$view]['count'] = $this->get_admin_page()->get_message_templates(
+				$this->_per_page,
+				$view,
+				true,
+				true
+			);
+		}
+	}
+
+
+	/**
+	 * @param EE_Message_Template_Group $item
+	 * @return string
+	 */
+	public function column_cb($item)
+	{
+		return '';
+	}
+
+
+	/**
+	 * @param EE_Message_Template_Group $item
+	 * @return string
+	 */
+	function column_description($item)
+	{
+		return '<p>' . $item->message_type_obj()->description . '</p>';
+	}
+
+
+	/**
+	 * @param EE_Message_Template_Group $item
+	 * @return string
+	 */
+	function column_messenger($item)
+	{
+		//Build row actions
+		$actions = array();
+
+		// edit link but only if item isn't trashed.
+		if (! $item->get('MTP_deleted')
+			&& EE_Registry::instance()->CAP->current_user_can(
+				'ee_edit_message',
+				'espresso_messages_edit_message_template',
+				$item->ID()
+			)) {
+			$edit_lnk_url    = EE_Admin_Page::add_query_args_and_nonce(
+				array(
+					'action' => 'edit_message_template',
+					'id'     => $item->GRP_ID(),
+				),
+				EE_MSG_ADMIN_URL
+			);
+			$actions['edit'] = '<a href="' . $edit_lnk_url . '"'
+							   . ' class="' . $item->message_type() . '-edit-link"'
+							   . ' title="' . esc_attr__('Edit Template Group', 'event_espresso') . '">'
+							   . esc_html__('Edit', 'event_espresso')
+							   . '</a>';
+		}
+
+		$name_link = ! $item->get('MTP_deleted')
+					 && EE_Registry::instance()->CAP->current_user_can(
+						 'ee_edit_message',
+						 'espresso_messages_edit_message_template',
+						 $item->ID()
+					 )
+			? '<a href="' . $edit_lnk_url . '"'
+			  . ' title="' . esc_attr__('Edit Template Group', 'event_espresso') . '">'
+			  . ucwords($item->messenger_obj()->label['singular'])
+			  . '</a>'
+			: ucwords($item->messenger_obj()->label['singular']);
+
+		//we want to display the contexts in here so we need to set them up
+		$c_label           = $item->context_label();
+		$c_configs         = $item->contexts_config();
+		$ctxt              = array();
+		$context_templates = $item->context_templates();
+		foreach ($context_templates as $context => $template_fields) {
+			$mtp_to        = ! empty($context_templates[$context]['to'])
+							 && $context_templates[$context]['to'] instanceof EE_Message_Template
+				? $context_templates[$context]['to']->get('MTP_content')
+				: null;
+			$inactive      = empty($mtp_to)
+							 && ! empty($context_templates[$context]['to'])
+				? ' class="mtp-inactive"'
+				: '';
+			$context_title = ucwords($c_configs[$context]['label']);
+			$edit_link     = EE_Admin_Page::add_query_args_and_nonce(array('action'  => 'edit_message_template',
+																		   'id'      => $item->GRP_ID(),
+																		   'context' => $context,
+			), EE_MSG_ADMIN_URL);
+			$ctxt[]        = EE_Registry::instance()->CAP->current_user_can(
+				'ee_edit_message',
+				'espresso_messages_edit_message_template',
+				$item->ID()
+			)
+				? '<a' . $inactive
+				  . ' href="' . $edit_link . '"'
+				  . ' class="' . $item->message_type() . '-' . $context . '-edit-link"'
+				  . ' title="' . esc_attr__('Edit Context', 'event_espresso') . '">'
+				  . $context_title
+				  . '</a>'
+				: $context_title;
+		}
+
+		$ctx_content = ! $item->get('MTP_deleted')
+					   && EE_Registry::instance()->CAP->current_user_can(
+						   'ee_edit_message',
+						   'espresso_messages_edit_message_template',
+						   $item->ID()
+					   )
+			? sprintf(
+				'<strong>%s:</strong> ',
+				ucwords($c_label['plural'])
+			)
+			  . implode(' | ', $ctxt)
+			: '';
+
+
+		//Return the name contents
+		return sprintf(
+			'%1$s <span style="color:silver">(id:%2$s)</span><br />%3$s%4$s',
+			/* $1%s */
+			$name_link,
+			/* $2%s */
+			$item->GRP_ID(),
+			/* %4$s */
+			$ctx_content,
+			/* $3%s */
+			$this->row_actions($actions)
+		);
+	}
+
+	/**
+	 * column_message_type
+	 *
+	 * @param  EE_Message_Template_Group  $item message info for the row
+	 * @return string       message_type name
+	 */
+	function column_message_type($item)
+	{
+		return ucwords($item->message_type_obj()->label['singular']);
+	}
+
+
+
+	/**
+	 * Generate dropdown filter select input for messengers
+	 *
+	 * @return string
+	 */
+	protected function _get_messengers_dropdown_filter()
+	{
+		$messenger_options                                   = array();
+		$active_message_template_groups_grouped_by_messenger = EEM_Message_Template_Group::instance()->get_all(
+			array(
+				array(
+					'MTP_is_active' => true,
+					'MTP_is_global' => true,
+				),
+				'group_by' => 'MTP_messenger',
+			)
+		);
+
+		foreach ($active_message_template_groups_grouped_by_messenger as $active_message_template_group) {
+			if ($active_message_template_group instanceof EE_Message_Template_Group) {
+				$messenger                                                      = $active_message_template_group->messenger_obj();
+				$messenger_label                                                = $messenger instanceof EE_messenger
+					? $messenger->label['singular']
+					: $active_message_template_group->messenger();
+				$messenger_options[$active_message_template_group->messenger()] = ucwords($messenger_label);
+			}
+		}
+		return $this->get_admin_page()->get_messengers_select_input($messenger_options);
+	}
+
+
+	/**
+	 * Generate dropdown filter select input for message types
+	 *
+	 * @return string
+	 */
+	protected function _get_message_types_dropdown_filter()
+	{
+		$message_type_options                                   = array();
+		$active_message_template_groups_grouped_by_message_type = EEM_Message_Template_Group::instance()->get_all(
+			array(
+				array(
+					'MTP_is_active' => true,
+					'MTP_is_global' => true,
+				),
+				'group_by' => 'MTP_message_type',
+			)
+		);
+
+		foreach ($active_message_template_groups_grouped_by_message_type as $active_message_template_group) {
+			if ($active_message_template_group instanceof EE_Message_Template_Group) {
+				$message_type                                                         = $active_message_template_group->message_type_obj();
+				$message_type_label                                                   = $message_type instanceof EE_message_type
+					? $message_type->label['singular']
+					: $active_message_template_group->message_type();
+				$message_type_options[$active_message_template_group->message_type()] = ucwords($message_type_label);
+			}
+		}
+		return $this->get_admin_page()->get_message_types_select_input($message_type_options);
+	}
 
 }

Spacing +17 added lines, -17 removed lines

@@ -27,7 +27,7 @@ 
      */
     protected function _setup_data()
     {
-        $this->_data           = $this->get_admin_page()->get_message_templates(
+        $this->_data = $this->get_admin_page()->get_message_templates(
             $this->_per_page,
             $this->_view,
             false
@@ -52,7 +52,7 @@ 
             'ajax'     => true, //for now,
             'screen'   => $this->get_admin_page()->get_current_screen()->id,
         );
-        $this->_columns      = array(
+        $this->_columns = array(
             //'cb' => '<input type="checkbox" />', //no deleting default (global) templates!
             'message_type' => esc_html__('Message Type', 'event_espresso'),
             'messenger'    => esc_html__('Messenger', 'event_espresso'),
@@ -79,7 +79,7 @@ 
         $message_type = $item->message_type_obj();
         $messenger    = $item->messenger_obj();
 
-        if (! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger) {
+        if ( ! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger) {
             echo '';
             return;
         }
@@ -153,7 +153,7 @@ 
      */
     function column_description($item)
     {
-        return '<p>' . $item->message_type_obj()->description . '</p>';
+        return '<p>'.$item->message_type_obj()->description.'</p>';
     }
 
 
@@ -167,22 +167,22 @@ 
         $actions = array();
 
         // edit link but only if item isn't trashed.
-        if (! $item->get('MTP_deleted')
+        if ( ! $item->get('MTP_deleted')
             && EE_Registry::instance()->CAP->current_user_can(
                 'ee_edit_message',
                 'espresso_messages_edit_message_template',
                 $item->ID()
             )) {
-            $edit_lnk_url    = EE_Admin_Page::add_query_args_and_nonce(
+            $edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(
                 array(
                     'action' => 'edit_message_template',
                     'id'     => $item->GRP_ID(),
                 ),
                 EE_MSG_ADMIN_URL
             );
-            $actions['edit'] = '<a href="' . $edit_lnk_url . '"'
-                               . ' class="' . $item->message_type() . '-edit-link"'
-                               . ' title="' . esc_attr__('Edit Template Group', 'event_espresso') . '">'
+            $actions['edit'] = '<a href="'.$edit_lnk_url.'"'
+                               . ' class="'.$item->message_type().'-edit-link"'
+                               . ' title="'.esc_attr__('Edit Template Group', 'event_espresso').'">'
                                . esc_html__('Edit', 'event_espresso')
                                . '</a>';
         }
@@ -193,8 +193,8 @@ 
                          'espresso_messages_edit_message_template',
                          $item->ID()
                      )
-            ? '<a href="' . $edit_lnk_url . '"'
-              . ' title="' . esc_attr__('Edit Template Group', 'event_espresso') . '">'
+            ? '<a href="'.$edit_lnk_url.'"'
+              . ' title="'.esc_attr__('Edit Template Group', 'event_espresso').'">'
               . ucwords($item->messenger_obj()->label['singular'])
               . '</a>'
             : ucwords($item->messenger_obj()->label['singular']);
@@ -209,7 +209,7 @@ 
                              && $context_templates[$context]['to'] instanceof EE_Message_Template
                 ? $context_templates[$context]['to']->get('MTP_content')
                 : null;
-            $inactive      = empty($mtp_to)
+            $inactive = empty($mtp_to)
                              && ! empty($context_templates[$context]['to'])
                 ? ' class="mtp-inactive"'
                 : '';
@@ -218,15 +218,15 @@ 
                                                                            'id'      => $item->GRP_ID(),
                                                                            'context' => $context,
             ), EE_MSG_ADMIN_URL);
-            $ctxt[]        = EE_Registry::instance()->CAP->current_user_can(
+            $ctxt[] = EE_Registry::instance()->CAP->current_user_can(
                 'ee_edit_message',
                 'espresso_messages_edit_message_template',
                 $item->ID()
             )
-                ? '<a' . $inactive
-                  . ' href="' . $edit_link . '"'
-                  . ' class="' . $item->message_type() . '-' . $context . '-edit-link"'
-                  . ' title="' . esc_attr__('Edit Context', 'event_espresso') . '">'
+                ? '<a'.$inactive
+                  . ' href="'.$edit_link.'"'
+                  . ' class="'.$item->message_type().'-'.$context.'-edit-link"'
+                  . ' title="'.esc_attr__('Edit Context', 'event_espresso').'">'
                   . $context_title
                   . '</a>'
                 : $context_title;

core/db_models/EEM_WP_User.model.php

Indentation +115 added lines, -115 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -15,129 +15,129 @@ 
 class EEM_WP_User extends EEM_Base
 {
 
-    /**
-     * private instance of the EEM_WP_User object
-     *
-     * @type EEM_WP_User
-     */
-    protected static $_instance = null;
+	/**
+	 * private instance of the EEM_WP_User object
+	 *
+	 * @type EEM_WP_User
+	 */
+	protected static $_instance = null;
 
 
 
-    /**
-     *    constructor
-     *
-     * @param null $timezone
-     * @throws \EE_Error
-     */
-    protected function __construct($timezone = null)
-    {
-        $this->singular_item = __('WP_User', 'event_espresso');
-        $this->plural_item = __('WP_Users', 'event_espresso');
-        global $wpdb;
-        $this->_tables = array(
-            'WP_User' => new EE_Primary_Table($wpdb->users, 'ID', true),
-        );
-        $this->_fields = array(
-            'WP_User' => array(
-                'ID'                  => new EE_Primary_Key_Int_Field('ID', __('WP_User ID', 'event_espresso')),
-                'user_login'          => new EE_Plain_Text_Field(
-                    'user_login',
-                    __('User Login', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'user_pass'           => new EE_Plain_Text_Field(
-                    'user_pass',
-                    __('User Password', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'user_nicename'       => new EE_Plain_Text_Field(
-                    'user_nicename',
-                    __(' User Nice Name', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'user_email'          => new EE_Email_Field(
-                    'user_email',
-                    __('User Email', 'event_espresso'),
-                    false
-                ),
-                'user_registered'     => new EE_Datetime_Field(
-                    'user_registered',
-                    __('Date User Registered', 'event_espresso'),
-                    false,
-                    EE_Datetime_Field::now,
-                    $timezone
-                ),
-                'user_activation_key' => new EE_Plain_Text_Field(
-                    'user_activation_key',
-                    __('User Activation Key', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'user_status'         => new EE_Integer_Field(
-                    'user_status',
-                    __('User Status', 'event_espresso'),
-                    false,
-                    0
-                ),
-                'display_name'        => new EE_Plain_Text_Field(
-                    'display_name',
-                    __('Display Name', 'event_espresso'),
-                    false,
-                    ''
-                ),
-            ),
-        );
-        $this->_model_relations = array(
-            'Attendee'       => new EE_Has_Many_Relation(),
-            'Change_Log'     => new EE_Has_Many_Relation(),
-            'Event'          => new EE_Has_Many_Relation(),
-            'Payment_Method' => new EE_Has_Many_Relation(),
-            'Price'          => new EE_Has_Many_Relation(),
-            'Price_Type'     => new EE_Has_Many_Relation(),
-            'Question'       => new EE_Has_Many_Relation(),
-            'Question_Group' => new EE_Has_Many_Relation(),
-            'Ticket'         => new EE_Has_Many_Relation(),
-            'Venue'          => new EE_Has_Many_Relation(),
-            'Message'        => new EE_Has_Many_Relation(),
-        );
-        $this->_wp_core_model = true;
-        $this->_caps_slug = 'users';
-        $this->_cap_contexts_to_cap_action_map[EEM_Base::caps_read] = 'list';
-        $this->_cap_contexts_to_cap_action_map[EEM_Base::caps_read_admin] = 'list';
-        foreach ($this->_cap_contexts_to_cap_action_map as $context => $action) {
-            $this->_cap_restriction_generators[$context] = new EE_Restriction_Generator_WP_User();
-        }
-        //@todo: account for create_users controls whether they can create users at all
-        parent::__construct($timezone);
-    }
+	/**
+	 *    constructor
+	 *
+	 * @param null $timezone
+	 * @throws \EE_Error
+	 */
+	protected function __construct($timezone = null)
+	{
+		$this->singular_item = __('WP_User', 'event_espresso');
+		$this->plural_item = __('WP_Users', 'event_espresso');
+		global $wpdb;
+		$this->_tables = array(
+			'WP_User' => new EE_Primary_Table($wpdb->users, 'ID', true),
+		);
+		$this->_fields = array(
+			'WP_User' => array(
+				'ID'                  => new EE_Primary_Key_Int_Field('ID', __('WP_User ID', 'event_espresso')),
+				'user_login'          => new EE_Plain_Text_Field(
+					'user_login',
+					__('User Login', 'event_espresso'),
+					false,
+					''
+				),
+				'user_pass'           => new EE_Plain_Text_Field(
+					'user_pass',
+					__('User Password', 'event_espresso'),
+					false,
+					''
+				),
+				'user_nicename'       => new EE_Plain_Text_Field(
+					'user_nicename',
+					__(' User Nice Name', 'event_espresso'),
+					false,
+					''
+				),
+				'user_email'          => new EE_Email_Field(
+					'user_email',
+					__('User Email', 'event_espresso'),
+					false
+				),
+				'user_registered'     => new EE_Datetime_Field(
+					'user_registered',
+					__('Date User Registered', 'event_espresso'),
+					false,
+					EE_Datetime_Field::now,
+					$timezone
+				),
+				'user_activation_key' => new EE_Plain_Text_Field(
+					'user_activation_key',
+					__('User Activation Key', 'event_espresso'),
+					false,
+					''
+				),
+				'user_status'         => new EE_Integer_Field(
+					'user_status',
+					__('User Status', 'event_espresso'),
+					false,
+					0
+				),
+				'display_name'        => new EE_Plain_Text_Field(
+					'display_name',
+					__('Display Name', 'event_espresso'),
+					false,
+					''
+				),
+			),
+		);
+		$this->_model_relations = array(
+			'Attendee'       => new EE_Has_Many_Relation(),
+			'Change_Log'     => new EE_Has_Many_Relation(),
+			'Event'          => new EE_Has_Many_Relation(),
+			'Payment_Method' => new EE_Has_Many_Relation(),
+			'Price'          => new EE_Has_Many_Relation(),
+			'Price_Type'     => new EE_Has_Many_Relation(),
+			'Question'       => new EE_Has_Many_Relation(),
+			'Question_Group' => new EE_Has_Many_Relation(),
+			'Ticket'         => new EE_Has_Many_Relation(),
+			'Venue'          => new EE_Has_Many_Relation(),
+			'Message'        => new EE_Has_Many_Relation(),
+		);
+		$this->_wp_core_model = true;
+		$this->_caps_slug = 'users';
+		$this->_cap_contexts_to_cap_action_map[EEM_Base::caps_read] = 'list';
+		$this->_cap_contexts_to_cap_action_map[EEM_Base::caps_read_admin] = 'list';
+		foreach ($this->_cap_contexts_to_cap_action_map as $context => $action) {
+			$this->_cap_restriction_generators[$context] = new EE_Restriction_Generator_WP_User();
+		}
+		//@todo: account for create_users controls whether they can create users at all
+		parent::__construct($timezone);
+	}
 
 
 
-    /**
-     * We don't need a foreign key to the WP_User model, we just need its primary key
-     *
-     * @return string
-     */
-    public function wp_user_field_name()
-    {
-        return $this->primary_key_name();
-    }
+	/**
+	 * We don't need a foreign key to the WP_User model, we just need its primary key
+	 *
+	 * @return string
+	 */
+	public function wp_user_field_name()
+	{
+		return $this->primary_key_name();
+	}
 
 
 
-    /**
-     * This WP_User model IS owned, even though it doesn't have a foreign key to itself
-     *
-     * @return boolean
-     */
-    public function is_owned()
-    {
-        return true;
-    }
+	/**
+	 * This WP_User model IS owned, even though it doesn't have a foreign key to itself
+	 *
+	 * @return boolean
+	 */
+	public function is_owned()
+	{
+		return true;
+	}
 }
 // End of file EEM_WP_User.model.php
 // Location: /core/db_models/EEM_WP_User.model.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php if (! defined('EVENT_ESPRESSO_VERSION')) {
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 

core/db_models/EEM_Term_Taxonomy.model.php

Indentation +116 added lines, -116 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -25,127 +25,127 @@ 
 class EEM_Term_Taxonomy extends EEM_Base
 {
 
-    // private instance of the Attendee object
-    protected static $_instance = null;
+	// private instance of the Attendee object
+	protected static $_instance = null;
 
 
 
-    protected function __construct($timezone = null)
-    {
-        $this->singular_item = __('Term Taxonomy', 'event_espresso');
-        $this->plural_item = __('Term Taxonomy', 'event_espresso');
-        $this->_tables = array(
-            'Term_Taxonomy' => new EE_Primary_Table('term_taxonomy', 'term_taxonomy_id'),
-        );
-        $this->_fields = array(
-            'Term_Taxonomy' => array(
-                'term_taxonomy_id' => new EE_Primary_Key_Int_Field(
-                    'term_taxonomy_id',
-                    __('Term-Taxonomy ID', 'event_espresso')
-                ),
-                'term_id'          => new EE_Foreign_Key_Int_Field(
-                    'term_id',
-                    __("Term Id", "event_espresso"),
-                    false,
-                    0,
-                    'Term'
-                ),
-                'taxonomy'         => new EE_Plain_Text_Field(
-                    'taxonomy',
-                    __('Taxonomy Name', 'event_espresso'),
-                    false,
-                    'category'
-                ),
-                'description'      => new EE_Post_Content_Field(
-                    'description',
-                    __("Description of Term", "event_espresso"),
-                    false,
-                    ''
-                ),
-                'parent'           => new EE_Integer_Field('parent', __("Parent Term ID", "event_espresso"), false, 0),
-                'term_count'       => new EE_Integer_Field(
-                    'count',
-                    __("Count of Objects attached", 'event_espresso'),
-                    false,
-                    0
-                ),
-            ),
-        );
-        $this->_model_relations = array(
-            'Term_Relationship' => new EE_Has_Many_Relation(),
-            'Term'              => new EE_Belongs_To_Relation(),
-        );
-        $cpt_models = array_keys(EE_Registry::instance()->cpt_models());
-        foreach ($cpt_models as $model_name) {
-            $this->_model_relations[$model_name] = new EE_HABTM_Relation('Term_Relationship');
-        }
-        $this->_indexes = array(
-            'term_id_taxonomy' => new EE_Unique_Index(array('term_id', 'taxonomy')),
-        );
-        $path_to_tax_model = '';
-        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Taxonomy_Protected(
-            $path_to_tax_model
-        );
-        $this->_cap_restriction_generators[EEM_Base::caps_edit] = false;
-        $this->_cap_restriction_generators[EEM_Base::caps_delete] = false;
-        //add cap restrictions for editing relating to the "ee_edit_*"
-        $this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories'),
-            )
-        );
-        $this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories'),
-            )
-        );
-        $this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type'),
-            )
-        );
-        //add cap restrictions for deleting relating to the "ee_deleting_*"
-        $this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories'),
-            )
-        );
-        $this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories'),
-            )
-        );
-        $this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type'),
-            )
-        );
-        parent::__construct($timezone);
-        add_filter('FHEE__Read__create_model_query_params', array('EEM_Term_Taxonomy', 'rest_api_query_params'), 10, 3);
-    }
+	protected function __construct($timezone = null)
+	{
+		$this->singular_item = __('Term Taxonomy', 'event_espresso');
+		$this->plural_item = __('Term Taxonomy', 'event_espresso');
+		$this->_tables = array(
+			'Term_Taxonomy' => new EE_Primary_Table('term_taxonomy', 'term_taxonomy_id'),
+		);
+		$this->_fields = array(
+			'Term_Taxonomy' => array(
+				'term_taxonomy_id' => new EE_Primary_Key_Int_Field(
+					'term_taxonomy_id',
+					__('Term-Taxonomy ID', 'event_espresso')
+				),
+				'term_id'          => new EE_Foreign_Key_Int_Field(
+					'term_id',
+					__("Term Id", "event_espresso"),
+					false,
+					0,
+					'Term'
+				),
+				'taxonomy'         => new EE_Plain_Text_Field(
+					'taxonomy',
+					__('Taxonomy Name', 'event_espresso'),
+					false,
+					'category'
+				),
+				'description'      => new EE_Post_Content_Field(
+					'description',
+					__("Description of Term", "event_espresso"),
+					false,
+					''
+				),
+				'parent'           => new EE_Integer_Field('parent', __("Parent Term ID", "event_espresso"), false, 0),
+				'term_count'       => new EE_Integer_Field(
+					'count',
+					__("Count of Objects attached", 'event_espresso'),
+					false,
+					0
+				),
+			),
+		);
+		$this->_model_relations = array(
+			'Term_Relationship' => new EE_Has_Many_Relation(),
+			'Term'              => new EE_Belongs_To_Relation(),
+		);
+		$cpt_models = array_keys(EE_Registry::instance()->cpt_models());
+		foreach ($cpt_models as $model_name) {
+			$this->_model_relations[$model_name] = new EE_HABTM_Relation('Term_Relationship');
+		}
+		$this->_indexes = array(
+			'term_id_taxonomy' => new EE_Unique_Index(array('term_id', 'taxonomy')),
+		);
+		$path_to_tax_model = '';
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Taxonomy_Protected(
+			$path_to_tax_model
+		);
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = false;
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = false;
+		//add cap restrictions for editing relating to the "ee_edit_*"
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories'),
+			)
+		);
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories'),
+			)
+		);
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type'),
+			)
+		);
+		//add cap restrictions for deleting relating to the "ee_deleting_*"
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories'),
+			)
+		);
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories'),
+			)
+		);
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type'),
+			)
+		);
+		parent::__construct($timezone);
+		add_filter('FHEE__Read__create_model_query_params', array('EEM_Term_Taxonomy', 'rest_api_query_params'), 10, 3);
+	}
 
 
 
-    /**
-     * Makes sure that during REST API queries, we only return term-taxonomies
-     * for term taxonomies which should be shown in the rest api
-     *
-     * @param array    $model_query_params
-     * @param array    $querystring_query_params
-     * @param EEM_Base $model
-     * @return array
-     */
-    public static function rest_api_query_params($model_query_params, $querystring_query_params, $model)
-    {
-        if ($model === EEM_Term_Taxonomy::instance()) {
-            $taxonomies = get_taxonomies(array('show_in_rest' => true));
-            if (! empty($taxonomies)) {
-                $model_query_params[0]['taxonomy'] = array('IN', $taxonomies);
-            }
-        }
-        return $model_query_params;
-    }
+	/**
+	 * Makes sure that during REST API queries, we only return term-taxonomies
+	 * for term taxonomies which should be shown in the rest api
+	 *
+	 * @param array    $model_query_params
+	 * @param array    $querystring_query_params
+	 * @param EEM_Base $model
+	 * @return array
+	 */
+	public static function rest_api_query_params($model_query_params, $querystring_query_params, $model)
+	{
+		if ($model === EEM_Term_Taxonomy::instance()) {
+			$taxonomies = get_taxonomies(array('show_in_rest' => true));
+			if (! empty($taxonomies)) {
+				$model_query_params[0]['taxonomy'] = array('IN', $taxonomies);
+			}
+		}
+		return $model_query_params;
+	}
 }
 // End of file EEM_Term_Taxonomy.model.php
 // Location: /includes/models/EEM_Term_Taxonomy.model.php

Spacing +9 added lines, -9 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (! defined('EVENT_ESPRESSO_VERSION')) {
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 /**
@@ -18,7 +18,7 @@ 
  * @author                Michael Nelson
  * ------------------------------------------------------------------------
  */
-require_once(EE_MODELS . 'EEM_Base.model.php');
+require_once(EE_MODELS.'EEM_Base.model.php');
 
 
 
@@ -92,33 +92,33 @@ 
         //add cap restrictions for editing relating to the "ee_edit_*"
         $this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories'),
+                $path_to_tax_model.'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories'),
             )
         );
         $this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories'),
+                $path_to_tax_model.'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories'),
             )
         );
         $this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type'),
+                $path_to_tax_model.'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type'),
             )
         );
         //add cap restrictions for deleting relating to the "ee_deleting_*"
         $this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories'),
+                $path_to_tax_model.'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories'),
             )
         );
         $this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories'),
+                $path_to_tax_model.'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories'),
             )
         );
         $this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type'),
+                $path_to_tax_model.'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type'),
             )
         );
         parent::__construct($timezone);
@@ -140,7 +140,7 @@ 
     {
         if ($model === EEM_Term_Taxonomy::instance()) {
             $taxonomies = get_taxonomies(array('show_in_rest' => true));
-            if (! empty($taxonomies)) {
+            if ( ! empty($taxonomies)) {
                 $model_query_params[0]['taxonomy'] = array('IN', $taxonomies);
             }
         }

core/db_models/EEM_Term.model.php

Indentation +201 added lines, -201 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -15,206 +15,206 @@ 
 class EEM_Term extends EEM_Base
 {
 
-    // private instance of the Attendee object
-    protected static $_instance = null;
-
-
-
-    /**
-     *__construct
-     *
-     * @param string $timezone
-     */
-    protected function __construct($timezone = null)
-    {
-        $this->singular_item = __('Term', 'event_espresso');
-        $this->plural_item = __('Terms', 'event_espresso');
-        $this->_tables = array(
-            'Term' => new EE_Primary_Table('terms', 'term_id'),
-        );
-        $this->_fields = array(
-            'Term' => array(
-                'term_id'    => new EE_Primary_Key_Int_Field('term_id', __('Term ID', 'event_espresso')),
-                'name'       => new EE_Plain_Text_Field('name', __('Term Name', 'event_espresso'), false, ''),
-                'slug'       => new EE_Slug_Field('slug', __('Term Slug', 'event_espresso'), false),
-                'term_group' => new EE_Integer_Field('term_group', __("Term Group", "event_espresso"), false, 0),
-            ),
-        );
-        $this->_model_relations = array(
-            'Term_Taxonomy' => new EE_Has_Many_Relation(),
-        );
-        $path_to_tax_model = 'Term_Taxonomy';
-        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Taxonomy_Protected(
-            $path_to_tax_model
-        );
-        $this->_cap_restriction_generators[EEM_Base::caps_edit] = false;
-        $this->_cap_restriction_generators[EEM_Base::caps_delete] = false;
-        $path_to_tax_model = $path_to_tax_model . '.';
-        //add cap restrictions for editing relating to the "ee_edit_*"
-        $this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories'),
-            )
-        );
-        $this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories'),
-            )
-        );
-        $this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type'),
-            )
-        );
-        //add cap restrictions for deleting relating to the "ee_deleting_*"
-        $this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories'),
-            )
-        );
-        $this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories'),
-            )
-        );
-        $this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
-            array(
-                $path_to_tax_model . 'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type'),
-            )
-        );
-        parent::__construct($timezone);
-        add_filter('FHEE__Read__create_model_query_params', array('EEM_Term', 'rest_api_query_params'), 10, 3);
-    }
-
-
-
-    /**
-     * retrieves a list of all EE event categories
-     *
-     * @access public
-     * @param bool $show_uncategorized
-     * @return \EE_Base_Class[]
-     */
-    public function get_all_ee_categories($show_uncategorized = false)
-    {
-        $where_params = array(
-            'Term_Taxonomy.taxonomy' => 'espresso_event_categories',
-            'NOT'                    => array('name' => __('Uncategorized', 'event_espresso')),
-        );
-        if ($show_uncategorized) {
-            unset($where_params['NOT']);
-        }
-        return EEM_Term::instance()->get_all(
-            array(
-                $where_params,
-                'order_by' => array('name' => 'ASC'),
-            )
-        );
-    }
-
-
-
-    /**
-     * retrieves a list of all post_tags associated with an EE CPT
-     *
-     * @access public
-     * @param string $post_type
-     * @return array
-     */
-    public function get_all_CPT_post_tags($post_type = '')
-    {
-        switch ($post_type) {
-            case 'espresso_events':
-                return $this->get_all_event_post_tags();
-                break;
-            case 'espresso_venues':
-                return $this->get_all_venue_post_tags();
-                break;
-            default:
-                $event_tags = $this->get_all_event_post_tags();
-                $venue_tags = $this->get_all_venue_post_tags();
-                return array_merge($event_tags, $venue_tags);
-        }
-    }
-
-
-
-    /**
-     * get_all_event_post_tags
-     *
-     * @return EE_Base_Class[]
-     */
-    public function get_all_event_post_tags()
-    {
-        $post_tags = EEM_Term::instance()->get_all(
-            array(
-                array(
-                    'Term_Taxonomy.taxonomy'        => 'post_tag',
-                    'Term_Taxonomy.Event.post_type' => 'espresso_events',
-                ),
-                'order_by'   => array('name' => 'ASC'),
-                'force_join' => array('Term_Taxonomy.Event'),
-            )
-        );
-        foreach ($post_tags as $key => $post_tag) {
-            if (! isset($post_tags[$key]->post_type)) {
-                $post_tags[$key]->post_type = array();
-            }
-            $post_tags[$key]->post_type[] = 'espresso_events';
-        }
-        return $post_tags;
-    }
-
-
-
-    /**
-     * get_all_venue_post_tags
-     *
-     * @return EE_Base_Class[]
-     */
-    public function get_all_venue_post_tags()
-    {
-        $post_tags = EEM_Term::instance()->get_all(
-            array(
-                array(
-                    'Term_Taxonomy.taxonomy'        => 'post_tag',
-                    'Term_Taxonomy.Venue.post_type' => 'espresso_venues',
-                ),
-                'order_by'   => array('name' => 'ASC'),
-                'force_join' => array('Term_Taxonomy'),
-            )
-        );
-        foreach ($post_tags as $key => $post_tag) {
-            if (! isset($post_tags[$key]->post_type)) {
-                $post_tags[$key]->post_type = array();
-            }
-            $post_tags[$key]->post_type[] = 'espresso_venues';
-        }
-        return $post_tags;
-    }
-
-
-
-    /**
-     * Makes sure that during REST API queries, we only return terms
-     * for term taxonomies which should be shown in the rest api
-     *
-     * @param array    $model_query_params
-     * @param array    $querystring_query_params
-     * @param EEM_Base $model
-     * @return array
-     */
-    public static function rest_api_query_params($model_query_params, $querystring_query_params, $model)
-    {
-        if ($model === EEM_Term::instance()) {
-            $taxonomies = get_taxonomies(array('show_in_rest' => true));
-            if (! empty($taxonomies)) {
-                $model_query_params[0]['Term_Taxonomy.taxonomy'] = array('IN', $taxonomies);
-            }
-        }
-        return $model_query_params;
-    }
+	// private instance of the Attendee object
+	protected static $_instance = null;
+
+
+
+	/**
+	 *__construct
+	 *
+	 * @param string $timezone
+	 */
+	protected function __construct($timezone = null)
+	{
+		$this->singular_item = __('Term', 'event_espresso');
+		$this->plural_item = __('Terms', 'event_espresso');
+		$this->_tables = array(
+			'Term' => new EE_Primary_Table('terms', 'term_id'),
+		);
+		$this->_fields = array(
+			'Term' => array(
+				'term_id'    => new EE_Primary_Key_Int_Field('term_id', __('Term ID', 'event_espresso')),
+				'name'       => new EE_Plain_Text_Field('name', __('Term Name', 'event_espresso'), false, ''),
+				'slug'       => new EE_Slug_Field('slug', __('Term Slug', 'event_espresso'), false),
+				'term_group' => new EE_Integer_Field('term_group', __("Term Group", "event_espresso"), false, 0),
+			),
+		);
+		$this->_model_relations = array(
+			'Term_Taxonomy' => new EE_Has_Many_Relation(),
+		);
+		$path_to_tax_model = 'Term_Taxonomy';
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Taxonomy_Protected(
+			$path_to_tax_model
+		);
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = false;
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = false;
+		$path_to_tax_model = $path_to_tax_model . '.';
+		//add cap restrictions for editing relating to the "ee_edit_*"
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories'),
+			)
+		);
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories'),
+			)
+		);
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type'),
+			)
+		);
+		//add cap restrictions for deleting relating to the "ee_deleting_*"
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories'),
+			)
+		);
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories'),
+			)
+		);
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
+			array(
+				$path_to_tax_model . 'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type'),
+			)
+		);
+		parent::__construct($timezone);
+		add_filter('FHEE__Read__create_model_query_params', array('EEM_Term', 'rest_api_query_params'), 10, 3);
+	}
+
+
+
+	/**
+	 * retrieves a list of all EE event categories
+	 *
+	 * @access public
+	 * @param bool $show_uncategorized
+	 * @return \EE_Base_Class[]
+	 */
+	public function get_all_ee_categories($show_uncategorized = false)
+	{
+		$where_params = array(
+			'Term_Taxonomy.taxonomy' => 'espresso_event_categories',
+			'NOT'                    => array('name' => __('Uncategorized', 'event_espresso')),
+		);
+		if ($show_uncategorized) {
+			unset($where_params['NOT']);
+		}
+		return EEM_Term::instance()->get_all(
+			array(
+				$where_params,
+				'order_by' => array('name' => 'ASC'),
+			)
+		);
+	}
+
+
+
+	/**
+	 * retrieves a list of all post_tags associated with an EE CPT
+	 *
+	 * @access public
+	 * @param string $post_type
+	 * @return array
+	 */
+	public function get_all_CPT_post_tags($post_type = '')
+	{
+		switch ($post_type) {
+			case 'espresso_events':
+				return $this->get_all_event_post_tags();
+				break;
+			case 'espresso_venues':
+				return $this->get_all_venue_post_tags();
+				break;
+			default:
+				$event_tags = $this->get_all_event_post_tags();
+				$venue_tags = $this->get_all_venue_post_tags();
+				return array_merge($event_tags, $venue_tags);
+		}
+	}
+
+
+
+	/**
+	 * get_all_event_post_tags
+	 *
+	 * @return EE_Base_Class[]
+	 */
+	public function get_all_event_post_tags()
+	{
+		$post_tags = EEM_Term::instance()->get_all(
+			array(
+				array(
+					'Term_Taxonomy.taxonomy'        => 'post_tag',
+					'Term_Taxonomy.Event.post_type' => 'espresso_events',
+				),
+				'order_by'   => array('name' => 'ASC'),
+				'force_join' => array('Term_Taxonomy.Event'),
+			)
+		);
+		foreach ($post_tags as $key => $post_tag) {
+			if (! isset($post_tags[$key]->post_type)) {
+				$post_tags[$key]->post_type = array();
+			}
+			$post_tags[$key]->post_type[] = 'espresso_events';
+		}
+		return $post_tags;
+	}
+
+
+
+	/**
+	 * get_all_venue_post_tags
+	 *
+	 * @return EE_Base_Class[]
+	 */
+	public function get_all_venue_post_tags()
+	{
+		$post_tags = EEM_Term::instance()->get_all(
+			array(
+				array(
+					'Term_Taxonomy.taxonomy'        => 'post_tag',
+					'Term_Taxonomy.Venue.post_type' => 'espresso_venues',
+				),
+				'order_by'   => array('name' => 'ASC'),
+				'force_join' => array('Term_Taxonomy'),
+			)
+		);
+		foreach ($post_tags as $key => $post_tag) {
+			if (! isset($post_tags[$key]->post_type)) {
+				$post_tags[$key]->post_type = array();
+			}
+			$post_tags[$key]->post_type[] = 'espresso_venues';
+		}
+		return $post_tags;
+	}
+
+
+
+	/**
+	 * Makes sure that during REST API queries, we only return terms
+	 * for term taxonomies which should be shown in the rest api
+	 *
+	 * @param array    $model_query_params
+	 * @param array    $querystring_query_params
+	 * @param EEM_Base $model
+	 * @return array
+	 */
+	public static function rest_api_query_params($model_query_params, $querystring_query_params, $model)
+	{
+		if ($model === EEM_Term::instance()) {
+			$taxonomies = get_taxonomies(array('show_in_rest' => true));
+			if (! empty($taxonomies)) {
+				$model_query_params[0]['Term_Taxonomy.taxonomy'] = array('IN', $taxonomies);
+			}
+		}
+		return $model_query_params;
+	}
 
 
 

Spacing +11 added lines, -11 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (! defined('EVENT_ESPRESSO_VERSION')) {
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 
@@ -50,37 +50,37 @@ 
         );
         $this->_cap_restriction_generators[EEM_Base::caps_edit] = false;
         $this->_cap_restriction_generators[EEM_Base::caps_delete] = false;
-        $path_to_tax_model = $path_to_tax_model . '.';
+        $path_to_tax_model = $path_to_tax_model.'.';
         //add cap restrictions for editing relating to the "ee_edit_*"
         $this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories'),
+                $path_to_tax_model.'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories'),
             )
         );
         $this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories'),
+                $path_to_tax_model.'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories'),
             )
         );
         $this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type'),
+                $path_to_tax_model.'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type'),
             )
         );
         //add cap restrictions for deleting relating to the "ee_deleting_*"
         $this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories'),
+                $path_to_tax_model.'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories'),
             )
         );
         $this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories'),
+                $path_to_tax_model.'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories'),
             )
         );
         $this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
             array(
-                $path_to_tax_model . 'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type'),
+                $path_to_tax_model.'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type'),
             )
         );
         parent::__construct($timezone);
@@ -158,7 +158,7 @@ 
             )
         );
         foreach ($post_tags as $key => $post_tag) {
-            if (! isset($post_tags[$key]->post_type)) {
+            if ( ! isset($post_tags[$key]->post_type)) {
                 $post_tags[$key]->post_type = array();
             }
             $post_tags[$key]->post_type[] = 'espresso_events';
@@ -186,7 +186,7 @@ 
             )
         );
         foreach ($post_tags as $key => $post_tag) {
-            if (! isset($post_tags[$key]->post_type)) {
+            if ( ! isset($post_tags[$key]->post_type)) {
                 $post_tags[$key]->post_type = array();
             }
             $post_tags[$key]->post_type[] = 'espresso_venues';
@@ -209,7 +209,7 @@ 
     {
         if ($model === EEM_Term::instance()) {
             $taxonomies = get_taxonomies(array('show_in_rest' => true));
-            if (! empty($taxonomies)) {
+            if ( ! empty($taxonomies)) {
                 $model_query_params[0]['Term_Taxonomy.taxonomy'] = array('IN', $taxonomies);
             }
         }

core/db_models/EEM_Post_Meta.model.php

Indentation +49 added lines, -49 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -33,57 +33,57 @@ 
 class EEM_Post_Meta extends EEM_Base
 {
 
-    // private instance of the EE_Post_Meta object
-    protected static $_instance = null;
+	// private instance of the EE_Post_Meta object
+	protected static $_instance = null;
 
 
 
-    protected function __construct($timezone = null)
-    {
-        $this->singular_item = __('Post Meta', 'event_espresso');
-        $this->plural_item = __('Post Metas', 'event_espresso');
-        $this->_tables = array(
-            'Post_Meta' => new EE_Primary_Table('postmeta', 'meta_id'),
-        );
-        $models_this_can_attach_to = array_keys(EE_Registry::instance()->cpt_models());
-        $this->_fields = array(
-            'Post_Meta' => array(
-                'meta_id'    => new EE_Primary_Key_Int_Field(
-                    'meta_id',
-                    __("Meta ID", "event_espresso")
-                ),
-                'post_id'    => new EE_Foreign_Key_Int_Field(
-                    'post_id',
-                    __("Primary Key of Post", "event_espresso"),
-                    false,
-                    0,
-                    $models_this_can_attach_to
-                ),
-                'meta_key'   => new EE_Plain_Text_Field(
-                    'meta_key',
-                    __("Meta Key", "event_espresso"),
-                    false,
-                    ''
-                ),
-                'meta_value' => new EE_Maybe_Serialized_Text_Field(
-                    'meta_value',
-                    __("Meta Value", "event_espresso"),
-                    true
-                ),
-            ),
-        );
-        $this->_model_relations = array();
-        foreach ($models_this_can_attach_to as $model) {
-            $this->_model_relations[$model] = new EE_Belongs_To_Relation();
-        }
-        foreach ($this->cap_contexts_to_cap_action_map() as $cap_context => $action) {
-            $this->_cap_restriction_generators[$cap_context] = new EE_Restriction_Generator_Meta(
-                'meta_key',
-                'meta_value'
-            );
-        }
-        parent::__construct($timezone);
-    }
+	protected function __construct($timezone = null)
+	{
+		$this->singular_item = __('Post Meta', 'event_espresso');
+		$this->plural_item = __('Post Metas', 'event_espresso');
+		$this->_tables = array(
+			'Post_Meta' => new EE_Primary_Table('postmeta', 'meta_id'),
+		);
+		$models_this_can_attach_to = array_keys(EE_Registry::instance()->cpt_models());
+		$this->_fields = array(
+			'Post_Meta' => array(
+				'meta_id'    => new EE_Primary_Key_Int_Field(
+					'meta_id',
+					__("Meta ID", "event_espresso")
+				),
+				'post_id'    => new EE_Foreign_Key_Int_Field(
+					'post_id',
+					__("Primary Key of Post", "event_espresso"),
+					false,
+					0,
+					$models_this_can_attach_to
+				),
+				'meta_key'   => new EE_Plain_Text_Field(
+					'meta_key',
+					__("Meta Key", "event_espresso"),
+					false,
+					''
+				),
+				'meta_value' => new EE_Maybe_Serialized_Text_Field(
+					'meta_value',
+					__("Meta Value", "event_espresso"),
+					true
+				),
+			),
+		);
+		$this->_model_relations = array();
+		foreach ($models_this_can_attach_to as $model) {
+			$this->_model_relations[$model] = new EE_Belongs_To_Relation();
+		}
+		foreach ($this->cap_contexts_to_cap_action_map() as $cap_context => $action) {
+			$this->_cap_restriction_generators[$cap_context] = new EE_Restriction_Generator_Meta(
+				'meta_key',
+				'meta_value'
+			);
+		}
+		parent::__construct($timezone);
+	}
 
 
 }

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (! defined('EVENT_ESPRESSO_VERSION')) {
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 /**
@@ -26,7 +26,7 @@ 
  * @author                Michael Nelson
  * ------------------------------------------------------------------------
  */
-require_once(EE_MODELS . 'EEM_Base.model.php');
+require_once(EE_MODELS.'EEM_Base.model.php');
 
 
 

core/db_models/EEM_Term_Relationship.model.php

Indentation +219 added lines, -219 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 require_once(EE_MODELS . 'EEM_Base.model.php');
 
@@ -15,229 +15,229 @@ 
 class EEM_Term_Relationship extends EEM_Base
 {
 
-    // private instance of the Attendee object
-    protected static $_instance = null;
-
-
-
-    /**
-     * EEM_Term_Relationship constructor.
-     *
-     * @param string $timezone
-     */
-    protected function __construct($timezone = null)
-    {
-        $this->singular_item = __('Term Relationship', 'event_espresso');
-        $this->plural_item = __('Term Relationships', 'event_espresso');
-        $this->_tables = array(
-            'Term_Relationship' => new EE_Primary_Table('term_relationships'),
-        );
-        $models_this_can_attach_to = array_keys(EE_Registry::instance()->cpt_models());
-        $this->_fields = array(
-            'Term_Relationship' => array(
-                'object_id'        => new EE_Foreign_Key_Int_Field(
-                    'object_id',
-                    __('Object(Post) ID', 'event_espresso'),
-                    false,
-                    0,
-                    $models_this_can_attach_to
-                ),
-                'term_taxonomy_id' => new EE_Foreign_Key_Int_Field(
-                    'term_taxonomy_id',
-                    __(
-                        'Term (in context of a taxonomy) ID',
-                        'event_espresso'
-                    ),
-                    false,
-                    0,
-                    'Term_Taxonomy'
-                ),
-                'term_order'       => new EE_Integer_Field(
-                    'term_order',
-                    __('Term Order', 'event_espresso'),
-                    false,
-                    0
-                ),
-            ),
-        );
-        $this->_model_relations = array(
-            'Term_Taxonomy' => new EE_Belongs_To_Relation(),
-        );
-        foreach ($models_this_can_attach_to as $model_name) {
-            $this->_model_relations[$model_name] = new EE_Belongs_To_Relation();
-        }
-        $this->_indexes = array(
-            'PRIMARY' => new EE_Primary_Key_Index(array('object_id', 'term_taxonomy_id')),
-        );
-        $path_to_event_model = 'Event.';
-        $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Event_Related_Public(
-            $path_to_event_model
-        );
-        $this->_cap_restriction_generators[EEM_Base::caps_read_admin] =
-            new EE_Restriction_Generator_Event_Related_Protected(
-                $path_to_event_model
-            );
-        $this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Event_Related_Protected(
-            $path_to_event_model
-        );
-        $this->_cap_restriction_generators[EEM_Base::caps_delete] =
-            new EE_Restriction_Generator_Event_Related_Protected(
-                $path_to_event_model,
-                EEM_Base::caps_edit
-            );
-        $path_to_tax_model = 'Term_Taxonomy.';
-        //add cap restrictions for editing term relations to the "ee_assign_*"
-        //and for deleting term relations too
-        $cap_contexts_affected = array(EEM_Base::caps_edit, EEM_Base::caps_delete);
-        foreach ($cap_contexts_affected as $cap_context_affected) {
-            $this->_cap_restrictions[$cap_context_affected]['ee_assign_event_category'] =
-                new EE_Default_Where_Conditions(
-                    array(
-                        $path_to_tax_model . 'taxonomy*ee_assign_event_category' => array(
-                            '!=',
-                            'espresso_event_categories',
-                        ),
-                    )
-                );
-            $this->_cap_restrictions[$cap_context_affected]['ee_assign_venue_category'] =
-                new EE_Default_Where_Conditions(
-                    array(
-                        $path_to_tax_model . 'taxonomy*ee_assign_venue_category' => array(
-                            '!=',
-                            'espresso_venue_categories',
-                        ),
-                    )
-                );
-            $this->_cap_restrictions[$cap_context_affected]['ee_assign_event_type'] = new EE_Default_Where_Conditions(
-                array(
-                    $path_to_tax_model . 'taxonomy*ee_assign_event_type' => array('!=', 'espresso_event_type'),
-                )
-            );
-        }
-        parent::__construct($timezone);
-        add_filter(
-            'FHEE__Read__create_model_query_params',
-            array('EEM_Term_Relationship', 'rest_api_query_params'),
-            10,
-            3
-        );
-    }
-
-
-
-    /**
-     * Makes sure all term-taxonomy counts are correct
-     *
-     * @param int   $term_taxonomy_id the id of the term taxonomy to update. If NULL, updates ALL
-     * @global wpdb $wpdb
-     * @return int the number of rows affected
-     */
-    public function update_term_taxonomy_counts($term_taxonomy_id = null)
-    {
-        //because this uses a subquery and sometimes assigning to column to be another column's
-        //value, we just write the SQL directly.
-        global $wpdb;
-        if ($term_taxonomy_id) {
-            $second_operand = $wpdb->prepare('%d', $term_taxonomy_id);
-        } else {
-            $second_operand = 'tr.term_taxonomy_id';
-        }
-        $rows_affected = $this->_do_wpdb_query(
-            'query',
-            array(
-                "
+	// private instance of the Attendee object
+	protected static $_instance = null;
+
+
+
+	/**
+	 * EEM_Term_Relationship constructor.
+	 *
+	 * @param string $timezone
+	 */
+	protected function __construct($timezone = null)
+	{
+		$this->singular_item = __('Term Relationship', 'event_espresso');
+		$this->plural_item = __('Term Relationships', 'event_espresso');
+		$this->_tables = array(
+			'Term_Relationship' => new EE_Primary_Table('term_relationships'),
+		);
+		$models_this_can_attach_to = array_keys(EE_Registry::instance()->cpt_models());
+		$this->_fields = array(
+			'Term_Relationship' => array(
+				'object_id'        => new EE_Foreign_Key_Int_Field(
+					'object_id',
+					__('Object(Post) ID', 'event_espresso'),
+					false,
+					0,
+					$models_this_can_attach_to
+				),
+				'term_taxonomy_id' => new EE_Foreign_Key_Int_Field(
+					'term_taxonomy_id',
+					__(
+						'Term (in context of a taxonomy) ID',
+						'event_espresso'
+					),
+					false,
+					0,
+					'Term_Taxonomy'
+				),
+				'term_order'       => new EE_Integer_Field(
+					'term_order',
+					__('Term Order', 'event_espresso'),
+					false,
+					0
+				),
+			),
+		);
+		$this->_model_relations = array(
+			'Term_Taxonomy' => new EE_Belongs_To_Relation(),
+		);
+		foreach ($models_this_can_attach_to as $model_name) {
+			$this->_model_relations[$model_name] = new EE_Belongs_To_Relation();
+		}
+		$this->_indexes = array(
+			'PRIMARY' => new EE_Primary_Key_Index(array('object_id', 'term_taxonomy_id')),
+		);
+		$path_to_event_model = 'Event.';
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Event_Related_Public(
+			$path_to_event_model
+		);
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] =
+			new EE_Restriction_Generator_Event_Related_Protected(
+				$path_to_event_model
+			);
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Event_Related_Protected(
+			$path_to_event_model
+		);
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] =
+			new EE_Restriction_Generator_Event_Related_Protected(
+				$path_to_event_model,
+				EEM_Base::caps_edit
+			);
+		$path_to_tax_model = 'Term_Taxonomy.';
+		//add cap restrictions for editing term relations to the "ee_assign_*"
+		//and for deleting term relations too
+		$cap_contexts_affected = array(EEM_Base::caps_edit, EEM_Base::caps_delete);
+		foreach ($cap_contexts_affected as $cap_context_affected) {
+			$this->_cap_restrictions[$cap_context_affected]['ee_assign_event_category'] =
+				new EE_Default_Where_Conditions(
+					array(
+						$path_to_tax_model . 'taxonomy*ee_assign_event_category' => array(
+							'!=',
+							'espresso_event_categories',
+						),
+					)
+				);
+			$this->_cap_restrictions[$cap_context_affected]['ee_assign_venue_category'] =
+				new EE_Default_Where_Conditions(
+					array(
+						$path_to_tax_model . 'taxonomy*ee_assign_venue_category' => array(
+							'!=',
+							'espresso_venue_categories',
+						),
+					)
+				);
+			$this->_cap_restrictions[$cap_context_affected]['ee_assign_event_type'] = new EE_Default_Where_Conditions(
+				array(
+					$path_to_tax_model . 'taxonomy*ee_assign_event_type' => array('!=', 'espresso_event_type'),
+				)
+			);
+		}
+		parent::__construct($timezone);
+		add_filter(
+			'FHEE__Read__create_model_query_params',
+			array('EEM_Term_Relationship', 'rest_api_query_params'),
+			10,
+			3
+		);
+	}
+
+
+
+	/**
+	 * Makes sure all term-taxonomy counts are correct
+	 *
+	 * @param int   $term_taxonomy_id the id of the term taxonomy to update. If NULL, updates ALL
+	 * @global wpdb $wpdb
+	 * @return int the number of rows affected
+	 */
+	public function update_term_taxonomy_counts($term_taxonomy_id = null)
+	{
+		//because this uses a subquery and sometimes assigning to column to be another column's
+		//value, we just write the SQL directly.
+		global $wpdb;
+		if ($term_taxonomy_id) {
+			$second_operand = $wpdb->prepare('%d', $term_taxonomy_id);
+		} else {
+			$second_operand = 'tr.term_taxonomy_id';
+		}
+		$rows_affected = $this->_do_wpdb_query(
+			'query',
+			array(
+				"
                 UPDATE {$wpdb->term_taxonomy} AS tt 
                 SET count = (
                     select count(*) as proper_count from {$wpdb->term_relationships} AS tr 
                     WHERE tt.term_taxonomy_id = $second_operand
                 )",
-            )
-        );
-        return $rows_affected;
-    }
-
-
-
-    /**
-     * Overrides the parent to also make sure term-taxonomy counts are up-to-date after
-     * inserting
-     *
-     * @param array $field_n_values @see EEM_Base::insert
-     * @return boolean
-     */
-    public function insert($field_n_values)
-    {
-        $return = parent::insert($field_n_values);
-        if (isset($field_n_values['term_taxonomy_id'])) {
-            $this->update_term_taxonomy_counts($field_n_values['term_taxonomy_id']);
-        }
-        return $return;
-    }
-
-
-
-    /**
-     * Overrides parent so that after an update, we also check the term_taxonomy_counts are
-     * all ok
-     *
-     * @param array   $fields_n_values         see EEM_Base::update
-     * @param array   $query_params            @see EEM_Base::get_all
-     * @param boolean $keep_model_objs_in_sync if TRUE, makes sure we ALSO update model objects
-     *                                         in this model's entity map according to $fields_n_values that match
-     *                                         $query_params. This obviously has some overhead, so you can disable it
-     *                                         by setting this to FALSE, but be aware that model objects being used
-     *                                         could get out-of-sync with the database
-     * @return int
-     */
-    public function update($fields_n_values, $query_params, $keep_model_objs_in_sync = true)
-    {
-        $count = parent::update($fields_n_values, $query_params, $keep_model_objs_in_sync);
-        if ($count) {
-            $this->update_term_taxonomy_counts();
-        }
-        return $count;
-    }
-
-
-
-    /**
-     * Overrides parent so that after running this, we also double-check
-     * the term taxonomy counts are up-to-date
-     *
-     * @param array   $query_params @see EEM_Base::get_all
-     * @param boolean $allow_blocking
-     * @return int @see EEM_Base::delete
-     */
-    public function delete($query_params, $allow_blocking = true)
-    {
-        $count = parent::delete($query_params, $allow_blocking);
-        if ($count) {
-            $this->update_term_taxonomy_counts();
-        }
-        return $count;
-    }
-
-
-
-    /**
-     * Makes sure that during REST API queries, we only return term relationships
-     * for term taxonomies which should be shown in the rest api
-     *
-     * @param array    $model_query_params
-     * @param array    $querystring_query_params
-     * @param EEM_Base $model
-     * @return array
-     */
-    public static function rest_api_query_params($model_query_params, $querystring_query_params, $model)
-    {
-        if ($model === EEM_Term_Relationship::instance()) {
-            $taxonomies = get_taxonomies(array('show_in_rest' => true));
-            if (! empty($taxonomies)) {
-                $model_query_params[0]['Term_Taxonomy.taxonomy'] = array('IN', $taxonomies);
-            }
-        }
-        return $model_query_params;
-    }
+			)
+		);
+		return $rows_affected;
+	}
+
+
+
+	/**
+	 * Overrides the parent to also make sure term-taxonomy counts are up-to-date after
+	 * inserting
+	 *
+	 * @param array $field_n_values @see EEM_Base::insert
+	 * @return boolean
+	 */
+	public function insert($field_n_values)
+	{
+		$return = parent::insert($field_n_values);
+		if (isset($field_n_values['term_taxonomy_id'])) {
+			$this->update_term_taxonomy_counts($field_n_values['term_taxonomy_id']);
+		}
+		return $return;
+	}
+
+
+
+	/**
+	 * Overrides parent so that after an update, we also check the term_taxonomy_counts are
+	 * all ok
+	 *
+	 * @param array   $fields_n_values         see EEM_Base::update
+	 * @param array   $query_params            @see EEM_Base::get_all
+	 * @param boolean $keep_model_objs_in_sync if TRUE, makes sure we ALSO update model objects
+	 *                                         in this model's entity map according to $fields_n_values that match
+	 *                                         $query_params. This obviously has some overhead, so you can disable it
+	 *                                         by setting this to FALSE, but be aware that model objects being used
+	 *                                         could get out-of-sync with the database
+	 * @return int
+	 */
+	public function update($fields_n_values, $query_params, $keep_model_objs_in_sync = true)
+	{
+		$count = parent::update($fields_n_values, $query_params, $keep_model_objs_in_sync);
+		if ($count) {
+			$this->update_term_taxonomy_counts();
+		}
+		return $count;
+	}
+
+
+
+	/**
+	 * Overrides parent so that after running this, we also double-check
+	 * the term taxonomy counts are up-to-date
+	 *
+	 * @param array   $query_params @see EEM_Base::get_all
+	 * @param boolean $allow_blocking
+	 * @return int @see EEM_Base::delete
+	 */
+	public function delete($query_params, $allow_blocking = true)
+	{
+		$count = parent::delete($query_params, $allow_blocking);
+		if ($count) {
+			$this->update_term_taxonomy_counts();
+		}
+		return $count;
+	}
+
+
+
+	/**
+	 * Makes sure that during REST API queries, we only return term relationships
+	 * for term taxonomies which should be shown in the rest api
+	 *
+	 * @param array    $model_query_params
+	 * @param array    $querystring_query_params
+	 * @param EEM_Base $model
+	 * @return array
+	 */
+	public static function rest_api_query_params($model_query_params, $querystring_query_params, $model)
+	{
+		if ($model === EEM_Term_Relationship::instance()) {
+			$taxonomies = get_taxonomies(array('show_in_rest' => true));
+			if (! empty($taxonomies)) {
+				$model_query_params[0]['Term_Taxonomy.taxonomy'] = array('IN', $taxonomies);
+			}
+		}
+		return $model_query_params;
+	}
 
 
 }

Spacing +6 added lines, -6 removed lines

@@ -1,7 +1,7 @@ 
-<?php if (! defined('EVENT_ESPRESSO_VERSION')) {
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
-require_once(EE_MODELS . 'EEM_Base.model.php');
+require_once(EE_MODELS.'EEM_Base.model.php');
 
 
 
@@ -93,7 +93,7 @@ 
             $this->_cap_restrictions[$cap_context_affected]['ee_assign_event_category'] =
                 new EE_Default_Where_Conditions(
                     array(
-                        $path_to_tax_model . 'taxonomy*ee_assign_event_category' => array(
+                        $path_to_tax_model.'taxonomy*ee_assign_event_category' => array(
                             '!=',
                             'espresso_event_categories',
                         ),
@@ -102,7 +102,7 @@ 
             $this->_cap_restrictions[$cap_context_affected]['ee_assign_venue_category'] =
                 new EE_Default_Where_Conditions(
                     array(
-                        $path_to_tax_model . 'taxonomy*ee_assign_venue_category' => array(
+                        $path_to_tax_model.'taxonomy*ee_assign_venue_category' => array(
                             '!=',
                             'espresso_venue_categories',
                         ),
@@ -110,7 +110,7 @@ 
                 );
             $this->_cap_restrictions[$cap_context_affected]['ee_assign_event_type'] = new EE_Default_Where_Conditions(
                 array(
-                    $path_to_tax_model . 'taxonomy*ee_assign_event_type' => array('!=', 'espresso_event_type'),
+                    $path_to_tax_model.'taxonomy*ee_assign_event_type' => array('!=', 'espresso_event_type'),
                 )
             );
         }
@@ -232,7 +232,7 @@ 
     {
         if ($model === EEM_Term_Relationship::instance()) {
             $taxonomies = get_taxonomies(array('show_in_rest' => true));
-            if (! empty($taxonomies)) {
+            if ( ! empty($taxonomies)) {
                 $model_query_params[0]['Term_Taxonomy.taxonomy'] = array('IN', $taxonomies);
             }
         }

modules/ticket_selector/templates/simple_ticket_selector.template.php

Indentation +9 added lines, -9 removed lines

@@ -11,14 +11,14 @@ 
 <input type="hidden" name="tkt-slctr-ticket-id-<?php echo $EVT_ID; ?>[]" value="<?php echo $TKT_ID; ?>"/>
 <?php
 if ( $ticket instanceof EE_Ticket ) {
-    do_action( 'AHEE__ticket_selector_chart__template__before_ticket_selector', $event );
-    $ticket_description = $ticket->description();
-    $ticket_description .= ! empty( $ticket_description )
-        ? '<br />' . $ticket_status_display
-        : $ticket_status_display;
-    if (strpos( $ticket_description, '<div' ) === false) {
-        $ticket_description = "<p>{$ticket_description}</p>";
-    }
+	do_action( 'AHEE__ticket_selector_chart__template__before_ticket_selector', $event );
+	$ticket_description = $ticket->description();
+	$ticket_description .= ! empty( $ticket_description )
+		? '<br />' . $ticket_status_display
+		: $ticket_status_display;
+	if (strpos( $ticket_description, '<div' ) === false) {
+		$ticket_description = "<p>{$ticket_description}</p>";
+	}
 ?>
 <div id="no-tkt-slctr-ticket-dv-<?php echo $EVT_ID; ?>" class="no-tkt-slctr-ticket-dv">
     <div class="no-tkt-slctr-ticket-content-dv">
@@ -28,6 +28,6 @@ 
         <?php } ?>
     </div><!-- .no-tkt-slctr-ticket-content-dv -->
 <?php
-    do_action( 'AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event );
+	do_action( 'AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event );
 }
 ?>

Spacing +7 added lines, -7 removed lines

@@ -10,24 +10,24 @@
 <input type="hidden" name="tkt-slctr-qty-<?php echo $EVT_ID; ?>[]" value="1"/>
 <input type="hidden" name="tkt-slctr-ticket-id-<?php echo $EVT_ID; ?>[]" value="<?php echo $TKT_ID; ?>"/>
 <?php
-if ( $ticket instanceof EE_Ticket ) {
-    do_action( 'AHEE__ticket_selector_chart__template__before_ticket_selector', $event );
+if ($ticket instanceof EE_Ticket) {
+    do_action('AHEE__ticket_selector_chart__template__before_ticket_selector', $event);
     $ticket_description = $ticket->description();
-    $ticket_description .= ! empty( $ticket_description )
-        ? '<br />' . $ticket_status_display
+    $ticket_description .= ! empty($ticket_description)
+        ? '<br />'.$ticket_status_display
         : $ticket_status_display;
-    if (strpos( $ticket_description, '<div' ) === false) {
+    if (strpos($ticket_description, '<div') === false) {
         $ticket_description = "<p>{$ticket_description}</p>";
     }
 ?>
 <div id="no-tkt-slctr-ticket-dv-<?php echo $EVT_ID; ?>" class="no-tkt-slctr-ticket-dv">
     <div class="no-tkt-slctr-ticket-content-dv">
         <h5><?php echo $ticket->name(); ?></h5>
-        <?php if ( ! empty( $ticket_description ) ) { ?>
+        <?php if ( ! empty($ticket_description)) { ?>
         <?php echo $ticket_description; ?>
         <?php } ?>
     </div><!-- .no-tkt-slctr-ticket-content-dv -->
 <?php
-    do_action( 'AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event );
+    do_action('AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event);
 }
 ?>