eventespresso / event-espresso-core

core/helpers/EEH_DTT_Helper.helper.php

Doc Comments +1 added lines, -1 removed lines

@@ -944,7 +944,7 @@
      * this method will add that "1" into your date regardless of the format.
      *
      * @param string $month
-     * @return string
+     * @return integer
      */
     public static function first_of_month_timestamp($month = '')
     {

Indentation +912 added lines, -912 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('NO direct script access allowed');
+	exit('NO direct script access allowed');
 }
 
 /**
@@ -26,233 +26,233 @@ 
 {
 
 
-    /**
-     * return the timezone set for the WP install
-     *
-     * @return string valid timezone string for PHP DateTimeZone() class
-     */
-    public static function get_timezone()
-    {
-        return EEH_DTT_Helper::get_valid_timezone_string();
-    }
-
-
-    /**
-     * get_valid_timezone_string
-     *    ensures that a valid timezone string is returned
-     *
-     * @access protected
-     * @param string $timezone_string
-     * @return string
-     * @throws \EE_Error
-     */
-    public static function get_valid_timezone_string($timezone_string = '')
-    {
-        // if passed a value, then use that, else get WP option
-        $timezone_string = ! empty($timezone_string) ? $timezone_string : get_option('timezone_string');
-        // value from above exists, use that, else get timezone string from gmt_offset
-        $timezone_string = ! empty($timezone_string) ? $timezone_string : EEH_DTT_Helper::get_timezone_string_from_gmt_offset();
-        EEH_DTT_Helper::validate_timezone($timezone_string);
-        return $timezone_string;
-    }
-
-
-    /**
-     * This only purpose for this static method is to validate that the incoming timezone is a valid php timezone.
-     *
-     * @static
-     * @access public
-     * @param  string $timezone_string Timezone string to check
-     * @param bool    $throw_error
-     * @return bool
-     * @throws \EE_Error
-     */
-    public static function validate_timezone($timezone_string, $throw_error = true)
-    {
-        // easiest way to test a timezone string is just see if it throws an error when you try to create a DateTimeZone object with it
-        try {
-            new DateTimeZone($timezone_string);
-        } catch (Exception $e) {
-            // sometimes we take exception to exceptions
-            if (! $throw_error) {
-                return false;
-            }
-            throw new EE_Error(
-                sprintf(
-                    __('The timezone given (%1$s), is invalid, please check with %2$sthis list%3$s for what valid timezones can be used',
-                        'event_espresso'),
-                    $timezone_string,
-                    '<a href="http://www.php.net/manual/en/timezones.php">',
-                    '</a>'
-                )
-            );
-        }
-        return true;
-    }
-
-
-    /**
-     * _create_timezone_object_from_timezone_name
-     *
-     * @access protected
-     * @param string $gmt_offset
-     * @return string
-     */
-    public static function get_timezone_string_from_gmt_offset($gmt_offset = '')
-    {
-        $timezone_string = 'UTC';
-        $gmt_offset      = ! empty($gmt_offset) ? $gmt_offset : get_option('gmt_offset');
-        if ($gmt_offset !== '') {
-            // convert GMT offset to seconds
-            $gmt_offset = $gmt_offset * HOUR_IN_SECONDS;
-            // account for WP offsets that aren't valid UTC
-            $gmt_offset = EEH_DTT_Helper::adjust_invalid_gmt_offsets($gmt_offset);
-            // although we don't know the TZ abbreviation, we know the UTC offset
-            $timezone_string = timezone_name_from_abbr(null, $gmt_offset);
-        }
-        // better have a valid timezone string by now, but if not, sigh... loop thru  the timezone_abbreviations_list()...
-        $timezone_string = $timezone_string !== false
-            ? $timezone_string
-            : EEH_DTT_Helper::get_timezone_string_from_abbreviations_list($gmt_offset);
-        return $timezone_string;
-    }
-
-    /**
-     * Gets the site's GMT offset based on either the timezone string
-     * (in which case teh gmt offset will vary depending on the location's
-     * observance of daylight savings time) or the gmt_offset wp option
-     *
-     * @return int seconds offset
-     */
-    public static function get_site_timezone_gmt_offset()
-    {
-        $timezone_string = get_option('timezone_string');
-        if ($timezone_string) {
-            try {
-                $timezone = new DateTimeZone($timezone_string);
-                return $timezone->getOffset(new DateTime()); //in WordPress DateTime defaults to UTC
-            } catch (Exception $e) {
-            }
-        }
-        $offset = get_option('gmt_offset');
-        return (int)($offset * HOUR_IN_SECONDS);
-    }
-
-
-    /**
-     * _create_timezone_object_from_timezone_name
-     *
-     * @access public
-     * @param int $gmt_offset
-     * @return int
-     */
-    public static function adjust_invalid_gmt_offsets($gmt_offset = 0)
-    {
-        //make sure $gmt_offset is int
-        $gmt_offset = (int)$gmt_offset;
-        switch ($gmt_offset) {
-
-            //			case -30600 :
-            //				$gmt_offset = -28800;
-            //				break;
-
-            case -27000 :
-                $gmt_offset = -25200;
-                break;
-
-            case -23400 :
-                $gmt_offset = -21600;
-                break;
-
-            case -19800 :
-                $gmt_offset = -18000;
-                break;
-
-            case -9000 :
-                $gmt_offset = -7200;
-                break;
-
-            case -5400 :
-                $gmt_offset = -3600;
-                break;
-
-            case -1800 :
-                $gmt_offset = 0;
-                break;
-
-            case 1800 :
-                $gmt_offset = 3600;
-                break;
-
-            case 49500 :
-                $gmt_offset = 50400;
-                break;
-
-        }
-        return $gmt_offset;
-    }
-
-
-    /**
-     * get_timezone_string_from_abbreviations_list
-     *
-     * @access public
-     * @param int $gmt_offset
-     * @return string
-     * @throws \EE_Error
-     */
-    public static function get_timezone_string_from_abbreviations_list($gmt_offset = 0)
-    {
-        $abbreviations = timezone_abbreviations_list();
-        foreach ($abbreviations as $abbreviation) {
-            foreach ($abbreviation as $city) {
-                if ($city['offset'] === $gmt_offset && $city['dst'] === false) {
-                    // check if the timezone is valid but don't throw any errors if it isn't
-                    if (EEH_DTT_Helper::validate_timezone($city['timezone_id'], false)) {
-                        return $city['timezone_id'];
-                    }
-                }
-            }
-        }
-        throw new EE_Error(
-            sprintf(
-                __('The provided GMT offset (%1$s), is invalid, please check with %2$sthis list%3$s for what valid timezones can be used',
-                    'event_espresso'),
-                $gmt_offset,
-                '<a href="http://www.php.net/manual/en/timezones.php">',
-                '</a>'
-            )
-        );
-    }
-
-
-    /**
-     * @access public
-     * @param string $timezone_string
-     */
-    public static function timezone_select_input($timezone_string = '')
-    {
-        // get WP date time format
-        $datetime_format = get_option('date_format') . ' ' . get_option('time_format');
-        // if passed a value, then use that, else get WP option
-        $timezone_string = ! empty($timezone_string) ? $timezone_string : get_option('timezone_string');
-        // check if the timezone is valid but don't throw any errors if it isn't
-        $timezone_string = EEH_DTT_Helper::validate_timezone($timezone_string, false);
-        $gmt_offset      = get_option('gmt_offset');
-
-        $check_zone_info = true;
-        if (empty($timezone_string)) {
-            // Create a UTC+- zone if no timezone string exists
-            $check_zone_info = false;
-            if ($gmt_offset > 0) {
-                $timezone_string = 'UTC+' . $gmt_offset;
-            } elseif ($gmt_offset < 0) {
-                $timezone_string = 'UTC' . $gmt_offset;
-            } else {
-                $timezone_string = 'UTC';
-            }
-        }
-        ?>
+	/**
+	 * return the timezone set for the WP install
+	 *
+	 * @return string valid timezone string for PHP DateTimeZone() class
+	 */
+	public static function get_timezone()
+	{
+		return EEH_DTT_Helper::get_valid_timezone_string();
+	}
+
+
+	/**
+	 * get_valid_timezone_string
+	 *    ensures that a valid timezone string is returned
+	 *
+	 * @access protected
+	 * @param string $timezone_string
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public static function get_valid_timezone_string($timezone_string = '')
+	{
+		// if passed a value, then use that, else get WP option
+		$timezone_string = ! empty($timezone_string) ? $timezone_string : get_option('timezone_string');
+		// value from above exists, use that, else get timezone string from gmt_offset
+		$timezone_string = ! empty($timezone_string) ? $timezone_string : EEH_DTT_Helper::get_timezone_string_from_gmt_offset();
+		EEH_DTT_Helper::validate_timezone($timezone_string);
+		return $timezone_string;
+	}
+
+
+	/**
+	 * This only purpose for this static method is to validate that the incoming timezone is a valid php timezone.
+	 *
+	 * @static
+	 * @access public
+	 * @param  string $timezone_string Timezone string to check
+	 * @param bool    $throw_error
+	 * @return bool
+	 * @throws \EE_Error
+	 */
+	public static function validate_timezone($timezone_string, $throw_error = true)
+	{
+		// easiest way to test a timezone string is just see if it throws an error when you try to create a DateTimeZone object with it
+		try {
+			new DateTimeZone($timezone_string);
+		} catch (Exception $e) {
+			// sometimes we take exception to exceptions
+			if (! $throw_error) {
+				return false;
+			}
+			throw new EE_Error(
+				sprintf(
+					__('The timezone given (%1$s), is invalid, please check with %2$sthis list%3$s for what valid timezones can be used',
+						'event_espresso'),
+					$timezone_string,
+					'<a href="http://www.php.net/manual/en/timezones.php">',
+					'</a>'
+				)
+			);
+		}
+		return true;
+	}
+
+
+	/**
+	 * _create_timezone_object_from_timezone_name
+	 *
+	 * @access protected
+	 * @param string $gmt_offset
+	 * @return string
+	 */
+	public static function get_timezone_string_from_gmt_offset($gmt_offset = '')
+	{
+		$timezone_string = 'UTC';
+		$gmt_offset      = ! empty($gmt_offset) ? $gmt_offset : get_option('gmt_offset');
+		if ($gmt_offset !== '') {
+			// convert GMT offset to seconds
+			$gmt_offset = $gmt_offset * HOUR_IN_SECONDS;
+			// account for WP offsets that aren't valid UTC
+			$gmt_offset = EEH_DTT_Helper::adjust_invalid_gmt_offsets($gmt_offset);
+			// although we don't know the TZ abbreviation, we know the UTC offset
+			$timezone_string = timezone_name_from_abbr(null, $gmt_offset);
+		}
+		// better have a valid timezone string by now, but if not, sigh... loop thru  the timezone_abbreviations_list()...
+		$timezone_string = $timezone_string !== false
+			? $timezone_string
+			: EEH_DTT_Helper::get_timezone_string_from_abbreviations_list($gmt_offset);
+		return $timezone_string;
+	}
+
+	/**
+	 * Gets the site's GMT offset based on either the timezone string
+	 * (in which case teh gmt offset will vary depending on the location's
+	 * observance of daylight savings time) or the gmt_offset wp option
+	 *
+	 * @return int seconds offset
+	 */
+	public static function get_site_timezone_gmt_offset()
+	{
+		$timezone_string = get_option('timezone_string');
+		if ($timezone_string) {
+			try {
+				$timezone = new DateTimeZone($timezone_string);
+				return $timezone->getOffset(new DateTime()); //in WordPress DateTime defaults to UTC
+			} catch (Exception $e) {
+			}
+		}
+		$offset = get_option('gmt_offset');
+		return (int)($offset * HOUR_IN_SECONDS);
+	}
+
+
+	/**
+	 * _create_timezone_object_from_timezone_name
+	 *
+	 * @access public
+	 * @param int $gmt_offset
+	 * @return int
+	 */
+	public static function adjust_invalid_gmt_offsets($gmt_offset = 0)
+	{
+		//make sure $gmt_offset is int
+		$gmt_offset = (int)$gmt_offset;
+		switch ($gmt_offset) {
+
+			//			case -30600 :
+			//				$gmt_offset = -28800;
+			//				break;
+
+			case -27000 :
+				$gmt_offset = -25200;
+				break;
+
+			case -23400 :
+				$gmt_offset = -21600;
+				break;
+
+			case -19800 :
+				$gmt_offset = -18000;
+				break;
+
+			case -9000 :
+				$gmt_offset = -7200;
+				break;
+
+			case -5400 :
+				$gmt_offset = -3600;
+				break;
+
+			case -1800 :
+				$gmt_offset = 0;
+				break;
+
+			case 1800 :
+				$gmt_offset = 3600;
+				break;
+
+			case 49500 :
+				$gmt_offset = 50400;
+				break;
+
+		}
+		return $gmt_offset;
+	}
+
+
+	/**
+	 * get_timezone_string_from_abbreviations_list
+	 *
+	 * @access public
+	 * @param int $gmt_offset
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public static function get_timezone_string_from_abbreviations_list($gmt_offset = 0)
+	{
+		$abbreviations = timezone_abbreviations_list();
+		foreach ($abbreviations as $abbreviation) {
+			foreach ($abbreviation as $city) {
+				if ($city['offset'] === $gmt_offset && $city['dst'] === false) {
+					// check if the timezone is valid but don't throw any errors if it isn't
+					if (EEH_DTT_Helper::validate_timezone($city['timezone_id'], false)) {
+						return $city['timezone_id'];
+					}
+				}
+			}
+		}
+		throw new EE_Error(
+			sprintf(
+				__('The provided GMT offset (%1$s), is invalid, please check with %2$sthis list%3$s for what valid timezones can be used',
+					'event_espresso'),
+				$gmt_offset,
+				'<a href="http://www.php.net/manual/en/timezones.php">',
+				'</a>'
+			)
+		);
+	}
+
+
+	/**
+	 * @access public
+	 * @param string $timezone_string
+	 */
+	public static function timezone_select_input($timezone_string = '')
+	{
+		// get WP date time format
+		$datetime_format = get_option('date_format') . ' ' . get_option('time_format');
+		// if passed a value, then use that, else get WP option
+		$timezone_string = ! empty($timezone_string) ? $timezone_string : get_option('timezone_string');
+		// check if the timezone is valid but don't throw any errors if it isn't
+		$timezone_string = EEH_DTT_Helper::validate_timezone($timezone_string, false);
+		$gmt_offset      = get_option('gmt_offset');
+
+		$check_zone_info = true;
+		if (empty($timezone_string)) {
+			// Create a UTC+- zone if no timezone string exists
+			$check_zone_info = false;
+			if ($gmt_offset > 0) {
+				$timezone_string = 'UTC+' . $gmt_offset;
+			} elseif ($gmt_offset < 0) {
+				$timezone_string = 'UTC' . $gmt_offset;
+			} else {
+				$timezone_string = 'UTC';
+			}
+		}
+		?>
 
         <p>
             <label for="timezone_string"><?php _e('timezone'); ?></label>
@@ -265,13 +265,13 @@ 
 
         <p>
         <span><?php
-            printf(
-                __('%1$sUTC%2$s time is %3$s'),
-                '<abbr title="Coordinated Universal Time">',
-                '</abbr>',
-                '<code>' . date_i18n($datetime_format, false, true) . '</code>'
-            );
-            ?></span>
+			printf(
+				__('%1$sUTC%2$s time is %3$s'),
+				'<abbr title="Coordinated Universal Time">',
+				'</abbr>',
+				'<code>' . date_i18n($datetime_format, false, true) . '</code>'
+			);
+			?></span>
         <?php if (! empty($timezone_string) || ! empty($gmt_offset)) : ?>
         <br/><span><?php printf(__('Local time is %1$s'), '<code>' . date_i18n($datetime_format) . '</code>'); ?></span>
     <?php endif; ?>
@@ -280,687 +280,687 @@ 
         <br/>
         <span>
 					<?php
-                    // Set TZ so localtime works.
-                    date_default_timezone_set($timezone_string);
-                    $now = localtime(time(), true);
-                    if ($now['tm_isdst']) {
-                        _e('This timezone is currently in daylight saving time.');
-                    } else {
-                        _e('This timezone is currently in standard time.');
-                    }
-                    ?>
+					// Set TZ so localtime works.
+					date_default_timezone_set($timezone_string);
+					$now = localtime(time(), true);
+					if ($now['tm_isdst']) {
+						_e('This timezone is currently in daylight saving time.');
+					} else {
+						_e('This timezone is currently in standard time.');
+					}
+					?>
             <br/>
             <?php
-            if (function_exists('timezone_transitions_get')) {
-                $found                   = false;
-                $date_time_zone_selected = new DateTimeZone($timezone_string);
-                $tz_offset               = timezone_offset_get($date_time_zone_selected, date_create());
-                $right_now               = time();
-                $tr['isdst']             = false;
-                foreach (timezone_transitions_get($date_time_zone_selected) as $tr) {
-                    if ($tr['ts'] > $right_now) {
-                        $found = true;
-                        break;
-                    }
-                }
-
-                if ($found) {
-                    $message = $tr['isdst'] ?
-                        __(' Daylight saving time begins on: %s.') :
-                        __(' Standard time begins  on: %s.');
-                    // Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
-                    printf($message,
-                        '<code >' . date_i18n($datetime_format, $tr['ts'] + ($tz_offset - $tr['offset'])) . '</code >');
-                } else {
-                    _e('This timezone does not observe daylight saving time.');
-                }
-            }
-            // Set back to UTC.
-            date_default_timezone_set('UTC');
-            ?>
+			if (function_exists('timezone_transitions_get')) {
+				$found                   = false;
+				$date_time_zone_selected = new DateTimeZone($timezone_string);
+				$tz_offset               = timezone_offset_get($date_time_zone_selected, date_create());
+				$right_now               = time();
+				$tr['isdst']             = false;
+				foreach (timezone_transitions_get($date_time_zone_selected) as $tr) {
+					if ($tr['ts'] > $right_now) {
+						$found = true;
+						break;
+					}
+				}
+
+				if ($found) {
+					$message = $tr['isdst'] ?
+						__(' Daylight saving time begins on: %s.') :
+						__(' Standard time begins  on: %s.');
+					// Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
+					printf($message,
+						'<code >' . date_i18n($datetime_format, $tr['ts'] + ($tz_offset - $tr['offset'])) . '</code >');
+				} else {
+					_e('This timezone does not observe daylight saving time.');
+				}
+			}
+			// Set back to UTC.
+			date_default_timezone_set('UTC');
+			?>
 				</span></p>
         <?php
-    endif;
-    }
-
-
-    /**
-     * This method will take an incoming unix timestamp and add the offset to it for the given timezone_string.
-     * If no unix timestamp is given then time() is used.  If no timezone is given then the set timezone string for
-     * the site is used.
-     * This is used typically when using a Unix timestamp any core WP functions that expect their specially
-     * computed timestamp (i.e. date_i18n() )
-     *
-     * @param int    $unix_timestamp                  if 0, then time() will be used.
-     * @param string $timezone_string                 timezone_string. If empty, then the current set timezone for the
-     *                                                site will be used.
-     * @return int      $unix_timestamp with the offset applied for the given timezone.
-     */
-    public static function get_timestamp_with_offset($unix_timestamp = 0, $timezone_string = '')
-    {
-        $unix_timestamp  = $unix_timestamp === 0 ? time() : (int)$unix_timestamp;
-        $timezone_string = self::get_valid_timezone_string($timezone_string);
-        $TimeZone        = new DateTimeZone($timezone_string);
-
-        $DateTime = new DateTime('@' . $unix_timestamp, $TimeZone);
-        $offset   = timezone_offset_get($TimeZone, $DateTime);
-        return (int)$DateTime->format('U') + (int)$offset;
-    }
-
-
-    /**
-     *    _set_date_time_field
-     *    modifies EE_Base_Class EE_Datetime_Field objects
-     *
-     * @param  EE_Base_Class $obj                 EE_Base_Class object
-     * @param    DateTime    $DateTime            PHP DateTime object
-     * @param  string        $datetime_field_name the datetime fieldname to be manipulated
-     * @return    EE_Base_Class
-     */
-    protected static function _set_date_time_field(EE_Base_Class $obj, DateTime $DateTime, $datetime_field_name)
-    {
-        // grab current datetime format
-        $current_format = $obj->get_format();
-        // set new full timestamp format
-        $obj->set_date_format(EE_Datetime_Field::mysql_date_format);
-        $obj->set_time_format(EE_Datetime_Field::mysql_time_format);
-        // set the new date value using a full timestamp format so that no data is lost
-        $obj->set($datetime_field_name, $DateTime->format(EE_Datetime_Field::mysql_timestamp_format));
-        // reset datetime formats
-        $obj->set_date_format($current_format[0]);
-        $obj->set_time_format($current_format[1]);
-        return $obj;
-    }
-
-
-    /**
-     *    date_time_add
-     *    helper for doing simple datetime calculations on a given datetime from EE_Base_Class
-     *    and modifying it IN the EE_Base_Class so you don't have to do anything else.
-     *
-     * @param  EE_Base_Class $obj                 EE_Base_Class object
-     * @param  string        $datetime_field_name name of the EE_Datetime_Filed datatype db column to be manipulated
-     * @param  string        $period              what you are adding. The options are (years, months, days, hours,
-     *                                            minutes, seconds) defaults to years
-     * @param  integer       $value               what you want to increment the time by
-     * @return EE_Base_Class           return the EE_Base_Class object so right away you can do something with it
-     *                                 (chaining)
-     */
-    public static function date_time_add(EE_Base_Class $obj, $datetime_field_name, $period = 'years', $value = 1)
-    {
-        //get the raw UTC date.
-        $DateTime = $obj->get_DateTime_object($datetime_field_name);
-        $DateTime = EEH_DTT_Helper::calc_date($DateTime, $period, $value);
-        return EEH_DTT_Helper::_set_date_time_field($obj, $DateTime, $datetime_field_name);
-    }
-
-
-    /**
-     *    date_time_subtract
-     *    same as date_time_add except subtracting value instead of adding.
-     *
-     * @param \EE_Base_Class $obj
-     * @param  string        $datetime_field_name name of the EE_Datetime_Filed datatype db column to be manipulated
-     * @param string         $period
-     * @param int            $value
-     * @return \EE_Base_Class
-     */
-    public static function date_time_subtract(EE_Base_Class $obj, $datetime_field_name, $period = 'years', $value = 1)
-    {
-        //get the raw UTC date
-        $DateTime = $obj->get_DateTime_object($datetime_field_name);
-        $DateTime = EEH_DTT_Helper::calc_date($DateTime, $period, $value, '-');
-        return EEH_DTT_Helper::_set_date_time_field($obj, $DateTime, $datetime_field_name);
-    }
-
-
-    /**
-     * Simply takes an incoming DateTime object and does calculations on it based on the incoming parameters
-     *
-     * @param  DateTime $DateTime DateTime object
-     * @param  string   $period   a value to indicate what interval is being used in the calculation. The options are
-     *                            'years', 'months', 'days', 'hours', 'minutes', 'seconds'. Defaults to years.
-     * @param  integer  $value    What you want to increment the date by
-     * @param  string   $operand  What operand you wish to use for the calculation
-     * @return \DateTime return whatever type came in.
-     * @throws \EE_Error
-     */
-    protected static function _modify_datetime_object(DateTime $DateTime, $period = 'years', $value = 1, $operand = '+')
-    {
-        if (! $DateTime instanceof DateTime) {
-            throw new EE_Error(
-                sprintf(
-                    __('Expected a PHP DateTime object, but instead received %1$s', 'event_espresso'),
-                    print_r($DateTime, true)
-                )
-            );
-        }
-        switch ($period) {
-            case 'years' :
-                $value = 'P' . $value . 'Y';
-                break;
-            case 'months' :
-                $value = 'P' . $value . 'M';
-                break;
-            case 'weeks' :
-                $value = 'P' . $value . 'W';
-                break;
-            case 'days' :
-                $value = 'P' . $value . 'D';
-                break;
-            case 'hours' :
-                $value = 'PT' . $value . 'H';
-                break;
-            case 'minutes' :
-                $value = 'PT' . $value . 'M';
-                break;
-            case 'seconds' :
-                $value = 'PT' . $value . 'S';
-                break;
-        }
-        switch ($operand) {
-            case '+':
-                $DateTime->add(new DateInterval($value));
-                break;
-            case '-':
-                $DateTime->sub(new DateInterval($value));
-                break;
-        }
-        return $DateTime;
-    }
-
-
-    /**
-     * Simply takes an incoming Unix timestamp and does calculations on it based on the incoming parameters
-     *
-     * @param  int     $timestamp Unix timestamp
-     * @param  string  $period    a value to indicate what interval is being used in the calculation. The options are
-     *                            'years', 'months', 'days', 'hours', 'minutes', 'seconds'. Defaults to years.
-     * @param  integer $value     What you want to increment the date by
-     * @param  string  $operand   What operand you wish to use for the calculation
-     * @return \DateTime return whatever type came in.
-     * @throws \EE_Error
-     */
-    protected static function _modify_timestamp($timestamp, $period = 'years', $value = 1, $operand = '+')
-    {
-        if (! preg_match(EE_Datetime_Field::unix_timestamp_regex, $timestamp)) {
-            throw new EE_Error(
-                sprintf(
-                    __('Expected a Unix timestamp, but instead received %1$s', 'event_espresso'),
-                    print_r($timestamp, true)
-                )
-            );
-        }
-        switch ($period) {
-            case 'years' :
-                $value = YEAR_IN_SECONDS * $value;
-                break;
-            case 'months' :
-                $value = YEAR_IN_SECONDS / 12 * $value;
-                break;
-            case 'weeks' :
-                $value = WEEK_IN_SECONDS * $value;
-                break;
-            case 'days' :
-                $value = DAY_IN_SECONDS * $value;
-                break;
-            case 'hours' :
-                $value = HOUR_IN_SECONDS * $value;
-                break;
-            case 'minutes' :
-                $value = MINUTE_IN_SECONDS * $value;
-                break;
-        }
-        switch ($operand) {
-            case '+':
-                $timestamp += $value;
-                break;
-            case '-':
-                $timestamp -= $value;
-                break;
-        }
-        return $timestamp;
-    }
-
-
-    /**
-     * Simply takes an incoming UTC timestamp or DateTime object and does calculations on it based on the incoming
-     * parameters and returns the new timestamp or DateTime.
-     *
-     * @param  int | DateTime $DateTime_or_timestamp DateTime object or Unix timestamp
-     * @param  string         $period                a value to indicate what interval is being used in the
-     *                                               calculation. The options are 'years', 'months', 'days', 'hours',
-     *                                               'minutes', 'seconds'. Defaults to years.
-     * @param  integer        $value                 What you want to increment the date by
-     * @param  string         $operand               What operand you wish to use for the calculation
-     * @return mixed string|DateTime          return whatever type came in.
-     */
-    public static function calc_date($DateTime_or_timestamp, $period = 'years', $value = 1, $operand = '+')
-    {
-        if ($DateTime_or_timestamp instanceof DateTime) {
-            return EEH_DTT_Helper::_modify_datetime_object($DateTime_or_timestamp, $period, $value, $operand);
-        } else if (preg_match(EE_Datetime_Field::unix_timestamp_regex, $DateTime_or_timestamp)) {
-            return EEH_DTT_Helper::_modify_timestamp($DateTime_or_timestamp, $period, $value, $operand);
-        } else {
-            //error
-            return $DateTime_or_timestamp;
-        }
-    }
-
-
-    /**
-     * The purpose of this helper method is to receive an incoming format string in php date/time format
-     * and spit out the js and moment.js equivalent formats.
-     * Note, if no format string is given, then it is assumed the user wants what is set for WP.
-     * Note, js date and time formats are those used by the jquery-ui datepicker and the jquery-ui date-
-     * time picker.
-     *
-     * @see http://stackoverflow.com/posts/16725290/ for the code inspiration.
-     * @param null $date_format_string
-     * @param null $time_format_string
-     * @return array
-     *                array(
-     *                'js' => array (
-     *                'date' => //date format
-     *                'time' => //time format
-     *                ),
-     *                'moment' => //date and time format.
-     *                )
-     */
-    public static function convert_php_to_js_and_moment_date_formats(
-        $date_format_string = null,
-        $time_format_string = null
-    ) {
-        if ($date_format_string === null) {
-            $date_format_string = get_option('date_format');
-        }
-
-        if ($time_format_string === null) {
-            $time_format_string = get_option('time_format');
-        }
-
-        $date_format = self::_php_to_js_moment_converter($date_format_string);
-        $time_format = self::_php_to_js_moment_converter($time_format_string);
-
-        return array(
-            'js'     => array(
-                'date' => $date_format['js'],
-                'time' => $time_format['js'],
-            ),
-            'moment' => $date_format['moment'] . ' ' . $time_format['moment'],
-        );
-    }
-
-
-    /**
-     * This converts incoming format string into js and moment variations.
-     *
-     * @param string $format_string incoming php format string
-     * @return array js and moment formats.
-     */
-    protected static function _php_to_js_moment_converter($format_string)
-    {
-        /**
-         * This is a map of symbols for formats.
-         * The index is the php symbol, the equivalent values are in the array.
-         *
-         * @var array
-         */
-        $symbols_map      = array(
-            // Day
-            //01
-            'd' => array(
-                'js'     => 'dd',
-                'moment' => 'DD',
-            ),
-            //Mon
-            'D' => array(
-                'js'     => 'D',
-                'moment' => 'ddd',
-            ),
-            //1,2,...31
-            'j' => array(
-                'js'     => 'd',
-                'moment' => 'D',
-            ),
-            //Monday
-            'l' => array(
-                'js'     => 'DD',
-                'moment' => 'dddd',
-            ),
-            //ISO numeric representation of the day of the week (1-6)
-            'N' => array(
-                'js'     => '',
-                'moment' => 'E',
-            ),
-            //st,nd.rd
-            'S' => array(
-                'js'     => '',
-                'moment' => 'o',
-            ),
-            //numeric representation of day of week (0-6)
-            'w' => array(
-                'js'     => '',
-                'moment' => 'd',
-            ),
-            //day of year starting from 0 (0-365)
-            'z' => array(
-                'js'     => 'o',
-                'moment' => 'DDD' //note moment does not start with 0 so will need to modify by subtracting 1
-            ),
-            // Week
-            //ISO-8601 week number of year (weeks starting on monday)
-            'W' => array(
-                'js'     => '',
-                'moment' => 'w',
-            ),
-            // Month
-            // January...December
-            'F' => array(
-                'js'     => 'MM',
-                'moment' => 'MMMM',
-            ),
-            //01...12
-            'm' => array(
-                'js'     => 'mm',
-                'moment' => 'MM',
-            ),
-            //Jan...Dec
-            'M' => array(
-                'js'     => 'M',
-                'moment' => 'MMM',
-            ),
-            //1-12
-            'n' => array(
-                'js'     => 'm',
-                'moment' => 'M',
-            ),
-            //number of days in given month
-            't' => array(
-                'js'     => '',
-                'moment' => '',
-            ),
-            // Year
-            //whether leap year or not 1/0
-            'L' => array(
-                'js'     => '',
-                'moment' => '',
-            ),
-            //ISO-8601 year number
-            'o' => array(
-                'js'     => '',
-                'moment' => 'GGGG',
-            ),
-            //1999...2003
-            'Y' => array(
-                'js'     => 'yy',
-                'moment' => 'YYYY',
-            ),
-            //99...03
-            'y' => array(
-                'js'     => 'y',
-                'moment' => 'YY',
-            ),
-            // Time
-            // am/pm
-            'a' => array(
-                'js'     => 'tt',
-                'moment' => 'a',
-            ),
-            // AM/PM
-            'A' => array(
-                'js'     => 'TT',
-                'moment' => 'A',
-            ),
-            // Swatch Internet Time?!?
-            'B' => array(
-                'js'     => '',
-                'moment' => '',
-            ),
-            //1...12
-            'g' => array(
-                'js'     => 'h',
-                'moment' => 'h',
-            ),
-            //0...23
-            'G' => array(
-                'js'     => 'H',
-                'moment' => 'H',
-            ),
-            //01...12
-            'h' => array(
-                'js'     => 'hh',
-                'moment' => 'hh',
-            ),
-            //00...23
-            'H' => array(
-                'js'     => 'HH',
-                'moment' => 'HH',
-            ),
-            //00..59
-            'i' => array(
-                'js'     => 'mm',
-                'moment' => 'mm',
-            ),
-            //seconds... 00...59
-            's' => array(
-                'js'     => 'ss',
-                'moment' => 'ss',
-            ),
-            //microseconds
-            'u' => array(
-                'js'     => '',
-                'moment' => '',
-            ),
-        );
-        $jquery_ui_format = "";
-        $moment_format    = "";
-        $escaping         = false;
-        for ($i = 0; $i < strlen($format_string); $i++) {
-            $char = $format_string[$i];
-            if ($char === '\\') { // PHP date format escaping character
-                $i++;
-                if ($escaping) {
-                    $jquery_ui_format .= $format_string[$i];
-                    $moment_format .= $format_string[$i];
-                } else {
-                    $jquery_ui_format .= '\'' . $format_string[$i];
-                    $moment_format .= $format_string[$i];
-                }
-                $escaping = true;
-            } else {
-                if ($escaping) {
-                    $jquery_ui_format .= "'";
-                    $moment_format .= "'";
-                    $escaping = false;
-                }
-                if (isset($symbols_map[$char])) {
-                    $jquery_ui_format .= $symbols_map[$char]['js'];
-                    $moment_format .= $symbols_map[$char]['moment'];
-                } else {
-                    $jquery_ui_format .= $char;
-                    $moment_format .= $char;
-                }
-            }
-        }
-        return array('js' => $jquery_ui_format, 'moment' => $moment_format);
-    }
-
-
-    /**
-     * This takes an incoming format string and validates it to ensure it will work fine with PHP.
-     *
-     * @param string $format_string   Incoming format string for php date().
-     * @return mixed bool|array  If all is okay then TRUE is returned.  Otherwise an array of validation
-     *                                errors is returned.  So for client code calling, check for is_array() to
-     *                                indicate failed validations.
-     */
-    public static function validate_format_string($format_string)
-    {
-        $error_msg = array();
-        //time format checks
-        switch (true) {
-            case   strpos($format_string, 'h') !== false  :
-            case   strpos($format_string, 'g') !== false :
-                /**
-                 * if the time string has a lowercase 'h' which == 12 hour time format and there
-                 * is not any ante meridiem format ('a' or 'A').  Then throw an error because its
-                 * too ambiguous and PHP won't be able to figure out whether 1 = 1pm or 1am.
-                 */
-                if (strpos(strtoupper($format_string), 'A') === false) {
-                    $error_msg[] = __('There is a  time format for 12 hour time but no  "a" or "A" to indicate am/pm.  Without this distinction, PHP is unable to determine if a "1" for the hour value equals "1pm" or "1am".',
-                        'event_espresso');
-                }
-                break;
-
-        }
-
-        return empty($error_msg) ? true : $error_msg;
-    }
-
-
-    /**
-     *     If the the first date starts at midnight on one day, and the next date ends at midnight on the
-     *     very next day then this method will return true.
-     *    If $date_1 = 2015-12-15 00:00:00 and $date_2 = 2015-12-16 00:00:00 then this function will return true.
-     *    If $date_1 = 2015-12-15 03:00:00 and $date_2 = 2015-12_16 03:00:00 then this function will return false.
-     *    If $date_1 = 2015-12-15 00:00:00 and $date_2 = 2015-12-15 00:00:00 then this function will return true.
-     *
-     * @param mixed $date_1
-     * @param mixed $date_2
-     * @return bool
-     */
-    public static function dates_represent_one_24_hour_date($date_1, $date_2)
-    {
-
-        if (
-            (! $date_1 instanceof DateTime || ! $date_2 instanceof DateTime) ||
-            ($date_1->format(EE_Datetime_Field::mysql_time_format) != '00:00:00' || $date_2->format(EE_Datetime_Field::mysql_time_format) != '00:00:00')
-        ) {
-            return false;
-        }
-        return $date_2->format('U') - $date_1->format('U') == 86400 ? true : false;
-    }
-
-
-    /**
-     * This returns the appropriate query interval string that can be used in sql queries involving mysql Date
-     * Functions.
-     *
-     * @param string $timezone_string    A timezone string in a valid format to instantiate a DateTimeZone object.
-     * @param string $field_for_interval The Database field that is the interval is applied to in the query.
-     * @return string
-     */
-    public static function get_sql_query_interval_for_offset($timezone_string, $field_for_interval)
-    {
-        try {
-            /** need to account for timezone offset on the selects */
-            $DateTimeZone = new DateTimeZone($timezone_string);
-        } catch (Exception $e) {
-            $DateTimeZone = null;
-        }
-
-        /**
-         * Note get_option( 'gmt_offset') returns a value in hours, whereas DateTimeZone::getOffset returns values in seconds.
-         * Hence we do the calc for DateTimeZone::getOffset.
-         */
-        $offset         = $DateTimeZone instanceof DateTimeZone ? ($DateTimeZone->getOffset(new DateTime('now'))) / HOUR_IN_SECONDS : get_option('gmt_offset');
-        $query_interval = $offset < 0
-            ? 'DATE_SUB(' . $field_for_interval . ', INTERVAL ' . $offset * -1 . ' HOUR)'
-            : 'DATE_ADD(' . $field_for_interval . ', INTERVAL ' . $offset . ' HOUR)';
-        return $query_interval;
-    }
-
-    /**
-     * Retrieves the site's default timezone and returns it formatted so it's ready for display
-     * to users. If you want to customize how its displayed feel free to fetch the 'timezone_string'
-     * and 'gmt_offset' WordPress options directly; or use the filter
-     * FHEE__EEH_DTT_Helper__get_timezone_string_for_display
-     * (although note that we remove any HTML that may be added)
-     *
-     * @return string
-     */
-    public static function get_timezone_string_for_display()
-    {
-        $pretty_timezone = apply_filters('FHEE__EEH_DTT_Helper__get_timezone_string_for_display', '');
-        if (! empty($pretty_timezone)) {
-            return esc_html($pretty_timezone);
-        }
-        $timezone_string = get_option('timezone_string');
-        if ($timezone_string) {
-            static $mo_loaded = false;
-            // Load translations for continents and cities just like wp_timezone_choice does
-            if (! $mo_loaded) {
-                $locale = get_locale();
-                $mofile = WP_LANG_DIR . '/continents-cities-' . $locale . '.mo';
-                load_textdomain('continents-cities', $mofile);
-                $mo_loaded = true;
-            }
-            //well that was easy.
-            $parts = explode('/', $timezone_string);
-            //remove the continent
-            unset($parts[0]);
-            $t_parts = array();
-            foreach ($parts as $part) {
-                $t_parts[] = translate(str_replace('_', ' ', $part), 'continents-cities');
-            }
-            return implode(' - ', $t_parts);
-        }
-        //they haven't set the timezone string, so let's return a string like "UTC+1"
-        $gmt_offset = get_option('gmt_offset');
-        if (intval($gmt_offset) >= 0) {
-            $prefix = '+';
-        } else {
-            $prefix = '';
-        }
-        $parts = explode('.', (string)$gmt_offset);
-        if (count($parts) === 1) {
-            $parts[1] = '00';
-        } else {
-            //convert the part after the decimal, eg "5" (from x.5) or "25" (from x.25)
-            //to minutes, eg 30 or 15, respectively
-            $hour_fraction = (float)('0.' . $parts[1]);
-            $parts[1]      = (string)$hour_fraction * 60;
-        }
-        return sprintf(__('UTC%1$s', 'event_espresso'), $prefix . implode(':', $parts));
-    }
-
-
-
-    /**
-     * So PHP does this awesome thing where if you are trying to get a timestamp
-     * for a month using a string like "February" or "February 2017",
-     * and you don't specify a day as part of your string,
-     * then PHP will use whatever the current day of the month is.
-     * IF the current day of the month happens to be the 30th or 31st,
-     * then PHP gets really confused by a date like February 30,
-     * so instead of saying
-     *      "Hey February only has 28 days (this year)...
-     *      ...you must have meant the last day of the month!"
-     * PHP does the next most logical thing, and bumps the date up to March 2nd,
-     * because someone requesting February 30th obviously meant March 1st!
-     * The way around this is to always set the day to the first,
-     * so that the month will stay on the month you wanted.
-     * this method will add that "1" into your date regardless of the format.
-     *
-     * @param string $month
-     * @return string
-     */
-    public static function first_of_month_timestamp($month = '')
-    {
-        $month = (string)$month;
-        $year = '';
-        // check if the incoming string has a year in it or not
-       if (preg_match('/\b\d{4}\b/', $month, $matches)) {
-           $year = $matches[0];
-           // ten remove that from the month string as well as any spaces
-           $month = trim(str_replace($year, '', $month));
-           // add a space before the year
-           $year = " {$year}";
-        }
-        // return timestamp for something like "February 1 2017"
-        return strtotime("{$month} 1{$year}");
-    }
+	endif;
+	}
+
+
+	/**
+	 * This method will take an incoming unix timestamp and add the offset to it for the given timezone_string.
+	 * If no unix timestamp is given then time() is used.  If no timezone is given then the set timezone string for
+	 * the site is used.
+	 * This is used typically when using a Unix timestamp any core WP functions that expect their specially
+	 * computed timestamp (i.e. date_i18n() )
+	 *
+	 * @param int    $unix_timestamp                  if 0, then time() will be used.
+	 * @param string $timezone_string                 timezone_string. If empty, then the current set timezone for the
+	 *                                                site will be used.
+	 * @return int      $unix_timestamp with the offset applied for the given timezone.
+	 */
+	public static function get_timestamp_with_offset($unix_timestamp = 0, $timezone_string = '')
+	{
+		$unix_timestamp  = $unix_timestamp === 0 ? time() : (int)$unix_timestamp;
+		$timezone_string = self::get_valid_timezone_string($timezone_string);
+		$TimeZone        = new DateTimeZone($timezone_string);
+
+		$DateTime = new DateTime('@' . $unix_timestamp, $TimeZone);
+		$offset   = timezone_offset_get($TimeZone, $DateTime);
+		return (int)$DateTime->format('U') + (int)$offset;
+	}
+
+
+	/**
+	 *    _set_date_time_field
+	 *    modifies EE_Base_Class EE_Datetime_Field objects
+	 *
+	 * @param  EE_Base_Class $obj                 EE_Base_Class object
+	 * @param    DateTime    $DateTime            PHP DateTime object
+	 * @param  string        $datetime_field_name the datetime fieldname to be manipulated
+	 * @return    EE_Base_Class
+	 */
+	protected static function _set_date_time_field(EE_Base_Class $obj, DateTime $DateTime, $datetime_field_name)
+	{
+		// grab current datetime format
+		$current_format = $obj->get_format();
+		// set new full timestamp format
+		$obj->set_date_format(EE_Datetime_Field::mysql_date_format);
+		$obj->set_time_format(EE_Datetime_Field::mysql_time_format);
+		// set the new date value using a full timestamp format so that no data is lost
+		$obj->set($datetime_field_name, $DateTime->format(EE_Datetime_Field::mysql_timestamp_format));
+		// reset datetime formats
+		$obj->set_date_format($current_format[0]);
+		$obj->set_time_format($current_format[1]);
+		return $obj;
+	}
+
+
+	/**
+	 *    date_time_add
+	 *    helper for doing simple datetime calculations on a given datetime from EE_Base_Class
+	 *    and modifying it IN the EE_Base_Class so you don't have to do anything else.
+	 *
+	 * @param  EE_Base_Class $obj                 EE_Base_Class object
+	 * @param  string        $datetime_field_name name of the EE_Datetime_Filed datatype db column to be manipulated
+	 * @param  string        $period              what you are adding. The options are (years, months, days, hours,
+	 *                                            minutes, seconds) defaults to years
+	 * @param  integer       $value               what you want to increment the time by
+	 * @return EE_Base_Class           return the EE_Base_Class object so right away you can do something with it
+	 *                                 (chaining)
+	 */
+	public static function date_time_add(EE_Base_Class $obj, $datetime_field_name, $period = 'years', $value = 1)
+	{
+		//get the raw UTC date.
+		$DateTime = $obj->get_DateTime_object($datetime_field_name);
+		$DateTime = EEH_DTT_Helper::calc_date($DateTime, $period, $value);
+		return EEH_DTT_Helper::_set_date_time_field($obj, $DateTime, $datetime_field_name);
+	}
+
+
+	/**
+	 *    date_time_subtract
+	 *    same as date_time_add except subtracting value instead of adding.
+	 *
+	 * @param \EE_Base_Class $obj
+	 * @param  string        $datetime_field_name name of the EE_Datetime_Filed datatype db column to be manipulated
+	 * @param string         $period
+	 * @param int            $value
+	 * @return \EE_Base_Class
+	 */
+	public static function date_time_subtract(EE_Base_Class $obj, $datetime_field_name, $period = 'years', $value = 1)
+	{
+		//get the raw UTC date
+		$DateTime = $obj->get_DateTime_object($datetime_field_name);
+		$DateTime = EEH_DTT_Helper::calc_date($DateTime, $period, $value, '-');
+		return EEH_DTT_Helper::_set_date_time_field($obj, $DateTime, $datetime_field_name);
+	}
+
+
+	/**
+	 * Simply takes an incoming DateTime object and does calculations on it based on the incoming parameters
+	 *
+	 * @param  DateTime $DateTime DateTime object
+	 * @param  string   $period   a value to indicate what interval is being used in the calculation. The options are
+	 *                            'years', 'months', 'days', 'hours', 'minutes', 'seconds'. Defaults to years.
+	 * @param  integer  $value    What you want to increment the date by
+	 * @param  string   $operand  What operand you wish to use for the calculation
+	 * @return \DateTime return whatever type came in.
+	 * @throws \EE_Error
+	 */
+	protected static function _modify_datetime_object(DateTime $DateTime, $period = 'years', $value = 1, $operand = '+')
+	{
+		if (! $DateTime instanceof DateTime) {
+			throw new EE_Error(
+				sprintf(
+					__('Expected a PHP DateTime object, but instead received %1$s', 'event_espresso'),
+					print_r($DateTime, true)
+				)
+			);
+		}
+		switch ($period) {
+			case 'years' :
+				$value = 'P' . $value . 'Y';
+				break;
+			case 'months' :
+				$value = 'P' . $value . 'M';
+				break;
+			case 'weeks' :
+				$value = 'P' . $value . 'W';
+				break;
+			case 'days' :
+				$value = 'P' . $value . 'D';
+				break;
+			case 'hours' :
+				$value = 'PT' . $value . 'H';
+				break;
+			case 'minutes' :
+				$value = 'PT' . $value . 'M';
+				break;
+			case 'seconds' :
+				$value = 'PT' . $value . 'S';
+				break;
+		}
+		switch ($operand) {
+			case '+':
+				$DateTime->add(new DateInterval($value));
+				break;
+			case '-':
+				$DateTime->sub(new DateInterval($value));
+				break;
+		}
+		return $DateTime;
+	}
+
+
+	/**
+	 * Simply takes an incoming Unix timestamp and does calculations on it based on the incoming parameters
+	 *
+	 * @param  int     $timestamp Unix timestamp
+	 * @param  string  $period    a value to indicate what interval is being used in the calculation. The options are
+	 *                            'years', 'months', 'days', 'hours', 'minutes', 'seconds'. Defaults to years.
+	 * @param  integer $value     What you want to increment the date by
+	 * @param  string  $operand   What operand you wish to use for the calculation
+	 * @return \DateTime return whatever type came in.
+	 * @throws \EE_Error
+	 */
+	protected static function _modify_timestamp($timestamp, $period = 'years', $value = 1, $operand = '+')
+	{
+		if (! preg_match(EE_Datetime_Field::unix_timestamp_regex, $timestamp)) {
+			throw new EE_Error(
+				sprintf(
+					__('Expected a Unix timestamp, but instead received %1$s', 'event_espresso'),
+					print_r($timestamp, true)
+				)
+			);
+		}
+		switch ($period) {
+			case 'years' :
+				$value = YEAR_IN_SECONDS * $value;
+				break;
+			case 'months' :
+				$value = YEAR_IN_SECONDS / 12 * $value;
+				break;
+			case 'weeks' :
+				$value = WEEK_IN_SECONDS * $value;
+				break;
+			case 'days' :
+				$value = DAY_IN_SECONDS * $value;
+				break;
+			case 'hours' :
+				$value = HOUR_IN_SECONDS * $value;
+				break;
+			case 'minutes' :
+				$value = MINUTE_IN_SECONDS * $value;
+				break;
+		}
+		switch ($operand) {
+			case '+':
+				$timestamp += $value;
+				break;
+			case '-':
+				$timestamp -= $value;
+				break;
+		}
+		return $timestamp;
+	}
+
+
+	/**
+	 * Simply takes an incoming UTC timestamp or DateTime object and does calculations on it based on the incoming
+	 * parameters and returns the new timestamp or DateTime.
+	 *
+	 * @param  int | DateTime $DateTime_or_timestamp DateTime object or Unix timestamp
+	 * @param  string         $period                a value to indicate what interval is being used in the
+	 *                                               calculation. The options are 'years', 'months', 'days', 'hours',
+	 *                                               'minutes', 'seconds'. Defaults to years.
+	 * @param  integer        $value                 What you want to increment the date by
+	 * @param  string         $operand               What operand you wish to use for the calculation
+	 * @return mixed string|DateTime          return whatever type came in.
+	 */
+	public static function calc_date($DateTime_or_timestamp, $period = 'years', $value = 1, $operand = '+')
+	{
+		if ($DateTime_or_timestamp instanceof DateTime) {
+			return EEH_DTT_Helper::_modify_datetime_object($DateTime_or_timestamp, $period, $value, $operand);
+		} else if (preg_match(EE_Datetime_Field::unix_timestamp_regex, $DateTime_or_timestamp)) {
+			return EEH_DTT_Helper::_modify_timestamp($DateTime_or_timestamp, $period, $value, $operand);
+		} else {
+			//error
+			return $DateTime_or_timestamp;
+		}
+	}
+
+
+	/**
+	 * The purpose of this helper method is to receive an incoming format string in php date/time format
+	 * and spit out the js and moment.js equivalent formats.
+	 * Note, if no format string is given, then it is assumed the user wants what is set for WP.
+	 * Note, js date and time formats are those used by the jquery-ui datepicker and the jquery-ui date-
+	 * time picker.
+	 *
+	 * @see http://stackoverflow.com/posts/16725290/ for the code inspiration.
+	 * @param null $date_format_string
+	 * @param null $time_format_string
+	 * @return array
+	 *                array(
+	 *                'js' => array (
+	 *                'date' => //date format
+	 *                'time' => //time format
+	 *                ),
+	 *                'moment' => //date and time format.
+	 *                )
+	 */
+	public static function convert_php_to_js_and_moment_date_formats(
+		$date_format_string = null,
+		$time_format_string = null
+	) {
+		if ($date_format_string === null) {
+			$date_format_string = get_option('date_format');
+		}
+
+		if ($time_format_string === null) {
+			$time_format_string = get_option('time_format');
+		}
+
+		$date_format = self::_php_to_js_moment_converter($date_format_string);
+		$time_format = self::_php_to_js_moment_converter($time_format_string);
+
+		return array(
+			'js'     => array(
+				'date' => $date_format['js'],
+				'time' => $time_format['js'],
+			),
+			'moment' => $date_format['moment'] . ' ' . $time_format['moment'],
+		);
+	}
+
+
+	/**
+	 * This converts incoming format string into js and moment variations.
+	 *
+	 * @param string $format_string incoming php format string
+	 * @return array js and moment formats.
+	 */
+	protected static function _php_to_js_moment_converter($format_string)
+	{
+		/**
+		 * This is a map of symbols for formats.
+		 * The index is the php symbol, the equivalent values are in the array.
+		 *
+		 * @var array
+		 */
+		$symbols_map      = array(
+			// Day
+			//01
+			'd' => array(
+				'js'     => 'dd',
+				'moment' => 'DD',
+			),
+			//Mon
+			'D' => array(
+				'js'     => 'D',
+				'moment' => 'ddd',
+			),
+			//1,2,...31
+			'j' => array(
+				'js'     => 'd',
+				'moment' => 'D',
+			),
+			//Monday
+			'l' => array(
+				'js'     => 'DD',
+				'moment' => 'dddd',
+			),
+			//ISO numeric representation of the day of the week (1-6)
+			'N' => array(
+				'js'     => '',
+				'moment' => 'E',
+			),
+			//st,nd.rd
+			'S' => array(
+				'js'     => '',
+				'moment' => 'o',
+			),
+			//numeric representation of day of week (0-6)
+			'w' => array(
+				'js'     => '',
+				'moment' => 'd',
+			),
+			//day of year starting from 0 (0-365)
+			'z' => array(
+				'js'     => 'o',
+				'moment' => 'DDD' //note moment does not start with 0 so will need to modify by subtracting 1
+			),
+			// Week
+			//ISO-8601 week number of year (weeks starting on monday)
+			'W' => array(
+				'js'     => '',
+				'moment' => 'w',
+			),
+			// Month
+			// January...December
+			'F' => array(
+				'js'     => 'MM',
+				'moment' => 'MMMM',
+			),
+			//01...12
+			'm' => array(
+				'js'     => 'mm',
+				'moment' => 'MM',
+			),
+			//Jan...Dec
+			'M' => array(
+				'js'     => 'M',
+				'moment' => 'MMM',
+			),
+			//1-12
+			'n' => array(
+				'js'     => 'm',
+				'moment' => 'M',
+			),
+			//number of days in given month
+			't' => array(
+				'js'     => '',
+				'moment' => '',
+			),
+			// Year
+			//whether leap year or not 1/0
+			'L' => array(
+				'js'     => '',
+				'moment' => '',
+			),
+			//ISO-8601 year number
+			'o' => array(
+				'js'     => '',
+				'moment' => 'GGGG',
+			),
+			//1999...2003
+			'Y' => array(
+				'js'     => 'yy',
+				'moment' => 'YYYY',
+			),
+			//99...03
+			'y' => array(
+				'js'     => 'y',
+				'moment' => 'YY',
+			),
+			// Time
+			// am/pm
+			'a' => array(
+				'js'     => 'tt',
+				'moment' => 'a',
+			),
+			// AM/PM
+			'A' => array(
+				'js'     => 'TT',
+				'moment' => 'A',
+			),
+			// Swatch Internet Time?!?
+			'B' => array(
+				'js'     => '',
+				'moment' => '',
+			),
+			//1...12
+			'g' => array(
+				'js'     => 'h',
+				'moment' => 'h',
+			),
+			//0...23
+			'G' => array(
+				'js'     => 'H',
+				'moment' => 'H',
+			),
+			//01...12
+			'h' => array(
+				'js'     => 'hh',
+				'moment' => 'hh',
+			),
+			//00...23
+			'H' => array(
+				'js'     => 'HH',
+				'moment' => 'HH',
+			),
+			//00..59
+			'i' => array(
+				'js'     => 'mm',
+				'moment' => 'mm',
+			),
+			//seconds... 00...59
+			's' => array(
+				'js'     => 'ss',
+				'moment' => 'ss',
+			),
+			//microseconds
+			'u' => array(
+				'js'     => '',
+				'moment' => '',
+			),
+		);
+		$jquery_ui_format = "";
+		$moment_format    = "";
+		$escaping         = false;
+		for ($i = 0; $i < strlen($format_string); $i++) {
+			$char = $format_string[$i];
+			if ($char === '\\') { // PHP date format escaping character
+				$i++;
+				if ($escaping) {
+					$jquery_ui_format .= $format_string[$i];
+					$moment_format .= $format_string[$i];
+				} else {
+					$jquery_ui_format .= '\'' . $format_string[$i];
+					$moment_format .= $format_string[$i];
+				}
+				$escaping = true;
+			} else {
+				if ($escaping) {
+					$jquery_ui_format .= "'";
+					$moment_format .= "'";
+					$escaping = false;
+				}
+				if (isset($symbols_map[$char])) {
+					$jquery_ui_format .= $symbols_map[$char]['js'];
+					$moment_format .= $symbols_map[$char]['moment'];
+				} else {
+					$jquery_ui_format .= $char;
+					$moment_format .= $char;
+				}
+			}
+		}
+		return array('js' => $jquery_ui_format, 'moment' => $moment_format);
+	}
+
+
+	/**
+	 * This takes an incoming format string and validates it to ensure it will work fine with PHP.
+	 *
+	 * @param string $format_string   Incoming format string for php date().
+	 * @return mixed bool|array  If all is okay then TRUE is returned.  Otherwise an array of validation
+	 *                                errors is returned.  So for client code calling, check for is_array() to
+	 *                                indicate failed validations.
+	 */
+	public static function validate_format_string($format_string)
+	{
+		$error_msg = array();
+		//time format checks
+		switch (true) {
+			case   strpos($format_string, 'h') !== false  :
+			case   strpos($format_string, 'g') !== false :
+				/**
+				 * if the time string has a lowercase 'h' which == 12 hour time format and there
+				 * is not any ante meridiem format ('a' or 'A').  Then throw an error because its
+				 * too ambiguous and PHP won't be able to figure out whether 1 = 1pm or 1am.
+				 */
+				if (strpos(strtoupper($format_string), 'A') === false) {
+					$error_msg[] = __('There is a  time format for 12 hour time but no  "a" or "A" to indicate am/pm.  Without this distinction, PHP is unable to determine if a "1" for the hour value equals "1pm" or "1am".',
+						'event_espresso');
+				}
+				break;
+
+		}
+
+		return empty($error_msg) ? true : $error_msg;
+	}
+
+
+	/**
+	 *     If the the first date starts at midnight on one day, and the next date ends at midnight on the
+	 *     very next day then this method will return true.
+	 *    If $date_1 = 2015-12-15 00:00:00 and $date_2 = 2015-12-16 00:00:00 then this function will return true.
+	 *    If $date_1 = 2015-12-15 03:00:00 and $date_2 = 2015-12_16 03:00:00 then this function will return false.
+	 *    If $date_1 = 2015-12-15 00:00:00 and $date_2 = 2015-12-15 00:00:00 then this function will return true.
+	 *
+	 * @param mixed $date_1
+	 * @param mixed $date_2
+	 * @return bool
+	 */
+	public static function dates_represent_one_24_hour_date($date_1, $date_2)
+	{
+
+		if (
+			(! $date_1 instanceof DateTime || ! $date_2 instanceof DateTime) ||
+			($date_1->format(EE_Datetime_Field::mysql_time_format) != '00:00:00' || $date_2->format(EE_Datetime_Field::mysql_time_format) != '00:00:00')
+		) {
+			return false;
+		}
+		return $date_2->format('U') - $date_1->format('U') == 86400 ? true : false;
+	}
+
+
+	/**
+	 * This returns the appropriate query interval string that can be used in sql queries involving mysql Date
+	 * Functions.
+	 *
+	 * @param string $timezone_string    A timezone string in a valid format to instantiate a DateTimeZone object.
+	 * @param string $field_for_interval The Database field that is the interval is applied to in the query.
+	 * @return string
+	 */
+	public static function get_sql_query_interval_for_offset($timezone_string, $field_for_interval)
+	{
+		try {
+			/** need to account for timezone offset on the selects */
+			$DateTimeZone = new DateTimeZone($timezone_string);
+		} catch (Exception $e) {
+			$DateTimeZone = null;
+		}
+
+		/**
+		 * Note get_option( 'gmt_offset') returns a value in hours, whereas DateTimeZone::getOffset returns values in seconds.
+		 * Hence we do the calc for DateTimeZone::getOffset.
+		 */
+		$offset         = $DateTimeZone instanceof DateTimeZone ? ($DateTimeZone->getOffset(new DateTime('now'))) / HOUR_IN_SECONDS : get_option('gmt_offset');
+		$query_interval = $offset < 0
+			? 'DATE_SUB(' . $field_for_interval . ', INTERVAL ' . $offset * -1 . ' HOUR)'
+			: 'DATE_ADD(' . $field_for_interval . ', INTERVAL ' . $offset . ' HOUR)';
+		return $query_interval;
+	}
+
+	/**
+	 * Retrieves the site's default timezone and returns it formatted so it's ready for display
+	 * to users. If you want to customize how its displayed feel free to fetch the 'timezone_string'
+	 * and 'gmt_offset' WordPress options directly; or use the filter
+	 * FHEE__EEH_DTT_Helper__get_timezone_string_for_display
+	 * (although note that we remove any HTML that may be added)
+	 *
+	 * @return string
+	 */
+	public static function get_timezone_string_for_display()
+	{
+		$pretty_timezone = apply_filters('FHEE__EEH_DTT_Helper__get_timezone_string_for_display', '');
+		if (! empty($pretty_timezone)) {
+			return esc_html($pretty_timezone);
+		}
+		$timezone_string = get_option('timezone_string');
+		if ($timezone_string) {
+			static $mo_loaded = false;
+			// Load translations for continents and cities just like wp_timezone_choice does
+			if (! $mo_loaded) {
+				$locale = get_locale();
+				$mofile = WP_LANG_DIR . '/continents-cities-' . $locale . '.mo';
+				load_textdomain('continents-cities', $mofile);
+				$mo_loaded = true;
+			}
+			//well that was easy.
+			$parts = explode('/', $timezone_string);
+			//remove the continent
+			unset($parts[0]);
+			$t_parts = array();
+			foreach ($parts as $part) {
+				$t_parts[] = translate(str_replace('_', ' ', $part), 'continents-cities');
+			}
+			return implode(' - ', $t_parts);
+		}
+		//they haven't set the timezone string, so let's return a string like "UTC+1"
+		$gmt_offset = get_option('gmt_offset');
+		if (intval($gmt_offset) >= 0) {
+			$prefix = '+';
+		} else {
+			$prefix = '';
+		}
+		$parts = explode('.', (string)$gmt_offset);
+		if (count($parts) === 1) {
+			$parts[1] = '00';
+		} else {
+			//convert the part after the decimal, eg "5" (from x.5) or "25" (from x.25)
+			//to minutes, eg 30 or 15, respectively
+			$hour_fraction = (float)('0.' . $parts[1]);
+			$parts[1]      = (string)$hour_fraction * 60;
+		}
+		return sprintf(__('UTC%1$s', 'event_espresso'), $prefix . implode(':', $parts));
+	}
+
+
+
+	/**
+	 * So PHP does this awesome thing where if you are trying to get a timestamp
+	 * for a month using a string like "February" or "February 2017",
+	 * and you don't specify a day as part of your string,
+	 * then PHP will use whatever the current day of the month is.
+	 * IF the current day of the month happens to be the 30th or 31st,
+	 * then PHP gets really confused by a date like February 30,
+	 * so instead of saying
+	 *      "Hey February only has 28 days (this year)...
+	 *      ...you must have meant the last day of the month!"
+	 * PHP does the next most logical thing, and bumps the date up to March 2nd,
+	 * because someone requesting February 30th obviously meant March 1st!
+	 * The way around this is to always set the day to the first,
+	 * so that the month will stay on the month you wanted.
+	 * this method will add that "1" into your date regardless of the format.
+	 *
+	 * @param string $month
+	 * @return string
+	 */
+	public static function first_of_month_timestamp($month = '')
+	{
+		$month = (string)$month;
+		$year = '';
+		// check if the incoming string has a year in it or not
+	   if (preg_match('/\b\d{4}\b/', $month, $matches)) {
+		   $year = $matches[0];
+		   // ten remove that from the month string as well as any spaces
+		   $month = trim(str_replace($year, '', $month));
+		   // add a space before the year
+		   $year = " {$year}";
+		}
+		// return timestamp for something like "February 1 2017"
+		return strtotime("{$month} 1{$year}");
+	}
 
 
 }// end class EEH_DTT_Helper
\ No newline at end of file

Spacing +38 added lines, -39 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('NO direct script access allowed');
 }
 
@@ -74,7 +74,7 @@ 
             new DateTimeZone($timezone_string);
         } catch (Exception $e) {
             // sometimes we take exception to exceptions
-            if (! $throw_error) {
+            if ( ! $throw_error) {
                 return false;
             }
             throw new EE_Error(
@@ -135,7 +135,7 @@ 
             }
         }
         $offset = get_option('gmt_offset');
-        return (int)($offset * HOUR_IN_SECONDS);
+        return (int) ($offset * HOUR_IN_SECONDS);
     }
 
 
@@ -149,7 +149,7 @@ 
     public static function adjust_invalid_gmt_offsets($gmt_offset = 0)
     {
         //make sure $gmt_offset is int
-        $gmt_offset = (int)$gmt_offset;
+        $gmt_offset = (int) $gmt_offset;
         switch ($gmt_offset) {
 
             //			case -30600 :
@@ -233,7 +233,7 @@ 
     public static function timezone_select_input($timezone_string = '')
     {
         // get WP date time format
-        $datetime_format = get_option('date_format') . ' ' . get_option('time_format');
+        $datetime_format = get_option('date_format').' '.get_option('time_format');
         // if passed a value, then use that, else get WP option
         $timezone_string = ! empty($timezone_string) ? $timezone_string : get_option('timezone_string');
         // check if the timezone is valid but don't throw any errors if it isn't
@@ -245,9 +245,9 @@ 
             // Create a UTC+- zone if no timezone string exists
             $check_zone_info = false;
             if ($gmt_offset > 0) {
-                $timezone_string = 'UTC+' . $gmt_offset;
+                $timezone_string = 'UTC+'.$gmt_offset;
             } elseif ($gmt_offset < 0) {
-                $timezone_string = 'UTC' . $gmt_offset;
+                $timezone_string = 'UTC'.$gmt_offset;
             } else {
                 $timezone_string = 'UTC';
             }
@@ -269,11 +269,11 @@ 
                 __('%1$sUTC%2$s time is %3$s'),
                 '<abbr title="Coordinated Universal Time">',
                 '</abbr>',
-                '<code>' . date_i18n($datetime_format, false, true) . '</code>'
+                '<code>'.date_i18n($datetime_format, false, true).'</code>'
             );
             ?></span>
-        <?php if (! empty($timezone_string) || ! empty($gmt_offset)) : ?>
-        <br/><span><?php printf(__('Local time is %1$s'), '<code>' . date_i18n($datetime_format) . '</code>'); ?></span>
+        <?php if ( ! empty($timezone_string) || ! empty($gmt_offset)) : ?>
+        <br/><span><?php printf(__('Local time is %1$s'), '<code>'.date_i18n($datetime_format).'</code>'); ?></span>
     <?php endif; ?>
 
         <?php if ($check_zone_info && $timezone_string) : ?>
@@ -306,11 +306,10 @@ 
 
                 if ($found) {
                     $message = $tr['isdst'] ?
-                        __(' Daylight saving time begins on: %s.') :
-                        __(' Standard time begins  on: %s.');
+                        __(' Daylight saving time begins on: %s.') : __(' Standard time begins  on: %s.');
                     // Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
                     printf($message,
-                        '<code >' . date_i18n($datetime_format, $tr['ts'] + ($tz_offset - $tr['offset'])) . '</code >');
+                        '<code >'.date_i18n($datetime_format, $tr['ts'] + ($tz_offset - $tr['offset'])).'</code >');
                 } else {
                     _e('This timezone does not observe daylight saving time.');
                 }
@@ -338,13 +337,13 @@ 
      */
     public static function get_timestamp_with_offset($unix_timestamp = 0, $timezone_string = '')
     {
-        $unix_timestamp  = $unix_timestamp === 0 ? time() : (int)$unix_timestamp;
+        $unix_timestamp  = $unix_timestamp === 0 ? time() : (int) $unix_timestamp;
         $timezone_string = self::get_valid_timezone_string($timezone_string);
         $TimeZone        = new DateTimeZone($timezone_string);
 
-        $DateTime = new DateTime('@' . $unix_timestamp, $TimeZone);
+        $DateTime = new DateTime('@'.$unix_timestamp, $TimeZone);
         $offset   = timezone_offset_get($TimeZone, $DateTime);
-        return (int)$DateTime->format('U') + (int)$offset;
+        return (int) $DateTime->format('U') + (int) $offset;
     }
 
 
@@ -427,7 +426,7 @@ 
      */
     protected static function _modify_datetime_object(DateTime $DateTime, $period = 'years', $value = 1, $operand = '+')
     {
-        if (! $DateTime instanceof DateTime) {
+        if ( ! $DateTime instanceof DateTime) {
             throw new EE_Error(
                 sprintf(
                     __('Expected a PHP DateTime object, but instead received %1$s', 'event_espresso'),
@@ -437,25 +436,25 @@ 
         }
         switch ($period) {
             case 'years' :
-                $value = 'P' . $value . 'Y';
+                $value = 'P'.$value.'Y';
                 break;
             case 'months' :
-                $value = 'P' . $value . 'M';
+                $value = 'P'.$value.'M';
                 break;
             case 'weeks' :
-                $value = 'P' . $value . 'W';
+                $value = 'P'.$value.'W';
                 break;
             case 'days' :
-                $value = 'P' . $value . 'D';
+                $value = 'P'.$value.'D';
                 break;
             case 'hours' :
-                $value = 'PT' . $value . 'H';
+                $value = 'PT'.$value.'H';
                 break;
             case 'minutes' :
-                $value = 'PT' . $value . 'M';
+                $value = 'PT'.$value.'M';
                 break;
             case 'seconds' :
-                $value = 'PT' . $value . 'S';
+                $value = 'PT'.$value.'S';
                 break;
         }
         switch ($operand) {
@@ -483,7 +482,7 @@ 
      */
     protected static function _modify_timestamp($timestamp, $period = 'years', $value = 1, $operand = '+')
     {
-        if (! preg_match(EE_Datetime_Field::unix_timestamp_regex, $timestamp)) {
+        if ( ! preg_match(EE_Datetime_Field::unix_timestamp_regex, $timestamp)) {
             throw new EE_Error(
                 sprintf(
                     __('Expected a Unix timestamp, but instead received %1$s', 'event_espresso'),
@@ -587,7 +586,7 @@ 
                 'date' => $date_format['js'],
                 'time' => $time_format['js'],
             ),
-            'moment' => $date_format['moment'] . ' ' . $time_format['moment'],
+            'moment' => $date_format['moment'].' '.$time_format['moment'],
         );
     }
 
@@ -606,7 +605,7 @@ 
          *
          * @var array
          */
-        $symbols_map      = array(
+        $symbols_map = array(
             // Day
             //01
             'd' => array(
@@ -764,7 +763,7 @@ 
                     $jquery_ui_format .= $format_string[$i];
                     $moment_format .= $format_string[$i];
                 } else {
-                    $jquery_ui_format .= '\'' . $format_string[$i];
+                    $jquery_ui_format .= '\''.$format_string[$i];
                     $moment_format .= $format_string[$i];
                 }
                 $escaping = true;
@@ -834,7 +833,7 @@ 
     {
 
         if (
-            (! $date_1 instanceof DateTime || ! $date_2 instanceof DateTime) ||
+            ( ! $date_1 instanceof DateTime || ! $date_2 instanceof DateTime) ||
             ($date_1->format(EE_Datetime_Field::mysql_time_format) != '00:00:00' || $date_2->format(EE_Datetime_Field::mysql_time_format) != '00:00:00')
         ) {
             return false;
@@ -866,8 +865,8 @@ 
          */
         $offset         = $DateTimeZone instanceof DateTimeZone ? ($DateTimeZone->getOffset(new DateTime('now'))) / HOUR_IN_SECONDS : get_option('gmt_offset');
         $query_interval = $offset < 0
-            ? 'DATE_SUB(' . $field_for_interval . ', INTERVAL ' . $offset * -1 . ' HOUR)'
-            : 'DATE_ADD(' . $field_for_interval . ', INTERVAL ' . $offset . ' HOUR)';
+            ? 'DATE_SUB('.$field_for_interval.', INTERVAL '.$offset * -1.' HOUR)'
+            : 'DATE_ADD('.$field_for_interval.', INTERVAL '.$offset.' HOUR)';
         return $query_interval;
     }
 
@@ -883,16 +882,16 @@ 
     public static function get_timezone_string_for_display()
     {
         $pretty_timezone = apply_filters('FHEE__EEH_DTT_Helper__get_timezone_string_for_display', '');
-        if (! empty($pretty_timezone)) {
+        if ( ! empty($pretty_timezone)) {
             return esc_html($pretty_timezone);
         }
         $timezone_string = get_option('timezone_string');
         if ($timezone_string) {
             static $mo_loaded = false;
             // Load translations for continents and cities just like wp_timezone_choice does
-            if (! $mo_loaded) {
+            if ( ! $mo_loaded) {
                 $locale = get_locale();
-                $mofile = WP_LANG_DIR . '/continents-cities-' . $locale . '.mo';
+                $mofile = WP_LANG_DIR.'/continents-cities-'.$locale.'.mo';
                 load_textdomain('continents-cities', $mofile);
                 $mo_loaded = true;
             }
@@ -913,16 +912,16 @@ 
         } else {
             $prefix = '';
         }
-        $parts = explode('.', (string)$gmt_offset);
+        $parts = explode('.', (string) $gmt_offset);
         if (count($parts) === 1) {
             $parts[1] = '00';
         } else {
             //convert the part after the decimal, eg "5" (from x.5) or "25" (from x.25)
             //to minutes, eg 30 or 15, respectively
-            $hour_fraction = (float)('0.' . $parts[1]);
-            $parts[1]      = (string)$hour_fraction * 60;
+            $hour_fraction = (float) ('0.'.$parts[1]);
+            $parts[1]      = (string) $hour_fraction * 60;
         }
-        return sprintf(__('UTC%1$s', 'event_espresso'), $prefix . implode(':', $parts));
+        return sprintf(__('UTC%1$s', 'event_espresso'), $prefix.implode(':', $parts));
     }
 
 
@@ -948,7 +947,7 @@ 
      */
     public static function first_of_month_timestamp($month = '')
     {
-        $month = (string)$month;
+        $month = (string) $month;
         $year = '';
         // check if the incoming string has a year in it or not
        if (preg_match('/\b\d{4}\b/', $month, $matches)) {

modules/events_archive_filters/EED_Events_Archive_Filters.module.php

Spacing +167 added lines, -167 removed lines

@@ -29,7 +29,7 @@ 
 	 * @return EED_Events_Archive_Filters
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -71,7 +71,7 @@ 
 	 *	@var 	$_types
 	 * 	@access 	protected
 	 */
-	protected static $_types = array( 'grid', 'text', 'dates' );
+	protected static $_types = array('grid', 'text', 'dates');
 
 
 //	public static $espresso_event_list_ID = 0;
@@ -125,7 +125,7 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 //		do_action( 'AHEE__EED_Events_Archive_Filters__before_run' );
 //		// set config
 //		if ( ! isset( EE_Registry::instance()->CFG->template_settings->EED_Events_Archive_Filters ) || ! EE_Registry::instance()->CFG->template_settings->EED_Events_Archive_Filters instanceof EE_Events_Archive_Config ) {
@@ -170,9 +170,9 @@ 
 	 */
 	private function _filter_query_parts() {
 		// build event list query
-		add_filter( 'posts_join', array( $this, 'posts_join' ), 1, 2 );
-		add_filter( 'posts_where', array( $this, 'posts_where' ), 1, 2 );
-		add_filter( 'posts_orderby', array( $this, 'posts_orderby' ), 1, 2 );
+		add_filter('posts_join', array($this, 'posts_join'), 1, 2);
+		add_filter('posts_where', array($this, 'posts_where'), 1, 2);
+		add_filter('posts_orderby', array($this, 'posts_orderby'), 1, 2);
 	}
 
 	/**
@@ -182,13 +182,13 @@ 
 	 *  @return 	string
 	 */
 	public static function set_type() {
-		do_action( 'AHEE__EED_Events_Archive_Filters__before_set_type' );
-		EED_Events_Archive_Filters::$_types = apply_filters( 'EED_Events_Archive_Filters__set_type__types', EED_Events_Archive_Filters::$_types );
-		$view = isset( EE_Registry::instance()->CFG->EED_Events_Archive_Filters['default_type'] ) ? EE_Registry::instance()->CFG->EED_Events_Archive_Filters['default_type'] : 'grid';
-		$elf_type = EE_Registry::instance()->REQ->is_set( 'elf_type' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'elf_type' )) : '';
-		$view = ! empty( $elf_type ) ? $elf_type : $view;
-		$view = apply_filters( 'EED_Events_Archive_Filters__set_type__type', $view );
-		if ( ! empty( $view ) && in_array( $view, EED_Events_Archive_Filters::$_types )) {
+		do_action('AHEE__EED_Events_Archive_Filters__before_set_type');
+		EED_Events_Archive_Filters::$_types = apply_filters('EED_Events_Archive_Filters__set_type__types', EED_Events_Archive_Filters::$_types);
+		$view = isset(EE_Registry::instance()->CFG->EED_Events_Archive_Filters['default_type']) ? EE_Registry::instance()->CFG->EED_Events_Archive_Filters['default_type'] : 'grid';
+		$elf_type = EE_Registry::instance()->REQ->is_set('elf_type') ? sanitize_text_field(EE_Registry::instance()->REQ->get('elf_type')) : '';
+		$view = ! empty($elf_type) ? $elf_type : $view;
+		$view = apply_filters('EED_Events_Archive_Filters__set_type__type', $view);
+		if ( ! empty($view) && in_array($view, EED_Events_Archive_Filters::$_types)) {
 			self::$_type = $view;
 		}
 	}
@@ -200,11 +200,11 @@ 
 	 *  @param	boolean	$req_only if TRUE, then ignore defaults and only return $_POST value
 	 *  @return 	boolean
 	 */
-	private static function _show_expired( $req_only = FALSE ) {
+	private static function _show_expired($req_only = FALSE) {
 		// get default value for "display_expired_events" as set in the EE General Settings > Templates > Event Listings
-		$show_expired = ! $req_only && isset( EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events'] ) ? EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events'] : FALSE;
+		$show_expired = ! $req_only && isset(EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events']) ? EE_Registry::instance()->CFG->EED_Events_Archive_Filters['display_expired_events'] : FALSE;
 		// override default expired option if set via filter
-		$show_expired = EE_Registry::instance()->REQ->is_set( 'elf_expired_chk' ) ? absint( EE_Registry::instance()->REQ->get( 'elf_expired_chk' )) : $show_expired;
+		$show_expired = EE_Registry::instance()->REQ->is_set('elf_expired_chk') ? absint(EE_Registry::instance()->REQ->get('elf_expired_chk')) : $show_expired;
 		return $show_expired ? TRUE : FALSE;
 	}
 
@@ -215,7 +215,7 @@ 
 	 *  @return 	string
 	 */
 	private static function _event_category_slug() {
-		return EE_Registry::instance()->REQ->is_set( 'elf_category_dd' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'elf_category_dd' )) : '';
+		return EE_Registry::instance()->REQ->is_set('elf_category_dd') ? sanitize_text_field(EE_Registry::instance()->REQ->get('elf_category_dd')) : '';
 	}
 
 	/**
@@ -225,7 +225,7 @@ 
 	 *  @return 	string
 	 */
 	private static function _display_month() {
-		return EE_Registry::instance()->REQ->is_set( 'elf_month_dd' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'elf_month_dd' )) : '';
+		return EE_Registry::instance()->REQ->is_set('elf_month_dd') ? sanitize_text_field(EE_Registry::instance()->REQ->get('elf_month_dd')) : '';
 	}
 
 
@@ -239,7 +239,7 @@ 
 	public function get_post_data() {
 		$this->_elf_month = EED_Events_Archive_Filters::_display_month();
 		$this->_elf_category = EED_Events_Archive_Filters::_event_category_slug();
-		$this->_show_expired = EED_Events_Archive_Filters::_show_expired( TRUE );
+		$this->_show_expired = EED_Events_Archive_Filters::_show_expired(TRUE);
 //		EEH_Debug_Tools::printr( EE_Registry::instance()->REQ, 'EE_Registry::instance()->REQ  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 //		echo '<h4>$this->_elf_month : ' . $this->_elf_month . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 //		echo '<h4>$this->_elf_category : ' . $this->_elf_category . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
@@ -256,11 +256,11 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function posts_join( $SQL, WP_Query $wp_query ) {
-		if ( isset( $wp_query->query ) && isset( $wp_query->query['post_type'] ) && $wp_query->query['post_type'] == 'espresso_events' ) {
+	public function posts_join($SQL, WP_Query $wp_query) {
+		if (isset($wp_query->query) && isset($wp_query->query['post_type']) && $wp_query->query['post_type'] == 'espresso_events') {
 			// Category
 //			$elf_category = EE_Registry::instance()->REQ->is_set( 'elf_category_dd' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'elf_category_dd' )) : '';
-			$SQL .= EED_Events_Archive_Filters::posts_join_sql_for_terms( EED_Events_Archive_Filters::_event_category_slug() );
+			$SQL .= EED_Events_Archive_Filters::posts_join_sql_for_terms(EED_Events_Archive_Filters::_event_category_slug());
 		}
 		return $SQL;
 	}
@@ -273,9 +273,9 @@ 
 	 *  @param	mixed boolean|string	$join_terms pass TRUE or term string, doesn't really matter since this value doesn't really get used for anything yet
 	 *  @return 	string
 	 */
-	public static function posts_join_sql_for_terms( $join_terms = NULL ) {
-		$SQL= '';
-		if ( ! empty( $join_terms )) {
+	public static function posts_join_sql_for_terms($join_terms = NULL) {
+		$SQL = '';
+		if ( ! empty($join_terms)) {
 			global $wpdb;
 			$SQL .= " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id)";
 			$SQL .= " LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id)";
@@ -293,28 +293,28 @@ 
 	 *  @param	array	$orderby_params
 	 *  @return 	string
 	 */
-	public static function posts_join_for_orderby( $orderby_params = array() ) {
+	public static function posts_join_for_orderby($orderby_params = array()) {
 		global $wpdb;
-		$SQL= '';
-		$orderby_params = is_array( $orderby_params ) ? $orderby_params : array( $orderby_params );
-		foreach( $orderby_params as $orderby ) {
-			switch ( $orderby ) {
+		$SQL = '';
+		$orderby_params = is_array($orderby_params) ? $orderby_params : array($orderby_params);
+		foreach ($orderby_params as $orderby) {
+			switch ($orderby) {
 
 				case 'ticket_start' :
 				case 'ticket_end' :
-					$SQL .= ' LEFT JOIN ' . EEM_Datetime_Ticket::instance()->table() . ' ON (' . EEM_Datetime::instance()->table() . '.DTT_ID = ' . EEM_Datetime_Ticket::instance()->table() . '.DTT_ID )';
-					$SQL .= ' LEFT JOIN ' . EEM_Ticket::instance()->table() . ' ON (' . EEM_Datetime_Ticket::instance()->table() . '.TKT_ID = ' . EEM_Ticket::instance()->table() . '.TKT_ID )';
+					$SQL .= ' LEFT JOIN '.EEM_Datetime_Ticket::instance()->table().' ON ('.EEM_Datetime::instance()->table().'.DTT_ID = '.EEM_Datetime_Ticket::instance()->table().'.DTT_ID )';
+					$SQL .= ' LEFT JOIN '.EEM_Ticket::instance()->table().' ON ('.EEM_Datetime_Ticket::instance()->table().'.TKT_ID = '.EEM_Ticket::instance()->table().'.TKT_ID )';
 					break;
 
 				case 'venue_title' :
 				case 'city' :
-					$SQL .= ' LEFT JOIN ' . EEM_Event_Venue::instance()->table() . ' ON (' . $wpdb->posts . '.ID = ' . EEM_Event_Venue::instance()->table() . '.EVT_ID )';
-					$SQL .= ' LEFT JOIN ' . EEM_Venue::instance()->table() . ' ON (' . EEM_Event_Venue::instance()->table() . '.VNU_ID = ' . EEM_Venue::instance()->table() . '.VNU_ID )';
+					$SQL .= ' LEFT JOIN '.EEM_Event_Venue::instance()->table().' ON ('.$wpdb->posts.'.ID = '.EEM_Event_Venue::instance()->table().'.EVT_ID )';
+					$SQL .= ' LEFT JOIN '.EEM_Venue::instance()->table().' ON ('.EEM_Event_Venue::instance()->table().'.VNU_ID = '.EEM_Venue::instance()->table().'.VNU_ID )';
 					break;
 
 				case 'state' :
-					$SQL .= ' LEFT JOIN ' . EEM_Event_Venue::instance()->table() . ' ON (' . $wpdb->posts . '.ID = ' . EEM_Event_Venue::instance()->table() . '.EVT_ID )';
-					$SQL .= ' LEFT JOIN ' . EEM_Event_Venue::instance()->second_table() . ' ON (' . EEM_Event_Venue::instance()->table() . '.VNU_ID = ' . EEM_Event_Venue::instance()->second_table() . '.VNU_ID )';
+					$SQL .= ' LEFT JOIN '.EEM_Event_Venue::instance()->table().' ON ('.$wpdb->posts.'.ID = '.EEM_Event_Venue::instance()->table().'.EVT_ID )';
+					$SQL .= ' LEFT JOIN '.EEM_Event_Venue::instance()->second_table().' ON ('.EEM_Event_Venue::instance()->table().'.VNU_ID = '.EEM_Event_Venue::instance()->second_table().'.VNU_ID )';
 					break;
 
 				break;
@@ -331,16 +331,16 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function posts_where( $SQL, WP_Query $wp_query ) {
-		if ( isset( $wp_query->query_vars ) && isset( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] == 'espresso_events'  ) {
+	public function posts_where($SQL, WP_Query $wp_query) {
+		if (isset($wp_query->query_vars) && isset($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'espresso_events') {
 			// Show Expired ?
-			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_show_expired( EED_Events_Archive_Filters::_show_expired() );
+			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_show_expired(EED_Events_Archive_Filters::_show_expired());
 			// Category
 			//$elf_category = EED_Events_Archive_Filters::_event_category_slug();
-			$SQL .=  EED_Events_Archive_Filters::posts_where_sql_for_event_category_slug( EED_Events_Archive_Filters::_event_category_slug() );
+			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_event_category_slug(EED_Events_Archive_Filters::_event_category_slug());
 			// Start Date
 			//$elf_month = EED_Events_Archive_Filters::_display_month();
-			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_event_list_month( EED_Events_Archive_Filters::_display_month() );
+			$SQL .= EED_Events_Archive_Filters::posts_where_sql_for_event_list_month(EED_Events_Archive_Filters::_display_month());
 		}
 		return $SQL;
 	}
@@ -353,8 +353,8 @@ 
 	 *  @param	boolean	$show_expired if TRUE, then displayed past events
 	 *  @return 	string
 	 */
-	public static function posts_where_sql_for_show_expired( $show_expired = FALSE ) {
-		return  ! $show_expired ? ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > "' . date('Y-m-d H:s:i') . '" ' : '';
+	public static function posts_where_sql_for_show_expired($show_expired = FALSE) {
+		return  ! $show_expired ? ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_end > "'.date('Y-m-d H:s:i').'" ' : '';
 	}
 
 
@@ -365,9 +365,9 @@ 
 	 *  @param	boolean	$event_category_slug
 	 *  @return 	string
 	 */
-	public static function posts_where_sql_for_event_category_slug( $event_category_slug = NULL ) {
+	public static function posts_where_sql_for_event_category_slug($event_category_slug = NULL) {
 		global $wpdb;
-		return  ! empty( $event_category_slug ) ? ' AND ' . $wpdb->terms . '.slug = "' . $event_category_slug . '" ' : '';
+		return  ! empty($event_category_slug) ? ' AND '.$wpdb->terms.'.slug = "'.$event_category_slug.'" ' : '';
 	}
 
 	/**
@@ -377,15 +377,15 @@ 
 	 *  @param	boolean	$month
 	 *  @return 	string
 	 */
-	public static function posts_where_sql_for_event_list_month( $month = NULL ) {
-		$SQL= '';
-		if ( ! empty( $month )) {
+	public static function posts_where_sql_for_event_list_month($month = NULL) {
+		$SQL = '';
+		if ( ! empty($month)) {
 			// event start date is LESS than the end of the month ( so nothing that doesn't start until next month )
-			$SQL = ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start';
-			$SQL .= ' <= "' . date('Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month)) . '"';
+			$SQL = ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_start';
+			$SQL .= ' <= "'.date('Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month)).'"';
 			// event end date is GREATER than the start of the month ( so nothing that ended before this month )
-			$SQL .= ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end';
-			$SQL .= ' >= "' . date('Y-m-d 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month)) . '" ';
+			$SQL .= ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_end';
+			$SQL .= ' >= "'.date('Y-m-d 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month)).'" ';
 		}
 		return $SQL;
 	}
@@ -397,9 +397,9 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function posts_orderby( $SQL, WP_Query $wp_query ) {
-		if ( isset( $wp_query->query ) && isset( $wp_query->query['post_type'] ) && $wp_query->query['post_type'] == 'espresso_events' ) {
-			$SQL = EED_Events_Archive_Filters::posts_orderby_sql( array( 'start_date' ));
+	public function posts_orderby($SQL, WP_Query $wp_query) {
+		if (isset($wp_query->query) && isset($wp_query->query['post_type']) && $wp_query->query['post_type'] == 'espresso_events') {
+			$SQL = EED_Events_Archive_Filters::posts_orderby_sql(array('start_date'));
 		}
 		return $SQL;
 	}
@@ -428,54 +428,54 @@ 
 	 *  @param	boolean	$orderby_params
 	 *  @return 	string
 	 */
-	public static function posts_orderby_sql( $orderby_params = array(), $sort = 'ASC' ) {
+	public static function posts_orderby_sql($orderby_params = array(), $sort = 'ASC') {
 		global $wpdb;
 		$SQL = '';
 		$cntr = 1;
-		$orderby_params = is_array( $orderby_params ) ? $orderby_params : array( $orderby_params );
-		foreach( $orderby_params as $orderby ) {
-			$glue = $cntr == 1 || $cntr == count( $orderby_params ) ? ' ' : ', ';
-			switch ( $orderby ) {
+		$orderby_params = is_array($orderby_params) ? $orderby_params : array($orderby_params);
+		foreach ($orderby_params as $orderby) {
+			$glue = $cntr == 1 || $cntr == count($orderby_params) ? ' ' : ', ';
+			switch ($orderby) {
 
 				case 'id' :
 				case 'ID' :
-					$SQL .= $glue . $wpdb->posts . '.ID ' . $sort;
+					$SQL .= $glue.$wpdb->posts.'.ID '.$sort;
 					break;
 
 				case 'start_date' :
-					$SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_start ' . $sort;
+					$SQL .= $glue.EEM_Datetime::instance()->table().'.DTT_EVT_start '.$sort;
 					break;
 
 				case 'end_date' :
-					$SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_end ' . $sort;
+					$SQL .= $glue.EEM_Datetime::instance()->table().'.DTT_EVT_end '.$sort;
 					break;
 
 				case 'event_name' :
-					$SQL .= $glue . $wpdb->posts . '.post_title ' . $sort;
+					$SQL .= $glue.$wpdb->posts.'.post_title '.$sort;
 					break;
 
 				case 'category_slug' :
-					$SQL .= $glue . $wpdb->terms . '.slug ' . $sort;
+					$SQL .= $glue.$wpdb->terms.'.slug '.$sort;
 					break;
 
 				case 'ticket_start' :
-					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_start_date ' . $sort;
+					$SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_start_date '.$sort;
 					break;
 
 				case 'ticket_end' :
-					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_end_date ' . $sort;
+					$SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_end_date '.$sort;
 					break;
 
 				case 'venue_title' :
-					$SQL .= $glue . 'venue_title ' . $sort;
+					$SQL .= $glue.'venue_title '.$sort;
 					break;
 
 				case 'city' :
-					$SQL .= $glue . EEM_Venue::instance()->second_table() . '.VNU_city ' . $sort;
+					$SQL .= $glue.EEM_Venue::instance()->second_table().'.VNU_city '.$sort;
 				break;
 
 				case 'state' :
-					$SQL .= $glue . EEM_State::instance()->table() . '.STA_name ' . $sort;
+					$SQL .= $glue.EEM_State::instance()->table().'.STA_name '.$sort;
 				break;
 
 			}
@@ -495,26 +495,26 @@ 
 	 */
 	public function template_redirect() {
 		// add event list filters
-		add_action( 'loop_start', array( $this, 'event_list_template_filters' ));
+		add_action('loop_start', array($this, 'event_list_template_filters'));
 		// and pagination
-		add_action( 'loop_start', array( $this, 'event_list_pagination' ));
-		add_action( 'loop_end', array( $this, 'event_list_pagination' ));
+		add_action('loop_start', array($this, 'event_list_pagination'));
+		add_action('loop_end', array($this, 'event_list_pagination'));
 		// if NOT a custom template
-		if ( EE_Registry::instance()->load_core( 'Front_Controller', array(), false, true )->get_selected_template() != 'archive-espresso_events.php' ) {
+		if (EE_Registry::instance()->load_core('Front_Controller', array(), false, true)->get_selected_template() != 'archive-espresso_events.php') {
 			// don't know if theme uses the_excerpt
-			add_filter( 'the_excerpt', array( $this, 'event_details' ), 100 );
-			add_filter( 'the_excerpt', array( $this, 'event_tickets' ), 110 );
-			add_filter( 'the_excerpt', array( $this, 'event_datetimes' ), 120 );
-			add_filter( 'the_excerpt', array( $this, 'event_venues' ), 130 );
+			add_filter('the_excerpt', array($this, 'event_details'), 100);
+			add_filter('the_excerpt', array($this, 'event_tickets'), 110);
+			add_filter('the_excerpt', array($this, 'event_datetimes'), 120);
+			add_filter('the_excerpt', array($this, 'event_venues'), 130);
 			// or the_content
-			add_filter( 'the_content', array( $this, 'event_details' ), 100 );
-			add_filter( 'the_content', array( $this, 'event_tickets' ), 110 );
-			add_filter( 'the_content', array( $this, 'event_datetimes' ), 120 );
-			add_filter( 'the_content', array( $this, 'event_venues' ), 130 );
+			add_filter('the_content', array($this, 'event_details'), 100);
+			add_filter('the_content', array($this, 'event_tickets'), 110);
+			add_filter('the_content', array($this, 'event_datetimes'), 120);
+			add_filter('the_content', array($this, 'event_venues'), 130);
 		} else {
-			remove_all_filters( 'excerpt_length' );
-			add_filter( 'excerpt_length', array( $this, 'excerpt_length' ), 10 );
-			add_filter( 'excerpt_more', array( $this, 'excerpt_more' ), 10 );
+			remove_all_filters('excerpt_length');
+			add_filter('excerpt_length', array($this, 'excerpt_length'), 10);
+			add_filter('excerpt_more', array($this, 'excerpt_more'), 10);
 		}
 	}
 
@@ -527,7 +527,7 @@ 
 	 *  	@return 		void
 	 */
 	public function event_list_pagination() {
-		echo '<div class="ee-pagination-dv clear">' . espresso_event_list_pagination() . '</div>';
+		echo '<div class="ee-pagination-dv clear">'.espresso_event_list_pagination().'</div>';
 	}
 
 
@@ -538,8 +538,8 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		void
 	 */
-	public function event_details( $content ) {
-		return EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-details.php', array( 'the_content' => $content ), TRUE );
+	public function event_details($content) {
+		return EEH_Template::display_template(EE_TEMPLATES.EE_Config::get_current_theme().DS.'content-espresso_events-details.php', array('the_content' => $content), TRUE);
 	}
 
 
@@ -550,8 +550,8 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		void
 	 */
-	public function event_tickets( $content ) {
-		return $content . EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-tickets.php', array(), TRUE );
+	public function event_tickets($content) {
+		return $content.EEH_Template::display_template(EE_TEMPLATES.EE_Config::get_current_theme().DS.'content-espresso_events-tickets.php', array(), TRUE);
 	}
 
 	/**
@@ -561,8 +561,8 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		void
 	 */
-	public function event_datetimes( $content ) {
-		return $content . EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-datetimes.php', array(), TRUE );
+	public function event_datetimes($content) {
+		return $content.EEH_Template::display_template(EE_TEMPLATES.EE_Config::get_current_theme().DS.'content-espresso_events-datetimes.php', array(), TRUE);
 	}
 
 	/**
@@ -572,8 +572,8 @@ 
 	 * 	@param		string 	$content
 	 *  	@return 		void
 	 */
-	public function event_venues( $content ) {
-		return $content . EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'content-espresso_events-venues.php', array(), TRUE );
+	public function event_venues($content) {
+		return $content.EEH_Template::display_template(EE_TEMPLATES.EE_Config::get_current_theme().DS.'content-espresso_events-venues.php', array(), TRUE);
 	}
 
 
@@ -588,12 +588,12 @@ 
 	 *  @return 	void
 	 */
 	private function _load_assests() {
-		do_action( 'AHEE__EED_Events_Archive_Filters__before_load_assests' );
-		add_filter( 'FHEE_load_css', '__return_true' );
-		add_filter( 'FHEE_load_EE_Session', '__return_true' );
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 10 );
-		if ( EE_Registry::instance()->CFG->map_settings->use_google_maps ) {
-			add_action('wp_enqueue_scripts', array( 'EEH_Maps', 'espresso_google_map_js' ), 11 );
+		do_action('AHEE__EED_Events_Archive_Filters__before_load_assests');
+		add_filter('FHEE_load_css', '__return_true');
+		add_filter('FHEE_load_EE_Session', '__return_true');
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
+		if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
+			add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
 		}
 		//add_filter( 'the_excerpt', array( $this, 'the_excerpt' ), 999 );
 	}
@@ -608,8 +608,8 @@ 
 	 *  @access 	private
 	 *  @return 	string
 	 */
-	private function _get_template( $which = 'part' ) {
-		return EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events.php';
+	private function _get_template($which = 'part') {
+		return EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events.php';
 	}
 
 
@@ -620,13 +620,13 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function excerpt_length( $length ) {
+	public function excerpt_length($length) {
 
-		if ( self::$_type == 'grid' ) {
+		if (self::$_type == 'grid') {
 			return 36;
 		}
 
-		switch ( EE_Registry::instance()->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size ) {
+		switch (EE_Registry::instance()->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size) {
 			case 'tiny' :
 				return 12;
 				break;
@@ -650,7 +650,7 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function excerpt_more( $more ) {
+	public function excerpt_more($more) {
 		return '&hellip;';
 	}
 
@@ -680,22 +680,22 @@ 
 	 */
 	public function wp_enqueue_scripts() {
 		// get some style
-		if ( apply_filters( 'FHEE_enable_default_espresso_css', FALSE ) ) {
+		if (apply_filters('FHEE_enable_default_espresso_css', FALSE)) {
 			// first check uploads folder
-			if ( is_readable( get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.css' )) {
-				wp_register_style( 'archive-espresso_events', get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.css', array( 'dashicons', 'espresso_default' ));
+			if (is_readable(get_stylesheet_directory().EE_Config::get_current_theme().DS.'archive-espresso_events.css')) {
+				wp_register_style('archive-espresso_events', get_stylesheet_directory_uri().EE_Config::get_current_theme().DS.'archive-espresso_events.css', array('dashicons', 'espresso_default'));
 			} else {
-				wp_register_style( 'archive-espresso_events', EE_TEMPLATES_URL . EE_Config::get_current_theme() . DS . 'archive-espresso_events.css', array( 'dashicons', 'espresso_default' ));
+				wp_register_style('archive-espresso_events', EE_TEMPLATES_URL.EE_Config::get_current_theme().DS.'archive-espresso_events.css', array('dashicons', 'espresso_default'));
 			}
-			if ( is_readable( get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.js' )) {
-				wp_register_script( 'archive-espresso_events', get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'archive-espresso_events.js', array( 'jquery-masonry' ), '1.0', TRUE  );
+			if (is_readable(get_stylesheet_directory().EE_Config::get_current_theme().DS.'archive-espresso_events.js')) {
+				wp_register_script('archive-espresso_events', get_stylesheet_directory_uri().EE_Config::get_current_theme().DS.'archive-espresso_events.js', array('jquery-masonry'), '1.0', TRUE);
 			} else {
-				wp_register_script( 'archive-espresso_events', EVENTS_ARCHIVE_ASSETS_URL . 'archive-espresso_events.js', array( 'jquery-masonry' ), '1.0', TRUE );
+				wp_register_script('archive-espresso_events', EVENTS_ARCHIVE_ASSETS_URL.'archive-espresso_events.js', array('jquery-masonry'), '1.0', TRUE);
 			}
-			wp_enqueue_style( 'archive-espresso_events' );
-			wp_enqueue_script( 'jquery-masonry' );
-			wp_enqueue_script( 'archive-espresso_events' );
-			add_action( 'wp_footer', array( 'EED_Events_Archive_Filters', 'localize_grid_event_lists' ), 1 );
+			wp_enqueue_style('archive-espresso_events');
+			wp_enqueue_script('jquery-masonry');
+			wp_enqueue_script('archive-espresso_events');
+			add_action('wp_footer', array('EED_Events_Archive_Filters', 'localize_grid_event_lists'), 1);
 		}
 	}
 
@@ -710,7 +710,7 @@ 
 	 *  @return 	void
 	 */
 	public static function localize_grid_event_lists() {
-		wp_localize_script( 'archive-espresso_events', 'espresso_grid_event_lists', EED_Events_Archive_Filters::$espresso_grid_event_lists );
+		wp_localize_script('archive-espresso_events', 'espresso_grid_event_lists', EED_Events_Archive_Filters::$espresso_grid_event_lists);
 	}
 
 
@@ -725,9 +725,9 @@ 
 	 */
 	public static function template_settings_form() {
 		$EE = EE_Registry::instance();
-		$EE->CFG->template_settings->EED_Events_Archive_Filters = isset( $EE->CFG->template_settings->EED_Events_Archive_Filters ) ? $EE->CFG->template_settings->EED_Events_Archive_Filters : new EE_Events_Archive_Config();
-		$EE->CFG->template_settings->EED_Events_Archive_Filters = apply_filters( 'FHEE__Event_List__template_settings_form__event_list_config', $EE->CFG->template_settings->EED_Events_Archive_Filters );
-		EEH_Template::display_template( EVENTS_ARCHIVE_TEMPLATES_PATH . 'admin-event-list-settings.template.php', $EE->CFG->template_settings->EED_Events_Archive_Filters );
+		$EE->CFG->template_settings->EED_Events_Archive_Filters = isset($EE->CFG->template_settings->EED_Events_Archive_Filters) ? $EE->CFG->template_settings->EED_Events_Archive_Filters : new EE_Events_Archive_Config();
+		$EE->CFG->template_settings->EED_Events_Archive_Filters = apply_filters('FHEE__Event_List__template_settings_form__event_list_config', $EE->CFG->template_settings->EED_Events_Archive_Filters);
+		EEH_Template::display_template(EVENTS_ARCHIVE_TEMPLATES_PATH.'admin-event-list-settings.template.php', $EE->CFG->template_settings->EED_Events_Archive_Filters);
 	}
 
 
@@ -741,16 +741,16 @@ 
 	 *  @static
 	 *  @return 	void
 	 */
-	public static function set_default_settings( $CFG ) {
+	public static function set_default_settings($CFG) {
 		//EEH_Debug_Tools::printr( $CFG, '$CFG  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		$CFG->display_description = isset( $CFG->display_description ) && ! empty( $CFG->display_description ) ? $CFG->display_description : 1;
-		$CFG->display_address = isset( $CFG->display_address ) && ! empty( $CFG->display_address ) ? $CFG->display_address : TRUE;
-		$CFG->display_venue_details = isset( $CFG->display_venue_details ) && ! empty( $CFG->display_venue_details ) ? $CFG->display_venue_details : TRUE;
-		$CFG->display_expired_events = isset( $CFG->display_expired_events ) && ! empty( $CFG->display_expired_events ) ? $CFG->display_expired_events : FALSE;
-		$CFG->default_type = isset( $CFG->default_type ) && ! empty( $CFG->default_type ) ? $CFG->default_type : 'grid';
-		$CFG->event_list_grid_size = isset( $CFG->event_list_grid_size ) && ! empty( $CFG->event_list_grid_size ) ? $CFG->event_list_grid_size : 'medium';
-		$CFG->templates['full'] = isset( $CFG->templates['full'] ) && ! empty( $CFG->templates['full'] ) ? $CFG->templates['full'] : EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events.php';
-		$CFG->templates['part'] = isset( $CFG->templates['part'] ) && ! empty( $CFG->templates['part'] ) ? $CFG->templates['part'] : EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-grid-view.php';
+		$CFG->display_description = isset($CFG->display_description) && ! empty($CFG->display_description) ? $CFG->display_description : 1;
+		$CFG->display_address = isset($CFG->display_address) && ! empty($CFG->display_address) ? $CFG->display_address : TRUE;
+		$CFG->display_venue_details = isset($CFG->display_venue_details) && ! empty($CFG->display_venue_details) ? $CFG->display_venue_details : TRUE;
+		$CFG->display_expired_events = isset($CFG->display_expired_events) && ! empty($CFG->display_expired_events) ? $CFG->display_expired_events : FALSE;
+		$CFG->default_type = isset($CFG->default_type) && ! empty($CFG->default_type) ? $CFG->default_type : 'grid';
+		$CFG->event_list_grid_size = isset($CFG->event_list_grid_size) && ! empty($CFG->event_list_grid_size) ? $CFG->event_list_grid_size : 'medium';
+		$CFG->templates['full'] = isset($CFG->templates['full']) && ! empty($CFG->templates['full']) ? $CFG->templates['full'] : EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events.php';
+		$CFG->templates['part'] = isset($CFG->templates['part']) && ! empty($CFG->templates['part']) ? $CFG->templates['part'] : EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-grid-view.php';
 		return $CFG;
 	}
 
@@ -762,7 +762,7 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function filter_config( $CFG ) {
+	public function filter_config($CFG) {
 		return $CFG;
 	}
 
@@ -775,32 +775,32 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public static function update_template_settings( $CFG, $REQ ) {
+	public static function update_template_settings($CFG, $REQ) {
 //		EEH_Debug_Tools::printr( $REQ, '$REQ  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 //		EEH_Debug_Tools::printr( $CFG, '$CFG  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		//$CFG->template_settings->EED_Events_Archive_Filters = new stdClass();
-		$CFG->EED_Events_Archive_Filters->display_description = isset( $REQ['display_description_in_event_list'] ) ? absint( $REQ['display_description_in_event_list'] ) : 1;
-		$CFG->EED_Events_Archive_Filters->display_address = isset( $REQ['display_address_in_event_list'] ) ? absint( $REQ['display_address_in_event_list'] ) : TRUE;
-		$CFG->EED_Events_Archive_Filters->display_venue_details = isset( $REQ['display_venue_details_in_event_list'] ) ? absint( $REQ['display_venue_details_in_event_list'] ) : TRUE;
-		$CFG->EED_Events_Archive_Filters->display_expired_events = isset( $REQ['display_expired_events'] ) ? absint( $REQ['display_expired_events'] ) : FALSE;
-		$CFG->EED_Events_Archive_Filters->default_type = isset( $REQ['default_type'] ) ? sanitize_text_field( $REQ['default_type'] ) : 'grid';
-		$CFG->EED_Events_Archive_Filters->event_list_grid_size = isset( $REQ['event_list_grid_size'] ) ? sanitize_text_field( $REQ['event_list_grid_size'] ) : 'medium';
+		$CFG->EED_Events_Archive_Filters->display_description = isset($REQ['display_description_in_event_list']) ? absint($REQ['display_description_in_event_list']) : 1;
+		$CFG->EED_Events_Archive_Filters->display_address = isset($REQ['display_address_in_event_list']) ? absint($REQ['display_address_in_event_list']) : TRUE;
+		$CFG->EED_Events_Archive_Filters->display_venue_details = isset($REQ['display_venue_details_in_event_list']) ? absint($REQ['display_venue_details_in_event_list']) : TRUE;
+		$CFG->EED_Events_Archive_Filters->display_expired_events = isset($REQ['display_expired_events']) ? absint($REQ['display_expired_events']) : FALSE;
+		$CFG->EED_Events_Archive_Filters->default_type = isset($REQ['default_type']) ? sanitize_text_field($REQ['default_type']) : 'grid';
+		$CFG->EED_Events_Archive_Filters->event_list_grid_size = isset($REQ['event_list_grid_size']) ? sanitize_text_field($REQ['event_list_grid_size']) : 'medium';
 		$CFG->EED_Events_Archive_Filters->templates = array(
-				'full'  => EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events.php'
+				'full'  => EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events.php'
 			);
 
-		switch ( $CFG->EED_Events_Archive_Filters->default_type ) {
+		switch ($CFG->EED_Events_Archive_Filters->default_type) {
 			case 'dates' :
-					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-dates-view.php';
+					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-dates-view.php';
 				break;
 			case 'text' :
-					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-text-view.php';
+					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-text-view.php';
 				break;
 			default :
-					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-grid-view.php';
+					$CFG->EED_Events_Archive_Filters->templates['part'] = EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-grid-view.php';
 		}
 
-		$CFG->EED_Events_Archive_Filters = isset( $REQ['reset_event_list_settings'] ) && absint( $REQ['reset_event_list_settings'] ) == 1 ? new EE_Events_Archive_Config() : $CFG->EED_Events_Archive_Filters;
+		$CFG->EED_Events_Archive_Filters = isset($REQ['reset_event_list_settings']) && absint($REQ['reset_event_list_settings']) == 1 ? new EE_Events_Archive_Config() : $CFG->EED_Events_Archive_Filters;
 		return $CFG;
 	}
 
@@ -815,7 +815,7 @@ 
 	 *  @return 	void
 	 */
 	public static function get_template_part() {
-		switch ( self::$_type ) {
+		switch (self::$_type) {
 			case 'dates' :
 					return 'archive-espresso_events-dates-view.php';
 				break;
@@ -839,13 +839,13 @@ 
 	 */
 	public function event_list_template_filters() {
 		$args = array(
-			'form_url' => get_post_type_archive_link( 'espresso_events' ), //add_query_arg( array( 'post_type' => 'espresso_events' ), home_url() ),
+			'form_url' => get_post_type_archive_link('espresso_events'), //add_query_arg( array( 'post_type' => 'espresso_events' ), home_url() ),
 			'elf_month' => EED_Events_Archive_Filters::_display_month(),
 			'elf_category' => EED_Events_Archive_Filters::_event_category_slug(),
 			'elf_show_expired' => EED_Events_Archive_Filters::_show_expired(),
 			'elf_type' => self::$_type
 		);
-		EEH_Template::display_template( EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_events-filters.php', $args );
+		EEH_Template::display_template(EE_TEMPLATES.EE_Config::get_current_theme().DS.'archive-espresso_events-filters.php', $args);
 	}
 
 
@@ -858,16 +858,16 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public static function event_list_css( $extra_class = '' ) {
+	public static function event_list_css($extra_class = '') {
 		$EE = EE_Registry::instance();
-		$event_list_css = ! empty( $extra_class ) ? array( $extra_class ) : array();
+		$event_list_css = ! empty($extra_class) ? array($extra_class) : array();
 		$event_list_css[] = 'espresso-event-list-event';
-		if ( self::$_type == 'grid' ) {
-			$event_list_grid_size = isset( $EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size ) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size : 'medium';
-			$event_list_css[] = $event_list_grid_size . '-event-list-grid';
+		if (self::$_type == 'grid') {
+			$event_list_grid_size = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->event_list_grid_size : 'medium';
+			$event_list_css[] = $event_list_grid_size.'-event-list-grid';
 		}
-		$event_list_css = apply_filters( 'EED_Events_Archive_Filters__event_list_css__event_list_css_array', $event_list_css );
-		return implode( ' ', $event_list_css );
+		$event_list_css = apply_filters('EED_Events_Archive_Filters__event_list_css__event_list_css_array', $event_list_css);
+		return implode(' ', $event_list_css);
 	}
 
 
@@ -893,9 +893,9 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public static function display_description( $value ) {
+	public static function display_description($value) {
 		$EE = EE_Registry::instance();
-		$display_description= isset( $EE->CFG->template_settings->EED_Events_Archive_Filters->display_description ) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_description : 1;
+		$display_description = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_description) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_description : 1;
 		return $display_description === $value ? TRUE : FALSE;
 	}
 
@@ -909,9 +909,9 @@ 
 	 */
 	public static function display_venue_details() {
 		$EE = EE_Registry::instance();
-		$display_venue_details= isset( $EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details ) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details : TRUE;
+		$display_venue_details = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_venue_details : TRUE;
 		$venue_name = EEH_Venue_View::venue_name();
-		return $display_venue_details && ! empty( $venue_name ) ? TRUE : FALSE;
+		return $display_venue_details && ! empty($venue_name) ? TRUE : FALSE;
 	}
 
 
@@ -923,9 +923,9 @@ 
 	 */
 	public static function display_address() {
 		$EE = EE_Registry::instance();
-		$display_address= isset( $EE->CFG->template_settings->EED_Events_Archive_Filters->display_address ) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_address : FALSE;
+		$display_address = isset($EE->CFG->template_settings->EED_Events_Archive_Filters->display_address) ? $EE->CFG->template_settings->EED_Events_Archive_Filters->display_address : FALSE;
 		$venue_name = EEH_Venue_View::venue_name();
-		return $display_address && ! empty( $venue_name ) ? TRUE : FALSE;
+		return $display_address && ! empty($venue_name) ? TRUE : FALSE;
 	}
 
 
@@ -939,22 +939,22 @@ 
 	public static function pagination() {
 		global $wp_query;
 		$big = 999999999; // need an unlikely integer
-		$pagination = paginate_links( array(
-			'base' => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+		$pagination = paginate_links(array(
+			'base' => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
 			'format' => '?paged=%#%',
-			'current' => max( 1, get_query_var('paged') ),
+			'current' => max(1, get_query_var('paged')),
 			'total' => $wp_query->max_num_pages,
 			'show_all'     => TRUE,
 			'end_size'     => 10,
 			'mid_size'     => 6,
 			'prev_next'    => TRUE,
-			'prev_text'    => __( '&lsaquo; PREV', 'event_espresso' ),
-			'next_text'    => __( 'NEXT &rsaquo;', 'event_espresso' ),
+			'prev_text'    => __('&lsaquo; PREV', 'event_espresso'),
+			'next_text'    => __('NEXT &rsaquo;', 'event_espresso'),
 			'type'         => 'plain',
 			'add_args'     => FALSE,
 			'add_fragment' => ''
 		));
-		return ! empty( $pagination ) ? '<div class="ee-pagination-dv clear">' . $pagination . '</div>' : '';
+		return ! empty($pagination) ? '<div class="ee-pagination-dv clear">'.$pagination.'</div>' : '';
 	}
 
 
@@ -968,7 +968,7 @@ 
 	 *  @return 	void
 	 */
 	public static function event_list_title() {
-		return apply_filters( 'EED_Events_Archive_Filters__event_list_title__event_list_title', __( 'Upcoming Events', 'event_espresso' ));
+		return apply_filters('EED_Events_Archive_Filters__event_list_title__event_list_title', __('Upcoming Events', 'event_espresso'));
 	}
 
 

widgets/upcoming_events/EEW_Upcoming_Events.widget.php

Spacing +73 added lines, -73 removed lines

@@ -30,8 +30,8 @@ 
 	function __construct() {
 		parent::__construct(
 			'ee-upcoming-events-widget',
-			__( 'Event Espresso Upcoming Events', 'event_espresso' ),
-			 array( 'description' => __( 'A widget to display your upcoming events.', 'event_espresso' )),
+			__('Event Espresso Upcoming Events', 'event_espresso'),
+			 array('description' => __('A widget to display your upcoming events.', 'event_espresso')),
 			array(
 				'width' => 300,
 				'height' => 350,
@@ -49,9 +49,9 @@ 
 	 * @param array $instance Previously saved values from database.
 	 * @return string|void
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 
-		EE_Registry::instance()->load_class( 'Question_Option', array(), FALSE, FALSE, TRUE );
+		EE_Registry::instance()->load_class('Question_Option', array(), FALSE, FALSE, TRUE);
 		// Set up some default widget settings.
 		$defaults = array(
 			'title' => __('Upcoming Events', 'event_espresso'),
@@ -66,12 +66,12 @@ 
 			'image_size' => 'medium'
 		);
 
-		$instance = wp_parse_args( (array) $instance, $defaults );
+		$instance = wp_parse_args((array) $instance, $defaults);
 		// don't add HTML labels for EE_Form_Fields generated inputs
-		add_filter( 'FHEE__EEH_Form_Fields__label_html', '__return_empty_string' );
+		add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
 		$yes_no_values = array(
-			EE_Question_Option::new_instance( array( 'QSO_value' => FALSE, 'QSO_desc' => __('No', 'event_espresso'))),
-			EE_Question_Option::new_instance( array( 'QSO_value' => TRUE, 'QSO_desc' => __('Yes', 'event_espresso')))
+			EE_Question_Option::new_instance(array('QSO_value' => FALSE, 'QSO_desc' => __('No', 'event_espresso'))),
+			EE_Question_Option::new_instance(array('QSO_value' => TRUE, 'QSO_desc' => __('Yes', 'event_espresso')))
 		);
 
 	?>
@@ -82,7 +82,7 @@ 
 			<label for="<?php echo $this->get_field_id('title'); ?>">
 				<?php _e('Title:', 'event_espresso'); ?>
 			</label>
-			<input id="<?php echo $this->get_field_id('title'); ?>" class="widefat" name="<?php echo $this->get_field_name('title'); ?>" value="<?php echo esc_attr( $instance['title'] ); ?>" type="text" />
+			<input id="<?php echo $this->get_field_id('title'); ?>" class="widefat" name="<?php echo $this->get_field_name('title'); ?>" value="<?php echo esc_attr($instance['title']); ?>" type="text" />
 		</p>
 		<p>
 			<label for="<?php echo $this->get_field_id('category_name'); ?>">
@@ -91,16 +91,16 @@ 
 			<?php
 			$event_categories = array();
 			/** @type EEM_Term $EEM_Term */
-			$EEM_Term = EE_Registry::instance()->load_model( 'Term' );
-			$categories = $EEM_Term->get_all_ee_categories( TRUE );
-			if ( $categories ) {
-				foreach ( $categories as $category ) {
-					if ( $category instanceof EE_Term ) {
-						$event_categories[] = EE_Question_Option::new_instance( array( 'QSO_value' => $category->get( 'slug' ), 'QSO_desc' => $category->get( 'name' )));
+			$EEM_Term = EE_Registry::instance()->load_model('Term');
+			$categories = $EEM_Term->get_all_ee_categories(TRUE);
+			if ($categories) {
+				foreach ($categories as $category) {
+					if ($category instanceof EE_Term) {
+						$event_categories[] = EE_Question_Option::new_instance(array('QSO_value' => $category->get('slug'), 'QSO_desc' => $category->get('name')));
 					}
 				}
 			}
-			array_unshift( $event_categories, EE_Question_Option::new_instance( array( 'QSO_value' => '', 'QSO_desc' => __(' - display all - ', 'event_espresso'))));
+			array_unshift($event_categories, EE_Question_Option::new_instance(array('QSO_value' => '', 'QSO_desc' => __(' - display all - ', 'event_espresso'))));
 			echo EEH_Form_Fields::select(
 				 __('Event Category:', 'event_espresso'),
 				$instance['category_name'],
@@ -137,16 +137,16 @@ 
 			<?php
 			$image_sizes = array();
 			$sizes = get_intermediate_image_sizes();
-			if ( $sizes ) {
+			if ($sizes) {
 				// loop thru images and create option objects out of them
-				foreach ( $sizes as $image_size ) {
-					$image_size = trim( $image_size );
+				foreach ($sizes as $image_size) {
+					$image_size = trim($image_size);
 					// no big images plz
-					if ( ! in_array( $image_size, array( 'large', 'post-thumbnail' ))) {
-						$image_sizes[] = EE_Question_Option::new_instance( array( 'QSO_value' => $image_size, 'QSO_desc' => $image_size ));
+					if ( ! in_array($image_size, array('large', 'post-thumbnail'))) {
+						$image_sizes[] = EE_Question_Option::new_instance(array('QSO_value' => $image_size, 'QSO_desc' => $image_size));
 					}
 				}
-				$image_sizes[] = EE_Question_Option::new_instance( array( 'QSO_value' => 'none', 'QSO_desc' =>  __('don\'t show images', 'event_espresso') ));
+				$image_sizes[] = EE_Question_Option::new_instance(array('QSO_value' => 'none', 'QSO_desc' =>  __('don\'t show images', 'event_espresso')));
 			}
 			echo EEH_Form_Fields::select(
 				 __('Image Size:', 'event_espresso'),
@@ -204,7 +204,7 @@ 
 			<label for="<?php echo $this->get_field_id('date_limit'); ?>">
 				<?php _e('Number of Dates to Display:', 'event_espresso'); ?>
 			</label>
-			<input id="<?php echo $this->get_field_id('date_limit'); ?>" name="<?php echo $this->get_field_name('date_limit'); ?>" value="<?php echo esc_attr( $instance['date_limit'] ); ?>" size="3" type="text" />
+			<input id="<?php echo $this->get_field_id('date_limit'); ?>" name="<?php echo $this->get_field_name('date_limit'); ?>" value="<?php echo esc_attr($instance['date_limit']); ?>" size="3" type="text" />
 		</p>
 		<p>
 			<label for="<?php echo $this->get_field_id('date_range'); ?>">
@@ -236,9 +236,9 @@ 
 	 *
 	 * @return array Updated safe values to be saved.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		$instance = $old_instance;
-		$instance['title'] = ! empty( $new_instance['title'] ) ? strip_tags( $new_instance['title'] ) : '';
+		$instance['title'] = ! empty($new_instance['title']) ? strip_tags($new_instance['title']) : '';
 		$instance['category_name'] = $new_instance['category_name'];
 		$instance['show_expired'] = $new_instance['show_expired'];
 		$instance['limit'] = $new_instance['limit'];
@@ -261,18 +261,18 @@ 
 	 * @param array $args     Widget arguments.
 	 * @param array $instance Saved values from database.
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 
 		global $post;
 		// make sure there is some kinda post object
-		if ( $post instanceof WP_Post ) {
+		if ($post instanceof WP_Post) {
 			$before_widget = '';
 			$before_title = '';
 			$after_title = '';
 			$after_widget = '';
 			// but NOT an events archives page, cuz that would be like two event lists on the same page
-			$show_everywhere = isset( $instance['show_everywhere'] ) ? (bool) absint( $instance['show_everywhere'] ) : TRUE;
-			if ( $show_everywhere || ! ( $post->post_type == 'espresso_events' && is_archive() )) {
+			$show_everywhere = isset($instance['show_everywhere']) ? (bool) absint($instance['show_everywhere']) : TRUE;
+			if ($show_everywhere || ! ($post->post_type == 'espresso_events' && is_archive())) {
 				// let's use some of the event helper functions'
 				// make separate vars out of attributes
 
@@ -291,83 +291,83 @@ 
 				// Before widget (defined by themes).
 				echo $before_widget;
 				// Display the widget title if one was input (before and after defined by themes).
-				if ( ! empty( $title )) {
-					echo $before_title . $title . $after_title;
+				if ( ! empty($title)) {
+					echo $before_title.$title.$after_title;
 				}
 				// grab widget settings
-				$category = isset( $instance['category_name'] ) && ! empty( $instance['category_name'] ) ? $instance['category_name'] : FALSE;
-				$show_expired = isset( $instance['show_expired'] ) ? (bool) absint( $instance['show_expired'] ) : FALSE;
-				$image_size = isset( $instance['image_size'] ) && ! empty( $instance['image_size'] ) ? $instance['image_size'] : 'medium';
-				$show_desc = isset( $instance['show_desc'] ) ? (bool) absint( $instance['show_desc'] ) : TRUE;
-				$show_dates = isset( $instance['show_dates'] ) ? (bool) absint( $instance['show_dates'] ) : TRUE;
-				$date_limit = isset( $instance['date_limit'] ) && ! empty( $instance['date_limit'] ) ? $instance['date_limit'] : NULL;
-				$date_range = isset( $instance['date_range'] ) && ! empty( $instance['date_range'] ) ? $instance['date_range'] : FALSE;
+				$category = isset($instance['category_name']) && ! empty($instance['category_name']) ? $instance['category_name'] : FALSE;
+				$show_expired = isset($instance['show_expired']) ? (bool) absint($instance['show_expired']) : FALSE;
+				$image_size = isset($instance['image_size']) && ! empty($instance['image_size']) ? $instance['image_size'] : 'medium';
+				$show_desc = isset($instance['show_desc']) ? (bool) absint($instance['show_desc']) : TRUE;
+				$show_dates = isset($instance['show_dates']) ? (bool) absint($instance['show_dates']) : TRUE;
+				$date_limit = isset($instance['date_limit']) && ! empty($instance['date_limit']) ? $instance['date_limit'] : NULL;
+				$date_range = isset($instance['date_range']) && ! empty($instance['date_range']) ? $instance['date_range'] : FALSE;
 				// start to build our where clause
 				$where = array(
 //					'Datetime.DTT_is_primary' => 1,
-					'status' => array( 'IN', array( 'publish', 'sold_out' ) )
+					'status' => array('IN', array('publish', 'sold_out'))
 				);
 				// add category
-				if ( $category ) {
+				if ($category) {
 					$where['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
 					$where['Term_Taxonomy.Term.slug'] = $category;
 				}
 				// if NOT expired then we want events that start today or in the future
-				if ( ! $show_expired ) {
-					$where['Datetime.DTT_EVT_end'] = array( '>=', EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_end' ) );
+				if ( ! $show_expired) {
+					$where['Datetime.DTT_EVT_end'] = array('>=', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'));
 				}
 				// allow $where to be filtered
-				$where = apply_filters( 'FHEE__EEW_Upcoming_Events__widget__where', $where, $category, $show_expired );
+				$where = apply_filters('FHEE__EEW_Upcoming_Events__widget__where', $where, $category, $show_expired);
 				// run the query
-				$events = EE_Registry::instance()->load_model( 'Event' )->get_all( array(
+				$events = EE_Registry::instance()->load_model('Event')->get_all(array(
 					$where,
-					'limit' => $instance['limit'] > 0 ? '0,' . $instance['limit'] : '0,10',
+					'limit' => $instance['limit'] > 0 ? '0,'.$instance['limit'] : '0,10',
 					'order_by' => 'Datetime.DTT_EVT_start',
 					'order' => 'ASC',
 					'group_by' => 'EVT_ID'
 				));
 
-				if ( ! empty( $events )) {
+				if ( ! empty($events)) {
 					echo '<ul class="ee-upcoming-events-widget-ul">';
-					foreach ( $events as $event ) {
-						if ( $event instanceof EE_Event && ( !is_single() || $post->ID != $event->ID() ) ) {
+					foreach ($events as $event) {
+						if ($event instanceof EE_Event && ( ! is_single() || $post->ID != $event->ID())) {
 							//printr( $event, '$event  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-							echo '<li id="ee-upcoming-events-widget-li-' . $event->ID() . '" class="ee-upcoming-events-widget-li">';
+							echo '<li id="ee-upcoming-events-widget-li-'.$event->ID().'" class="ee-upcoming-events-widget-li">';
 							// how big is the event name ?
-							$name_length = strlen( $event->name() );
-							switch( $name_length ) {
+							$name_length = strlen($event->name());
+							switch ($name_length) {
 								case $name_length > 70 :
-									$len_class =  ' three-line';
+									$len_class = ' three-line';
 									break;
 								case $name_length > 35 :
-									$len_class =  ' two-line';
+									$len_class = ' two-line';
 									break;
 								default :
-									$len_class =  ' one-line';
+									$len_class = ' one-line';
 							}
-							$event_url = apply_filters( 'FHEE_EEW_Upcoming_Events__widget__event_url', $event->get_permalink(), $event );
-							echo '<h5 class="ee-upcoming-events-widget-title-h5"><a class="ee-widget-event-name-a' . $len_class . '" href="' . $event_url . '">' . $event->name() . '</a></h5>';
-							if ( post_password_required( $event->ID() ) ) {
-								$pswd_form = apply_filters( 'FHEE_EEW_Upcoming_Events__widget__password_form', get_the_password_form( $event->ID() ), $event );
+							$event_url = apply_filters('FHEE_EEW_Upcoming_Events__widget__event_url', $event->get_permalink(), $event);
+							echo '<h5 class="ee-upcoming-events-widget-title-h5"><a class="ee-widget-event-name-a'.$len_class.'" href="'.$event_url.'">'.$event->name().'</a></h5>';
+							if (post_password_required($event->ID())) {
+								$pswd_form = apply_filters('FHEE_EEW_Upcoming_Events__widget__password_form', get_the_password_form($event->ID()), $event);
 								echo $pswd_form;
 							} else {
-								if ( has_post_thumbnail( $event->ID() ) && $image_size != 'none' ) {
-									echo '<div class="ee-upcoming-events-widget-img-dv"><a class="ee-upcoming-events-widget-img" href="' . $event_url . '">' . get_the_post_thumbnail( $event->ID(), $image_size ) . '</a></div>';
+								if (has_post_thumbnail($event->ID()) && $image_size != 'none') {
+									echo '<div class="ee-upcoming-events-widget-img-dv"><a class="ee-upcoming-events-widget-img" href="'.$event_url.'">'.get_the_post_thumbnail($event->ID(), $image_size).'</a></div>';
 								}
-								$desc = $event->short_description( 25 );
-								if ( $show_dates ) {
-									$date_format = apply_filters( 'FHEE__espresso_event_date_range__date_format', get_option( 'date_format' ));
-									$time_format = apply_filters( 'FHEE__espresso_event_date_range__time_format', get_option( 'time_format' ));
-									$single_date_format = apply_filters( 'FHEE__espresso_event_date_range__single_date_format', get_option( 'date_format' ));
-									$single_time_format = apply_filters( 'FHEE__espresso_event_date_range__single_time_format', get_option( 'time_format' ));
-									if ( $date_range == TRUE ) {
-										echo espresso_event_date_range( $date_format, $time_format, $single_date_format, $single_time_format, $event->ID() );
-									}else{
-										echo espresso_list_of_event_dates( $event->ID(), $date_format, $time_format, FALSE, NULL, TRUE, TRUE, $date_limit );
+								$desc = $event->short_description(25);
+								if ($show_dates) {
+									$date_format = apply_filters('FHEE__espresso_event_date_range__date_format', get_option('date_format'));
+									$time_format = apply_filters('FHEE__espresso_event_date_range__time_format', get_option('time_format'));
+									$single_date_format = apply_filters('FHEE__espresso_event_date_range__single_date_format', get_option('date_format'));
+									$single_time_format = apply_filters('FHEE__espresso_event_date_range__single_time_format', get_option('time_format'));
+									if ($date_range == TRUE) {
+										echo espresso_event_date_range($date_format, $time_format, $single_date_format, $single_time_format, $event->ID());
+									} else {
+										echo espresso_list_of_event_dates($event->ID(), $date_format, $time_format, FALSE, NULL, TRUE, TRUE, $date_limit);
 									}
 								}
-								if ( $show_desc && $desc ) {
-									echo '<p style="margin-top: .5em">' . $desc . '</p>';
+								if ($show_desc && $desc) {
+									echo '<p style="margin-top: .5em">'.$desc.'</p>';
 								}
 							}
 							echo '</li>';
@@ -391,7 +391,7 @@ 
 	 * @return string
 	 */
 	public function make_the_title_a_link($title) {
-	    return '<a href="' . EEH_Event_View::event_archive_url() . '">' . $title . '</a>';
+	    return '<a href="'.EEH_Event_View::event_archive_url().'">'.$title.'</a>';
 	}
 
 }

shortcodes/espresso_events/EES_Espresso_Events.shortcode.php

Indentation +13 added lines, -13 removed lines

@@ -104,16 +104,16 @@ 
 		// grab attributes and merge with defaults, then extract
 		$attributes = array_merge( (array) $default_espresso_events_shortcode_atts, (array) $attributes );
 		$attributes = \EES_Shortcode::sanitize_attributes(
-		    $attributes,
-            // the following get sanitized/whitelisted in EEH_Event_Query
-            array(
-                'category_slug' => 'skip_sanitization',
-                'show_expired'  => 'skip_sanitization',
-                'order_by'      => 'skip_sanitization',
-                'month'         => 'skip_sanitization',
-                'sort'          => 'skip_sanitization',
-            )
-        );
+			$attributes,
+			// the following get sanitized/whitelisted in EEH_Event_Query
+			array(
+				'category_slug' => 'skip_sanitization',
+				'show_expired'  => 'skip_sanitization',
+				'order_by'      => 'skip_sanitization',
+				'month'         => 'skip_sanitization',
+				'sort'          => 'skip_sanitization',
+			)
+		);
 		// make sure we use the_excerpt()
 		add_filter( 'FHEE__EES_Espresso_Events__process_shortcode__true', '__return_true' );
 		// apply query filters
@@ -232,9 +232,9 @@ 
 
 
 	/**
-     * event_list_css
-     *
-     * @param string $event_list_css
+	 * event_list_css
+	 *
+	 * @param string $event_list_css
 	 * @return string
 	 */
 	public function event_list_css( $event_list_css = '' ) {

Spacing +33 added lines, -33 removed lines

@@ -50,14 +50,14 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public function run( WP $WP ) {
-		if ( did_action( 'pre_get_posts' ) && did_action( 'send_headers' ) ) {
+	public function run(WP $WP) {
+		if (did_action('pre_get_posts') && did_action('send_headers')) {
 			EED_Events_Archive::instance()->event_list();
 		} else {
 			// this will trigger the EED_Events_Archive module's event_list() method during the pre_get_posts hook point,
 			// this allows us to initialize things, enqueue assets, etc,
 			// as well, this saves an instantiation of the module in an array using 'espresso_events' as the key, so that we can retrieve it
-			add_action( 'pre_get_posts', array( EED_Events_Archive::instance(), 'event_list' ) );
+			add_action('pre_get_posts', array(EED_Events_Archive::instance(), 'event_list'));
 		}
 	}
 
@@ -79,9 +79,9 @@ 
 	 *  @param 	array 	$attributes
 	 *  @return 	string
 	 */
-	public function process_shortcode( $attributes = array() ) {
+	public function process_shortcode($attributes = array()) {
 		// make sure EED_Events_Archive is setup properly
-		if ( apply_filters( 'FHEE__fallback_shortcode_processor__EES_Espresso_Events', FALSE )) {
+		if (apply_filters('FHEE__fallback_shortcode_processor__EES_Espresso_Events', FALSE)) {
 			EED_Events_Archive::instance()->event_list();
 		}
 		//set default attributes
@@ -102,7 +102,7 @@ 
 			$default_espresso_events_shortcode_atts
 		);
 		// grab attributes and merge with defaults, then extract
-		$attributes = array_merge( (array) $default_espresso_events_shortcode_atts, (array) $attributes );
+		$attributes = array_merge((array) $default_espresso_events_shortcode_atts, (array) $attributes);
 		$attributes = \EES_Shortcode::sanitize_attributes(
 		    $attributes,
             // the following get sanitized/whitelisted in EEH_Event_Query
@@ -115,22 +115,22 @@ 
             )
         );
 		// make sure we use the_excerpt()
-		add_filter( 'FHEE__EES_Espresso_Events__process_shortcode__true', '__return_true' );
+		add_filter('FHEE__EES_Espresso_Events__process_shortcode__true', '__return_true');
 		// apply query filters
-		add_filter( 'FHEE__EEH_Event_Query__apply_query_filters', '__return_true' );
+		add_filter('FHEE__EEH_Event_Query__apply_query_filters', '__return_true');
 		// run the query
 		global $wp_query;
-		$wp_query = new EE_Event_List_Query( $attributes );
+		$wp_query = new EE_Event_List_Query($attributes);
 		// check what template is loaded and load filters accordingly
-		EED_Events_Archive::instance()->template_include( 'loop-espresso_events.php' );
+		EED_Events_Archive::instance()->template_include('loop-espresso_events.php');
 		// load our template
-		$event_list = EEH_Template::locate_template( 'loop-espresso_events.php', array(), TRUE, TRUE );
+		$event_list = EEH_Template::locate_template('loop-espresso_events.php', array(), TRUE, TRUE);
 		// now reset the query and postdata
 		wp_reset_query();
 		wp_reset_postdata();
 		EED_Events_Archive::remove_all_events_archive_filters();
 		// remove query filters
-		remove_filter( 'FHEE__EEH_Event_Query__apply_query_filters', '__return_true' );
+		remove_filter('FHEE__EEH_Event_Query__apply_query_filters', '__return_true');
 		// pull our content from the output buffer and return it
 		return $event_list;
 	}
@@ -174,43 +174,43 @@ 
 	 *
 	 * @param array $args
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		// incoming args could be a mix of WP query args + EE shortcode args
-		foreach ( $args as $key =>$value ) {
-			$property = '_' . $key;
+		foreach ($args as $key =>$value) {
+			$property = '_'.$key;
 			// if the arg is a property of this class, then it's an EE shortcode arg
-			if ( property_exists( $this, $property )) {
+			if (property_exists($this, $property)) {
 				// set the property value
 				$this->{$property} = $value;
 				// then remove it from the array of args that will later be passed to WP_Query()
-				unset( $args[ $key ] );
+				unset($args[$key]);
 			}
 		}
 		//add query filters
 		EEH_Event_Query::add_query_filters();
 		// set params that will get used by the filters
-		EEH_Event_Query::set_query_params( $this->_month, $this->_category_slug, $this->_show_expired, $this->_order_by, $this->_sort );
+		EEH_Event_Query::set_query_params($this->_month, $this->_category_slug, $this->_show_expired, $this->_order_by, $this->_sort);
 		// first off, let's remove any filters from previous queries
-		remove_filter( 'FHEE__archive_espresso_events_template__upcoming_events_h1', array( $this, 'event_list_title' ));
-		remove_all_filters( 'FHEE__content_espresso_events__event_class' );
+		remove_filter('FHEE__archive_espresso_events_template__upcoming_events_h1', array($this, 'event_list_title'));
+		remove_all_filters('FHEE__content_espresso_events__event_class');
 		// Event List Title ?
-		add_filter( 'FHEE__archive_espresso_events_template__upcoming_events_h1', array( $this, 'event_list_title' ), 10, 1 );
+		add_filter('FHEE__archive_espresso_events_template__upcoming_events_h1', array($this, 'event_list_title'), 10, 1);
 		// add the css class
-		add_filter( 'FHEE__content_espresso_events__event_class', array( $this, 'event_list_css' ), 10, 1 );
+		add_filter('FHEE__content_espresso_events__event_class', array($this, 'event_list_css'), 10, 1);
 		// the current "page" we are viewing
-		$paged = max( 1, get_query_var( 'paged' ));
+		$paged = max(1, get_query_var('paged'));
 		// Force these args
-		$args = array_merge( $args, array(
+		$args = array_merge($args, array(
 			'post_type' => 'espresso_events',
 			'posts_per_page' => $this->_limit,
 			'update_post_term_cache' => FALSE,
 			'update_post_meta_cache' => FALSE,
 			'paged' => $paged,
-			'offset' => ( $paged - 1 ) * $this->_limit
+			'offset' => ($paged - 1) * $this->_limit
 		));
 
 		// run the query
-		parent::__construct( $args );
+		parent::__construct($args);
 	}
 
 
@@ -222,8 +222,8 @@ 
 	 * @param string $event_list_title
 	 * @return string
 	 */
-	public function event_list_title( $event_list_title = '' ) {
-		if ( ! empty( $this->_title )) {
+	public function event_list_title($event_list_title = '') {
+		if ( ! empty($this->_title)) {
 			return $this->_title;
 		}
 		return $event_list_title;
@@ -237,11 +237,11 @@ 
      * @param string $event_list_css
 	 * @return string
 	 */
-	public function event_list_css( $event_list_css = '' ) {
-		$event_list_css .=  ! empty( $event_list_css ) ? ' ' : '';
-		$event_list_css .=  ! empty( $this->_css_class ) ? $this->_css_class : '';
-		$event_list_css .=  ! empty( $event_list_css ) ? ' ' : '';
-		$event_list_css .=  ! empty( $this->_category_slug ) ? $this->_category_slug : '';
+	public function event_list_css($event_list_css = '') {
+		$event_list_css .= ! empty($event_list_css) ? ' ' : '';
+		$event_list_css .= ! empty($this->_css_class) ? $this->_css_class : '';
+		$event_list_css .= ! empty($event_list_css) ? ' ' : '';
+		$event_list_css .= ! empty($this->_category_slug) ? $this->_category_slug : '';
 		return $event_list_css;
 	}
 

core/helpers/EEH_Event_Query.helper.php

Indentation +147 added lines, -147 removed lines

@@ -91,9 +91,9 @@ 
 	 */
 	public static function apply_query_filters( WP_Query $WP_Query ) {
 		return (
-		    isset( $WP_Query->query, $WP_Query->query['post_type'] )
-            && $WP_Query->query['post_type'] === 'espresso_events'
-        ) ||  apply_filters( 'FHEE__EEH_Event_Query__apply_query_filters', false ) ;
+			isset( $WP_Query->query, $WP_Query->query['post_type'] )
+			&& $WP_Query->query['post_type'] === 'espresso_events'
+		) ||  apply_filters( 'FHEE__EEH_Event_Query__apply_query_filters', false ) ;
 	}
 
 
@@ -104,8 +104,8 @@ 
 	 */
 	public static function filter_query_parts( WP_Query $WP_Query ) {
 		// ONLY add our filters if this isn't the main wp_query,
-        // because if this is the main wp_query we already have
-        // our cpt strategies take care of adding things in.
+		// because if this is the main wp_query we already have
+		// our cpt strategies take care of adding things in.
 		if ( $WP_Query instanceof WP_Query && ! $WP_Query->is_main_query() ) {
 			// build event list query
 			add_filter( 'posts_fields', array( 'EEH_Event_Query', 'posts_fields' ), 10, 2 );
@@ -127,13 +127,13 @@ 
 	 * @param string $orderby
 	 * @param string $sort
 	 */
-    public static function set_query_params(
-        $month = '',
-        $category = '',
-        $show_expired = false,
-        $orderby = 'start_date',
-        $sort = 'ASC'
-    ) {
+	public static function set_query_params(
+		$month = '',
+		$category = '',
+		$show_expired = false,
+		$orderby = 'start_date',
+		$sort = 'ASC'
+	) {
 		self::$_query_params = array();
 		EEH_Event_Query::$_event_query_month = EEH_Event_Query::_display_month( $month );
 		EEH_Event_Query::$_event_query_category = EEH_Event_Query::_event_category_slug( $category );
@@ -151,8 +151,8 @@ 
 	 * @return    string
 	 */
 	private static function _display_month( $month = '' ) {
-        return sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_month', $month));
-    }
+		return sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_month', $month));
+	}
 
 
 
@@ -177,9 +177,9 @@ 
 	private static function _show_expired( $show_expired = false ) {
 		// override default expired option if set via filter
 		return filter_var(
-		    EE_Registry::instance()->REQ->get('event_query_show_expired', $show_expired),
-            FILTER_VALIDATE_BOOLEAN
-        );
+			EE_Registry::instance()->REQ->get('event_query_show_expired', $show_expired),
+			FILTER_VALIDATE_BOOLEAN
+		);
 	}
 
 
@@ -193,8 +193,8 @@ 
 	private static function _orderby( $orderby = 'start_date' ) {
 		$event_query_orderby = EE_Registry::instance()->REQ->get('event_query_orderby', $orderby);
 		$event_query_orderby = is_array( $event_query_orderby )
-            ? $event_query_orderby
-            : explode( ',', $event_query_orderby );
+			? $event_query_orderby
+			: explode( ',', $event_query_orderby );
 		$event_query_orderby = array_map( 'trim', $event_query_orderby );
 		$event_query_orderby = array_map( 'sanitize_text_field', $event_query_orderby );
 		return $event_query_orderby;
@@ -211,8 +211,8 @@ 
 	private static function _sort( $sort = 'ASC' ) {
 		$sort = EE_Registry::instance()->REQ->get('event_query_sort', $sort);
 		return in_array( $sort, array( 'ASC', 'asc', 'DESC', 'desc' ), true)
-            ? strtoupper( $sort )
-            : 'ASC';
+			? strtoupper( $sort )
+			: 'ASC';
 	}
 
 
@@ -235,14 +235,14 @@ 
 
 
 
-    /**
-     *    posts_fields
-     *
-     * @param          $SQL
-     * @param WP_Query $wp_query
-     * @return    string
-     * @throws \EE_Error
-     */
+	/**
+	 *    posts_fields
+	 *
+	 * @param          $SQL
+	 * @param WP_Query $wp_query
+	 * @return    string
+	 * @throws \EE_Error
+	 */
 	public static function posts_fields( $SQL, WP_Query $wp_query ) {
 		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
 			// adds something like ", wp_esp_datetime.* " to WP Query SELECT statement
@@ -253,13 +253,13 @@ 
 
 
 
-    /**
-     *    posts_join_sql_for_terms
-     *
-     * @param array $orderby_params
-     * @return    string
-     * @throws \EE_Error
-     */
+	/**
+	 *    posts_join_sql_for_terms
+	 *
+	 * @param array $orderby_params
+	 * @return    string
+	 * @throws \EE_Error
+	 */
 	public static function posts_fields_sql_for_orderby( $orderby_params = array() ) {
 		$SQL = ', MIN( ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start ) as event_start_date ' ;
 		foreach( (array)$orderby_params as $orderby ) {
@@ -292,14 +292,14 @@ 
 
 
 
-    /**
-     *    posts_join
-     *
-     * @param string   $SQL
-     * @param WP_Query $wp_query
-     * @return    string
-     * @throws \EE_Error
-     */
+	/**
+	 *    posts_join
+	 *
+	 * @param string   $SQL
+	 * @param WP_Query $wp_query
+	 * @return    string
+	 * @throws \EE_Error
+	 */
 	public static function posts_join( $SQL = '', WP_Query $wp_query ) {
 		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
 			// Category
@@ -312,14 +312,14 @@ 
 
 
 
-    /**
-     *    posts_join_sql_for_terms
-     *
-     * @param string     $SQL
-     * @param    boolean $show_expired if TRUE, then displayed past events
-     * @return string
-     * @throws \EE_Error
-     */
+	/**
+	 *    posts_join_sql_for_terms
+	 *
+	 * @param string     $SQL
+	 * @param    boolean $show_expired if TRUE, then displayed past events
+	 * @return string
+	 * @throws \EE_Error
+	 */
 	public static function posts_join_sql_for_show_expired( $SQL = '', $show_expired = FALSE ) {
 		if ( ! $show_expired ) {
 			$join = EEM_Event::instance()->table() . '.ID = ';
@@ -353,24 +353,24 @@ 
 
 
 
-    /**
-     *    posts_join_for_orderby
-     *    usage:  $SQL .= EEH_Event_Query::posts_join_for_orderby( $orderby_params );
-     *
-     * @param    string $SQL
-     * @param    array  $orderby_params
-     * @return    string
-     * @throws \EE_Error
-     */
+	/**
+	 *    posts_join_for_orderby
+	 *    usage:  $SQL .= EEH_Event_Query::posts_join_for_orderby( $orderby_params );
+	 *
+	 * @param    string $SQL
+	 * @param    array  $orderby_params
+	 * @return    string
+	 * @throws \EE_Error
+	 */
 	public static function posts_join_for_orderby( $SQL = '', $orderby_params = array() ) {
 		foreach ( (array)$orderby_params as $orderby ) {
 			switch ( $orderby ) {
 				case 'ticket_start' :
 				case 'ticket_end' :
 					$SQL .= EEH_Event_Query::_posts_join_for_datetime(
-					    $SQL,
-                        EEM_Datetime_Ticket::instance()->table() . '.' . EEM_Datetime::instance()->primary_key_name()
-                    );
+						$SQL,
+						EEM_Datetime_Ticket::instance()->table() . '.' . EEM_Datetime::instance()->primary_key_name()
+					);
 					$SQL .= ' LEFT JOIN ' . EEM_Ticket::instance()->table();
 					$SQL .= ' ON (';
 					$SQL .= EEM_Datetime_Ticket::instance()->table() . '.' . EEM_Ticket::instance()->primary_key_name();
@@ -398,14 +398,14 @@ 
 
 
 
-    /**
-     *    _posts_join_for_datetime
-     *
-     * @param string $SQL
-     * @param string $join
-     * @return string
-     * @throws \EE_Error
-     */
+	/**
+	 *    _posts_join_for_datetime
+	 *
+	 * @param string $SQL
+	 * @param string $join
+	 * @return string
+	 * @throws \EE_Error
+	 */
 	protected static function _posts_join_for_datetime( $SQL = '', $join = '' ) {
 		if ( ! empty( $join )) {
 			$join .= ' = ' . EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name();
@@ -418,13 +418,13 @@ 
 
 
 
-    /**
-     *    _posts_join_for_event_venue
-     *
-     * @param string $SQL
-     * @return string
-     * @throws \EE_Error
-     */
+	/**
+	 *    _posts_join_for_event_venue
+	 *
+	 * @param string $SQL
+	 * @return string
+	 * @throws \EE_Error
+	 */
 	protected static function _posts_join_for_event_venue( $SQL = '' ) {
 		// Event Venue table name
 		$event_venue_table = EEM_Event_Venue::instance()->table();
@@ -454,13 +454,13 @@ 
 
 
 
-    /**
-     *    _posts_join_for_venue_state
-     *
-     * @param string $SQL
-     * @return string
-     * @throws \EE_Error
-     */
+	/**
+	 *    _posts_join_for_venue_state
+	 *
+	 * @param string $SQL
+	 * @return string
+	 * @throws \EE_Error
+	 */
 	protected static function _posts_join_for_venue_state( $SQL = '' ) {
 		// Venue Meta table name
 		$venue_meta_table = EEM_Venue::instance()->second_table();
@@ -484,14 +484,14 @@ 
 
 
 
-    /**
-     *    posts_where
-     *
-     * @param string   $SQL
-     * @param WP_Query $wp_query
-     * @return    string
-     * @throws \EE_Error
-     */
+	/**
+	 *    posts_where
+	 *
+	 * @param string   $SQL
+	 * @param WP_Query $wp_query
+	 * @return    string
+	 * @throws \EE_Error
+	 */
 	public static function posts_where( $SQL = '', WP_Query $wp_query ) {
 		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
 			// Show Expired ?
@@ -506,17 +506,17 @@ 
 
 
 
-    /**
-     *    posts_where_sql_for_show_expired
-     *
-     * @param    boolean $show_expired if TRUE, then displayed past events
-     * @return    string
-     * @throws \EE_Error
-     */
+	/**
+	 *    posts_where_sql_for_show_expired
+	 *
+	 * @param    boolean $show_expired if TRUE, then displayed past events
+	 * @return    string
+	 * @throws \EE_Error
+	 */
 	public static function posts_where_sql_for_show_expired( $show_expired = FALSE ) {
 		return ! $show_expired
-            ? ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > \'' . current_time( 'mysql', TRUE ) . '\' '
-            : '';
+			? ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > \'' . current_time( 'mysql', TRUE ) . '\' '
+			: '';
 	}
 
 
@@ -531,19 +531,19 @@ 
 		global $wpdb;
 		$event_category_slug = esc_sql($event_category_slug);
 		return ! empty( $event_category_slug )
-            ? " AND {$wpdb->terms}.slug = '{$event_category_slug}' "
-            : '';
+			? " AND {$wpdb->terms}.slug = '{$event_category_slug}' "
+			: '';
 	}
 
 
 
-    /**
-     *    posts_where_sql_for_event_list_month
-     *
-     * @param    boolean $month
-     * @return    string
-     * @throws \EE_Error
-     */
+	/**
+	 *    posts_where_sql_for_event_list_month
+	 *
+	 * @param    boolean $month
+	 * @return    string
+	 * @throws \EE_Error
+	 */
 	public static function posts_where_sql_for_event_list_month( $month = NULL ) {
 		$SQL = '';
 		if ( ! empty( $month ) ) {
@@ -558,55 +558,55 @@ 
 
 
 
-    /**
-     *    posts_orderby
-     *
-     * @param string   $SQL
-     * @param WP_Query $wp_query
-     * @return    string
-     * @throws \EE_Error
-     */
+	/**
+	 *    posts_orderby
+	 *
+	 * @param string   $SQL
+	 * @param WP_Query $wp_query
+	 * @return    string
+	 * @throws \EE_Error
+	 */
 	public static function posts_orderby( $SQL = '', WP_Query $wp_query ) {
 		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
 			$SQL = EEH_Event_Query::posts_orderby_sql(
-			    EEH_Event_Query::$_event_query_orderby,
-                EEH_Event_Query::$_event_query_sort
-            );
+				EEH_Event_Query::$_event_query_orderby,
+				EEH_Event_Query::$_event_query_sort
+			);
 		}
 		return $SQL;
 	}
 
 
 
-    /**
-     *    posts_orderby_sql
-     *    possible parameters:
-     *    ID
-     *    start_date
-     *    end_date
-     *    event_name
-     *    category_slug
-     *    ticket_start
-     *    ticket_end
-     *    venue_title
-     *    city
-     *    state
-     *    **IMPORTANT**
-     *    make sure to also send the $orderby_params array to the posts_join_for_orderby() method
-     *    or else some of the table references below will result in MySQL errors
-     *
-     * @param array|bool $orderby_params
-     * @param string     $sort
-     * @return string
-     * @throws \EE_Error
-     */
+	/**
+	 *    posts_orderby_sql
+	 *    possible parameters:
+	 *    ID
+	 *    start_date
+	 *    end_date
+	 *    event_name
+	 *    category_slug
+	 *    ticket_start
+	 *    ticket_end
+	 *    venue_title
+	 *    city
+	 *    state
+	 *    **IMPORTANT**
+	 *    make sure to also send the $orderby_params array to the posts_join_for_orderby() method
+	 *    or else some of the table references below will result in MySQL errors
+	 *
+	 * @param array|bool $orderby_params
+	 * @param string     $sort
+	 * @return string
+	 * @throws \EE_Error
+	 */
 	public static function posts_orderby_sql( $orderby_params = array(), $sort = 'ASC' ) {
 		global $wpdb;
 		$SQL = '';
 		$counter = 0;
 		$sort = in_array($sort, array('ASC', 'asc', 'DESC', 'desc'), true)
-            ? strtoupper($sort)
-            : 'ASC';
+			? strtoupper($sort)
+			: 'ASC';
 		//make sure 'orderby' is set in query params
 		if ( ! isset( self::$_query_params['orderby'] )) {
 			self::$_query_params['orderby'] = array();

Spacing +119 added lines, -119 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -78,7 +78,7 @@ 
 	 */
 	public static function add_query_filters() {
 		//add query filters
-		add_action( 'pre_get_posts', array( 'EEH_Event_Query', 'filter_query_parts' ), 10, 1 );
+		add_action('pre_get_posts', array('EEH_Event_Query', 'filter_query_parts'), 10, 1);
 	}
 
 
@@ -89,11 +89,11 @@ 
 	 * @param \WP_Query $WP_Query
 	 * @return bool
 	 */
-	public static function apply_query_filters( WP_Query $WP_Query ) {
+	public static function apply_query_filters(WP_Query $WP_Query) {
 		return (
-		    isset( $WP_Query->query, $WP_Query->query['post_type'] )
+		    isset($WP_Query->query, $WP_Query->query['post_type'])
             && $WP_Query->query['post_type'] === 'espresso_events'
-        ) ||  apply_filters( 'FHEE__EEH_Event_Query__apply_query_filters', false ) ;
+        ) || apply_filters('FHEE__EEH_Event_Query__apply_query_filters', false);
 	}
 
 
@@ -102,17 +102,17 @@ 
 	 *
 	 * @param \WP_Query $WP_Query
 	 */
-	public static function filter_query_parts( WP_Query $WP_Query ) {
+	public static function filter_query_parts(WP_Query $WP_Query) {
 		// ONLY add our filters if this isn't the main wp_query,
         // because if this is the main wp_query we already have
         // our cpt strategies take care of adding things in.
-		if ( $WP_Query instanceof WP_Query && ! $WP_Query->is_main_query() ) {
+		if ($WP_Query instanceof WP_Query && ! $WP_Query->is_main_query()) {
 			// build event list query
-			add_filter( 'posts_fields', array( 'EEH_Event_Query', 'posts_fields' ), 10, 2 );
-			add_filter( 'posts_join', array( 'EEH_Event_Query', 'posts_join' ), 10, 2 );
-			add_filter( 'posts_where', array( 'EEH_Event_Query', 'posts_where' ), 10, 2 );
-			add_filter( 'posts_orderby', array( 'EEH_Event_Query', 'posts_orderby' ), 10, 2 );
-			add_filter( 'posts_clauses_request', array( 'EEH_Event_Query', 'posts_clauses' ), 10, 2 );
+			add_filter('posts_fields', array('EEH_Event_Query', 'posts_fields'), 10, 2);
+			add_filter('posts_join', array('EEH_Event_Query', 'posts_join'), 10, 2);
+			add_filter('posts_where', array('EEH_Event_Query', 'posts_where'), 10, 2);
+			add_filter('posts_orderby', array('EEH_Event_Query', 'posts_orderby'), 10, 2);
+			add_filter('posts_clauses_request', array('EEH_Event_Query', 'posts_clauses'), 10, 2);
 		}
 	}
 
@@ -135,11 +135,11 @@ 
         $sort = 'ASC'
     ) {
 		self::$_query_params = array();
-		EEH_Event_Query::$_event_query_month = EEH_Event_Query::_display_month( $month );
-		EEH_Event_Query::$_event_query_category = EEH_Event_Query::_event_category_slug( $category );
-		EEH_Event_Query::$_event_query_show_expired = EEH_Event_Query::_show_expired( $show_expired );
-		EEH_Event_Query::$_event_query_orderby = EEH_Event_Query::_orderby( $orderby );
-		EEH_Event_Query::$_event_query_sort = EEH_Event_Query::_sort( $sort );
+		EEH_Event_Query::$_event_query_month = EEH_Event_Query::_display_month($month);
+		EEH_Event_Query::$_event_query_category = EEH_Event_Query::_event_category_slug($category);
+		EEH_Event_Query::$_event_query_show_expired = EEH_Event_Query::_show_expired($show_expired);
+		EEH_Event_Query::$_event_query_orderby = EEH_Event_Query::_orderby($orderby);
+		EEH_Event_Query::$_event_query_sort = EEH_Event_Query::_sort($sort);
 	}
 
 
@@ -150,7 +150,7 @@ 
 	 * @param string $month
 	 * @return    string
 	 */
-	private static function _display_month( $month = '' ) {
+	private static function _display_month($month = '') {
         return sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_month', $month));
     }
 
@@ -162,7 +162,7 @@ 
 	 * @param string $category
 	 * @return    string
 	 */
-	private static function _event_category_slug( $category = '' ) {
+	private static function _event_category_slug($category = '') {
 		return sanitize_title_with_dashes(EE_Registry::instance()->REQ->get('event_query_category', $category));
 	}
 
@@ -174,7 +174,7 @@ 
 	 * @param bool $show_expired
 	 * @return    boolean
 	 */
-	private static function _show_expired( $show_expired = false ) {
+	private static function _show_expired($show_expired = false) {
 		// override default expired option if set via filter
 		return filter_var(
 		    EE_Registry::instance()->REQ->get('event_query_show_expired', $show_expired),
@@ -190,13 +190,13 @@ 
 	 * @param    string $orderby
 	 * @return    array
 	 */
-	private static function _orderby( $orderby = 'start_date' ) {
+	private static function _orderby($orderby = 'start_date') {
 		$event_query_orderby = EE_Registry::instance()->REQ->get('event_query_orderby', $orderby);
-		$event_query_orderby = is_array( $event_query_orderby )
+		$event_query_orderby = is_array($event_query_orderby)
             ? $event_query_orderby
-            : explode( ',', $event_query_orderby );
-		$event_query_orderby = array_map( 'trim', $event_query_orderby );
-		$event_query_orderby = array_map( 'sanitize_text_field', $event_query_orderby );
+            : explode(',', $event_query_orderby);
+		$event_query_orderby = array_map('trim', $event_query_orderby);
+		$event_query_orderby = array_map('sanitize_text_field', $event_query_orderby);
 		return $event_query_orderby;
 	}
 
@@ -208,10 +208,10 @@ 
 	 * @param string $sort
 	 * @return string
 	 */
-	private static function _sort( $sort = 'ASC' ) {
+	private static function _sort($sort = 'ASC') {
 		$sort = EE_Registry::instance()->REQ->get('event_query_sort', $sort);
-		return in_array( $sort, array( 'ASC', 'asc', 'DESC', 'desc' ), true)
-            ? strtoupper( $sort )
+		return in_array($sort, array('ASC', 'asc', 'DESC', 'desc'), true)
+            ? strtoupper($sort)
             : 'ASC';
 	}
 
@@ -225,10 +225,10 @@ 
 	 *
 	 * @return array   array of clauses
 	 */
-	public static function posts_clauses( $clauses, WP_Query $wp_query ) {
-		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
+	public static function posts_clauses($clauses, WP_Query $wp_query) {
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
 			global $wpdb;
-			$clauses['groupby'] = $wpdb->posts . '.ID ';
+			$clauses['groupby'] = $wpdb->posts.'.ID ';
 		}
 		return $clauses;
 	}
@@ -243,10 +243,10 @@ 
      * @return    string
      * @throws \EE_Error
      */
-	public static function posts_fields( $SQL, WP_Query $wp_query ) {
-		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
+	public static function posts_fields($SQL, WP_Query $wp_query) {
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
 			// adds something like ", wp_esp_datetime.* " to WP Query SELECT statement
-			$SQL .= EEH_Event_Query::posts_fields_sql_for_orderby( EEH_Event_Query::$_event_query_orderby );
+			$SQL .= EEH_Event_Query::posts_fields_sql_for_orderby(EEH_Event_Query::$_event_query_orderby);
 		}
 		return $SQL;
 	}
@@ -260,29 +260,29 @@ 
      * @return    string
      * @throws \EE_Error
      */
-	public static function posts_fields_sql_for_orderby( $orderby_params = array() ) {
-		$SQL = ', MIN( ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start ) as event_start_date ' ;
-		foreach( (array)$orderby_params as $orderby ) {
-			switch ( $orderby ) {
+	public static function posts_fields_sql_for_orderby($orderby_params = array()) {
+		$SQL = ', MIN( '.EEM_Datetime::instance()->table().'.DTT_EVT_start ) as event_start_date ';
+		foreach ((array) $orderby_params as $orderby) {
+			switch ($orderby) {
 
 				case 'ticket_start' :
-					$SQL .= ', ' . EEM_Ticket::instance()->table() . '.TKT_start_date' ;
+					$SQL .= ', '.EEM_Ticket::instance()->table().'.TKT_start_date';
 					break;
 
 				case 'ticket_end' :
-					$SQL .= ', ' . EEM_Ticket::instance()->table() . '.TKT_end_date' ;
+					$SQL .= ', '.EEM_Ticket::instance()->table().'.TKT_end_date';
 					break;
 
 				case 'venue_title' :
-					$SQL .= ', Venue.post_title AS venue_title' ;
+					$SQL .= ', Venue.post_title AS venue_title';
 					break;
 
 				case 'city' :
-					$SQL .= ', ' . EEM_Venue::instance()->second_table() . '.VNU_city' ;
+					$SQL .= ', '.EEM_Venue::instance()->second_table().'.VNU_city';
 					break;
 
 				case 'state' :
-					$SQL .= ', ' . EEM_State::instance()->table() . '.STA_name' ;
+					$SQL .= ', '.EEM_State::instance()->table().'.STA_name';
 					break;
 
 			}
@@ -300,12 +300,12 @@ 
      * @return    string
      * @throws \EE_Error
      */
-	public static function posts_join( $SQL = '', WP_Query $wp_query ) {
-		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
+	public static function posts_join($SQL = '', WP_Query $wp_query) {
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
 			// Category
-			$SQL = EEH_Event_Query::posts_join_sql_for_show_expired( $SQL, EEH_Event_Query::$_event_query_show_expired );
-			$SQL = EEH_Event_Query::posts_join_sql_for_terms( $SQL, EEH_Event_Query::$_event_query_category );
-			$SQL = EEH_Event_Query::posts_join_for_orderby( $SQL, EEH_Event_Query::$_event_query_orderby );
+			$SQL = EEH_Event_Query::posts_join_sql_for_show_expired($SQL, EEH_Event_Query::$_event_query_show_expired);
+			$SQL = EEH_Event_Query::posts_join_sql_for_terms($SQL, EEH_Event_Query::$_event_query_category);
+			$SQL = EEH_Event_Query::posts_join_for_orderby($SQL, EEH_Event_Query::$_event_query_orderby);
 		}
 		return $SQL;
 	}
@@ -320,13 +320,13 @@ 
      * @return string
      * @throws \EE_Error
      */
-	public static function posts_join_sql_for_show_expired( $SQL = '', $show_expired = FALSE ) {
-		if ( ! $show_expired ) {
-			$join = EEM_Event::instance()->table() . '.ID = ';
-			$join .= EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name();
+	public static function posts_join_sql_for_show_expired($SQL = '', $show_expired = FALSE) {
+		if ( ! $show_expired) {
+			$join = EEM_Event::instance()->table().'.ID = ';
+			$join .= EEM_Datetime::instance()->table().'.'.EEM_Event::instance()->primary_key_name();
 			// don't add if this is already in the SQL
-			if ( strpos( $SQL, $join ) === FALSE ) {
-				$SQL .= ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . $join . ' ) ';
+			if (strpos($SQL, $join) === FALSE) {
+				$SQL .= ' INNER JOIN '.EEM_Datetime::instance()->table().' ON ( '.$join.' ) ';
 			}
 		}
 		return $SQL;
@@ -341,8 +341,8 @@ 
 	 * @param 	string $join_terms pass TRUE or term string, doesn't really matter since this value doesn't really get used for anything yet
 	 * @return 	string
 	 */
-	public static function posts_join_sql_for_terms( $SQL = '', $join_terms = '' ) {
-		if ( ! empty( $join_terms ) ) {
+	public static function posts_join_sql_for_terms($SQL = '', $join_terms = '') {
+		if ( ! empty($join_terms)) {
 			global $wpdb;
 			$SQL .= " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id)";
 			$SQL .= " LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id)";
@@ -362,33 +362,33 @@ 
      * @return    string
      * @throws \EE_Error
      */
-	public static function posts_join_for_orderby( $SQL = '', $orderby_params = array() ) {
-		foreach ( (array)$orderby_params as $orderby ) {
-			switch ( $orderby ) {
+	public static function posts_join_for_orderby($SQL = '', $orderby_params = array()) {
+		foreach ((array) $orderby_params as $orderby) {
+			switch ($orderby) {
 				case 'ticket_start' :
 				case 'ticket_end' :
 					$SQL .= EEH_Event_Query::_posts_join_for_datetime(
 					    $SQL,
-                        EEM_Datetime_Ticket::instance()->table() . '.' . EEM_Datetime::instance()->primary_key_name()
+                        EEM_Datetime_Ticket::instance()->table().'.'.EEM_Datetime::instance()->primary_key_name()
                     );
-					$SQL .= ' LEFT JOIN ' . EEM_Ticket::instance()->table();
+					$SQL .= ' LEFT JOIN '.EEM_Ticket::instance()->table();
 					$SQL .= ' ON (';
-					$SQL .= EEM_Datetime_Ticket::instance()->table() . '.' . EEM_Ticket::instance()->primary_key_name();
+					$SQL .= EEM_Datetime_Ticket::instance()->table().'.'.EEM_Ticket::instance()->primary_key_name();
 					$SQL .= ' = ';
-					$SQL .= EEM_Ticket::instance()->table() . '.' . EEM_Ticket::instance()->primary_key_name();
-					$SQL .=  ' )';
+					$SQL .= EEM_Ticket::instance()->table().'.'.EEM_Ticket::instance()->primary_key_name();
+					$SQL .= ' )';
 					break;
 				case 'venue_title' :
 				case 'city' :
-					$SQL .= EEH_Event_Query::_posts_join_for_event_venue( $SQL );
+					$SQL .= EEH_Event_Query::_posts_join_for_event_venue($SQL);
 					break;
 				case 'state' :
-					$SQL .= EEH_Event_Query::_posts_join_for_event_venue( $SQL );
-					$SQL .= EEH_Event_Query::_posts_join_for_venue_state( $SQL );
+					$SQL .= EEH_Event_Query::_posts_join_for_event_venue($SQL);
+					$SQL .= EEH_Event_Query::_posts_join_for_venue_state($SQL);
 					break;
 				case 'start_date' :
 				default :
-					$SQL .= EEH_Event_Query::_posts_join_for_datetime( $SQL, EEM_Event::instance()->table() . '.ID' );
+					$SQL .= EEH_Event_Query::_posts_join_for_datetime($SQL, EEM_Event::instance()->table().'.ID');
 					break;
 
 			}
@@ -406,11 +406,11 @@ 
      * @return string
      * @throws \EE_Error
      */
-	protected static function _posts_join_for_datetime( $SQL = '', $join = '' ) {
-		if ( ! empty( $join )) {
-			$join .= ' = ' . EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name();
-			if ( strpos( $SQL, $join ) === FALSE ) {
-				return ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . $join . ' )';
+	protected static function _posts_join_for_datetime($SQL = '', $join = '') {
+		if ( ! empty($join)) {
+			$join .= ' = '.EEM_Datetime::instance()->table().'.'.EEM_Event::instance()->primary_key_name();
+			if (strpos($SQL, $join) === FALSE) {
+				return ' INNER JOIN '.EEM_Datetime::instance()->table().' ON ( '.$join.' )';
 			}
 		}
 		return '';
@@ -425,14 +425,14 @@ 
      * @return string
      * @throws \EE_Error
      */
-	protected static function _posts_join_for_event_venue( $SQL = '' ) {
+	protected static function _posts_join_for_event_venue($SQL = '') {
 		// Event Venue table name
 		$event_venue_table = EEM_Event_Venue::instance()->table();
 		// generate conditions for:  Event <=> Event Venue  JOIN clause
-		$event_to_event_venue_join = EEM_Event::instance()->table() . '.ID = ';
-		$event_to_event_venue_join .= $event_venue_table . '.' . EEM_Event::instance()->primary_key_name();
+		$event_to_event_venue_join = EEM_Event::instance()->table().'.ID = ';
+		$event_to_event_venue_join .= $event_venue_table.'.'.EEM_Event::instance()->primary_key_name();
 		// don't add joins if they have already been added
-		if ( strpos( $SQL, $event_to_event_venue_join ) === FALSE ) {
+		if (strpos($SQL, $event_to_event_venue_join) === FALSE) {
 			// Venue table name
 			$venue_table = EEM_Venue::instance()->table();
 			// Venue table pk
@@ -445,10 +445,10 @@ 
 			$venue_SQL .= " LEFT JOIN $venue_table as Venue ON ( $event_venue_table.$venue_table_pk = Venue.ID )";
 			// generate JOIN clause for: Venue <=> Venue Meta
 			$venue_SQL .= " LEFT JOIN $venue_meta_table ON ( Venue.ID = $venue_meta_table.$venue_table_pk )";
-			unset( $event_venue_table, $event_to_event_venue_join, $venue_table, $venue_table_pk, $venue_meta_table );
+			unset($event_venue_table, $event_to_event_venue_join, $venue_table, $venue_table_pk, $venue_meta_table);
 			return $venue_SQL;
 		}
-		unset( $event_venue_table, $event_to_event_venue_join );
+		unset($event_venue_table, $event_to_event_venue_join);
 		return '';
 	}
 
@@ -461,7 +461,7 @@ 
      * @return string
      * @throws \EE_Error
      */
-	protected static function _posts_join_for_venue_state( $SQL = '' ) {
+	protected static function _posts_join_for_venue_state($SQL = '') {
 		// Venue Meta table name
 		$venue_meta_table = EEM_Venue::instance()->second_table();
 		// State table name
@@ -469,16 +469,16 @@ 
 		// State table pk
 		$state_table_pk = EEM_State::instance()->primary_key_name();
 		// verify vars
-		if ( $venue_meta_table && $state_table && $state_table_pk ) {
+		if ($venue_meta_table && $state_table && $state_table_pk) {
 			// like: wp_esp_venue_meta.STA_ID = wp_esp_state.STA_ID
 			$join = "$venue_meta_table.$state_table_pk = $state_table.$state_table_pk";
 			// don't add join if it has already been added
-			if ( strpos( $SQL, $join ) === FALSE ) {
-				unset( $state_table_pk, $venue_meta_table, $venue_table_pk );
+			if (strpos($SQL, $join) === FALSE) {
+				unset($state_table_pk, $venue_meta_table, $venue_table_pk);
 				return " LEFT JOIN $state_table ON ( $join )";
 			}
 		}
-		unset( $join, $state_table, $state_table_pk, $venue_meta_table, $venue_table_pk );
+		unset($join, $state_table, $state_table_pk, $venue_meta_table, $venue_table_pk);
 		return '';
 	}
 
@@ -492,14 +492,14 @@ 
      * @return    string
      * @throws \EE_Error
      */
-	public static function posts_where( $SQL = '', WP_Query $wp_query ) {
-		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
+	public static function posts_where($SQL = '', WP_Query $wp_query) {
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
 			// Show Expired ?
-			$SQL .= EEH_Event_Query::posts_where_sql_for_show_expired( EEH_Event_Query::$_event_query_show_expired );
+			$SQL .= EEH_Event_Query::posts_where_sql_for_show_expired(EEH_Event_Query::$_event_query_show_expired);
 			// Category
-			$SQL .= EEH_Event_Query::posts_where_sql_for_event_category_slug( EEH_Event_Query::$_event_query_category );
+			$SQL .= EEH_Event_Query::posts_where_sql_for_event_category_slug(EEH_Event_Query::$_event_query_category);
 			// Start Date
-			$SQL .= EEH_Event_Query::posts_where_sql_for_event_list_month( EEH_Event_Query::$_event_query_month );
+			$SQL .= EEH_Event_Query::posts_where_sql_for_event_list_month(EEH_Event_Query::$_event_query_month);
 		}
 		return $SQL;
 	}
@@ -513,9 +513,9 @@ 
      * @return    string
      * @throws \EE_Error
      */
-	public static function posts_where_sql_for_show_expired( $show_expired = FALSE ) {
+	public static function posts_where_sql_for_show_expired($show_expired = FALSE) {
 		return ! $show_expired
-            ? ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > \'' . current_time( 'mysql', TRUE ) . '\' '
+            ? ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_end > \''.current_time('mysql', TRUE).'\' '
             : '';
 	}
 
@@ -527,10 +527,10 @@ 
 	 * @param    boolean $event_category_slug
 	 * @return    string
 	 */
-	public static function posts_where_sql_for_event_category_slug( $event_category_slug = NULL ) {
+	public static function posts_where_sql_for_event_category_slug($event_category_slug = NULL) {
 		global $wpdb;
 		$event_category_slug = esc_sql($event_category_slug);
-		return ! empty( $event_category_slug )
+		return ! empty($event_category_slug)
             ? " AND {$wpdb->terms}.slug = '{$event_category_slug}' "
             : '';
 	}
@@ -544,16 +544,16 @@ 
      * @return    string
      * @throws \EE_Error
      */
-	public static function posts_where_sql_for_event_list_month( $month = NULL ) {
+	public static function posts_where_sql_for_event_list_month($month = NULL) {
 		$SQL = '';
-		if ( ! empty( $month ) ) {
+		if ( ! empty($month)) {
 			$datetime_table = EEM_Datetime::instance()->table();
 			// event start date is LESS than the end of the month ( so nothing that doesn't start until next month )
 			$SQL = " AND {$datetime_table}.DTT_EVT_start <= '";
-			$SQL .= date( 'Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month)) . "'";
+			$SQL .= date('Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month))."'";
 			// event end date is GREATER than the start of the month ( so nothing that ended before this month )
 			$SQL .= " AND {$datetime_table}.DTT_EVT_end >= '";
-			$SQL .= date( 'Y-m-01 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month)) . "' ";
+			$SQL .= date('Y-m-01 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month))."' ";
 		}
 		return $SQL;
 	}
@@ -568,8 +568,8 @@ 
      * @return    string
      * @throws \EE_Error
      */
-	public static function posts_orderby( $SQL = '', WP_Query $wp_query ) {
-		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
+	public static function posts_orderby($SQL = '', WP_Query $wp_query) {
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
 			$SQL = EEH_Event_Query::posts_orderby_sql(
 			    EEH_Event_Query::$_event_query_orderby,
                 EEH_Event_Query::$_event_query_sort
@@ -602,7 +602,7 @@ 
      * @return string
      * @throws \EE_Error
      */
-	public static function posts_orderby_sql( $orderby_params = array(), $sort = 'ASC' ) {
+	public static function posts_orderby_sql($orderby_params = array(), $sort = 'ASC') {
 		global $wpdb;
 		$SQL = '';
 		$counter = 0;
@@ -610,58 +610,58 @@ 
             ? strtoupper($sort)
             : 'ASC';
 		//make sure 'orderby' is set in query params
-		if ( ! isset( self::$_query_params['orderby'] )) {
+		if ( ! isset(self::$_query_params['orderby'])) {
 			self::$_query_params['orderby'] = array();
 		}
 		// loop thru $orderby_params (type cast as array)
-		foreach ( (array)$orderby_params as $orderby ) {
+		foreach ((array) $orderby_params as $orderby) {
 			// check if we have already added this param
-			if ( isset( self::$_query_params['orderby'][ $orderby ] )) {
+			if (isset(self::$_query_params['orderby'][$orderby])) {
 				// if so then remove from the $orderby_params so that the count() method below is accurate
-				unset( $orderby_params[ $orderby ] );
+				unset($orderby_params[$orderby]);
 				// then bump ahead to the next param
 				continue;
 			}
 			// this will ad a comma depending on whether this is the first or last param
-			$glue = $counter === 0 || $counter === count( $orderby_params ) ? ' ' : ', ';
+			$glue = $counter === 0 || $counter === count($orderby_params) ? ' ' : ', ';
 			// ok what's we dealing with?
-			switch ( $orderby ) {
+			switch ($orderby) {
 				case 'id' :
 				case 'ID' :
-					$SQL .= $glue . $wpdb->posts . '.ID ' . $sort;
+					$SQL .= $glue.$wpdb->posts.'.ID '.$sort;
 					break;
 				case 'end_date' :
-					$SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_end ' . $sort;
+					$SQL .= $glue.EEM_Datetime::instance()->table().'.DTT_EVT_end '.$sort;
 					break;
 				case 'event_name' :
-					$SQL .= $glue . $wpdb->posts . '.post_title ' . $sort;
+					$SQL .= $glue.$wpdb->posts.'.post_title '.$sort;
 					break;
 				case 'category_slug' :
-					$SQL .= $glue . $wpdb->terms . '.slug ' . $sort;
+					$SQL .= $glue.$wpdb->terms.'.slug '.$sort;
 					break;
 				case 'ticket_start' :
-					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_start_date ' . $sort;
+					$SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_start_date '.$sort;
 					break;
 				case 'ticket_end' :
-					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_end_date ' . $sort;
+					$SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_end_date '.$sort;
 					break;
 				case 'venue_title' :
-					$SQL .= $glue . 'venue_title ' . $sort;
+					$SQL .= $glue.'venue_title '.$sort;
 					break;
 				case 'city' :
-					$SQL .= $glue . EEM_Venue::instance()->second_table() . '.VNU_city ' . $sort;
+					$SQL .= $glue.EEM_Venue::instance()->second_table().'.VNU_city '.$sort;
 					break;
 				case 'state' :
-					$SQL .= $glue . EEM_State::instance()->table() . '.STA_name ' . $sort;
+					$SQL .= $glue.EEM_State::instance()->table().'.STA_name '.$sort;
 					break;
 				case 'start_date' :
 				default :
-					$SQL .= $glue . ' event_start_date ' . $sort;
+					$SQL .= $glue.' event_start_date '.$sort;
 					break;
 			}
 			// add to array of orderby params that have been added
-			self::$_query_params['orderby'][ $orderby ] = TRUE;
-			$counter ++;
+			self::$_query_params['orderby'][$orderby] = TRUE;
+			$counter++;
 		}
 		return $SQL;
 	}

core/EES_Shortcode.shortcode.php

Spacing +21 added lines, -21 removed lines

@@ -42,7 +42,7 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public abstract function run( WP $WP );
+	public abstract function run(WP $WP);
 
 
 
@@ -54,7 +54,7 @@ 
 	 *  @param		array 	$attributes
 	 *  @return 	mixed
 	 */
-	public abstract function process_shortcode( $attributes = array() );
+	public abstract function process_shortcode($attributes = array());
 
 
 
@@ -65,13 +65,13 @@ 
 	 * @param 	string $shortcode_class
 	 * @return 	\EES_Shortcode
 	 */
-	final public static function instance( $shortcode_class = null ) {
-		$shortcode_class = ! empty( $shortcode_class ) ? $shortcode_class : get_called_class();
-		if ( $shortcode_class === 'EES_Shortcode' || empty( $shortcode_class )) {
+	final public static function instance($shortcode_class = null) {
+		$shortcode_class = ! empty($shortcode_class) ? $shortcode_class : get_called_class();
+		if ($shortcode_class === 'EES_Shortcode' || empty($shortcode_class)) {
 			return null;
 		}
-		$shortcode = str_replace( 'EES_', '', strtoupper( $shortcode_class ));
-		$shortcode_obj = isset( EE_Registry::instance()->shortcodes->{$shortcode} )
+		$shortcode = str_replace('EES_', '', strtoupper($shortcode_class));
+		$shortcode_obj = isset(EE_Registry::instance()->shortcodes->{$shortcode} )
             ? EE_Registry::instance()->shortcodes->{$shortcode}
             : null;
 		return $shortcode_obj instanceof $shortcode_class || $shortcode_class === 'self'
@@ -90,23 +90,23 @@ 
 	 * @param 	$attributes
 	 * @return 	mixed
 	 */
-	final public static function fallback_shortcode_processor( $attributes ) {
-		if ( EE_Maintenance_Mode::disable_frontend_for_maintenance() ) {
+	final public static function fallback_shortcode_processor($attributes) {
+		if (EE_Maintenance_Mode::disable_frontend_for_maintenance()) {
 			return null;
 		}
 		// what shortcode was actually parsed ?
 		$shortcode_class = get_called_class();
 		// notify rest of system that fallback processor was triggered
-		add_filter( 'FHEE__fallback_shortcode_processor__' . $shortcode_class, '__return_true' );
+		add_filter('FHEE__fallback_shortcode_processor__'.$shortcode_class, '__return_true');
 		// get instance of actual shortcode
-		$shortcode_obj = self::instance( $shortcode_class );
+		$shortcode_obj = self::instance($shortcode_class);
 		// verify class
-		if ( $shortcode_obj instanceof EES_Shortcode ) {
+		if ($shortcode_obj instanceof EES_Shortcode) {
 			global $wp;
-			$shortcode_obj->run( $wp );
+			$shortcode_obj->run($wp);
 			// set attributes and run the shortcode
-			$shortcode_obj->_attributes = (array)$attributes;
-			return $shortcode_obj->process_shortcode( $shortcode_obj->_attributes );
+			$shortcode_obj->_attributes = (array) $attributes;
+			return $shortcode_obj->process_shortcode($shortcode_obj->_attributes);
 		} else {
 			return null;
 		}
@@ -122,7 +122,7 @@ 
 	 * @param 	$attributes
 	 * @return 	string
 	 */
-	final public static function invalid_shortcode_processor( $attributes ) {
+	final public static function invalid_shortcode_processor($attributes) {
 		return '';
 	}
 
@@ -133,11 +133,11 @@ 
 	 */
 	final public function __construct() {
 		// get classname, remove EES_prefix, and convert to UPPERCASE
-		$shortcode = strtoupper( str_replace( 'EES_', '', get_class( $this )));
+		$shortcode = strtoupper(str_replace('EES_', '', get_class($this)));
 		// assign shortcode to the preferred callback, which overwrites the "fallback shortcode processor" assigned earlier
-		add_shortcode( $shortcode, array( $this, 'process_shortcode' ));
+		add_shortcode($shortcode, array($this, 'process_shortcode'));
 		// make sure system knows this is an EE page
-		EE_Registry::instance()->REQ->set_espresso_page( TRUE );
+		EE_Registry::instance()->REQ->set_espresso_page(TRUE);
 	}
 
 
@@ -151,12 +151,12 @@ 
     {
         foreach ($attributes as $key => $value) {
             // is a custom sanitization callback specified ?
-            if ( isset($custom_sanitization[$key])) {
+            if (isset($custom_sanitization[$key])) {
                 $callback = $custom_sanitization[$key];
                 if ($callback === 'skip_sanitization') {
                     $attributes[$key] = $value;
                     continue;
-                } else if (function_exists($callback)){
+                } else if (function_exists($callback)) {
                     $attributes[$key] = $callback($value);
                     continue;
                 }

Indentation +57 added lines, -57 removed lines

@@ -72,11 +72,11 @@ 
 		}
 		$shortcode = str_replace( 'EES_', '', strtoupper( $shortcode_class ));
 		$shortcode_obj = isset( EE_Registry::instance()->shortcodes->{$shortcode} )
-            ? EE_Registry::instance()->shortcodes->{$shortcode}
-            : null;
+			? EE_Registry::instance()->shortcodes->{$shortcode}
+			: null;
 		return $shortcode_obj instanceof $shortcode_class || $shortcode_class === 'self'
-            ? $shortcode_obj
-            : new $shortcode_class();
+			? $shortcode_obj
+			: new $shortcode_class();
 	}
 
 
@@ -142,59 +142,59 @@ 
 
 
 
-    /**
-     * Performs basic sanitization on shortcode attributes
-     * Since incoming attributes from the shortcode usage in the WP editor will all be strings,
-     * most attributes will by default be sanitized using the sanitize_text_field() function.
-     * This can be overridden by supplying an array for the $custom_sanitization param,
-     * where keys match keys in your attributes array,
-     * and values represent the sanitization function you wish to be applied to that attribute.
-     * So for example, if you had an integer attribute named "event_id"
-     * that you wanted to be sanitized using absint(),
-     * then you would pass the following for your $custom_sanitization array:
-     *      array('event_id' => 'absint')
-     * all other attributes would be sanitized using the defaults in the switch statement below
-     *
-     * @param array $attributes
-     * @param array $custom_sanitization
-     * @return array
-     */
-    public static function sanitize_attributes(array $attributes, $custom_sanitization = array())
-    {
-        foreach ($attributes as $key => $value) {
-            // is a custom sanitization callback specified ?
-            if ( isset($custom_sanitization[$key])) {
-                $callback = $custom_sanitization[$key];
-                if ($callback === 'skip_sanitization') {
-                    $attributes[$key] = $value;
-                    continue;
-                } else if (function_exists($callback)){
-                    $attributes[$key] = $callback($value);
-                    continue;
-                }
-            }
-            switch (true) {
-                case $value === null :
-                case is_int($value) :
-                case is_float($value) :
-                    // typical booleans
-                case in_array($value, array(true, 'true', '1', 'on', 'yes', false, 'false', '0', 'off', 'no'), true) :
-                    $attributes[$key] = $value;
-                    break;
-                case is_string($value) :
-                    $attributes[$key] = sanitize_text_field($value);
-                    break;
-                case is_array($value) :
-                    $attributes[$key] = \EES_Shortcode::sanitize_attributes($value);
-                    break;
-                default :
-                    // only remaining data types are Object and Resource
-                    // which are not allowed as shortcode attributes
-                    $attributes[$key] = null;
-                    break;
-            }
-        }
-        return $attributes;
+	/**
+	 * Performs basic sanitization on shortcode attributes
+	 * Since incoming attributes from the shortcode usage in the WP editor will all be strings,
+	 * most attributes will by default be sanitized using the sanitize_text_field() function.
+	 * This can be overridden by supplying an array for the $custom_sanitization param,
+	 * where keys match keys in your attributes array,
+	 * and values represent the sanitization function you wish to be applied to that attribute.
+	 * So for example, if you had an integer attribute named "event_id"
+	 * that you wanted to be sanitized using absint(),
+	 * then you would pass the following for your $custom_sanitization array:
+	 *      array('event_id' => 'absint')
+	 * all other attributes would be sanitized using the defaults in the switch statement below
+	 *
+	 * @param array $attributes
+	 * @param array $custom_sanitization
+	 * @return array
+	 */
+	public static function sanitize_attributes(array $attributes, $custom_sanitization = array())
+	{
+		foreach ($attributes as $key => $value) {
+			// is a custom sanitization callback specified ?
+			if ( isset($custom_sanitization[$key])) {
+				$callback = $custom_sanitization[$key];
+				if ($callback === 'skip_sanitization') {
+					$attributes[$key] = $value;
+					continue;
+				} else if (function_exists($callback)){
+					$attributes[$key] = $callback($value);
+					continue;
+				}
+			}
+			switch (true) {
+				case $value === null :
+				case is_int($value) :
+				case is_float($value) :
+					// typical booleans
+				case in_array($value, array(true, 'true', '1', 'on', 'yes', false, 'false', '0', 'off', 'no'), true) :
+					$attributes[$key] = $value;
+					break;
+				case is_string($value) :
+					$attributes[$key] = sanitize_text_field($value);
+					break;
+				case is_array($value) :
+					$attributes[$key] = \EES_Shortcode::sanitize_attributes($value);
+					break;
+				default :
+					// only remaining data types are Object and Resource
+					// which are not allowed as shortcode attributes
+					$attributes[$key] = null;
+					break;
+			}
+		}
+		return $attributes;
 	}
 
 

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

Doc Comments +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
 	/**
 	 * Checks if that value is the one selected
 	 * @param string|int $value unnormalized value option (string)
-	 * @return string
+	 * @return boolean
 	 */
 	protected function _check_if_option_selected( $value ){
 		return $this->_input->raw_value() === $value ? TRUE : FALSE;

Spacing +27 added lines, -27 removed lines

@@ -11,49 +11,49 @@ 
  * @since 				$VID:$
  *
  */
-class EE_Select_Display_Strategy extends EE_Display_Strategy_Base{
+class EE_Select_Display_Strategy extends EE_Display_Strategy_Base {
 
 	/**
 	 *
 	 * @throws EE_Error
 	 * @return string of html to display the field
 	 */
-	function display(){
-		if( ! $this->_input instanceof EE_Form_Input_With_Options_Base){
-			throw new EE_Error( sprintf( __( 'Cannot use Select Display Strategy with an input that doesn\'t have options', 'event_espresso' )));
+	function display() {
+		if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base) {
+			throw new EE_Error(sprintf(__('Cannot use Select Display Strategy with an input that doesn\'t have options', 'event_espresso')));
 		}
 
-		$html = EEH_HTML::nl( 0, 'select' );
+		$html = EEH_HTML::nl(0, 'select');
 		$html .= '<select';
-		$html .= ' id="' . $this->_input->html_id() . '"';
-		$html .= ' name="' . $this->_input->html_name() . '"';
-		$class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class();
-		$html .= ' class="' . $class . '"';
+		$html .= ' id="'.$this->_input->html_id().'"';
+		$html .= ' name="'.$this->_input->html_name().'"';
+		$class = $this->_input->required() ? $this->_input->required_css_class().' '.$this->_input->html_class() : $this->_input->html_class();
+		$html .= ' class="'.$class.'"';
 		// add html5 required
 		$html .= $this->_input->required() ? ' required' : '';
-		$html .= ' style="' . $this->_input->html_style() . '"';
-		$html .= ' ' . $this->_input->other_html_attributes();
+		$html .= ' style="'.$this->_input->html_style().'"';
+		$html .= ' '.$this->_input->other_html_attributes();
 		$html .= '>';
 
-		if ( EEH_Array::is_multi_dimensional_array( $this->_input->options() )) {
-			EEH_HTML::indent( 1, 'optgroup' );
-			foreach( $this->_input->options() as $opt_group_label => $opt_group ){
+		if (EEH_Array::is_multi_dimensional_array($this->_input->options())) {
+			EEH_HTML::indent(1, 'optgroup');
+			foreach ($this->_input->options() as $opt_group_label => $opt_group) {
 			    if ( ! empty($opt_group_label)) {
-                    $html .= EEH_HTML::nl(0, 'optgroup') . '<optgroup label="' . esc_attr($opt_group_label) . '">';
+                    $html .= EEH_HTML::nl(0, 'optgroup').'<optgroup label="'.esc_attr($opt_group_label).'">';
                 }
-				EEH_HTML::indent( 1, 'option' );
-				$html .= $this->_display_options( $opt_group );
+				EEH_HTML::indent(1, 'option');
+				$html .= $this->_display_options($opt_group);
 				EEH_HTML::indent( -1, 'option' );
                 if ( ! empty($opt_group_label)) {
-                    $html .= EEH_HTML::nl( 0, 'optgroup' ) . '</optgroup>';
+                    $html .= EEH_HTML::nl(0, 'optgroup').'</optgroup>';
 			    }
 			}
 			EEH_HTML::indent( -1, 'optgroup' );
 		} else {
-			$html.=$this->_display_options( $this->_input->options() );
+			$html .= $this->_display_options($this->_input->options());
 		}
 
-		$html.= EEH_HTML::nl( 0, 'select' ) . '</select>';
+		$html .= EEH_HTML::nl(0, 'select').'</select>';
 		return $html;
 	}
 
@@ -64,13 +64,13 @@ 
 	 * @param array $options
 	 * @return string
 	 */
-	protected function _display_options($options){
+	protected function _display_options($options) {
 		$html = '';
-		EEH_HTML::indent( 1, 'option' );
-		foreach( $options as $value => $display_text ){
-			$unnormalized_value = $this->_input->get_normalization_strategy()->unnormalize_one( $value );
-			$selected = $this->_check_if_option_selected( $unnormalized_value ) ? ' selected="selected"' : '';
-			$html.= EEH_HTML::nl( 0, 'option' ) . '<option value="' . esc_attr( $unnormalized_value ) . '"' . $selected . '>' . $display_text . '</option>';
+		EEH_HTML::indent(1, 'option');
+		foreach ($options as $value => $display_text) {
+			$unnormalized_value = $this->_input->get_normalization_strategy()->unnormalize_one($value);
+			$selected = $this->_check_if_option_selected($unnormalized_value) ? ' selected="selected"' : '';
+			$html .= EEH_HTML::nl(0, 'option').'<option value="'.esc_attr($unnormalized_value).'"'.$selected.'>'.$display_text.'</option>';
 		}
 		EEH_HTML::indent( -1, 'option' );
 		return $html;
@@ -83,7 +83,7 @@ 
 	 * @param string|int $value unnormalized value option (string)
 	 * @return string
 	 */
-	protected function _check_if_option_selected( $value ){
+	protected function _check_if_option_selected($value) {
 		return $this->_input->raw_value() === $value ? TRUE : FALSE;
 	}
 

admin_pages/registrations/Registrations_Admin_Page.core.php

Spacing +82 added lines, -82 removed lines

@@ -569,11 +569,11 @@ 
     {
         //style
         //wp_register_style('espresso_attendees', ATT_ASSETS_URL . 'espresso_attendees_admin.css', array(), EVENT_ESPRESSO_VERSION );
-        wp_register_style('espresso_reg', REG_ASSETS_URL . 'espresso_registrations_admin.css', array('ee-admin-css'),
+        wp_register_style('espresso_reg', REG_ASSETS_URL.'espresso_registrations_admin.css', array('ee-admin-css'),
             EVENT_ESPRESSO_VERSION);
         wp_enqueue_style('espresso_reg');
         //script
-        wp_register_script('espresso_reg', REG_ASSETS_URL . 'espresso_registrations_admin.js',
+        wp_register_script('espresso_reg', REG_ASSETS_URL.'espresso_registrations_admin.js',
             array('jquery-ui-datepicker', 'jquery-ui-draggable', 'ee_admin_js'), EVENT_ESPRESSO_VERSION, true);
         wp_enqueue_script('espresso_reg');
     }
@@ -604,7 +604,7 @@ 
     public function load_scripts_styles_contact_list()
     {
         wp_deregister_style('espresso_reg');
-        wp_register_style('espresso_att', REG_ASSETS_URL . 'espresso_attendees_admin.css', array('ee-admin-css'),
+        wp_register_style('espresso_att', REG_ASSETS_URL.'espresso_attendees_admin.css', array('ee-admin-css'),
             EVENT_ESPRESSO_VERSION);
         wp_enqueue_style('espresso_att');
     }
@@ -612,7 +612,7 @@ 
 
     public function load_scripts_styles_new_registration()
     {
-        wp_register_script('ee-spco-for-admin', REG_ASSETS_URL . 'spco_for_admin.js', array('underscore', 'jquery'),
+        wp_register_script('ee-spco-for-admin', REG_ASSETS_URL.'spco_for_admin.js', array('underscore', 'jquery'),
             EVENT_ESPRESSO_VERSION, true);
         wp_enqueue_script('ee-spco-for-admin');
         add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true');
@@ -722,7 +722,7 @@ 
                     'trash_registrations' => __('Trash Registrations', 'event_espresso'),
                 ),
             );
-            $this->_views['trash']      = array(
+            $this->_views['trash'] = array(
                 'slug'        => 'trash',
                 'label'       => __('Trash', 'event_espresso'),
                 'count'       => 0,
@@ -807,31 +807,31 @@ 
         }
         $sc_items = array(
             'approved_status'   => array(
-                'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_approved,
+                'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_approved,
                 'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_approved, false, 'sentence'),
             ),
             'pending_status'    => array(
-                'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_pending_payment,
+                'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_pending_payment,
                 'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, false, 'sentence'),
             ),
             'wait_list'         => array(
-                'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_wait_list,
+                'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_wait_list,
                 'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_wait_list, false, 'sentence'),
             ),
             'incomplete_status' => array(
-                'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_incomplete,
+                'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_incomplete,
                 'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_incomplete, false, 'sentence'),
             ),
             'not_approved'      => array(
-                'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_not_approved,
+                'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_not_approved,
                 'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, false, 'sentence'),
             ),
             'declined_status'   => array(
-                'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_declined,
+                'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_declined,
                 'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_declined, false, 'sentence'),
             ),
             'cancelled_status'  => array(
-                'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_cancelled,
+                'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_cancelled,
                 'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, false, 'sentence'),
             ),
         );
@@ -852,17 +852,17 @@ 
             if (EE_Registry::instance()->CAP->current_user_can('ee_edit_registrations',
                 'espresso_registrations_new_registration', $EVT_ID)
             ) {
-                $this->_admin_page_title .= ' ' . $this->get_action_link_or_button('new_registration', 'add-registrant',
+                $this->_admin_page_title .= ' '.$this->get_action_link_or_button('new_registration', 'add-registrant',
                         array('event_id' => $EVT_ID), 'add-new-h2');
             }
             $event = EEM_Event::instance()->get_one_by_ID($EVT_ID);
             if ($event instanceof EE_Event) {
                 $this->_template_args['admin_page_header'] = sprintf(__('%s Viewing registrations for the event: %s%s',
                     'event_espresso'), '<h3 style="line-height:1.5em;">',
-                    '<br /><a href="' . EE_Admin_Page::add_query_args_and_nonce(array(
+                    '<br /><a href="'.EE_Admin_Page::add_query_args_and_nonce(array(
                         'action' => 'edit',
                         'post'   => $event->ID(),
-                    ), EVENTS_ADMIN_URL) . '">&nbsp;' . $event->get('EVT_name') . '&nbsp;</a>&nbsp;', '</h3>');
+                    ), EVENTS_ADMIN_URL).'">&nbsp;'.$event->get('EVT_name').'&nbsp;</a>&nbsp;', '</h3>');
             }
             $DTT_ID   = ! empty($this->_req_data['datetime_id']) ? absint($this->_req_data['datetime_id']) : 0;
             $datetime = EEM_Datetime::instance()->get_one_by_ID($DTT_ID);
@@ -871,7 +871,7 @@ 
                 $this->_template_args['admin_page_header'] .= ' &nbsp;<span class="drk-grey-text">';
                 $this->_template_args['admin_page_header'] .= '<span class="dashicons dashicons-calendar"></span>';
                 $this->_template_args['admin_page_header'] .= $datetime->name();
-                $this->_template_args['admin_page_header'] .= ' ( ' . $datetime->start_date() . ' )';
+                $this->_template_args['admin_page_header'] .= ' ( '.$datetime->start_date().' )';
                 $this->_template_args['admin_page_header'] .= '</span></h3>';
             }
         }
@@ -921,10 +921,10 @@ 
         $this_month = false,
         $today = false
     ) {
-        if( $this_month ) {
+        if ($this_month) {
             $this->_req_data['status'] = 'month';
         }
-        if( $today ) {
+        if ($today) {
             $this->_req_data['status'] = 'today';
         }
         $query_params = $this->_get_registration_query_parameters($this->_req_data, $per_page, $count);
@@ -995,7 +995,7 @@ 
     protected function _add_category_id_to_where_conditions(array $request)
     {
         $where = array();
-        if ( ! empty($request['EVT_CAT']) && (int)$request['EVT_CAT'] !== -1) {
+        if ( ! empty($request['EVT_CAT']) && (int) $request['EVT_CAT'] !== -1) {
             $where['Event.Term_Taxonomy.term_id'] = absint($request['EVT_CAT']);
         }
         return $where;
@@ -1014,7 +1014,7 @@ 
         if ( ! empty($request['datetime_id'])) {
             $where['Ticket.Datetime.DTT_ID'] = absint($request['datetime_id']);
         }
-        if( ! empty($request['DTT_ID'])){
+        if ( ! empty($request['DTT_ID'])) {
             $where['Ticket.Datetime.DTT_ID'] = absint($request['DTT_ID']);
         }
         return $where;
@@ -1030,7 +1030,7 @@ 
     protected function _add_registration_status_to_where_conditions(array $request)
     {
         $where = array();
-        $view  = EEH_Array::is_set( $request, 'status', '' );
+        $view  = EEH_Array::is_set($request, 'status', '');
         $registration_status = ! empty($request['_reg_status'])
             ? sanitize_text_field($request['_reg_status'])
             : '';
@@ -1065,7 +1065,7 @@ 
     protected function _add_date_to_where_conditions(array $request)
     {
         $where = array();
-        $view  = EEH_Array::is_set( $request, 'status', '' );
+        $view  = EEH_Array::is_set($request, 'status', '');
         $month_range             = ! empty($request['month_range'])
             ? sanitize_text_field($request['month_range'])
             : '';
@@ -1079,12 +1079,12 @@ 
                 array(
                     EEM_Registration::instance()->convert_datetime_for_query(
                         'REG_date',
-                        $now . ' 00:00:00',
+                        $now.' 00:00:00',
                         'Y-m-d H:i:s'
                     ),
                     EEM_Registration::instance()->convert_datetime_for_query(
                         'REG_date',
-                        $now . ' 23:59:59',
+                        $now.' 23:59:59',
                         'Y-m-d H:i:s'
                     ),
                 ),
@@ -1097,12 +1097,12 @@ 
                 array(
                     EEM_Registration::instance()->convert_datetime_for_query(
                         'REG_date',
-                        $current_year_and_month . '-01 00:00:00',
+                        $current_year_and_month.'-01 00:00:00',
                         'Y-m-d H:i:s'
                     ),
                     EEM_Registration::instance()->convert_datetime_for_query(
                         'REG_date',
-                        $current_year_and_month . '-' . $days_this_month . ' 23:59:59',
+                        $current_year_and_month.'-'.$days_this_month.' 23:59:59',
                         'Y-m-d H:i:s'
                     ),
                 ),
@@ -1117,18 +1117,18 @@ 
                 : '';
             //if there is not a month or year then we can't go further
             if ($month_requested && $year_requested) {
-                $days_in_month     = date('t', strtotime($year_requested . '-' . $month_requested . '-' . '01'));
+                $days_in_month     = date('t', strtotime($year_requested.'-'.$month_requested.'-'.'01'));
                 $where['REG_date'] = array(
                     'BETWEEN',
                     array(
                         EEM_Registration::instance()->convert_datetime_for_query(
                             'REG_date',
-                            $year_requested . '-' . $month_requested . '-01 00:00:00',
+                            $year_requested.'-'.$month_requested.'-01 00:00:00',
                             'Y-m-d H:i:s'
                         ),
                         EEM_Registration::instance()->convert_datetime_for_query(
                             'REG_date',
-                            $year_requested . '-' . $month_requested . '-' . $days_in_month . ' 23:59:59',
+                            $year_requested.'-'.$month_requested.'-'.$days_in_month.' 23:59:59',
                             'Y-m-d H:i:s'
                         ),
                     ),
@@ -1149,7 +1149,7 @@ 
     {
         $where = array();
         if ( ! empty($request['s'])) {
-            $search_string = '%' . sanitize_text_field($request['s']) . '%';
+            $search_string = '%'.sanitize_text_field($request['s']).'%';
             $where['OR'] = array(
                 'Event.EVT_name'                          => array('LIKE', $search_string),
                 'Event.EVT_desc'                          => array('LIKE', $search_string),
@@ -1251,7 +1251,7 @@ 
             : $per_page;
 
         //-1 means return all results so get out if that's set.
-        if ((int)$per_page === -1) {
+        if ((int) $per_page === -1) {
             return array();
         }
         $per_page = absint($per_page);
@@ -1297,12 +1297,12 @@ 
                 'action'   => 'default',
                 'event_id' => $event_id,
             ), REG_ADMIN_URL);
-            $this->_template_args['filtered_transactions_link']  = EE_Admin_Page::add_query_args_and_nonce(array(
+            $this->_template_args['filtered_transactions_link'] = EE_Admin_Page::add_query_args_and_nonce(array(
                 'action' => 'default',
                 'EVT_ID' => $event_id,
                 'page'   => 'espresso_transactions',
             ), admin_url('admin.php'));
-            $this->_template_args['event_link']                  = EE_Admin_Page::add_query_args_and_nonce(array(
+            $this->_template_args['event_link'] = EE_Admin_Page::add_query_args_and_nonce(array(
                 'page'   => 'espresso_events',
                 'action' => 'edit',
                 'post'   => $event_id,
@@ -1321,7 +1321,7 @@ 
                     '_REG_ID' => $previous_reg['REG_ID'],
                 ), REG_ADMIN_URL), 'dashicons dashicons-arrow-left ee-icon-size-22') : '';
             // grab header
-            $template_path                             = REG_TEMPLATE_PATH . 'reg_admin_details_header.template.php';
+            $template_path                             = REG_TEMPLATE_PATH.'reg_admin_details_header.template.php';
             $this->_template_args['REG_ID']            = $this->_registration->ID();
             $this->_template_args['admin_page_header'] = EEH_Template::display_template($template_path,
                 $this->_template_args, true);
@@ -1395,8 +1395,8 @@ 
                     'default' => $this->_registration->ID(),
                 )),
                 'current_status'     => new EE_Form_Section_HTML(EEH_HTML::tr(EEH_HTML::th(EEH_HTML::label(EEH_HTML::strong(__('Current Registration Status',
-                        'event_espresso')))) . EEH_HTML::td(EEH_HTML::strong($this->_registration->pretty_status(),
-                        '', 'status-' . $this->_registration->status_ID(),
+                        'event_espresso')))).EEH_HTML::td(EEH_HTML::strong($this->_registration->pretty_status(),
+                        '', 'status-'.$this->_registration->status_ID(),
                         'line-height: 1em; font-size: 1.5em; font-weight: bold;')))),
                 'reg_status'         => new EE_Select_Input($this->_get_reg_statuses(), array(
                     'html_label_text' => __('Change Registration Status to', 'event_espresso'),
@@ -1452,9 +1452,9 @@ 
     {
         if (isset($this->_req_data['reg_status_change_form'])) {
             $REG_IDs = isset($this->_req_data['reg_status_change_form']['REG_ID'])
-                ? (array)$this->_req_data['reg_status_change_form']['REG_ID'] : array();
+                ? (array) $this->_req_data['reg_status_change_form']['REG_ID'] : array();
         } else {
-            $REG_IDs = isset($this->_req_data['_REG_ID']) ? (array)$this->_req_data['_REG_ID'] : array();
+            $REG_IDs = isset($this->_req_data['_REG_ID']) ? (array) $this->_req_data['_REG_ID'] : array();
         }
         $success = $this->_set_registration_status($REG_IDs, $status);
         //notify?
@@ -1482,7 +1482,7 @@ 
     {
         $success = false;
         // typecast $REG_IDs
-        $REG_IDs = (array)$REG_IDs;
+        $REG_IDs = (array) $REG_IDs;
         if ( ! empty($REG_IDs)) {
             $success = true;
             // set default status if none is passed
@@ -1775,7 +1775,7 @@ 
         ), REG_ADMIN_URL);
         $this->_template_args['REG_ID']                                       = $this->_registration->ID();
         $this->_template_args['event_id']                                     = $this->_registration->event_ID();
-        $template_path                                                        = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_reg_details.template.php';
+        $template_path                                                        = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_reg_details.template.php';
         echo EEH_Template::display_template($template_path, $this->_template_args, true);
     }
 
@@ -1797,7 +1797,7 @@ 
             $this->_template_args['att_questions']             = count($form->subforms()) > 0 ? $form->get_html_and_js() : '';
             $this->_template_args['reg_questions_form_action'] = 'edit_registration';
             $this->_template_args['REG_ID']                    = $this->_registration->ID();
-            $template_path                                     = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_reg_questions.template.php';
+            $template_path                                     = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_reg_questions.template.php';
             echo EEH_Template::display_template($template_path, $this->_template_args, true);
         }
     }
@@ -1813,7 +1813,7 @@ 
      */
     public function form_before_question_group($output)
     {
-        EE_Error::doing_it_wrong(__CLASS__ . '::' . __FUNCTION__,
+        EE_Error::doing_it_wrong(__CLASS__.'::'.__FUNCTION__,
             __('This method would have been protected but was used on a filter callback'
                . 'so needed to be public. Please discontinue usage as it will be removed soon.', 'event_espresso'),
             '4.8.32.rc.000');
@@ -1834,7 +1834,7 @@ 
      */
     public function form_after_question_group($output)
     {
-        EE_Error::doing_it_wrong(__CLASS__ . '::' . __FUNCTION__,
+        EE_Error::doing_it_wrong(__CLASS__.'::'.__FUNCTION__,
             __('This method would have been protected but was used on a filter callback'
                . 'so needed to be public. Please discontinue usage as it will be removed soon.', 'event_espresso'),
             '4.8.32.rc.000');
@@ -1868,14 +1868,14 @@ 
      */
     public function form_form_field_label_wrap($label)
     {
-        EE_Error::doing_it_wrong(__CLASS__ . '::' . __FUNCTION__,
+        EE_Error::doing_it_wrong(__CLASS__.'::'.__FUNCTION__,
             __('This method would have been protected but was used on a filter callback'
                . 'so needed to be public. Please discontinue usage as it will be removed soon.', 'event_espresso'),
             '4.8.32.rc.000');
         return '
 			<tr>
 				<th>
-					' . $label . '
+					' . $label.'
 				</th>';
     }
 
@@ -1890,13 +1890,13 @@ 
      */
     public function form_form_field_input__wrap($input)
     {
-        EE_Error::doing_it_wrong(__CLASS__ . '::' . __FUNCTION__,
+        EE_Error::doing_it_wrong(__CLASS__.'::'.__FUNCTION__,
             __('This method would have been protected but was used on a filter callback'
                . 'so needed to be public. Please discontinue usage as it will be removed soon.', 'event_espresso'),
             '4.8.32.rc.000');
         return '
 				<td class="reg-admin-attendee-questions-input-td disabled-input">
-					' . $input . '
+					' . $input.'
 				</td>
 			</tr>';
     }
@@ -1936,7 +1936,7 @@ 
     protected function _get_reg_custom_questions_form($REG_ID)
     {
         if ( ! $this->_reg_custom_questions_form) {
-            require_once(REG_ADMIN . 'form_sections' . DS . 'EE_Registration_Custom_Questions_Form.form.php');
+            require_once(REG_ADMIN.'form_sections'.DS.'EE_Registration_Custom_Questions_Form.form.php');
             $this->_reg_custom_questions_form = new EE_Registration_Custom_Questions_Form(
                 EEM_Registration::instance()->get_one_by_ID($REG_ID)
             );
@@ -1965,7 +1965,7 @@ 
         if ($form->is_valid()) {
             foreach ($form->subforms() as $question_group_id => $question_group_form) {
                 foreach ($question_group_form->inputs() as $question_id => $input) {
-                    $where_conditions    = array(
+                    $where_conditions = array(
                         'QST_ID' => $question_id,
                         'REG_ID' => $REG_ID,
                     );
@@ -2001,7 +2001,7 @@ 
         $REG = EEM_Registration::instance();
         //get all other registrations on this transaction, and cache
         //the attendees for them so we don't have to run another query using force_join
-        $registrations                           = $REG->get_all(array(
+        $registrations = $REG->get_all(array(
             array(
                 'TXN_ID' => $this->_registration->transaction_ID(),
                 'REG_ID' => array('!=', $this->_registration->ID()),
@@ -2021,29 +2021,29 @@ 
             $att_nmbr = 1;
             foreach ($registrations as $registration) {
                 /* @var $registration EE_Registration */
-                $attendee                                                    = $registration->attendee()
+                $attendee = $registration->attendee()
                     ? $registration->attendee()
                     : EEM_Attendee::instance()
                                   ->create_default_object();
                 $this->_template_args['attendees'][$att_nmbr]['STS_ID']      = $registration->status_ID();
-                $this->_template_args['attendees'][$att_nmbr]['fname']       = $attendee->fname();//( isset( $registration->ATT_fname ) & ! empty( $registration->ATT_fname ) ) ? $registration->ATT_fname : '';
-                $this->_template_args['attendees'][$att_nmbr]['lname']       = $attendee->lname();//( isset( $registration->ATT_lname ) & ! empty( $registration->ATT_lname ) ) ? $registration->ATT_lname : '';
-                $this->_template_args['attendees'][$att_nmbr]['email']       = $attendee->email();//( isset( $registration->ATT_email ) & ! empty( $registration->ATT_email ) ) ? $registration->ATT_email : '';
-                $this->_template_args['attendees'][$att_nmbr]['final_price'] = $registration->final_price();//( isset( $registration->REG_final_price ) & ! empty( $registration->REG_final_price ) ) ? $registration->REG_final_price : '';
+                $this->_template_args['attendees'][$att_nmbr]['fname']       = $attendee->fname(); //( isset( $registration->ATT_fname ) & ! empty( $registration->ATT_fname ) ) ? $registration->ATT_fname : '';
+                $this->_template_args['attendees'][$att_nmbr]['lname']       = $attendee->lname(); //( isset( $registration->ATT_lname ) & ! empty( $registration->ATT_lname ) ) ? $registration->ATT_lname : '';
+                $this->_template_args['attendees'][$att_nmbr]['email']       = $attendee->email(); //( isset( $registration->ATT_email ) & ! empty( $registration->ATT_email ) ) ? $registration->ATT_email : '';
+                $this->_template_args['attendees'][$att_nmbr]['final_price'] = $registration->final_price(); //( isset( $registration->REG_final_price ) & ! empty( $registration->REG_final_price ) ) ? $registration->REG_final_price : '';
                 $this->_template_args['attendees'][$att_nmbr]['address']     = implode(', ',
                     $attendee->full_address_as_array());
                 $this->_template_args['attendees'][$att_nmbr]['att_link']    = self::add_query_args_and_nonce(array(
                     'action' => 'edit_attendee',
                     'post'   => $attendee->ID(),
                 ), REG_ADMIN_URL);
-                $this->_template_args['attendees'][$att_nmbr]['event_name']  = $registration->event_obj()->name();
+                $this->_template_args['attendees'][$att_nmbr]['event_name'] = $registration->event_obj()->name();
                 $att_nmbr++;
             }
             //EEH_Debug_Tools::printr( $attendees, '$attendees  <br /><span style="font-size:10px;font-weight:normal;">( file: '. __FILE__ . ' - line no: ' . __LINE__ . ' )</span>', 'auto' );
             $this->_template_args['currency_sign'] = EE_Registry::instance()->CFG->currency->sign;
             //			$this->_template_args['registration_form_url'] = add_query_arg( array( 'action' => 'edit_registration', 'process' => 'attendees'  ), REG_ADMIN_URL );
         }
-        $template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_attendees.template.php';
+        $template_path = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_attendees.template.php';
         echo EEH_Template::display_template($template_path, $this->_template_args, true);
     }
 
@@ -2072,26 +2072,26 @@ 
             $primary_registration = null;
         }
         $this->_template_args['ATT_ID']            = $attendee->ID();
-        $this->_template_args['fname']             = $attendee->fname();//$this->_registration->ATT_fname;
-        $this->_template_args['lname']             = $attendee->lname();//$this->_registration->ATT_lname;
-        $this->_template_args['email']             = $attendee->email();//$this->_registration->ATT_email;
+        $this->_template_args['fname']             = $attendee->fname(); //$this->_registration->ATT_fname;
+        $this->_template_args['lname']             = $attendee->lname(); //$this->_registration->ATT_lname;
+        $this->_template_args['email']             = $attendee->email(); //$this->_registration->ATT_email;
         $this->_template_args['phone']             = $attendee->phone();
         $this->_template_args['formatted_address'] = EEH_Address::format($attendee);
         //edit link
-        $this->_template_args['att_edit_link']  = EE_Admin_Page::add_query_args_and_nonce(array(
+        $this->_template_args['att_edit_link'] = EE_Admin_Page::add_query_args_and_nonce(array(
             'action' => 'edit_attendee',
             'post'   => $attendee->ID(),
         ), REG_ADMIN_URL);
         $this->_template_args['att_edit_label'] = __('View/Edit Contact', 'event_espresso');
         //create link
-        $this->_template_args['create_link']  = $primary_registration instanceof EE_Registration
+        $this->_template_args['create_link'] = $primary_registration instanceof EE_Registration
             ? EE_Admin_Page::add_query_args_and_nonce(array(
                 'action'  => 'duplicate_attendee',
                 '_REG_ID' => $this->_registration->ID(),
             ), REG_ADMIN_URL) : '';
         $this->_template_args['create_label'] = __('Create Contact', 'event_espresso');
         $this->_template_args['att_check']    = $att_check;
-        $template_path                        = REG_TEMPLATE_PATH . 'reg_admin_details_side_meta_box_registrant.template.php';
+        $template_path                        = REG_TEMPLATE_PATH.'reg_admin_details_side_meta_box_registrant.template.php';
         echo EEH_Template::display_template($template_path, $this->_template_args, true);
     }
 
@@ -2305,7 +2305,7 @@ 
                 'action' => 'edit',
                 'post'   => $this->_reg_event->ID(),
             ), EVENTS_ADMIN_URL);
-            $edit_event_lnk                     = '<a href="'
+            $edit_event_lnk = '<a href="'
                                                   . $edit_event_url
                                                   . '" title="'
                                                   . esc_attr__('Edit ', 'event_espresso')
@@ -2322,7 +2322,7 @@ 
             $this->_return_json();
         }
         // grab header
-        $template_path                              = REG_TEMPLATE_PATH . 'reg_admin_register_new_attendee.template.php';
+        $template_path                              = REG_TEMPLATE_PATH.'reg_admin_register_new_attendee.template.php';
         $this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path,
             $this->_template_args, true);
         //$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
@@ -2344,7 +2344,7 @@ 
                 'event_espresso'), '<br />', '<h3 class="important-notice">', '</h3>', '<div class="float-right">',
                 '<span id="redirect_timer" class="important-notice">30</span>', '</div>', '<b>', '</b>');
             return '
-	<div id="ee-add-reg-back-button-dv"><p>' . $warning_msg . '</p></div>
+	<div id="ee-add-reg-back-button-dv"><p>' . $warning_msg.'</p></div>
 	<script >
 		// WHOAH !!! it appears that someone is using the back button from the Transaction admin page
 		// after just adding a new registration... we gotta try to put a stop to that !!!
@@ -2569,7 +2569,7 @@ 
     public function get_attendees($per_page, $count = false, $trash = false)
     {
         do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        require_once(REG_ADMIN . 'EE_Attendee_Contact_List_Table.class.php');
+        require_once(REG_ADMIN.'EE_Attendee_Contact_List_Table.class.php');
         $ATT_MDL                    = EEM_Attendee::instance();
         $this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : '';
         switch ($this->_req_data['orderby']) {
@@ -2603,7 +2603,7 @@ 
             ? $this->_req_data['perpage'] : $per_page;
         $_where       = array();
         if ( ! empty($this->_req_data['s'])) {
-            $sstr         = '%' . $this->_req_data['s'] . '%';
+            $sstr         = '%'.$this->_req_data['s'].'%';
             $_where['OR'] = array(
                 'Registration.Event.EVT_name'       => array('LIKE', $sstr),
                 'Registration.Event.EVT_desc'       => array('LIKE', $sstr),
@@ -2681,7 +2681,7 @@ 
      *                                                     the query parameters from the request
      * @return void ends the request with a redirect or download
      */
-    public function _registrations_report_base( $method_name_for_getting_query_params )
+    public function _registrations_report_base($method_name_for_getting_query_params)
     {
         if ( ! defined('EE_USE_OLD_CSV_REPORT_CLASS')) {
             wp_redirect(EE_Admin_Page::add_query_args_and_nonce(array(
@@ -2691,7 +2691,7 @@ 
                 'filters'     => urlencode(
                     serialize(
                         call_user_func(
-                            array( $this, $method_name_for_getting_query_params ),
+                            array($this, $method_name_for_getting_query_params),
                             EEH_Array::is_set(
                                 $this->_req_data,
                                 'filters',
@@ -2711,8 +2711,8 @@ 
                 'EVT_ID' => isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : null,
             );
             $this->_req_data = array_merge($this->_req_data, $new_request_args);
-            if (is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-                require_once(EE_CLASSES . 'EE_Export.class.php');
+            if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+                require_once(EE_CLASSES.'EE_Export.class.php');
                 $EE_Export = EE_Export::instance($this->_req_data);
                 $EE_Export->export();
             }
@@ -2727,14 +2727,14 @@ 
      */
     public function _registrations_report()
     {
-        $this->_registrations_report_base( '_get_registration_query_parameters' );
+        $this->_registrations_report_base('_get_registration_query_parameters');
     }
 
 
     public function _contact_list_export()
     {
-        if (is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-            require_once(EE_CLASSES . 'EE_Export.class.php');
+        if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+            require_once(EE_CLASSES.'EE_Export.class.php');
             $EE_Export = EE_Export::instance($this->_req_data);
             $EE_Export->export_attendees();
         }
@@ -2751,8 +2751,8 @@ 
                 'return_url'  => urlencode($this->_req_data['return_url']),
             )));
         } else {
-            if (is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-                require_once(EE_CLASSES . 'EE_Export.class.php');
+            if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+                require_once(EE_CLASSES.'EE_Export.class.php');
                 $EE_Export = EE_Export::instance($this->_req_data);
                 $EE_Export->report_attendees();
             }
@@ -2809,7 +2809,7 @@ 
             $updated_fields = array(
                 'ATT_fname'     => $this->_req_data['ATT_fname'],
                 'ATT_lname'     => $this->_req_data['ATT_lname'],
-                'ATT_full_name' => $this->_req_data['ATT_fname'] . ' ' . $this->_req_data['ATT_lname'],
+                'ATT_full_name' => $this->_req_data['ATT_fname'].' '.$this->_req_data['ATT_lname'],
                 'ATT_address'   => isset($this->_req_data['ATT_address']) ? $this->_req_data['ATT_address'] : '',
                 'ATT_address2'  => isset($this->_req_data['ATT_address2']) ? $this->_req_data['ATT_address2'] : '',
                 'ATT_city'      => isset($this->_req_data['ATT_city']) ? $this->_req_data['ATT_city'] : '',
@@ -2892,7 +2892,7 @@ 
     {
         //get attendee object ( should already have it )
         $this->_template_args['attendee'] = $this->_cpt_model_obj;
-        $template                         = REG_TEMPLATE_PATH . 'attendee_contact_info_metabox_content.template.php';
+        $template                         = REG_TEMPLATE_PATH.'attendee_contact_info_metabox_content.template.php';
         EEH_Template::display_template($template, $this->_template_args);
     }
 
@@ -2933,7 +2933,7 @@ 
             'input_prefix'   => '',
             'append_qstn_id' => false,
         )));
-        $template                             = REG_TEMPLATE_PATH . 'attendee_address_details_metabox_content.template.php';
+        $template = REG_TEMPLATE_PATH.'attendee_address_details_metabox_content.template.php';
         EEH_Template::display_template($template, $this->_template_args);
     }
 
@@ -2948,7 +2948,7 @@ 
     {
         $this->_template_args['attendee']      = $this->_cpt_model_obj;
         $this->_template_args['registrations'] = $this->_cpt_model_obj->get_many_related('Registration');
-        $template                              = REG_TEMPLATE_PATH . 'attendee_registrations_main_meta_box.template.php';
+        $template                              = REG_TEMPLATE_PATH.'attendee_registrations_main_meta_box.template.php';
         EEH_Template::display_template($template, $this->_template_args);
     }
 
@@ -2962,7 +2962,7 @@ 
     public function after_title_form_fields($post)
     {
         if ($post->post_type == 'espresso_attendees') {
-            $template                  = REG_TEMPLATE_PATH . 'attendee_details_after_title_form_fields.template.php';
+            $template                  = REG_TEMPLATE_PATH.'attendee_details_after_title_form_fields.template.php';
             $template_args['attendee'] = $this->_cpt_model_obj;
             EEH_Template::display_template($template, $template_args);
         }

Indentation +2960 added lines, -2960 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -23,1844 +23,1844 @@ 
 class Registrations_Admin_Page extends EE_Admin_Page_CPT
 {
 
-    /**
-     * @var EE_Registration
-     */
-    private $_registration;
-
-    /**
-     * @var EE_Event
-     */
-    private $_reg_event;
-
-    /**
-     * @var EE_Session
-     */
-    private $_session;
-
-    private static $_reg_status;
-
-    /**
-     * Form for displaying the custom questions for this registration.
-     * This gets used a few times throughout the request so its best to cache it
-     *
-     * @var EE_Registration_Custom_Questions_Form
-     */
-    protected $_reg_custom_questions_form = null;
-
-
-    /**
-     *        constructor
-     *
-     * @Constructor
-     * @access public
-     * @param bool $routing
-     * @return Registrations_Admin_Page
-     */
-    public function __construct($routing = true)
-    {
-        parent::__construct($routing);
-        add_action('wp_loaded', array($this, 'wp_loaded'));
-    }
-
-
-    public function wp_loaded()
-    {
-        // when adding a new registration...
-        if (isset($this->_req_data['action']) && $this->_req_data['action'] === 'new_registration') {
-            EE_System::do_not_cache();
-            if ( ! isset($this->_req_data['processing_registration'])
-                 || absint($this->_req_data['processing_registration']) !== 1
-            ) {
-                // and it's NOT the attendee information reg step
-                // force cookie expiration by setting time to last week
-                setcookie('ee_registration_added', 0, time() - WEEK_IN_SECONDS, '/');
-                // and update the global
-                $_COOKIE['ee_registration_added'] = 0;
-            }
-        }
-    }
-
-
-    protected function _init_page_props()
-    {
-        $this->page_slug        = REG_PG_SLUG;
-        $this->_admin_base_url  = REG_ADMIN_URL;
-        $this->_admin_base_path = REG_ADMIN;
-        $this->page_label       = __('Registrations', 'event_espresso');
-        $this->_cpt_routes      = array(
-            'add_new_attendee' => 'espresso_attendees',
-            'edit_attendee'    => 'espresso_attendees',
-            'insert_attendee'  => 'espresso_attendees',
-            'update_attendee'  => 'espresso_attendees',
-        );
-        $this->_cpt_model_names = array(
-            'add_new_attendee' => 'EEM_Attendee',
-            'edit_attendee'    => 'EEM_Attendee',
-        );
-        $this->_cpt_edit_routes = array(
-            'espresso_attendees' => 'edit_attendee',
-        );
-        $this->_pagenow_map     = array(
-            'add_new_attendee' => 'post-new.php',
-            'edit_attendee'    => 'post.php',
-            'trash'            => 'post.php',
-        );
-        add_action('edit_form_after_title', array($this, 'after_title_form_fields'), 10);
-        //add filters so that the comment urls don't take users to a confusing 404 page
-        add_filter('get_comment_link', array($this, 'clear_comment_link'), 10, 3);
-    }
-
-
-    public function clear_comment_link($link, $comment, $args)
-    {
-        //gotta make sure this only happens on this route
-        $post_type = get_post_type($comment->comment_post_ID);
-        if ($post_type === 'espresso_attendees') {
-            return '#commentsdiv';
-        }
-        return $link;
-    }
-
-
-    protected function _ajax_hooks()
-    {
-        //todo: all hooks for registrations ajax goes in here
-        add_action('wp_ajax_toggle_checkin_status', array($this, 'toggle_checkin_status'));
-    }
-
-
-    protected function _define_page_props()
-    {
-        $this->_admin_page_title = $this->page_label;
-        $this->_labels           = array(
-            'buttons'                      => array(
-                'add-registrant'      => __('Add New Registration', 'event_espresso'),
-                'add-attendee'        => __('Add Contact', 'event_espresso'),
-                'edit'                => __('Edit Contact', 'event_espresso'),
-                'report'              => __("Event Registrations CSV Report", "event_espresso"),
-                'report_all'          => __('All Registrations CSV Report', 'event_espresso'),
-                'report_filtered'     => __('Filtered CSV Report', 'event_espresso'),
-                'contact_list_report' => __('Contact List Report', 'event_espresso'),
-                'contact_list_export' => __("Export Data", "event_espresso"),
-            ),
-            'publishbox'                   => array(
-                'add_new_attendee' => __("Add Contact Record", 'event_espresso'),
-                'edit_attendee'    => __("Update Contact Record", 'event_espresso'),
-            ),
-            'hide_add_button_on_cpt_route' => array(
-                'edit_attendee' => true,
-            ),
-        );
-    }
-
-
-    /**
-     *        grab url requests and route them
-     *
-     * @access private
-     * @return void
-     */
-    public function _set_page_routes()
-    {
-        $this->_get_registration_status_array();
-        $reg_id             = ! empty($this->_req_data['_REG_ID']) && ! is_array($this->_req_data['_REG_ID'])
-            ? $this->_req_data['_REG_ID'] : 0;
-        $att_id             = ! empty($this->_req_data['ATT_ID']) && ! is_array($this->_req_data['ATT_ID'])
-            ? $this->_req_data['ATT_ID'] : 0;
-        $att_id             = ! empty($this->_req_data['post']) && ! is_array($this->_req_data['post']) ? $this->_req_data['post']
-            : $att_id;
-        $this->_page_routes = array(
-            'default'                            => array(
-                'func'       => '_registrations_overview_list_table',
-                'capability' => 'ee_read_registrations',
-            ),
-            'view_registration'                  => array(
-                'func'       => '_registration_details',
-                'capability' => 'ee_read_registration',
-                'obj_id'     => $reg_id,
-            ),
-            'edit_registration'                  => array(
-                'func'               => '_update_attendee_registration_form',
-                'noheader'           => true,
-                'headers_sent_route' => 'view_registration',
-                'capability'         => 'ee_edit_registration',
-                'obj_id'             => $reg_id,
-                '_REG_ID'            => $reg_id,
-            ),
-            'trash_registrations'                => array(
-                'func'       => '_trash_or_restore_registrations',
-                'args'       => array('trash' => true),
-                'noheader'   => true,
-                'capability' => 'ee_delete_registrations',
-            ),
-            'restore_registrations'              => array(
-                'func'       => '_trash_or_restore_registrations',
-                'args'       => array('trash' => false),
-                'noheader'   => true,
-                'capability' => 'ee_delete_registrations',
-            ),
-            'delete_registrations'               => array(
-                'func'       => '_delete_registrations',
-                'noheader'   => true,
-                'capability' => 'ee_delete_registrations',
-            ),
-            'new_registration'                   => array(
-                'func'       => 'new_registration',
-                'capability' => 'ee_edit_registrations',
-            ),
-            'process_reg_step'                   => array(
-                'func'       => 'process_reg_step',
-                'noheader'   => true,
-                'capability' => 'ee_edit_registrations',
-            ),
-            'redirect_to_txn'                    => array(
-                'func'       => 'redirect_to_txn',
-                'noheader'   => true,
-                'capability' => 'ee_edit_registrations',
-            ),
-            'change_reg_status'                  => array(
-                'func'       => '_change_reg_status',
-                'noheader'   => true,
-                'capability' => 'ee_edit_registration',
-                'obj_id'     => $reg_id,
-            ),
-            'approve_registration'               => array(
-                'func'       => 'approve_registration',
-                'noheader'   => true,
-                'capability' => 'ee_edit_registration',
-                'obj_id'     => $reg_id,
-            ),
-            'approve_and_notify_registration'    => array(
-                'func'       => 'approve_registration',
-                'noheader'   => true,
-                'args'       => array(true),
-                'capability' => 'ee_edit_registration',
-                'obj_id'     => $reg_id,
-            ),
-            'decline_registration'               => array(
-                'func'       => 'decline_registration',
-                'noheader'   => true,
-                'capability' => 'ee_edit_registration',
-                'obj_id'     => $reg_id,
-            ),
-            'decline_and_notify_registration'    => array(
-                'func'       => 'decline_registration',
-                'noheader'   => true,
-                'args'       => array(true),
-                'capability' => 'ee_edit_registration',
-                'obj_id'     => $reg_id,
-            ),
-            'pending_registration'               => array(
-                'func'       => 'pending_registration',
-                'noheader'   => true,
-                'capability' => 'ee_edit_registration',
-                'obj_id'     => $reg_id,
-            ),
-            'pending_and_notify_registration'    => array(
-                'func'       => 'pending_registration',
-                'noheader'   => true,
-                'args'       => array(true),
-                'capability' => 'ee_edit_registration',
-                'obj_id'     => $reg_id,
-            ),
-            'no_approve_registration'            => array(
-                'func'       => 'not_approve_registration',
-                'noheader'   => true,
-                'capability' => 'ee_edit_registration',
-                'obj_id'     => $reg_id,
-            ),
-            'no_approve_and_notify_registration' => array(
-                'func'       => 'not_approve_registration',
-                'noheader'   => true,
-                'args'       => array(true),
-                'capability' => 'ee_edit_registration',
-                'obj_id'     => $reg_id,
-            ),
-            'cancel_registration'                => array(
-                'func'       => 'cancel_registration',
-                'noheader'   => true,
-                'capability' => 'ee_edit_registration',
-                'obj_id'     => $reg_id,
-            ),
-            'cancel_and_notify_registration'     => array(
-                'func'       => 'cancel_registration',
-                'noheader'   => true,
-                'args'       => array(true),
-                'capability' => 'ee_edit_registration',
-                'obj_id'     => $reg_id,
-            ),
-            'contact_list'                       => array(
-                'func'       => '_attendee_contact_list_table',
-                'capability' => 'ee_read_contacts',
-            ),
-            'add_new_attendee'                   => array(
-                'func' => '_create_new_cpt_item',
-                'args' => array(
-                    'new_attendee' => true,
-                    'capability'   => 'ee_edit_contacts',
-                ),
-            ),
-            'edit_attendee'                      => array(
-                'func'       => '_edit_cpt_item',
-                'capability' => 'ee_edit_contacts',
-                'obj_id'     => $att_id,
-            ),
-            'duplicate_attendee'                 => array(
-                'func'       => '_duplicate_attendee',
-                'noheader'   => true,
-                'capability' => 'ee_edit_contacts',
-                'obj_id'     => $att_id,
-            ),
-            'insert_attendee'                    => array(
-                'func'       => '_insert_or_update_attendee',
-                'args'       => array(
-                    'new_attendee' => true,
-                ),
-                'noheader'   => true,
-                'capability' => 'ee_edit_contacts',
-            ),
-            'update_attendee'                    => array(
-                'func'       => '_insert_or_update_attendee',
-                'args'       => array(
-                    'new_attendee' => false,
-                ),
-                'noheader'   => true,
-                'capability' => 'ee_edit_contacts',
-                'obj_id'     => $att_id,
-            ),
-            'trash_attendees'                    => array(
-                'func'       => '_trash_or_restore_attendees',
-                'args'       => array(
-                    'trash' => true,
-                ),
-                'noheader'   => true,
-                'capability' => 'ee_delete_contacts',
-                'obj_id'     => $att_id,
-            ),
-            'restore_attendees'                  => array(
-                'func'       => '_trash_or_restore_attendees',
-                'args'       => array(
-                    'trash' => false,
-                ),
-                'noheader'   => true,
-                'capability' => 'ee_delete_contacts',
-                'obj_id'     => $att_id,
-            ),
-            'resend_registration'                => array(
-                'func'       => '_resend_registration',
-                'noheader'   => true,
-                'capability' => 'ee_send_message',
-            ),
-            'registrations_report'               => array(
-                'func'       => '_registrations_report',
-                'noheader'   => true,
-                'capability' => 'ee_read_registrations',
-            ),
-            'contact_list_export'                => array(
-                'func'       => '_contact_list_export',
-                'noheader'   => true,
-                'capability' => 'export',
-            ),
-            'contact_list_report'                => array(
-                'func'       => '_contact_list_report',
-                'noheader'   => true,
-                'capability' => 'ee_read_contacts',
-            ),
-        );
-    }
-
-
-    protected function _set_page_config()
-    {
-        $this->_page_config = array(
-            'default'           => array(
-                'nav'           => array(
-                    'label' => __('Overview', 'event_espresso'),
-                    'order' => 5,
-                ),
-                'help_tabs'     => array(
-                    'registrations_overview_help_tab'                       => array(
-                        'title'    => __('Registrations Overview', 'event_espresso'),
-                        'filename' => 'registrations_overview',
-                    ),
-                    'registrations_overview_table_column_headings_help_tab' => array(
-                        'title'    => __('Registrations Table Column Headings', 'event_espresso'),
-                        'filename' => 'registrations_overview_table_column_headings',
-                    ),
-                    'registrations_overview_filters_help_tab'               => array(
-                        'title'    => __('Registration Filters', 'event_espresso'),
-                        'filename' => 'registrations_overview_filters',
-                    ),
-                    'registrations_overview_views_help_tab'                 => array(
-                        'title'    => __('Registration Views', 'event_espresso'),
-                        'filename' => 'registrations_overview_views',
-                    ),
-                    'registrations_regoverview_other_help_tab'              => array(
-                        'title'    => __('Registrations Other', 'event_espresso'),
-                        'filename' => 'registrations_overview_other',
-                    ),
-                ),
-                'help_tour'     => array('Registration_Overview_Help_Tour'),
-                'qtips'         => array('Registration_List_Table_Tips'),
-                'list_table'    => 'EE_Registrations_List_Table',
-                'require_nonce' => false,
-            ),
-            'view_registration' => array(
-                'nav'           => array(
-                    'label'      => __('REG Details', 'event_espresso'),
-                    'order'      => 15,
-                    'url'        => isset($this->_req_data['_REG_ID'])
-                        ? add_query_arg(array('_REG_ID' => $this->_req_data['_REG_ID']), $this->_current_page_view_url)
-                        : $this->_admin_base_url,
-                    'persistent' => false,
-                ),
-                'help_tabs'     => array(
-                    'registrations_details_help_tab'                    => array(
-                        'title'    => __('Registration Details', 'event_espresso'),
-                        'filename' => 'registrations_details',
-                    ),
-                    'registrations_details_table_help_tab'              => array(
-                        'title'    => __('Registration Details Table', 'event_espresso'),
-                        'filename' => 'registrations_details_table',
-                    ),
-                    'registrations_details_form_answers_help_tab'       => array(
-                        'title'    => __('Registration Form Answers', 'event_espresso'),
-                        'filename' => 'registrations_details_form_answers',
-                    ),
-                    'registrations_details_registrant_details_help_tab' => array(
-                        'title'    => __('Contact Details', 'event_espresso'),
-                        'filename' => 'registrations_details_registrant_details',
-                    ),
-                ),
-                'help_tour'     => array('Registration_Details_Help_Tour'),
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes,
-                    array('_registration_details_metaboxes')),
-                'require_nonce' => false,
-            ),
-            'new_registration'  => array(
-                'nav'           => array(
-                    'label'      => __('Add New Registration', 'event_espresso'),
-                    'url'        => '#',
-                    'order'      => 15,
-                    'persistent' => false,
-                ),
-                'metaboxes'     => $this->_default_espresso_metaboxes,
-                'labels'        => array(
-                    'publishbox' => __('Save Registration', 'event_espresso'),
-                ),
-                'require_nonce' => false,
-            ),
-            'add_new_attendee'  => array(
-                'nav'           => array(
-                    'label'      => __('Add Contact', 'event_espresso'),
-                    'order'      => 15,
-                    'persistent' => false,
-                ),
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes,
-                    array('_publish_post_box', 'attendee_editor_metaboxes')),
-                'require_nonce' => false,
-            ),
-            'edit_attendee'     => array(
-                'nav'           => array(
-                    'label'      => __('Edit Contact', 'event_espresso'),
-                    'order'      => 15,
-                    'persistent' => false,
-                    'url'        => isset($this->_req_data['ATT_ID'])
-                        ? add_query_arg(array('ATT_ID' => $this->_req_data['ATT_ID']), $this->_current_page_view_url)
-                        : $this->_admin_base_url,
-                ),
-                'metaboxes'     => array('attendee_editor_metaboxes'),
-                'require_nonce' => false,
-            ),
-            'contact_list'      => array(
-                'nav'           => array(
-                    'label' => __('Contact List', 'event_espresso'),
-                    'order' => 20,
-                ),
-                'list_table'    => 'EE_Attendee_Contact_List_Table',
-                'help_tabs'     => array(
-                    'registrations_contact_list_help_tab'                       => array(
-                        'title'    => __('Registrations Contact List', 'event_espresso'),
-                        'filename' => 'registrations_contact_list',
-                    ),
-                    'registrations_contact-list_table_column_headings_help_tab' => array(
-                        'title'    => __('Contact List Table Column Headings', 'event_espresso'),
-                        'filename' => 'registrations_contact_list_table_column_headings',
-                    ),
-                    'registrations_contact_list_views_help_tab'                 => array(
-                        'title'    => __('Contact List Views', 'event_espresso'),
-                        'filename' => 'registrations_contact_list_views',
-                    ),
-                    'registrations_contact_list_other_help_tab'                 => array(
-                        'title'    => __('Contact List Other', 'event_espresso'),
-                        'filename' => 'registrations_contact_list_other',
-                    ),
-                ),
-                'help_tour'     => array('Contact_List_Help_Tour'),
-                'metaboxes'     => array(),
-                'require_nonce' => false,
-            ),
-            //override default cpt routes
-            'create_new'        => '',
-            'edit'              => '',
-        );
-    }
-
-
-    /**
-     * The below methods aren't used by this class currently
-     */
-    protected function _add_screen_options()
-    {
-    }
-
-
-    protected function _add_feature_pointers()
-    {
-    }
-
-
-    public function admin_init()
-    {
-        EE_Registry::$i18n_js_strings['update_att_qstns'] = __('click "Update Registration Questions" to save your changes',
-            'event_espresso');
-    }
-
-
-    public function admin_notices()
-    {
-    }
-
-
-    public function admin_footer_scripts()
-    {
-    }
-
-
-    /**
-     *        get list of registration statuses
-     *
-     * @access private
-     * @return void
-     */
-    private function _get_registration_status_array()
-    {
-        self::$_reg_status = EEM_Registration::reg_status_array(array(), true);
-    }
-
-
-    protected function _add_screen_options_default()
-    {
-        $this->_per_page_screen_option();
-    }
-
-
-    protected function _add_screen_options_contact_list()
-    {
-        $page_title              = $this->_admin_page_title;
-        $this->_admin_page_title = __("Contacts", 'event_espresso');
-        $this->_per_page_screen_option();
-        $this->_admin_page_title = $page_title;
-    }
-
-
-    public function load_scripts_styles()
-    {
-        //style
-        //wp_register_style('espresso_attendees', ATT_ASSETS_URL . 'espresso_attendees_admin.css', array(), EVENT_ESPRESSO_VERSION );
-        wp_register_style('espresso_reg', REG_ASSETS_URL . 'espresso_registrations_admin.css', array('ee-admin-css'),
-            EVENT_ESPRESSO_VERSION);
-        wp_enqueue_style('espresso_reg');
-        //script
-        wp_register_script('espresso_reg', REG_ASSETS_URL . 'espresso_registrations_admin.js',
-            array('jquery-ui-datepicker', 'jquery-ui-draggable', 'ee_admin_js'), EVENT_ESPRESSO_VERSION, true);
-        wp_enqueue_script('espresso_reg');
-    }
-
-
-    public function load_scripts_styles_edit_attendee()
-    {
-        //stuff to only show up on our attendee edit details page.
-        $attendee_details_translations = array(
-            'att_publish_text' => sprintf(__('Created on: <b>%1$s</b>', 'event_espresso'),
-                $this->_cpt_model_obj->get_datetime('ATT_created')),
-        );
-        wp_localize_script('espresso_reg', 'ATTENDEE_DETAILS', $attendee_details_translations);
-        wp_enqueue_script('jquery-validate');
-    }
-
-
-    public function load_scripts_styles_view_registration()
-    {
-        //styles
-        wp_enqueue_style('espresso-ui-theme');
-        //scripts
-        $this->_get_reg_custom_questions_form($this->_registration->ID());
-        $this->_reg_custom_questions_form->wp_enqueue_scripts(true);
-    }
-
-
-    public function load_scripts_styles_contact_list()
-    {
-        wp_deregister_style('espresso_reg');
-        wp_register_style('espresso_att', REG_ASSETS_URL . 'espresso_attendees_admin.css', array('ee-admin-css'),
-            EVENT_ESPRESSO_VERSION);
-        wp_enqueue_style('espresso_att');
-    }
-
-
-    public function load_scripts_styles_new_registration()
-    {
-        wp_register_script('ee-spco-for-admin', REG_ASSETS_URL . 'spco_for_admin.js', array('underscore', 'jquery'),
-            EVENT_ESPRESSO_VERSION, true);
-        wp_enqueue_script('ee-spco-for-admin');
-        add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true');
-        EE_Form_Section_Proper::wp_enqueue_scripts();
-        EED_Ticket_Selector::load_tckt_slctr_assets();
-        EE_Datepicker_Input::enqueue_styles_and_scripts();
-    }
-
-
-    public function AHEE__EE_Admin_Page__route_admin_request_resend_registration()
-    {
-        add_filter('FHEE_load_EE_messages', '__return_true');
-    }
-
-
-    public function AHEE__EE_Admin_Page__route_admin_request_approve_registration()
-    {
-        add_filter('FHEE_load_EE_messages', '__return_true');
-    }
-
-
-    protected function _set_list_table_views_default()
-    {
-        //for notification related bulk actions we need to make sure only active messengers have an option.
-        EED_Messages::set_autoloaders();
-        /** @type EE_Message_Resource_Manager $message_resource_manager */
-        $message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
-        $active_mts               = $message_resource_manager->list_of_active_message_types();
-        //key= bulk_action_slug, value= message type.
-        $match_array = array(
-            'approve_registration'    => 'registration',
-            'decline_registration'    => 'declined_registration',
-            'pending_registration'    => 'pending_approval',
-            'no_approve_registration' => 'not_approved_registration',
-            'cancel_registration'     => 'cancelled_registration',
-        );
-        /** setup reg status bulk actions **/
-        $def_reg_status_actions['approve_registration'] = __('Approve Registrations', 'event_espresso');
-        if (in_array($match_array['approve_registration'], $active_mts)
-            && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')
-        ) {
-            $def_reg_status_actions['approve_and_notify_registration'] = __('Approve and Notify Registrations',
-                'event_espresso');
-        }
-        $def_reg_status_actions['decline_registration'] = __('Decline Registrations', 'event_espresso');
-        if (in_array($match_array['decline_registration'], $active_mts)
-            && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')
-        ) {
-            $def_reg_status_actions['decline_and_notify_registration'] = __('Decline and Notify Registrations',
-                'event_espresso');
-        }
-        $def_reg_status_actions['pending_registration'] = __('Set Registrations to Pending Payment', 'event_espresso');
-        if (in_array($match_array['pending_registration'], $active_mts)
-            && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')
-        ) {
-            $def_reg_status_actions['pending_and_notify_registration'] = __('Set Registrations to Pending Payment and Notify',
-                'event_espresso');
-        }
-        $def_reg_status_actions['no_approve_registration'] = __('Set Registrations to Not Approved', 'event_espresso');
-        if (in_array($match_array['no_approve_registration'], $active_mts)
-            && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')
-        ) {
-            $def_reg_status_actions['no_approve_and_notify_registration'] = __('Set Registrations to Not Approved and Notify',
-                'event_espresso');
-        }
-        $def_reg_status_actions['cancel_registration'] = __('Cancel Registrations', 'event_espresso');
-        if (in_array($match_array['cancel_registration'], $active_mts)
-            && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')
-        ) {
-            $def_reg_status_actions['cancel_and_notify_registration'] = __('Cancel Registrations and Notify',
-                'event_espresso');
-        }
-        $this->_views = array(
-            'all'   => array(
-                'slug'        => 'all',
-                'label'       => __('View All Registrations', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array_merge($def_reg_status_actions, array(
-                    'trash_registrations' => __('Trash Registrations', 'event_espresso'),
-                )),
-            ),
-            'month' => array(
-                'slug'        => 'month',
-                'label'       => __('This Month', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array_merge($def_reg_status_actions, array(
-                    'trash_registrations' => __('Trash Registrations', 'event_espresso'),
-                )),
-            ),
-            'today' => array(
-                'slug'        => 'today',
-                'label'       => sprintf(__('Today - %s', 'event_espresso'), date('M d, Y', current_time('timestamp'))),
-                'count'       => 0,
-                'bulk_action' => array_merge($def_reg_status_actions, array(
-                    'trash_registrations' => __('Trash Registrations', 'event_espresso'),
-                )),
-            ),
-        );
-        if (EE_Registry::instance()->CAP->current_user_can('ee_delete_registrations',
-            'espresso_registrations_delete_registration')
-        ) {
-            $this->_views['incomplete'] = array(
-                'slug'        => 'incomplete',
-                'label'       => __('Incomplete', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array(
-                    'trash_registrations' => __('Trash Registrations', 'event_espresso'),
-                ),
-            );
-            $this->_views['trash']      = array(
-                'slug'        => 'trash',
-                'label'       => __('Trash', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array(
-                    'restore_registrations' => __('Restore Registrations', 'event_espresso'),
-                    'delete_registrations'  => __('Delete Registrations Permanently', 'event_espresso'),
-                ),
-            );
-        }
-    }
-
-
-    protected function _set_list_table_views_contact_list()
-    {
-        $this->_views = array(
-            'in_use' => array(
-                'slug'        => 'in_use',
-                'label'       => __('In Use', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array(
-                    'trash_attendees' => __('Move to Trash', 'event_espresso'),
-                ),
-            ),
-        );
-        if (EE_Registry::instance()->CAP->current_user_can('ee_delete_contacts',
-            'espresso_registrations_trash_attendees')
-        ) {
-            $this->_views['trash'] = array(
-                'slug'        => 'trash',
-                'label'       => __('Trash', 'event_espresso'),
-                'count'       => 0,
-                'bulk_action' => array(
-                    'restore_attendees' => __('Restore from Trash', 'event_espresso'),
-                ),
-            );
-        }
-    }
-
-
-    protected function _registration_legend_items()
-    {
-        $fc_items = array(
-            'star-icon'        => array(
-                'class' => 'dashicons dashicons-star-filled lt-blue-icon ee-icon-size-8',
-                'desc'  => __('This is the Primary Registrant', 'event_espresso'),
-            ),
-            'view_details'     => array(
-                'class' => 'dashicons dashicons-clipboard',
-                'desc'  => __('View Registration Details', 'event_espresso'),
-            ),
-            'edit_attendee'    => array(
-                'class' => 'ee-icon ee-icon-user-edit ee-icon-size-16',
-                'desc'  => __('Edit Contact Details', 'event_espresso'),
-            ),
-            'view_transaction' => array(
-                'class' => 'dashicons dashicons-cart',
-                'desc'  => __('View Transaction Details', 'event_espresso'),
-            ),
-            'view_invoice'     => array(
-                'class' => 'dashicons dashicons-media-spreadsheet',
-                'desc'  => __('View Transaction Invoice', 'event_espresso'),
-            ),
-        );
-        if (EE_Registry::instance()->CAP->current_user_can('ee_send_message',
-            'espresso_registrations_resend_registration')
-        ) {
-            $fc_items['resend_registration'] = array(
-                'class' => 'dashicons dashicons-email-alt',
-                'desc'  => __('Resend Registration Details', 'event_espresso'),
-            );
-        } else {
-            $fc_items['blank'] = array('class' => 'blank', 'desc' => '');
-        }
-        if (EE_Registry::instance()->CAP->current_user_can('ee_read_global_messages', 'view_filtered_messages')) {
-            $related_for_icon = EEH_MSG_Template::get_message_action_icon('see_notifications_for');
-            if (isset($related_for_icon['css_class']) && isset($related_for_icon['label'])) {
-                $fc_items['view_related_messages'] = array(
-                    'class' => $related_for_icon['css_class'],
-                    'desc'  => $related_for_icon['label'],
-                );
-            }
-        }
-        $sc_items = array(
-            'approved_status'   => array(
-                'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_approved,
-                'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_approved, false, 'sentence'),
-            ),
-            'pending_status'    => array(
-                'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_pending_payment,
-                'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, false, 'sentence'),
-            ),
-            'wait_list'         => array(
-                'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_wait_list,
-                'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_wait_list, false, 'sentence'),
-            ),
-            'incomplete_status' => array(
-                'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_incomplete,
-                'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_incomplete, false, 'sentence'),
-            ),
-            'not_approved'      => array(
-                'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_not_approved,
-                'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, false, 'sentence'),
-            ),
-            'declined_status'   => array(
-                'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_declined,
-                'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_declined, false, 'sentence'),
-            ),
-            'cancelled_status'  => array(
-                'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_cancelled,
-                'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, false, 'sentence'),
-            ),
-        );
-        return array_merge($fc_items, $sc_items);
-    }
-
-
-
-    /***************************************        REGISTRATION OVERVIEW        **************************************/
-    /**
-     * @throws \EE_Error
-     */
-    protected function _registrations_overview_list_table()
-    {
-        $this->_template_args['admin_page_header'] = '';
-        $EVT_ID                                    = ! empty($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : 0;
-        if ($EVT_ID) {
-            if (EE_Registry::instance()->CAP->current_user_can('ee_edit_registrations',
-                'espresso_registrations_new_registration', $EVT_ID)
-            ) {
-                $this->_admin_page_title .= ' ' . $this->get_action_link_or_button('new_registration', 'add-registrant',
-                        array('event_id' => $EVT_ID), 'add-new-h2');
-            }
-            $event = EEM_Event::instance()->get_one_by_ID($EVT_ID);
-            if ($event instanceof EE_Event) {
-                $this->_template_args['admin_page_header'] = sprintf(__('%s Viewing registrations for the event: %s%s',
-                    'event_espresso'), '<h3 style="line-height:1.5em;">',
-                    '<br /><a href="' . EE_Admin_Page::add_query_args_and_nonce(array(
-                        'action' => 'edit',
-                        'post'   => $event->ID(),
-                    ), EVENTS_ADMIN_URL) . '">&nbsp;' . $event->get('EVT_name') . '&nbsp;</a>&nbsp;', '</h3>');
-            }
-            $DTT_ID   = ! empty($this->_req_data['datetime_id']) ? absint($this->_req_data['datetime_id']) : 0;
-            $datetime = EEM_Datetime::instance()->get_one_by_ID($DTT_ID);
-            if ($datetime instanceof EE_Datetime && $this->_template_args['admin_page_header'] !== '') {
-                $this->_template_args['admin_page_header'] = substr($this->_template_args['admin_page_header'], 0, -5);
-                $this->_template_args['admin_page_header'] .= ' &nbsp;<span class="drk-grey-text">';
-                $this->_template_args['admin_page_header'] .= '<span class="dashicons dashicons-calendar"></span>';
-                $this->_template_args['admin_page_header'] .= $datetime->name();
-                $this->_template_args['admin_page_header'] .= ' ( ' . $datetime->start_date() . ' )';
-                $this->_template_args['admin_page_header'] .= '</span></h3>';
-            }
-        }
-        $this->_template_args['after_list_table'] = $this->_display_legend($this->_registration_legend_items());
-        $this->display_admin_list_table_page_with_no_sidebar();
-    }
-
-
-    /**
-     * This sets the _registration property for the registration details screen
-     *
-     * @access private
-     * @return bool
-     */
-    private function _set_registration_object()
-    {
-        //get out if we've already set the object
-        if (is_object($this->_registration)) {
-            return true;
-        }
-        $REG    = EEM_Registration::instance();
-        $REG_ID = ( ! empty($this->_req_data['_REG_ID'])) ? absint($this->_req_data['_REG_ID']) : false;
-        if ($this->_registration = $REG->get_one_by_ID($REG_ID)) {
-            return true;
-        } else {
-            $error_msg = sprintf(__('An error occurred and the details for Registration ID #%s could not be retrieved.',
-                'event_espresso'), $REG_ID);
-            EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
-            $this->_registration = null;
-            return false;
-        }
-    }
-
-
-    /**
-     * Used to retrieve registrations for the list table.
-     *
-     * @param int    $per_page
-     * @param bool   $count
-     * @param bool   $this_month
-     * @param bool   $today
-     * @return \EE_Registration[]|int
-     */
-    public function get_registrations(
-        $per_page = 10,
-        $count = false,
-        $this_month = false,
-        $today = false
-    ) {
-        if( $this_month ) {
-            $this->_req_data['status'] = 'month';
-        }
-        if( $today ) {
-            $this->_req_data['status'] = 'today';
-        }
-        $query_params = $this->_get_registration_query_parameters($this->_req_data, $per_page, $count);
-        /**
-         * Override the default groupby added by EEM_Base so that sorts with multiple order bys work as expected
-         * @link https://events.codebasehq.com/projects/event-espresso/tickets/10093
-         * @see EEM_Base::get_all()
-         */
-        $query_params['group_by'] = '';
-
-        return $count
-            ? EEM_Registration::instance()->count($query_params)
-            /** @type EE_Registration[] */
-            : EEM_Registration::instance()->get_all($query_params);
-    }
-
-
-
-    /**
-     * Retrieves the query parameters to be used by the Registration model for getting registrations.
-     * Note: this listens to values on the request for some of the query parameters.
-     *
-     * @param array $request
-     * @param int    $per_page
-     * @param bool   $count
-     * @return array
-     */
-    protected function _get_registration_query_parameters(
-        $request = array(),
-        $per_page = 10,
-        $count = false
-    ) {
-
-        $query_params = array(
-            0                          => $this->_get_where_conditions_for_registrations_query(
-                $request
-            ),
-            'caps'                     => EEM_Registration::caps_read_admin,
-            'default_where_conditions' => 'this_model_only',
-        );
-        if ( ! $count) {
-            $query_params = array_merge(
-                $query_params,
-                $this->_get_orderby_for_registrations_query(),
-                $this->_get_limit($per_page)
-            );
-        }
-
-        return $query_params;
-    }
-
-
-    /**
-     * This will add EVT_ID to the provided $where array for EE model query parameters.
-     *
-     * @param array $request usually the same as $this->_req_data but not necessarily
-     * @return array
-     */
-    protected function _add_event_id_to_where_conditions(array $request)
-    {
-        $where = array();
-        if ( ! empty($request['event_id'])) {
-            $where['EVT_ID'] = absint($request['event_id']);
-        }
-        return $where;
-    }
-
-
-    /**
-     * Adds category ID if it exists in the request to the where conditions for the registrations query.
-     *
-     * @param array $request usually the same as $this->_req_data but not necessarily
-     * @return array
-     */
-    protected function _add_category_id_to_where_conditions(array $request)
-    {
-        $where = array();
-        if ( ! empty($request['EVT_CAT']) && (int)$request['EVT_CAT'] !== -1) {
-            $where['Event.Term_Taxonomy.term_id'] = absint($request['EVT_CAT']);
-        }
-        return $where;
-    }
-
-
-    /**
-     * Adds the datetime ID if it exists in the request to the where conditions for the registrations query.
-     *
-     * @param array $request usually the same as $this->_req_data but not necessarily
-     * @return array
-     */
-    protected function _add_datetime_id_to_where_conditions(array $request)
-    {
-        $where = array();
-        if ( ! empty($request['datetime_id'])) {
-            $where['Ticket.Datetime.DTT_ID'] = absint($request['datetime_id']);
-        }
-        if( ! empty($request['DTT_ID'])){
-            $where['Ticket.Datetime.DTT_ID'] = absint($request['DTT_ID']);
-        }
-        return $where;
-    }
-
-
-    /**
-     * Adds the correct registration status to the where conditions for the registrations query.
-     *
-     * @param array $request usually the same as $this->_req_data but not necessarily
-     * @return array
-     */
-    protected function _add_registration_status_to_where_conditions(array $request)
-    {
-        $where = array();
-        $view  = EEH_Array::is_set( $request, 'status', '' );
-        $registration_status = ! empty($request['_reg_status'])
-            ? sanitize_text_field($request['_reg_status'])
-            : '';
-
-        /*
+	/**
+	 * @var EE_Registration
+	 */
+	private $_registration;
+
+	/**
+	 * @var EE_Event
+	 */
+	private $_reg_event;
+
+	/**
+	 * @var EE_Session
+	 */
+	private $_session;
+
+	private static $_reg_status;
+
+	/**
+	 * Form for displaying the custom questions for this registration.
+	 * This gets used a few times throughout the request so its best to cache it
+	 *
+	 * @var EE_Registration_Custom_Questions_Form
+	 */
+	protected $_reg_custom_questions_form = null;
+
+
+	/**
+	 *        constructor
+	 *
+	 * @Constructor
+	 * @access public
+	 * @param bool $routing
+	 * @return Registrations_Admin_Page
+	 */
+	public function __construct($routing = true)
+	{
+		parent::__construct($routing);
+		add_action('wp_loaded', array($this, 'wp_loaded'));
+	}
+
+
+	public function wp_loaded()
+	{
+		// when adding a new registration...
+		if (isset($this->_req_data['action']) && $this->_req_data['action'] === 'new_registration') {
+			EE_System::do_not_cache();
+			if ( ! isset($this->_req_data['processing_registration'])
+				 || absint($this->_req_data['processing_registration']) !== 1
+			) {
+				// and it's NOT the attendee information reg step
+				// force cookie expiration by setting time to last week
+				setcookie('ee_registration_added', 0, time() - WEEK_IN_SECONDS, '/');
+				// and update the global
+				$_COOKIE['ee_registration_added'] = 0;
+			}
+		}
+	}
+
+
+	protected function _init_page_props()
+	{
+		$this->page_slug        = REG_PG_SLUG;
+		$this->_admin_base_url  = REG_ADMIN_URL;
+		$this->_admin_base_path = REG_ADMIN;
+		$this->page_label       = __('Registrations', 'event_espresso');
+		$this->_cpt_routes      = array(
+			'add_new_attendee' => 'espresso_attendees',
+			'edit_attendee'    => 'espresso_attendees',
+			'insert_attendee'  => 'espresso_attendees',
+			'update_attendee'  => 'espresso_attendees',
+		);
+		$this->_cpt_model_names = array(
+			'add_new_attendee' => 'EEM_Attendee',
+			'edit_attendee'    => 'EEM_Attendee',
+		);
+		$this->_cpt_edit_routes = array(
+			'espresso_attendees' => 'edit_attendee',
+		);
+		$this->_pagenow_map     = array(
+			'add_new_attendee' => 'post-new.php',
+			'edit_attendee'    => 'post.php',
+			'trash'            => 'post.php',
+		);
+		add_action('edit_form_after_title', array($this, 'after_title_form_fields'), 10);
+		//add filters so that the comment urls don't take users to a confusing 404 page
+		add_filter('get_comment_link', array($this, 'clear_comment_link'), 10, 3);
+	}
+
+
+	public function clear_comment_link($link, $comment, $args)
+	{
+		//gotta make sure this only happens on this route
+		$post_type = get_post_type($comment->comment_post_ID);
+		if ($post_type === 'espresso_attendees') {
+			return '#commentsdiv';
+		}
+		return $link;
+	}
+
+
+	protected function _ajax_hooks()
+	{
+		//todo: all hooks for registrations ajax goes in here
+		add_action('wp_ajax_toggle_checkin_status', array($this, 'toggle_checkin_status'));
+	}
+
+
+	protected function _define_page_props()
+	{
+		$this->_admin_page_title = $this->page_label;
+		$this->_labels           = array(
+			'buttons'                      => array(
+				'add-registrant'      => __('Add New Registration', 'event_espresso'),
+				'add-attendee'        => __('Add Contact', 'event_espresso'),
+				'edit'                => __('Edit Contact', 'event_espresso'),
+				'report'              => __("Event Registrations CSV Report", "event_espresso"),
+				'report_all'          => __('All Registrations CSV Report', 'event_espresso'),
+				'report_filtered'     => __('Filtered CSV Report', 'event_espresso'),
+				'contact_list_report' => __('Contact List Report', 'event_espresso'),
+				'contact_list_export' => __("Export Data", "event_espresso"),
+			),
+			'publishbox'                   => array(
+				'add_new_attendee' => __("Add Contact Record", 'event_espresso'),
+				'edit_attendee'    => __("Update Contact Record", 'event_espresso'),
+			),
+			'hide_add_button_on_cpt_route' => array(
+				'edit_attendee' => true,
+			),
+		);
+	}
+
+
+	/**
+	 *        grab url requests and route them
+	 *
+	 * @access private
+	 * @return void
+	 */
+	public function _set_page_routes()
+	{
+		$this->_get_registration_status_array();
+		$reg_id             = ! empty($this->_req_data['_REG_ID']) && ! is_array($this->_req_data['_REG_ID'])
+			? $this->_req_data['_REG_ID'] : 0;
+		$att_id             = ! empty($this->_req_data['ATT_ID']) && ! is_array($this->_req_data['ATT_ID'])
+			? $this->_req_data['ATT_ID'] : 0;
+		$att_id             = ! empty($this->_req_data['post']) && ! is_array($this->_req_data['post']) ? $this->_req_data['post']
+			: $att_id;
+		$this->_page_routes = array(
+			'default'                            => array(
+				'func'       => '_registrations_overview_list_table',
+				'capability' => 'ee_read_registrations',
+			),
+			'view_registration'                  => array(
+				'func'       => '_registration_details',
+				'capability' => 'ee_read_registration',
+				'obj_id'     => $reg_id,
+			),
+			'edit_registration'                  => array(
+				'func'               => '_update_attendee_registration_form',
+				'noheader'           => true,
+				'headers_sent_route' => 'view_registration',
+				'capability'         => 'ee_edit_registration',
+				'obj_id'             => $reg_id,
+				'_REG_ID'            => $reg_id,
+			),
+			'trash_registrations'                => array(
+				'func'       => '_trash_or_restore_registrations',
+				'args'       => array('trash' => true),
+				'noheader'   => true,
+				'capability' => 'ee_delete_registrations',
+			),
+			'restore_registrations'              => array(
+				'func'       => '_trash_or_restore_registrations',
+				'args'       => array('trash' => false),
+				'noheader'   => true,
+				'capability' => 'ee_delete_registrations',
+			),
+			'delete_registrations'               => array(
+				'func'       => '_delete_registrations',
+				'noheader'   => true,
+				'capability' => 'ee_delete_registrations',
+			),
+			'new_registration'                   => array(
+				'func'       => 'new_registration',
+				'capability' => 'ee_edit_registrations',
+			),
+			'process_reg_step'                   => array(
+				'func'       => 'process_reg_step',
+				'noheader'   => true,
+				'capability' => 'ee_edit_registrations',
+			),
+			'redirect_to_txn'                    => array(
+				'func'       => 'redirect_to_txn',
+				'noheader'   => true,
+				'capability' => 'ee_edit_registrations',
+			),
+			'change_reg_status'                  => array(
+				'func'       => '_change_reg_status',
+				'noheader'   => true,
+				'capability' => 'ee_edit_registration',
+				'obj_id'     => $reg_id,
+			),
+			'approve_registration'               => array(
+				'func'       => 'approve_registration',
+				'noheader'   => true,
+				'capability' => 'ee_edit_registration',
+				'obj_id'     => $reg_id,
+			),
+			'approve_and_notify_registration'    => array(
+				'func'       => 'approve_registration',
+				'noheader'   => true,
+				'args'       => array(true),
+				'capability' => 'ee_edit_registration',
+				'obj_id'     => $reg_id,
+			),
+			'decline_registration'               => array(
+				'func'       => 'decline_registration',
+				'noheader'   => true,
+				'capability' => 'ee_edit_registration',
+				'obj_id'     => $reg_id,
+			),
+			'decline_and_notify_registration'    => array(
+				'func'       => 'decline_registration',
+				'noheader'   => true,
+				'args'       => array(true),
+				'capability' => 'ee_edit_registration',
+				'obj_id'     => $reg_id,
+			),
+			'pending_registration'               => array(
+				'func'       => 'pending_registration',
+				'noheader'   => true,
+				'capability' => 'ee_edit_registration',
+				'obj_id'     => $reg_id,
+			),
+			'pending_and_notify_registration'    => array(
+				'func'       => 'pending_registration',
+				'noheader'   => true,
+				'args'       => array(true),
+				'capability' => 'ee_edit_registration',
+				'obj_id'     => $reg_id,
+			),
+			'no_approve_registration'            => array(
+				'func'       => 'not_approve_registration',
+				'noheader'   => true,
+				'capability' => 'ee_edit_registration',
+				'obj_id'     => $reg_id,
+			),
+			'no_approve_and_notify_registration' => array(
+				'func'       => 'not_approve_registration',
+				'noheader'   => true,
+				'args'       => array(true),
+				'capability' => 'ee_edit_registration',
+				'obj_id'     => $reg_id,
+			),
+			'cancel_registration'                => array(
+				'func'       => 'cancel_registration',
+				'noheader'   => true,
+				'capability' => 'ee_edit_registration',
+				'obj_id'     => $reg_id,
+			),
+			'cancel_and_notify_registration'     => array(
+				'func'       => 'cancel_registration',
+				'noheader'   => true,
+				'args'       => array(true),
+				'capability' => 'ee_edit_registration',
+				'obj_id'     => $reg_id,
+			),
+			'contact_list'                       => array(
+				'func'       => '_attendee_contact_list_table',
+				'capability' => 'ee_read_contacts',
+			),
+			'add_new_attendee'                   => array(
+				'func' => '_create_new_cpt_item',
+				'args' => array(
+					'new_attendee' => true,
+					'capability'   => 'ee_edit_contacts',
+				),
+			),
+			'edit_attendee'                      => array(
+				'func'       => '_edit_cpt_item',
+				'capability' => 'ee_edit_contacts',
+				'obj_id'     => $att_id,
+			),
+			'duplicate_attendee'                 => array(
+				'func'       => '_duplicate_attendee',
+				'noheader'   => true,
+				'capability' => 'ee_edit_contacts',
+				'obj_id'     => $att_id,
+			),
+			'insert_attendee'                    => array(
+				'func'       => '_insert_or_update_attendee',
+				'args'       => array(
+					'new_attendee' => true,
+				),
+				'noheader'   => true,
+				'capability' => 'ee_edit_contacts',
+			),
+			'update_attendee'                    => array(
+				'func'       => '_insert_or_update_attendee',
+				'args'       => array(
+					'new_attendee' => false,
+				),
+				'noheader'   => true,
+				'capability' => 'ee_edit_contacts',
+				'obj_id'     => $att_id,
+			),
+			'trash_attendees'                    => array(
+				'func'       => '_trash_or_restore_attendees',
+				'args'       => array(
+					'trash' => true,
+				),
+				'noheader'   => true,
+				'capability' => 'ee_delete_contacts',
+				'obj_id'     => $att_id,
+			),
+			'restore_attendees'                  => array(
+				'func'       => '_trash_or_restore_attendees',
+				'args'       => array(
+					'trash' => false,
+				),
+				'noheader'   => true,
+				'capability' => 'ee_delete_contacts',
+				'obj_id'     => $att_id,
+			),
+			'resend_registration'                => array(
+				'func'       => '_resend_registration',
+				'noheader'   => true,
+				'capability' => 'ee_send_message',
+			),
+			'registrations_report'               => array(
+				'func'       => '_registrations_report',
+				'noheader'   => true,
+				'capability' => 'ee_read_registrations',
+			),
+			'contact_list_export'                => array(
+				'func'       => '_contact_list_export',
+				'noheader'   => true,
+				'capability' => 'export',
+			),
+			'contact_list_report'                => array(
+				'func'       => '_contact_list_report',
+				'noheader'   => true,
+				'capability' => 'ee_read_contacts',
+			),
+		);
+	}
+
+
+	protected function _set_page_config()
+	{
+		$this->_page_config = array(
+			'default'           => array(
+				'nav'           => array(
+					'label' => __('Overview', 'event_espresso'),
+					'order' => 5,
+				),
+				'help_tabs'     => array(
+					'registrations_overview_help_tab'                       => array(
+						'title'    => __('Registrations Overview', 'event_espresso'),
+						'filename' => 'registrations_overview',
+					),
+					'registrations_overview_table_column_headings_help_tab' => array(
+						'title'    => __('Registrations Table Column Headings', 'event_espresso'),
+						'filename' => 'registrations_overview_table_column_headings',
+					),
+					'registrations_overview_filters_help_tab'               => array(
+						'title'    => __('Registration Filters', 'event_espresso'),
+						'filename' => 'registrations_overview_filters',
+					),
+					'registrations_overview_views_help_tab'                 => array(
+						'title'    => __('Registration Views', 'event_espresso'),
+						'filename' => 'registrations_overview_views',
+					),
+					'registrations_regoverview_other_help_tab'              => array(
+						'title'    => __('Registrations Other', 'event_espresso'),
+						'filename' => 'registrations_overview_other',
+					),
+				),
+				'help_tour'     => array('Registration_Overview_Help_Tour'),
+				'qtips'         => array('Registration_List_Table_Tips'),
+				'list_table'    => 'EE_Registrations_List_Table',
+				'require_nonce' => false,
+			),
+			'view_registration' => array(
+				'nav'           => array(
+					'label'      => __('REG Details', 'event_espresso'),
+					'order'      => 15,
+					'url'        => isset($this->_req_data['_REG_ID'])
+						? add_query_arg(array('_REG_ID' => $this->_req_data['_REG_ID']), $this->_current_page_view_url)
+						: $this->_admin_base_url,
+					'persistent' => false,
+				),
+				'help_tabs'     => array(
+					'registrations_details_help_tab'                    => array(
+						'title'    => __('Registration Details', 'event_espresso'),
+						'filename' => 'registrations_details',
+					),
+					'registrations_details_table_help_tab'              => array(
+						'title'    => __('Registration Details Table', 'event_espresso'),
+						'filename' => 'registrations_details_table',
+					),
+					'registrations_details_form_answers_help_tab'       => array(
+						'title'    => __('Registration Form Answers', 'event_espresso'),
+						'filename' => 'registrations_details_form_answers',
+					),
+					'registrations_details_registrant_details_help_tab' => array(
+						'title'    => __('Contact Details', 'event_espresso'),
+						'filename' => 'registrations_details_registrant_details',
+					),
+				),
+				'help_tour'     => array('Registration_Details_Help_Tour'),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes,
+					array('_registration_details_metaboxes')),
+				'require_nonce' => false,
+			),
+			'new_registration'  => array(
+				'nav'           => array(
+					'label'      => __('Add New Registration', 'event_espresso'),
+					'url'        => '#',
+					'order'      => 15,
+					'persistent' => false,
+				),
+				'metaboxes'     => $this->_default_espresso_metaboxes,
+				'labels'        => array(
+					'publishbox' => __('Save Registration', 'event_espresso'),
+				),
+				'require_nonce' => false,
+			),
+			'add_new_attendee'  => array(
+				'nav'           => array(
+					'label'      => __('Add Contact', 'event_espresso'),
+					'order'      => 15,
+					'persistent' => false,
+				),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes,
+					array('_publish_post_box', 'attendee_editor_metaboxes')),
+				'require_nonce' => false,
+			),
+			'edit_attendee'     => array(
+				'nav'           => array(
+					'label'      => __('Edit Contact', 'event_espresso'),
+					'order'      => 15,
+					'persistent' => false,
+					'url'        => isset($this->_req_data['ATT_ID'])
+						? add_query_arg(array('ATT_ID' => $this->_req_data['ATT_ID']), $this->_current_page_view_url)
+						: $this->_admin_base_url,
+				),
+				'metaboxes'     => array('attendee_editor_metaboxes'),
+				'require_nonce' => false,
+			),
+			'contact_list'      => array(
+				'nav'           => array(
+					'label' => __('Contact List', 'event_espresso'),
+					'order' => 20,
+				),
+				'list_table'    => 'EE_Attendee_Contact_List_Table',
+				'help_tabs'     => array(
+					'registrations_contact_list_help_tab'                       => array(
+						'title'    => __('Registrations Contact List', 'event_espresso'),
+						'filename' => 'registrations_contact_list',
+					),
+					'registrations_contact-list_table_column_headings_help_tab' => array(
+						'title'    => __('Contact List Table Column Headings', 'event_espresso'),
+						'filename' => 'registrations_contact_list_table_column_headings',
+					),
+					'registrations_contact_list_views_help_tab'                 => array(
+						'title'    => __('Contact List Views', 'event_espresso'),
+						'filename' => 'registrations_contact_list_views',
+					),
+					'registrations_contact_list_other_help_tab'                 => array(
+						'title'    => __('Contact List Other', 'event_espresso'),
+						'filename' => 'registrations_contact_list_other',
+					),
+				),
+				'help_tour'     => array('Contact_List_Help_Tour'),
+				'metaboxes'     => array(),
+				'require_nonce' => false,
+			),
+			//override default cpt routes
+			'create_new'        => '',
+			'edit'              => '',
+		);
+	}
+
+
+	/**
+	 * The below methods aren't used by this class currently
+	 */
+	protected function _add_screen_options()
+	{
+	}
+
+
+	protected function _add_feature_pointers()
+	{
+	}
+
+
+	public function admin_init()
+	{
+		EE_Registry::$i18n_js_strings['update_att_qstns'] = __('click "Update Registration Questions" to save your changes',
+			'event_espresso');
+	}
+
+
+	public function admin_notices()
+	{
+	}
+
+
+	public function admin_footer_scripts()
+	{
+	}
+
+
+	/**
+	 *        get list of registration statuses
+	 *
+	 * @access private
+	 * @return void
+	 */
+	private function _get_registration_status_array()
+	{
+		self::$_reg_status = EEM_Registration::reg_status_array(array(), true);
+	}
+
+
+	protected function _add_screen_options_default()
+	{
+		$this->_per_page_screen_option();
+	}
+
+
+	protected function _add_screen_options_contact_list()
+	{
+		$page_title              = $this->_admin_page_title;
+		$this->_admin_page_title = __("Contacts", 'event_espresso');
+		$this->_per_page_screen_option();
+		$this->_admin_page_title = $page_title;
+	}
+
+
+	public function load_scripts_styles()
+	{
+		//style
+		//wp_register_style('espresso_attendees', ATT_ASSETS_URL . 'espresso_attendees_admin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_reg', REG_ASSETS_URL . 'espresso_registrations_admin.css', array('ee-admin-css'),
+			EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('espresso_reg');
+		//script
+		wp_register_script('espresso_reg', REG_ASSETS_URL . 'espresso_registrations_admin.js',
+			array('jquery-ui-datepicker', 'jquery-ui-draggable', 'ee_admin_js'), EVENT_ESPRESSO_VERSION, true);
+		wp_enqueue_script('espresso_reg');
+	}
+
+
+	public function load_scripts_styles_edit_attendee()
+	{
+		//stuff to only show up on our attendee edit details page.
+		$attendee_details_translations = array(
+			'att_publish_text' => sprintf(__('Created on: <b>%1$s</b>', 'event_espresso'),
+				$this->_cpt_model_obj->get_datetime('ATT_created')),
+		);
+		wp_localize_script('espresso_reg', 'ATTENDEE_DETAILS', $attendee_details_translations);
+		wp_enqueue_script('jquery-validate');
+	}
+
+
+	public function load_scripts_styles_view_registration()
+	{
+		//styles
+		wp_enqueue_style('espresso-ui-theme');
+		//scripts
+		$this->_get_reg_custom_questions_form($this->_registration->ID());
+		$this->_reg_custom_questions_form->wp_enqueue_scripts(true);
+	}
+
+
+	public function load_scripts_styles_contact_list()
+	{
+		wp_deregister_style('espresso_reg');
+		wp_register_style('espresso_att', REG_ASSETS_URL . 'espresso_attendees_admin.css', array('ee-admin-css'),
+			EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('espresso_att');
+	}
+
+
+	public function load_scripts_styles_new_registration()
+	{
+		wp_register_script('ee-spco-for-admin', REG_ASSETS_URL . 'spco_for_admin.js', array('underscore', 'jquery'),
+			EVENT_ESPRESSO_VERSION, true);
+		wp_enqueue_script('ee-spco-for-admin');
+		add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true');
+		EE_Form_Section_Proper::wp_enqueue_scripts();
+		EED_Ticket_Selector::load_tckt_slctr_assets();
+		EE_Datepicker_Input::enqueue_styles_and_scripts();
+	}
+
+
+	public function AHEE__EE_Admin_Page__route_admin_request_resend_registration()
+	{
+		add_filter('FHEE_load_EE_messages', '__return_true');
+	}
+
+
+	public function AHEE__EE_Admin_Page__route_admin_request_approve_registration()
+	{
+		add_filter('FHEE_load_EE_messages', '__return_true');
+	}
+
+
+	protected function _set_list_table_views_default()
+	{
+		//for notification related bulk actions we need to make sure only active messengers have an option.
+		EED_Messages::set_autoloaders();
+		/** @type EE_Message_Resource_Manager $message_resource_manager */
+		$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+		$active_mts               = $message_resource_manager->list_of_active_message_types();
+		//key= bulk_action_slug, value= message type.
+		$match_array = array(
+			'approve_registration'    => 'registration',
+			'decline_registration'    => 'declined_registration',
+			'pending_registration'    => 'pending_approval',
+			'no_approve_registration' => 'not_approved_registration',
+			'cancel_registration'     => 'cancelled_registration',
+		);
+		/** setup reg status bulk actions **/
+		$def_reg_status_actions['approve_registration'] = __('Approve Registrations', 'event_espresso');
+		if (in_array($match_array['approve_registration'], $active_mts)
+			&& EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')
+		) {
+			$def_reg_status_actions['approve_and_notify_registration'] = __('Approve and Notify Registrations',
+				'event_espresso');
+		}
+		$def_reg_status_actions['decline_registration'] = __('Decline Registrations', 'event_espresso');
+		if (in_array($match_array['decline_registration'], $active_mts)
+			&& EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')
+		) {
+			$def_reg_status_actions['decline_and_notify_registration'] = __('Decline and Notify Registrations',
+				'event_espresso');
+		}
+		$def_reg_status_actions['pending_registration'] = __('Set Registrations to Pending Payment', 'event_espresso');
+		if (in_array($match_array['pending_registration'], $active_mts)
+			&& EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')
+		) {
+			$def_reg_status_actions['pending_and_notify_registration'] = __('Set Registrations to Pending Payment and Notify',
+				'event_espresso');
+		}
+		$def_reg_status_actions['no_approve_registration'] = __('Set Registrations to Not Approved', 'event_espresso');
+		if (in_array($match_array['no_approve_registration'], $active_mts)
+			&& EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')
+		) {
+			$def_reg_status_actions['no_approve_and_notify_registration'] = __('Set Registrations to Not Approved and Notify',
+				'event_espresso');
+		}
+		$def_reg_status_actions['cancel_registration'] = __('Cancel Registrations', 'event_espresso');
+		if (in_array($match_array['cancel_registration'], $active_mts)
+			&& EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')
+		) {
+			$def_reg_status_actions['cancel_and_notify_registration'] = __('Cancel Registrations and Notify',
+				'event_espresso');
+		}
+		$this->_views = array(
+			'all'   => array(
+				'slug'        => 'all',
+				'label'       => __('View All Registrations', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array_merge($def_reg_status_actions, array(
+					'trash_registrations' => __('Trash Registrations', 'event_espresso'),
+				)),
+			),
+			'month' => array(
+				'slug'        => 'month',
+				'label'       => __('This Month', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array_merge($def_reg_status_actions, array(
+					'trash_registrations' => __('Trash Registrations', 'event_espresso'),
+				)),
+			),
+			'today' => array(
+				'slug'        => 'today',
+				'label'       => sprintf(__('Today - %s', 'event_espresso'), date('M d, Y', current_time('timestamp'))),
+				'count'       => 0,
+				'bulk_action' => array_merge($def_reg_status_actions, array(
+					'trash_registrations' => __('Trash Registrations', 'event_espresso'),
+				)),
+			),
+		);
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_registrations',
+			'espresso_registrations_delete_registration')
+		) {
+			$this->_views['incomplete'] = array(
+				'slug'        => 'incomplete',
+				'label'       => __('Incomplete', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array(
+					'trash_registrations' => __('Trash Registrations', 'event_espresso'),
+				),
+			);
+			$this->_views['trash']      = array(
+				'slug'        => 'trash',
+				'label'       => __('Trash', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array(
+					'restore_registrations' => __('Restore Registrations', 'event_espresso'),
+					'delete_registrations'  => __('Delete Registrations Permanently', 'event_espresso'),
+				),
+			);
+		}
+	}
+
+
+	protected function _set_list_table_views_contact_list()
+	{
+		$this->_views = array(
+			'in_use' => array(
+				'slug'        => 'in_use',
+				'label'       => __('In Use', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array(
+					'trash_attendees' => __('Move to Trash', 'event_espresso'),
+				),
+			),
+		);
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_contacts',
+			'espresso_registrations_trash_attendees')
+		) {
+			$this->_views['trash'] = array(
+				'slug'        => 'trash',
+				'label'       => __('Trash', 'event_espresso'),
+				'count'       => 0,
+				'bulk_action' => array(
+					'restore_attendees' => __('Restore from Trash', 'event_espresso'),
+				),
+			);
+		}
+	}
+
+
+	protected function _registration_legend_items()
+	{
+		$fc_items = array(
+			'star-icon'        => array(
+				'class' => 'dashicons dashicons-star-filled lt-blue-icon ee-icon-size-8',
+				'desc'  => __('This is the Primary Registrant', 'event_espresso'),
+			),
+			'view_details'     => array(
+				'class' => 'dashicons dashicons-clipboard',
+				'desc'  => __('View Registration Details', 'event_espresso'),
+			),
+			'edit_attendee'    => array(
+				'class' => 'ee-icon ee-icon-user-edit ee-icon-size-16',
+				'desc'  => __('Edit Contact Details', 'event_espresso'),
+			),
+			'view_transaction' => array(
+				'class' => 'dashicons dashicons-cart',
+				'desc'  => __('View Transaction Details', 'event_espresso'),
+			),
+			'view_invoice'     => array(
+				'class' => 'dashicons dashicons-media-spreadsheet',
+				'desc'  => __('View Transaction Invoice', 'event_espresso'),
+			),
+		);
+		if (EE_Registry::instance()->CAP->current_user_can('ee_send_message',
+			'espresso_registrations_resend_registration')
+		) {
+			$fc_items['resend_registration'] = array(
+				'class' => 'dashicons dashicons-email-alt',
+				'desc'  => __('Resend Registration Details', 'event_espresso'),
+			);
+		} else {
+			$fc_items['blank'] = array('class' => 'blank', 'desc' => '');
+		}
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_global_messages', 'view_filtered_messages')) {
+			$related_for_icon = EEH_MSG_Template::get_message_action_icon('see_notifications_for');
+			if (isset($related_for_icon['css_class']) && isset($related_for_icon['label'])) {
+				$fc_items['view_related_messages'] = array(
+					'class' => $related_for_icon['css_class'],
+					'desc'  => $related_for_icon['label'],
+				);
+			}
+		}
+		$sc_items = array(
+			'approved_status'   => array(
+				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_approved,
+				'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_approved, false, 'sentence'),
+			),
+			'pending_status'    => array(
+				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_pending_payment,
+				'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, false, 'sentence'),
+			),
+			'wait_list'         => array(
+				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_wait_list,
+				'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_wait_list, false, 'sentence'),
+			),
+			'incomplete_status' => array(
+				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_incomplete,
+				'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_incomplete, false, 'sentence'),
+			),
+			'not_approved'      => array(
+				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_not_approved,
+				'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, false, 'sentence'),
+			),
+			'declined_status'   => array(
+				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_declined,
+				'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_declined, false, 'sentence'),
+			),
+			'cancelled_status'  => array(
+				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_cancelled,
+				'desc'  => EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, false, 'sentence'),
+			),
+		);
+		return array_merge($fc_items, $sc_items);
+	}
+
+
+
+	/***************************************        REGISTRATION OVERVIEW        **************************************/
+	/**
+	 * @throws \EE_Error
+	 */
+	protected function _registrations_overview_list_table()
+	{
+		$this->_template_args['admin_page_header'] = '';
+		$EVT_ID                                    = ! empty($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : 0;
+		if ($EVT_ID) {
+			if (EE_Registry::instance()->CAP->current_user_can('ee_edit_registrations',
+				'espresso_registrations_new_registration', $EVT_ID)
+			) {
+				$this->_admin_page_title .= ' ' . $this->get_action_link_or_button('new_registration', 'add-registrant',
+						array('event_id' => $EVT_ID), 'add-new-h2');
+			}
+			$event = EEM_Event::instance()->get_one_by_ID($EVT_ID);
+			if ($event instanceof EE_Event) {
+				$this->_template_args['admin_page_header'] = sprintf(__('%s Viewing registrations for the event: %s%s',
+					'event_espresso'), '<h3 style="line-height:1.5em;">',
+					'<br /><a href="' . EE_Admin_Page::add_query_args_and_nonce(array(
+						'action' => 'edit',
+						'post'   => $event->ID(),
+					), EVENTS_ADMIN_URL) . '">&nbsp;' . $event->get('EVT_name') . '&nbsp;</a>&nbsp;', '</h3>');
+			}
+			$DTT_ID   = ! empty($this->_req_data['datetime_id']) ? absint($this->_req_data['datetime_id']) : 0;
+			$datetime = EEM_Datetime::instance()->get_one_by_ID($DTT_ID);
+			if ($datetime instanceof EE_Datetime && $this->_template_args['admin_page_header'] !== '') {
+				$this->_template_args['admin_page_header'] = substr($this->_template_args['admin_page_header'], 0, -5);
+				$this->_template_args['admin_page_header'] .= ' &nbsp;<span class="drk-grey-text">';
+				$this->_template_args['admin_page_header'] .= '<span class="dashicons dashicons-calendar"></span>';
+				$this->_template_args['admin_page_header'] .= $datetime->name();
+				$this->_template_args['admin_page_header'] .= ' ( ' . $datetime->start_date() . ' )';
+				$this->_template_args['admin_page_header'] .= '</span></h3>';
+			}
+		}
+		$this->_template_args['after_list_table'] = $this->_display_legend($this->_registration_legend_items());
+		$this->display_admin_list_table_page_with_no_sidebar();
+	}
+
+
+	/**
+	 * This sets the _registration property for the registration details screen
+	 *
+	 * @access private
+	 * @return bool
+	 */
+	private function _set_registration_object()
+	{
+		//get out if we've already set the object
+		if (is_object($this->_registration)) {
+			return true;
+		}
+		$REG    = EEM_Registration::instance();
+		$REG_ID = ( ! empty($this->_req_data['_REG_ID'])) ? absint($this->_req_data['_REG_ID']) : false;
+		if ($this->_registration = $REG->get_one_by_ID($REG_ID)) {
+			return true;
+		} else {
+			$error_msg = sprintf(__('An error occurred and the details for Registration ID #%s could not be retrieved.',
+				'event_espresso'), $REG_ID);
+			EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
+			$this->_registration = null;
+			return false;
+		}
+	}
+
+
+	/**
+	 * Used to retrieve registrations for the list table.
+	 *
+	 * @param int    $per_page
+	 * @param bool   $count
+	 * @param bool   $this_month
+	 * @param bool   $today
+	 * @return \EE_Registration[]|int
+	 */
+	public function get_registrations(
+		$per_page = 10,
+		$count = false,
+		$this_month = false,
+		$today = false
+	) {
+		if( $this_month ) {
+			$this->_req_data['status'] = 'month';
+		}
+		if( $today ) {
+			$this->_req_data['status'] = 'today';
+		}
+		$query_params = $this->_get_registration_query_parameters($this->_req_data, $per_page, $count);
+		/**
+		 * Override the default groupby added by EEM_Base so that sorts with multiple order bys work as expected
+		 * @link https://events.codebasehq.com/projects/event-espresso/tickets/10093
+		 * @see EEM_Base::get_all()
+		 */
+		$query_params['group_by'] = '';
+
+		return $count
+			? EEM_Registration::instance()->count($query_params)
+			/** @type EE_Registration[] */
+			: EEM_Registration::instance()->get_all($query_params);
+	}
+
+
+
+	/**
+	 * Retrieves the query parameters to be used by the Registration model for getting registrations.
+	 * Note: this listens to values on the request for some of the query parameters.
+	 *
+	 * @param array $request
+	 * @param int    $per_page
+	 * @param bool   $count
+	 * @return array
+	 */
+	protected function _get_registration_query_parameters(
+		$request = array(),
+		$per_page = 10,
+		$count = false
+	) {
+
+		$query_params = array(
+			0                          => $this->_get_where_conditions_for_registrations_query(
+				$request
+			),
+			'caps'                     => EEM_Registration::caps_read_admin,
+			'default_where_conditions' => 'this_model_only',
+		);
+		if ( ! $count) {
+			$query_params = array_merge(
+				$query_params,
+				$this->_get_orderby_for_registrations_query(),
+				$this->_get_limit($per_page)
+			);
+		}
+
+		return $query_params;
+	}
+
+
+	/**
+	 * This will add EVT_ID to the provided $where array for EE model query parameters.
+	 *
+	 * @param array $request usually the same as $this->_req_data but not necessarily
+	 * @return array
+	 */
+	protected function _add_event_id_to_where_conditions(array $request)
+	{
+		$where = array();
+		if ( ! empty($request['event_id'])) {
+			$where['EVT_ID'] = absint($request['event_id']);
+		}
+		return $where;
+	}
+
+
+	/**
+	 * Adds category ID if it exists in the request to the where conditions for the registrations query.
+	 *
+	 * @param array $request usually the same as $this->_req_data but not necessarily
+	 * @return array
+	 */
+	protected function _add_category_id_to_where_conditions(array $request)
+	{
+		$where = array();
+		if ( ! empty($request['EVT_CAT']) && (int)$request['EVT_CAT'] !== -1) {
+			$where['Event.Term_Taxonomy.term_id'] = absint($request['EVT_CAT']);
+		}
+		return $where;
+	}
+
+
+	/**
+	 * Adds the datetime ID if it exists in the request to the where conditions for the registrations query.
+	 *
+	 * @param array $request usually the same as $this->_req_data but not necessarily
+	 * @return array
+	 */
+	protected function _add_datetime_id_to_where_conditions(array $request)
+	{
+		$where = array();
+		if ( ! empty($request['datetime_id'])) {
+			$where['Ticket.Datetime.DTT_ID'] = absint($request['datetime_id']);
+		}
+		if( ! empty($request['DTT_ID'])){
+			$where['Ticket.Datetime.DTT_ID'] = absint($request['DTT_ID']);
+		}
+		return $where;
+	}
+
+
+	/**
+	 * Adds the correct registration status to the where conditions for the registrations query.
+	 *
+	 * @param array $request usually the same as $this->_req_data but not necessarily
+	 * @return array
+	 */
+	protected function _add_registration_status_to_where_conditions(array $request)
+	{
+		$where = array();
+		$view  = EEH_Array::is_set( $request, 'status', '' );
+		$registration_status = ! empty($request['_reg_status'])
+			? sanitize_text_field($request['_reg_status'])
+			: '';
+
+		/*
          * If filtering by registration status, then we show registrations matching that status.
          * If not filtering by specified status, then we show all registrations excluding incomplete registrations UNLESS
          * viewing trashed registrations.
          */
-        if ( ! empty($registration_status)) {
-            $where['STS_ID'] = $registration_status;
-        } else {
-            //make sure we exclude incomplete registrations, but only if not trashed.
-            if ($view === 'trash') {
-                $where['REG_deleted'] = true;
-            } else if ($view === 'incomplete') {
-                $where['STS_ID'] = EEM_Registration::status_id_incomplete;
-            } else {
-                $where['STS_ID'] = array('!=', EEM_Registration::status_id_incomplete);
-            }
-        }
-        return $where;
-    }
-
-
-    /**
-     * Adds any provided date restraints to the where conditions for the registrations query.
-     *
-     * @param array $request usually the same as $this->_req_data but not necessarily
-     * @return array
-     */
-    protected function _add_date_to_where_conditions(array $request)
-    {
-        $where = array();
-        $view  = EEH_Array::is_set( $request, 'status', '' );
-        $month_range             = ! empty($request['month_range'])
-            ? sanitize_text_field($request['month_range'])
-            : '';
-        $retrieve_for_today      = $view === 'today';
-        $retrieve_for_this_month = $view === 'month';
-
-        if ($retrieve_for_today) {
-            $now               = date('Y-m-d', current_time('timestamp'));
-            $where['REG_date'] = array(
-                'BETWEEN',
-                array(
-                    EEM_Registration::instance()->convert_datetime_for_query(
-                        'REG_date',
-                        $now . ' 00:00:00',
-                        'Y-m-d H:i:s'
-                    ),
-                    EEM_Registration::instance()->convert_datetime_for_query(
-                        'REG_date',
-                        $now . ' 23:59:59',
-                        'Y-m-d H:i:s'
-                    ),
-                ),
-            );
-        } elseif ($retrieve_for_this_month) {
-            $current_year_and_month = date('Y-m', current_time('timestamp'));
-            $days_this_month        = date('t', current_time('timestamp'));
-            $where['REG_date']      = array(
-                'BETWEEN',
-                array(
-                    EEM_Registration::instance()->convert_datetime_for_query(
-                        'REG_date',
-                        $current_year_and_month . '-01 00:00:00',
-                        'Y-m-d H:i:s'
-                    ),
-                    EEM_Registration::instance()->convert_datetime_for_query(
-                        'REG_date',
-                        $current_year_and_month . '-' . $days_this_month . ' 23:59:59',
-                        'Y-m-d H:i:s'
-                    ),
-                ),
-            );
-        } elseif ($month_range) {
-            $pieces          = explode(' ', $month_range, 3);
-            $month_requested = ! empty($pieces[0])
-                ? date('m', \EEH_DTT_Helper::first_of_month_timestamp($pieces[0]))
-                : '';
-            $year_requested  = ! empty($pieces[1])
-                ? $pieces[1]
-                : '';
-            //if there is not a month or year then we can't go further
-            if ($month_requested && $year_requested) {
-                $days_in_month     = date('t', strtotime($year_requested . '-' . $month_requested . '-' . '01'));
-                $where['REG_date'] = array(
-                    'BETWEEN',
-                    array(
-                        EEM_Registration::instance()->convert_datetime_for_query(
-                            'REG_date',
-                            $year_requested . '-' . $month_requested . '-01 00:00:00',
-                            'Y-m-d H:i:s'
-                        ),
-                        EEM_Registration::instance()->convert_datetime_for_query(
-                            'REG_date',
-                            $year_requested . '-' . $month_requested . '-' . $days_in_month . ' 23:59:59',
-                            'Y-m-d H:i:s'
-                        ),
-                    ),
-                );
-            }
-        }
-        return $where;
-    }
-
-
-    /**
-     * Adds any provided search restraints to the where conditions for the registrations query
-     *
-     * @param array $request usually the same as $this->_req_data but not necessarily
-     * @return array
-     */
-    protected function _add_search_to_where_conditions(array $request)
-    {
-        $where = array();
-        if ( ! empty($request['s'])) {
-            $search_string = '%' . sanitize_text_field($request['s']) . '%';
-            $where['OR'] = array(
-                'Event.EVT_name'                          => array('LIKE', $search_string),
-                'Event.EVT_desc'                          => array('LIKE', $search_string),
-                'Event.EVT_short_desc'                    => array('LIKE', $search_string),
-                'Attendee.ATT_full_name'                  => array('LIKE', $search_string),
-                'Attendee.ATT_fname'                      => array('LIKE', $search_string),
-                'Attendee.ATT_lname'                      => array('LIKE', $search_string),
-                'Attendee.ATT_short_bio'                  => array('LIKE', $search_string),
-                'Attendee.ATT_email'                      => array('LIKE', $search_string),
-                'Attendee.ATT_address'                    => array('LIKE', $search_string),
-                'Attendee.ATT_address2'                   => array('LIKE', $search_string),
-                'Attendee.ATT_city'                       => array('LIKE', $search_string),
-                'REG_final_price'                         => array('LIKE', $search_string),
-                'REG_code'                                => array('LIKE', $search_string),
-                'REG_count'                               => array('LIKE', $search_string),
-                'REG_group_size'                          => array('LIKE', $search_string),
-                'Ticket.TKT_name'                         => array('LIKE', $search_string),
-                'Ticket.TKT_description'                  => array('LIKE', $search_string),
-                'Transaction.Payment.PAY_txn_id_chq_nmbr' => array('LIKE', $search_string),
-            );
-        }
-        return $where;
-    }
-
-
-    /**
-     * Sets up the where conditions for the registrations query.
-     *
-     * @param array $request
-     * @return array
-     */
-    protected function _get_where_conditions_for_registrations_query($request)
-    {
-        return array_merge(
-            $this->_add_event_id_to_where_conditions($request),
-            $this->_add_category_id_to_where_conditions($request),
-            $this->_add_datetime_id_to_where_conditions($request),
-            $this->_add_registration_status_to_where_conditions($request),
-            $this->_add_date_to_where_conditions($request),
-            $this->_add_search_to_where_conditions($request)
-        );
-    }
-
-
-    /**
-     * Sets up the orderby for the registrations query.
-     *
-     * @return array
-     */
-    protected function _get_orderby_for_registrations_query()
-    {
-        $orderby_field = ! empty($this->_req_data['orderby'])
-            ? sanitize_text_field($this->_req_data['orderby'])
-            : '';
-        switch ($orderby_field) {
-            case '_REG_ID':
-                $orderby_field = 'REG_ID';
-                break;
-            case '_Reg_status':
-                $orderby_field = 'STS_ID';
-                break;
-            case 'ATT_fname':
-                $orderby_field = array('Attendee.ATT_fname', 'Attendee.ATT_lname');
-                break;
-            case 'ATT_lname' :
-                $orderby_field = array('Attendee.ATT_lname', 'Attendee.ATT_fname');
-                break;
-            case 'event_name':
-                $orderby_field = 'Event.EVT_name';
-                break;
-            case 'DTT_EVT_start':
-                $orderby_field = 'Event.Datetime.DTT_EVT_start';
-                break;
-            default: //'REG_date'
-                $orderby_field = 'REG_date';
-        }
-
-        //order
-        $order = ! empty($this->_req_data['order'])
-            ? sanitize_text_field($this->_req_data['order'])
-            : 'DESC';
-
-        //mutate orderby_field
-        $orderby_field = array_combine(
-                (array) $orderby_field,
-                array_fill(0, count($orderby_field), $order)
-            );
-        return array('order_by' => $orderby_field);
-    }
-
-
-    /**
-     * Sets up the limit for the registrations query.
-     *
-     * @param $per_page
-     * @return array
-     */
-    protected function _get_limit($per_page)
-    {
-        $current_page = ! empty($this->_req_data['paged'])
-            ? absint($this->_req_data['paged'])
-            : 1;
-        $per_page     = ! empty($this->_req_data['perpage'])
-            ? $this->_req_data['perpage']
-            : $per_page;
-
-        //-1 means return all results so get out if that's set.
-        if ((int)$per_page === -1) {
-            return array();
-        }
-        $per_page = absint($per_page);
-        $offset   = ($current_page - 1) * $per_page;
-        return array('limit' => array($offset, $per_page));
-    }
-
-
-    public function get_registration_status_array()
-    {
-        return self::$_reg_status;
-    }
-
-
-
-
-    /***************************************        REGISTRATION DETAILS        ***************************************/
-    /**
-     *        generates HTML for the View Registration Details Admin page
-     *
-     * @access protected
-     * @return void
-     */
-    protected function _registration_details()
-    {
-        $this->_template_args = array();
-        $this->_set_registration_object();
-        if (is_object($this->_registration)) {
-            $transaction                                   = $this->_registration->transaction() ? $this->_registration->transaction()
-                : EE_Transaction::new_instance();
-            $this->_session                                = $transaction->session_data();
-            $event_id                                      = $this->_registration->event_ID();
-            $this->_template_args['reg_nmbr']['value']     = $this->_registration->ID();
-            $this->_template_args['reg_nmbr']['label']     = __('Registration Number', 'event_espresso');
-            $this->_template_args['reg_datetime']['value'] = $this->_registration->get_i18n_datetime('REG_date');
-            $this->_template_args['reg_datetime']['label'] = __('Date', 'event_espresso');
-            $this->_template_args['grand_total']           = $transaction->total();
-            $this->_template_args['currency_sign']         = EE_Registry::instance()->CFG->currency->sign;
-            // link back to overview
-            $this->_template_args['reg_overview_url']            = REG_ADMIN_URL;
-            $this->_template_args['registration']                = $this->_registration;
-            $this->_template_args['filtered_registrations_link'] = EE_Admin_Page::add_query_args_and_nonce(array(
-                'action'   => 'default',
-                'event_id' => $event_id,
-            ), REG_ADMIN_URL);
-            $this->_template_args['filtered_transactions_link']  = EE_Admin_Page::add_query_args_and_nonce(array(
-                'action' => 'default',
-                'EVT_ID' => $event_id,
-                'page'   => 'espresso_transactions',
-            ), admin_url('admin.php'));
-            $this->_template_args['event_link']                  = EE_Admin_Page::add_query_args_and_nonce(array(
-                'page'   => 'espresso_events',
-                'action' => 'edit',
-                'post'   => $event_id,
-            ), admin_url('admin.php'));
-            //next and previous links
-            $next_reg                                      = $this->_registration->next(null, array(), 'REG_ID');
-            $this->_template_args['next_registration']     = $next_reg
-                ? $this->_next_link(EE_Admin_Page::add_query_args_and_nonce(array(
-                    'action'  => 'view_registration',
-                    '_REG_ID' => $next_reg['REG_ID'],
-                ), REG_ADMIN_URL), 'dashicons dashicons-arrow-right ee-icon-size-22') : '';
-            $previous_reg                                  = $this->_registration->previous(null, array(), 'REG_ID');
-            $this->_template_args['previous_registration'] = $previous_reg
-                ? $this->_previous_link(EE_Admin_Page::add_query_args_and_nonce(array(
-                    'action'  => 'view_registration',
-                    '_REG_ID' => $previous_reg['REG_ID'],
-                ), REG_ADMIN_URL), 'dashicons dashicons-arrow-left ee-icon-size-22') : '';
-            // grab header
-            $template_path                             = REG_TEMPLATE_PATH . 'reg_admin_details_header.template.php';
-            $this->_template_args['REG_ID']            = $this->_registration->ID();
-            $this->_template_args['admin_page_header'] = EEH_Template::display_template($template_path,
-                $this->_template_args, true);
-        } else {
-            $this->_template_args['admin_page_header'] = $this->display_espresso_notices();
-        }
-        // the details template wrapper
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    protected function _registration_details_metaboxes()
-    {
-        do_action('AHEE__Registrations_Admin_Page___registration_details_metabox__start', $this);
-        $this->_set_registration_object();
-        $attendee = $this->_registration instanceof EE_Registration ? $this->_registration->attendee() : null;
-        add_meta_box('edit-reg-status-mbox', __('Registration Status', 'event_espresso'),
-            array($this, 'set_reg_status_buttons_metabox'), $this->wp_page_slug, 'normal', 'high');
-        add_meta_box('edit-reg-details-mbox', __('Registration Details', 'event_espresso'),
-            array($this, '_reg_details_meta_box'), $this->wp_page_slug, 'normal', 'high');
-        if ($attendee instanceof EE_Attendee
-            && EE_Registry::instance()->CAP->current_user_can('ee_edit_registration', 'edit-reg-questions-mbox')
-        ) {
-            add_meta_box('edit-reg-questions-mbox', __('Registration Form Answers', 'event_espresso'),
-                array($this, '_reg_questions_meta_box'), $this->wp_page_slug, 'normal', 'high');
-        }
-        add_meta_box('edit-reg-registrant-mbox', __('Contact Details', 'event_espresso'),
-            array($this, '_reg_registrant_side_meta_box'), $this->wp_page_slug, 'side', 'high');
-        if ($this->_registration->group_size() > 1) {
-            add_meta_box('edit-reg-attendees-mbox', __('Other Registrations in this Transaction', 'event_espresso'),
-                array($this, '_reg_attendees_meta_box'), $this->wp_page_slug, 'normal', 'high');
-        }
-    }
-
-
-    /**
-     * set_reg_status_buttons_metabox
-     *
-     * @access protected
-     * @return string
-     * @throws \EE_Error
-     */
-    public function set_reg_status_buttons_metabox()
-    {
-        $this->_set_registration_object();
-        $change_reg_status_form = $this->_generate_reg_status_change_form();
-        echo $change_reg_status_form->form_open(self::add_query_args_and_nonce(array(
-            'action' => 'change_reg_status',
-        ), REG_ADMIN_URL));
-        echo $change_reg_status_form->get_html();
-        echo $change_reg_status_form->form_close();
-    }
-
-
-    /**
-     * @return EE_Form_Section_Proper
-     */
-    protected function _generate_reg_status_change_form()
-    {
-        return new EE_Form_Section_Proper(array(
-            'name'            => 'reg_status_change_form',
-            'html_id'         => 'reg-status-change-form',
-            'layout_strategy' => new EE_Admin_Two_Column_Layout(),
-            'subsections'     => array(
-                'return'             => new EE_Hidden_Input(array(
-                    'name'    => 'return',
-                    'default' => 'view_registration',
-                )),
-                'REG_ID'             => new EE_Hidden_Input(array(
-                    'name'    => 'REG_ID',
-                    'default' => $this->_registration->ID(),
-                )),
-                'current_status'     => new EE_Form_Section_HTML(EEH_HTML::tr(EEH_HTML::th(EEH_HTML::label(EEH_HTML::strong(__('Current Registration Status',
-                        'event_espresso')))) . EEH_HTML::td(EEH_HTML::strong($this->_registration->pretty_status(),
-                        '', 'status-' . $this->_registration->status_ID(),
-                        'line-height: 1em; font-size: 1.5em; font-weight: bold;')))),
-                'reg_status'         => new EE_Select_Input($this->_get_reg_statuses(), array(
-                    'html_label_text' => __('Change Registration Status to', 'event_espresso'),
-                    'default'         => $this->_registration->status_ID(),
-                )),
-                'send_notifications' => new EE_Yes_No_Input(array(
-                    'html_label_text' => __('Send Related Messages', 'event_espresso'),
-                    'default'         => false,
-                    'html_help_text'  => __('If set to "Yes", then the related messages will be sent to the registrant.',
-                        'event_espresso'),
-                )),
-                'submit'             => new EE_Submit_Input(array(
-                    'html_class'      => 'button-primary',
-                    'html_label_text' => '&nbsp;',
-                    'default'         => __('Update Registration Status', 'event_espresso'),
-                )),
-            ),
-        ));
-    }
-
-
-
-    /**
-     * Returns an array of all the buttons for the various statuses and switch status actions
-     *
-     * @return array
-     */
-    protected function _get_reg_statuses()
-    {
-        $reg_status_array = EEM_Registration::instance()->reg_status_array();
-        unset ($reg_status_array[EEM_Registration::status_id_incomplete]);
-        // get current reg status
-        $current_status = $this->_registration->status_ID();
-        // is registration for free event? This will determine whether to display the pending payment option
-        if ($current_status != EEM_Registration::status_id_pending_payment
-            && $this->_registration->transaction()
-                                   ->is_free()
-        ) {
-            unset($reg_status_array[EEM_Registration::status_id_pending_payment]);
-        }
-        return EEM_Status::instance()->localized_status($reg_status_array, false, 'sentence');
-    }
-
-
-    /**
-     * This method is used when using _REG_ID from request which may or may not be an array of reg_ids.
-     *
-     * @param bool $status REG status given for changing registrations to.
-     * @param bool $notify Whether to send messages notifications or not.
-     * @return array  (array with reg_id(s) updated and whether update was successful.
-     */
-    protected function _set_registration_status_from_request($status = false, $notify = false)
-    {
-        if (isset($this->_req_data['reg_status_change_form'])) {
-            $REG_IDs = isset($this->_req_data['reg_status_change_form']['REG_ID'])
-                ? (array)$this->_req_data['reg_status_change_form']['REG_ID'] : array();
-        } else {
-            $REG_IDs = isset($this->_req_data['_REG_ID']) ? (array)$this->_req_data['_REG_ID'] : array();
-        }
-        $success = $this->_set_registration_status($REG_IDs, $status);
-        //notify?
-        if ($success
-            && $notify
-            && EE_Registry::instance()->CAP->current_user_can('ee_send_message',
-                'espresso_registrations_resend_registration')
-        ) {
-            $this->_process_resend_registration();
-        }
-        return $success;
-    }
-
-
-    /**
-     * Set the registration status for the given reg_id (which may or may not be an array, it gets typecast to an
-     * array). Note, this method does NOT take care of possible notifications.  That is required by calling code.
-     *
-     * @param array $REG_IDs
-     * @param bool  $status
-     * @return array (an array with 'success' key representing whether status change was successful, and 'REG_ID' as
-     *               the array of updated registrations).
-     */
-    protected function _set_registration_status($REG_IDs = array(), $status = false)
-    {
-        $success = false;
-        // typecast $REG_IDs
-        $REG_IDs = (array)$REG_IDs;
-        if ( ! empty($REG_IDs)) {
-            $success = true;
-            // set default status if none is passed
-            $status = $status ? $status : EEM_Registration::status_id_pending_payment;
-            // sanitize $REG_IDs
-            $REG_IDs = array_filter($REG_IDs, 'absint');
-            //loop through REG_ID's and change status
-            foreach ($REG_IDs as $REG_ID) {
-                $registration = EEM_Registration::instance()->get_one_by_ID($REG_ID);
-                if ($registration instanceof EE_Registration) {
-                    $registration->set_status($status);
-                    $result = $registration->save();
-                    // verifying explicit fails because update *may* just return 0 for 0 rows affected
-                    $success = $result !== false ? $success : false;
-                }
-            }
-        }
-        //reset _req_data['_REG_ID'] for any potential future messages notifications
-        $this->_req_data['_REG_ID'] = $REG_IDs;
-        //return $success and processed registrations
-        return array('REG_ID' => $REG_IDs, 'success' => $success);
-    }
-
-
-    /**
-     * Common logic for setting up success message and redirecting to appropriate route
-     *
-     * @param  string $STS_ID status id for the registration changed to
-     * @param   bool  $notify indicates whether the _set_registration_status_from_request does notifications or not.
-     * @return void
-     */
-    protected function _reg_status_change_return($STS_ID, $notify = false)
-    {
-        $result  = ! empty($STS_ID) ? $this->_set_registration_status_from_request($STS_ID, $notify)
-            : array('success' => false);
-        $success = isset($result['success']) && $result['success'];
-        //setup success message
-        if ($success) {
-            if (is_array($result['REG_ID']) && count($result['REG_ID']) === 1) {
-                $msg = sprintf(__('Registration status has been set to %s', 'event_espresso'),
-                    EEH_Template::pretty_status($STS_ID, false, 'lower'));
-            } else {
-                $msg = sprintf(__('Registrations have been set to %s.', 'event_espresso'),
-                    EEH_Template::pretty_status($STS_ID, false, 'lower'));
-            }
-            EE_Error::add_success($msg);
-        } else {
-            EE_Error::add_error(__('Something went wrong, and the status was not changed', 'event_espresso'), __FILE__,
-                __LINE__, __FUNCTION__);
-        }
-        if (isset($this->_req_data['return']) && $this->_req_data['return'] == 'view_registration') {
-            $route = array('action' => 'view_registration', '_REG_ID' => reset($result['REG_ID']));
-        } else {
-            $route = array('action' => 'default');
-        }
-        //unset nonces
-        foreach ($this->_req_data as $ref => $value) {
-            if (strpos($ref, 'nonce') !== false) {
-                unset($this->_req_data[$ref]);
-                continue;
-            }
-            $value                 = is_array($value) ? array_map('urlencode', $value) : urlencode($value);
-            $this->_req_data[$ref] = $value;
-        }
-        //merge request vars so that the reloaded list table contains any existing filter query params
-        $route = array_merge($this->_req_data, $route);
-        $this->_redirect_after_action($success, '', '', $route, true);
-    }
-
-
-    /**
-     * incoming reg status change from reg details page.
-     *
-     * @return void
-     */
-    protected function _change_reg_status()
-    {
-        $this->_req_data['return'] = 'view_registration';
-        //set notify based on whether the send notifications toggle is set or not
-        $notify = ! empty($this->_req_data['reg_status_change_form']['send_notifications']);
-        //$notify = ! empty( $this->_req_data['txn_reg_status_change']['send_notifications'] );
-        $this->_req_data['reg_status_change_form']['reg_status'] = isset($this->_req_data['reg_status_change_form']['reg_status'])
-            ? $this->_req_data['reg_status_change_form']['reg_status'] : '';
-        switch ($this->_req_data['reg_status_change_form']['reg_status']) {
-            case EEM_Registration::status_id_approved :
-            case EEH_Template::pretty_status(EEM_Registration::status_id_approved, false, 'sentence') :
-                $this->approve_registration($notify);
-                break;
-            case EEM_Registration::status_id_pending_payment :
-            case EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, false, 'sentence') :
-                $this->pending_registration($notify);
-                break;
-            case EEM_Registration::status_id_not_approved :
-            case EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, false, 'sentence') :
-                $this->not_approve_registration($notify);
-                break;
-            case EEM_Registration::status_id_declined :
-            case EEH_Template::pretty_status(EEM_Registration::status_id_declined, false, 'sentence') :
-                $this->decline_registration($notify);
-                break;
-            case EEM_Registration::status_id_cancelled :
-            case EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, false, 'sentence') :
-                $this->cancel_registration($notify);
-                break;
-            case EEM_Registration::status_id_wait_list :
-            case EEH_Template::pretty_status(EEM_Registration::status_id_wait_list, false, 'sentence') :
-                $this->waitlist_registration($notify);
-                break;
-            case EEM_Registration::status_id_incomplete :
-            default :
-                $result['success'] = false;
-                unset($this->_req_data['return']);
-                $this->_reg_status_change_return('', false);
-                break;
-        }
-    }
-
-
-    /**
-     * approve_registration
-     *
-     * @access protected
-     * @param bool $notify whether or not to notify the registrant about their approval.
-     * @return void
-     */
-    protected function approve_registration($notify = false)
-    {
-        $this->_reg_status_change_return(EEM_Registration::status_id_approved, $notify);
-    }
-
-
-    /**
-     *        decline_registration
-     *
-     * @access protected
-     * @param bool $notify whether or not to notify the registrant about their status change.
-     * @return void
-     */
-    protected function decline_registration($notify = false)
-    {
-        $this->_reg_status_change_return(EEM_Registration::status_id_declined, $notify);
-    }
-
-
-    /**
-     *        cancel_registration
-     *
-     * @access protected
-     * @param bool $notify whether or not to notify the registrant about their status change.
-     * @return void
-     */
-    protected function cancel_registration($notify = false)
-    {
-        $this->_reg_status_change_return(EEM_Registration::status_id_cancelled, $notify);
-    }
-
-
-    /**
-     *        not_approve_registration
-     *
-     * @access protected
-     * @param bool $notify whether or not to notify the registrant about their status change.
-     * @return void
-     */
-    protected function not_approve_registration($notify = false)
-    {
-        $this->_reg_status_change_return(EEM_Registration::status_id_not_approved, $notify);
-    }
-
-
-    /**
-     *        decline_registration
-     *
-     * @access protected
-     * @param bool $notify whether or not to notify the registrant about their status change.
-     * @return void
-     */
-    protected function pending_registration($notify = false)
-    {
-        $this->_reg_status_change_return(EEM_Registration::status_id_pending_payment, $notify);
-    }
-
-
-    /**
-     * waitlist_registration
-     *
-     * @access protected
-     * @param bool $notify whether or not to notify the registrant about their status change.
-     * @return void
-     */
-    protected function waitlist_registration($notify = false)
-    {
-        $this->_reg_status_change_return(EEM_Registration::status_id_wait_list, $notify);
-    }
-
-
-    /**
-     *        generates HTML for the Registration main meta box
-     *
-     * @access public
-     * @return void
-     */
-    public function _reg_details_meta_box()
-    {
-        EEH_Autoloader::register_line_item_display_autoloaders();
-        EEH_Autoloader::register_line_item_filter_autoloaders();
-        EE_Registry::instance()->load_helper('Line_Item');
-        $transaction    = $this->_registration->transaction() ? $this->_registration->transaction()
-            : EE_Transaction::new_instance();
-        $this->_session = $transaction->session_data();
-        $filters        = new EE_Line_Item_Filter_Collection();
-        //$filters->add( new EE_Non_Zero_Line_Item_Filter() );
-        $filters->add(new EE_Single_Registration_Line_Item_Filter($this->_registration));
-        $line_item_filter_processor              = new EE_Line_Item_Filter_Processor($filters,
-            $transaction->total_line_item());
-        $filtered_line_item_tree                 = $line_item_filter_processor->process();
-        $line_item_display                       = new EE_Line_Item_Display('reg_admin_table',
-            'EE_Admin_Table_Registration_Line_Item_Display_Strategy');
-        $this->_template_args['line_item_table'] = $line_item_display->display_line_item($filtered_line_item_tree,
-            array('EE_Registration' => $this->_registration));
-        $attendee                                = $this->_registration->attendee();
-        if (EE_Registry::instance()->CAP->current_user_can('ee_read_transaction',
-            'espresso_transactions_view_transaction')
-        ) {
-            $this->_template_args['view_transaction_button'] = EEH_Template::get_button_or_link(EE_Admin_Page::add_query_args_and_nonce(array(
-                'action' => 'view_transaction',
-                'TXN_ID' => $transaction->ID(),
-            ), TXN_ADMIN_URL), esc_html__(' View Transaction'), 'button secondary-button right',
-                'dashicons dashicons-cart');
-        } else {
-            $this->_template_args['view_transaction_button'] = '';
-        }
-        if ($attendee instanceof EE_Attendee
-            && EE_Registry::instance()->CAP->current_user_can('ee_send_message',
-                'espresso_registrations_resend_registration')
-        ) {
-            $this->_template_args['resend_registration_button'] = EEH_Template::get_button_or_link(EE_Admin_Page::add_query_args_and_nonce(array(
-                'action'      => 'resend_registration',
-                '_REG_ID'     => $this->_registration->ID(),
-                'redirect_to' => 'view_registration',
-            ), REG_ADMIN_URL), esc_html__(' Resend Registration'), 'button secondary-button right',
-                'dashicons dashicons-email-alt');
-        } else {
-            $this->_template_args['resend_registration_button'] = '';
-        }
-        $this->_template_args['currency_sign'] = EE_Registry::instance()->CFG->currency->sign;
-        $payment                               = $transaction->get_first_related('Payment');
-        $payment                               = ! $payment instanceof EE_Payment ? EE_Payment::new_instance() : $payment;
-        $payment_method                        = $payment->get_first_related('Payment_Method');
-        $payment_method                        = ! $payment_method instanceof EE_Payment_Method ? EE_Payment_Method::new_instance()
-            : $payment_method;
-        $reg_details                           = array(
-            'payment_method'       => $payment_method->name(),
-            'response_msg'         => $payment->gateway_response(),
-            'registration_id'      => $this->_registration->get('REG_code'),
-            'registration_session' => $this->_registration->session_ID(),
-            'ip_address'           => isset($this->_session['ip_address']) ? $this->_session['ip_address'] : '',
-            'user_agent'           => isset($this->_session['user_agent']) ? $this->_session['user_agent'] : '',
-        );
-        if (isset($reg_details['registration_id'])) {
-            $this->_template_args['reg_details']['registration_id']['value'] = $reg_details['registration_id'];
-            $this->_template_args['reg_details']['registration_id']['label'] = __('Registration ID', 'event_espresso');
-            $this->_template_args['reg_details']['registration_id']['class'] = 'regular-text';
-        }
-        if (isset($reg_details['payment_method'])) {
-            $this->_template_args['reg_details']['payment_method']['value'] = $reg_details['payment_method'];
-            $this->_template_args['reg_details']['payment_method']['label'] = __('Most Recent Payment Method',
-                'event_espresso');
-            $this->_template_args['reg_details']['payment_method']['class'] = 'regular-text';
-            $this->_template_args['reg_details']['response_msg']['value']   = $reg_details['response_msg'];
-            $this->_template_args['reg_details']['response_msg']['label']   = __('Payment method response',
-                'event_espresso');
-            $this->_template_args['reg_details']['response_msg']['class']   = 'regular-text';
-        }
-        $this->_template_args['reg_details']['registration_session']['value'] = $reg_details['registration_session'];
-        $this->_template_args['reg_details']['registration_session']['label'] = __('Registration Session',
-            'event_espresso');
-        $this->_template_args['reg_details']['registration_session']['class'] = 'regular-text';
-        $this->_template_args['reg_details']['ip_address']['value']           = $reg_details['ip_address'];
-        $this->_template_args['reg_details']['ip_address']['label']           = __('Registration placed from IP',
-            'event_espresso');
-        $this->_template_args['reg_details']['ip_address']['class']           = 'regular-text';
-        $this->_template_args['reg_details']['user_agent']['value']           = $reg_details['user_agent'];
-        $this->_template_args['reg_details']['user_agent']['label']           = __('Registrant User Agent',
-            'event_espresso');
-        $this->_template_args['reg_details']['user_agent']['class']           = 'large-text';
-        $this->_template_args['event_link']                                   = EE_Admin_Page::add_query_args_and_nonce(array(
-            'action'   => 'default',
-            'event_id' => $this->_registration->event_ID(),
-        ), REG_ADMIN_URL);
-        $this->_template_args['REG_ID']                                       = $this->_registration->ID();
-        $this->_template_args['event_id']                                     = $this->_registration->event_ID();
-        $template_path                                                        = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_reg_details.template.php';
-        echo EEH_Template::display_template($template_path, $this->_template_args, true);
-    }
-
-
-    /**
-     * generates HTML for the Registration Questions meta box.
-     * If pre-4.8.32.rc.000 hooks are used, uses old methods (with its filters),
-     * otherwise uses new forms system
-     *
-     * @access public
-     * @return void
-     */
-    public function _reg_questions_meta_box()
-    {
-        //allow someone to override this method entirely
-        if (apply_filters('FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', true, $this,
-            $this->_registration)) {
-            $form                                              = $this->_get_reg_custom_questions_form($this->_registration->ID());
-            $this->_template_args['att_questions']             = count($form->subforms()) > 0 ? $form->get_html_and_js() : '';
-            $this->_template_args['reg_questions_form_action'] = 'edit_registration';
-            $this->_template_args['REG_ID']                    = $this->_registration->ID();
-            $template_path                                     = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_reg_questions.template.php';
-            echo EEH_Template::display_template($template_path, $this->_template_args, true);
-        }
-    }
-
-
-    /**
-     * form_before_question_group
-     *
-     * @deprecated    as of 4.8.32.rc.000
-     * @access        public
-     * @param        string $output
-     * @return        string
-     */
-    public function form_before_question_group($output)
-    {
-        EE_Error::doing_it_wrong(__CLASS__ . '::' . __FUNCTION__,
-            __('This method would have been protected but was used on a filter callback'
-               . 'so needed to be public. Please discontinue usage as it will be removed soon.', 'event_espresso'),
-            '4.8.32.rc.000');
-        return '
+		if ( ! empty($registration_status)) {
+			$where['STS_ID'] = $registration_status;
+		} else {
+			//make sure we exclude incomplete registrations, but only if not trashed.
+			if ($view === 'trash') {
+				$where['REG_deleted'] = true;
+			} else if ($view === 'incomplete') {
+				$where['STS_ID'] = EEM_Registration::status_id_incomplete;
+			} else {
+				$where['STS_ID'] = array('!=', EEM_Registration::status_id_incomplete);
+			}
+		}
+		return $where;
+	}
+
+
+	/**
+	 * Adds any provided date restraints to the where conditions for the registrations query.
+	 *
+	 * @param array $request usually the same as $this->_req_data but not necessarily
+	 * @return array
+	 */
+	protected function _add_date_to_where_conditions(array $request)
+	{
+		$where = array();
+		$view  = EEH_Array::is_set( $request, 'status', '' );
+		$month_range             = ! empty($request['month_range'])
+			? sanitize_text_field($request['month_range'])
+			: '';
+		$retrieve_for_today      = $view === 'today';
+		$retrieve_for_this_month = $view === 'month';
+
+		if ($retrieve_for_today) {
+			$now               = date('Y-m-d', current_time('timestamp'));
+			$where['REG_date'] = array(
+				'BETWEEN',
+				array(
+					EEM_Registration::instance()->convert_datetime_for_query(
+						'REG_date',
+						$now . ' 00:00:00',
+						'Y-m-d H:i:s'
+					),
+					EEM_Registration::instance()->convert_datetime_for_query(
+						'REG_date',
+						$now . ' 23:59:59',
+						'Y-m-d H:i:s'
+					),
+				),
+			);
+		} elseif ($retrieve_for_this_month) {
+			$current_year_and_month = date('Y-m', current_time('timestamp'));
+			$days_this_month        = date('t', current_time('timestamp'));
+			$where['REG_date']      = array(
+				'BETWEEN',
+				array(
+					EEM_Registration::instance()->convert_datetime_for_query(
+						'REG_date',
+						$current_year_and_month . '-01 00:00:00',
+						'Y-m-d H:i:s'
+					),
+					EEM_Registration::instance()->convert_datetime_for_query(
+						'REG_date',
+						$current_year_and_month . '-' . $days_this_month . ' 23:59:59',
+						'Y-m-d H:i:s'
+					),
+				),
+			);
+		} elseif ($month_range) {
+			$pieces          = explode(' ', $month_range, 3);
+			$month_requested = ! empty($pieces[0])
+				? date('m', \EEH_DTT_Helper::first_of_month_timestamp($pieces[0]))
+				: '';
+			$year_requested  = ! empty($pieces[1])
+				? $pieces[1]
+				: '';
+			//if there is not a month or year then we can't go further
+			if ($month_requested && $year_requested) {
+				$days_in_month     = date('t', strtotime($year_requested . '-' . $month_requested . '-' . '01'));
+				$where['REG_date'] = array(
+					'BETWEEN',
+					array(
+						EEM_Registration::instance()->convert_datetime_for_query(
+							'REG_date',
+							$year_requested . '-' . $month_requested . '-01 00:00:00',
+							'Y-m-d H:i:s'
+						),
+						EEM_Registration::instance()->convert_datetime_for_query(
+							'REG_date',
+							$year_requested . '-' . $month_requested . '-' . $days_in_month . ' 23:59:59',
+							'Y-m-d H:i:s'
+						),
+					),
+				);
+			}
+		}
+		return $where;
+	}
+
+
+	/**
+	 * Adds any provided search restraints to the where conditions for the registrations query
+	 *
+	 * @param array $request usually the same as $this->_req_data but not necessarily
+	 * @return array
+	 */
+	protected function _add_search_to_where_conditions(array $request)
+	{
+		$where = array();
+		if ( ! empty($request['s'])) {
+			$search_string = '%' . sanitize_text_field($request['s']) . '%';
+			$where['OR'] = array(
+				'Event.EVT_name'                          => array('LIKE', $search_string),
+				'Event.EVT_desc'                          => array('LIKE', $search_string),
+				'Event.EVT_short_desc'                    => array('LIKE', $search_string),
+				'Attendee.ATT_full_name'                  => array('LIKE', $search_string),
+				'Attendee.ATT_fname'                      => array('LIKE', $search_string),
+				'Attendee.ATT_lname'                      => array('LIKE', $search_string),
+				'Attendee.ATT_short_bio'                  => array('LIKE', $search_string),
+				'Attendee.ATT_email'                      => array('LIKE', $search_string),
+				'Attendee.ATT_address'                    => array('LIKE', $search_string),
+				'Attendee.ATT_address2'                   => array('LIKE', $search_string),
+				'Attendee.ATT_city'                       => array('LIKE', $search_string),
+				'REG_final_price'                         => array('LIKE', $search_string),
+				'REG_code'                                => array('LIKE', $search_string),
+				'REG_count'                               => array('LIKE', $search_string),
+				'REG_group_size'                          => array('LIKE', $search_string),
+				'Ticket.TKT_name'                         => array('LIKE', $search_string),
+				'Ticket.TKT_description'                  => array('LIKE', $search_string),
+				'Transaction.Payment.PAY_txn_id_chq_nmbr' => array('LIKE', $search_string),
+			);
+		}
+		return $where;
+	}
+
+
+	/**
+	 * Sets up the where conditions for the registrations query.
+	 *
+	 * @param array $request
+	 * @return array
+	 */
+	protected function _get_where_conditions_for_registrations_query($request)
+	{
+		return array_merge(
+			$this->_add_event_id_to_where_conditions($request),
+			$this->_add_category_id_to_where_conditions($request),
+			$this->_add_datetime_id_to_where_conditions($request),
+			$this->_add_registration_status_to_where_conditions($request),
+			$this->_add_date_to_where_conditions($request),
+			$this->_add_search_to_where_conditions($request)
+		);
+	}
+
+
+	/**
+	 * Sets up the orderby for the registrations query.
+	 *
+	 * @return array
+	 */
+	protected function _get_orderby_for_registrations_query()
+	{
+		$orderby_field = ! empty($this->_req_data['orderby'])
+			? sanitize_text_field($this->_req_data['orderby'])
+			: '';
+		switch ($orderby_field) {
+			case '_REG_ID':
+				$orderby_field = 'REG_ID';
+				break;
+			case '_Reg_status':
+				$orderby_field = 'STS_ID';
+				break;
+			case 'ATT_fname':
+				$orderby_field = array('Attendee.ATT_fname', 'Attendee.ATT_lname');
+				break;
+			case 'ATT_lname' :
+				$orderby_field = array('Attendee.ATT_lname', 'Attendee.ATT_fname');
+				break;
+			case 'event_name':
+				$orderby_field = 'Event.EVT_name';
+				break;
+			case 'DTT_EVT_start':
+				$orderby_field = 'Event.Datetime.DTT_EVT_start';
+				break;
+			default: //'REG_date'
+				$orderby_field = 'REG_date';
+		}
+
+		//order
+		$order = ! empty($this->_req_data['order'])
+			? sanitize_text_field($this->_req_data['order'])
+			: 'DESC';
+
+		//mutate orderby_field
+		$orderby_field = array_combine(
+				(array) $orderby_field,
+				array_fill(0, count($orderby_field), $order)
+			);
+		return array('order_by' => $orderby_field);
+	}
+
+
+	/**
+	 * Sets up the limit for the registrations query.
+	 *
+	 * @param $per_page
+	 * @return array
+	 */
+	protected function _get_limit($per_page)
+	{
+		$current_page = ! empty($this->_req_data['paged'])
+			? absint($this->_req_data['paged'])
+			: 1;
+		$per_page     = ! empty($this->_req_data['perpage'])
+			? $this->_req_data['perpage']
+			: $per_page;
+
+		//-1 means return all results so get out if that's set.
+		if ((int)$per_page === -1) {
+			return array();
+		}
+		$per_page = absint($per_page);
+		$offset   = ($current_page - 1) * $per_page;
+		return array('limit' => array($offset, $per_page));
+	}
+
+
+	public function get_registration_status_array()
+	{
+		return self::$_reg_status;
+	}
+
+
+
+
+	/***************************************        REGISTRATION DETAILS        ***************************************/
+	/**
+	 *        generates HTML for the View Registration Details Admin page
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function _registration_details()
+	{
+		$this->_template_args = array();
+		$this->_set_registration_object();
+		if (is_object($this->_registration)) {
+			$transaction                                   = $this->_registration->transaction() ? $this->_registration->transaction()
+				: EE_Transaction::new_instance();
+			$this->_session                                = $transaction->session_data();
+			$event_id                                      = $this->_registration->event_ID();
+			$this->_template_args['reg_nmbr']['value']     = $this->_registration->ID();
+			$this->_template_args['reg_nmbr']['label']     = __('Registration Number', 'event_espresso');
+			$this->_template_args['reg_datetime']['value'] = $this->_registration->get_i18n_datetime('REG_date');
+			$this->_template_args['reg_datetime']['label'] = __('Date', 'event_espresso');
+			$this->_template_args['grand_total']           = $transaction->total();
+			$this->_template_args['currency_sign']         = EE_Registry::instance()->CFG->currency->sign;
+			// link back to overview
+			$this->_template_args['reg_overview_url']            = REG_ADMIN_URL;
+			$this->_template_args['registration']                = $this->_registration;
+			$this->_template_args['filtered_registrations_link'] = EE_Admin_Page::add_query_args_and_nonce(array(
+				'action'   => 'default',
+				'event_id' => $event_id,
+			), REG_ADMIN_URL);
+			$this->_template_args['filtered_transactions_link']  = EE_Admin_Page::add_query_args_and_nonce(array(
+				'action' => 'default',
+				'EVT_ID' => $event_id,
+				'page'   => 'espresso_transactions',
+			), admin_url('admin.php'));
+			$this->_template_args['event_link']                  = EE_Admin_Page::add_query_args_and_nonce(array(
+				'page'   => 'espresso_events',
+				'action' => 'edit',
+				'post'   => $event_id,
+			), admin_url('admin.php'));
+			//next and previous links
+			$next_reg                                      = $this->_registration->next(null, array(), 'REG_ID');
+			$this->_template_args['next_registration']     = $next_reg
+				? $this->_next_link(EE_Admin_Page::add_query_args_and_nonce(array(
+					'action'  => 'view_registration',
+					'_REG_ID' => $next_reg['REG_ID'],
+				), REG_ADMIN_URL), 'dashicons dashicons-arrow-right ee-icon-size-22') : '';
+			$previous_reg                                  = $this->_registration->previous(null, array(), 'REG_ID');
+			$this->_template_args['previous_registration'] = $previous_reg
+				? $this->_previous_link(EE_Admin_Page::add_query_args_and_nonce(array(
+					'action'  => 'view_registration',
+					'_REG_ID' => $previous_reg['REG_ID'],
+				), REG_ADMIN_URL), 'dashicons dashicons-arrow-left ee-icon-size-22') : '';
+			// grab header
+			$template_path                             = REG_TEMPLATE_PATH . 'reg_admin_details_header.template.php';
+			$this->_template_args['REG_ID']            = $this->_registration->ID();
+			$this->_template_args['admin_page_header'] = EEH_Template::display_template($template_path,
+				$this->_template_args, true);
+		} else {
+			$this->_template_args['admin_page_header'] = $this->display_espresso_notices();
+		}
+		// the details template wrapper
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	protected function _registration_details_metaboxes()
+	{
+		do_action('AHEE__Registrations_Admin_Page___registration_details_metabox__start', $this);
+		$this->_set_registration_object();
+		$attendee = $this->_registration instanceof EE_Registration ? $this->_registration->attendee() : null;
+		add_meta_box('edit-reg-status-mbox', __('Registration Status', 'event_espresso'),
+			array($this, 'set_reg_status_buttons_metabox'), $this->wp_page_slug, 'normal', 'high');
+		add_meta_box('edit-reg-details-mbox', __('Registration Details', 'event_espresso'),
+			array($this, '_reg_details_meta_box'), $this->wp_page_slug, 'normal', 'high');
+		if ($attendee instanceof EE_Attendee
+			&& EE_Registry::instance()->CAP->current_user_can('ee_edit_registration', 'edit-reg-questions-mbox')
+		) {
+			add_meta_box('edit-reg-questions-mbox', __('Registration Form Answers', 'event_espresso'),
+				array($this, '_reg_questions_meta_box'), $this->wp_page_slug, 'normal', 'high');
+		}
+		add_meta_box('edit-reg-registrant-mbox', __('Contact Details', 'event_espresso'),
+			array($this, '_reg_registrant_side_meta_box'), $this->wp_page_slug, 'side', 'high');
+		if ($this->_registration->group_size() > 1) {
+			add_meta_box('edit-reg-attendees-mbox', __('Other Registrations in this Transaction', 'event_espresso'),
+				array($this, '_reg_attendees_meta_box'), $this->wp_page_slug, 'normal', 'high');
+		}
+	}
+
+
+	/**
+	 * set_reg_status_buttons_metabox
+	 *
+	 * @access protected
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function set_reg_status_buttons_metabox()
+	{
+		$this->_set_registration_object();
+		$change_reg_status_form = $this->_generate_reg_status_change_form();
+		echo $change_reg_status_form->form_open(self::add_query_args_and_nonce(array(
+			'action' => 'change_reg_status',
+		), REG_ADMIN_URL));
+		echo $change_reg_status_form->get_html();
+		echo $change_reg_status_form->form_close();
+	}
+
+
+	/**
+	 * @return EE_Form_Section_Proper
+	 */
+	protected function _generate_reg_status_change_form()
+	{
+		return new EE_Form_Section_Proper(array(
+			'name'            => 'reg_status_change_form',
+			'html_id'         => 'reg-status-change-form',
+			'layout_strategy' => new EE_Admin_Two_Column_Layout(),
+			'subsections'     => array(
+				'return'             => new EE_Hidden_Input(array(
+					'name'    => 'return',
+					'default' => 'view_registration',
+				)),
+				'REG_ID'             => new EE_Hidden_Input(array(
+					'name'    => 'REG_ID',
+					'default' => $this->_registration->ID(),
+				)),
+				'current_status'     => new EE_Form_Section_HTML(EEH_HTML::tr(EEH_HTML::th(EEH_HTML::label(EEH_HTML::strong(__('Current Registration Status',
+						'event_espresso')))) . EEH_HTML::td(EEH_HTML::strong($this->_registration->pretty_status(),
+						'', 'status-' . $this->_registration->status_ID(),
+						'line-height: 1em; font-size: 1.5em; font-weight: bold;')))),
+				'reg_status'         => new EE_Select_Input($this->_get_reg_statuses(), array(
+					'html_label_text' => __('Change Registration Status to', 'event_espresso'),
+					'default'         => $this->_registration->status_ID(),
+				)),
+				'send_notifications' => new EE_Yes_No_Input(array(
+					'html_label_text' => __('Send Related Messages', 'event_espresso'),
+					'default'         => false,
+					'html_help_text'  => __('If set to "Yes", then the related messages will be sent to the registrant.',
+						'event_espresso'),
+				)),
+				'submit'             => new EE_Submit_Input(array(
+					'html_class'      => 'button-primary',
+					'html_label_text' => '&nbsp;',
+					'default'         => __('Update Registration Status', 'event_espresso'),
+				)),
+			),
+		));
+	}
+
+
+
+	/**
+	 * Returns an array of all the buttons for the various statuses and switch status actions
+	 *
+	 * @return array
+	 */
+	protected function _get_reg_statuses()
+	{
+		$reg_status_array = EEM_Registration::instance()->reg_status_array();
+		unset ($reg_status_array[EEM_Registration::status_id_incomplete]);
+		// get current reg status
+		$current_status = $this->_registration->status_ID();
+		// is registration for free event? This will determine whether to display the pending payment option
+		if ($current_status != EEM_Registration::status_id_pending_payment
+			&& $this->_registration->transaction()
+								   ->is_free()
+		) {
+			unset($reg_status_array[EEM_Registration::status_id_pending_payment]);
+		}
+		return EEM_Status::instance()->localized_status($reg_status_array, false, 'sentence');
+	}
+
+
+	/**
+	 * This method is used when using _REG_ID from request which may or may not be an array of reg_ids.
+	 *
+	 * @param bool $status REG status given for changing registrations to.
+	 * @param bool $notify Whether to send messages notifications or not.
+	 * @return array  (array with reg_id(s) updated and whether update was successful.
+	 */
+	protected function _set_registration_status_from_request($status = false, $notify = false)
+	{
+		if (isset($this->_req_data['reg_status_change_form'])) {
+			$REG_IDs = isset($this->_req_data['reg_status_change_form']['REG_ID'])
+				? (array)$this->_req_data['reg_status_change_form']['REG_ID'] : array();
+		} else {
+			$REG_IDs = isset($this->_req_data['_REG_ID']) ? (array)$this->_req_data['_REG_ID'] : array();
+		}
+		$success = $this->_set_registration_status($REG_IDs, $status);
+		//notify?
+		if ($success
+			&& $notify
+			&& EE_Registry::instance()->CAP->current_user_can('ee_send_message',
+				'espresso_registrations_resend_registration')
+		) {
+			$this->_process_resend_registration();
+		}
+		return $success;
+	}
+
+
+	/**
+	 * Set the registration status for the given reg_id (which may or may not be an array, it gets typecast to an
+	 * array). Note, this method does NOT take care of possible notifications.  That is required by calling code.
+	 *
+	 * @param array $REG_IDs
+	 * @param bool  $status
+	 * @return array (an array with 'success' key representing whether status change was successful, and 'REG_ID' as
+	 *               the array of updated registrations).
+	 */
+	protected function _set_registration_status($REG_IDs = array(), $status = false)
+	{
+		$success = false;
+		// typecast $REG_IDs
+		$REG_IDs = (array)$REG_IDs;
+		if ( ! empty($REG_IDs)) {
+			$success = true;
+			// set default status if none is passed
+			$status = $status ? $status : EEM_Registration::status_id_pending_payment;
+			// sanitize $REG_IDs
+			$REG_IDs = array_filter($REG_IDs, 'absint');
+			//loop through REG_ID's and change status
+			foreach ($REG_IDs as $REG_ID) {
+				$registration = EEM_Registration::instance()->get_one_by_ID($REG_ID);
+				if ($registration instanceof EE_Registration) {
+					$registration->set_status($status);
+					$result = $registration->save();
+					// verifying explicit fails because update *may* just return 0 for 0 rows affected
+					$success = $result !== false ? $success : false;
+				}
+			}
+		}
+		//reset _req_data['_REG_ID'] for any potential future messages notifications
+		$this->_req_data['_REG_ID'] = $REG_IDs;
+		//return $success and processed registrations
+		return array('REG_ID' => $REG_IDs, 'success' => $success);
+	}
+
+
+	/**
+	 * Common logic for setting up success message and redirecting to appropriate route
+	 *
+	 * @param  string $STS_ID status id for the registration changed to
+	 * @param   bool  $notify indicates whether the _set_registration_status_from_request does notifications or not.
+	 * @return void
+	 */
+	protected function _reg_status_change_return($STS_ID, $notify = false)
+	{
+		$result  = ! empty($STS_ID) ? $this->_set_registration_status_from_request($STS_ID, $notify)
+			: array('success' => false);
+		$success = isset($result['success']) && $result['success'];
+		//setup success message
+		if ($success) {
+			if (is_array($result['REG_ID']) && count($result['REG_ID']) === 1) {
+				$msg = sprintf(__('Registration status has been set to %s', 'event_espresso'),
+					EEH_Template::pretty_status($STS_ID, false, 'lower'));
+			} else {
+				$msg = sprintf(__('Registrations have been set to %s.', 'event_espresso'),
+					EEH_Template::pretty_status($STS_ID, false, 'lower'));
+			}
+			EE_Error::add_success($msg);
+		} else {
+			EE_Error::add_error(__('Something went wrong, and the status was not changed', 'event_espresso'), __FILE__,
+				__LINE__, __FUNCTION__);
+		}
+		if (isset($this->_req_data['return']) && $this->_req_data['return'] == 'view_registration') {
+			$route = array('action' => 'view_registration', '_REG_ID' => reset($result['REG_ID']));
+		} else {
+			$route = array('action' => 'default');
+		}
+		//unset nonces
+		foreach ($this->_req_data as $ref => $value) {
+			if (strpos($ref, 'nonce') !== false) {
+				unset($this->_req_data[$ref]);
+				continue;
+			}
+			$value                 = is_array($value) ? array_map('urlencode', $value) : urlencode($value);
+			$this->_req_data[$ref] = $value;
+		}
+		//merge request vars so that the reloaded list table contains any existing filter query params
+		$route = array_merge($this->_req_data, $route);
+		$this->_redirect_after_action($success, '', '', $route, true);
+	}
+
+
+	/**
+	 * incoming reg status change from reg details page.
+	 *
+	 * @return void
+	 */
+	protected function _change_reg_status()
+	{
+		$this->_req_data['return'] = 'view_registration';
+		//set notify based on whether the send notifications toggle is set or not
+		$notify = ! empty($this->_req_data['reg_status_change_form']['send_notifications']);
+		//$notify = ! empty( $this->_req_data['txn_reg_status_change']['send_notifications'] );
+		$this->_req_data['reg_status_change_form']['reg_status'] = isset($this->_req_data['reg_status_change_form']['reg_status'])
+			? $this->_req_data['reg_status_change_form']['reg_status'] : '';
+		switch ($this->_req_data['reg_status_change_form']['reg_status']) {
+			case EEM_Registration::status_id_approved :
+			case EEH_Template::pretty_status(EEM_Registration::status_id_approved, false, 'sentence') :
+				$this->approve_registration($notify);
+				break;
+			case EEM_Registration::status_id_pending_payment :
+			case EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, false, 'sentence') :
+				$this->pending_registration($notify);
+				break;
+			case EEM_Registration::status_id_not_approved :
+			case EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, false, 'sentence') :
+				$this->not_approve_registration($notify);
+				break;
+			case EEM_Registration::status_id_declined :
+			case EEH_Template::pretty_status(EEM_Registration::status_id_declined, false, 'sentence') :
+				$this->decline_registration($notify);
+				break;
+			case EEM_Registration::status_id_cancelled :
+			case EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, false, 'sentence') :
+				$this->cancel_registration($notify);
+				break;
+			case EEM_Registration::status_id_wait_list :
+			case EEH_Template::pretty_status(EEM_Registration::status_id_wait_list, false, 'sentence') :
+				$this->waitlist_registration($notify);
+				break;
+			case EEM_Registration::status_id_incomplete :
+			default :
+				$result['success'] = false;
+				unset($this->_req_data['return']);
+				$this->_reg_status_change_return('', false);
+				break;
+		}
+	}
+
+
+	/**
+	 * approve_registration
+	 *
+	 * @access protected
+	 * @param bool $notify whether or not to notify the registrant about their approval.
+	 * @return void
+	 */
+	protected function approve_registration($notify = false)
+	{
+		$this->_reg_status_change_return(EEM_Registration::status_id_approved, $notify);
+	}
+
+
+	/**
+	 *        decline_registration
+	 *
+	 * @access protected
+	 * @param bool $notify whether or not to notify the registrant about their status change.
+	 * @return void
+	 */
+	protected function decline_registration($notify = false)
+	{
+		$this->_reg_status_change_return(EEM_Registration::status_id_declined, $notify);
+	}
+
+
+	/**
+	 *        cancel_registration
+	 *
+	 * @access protected
+	 * @param bool $notify whether or not to notify the registrant about their status change.
+	 * @return void
+	 */
+	protected function cancel_registration($notify = false)
+	{
+		$this->_reg_status_change_return(EEM_Registration::status_id_cancelled, $notify);
+	}
+
+
+	/**
+	 *        not_approve_registration
+	 *
+	 * @access protected
+	 * @param bool $notify whether or not to notify the registrant about their status change.
+	 * @return void
+	 */
+	protected function not_approve_registration($notify = false)
+	{
+		$this->_reg_status_change_return(EEM_Registration::status_id_not_approved, $notify);
+	}
+
+
+	/**
+	 *        decline_registration
+	 *
+	 * @access protected
+	 * @param bool $notify whether or not to notify the registrant about their status change.
+	 * @return void
+	 */
+	protected function pending_registration($notify = false)
+	{
+		$this->_reg_status_change_return(EEM_Registration::status_id_pending_payment, $notify);
+	}
+
+
+	/**
+	 * waitlist_registration
+	 *
+	 * @access protected
+	 * @param bool $notify whether or not to notify the registrant about their status change.
+	 * @return void
+	 */
+	protected function waitlist_registration($notify = false)
+	{
+		$this->_reg_status_change_return(EEM_Registration::status_id_wait_list, $notify);
+	}
+
+
+	/**
+	 *        generates HTML for the Registration main meta box
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function _reg_details_meta_box()
+	{
+		EEH_Autoloader::register_line_item_display_autoloaders();
+		EEH_Autoloader::register_line_item_filter_autoloaders();
+		EE_Registry::instance()->load_helper('Line_Item');
+		$transaction    = $this->_registration->transaction() ? $this->_registration->transaction()
+			: EE_Transaction::new_instance();
+		$this->_session = $transaction->session_data();
+		$filters        = new EE_Line_Item_Filter_Collection();
+		//$filters->add( new EE_Non_Zero_Line_Item_Filter() );
+		$filters->add(new EE_Single_Registration_Line_Item_Filter($this->_registration));
+		$line_item_filter_processor              = new EE_Line_Item_Filter_Processor($filters,
+			$transaction->total_line_item());
+		$filtered_line_item_tree                 = $line_item_filter_processor->process();
+		$line_item_display                       = new EE_Line_Item_Display('reg_admin_table',
+			'EE_Admin_Table_Registration_Line_Item_Display_Strategy');
+		$this->_template_args['line_item_table'] = $line_item_display->display_line_item($filtered_line_item_tree,
+			array('EE_Registration' => $this->_registration));
+		$attendee                                = $this->_registration->attendee();
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_transaction',
+			'espresso_transactions_view_transaction')
+		) {
+			$this->_template_args['view_transaction_button'] = EEH_Template::get_button_or_link(EE_Admin_Page::add_query_args_and_nonce(array(
+				'action' => 'view_transaction',
+				'TXN_ID' => $transaction->ID(),
+			), TXN_ADMIN_URL), esc_html__(' View Transaction'), 'button secondary-button right',
+				'dashicons dashicons-cart');
+		} else {
+			$this->_template_args['view_transaction_button'] = '';
+		}
+		if ($attendee instanceof EE_Attendee
+			&& EE_Registry::instance()->CAP->current_user_can('ee_send_message',
+				'espresso_registrations_resend_registration')
+		) {
+			$this->_template_args['resend_registration_button'] = EEH_Template::get_button_or_link(EE_Admin_Page::add_query_args_and_nonce(array(
+				'action'      => 'resend_registration',
+				'_REG_ID'     => $this->_registration->ID(),
+				'redirect_to' => 'view_registration',
+			), REG_ADMIN_URL), esc_html__(' Resend Registration'), 'button secondary-button right',
+				'dashicons dashicons-email-alt');
+		} else {
+			$this->_template_args['resend_registration_button'] = '';
+		}
+		$this->_template_args['currency_sign'] = EE_Registry::instance()->CFG->currency->sign;
+		$payment                               = $transaction->get_first_related('Payment');
+		$payment                               = ! $payment instanceof EE_Payment ? EE_Payment::new_instance() : $payment;
+		$payment_method                        = $payment->get_first_related('Payment_Method');
+		$payment_method                        = ! $payment_method instanceof EE_Payment_Method ? EE_Payment_Method::new_instance()
+			: $payment_method;
+		$reg_details                           = array(
+			'payment_method'       => $payment_method->name(),
+			'response_msg'         => $payment->gateway_response(),
+			'registration_id'      => $this->_registration->get('REG_code'),
+			'registration_session' => $this->_registration->session_ID(),
+			'ip_address'           => isset($this->_session['ip_address']) ? $this->_session['ip_address'] : '',
+			'user_agent'           => isset($this->_session['user_agent']) ? $this->_session['user_agent'] : '',
+		);
+		if (isset($reg_details['registration_id'])) {
+			$this->_template_args['reg_details']['registration_id']['value'] = $reg_details['registration_id'];
+			$this->_template_args['reg_details']['registration_id']['label'] = __('Registration ID', 'event_espresso');
+			$this->_template_args['reg_details']['registration_id']['class'] = 'regular-text';
+		}
+		if (isset($reg_details['payment_method'])) {
+			$this->_template_args['reg_details']['payment_method']['value'] = $reg_details['payment_method'];
+			$this->_template_args['reg_details']['payment_method']['label'] = __('Most Recent Payment Method',
+				'event_espresso');
+			$this->_template_args['reg_details']['payment_method']['class'] = 'regular-text';
+			$this->_template_args['reg_details']['response_msg']['value']   = $reg_details['response_msg'];
+			$this->_template_args['reg_details']['response_msg']['label']   = __('Payment method response',
+				'event_espresso');
+			$this->_template_args['reg_details']['response_msg']['class']   = 'regular-text';
+		}
+		$this->_template_args['reg_details']['registration_session']['value'] = $reg_details['registration_session'];
+		$this->_template_args['reg_details']['registration_session']['label'] = __('Registration Session',
+			'event_espresso');
+		$this->_template_args['reg_details']['registration_session']['class'] = 'regular-text';
+		$this->_template_args['reg_details']['ip_address']['value']           = $reg_details['ip_address'];
+		$this->_template_args['reg_details']['ip_address']['label']           = __('Registration placed from IP',
+			'event_espresso');
+		$this->_template_args['reg_details']['ip_address']['class']           = 'regular-text';
+		$this->_template_args['reg_details']['user_agent']['value']           = $reg_details['user_agent'];
+		$this->_template_args['reg_details']['user_agent']['label']           = __('Registrant User Agent',
+			'event_espresso');
+		$this->_template_args['reg_details']['user_agent']['class']           = 'large-text';
+		$this->_template_args['event_link']                                   = EE_Admin_Page::add_query_args_and_nonce(array(
+			'action'   => 'default',
+			'event_id' => $this->_registration->event_ID(),
+		), REG_ADMIN_URL);
+		$this->_template_args['REG_ID']                                       = $this->_registration->ID();
+		$this->_template_args['event_id']                                     = $this->_registration->event_ID();
+		$template_path                                                        = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_reg_details.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, true);
+	}
+
+
+	/**
+	 * generates HTML for the Registration Questions meta box.
+	 * If pre-4.8.32.rc.000 hooks are used, uses old methods (with its filters),
+	 * otherwise uses new forms system
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function _reg_questions_meta_box()
+	{
+		//allow someone to override this method entirely
+		if (apply_filters('FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', true, $this,
+			$this->_registration)) {
+			$form                                              = $this->_get_reg_custom_questions_form($this->_registration->ID());
+			$this->_template_args['att_questions']             = count($form->subforms()) > 0 ? $form->get_html_and_js() : '';
+			$this->_template_args['reg_questions_form_action'] = 'edit_registration';
+			$this->_template_args['REG_ID']                    = $this->_registration->ID();
+			$template_path                                     = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_reg_questions.template.php';
+			echo EEH_Template::display_template($template_path, $this->_template_args, true);
+		}
+	}
+
+
+	/**
+	 * form_before_question_group
+	 *
+	 * @deprecated    as of 4.8.32.rc.000
+	 * @access        public
+	 * @param        string $output
+	 * @return        string
+	 */
+	public function form_before_question_group($output)
+	{
+		EE_Error::doing_it_wrong(__CLASS__ . '::' . __FUNCTION__,
+			__('This method would have been protected but was used on a filter callback'
+			   . 'so needed to be public. Please discontinue usage as it will be removed soon.', 'event_espresso'),
+			'4.8.32.rc.000');
+		return '
 	<table class="form-table ee-width-100">
 		<tbody>
 			';
-    }
-
-
-    /**
-     * form_after_question_group
-     *
-     * @deprecated    as of 4.8.32.rc.000
-     * @access        public
-     * @param        string $output
-     * @return        string
-     */
-    public function form_after_question_group($output)
-    {
-        EE_Error::doing_it_wrong(__CLASS__ . '::' . __FUNCTION__,
-            __('This method would have been protected but was used on a filter callback'
-               . 'so needed to be public. Please discontinue usage as it will be removed soon.', 'event_espresso'),
-            '4.8.32.rc.000');
-        return '
+	}
+
+
+	/**
+	 * form_after_question_group
+	 *
+	 * @deprecated    as of 4.8.32.rc.000
+	 * @access        public
+	 * @param        string $output
+	 * @return        string
+	 */
+	public function form_after_question_group($output)
+	{
+		EE_Error::doing_it_wrong(__CLASS__ . '::' . __FUNCTION__,
+			__('This method would have been protected but was used on a filter callback'
+			   . 'so needed to be public. Please discontinue usage as it will be removed soon.', 'event_espresso'),
+			'4.8.32.rc.000');
+		return '
 			<tr class="hide-if-no-js">
 				<th> </th>
 				<td class="reg-admin-edit-attendee-question-td">
 					<a class="reg-admin-edit-attendee-question-lnk" href="#" title="'
-               . esc_attr__('click to edit question', 'event_espresso')
-               . '">
+			   . esc_attr__('click to edit question', 'event_espresso')
+			   . '">
 						<span class="reg-admin-edit-question-group-spn lt-grey-txt">'
-               . __('edit the above question group', 'event_espresso')
-               . '</span>
+			   . __('edit the above question group', 'event_espresso')
+			   . '</span>
 						<div class="dashicons dashicons-edit"></div>
 					</a>
 				</td>
@@ -1868,495 +1868,495 @@ 
 		</tbody>
 	</table>
 ';
-    }
-
-
-    /**
-     * form_form_field_label_wrap
-     *
-     * @deprecated    as of 4.8.32.rc.000
-     * @access        public
-     * @param        string $label
-     * @return        string
-     */
-    public function form_form_field_label_wrap($label)
-    {
-        EE_Error::doing_it_wrong(__CLASS__ . '::' . __FUNCTION__,
-            __('This method would have been protected but was used on a filter callback'
-               . 'so needed to be public. Please discontinue usage as it will be removed soon.', 'event_espresso'),
-            '4.8.32.rc.000');
-        return '
+	}
+
+
+	/**
+	 * form_form_field_label_wrap
+	 *
+	 * @deprecated    as of 4.8.32.rc.000
+	 * @access        public
+	 * @param        string $label
+	 * @return        string
+	 */
+	public function form_form_field_label_wrap($label)
+	{
+		EE_Error::doing_it_wrong(__CLASS__ . '::' . __FUNCTION__,
+			__('This method would have been protected but was used on a filter callback'
+			   . 'so needed to be public. Please discontinue usage as it will be removed soon.', 'event_espresso'),
+			'4.8.32.rc.000');
+		return '
 			<tr>
 				<th>
 					' . $label . '
 				</th>';
-    }
-
-
-    /**
-     * form_form_field_input__wrap
-     *
-     * @deprecated    as of 4.8.32.rc.000
-     * @access        public
-     * @param        string $input
-     * @return        string
-     */
-    public function form_form_field_input__wrap($input)
-    {
-        EE_Error::doing_it_wrong(__CLASS__ . '::' . __FUNCTION__,
-            __('This method would have been protected but was used on a filter callback'
-               . 'so needed to be public. Please discontinue usage as it will be removed soon.', 'event_espresso'),
-            '4.8.32.rc.000');
-        return '
+	}
+
+
+	/**
+	 * form_form_field_input__wrap
+	 *
+	 * @deprecated    as of 4.8.32.rc.000
+	 * @access        public
+	 * @param        string $input
+	 * @return        string
+	 */
+	public function form_form_field_input__wrap($input)
+	{
+		EE_Error::doing_it_wrong(__CLASS__ . '::' . __FUNCTION__,
+			__('This method would have been protected but was used on a filter callback'
+			   . 'so needed to be public. Please discontinue usage as it will be removed soon.', 'event_espresso'),
+			'4.8.32.rc.000');
+		return '
 				<td class="reg-admin-attendee-questions-input-td disabled-input">
 					' . $input . '
 				</td>
 			</tr>';
-    }
-
-
-    /**
-     * Updates the registration's custom questions according to the form info, if the form is submitted.
-     * If it's not a post, the "view_registrations" route will be called next on the SAME request
-     * to display the page
-     *
-     * @access protected
-     * @return void
-     */
-    protected function _update_attendee_registration_form()
-    {
-        do_action('AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', $this);
-        if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-            $REG_ID  = isset($this->_req_data['_REG_ID']) ? absint($this->_req_data['_REG_ID']) : false;
-            $success = $this->_save_reg_custom_questions_form($REG_ID);
-            if ($success) {
-                $what  = __('Registration Form', 'event_espresso');
-                $route = $REG_ID ? array('action' => 'view_registration', '_REG_ID' => $REG_ID)
-                    : array('action' => 'default');
-                $this->_redirect_after_action($success, $what, __('updated', 'event_espresso'), $route);
-            }
-        }
-    }
-
-
-    /**
-     * Gets the form for saving registrations custom questions (if done
-     * previously retrieves the cached form object, which may have validation errors in it)
-     *
-     * @param int $REG_ID
-     * @return EE_Registration_Custom_Questions_Form
-     */
-    protected function _get_reg_custom_questions_form($REG_ID)
-    {
-        if ( ! $this->_reg_custom_questions_form) {
-            require_once(REG_ADMIN . 'form_sections' . DS . 'EE_Registration_Custom_Questions_Form.form.php');
-            $this->_reg_custom_questions_form = new EE_Registration_Custom_Questions_Form(
-                EEM_Registration::instance()->get_one_by_ID($REG_ID)
-            );
-            $this->_reg_custom_questions_form->_construct_finalize(null, null);
-        }
-        return $this->_reg_custom_questions_form;
-    }
-
-
-    /**
-     * Saves
-     *
-     * @access private
-     * @param bool $REG_ID
-     * @return bool
-     */
-    private function _save_reg_custom_questions_form($REG_ID = false)
-    {
-        if ( ! $REG_ID) {
-            EE_Error::add_error(__('An error occurred. No registration ID was received.', 'event_espresso'), __FILE__,
-                __FUNCTION__, __LINE__);
-        }
-        $form = $this->_get_reg_custom_questions_form($REG_ID);
-        $form->receive_form_submission($this->_req_data);
-        $success = false;
-        if ($form->is_valid()) {
-            foreach ($form->subforms() as $question_group_id => $question_group_form) {
-                foreach ($question_group_form->inputs() as $question_id => $input) {
-                    $where_conditions    = array(
-                        'QST_ID' => $question_id,
-                        'REG_ID' => $REG_ID,
-                    );
-                    $possibly_new_values = array(
-                        'ANS_value' => $input->normalized_value(),
-                    );
-                    $answer              = EEM_Answer::instance()->get_one(array($where_conditions));
-                    if ($answer instanceof EE_Answer) {
-                        $success = $answer->save($possibly_new_values);
-                    } else {
-                        //insert it then
-                        $cols_n_vals = array_merge($where_conditions, $possibly_new_values);
-                        $answer      = EE_Answer::new_instance($cols_n_vals);
-                        $success     = $answer->save();
-                    }
-                }
-            }
-        } else {
-            EE_Error::add_error($form->get_validation_error_string(), __FILE__, __FUNCTION__, __LINE__);
-        }
-        return $success;
-    }
-
-
-    /**
-     *        generates HTML for the Registration main meta box
-     *
-     * @access public
-     * @return void
-     */
-    public function _reg_attendees_meta_box()
-    {
-        $REG = EEM_Registration::instance();
-        //get all other registrations on this transaction, and cache
-        //the attendees for them so we don't have to run another query using force_join
-        $registrations                           = $REG->get_all(array(
-            array(
-                'TXN_ID' => $this->_registration->transaction_ID(),
-                'REG_ID' => array('!=', $this->_registration->ID()),
-            ),
-            'force_join' => array('Attendee'),
-        ));
-        $this->_template_args['attendees']       = array();
-        $this->_template_args['attendee_notice'] = '';
-        if (empty($registrations)
-            || (is_array($registrations)
-                && ! EEH_Array::get_one_item_from_array($registrations))
-        ) {
-            EE_Error::add_error(__('There are no records attached to this registration. Something may have gone wrong with the registration',
-                'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
-            $this->_template_args['attendee_notice'] = EE_Error::get_notices();
-        } else {
-            $att_nmbr = 1;
-            foreach ($registrations as $registration) {
-                /* @var $registration EE_Registration */
-                $attendee                                                    = $registration->attendee()
-                    ? $registration->attendee()
-                    : EEM_Attendee::instance()
-                                  ->create_default_object();
-                $this->_template_args['attendees'][$att_nmbr]['STS_ID']      = $registration->status_ID();
-                $this->_template_args['attendees'][$att_nmbr]['fname']       = $attendee->fname();//( isset( $registration->ATT_fname ) & ! empty( $registration->ATT_fname ) ) ? $registration->ATT_fname : '';
-                $this->_template_args['attendees'][$att_nmbr]['lname']       = $attendee->lname();//( isset( $registration->ATT_lname ) & ! empty( $registration->ATT_lname ) ) ? $registration->ATT_lname : '';
-                $this->_template_args['attendees'][$att_nmbr]['email']       = $attendee->email();//( isset( $registration->ATT_email ) & ! empty( $registration->ATT_email ) ) ? $registration->ATT_email : '';
-                $this->_template_args['attendees'][$att_nmbr]['final_price'] = $registration->final_price();//( isset( $registration->REG_final_price ) & ! empty( $registration->REG_final_price ) ) ? $registration->REG_final_price : '';
-                $this->_template_args['attendees'][$att_nmbr]['address']     = implode(', ',
-                    $attendee->full_address_as_array());
-                $this->_template_args['attendees'][$att_nmbr]['att_link']    = self::add_query_args_and_nonce(array(
-                    'action' => 'edit_attendee',
-                    'post'   => $attendee->ID(),
-                ), REG_ADMIN_URL);
-                $this->_template_args['attendees'][$att_nmbr]['event_name']  = $registration->event_obj()->name();
-                $att_nmbr++;
-            }
-            //EEH_Debug_Tools::printr( $attendees, '$attendees  <br /><span style="font-size:10px;font-weight:normal;">( file: '. __FILE__ . ' - line no: ' . __LINE__ . ' )</span>', 'auto' );
-            $this->_template_args['currency_sign'] = EE_Registry::instance()->CFG->currency->sign;
-            //			$this->_template_args['registration_form_url'] = add_query_arg( array( 'action' => 'edit_registration', 'process' => 'attendees'  ), REG_ADMIN_URL );
-        }
-        $template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_attendees.template.php';
-        echo EEH_Template::display_template($template_path, $this->_template_args, true);
-    }
-
-
-    /**
-     *        generates HTML for the Edit Registration side meta box
-     *
-     * @access public
-     * @return void
-     */
-    public function _reg_registrant_side_meta_box()
-    {
-        /*@var $attendee EE_Attendee */
-        $att_check = $this->_registration->attendee();
-        $attendee  = $att_check instanceof EE_Attendee ? $att_check : EEM_Attendee::instance()->create_default_object();
-        //now let's determine if this is not the primary registration.  If it isn't then we set the primary_registration object for reference BUT ONLY if the Attendee object loaded is not the same as the primary registration object (that way we know if we need to show create button or not)
-        if ( ! $this->_registration->is_primary_registrant()) {
-            $primary_registration = $this->_registration->get_primary_registration();
-            $primary_attendee     = $primary_registration instanceof EE_Registration ? $primary_registration->attendee()
-                : null;
-            if ( ! $primary_attendee instanceof EE_Attendee || $attendee->ID() !== $primary_attendee->ID()) {
-                //in here?  This means the displayed registration is not the primary registrant but ALREADY HAS its own custom attendee object so let's not worry about the primary reg.
-                $primary_registration = null;
-            }
-        } else {
-            $primary_registration = null;
-        }
-        $this->_template_args['ATT_ID']            = $attendee->ID();
-        $this->_template_args['fname']             = $attendee->fname();//$this->_registration->ATT_fname;
-        $this->_template_args['lname']             = $attendee->lname();//$this->_registration->ATT_lname;
-        $this->_template_args['email']             = $attendee->email();//$this->_registration->ATT_email;
-        $this->_template_args['phone']             = $attendee->phone();
-        $this->_template_args['formatted_address'] = EEH_Address::format($attendee);
-        //edit link
-        $this->_template_args['att_edit_link']  = EE_Admin_Page::add_query_args_and_nonce(array(
-            'action' => 'edit_attendee',
-            'post'   => $attendee->ID(),
-        ), REG_ADMIN_URL);
-        $this->_template_args['att_edit_label'] = __('View/Edit Contact', 'event_espresso');
-        //create link
-        $this->_template_args['create_link']  = $primary_registration instanceof EE_Registration
-            ? EE_Admin_Page::add_query_args_and_nonce(array(
-                'action'  => 'duplicate_attendee',
-                '_REG_ID' => $this->_registration->ID(),
-            ), REG_ADMIN_URL) : '';
-        $this->_template_args['create_label'] = __('Create Contact', 'event_espresso');
-        $this->_template_args['att_check']    = $att_check;
-        $template_path                        = REG_TEMPLATE_PATH . 'reg_admin_details_side_meta_box_registrant.template.php';
-        echo EEH_Template::display_template($template_path, $this->_template_args, true);
-    }
-
-
-    /**
-     * trash or restore registrations
-     *
-     * @param  boolean $trash whether to archive or restore
-     * @access protected
-     * @return void
-     */
-    protected function _trash_or_restore_registrations($trash = true)
-    {
-        $REGM    = EEM_Registration::instance();
-        $success = 1;
-        $error   = 0;
-        $tickets = array();
-        $dtts    = array();
-        //if empty _REG_ID then get out because there's nothing to do
-        if (empty($this->_req_data['_REG_ID'])) {
-            $msg = $trash
-                ? __('In order to trash registrations you must select which ones you wish to trash by clicking the checkboxes.',
-                    'event_espresso')
-                : __('In order to restore registrations you must select which ones you wish to restore by clicking the checkboxes.',
-                    'event_espresso');
-            EE_Error::add_error($msg, __FILE__, __LINE__, __FUNCTION__);
-            $this->_redirect_after_action(false, '', '', array(), true);
-        }
-        //Checkboxes
-        if ( ! empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) {
-            // if array has more than one element than success message should be plural
-            $success = count($this->_req_data['_REG_ID']) > 1 ? 2 : 1;
-            // cycle thru checkboxes
-            while (list($ind, $REG_ID) = each($this->_req_data['_REG_ID'])) {
-                /** @var EE_Registration $REG */
-                $REG           = $REGM->get_one_by_ID($REG_ID);
-                $payment_count = $REG->get_first_related('Transaction')->count_related('Payment');
-                if ($payment_count > 0) {
-                    $name    = $REG->attendee() instanceof EE_Attendee ? $REG->attendee()->full_name()
-                        : __('Unknown Attendee', 'event_espresso');
-                    $error   = 1;
-                    $success = 0;
-                    EE_Error::add_error(sprintf(__('The registration for %s could not be trashed because it has payments attached to the related transaction.  If you wish to trash this registration you must first delete the payments on the related transaction.',
-                        'event_espresso'), $name), __FILE__, __FUNCTION__, __LINE__);
-                    continue; //can't trash this registration because it has payments.
-                }
-                $ticket                 = $REG->get_first_related('Ticket');
-                $tickets[$ticket->ID()] = $ticket;
-                $dtt                    = $ticket->get_many_related('Datetime');
-                $dtts                   = array_merge($dtts, $dtt);
-                $updated                = $trash ? $REG->delete() : $REG->restore();
-                if ( ! $updated) {
-                    $success = 0;
-                } else {
-                    $success = 2;
-                }/**/
-            }
-        } else {
-            // grab single id and delete
-            $REG_ID                 = absint($this->_req_data['_REG_ID']);
-            $REG                    = $REGM->get_one_by_ID($REG_ID);
-            $ticket                 = $REG->get_first_related('Ticket');
-            $tickets[$ticket->ID()] = $ticket;
-            $dtts                   = $ticket->get_many_related('Datetime');
-            $updated                = $trash ? $REG->delete() : $REG->restore();
-            if ( ! $updated) {
-                $success = 0;
-            }
-        }
-        //now let's update counts
-        EEM_Ticket::instance()->update_tickets_sold($tickets);
-        EEM_Datetime::instance()->update_sold($dtts);
-        $what           = $success > 1 ? __('Registrations', 'event_espresso') : __('Registration', 'event_espresso');
-        $action_desc    = $trash ? __('moved to the trash', 'event_espresso') : __('restored', 'event_espresso');
-        $overwrite_msgs = $error ? true : false;
-        $this->_redirect_after_action($success, $what, $action_desc, array('action' => 'default'), $overwrite_msgs);
-    }
-
-
-    /**
-     * This is used to permanently delete registrations.  Note, this will handle not only deleting permanently the
-     * registration but also.
-     * 1. Removing relations to EE_Attendee
-     * 2. Deleting permanently the related transaction, but ONLY if all related registrations to the transaction are
-     * ALSO trashed.
-     * 3. Deleting permanently any related Line items but only if the above conditions are met.
-     * 4. Removing relationships between all tickets and the related registrations
-     * 5. Deleting permanently any related Answers (and the answers for other related registrations that were deleted.)
-     * 6. Deleting permanently any related Checkins.
-     *
-     * @return void
-     */
-    protected function _delete_registrations()
-    {
-        $REG_MDL = EEM_Registration::instance();
-        $success = 1;
-        //Checkboxes
-        if ( ! empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) {
-            // if array has more than one element than success message should be plural
-            $success = count($this->_req_data['_REG_ID']) > 1 ? 2 : 1;
-            // cycle thru checkboxes
-            while (list($ind, $REG_ID) = each($this->_req_data['_REG_ID'])) {
-                $REG = $REG_MDL->get_one_by_ID($REG_ID);
-                if ( ! $REG instanceof EE_Registration) {
-                    continue;
-                }
-                $deleted = $this->_delete_registration($REG);
-                if ( ! $deleted) {
-                    $success = 0;
-                }
-            }
-        } else {
-            // grab single id and delete
-            $REG_ID  = $this->_req_data['_REG_ID'];
-            $REG     = $REG_MDL->get_one_by_ID($REG_ID);
-            $deleted = $this->_delete_registration($REG);
-            if ( ! $deleted) {
-                $success = 0;
-            }
-        }
-        $what        = $success > 1 ? __('Registrations', 'event_espresso') : __('Registration', 'event_espresso');
-        $action_desc = __('permanently deleted.', 'event_espresso');
-        $this->_redirect_after_action($success, $what, $action_desc, array('action' => 'default'), true);
-    }
-
-
-    /**
-     * handles the permanent deletion of a registration.  See comments with _delete_registrations() for details on what
-     * models get affected.
-     *
-     * @param  EE_Registration $REG registration to be deleted permenantly
-     * @return boolean              true = successful deletion, false = fail.
-     */
-    protected function _delete_registration(EE_Registration $REG)
-    {
-        //first we start with the transaction... ultimately, we WILL not delete permanently if there are any related registrations on the transaction that are NOT trashed.
-        $TXN         = $REG->get_first_related('Transaction');
-        $REGS        = $TXN->get_many_related('Registration');
-        $all_trashed = true;
-        foreach ($REGS as $registration) {
-            if ( ! $registration->get('REG_deleted')) {
-                $all_trashed = false;
-            }
-        }
-        if ( ! $all_trashed) {
-            EE_Error::add_error(__('Unable to permanently delete this registration. Before this registration can be permanently deleted, all registrations made in the same transaction must be trashed as well.  These registrations will be permanently deleted in the same action.',
-                'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-        //k made it here so that means we can delete all the related transactions and their answers (but let's do them separately from THIS one).
-        foreach ($REGS as $registration) {
-            //delete related answers
-            $registration->delete_related_permanently('Answer');
-            //remove relationship to EE_Attendee (but we ALWAYS leave the contact record intact)
-            $attendee = $registration->get_first_related('Attendee');
-            if ($attendee instanceof EE_Attendee) {
-                $registration->_remove_relation_to($attendee, 'Attendee');
-            }
-            //now remove relationships to tickets on this registration.
-            $registration->_remove_relations('Ticket');
-            //now delete permanently the checkins related to this registration.
-            $registration->delete_related_permanently('Checkin');
-            if ($registration->ID() === $REG->ID()) {
-                continue;
-            } //we don't want to delete permanently the existing registration just yet.
-            //remove relation to transaction for these registrations if NOT the existing registrations
-            $registration->_remove_relations('Transaction');
-            //delete permanently any related messages.
-            $registration->delete_related_permanently('Message');
-            //now delete this registration permanently
-            $registration->delete_permanently();
-        }
-        //now all related registrations on the transaction are handled.  So let's just handle this registration itself (the transaction and line items should be all that's left).
-        //delete the line items related to the transaction for this registration.
-        $TXN->delete_related_permanently('Line_Item');
-        //we need to remove all the relationships on the transaction
-        $TXN->delete_related_permanently('Payment');
-        $TXN->delete_related_permanently('Extra_Meta');
-        $TXN->delete_related_permanently('Message');
-        //now we can delete this REG permanently (and the transaction of course)
-        $REG->delete_related_permanently('Transaction');
-        return $REG->delete_permanently();
-    }
-
-
-    /**
-     *    generates HTML for the Register New Attendee Admin page
-     *
-     * @access private
-     * @throws \EE_Error
-     * @return void
-     */
-    public function new_registration()
-    {
-        if ( ! $this->_set_reg_event()) {
-            throw new EE_Error(__('Unable to continue with registering because there is no Event ID in the request',
-                'event_espresso'));
-        }
-        EE_Registry::instance()->REQ->set_espresso_page(true);
-        // gotta start with a clean slate if we're not coming here via ajax
-        if ( ! defined('DOING_AJAX')
-             && ( ! isset($this->_req_data['processing_registration']) || isset($this->_req_data['step_error']))
-        ) {
-            EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
-        }
-        $this->_template_args['event_name'] = '';
-        // event name
-        if ($this->_reg_event) {
-            $this->_template_args['event_name'] = $this->_reg_event->name();
-            $edit_event_url                     = self::add_query_args_and_nonce(array(
-                'action' => 'edit',
-                'post'   => $this->_reg_event->ID(),
-            ), EVENTS_ADMIN_URL);
-            $edit_event_lnk                     = '<a href="'
-                                                  . $edit_event_url
-                                                  . '" title="'
-                                                  . esc_attr__('Edit ', 'event_espresso')
-                                                  . $this->_reg_event->name()
-                                                  . '">'
-                                                  . __('Edit Event', 'event_espresso')
-                                                  . '</a>';
-            $this->_template_args['event_name'] .= ' <span class="admin-page-header-edit-lnk not-bold">'
-                                                   . $edit_event_lnk
-                                                   . '</span>';
-        }
-        $this->_template_args['step_content'] = $this->_get_registration_step_content();
-        if (defined('DOING_AJAX')) {
-            $this->_return_json();
-        }
-        // grab header
-        $template_path                              = REG_TEMPLATE_PATH . 'reg_admin_register_new_attendee.template.php';
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path,
-            $this->_template_args, true);
-        //$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-        // the details template wrapper
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    /**
-     * This returns the content for a registration step
-     *
-     * @access protected
-     * @return string html
-     */
-    protected function _get_registration_step_content()
-    {
-        if (isset($_COOKIE['ee_registration_added']) && $_COOKIE['ee_registration_added']) {
-            $warning_msg = sprintf(__('%2$sWARNING!!!%3$s%1$sPlease do not use the back button to return to this page for the purpose of adding another registration.%1$sThis can result in lost and/or corrupted data.%1$sIf you wish to add another registration, then please click the%1$s%7$s"Add Another New Registration to Event"%8$s button%1$son the Transaction details page, after you are redirected.%1$s%1$s%4$s redirecting in %5$s seconds %6$s',
-                'event_espresso'), '<br />', '<h3 class="important-notice">', '</h3>', '<div class="float-right">',
-                '<span id="redirect_timer" class="important-notice">30</span>', '</div>', '<b>', '</b>');
-            return '
+	}
+
+
+	/**
+	 * Updates the registration's custom questions according to the form info, if the form is submitted.
+	 * If it's not a post, the "view_registrations" route will be called next on the SAME request
+	 * to display the page
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function _update_attendee_registration_form()
+	{
+		do_action('AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', $this);
+		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+			$REG_ID  = isset($this->_req_data['_REG_ID']) ? absint($this->_req_data['_REG_ID']) : false;
+			$success = $this->_save_reg_custom_questions_form($REG_ID);
+			if ($success) {
+				$what  = __('Registration Form', 'event_espresso');
+				$route = $REG_ID ? array('action' => 'view_registration', '_REG_ID' => $REG_ID)
+					: array('action' => 'default');
+				$this->_redirect_after_action($success, $what, __('updated', 'event_espresso'), $route);
+			}
+		}
+	}
+
+
+	/**
+	 * Gets the form for saving registrations custom questions (if done
+	 * previously retrieves the cached form object, which may have validation errors in it)
+	 *
+	 * @param int $REG_ID
+	 * @return EE_Registration_Custom_Questions_Form
+	 */
+	protected function _get_reg_custom_questions_form($REG_ID)
+	{
+		if ( ! $this->_reg_custom_questions_form) {
+			require_once(REG_ADMIN . 'form_sections' . DS . 'EE_Registration_Custom_Questions_Form.form.php');
+			$this->_reg_custom_questions_form = new EE_Registration_Custom_Questions_Form(
+				EEM_Registration::instance()->get_one_by_ID($REG_ID)
+			);
+			$this->_reg_custom_questions_form->_construct_finalize(null, null);
+		}
+		return $this->_reg_custom_questions_form;
+	}
+
+
+	/**
+	 * Saves
+	 *
+	 * @access private
+	 * @param bool $REG_ID
+	 * @return bool
+	 */
+	private function _save_reg_custom_questions_form($REG_ID = false)
+	{
+		if ( ! $REG_ID) {
+			EE_Error::add_error(__('An error occurred. No registration ID was received.', 'event_espresso'), __FILE__,
+				__FUNCTION__, __LINE__);
+		}
+		$form = $this->_get_reg_custom_questions_form($REG_ID);
+		$form->receive_form_submission($this->_req_data);
+		$success = false;
+		if ($form->is_valid()) {
+			foreach ($form->subforms() as $question_group_id => $question_group_form) {
+				foreach ($question_group_form->inputs() as $question_id => $input) {
+					$where_conditions    = array(
+						'QST_ID' => $question_id,
+						'REG_ID' => $REG_ID,
+					);
+					$possibly_new_values = array(
+						'ANS_value' => $input->normalized_value(),
+					);
+					$answer              = EEM_Answer::instance()->get_one(array($where_conditions));
+					if ($answer instanceof EE_Answer) {
+						$success = $answer->save($possibly_new_values);
+					} else {
+						//insert it then
+						$cols_n_vals = array_merge($where_conditions, $possibly_new_values);
+						$answer      = EE_Answer::new_instance($cols_n_vals);
+						$success     = $answer->save();
+					}
+				}
+			}
+		} else {
+			EE_Error::add_error($form->get_validation_error_string(), __FILE__, __FUNCTION__, __LINE__);
+		}
+		return $success;
+	}
+
+
+	/**
+	 *        generates HTML for the Registration main meta box
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function _reg_attendees_meta_box()
+	{
+		$REG = EEM_Registration::instance();
+		//get all other registrations on this transaction, and cache
+		//the attendees for them so we don't have to run another query using force_join
+		$registrations                           = $REG->get_all(array(
+			array(
+				'TXN_ID' => $this->_registration->transaction_ID(),
+				'REG_ID' => array('!=', $this->_registration->ID()),
+			),
+			'force_join' => array('Attendee'),
+		));
+		$this->_template_args['attendees']       = array();
+		$this->_template_args['attendee_notice'] = '';
+		if (empty($registrations)
+			|| (is_array($registrations)
+				&& ! EEH_Array::get_one_item_from_array($registrations))
+		) {
+			EE_Error::add_error(__('There are no records attached to this registration. Something may have gone wrong with the registration',
+				'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
+			$this->_template_args['attendee_notice'] = EE_Error::get_notices();
+		} else {
+			$att_nmbr = 1;
+			foreach ($registrations as $registration) {
+				/* @var $registration EE_Registration */
+				$attendee                                                    = $registration->attendee()
+					? $registration->attendee()
+					: EEM_Attendee::instance()
+								  ->create_default_object();
+				$this->_template_args['attendees'][$att_nmbr]['STS_ID']      = $registration->status_ID();
+				$this->_template_args['attendees'][$att_nmbr]['fname']       = $attendee->fname();//( isset( $registration->ATT_fname ) & ! empty( $registration->ATT_fname ) ) ? $registration->ATT_fname : '';
+				$this->_template_args['attendees'][$att_nmbr]['lname']       = $attendee->lname();//( isset( $registration->ATT_lname ) & ! empty( $registration->ATT_lname ) ) ? $registration->ATT_lname : '';
+				$this->_template_args['attendees'][$att_nmbr]['email']       = $attendee->email();//( isset( $registration->ATT_email ) & ! empty( $registration->ATT_email ) ) ? $registration->ATT_email : '';
+				$this->_template_args['attendees'][$att_nmbr]['final_price'] = $registration->final_price();//( isset( $registration->REG_final_price ) & ! empty( $registration->REG_final_price ) ) ? $registration->REG_final_price : '';
+				$this->_template_args['attendees'][$att_nmbr]['address']     = implode(', ',
+					$attendee->full_address_as_array());
+				$this->_template_args['attendees'][$att_nmbr]['att_link']    = self::add_query_args_and_nonce(array(
+					'action' => 'edit_attendee',
+					'post'   => $attendee->ID(),
+				), REG_ADMIN_URL);
+				$this->_template_args['attendees'][$att_nmbr]['event_name']  = $registration->event_obj()->name();
+				$att_nmbr++;
+			}
+			//EEH_Debug_Tools::printr( $attendees, '$attendees  <br /><span style="font-size:10px;font-weight:normal;">( file: '. __FILE__ . ' - line no: ' . __LINE__ . ' )</span>', 'auto' );
+			$this->_template_args['currency_sign'] = EE_Registry::instance()->CFG->currency->sign;
+			//			$this->_template_args['registration_form_url'] = add_query_arg( array( 'action' => 'edit_registration', 'process' => 'attendees'  ), REG_ADMIN_URL );
+		}
+		$template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_attendees.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, true);
+	}
+
+
+	/**
+	 *        generates HTML for the Edit Registration side meta box
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function _reg_registrant_side_meta_box()
+	{
+		/*@var $attendee EE_Attendee */
+		$att_check = $this->_registration->attendee();
+		$attendee  = $att_check instanceof EE_Attendee ? $att_check : EEM_Attendee::instance()->create_default_object();
+		//now let's determine if this is not the primary registration.  If it isn't then we set the primary_registration object for reference BUT ONLY if the Attendee object loaded is not the same as the primary registration object (that way we know if we need to show create button or not)
+		if ( ! $this->_registration->is_primary_registrant()) {
+			$primary_registration = $this->_registration->get_primary_registration();
+			$primary_attendee     = $primary_registration instanceof EE_Registration ? $primary_registration->attendee()
+				: null;
+			if ( ! $primary_attendee instanceof EE_Attendee || $attendee->ID() !== $primary_attendee->ID()) {
+				//in here?  This means the displayed registration is not the primary registrant but ALREADY HAS its own custom attendee object so let's not worry about the primary reg.
+				$primary_registration = null;
+			}
+		} else {
+			$primary_registration = null;
+		}
+		$this->_template_args['ATT_ID']            = $attendee->ID();
+		$this->_template_args['fname']             = $attendee->fname();//$this->_registration->ATT_fname;
+		$this->_template_args['lname']             = $attendee->lname();//$this->_registration->ATT_lname;
+		$this->_template_args['email']             = $attendee->email();//$this->_registration->ATT_email;
+		$this->_template_args['phone']             = $attendee->phone();
+		$this->_template_args['formatted_address'] = EEH_Address::format($attendee);
+		//edit link
+		$this->_template_args['att_edit_link']  = EE_Admin_Page::add_query_args_and_nonce(array(
+			'action' => 'edit_attendee',
+			'post'   => $attendee->ID(),
+		), REG_ADMIN_URL);
+		$this->_template_args['att_edit_label'] = __('View/Edit Contact', 'event_espresso');
+		//create link
+		$this->_template_args['create_link']  = $primary_registration instanceof EE_Registration
+			? EE_Admin_Page::add_query_args_and_nonce(array(
+				'action'  => 'duplicate_attendee',
+				'_REG_ID' => $this->_registration->ID(),
+			), REG_ADMIN_URL) : '';
+		$this->_template_args['create_label'] = __('Create Contact', 'event_espresso');
+		$this->_template_args['att_check']    = $att_check;
+		$template_path                        = REG_TEMPLATE_PATH . 'reg_admin_details_side_meta_box_registrant.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, true);
+	}
+
+
+	/**
+	 * trash or restore registrations
+	 *
+	 * @param  boolean $trash whether to archive or restore
+	 * @access protected
+	 * @return void
+	 */
+	protected function _trash_or_restore_registrations($trash = true)
+	{
+		$REGM    = EEM_Registration::instance();
+		$success = 1;
+		$error   = 0;
+		$tickets = array();
+		$dtts    = array();
+		//if empty _REG_ID then get out because there's nothing to do
+		if (empty($this->_req_data['_REG_ID'])) {
+			$msg = $trash
+				? __('In order to trash registrations you must select which ones you wish to trash by clicking the checkboxes.',
+					'event_espresso')
+				: __('In order to restore registrations you must select which ones you wish to restore by clicking the checkboxes.',
+					'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __LINE__, __FUNCTION__);
+			$this->_redirect_after_action(false, '', '', array(), true);
+		}
+		//Checkboxes
+		if ( ! empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) {
+			// if array has more than one element than success message should be plural
+			$success = count($this->_req_data['_REG_ID']) > 1 ? 2 : 1;
+			// cycle thru checkboxes
+			while (list($ind, $REG_ID) = each($this->_req_data['_REG_ID'])) {
+				/** @var EE_Registration $REG */
+				$REG           = $REGM->get_one_by_ID($REG_ID);
+				$payment_count = $REG->get_first_related('Transaction')->count_related('Payment');
+				if ($payment_count > 0) {
+					$name    = $REG->attendee() instanceof EE_Attendee ? $REG->attendee()->full_name()
+						: __('Unknown Attendee', 'event_espresso');
+					$error   = 1;
+					$success = 0;
+					EE_Error::add_error(sprintf(__('The registration for %s could not be trashed because it has payments attached to the related transaction.  If you wish to trash this registration you must first delete the payments on the related transaction.',
+						'event_espresso'), $name), __FILE__, __FUNCTION__, __LINE__);
+					continue; //can't trash this registration because it has payments.
+				}
+				$ticket                 = $REG->get_first_related('Ticket');
+				$tickets[$ticket->ID()] = $ticket;
+				$dtt                    = $ticket->get_many_related('Datetime');
+				$dtts                   = array_merge($dtts, $dtt);
+				$updated                = $trash ? $REG->delete() : $REG->restore();
+				if ( ! $updated) {
+					$success = 0;
+				} else {
+					$success = 2;
+				}/**/
+			}
+		} else {
+			// grab single id and delete
+			$REG_ID                 = absint($this->_req_data['_REG_ID']);
+			$REG                    = $REGM->get_one_by_ID($REG_ID);
+			$ticket                 = $REG->get_first_related('Ticket');
+			$tickets[$ticket->ID()] = $ticket;
+			$dtts                   = $ticket->get_many_related('Datetime');
+			$updated                = $trash ? $REG->delete() : $REG->restore();
+			if ( ! $updated) {
+				$success = 0;
+			}
+		}
+		//now let's update counts
+		EEM_Ticket::instance()->update_tickets_sold($tickets);
+		EEM_Datetime::instance()->update_sold($dtts);
+		$what           = $success > 1 ? __('Registrations', 'event_espresso') : __('Registration', 'event_espresso');
+		$action_desc    = $trash ? __('moved to the trash', 'event_espresso') : __('restored', 'event_espresso');
+		$overwrite_msgs = $error ? true : false;
+		$this->_redirect_after_action($success, $what, $action_desc, array('action' => 'default'), $overwrite_msgs);
+	}
+
+
+	/**
+	 * This is used to permanently delete registrations.  Note, this will handle not only deleting permanently the
+	 * registration but also.
+	 * 1. Removing relations to EE_Attendee
+	 * 2. Deleting permanently the related transaction, but ONLY if all related registrations to the transaction are
+	 * ALSO trashed.
+	 * 3. Deleting permanently any related Line items but only if the above conditions are met.
+	 * 4. Removing relationships between all tickets and the related registrations
+	 * 5. Deleting permanently any related Answers (and the answers for other related registrations that were deleted.)
+	 * 6. Deleting permanently any related Checkins.
+	 *
+	 * @return void
+	 */
+	protected function _delete_registrations()
+	{
+		$REG_MDL = EEM_Registration::instance();
+		$success = 1;
+		//Checkboxes
+		if ( ! empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) {
+			// if array has more than one element than success message should be plural
+			$success = count($this->_req_data['_REG_ID']) > 1 ? 2 : 1;
+			// cycle thru checkboxes
+			while (list($ind, $REG_ID) = each($this->_req_data['_REG_ID'])) {
+				$REG = $REG_MDL->get_one_by_ID($REG_ID);
+				if ( ! $REG instanceof EE_Registration) {
+					continue;
+				}
+				$deleted = $this->_delete_registration($REG);
+				if ( ! $deleted) {
+					$success = 0;
+				}
+			}
+		} else {
+			// grab single id and delete
+			$REG_ID  = $this->_req_data['_REG_ID'];
+			$REG     = $REG_MDL->get_one_by_ID($REG_ID);
+			$deleted = $this->_delete_registration($REG);
+			if ( ! $deleted) {
+				$success = 0;
+			}
+		}
+		$what        = $success > 1 ? __('Registrations', 'event_espresso') : __('Registration', 'event_espresso');
+		$action_desc = __('permanently deleted.', 'event_espresso');
+		$this->_redirect_after_action($success, $what, $action_desc, array('action' => 'default'), true);
+	}
+
+
+	/**
+	 * handles the permanent deletion of a registration.  See comments with _delete_registrations() for details on what
+	 * models get affected.
+	 *
+	 * @param  EE_Registration $REG registration to be deleted permenantly
+	 * @return boolean              true = successful deletion, false = fail.
+	 */
+	protected function _delete_registration(EE_Registration $REG)
+	{
+		//first we start with the transaction... ultimately, we WILL not delete permanently if there are any related registrations on the transaction that are NOT trashed.
+		$TXN         = $REG->get_first_related('Transaction');
+		$REGS        = $TXN->get_many_related('Registration');
+		$all_trashed = true;
+		foreach ($REGS as $registration) {
+			if ( ! $registration->get('REG_deleted')) {
+				$all_trashed = false;
+			}
+		}
+		if ( ! $all_trashed) {
+			EE_Error::add_error(__('Unable to permanently delete this registration. Before this registration can be permanently deleted, all registrations made in the same transaction must be trashed as well.  These registrations will be permanently deleted in the same action.',
+				'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+		//k made it here so that means we can delete all the related transactions and their answers (but let's do them separately from THIS one).
+		foreach ($REGS as $registration) {
+			//delete related answers
+			$registration->delete_related_permanently('Answer');
+			//remove relationship to EE_Attendee (but we ALWAYS leave the contact record intact)
+			$attendee = $registration->get_first_related('Attendee');
+			if ($attendee instanceof EE_Attendee) {
+				$registration->_remove_relation_to($attendee, 'Attendee');
+			}
+			//now remove relationships to tickets on this registration.
+			$registration->_remove_relations('Ticket');
+			//now delete permanently the checkins related to this registration.
+			$registration->delete_related_permanently('Checkin');
+			if ($registration->ID() === $REG->ID()) {
+				continue;
+			} //we don't want to delete permanently the existing registration just yet.
+			//remove relation to transaction for these registrations if NOT the existing registrations
+			$registration->_remove_relations('Transaction');
+			//delete permanently any related messages.
+			$registration->delete_related_permanently('Message');
+			//now delete this registration permanently
+			$registration->delete_permanently();
+		}
+		//now all related registrations on the transaction are handled.  So let's just handle this registration itself (the transaction and line items should be all that's left).
+		//delete the line items related to the transaction for this registration.
+		$TXN->delete_related_permanently('Line_Item');
+		//we need to remove all the relationships on the transaction
+		$TXN->delete_related_permanently('Payment');
+		$TXN->delete_related_permanently('Extra_Meta');
+		$TXN->delete_related_permanently('Message');
+		//now we can delete this REG permanently (and the transaction of course)
+		$REG->delete_related_permanently('Transaction');
+		return $REG->delete_permanently();
+	}
+
+
+	/**
+	 *    generates HTML for the Register New Attendee Admin page
+	 *
+	 * @access private
+	 * @throws \EE_Error
+	 * @return void
+	 */
+	public function new_registration()
+	{
+		if ( ! $this->_set_reg_event()) {
+			throw new EE_Error(__('Unable to continue with registering because there is no Event ID in the request',
+				'event_espresso'));
+		}
+		EE_Registry::instance()->REQ->set_espresso_page(true);
+		// gotta start with a clean slate if we're not coming here via ajax
+		if ( ! defined('DOING_AJAX')
+			 && ( ! isset($this->_req_data['processing_registration']) || isset($this->_req_data['step_error']))
+		) {
+			EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
+		}
+		$this->_template_args['event_name'] = '';
+		// event name
+		if ($this->_reg_event) {
+			$this->_template_args['event_name'] = $this->_reg_event->name();
+			$edit_event_url                     = self::add_query_args_and_nonce(array(
+				'action' => 'edit',
+				'post'   => $this->_reg_event->ID(),
+			), EVENTS_ADMIN_URL);
+			$edit_event_lnk                     = '<a href="'
+												  . $edit_event_url
+												  . '" title="'
+												  . esc_attr__('Edit ', 'event_espresso')
+												  . $this->_reg_event->name()
+												  . '">'
+												  . __('Edit Event', 'event_espresso')
+												  . '</a>';
+			$this->_template_args['event_name'] .= ' <span class="admin-page-header-edit-lnk not-bold">'
+												   . $edit_event_lnk
+												   . '</span>';
+		}
+		$this->_template_args['step_content'] = $this->_get_registration_step_content();
+		if (defined('DOING_AJAX')) {
+			$this->_return_json();
+		}
+		// grab header
+		$template_path                              = REG_TEMPLATE_PATH . 'reg_admin_register_new_attendee.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path,
+			$this->_template_args, true);
+		//$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
+		// the details template wrapper
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 * This returns the content for a registration step
+	 *
+	 * @access protected
+	 * @return string html
+	 */
+	protected function _get_registration_step_content()
+	{
+		if (isset($_COOKIE['ee_registration_added']) && $_COOKIE['ee_registration_added']) {
+			$warning_msg = sprintf(__('%2$sWARNING!!!%3$s%1$sPlease do not use the back button to return to this page for the purpose of adding another registration.%1$sThis can result in lost and/or corrupted data.%1$sIf you wish to add another registration, then please click the%1$s%7$s"Add Another New Registration to Event"%8$s button%1$son the Transaction details page, after you are redirected.%1$s%1$s%4$s redirecting in %5$s seconds %6$s',
+				'event_espresso'), '<br />', '<h3 class="important-notice">', '</h3>', '<div class="float-right">',
+				'<span id="redirect_timer" class="important-notice">30</span>', '</div>', '<b>', '</b>');
+			return '
 	<div id="ee-add-reg-back-button-dv"><p>' . $warning_msg . '</p></div>
 	<script >
 		// WHOAH !!! it appears that someone is using the back button from the Transaction admin page
@@ -2369,658 +2369,658 @@ 
 	        }
 	    }, 800 );
 	</script >';
-        }
-        $template_args = array(
-            'title'                    => '',
-            'content'                  => '',
-            'step_button_text'         => '',
-            'show_notification_toggle' => false,
-        );
-        //to indicate we're processing a new registration
-        $hidden_fields = array(
-            'processing_registration' => array(
-                'type'  => 'hidden',
-                'value' => 0,
-            ),
-            'event_id'                => array(
-                'type'  => 'hidden',
-                'value' => $this->_reg_event->ID(),
-            ),
-        );
-        //if the cart is empty then we know we're at step one so we'll display ticket selector
-        $cart = EE_Registry::instance()->SSN->cart();
-        $step = ! $cart instanceof EE_Cart ? 'ticket' : 'questions';
-        switch ($step) {
-            case 'ticket' :
-                $hidden_fields['processing_registration']['value'] = 1;
-                $template_args['title']                            = __('Step One: Select the Ticket for this registration',
-                    'event_espresso');
-                $template_args['content']                          = EED_Ticket_Selector::instance()->display_ticket_selector($this->_reg_event);
-                $template_args['step_button_text']                 = __('Add Tickets and Continue to Registrant Details',
-                    'event_espresso');
-                $template_args['show_notification_toggle']         = false;
-                break;
-            case 'questions' :
-                $hidden_fields['processing_registration']['value'] = 2;
-                $template_args['title']                            = __('Step Two: Add Registrant Details for this Registration',
-                    'event_espresso');
-                //in theory we should be able to run EED_SPCO at this point because the cart should have been setup properly by the first process_reg_step run.
-                $template_args['content']                  = EED_Single_Page_Checkout::registration_checkout_for_admin();
-                $template_args['step_button_text']         = __('Save Registration and Continue to Details',
-                    'event_espresso');
-                $template_args['show_notification_toggle'] = true;
-                break;
-        }
-        $this->_set_add_edit_form_tags('process_reg_step',
-            $hidden_fields); //we come back to the process_registration_step route.
-        return EEH_Template::display_template(REG_TEMPLATE_PATH
-                                              . 'reg_admin_register_new_attendee_step_content.template.php',
-            $template_args, true);
-    }
-
-
-    /**
-     *        set_reg_event
-     *
-     * @access private
-     * @return boolean
-     */
-    private function _set_reg_event()
-    {
-        if (is_object($this->_reg_event)) {
-            return true;
-        }
-        $EVT_ID = ( ! empty($this->_req_data['event_id'])) ? absint($this->_req_data['event_id']) : false;
-        if ( ! $EVT_ID) {
-            return false;
-        }
-        $this->_reg_event = EEM_Event::instance()->get_one_by_ID($EVT_ID);
-        return true;
-    }
-
-
-    /**
-     * process_reg_step
-     *
-     * @access        public
-     * @return        string
-     * @throws \RuntimeException
-     * @throws \EE_Error
-     */
-    public function process_reg_step()
-    {
-        EE_System::do_not_cache();
-        $this->_set_reg_event();
-        EE_Registry::instance()->REQ->set_espresso_page(true);
-        EE_Registry::instance()->REQ->set('uts', time());
-        //what step are we on?
-        $cart = EE_Registry::instance()->SSN->cart();
-        $step = ! $cart instanceof EE_Cart ? 'ticket' : 'questions';
-        //if doing ajax then we need to verify the nonce
-        if (defined('DOING_AJAX')) {
-            $nonce = isset($this->_req_data[$this->_req_nonce])
-                ? sanitize_text_field($this->_req_data[$this->_req_nonce]) : '';
-            $this->_verify_nonce($nonce, $this->_req_nonce);
-        }
-        switch ($step) {
-            case 'ticket' :
-                //process ticket selection
-                $success = EED_Ticket_Selector::instance()->process_ticket_selections();
-                if ($success) {
-                    EE_Error::add_success(esc_html__('Tickets Selected. Now complete the registration.',
-                        'event_espresso'));
-                } else {
-                    $query_args['step_error'] = $this->_req_data['step_error'] = true;
-                }
-                if (defined('DOING_AJAX')) {
-                    $this->new_registration(); //display next step
-                } else {
-                    $query_args = array(
-                        'action'                  => 'new_registration',
-                        'processing_registration' => 1,
-                        'event_id'                => $this->_reg_event->ID(),
-                        'uts'                     => time(),
-                    );
-                    $this->_redirect_after_action(false, '', '', $query_args, true);
-                }
-                break;
-            case 'questions' :
-                if ( ! isset($this->_req_data['txn_reg_status_change'], $this->_req_data['txn_reg_status_change']['send_notifications'])) {
-                    add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_false', 15);
-                }
-                //process registration
-                $transaction = EED_Single_Page_Checkout::instance()->process_registration_from_admin();
-                if ($cart instanceof EE_Cart) {
-                    $grand_total = $cart->get_cart_grand_total();
-                    if ($grand_total instanceof EE_Line_Item) {
-                        $grand_total->save_this_and_descendants_to_txn();
-                    }
-                }
-                if ( ! $transaction instanceof EE_Transaction) {
-                    $query_args = array(
-                        'action'                  => 'new_registration',
-                        'processing_registration' => 2,
-                        'event_id'                => $this->_reg_event->ID(),
-                        'uts'                     => time(),
-                    );
-                    if (defined('DOING_AJAX')) {
-                        //display registration form again because there are errors (maybe validation?)
-                        $this->new_registration();
-                        return;
-                    } else {
-                        $this->_redirect_after_action(false, '', '', $query_args, true);
-                        return;
-                    }
-                }
-                // maybe update status, and make sure to save transaction if not done already
-                if ( ! $transaction->update_status_based_on_total_paid()) {
-                    $transaction->save();
-                }
-                EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
-                $this->_req_data = array();
-                $query_args      = array(
-                    'action'        => 'redirect_to_txn',
-                    'TXN_ID'        => $transaction->ID(),
-                    'EVT_ID'        => $this->_reg_event->ID(),
-                    'event_name'    => urlencode($this->_reg_event->name()),
-                    'redirect_from' => 'new_registration',
-                );
-                $this->_redirect_after_action(false, '', '', $query_args, true);
-                break;
-        }
-        //what are you looking here for?  Should be nothing to do at this point.
-    }
-
-
-    /**
-     * redirect_to_txn
-     *
-     * @access public
-     * @return void
-     */
-    public function redirect_to_txn()
-    {
-        EE_System::do_not_cache();
-        EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
-        $query_args = array(
-            'action' => 'view_transaction',
-            'TXN_ID' => isset($this->_req_data['TXN_ID']) ? absint($this->_req_data['TXN_ID']) : 0,
-            'page'   => 'espresso_transactions',
-        );
-        if (isset($this->_req_data['EVT_ID'], $this->_req_data['redirect_from'])) {
-            $query_args['EVT_ID']        = $this->_req_data['EVT_ID'];
-            $query_args['event_name']    = urlencode($this->_req_data['event_name']);
-            $query_args['redirect_from'] = $this->_req_data['redirect_from'];
-        }
-        EE_Error::add_success(__('Registration Created.  Please review the transaction and add any payments as necessary',
-            'event_espresso'));
-        $this->_redirect_after_action(false, '', '', $query_args, true);
-    }
-
-
-    /**
-     *        generates HTML for the Attendee Contact List
-     *
-     * @access protected
-     * @return void
-     */
-    protected function _attendee_contact_list_table()
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        $this->_search_btn_label = __('Contacts', 'event_espresso');
-        $this->display_admin_list_table_page_with_no_sidebar();
-    }
-
-
-    /**
-     *        get_attendees
-     *
-     * @param bool $count whether to return count or data.
-     * @access public
-     * @return array
-     */
-    public function get_attendees($per_page, $count = false, $trash = false)
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        require_once(REG_ADMIN . 'EE_Attendee_Contact_List_Table.class.php');
-        $ATT_MDL                    = EEM_Attendee::instance();
-        $this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : '';
-        switch ($this->_req_data['orderby']) {
-            case 'ATT_ID':
-                $orderby = 'ATT_ID';
-                break;
-            case 'ATT_fname':
-                $orderby = 'ATT_fname';
-                break;
-            case 'ATT_email':
-                $orderby = 'ATT_email';
-                break;
-            case 'ATT_city':
-                $orderby = 'ATT_city';
-                break;
-            case 'STA_ID':
-                $orderby = 'STA_ID';
-                break;
-            case 'CNT_ID':
-                $orderby = 'CNT_ID';
-                break;
-            default:
-                $orderby = 'ATT_lname';
-        }
-        $sort         = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order']
-            : 'ASC';
-        $current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged'])
-            ? $this->_req_data['paged'] : 1;
-        $per_page     = isset($per_page) && ! empty($per_page) ? $per_page : 10;
-        $per_page     = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage'])
-            ? $this->_req_data['perpage'] : $per_page;
-        $_where       = array();
-        if ( ! empty($this->_req_data['s'])) {
-            $sstr         = '%' . $this->_req_data['s'] . '%';
-            $_where['OR'] = array(
-                'Registration.Event.EVT_name'       => array('LIKE', $sstr),
-                'Registration.Event.EVT_desc'       => array('LIKE', $sstr),
-                'Registration.Event.EVT_short_desc' => array('LIKE', $sstr),
-                'ATT_fname'                         => array('LIKE', $sstr),
-                'ATT_lname'                         => array('LIKE', $sstr),
-                'ATT_short_bio'                     => array('LIKE', $sstr),
-                'ATT_email'                         => array('LIKE', $sstr),
-                'ATT_address'                       => array('LIKE', $sstr),
-                'ATT_address2'                      => array('LIKE', $sstr),
-                'ATT_city'                          => array('LIKE', $sstr),
-                'Country.CNT_name'                  => array('LIKE', $sstr),
-                'State.STA_name'                    => array('LIKE', $sstr),
-                'ATT_phone'                         => array('LIKE', $sstr),
-                'Registration.REG_final_price'      => array('LIKE', $sstr),
-                'Registration.REG_code'             => array('LIKE', $sstr),
-                'Registration.REG_count'            => array('LIKE', $sstr),
-                'Registration.REG_group_size'       => array('LIKE', $sstr),
-            );
-        }
-        $offset = ($current_page - 1) * $per_page;
-        $limit  = $count ? null : array($offset, $per_page);
-        if ($trash) {
-            $_where['status'] = array('!=', 'publish');
-            $all_attendees    = $count
-                ? $ATT_MDL->count(array(
-                    $_where,
-                    'order_by' => array($orderby => $sort),
-                    'limit'    => $limit,
-                ), 'ATT_ID', true)
-                : $ATT_MDL->get_all(array(
-                    $_where,
-                    'order_by' => array($orderby => $sort),
-                    'limit'    => $limit,
-                ));
-        } else {
-            $_where['status'] = array('IN', array('publish'));
-            $all_attendees    = $count
-                ? $ATT_MDL->count(array(
-                    $_where,
-                    'order_by' => array($orderby => $sort),
-                    'limit'    => $limit,
-                ), 'ATT_ID', true)
-                : $ATT_MDL->get_all(array(
-                    $_where,
-                    'order_by' => array($orderby => $sort),
-                    'limit'    => $limit,
-                ));
-        }
-        return $all_attendees;
-    }
-
-
-    /**
-     * This is just taking care of resending the registration confirmation
-     *
-     * @access protected
-     * @return void
-     */
-    protected function _resend_registration()
-    {
-        $this->_process_resend_registration();
-        $query_args = isset($this->_req_data['redirect_to'])
-            ? array('action' => $this->_req_data['redirect_to'], '_REG_ID' => $this->_req_data['_REG_ID'])
-            : array(
-                'action' => 'default',
-            );
-        $this->_redirect_after_action(false, '', '', $query_args, true);
-    }
-
-    /**
-     * Creates a registration report, but accepts the name of a method to use for preparing the query parameters
-     * to use when selecting registrations
-     * @param string $method_name_for_getting_query_params the name of the method (on this class) to use for preparing
-     *                                                     the query parameters from the request
-     * @return void ends the request with a redirect or download
-     */
-    public function _registrations_report_base( $method_name_for_getting_query_params )
-    {
-        if ( ! defined('EE_USE_OLD_CSV_REPORT_CLASS')) {
-            wp_redirect(EE_Admin_Page::add_query_args_and_nonce(array(
-                'page'        => 'espresso_batch',
-                'batch'       => 'file',
-                'EVT_ID'      => isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : null,
-                'filters'     => urlencode(
-                    serialize(
-                        call_user_func(
-                            array( $this, $method_name_for_getting_query_params ),
-                            EEH_Array::is_set(
-                                $this->_req_data,
-                                'filters',
-                                array()
-                            )
-                        )
-                    )
-                ),
-                'use_filters' => EEH_Array::is_set($this->_req_data, 'use_filters', false),
-                'job_handler' => urlencode('EventEspressoBatchRequest\JobHandlers\RegistrationsReport'),
-                'return_url'  => urlencode($this->_req_data['return_url']),
-            )));
-        } else {
-            $new_request_args = array(
-                'export' => 'report',
-                'action' => 'registrations_report_for_event',
-                'EVT_ID' => isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : null,
-            );
-            $this->_req_data = array_merge($this->_req_data, $new_request_args);
-            if (is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-                require_once(EE_CLASSES . 'EE_Export.class.php');
-                $EE_Export = EE_Export::instance($this->_req_data);
-                $EE_Export->export();
-            }
-        }
-    }
-
-
-
-    /**
-     * Creates a registration report using only query parameters in the request
-     * @return void
-     */
-    public function _registrations_report()
-    {
-        $this->_registrations_report_base( '_get_registration_query_parameters' );
-    }
-
-
-    public function _contact_list_export()
-    {
-        if (is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-            require_once(EE_CLASSES . 'EE_Export.class.php');
-            $EE_Export = EE_Export::instance($this->_req_data);
-            $EE_Export->export_attendees();
-        }
-    }
-
-
-    public function _contact_list_report()
-    {
-        if ( ! defined('EE_USE_OLD_CSV_REPORT_CLASS')) {
-            wp_redirect(EE_Admin_Page::add_query_args_and_nonce(array(
-                'page'        => 'espresso_batch',
-                'batch'       => 'file',
-                'job_handler' => urlencode('EventEspressoBatchRequest\JobHandlers\AttendeesReport'),
-                'return_url'  => urlencode($this->_req_data['return_url']),
-            )));
-        } else {
-            if (is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-                require_once(EE_CLASSES . 'EE_Export.class.php');
-                $EE_Export = EE_Export::instance($this->_req_data);
-                $EE_Export->report_attendees();
-            }
-        }
-    }
-
-
-
-
-
-    /***************************************        ATTENDEE DETAILS        ***************************************/
-    /**
-     * This duplicates the attendee object for the given incoming registration id and attendee_id.
-     *
-     * @return void
-     */
-    protected function _duplicate_attendee()
-    {
-        $action = ! empty($this->_req_data['return']) ? $this->_req_data['return'] : 'default';
-        //verify we have necessary info
-        if (empty($this->_req_data['_REG_ID'])) {
-            EE_Error::add_error(__('Unable to create the contact for the registration because the required parameters are not present (_REG_ID )',
-                'event_espresso'), __FILE__, __LINE__, __FUNCTION__);
-            $query_args = array('action' => $action);
-            $this->_redirect_after_action('', '', '', $query_args, true);
-        }
-        //okay necessary deets present... let's dupe the incoming attendee and attach to incoming registration.
-        $registration = EEM_Registration::instance()->get_one_by_ID($this->_req_data['_REG_ID']);
-        $attendee     = $registration->attendee();
-        //remove relation of existing attendee on registration
-        $registration->_remove_relation_to($attendee, 'Attendee');
-        //new attendee
-        $new_attendee = clone $attendee;
-        $new_attendee->set('ATT_ID', 0);
-        $new_attendee->save();
-        //add new attendee to reg
-        $registration->_add_relation_to($new_attendee, 'Attendee');
-        EE_Error::add_success(__('New Contact record created.  Now make any edits you wish to make for this contact.',
-            'event_espresso'));
-        //redirect to edit page for attendee
-        $query_args = array('post' => $new_attendee->ID(), 'action' => 'edit_attendee');
-        $this->_redirect_after_action('', '', '', $query_args, true);
-    }
-
-
-    //related to cpt routes
-    protected function _insert_update_cpt_item($post_id, $post)
-    {
-        $success  = true;
-        $attendee = EEM_Attendee::instance()->get_one_by_ID($post_id);
-        //for attendee updates
-        if ($post->post_type = 'espresso_attendees' && ! empty($attendee)) {
-            //note we should only be UPDATING attendees at this point.
-            $updated_fields = array(
-                'ATT_fname'     => $this->_req_data['ATT_fname'],
-                'ATT_lname'     => $this->_req_data['ATT_lname'],
-                'ATT_full_name' => $this->_req_data['ATT_fname'] . ' ' . $this->_req_data['ATT_lname'],
-                'ATT_address'   => isset($this->_req_data['ATT_address']) ? $this->_req_data['ATT_address'] : '',
-                'ATT_address2'  => isset($this->_req_data['ATT_address2']) ? $this->_req_data['ATT_address2'] : '',
-                'ATT_city'      => isset($this->_req_data['ATT_city']) ? $this->_req_data['ATT_city'] : '',
-                'STA_ID'        => isset($this->_req_data['STA_ID']) ? $this->_req_data['STA_ID'] : '',
-                'CNT_ISO'       => isset($this->_req_data['CNT_ISO']) ? $this->_req_data['CNT_ISO'] : '',
-                'ATT_zip'       => isset($this->_req_data['ATT_zip']) ? $this->_req_data['ATT_zip'] : '',
-                'ATT_email'     => isset($this->_req_data['ATT_email']) ? $this->_req_data['ATT_email'] : '',
-                'ATT_phone'     => isset($this->_req_data['ATT_phone']) ? $this->_req_data['ATT_phone'] : '',
-            );
-            foreach ($updated_fields as $field => $value) {
-                $attendee->set($field, $value);
-            }
-            $success                   = $attendee->save();
-            $attendee_update_callbacks = apply_filters('FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update',
-                array());
-            foreach ($attendee_update_callbacks as $a_callback) {
-                if (false === call_user_func_array($a_callback, array($attendee, $this->_req_data))) {
-                    throw new EE_Error(sprintf(__('The %s callback given for the "FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update" filter is not a valid callback.  Please check the spelling.',
-                        'event_espresso'), $a_callback));
-                }
-            }
-        }
-        if ($success === false) {
-            EE_Error::add_error(__('Something went wrong with updating the meta table data for the registration.',
-                'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
-        }
-    }
-
-
-    public function trash_cpt_item($post_id)
-    {
-    }
-
-
-    public function delete_cpt_item($post_id)
-    {
-    }
-
-
-    public function restore_cpt_item($post_id)
-    {
-    }
-
-
-    protected function _restore_cpt_item($post_id, $revision_id)
-    {
-    }
-
-
-    public function attendee_editor_metaboxes()
-    {
-        $this->verify_cpt_object();
-        remove_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', $this->_cpt_routes[$this->_req_action],
-            'normal', 'core');
-        remove_meta_box('commentstatusdiv', $this->_cpt_routes[$this->_req_action], 'normal', 'core');
-        if (post_type_supports('espresso_attendees', 'excerpt')) {
-            add_meta_box('postexcerpt', __('Short Biography', 'event_espresso'), 'post_excerpt_meta_box',
-                $this->_cpt_routes[$this->_req_action], 'normal');
-        }
-        if (post_type_supports('espresso_attendees', 'comments')) {
-            add_meta_box('commentsdiv', __('Notes on the Contact', 'event_espresso'), 'post_comment_meta_box',
-                $this->_cpt_routes[$this->_req_action], 'normal', 'core');
-        }
-        add_meta_box('attendee_contact_info', __('Contact Info', 'event_espresso'),
-            array($this, 'attendee_contact_info'), $this->_cpt_routes[$this->_req_action], 'side', 'core');
-        add_meta_box('attendee_details_address', __('Address Details', 'event_espresso'),
-            array($this, 'attendee_address_details'), $this->_cpt_routes[$this->_req_action], 'normal', 'core');
-        add_meta_box('attendee_registrations', __('Registrations for this Contact', 'event_espresso'),
-            array($this, 'attendee_registrations_meta_box'), $this->_cpt_routes[$this->_req_action], 'normal', 'high');
-    }
-
-
-    /**
-     * Metabox for attendee contact info
-     *
-     * @param  WP_Post $post wp post object
-     * @return string        attendee contact info ( and form )
-     */
-    public function attendee_contact_info($post)
-    {
-        //get attendee object ( should already have it )
-        $this->_template_args['attendee'] = $this->_cpt_model_obj;
-        $template                         = REG_TEMPLATE_PATH . 'attendee_contact_info_metabox_content.template.php';
-        EEH_Template::display_template($template, $this->_template_args);
-    }
-
-
-    /**
-     * Metabox for attendee details
-     *
-     * @param  WP_Post $post wp post object
-     * @return string        attendee address details (and form)
-     */
-    public function attendee_address_details($post)
-    {
-        //get attendee object (should already have it)
-        $this->_template_args['attendee']     = $this->_cpt_model_obj;
-        $this->_template_args['state_html']   = EEH_Form_Fields::generate_form_input(new EE_Question_Form_Input(EE_Question::new_instance(array(
-            'QST_ID'           => 0,
-            'QST_display_text' => __('State/Province', 'event_espresso'),
-            'QST_system'       => 'admin-state',
-        )), EE_Answer::new_instance(array(
-            'ANS_ID'    => 0,
-            'ANS_value' => $this->_cpt_model_obj->state_ID(),
-        )), array(
-            'input_id'       => 'STA_ID',
-            'input_name'     => 'STA_ID',
-            'input_prefix'   => '',
-            'append_qstn_id' => false,
-        )));
-        $this->_template_args['country_html'] = EEH_Form_Fields::generate_form_input(new EE_Question_Form_Input(EE_Question::new_instance(array(
-            'QST_ID'           => 0,
-            'QST_display_text' => __('Country', 'event_espresso'),
-            'QST_system'       => 'admin-country',
-        )), EE_Answer::new_instance(array(
-            'ANS_ID'    => 0,
-            'ANS_value' => $this->_cpt_model_obj->country_ID(),
-        )), array(
-            'input_id'       => 'CNT_ISO',
-            'input_name'     => 'CNT_ISO',
-            'input_prefix'   => '',
-            'append_qstn_id' => false,
-        )));
-        $template                             = REG_TEMPLATE_PATH . 'attendee_address_details_metabox_content.template.php';
-        EEH_Template::display_template($template, $this->_template_args);
-    }
-
-
-    /**
-     *        _attendee_details
-     *
-     * @access protected
-     * @return void
-     */
-    public function attendee_registrations_meta_box($post)
-    {
-        $this->_template_args['attendee']      = $this->_cpt_model_obj;
-        $this->_template_args['registrations'] = $this->_cpt_model_obj->get_many_related('Registration');
-        $template                              = REG_TEMPLATE_PATH . 'attendee_registrations_main_meta_box.template.php';
-        EEH_Template::display_template($template, $this->_template_args);
-    }
-
-
-    /**
-     * add in the form fields for the attendee edit
-     *
-     * @param  WP_Post $post wp post object
-     * @return string        html for new form.
-     */
-    public function after_title_form_fields($post)
-    {
-        if ($post->post_type == 'espresso_attendees') {
-            $template                  = REG_TEMPLATE_PATH . 'attendee_details_after_title_form_fields.template.php';
-            $template_args['attendee'] = $this->_cpt_model_obj;
-            EEH_Template::display_template($template, $template_args);
-        }
-    }
-
-
-    /**
-     *        _trash_or_restore_attendee
-     *
-     * @param boolean $trash - whether to move item to trash (TRUE) or restore it (FALSE)
-     * @access protected
-     * @return void
-     */
-    protected function _trash_or_restore_attendees($trash = true)
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        $ATT_MDL = EEM_Attendee::instance();
-        $success = 1;
-        //Checkboxes
-        if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
-            // if array has more than one element than success message should be plural
-            $success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
-            // cycle thru checkboxes
-            while (list($ATT_ID, $value) = each($this->_req_data['checkbox'])) {
-                $updated = $trash ? $ATT_MDL->update_by_ID(array('status' => 'trash'), $ATT_ID)
-                    : $ATT_MDL->update_by_ID(array('status' => 'publish'), $ATT_ID);
-                if ( ! $updated) {
-                    $success = 0;
-                }
-            }
-        } else {
-            // grab single id and delete
-            $ATT_ID = absint($this->_req_data['ATT_ID']);
-            //get attendee
-            $att     = $ATT_MDL->get_one_by_ID($ATT_ID);
-            $updated = $trash ? $att->set_status('trash') : $att->set_status('publish');
-            $updated = $att->save();
-            if ( ! $updated) {
-                $success = 0;
-            }
-        }
-        $what        = $success > 1 ? __('Contacts', 'event_espresso') : __('Contact', 'event_espresso');
-        $action_desc = $trash ? __('moved to the trash', 'event_espresso') : __('restored', 'event_espresso');
-        $this->_redirect_after_action($success, $what, $action_desc, array('action' => 'contact_list'));
-    }
+		}
+		$template_args = array(
+			'title'                    => '',
+			'content'                  => '',
+			'step_button_text'         => '',
+			'show_notification_toggle' => false,
+		);
+		//to indicate we're processing a new registration
+		$hidden_fields = array(
+			'processing_registration' => array(
+				'type'  => 'hidden',
+				'value' => 0,
+			),
+			'event_id'                => array(
+				'type'  => 'hidden',
+				'value' => $this->_reg_event->ID(),
+			),
+		);
+		//if the cart is empty then we know we're at step one so we'll display ticket selector
+		$cart = EE_Registry::instance()->SSN->cart();
+		$step = ! $cart instanceof EE_Cart ? 'ticket' : 'questions';
+		switch ($step) {
+			case 'ticket' :
+				$hidden_fields['processing_registration']['value'] = 1;
+				$template_args['title']                            = __('Step One: Select the Ticket for this registration',
+					'event_espresso');
+				$template_args['content']                          = EED_Ticket_Selector::instance()->display_ticket_selector($this->_reg_event);
+				$template_args['step_button_text']                 = __('Add Tickets and Continue to Registrant Details',
+					'event_espresso');
+				$template_args['show_notification_toggle']         = false;
+				break;
+			case 'questions' :
+				$hidden_fields['processing_registration']['value'] = 2;
+				$template_args['title']                            = __('Step Two: Add Registrant Details for this Registration',
+					'event_espresso');
+				//in theory we should be able to run EED_SPCO at this point because the cart should have been setup properly by the first process_reg_step run.
+				$template_args['content']                  = EED_Single_Page_Checkout::registration_checkout_for_admin();
+				$template_args['step_button_text']         = __('Save Registration and Continue to Details',
+					'event_espresso');
+				$template_args['show_notification_toggle'] = true;
+				break;
+		}
+		$this->_set_add_edit_form_tags('process_reg_step',
+			$hidden_fields); //we come back to the process_registration_step route.
+		return EEH_Template::display_template(REG_TEMPLATE_PATH
+											  . 'reg_admin_register_new_attendee_step_content.template.php',
+			$template_args, true);
+	}
+
+
+	/**
+	 *        set_reg_event
+	 *
+	 * @access private
+	 * @return boolean
+	 */
+	private function _set_reg_event()
+	{
+		if (is_object($this->_reg_event)) {
+			return true;
+		}
+		$EVT_ID = ( ! empty($this->_req_data['event_id'])) ? absint($this->_req_data['event_id']) : false;
+		if ( ! $EVT_ID) {
+			return false;
+		}
+		$this->_reg_event = EEM_Event::instance()->get_one_by_ID($EVT_ID);
+		return true;
+	}
+
+
+	/**
+	 * process_reg_step
+	 *
+	 * @access        public
+	 * @return        string
+	 * @throws \RuntimeException
+	 * @throws \EE_Error
+	 */
+	public function process_reg_step()
+	{
+		EE_System::do_not_cache();
+		$this->_set_reg_event();
+		EE_Registry::instance()->REQ->set_espresso_page(true);
+		EE_Registry::instance()->REQ->set('uts', time());
+		//what step are we on?
+		$cart = EE_Registry::instance()->SSN->cart();
+		$step = ! $cart instanceof EE_Cart ? 'ticket' : 'questions';
+		//if doing ajax then we need to verify the nonce
+		if (defined('DOING_AJAX')) {
+			$nonce = isset($this->_req_data[$this->_req_nonce])
+				? sanitize_text_field($this->_req_data[$this->_req_nonce]) : '';
+			$this->_verify_nonce($nonce, $this->_req_nonce);
+		}
+		switch ($step) {
+			case 'ticket' :
+				//process ticket selection
+				$success = EED_Ticket_Selector::instance()->process_ticket_selections();
+				if ($success) {
+					EE_Error::add_success(esc_html__('Tickets Selected. Now complete the registration.',
+						'event_espresso'));
+				} else {
+					$query_args['step_error'] = $this->_req_data['step_error'] = true;
+				}
+				if (defined('DOING_AJAX')) {
+					$this->new_registration(); //display next step
+				} else {
+					$query_args = array(
+						'action'                  => 'new_registration',
+						'processing_registration' => 1,
+						'event_id'                => $this->_reg_event->ID(),
+						'uts'                     => time(),
+					);
+					$this->_redirect_after_action(false, '', '', $query_args, true);
+				}
+				break;
+			case 'questions' :
+				if ( ! isset($this->_req_data['txn_reg_status_change'], $this->_req_data['txn_reg_status_change']['send_notifications'])) {
+					add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_false', 15);
+				}
+				//process registration
+				$transaction = EED_Single_Page_Checkout::instance()->process_registration_from_admin();
+				if ($cart instanceof EE_Cart) {
+					$grand_total = $cart->get_cart_grand_total();
+					if ($grand_total instanceof EE_Line_Item) {
+						$grand_total->save_this_and_descendants_to_txn();
+					}
+				}
+				if ( ! $transaction instanceof EE_Transaction) {
+					$query_args = array(
+						'action'                  => 'new_registration',
+						'processing_registration' => 2,
+						'event_id'                => $this->_reg_event->ID(),
+						'uts'                     => time(),
+					);
+					if (defined('DOING_AJAX')) {
+						//display registration form again because there are errors (maybe validation?)
+						$this->new_registration();
+						return;
+					} else {
+						$this->_redirect_after_action(false, '', '', $query_args, true);
+						return;
+					}
+				}
+				// maybe update status, and make sure to save transaction if not done already
+				if ( ! $transaction->update_status_based_on_total_paid()) {
+					$transaction->save();
+				}
+				EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
+				$this->_req_data = array();
+				$query_args      = array(
+					'action'        => 'redirect_to_txn',
+					'TXN_ID'        => $transaction->ID(),
+					'EVT_ID'        => $this->_reg_event->ID(),
+					'event_name'    => urlencode($this->_reg_event->name()),
+					'redirect_from' => 'new_registration',
+				);
+				$this->_redirect_after_action(false, '', '', $query_args, true);
+				break;
+		}
+		//what are you looking here for?  Should be nothing to do at this point.
+	}
+
+
+	/**
+	 * redirect_to_txn
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function redirect_to_txn()
+	{
+		EE_System::do_not_cache();
+		EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
+		$query_args = array(
+			'action' => 'view_transaction',
+			'TXN_ID' => isset($this->_req_data['TXN_ID']) ? absint($this->_req_data['TXN_ID']) : 0,
+			'page'   => 'espresso_transactions',
+		);
+		if (isset($this->_req_data['EVT_ID'], $this->_req_data['redirect_from'])) {
+			$query_args['EVT_ID']        = $this->_req_data['EVT_ID'];
+			$query_args['event_name']    = urlencode($this->_req_data['event_name']);
+			$query_args['redirect_from'] = $this->_req_data['redirect_from'];
+		}
+		EE_Error::add_success(__('Registration Created.  Please review the transaction and add any payments as necessary',
+			'event_espresso'));
+		$this->_redirect_after_action(false, '', '', $query_args, true);
+	}
+
+
+	/**
+	 *        generates HTML for the Attendee Contact List
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function _attendee_contact_list_table()
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$this->_search_btn_label = __('Contacts', 'event_espresso');
+		$this->display_admin_list_table_page_with_no_sidebar();
+	}
+
+
+	/**
+	 *        get_attendees
+	 *
+	 * @param bool $count whether to return count or data.
+	 * @access public
+	 * @return array
+	 */
+	public function get_attendees($per_page, $count = false, $trash = false)
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		require_once(REG_ADMIN . 'EE_Attendee_Contact_List_Table.class.php');
+		$ATT_MDL                    = EEM_Attendee::instance();
+		$this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : '';
+		switch ($this->_req_data['orderby']) {
+			case 'ATT_ID':
+				$orderby = 'ATT_ID';
+				break;
+			case 'ATT_fname':
+				$orderby = 'ATT_fname';
+				break;
+			case 'ATT_email':
+				$orderby = 'ATT_email';
+				break;
+			case 'ATT_city':
+				$orderby = 'ATT_city';
+				break;
+			case 'STA_ID':
+				$orderby = 'STA_ID';
+				break;
+			case 'CNT_ID':
+				$orderby = 'CNT_ID';
+				break;
+			default:
+				$orderby = 'ATT_lname';
+		}
+		$sort         = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order']
+			: 'ASC';
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged'])
+			? $this->_req_data['paged'] : 1;
+		$per_page     = isset($per_page) && ! empty($per_page) ? $per_page : 10;
+		$per_page     = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage'])
+			? $this->_req_data['perpage'] : $per_page;
+		$_where       = array();
+		if ( ! empty($this->_req_data['s'])) {
+			$sstr         = '%' . $this->_req_data['s'] . '%';
+			$_where['OR'] = array(
+				'Registration.Event.EVT_name'       => array('LIKE', $sstr),
+				'Registration.Event.EVT_desc'       => array('LIKE', $sstr),
+				'Registration.Event.EVT_short_desc' => array('LIKE', $sstr),
+				'ATT_fname'                         => array('LIKE', $sstr),
+				'ATT_lname'                         => array('LIKE', $sstr),
+				'ATT_short_bio'                     => array('LIKE', $sstr),
+				'ATT_email'                         => array('LIKE', $sstr),
+				'ATT_address'                       => array('LIKE', $sstr),
+				'ATT_address2'                      => array('LIKE', $sstr),
+				'ATT_city'                          => array('LIKE', $sstr),
+				'Country.CNT_name'                  => array('LIKE', $sstr),
+				'State.STA_name'                    => array('LIKE', $sstr),
+				'ATT_phone'                         => array('LIKE', $sstr),
+				'Registration.REG_final_price'      => array('LIKE', $sstr),
+				'Registration.REG_code'             => array('LIKE', $sstr),
+				'Registration.REG_count'            => array('LIKE', $sstr),
+				'Registration.REG_group_size'       => array('LIKE', $sstr),
+			);
+		}
+		$offset = ($current_page - 1) * $per_page;
+		$limit  = $count ? null : array($offset, $per_page);
+		if ($trash) {
+			$_where['status'] = array('!=', 'publish');
+			$all_attendees    = $count
+				? $ATT_MDL->count(array(
+					$_where,
+					'order_by' => array($orderby => $sort),
+					'limit'    => $limit,
+				), 'ATT_ID', true)
+				: $ATT_MDL->get_all(array(
+					$_where,
+					'order_by' => array($orderby => $sort),
+					'limit'    => $limit,
+				));
+		} else {
+			$_where['status'] = array('IN', array('publish'));
+			$all_attendees    = $count
+				? $ATT_MDL->count(array(
+					$_where,
+					'order_by' => array($orderby => $sort),
+					'limit'    => $limit,
+				), 'ATT_ID', true)
+				: $ATT_MDL->get_all(array(
+					$_where,
+					'order_by' => array($orderby => $sort),
+					'limit'    => $limit,
+				));
+		}
+		return $all_attendees;
+	}
+
+
+	/**
+	 * This is just taking care of resending the registration confirmation
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function _resend_registration()
+	{
+		$this->_process_resend_registration();
+		$query_args = isset($this->_req_data['redirect_to'])
+			? array('action' => $this->_req_data['redirect_to'], '_REG_ID' => $this->_req_data['_REG_ID'])
+			: array(
+				'action' => 'default',
+			);
+		$this->_redirect_after_action(false, '', '', $query_args, true);
+	}
+
+	/**
+	 * Creates a registration report, but accepts the name of a method to use for preparing the query parameters
+	 * to use when selecting registrations
+	 * @param string $method_name_for_getting_query_params the name of the method (on this class) to use for preparing
+	 *                                                     the query parameters from the request
+	 * @return void ends the request with a redirect or download
+	 */
+	public function _registrations_report_base( $method_name_for_getting_query_params )
+	{
+		if ( ! defined('EE_USE_OLD_CSV_REPORT_CLASS')) {
+			wp_redirect(EE_Admin_Page::add_query_args_and_nonce(array(
+				'page'        => 'espresso_batch',
+				'batch'       => 'file',
+				'EVT_ID'      => isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : null,
+				'filters'     => urlencode(
+					serialize(
+						call_user_func(
+							array( $this, $method_name_for_getting_query_params ),
+							EEH_Array::is_set(
+								$this->_req_data,
+								'filters',
+								array()
+							)
+						)
+					)
+				),
+				'use_filters' => EEH_Array::is_set($this->_req_data, 'use_filters', false),
+				'job_handler' => urlencode('EventEspressoBatchRequest\JobHandlers\RegistrationsReport'),
+				'return_url'  => urlencode($this->_req_data['return_url']),
+			)));
+		} else {
+			$new_request_args = array(
+				'export' => 'report',
+				'action' => 'registrations_report_for_event',
+				'EVT_ID' => isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : null,
+			);
+			$this->_req_data = array_merge($this->_req_data, $new_request_args);
+			if (is_readable(EE_CLASSES . 'EE_Export.class.php')) {
+				require_once(EE_CLASSES . 'EE_Export.class.php');
+				$EE_Export = EE_Export::instance($this->_req_data);
+				$EE_Export->export();
+			}
+		}
+	}
+
+
+
+	/**
+	 * Creates a registration report using only query parameters in the request
+	 * @return void
+	 */
+	public function _registrations_report()
+	{
+		$this->_registrations_report_base( '_get_registration_query_parameters' );
+	}
+
+
+	public function _contact_list_export()
+	{
+		if (is_readable(EE_CLASSES . 'EE_Export.class.php')) {
+			require_once(EE_CLASSES . 'EE_Export.class.php');
+			$EE_Export = EE_Export::instance($this->_req_data);
+			$EE_Export->export_attendees();
+		}
+	}
+
+
+	public function _contact_list_report()
+	{
+		if ( ! defined('EE_USE_OLD_CSV_REPORT_CLASS')) {
+			wp_redirect(EE_Admin_Page::add_query_args_and_nonce(array(
+				'page'        => 'espresso_batch',
+				'batch'       => 'file',
+				'job_handler' => urlencode('EventEspressoBatchRequest\JobHandlers\AttendeesReport'),
+				'return_url'  => urlencode($this->_req_data['return_url']),
+			)));
+		} else {
+			if (is_readable(EE_CLASSES . 'EE_Export.class.php')) {
+				require_once(EE_CLASSES . 'EE_Export.class.php');
+				$EE_Export = EE_Export::instance($this->_req_data);
+				$EE_Export->report_attendees();
+			}
+		}
+	}
+
+
+
+
+
+	/***************************************        ATTENDEE DETAILS        ***************************************/
+	/**
+	 * This duplicates the attendee object for the given incoming registration id and attendee_id.
+	 *
+	 * @return void
+	 */
+	protected function _duplicate_attendee()
+	{
+		$action = ! empty($this->_req_data['return']) ? $this->_req_data['return'] : 'default';
+		//verify we have necessary info
+		if (empty($this->_req_data['_REG_ID'])) {
+			EE_Error::add_error(__('Unable to create the contact for the registration because the required parameters are not present (_REG_ID )',
+				'event_espresso'), __FILE__, __LINE__, __FUNCTION__);
+			$query_args = array('action' => $action);
+			$this->_redirect_after_action('', '', '', $query_args, true);
+		}
+		//okay necessary deets present... let's dupe the incoming attendee and attach to incoming registration.
+		$registration = EEM_Registration::instance()->get_one_by_ID($this->_req_data['_REG_ID']);
+		$attendee     = $registration->attendee();
+		//remove relation of existing attendee on registration
+		$registration->_remove_relation_to($attendee, 'Attendee');
+		//new attendee
+		$new_attendee = clone $attendee;
+		$new_attendee->set('ATT_ID', 0);
+		$new_attendee->save();
+		//add new attendee to reg
+		$registration->_add_relation_to($new_attendee, 'Attendee');
+		EE_Error::add_success(__('New Contact record created.  Now make any edits you wish to make for this contact.',
+			'event_espresso'));
+		//redirect to edit page for attendee
+		$query_args = array('post' => $new_attendee->ID(), 'action' => 'edit_attendee');
+		$this->_redirect_after_action('', '', '', $query_args, true);
+	}
+
+
+	//related to cpt routes
+	protected function _insert_update_cpt_item($post_id, $post)
+	{
+		$success  = true;
+		$attendee = EEM_Attendee::instance()->get_one_by_ID($post_id);
+		//for attendee updates
+		if ($post->post_type = 'espresso_attendees' && ! empty($attendee)) {
+			//note we should only be UPDATING attendees at this point.
+			$updated_fields = array(
+				'ATT_fname'     => $this->_req_data['ATT_fname'],
+				'ATT_lname'     => $this->_req_data['ATT_lname'],
+				'ATT_full_name' => $this->_req_data['ATT_fname'] . ' ' . $this->_req_data['ATT_lname'],
+				'ATT_address'   => isset($this->_req_data['ATT_address']) ? $this->_req_data['ATT_address'] : '',
+				'ATT_address2'  => isset($this->_req_data['ATT_address2']) ? $this->_req_data['ATT_address2'] : '',
+				'ATT_city'      => isset($this->_req_data['ATT_city']) ? $this->_req_data['ATT_city'] : '',
+				'STA_ID'        => isset($this->_req_data['STA_ID']) ? $this->_req_data['STA_ID'] : '',
+				'CNT_ISO'       => isset($this->_req_data['CNT_ISO']) ? $this->_req_data['CNT_ISO'] : '',
+				'ATT_zip'       => isset($this->_req_data['ATT_zip']) ? $this->_req_data['ATT_zip'] : '',
+				'ATT_email'     => isset($this->_req_data['ATT_email']) ? $this->_req_data['ATT_email'] : '',
+				'ATT_phone'     => isset($this->_req_data['ATT_phone']) ? $this->_req_data['ATT_phone'] : '',
+			);
+			foreach ($updated_fields as $field => $value) {
+				$attendee->set($field, $value);
+			}
+			$success                   = $attendee->save();
+			$attendee_update_callbacks = apply_filters('FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update',
+				array());
+			foreach ($attendee_update_callbacks as $a_callback) {
+				if (false === call_user_func_array($a_callback, array($attendee, $this->_req_data))) {
+					throw new EE_Error(sprintf(__('The %s callback given for the "FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update" filter is not a valid callback.  Please check the spelling.',
+						'event_espresso'), $a_callback));
+				}
+			}
+		}
+		if ($success === false) {
+			EE_Error::add_error(__('Something went wrong with updating the meta table data for the registration.',
+				'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
+		}
+	}
+
+
+	public function trash_cpt_item($post_id)
+	{
+	}
+
+
+	public function delete_cpt_item($post_id)
+	{
+	}
+
+
+	public function restore_cpt_item($post_id)
+	{
+	}
+
+
+	protected function _restore_cpt_item($post_id, $revision_id)
+	{
+	}
+
+
+	public function attendee_editor_metaboxes()
+	{
+		$this->verify_cpt_object();
+		remove_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', $this->_cpt_routes[$this->_req_action],
+			'normal', 'core');
+		remove_meta_box('commentstatusdiv', $this->_cpt_routes[$this->_req_action], 'normal', 'core');
+		if (post_type_supports('espresso_attendees', 'excerpt')) {
+			add_meta_box('postexcerpt', __('Short Biography', 'event_espresso'), 'post_excerpt_meta_box',
+				$this->_cpt_routes[$this->_req_action], 'normal');
+		}
+		if (post_type_supports('espresso_attendees', 'comments')) {
+			add_meta_box('commentsdiv', __('Notes on the Contact', 'event_espresso'), 'post_comment_meta_box',
+				$this->_cpt_routes[$this->_req_action], 'normal', 'core');
+		}
+		add_meta_box('attendee_contact_info', __('Contact Info', 'event_espresso'),
+			array($this, 'attendee_contact_info'), $this->_cpt_routes[$this->_req_action], 'side', 'core');
+		add_meta_box('attendee_details_address', __('Address Details', 'event_espresso'),
+			array($this, 'attendee_address_details'), $this->_cpt_routes[$this->_req_action], 'normal', 'core');
+		add_meta_box('attendee_registrations', __('Registrations for this Contact', 'event_espresso'),
+			array($this, 'attendee_registrations_meta_box'), $this->_cpt_routes[$this->_req_action], 'normal', 'high');
+	}
+
+
+	/**
+	 * Metabox for attendee contact info
+	 *
+	 * @param  WP_Post $post wp post object
+	 * @return string        attendee contact info ( and form )
+	 */
+	public function attendee_contact_info($post)
+	{
+		//get attendee object ( should already have it )
+		$this->_template_args['attendee'] = $this->_cpt_model_obj;
+		$template                         = REG_TEMPLATE_PATH . 'attendee_contact_info_metabox_content.template.php';
+		EEH_Template::display_template($template, $this->_template_args);
+	}
+
+
+	/**
+	 * Metabox for attendee details
+	 *
+	 * @param  WP_Post $post wp post object
+	 * @return string        attendee address details (and form)
+	 */
+	public function attendee_address_details($post)
+	{
+		//get attendee object (should already have it)
+		$this->_template_args['attendee']     = $this->_cpt_model_obj;
+		$this->_template_args['state_html']   = EEH_Form_Fields::generate_form_input(new EE_Question_Form_Input(EE_Question::new_instance(array(
+			'QST_ID'           => 0,
+			'QST_display_text' => __('State/Province', 'event_espresso'),
+			'QST_system'       => 'admin-state',
+		)), EE_Answer::new_instance(array(
+			'ANS_ID'    => 0,
+			'ANS_value' => $this->_cpt_model_obj->state_ID(),
+		)), array(
+			'input_id'       => 'STA_ID',
+			'input_name'     => 'STA_ID',
+			'input_prefix'   => '',
+			'append_qstn_id' => false,
+		)));
+		$this->_template_args['country_html'] = EEH_Form_Fields::generate_form_input(new EE_Question_Form_Input(EE_Question::new_instance(array(
+			'QST_ID'           => 0,
+			'QST_display_text' => __('Country', 'event_espresso'),
+			'QST_system'       => 'admin-country',
+		)), EE_Answer::new_instance(array(
+			'ANS_ID'    => 0,
+			'ANS_value' => $this->_cpt_model_obj->country_ID(),
+		)), array(
+			'input_id'       => 'CNT_ISO',
+			'input_name'     => 'CNT_ISO',
+			'input_prefix'   => '',
+			'append_qstn_id' => false,
+		)));
+		$template                             = REG_TEMPLATE_PATH . 'attendee_address_details_metabox_content.template.php';
+		EEH_Template::display_template($template, $this->_template_args);
+	}
+
+
+	/**
+	 *        _attendee_details
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	public function attendee_registrations_meta_box($post)
+	{
+		$this->_template_args['attendee']      = $this->_cpt_model_obj;
+		$this->_template_args['registrations'] = $this->_cpt_model_obj->get_many_related('Registration');
+		$template                              = REG_TEMPLATE_PATH . 'attendee_registrations_main_meta_box.template.php';
+		EEH_Template::display_template($template, $this->_template_args);
+	}
+
+
+	/**
+	 * add in the form fields for the attendee edit
+	 *
+	 * @param  WP_Post $post wp post object
+	 * @return string        html for new form.
+	 */
+	public function after_title_form_fields($post)
+	{
+		if ($post->post_type == 'espresso_attendees') {
+			$template                  = REG_TEMPLATE_PATH . 'attendee_details_after_title_form_fields.template.php';
+			$template_args['attendee'] = $this->_cpt_model_obj;
+			EEH_Template::display_template($template, $template_args);
+		}
+	}
+
+
+	/**
+	 *        _trash_or_restore_attendee
+	 *
+	 * @param boolean $trash - whether to move item to trash (TRUE) or restore it (FALSE)
+	 * @access protected
+	 * @return void
+	 */
+	protected function _trash_or_restore_attendees($trash = true)
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$ATT_MDL = EEM_Attendee::instance();
+		$success = 1;
+		//Checkboxes
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+			// if array has more than one element than success message should be plural
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
+			// cycle thru checkboxes
+			while (list($ATT_ID, $value) = each($this->_req_data['checkbox'])) {
+				$updated = $trash ? $ATT_MDL->update_by_ID(array('status' => 'trash'), $ATT_ID)
+					: $ATT_MDL->update_by_ID(array('status' => 'publish'), $ATT_ID);
+				if ( ! $updated) {
+					$success = 0;
+				}
+			}
+		} else {
+			// grab single id and delete
+			$ATT_ID = absint($this->_req_data['ATT_ID']);
+			//get attendee
+			$att     = $ATT_MDL->get_one_by_ID($ATT_ID);
+			$updated = $trash ? $att->set_status('trash') : $att->set_status('publish');
+			$updated = $att->save();
+			if ( ! $updated) {
+				$success = 0;
+			}
+		}
+		$what        = $success > 1 ? __('Contacts', 'event_espresso') : __('Contact', 'event_espresso');
+		$action_desc = $trash ? __('moved to the trash', 'event_espresso') : __('restored', 'event_espresso');
+		$this->_redirect_after_action($success, $what, $action_desc, array('action' => 'contact_list'));
+	}
 
 }
 

core/libraries/plugin_api/EE_Register_Message_Type.lib.php

Indentation +426 added lines, -426 removed lines

@@ -7,7 +7,7 @@ 
  * @since           4.3.0
  */
 if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 /**
@@ -22,455 +22,455 @@ 
 {
 
 
-    /**
-     * Holds values for registered message types
-     *
-     * @var array
-     */
-    protected static $_ee_message_type_registry = array();
+	/**
+	 * Holds values for registered message types
+	 *
+	 * @var array
+	 */
+	protected static $_ee_message_type_registry = array();
 
 
-    /**
-     * Method for registering new message types in the EE_messages system.
-     * Note:  All message types must have the following files in order to work:
-     * Template files for default templates getting setup.
-     * See /core/libraries/messages/defaults/default/ for examples
-     * (note that template files match a specific naming schema).
-     * These templates will need to be registered with the default template pack.
-     * - EE_Messages_Validator extended class(es).  See /core/libraries/messages/validators/email/
-     *      for examples.  Note for any new message types, there will need to be a validator for each
-     *      messenger combo this message type can activate with.
-     * - And of course the main EE_{Message_Type_Name}_message_type class that defines the new
-     *      message type and its properties.
-     *
-     * @since    4.3.0
-     * @param string $mt_name       Whatever is defined for the $name property of
-     *                              the message type you are registering (eg.
-     *                              declined_registration). Required.
-     * @param  array $setup_args    An array of arguments provided for registering the message type.
-     *                              @see inline docs in the register method for what can be passed in as arguments.
-     * @throws \EE_Error
-     *                              }
-     */
-    public static function register($mt_name = null, $setup_args = array())
-    {
-        //required fields MUST be present, so let's make sure they are.
-        if (
-            ! isset($mt_name)
-            || ! is_array($setup_args)
-            || empty($setup_args['mtfilename']) || empty($setup_args['autoloadpaths'])
-        ) {
-            throw new EE_Error(
-                __('In order to register a message type with EE_Register_Message_Type::register, you must include a unique name for the message type, plus an array containing the following keys: "mtfilename", "autoloadpaths"',
-                    'event_espresso')
-            );
-        }
+	/**
+	 * Method for registering new message types in the EE_messages system.
+	 * Note:  All message types must have the following files in order to work:
+	 * Template files for default templates getting setup.
+	 * See /core/libraries/messages/defaults/default/ for examples
+	 * (note that template files match a specific naming schema).
+	 * These templates will need to be registered with the default template pack.
+	 * - EE_Messages_Validator extended class(es).  See /core/libraries/messages/validators/email/
+	 *      for examples.  Note for any new message types, there will need to be a validator for each
+	 *      messenger combo this message type can activate with.
+	 * - And of course the main EE_{Message_Type_Name}_message_type class that defines the new
+	 *      message type and its properties.
+	 *
+	 * @since    4.3.0
+	 * @param string $mt_name       Whatever is defined for the $name property of
+	 *                              the message type you are registering (eg.
+	 *                              declined_registration). Required.
+	 * @param  array $setup_args    An array of arguments provided for registering the message type.
+	 *                              @see inline docs in the register method for what can be passed in as arguments.
+	 * @throws \EE_Error
+	 *                              }
+	 */
+	public static function register($mt_name = null, $setup_args = array())
+	{
+		//required fields MUST be present, so let's make sure they are.
+		if (
+			! isset($mt_name)
+			|| ! is_array($setup_args)
+			|| empty($setup_args['mtfilename']) || empty($setup_args['autoloadpaths'])
+		) {
+			throw new EE_Error(
+				__('In order to register a message type with EE_Register_Message_Type::register, you must include a unique name for the message type, plus an array containing the following keys: "mtfilename", "autoloadpaths"',
+					'event_espresso')
+			);
+		}
 
-        //make sure we don't register twice
-        if (isset(self::$_ee_message_type_registry[$mt_name])) {
-            return;
-        }
+		//make sure we don't register twice
+		if (isset(self::$_ee_message_type_registry[$mt_name])) {
+			return;
+		}
 
-        //make sure this was called in the right place!
-        if (
-            ! did_action('EE_Brewing_Regular___messages_caf')
-            || did_action('AHEE__EE_System__perform_activations_upgrades_and_migrations')
-        ) {
-            EE_Error::doing_it_wrong(
-                __METHOD__,
-                sprintf(
-                    __('A message type named "%s" has been attempted to be registered with the EE Messages System.  It may or may not work because it should be only called on the "EE_Brewing_Regular___messages_caf" hook.',
-                        'event_espresso'),
-                    $mt_name
-                ),
-                '4.3.0'
-            );
-        }
-        //setup $__ee_message_type_registry array from incoming values.
-        self::$_ee_message_type_registry[$mt_name] = array(
-            /**
-             * The file name for the message type being registered.
-             * Required.
-             * @type string
-             */
-            'mtfilename'                  => (string)$setup_args['mtfilename'],
-            /**
-             * Autoload paths for classes used by the message type.
-             * Required.
-             * @type array
-             */
-            'autoloadpaths'               => (array)$setup_args['autoloadpaths'],
-            /**
-             * Messengers that the message type should be able to activate with.
-             * Use messenger slugs.
-             * @type array
-             */
-            'messengers_to_activate_with' => ! empty($setup_args['messengers_to_activate_with'])
-                ? (array)$setup_args['messengers_to_activate_with']
-                : array(),
-            /**
-             * Messengers that the message type should validate with.
-             * Use messenger slugs.
-             * @type array
-             */
-            'messengers_to_validate_with' => ! empty($setup_args['messengers_to_validate_with'])
-                ? (array)$setup_args['messengers_to_validate_with']
-                : array(),
-            /**
-             * Whether to force activate this message type the first time it is registered.
-             * @type bool   False means its not activated by default and left up to the end user to activate.
-             */
-            'force_activation'            => ! empty($setup_args['force_activation'])
-                ? (bool)$setup_args['force_activation']
-                : false,
-            /**
-             * What messengers this message type supports the default template pack for.
-             * Note: If you do not set this (or any of the following template pack/variation related arguments) to true,
-             * then it is expected that the message type being registered is doing its own custom default template
-             * pack/variation registration.
-             *
-             * If this is set and has values, then it is expected that the following arguments are also set in the incoming options
-             * $setup_arguments array as well:
-             * - 'base_path_for_default_templates'
-             *
-             * @type array   Expect an array of messengers this supports default template packs for.
-             */
-            'messengers_supporting_default_template_pack_with' => isset($setup_args['messengers_supporting_default_template_pack_with'])
-                ? (array)$setup_args['messengers_supporting_default_template_pack_with']
-                : array(),
-            /**
-             * The base path where the default templates for this message type can be found.
-             * @type string
-             */
-            'base_path_for_default_templates' => isset($setup_args['base_path_for_default_templates'])
-                ? $setup_args['base_path_for_default_templates']
-                : '',
-            /**
-             * The base path where the default variations for this message type can be found.
-             * @type string
-             */
-            'base_path_for_default_variation' => isset($setup_args['base_path_for_default_variation'])
-                ? $setup_args['base_path_for_default_variation']
-                : '',
-            /**
-             * The base url for the default variations for this message type.
-             * @type string
-             */
-            'base_url_for_default_variation' => isset($setup_args['base_url_for_default_variation'])
-                ? $setup_args['base_url_for_default_variation']
-                : ''
-        );
-        //add filters but only if they haven't already been set (these filters only need to be registered ONCE because
-        //the callback handles all registered message types.
-        if ( false === has_filter(
-            'FHEE__EED_Messages___set_messages_paths___MSG_PATHS',
-            array('EE_Register_Message_Type', 'register_msgs_autoload_paths')
-        )) {
-            add_filter(
-                'FHEE__EED_Messages___set_messages_paths___MSG_PATHS',
-                array('EE_Register_Message_Type', 'register_msgs_autoload_paths'),
-                10
-            );
-            add_filter(
-                'FHEE__EE_messages__get_installed__messagetype_files',
-                array('EE_Register_Message_Type', 'register_messagetype_files'),
-                10,
-                1
-            );
-            add_filter(
-                'FHEE__EE_messenger__get_default_message_types__default_types',
-                array('EE_Register_Message_Type', 'register_messengers_to_activate_mt_with'),
-                10,
-                2
-            );
-            add_filter(
-                'FHEE__EE_messenger__get_valid_message_types__valid_types',
-                array('EE_Register_Message_Type', 'register_messengers_to_validate_mt_with'),
-                10,
-                2
-            );
-            //actions
-            add_action(
-                'AHEE__EE_Addon__initialize_default_data__begin',
-                array('EE_Register_Message_Type', 'set_defaults')
-            );
+		//make sure this was called in the right place!
+		if (
+			! did_action('EE_Brewing_Regular___messages_caf')
+			|| did_action('AHEE__EE_System__perform_activations_upgrades_and_migrations')
+		) {
+			EE_Error::doing_it_wrong(
+				__METHOD__,
+				sprintf(
+					__('A message type named "%s" has been attempted to be registered with the EE Messages System.  It may or may not work because it should be only called on the "EE_Brewing_Regular___messages_caf" hook.',
+						'event_espresso'),
+					$mt_name
+				),
+				'4.3.0'
+			);
+		}
+		//setup $__ee_message_type_registry array from incoming values.
+		self::$_ee_message_type_registry[$mt_name] = array(
+			/**
+			 * The file name for the message type being registered.
+			 * Required.
+			 * @type string
+			 */
+			'mtfilename'                  => (string)$setup_args['mtfilename'],
+			/**
+			 * Autoload paths for classes used by the message type.
+			 * Required.
+			 * @type array
+			 */
+			'autoloadpaths'               => (array)$setup_args['autoloadpaths'],
+			/**
+			 * Messengers that the message type should be able to activate with.
+			 * Use messenger slugs.
+			 * @type array
+			 */
+			'messengers_to_activate_with' => ! empty($setup_args['messengers_to_activate_with'])
+				? (array)$setup_args['messengers_to_activate_with']
+				: array(),
+			/**
+			 * Messengers that the message type should validate with.
+			 * Use messenger slugs.
+			 * @type array
+			 */
+			'messengers_to_validate_with' => ! empty($setup_args['messengers_to_validate_with'])
+				? (array)$setup_args['messengers_to_validate_with']
+				: array(),
+			/**
+			 * Whether to force activate this message type the first time it is registered.
+			 * @type bool   False means its not activated by default and left up to the end user to activate.
+			 */
+			'force_activation'            => ! empty($setup_args['force_activation'])
+				? (bool)$setup_args['force_activation']
+				: false,
+			/**
+			 * What messengers this message type supports the default template pack for.
+			 * Note: If you do not set this (or any of the following template pack/variation related arguments) to true,
+			 * then it is expected that the message type being registered is doing its own custom default template
+			 * pack/variation registration.
+			 *
+			 * If this is set and has values, then it is expected that the following arguments are also set in the incoming options
+			 * $setup_arguments array as well:
+			 * - 'base_path_for_default_templates'
+			 *
+			 * @type array   Expect an array of messengers this supports default template packs for.
+			 */
+			'messengers_supporting_default_template_pack_with' => isset($setup_args['messengers_supporting_default_template_pack_with'])
+				? (array)$setup_args['messengers_supporting_default_template_pack_with']
+				: array(),
+			/**
+			 * The base path where the default templates for this message type can be found.
+			 * @type string
+			 */
+			'base_path_for_default_templates' => isset($setup_args['base_path_for_default_templates'])
+				? $setup_args['base_path_for_default_templates']
+				: '',
+			/**
+			 * The base path where the default variations for this message type can be found.
+			 * @type string
+			 */
+			'base_path_for_default_variation' => isset($setup_args['base_path_for_default_variation'])
+				? $setup_args['base_path_for_default_variation']
+				: '',
+			/**
+			 * The base url for the default variations for this message type.
+			 * @type string
+			 */
+			'base_url_for_default_variation' => isset($setup_args['base_url_for_default_variation'])
+				? $setup_args['base_url_for_default_variation']
+				: ''
+		);
+		//add filters but only if they haven't already been set (these filters only need to be registered ONCE because
+		//the callback handles all registered message types.
+		if ( false === has_filter(
+			'FHEE__EED_Messages___set_messages_paths___MSG_PATHS',
+			array('EE_Register_Message_Type', 'register_msgs_autoload_paths')
+		)) {
+			add_filter(
+				'FHEE__EED_Messages___set_messages_paths___MSG_PATHS',
+				array('EE_Register_Message_Type', 'register_msgs_autoload_paths'),
+				10
+			);
+			add_filter(
+				'FHEE__EE_messages__get_installed__messagetype_files',
+				array('EE_Register_Message_Type', 'register_messagetype_files'),
+				10,
+				1
+			);
+			add_filter(
+				'FHEE__EE_messenger__get_default_message_types__default_types',
+				array('EE_Register_Message_Type', 'register_messengers_to_activate_mt_with'),
+				10,
+				2
+			);
+			add_filter(
+				'FHEE__EE_messenger__get_valid_message_types__valid_types',
+				array('EE_Register_Message_Type', 'register_messengers_to_validate_mt_with'),
+				10,
+				2
+			);
+			//actions
+			add_action(
+				'AHEE__EE_Addon__initialize_default_data__begin',
+				array('EE_Register_Message_Type', 'set_defaults')
+			);
 
-            //default template packs and variations related
-            add_filter(
-                'FHEE__EE_Messages_Template_Pack_Default__get_supports',
-                array('EE_Register_Message_Type', 'register_default_template_pack_supports')
-            );
-            add_filter(
-                'FHEE__EE_Template_Pack___get_specific_template__filtered_base_path',
-                array('EE_Register_Message_Type', 'register_base_template_path'),
-                10,
-                6
-            );
-            add_filter(
-                'FHEE__EE_Messages_Template_Pack__get_variation__base_path_or_url',
-                array('EE_Register_Message_Type', 'register_variation_base_path_or_url'),
-                10,
-                8
-            );
-            add_filter(
-                'FHEE__EE_Messages_Template_Pack__get_variation__base_path',
-                array('EE_Register_Message_Type', 'register_variation_base_path_or_url'),
-                10,
-                8
-            );
-        }
-    }
+			//default template packs and variations related
+			add_filter(
+				'FHEE__EE_Messages_Template_Pack_Default__get_supports',
+				array('EE_Register_Message_Type', 'register_default_template_pack_supports')
+			);
+			add_filter(
+				'FHEE__EE_Template_Pack___get_specific_template__filtered_base_path',
+				array('EE_Register_Message_Type', 'register_base_template_path'),
+				10,
+				6
+			);
+			add_filter(
+				'FHEE__EE_Messages_Template_Pack__get_variation__base_path_or_url',
+				array('EE_Register_Message_Type', 'register_variation_base_path_or_url'),
+				10,
+				8
+			);
+			add_filter(
+				'FHEE__EE_Messages_Template_Pack__get_variation__base_path',
+				array('EE_Register_Message_Type', 'register_variation_base_path_or_url'),
+				10,
+				8
+			);
+		}
+	}
 
 
-    /**
-     * This just ensures that when an addon registers a message type that on initial activation/reactivation the
-     * defaults the addon sets are taken care of.
-     */
-    public static function set_defaults()
-    {
-        /** @type EE_Message_Resource_Manager $message_resource_manager */
-        $message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+	/**
+	 * This just ensures that when an addon registers a message type that on initial activation/reactivation the
+	 * defaults the addon sets are taken care of.
+	 */
+	public static function set_defaults()
+	{
+		/** @type EE_Message_Resource_Manager $message_resource_manager */
+		$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 
-        //for any message types with force activation, let's ensure they are activated
-        foreach (self::$_ee_message_type_registry as $message_type_name => $settings) {
-            if ($settings['force_activation']) {
-                foreach ($settings['messengers_to_activate_with'] as $messenger) {
-                    //DO not force activation if this message type has already been activated in the system
-                    if (! $message_resource_manager->has_message_type_been_activated_for_messenger($message_type_name,
-                        $messenger)
-                    ) {
-                        $message_resource_manager->ensure_message_type_is_active($message_type_name, $messenger);
-                    }
-                }
-            }
-        }
-    }
+		//for any message types with force activation, let's ensure they are activated
+		foreach (self::$_ee_message_type_registry as $message_type_name => $settings) {
+			if ($settings['force_activation']) {
+				foreach ($settings['messengers_to_activate_with'] as $messenger) {
+					//DO not force activation if this message type has already been activated in the system
+					if (! $message_resource_manager->has_message_type_been_activated_for_messenger($message_type_name,
+						$messenger)
+					) {
+						$message_resource_manager->ensure_message_type_is_active($message_type_name, $messenger);
+					}
+				}
+			}
+		}
+	}
 
 
-    /**
-     * This deregisters a message type that was previously registered with a specific message_type_name.
-     *
-     * @since    4.3.0
-     * @param string $message_type_name the name for the message type that was previously registered
-     * @return void
-     */
-    public static function deregister($message_type_name = null)
-    {
-        if (! empty(self::$_ee_message_type_registry[$message_type_name])) {
-            //let's make sure that we remove any place this message type was made active
-            /** @var EE_Message_Resource_Manager $Message_Resource_Manager */
-            $Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
-            $Message_Resource_Manager->deactivate_message_type($message_type_name);
-            unset(self::$_ee_message_type_registry[$message_type_name]);
-        }
-    }
+	/**
+	 * This deregisters a message type that was previously registered with a specific message_type_name.
+	 *
+	 * @since    4.3.0
+	 * @param string $message_type_name the name for the message type that was previously registered
+	 * @return void
+	 */
+	public static function deregister($message_type_name = null)
+	{
+		if (! empty(self::$_ee_message_type_registry[$message_type_name])) {
+			//let's make sure that we remove any place this message type was made active
+			/** @var EE_Message_Resource_Manager $Message_Resource_Manager */
+			$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+			$Message_Resource_Manager->deactivate_message_type($message_type_name);
+			unset(self::$_ee_message_type_registry[$message_type_name]);
+		}
+	}
 
 
-    /**
-     * callback for FHEE__EE_messages__get_installed__messagetype_files filter.
-     *
-     * @since   4.3.0
-     * @param  array $messagetype_files The current array of message type file names
-     * @return  array                                 Array of message type file names
-     */
-    public static function register_messagetype_files($messagetype_files)
-    {
-        if (empty(self::$_ee_message_type_registry)) {
-            return $messagetype_files;
-        }
-        foreach (self::$_ee_message_type_registry as $mt_reg) {
-            if (empty($mt_reg['mtfilename'])) {
-                continue;
-            }
-            $messagetype_files[] = $mt_reg['mtfilename'];
-        }
-        return $messagetype_files;
-    }
+	/**
+	 * callback for FHEE__EE_messages__get_installed__messagetype_files filter.
+	 *
+	 * @since   4.3.0
+	 * @param  array $messagetype_files The current array of message type file names
+	 * @return  array                                 Array of message type file names
+	 */
+	public static function register_messagetype_files($messagetype_files)
+	{
+		if (empty(self::$_ee_message_type_registry)) {
+			return $messagetype_files;
+		}
+		foreach (self::$_ee_message_type_registry as $mt_reg) {
+			if (empty($mt_reg['mtfilename'])) {
+				continue;
+			}
+			$messagetype_files[] = $mt_reg['mtfilename'];
+		}
+		return $messagetype_files;
+	}
 
 
-    /**
-     * callback for FHEE__EED_Messages___set_messages_paths___MSG_PATHS filter.
-     *
-     * @since    4.3.0
-     * @param array $paths array of paths to be checked by EE_messages autoloader.
-     * @return array
-     */
-    public static function register_msgs_autoload_paths($paths)
-    {
-        if (! empty(self::$_ee_message_type_registry)) {
-            foreach (self::$_ee_message_type_registry as $mt_reg) {
-                if (empty($mt_reg['autoloadpaths'])) {
-                    continue;
-                }
-                $paths = array_merge($paths, $mt_reg['autoloadpaths']);
-            }
-        }
-        return $paths;
-    }
+	/**
+	 * callback for FHEE__EED_Messages___set_messages_paths___MSG_PATHS filter.
+	 *
+	 * @since    4.3.0
+	 * @param array $paths array of paths to be checked by EE_messages autoloader.
+	 * @return array
+	 */
+	public static function register_msgs_autoload_paths($paths)
+	{
+		if (! empty(self::$_ee_message_type_registry)) {
+			foreach (self::$_ee_message_type_registry as $mt_reg) {
+				if (empty($mt_reg['autoloadpaths'])) {
+					continue;
+				}
+				$paths = array_merge($paths, $mt_reg['autoloadpaths']);
+			}
+		}
+		return $paths;
+	}
 
 
-    /**
-     * callback for FHEE__EE_messenger__get_default_message_types__default_types filter.
-     *
-     * @since  4.3.0
-     * @param  array        $default_types  array of message types activated with messenger (
-     *                                      corresponds to the $name property of message type)
-     * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
-     * @return array
-     */
-    public static function register_messengers_to_activate_mt_with($default_types, EE_messenger $messenger)
-    {
-        if (empty(self::$_ee_message_type_registry)) {
-            return $default_types;
-        }
-        foreach (self::$_ee_message_type_registry as $message_type_name => $mt_reg) {
-            if (empty($mt_reg['messengers_to_activate_with']) || empty($mt_reg['mtfilename'])) {
-                continue;
-            }
-            // loop through each of the messengers and if it matches the loaded class
-            // then we add this message type to the
-            foreach ($mt_reg['messengers_to_activate_with'] as $msgr) {
-                if ($messenger->name == $msgr) {
-                    $default_types[] = $message_type_name;
-                }
-            }
-        }
+	/**
+	 * callback for FHEE__EE_messenger__get_default_message_types__default_types filter.
+	 *
+	 * @since  4.3.0
+	 * @param  array        $default_types  array of message types activated with messenger (
+	 *                                      corresponds to the $name property of message type)
+	 * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
+	 * @return array
+	 */
+	public static function register_messengers_to_activate_mt_with($default_types, EE_messenger $messenger)
+	{
+		if (empty(self::$_ee_message_type_registry)) {
+			return $default_types;
+		}
+		foreach (self::$_ee_message_type_registry as $message_type_name => $mt_reg) {
+			if (empty($mt_reg['messengers_to_activate_with']) || empty($mt_reg['mtfilename'])) {
+				continue;
+			}
+			// loop through each of the messengers and if it matches the loaded class
+			// then we add this message type to the
+			foreach ($mt_reg['messengers_to_activate_with'] as $msgr) {
+				if ($messenger->name == $msgr) {
+					$default_types[] = $message_type_name;
+				}
+			}
+		}
 
-        return $default_types;
-    }
+		return $default_types;
+	}
 
 
-    /**
-     * callback for FHEE__EE_messenger__get_valid_message_types__default_types filter.
-     *
-     * @since   4.3.0
-     * @param  array        $valid_types    array of message types valid with messenger (
-     *                                      corresponds to the $name property of message type)
-     * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
-     * @return  array
-     */
-    public static function register_messengers_to_validate_mt_with($valid_types, EE_messenger $messenger)
-    {
-        if (empty(self::$_ee_message_type_registry)) {
-            return $valid_types;
-        }
-        foreach (self::$_ee_message_type_registry as $message_type_name => $mt_reg) {
-            if (empty($mt_reg['messengers_to_validate_with']) || empty($mt_reg['mtfilename'])) {
-                continue;
-            }
-            // loop through each of the messengers and if it matches the loaded class
-            // then we add this message type to the
-            foreach ($mt_reg['messengers_to_validate_with'] as $msgr) {
-                if ($messenger->name == $msgr) {
-                    $valid_types[] = $message_type_name;
-                }
-            }
-        }
+	/**
+	 * callback for FHEE__EE_messenger__get_valid_message_types__default_types filter.
+	 *
+	 * @since   4.3.0
+	 * @param  array        $valid_types    array of message types valid with messenger (
+	 *                                      corresponds to the $name property of message type)
+	 * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
+	 * @return  array
+	 */
+	public static function register_messengers_to_validate_mt_with($valid_types, EE_messenger $messenger)
+	{
+		if (empty(self::$_ee_message_type_registry)) {
+			return $valid_types;
+		}
+		foreach (self::$_ee_message_type_registry as $message_type_name => $mt_reg) {
+			if (empty($mt_reg['messengers_to_validate_with']) || empty($mt_reg['mtfilename'])) {
+				continue;
+			}
+			// loop through each of the messengers and if it matches the loaded class
+			// then we add this message type to the
+			foreach ($mt_reg['messengers_to_validate_with'] as $msgr) {
+				if ($messenger->name == $msgr) {
+					$valid_types[] = $message_type_name;
+				}
+			}
+		}
 
-        return $valid_types;
-    }
+		return $valid_types;
+	}
 
 
-    /**
-     * Callback for `FHEE__EE_Messages_Template_Pack_Default__get_supports` filter to register this message type as
-     * supporting the default template pack
-     *
-     * @param array $supports
-     *
-     * @return array
-     */
-    public static function register_default_template_pack_supports($supports)
-    {
-        foreach (self::$_ee_message_type_registry as $message_type_name => $mt_reg) {
-            if (empty($mt_reg['messengers_supporting_default_template_pack_with'])) {
-                continue;
-            }
-            foreach ($mt_reg['messengers_supporting_default_template_pack_with'] as $messenger_slug) {
-                $supports[$messenger_slug][] = $message_type_name;
-            }
-        }
-        return $supports;
-    }
+	/**
+	 * Callback for `FHEE__EE_Messages_Template_Pack_Default__get_supports` filter to register this message type as
+	 * supporting the default template pack
+	 *
+	 * @param array $supports
+	 *
+	 * @return array
+	 */
+	public static function register_default_template_pack_supports($supports)
+	{
+		foreach (self::$_ee_message_type_registry as $message_type_name => $mt_reg) {
+			if (empty($mt_reg['messengers_supporting_default_template_pack_with'])) {
+				continue;
+			}
+			foreach ($mt_reg['messengers_supporting_default_template_pack_with'] as $messenger_slug) {
+				$supports[$messenger_slug][] = $message_type_name;
+			}
+		}
+		return $supports;
+	}
 
 
-    /**
-     * Callback for FHEE__EE_Template_Pack___get_specific_template__filtered_base_path
-     *
-     * @param string $base_path The original base path for message templates
-     * @param EE_messenger $messenger
-     * @param EE_message_type $message_type
-     * @param string $field  The field requesting a template
-     * @param string $context  The context requesting a template
-     * @param EE_Messages_Template_Pack $template_pack
-     *
-     * @return string
-     */
-    public static function register_base_template_path(
-        $base_path,
-        $messenger,
-        $message_type,
-        $field,
-        $context,
-        $template_pack
-    ) {
-        if (! $template_pack instanceof EE_Messages_Template_Pack_Default
-            || ! $message_type instanceof EE_message_type
-        ) {
-            return $base_path;
-        }
-        foreach (self::$_ee_message_type_registry as $message_type_name => $mt_reg) {
-            if ($message_type->name === $message_type_name
-                && ! empty($mt_reg['base_path_for_default_templates'])
-            ) {
-                return $mt_reg['base_path_for_default_templates'];
-            }
-        }
-        return $base_path;
-    }
+	/**
+	 * Callback for FHEE__EE_Template_Pack___get_specific_template__filtered_base_path
+	 *
+	 * @param string $base_path The original base path for message templates
+	 * @param EE_messenger $messenger
+	 * @param EE_message_type $message_type
+	 * @param string $field  The field requesting a template
+	 * @param string $context  The context requesting a template
+	 * @param EE_Messages_Template_Pack $template_pack
+	 *
+	 * @return string
+	 */
+	public static function register_base_template_path(
+		$base_path,
+		$messenger,
+		$message_type,
+		$field,
+		$context,
+		$template_pack
+	) {
+		if (! $template_pack instanceof EE_Messages_Template_Pack_Default
+			|| ! $message_type instanceof EE_message_type
+		) {
+			return $base_path;
+		}
+		foreach (self::$_ee_message_type_registry as $message_type_name => $mt_reg) {
+			if ($message_type->name === $message_type_name
+				&& ! empty($mt_reg['base_path_for_default_templates'])
+			) {
+				return $mt_reg['base_path_for_default_templates'];
+			}
+		}
+		return $base_path;
+	}
 
 
-    /**
-     * Callback for FHEE__EE_Messages_Template_Pack__get_variation__base_path and
-     * FHEE__EE_Messages_Template_Pack__get_variation__base_path_or_url hooks
-     *
-     * @param string $base_path_or_url       The original incoming base url or path
-     * @param string $messenger_slug      The slug of the messenger the template is being generated for.
-     * @param string $message_type_slug The slug of the message type the template is being generated for.
-     * @param string $type             The "type" of css being requested.
-     * @param string $variation      The variation being requested.
-     * @param string $file_extension What file extension is expected for the variation file.
-     * @param bool $url whether a url or path is being requested.
-     * @param EE_Messages_Template_Pack $template_pack
-     *
-     * @return string
-     */
-    public static function register_variation_base_path_or_url(
-        $base_path_or_url,
-        $messenger_slug,
-        $message_type_slug,
-        $type,
-        $variation,
-        $url,
-        $file_extension,
-        $template_pack
-    ) {
-        if (! $template_pack instanceof EE_Messages_Template_Pack_Default) {
-            return $base_path_or_url;
-        }
-        foreach (self::$_ee_message_type_registry as $message_type_name => $mt_reg) {
-            if ($message_type_name === $message_type_slug
-            ) {
-                if ($url
-                    && ! empty($mt_reg['base_url_for_default_variation'])
-                ) {
-                    return $mt_reg['base_url_for_default_variation'];
-                } elseif (! $url
-                    && ! empty($mt_reg['base_path_for_default_variation'])
-                ) {
-                    return $mt_reg['base_path_for_default_variation'];
-                }
-            }
-        }
-        return $base_path_or_url;
-    }
+	/**
+	 * Callback for FHEE__EE_Messages_Template_Pack__get_variation__base_path and
+	 * FHEE__EE_Messages_Template_Pack__get_variation__base_path_or_url hooks
+	 *
+	 * @param string $base_path_or_url       The original incoming base url or path
+	 * @param string $messenger_slug      The slug of the messenger the template is being generated for.
+	 * @param string $message_type_slug The slug of the message type the template is being generated for.
+	 * @param string $type             The "type" of css being requested.
+	 * @param string $variation      The variation being requested.
+	 * @param string $file_extension What file extension is expected for the variation file.
+	 * @param bool $url whether a url or path is being requested.
+	 * @param EE_Messages_Template_Pack $template_pack
+	 *
+	 * @return string
+	 */
+	public static function register_variation_base_path_or_url(
+		$base_path_or_url,
+		$messenger_slug,
+		$message_type_slug,
+		$type,
+		$variation,
+		$url,
+		$file_extension,
+		$template_pack
+	) {
+		if (! $template_pack instanceof EE_Messages_Template_Pack_Default) {
+			return $base_path_or_url;
+		}
+		foreach (self::$_ee_message_type_registry as $message_type_name => $mt_reg) {
+			if ($message_type_name === $message_type_slug
+			) {
+				if ($url
+					&& ! empty($mt_reg['base_url_for_default_variation'])
+				) {
+					return $mt_reg['base_url_for_default_variation'];
+				} elseif (! $url
+					&& ! empty($mt_reg['base_path_for_default_variation'])
+				) {
+					return $mt_reg['base_path_for_default_variation'];
+				}
+			}
+		}
+		return $base_path_or_url;
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -6,7 +6,7 @@ 
  * @subpackage      plugin api, messages
  * @since           4.3.0
  */
-if (! defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 
@@ -93,20 +93,20 @@ 
              * Required.
              * @type string
              */
-            'mtfilename'                  => (string)$setup_args['mtfilename'],
+            'mtfilename'                  => (string) $setup_args['mtfilename'],
             /**
              * Autoload paths for classes used by the message type.
              * Required.
              * @type array
              */
-            'autoloadpaths'               => (array)$setup_args['autoloadpaths'],
+            'autoloadpaths'               => (array) $setup_args['autoloadpaths'],
             /**
              * Messengers that the message type should be able to activate with.
              * Use messenger slugs.
              * @type array
              */
             'messengers_to_activate_with' => ! empty($setup_args['messengers_to_activate_with'])
-                ? (array)$setup_args['messengers_to_activate_with']
+                ? (array) $setup_args['messengers_to_activate_with']
                 : array(),
             /**
              * Messengers that the message type should validate with.
@@ -114,14 +114,14 @@ 
              * @type array
              */
             'messengers_to_validate_with' => ! empty($setup_args['messengers_to_validate_with'])
-                ? (array)$setup_args['messengers_to_validate_with']
+                ? (array) $setup_args['messengers_to_validate_with']
                 : array(),
             /**
              * Whether to force activate this message type the first time it is registered.
              * @type bool   False means its not activated by default and left up to the end user to activate.
              */
             'force_activation'            => ! empty($setup_args['force_activation'])
-                ? (bool)$setup_args['force_activation']
+                ? (bool) $setup_args['force_activation']
                 : false,
             /**
              * What messengers this message type supports the default template pack for.
@@ -136,7 +136,7 @@ 
              * @type array   Expect an array of messengers this supports default template packs for.
              */
             'messengers_supporting_default_template_pack_with' => isset($setup_args['messengers_supporting_default_template_pack_with'])
-                ? (array)$setup_args['messengers_supporting_default_template_pack_with']
+                ? (array) $setup_args['messengers_supporting_default_template_pack_with']
                 : array(),
             /**
              * The base path where the default templates for this message type can be found.
@@ -162,7 +162,7 @@ 
         );
         //add filters but only if they haven't already been set (these filters only need to be registered ONCE because
         //the callback handles all registered message types.
-        if ( false === has_filter(
+        if (false === has_filter(
             'FHEE__EED_Messages___set_messages_paths___MSG_PATHS',
             array('EE_Register_Message_Type', 'register_msgs_autoload_paths')
         )) {
@@ -236,7 +236,7 @@ 
             if ($settings['force_activation']) {
                 foreach ($settings['messengers_to_activate_with'] as $messenger) {
                     //DO not force activation if this message type has already been activated in the system
-                    if (! $message_resource_manager->has_message_type_been_activated_for_messenger($message_type_name,
+                    if ( ! $message_resource_manager->has_message_type_been_activated_for_messenger($message_type_name,
                         $messenger)
                     ) {
                         $message_resource_manager->ensure_message_type_is_active($message_type_name, $messenger);
@@ -256,7 +256,7 @@ 
      */
     public static function deregister($message_type_name = null)
     {
-        if (! empty(self::$_ee_message_type_registry[$message_type_name])) {
+        if ( ! empty(self::$_ee_message_type_registry[$message_type_name])) {
             //let's make sure that we remove any place this message type was made active
             /** @var EE_Message_Resource_Manager $Message_Resource_Manager */
             $Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
@@ -297,7 +297,7 @@ 
      */
     public static function register_msgs_autoload_paths($paths)
     {
-        if (! empty(self::$_ee_message_type_registry)) {
+        if ( ! empty(self::$_ee_message_type_registry)) {
             foreach (self::$_ee_message_type_registry as $mt_reg) {
                 if (empty($mt_reg['autoloadpaths'])) {
                     continue;
@@ -413,7 +413,7 @@ 
         $context,
         $template_pack
     ) {
-        if (! $template_pack instanceof EE_Messages_Template_Pack_Default
+        if ( ! $template_pack instanceof EE_Messages_Template_Pack_Default
             || ! $message_type instanceof EE_message_type
         ) {
             return $base_path;
@@ -454,7 +454,7 @@ 
         $file_extension,
         $template_pack
     ) {
-        if (! $template_pack instanceof EE_Messages_Template_Pack_Default) {
+        if ( ! $template_pack instanceof EE_Messages_Template_Pack_Default) {
             return $base_path_or_url;
         }
         foreach (self::$_ee_message_type_registry as $message_type_name => $mt_reg) {
@@ -464,7 +464,7 @@ 
                     && ! empty($mt_reg['base_url_for_default_variation'])
                 ) {
                     return $mt_reg['base_url_for_default_variation'];
-                } elseif (! $url
+                } elseif ( ! $url
                     && ! empty($mt_reg['base_path_for_default_variation'])
                 ) {
                     return $mt_reg['base_path_for_default_variation'];