eventespresso / event-espresso-core

core/db_models/EEM_Registration.model.php

Indentation +19 added lines, -19 removed lines

@@ -219,11 +219,11 @@ 
 
 
 	/**
-	*		retrieve ALL registrations for a particular Attendee from db
-	* 		@access		public
-	* 		@param		int		$ATT_ID
-	*		@return 	EE_Registration[]
-	*/
+	 *		retrieve ALL registrations for a particular Attendee from db
+	 * 		@access		public
+	 * 		@param		int		$ATT_ID
+	 *		@return 	EE_Registration[]
+	 */
 	public function get_all_registrations_for_attendee( $ATT_ID = 0 ) {
 		if ( ! $ATT_ID ) {
 			return FALSE;
@@ -250,14 +250,14 @@ 
 
 
 	/**
-	*		retrieve registration for a specific transaction attendee from db
-	*
-	* 		@access		public
-	* 		@param	int	$TXN_ID
-	* 		@param    int		$ATT_ID
-	* 		@param    int		$att_nmbr 	in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required
-	*		@return 		mixed		array on success, FALSE on fail
-	*/
+	 *		retrieve registration for a specific transaction attendee from db
+	 *
+	 * 		@access		public
+	 * 		@param	int	$TXN_ID
+	 * 		@param    int		$ATT_ID
+	 * 		@param    int		$att_nmbr 	in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required
+	 *		@return 		mixed		array on success, FALSE on fail
+	 */
 	public function get_registration_for_transaction_attendee( $TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0 ) {
 		return $this->get_one(array(
 			array(
@@ -270,12 +270,12 @@ 
 
 
 	/**
-	*		get the number of registrations per day  for the Registration Admin page Reports Tab.
+	 *		get the number of registrations per day  for the Registration Admin page Reports Tab.
 	 *		(doesn't utilize models because it's a fairly specialized query)
-	* 		@access		public
+	 * 		@access		public
 	 *		@param $period string which can be passed to php's strtotime function (eg "-1 month")
 	 *		@return stdClass[] with properties regDate and total
-	*/
+	 */
 	public function get_registrations_per_day_report( $period = '-1 month' ) {
 
 		$sql_date = $this->convert_datetime_for_query( 'REG_date', date("Y-m-d H:i:s", strtotime($period) ), 'Y-m-d H:i:s', 'UTC' );
@@ -304,11 +304,11 @@ 
 
 
 	/**
-	*		get the number of registrations per event  for the Registration Admin page Reports Tab
-	* 		@access		public
+	 *		get the number of registrations per event  for the Registration Admin page Reports Tab
+	 * 		@access		public
 	 * @param $period string which can be passed to php's strtotime function (eg "-1 month")
 	 *		@return stdClass[] each with properties event_name, reg_limit, and total
-	*/
+	 */
 	public function get_registrations_per_event_report( $period = '-1 month' ) {
 
 		$date_sql = $this->convert_datetime_for_query( 'REG_date', date( "Y-m-d H:i:s", strtotime( $period )), 'Y-m-d H:i:s', 'UTC' );

Spacing +92 added lines, -92 removed lines

@@ -1,6 +1,6 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_Registration.class.php' );
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
+require_once (EE_CLASSES.'EE_Registration.class.php');
 /**
  *
  * Registration Model
@@ -92,31 +92,31 @@ 
 	 *    Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 * @return \EEM_Registration
 	 */
-	protected function __construct( $timezone ) {
-		$this->singular_item = __('Registration','event_espresso');
-		$this->plural_item = __('Registrations','event_espresso');
+	protected function __construct($timezone) {
+		$this->singular_item = __('Registration', 'event_espresso');
+		$this->plural_item = __('Registrations', 'event_espresso');
 
 		$this->_tables = array(
-			'Registration'=>new EE_Primary_Table('esp_registration','REG_ID')
+			'Registration'=>new EE_Primary_Table('esp_registration', 'REG_ID')
 		);
 		$this->_fields = array(
 			'Registration'=>array(
-				'REG_ID'=>new EE_Primary_Key_Int_Field('REG_ID', __('Registration ID','event_espresso')),
-				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID','event_espresso'), false, 0, 'Event'),
-				'ATT_ID'=>new EE_Foreign_Key_Int_Field('ATT_ID', __('Attendee ID','event_espresso'), false, 0, 'Attendee'),
-				'TXN_ID'=>new EE_Foreign_Key_Int_Field('TXN_ID', __('Transaction ID','event_espresso'), false, 0, 'Transaction'),
-				'TKT_ID'=>new EE_Foreign_Key_Int_Field('TKT_ID', __('Ticket ID','event_espresso'), false, 0, 'Ticket'),
-				'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID','event_espresso'), false, EEM_Registration::status_id_incomplete, 'Status'),
-				'REG_date'=>new EE_Datetime_Field('REG_date', __('Time registration occurred','event_espresso'), false, time(), $timezone ),
-				'REG_final_price'=>new EE_Money_Field('REG_final_price', __('Registration\'s share of the transaction total','event_espresso'), false, 0),
-				'REG_paid'=>new EE_Money_Field('REG_paid', __('Amount paid to date towards registration','event_espresso'), false, 0),
-				'REG_session'=>new EE_Plain_Text_Field('REG_session', __('Session ID of registration','event_espresso'), false, ''),
-				'REG_code'=>new EE_Plain_Text_Field('REG_code', __('Unique Code for this registration','event_espresso'), false, ''),
-				'REG_url_link'=>new EE_Plain_Text_Field('REG_url_link', __('String to be used in URL for identifying registration','event_espresso'), false, ''),
-				'REG_count'=>new EE_Integer_Field('REG_count', __('Count of this registration in the group registration ','event_espresso'), true, 1),
-				'REG_group_size'=>new EE_Integer_Field('REG_group_size', __('Number of registrations on this group','event_espresso'), false, 1),
-				'REG_att_is_going'=>new EE_Boolean_Field('REG_att_is_going', __('Flag indicating the registrant plans on attending','event_espresso'), false, false),
-				'REG_deleted' => new EE_Trashed_Flag_Field('REG_deleted', __('Flag indicating if registration has been archived or not.', 'event_espresso'), false, false )
+				'REG_ID'=>new EE_Primary_Key_Int_Field('REG_ID', __('Registration ID', 'event_espresso')),
+				'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID', 'event_espresso'), false, 0, 'Event'),
+				'ATT_ID'=>new EE_Foreign_Key_Int_Field('ATT_ID', __('Attendee ID', 'event_espresso'), false, 0, 'Attendee'),
+				'TXN_ID'=>new EE_Foreign_Key_Int_Field('TXN_ID', __('Transaction ID', 'event_espresso'), false, 0, 'Transaction'),
+				'TKT_ID'=>new EE_Foreign_Key_Int_Field('TKT_ID', __('Ticket ID', 'event_espresso'), false, 0, 'Ticket'),
+				'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID', 'event_espresso'), false, EEM_Registration::status_id_incomplete, 'Status'),
+				'REG_date'=>new EE_Datetime_Field('REG_date', __('Time registration occurred', 'event_espresso'), false, time(), $timezone),
+				'REG_final_price'=>new EE_Money_Field('REG_final_price', __('Registration\'s share of the transaction total', 'event_espresso'), false, 0),
+				'REG_paid'=>new EE_Money_Field('REG_paid', __('Amount paid to date towards registration', 'event_espresso'), false, 0),
+				'REG_session'=>new EE_Plain_Text_Field('REG_session', __('Session ID of registration', 'event_espresso'), false, ''),
+				'REG_code'=>new EE_Plain_Text_Field('REG_code', __('Unique Code for this registration', 'event_espresso'), false, ''),
+				'REG_url_link'=>new EE_Plain_Text_Field('REG_url_link', __('String to be used in URL for identifying registration', 'event_espresso'), false, ''),
+				'REG_count'=>new EE_Integer_Field('REG_count', __('Count of this registration in the group registration ', 'event_espresso'), true, 1),
+				'REG_group_size'=>new EE_Integer_Field('REG_group_size', __('Number of registrations on this group', 'event_espresso'), false, 1),
+				'REG_att_is_going'=>new EE_Boolean_Field('REG_att_is_going', __('Flag indicating the registrant plans on attending', 'event_espresso'), false, false),
+				'REG_deleted' => new EE_Trashed_Flag_Field('REG_deleted', __('Flag indicating if registration has been archived or not.', 'event_espresso'), false, false)
 			)
 		);
 		$this->_model_relations = array(
@@ -128,11 +128,11 @@ 
 			'Answer'=>new EE_Has_Many_Relation(),
 			'Checkin'=>new EE_Has_Many_Relation(),
 			'Registration_Payment' => new EE_Has_Many_Relation(),
-			'Payment'=>new EE_HABTM_Relation( 'Registration_Payment' ),
+			'Payment'=>new EE_HABTM_Relation('Registration_Payment'),
 		);
 		$this->_model_chain_to_wp_user = 'Event';
 
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -165,9 +165,9 @@ 
 	 *		@param bool  $translated If true will return the values as singular localized strings
 	 *		@return array
 	 */
-	public static function reg_status_array( $exclude = array(), $translated = FALSE ) {
-		EEM_Registration::instance()->_get_registration_status_array( $exclude );
-		return $translated ? EEM_Status::instance()->localized_status( self::$_reg_status, FALSE, 'sentence') : self::$_reg_status;
+	public static function reg_status_array($exclude = array(), $translated = FALSE) {
+		EEM_Registration::instance()->_get_registration_status_array($exclude);
+		return $translated ? EEM_Status::instance()->localized_status(self::$_reg_status, FALSE, 'sentence') : self::$_reg_status;
 	}
 
 
@@ -178,19 +178,19 @@ 
 	 * @param array $exclude
 	 * @return array
 	 */
-	private function _get_registration_status_array( $exclude = array() ) {
+	private function _get_registration_status_array($exclude = array()) {
 		//in the very rare circumstance that we are deleting a model's table's data
 		//and the table hasn't actually been created, this could have an error
 		/** @type WPDB $wpdb */
 		global $wpdb;
-		EE_Registry::instance()->load_helper( 'Activation' );
-		if( EEH_Activation::table_exists( $wpdb->prefix . 'esp_status' ) ){
-			$SQL = 'SELECT STS_ID, STS_code FROM '. $wpdb->prefix . 'esp_status WHERE STS_type = "registration"';
-			$results = $wpdb->get_results( $SQL );
+		EE_Registry::instance()->load_helper('Activation');
+		if (EEH_Activation::table_exists($wpdb->prefix.'esp_status')) {
+			$SQL = 'SELECT STS_ID, STS_code FROM '.$wpdb->prefix.'esp_status WHERE STS_type = "registration"';
+			$results = $wpdb->get_results($SQL);
 			self::$_reg_status = array();
-			foreach ( $results as $status ) {
-				if ( ! in_array( $status->STS_ID, $exclude )) {
-					self::$_reg_status[ $status->STS_ID ] = $status->STS_code;
+			foreach ($results as $status) {
+				if ( ! in_array($status->STS_ID, $exclude)) {
+					self::$_reg_status[$status->STS_ID] = $status->STS_code;
 				}
 			}
 		}
@@ -205,15 +205,15 @@ 
 	 * @param  array  $where_params Array of query_params as described in the comments for EEM_Base::get_all()
 	 * @return wpdb results array
 	 */
-	public function get_reg_months_and_years( $where_params ) {
+	public function get_reg_months_and_years($where_params) {
 		$query_params[0] = $where_params;
 		$query_params['group_by'] = array('reg_year', 'reg_month');
-		$query_params['order_by'] = array( 'REG_date' => 'DESC' );
+		$query_params['order_by'] = array('REG_date' => 'DESC');
 		$columns_to_select = array(
 			'reg_year' => array('YEAR(REG_date)', '%s'),
 			'reg_month' => array('MONTHNAME(REG_date)', '%s')
 			);
-		return $this->_get_all_wpdb_results( $query_params, OBJECT, $columns_to_select );
+		return $this->_get_all_wpdb_results($query_params, OBJECT, $columns_to_select);
 	}
 
 
@@ -225,11 +225,11 @@ 
 	* 		@param		int		$ATT_ID
 	*		@return 	EE_Registration[]
 	*/
-	public function get_all_registrations_for_attendee( $ATT_ID = 0 ) {
-		if ( ! $ATT_ID ) {
+	public function get_all_registrations_for_attendee($ATT_ID = 0) {
+		if ( ! $ATT_ID) {
 			return FALSE;
 		}
-		return $this->get_all( array( array( 'ATT_ID' => $ATT_ID )));
+		return $this->get_all(array(array('ATT_ID' => $ATT_ID)));
 	}
 
 
@@ -240,8 +240,8 @@ 
 	 * @param string $REG_url_link
 	 * @return EE_Registration
 	 */
-	public function get_registration_for_reg_url_link($REG_url_link){
-		if(!$REG_url_link){
+	public function get_registration_for_reg_url_link($REG_url_link) {
+		if ( ! $REG_url_link) {
 			return false;
 		}
 		return $this->get_one(array(array('REG_url_link'=>$REG_url_link)));
@@ -259,13 +259,13 @@ 
 	* 		@param    int		$att_nmbr 	in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required
 	*		@return 		mixed		array on success, FALSE on fail
 	*/
-	public function get_registration_for_transaction_attendee( $TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0 ) {
+	public function get_registration_for_transaction_attendee($TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0) {
 		return $this->get_one(array(
 			array(
 				'TXN_ID'=>$TXN_ID,
 				'ATT_ID'=>$ATT_ID
 			),
-			'limit'=>array( min( ( $att_nmbr-1 ), 0 ), 1 )
+			'limit'=>array(min(($att_nmbr - 1), 0), 1)
 		));
 	}
 
@@ -277,17 +277,17 @@ 
 	 *		@param $period string which can be passed to php's strtotime function (eg "-1 month")
 	 *		@return stdClass[] with properties regDate and total
 	*/
-	public function get_registrations_per_day_report( $period = '-1 month' ) {
+	public function get_registrations_per_day_report($period = '-1 month') {
 
-		$sql_date = $this->convert_datetime_for_query( 'REG_date', date("Y-m-d H:i:s", strtotime($period) ), 'Y-m-d H:i:s', 'UTC' );
-		$where = array( 'REG_date' => array( '>=', $sql_date ), 'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete ) );
+		$sql_date = $this->convert_datetime_for_query('REG_date', date("Y-m-d H:i:s", strtotime($period)), 'Y-m-d H:i:s', 'UTC');
+		$where = array('REG_date' => array('>=', $sql_date), 'STS_ID' => array('!=', EEM_Registration::status_id_incomplete));
 
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_day_report' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_day_report')) {
 			$where['Event.EVT_wp_user'] = get_current_user_id();
 		}
 
-		EE_Registry::instance()->load_helper( 'DTT_Helper' );
-		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset( $this->get_timezone(), 'REG_date' );
+		EE_Registry::instance()->load_helper('DTT_Helper');
+		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'REG_date');
 
 		$results = $this->_get_all_wpdb_results(
 				array(
@@ -297,8 +297,8 @@ 
 				),
 				OBJECT,
 				array(
-					'regDate'=>array( 'DATE(' . $query_interval . ')','%s'),
-					'total'=>array('count(REG_ID)','%d')
+					'regDate'=>array('DATE('.$query_interval.')', '%s'),
+					'total'=>array('count(REG_ID)', '%d')
 				));
 		return $results;
 	}
@@ -313,23 +313,23 @@ 
 	 * @return stdClass[] with properties Registration_REG_date and a column for each registration status as the STS_ID
 	 *                    (i.e. RAP)
 	 */
-	public function get_registrations_per_day_and_per_status_report( $period = '-1 month' ) {
+	public function get_registrations_per_day_and_per_status_report($period = '-1 month') {
 		global $wpdb;
-		$registration_table = $wpdb->prefix . 'esp_registration';
+		$registration_table = $wpdb->prefix.'esp_registration';
 		$event_table = $wpdb->posts;
-		$sql_date = date("Y-m-d H:i:s", strtotime($period) );
+		$sql_date = date("Y-m-d H:i:s", strtotime($period));
 
 		//prepare the query interval for displaying offset
-		EE_Registry::instance()->load_helper( 'DTT_Helper' );
-		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset( $this->get_timezone(), 'dates.REG_date' );
+		EE_Registry::instance()->load_helper('DTT_Helper');
+		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'dates.REG_date');
 
 		//inner date query
 		$inner_date_query = "SELECT DISTINCT REG_date from $registration_table ";
 		$inner_where = " WHERE";
 		//exclude events not authored by user if permissions in effect
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_event_report' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
 			$inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID";
-			$inner_where .= " post_author = " . get_current_user_id() . " AND";
+			$inner_where .= " post_author = ".get_current_user_id()." AND";
 		}
 		$inner_where .= " REG_date >= '$sql_date'";
 		$inner_date_query .= $inner_where;
@@ -341,8 +341,8 @@ 
 		$select_parts = array();
 
 		//loop through registration stati to do parts for each status.
-		foreach ( EEM_Registration::reg_status_array() as $STS_ID => $STS_code ) {
-			if ( $STS_ID === EEM_Registration::status_id_incomplete ) {
+		foreach (EEM_Registration::reg_status_array() as $STS_ID => $STS_code) {
+			if ($STS_ID === EEM_Registration::status_id_incomplete) {
 				continue;
 			}
 			$select_parts[] = "COUNT($STS_code.REG_ID) as $STS_ID";
@@ -350,14 +350,14 @@ 
 		}
 
 		//setup the selects
-		$select .= implode(', ', $select_parts );
+		$select .= implode(', ', $select_parts);
 		$select .= " FROM ($inner_date_query) AS dates LEFT JOIN ";
 
 		//setup the joins
-		$join .= implode( " LEFT JOIN ", $join_parts );
+		$join .= implode(" LEFT JOIN ", $join_parts);
 
 		//now let's put it all together
-		$query = $select . $join . ' GROUP BY Registration_REG_date';
+		$query = $select.$join.' GROUP BY Registration_REG_date';
 
 		//and execute it
 		$results = $wpdb->get_results(
@@ -378,23 +378,23 @@ 
 	 * @param $period string which can be passed to php's strtotime function (eg "-1 month")
 	 *		@return stdClass[] each with properties event_name, reg_limit, and total
 	*/
-	public function get_registrations_per_event_report( $period = '-1 month' ) {
+	public function get_registrations_per_event_report($period = '-1 month') {
 
-		$date_sql = $this->convert_datetime_for_query( 'REG_date', date( "Y-m-d H:i:s", strtotime( $period )), 'Y-m-d H:i:s', 'UTC' );
-		$where = array( 'REG_date' => array( '>=', $date_sql ), 'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete ) );
+		$date_sql = $this->convert_datetime_for_query('REG_date', date("Y-m-d H:i:s", strtotime($period)), 'Y-m-d H:i:s', 'UTC');
+		$where = array('REG_date' => array('>=', $date_sql), 'STS_ID' => array('!=', EEM_Registration::status_id_incomplete));
 
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_event_report' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
 			$where['Event.EVT_wp_user'] = get_current_user_id();
 		}
 		$results = $this->_get_all_wpdb_results(array(
 			$where,
 			'group_by'=>'Event.EVT_name',
 			'order_by'=>'Event.EVT_name',
-			'limit'=>array(0,24)),
+			'limit'=>array(0, 24)),
 			OBJECT,
 			array(
-				'event_name'=>array('Event_CPT.post_title','%s'),
-				'total'=>array('COUNT(REG_ID)','%s')
+				'event_name'=>array('Event_CPT.post_title', '%s'),
+				'total'=>array('COUNT(REG_ID)', '%s')
 			)
 		);
 
@@ -412,19 +412,19 @@ 
 	 * @return stdClass[] with properties `Registration_Event` and a column for each registration status as the STS_ID
 	 *                    (i.e. RAP)
 	 */
-	public function get_registrations_per_event_and_per_status_report( $period = '-1 month' ) {
+	public function get_registrations_per_event_and_per_status_report($period = '-1 month') {
 		global $wpdb;
-		$registration_table = $wpdb->prefix . 'esp_registration';
+		$registration_table = $wpdb->prefix.'esp_registration';
 		$event_table = $wpdb->posts;
-		$sql_date = date("Y-m-d H:i:s", strtotime($period) );
+		$sql_date = date("Y-m-d H:i:s", strtotime($period));
 
 		//inner date query
 		$inner_date_query = "SELECT DISTINCT EVT_ID, REG_date from $registration_table ";
 		$inner_where = " WHERE";
 		//exclude events not authored by user if permissions in effect
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_event_report' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
 			$inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID";
-			$inner_where .= " post_author = " . get_current_user_id() . " AND";
+			$inner_where .= " post_author = ".get_current_user_id()." AND";
 		}
 		$inner_where .= " REG_date >= '$sql_date'";
 		$inner_date_query .= $inner_where;
@@ -436,8 +436,8 @@ 
 		$select_parts = array();
 
 		//loop through registration stati to do parts for each status.
-		foreach ( EEM_Registration::reg_status_array() as $STS_ID => $STS_code ) {
-			if ( $STS_ID === EEM_Registration::status_id_incomplete ) {
+		foreach (EEM_Registration::reg_status_array() as $STS_ID => $STS_code) {
+			if ($STS_ID === EEM_Registration::status_id_incomplete) {
 				continue;
 			}
 			$select_parts[] = "COUNT($STS_code.REG_ID) as $STS_ID";
@@ -445,14 +445,14 @@ 
 		}
 
 		//setup the selects
-		$select .= implode( ', ', $select_parts );
+		$select .= implode(', ', $select_parts);
 		$select .= " FROM ($inner_date_query) AS dates LEFT JOIN $event_table as Event ON Event.ID = dates.EVT_ID LEFT JOIN ";
 
 		//setup remaining joins
-		$join .= implode( " LEFT JOIN ", $join_parts );
+		$join .= implode(" LEFT JOIN ", $join_parts);
 
 		//now put it all together
-		$query = $select . $join . ' GROUP BY Registration_Event';
+		$query = $select.$join.' GROUP BY Registration_Event';
 
 		//and execute
 		$results = $wpdb->get_results(
@@ -468,11 +468,11 @@ 
 	 * @param int $TXN_ID
 	 * @return EE_Registration
 	 */
-	public function get_primary_registration_for_transaction_ID( $TXN_ID = 0){
-		if( ! $TXN_ID ){
+	public function get_primary_registration_for_transaction_ID($TXN_ID = 0) {
+		if ( ! $TXN_ID) {
 			return false;
 		}
-		return $this->get_one(array(array('TXN_ID'=>$TXN_ID,'REG_count'=>  EEM_Registration::PRIMARY_REGISTRANT_COUNT)));
+		return $this->get_one(array(array('TXN_ID'=>$TXN_ID, 'REG_count'=>  EEM_Registration::PRIMARY_REGISTRANT_COUNT)));
 	}
 
 
@@ -484,11 +484,11 @@ 
 	 *		@param boolean $for_incomplete_payments
 	 *		@return int
 	 */
-	public function get_event_registration_count ( $EVT_ID, $for_incomplete_payments = FALSE ) {
+	public function get_event_registration_count($EVT_ID, $for_incomplete_payments = FALSE) {
 		// we only count approved registrations towards registration limits
-		$query_params = array( array( 'EVT_ID' => $EVT_ID, 'STS_ID' => self::status_id_approved ) );
-		if( $for_incomplete_payments ){
-			$query_params[0]['Transaction.STS_ID']=array('!=',  EEM_Transaction::complete_status_code);
+		$query_params = array(array('EVT_ID' => $EVT_ID, 'STS_ID' => self::status_id_approved));
+		if ($for_incomplete_payments) {
+			$query_params[0]['Transaction.STS_ID'] = array('!=', EEM_Transaction::complete_status_code);
 		}
 
 		return $this->count($query_params);
@@ -504,7 +504,7 @@ 
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		return $wpdb->query(
-				'DELETE r FROM ' . $this->table() . ' r LEFT JOIN ' . EEM_Transaction::instance()->table() . ' t ON r.TXN_ID = t.TXN_ID WHERE t.TXN_ID IS NULL' );
+				'DELETE r FROM '.$this->table().' r LEFT JOIN '.EEM_Transaction::instance()->table().' t ON r.TXN_ID = t.TXN_ID WHERE t.TXN_ID IS NULL' );
 	}
 
 	/**
@@ -514,7 +514,7 @@ 
 	 * @param boolean $checked_in whether to count registrations checked IN or OUT
 	 * @return int
 	 */
-	public function count_registrations_checked_into_datetime( $DTT_ID, $checked_in = true) {
+	public function count_registrations_checked_into_datetime($DTT_ID, $checked_in = true) {
 		return $this->count(
 			array(
 				array(
@@ -532,7 +532,7 @@ 
 	 * @param boolean $checked_in whether to count registrations checked IN or OUT
 	 * @return int
 	 */
-	public function count_registrations_checked_into_event( $EVT_ID, $checked_in = true ) {
+	public function count_registrations_checked_into_event($EVT_ID, $checked_in = true) {
 		return $this->count(
 			array(
 				array(

core/libraries/form_sections/inputs/EE_Form_Input_Base.input.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 /**
- * EE_Form_Input_Base
- * For representing a single form input. Extends EE_Form_Section_Base because
- * it is a part of a form and shares a surprisingly large amount of functionality
- *
- * @package			Event Espresso
- * @subpackage
- * @author				Mike Nelson
- */
+	 * EE_Form_Input_Base
+	 * For representing a single form input. Extends EE_Form_Section_Base because
+	 * it is a part of a form and shares a surprisingly large amount of functionality
+	 *
+	 * @package			Event Espresso
+	 * @subpackage
+	 * @author				Mike Nelson
+	 */
 abstract class EE_Form_Input_Base extends EE_Form_Section_Validatable{
 
 	/**

Spacing +133 added lines, -133 removed lines

@@ -8,7 +8,7 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-abstract class EE_Form_Input_Base extends EE_Form_Section_Validatable{
+abstract class EE_Form_Input_Base extends EE_Form_Section_Validatable {
 
 	/**
 	 * the input's name attribute
@@ -141,66 +141,66 @@ 
 	 *		@type EE_Validation_Strategy_Base[] $validation_strategies
 	 * }
 	 */
-	public function __construct( $input_args = array() ){
-		$input_args = apply_filters( 'FHEE__EE_Form_Input_Base___construct__input_args', $input_args, $this );
+	public function __construct($input_args = array()) {
+		$input_args = apply_filters('FHEE__EE_Form_Input_Base___construct__input_args', $input_args, $this);
 		// the following properties must be cast as arrays
 		$set_as_array = array(
 			'validation_strategies' => true
 		);
 		// loop thru incoming options
-		foreach( $input_args as $key => $value ) {
+		foreach ($input_args as $key => $value) {
 			// add underscore to $key to match property names
-			$_key = '_' . $key;
-			if ( property_exists( $this, $_key )) {
+			$_key = '_'.$key;
+			if (property_exists($this, $_key)) {
 				// first check if this property needs to be set as an array
-				if ( isset( $set_as_array[ $key ] )) {
+				if (isset($set_as_array[$key])) {
 					// ensure value is an array
-					$value = is_array( $value ) ? $value : array( get_class( $value ), $value );
+					$value = is_array($value) ? $value : array(get_class($value), $value);
 					// and merge with existing values
-					$this->{$_key} = array_merge( $this->{$_key}, $value );
+					$this->{$_key} = array_merge($this->{$_key}, $value);
 				} else {
 					$this->{$_key} = $value;
 				}
 			}
 		}
 		// ensure that "required" is set correctly
-		$this->set_required( $this->_required, isset( $input_args[ 'required_validation_error_message' ] ) ? $input_args[ 'required_validation_error_message' ] : NULL );
+		$this->set_required($this->_required, isset($input_args['required_validation_error_message']) ? $input_args['required_validation_error_message'] : NULL);
 
 		//$this->_html_name_specified = isset( $input_args['html_name'] ) ? TRUE : FALSE;
 
 		$this->_display_strategy->_construct_finalize($this);
-		if ( $this->_validation_strategies ){
-			foreach( $this->_validation_strategies as $validation_strategy ){
+		if ($this->_validation_strategies) {
+			foreach ($this->_validation_strategies as $validation_strategy) {
 				$validation_strategy->_construct_finalize($this);
 			}
 		}
 
-		if( ! $this->_normalization_strategy){
+		if ( ! $this->_normalization_strategy) {
 			$this->_normalization_strategy = new EE_Text_Normalization();
 		}
 		$this->_normalization_strategy->_construct_finalize($this);
 
 		//at least we can use the normalization strategy to populate the default
-		if( isset( $input_args[ 'default' ] ) ) {
-			$this->set_default( $input_args[ 'default' ] );
+		if (isset($input_args['default'])) {
+			$this->set_default($input_args['default']);
 		}
 
-		if( ! $this->_sensitive_data_removal_strategy){
+		if ( ! $this->_sensitive_data_removal_strategy) {
 			$this->_sensitive_data_removal_strategy = new EE_No_Sensitive_Data_Removal();
 		}
 		$this->_sensitive_data_removal_strategy->_construct_finalize($this);
-		parent::__construct( $input_args );
+		parent::__construct($input_args);
 	}
 
 	/**
 	 * Sets the html_name to its default value, if none was specified in teh constructor.
 	 * Calculation involves using the name and the parent's html_name
 	 */
-	protected function _set_default_html_name_if_empty(){
-		if( ! $this->_html_name){
-			if( $this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper){
-				$this->_html_name = $this->_parent_section->html_name_prefix() . "[{$this->name()}]";
-			}else{
+	protected function _set_default_html_name_if_empty() {
+		if ( ! $this->_html_name) {
+			if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) {
+				$this->_html_name = $this->_parent_section->html_name_prefix()."[{$this->name()}]";
+			} else {
 				$this->_html_name = $this->name();
 			}
 		}
@@ -215,12 +215,12 @@ 
 	function _construct_finalize($parent_form_section, $name) {
 		parent::_construct_finalize($parent_form_section, $name);
 		$this->_set_default_html_name_if_empty();
-		if( ! $this->_html_label ){
-			if( ! $this->_html_label_text){
-				$this->_html_label_text = ucwords( str_replace("_"," ",$name));
+		if ( ! $this->_html_label) {
+			if ( ! $this->_html_label_text) {
+				$this->_html_label_text = ucwords(str_replace("_", " ", $name));
 			}
 		}
-		do_action( 'AHEE__EE_Form_Input_Base___construct_finalize__end', $this, $parent_form_section, $name );
+		do_action('AHEE__EE_Form_Input_Base___construct_finalize__end', $this, $parent_form_section, $name);
 	}
 
 	 /**
@@ -228,10 +228,10 @@ 
 	  * @return EE_Display_Strategy_Base
 	  * @throws EE_Error
 	  */
-	protected function _get_display_strategy(){
-		if( ! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base){
-			throw new EE_Error(sprintf(__("Cannot get display strategy for form input with name %s and id %s, because it has not been set in the constructor", "event_espresso"),$this->html_name(),$this->html_id()));
-		}else{
+	protected function _get_display_strategy() {
+		if ( ! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base) {
+			throw new EE_Error(sprintf(__("Cannot get display strategy for form input with name %s and id %s, because it has not been set in the constructor", "event_espresso"), $this->html_name(), $this->html_id()));
+		} else {
 			return $this->_display_strategy;
 		}
 	}
@@ -239,7 +239,7 @@ 
 	 * Sets the display strategy.
 	 * @param EE_Display_Strategy_Base $strategy
 	 */
-	protected function _set_display_strategy(EE_Display_Strategy_Base $strategy){
+	protected function _set_display_strategy(EE_Display_Strategy_Base $strategy) {
 		$this->_display_strategy = $strategy;
 	}
 
@@ -247,7 +247,7 @@ 
 	 * Sets the sanitization strategy
 	 * @param EE_Normalization_Strategy_Base $strategy
 	 */
-	protected function _set_normalization_strategy(EE_Normalization_Strategy_Base $strategy){
+	protected function _set_normalization_strategy(EE_Normalization_Strategy_Base $strategy) {
 		$this->_normalization_strategy = $strategy;
 	}
 
@@ -273,14 +273,14 @@ 
 	 * Gets the display strategy for this input
 	 * @return EE_Display_Strategy_Base
 	 */
-	public function get_display_strategy(){
+	public function get_display_strategy() {
 		return $this->_display_strategy;
 	}
 	/**
 	 * Overwrites the display strategy
 	 * @param EE_Display_Strategy_Base $display_strategy
 	 */
-	public function set_display_strategy($display_strategy){
+	public function set_display_strategy($display_strategy) {
 		$this->_display_strategy = $display_strategy;
 		$this->_display_strategy->_construct_finalize($this);
 	}
@@ -288,14 +288,14 @@ 
 	 * Gets the normalization strategy set on this input
 	 * @return EE_Normalization_Strategy_Base
 	 */
-	public function get_normalization_strategy(){
+	public function get_normalization_strategy() {
 		return $this->_normalization_strategy;
 	}
 	/**
 	 * Overwrites the normalization strategy
 	 * @param EE_Normalization_Strategy_Base $normalization_strategy
 	 */
-	public function set_normalization_strategy($normalization_strategy){
+	public function set_normalization_strategy($normalization_strategy) {
 		$this->_normalization_strategy = $normalization_strategy;
 		$this->_normalization_strategy->_construct_finalize($this);
 	}
@@ -304,10 +304,10 @@ 
 	 * Returns all teh validation strategies which apply to this field, numerically indexed
 	 * @return EE_Validation_Strategy_Base[]
 	 */
-	public function get_validation_strategies(){
-		if(is_array($this->_validation_strategies)){
+	public function get_validation_strategies() {
+		if (is_array($this->_validation_strategies)) {
 			return $this->_validation_strategies;
-		}else{
+		} else {
 			return array();
 		}
 
@@ -317,9 +317,9 @@ 
 	 * @param EE_Validation_Strategy_Base $validation_strategy
 	 * @return void
 	 */
-	protected function _add_validation_strategy( EE_Validation_Strategy_Base $validation_strategy ){
-		$validation_strategy->_construct_finalize( $this );
-		$this->_validation_strategies[ get_class($validation_strategy) ] = $validation_strategy;
+	protected function _add_validation_strategy(EE_Validation_Strategy_Base $validation_strategy) {
+		$validation_strategy->_construct_finalize($this);
+		$this->_validation_strategies[get_class($validation_strategy)] = $validation_strategy;
 	}
 
 	/**
@@ -327,18 +327,18 @@ 
 	 * @param EE_Validation_Strategy_Base $validation_strategy
 	 * @return void
 	 */
-	public function add_validation_strategy( EE_Validation_Strategy_Base $validation_strategy ) {
-		$this->_add_validation_strategy( $validation_strategy );
+	public function add_validation_strategy(EE_Validation_Strategy_Base $validation_strategy) {
+		$this->_add_validation_strategy($validation_strategy);
 	}
 
 	/**
 	 * The classname of the validation strategy to remove
 	 * @param string $validation_strategy_classname
 	 */
-	public function remove_validation_strategy( $validation_strategy_classname ) {
-		foreach( $this->_validation_strategies as $key => $validation_strategy ){
-			if( is_subclass_of( $validation_strategy, $validation_strategy_classname ) ){
-				unset( $this->_validation_strategies[ $key ] );
+	public function remove_validation_strategy($validation_strategy_classname) {
+		foreach ($this->_validation_strategies as $key => $validation_strategy) {
+			if (is_subclass_of($validation_strategy, $validation_strategy_classname)) {
+				unset($this->_validation_strategies[$key]);
 			}
 		}
 	}
@@ -347,7 +347,7 @@ 
 	 * to the parent form's layout strategy
 	 * @return string
 	 */
-	public function get_html_and_js(){
+	public function get_html_and_js() {
 		return $this->_parent_section->get_html_for_input($this);
 	}
 	/**
@@ -356,7 +356,7 @@ 
 	 * Makes sure the JS and CSS are enqueued for it
 	 * @return string
 	 */
-	public function get_html_for_input(){
+	public function get_html_for_input() {
 		return  $this->_get_display_strategy()->display();
 	}
 
@@ -366,7 +366,7 @@ 
 	 * @return string
 	 */
 	public function html_other_attributes() {
-		return ! empty( $this->_html_other_attributes ) ? ' ' . $this->_html_other_attributes : '';
+		return ! empty($this->_html_other_attributes) ? ' '.$this->_html_other_attributes : '';
 	}
 
 
@@ -374,7 +374,7 @@ 
 	/**
 	 * @param string $html_other_attributes
 	 */
-	public function set_html_other_attributes( $html_other_attributes ) {
+	public function set_html_other_attributes($html_other_attributes) {
 		$this->_html_other_attributes = $html_other_attributes;
 	}
 
@@ -383,7 +383,7 @@ 
 	 * according to the form section's layout strategy
 	 * @return string
 	 */
-	public function get_html_for_label(){
+	public function get_html_for_label() {
 		return $this->_parent_section->get_layout_strategy()->display_label($this);
 	}
 	/**
@@ -391,7 +391,7 @@ 
 	 * according to the form section's layout strategy
 	 * @return string
 	 */
-	public function get_html_for_errors(){
+	public function get_html_for_errors() {
 		return $this->_parent_section->get_layout_strategy()->display_errors($this);
 	}
 	/**
@@ -399,7 +399,7 @@ 
 	 * according to the form section's layout strategy
 	 * @return string
 	 */
-	public function get_html_for_help(){
+	public function get_html_for_help() {
 		return $this->_parent_section->get_layout_strategy()->display_help_text($this);
 	}
 	/**
@@ -408,20 +408,20 @@ 
 	 * @return boolean
 	 */
 	protected function _validate() {
-		if(is_array($this->_validation_strategies)){
-			foreach($this->_validation_strategies as $validation_strategy){
-				if ( $validation_strategy instanceof EE_Validation_Strategy_Base ) {
-					try{
+		if (is_array($this->_validation_strategies)) {
+			foreach ($this->_validation_strategies as $validation_strategy) {
+				if ($validation_strategy instanceof EE_Validation_Strategy_Base) {
+					try {
 						$validation_strategy->validate($this->normalized_value());
-					}catch(EE_Validation_Error $e){
+					} catch (EE_Validation_Error $e) {
 						$this->add_validation_error($e);
 					}
 				}
 			}
 		}
-		if( $this->get_validation_errors()){
+		if ($this->get_validation_errors()) {
 			return false;
-		}else{
+		} else {
 			return true;
 		}
 	}
@@ -434,8 +434,8 @@ 
 	 * @param string $value
 	 * @return null|string
 	 */
-	private function _sanitize($value){
-		return $value !== NULL ?stripslashes(html_entity_decode($value)) : NULL;//don't sanitize_text_field
+	private function _sanitize($value) {
+		return $value !== NULL ? stripslashes(html_entity_decode($value)) : NULL; //don't sanitize_text_field
 	}
 
 
@@ -447,24 +447,24 @@ 
 	 * @param array $req_data like $_POST
 	 * @return boolean whether or not there was an error
 	 */
-	protected function _normalize( $req_data ) {
+	protected function _normalize($req_data) {
 		//any existing validation errors don't apply so clear them
 		$this->_validation_errors = array();
 		try {
-			$raw_input = $this->find_form_data_for_this_section( $req_data );
+			$raw_input = $this->find_form_data_for_this_section($req_data);
 			//super simple sanitization for now
-			if ( is_array( $raw_input )) {
+			if (is_array($raw_input)) {
 				$this->_raw_value = array();
-				foreach( $raw_input as $key => $value ) {
-					$this->_raw_value[ $key ] = $this->_sanitize( $value );
+				foreach ($raw_input as $key => $value) {
+					$this->_raw_value[$key] = $this->_sanitize($value);
 				}
 			} else {
-				$this->_raw_value = $this->_sanitize( $raw_input );
+				$this->_raw_value = $this->_sanitize($raw_input);
 			}
 			//we want ot mostly leave the input alone in case we need to re-display it to the user
-			$this->_normalized_value = $this->_normalization_strategy->normalize( $this->raw_value() );
-		} catch ( EE_Validation_Error $e ) {
-			$this->add_validation_error( $e );
+			$this->_normalized_value = $this->_normalization_strategy->normalize($this->raw_value());
+		} catch (EE_Validation_Error $e) {
+			$this->add_validation_error($e);
 		}
 	}
 
@@ -473,7 +473,7 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_name(){
+	public function html_name() {
 		return $this->_html_name;
 	}
 
@@ -482,8 +482,8 @@ 
 	/**
 	 * @return string
 	 */
-	function html_label_id(){
-		return ! empty( $this->_html_label_id ) ? $this->_html_label_id : $this->_html_id . '-lbl';
+	function html_label_id() {
+		return ! empty($this->_html_label_id) ? $this->_html_label_id : $this->_html_id.'-lbl';
 	}
 
 
@@ -491,7 +491,7 @@ 
 	/**
 	 * @return string
 	 */
-	function html_label_class(){
+	function html_label_class() {
 		return $this->_html_label_class;
 	}
 
@@ -500,7 +500,7 @@ 
 	/**
 	 * @return string
 	 */
-	function html_label_style(){
+	function html_label_style() {
 		return $this->_html_label_style;
 	}
 
@@ -509,7 +509,7 @@ 
 	/**
 	 * @return string
 	 */
-	function html_label_text(){
+	function html_label_text() {
 		return $this->_html_label_text;
 	}
 
@@ -518,7 +518,7 @@ 
 	/**
 	 * @return string
 	 */
-	function html_help_text(){
+	function html_help_text() {
 		return $this->_html_help_text;
 	}
 
@@ -527,7 +527,7 @@ 
 	/**
 	 * @return string
 	 */
-	function html_help_class(){
+	function html_help_class() {
 		return $this->_html_help_class;
 	}
 
@@ -536,7 +536,7 @@ 
 	/**
 	 * @return string
 	 */
-	function html_help_style(){
+	function html_help_style() {
 		return $this->_html_style;
 	}
 	/**
@@ -549,7 +549,7 @@ 
 	 * in which case, we would have stored the malicious content to our database.
 	 * @return string
 	 */
-	function raw_value(){
+	function raw_value() {
 		return $this->_raw_value;
 	}
 	/**
@@ -557,15 +557,15 @@ 
 	 * it escapes all html entities
 	 * @return string
 	 */
-	function raw_value_in_form(){
-		return htmlentities($this->raw_value(),ENT_QUOTES, 'UTF-8');
+	function raw_value_in_form() {
+		return htmlentities($this->raw_value(), ENT_QUOTES, 'UTF-8');
 	}
 	/**
 	 * returns the value after it's been sanitized, and then converted into it's proper type
 	 * in PHP. Eg, a string, an int, an array,
 	 * @return mixed
 	 */
-	function normalized_value(){
+	function normalized_value() {
 		return $this->_normalized_value;
 	}
 
@@ -575,7 +575,7 @@ 
 	 * the best thing to display
 	 * @return string
 	 */
-	function pretty_value(){
+	function pretty_value() {
 		return $this->_normalized_value;
 	}
 	/**
@@ -594,19 +594,19 @@ 
 		  }</code>
 	 * @return array
 	 */
-	function get_jquery_validation_rules(){
+	function get_jquery_validation_rules() {
 
 		$jquery_validation_rules = array();
-		foreach($this->get_validation_strategies() as $validation_strategy){
+		foreach ($this->get_validation_strategies() as $validation_strategy) {
 			$jquery_validation_rules = array_replace_recursive(
 				$jquery_validation_rules,
 				$validation_strategy->get_jquery_validation_rule_array()
 			);
 		}
 
-		if(! empty($jquery_validation_rules)){
-			$jquery_validation_js[ $this->html_id( TRUE ) ] = $jquery_validation_rules;
-		}else{
+		if ( ! empty($jquery_validation_rules)) {
+			$jquery_validation_js[$this->html_id(TRUE)] = $jquery_validation_rules;
+		} else {
 			return array();
 		}
 		return $jquery_validation_js;
@@ -618,9 +618,9 @@ 
 	 * @param mixed $value
 	 * @return void
 	 */
-	function set_default($value){
+	function set_default($value) {
 		$this->_normalized_value = $value;
-		$this->_raw_value = $this->_normalization_strategy->unnormalize( $value );
+		$this->_raw_value = $this->_normalization_strategy->unnormalize($value);
 	}
 
 	/**
@@ -628,7 +628,7 @@ 
 	 * @param string $label
 	 * @return void
 	 */
-	function set_html_label_text($label){
+	function set_html_label_text($label) {
 		$this->_html_label_text = $label;
 	}
 
@@ -640,12 +640,12 @@ 
 	 * @param boolean $required
 	 * @param null    $required_text
 	 */
-	function set_required($required = true, $required_text = NULL ){
-		$required = filter_var( $required, FILTER_VALIDATE_BOOLEAN );
-		if ( $required ) {
-			$this->_add_validation_strategy( new EE_Required_Validation_Strategy( $required_text ) );
+	function set_required($required = true, $required_text = NULL) {
+		$required = filter_var($required, FILTER_VALIDATE_BOOLEAN);
+		if ($required) {
+			$this->_add_validation_strategy(new EE_Required_Validation_Strategy($required_text));
 		} else {
-			unset( $this->_validation_strategies[ 'EE_Required_Validation_Strategy' ] );
+			unset($this->_validation_strategies['EE_Required_Validation_Strategy']);
 		}
 		$this->_required = $required;
 	}
@@ -653,7 +653,7 @@ 
 	 * Returns whether or not this field is required
 	 * @return boolean
 	 */
-	public function required(){
+	public function required() {
 		return $this->_required;
 	}
 
@@ -662,7 +662,7 @@ 
 	/**
 	 * @param string $required_css_class
 	 */
-	public function set_required_css_class( $required_css_class ) {
+	public function set_required_css_class($required_css_class) {
 		$this->_required_css_class = $required_css_class;
 	}
 
@@ -681,7 +681,7 @@ 
 	 * Sets the help text, in case
 	 * @param string $text
 	 */
-	public function set_html_help_text($text){
+	public function set_html_help_text($text) {
 		$this->_html_help_text = $text;
 	}
 	/**
@@ -693,8 +693,8 @@ 
 	public function clean_sensitive_data() {
 		//if we do ANY kind of sensitive data removal on this, then just clear out the raw value
 		//if we need more logic than this we'll make a strategy for it
-		if( $this->_sensitive_data_removal_strategy &&
-				! $this->_sensitive_data_removal_strategy instanceof EE_No_Sensitive_Data_Removal ){
+		if ($this->_sensitive_data_removal_strategy &&
+				! $this->_sensitive_data_removal_strategy instanceof EE_No_Sensitive_Data_Removal) {
 			$this->_raw_value = NULL;
 		}
 		//and clean the normalized value according to the appropriate strategy
@@ -708,10 +708,10 @@ 
 	 * @param string $button_size
 	 * @param string $other_attributes
 	 */
-	public function set_button_css_attributes( $primary = TRUE, $button_size = '', $other_attributes = '' ) {
+	public function set_button_css_attributes($primary = TRUE, $button_size = '', $other_attributes = '') {
 		$button_css_attributes = 'button';
 		$button_css_attributes .= $primary === TRUE ? ' button-primary' : ' button-secondary';
-		switch ( $button_size ) {
+		switch ($button_size) {
 			case 'xs' :
 			case 'extra-small' :
 				$button_css_attributes .= ' button-xs';
@@ -732,7 +732,7 @@ 
 			default :
 				$button_css_attributes .= '';
 		}
-		$this->_button_css_attributes .= ! empty( $other_attributes ) ? $button_css_attributes . ' ' . $other_attributes : $button_css_attributes;
+		$this->_button_css_attributes .= ! empty($other_attributes) ? $button_css_attributes.' '.$other_attributes : $button_css_attributes;
 	}
 
 
@@ -741,7 +741,7 @@ 
 	 * @return string
 	 */
 	public function button_css_attributes() {
-		if ( empty( $this->_button_css_attributes )) {
+		if (empty($this->_button_css_attributes)) {
 			$this->set_button_css_attributes();
 		}
 		return $this->_button_css_attributes;
@@ -761,27 +761,27 @@ 
 	 * @param array $req_data
 	 * @return mixed whatever the raw value of this form section is in the request data
 	 */
-	public function find_form_data_for_this_section( $req_data ){
+	public function find_form_data_for_this_section($req_data) {
 		// break up the html name by "[]"
-		if ( strpos( $this->html_name(), '[' ) !== FALSE ) {
-			$before_any_brackets = substr( $this->html_name(), 0, strpos($this->html_name(), '[') );
+		if (strpos($this->html_name(), '[') !== FALSE) {
+			$before_any_brackets = substr($this->html_name(), 0, strpos($this->html_name(), '['));
 		} else {
 			$before_any_brackets = $this->html_name();
 		}
 		// grab all of the segments
-		preg_match_all('~\[([^]]*)\]~',$this->html_name(), $matches);
-		if( isset( $matches[ 1 ] ) && is_array( $matches[ 1 ] ) ){
-			$name_parts = $matches[ 1 ];
+		preg_match_all('~\[([^]]*)\]~', $this->html_name(), $matches);
+		if (isset($matches[1]) && is_array($matches[1])) {
+			$name_parts = $matches[1];
 			array_unshift($name_parts, $before_any_brackets);
-		}else{
-			$name_parts = array( $before_any_brackets );
+		} else {
+			$name_parts = array($before_any_brackets);
 		}
 		// now get the value for the input
 		$value = $this->_find_form_data_for_this_section_using_name_parts($name_parts, $req_data);
-		if( $value === NULL ){
+		if ($value === NULL) {
 			//check if this thing's name is at the TOP level of the request data
-			if( isset( $req_data[ $this->name() ] ) ){
-				$value = $req_data[ $this->name() ];
+			if (isset($req_data[$this->name()])) {
+				$value = $req_data[$this->name()];
 			}
 		}
 		return $value;
@@ -795,15 +795,15 @@ 
 	 * @param array $req_data
 	 * @return array | NULL
 	 */
-	public function _find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data){
-		$first_part_to_consider = array_shift( $html_name_parts );
-		if( isset( $req_data[ $first_part_to_consider ] ) ){
-			if( empty($html_name_parts ) ){
-				return $req_data[ $first_part_to_consider ];
-			}else{
-				return $this->_find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data[ $first_part_to_consider ] );
+	public function _find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data) {
+		$first_part_to_consider = array_shift($html_name_parts);
+		if (isset($req_data[$first_part_to_consider])) {
+			if (empty($html_name_parts)) {
+				return $req_data[$first_part_to_consider];
+			} else {
+				return $this->_find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data[$first_part_to_consider]);
 			}
-		}else{
+		} else {
 			return NULL;
 		}
 	}
@@ -815,14 +815,14 @@ 
 	 * @param array $req_data like $_POST
 	 * @return boolean
 	 */
-	public function form_data_present_in($req_data = NULL){
-		if( $req_data === NULL ){
+	public function form_data_present_in($req_data = NULL) {
+		if ($req_data === NULL) {
 			$req_data = $_POST;
 		}
-		$checked_value = $this->find_form_data_for_this_section( $req_data );
-		if( $checked_value !== null ){
+		$checked_value = $this->find_form_data_for_this_section($req_data);
+		if ($checked_value !== null) {
 			return TRUE;
-		}else{
+		} else {
 			return FALSE;
 		}
 	}

core/db_classes/EE_Registration_Payment.class.php

Indentation +10 added lines, -10 removed lines

@@ -1,15 +1,15 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 /**
- * Class EE_Registration_Payment
- *
- * Description
- *
- * @package 			Event Espresso
- * @subpackage 	core
- * @author 				Brent Christensen
- * @since 				4.7.0
- *
- */
+	 * Class EE_Registration_Payment
+	 *
+	 * Description
+	 *
+	 * @package 			Event Espresso
+	 * @subpackage 	core
+	 * @author 				Brent Christensen
+	 * @since 				4.7.0
+	 *
+	 */
 
 class EE_Registration_Payment extends EE_Base_Class {
 

Spacing +12 added lines, -12 removed lines

@@ -19,9 +19,9 @@ 
 	 * @param string $timezone
 	 * @return EE_Registration_Payment
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = '', $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = '', $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -31,8 +31,8 @@ 
 	 * @param string $timezone
 	 * @return EE_Registration_Payment
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = '' ) {
-		return new self( $props_n_values, true, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = '') {
+		return new self($props_n_values, true, $timezone);
 	}
 
 
@@ -43,7 +43,7 @@ 
 	 * @return 	int
 	 */
 	public function registration_ID() {
-		return $this->get( 'REG_ID' );
+		return $this->get('REG_ID');
 	}
 
 
@@ -54,7 +54,7 @@ 
 	 * @return    int
 	 */
 	public function payment_ID() {
-		return $this->get( 'PAY_ID' );
+		return $this->get('PAY_ID');
 	}
 
 
@@ -65,7 +65,7 @@ 
 	 * @return 	float
 	 */
 	public function amount() {
-		return $this->get( 'RPY_amount' );
+		return $this->get('RPY_amount');
 	}
 
 
@@ -75,8 +75,8 @@ 
 	 * @access    public
 	 * @param float $amount
 	 */
-	public function set_amount( $amount = 0.000 ) {
-		$this->set( 'RPY_amount', $amount );
+	public function set_amount($amount = 0.000) {
+		$this->set('RPY_amount', $amount);
 	}
 
 
@@ -87,7 +87,7 @@ 
 	 * @return \EE_Registration
 	 */
 	public function registration() {
-		return $this->get_first_related( 'Registration' );
+		return $this->get_first_related('Registration');
 	}
 
 
@@ -98,7 +98,7 @@ 
 	 * @return \EE_Payment
 	 */
 	public function payment() {
-		return $this->get_first_related( 'Payment' );
+		return $this->get_first_related('Payment');
 	}
 
 

core/helpers/EEH_URL.helper.php

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
- * EEH_URL helper
- * Helper class for URL-related PHP functions
- *
- * @package			Event Espresso
- * @subpackage 	/helper/EEH_URL.helper.php
- * @author				Brent Christensen, Michael Nelson
- *
- * ------------------------------------------------------------------------
- */
+	 * EEH_URL helper
+	 * Helper class for URL-related PHP functions
+	 *
+	 * @package			Event Espresso
+	 * @subpackage 	/helper/EEH_URL.helper.php
+	 * @author				Brent Christensen, Michael Nelson
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 class EEH_URL{
 
 	/**

Spacing +56 added lines, -56 removed lines

@@ -9,7 +9,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEH_URL{
+class EEH_URL {
 
 	/**
 	 * _add_query_arg
@@ -21,30 +21,30 @@ 
 	 * @param bool  $exclude_nonce  If true then the nonce will be excluded from the generated url.
 	 * @return string
 	 */
-	public static function add_query_args_and_nonce( $args = array(), $url = '', $exclude_nonce = false ) {
-		if ( empty( $url ) ) {
-			$user_msg = __('An error occurred. A URL is a required parameter for the add_query_args_and_nonce method.', 'event_espresso' );
-			$dev_msg = $user_msg . "\n" . sprintf(
-					__('In order to dynamically generate nonces for your actions, you need to supply a valid URL as a second parameter for the %s::add_query_args_and_nonce method.', 'event_espresso' ),
+	public static function add_query_args_and_nonce($args = array(), $url = '', $exclude_nonce = false) {
+		if (empty($url)) {
+			$user_msg = __('An error occurred. A URL is a required parameter for the add_query_args_and_nonce method.', 'event_espresso');
+			$dev_msg = $user_msg."\n".sprintf(
+					__('In order to dynamically generate nonces for your actions, you need to supply a valid URL as a second parameter for the %s::add_query_args_and_nonce method.', 'event_espresso'),
 					__CLASS__
 				);
-			EE_Error::add_error( $user_msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($user_msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 		// check that an action exists and add nonce
-		if ( ! $exclude_nonce ) {
-			if ( isset( $args['action'] ) && ! empty( $args['action'] ) ) {
-				$args = array_merge( $args, array( $args['action'] . '_nonce' => wp_create_nonce( $args['action'] . '_nonce' ) ) );
+		if ( ! $exclude_nonce) {
+			if (isset($args['action']) && ! empty($args['action'])) {
+				$args = array_merge($args, array($args['action'].'_nonce' => wp_create_nonce($args['action'].'_nonce')));
 			} else {
-				$args = array_merge( $args, array( 'action' => 'default', 'default_nonce' => wp_create_nonce( 'default_nonce' ) ) );
+				$args = array_merge($args, array('action' => 'default', 'default_nonce' => wp_create_nonce('default_nonce')));
 			}
 		}
 
 		//finally, let's always add a return address (if present) :)
-		$args = ! empty( $_REQUEST['action'] ) && ! isset( $_REQUEST[ 'return' ] )
-			? array_merge( $args, array( 'return' => $_REQUEST['action'] ) )
+		$args = ! empty($_REQUEST['action']) && ! isset($_REQUEST['return'])
+			? array_merge($args, array('return' => $_REQUEST['action']))
 			: $args;
 
-		return add_query_arg( $args, $url );
+		return add_query_arg($args, $url);
 
 	}
 
@@ -57,17 +57,17 @@ 
 	 * @param boolean $sslverify whether we care if the SSL certificate for the requested site is setup properly
 	 * @return boolean
 	 */
-	public static function remote_file_exists( $url, $args = array() ){
-		$results = wp_remote_request($url,array_merge( array(
+	public static function remote_file_exists($url, $args = array()) {
+		$results = wp_remote_request($url, array_merge(array(
 			'method'=>'GET',
 			'redirection'=>1
-		), $args ) );
-		if( ! $results instanceof WP_Error &&
+		), $args));
+		if ( ! $results instanceof WP_Error &&
 				isset($results['response']) &&
 				isset($results['response']['code']) &&
-				$results['response']['code'] == '200'){
+				$results['response']['code'] == '200') {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -83,29 +83,29 @@ 
 	 * @param bool   $base_url_only - TRUE will only return the scheme and host with no other parameters
 	 * @return string
 	 */
-	public static function refactor_url( $url = '', $remove_query = TRUE, $base_url_only = FALSE ) {
+	public static function refactor_url($url = '', $remove_query = TRUE, $base_url_only = FALSE) {
 		// break apart incoming URL
-		$url_bits = parse_url( $url );
+		$url_bits = parse_url($url);
 		// HTTP or HTTPS ?
-		$scheme = isset( $url_bits[ 'scheme' ] ) ? $url_bits[ 'scheme' ] . '://' : 'http://';
+		$scheme = isset($url_bits['scheme']) ? $url_bits['scheme'].'://' : 'http://';
 		// domain
-		$host = isset( $url_bits[ 'host' ] ) ? $url_bits[ 'host' ] : '';
+		$host = isset($url_bits['host']) ? $url_bits['host'] : '';
 		// if only the base URL is requested, then return that now
-		if ( $base_url_only ) {
-			return $scheme . $host;
+		if ($base_url_only) {
+			return $scheme.$host;
 		}
-		$port = isset( $url_bits[ 'port' ] ) ? ':' . $url_bits[ 'port' ] : '';
-		$user = isset( $url_bits[ 'user' ] ) ? $url_bits[ 'user' ] : '';
-		$pass = isset( $url_bits[ 'pass' ] ) ? ':' . $url_bits[ 'pass' ] : '';
-		$pass = ( $user || $pass ) ? $pass . '@' : '';
-		$path = isset( $url_bits[ 'path' ] ) ? $url_bits[ 'path' ] : '';
+		$port = isset($url_bits['port']) ? ':'.$url_bits['port'] : '';
+		$user = isset($url_bits['user']) ? $url_bits['user'] : '';
+		$pass = isset($url_bits['pass']) ? ':'.$url_bits['pass'] : '';
+		$pass = ($user || $pass) ? $pass.'@' : '';
+		$path = isset($url_bits['path']) ? $url_bits['path'] : '';
 		// if the query string is not required, then return what we have so far
-		if ( $remove_query ) {
-			return $scheme . $user . $pass . $host . $port . $path;
+		if ($remove_query) {
+			return $scheme.$user.$pass.$host.$port.$path;
 		}
-		$query = isset( $url_bits[ 'query' ] ) ? '?' . $url_bits[ 'query' ] : '';
-		$fragment = isset( $url_bits[ 'fragment' ] ) ? '#' . $url_bits[ 'fragment' ] : '';
-		return $scheme . $user . $pass . $host . $port . $path . $query . $fragment;
+		$query = isset($url_bits['query']) ? '?'.$url_bits['query'] : '';
+		$fragment = isset($url_bits['fragment']) ? '#'.$url_bits['fragment'] : '';
+		return $scheme.$user.$pass.$host.$port.$path.$query.$fragment;
 	}
 
 
@@ -118,29 +118,29 @@ 
 	 * @param bool   $as_array TRUE (default) will return query params as an array of key value pairs, FALSE will simply return the query string
 	 * @return string|array
 	 */
-	public static function get_query_string( $url = '', $as_array = TRUE ) {
+	public static function get_query_string($url = '', $as_array = TRUE) {
 		// break apart incoming URL
-		$url_bits = parse_url( $url );
+		$url_bits = parse_url($url);
 		// grab query string from URL
-		$query = isset( $url_bits[ 'query' ] ) ? $url_bits[ 'query' ] : '';
+		$query = isset($url_bits['query']) ? $url_bits['query'] : '';
 		// if we don't want the query string formatted into an array of key => value pairs, then just return it as is
-		if ( ! $as_array ) {
+		if ( ! $as_array) {
 			return $query;
 		}
 		// if no query string exists then just return an empty array now
-		if ( empty( $query )) {
+		if (empty($query)) {
 			return array();
 		}
 		// empty array to hold results
 		$query_params = array();
 		// now break apart the query string into separate params
-		$query = explode( '&', $query );
+		$query = explode('&', $query);
 		// loop thru our query params
-		foreach ( $query as $query_args ) {
+		foreach ($query as $query_args) {
 			// break apart the key value pairs
-			$query_args = explode( '=', $query_args );
+			$query_args = explode('=', $query_args);
 			// and add to our results array
-			$query_params[ $query_args[0] ] = $query_args[1];
+			$query_params[$query_args[0]] = $query_args[1];
 		}
 		return $query_params;
 	}
@@ -151,7 +151,7 @@ 
 	 * prevent_prefetching
 	 * @return void
 	 */
-	public static function prevent_prefetching(){
+	public static function prevent_prefetching() {
 		// prevent browsers from prefetching of the rel='next' link, because it may contain content that interferes with the registration process
 		remove_action('wp_head', 'adjacent_posts_rel_link_wp_head');
 	}
@@ -166,9 +166,9 @@ 
 	 * @param   string $prefix Use this to prefix the string with something.
 	 * @return string
 	 */
-	public static function generate_unique_token( $prefix = '' ) {
-		$token =  md5( uniqid() . mt_rand() );
-		return $prefix ? $prefix . '_' . $token : $token;
+	public static function generate_unique_token($prefix = '') {
+		$token = md5(uniqid().mt_rand());
+		return $prefix ? $prefix.'_'.$token : $token;
 	}
 
 
@@ -177,7 +177,7 @@ 
 	 * add_nocache_headers
 	 * @return void
 	 */
-	public static function add_nocache_headers(){
+	public static function add_nocache_headers() {
 		// add no cache headers
 //		add_action( 'wp_head' , array( 'EED_Single_Page_Checkout', 'nocache_headers' ), 10 );
 		// plus a little extra for nginx
@@ -194,19 +194,19 @@ 
 	 * @param string $server_variable
 	 * @return string
 	 */
-	public static function filter_input_server_url( $server_variable = 'REQUEST_URI' ){
+	public static function filter_input_server_url($server_variable = 'REQUEST_URI') {
 		$URL = '';
 		$server_variables = array(
 			'REQUEST_URI' => 1,
 			'HTTP_HOST' => 1,
 			'PHP_SELF' => 1,
 		);
-		$server_variable = strtoupper( $server_variable );
+		$server_variable = strtoupper($server_variable);
 		// whitelist INPUT_SERVER var
-		if ( isset( $server_variables[ $server_variable ] ) ) {
-			$URL = filter_input( INPUT_SERVER, $server_variable, FILTER_SANITIZE_URL, FILTER_NULL_ON_FAILURE );
-			if ( empty( $URL ) ) {
-				$URL = esc_url( $_SERVER[ $server_variable ] );
+		if (isset($server_variables[$server_variable])) {
+			$URL = filter_input(INPUT_SERVER, $server_variable, FILTER_SANITIZE_URL, FILTER_NULL_ON_FAILURE);
+			if (empty($URL)) {
+				$URL = esc_url($_SERVER[$server_variable]);
 			}
 		}
 		return $URL;

core/admin/EE_Admin.core.php

Indentation +42 added lines, -42 removed lines

@@ -1,33 +1,33 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package			Event Espresso
- * @ author			Seth Shoultes
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link					http://www.eventespresso.com
- * @ version		 	4.0
- *
- * ------------------------------------------------------------------------
- *
- * EE_Admin
- *
- * @package			Event Espresso
- * @subpackage	/core/admin/
- * @author				Brent Christensen
- *
- * ------------------------------------------------------------------------
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package			Event Espresso
+	 * @ author			Seth Shoultes
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+	 * @ link					http://www.eventespresso.com
+	 * @ version		 	4.0
+	 *
+	 * ------------------------------------------------------------------------
+	 *
+	 * EE_Admin
+	 *
+	 * @package			Event Espresso
+	 * @subpackage	/core/admin/
+	 * @author				Brent Christensen
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 final class EE_Admin {
 
    /**
-     * 	EE_Admin Object
-     * 	@private _instance
-	 * 	@private 	protected
-     */
+    * 	EE_Admin Object
+    * 	@private _instance
+    * 	@private 	protected
+    */
 	private static $_instance = NULL;
 
 	/**
@@ -56,8 +56,8 @@ 
 
 
    /**
-     * class constructor
-     */
+    * class constructor
+    */
 	protected function __construct() {
 		// define global EE_Admin constants
 		$this->_define_all_constants();
@@ -168,11 +168,11 @@ 
 
 
 	/**
-	* init- should fire after shortcode, module,  addon, other plugin (default priority), and even EE_Front_Controller's init phases have run
-	*
-	* @access public
-	* @return void
-	*/
+	 * init- should fire after shortcode, module,  addon, other plugin (default priority), and even EE_Front_Controller's init phases have run
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function init() {
 
 		//only enable most of the EE_Admin IF we're not in full maintenance mode
@@ -463,11 +463,11 @@ 
 
 
 	/**
-	* admin_init
-	*
-	* @access public
-	* @return void
-	*/
+	 * admin_init
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function admin_init() {
 
 		/**
@@ -624,11 +624,11 @@ 
 
 
 	/**
-	* 	dismiss_persistent_admin_notice
-	*
-	*	@access 	public
-	* 	@return 		void
-	*/
+	 * 	dismiss_persistent_admin_notice
+	 *
+	 *	@access 	public
+	 * 	@return 		void
+	 */
 	public function dismiss_ee_nag_notice_callback() {
 		EE_Error::dismiss_persistent_admin_notice();
 	}

Spacing +174 added lines, -174 removed lines

@@ -47,7 +47,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if (  ! self::$_instance instanceof EE_Admin ) {
+		if ( ! self::$_instance instanceof EE_Admin) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -62,25 +62,25 @@ 
 		// define global EE_Admin constants
 		$this->_define_all_constants();
 		// set autoloaders for our admin page classes based on included path information
-		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder( EE_ADMIN );
+		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder(EE_ADMIN);
 		// admin hooks
-		add_filter( 'plugin_action_links', array( $this, 'filter_plugin_actions' ), 10, 2 );
+		add_filter('plugin_action_links', array($this, 'filter_plugin_actions'), 10, 2);
 		// load EE_Request_Handler early
-		add_action( 'AHEE__EE_System__core_loaded_and_ready', array( $this, 'get_request' ));
-		add_action( 'AHEE__EE_System__initialize_last', array( $this, 'init' ));
-		add_action( 'AHEE__EE_Admin_Page__route_admin_request', array( $this, 'route_admin_request' ), 100, 2 );
-		add_action( 'wp_loaded', array( $this, 'wp_loaded' ), 100 );
-		add_action( 'admin_init', array( $this, 'admin_init' ), 100 );
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ), 20 );
-		add_action( 'admin_notices', array( $this, 'display_admin_notices' ), 10 );
-		add_action( 'network_admin_notices', array( $this, 'display_admin_notices' ), 10 );
-		add_filter( 'pre_update_option', array( $this, 'check_for_invalid_datetime_formats' ), 100, 2 );
-		add_filter('admin_footer_text', array( $this, 'espresso_admin_footer' ));
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'get_request'));
+		add_action('AHEE__EE_System__initialize_last', array($this, 'init'));
+		add_action('AHEE__EE_Admin_Page__route_admin_request', array($this, 'route_admin_request'), 100, 2);
+		add_action('wp_loaded', array($this, 'wp_loaded'), 100);
+		add_action('admin_init', array($this, 'admin_init'), 100);
+		add_action('admin_enqueue_scripts', array($this, 'enqueue_admin_scripts'), 20);
+		add_action('admin_notices', array($this, 'display_admin_notices'), 10);
+		add_action('network_admin_notices', array($this, 'display_admin_notices'), 10);
+		add_filter('pre_update_option', array($this, 'check_for_invalid_datetime_formats'), 100, 2);
+		add_filter('admin_footer_text', array($this, 'espresso_admin_footer'));
 
 		//reset Environment config (we only do this on admin page loads);
 		EE_Registry::instance()->CFG->environment->recheck_values();
 
-		do_action( 'AHEE__EE_Admin__loaded' );
+		do_action('AHEE__EE_Admin__loaded');
 	}
 
 
@@ -95,11 +95,11 @@ 
 	 * @return void
 	 */
 	private function _define_all_constants() {
-		define( 'EE_ADMIN_URL', EE_PLUGIN_DIR_URL . 'core/admin/' );
-		define( 'EE_ADMIN_PAGES_URL', EE_PLUGIN_DIR_URL . 'admin_pages/' );
-		define( 'EE_ADMIN_TEMPLATE', EE_ADMIN . 'templates' . DS );
-		define( 'WP_ADMIN_PATH', ABSPATH . 'wp-admin/' );
-		define( 'WP_AJAX_URL', admin_url( 'admin-ajax.php' ));
+		define('EE_ADMIN_URL', EE_PLUGIN_DIR_URL.'core/admin/');
+		define('EE_ADMIN_PAGES_URL', EE_PLUGIN_DIR_URL.'admin_pages/');
+		define('EE_ADMIN_TEMPLATE', EE_ADMIN.'templates'.DS);
+		define('WP_ADMIN_PATH', ABSPATH.'wp-admin/');
+		define('WP_AJAX_URL', admin_url('admin-ajax.php'));
 	}
 
 
@@ -112,23 +112,23 @@ 
 	 * @param 	string 	$plugin
 	 * @return 	array
 	 */
-	public function filter_plugin_actions( $links, $plugin ) {
+	public function filter_plugin_actions($links, $plugin) {
 		// set $main_file in stone
 		static $main_file;
 		// if $main_file is not set yet
-		if ( ! $main_file ) {
-			$main_file = plugin_basename( EVENT_ESPRESSO_MAIN_FILE );
+		if ( ! $main_file) {
+			$main_file = plugin_basename(EVENT_ESPRESSO_MAIN_FILE);
 		}
-		 if ( $plugin == $main_file ) {
+		 if ($plugin == $main_file) {
 		 	// compare current plugin to this one
-			if ( EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance ) {
-				$maintenance_link = '<a href="admin.php?page=espresso_maintenance_settings" title="Event Espresso is in maintenance mode.  Click this link to learn why.">' . __('Maintenance Mode Active', 'event_espresso' ) . '</a>';
-				array_unshift( $links, $maintenance_link );
+			if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
+				$maintenance_link = '<a href="admin.php?page=espresso_maintenance_settings" title="Event Espresso is in maintenance mode.  Click this link to learn why.">'.__('Maintenance Mode Active', 'event_espresso').'</a>';
+				array_unshift($links, $maintenance_link);
 			} else {
-				$org_settings_link = '<a href="admin.php?page=espresso_general_settings">' . __( 'Settings', 'event_espresso' ) . '</a>';
-				$events_link = '<a href="admin.php?page=espresso_events">' . __( 'Events', 'event_espresso' ) . '</a>';
+				$org_settings_link = '<a href="admin.php?page=espresso_general_settings">'.__('Settings', 'event_espresso').'</a>';
+				$events_link = '<a href="admin.php?page=espresso_events">'.__('Events', 'event_espresso').'</a>';
 				// add before other links
-				array_unshift( $links, $org_settings_link, $events_link );
+				array_unshift($links, $org_settings_link, $events_link);
 			}
 		}
 		return $links;
@@ -143,8 +143,8 @@ 
 	 *	@return void
 	 */
 	public function get_request() {
-		EE_Registry::instance()->load_core( 'Request_Handler' );
-		EE_Registry::instance()->load_core( 'CPT_Strategy' );
+		EE_Registry::instance()->load_core('Request_Handler');
+		EE_Registry::instance()->load_core('CPT_Strategy');
 	}
 
 
@@ -156,11 +156,11 @@ 
 	 * @param array $admin_page_folder_names
 	 * @return array
 	 */
-	public function hide_admin_pages_except_maintenance_mode( $admin_page_folder_names = array() ){
+	public function hide_admin_pages_except_maintenance_mode($admin_page_folder_names = array()) {
 		return array(
-			'maintenance' => EE_ADMIN_PAGES . 'maintenance' . DS,
-			'about' => EE_ADMIN_PAGES . 'about' . DS,
-			'support' => EE_ADMIN_PAGES . 'support' . DS
+			'maintenance' => EE_ADMIN_PAGES.'maintenance'.DS,
+			'about' => EE_ADMIN_PAGES.'about'.DS,
+			'support' => EE_ADMIN_PAGES.'support'.DS
 		);
 	}
 
@@ -175,36 +175,36 @@ 
 	public function init() {
 
 		//only enable most of the EE_Admin IF we're not in full maintenance mode
-		if ( EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ){
+		if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
 			//ok so we want to enable the entire admin
-			add_action( 'wp_ajax_dismiss_ee_nag_notice', array( $this, 'dismiss_ee_nag_notice_callback' ));
-			add_action( 'save_post', array( 'EE_Admin', 'parse_post_content_on_save' ), 100, 2 );
-			add_action( 'update_option', array( $this, 'reset_page_for_posts_on_change' ), 100, 3 );
-			add_filter( 'content_save_pre', array( $this, 'its_eSpresso' ), 10, 1 );
-			add_action( 'admin_notices', array( $this, 'get_persistent_admin_notices' ), 9 );
-			add_action( 'network_admin_notices', array( $this, 'get_persistent_admin_notices' ), 9 );
+			add_action('wp_ajax_dismiss_ee_nag_notice', array($this, 'dismiss_ee_nag_notice_callback'));
+			add_action('save_post', array('EE_Admin', 'parse_post_content_on_save'), 100, 2);
+			add_action('update_option', array($this, 'reset_page_for_posts_on_change'), 100, 3);
+			add_filter('content_save_pre', array($this, 'its_eSpresso'), 10, 1);
+			add_action('admin_notices', array($this, 'get_persistent_admin_notices'), 9);
+			add_action('network_admin_notices', array($this, 'get_persistent_admin_notices'), 9);
 			//at a glance dashboard widget
-			add_filter( 'dashboard_glance_items', array( $this, 'dashboard_glance_items'), 10 );
+			add_filter('dashboard_glance_items', array($this, 'dashboard_glance_items'), 10);
 			//filter for get_edit_post_link used on comments for custom post types
-			add_filter('get_edit_post_link', array( $this, 'modify_edit_post_link' ), 10, 3 );
+			add_filter('get_edit_post_link', array($this, 'modify_edit_post_link'), 10, 3);
 		}
 
 		// run the admin page factory but ONLY if we are doing an ee admin ajax request
-		if ( !defined('DOING_AJAX') || EE_ADMIN_AJAX ) {
+		if ( ! defined('DOING_AJAX') || EE_ADMIN_AJAX) {
 			try {
 				//this loads the controller for the admin pages which will setup routing etc
-				EE_Registry::instance()->load_core( 'Admin_Page_Loader' );
-			} catch ( EE_Error $e ) {
+				EE_Registry::instance()->load_core('Admin_Page_Loader');
+			} catch (EE_Error $e) {
 				$e->get_error();
 			}
 		}
 
 		//make sure our CPTs and custom taxonomy metaboxes get shown for first time users
-		add_action('admin_head', array($this, 'enable_hidden_ee_nav_menu_metaboxes' ), 10 );
-		add_action('admin_head', array( $this, 'register_custom_nav_menu_boxes' ), 10 );
+		add_action('admin_head', array($this, 'enable_hidden_ee_nav_menu_metaboxes'), 10);
+		add_action('admin_head', array($this, 'register_custom_nav_menu_boxes'), 10);
 
 		//exclude EE critical pages from all nav menus and wp_list_pages
-		add_filter('nav_menu_meta_box_object', array( $this, 'remove_pages_from_nav_menu'), 10 );
+		add_filter('nav_menu_meta_box_object', array($this, 'remove_pages_from_nav_menu'), 10);
 	}
 
 
@@ -217,9 +217,9 @@ 
 	 * @param  object $post_type WP post type object
 	 * @return object            WP post type object
 	 */
-	public function remove_pages_from_nav_menu( $post_type ) {
+	public function remove_pages_from_nav_menu($post_type) {
 		//if this isn't the "pages" post type let's get out
-		if ( $post_type->name !== 'page' )
+		if ($post_type->name !== 'page')
 			return $post_type;
 
 		$critical_pages = EE_Registry::instance()->CFG->core->get_critical_pages_array();
@@ -239,28 +239,28 @@ 
 	 */
 	public function enable_hidden_ee_nav_menu_metaboxes() {
 		global $wp_meta_boxes, $pagenow;
-		if ( ! is_array($wp_meta_boxes) || $pagenow !== 'nav-menus.php' ) {
+		if ( ! is_array($wp_meta_boxes) || $pagenow !== 'nav-menus.php') {
 			return;
 		}
 		$user = wp_get_current_user();
 		//has this been done yet?
-		if ( get_user_option( 'ee_nav_menu_initialized', $user->ID ) ) {
+		if (get_user_option('ee_nav_menu_initialized', $user->ID)) {
 			return;
 		}
 
-		$hidden_meta_boxes = get_user_option( 'metaboxhidden_nav-menus', $user->ID );
-		$initial_meta_boxes = apply_filters( 'FHEE__EE_Admin__enable_hidden_ee_nav_menu_boxes__initial_meta_boxes', array( 'nav-menu-theme-locations', 'add-page', 'add-custom-links', 'add-category', 'add-espresso_events', 'add-espresso_venues', 'add-espresso_event_categories', 'add-espresso_venue_categories', 'add-post-type-post', 'add-post-type-page' ) );
+		$hidden_meta_boxes = get_user_option('metaboxhidden_nav-menus', $user->ID);
+		$initial_meta_boxes = apply_filters('FHEE__EE_Admin__enable_hidden_ee_nav_menu_boxes__initial_meta_boxes', array('nav-menu-theme-locations', 'add-page', 'add-custom-links', 'add-category', 'add-espresso_events', 'add-espresso_venues', 'add-espresso_event_categories', 'add-espresso_venue_categories', 'add-post-type-post', 'add-post-type-page'));
 
-		if ( is_array( $hidden_meta_boxes ) ) {
-			foreach ( $hidden_meta_boxes as $key => $meta_box_id ) {
-				if ( in_array( $meta_box_id, $initial_meta_boxes ) ) {
-					unset( $hidden_meta_boxes[ $key ] );
+		if (is_array($hidden_meta_boxes)) {
+			foreach ($hidden_meta_boxes as $key => $meta_box_id) {
+				if (in_array($meta_box_id, $initial_meta_boxes)) {
+					unset($hidden_meta_boxes[$key]);
 				}
 			}
 		}
 
-		update_user_option( $user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true );
-		update_user_option( $user->ID, 'ee_nav_menu_initialized', 1, true );
+		update_user_option($user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true);
+		update_user_option($user->ID, 'ee_nav_menu_initialized', 1, true);
 	}
 
 
@@ -279,7 +279,7 @@ 
 	 * @return void
 	 */
 	public function register_custom_nav_menu_boxes() {
-		add_meta_box( 'add-extra-nav-menu-pages', __('Event Espresso Pages', 'event_espresso'), array( $this, 'ee_cpt_archive_pages' ), 'nav-menus', 'side', 'core' );
+		add_meta_box('add-extra-nav-menu-pages', __('Event Espresso Pages', 'event_espresso'), array($this, 'ee_cpt_archive_pages'), 'nav-menus', 'side', 'core');
 	}
 
 
@@ -296,17 +296,17 @@ 
 	 *
 	 * @return string  the (maybe) modified link
 	 */
-	public function modify_edit_post_link( $link, $id, $context ) {
-		if ( ! $post = get_post( $id ) )
+	public function modify_edit_post_link($link, $id, $context) {
+		if ( ! $post = get_post($id))
 			return $link;
 
-		if ( $post->post_type == 'espresso_attendees' ) {
+		if ($post->post_type == 'espresso_attendees') {
 			$query_args = array(
 				'action' => 'edit_attendee',
 				'post' => $id
 				);
 			EE_Registry::instance()->load_helper('URL');
-			return EEH_URL::add_query_args_and_nonce( $query_args, admin_url('admin.php?page=espresso_registrations') );
+			return EEH_URL::add_query_args_and_nonce($query_args, admin_url('admin.php?page=espresso_registrations'));
 		}
 		return $link;
 	}
@@ -318,7 +318,7 @@ 
 		global $nav_menu_selected_id;
 
 		$db_fields = false;
-		$walker = new Walker_Nav_Menu_Checklist( $db_fields );
+		$walker = new Walker_Nav_Menu_Checklist($db_fields);
 		$current_tab = 'event-archives';
 
 		/*if ( ! empty( $_REQUEST['quick-search-posttype-' . $post_type_name] ) ) {
@@ -337,9 +337,9 @@ 
 		?>
 		<div id="posttype-extra-nav-menu-pages" class="posttypediv">
 			<ul id="posttype-extra-nav-menu-pages-tabs" class="posttype-tabs add-menu-item-tabs">
-				<li <?php echo ( 'event-archives' == $current_tab ? ' class="tabs"' : '' ); ?>>
-					<a class="nav-tab-link" data-type="tabs-panel-posttype-extra-nav-menu-pages-event-archives" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg('extra-nav-menu-pages-tab', 'event-archives', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-extra-nav-menu-pages-event-archives">
-						<?php _e( 'Event Archive Pages', 'event_espresso' ); ?>
+				<li <?php echo ('event-archives' == $current_tab ? ' class="tabs"' : ''); ?>>
+					<a class="nav-tab-link" data-type="tabs-panel-posttype-extra-nav-menu-pages-event-archives" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg('extra-nav-menu-pages-tab', 'event-archives', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-extra-nav-menu-pages-event-archives">
+						<?php _e('Event Archive Pages', 'event_espresso'); ?>
 					</a>
 				</li>
 			<?php /* // temporarily removing but leaving skeleton in place in case we ever decide to add more tabs.
@@ -357,13 +357,13 @@ 
  			<?php */ ?>
 
 			<div id="tabs-panel-posttype-extra-nav-menu-pages-event-archives" class="tabs-panel <?php
-			echo ( 'event-archives' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('event-archives' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 			?>">
 				<ul id="extra-nav-menu-pageschecklist-event-archives" class="categorychecklist form-no-clear">
 					<?php
 					$pages = $this->_get_extra_nav_menu_pages_items();
 					$args['walker'] = $walker;
-					echo walk_nav_menu_tree( array_map( array( $this, '_setup_extra_nav_menu_pages_items' ), $pages), 0, (object) $args );
+					echo walk_nav_menu_tree(array_map(array($this, '_setup_extra_nav_menu_pages_items'), $pages), 0, (object) $args);
 					?>
 				</ul>
 			</div><!-- /.tabs-panel -->
@@ -371,18 +371,18 @@ 
 			<p class="button-controls">
 				<span class="list-controls">
 					<a href="<?php
-						echo esc_url( add_query_arg(
+						echo esc_url(add_query_arg(
 							array(
 								'extra-nav-menu-pages-tab' => 'event-archives',
 								'selectall' => 1,
 							),
-							remove_query_arg( $removed_args )
+							remove_query_arg($removed_args)
 						));
 					?>#posttype-extra-nav-menu-pages>" class="select-all"><?php _e('Select All'); ?></a>
 				</span>
 
 				<span class="add-to-menu">
-					<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( __( 'Add to Menu' ) ); ?>" name="add-post-type-menu-item" id="<?php esc_attr_e( 'submit-posttype-extra-nav-menu-pages' ); ?>" />
+					<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e(__('Add to Menu')); ?>" name="add-post-type-menu-item" id="<?php esc_attr_e('submit-posttype-extra-nav-menu-pages'); ?>" />
 					<span class="spinner"></span>
 				</span>
 			</p>
@@ -403,10 +403,10 @@ 
 	private function _get_extra_nav_menu_pages_items() {
 		$menuitems[] = array(
 			'title' => __('Event List', 'event_espresso'),
-			'url' => get_post_type_archive_link( 'espresso_events' ),
+			'url' => get_post_type_archive_link('espresso_events'),
 			'description' => __('Archive page for all events.', 'event_espresso')
 		);
-		return apply_filters( 'FHEE__EE_Admin__get_extra_nav_menu_pages_items', $menuitems );
+		return apply_filters('FHEE__EE_Admin__get_extra_nav_menu_pages_items', $menuitems);
 	}
 
 
@@ -418,7 +418,7 @@ 
 	 * @param $menu_item_values
 	 * @return stdClass
 	 */
-	private function _setup_extra_nav_menu_pages_items( $menu_item_values ) {
+	private function _setup_extra_nav_menu_pages_items($menu_item_values) {
 		$menu_item = new stdClass();
 		$keys = array(
 			'ID' => 0,
@@ -438,8 +438,8 @@ 
 			'xfn' => ''
 		);
 
-		foreach ( $keys as $key => $value) {
-			$menu_item->{$key} = isset( $menu_item_values[ $key]) ? $menu_item_values[ $key] : $value;
+		foreach ($keys as $key => $value) {
+			$menu_item->{$key} = isset($menu_item_values[$key]) ? $menu_item_values[$key] : $value;
 		}
 		return $menu_item;
 	}
@@ -478,10 +478,10 @@ 
 		 * - check if doing post processing of one of EE CPTs
 		 * - instantiate the corresponding EE CPT model for the post_type being processed.
 		 */
-		if ( isset( $_POST['action'] ) && $_POST['action'] == 'editpost' ) {
-			if ( isset( $_POST['post_type'] ) ) {
-				EE_Registry::instance()->load_core( 'Register_CPTs' );
-				EE_Register_CPTs::instantiate_cpt_models( $_POST['post_type'] );
+		if (isset($_POST['action']) && $_POST['action'] == 'editpost') {
+			if (isset($_POST['post_type'])) {
+				EE_Registry::instance()->load_core('Register_CPTs');
+				EE_Register_CPTs::instantiate_cpt_models($_POST['post_type']);
 			}
 		}
 
@@ -491,8 +491,8 @@ 
 		 * 'options-reading.php' core WordPress admin settings page.  This is for user-proofing.
 		 */
 		global $pagenow;
-		if ( $pagenow == 'options-reading.php' ) {
-			add_filter( 'wp_dropdown_pages', array( $this, 'modify_dropdown_pages' ) );
+		if ($pagenow == 'options-reading.php') {
+			add_filter('wp_dropdown_pages', array($this, 'modify_dropdown_pages'));
 		}
 
 	}
@@ -504,25 +504,25 @@ 
 	 * @param string $output  Current output.
 	 * @return string
 	 */
-	public function modify_dropdown_pages( $output ) {
+	public function modify_dropdown_pages($output) {
 		//get critical pages
 		$critical_pages = EE_Registry::instance()->CFG->core->get_critical_pages_array();
 
 		//split current output by line break for easier parsing.
-		$split_output = explode( "\n", $output );
+		$split_output = explode("\n", $output);
 
 		//loop through to remove any critical pages from the array.
-		foreach ( $critical_pages as $page_id ) {
-			$needle = 'value="' . $page_id . '"';
-			foreach( $split_output as $key => $haystack ) {
-				if( strpos( $haystack, $needle ) !== false ) {
-					unset( $split_output[$key] );
+		foreach ($critical_pages as $page_id) {
+			$needle = 'value="'.$page_id.'"';
+			foreach ($split_output as $key => $haystack) {
+				if (strpos($haystack, $needle) !== false) {
+					unset($split_output[$key]);
 				}
 			}
 		}
 
 		//replace output with the new contents
-		$output = implode( "\n", $split_output );
+		$output = implode("\n", $split_output);
 
 		return $output;
 	}
@@ -538,37 +538,37 @@ 
 	public function enqueue_admin_scripts() {
 		// this javascript is loaded on every admin page to catch any injections ee needs to add to wp run js.
 		// Note: the intention of this script is to only do TARGETED injections.  I.E, only injecting on certain script calls.
-		wp_enqueue_script('ee-inject-wp', EE_ADMIN_URL . 'assets/ee-cpt-wp-injects.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('ee-inject-wp', EE_ADMIN_URL.'assets/ee-cpt-wp-injects.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
 		// register cookie script for future dependencies
-		wp_register_script('jquery-cookie', EE_THIRD_PARTY_URL . 'joyride/jquery.cookie.js', array('jquery'), '2.1', TRUE );
+		wp_register_script('jquery-cookie', EE_THIRD_PARTY_URL.'joyride/jquery.cookie.js', array('jquery'), '2.1', TRUE);
 		// jquery_validate loading is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again via:  add_filter( 'FHEE_load_jquery_validate', '__return_true' );
-		if ( apply_filters( 'FHEE_load_jquery_validate', FALSE ) ) {
+		if (apply_filters('FHEE_load_jquery_validate', FALSE)) {
 			// register jQuery Validate
-			wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js', array('jquery'), '1.15.0', TRUE);
+			wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.min.js', array('jquery'), '1.15.0', TRUE);
 		}
 		//joyride is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again vai: add_filter('FHEE_load_joyride', '__return_true' );
-		if ( apply_filters( 'FHEE_load_joyride', FALSE ) ) {
+		if (apply_filters('FHEE_load_joyride', FALSE)) {
 			//joyride style
-			wp_register_style('joyride-css', EE_THIRD_PARTY_URL . 'joyride/joyride-2.1.css', array(), '2.1');
-			wp_register_style('ee-joyride-css', EE_GLOBAL_ASSETS_URL . 'css/ee-joyride-styles.css', array('joyride-css'), EVENT_ESPRESSO_VERSION );
-			wp_register_script('joyride-modernizr', EE_THIRD_PARTY_URL . 'joyride/modernizr.mq.js', array(), '2.1', TRUE );
+			wp_register_style('joyride-css', EE_THIRD_PARTY_URL.'joyride/joyride-2.1.css', array(), '2.1');
+			wp_register_style('ee-joyride-css', EE_GLOBAL_ASSETS_URL.'css/ee-joyride-styles.css', array('joyride-css'), EVENT_ESPRESSO_VERSION);
+			wp_register_script('joyride-modernizr', EE_THIRD_PARTY_URL.'joyride/modernizr.mq.js', array(), '2.1', TRUE);
 			//joyride JS
-			wp_register_script('jquery-joyride', EE_THIRD_PARTY_URL . 'joyride/jquery.joyride-2.1.js', array('jquery-cookie', 'joyride-modernizr'), '2.1', TRUE );
+			wp_register_script('jquery-joyride', EE_THIRD_PARTY_URL.'joyride/jquery.joyride-2.1.js', array('jquery-cookie', 'joyride-modernizr'), '2.1', TRUE);
 			// wanna go for a joyride?
 			wp_enqueue_style('ee-joyride-css');
 			wp_enqueue_script('jquery-joyride');
 		}
 		//qtip is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again via: add_filter('FHEE_load_qtips', '__return_true' );
-		if ( apply_filters( 'FHEE_load_qtip', FALSE ) ) {
+		if (apply_filters('FHEE_load_qtip', FALSE)) {
 			EE_Registry::instance()->load_helper('Qtip_Loader');
 			EEH_Qtip_Loader::instance()->register_and_enqueue();
 		}
 		//accounting.js library
 		// @link http://josscrowcroft.github.io/accounting.js/
-		if ( apply_filters( 'FHEE_load_accounting_js', FALSE ) ) {
-			wp_register_script( 'ee-accounting', EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_register_script( 'ee-accounting-core', EE_THIRD_PARTY_URL . 'accounting/accounting.js', array('underscore'), '0.3.2', TRUE );
-			wp_enqueue_script( 'ee-accounting' );
+		if (apply_filters('FHEE_load_accounting_js', FALSE)) {
+			wp_register_script('ee-accounting', EE_GLOBAL_ASSETS_URL.'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_register_script('ee-accounting-core', EE_THIRD_PARTY_URL.'accounting/accounting.js', array('underscore'), '0.3.2', TRUE);
+			wp_enqueue_script('ee-accounting');
 			// array of settings to get converted to JSON array via wp_localize_script
 			$currency_config = array(
 				'currency' => array(
@@ -615,11 +615,11 @@ 
 	public function get_persistent_admin_notices() {
 		// http://www.example.com/wp-admin/admin.php?page=espresso_general_settings&action=critical_pages&critical_pages_nonce=2831ce0f30
 		$args = array(
-			'page' => EE_Registry::instance()->REQ->is_set( 'page' ) ? EE_Registry::instance()->REQ->get( 'page' ) : '',
-			'action' => EE_Registry::instance()->REQ->is_set( 'action' ) ? EE_Registry::instance()->REQ->get( 'action' ) : '',
+			'page' => EE_Registry::instance()->REQ->is_set('page') ? EE_Registry::instance()->REQ->get('page') : '',
+			'action' => EE_Registry::instance()->REQ->is_set('action') ? EE_Registry::instance()->REQ->get('action') : '',
 		);
-		$return_url = EE_Admin_Page::add_query_args_and_nonce( $args, EE_ADMIN_URL );
-		echo EE_Error::get_persistent_admin_notices( $return_url );
+		$return_url = EE_Admin_Page::add_query_args_and_nonce($args, EE_ADMIN_URL);
+		echo EE_Error::get_persistent_admin_notices($return_url);
 	}
 
 
@@ -640,26 +640,26 @@ 
 	 * @param $elements
 	 * @return array
 	 */
-	public function dashboard_glance_items( $elements ) {
+	public function dashboard_glance_items($elements) {
 		$events = EEM_Event::instance()->count();
-		$items['events']['url'] = EE_Admin_Page::add_query_args_and_nonce( array('page' => 'espresso_events'), admin_url('admin.php') );
-		$items['events']['text'] = sprintf( _n( '%s Event', '%s Events', $events ), number_format_i18n( $events ) );
+		$items['events']['url'] = EE_Admin_Page::add_query_args_and_nonce(array('page' => 'espresso_events'), admin_url('admin.php'));
+		$items['events']['text'] = sprintf(_n('%s Event', '%s Events', $events), number_format_i18n($events));
 		$items['events']['title'] = __('Click to view all Events', 'event_espresso');
 		$registrations = EEM_Registration::instance()->count(
 			array(
 				array(
-					'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete )
+					'STS_ID' => array('!=', EEM_Registration::status_id_incomplete)
 				)
 			)
 		);
-		$items['registrations']['url'] = EE_Admin_Page::add_query_args_and_nonce( array('page' => 'espresso_registrations' ), admin_url('admin.php') );
-		$items['registrations']['text'] = sprintf( _n( '%s Registration', '%s Registrations', $registrations ), number_format_i18n($registrations) );
+		$items['registrations']['url'] = EE_Admin_Page::add_query_args_and_nonce(array('page' => 'espresso_registrations'), admin_url('admin.php'));
+		$items['registrations']['text'] = sprintf(_n('%s Registration', '%s Registrations', $registrations), number_format_i18n($registrations));
 		$items['registrations']['title'] = __('Click to view all registrations', 'event_espresso');
 
-		$items = apply_filters( 'FHEE__EE_Admin__dashboard_glance_items__items', $items );
+		$items = apply_filters('FHEE__EE_Admin__dashboard_glance_items__items', $items);
 
-		foreach ( $items as $type => $item_properties ) {
-			$elements[] = sprintf( '<a class="ee-dashboard-link-' . $type . '" href="%s" title="%s">%s</a>', $item_properties['url'], $item_properties['title'], $item_properties['text'] );
+		foreach ($items as $type => $item_properties) {
+			$elements[] = sprintf('<a class="ee-dashboard-link-'.$type.'" href="%s" title="%s">%s</a>', $item_properties['url'], $item_properties['title'], $item_properties['text']);
 		}
 		return $elements;
 	}
@@ -678,63 +678,63 @@ 
 	 * @param $post
 	 * @return    void
 	 */
-	public static function parse_post_content_on_save( $post_ID, $post ) {
+	public static function parse_post_content_on_save($post_ID, $post) {
 		// default post types
-		$post_types = array( 'post' => 0, 'page' => 1 );
+		$post_types = array('post' => 0, 'page' => 1);
 		// add CPTs
 		$CPTs = EE_Register_CPTs::get_CPTs();
-		$post_types = array_merge( $post_types, $CPTs );
+		$post_types = array_merge($post_types, $CPTs);
 		// for default or CPT posts...
-		if ( isset( $post_types[ $post->post_type ] )) {
+		if (isset($post_types[$post->post_type])) {
 			// post on frontpage ?
 			$page_for_posts = EE_Config::get_page_for_posts();
 			$maybe_remove_from_posts = array();
 			// critical page shortcodes that we do NOT want added to the Posts page (blog)
 			$critical_shortcodes = EE_Registry::instance()->CFG->core->get_critical_pages_shortcodes_array();
 			// array of shortcodes indexed by post name
-			EE_Registry::instance()->CFG->core->post_shortcodes = isset( EE_Registry::instance()->CFG->core->post_shortcodes ) ? EE_Registry::instance()->CFG->core->post_shortcodes : array();
+			EE_Registry::instance()->CFG->core->post_shortcodes = isset(EE_Registry::instance()->CFG->core->post_shortcodes) ? EE_Registry::instance()->CFG->core->post_shortcodes : array();
 			// whether to proceed with update, if an entry already exists for this post, then we want to update
-			$update_post_shortcodes = isset( EE_Registry::instance()->CFG->core->post_shortcodes[ $post->post_name ] ) ? true : false;
+			$update_post_shortcodes = isset(EE_Registry::instance()->CFG->core->post_shortcodes[$post->post_name]) ? true : false;
 			// empty both arrays
-			EE_Registry::instance()->CFG->core->post_shortcodes[ $post->post_name ] = array();
+			EE_Registry::instance()->CFG->core->post_shortcodes[$post->post_name] = array();
 			// check that posts page is already being tracked
-			if ( ! isset( EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ] ) ) {
+			if ( ! isset(EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts])) {
 				// if not, then ensure that it is properly added
-				EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ] = array();
+				EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts] = array();
 			}
 			// loop thru shortcodes
-			foreach ( EE_Registry::instance()->shortcodes as $EES_Shortcode => $shortcode_dir ) {
+			foreach (EE_Registry::instance()->shortcodes as $EES_Shortcode => $shortcode_dir) {
 				// convert to UPPERCASE to get actual shortcode
-				$EES_Shortcode = strtoupper( $EES_Shortcode );
+				$EES_Shortcode = strtoupper($EES_Shortcode);
 				// is the shortcode in the post_content ?
-				if ( strpos( $post->post_content, $EES_Shortcode ) !== FALSE ) {
+				if (strpos($post->post_content, $EES_Shortcode) !== FALSE) {
 					// map shortcode to post names and post IDs
-					EE_Registry::instance()->CFG->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] = $post_ID;
+					EE_Registry::instance()->CFG->core->post_shortcodes[$post->post_name][$EES_Shortcode] = $post_ID;
 					// if the shortcode is NOT one of the critical page shortcodes like ESPRESSO_TXN_PAGE
-					if ( ! in_array( $EES_Shortcode, $critical_shortcodes )) {
+					if ( ! in_array($EES_Shortcode, $critical_shortcodes)) {
 						// add shortcode to "Posts page" tracking
-						EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] = $post_ID;
+						EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts][$EES_Shortcode] = $post_ID;
 					}
 					$update_post_shortcodes = TRUE;
-					unset( $maybe_remove_from_posts[ $EES_Shortcode ] );
+					unset($maybe_remove_from_posts[$EES_Shortcode]);
 				} else {
-					$maybe_remove_from_posts[ $EES_Shortcode ] = $post_ID;
+					$maybe_remove_from_posts[$EES_Shortcode] = $post_ID;
 				}
 			}
-			if ( $update_post_shortcodes ) {
+			if ($update_post_shortcodes) {
 				// remove shortcodes from $maybe_remove_from_posts that are still being used
-				foreach ( EE_Registry::instance()->CFG->core->post_shortcodes as $post_name => $shortcodes ) {
-					if ( $post_name == $page_for_posts ) {
+				foreach (EE_Registry::instance()->CFG->core->post_shortcodes as $post_name => $shortcodes) {
+					if ($post_name == $page_for_posts) {
 						continue;
 					}
 					// compute difference between active post_shortcodes array and $maybe_remove_from_posts array
-					$maybe_remove_from_posts = array_diff_key( $maybe_remove_from_posts, $shortcodes );
+					$maybe_remove_from_posts = array_diff_key($maybe_remove_from_posts, $shortcodes);
 				}
 				// now unset unused shortcodes from the $page_for_posts post_shortcodes
-				foreach ( $maybe_remove_from_posts as $shortcode => $post_ID ) {
-					unset( EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ][ $shortcode ] );
+				foreach ($maybe_remove_from_posts as $shortcode => $post_ID) {
+					unset(EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts][$shortcode]);
 				}
-				EE_Registry::instance()->CFG->update_post_shortcodes( $page_for_posts );
+				EE_Registry::instance()->CFG->update_post_shortcodes($page_for_posts);
 			}
 		}
 	}
@@ -752,32 +752,32 @@ 
 	 * @throws EE_Error
 	 * @return    string
 	 */
-	public function check_for_invalid_datetime_formats( $value, $option ) {
-		EE_Registry::instance()->load_helper( 'DTT_Helper' );
+	public function check_for_invalid_datetime_formats($value, $option) {
+		EE_Registry::instance()->load_helper('DTT_Helper');
 		// check for date_format or time_format
-		switch ( $option ) {
+		switch ($option) {
 			case 'date_format' :
-				$date_time_format = $value . ' ' . get_option('time_format');
+				$date_time_format = $value.' '.get_option('time_format');
 				break;
 			case 'time_format' :
-				$date_time_format = get_option('date_format') . ' ' . $value;
+				$date_time_format = get_option('date_format').' '.$value;
 				break;
 			default :
 				$date_time_format = FALSE;
 		}
 		// do we have a date_time format to check ?
-		if ( $date_time_format ) {
-			$error_msg = EEH_DTT_Helper::validate_format_string( $date_time_format );
+		if ($date_time_format) {
+			$error_msg = EEH_DTT_Helper::validate_format_string($date_time_format);
 
-			if ( is_array( $error_msg ) ) {
-				$msg = '<p>' . sprintf( __( 'The following date time "%s" ( %s ) is difficult to be properly parsed by PHP for the following reasons:', 'event_espresso' ), date( $date_time_format ) , $date_time_format  ) . '</p><p><ul>';
+			if (is_array($error_msg)) {
+				$msg = '<p>'.sprintf(__('The following date time "%s" ( %s ) is difficult to be properly parsed by PHP for the following reasons:', 'event_espresso'), date($date_time_format), $date_time_format).'</p><p><ul>';
 
 
-				foreach ( $error_msg as $error ) {
-					$msg .= '<li>' . $error . '</li>';
+				foreach ($error_msg as $error) {
+					$msg .= '<li>'.$error.'</li>';
 				}
 
-				$msg .= '</ul></p><p>' . sprintf( __( '%sPlease note that your date and time formats have been reset to "F j, Y" and "g:i a" respectively.%s', 'event_espresso' ), '<span style="color:#D54E21;">', '</span>' ) . '</p>';
+				$msg .= '</ul></p><p>'.sprintf(__('%sPlease note that your date and time formats have been reset to "F j, Y" and "g:i a" respectively.%s', 'event_espresso'), '<span style="color:#D54E21;">', '</span>').'</p>';
 
 				// trigger WP settings error
 				add_settings_error(
@@ -787,7 +787,7 @@ 
 				);
 
 				// set format to something valid
-				switch ( $option ) {
+				switch ($option) {
 					case 'date_format' :
 						$value = 'F j, Y';
 						break;
@@ -813,14 +813,14 @@ 
 	 * @param 	$value
 	 * @return 	void
 	 */
-	public function reset_page_for_posts_on_change( $option, $old_value, $value ) {
-		if ( $option == 'page_for_posts' ) {
+	public function reset_page_for_posts_on_change($option, $old_value, $value) {
+		if ($option == 'page_for_posts') {
 			global $wpdb;
-			$SQL = 'SELECT post_name from ' . $wpdb->posts . ' WHERE post_type="posts" OR post_type="page" AND post_status="publish" AND ID=%s';
-			$old_page_for_posts = $old_value ? $wpdb->get_var( $wpdb->prepare( $SQL, $old_value )) : 'posts';
-			$new_page_for_posts = $value ? $wpdb->get_var( $wpdb->prepare( $SQL, $value )) : 'posts';
-			EE_Registry::instance()->CFG->core->post_shortcodes[ $new_page_for_posts ] = EE_Registry::instance()->CFG->core->post_shortcodes[ $old_page_for_posts ];
-			EE_Registry::instance()->CFG->update_post_shortcodes( $new_page_for_posts );
+			$SQL = 'SELECT post_name from '.$wpdb->posts.' WHERE post_type="posts" OR post_type="page" AND post_status="publish" AND ID=%s';
+			$old_page_for_posts = $old_value ? $wpdb->get_var($wpdb->prepare($SQL, $old_value)) : 'posts';
+			$new_page_for_posts = $value ? $wpdb->get_var($wpdb->prepare($SQL, $value)) : 'posts';
+			EE_Registry::instance()->CFG->core->post_shortcodes[$new_page_for_posts] = EE_Registry::instance()->CFG->core->post_shortcodes[$old_page_for_posts];
+			EE_Registry::instance()->CFG->update_post_shortcodes($new_page_for_posts);
 		}
 	}
 
@@ -833,8 +833,8 @@ 
 	 * @param $content
 	 * @return    string
 	 */
-	public function its_eSpresso( $content ) {
-		return str_replace( '[EXPRESSO_', '[ESPRESSO_', $content );
+	public function its_eSpresso($content) {
+		return str_replace('[EXPRESSO_', '[ESPRESSO_', $content);
 	}
 
 
@@ -847,9 +847,9 @@ 
 	 */
 	public function espresso_admin_footer() {
 		return sprintf(
-			__( 'Event Registration and Ticketing Powered by %sEvent Registration Powered by Event Espresso%s', 'event_espresso' ),
+			__('Event Registration and Ticketing Powered by %sEvent Registration Powered by Event Espresso%s', 'event_espresso'),
 			'<a href="https://eventespresso.com/" title="',
-			'">' . EVENT_ESPRESSO_POWERED_BY . '</a>'
+			'">'.EVENT_ESPRESSO_POWERED_BY.'</a>'
 		);
 	}
 
@@ -869,11 +869,11 @@ 
 	 * @param array $config
 	 * @return void
 	 */
-	public static function register_ee_admin_page( $page_basename, $page_path, $config = array() ) {
-		EE_Error::doing_it_wrong( __METHOD__, sprintf( __('Usage is deprecated.  Use EE_Register_Admin_Page::register() for registering the %s admin page.', 'event_espresso'), $page_basename), '4.3' );
-		if ( class_exists( 'EE_Register_Admin_Page' ) )
+	public static function register_ee_admin_page($page_basename, $page_path, $config = array()) {
+		EE_Error::doing_it_wrong(__METHOD__, sprintf(__('Usage is deprecated.  Use EE_Register_Admin_Page::register() for registering the %s admin page.', 'event_espresso'), $page_basename), '4.3');
+		if (class_exists('EE_Register_Admin_Page'))
 			$config['page_path'] = $page_path;
-			EE_Register_Admin_Page::register( $page_basename, $config );
+			EE_Register_Admin_Page::register($page_basename, $config);
 	}
 
 

public/Espresso_Arabica_2014/functions.php

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 /**
- * Espresso Template functions
- *
- * @ package		Event Espresso
- * @ author		Seth Shoultes
- * @ copyright	(c) 2008-2014 Event Espresso  All Rights Reserved.
- * @ license		http://venueespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link			http://www.eventespresso.com
- * @ version		4+
- */
+				 * Espresso Template functions
+				 *
+				 * @ package		Event Espresso
+				 * @ author		Seth Shoultes
+				 * @ copyright	(c) 2008-2014 Event Espresso  All Rights Reserved.
+				 * @ license		http://venueespresso.com/support/terms-conditions/   * see Plugin Licensing *
+				 * @ link			http://www.eventespresso.com
+				 * @ version		4+
+				 */
 define( 'EE_THEME_FUNCTIONS_LOADED', TRUE );
  
 /**

Spacing +7 added lines, -7 removed lines

@@ -9,9 +9,9 @@ 
  * @ link			http://www.eventespresso.com
  * @ version		4+
  */
-define( 'EE_THEME_FUNCTIONS_LOADED', TRUE );
+define('EE_THEME_FUNCTIONS_LOADED', TRUE);
 
-if ( ! function_exists( 'espresso_pagination' ) ) {
+if ( ! function_exists('espresso_pagination')) {
 	/**
 	 *    espresso_pagination
 	 *
@@ -23,21 +23,21 @@ 
 		$big = 999999999; // need an unlikely integer
 		$pagination = paginate_links(
 			array(
-				'base'         => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+				'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'    => __( '‹ PREV', 'event_espresso' ),
-				'next_text'    => __( 'NEXT ›', 'event_espresso' ),
+				'prev_text'    => __('‹ PREV', 'event_espresso'),
+				'next_text'    => __('NEXT ›', 'event_espresso'),
 				'type'         => 'plain',
 				'add_args'     => false,
 				'add_fragment' => ''
 			)
 		);
-		echo ! empty( $pagination ) ? '<div class="ee-pagination-dv clear">' . $pagination . '</div>' : '';
+		echo ! empty($pagination) ? '<div class="ee-pagination-dv clear">'.$pagination.'</div>' : '';
 	}
 }
\ No newline at end of file

core/db_models/EEM_Base.model.php

Indentation +27 added lines, -27 removed lines

@@ -1,28 +1,28 @@ 
 <?php
 /**
- *
- * Class EEM_Base
- *
- * Multi-table model. Especially handles joins when querying.
- * An important note about values dealt with in models and model objects:
- * values used by models exist in basically 3 different domains, which the EE_Model_Fields help convert between:
- * 1. Client-code values (eg, controller code may refer to a date as "March 21, 2013")
- * 2. Model object values (eg, after the model object has called set() on the value and saves it onto the model object, it may become a unix timestamp, eg 12312412412)
- * 3. Database values (eg, we may later decide to store dates as mysql dates, in which case they'd be stored as '2013-03-21 00:00:00')
- * Sometimes these values are the same, but often they are not. When your client code is using a model's functions, you need to be aware
- * which domain your data exists in. If it is client-code values (ie, it hasn't had a EE_Model_Field call prepare_for_set on it) then use the
- * model functions as normal. However, if you are calling the model functions with values from the model object domain (ie, the code your writing is
- * probably within a model object, and all the values you're dealing with have had an EE_Model_Field call prepare_for_set on them), then you'll want
- * to set $values_already_prepared_by_model_object to FALSE within the argument-list of the functions you call (in order to avoid re-processing those values).
- * If your values are already in the database values domain, you'll either way to convert them into the model object domain by creating model objects
- * from those raw db values (ie,using EEM_Base::_create_objects), or just use $wpdb directly.
- *
- * @package 			Event Espresso
- * @subpackage 	core
- * @author 				Michael Nelson
- * @since 				EE4
- *
- */
+	 *
+	 * Class EEM_Base
+	 *
+	 * Multi-table model. Especially handles joins when querying.
+	 * An important note about values dealt with in models and model objects:
+	 * values used by models exist in basically 3 different domains, which the EE_Model_Fields help convert between:
+	 * 1. Client-code values (eg, controller code may refer to a date as "March 21, 2013")
+	 * 2. Model object values (eg, after the model object has called set() on the value and saves it onto the model object, it may become a unix timestamp, eg 12312412412)
+	 * 3. Database values (eg, we may later decide to store dates as mysql dates, in which case they'd be stored as '2013-03-21 00:00:00')
+	 * Sometimes these values are the same, but often they are not. When your client code is using a model's functions, you need to be aware
+	 * which domain your data exists in. If it is client-code values (ie, it hasn't had a EE_Model_Field call prepare_for_set on it) then use the
+	 * model functions as normal. However, if you are calling the model functions with values from the model object domain (ie, the code your writing is
+	 * probably within a model object, and all the values you're dealing with have had an EE_Model_Field call prepare_for_set on them), then you'll want
+	 * to set $values_already_prepared_by_model_object to FALSE within the argument-list of the functions you call (in order to avoid re-processing those values).
+	 * If your values are already in the database values domain, you'll either way to convert them into the model object domain by creating model objects
+	 * from those raw db values (ie,using EEM_Base::_create_objects), or just use $wpdb directly.
+	 *
+	 * @package 			Event Espresso
+	 * @subpackage 	core
+	 * @author 				Michael Nelson
+	 * @since 				EE4
+	 *
+	 */
 abstract class EEM_Base extends EE_Base{
 
 	//admin posty
@@ -578,10 +578,10 @@ 
 	 	$stati = EEM_Status::instance()->get_all(array(array('STS_type' => $status_type) ) );
 	 	$status_array = array();
 	 	foreach ( $stati as $status ) {
-            $status_array[ $status->ID() ] = $status->get('STS_code');
-        }
-        return $translated ? EEM_Status::instance()->localized_status($status_array, FALSE, 'sentence') : $status_array;
-    }
+			$status_array[ $status->ID() ] = $status->get('STS_code');
+		}
+		return $translated ? EEM_Status::instance()->localized_status($status_array, FALSE, 'sentence') : $status_array;
+	}
 
 
 

admin_pages/registrations/Registrations_Admin_Page.core.php

Indentation +64 added lines, -64 removed lines

@@ -136,9 +136,9 @@ 
 
 	/**
 	 * 		grab url requests and route them
-	*		@access private
-	*		@return void
-	*/
+	 *		@access private
+	 *		@return void
+	 */
 	public function _set_page_routes() {
 
 		$this->_get_registration_status_array();
@@ -404,7 +404,7 @@ 
 						'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',
@@ -418,7 +418,7 @@ 
 					'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(
+				'help_tabs' => array(
 					'registrations_details_help_tab' => array(
 						'title' => __('Registration Details', 'event_espresso'),
 						'filename' => 'registrations_details'
@@ -482,7 +482,7 @@ 
 					'order' => 20
 					),
 				'list_table' => 'EE_Attendee_Contact_List_Table',
-                'help_tabs' => array(
+				'help_tabs' => array(
 					'registrations_contact_list_help_tab' => array(
 						'title' => __('Registrations Contact List', 'event_espresso'),
 						'filename' => 'registrations_contact_list'
@@ -499,7 +499,7 @@ 
 						'title' => __('Contact List Other', 'event_espresso'),
 						'filename' => 'registrations_contact_list_other'
 					)
-                ),
+				),
 				'help_tour' => array( 'Contact_List_Help_Tour' ),
 				'metaboxes' => array(),
 				'require_nonce' => FALSE
@@ -533,9 +533,9 @@ 
 
 	/**
 	 * 		get list of registration statuses
-	*		@access private
-	*		@return void
-	*/
+	 *		@access private
+	 *		@return void
+	 */
 	private function _get_registration_status_array() {
 		self::$_reg_status = EEM_Registration::reg_status_array( array(), TRUE);
 	}
@@ -842,7 +842,7 @@ 
 			return TRUE;
 		}
 
-	    $REG = EEM_Registration::instance();
+		$REG = EEM_Registration::instance();
 
 		$REG_ID = ( ! empty( $this->_req_data['_REG_ID'] )) ? absint( $this->_req_data['_REG_ID'] ) : FALSE;
 
@@ -1065,9 +1065,9 @@ 
 
 	/**
 	 * 		generates HTML for the View Registration Details Admin page
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _registration_details() {
 
 		$this->_template_args = array();
@@ -1145,9 +1145,9 @@ 
 
 	/**
 	 * 		_set_approve_or_decline_reg_status_buttons
-	*		@access protected
-	*		@return string
-	*/
+	 *		@access protected
+	 *		@return string
+	 */
 	public function set_reg_status_buttons_metabox() {
 
 		//is registration for free event OR for a completed transaction? This will determine whether the set to pending option is shown.
@@ -1337,10 +1337,10 @@ 
 
 	/**
 	 * 		approve_registration
-	*		@access protected
-	*		@param bool $notify whether or not to notify the registrant about their approval.
-	*		@return void
-	*/
+	 *		@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 );
 	}
@@ -1350,10 +1350,10 @@ 
 
 	/**
 	 * 		decline_registration
-	*		@access protected
-	*		@param bool $notify whether or not to notify the registrant about their approval.
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param bool $notify whether or not to notify the registrant about their approval.
+	 *		@return void
+	 */
 	protected function decline_registration( $notify = false ) {
 		$this->_reg_status_change_return( EEM_Registration::status_id_declined, $notify );
 	}
@@ -1363,10 +1363,10 @@ 
 
 	/**
 	 * 		cancel_registration
-	*		@access protected
-	*		@param bool $notify whether or not to notify the registrant about their approval.
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param bool $notify whether or not to notify the registrant about their approval.
+	 *		@return void
+	 */
 	protected function cancel_registration( $notify = false ) {
 		$this->_reg_status_change_return( EEM_Registration::status_id_cancelled, $notify );
 	}
@@ -1377,10 +1377,10 @@ 
 
 	/**
 	 * 		not_approve_registration
-	*		@access protected
-	*		@param bool $notify whether or not to notify the registrant about their approval.
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param bool $notify whether or not to notify the registrant about their approval.
+	 *		@return void
+	 */
 	protected function not_approve_registration( $notify = false ) {
 		$this->_reg_status_change_return( EEM_Registration::status_id_not_approved, $notify );
 	}
@@ -1389,10 +1389,10 @@ 
 
 	/**
 	 * 		decline_registration
-	*		@access protected
-	*		@param bool $notify whether or not to notify the registrant about their approval.
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param bool $notify whether or not to notify the registrant about their approval.
+	 *		@return void
+	 */
 	protected function pending_registration( $notify = false ) {
 		$this->_reg_status_change_return( EEM_Registration::status_id_pending_payment, $notify );
 	}
@@ -1402,9 +1402,9 @@ 
 
 	/**
 	 * 		generates HTML for the Registration main meta box
-	*		@access public
-	*		@return void
-	*/
+	 *		@access public
+	 *		@return void
+	 */
 	public function _reg_details_meta_box() {
 		EEH_Autoloader::register_line_item_display_autoloaders();
 		EEH_Autoloader::register_line_item_filter_autoloaders();
@@ -1487,7 +1487,7 @@ 
 	 *
 	 * @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 ) ) {
@@ -1689,12 +1689,12 @@ 
 
 	/**
 	 * 		generates HTML for the Registration main meta box
-	*		@access public
-	*		@return void
-	*/
+	 *		@access public
+	 *		@return void
+	 */
 	public function _reg_attendees_meta_box() {
 
-	    $REG = EEM_Registration::instance();
+		$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(
@@ -1747,9 +1747,9 @@ 
 
 	/**
 	 * 		generates HTML for the Edit Registration side meta box
-	*		@access public
-	*		@return void
-	*/
+	 *		@access public
+	 *		@return void
+	 */
 	public function _reg_registrant_side_meta_box() {
 
 		/*@var $attendee EE_Attendee */
@@ -2095,9 +2095,9 @@ 
 
 	/**
 	 * 		set_reg_event
-	*		@access private
-	*		@return boolean
-	*/
+	 *		@access private
+	 *		@return boolean
+	 */
 	private function _set_reg_event() {
 		if ( is_object( $this->_reg_event )) {
 			return TRUE;
@@ -2204,9 +2204,9 @@ 
 
 	/**
 	 * 		generates HTML for the Attendee Contact List
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _attendee_contact_list_table() {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 		$this->_search_btn_label = __('Contacts', 'event_espresso');
@@ -2220,9 +2220,9 @@ 
 	/**
 	 * 		get_attendees
 	 * 		@param bool $count whether to return count or data.
-	*		@access public
-	*		@return array
-	*/
+	 *		@access public
+	 *		@return array
+	 */
 	public function get_attendees( $per_page, $count = FALSE, $trash = FALSE ) {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
@@ -2558,9 +2558,9 @@ 
 
 	/**
 	 * 		_attendee_details
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	public function attendee_registrations_meta_box( $post ) {
 
 		$this->_template_args['attendee'] = $this->_cpt_model_obj;
@@ -2593,10 +2593,10 @@ 
 
 	/**
 	 * 		_trash_or_restore_attendee
-	*		@param boolean 		$trash - whether to move item to trash (TRUE) or restore it (FALSE)
-	*		@access protected
-	*		@return void
-	*/
+	 *		@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__, '' );

Spacing +545 added lines, -545 removed lines

@@ -56,26 +56,26 @@ 
 	 * @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 __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' ) {
+		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
+				! 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, '/' );
+				setcookie('ee_registration_added', 0, time() - WEEK_IN_SECONDS, '/');
 				// and update the global
-				$_COOKIE[ 'ee_registration_added' ] = 0;
+				$_COOKIE['ee_registration_added'] = 0;
 			}
 		}
 	}
@@ -109,16 +109,16 @@ 
 				'trash' => 'post.php'
 			);
 
-		add_action('edit_form_after_title', array($this, 'after_title_form_fields'), 10 );
+		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 );
+		add_filter('get_comment_link', array($this, 'clear_comment_link'), 10, 3);
 	}
 
 
-	public function clear_comment_link( $link, $comment, $args ) {
+	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' )
+		$post_type = get_post_type($comment->comment_post_ID);
+		if ($post_type == 'espresso_attendees')
 			return '#commentsdiv';
 		return $link;
 	}
@@ -126,7 +126,7 @@ 
 
 	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' ));
+		add_action('wp_ajax_toggle_checkin_status', array($this, 'toggle_checkin_status'));
 	}
 
 
@@ -141,8 +141,8 @@ 
 				'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' ),
-				'contact_list_report' => __( 'Contact List Report', 'event_espresso' ),
+				'report_all' => __('All Registrations CSV Report', 'event_espresso'),
+				'contact_list_report' => __('Contact List Report', 'event_espresso'),
 				'contact_list_export'=>  __("Export Data", "event_espresso"),
 			),
 			'publishbox' => array(
@@ -170,9 +170,9 @@ 
 
 		$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;
+		$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(
 
@@ -205,7 +205,7 @@ 
 
 				'restore_registrations' => array(
 					'func' => '_trash_or_restore_registrations',
-					'args' => array( 'trash' => FALSE ),
+					'args' => array('trash' => FALSE),
 					'noheader' => TRUE,
 					'capability' => 'ee_delete_registrations'
 					),
@@ -437,7 +437,7 @@ 
 						'filename' => 'registrations_overview_other'
 					)
                 ),
-				'help_tour' => array( 'Registration_Overview_Help_Tour' ),
+				'help_tour' => array('Registration_Overview_Help_Tour'),
 				'qtips' => array('Registration_List_Table_Tips'),
 				'list_table' => 'EE_Registrations_List_Table',
 				'require_nonce' => FALSE
@@ -447,7 +447,7 @@ 
 				'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,
+					'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(
@@ -468,8 +468,8 @@ 
 						'filename' => 'registrations_details_registrant_details'
 					)
 				),
-				'help_tour' => array( 'Registration_Details_Help_Tour' ),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_registration_details_metaboxes' ) ),
+				'help_tour' => array('Registration_Details_Help_Tour'),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_registration_details_metaboxes')),
 				'require_nonce' => FALSE
 			),
 
@@ -493,7 +493,7 @@ 
 					'order' => 15,
 					'persistent' => FALSE
 				),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box', 'attendee_editor_metaboxes' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box', 'attendee_editor_metaboxes')),
 				'require_nonce' => FALSE
 			),
 
@@ -502,7 +502,7 @@ 
 					'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
+					'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
@@ -532,7 +532,7 @@ 
 						'filename' => 'registrations_contact_list_other'
 					)
                 ),
-				'help_tour' => array( 'Contact_List_Help_Tour' ),
+				'help_tour' => array('Contact_List_Help_Tour'),
 				'metaboxes' => array(),
 				'require_nonce' => FALSE
 			),
@@ -551,7 +551,7 @@ 
 	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' );
+		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() {}
@@ -569,7 +569,7 @@ 
 	*		@return void
 	*/
 	private function _get_registration_status_array() {
-		self::$_reg_status = EEM_Registration::reg_status_array( array(), TRUE);
+		self::$_reg_status = EEM_Registration::reg_status_array(array(), TRUE);
 	}
 
 
@@ -592,11 +592,11 @@ 
 	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_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_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');
 	}
 
@@ -605,9 +605,9 @@ 
 	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') )
+			'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_localize_script('espresso_reg', 'ATTENDEE_DETAILS', $attendee_details_translations);
 		wp_enqueue_script('jquery-validate');
 	}
 
@@ -616,8 +616,8 @@ 
 		//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 );
+		$this->_get_reg_custom_questions_form($this->_registration->ID());
+		$this->_reg_custom_questions_form->wp_enqueue_scripts(true);
 	}
 
 
@@ -627,7 +627,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'), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_att', REG_ASSETS_URL.'espresso_attendees_admin.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_att');
 	}
 
@@ -636,9 +636,9 @@ 
 
 
 	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_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' );
+		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();
@@ -677,23 +677,23 @@ 
 
 		/** 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' ) ) {
+		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' ) ) {
+		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' ) ) {
+		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' ) ) {
+		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' ) ) {
+		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');
 		}
 
@@ -702,29 +702,29 @@ 
 				'slug' => 'all',
 				'label' => __('View All Registrations', 'event_espresso'),
 				'count' => 0,
-				'bulk_action' => array_merge( $def_reg_status_actions, array(
+				'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(
+				'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' ) ) ),
+				'label' => sprintf(__('Today - %s', 'event_espresso'), date('M d, Y', current_time('timestamp'))),
 				'count' => 0,
-				'bulk_action' => array_merge( $def_reg_status_actions,  array(
+				'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' ) ) {
+		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'),
@@ -760,7 +760,7 @@ 
 				)
 			);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_contacts', 'espresso_registrations_trash_attendees' ) ) {
+		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'),
@@ -799,42 +799,42 @@ 
 				'desc' => __('View Transaction Invoice', 'event_espresso')
 				),
  			);
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_resend_registration' ) ) {
+		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' => '' );
+			$fc_items['blank'] = array('class' => 'blank', 'desc' => '');
 		}
 
 		$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' )
+				'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' )
+				'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')
 				),
 			'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' )
+				'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' )
+				'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' )
+				'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' )
+				'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 );
+		return array_merge($fc_items, $sc_items);
 	}
 
 
@@ -847,15 +847,15 @@ 
 
 
 	protected function _registrations_overview_list_table() {
-		$EVT_ID = ( ! empty( $this->_req_data['event_id'] )) ? absint( $this->_req_data['event_id'] ) : FALSE;
-		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' );
+		$EVT_ID = ( ! empty($this->_req_data['event_id'])) ? absint($this->_req_data['event_id']) : FALSE;
+		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 );
-			$this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf( __('%s Viewing registrations for the event: %s%s', 'event_espresso'), '<h2>', '<a href="' . EE_Admin_Page::add_query_args_and_nonce( array('action' => 'edit', 'post' => $event->ID() ), EVENTS_ADMIN_URL ) . '">' . $event->get('EVT_name') . '</a>', '</h2>' ) : '';
+			$event = EEM_Event::instance()->get_one_by_ID($EVT_ID);
+			$this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf(__('%s Viewing registrations for the event: %s%s', 'event_espresso'), '<h2>', '<a href="'.EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit', 'post' => $event->ID()), EVENTS_ADMIN_URL).'">'.$event->get('EVT_name').'</a>', '</h2>') : '';
 		}
-		$this->_template_args['after_list_table'] = $this->_display_legend( $this->_registration_legend_items() );
+		$this->_template_args['after_list_table'] = $this->_display_legend($this->_registration_legend_items());
 		$this->display_admin_list_table_page_with_no_sidebar();
 	}
 
@@ -870,19 +870,19 @@ 
 	 */
 	private function _set_registration_object() {
 		//get out if we've already set the object
-		if ( is_object( $this->_registration )) {
+		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;
+		$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 ))
+		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__ );
+			$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;
 		}
@@ -901,25 +901,25 @@ 
 	 * @internal param bool $all whether to ignore all query params and just return ALL registrations (or count if count is set)
 	 * @return mixed (int|array)  int = count || array of registration objects
 	 */
-	public function get_registrations( $per_page = 10, $count = FALSE, $this_month = FALSE, $today = FALSE ) {
-
-		$EVT_ID = ! empty( $this->_req_data['event_id'] ) && $this->_req_data['event_id'] > 0 ? absint( $this->_req_data['event_id'] ) : FALSE;
-		$CAT_ID = ! empty( $this->_req_data['EVT_CAT'] ) && (int) $this->_req_data['EVT_CAT'] > 0? absint( $this->_req_data['EVT_CAT'] ) : FALSE;
-		$reg_status = ! empty( $this->_req_data['_reg_status'] ) ? sanitize_text_field( $this->_req_data['_reg_status'] ) : FALSE;
-		$month_range = ! empty( $this->_req_data['month_range'] ) ? sanitize_text_field( $this->_req_data['month_range'] ) : FALSE;//should be like 2013-april
-		$today_a = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'today' ? TRUE : FALSE;
-		$this_month_a = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'month' ? TRUE  : FALSE;
+	public function get_registrations($per_page = 10, $count = FALSE, $this_month = FALSE, $today = FALSE) {
+
+		$EVT_ID = ! empty($this->_req_data['event_id']) && $this->_req_data['event_id'] > 0 ? absint($this->_req_data['event_id']) : FALSE;
+		$CAT_ID = ! empty($this->_req_data['EVT_CAT']) && (int) $this->_req_data['EVT_CAT'] > 0 ? absint($this->_req_data['EVT_CAT']) : FALSE;
+		$reg_status = ! empty($this->_req_data['_reg_status']) ? sanitize_text_field($this->_req_data['_reg_status']) : FALSE;
+		$month_range = ! empty($this->_req_data['month_range']) ? sanitize_text_field($this->_req_data['month_range']) : FALSE; //should be like 2013-april
+		$today_a = ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'today' ? TRUE : FALSE;
+		$this_month_a = ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'month' ? TRUE : FALSE;
 		$start_date = FALSE;
 		$end_date = FALSE;
 		$_where = array();
-		$trash = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'trash' ? TRUE : FALSE;
-		$incomplete = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'incomplete' ? TRUE : FALSE;
+		$trash = ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'trash' ? TRUE : FALSE;
+		$incomplete = ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'incomplete' ? TRUE : FALSE;
 
 		//set orderby
 		$this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : '';
 
 
-		switch ( $this->_req_data['orderby'] ) {
+		switch ($this->_req_data['orderby']) {
 			case '_REG_ID':
 				$orderby = 'REG_ID';
 				break;
@@ -939,26 +939,26 @@ 
 				$orderby = 'REG_date';
 		}
 
-		$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'DESC';
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'DESC';
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = $count  ? NULL : array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = $count ? NULL : array($offset, $per_page);
 
-		if($EVT_ID){
-			$_where['EVT_ID']=$EVT_ID;
+		if ($EVT_ID) {
+			$_where['EVT_ID'] = $EVT_ID;
 		}
-		if($CAT_ID){
+		if ($CAT_ID) {
 			$_where['Event.Term_Taxonomy.term_id'] = $CAT_ID;
 		}
-		if ( $incomplete ) {
+		if ($incomplete) {
 			$_where['STS_ID'] = EEM_Registration::status_id_incomplete;
 		} else if ( ! $trash) {
-			$_where['STS_ID'] = array( '!=', EEM_Registration::status_id_incomplete );
+			$_where['STS_ID'] = array('!=', EEM_Registration::status_id_incomplete);
 		}
-		if($reg_status){
+		if ($reg_status) {
 			$_where['STS_ID'] = $reg_status;
 		}
 
@@ -970,105 +970,105 @@ 
 		$time_start = ' 00:00:00';
 		$time_end = ' 23:59:59';
 
-		if($today_a || $today ){
+		if ($today_a || $today) {
 			$curdate = date('Y-m-d', current_time('timestamp'));
-			$_where['REG_date']= array('BETWEEN',
+			$_where['REG_date'] = array('BETWEEN',
 				array(
-					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $curdate . $time_start, 'Y-m-d H:i:s' ),
-					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $curdate . $time_end, 'Y-m-d H:i:s' ),
+					EEM_Registration::instance()->convert_datetime_for_query('REG_date', $curdate.$time_start, 'Y-m-d H:i:s'),
+					EEM_Registration::instance()->convert_datetime_for_query('REG_date', $curdate.$time_end, 'Y-m-d H:i:s'),
 			));
-		}elseif($this_month_a || $this_month){
+		}elseif ($this_month_a || $this_month) {
 			$this_month_r = date('m', current_time('timestamp'));
-			$days_this_month = date( 't', current_time('timestamp') );
-			$_where['REG_date']= array('BETWEEN',
+			$days_this_month = date('t', current_time('timestamp'));
+			$_where['REG_date'] = array('BETWEEN',
 				array(
-					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $this_year_r . '-' . $this_month_r . '-01' . ' ' . $time_start, 'Y-m-d H:i:s' ),
-					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $this_year_r . '-' . $this_month_r . '-' . $days_this_month . ' ' . $time_end, 'Y-m-d H:i:s' )
+					EEM_Registration::instance()->convert_datetime_for_query('REG_date', $this_year_r.'-'.$this_month_r.'-01'.' '.$time_start, 'Y-m-d H:i:s'),
+					EEM_Registration::instance()->convert_datetime_for_query('REG_date', $this_year_r.'-'.$this_month_r.'-'.$days_this_month.' '.$time_end, 'Y-m-d H:i:s')
 			));
-		}elseif($month_range){
+		}elseif ($month_range) {
 			$pieces = explode(' ', $this->_req_data['month_range'], 3);
-			$month_r = !empty($pieces[0]) ? date('m', strtotime($pieces[0])) : '';
-			$year_r = !empty($pieces[1]) ? $pieces[1] : '';
-			$days_in_month = date('t', strtotime($year_r .  '-' . $month_r . '-' . '01') );
-			$_where['REG_date']= array('BETWEEN',
-				array(  EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $year_r . '-' . $month_r . '-01 00:00:00', 'Y-m-d H:i:s'), EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $year_r . '-' . $month_r . '-' . $days_in_month .  ' 23:59:59', 'Y-m-d H:i:s' ) ) );
-		}elseif($start_date && $end_date){
+			$month_r = ! empty($pieces[0]) ? date('m', strtotime($pieces[0])) : '';
+			$year_r = ! empty($pieces[1]) ? $pieces[1] : '';
+			$days_in_month = date('t', strtotime($year_r.'-'.$month_r.'-'.'01'));
+			$_where['REG_date'] = array('BETWEEN',
+				array(EEM_Registration::instance()->convert_datetime_for_query('REG_date', $year_r.'-'.$month_r.'-01 00:00:00', 'Y-m-d H:i:s'), EEM_Registration::instance()->convert_datetime_for_query('REG_date', $year_r.'-'.$month_r.'-'.$days_in_month.' 23:59:59', 'Y-m-d H:i:s')));
+		}elseif ($start_date && $end_date) {
 			throw new EE_Error("not yet supported");
-		}elseif($start_date){
+		}elseif ($start_date) {
 			throw new EE_Error("not yet supported");
-		}elseif($end_date){
+		}elseif ($end_date) {
 			throw new EE_Error("not yet supported");
 		}
 
-		if ( ! empty( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if ( ! empty($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'Event.EVT_name' => array( 'LIKE', $sstr),
-				'Event.EVT_desc' => array( 'LIKE', $sstr ),
-				'Event.EVT_short_desc' => array( 'LIKE' , $sstr ),
-				'Attendee.ATT_full_name' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_fname' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_lname' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_short_bio' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_email' => array('LIKE', $sstr ),
-				'Attendee.ATT_address' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_address2' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_city' => array( 'LIKE', $sstr ),
-				'REG_final_price' => array( 'LIKE', $sstr ),
-				'REG_code' => array( 'LIKE', $sstr ),
-				'REG_count' => array( 'LIKE' , $sstr ),
-				'REG_group_size' => array( 'LIKE' , $sstr ),
-				'Ticket.TKT_name' => array( 'LIKE', $sstr ),
-				'Ticket.TKT_description' => array( 'LIKE', $sstr ),
-				'Transaction.Payment.PAY_txn_id_chq_nmbr' => array( 'LIKE', $sstr )
+				'Event.EVT_name' => array('LIKE', $sstr),
+				'Event.EVT_desc' => array('LIKE', $sstr),
+				'Event.EVT_short_desc' => array('LIKE', $sstr),
+				'Attendee.ATT_full_name' => array('LIKE', $sstr),
+				'Attendee.ATT_fname' => array('LIKE', $sstr),
+				'Attendee.ATT_lname' => array('LIKE', $sstr),
+				'Attendee.ATT_short_bio' => array('LIKE', $sstr),
+				'Attendee.ATT_email' => array('LIKE', $sstr),
+				'Attendee.ATT_address' => array('LIKE', $sstr),
+				'Attendee.ATT_address2' => array('LIKE', $sstr),
+				'Attendee.ATT_city' => array('LIKE', $sstr),
+				'REG_final_price' => array('LIKE', $sstr),
+				'REG_code' => array('LIKE', $sstr),
+				'REG_count' => array('LIKE', $sstr),
+				'REG_group_size' => array('LIKE', $sstr),
+				'Ticket.TKT_name' => array('LIKE', $sstr),
+				'Ticket.TKT_description' => array('LIKE', $sstr),
+				'Transaction.Payment.PAY_txn_id_chq_nmbr' => array('LIKE', $sstr)
 				);
 		}
 
 		//capability checks
-		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'get_registrations' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'get_registrations')) {
 			$_where['AND'] = array(
 				'Event.EVT_wp_user' => get_current_user_id()
 				);
 		}
 
 
-		if( $count ){
-			if ( $trash ) {
-				return EEM_Registration::instance()->count_deleted( array( $_where ));
-			} else if ( $incomplete ) {
-				return EEM_Registration::instance()->count( array( $_where ));
+		if ($count) {
+			if ($trash) {
+				return EEM_Registration::instance()->count_deleted(array($_where));
+			} else if ($incomplete) {
+				return EEM_Registration::instance()->count(array($_where));
 			} else {
-				return EEM_Registration::instance()->count( array( $_where, 'default_where_conditions' => 'this_model_only' ));
+				return EEM_Registration::instance()->count(array($_where, 'default_where_conditions' => 'this_model_only'));
 			}
 		} else {
 			//make sure we remove default where conditions cause all registrations matching query are returned
-			$query_params = array( $_where, 'order_by' => array( $orderby => $sort ), 'default_where_conditions' => 'this_model_only' );
-			if ( $per_page !== -1 ) {
+			$query_params = array($_where, 'order_by' => array($orderby => $sort), 'default_where_conditions' => 'this_model_only');
+			if ($per_page !== -1) {
 				$query_params['limit'] = $limit;
 			}
-			$registrations =  $trash ? EEM_Registration::instance()->get_all_deleted($query_params) : EEM_Registration::instance()->get_all($query_params);
+			$registrations = $trash ? EEM_Registration::instance()->get_all_deleted($query_params) : EEM_Registration::instance()->get_all($query_params);
 
 
-			if ( $EVT_ID && isset( $registrations[0] ) && $registrations[0] instanceof EE_Registration &&  $registrations[0]->event_obj()) {
+			if ($EVT_ID && isset($registrations[0]) && $registrations[0] instanceof EE_Registration && $registrations[0]->event_obj()) {
 				$first_registration = $registrations[0];
 				//EEH_Debug_Tools::printr( $registrations[0], '$registrations  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 				$event_name = $first_registration->event_obj()->name();
-				$event_date = $first_registration->date_obj()->start_date_and_time('l F j, Y,', 'g:i:s a');// isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y,    g:i:s a', $registrations[0]->DTT_EVT_start ) : '';
+				$event_date = $first_registration->date_obj()->start_date_and_time('l F j, Y,', 'g:i:s a'); // isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y,    g:i:s a', $registrations[0]->DTT_EVT_start ) : '';
 				// edit event link
-				if ( $event_name != '' ) {
-					$edit_event_url = self::add_query_args_and_nonce( array( 'action'=>'edit_event', 'EVT_ID'=>$EVT_ID ), EVENTS_ADMIN_URL );
-					$edit_event_lnk = '<a href="'.$edit_event_url.'" title="' . esc_attr__( 'Edit ', 'event_espresso' ) . $event_name . '">' . __( 'Edit Event', 'event_espresso' ) . '</a>';
-					$event_name .= ' <span class="admin-page-header-edit-lnk not-bold">' . $edit_event_lnk . '</span>' ;
+				if ($event_name != '') {
+					$edit_event_url = self::add_query_args_and_nonce(array('action'=>'edit_event', 'EVT_ID'=>$EVT_ID), EVENTS_ADMIN_URL);
+					$edit_event_lnk = '<a href="'.$edit_event_url.'" title="'.esc_attr__('Edit ', 'event_espresso').$event_name.'">'.__('Edit Event', 'event_espresso').'</a>';
+					$event_name .= ' <span class="admin-page-header-edit-lnk not-bold">'.$edit_event_lnk.'</span>';
 				}
 
-				$back_2_reg_url = self::add_query_args_and_nonce( array( 'action'=>'default' ), REG_ADMIN_URL );
-				$back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="' . esc_attr__( 'click to return to viewing all registrations ', 'event_espresso' ) . '">&laquo; ' . __( 'Back to All Registrations', 'event_espresso' ) . '</a>';
+				$back_2_reg_url = self::add_query_args_and_nonce(array('action'=>'default'), REG_ADMIN_URL);
+				$back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="'.esc_attr__('click to return to viewing all registrations ', 'event_espresso').'">&laquo; '.__('Back to All Registrations', 'event_espresso').'</a>';
 
 				$this->_template_args['before_admin_page_content'] = '
 			<div id="admin-page-header">
-				<h1><span class="small-text not-bold">'.__( 'Event: ', 'event_espresso' ).'</span>'. $event_name .'</h1>
-				<h3><span class="small-text not-bold">'.__( 'Date: ', 'event_espresso' ). '</span>'. $event_date .'</h3>
-				<span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk . '</span>
+				<h1><span class="small-text not-bold">'.__('Event: ', 'event_espresso').'</span>'.$event_name.'</h1>
+				<h3><span class="small-text not-bold">'.__('Date: ', 'event_espresso').'</span>'.$event_date.'</h3>
+				<span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk.'</span>
 			</div>
 			';
 
@@ -1106,7 +1106,7 @@ 
 
 		$this->_set_registration_object();
 
-		if ( is_object( $this->_registration )) {
+		if (is_object($this->_registration)) {
 			$transaction = $this->_registration->transaction() ? $this->_registration->transaction() : EE_Transaction::new_instance();
 			$this->_session = $transaction->session_data();
 
@@ -1114,10 +1114,10 @@ 
 
 
 			$this->_template_args['reg_nmbr']['value'] = $this->_registration->ID();
-			$this->_template_args['reg_nmbr']['label'] = __( 'Registration Number', 'event_espresso' );
+			$this->_template_args['reg_nmbr']['label'] = __('Registration Number', 'event_espresso');
 
-			$this->_template_args['reg_datetime']['value'] =  $this->_registration->pretty_date('l F j, Y','g:i:s a') ;
-			$this->_template_args['reg_datetime']['label'] = __( 'Date', 'event_espresso' );
+			$this->_template_args['reg_datetime']['value'] = $this->_registration->pretty_date('l F j, Y', 'g:i:s a');
+			$this->_template_args['reg_datetime']['label'] = __('Date', 'event_espresso');
 
 			$this->_template_args['grand_total'] = $transaction->total();
 
@@ -1125,19 +1125,19 @@ 
 			// 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' ) );
+			$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' ) : '';
+			$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['admin_page_header'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+			$template_path = REG_TEMPLATE_PATH.'reg_admin_details_header.template.php';
+			$this->_template_args['admin_page_header'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 		} else {
 
@@ -1156,17 +1156,17 @@ 
 
 
 	protected function _registration_details_metaboxes() {
-		do_action( 'AHEE__Registrations_Admin_Page___registration_details_metabox__start', $this );
+		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-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' );
+		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');
 		}
 	}
 
@@ -1187,23 +1187,23 @@ 
 
 		//let's get an array of all possible buttons that we can just reference
 		$status_buttons = $this->_get_reg_status_buttons();
-		$template_args[ 'reg_status_value' ] = $this->_registration->pretty_status();
-		$template_args[ 'reg_status_class' ] = 'status-' . $this->_registration->status_ID();
+		$template_args['reg_status_value'] = $this->_registration->pretty_status();
+		$template_args['reg_status_class'] = 'status-'.$this->_registration->status_ID();
 		$template_args['attendee'] = $this->_registration->attendee();
-		$template = REG_TEMPLATE_PATH . 'reg_status_change_buttons.template.php';
-		if ( $this->_set_registration_object() ) {
+		$template = REG_TEMPLATE_PATH.'reg_status_change_buttons.template.php';
+		if ($this->_set_registration_object()) {
 			$current_status = $this->_registration->status_ID();
-			unset( $status_buttons[$current_status] );
-			if ( $current_status != EEM_Registration::status_id_pending_payment && $is_complete ) {
-				unset( $status_buttons[EEM_Registration::status_id_pending_payment] );
+			unset($status_buttons[$current_status]);
+			if ($current_status != EEM_Registration::status_id_pending_payment && $is_complete) {
+				unset($status_buttons[EEM_Registration::status_id_pending_payment]);
 			}
-			$template_args['status_buttons'] = implode( "\n", $status_buttons );
+			$template_args['status_buttons'] = implode("\n", $status_buttons);
 		}
 		$template_args['form_url'] = REG_ADMIN_URL;
 		$template_args['REG_ID'] = $this->_registration->ID();
-		$template_args['nonce'] = wp_nonce_field( 'change_reg_status_nonce',  'change_reg_status_nonce', FALSE, FALSE );
+		$template_args['nonce'] = wp_nonce_field('change_reg_status_nonce', 'change_reg_status_nonce', FALSE, FALSE);
 
-		EEH_Template::display_template( $template, $template_args );
+		EEH_Template::display_template($template, $template_args);
 
 	}
 
@@ -1217,11 +1217,11 @@ 
 	private function _get_reg_status_buttons() {
 
 		$buttons = array(
-			EEM_Registration::status_id_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_approved . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' ) . '">',
-			EEM_Registration::status_id_pending_payment => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_pending_payment . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, FALSE, 'sentence' ) . '">',
-			EEM_Registration::status_id_not_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_not_approved . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, FALSE, 'sentence' ) . '">',
-			EEM_Registration::status_id_declined => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_declined . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_declined, FALSE, 'sentence' ) . '">',
-			EEM_Registration::status_id_cancelled =>'<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_cancelled . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, FALSE, 'sentence' ) . '">',
+			EEM_Registration::status_id_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_approved.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence').'">',
+			EEM_Registration::status_id_pending_payment => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_pending_payment.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence').'">',
+			EEM_Registration::status_id_not_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_not_approved.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence').'">',
+			EEM_Registration::status_id_declined => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_declined.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_declined, FALSE, 'sentence').'">',
+			EEM_Registration::status_id_cancelled =>'<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_cancelled.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, FALSE, 'sentence').'">',
 			);
 		return $buttons;
 	}
@@ -1235,13 +1235,13 @@ 
 	 *
 	 * @return array  (array with reg_id(s) updated and whether update was successful.
 	 */
-	protected function _set_registration_status_from_request( $status = false, $notify = false ) {
-		$REG_ID = isset( $this->_req_data['_REG_ID'] ) ? (array) $this->_req_data['_REG_ID'] : array();
+	protected function _set_registration_status_from_request($status = false, $notify = false) {
+		$REG_ID = isset($this->_req_data['_REG_ID']) ? (array) $this->_req_data['_REG_ID'] : array();
 
-		$success = $this->_set_registration_status( $REG_ID, $status );
+		$success = $this->_set_registration_status($REG_ID, $status);
 
 		//notify?
-		if ( $success && $notify && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_resend_registration' ) ) {
+		if ($success && $notify && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_resend_registration')) {
 			$this->_process_resend_registration();
 		}
 
@@ -1259,19 +1259,19 @@ 
 	 * @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_ID, $status = false ) {
+	protected function _set_registration_status($REG_ID, $status = false) {
 		$success = true;
 		// set default status if none is passed
 		$status = $status ? $status : EEM_Registration::status_id_pending_payment;
 
 		//typecast and sanitize reg_id
-		$reg_ids = array_filter( (array) $REG_ID, 'absint' );
+		$reg_ids = array_filter((array) $REG_ID, 'absint');
 
 		//loop through REG_ID's and change status
-		foreach ( $reg_ids as $r_id ) {
-			$registration = EEM_Registration::instance()->get_one_by_ID( $r_id );
-			if ( $registration instanceof EE_Registration ) {
-				$registration->set_status( $status );
+		foreach ($reg_ids as $r_id) {
+			$registration = EEM_Registration::instance()->get_one_by_ID($r_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
@@ -1283,7 +1283,7 @@ 
 		$this->_req_data['_REG_ID'] = $reg_ids;
 
 		//return $success and processed registrations
-		return array( 'REG_ID' => $reg_ids, 'success' => $success );
+		return array('REG_ID' => $reg_ids, 'success' => $success);
 	}
 
 
@@ -1295,37 +1295,37 @@ 
 	 * @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 ) {
+	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 );
+		$result = ! empty($STS_ID) ? $this->_set_registration_status_from_request($STS_ID, $notify) : array('success' => false);
 
 
-		$success = isset( $result['success'] ) && $result['success'];
+		$success = isset($result['success']) && $result['success'];
 
 		//setup success message
-		if ( $success ) {
-			$msg = is_array( $result['REG_ID'] ) && count( $result['REG_ID'] ) > 1  ? sprintf( __('Registration status has been set to %s', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower' ) ) :  sprintf( __('Registrations have been set to %s.', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower' ) ) ;
-			EE_Error::add_success( $msg );
+		if ($success) {
+			$msg = is_array($result['REG_ID']) && count($result['REG_ID']) > 1 ? sprintf(__('Registration status has been set to %s', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower')) : 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__ );
+			EE_Error::add_error(__('Something went wrong, and the status was not changed', 'event_espresso'), __FILE__, __LINE__, __FUNCTION__);
 		}
 
-		$route = isset( $this->_req_data['return'] ) && $this->_req_data['return'] == 'view_registration' ? array( 'action' => 'view_registration', '_REG_ID' => $result['REG_ID'][0] ) : array( 'action' => 'default' );
+		$route = isset($this->_req_data['return']) && $this->_req_data['return'] == 'view_registration' ? array('action' => 'view_registration', '_REG_ID' => $result['REG_ID'][0]) : array('action' => 'default');
 		//unset nonces
-		foreach ( $this->_req_data as $ref => $value ) {
-			if ( strpos( $ref, 'nonce' ) !== false ) {
-				unset( $this->_req_data[$ref] );
+		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 );
+			$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 );
+		$route = array_merge($this->_req_data, $route);
 
-		$this->_redirect_after_action( false, '', '', $route, true );
+		$this->_redirect_after_action(false, '', '', $route, true);
 	}
 
 
@@ -1337,29 +1337,29 @@ 
 	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['txn_reg_status_change']['send_notifications'] );
-		$this->_req_data[ '_reg_status_id' ] = isset( $this->_req_data[ '_reg_status_id' ] ) ? $this->_req_data[ '_reg_status_id' ] : '';
+		$notify = ! empty($this->_req_data['txn_reg_status_change']['send_notifications']);
+		$this->_req_data['_reg_status_id'] = isset($this->_req_data['_reg_status_id']) ? $this->_req_data['_reg_status_id'] : '';
 
-		switch ( $this->_req_data['_reg_status_id'] ) {
-			case EEH_Template::pretty_status( EEM_Registration::status_id_approved, false, 'sentence' ) :
-				$this->approve_registration( $notify );
+		switch ($this->_req_data['_reg_status_id']) {
+			case EEH_Template::pretty_status(EEM_Registration::status_id_approved, false, 'sentence') :
+				$this->approve_registration($notify);
 				break;
-			case EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, false, 'sentence' ) :
-				$this->pending_registration( $notify );
+			case EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, false, 'sentence') :
+				$this->pending_registration($notify);
 				break;
-			case EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, false, 'sentence' ) :
-				$this->not_approve_registration( $notify );
+			case EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, false, 'sentence') :
+				$this->not_approve_registration($notify);
 				break;
-			case EEH_Template::pretty_status( EEM_Registration::status_id_declined, false, 'sentence' ) :
-				$this->decline_registration( $notify );
+			case EEH_Template::pretty_status(EEM_Registration::status_id_declined, false, 'sentence') :
+				$this->decline_registration($notify);
 				break;
-			case EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, false, 'sentence' ) :
-				$this->cancel_registration( $notify );
+			case EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, false, 'sentence') :
+				$this->cancel_registration($notify);
 				break;
 			default :
 				$result['success'] = false;
-				unset( $this->_req_data['return'] );
-				$this->_reg_status_change_return( '', false );
+				unset($this->_req_data['return']);
+				$this->_reg_status_change_return('', false);
 				break;
 		}
 	}
@@ -1372,8 +1372,8 @@ 
 	*		@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 );
+	protected function approve_registration($notify = false) {
+		$this->_reg_status_change_return(EEM_Registration::status_id_approved, $notify);
 	}
 
 
@@ -1385,8 +1385,8 @@ 
 	*		@param bool $notify whether or not to notify the registrant about their approval.
 	*		@return void
 	*/
-	protected function decline_registration( $notify = false ) {
-		$this->_reg_status_change_return( EEM_Registration::status_id_declined, $notify );
+	protected function decline_registration($notify = false) {
+		$this->_reg_status_change_return(EEM_Registration::status_id_declined, $notify);
 	}
 
 
@@ -1398,8 +1398,8 @@ 
 	*		@param bool $notify whether or not to notify the registrant about their approval.
 	*		@return void
 	*/
-	protected function cancel_registration( $notify = false ) {
-		$this->_reg_status_change_return( EEM_Registration::status_id_cancelled, $notify );
+	protected function cancel_registration($notify = false) {
+		$this->_reg_status_change_return(EEM_Registration::status_id_cancelled, $notify);
 	}
 
 
@@ -1412,8 +1412,8 @@ 
 	*		@param bool $notify whether or not to notify the registrant about their approval.
 	*		@return void
 	*/
-	protected function not_approve_registration( $notify = false ) {
-		$this->_reg_status_change_return( EEM_Registration::status_id_not_approved, $notify );
+	protected function not_approve_registration($notify = false) {
+		$this->_reg_status_change_return(EEM_Registration::status_id_not_approved, $notify);
 	}
 
 
@@ -1424,8 +1424,8 @@ 
 	*		@param bool $notify whether or not to notify the registrant about their approval.
 	*		@return void
 	*/
-	protected function pending_registration( $notify = false ) {
-		$this->_reg_status_change_return( EEM_Registration::status_id_pending_payment, $notify );
+	protected function pending_registration($notify = false) {
+		$this->_reg_status_change_return(EEM_Registration::status_id_pending_payment, $notify);
 	}
 
 
@@ -1439,75 +1439,75 @@ 
 	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' );
+		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_Single_Registration_Line_Item_Filter( $this->_registration ) );
-		$filters->add( new EE_Non_Zero_Line_Item_Filter() );
-		$line_item_filter_processor = new EE_Line_Item_Filter_Processor( $filters, $transaction->total_line_item() );
+		$filters->add(new EE_Single_Registration_Line_Item_Filter($this->_registration));
+		$filters->add(new EE_Non_Zero_Line_Item_Filter());
+		$line_item_filter_processor = new EE_Line_Item_Filter_Processor($filters, $transaction->total_line_item());
 		$filtered_line_item_tree = $line_item_filter_processor->process();
 
 		$this->_template_args['REG_ID'] = $this->_registration->ID();
-		$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 ) );
+		$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();
 
 
-		$this->_template_args['view_transaction_button'] = EE_Registry::instance()->CAP->current_user_can( 'ee_read_transaction', 'espresso_transactions_view_transaction' ) ?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 ), __(' View Transaction'), 'button secondary-button right', 'dashicons dashicons-cart' ) : '';
-		$this->_template_args['resend_registration_button'] = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_resend_registration' ) ?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 ), __(' Resend Registration'), 'button secondary-button right', 'dashicons dashicons-email-alt' ) : '';
+		$this->_template_args['view_transaction_button'] = EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction') ? 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), __(' View Transaction'), 'button secondary-button right', 'dashicons dashicons-cart') : '';
+		$this->_template_args['resend_registration_button'] = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_resend_registration') ? 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), __(' Resend Registration'), 'button secondary-button right', 'dashicons dashicons-email-alt') : '';
 
 
 		$this->_template_args['currency_sign'] = EE_Registry::instance()->CFG->currency->sign;
-		$payment = $transaction->get_first_related( 'Payment' );
+		$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->get_first_related('Payment_Method');
 		$payment_method = ! $payment_method instanceof EE_Payment_Method ? EE_Payment_Method::new_instance() : $payment_method;
-		$reg_status_class = 'status-' . $this->_registration->status_ID();
+		$reg_status_class = 'status-'.$this->_registration->status_ID();
 		$reg_details = array(
 			'payment_method' => $payment_method->name(),
 			'response_msg' => $payment->gateway_response(),
-			'registration_id' => $this->_registration->get( 'REG_code' ),
+			'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'] : '',
+			'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'] )) {
+		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']['label'] = __('Registration ID', 'event_espresso');
 			$this->_template_args['reg_details']['registration_id']['class'] = 'regular-text';
 		}
 
-		if ( isset( $reg_details['payment_method'] ) ) {
+		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']['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']['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']['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']['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']['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['event_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'event_id' => $this->_registration->event_ID()), REG_ADMIN_URL);
 
-		$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 );
+		$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);
 
 	}
 
@@ -1521,14 +1521,14 @@ 
 	*/
 	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() : '';
+		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 );
+			$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);
 		}
 	}
 
@@ -1542,12 +1542,12 @@ 
 	 * @param        string $output
 	 * @return        string
 	 */
-	public function form_before_question_group( $output ) {
+	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'
+			__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' ),
+				'event_espresso'),
 			'4.8.32.rc.000'
 		);
 		return '
@@ -1566,20 +1566,20 @@ 
 	 * @param        string $output
 	 * @return        string
 	 */
-	public function form_after_question_group( $output ) {
+	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'
+			__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' ),
+				'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' ) . '">
-						<span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __( 'edit the above question group', 'event_espresso' ) . '</span>
+					<a class="reg-admin-edit-attendee-question-lnk" href="#" title="' . 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>
 						<div class="dashicons dashicons-edit"></div>
 					</a>
 				</td>
@@ -1599,18 +1599,18 @@ 
 	 * @param        string $label
 	 * @return        string
 	 */
-	public function form_form_field_label_wrap( $label ) {
+	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'
+			__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' ),
+				'event_espresso'),
 			'4.8.32.rc.000'
 		);
 		return '
 			<tr>
 				<th>
-					' . $label  . '
+					' . $label.'
 				</th>';
 	}
 
@@ -1624,17 +1624,17 @@ 
 	 * @param        string $input
 	 * @return        string
 	 */
-	public function form_form_field_input__wrap( $input ) {
+	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'
+			__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' ),
+				'event_espresso'),
 			'4.8.32.rc.000'
 		);
 		return '
 				<td class="reg-admin-attendee-questions-input-td disabled-input">
-					' . $input . '
+					' . $input.'
 				</td>
 			</tr>';
 	}
@@ -1648,14 +1648,14 @@ 
 	 * @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 ) {
+		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 );
+				$route = $REG_ID ? array('action' => 'view_registration', '_REG_ID' => $REG_ID) : array('action' => 'default');
+				$this->_redirect_after_action($success, $what, __('updated', 'event_espresso'), $route);
 			}
 		}
 	}
@@ -1666,11 +1666,11 @@ 
 	 * @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 );
+	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;
 	}
@@ -1683,17 +1683,17 @@ 
 	 * @param bool $REG_ID
 	 * @return bool
 	 */
-	private function _save_reg_custom_questions_form( $REG_ID = FALSE ) {
+	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__ );
+			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 );
+		$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 ) {
+		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
@@ -1701,19 +1701,19 @@ 
 					$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 );
+					$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 );
+						$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__ );
+			EE_Error::add_error($form->get_validation_error_string(), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return $success;
 	}
@@ -1731,30 +1731,30 @@ 
 		$registrations = $REG->get_all(array(
 			array(
 				'TXN_ID'=>$this->_registration->transaction_ID(),
-				'REG_ID'=>array('!=',$this->_registration->ID())
+				'REG_ID'=>array('!=', $this->_registration->ID())
 			),
 			'force_join'=>array('Attendee')));
 
 		$this->_template_args['attendees'] = array();
 		$this->_template_args['attendee_notice'] = '';
 		EE_Registry::instance()->load_helper('Array');
-		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__ );
+		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 ) {
+			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 ]['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]['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]['att_link'] = self::add_query_args_and_nonce(array('action'=>'edit_attendee', 'post'=>$attendee->ID()), REG_ADMIN_URL);
 
 				$att_nmbr++;
 			}
@@ -1766,8 +1766,8 @@ 
 
 	//			$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 );
+		$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);
 
 	}
 
@@ -1788,11 +1788,11 @@ 
 		$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 cereate button or not)
-		if ( ! $this->_registration->is_primary_registrant() ) {
+		if ( ! $this->_registration->is_primary_registrant()) {
 			$primary_registration = $this->_registration->get_primary_registration();
 			$primary_attendee = $primary_registration->attendee();
 
-			if ( ! $primary_attendee instanceof EE_Attendee || $attendee->ID() !== $primary_attendee->ID() ) {
+			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;
 			}
@@ -1801,28 +1801,28 @@ 
 		}
 
 		$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();
 
-		EE_Registry::instance()->load_helper( 'Formatter' );
-		$this->_template_args[ 'formatted_address' ] = EEH_Address::format( $attendee );
+		EE_Registry::instance()->load_helper('Formatter');
+		$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' );
+		$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');
 
 		//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_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 );
+		$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);
 	}
 
 
@@ -1835,7 +1835,7 @@ 
 	 * @access protected
 	 * @return void
 	 */
-	protected function _trash_or_restore_registrations( $trash = TRUE ) {
+	protected function _trash_or_restore_registrations($trash = TRUE) {
 		$REGM = EEM_Registration::instance();
 
 		$success = 1;
@@ -1845,26 +1845,26 @@ 
 		$dtts = array();
 
 		//if empty _REG_ID then get out because there's nothing to do
-		if ( empty( $this->_req_data['_REG_ID'] ) ) {
+		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 );
+			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 ( ! 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;
+			$success = count($this->_req_data['_REG_ID']) > 1 ? 2 : 1;
 			// cycle thru checkboxes
-			while (list( $ind, $REG_ID ) = each($this->_req_data['_REG_ID'])) {
+			while (list($ind, $REG_ID) = each($this->_req_data['_REG_ID'])) {
 
 				$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' );
+				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__ );
+					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');
@@ -1873,7 +1873,7 @@ 
 				$dtts = array_merge($dtts, $dtt);
 
 				$updated = $trash ? $REG->delete() : $REG->restore();
-				if ( !$updated ) {
+				if ( ! $updated) {
 					$success = 0;
 				} else {
 					$success = 2;
@@ -1888,7 +1888,7 @@ 
 			$tickets[$ticket->ID()] = $ticket;
 			$dtts = $ticket->get_many_related('Datetime');
 			$updated = $trash ? $REG->delete() : $REG->restore();
-			if ( ! $updated ) {
+			if ( ! $updated) {
 				$success = 0;
 			}
 
@@ -1898,10 +1898,10 @@ 
 		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' );
+		$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->_redirect_after_action($success, $what, $action_desc, array('action' => 'default'), $overwrite_msgs);
 	}
 
 
@@ -1925,16 +1925,16 @@ 
 		$success = 1;
 
 		//Checkboxes
-		if (!empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) {
+		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;
+			$success = count($this->_req_data['_REG_ID']) > 1 ? 2 : 1;
 			// cycle thru checkboxes
-			while (list( $ind, $REG_ID ) = each($this->_req_data['_REG_ID'])) {
+			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 )
+				if ( ! $REG instanceof EE_Registration)
 					continue;
 				$deleted = $this->_delete_registration($REG);
-				if ( !$deleted ) {
+				if ( ! $deleted) {
 					$success = 0;
 				}
 			}
@@ -1944,15 +1944,15 @@ 
 			$REG_ID = $this->_req_data['_REG_ID'];
 			$REG = $REG_MDL->get_one_by_ID($REG_ID);
 			$deleted = $this->_delete_registration($REG);
-			if ( ! $deleted ) {
+			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 );
+		$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);
 	}
 
 
@@ -1964,31 +1964,31 @@ 
 	 * @param  EE_Registration $REG registration to be deleted permenantly
 	 * @return boolean              true = successful deletion, false = fail.
 	 */
-	protected function _delete_registration( EE_Registration $REG ) {
+	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') )
+		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__ );
+		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 ) {
+		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 ) {
+			if ($attendee instanceof EE_Attendee) {
 				$registration->_remove_relation_to($attendee, 'Attendee');
 			}
 
@@ -1998,7 +1998,7 @@ 
 			//now delete permanently the checkins related to this registration.
 			$registration->delete_related_permanently('Checkin');
 
-			if ( $registration->ID() === $REG->ID() )
+			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
@@ -2031,35 +2031,35 @@ 
 	 * @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') );
+		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 );
+		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'] ) )
+			! defined('DOING_AJAX')
+			&& ( ! isset($this->_req_data['processing_registration']) || isset($this->_req_data['step_error']))
 		) {
-			EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ );
+			EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
 		}
 
-		$this->_template_args['event_name'] = '' ;
+		$this->_template_args['event_name'] = '';
 		// event name
-		if ( $this->_reg_event ) {
+		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>' ;
+			$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' ) ) {
+		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 );
+		$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
@@ -2076,7 +2076,7 @@ 
 	 * @return string html
 	 */
 	protected function _get_registration_step_content() {
-		if ( isset( $_COOKIE[ 'ee_registration_added' ] ) && $_COOKIE[ 'ee_registration_added' ] ) {
+		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',
@@ -2092,7 +2092,7 @@ 
 				'</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 !!!
@@ -2127,16 +2127,16 @@ 
 		$cart = EE_Registry::instance()->SSN->cart();
 		$step = ! $cart instanceof EE_Cart ? 'ticket' : 'questions';
 
-		switch ( $step ) {
+		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['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;
+				$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();
@@ -2145,10 +2145,10 @@ 
 				break;
 		}
 
-		$this->_set_add_edit_form_tags( 'process_reg_step', $hidden_fields ); //we come back to the process_registration_step route.
+		$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
+			REG_TEMPLATE_PATH.'reg_admin_register_new_attendee_step_content.template.php', $template_args, TRUE
 		);
 	}
 
@@ -2163,11 +2163,11 @@ 
 	*		@return boolean
 	*/
 	private function _set_reg_event() {
-		if ( is_object( $this->_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 ) {
+		$EVT_ID = ( ! empty($this->_req_data['event_id'])) ? absint($this->_req_data['event_id']) : FALSE;
+		if ( ! $EVT_ID) {
 			return FALSE;
 		}
 
@@ -2188,82 +2188,82 @@ 
 	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_espresso_page(TRUE);
 
 		//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 );
+		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 ) {
+		switch ($step) {
 
 			case 'ticket' :
 				//process ticket selection
 				$success = EED_Ticket_Selector::instance()->process_ticket_selections();
-				if ( $success ) {
-					EE_Error::add_success( __('Tickets Selected. Now complete the registration.'), 'event_espresso');
+				if ($success) {
+					EE_Error::add_success(__('Tickets Selected. Now complete the registration.'), 'event_espresso');
 				} else {
 					$query_args['step_error'] = $this->_req_data['step_error'] = TRUE;
 				}
-				if ( defined('DOING_AJAX') ) {
+				if (defined('DOING_AJAX')) {
 					$this->new_registration(); //display next step
 				} else {
 					$query_args['action'] = 'new_registration';
 					$query_args['processing_registration'] = 1;
 					$query_args['event_id'] = $this->_reg_event->ID();
-					$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+					$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 );
+				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 ) {
+				if ($cart instanceof EE_Cart) {
 					$grand_total = $cart->get_cart_grand_total();
-					if ( $grand_total instanceof EE_Line_Item ) {
+					if ($grand_total instanceof EE_Line_Item) {
 						$grand_total->save_this_and_descendants_to_txn();
 					}
 				}
-				if ( ! $transaction instanceof EE_Transaction ) {
+				if ( ! $transaction instanceof EE_Transaction) {
 					$query_args = array(
 						'action' => 'new_registration',
 						'processing_registration' => 2,
 						'event_id' => $this->_reg_event->ID()
 					);
 
-					if ( defined('DOING_AJAX' )) {
+					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 );
+						$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 						return;
 					}
 				}
 				/** @type EE_Transaction_Payments $transaction_payments */
-				$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+				$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 				// maybe update status, and make sure to save transaction if not done already
-				if ( ! $transaction_payments->update_transaction_status_based_on_total_paid( $transaction )) {
+				if ( ! $transaction_payments->update_transaction_status_based_on_total_paid($transaction)) {
 					$transaction->save();
 				}
-				EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ );
+				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() ),
+					'event_name'    => urlencode($this->_reg_event->name()),
 					'redirect_from' => 'new_registration'
 				);
-				$this->_redirect_after_action( false, '', '', $query_args, true );
+				$this->_redirect_after_action(false, '', '', $query_args, true);
 				break;
 		}
 
@@ -2280,21 +2280,21 @@ 
 	 */
 	public function redirect_to_txn() {
 		EE_System::do_not_cache();
-		EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ );
+		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,
+			'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' ];
+		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' )
+			__('Registration Created.  Please review the transaction and add any payments as necessary', 'event_espresso')
 		);
-		$this->_redirect_after_action( false, '', '', $query_args, true );
+		$this->_redirect_after_action(false, '', '', $query_args, true);
 	}
 
 
@@ -2305,7 +2305,7 @@ 
 	*		@return void
 	*/
 	protected function _attendee_contact_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$this->_search_btn_label = __('Contacts', 'event_espresso');
 		$this->display_admin_list_table_page_with_no_sidebar();
 	}
@@ -2320,10 +2320,10 @@ 
 	*		@access public
 	*		@return array
 	*/
-	public function get_attendees( $per_page, $count = FALSE, $trash = FALSE ) {
+	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' );
+		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'] : '';
@@ -2351,47 +2351,47 @@ 
 				$orderby = 'ATT_lname';
 		}
 
-		$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC';
+		$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;
+		$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 ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if (isset($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 )
+				'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 );
+		$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_MDL->get_all( array($_where,'order_by'=>array($orderby=>$sort), 'limit'=>$limit));
+		if ($trash) {
+			$_where['status'] = array('!=', 'publish');
+			$all_attendees = $count ? $ATT_MDL->count(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit)) : $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_MDL->get_all( array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit) );
+			$_where['status'] = array('IN', array('publish'));
+			$all_attendees = $count ? $ATT_MDL->count(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit)) : $ATT_MDL->get_all(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit));
 		}
 
 		return $all_attendees;
@@ -2408,10 +2408,10 @@ 
 	 */
 	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(
+		$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 );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 	}
 
 
@@ -2419,27 +2419,27 @@ 
 
 
 
-	public function _registrations_report(){
-		if( ! defined( 'EE_USE_OLD_CSV_REPORT_CLASS' ) ) {
-			wp_redirect( EE_Admin_Page::add_query_args_and_nonce(
+	public function _registrations_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',
-					'EVT_ID' => isset( $this->_req_data[ 'EVT_ID'] ) ? $this->_req_data[ 'EVT_ID' ] : NULL,
-					'job_handler' => urlencode( 'EventEspressoBatchRequest\JobHandlers\RegistrationsReport' ),
-					'return_url' => urlencode( $this->_req_data[ 'return_url' ] ),
-				)) );
+					'EVT_ID' => isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : NULL,
+					'job_handler' => urlencode('EventEspressoBatchRequest\JobHandlers\RegistrationsReport'),
+					'return_url' => urlencode($this->_req_data['return_url']),
+				)));
 		} else {
-			EE_Registry::instance()->load_helper( 'File' );
+			EE_Registry::instance()->load_helper('File');
 			$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,
+				'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();
 			}
@@ -2448,28 +2448,28 @@ 
 
 
 
-	public function _contact_list_export(){
-		EE_Registry::instance()->load_helper( 'File' );
-		if ( is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-			require_once(EE_CLASSES . 'EE_Export.class.php');
+	public function _contact_list_export() {
+		EE_Registry::instance()->load_helper('File');
+		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(
+	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' ] ),
-				)) );
+					'job_handler' => urlencode('EventEspressoBatchRequest\JobHandlers\AttendeesReport'),
+					'return_url' => urlencode($this->_req_data['return_url']),
+				)));
 		} else {
-			EE_Registry::instance()->load_helper( 'File' );
-			if ( is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-				require_once(EE_CLASSES . 'EE_Export.class.php');
+			EE_Registry::instance()->load_helper('File');
+			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();
 			}
@@ -2489,73 +2489,73 @@ 
 	 * @return void
 	 */
 	protected function _duplicate_attendee() {
-		$action = !empty( $this->_req_data['return'] ) ? $this->_req_data['return'] : 'default';
+		$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 paramaters are not present (_REG_ID )', 'event_espresso'),  __FILE__, __LINE__, __FUNCTION__ );
-			$query_args = array( 'action' => $action );
+		if (empty($this->_req_data['_REG_ID'])) {
+			EE_Error::add_error(__('Unable to create the contact for the registration because the required paramaters 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'] );
+		$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' );
+		$registration->_remove_relation_to($attendee, 'Attendee');
 		//new attendee
 		$new_attendee = clone $attendee;
-		$new_attendee->set( 'ATT_ID', 0 );
+		$new_attendee->set('ATT_ID', 0);
 		$new_attendee->save();
 
 		//add new attendee to reg
-		$registration->_add_relation_to( $new_attendee, 'Attendee');
+		$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') );
+		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' );
+		$query_args = array('post' => $new_attendee->ID(), 'action' => 'edit_attendee');
 
-		$this->_redirect_after_action( '', '', '', $query_args, TRUE );
+		$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 );
+		$attendee = EEM_Attendee::instance()->get_one_by_ID($post_id);
 		//for attendee updates
-		if ( $post->post_type = 'espresso_attendees' && !empty( $attendee ) ) {
+		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_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'] : ''
+				'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 ) {
+			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 ) );
+			$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__ );
+		if ($success === FALSE)
+			EE_Error::add_error(__('Something went wrong with updating the meta table data for the registration.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 
 	}
 
@@ -2575,17 +2575,17 @@ 
 		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', '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') ) {
+		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');
+		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');
 	}
 
 
@@ -2594,10 +2594,10 @@ 
 	 * @param  WP_Post $post wp post object
 	 * @return string        attendee contact info ( and form )
 	 */
-	public function attendee_contact_info( $post ) {
+	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';
+		$template = REG_TEMPLATE_PATH.'attendee_contact_info_metabox_content.template.php';
 		EEH_Template::display_template($template, $this->_template_args);
 	}
 
@@ -2613,12 +2613,12 @@ 
 		$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(
+				EE_Question::new_instance(array(
 					'QST_ID' => 0,
 					'QST_display_text' => __('State/Province', 'event_espresso'),
 					'QST_system' => 'admin-state'
 					)),
-				EE_Answer::new_instance( array(
+				EE_Answer::new_instance(array(
 					'ANS_ID' => 0,
 					'ANS_value' => $this->_cpt_model_obj->state_ID()
 					)),
@@ -2631,12 +2631,12 @@ 
 			));
 		$this->_template_args['country_html'] = EEH_Form_Fields::generate_form_input(
 				new EE_Question_Form_Input(
-				EE_Question::new_instance( array(
+				EE_Question::new_instance(array(
 					'QST_ID' => 0,
 					'QST_display_text' => __('Country', 'event_espresso'),
 					'QST_system' => 'admin-country'
 					)),
-				EE_Answer::new_instance( array(
+				EE_Answer::new_instance(array(
 					'ANS_ID' => 0,
 					'ANS_value' => $this->_cpt_model_obj->country_ID()
 					)),
@@ -2647,8 +2647,8 @@ 
 					'append_qstn_id' => FALSE
 					)
 				));
-		$template = REG_TEMPLATE_PATH . 'attendee_address_details_metabox_content.template.php';
-		EEH_Template::display_template($template, $this->_template_args );
+		$template = REG_TEMPLATE_PATH.'attendee_address_details_metabox_content.template.php';
+		EEH_Template::display_template($template, $this->_template_args);
 
 	}
 
@@ -2658,11 +2658,11 @@ 
 	*		@access protected
 	*		@return void
 	*/
-	public function attendee_registrations_meta_box( $post ) {
+	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';
+		$template = REG_TEMPLATE_PATH.'attendee_registrations_main_meta_box.template.php';
 		EEH_Template::display_template($template, $this->_template_args);
 
 	}
@@ -2676,8 +2676,8 @@ 
 	 * @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';
+		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);
 		}
@@ -2694,21 +2694,21 @@ 
 	*		@access protected
 	*		@return void
 	*/
-	protected function _trash_or_restore_attendees( $trash = TRUE ) {
+	protected function _trash_or_restore_attendees($trash = TRUE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		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 ( ! 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;
+			$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 ) {
+			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;
 				}
 			}
@@ -2717,18 +2717,18 @@ 
 			// grab single id and delete
 			$ATT_ID = absint($this->_req_data['ATT_ID']);
 			//get attendee
-			$att = $ATT_MDL->get_one_by_ID( $ATT_ID );
+			$att = $ATT_MDL->get_one_by_ID($ATT_ID);
 			$updated = $trash ? $att->set_status('trash') : $att->set_status('publish');
 			$updated = $att->save();
-			if ( ! $updated ) {
+			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' ) );
+		$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'));
 
 	}
 

Braces +27 added lines, -19 removed lines

@@ -1,4 +1,6 @@ 
-<?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
  *
@@ -118,8 +120,9 @@ 
 	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';
+		if ( $post_type == 'espresso_attendees' ) {
+					return '#commentsdiv';
+		}
 		return $link;
 	}
 
@@ -878,9 +881,9 @@ 
 
 		$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 {
+		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;
@@ -977,7 +980,7 @@ 
 					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $curdate . $time_start, 'Y-m-d H:i:s' ),
 					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $curdate . $time_end, 'Y-m-d H:i:s' ),
 			));
-		}elseif($this_month_a || $this_month){
+		} elseif($this_month_a || $this_month){
 			$this_month_r = date('m', current_time('timestamp'));
 			$days_this_month = date( 't', current_time('timestamp') );
 			$_where['REG_date']= array('BETWEEN',
@@ -985,18 +988,18 @@ 
 					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $this_year_r . '-' . $this_month_r . '-01' . ' ' . $time_start, 'Y-m-d H:i:s' ),
 					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $this_year_r . '-' . $this_month_r . '-' . $days_this_month . ' ' . $time_end, 'Y-m-d H:i:s' )
 			));
-		}elseif($month_range){
+		} elseif($month_range){
 			$pieces = explode(' ', $this->_req_data['month_range'], 3);
 			$month_r = !empty($pieces[0]) ? date('m', strtotime($pieces[0])) : '';
 			$year_r = !empty($pieces[1]) ? $pieces[1] : '';
 			$days_in_month = date('t', strtotime($year_r .  '-' . $month_r . '-' . '01') );
 			$_where['REG_date']= array('BETWEEN',
 				array(  EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $year_r . '-' . $month_r . '-01 00:00:00', 'Y-m-d H:i:s'), EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $year_r . '-' . $month_r . '-' . $days_in_month .  ' 23:59:59', 'Y-m-d H:i:s' ) ) );
-		}elseif($start_date && $end_date){
+		} elseif($start_date && $end_date){
 			throw new EE_Error("not yet supported");
-		}elseif($start_date){
+		} elseif($start_date){
 			throw new EE_Error("not yet supported");
-		}elseif($end_date){
+		} elseif($end_date){
 			throw new EE_Error("not yet supported");
 		}
 
@@ -1931,8 +1934,9 @@ 
 			// 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;
+				if ( ! $REG instanceof EE_Registration ) {
+									continue;
+				}
 				$deleted = $this->_delete_registration($REG);
 				if ( !$deleted ) {
 					$success = 0;
@@ -1971,8 +1975,9 @@ 
 
 		$all_trashed = TRUE;
 		foreach ( $REGS as $registration ) {
-			if ( ! $registration->get('REG_deleted') )
-				$all_trashed = FALSE;
+			if ( ! $registration->get('REG_deleted') ) {
+							$all_trashed = FALSE;
+			}
 		}
 
 		if ( ! $all_trashed ) {
@@ -1998,8 +2003,10 @@ 
 			//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.
+			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');
@@ -2554,8 +2561,9 @@ 
 			}
 		}
 
-		if ( $success === FALSE )
-			EE_Error::add_error(__('Something went wrong with updating the meta table data for the registration.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( $success === FALSE ) {
+					EE_Error::add_error(__('Something went wrong with updating the meta table data for the registration.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		}
 
 	}
 

admin_pages/events/Events_Admin_List_Table.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -503,7 +503,7 @@
 	/**
 	 * @param $message_types
 	 * @param array $extra
-	 * @return mixed|string
+	 * @return string
 	 */
 	protected function _get_admin_content_events_edit( $message_types, $extra ) {
 		//defaults

Spacing +77 added lines, -77 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -43,9 +43,9 @@ 
 	 *
 	 * @param EE_Admin_Page $admin_page
 	 */
-	public function __construct( $admin_page ) {
+	public function __construct($admin_page) {
 		parent::__construct($admin_page);
-		require_once( EE_HELPERS . 'EEH_DTT_Helper.helper.php' );
+		require_once(EE_HELPERS.'EEH_DTT_Helper.helper.php');
 	}
 
 
@@ -54,7 +54,7 @@ 
 	 */
 	protected function _setup_data() {
 		$this->_data = $this->_admin_page->get_events($this->_per_page, $this->_current_page);
- 		$this->_all_data_count = $this->_admin_page->get_events(0,0, TRUE);
+ 		$this->_all_data_count = $this->_admin_page->get_events(0, 0, TRUE);
 	}
 
 
@@ -85,17 +85,17 @@ 
 
 
 		$this->_sortable_columns = array(
-			'id' => array( 'EVT_ID' => true ),
-			'name' => array( 'EVT_name' => false ),
-			'author' => array( 'EVT_wp_user' => false ),
-			'venue' => array( 'Venue.VNU_name' => false ),
+			'id' => array('EVT_ID' => true),
+			'name' => array('EVT_name' => false),
+			'author' => array('EVT_wp_user' => false),
+			'venue' => array('Venue.VNU_name' => false),
 			'start_date_time' => array('Datetime.DTT_EVT_start' => false),
 			'reg_begins' => array('Datetime.Ticket.TKT_start_date' => false),
 			);
 
 		$this->_primary_column = 'id';
 
-		$this->_hidden_columns = array( 'author' );
+		$this->_hidden_columns = array('author');
 	}
 
 
@@ -113,7 +113,7 @@ 
 	protected function _add_view_counts() {
 		$this->_views['all']['count'] = $this->_admin_page->total_events();
 		$this->_views['draft']['count'] = $this->_admin_page->total_events_draft();
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_events', 'espresso_events_trash_events' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_events', 'espresso_events_trash_events')) {
 			$this->_views['trash']['count'] = $this->_admin_page->total_trashed_events();
 		}
 	}
@@ -124,11 +124,11 @@ 
 	 *
 	 * @return string
 	 */
-	protected function _get_row_class( $item ) {
-		$class = parent::_get_row_class( $item );
+	protected function _get_row_class($item) {
+		$class = parent::_get_row_class($item);
 		//add status class
-		$class .= $item instanceof EE_Event ? ' ee-status-strip event-status-' . $item->get_active_status() : '';
-		if ( $this->_has_checkbox_column ) {
+		$class .= $item instanceof EE_Event ? ' ee-status-strip event-status-'.$item->get_active_status() : '';
+		if ($this->_has_checkbox_column) {
 			$class .= ' has-checkbox-column';
 		}
 		return $class;
@@ -140,8 +140,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_status( EE_Event $item ) {
-		return '<span class="ee-status-strip ee-status-strip-td event-status-' . $item->get_active_status() . '"></span>';
+	public function column_status(EE_Event $item) {
+		return '<span class="ee-status-strip ee-status-strip-td event-status-'.$item->get_active_status().'"></span>';
 	}/**/
 
 
@@ -150,7 +150,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_cb( $item ) {
+	public function column_cb($item) {
 		$this->_dtt = $item->primary_datetime(); //set this for use in other columns
 
 		//does event have any attached registrations?
@@ -166,9 +166,9 @@ 
 	 *
 	 * @return mixed|string
 	 */
-	public function column_id( EE_Event $item ) {
+	public function column_id(EE_Event $item) {
 		$content = $item->ID();
-		$content .= '  <span class="show-on-mobile-view-only">' . $item->name() . '</span>';
+		$content .= '  <span class="show-on-mobile-view-only">'.$item->name().'</span>';
 		return $content;
 	}
 
@@ -178,16 +178,16 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_name( EE_Event $item ) {
+	public function column_name(EE_Event $item) {
 		$edit_query_args = array(
 				'action' => 'edit',
 				'post' => $item->ID()
 			);
-		$edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EVENTS_ADMIN_URL );
-		$actions = $this->_column_name_action_setup( $item );
+		$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
+		$actions = $this->_column_name_action_setup($item);
 		$status = ''; //$item->status() !== 'publish' ? ' (' . $item->status() . ')' : '';
-		$content = '<strong><a class="row-title" href="' . $edit_link . '">' . $item->name() . '</a></strong>' . $status;
-		$content .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $item->get_active_status(), false, 'sentence' ) . '</span>';
+		$content = '<strong><a class="row-title" href="'.$edit_link.'">'.$item->name().'</a></strong>'.$status;
+		$content .= '<br><span class="ee-status-text-small">'.EEH_Template::pretty_status($item->get_active_status(), false, 'sentence').'</span>';
 		$content .= $this->row_actions($actions);
 		return $content;
 
@@ -204,72 +204,72 @@ 
 	 *
 	 * @return array array of actions
 	 */
-	protected function _column_name_action_setup( EE_Event $item ) {
+	protected function _column_name_action_setup(EE_Event $item) {
 		//todo: remove when attendees is active
-		if ( !defined('REG_ADMIN_URL') )
+		if ( ! defined('REG_ADMIN_URL'))
 			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
 
 		$actions = array();
 
-		if ( EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID())) {
 			$edit_query_args = array(
 					'action' => 'edit',
 					'post' => $item->ID()
 				);
-			$edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EVENTS_ADMIN_URL );
-			$actions['edit'] = '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event', 'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>';
+			$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
+			$actions['edit'] = '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Event', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>';
 
 		}
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID())) {
 			$attendees_query_args = array(
 					'action' => 'default',
 					'event_id' => $item->ID()
 				);
-			$attendees_link = EE_Admin_Page::add_query_args_and_nonce( $attendees_query_args, REG_ADMIN_URL );
-			$actions['attendees'] = '<a href="' . $attendees_link . '" title="' . esc_attr__('View Registrations', 'event_espresso') . '">' . __('Registrations', 'event_espresso') . '</a>';
+			$attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
+			$actions['attendees'] = '<a href="'.$attendees_link.'" title="'.esc_attr__('View Registrations', 'event_espresso').'">'.__('Registrations', 'event_espresso').'</a>';
 		}
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_trash_event', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_trash_event', $item->ID())) {
 			$trash_event_query_args = array(
 					'action' => 'trash_event',
 					'EVT_ID' => $item->ID()
 				);
-			$trash_event_link = EE_Admin_Page::add_query_args_and_nonce( $trash_event_query_args, EVENTS_ADMIN_URL );
+			$trash_event_link = EE_Admin_Page::add_query_args_and_nonce($trash_event_query_args, EVENTS_ADMIN_URL);
 		}
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_restore_event', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_restore_event', $item->ID())) {
 			$restore_event_query_args = array(
 					'action' => 'restore_event',
 					'EVT_ID' => $item->ID()
 				);
-			$restore_event_link = EE_Admin_Page::add_query_args_and_nonce( $restore_event_query_args, EVENTS_ADMIN_URL );
+			$restore_event_link = EE_Admin_Page::add_query_args_and_nonce($restore_event_query_args, EVENTS_ADMIN_URL);
 		}
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_delete_event', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_delete_event', $item->ID())) {
 			$delete_event_query_args = array(
 					'action' => 'delete_event',
 					'EVT_ID' => $item->ID()
 				);
-			$delete_event_link = EE_Admin_Page::add_query_args_and_nonce( $delete_event_query_args, EVENTS_ADMIN_URL );
+			$delete_event_link = EE_Admin_Page::add_query_args_and_nonce($delete_event_query_args, EVENTS_ADMIN_URL);
 		}
 
 		$view_link = get_permalink($item->ID());
 
-		$actions['view'] = '<a href="' . $view_link . '" title="' . esc_attr__('View Event', 'event_espresso') . '">' . __('View', 'event_espresso') . '</a>';
+		$actions['view'] = '<a href="'.$view_link.'" title="'.esc_attr__('View Event', 'event_espresso').'">'.__('View', 'event_espresso').'</a>';
 
-		switch ( $item->get( 'status' ) ) {
+		switch ($item->get('status')) {
 			case 'trash' :
-					if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_restore_event', $item->ID() ) ) {
-						$actions['restore_from_trash'] = '<a href="' . $restore_event_link . '" title="' . esc_attr__('Restore from Trash', 'event_espresso') . '">' . __('Restore from Trash', 'event_espresso') . '</a>';
+					if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_restore_event', $item->ID())) {
+						$actions['restore_from_trash'] = '<a href="'.$restore_event_link.'" title="'.esc_attr__('Restore from Trash', 'event_espresso').'">'.__('Restore from Trash', 'event_espresso').'</a>';
 					}
-					if ( $item->count_related('Registration') === 0 && EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_delete_event', $item->ID() ) ) {
-						$actions['delete'] = '<a href="' . $delete_event_link . '" title="' . esc_attr__('Delete Permanently', 'event_espresso') . '">' . __('Delete Permanently', 'event_espresso') . '</a>';
+					if ($item->count_related('Registration') === 0 && EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_delete_event', $item->ID())) {
+						$actions['delete'] = '<a href="'.$delete_event_link.'" title="'.esc_attr__('Delete Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
 					}
 				break;
 			default :
-					if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_trash_event', $item->ID() ) ) {
-						$actions['move to trash'] = '<a href="' . $trash_event_link . '" title="' . esc_attr__('Trash Event', 'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>';
+					if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_trash_event', $item->ID())) {
+						$actions['move to trash'] = '<a href="'.$trash_event_link.'" title="'.esc_attr__('Trash Event', 'event_espresso').'">'.__('Trash', 'event_espresso').'</a>';
 					}
 		}
 		return $actions;
@@ -281,17 +281,17 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_author( EE_Event $item ) {
+	public function column_author(EE_Event $item) {
 		//user author info
-		$event_author = get_userdata( $item->wp_user() );
-		$gravatar = get_avatar( $item->wp_user(), '15' );
+		$event_author = get_userdata($item->wp_user());
+		$gravatar = get_avatar($item->wp_user(), '15');
 		//filter link
 		$query_args = array(
 			'action' => 'default',
 			'EVT_wp_user' => $item->wp_user()
 			);
-		$filter_url = EE_Admin_Page::add_query_args_and_nonce( $query_args, EVENTS_ADMIN_URL );
-		return $gravatar . '  <a href="' . $filter_url . '" title="' . esc_attr__('Click to filter events by this author.', 'event_espresso') . '">' . $event_author->display_name . '</a>';
+		$filter_url = EE_Admin_Page::add_query_args_and_nonce($query_args, EVENTS_ADMIN_URL);
+		return $gravatar.'  <a href="'.$filter_url.'" title="'.esc_attr__('Click to filter events by this author.', 'event_espresso').'">'.$event_author->display_name.'</a>';
 	}
 
 
@@ -300,9 +300,9 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_venue( EE_Event $item ) {
-		$venue = $item->get_first_related( 'Venue' );
-		return !empty( $venue ) ? $venue->name() : '';
+	public function column_venue(EE_Event $item) {
+		$venue = $item->get_first_related('Venue');
+		return ! empty($venue) ? $venue->name() : '';
 	}
 
 
@@ -311,10 +311,10 @@ 
 	 *
 	 * @throws EE_Error
 	 */
-	public function column_start_date_time( EE_Event $item ) {
-		echo !empty( $this->_dtt ) ?  $this->_dtt->get_i18n_datetime('DTT_EVT_start') : __('No Date was saved for this Event', 'event_espresso');
+	public function column_start_date_time(EE_Event $item) {
+		echo ! empty($this->_dtt) ? $this->_dtt->get_i18n_datetime('DTT_EVT_start') : __('No Date was saved for this Event', 'event_espresso');
 		//display in user's timezone?
-		echo !empty( $this->_dtt ) ? $this->_dtt->display_in_my_timezone('DTT_EVT_start', 'get_i18n_datetime', '', 'My Timezone: ' ) : '';
+		echo ! empty($this->_dtt) ? $this->_dtt->display_in_my_timezone('DTT_EVT_start', 'get_i18n_datetime', '', 'My Timezone: ') : '';
 
 	}
 
@@ -324,11 +324,11 @@ 
 	 *
 	 * @throws EE_Error
 	 */
-	public function column_reg_begins( EE_Event $item ) {
+	public function column_reg_begins(EE_Event $item) {
 		$reg_start = $item->get_ticket_with_earliest_start_time();
-		echo !empty( $reg_start ) ? $reg_start->get_i18n_datetime('TKT_start_date') : __('No Tickets have been setup for this Event', 'event_espresso');
+		echo ! empty($reg_start) ? $reg_start->get_i18n_datetime('TKT_start_date') : __('No Tickets have been setup for this Event', 'event_espresso');
 		//display in user's timezone?
-		echo !empty( $reg_start ) ? $reg_start->display_in_my_timezone('TKT_start_date', 'get_i18n_datetime', '', 'My Timezone: ' ) : '';/**/
+		echo ! empty($reg_start) ? $reg_start->display_in_my_timezone('TKT_start_date', 'get_i18n_datetime', '', 'My Timezone: ') : ''; /**/
 	}
 
 
@@ -337,14 +337,14 @@ 
 	 *
 	 * @return int|string
 	 */
-	public function column_attendees( EE_Event $item ) {
+	public function column_attendees(EE_Event $item) {
 		$attendees_query_args = array(
 				'action' => 'default',
 				'event_id' => $item->ID()
 			);
-		$attendees_link = EE_Admin_Page::add_query_args_and_nonce( $attendees_query_args, REG_ADMIN_URL );
-		$registered_attendees = EEM_Registration::instance()->get_event_registration_count( $item->ID() );
-		return  EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ? '<a href="' . $attendees_link . '">' . $registered_attendees . '</a>' : $registered_attendees;
+		$attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
+		$registered_attendees = EEM_Registration::instance()->get_event_registration_count($item->ID());
+		return  EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID()) ? '<a href="'.$attendees_link.'">'.$registered_attendees.'</a>' : $registered_attendees;
 	}
 
 
@@ -353,8 +353,8 @@ 
 	 *
 	 * @return float
 	 */
-	public function column_tkts_sold( EE_Event $item ) {
-		return EEM_Ticket::instance()->sum(array( array('Datetime.EVT_ID' => $item->ID() )), 'TKT_sold' );
+	public function column_tkts_sold(EE_Event $item) {
+		return EEM_Ticket::instance()->sum(array(array('Datetime.EVT_ID' => $item->ID())), 'TKT_sold');
 	}
 
 
@@ -363,38 +363,38 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_actions( EE_Event $item ) {
+	public function column_actions(EE_Event $item) {
 		//todo: remove when attendees is active
-		if ( !defined('REG_ADMIN_URL') )
+		if ( ! defined('REG_ADMIN_URL'))
 			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
 		$actionlinks = array();
 
 		$view_link = get_permalink($item->ID());
 
-		$actionlinks[] = '<a href="' .  $view_link . '" title="' . esc_attr__('View Event', 'event_espresso') . '" target="_blank">';
+		$actionlinks[] = '<a href="'.$view_link.'" title="'.esc_attr__('View Event', 'event_espresso').'" target="_blank">';
 		$actionlinks[] = '<div class="dashicons dashicons-search"></div></a>';
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID())) {
 			$edit_query_args = array(
 					'action' => 'edit',
 					'post' => $item->ID()
 				);
-			$edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EVENTS_ADMIN_URL );
-			$actionlinks[] = '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event', 'event_espresso') . '"><div class="ee-icon ee-icon-calendar-edit"></div></a>';
+			$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
+			$actionlinks[] = '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Event', 'event_espresso').'"><div class="ee-icon ee-icon-calendar-edit"></div></a>';
 		}
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID())) {
 			$attendees_query_args = array(
 				'action' => 'default',
 				'event_id' => $item->ID()
 			);
-			$attendees_link = EE_Admin_Page::add_query_args_and_nonce( $attendees_query_args, REG_ADMIN_URL );
-			$actionlinks[] = '<a href="' . $attendees_link . '" title="' . esc_attr__('View Registrants', 'event_espresso') . '"><div class="dashicons dashicons-groups"></div></a>';
+			$attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
+			$actionlinks[] = '<a href="'.$attendees_link.'" title="'.esc_attr__('View Registrants', 'event_espresso').'"><div class="dashicons dashicons-groups"></div></a>';
 		}
 
-		$actionlinks = apply_filters( 'FHEE__Events_Admin_List_Table__column_actions__action_links', $actionlinks, $item );
+		$actionlinks = apply_filters('FHEE__Events_Admin_List_Table__column_actions__action_links', $actionlinks, $item);
 
-		return $this->_action_string( implode( "\n\t", $actionlinks ), $item, 'div' );
+		return $this->_action_string(implode("\n\t", $actionlinks), $item, 'div');
 	}