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/admin/EE_Admin_Page.core.php

Indentation +72 added lines, -72 removed lines

@@ -1,18 +1,18 @@ 
 <?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			{@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
- * @ link				{@link http://www.eventespresso.com}
- * @ since		 		4.0
- *
- * ------------------------------------------------------------------------
- */
+	 * 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			{@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
+	 * @ link				{@link http://www.eventespresso.com}
+	 * @ since		 		4.0
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 
 
 
@@ -1301,8 +1301,8 @@ 
 	 * 		verifies user access for this admin page
 	 * 		@param string $route_to_check if present then the capability for the route matching this string is checked.
 	 * 		@param bool   $verify_only Default is FALSE which means if user check fails then wp_die().  Otherwise just return false if verify fail.
-	*		@return 		BOOL|wp_die()
-	*/
+	 *		@return 		BOOL|wp_die()
+	 */
 	public function check_user_access( $route_to_check = '', $verify_only = FALSE ) {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 		$route_to_check = empty( $route_to_check ) ? $this->_req_action : $route_to_check;
@@ -1703,11 +1703,11 @@ 
 
 
 	/**
-	*		admin_footer_scripts_eei18n_js_strings
-	*
-	*		@access 		public
-	*		@return 		void
-	*/
+	 *		admin_footer_scripts_eei18n_js_strings
+	 *
+	 *		@access 		public
+	 *		@return 		void
+	 */
 	public function admin_footer_scripts_eei18n_js_strings() {
 
 		EE_Registry::$i18n_js_strings['ajax_url'] = WP_AJAX_URL;
@@ -1763,11 +1763,11 @@ 
 
 
 	/**
-	*		load enhanced xdebug styles for ppl with failing eyesight
-	*
-	*		@access 		public
-	*		@return 		void
-	*/
+	 *		load enhanced xdebug styles for ppl with failing eyesight
+	 *
+	 *		@access 		public
+	 *		@return 		void
+	 */
 	public function add_xdebug_style() {
 		echo '<style>.xdebug-error { font-size:1.5em; }</style>';
 	}
@@ -1824,9 +1824,9 @@ 
 
 	/**
 	 * 		set current view for List Table
-	*		@access public
-	*		@return array
-	*/
+	 *		@access public
+	 *		@return array
+	 */
 	protected function _set_list_table_view() {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 
@@ -1903,7 +1903,7 @@ 
 	 * @access protected
 	 * @param int $max_entries total number of rows in the table
 	 * @return string
-	*/
+	 */
 	protected function _entries_per_page_dropdown( $max_entries = FALSE ) {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
@@ -1948,9 +1948,9 @@ 
 
 	/**
 	 * 		_set_search_attributes
-	*		@access 		protected
-	*		@return 		void
-	*/
+	 *		@access 		protected
+	 *		@return 		void
+	 */
 	public function _set_search_attributes() {
 		$this->_template_args['search']['btn_label'] = sprintf( __( 'Search %s', 'event_espresso' ), empty( $this->_search_btn_label ) ? $this->page_label : $this->_search_btn_label );
 		$this->_template_args['search']['callback'] = 'search_' . $this->page_slug;
@@ -1970,7 +1970,7 @@ 
 	 * @link http://codex.wordpress.org/Function_Reference/add_meta_box
 	 * @access private
 	 * @return void
-	*/
+	 */
 	private function _add_registered_meta_boxes() {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 
@@ -2230,9 +2230,9 @@ 
 
 	/**
 	 * 		displays an error message to ppl who have javascript disabled
-	*		@access 		private
-	*		@return 		string
-	*/
+	 *		@access 		private
+	 *		@return 		string
+	 */
 	private function _display_no_javascript_warning() {
 		?>
 		<noscript>
@@ -2255,9 +2255,9 @@ 
 
 	/**
 	 * 		displays espresso success and/or error notices
-	*		@access 		private
-	*		@return 		string
-	*/
+	 *		@access 		private
+	 *		@return 		string
+	 */
 	private function _display_espresso_notices() {
 		$notices = $this->_get_transient( TRUE );
 		echo stripslashes($notices);
@@ -2269,10 +2269,10 @@ 
 
 
 	/**
-	*		spinny things pacify the masses
-	*		@access private
-	*		@return string
-	*/
+	 *		spinny things pacify the masses
+	 *		@access private
+	 *		@return string
+	 */
 	protected function _add_admin_page_ajax_loading_img() {
 		?>
 			<div id="espresso-ajax-loading" class="ajax-loading-grey">
@@ -2286,10 +2286,10 @@ 
 
 
 	/**
-	*		add admin page overlay for modal boxes
-	*		@access private
-	*		@return string
-	*/
+	 *		add admin page overlay for modal boxes
+	 *		@access private
+	 *		@return string
+	 */
 	protected function _add_admin_page_overlay() {
 		?>
 		<div id="espresso-admin-page-overlay-dv" class=""></div>
@@ -2351,10 +2351,10 @@ 
 
 
 	/**
-	*		generates  HTML wrapper for an admin details page
-	*		@access public
-	*		@return void
-	*/
+	 *		generates  HTML wrapper for an admin details page
+	 *		@access public
+	 *		@return void
+	 */
 	public function display_admin_page_with_sidebar() {
 
 		$this->_display_admin_page(TRUE);
@@ -2364,10 +2364,10 @@ 
 
 
 	/**
-	*		generates  HTML wrapper for an admin details page (except no sidebar)
-	*		@access public
-	*		@return void
-	*/
+	 *		generates  HTML wrapper for an admin details page (except no sidebar)
+	 *		@access public
+	 *		@return void
+	 */
 	public function display_admin_page_with_no_sidebar() {
 		$this->_display_admin_page();
 	}
@@ -2591,11 +2591,11 @@ 
 		// make sure there are no php errors or headers_sent.  Then we can set correct json header.
 		if ( NULL === error_get_last() || ! headers_sent() )
 			header('Content-Type: application/json; charset=UTF-8');
-                if( function_exists( 'wp_json_encode' ) ) {
-                    echo wp_json_encode( $json );
-                } else {
-                    echo json_encode( $json );
-                }
+				if( function_exists( 'wp_json_encode' ) ) {
+					echo wp_json_encode( $json );
+				} else {
+					echo json_encode( $json );
+				}
 		exit();
 	}
 
@@ -2634,11 +2634,11 @@ 
 
 
 	/**
-	*		generates  HTML wrapper with Tabbed nav for an admin page
-	*		@access public
-	*		@param  boolean $about whether to use the special about page wrapper or default.
-	*		@return void
-	*/
+	 *		generates  HTML wrapper with Tabbed nav for an admin page
+	 *		@access public
+	 *		@param  boolean $about whether to use the special about page wrapper or default.
+	 *		@return void
+	 */
 	public function admin_page_wrapper($about = FALSE) {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
@@ -2692,15 +2692,15 @@ 
 
 
 	/**
-	*		sort nav tabs
-	*		@access public
-	*		@return void
-	*/
+	 *		sort nav tabs
+	 *		@access public
+	 *		@return void
+	 */
 	private function _sort_nav_tabs( $a, $b ) {
 		if ($a['order'] == $b['order']) {
-	        return 0;
-	    }
-	    return ($a['order'] < $b['order']) ? -1 : 1;
+			return 0;
+		}
+		return ($a['order'] < $b['order']) ? -1 : 1;
 	}
 
 

Spacing +595 added lines, -595 removed lines

@@ -144,9 +144,9 @@ 
 	 * 		@access public
 	 * 		@return void
 	 */
-	public function __construct( $routing = TRUE ) {
+	public function __construct($routing = TRUE) {
 
-		if ( strpos( $this->_get_dir(), 'caffeinated' ) !== false )
+		if (strpos($this->_get_dir(), 'caffeinated') !== false)
 			$this->_is_caf = TRUE;
 
 		$this->_yes_no_values = array(
@@ -157,7 +157,7 @@ 
 
 
 		//set the _req_data property.
-		$this->_req_data = array_merge( $_GET, $_POST );
+		$this->_req_data = array_merge($_GET, $_POST);
 
 
 		//routing enabled?
@@ -178,7 +178,7 @@ 
 		$this->_do_other_page_hooks();
 
 		//This just allows us to have extending clases do something specific before the parent constructor runs _page_setup.
-		if ( method_exists( $this, '_before_page_setup' ) )
+		if (method_exists($this, '_before_page_setup'))
 			$this->_before_page_setup();
 
 		//set up page dependencies
@@ -448,16 +448,16 @@ 
 	 */
 	protected function _global_ajax_hooks() {
 		//for lazy loading of metabox content
-		add_action( 'wp_ajax_espresso-ajax-content', array( $this, 'ajax_metabox_content'), 10 );
+		add_action('wp_ajax_espresso-ajax-content', array($this, 'ajax_metabox_content'), 10);
 	}
 
 
 
 	public function ajax_metabox_content() {
-		$contentid = isset( $this->_req_data['contentid'] ) ? $this->_req_data['contentid'] : '';
-		$url = isset( $this->_req_data['contenturl'] ) ? $this->_req_data['contenturl'] : '';
+		$contentid = isset($this->_req_data['contentid']) ? $this->_req_data['contentid'] : '';
+		$url = isset($this->_req_data['contenturl']) ? $this->_req_data['contenturl'] : '';
 
-		self::cached_rss_display( $contentid, $url );
+		self::cached_rss_display($contentid, $url);
 		wp_die();
 	}
 
@@ -478,87 +478,87 @@ 
 
 
 		//admin_init stuff - global - we're setting this REALLY early so if EE_Admin pages have to hook into other WP pages they can.  But keep in mind, not everything is available from the EE_Admin Page object at this point.
-		add_action( 'admin_init', array( $this, 'admin_init_global' ), 5 );
+		add_action('admin_init', array($this, 'admin_init_global'), 5);
 
 
 		//next verify if we need to load anything...
-		$this->_current_page = !empty( $_GET['page'] ) ? sanitize_key( $_GET['page'] ) : FALSE;
-		$this->page_folder = strtolower( str_replace( '_Admin_Page', '', str_replace( 'Extend_', '', get_class($this) ) ) );
+		$this->_current_page = ! empty($_GET['page']) ? sanitize_key($_GET['page']) : FALSE;
+		$this->page_folder = strtolower(str_replace('_Admin_Page', '', str_replace('Extend_', '', get_class($this))));
 
 		global $ee_menu_slugs;
 		$ee_menu_slugs = (array) $ee_menu_slugs;
 
-		if ( ( !$this->_current_page || ! isset( $ee_menu_slugs[$this->_current_page] ) ) && !defined( 'DOING_AJAX') ) return FALSE;
+		if (( ! $this->_current_page || ! isset($ee_menu_slugs[$this->_current_page])) && ! defined('DOING_AJAX')) return FALSE;
 
 
 		// becuz WP List tables have two duplicate select inputs for choosing bulk actions, we need to copy the action from the second to the first
-		if ( isset( $this->_req_data['action2'] ) && $this->_req_data['action'] == -1 ) {
-			$this->_req_data['action'] = ! empty( $this->_req_data['action2'] ) && $this->_req_data['action2'] != -1 ? $this->_req_data['action2'] : $this->_req_data['action'];
+		if (isset($this->_req_data['action2']) && $this->_req_data['action'] == -1) {
+			$this->_req_data['action'] = ! empty($this->_req_data['action2']) && $this->_req_data['action2'] != -1 ? $this->_req_data['action2'] : $this->_req_data['action'];
 		}
 		// then set blank or -1 action values to 'default'
-		$this->_req_action = isset( $this->_req_data['action'] ) && ! empty( $this->_req_data['action'] ) && $this->_req_data['action'] != -1 ? sanitize_key( $this->_req_data['action'] ) : 'default';
+		$this->_req_action = isset($this->_req_data['action']) && ! empty($this->_req_data['action']) && $this->_req_data['action'] != -1 ? sanitize_key($this->_req_data['action']) : 'default';
 
 		//if action is 'default' after the above BUT we have  'route' var set, then let's use the route as the action.  This covers cases where we're coming in from a list table that isn't on the default route.
-		$this->_req_action = $this->_req_action == 'default' && isset( $this->_req_data['route'] ) ? $this->_req_data['route'] : $this->_req_action;
+		$this->_req_action = $this->_req_action == 'default' && isset($this->_req_data['route']) ? $this->_req_data['route'] : $this->_req_action;
 
 		//however if we are doing_ajax and we've got a 'route' set then that's what the req_action will be
 		$this->_req_action = defined('DOING_AJAX') && isset($this->_req_data['route']) ? $this->_req_data['route'] : $this->_req_action;
 
 		$this->_current_view = $this->_req_action;
-		$this->_req_nonce = $this->_req_action . '_nonce';
+		$this->_req_nonce = $this->_req_action.'_nonce';
 		$this->_define_page_props();
 
-		$this->_current_page_view_url = add_query_arg( array( 'page' => $this->_current_page, 'action' => $this->_current_view ),  $this->_admin_base_url );
+		$this->_current_page_view_url = add_query_arg(array('page' => $this->_current_page, 'action' => $this->_current_view), $this->_admin_base_url);
 
 		//default things
-		$this->_default_espresso_metaboxes = array('_espresso_news_post_box', '_espresso_links_post_box', '_espresso_ratings_request', '_espresso_sponsors_post_box' );
+		$this->_default_espresso_metaboxes = array('_espresso_news_post_box', '_espresso_links_post_box', '_espresso_ratings_request', '_espresso_sponsors_post_box');
 
 		//set page configs
 		$this->_set_page_routes();
 		$this->_set_page_config();
 
 		//let's include any referrer data in our default_query_args for this route for "stickiness".
-		if ( isset( $this->_req_data['wp_referer'] ) ) {
+		if (isset($this->_req_data['wp_referer'])) {
 			$this->_default_route_query_args['wp_referer'] = $this->_req_data['wp_referer'];
 		}
 
 		//for caffeinated and other extended functionality.  If there is a _extend_page_config method then let's run that to modify the all the various page configuration arrays
-		if ( method_exists( $this, '_extend_page_config' ) )
+		if (method_exists($this, '_extend_page_config'))
 			$this->_extend_page_config();
 
 		//for CPT and other extended functionality. If there is an _extend_page_config_for_cpt then let's run that to modify all the various page configuration arrays.
-		if ( method_exists( $this, '_extend_page_config_for_cpt' ) )
+		if (method_exists($this, '_extend_page_config_for_cpt'))
 			$this->_extend_page_config_for_cpt();
 
 		//filter routes and page_config so addons can add their stuff. Filtering done per class
-		$this->_page_routes = apply_filters( 'FHEE__' . get_class($this) . '__page_setup__page_routes', $this->_page_routes, $this );
-		$this->_page_config = apply_filters( 'FHEE__' . get_class($this) . '__page_setup__page_config', $this->_page_config, $this );
+		$this->_page_routes = apply_filters('FHEE__'.get_class($this).'__page_setup__page_routes', $this->_page_routes, $this);
+		$this->_page_config = apply_filters('FHEE__'.get_class($this).'__page_setup__page_config', $this->_page_config, $this);
 
 
 		//if AHEE__EE_Admin_Page__route_admin_request_$this->_current_view method is present then we call it hooked into the AHEE__EE_Admin_Page__route_admin_request action
-		if ( method_exists( $this, 'AHEE__EE_Admin_Page__route_admin_request_' . $this->_current_view ) ) {
-			add_action( 'AHEE__EE_Admin_Page__route_admin_request', array( $this, 'AHEE__EE_Admin_Page__route_admin_request_' . $this->_current_view ), 10, 2 );
+		if (method_exists($this, 'AHEE__EE_Admin_Page__route_admin_request_'.$this->_current_view)) {
+			add_action('AHEE__EE_Admin_Page__route_admin_request', array($this, 'AHEE__EE_Admin_Page__route_admin_request_'.$this->_current_view), 10, 2);
 		}
 
 
 		//next route only if routing enabled
-		if ( $this->_routing && !defined('DOING_AJAX') ) {
+		if ($this->_routing && ! defined('DOING_AJAX')) {
 
 			$this->_verify_routes();
 
 			//next let's just check user_access and kill if no access
 			$this->check_user_access();
 
-			if ( $this->_is_UI_request ) {
+			if ($this->_is_UI_request) {
 				//admin_init stuff - global, all views for this page class, specific view
-				add_action( 'admin_init', array( $this, 'admin_init' ), 10 );
-				if ( method_exists( $this, 'admin_init_' . $this->_current_view )) {
-					add_action( 'admin_init', array( $this, 'admin_init_' . $this->_current_view ), 15 );
+				add_action('admin_init', array($this, 'admin_init'), 10);
+				if (method_exists($this, 'admin_init_'.$this->_current_view)) {
+					add_action('admin_init', array($this, 'admin_init_'.$this->_current_view), 15);
 				}
 
 			} else {
 				//hijack regular WP loading and route admin request immediately
-				@ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+				@ini_set('memory_limit', apply_filters('admin_memory_limit', WP_MAX_MEMORY_LIMIT));
 				$this->route_admin_request();
 			}
 		}
@@ -575,18 +575,18 @@ 
 	 * @return void
 	 */
 	private function _do_other_page_hooks() {
-		$registered_pages = apply_filters( 'FHEE_do_other_page_hooks_' . $this->page_slug, array() );
+		$registered_pages = apply_filters('FHEE_do_other_page_hooks_'.$this->page_slug, array());
 
-		foreach ( $registered_pages as $page ) {
+		foreach ($registered_pages as $page) {
 
 			//now let's setup the file name and class that should be present
 			$classname = str_replace('.class.php', '', $page);
 
 			//autoloaders should take care of loading file
-			if ( !class_exists( $classname ) ) {
-				$error_msg[] = sprintf( __('Something went wrong with loading the %s admin hooks page.', 'event_espresso' ), $page);
-				$error_msg[] = $error_msg[0] . "\r\n" . sprintf( __( 'There is no class in place for the %s admin hooks page.%sMake sure you have <strong>%s</strong> defined. If this is a non-EE-core admin page then you also must have an autoloader in place for your class', 'event_espresso'), $page, '<br />', $classname );
-				throw new EE_Error( implode( '||', $error_msg ));
+			if ( ! class_exists($classname)) {
+				$error_msg[] = sprintf(__('Something went wrong with loading the %s admin hooks page.', 'event_espresso'), $page);
+				$error_msg[] = $error_msg[0]."\r\n".sprintf(__('There is no class in place for the %s admin hooks page.%sMake sure you have <strong>%s</strong> defined. If this is a non-EE-core admin page then you also must have an autoloader in place for your class', 'event_espresso'), $page, '<br />', $classname);
+				throw new EE_Error(implode('||', $error_msg));
 			}
 
 			$a = new ReflectionClass($classname);
@@ -601,7 +601,7 @@ 
 	public function load_page_dependencies() {
 		try {
 			$this->_load_page_dependencies();
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 	}
@@ -619,16 +619,16 @@ 
 		$this->_current_screen = get_current_screen();
 
 		//load admin_notices - global, page class, and view specific
-		add_action( 'admin_notices', array( $this, 'admin_notices_global'), 5 );
-		add_action( 'admin_notices', array( $this, 'admin_notices' ), 10 );
-		if ( method_exists( $this, 'admin_notices_' . $this->_current_view ) ) {
-			add_action( 'admin_notices', array( $this, 'admin_notices_' . $this->_current_view ), 15 );
+		add_action('admin_notices', array($this, 'admin_notices_global'), 5);
+		add_action('admin_notices', array($this, 'admin_notices'), 10);
+		if (method_exists($this, 'admin_notices_'.$this->_current_view)) {
+			add_action('admin_notices', array($this, 'admin_notices_'.$this->_current_view), 15);
 		}
 
 		//load network admin_notices - global, page class, and view specific
-		add_action( 'network_admin_notices', array( $this, 'network_admin_notices_global'), 5 );
-		if ( method_exists( $this, 'network_admin_notices_' . $this->_current_view ) ) {
-			add_action( 'network_admin_notices', array( $this, 'network_admin_notices_' . $this->_current_view ) );
+		add_action('network_admin_notices', array($this, 'network_admin_notices_global'), 5);
+		if (method_exists($this, 'network_admin_notices_'.$this->_current_view)) {
+			add_action('network_admin_notices', array($this, 'network_admin_notices_'.$this->_current_view));
 		}
 
 		//this will save any per_page screen options if they are present
@@ -644,8 +644,8 @@ 
 		//add screen options - global, page child class, and view specific
 		$this->_add_global_screen_options();
 		$this->_add_screen_options();
-		if ( method_exists( $this, '_add_screen_options_' . $this->_current_view ) )
-			call_user_func( array( $this, '_add_screen_options_' . $this->_current_view ) );
+		if (method_exists($this, '_add_screen_options_'.$this->_current_view))
+			call_user_func(array($this, '_add_screen_options_'.$this->_current_view));
 
 
 		//add help tab(s) and tours- set via page_config and qtips.
@@ -656,33 +656,33 @@ 
 		//add feature_pointers - global, page child class, and view specific
 		$this->_add_feature_pointers();
 		$this->_add_global_feature_pointers();
-		if ( method_exists( $this, '_add_feature_pointer_' . $this->_current_view ) )
-			call_user_func( array( $this, '_add_feature_pointer_' . $this->_current_view ) );
+		if (method_exists($this, '_add_feature_pointer_'.$this->_current_view))
+			call_user_func(array($this, '_add_feature_pointer_'.$this->_current_view));
 
 		//enqueue scripts/styles - global, page class, and view specific
-		add_action('admin_enqueue_scripts', array($this, 'load_global_scripts_styles'), 5 );
-		add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles'), 10 );
-		if ( method_exists( $this, 'load_scripts_styles_' . $this->_current_view ) )
-			add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles_' . $this->_current_view ), 15 );
+		add_action('admin_enqueue_scripts', array($this, 'load_global_scripts_styles'), 5);
+		add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles'), 10);
+		if (method_exists($this, 'load_scripts_styles_'.$this->_current_view))
+			add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles_'.$this->_current_view), 15);
 
-		add_action('admin_enqueue_scripts', array( $this, 'admin_footer_scripts_eei18n_js_strings' ), 100 );
+		add_action('admin_enqueue_scripts', array($this, 'admin_footer_scripts_eei18n_js_strings'), 100);
 
 		//admin_print_footer_scripts - global, page child class, and view specific.  NOTE, despite the name, whenever possible, scripts should NOT be loaded using this.  In most cases that's doing_it_wrong().  But adding hidden container elements etc. is a good use case. Notice the late priority we're giving these
-		add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_global' ), 99 );
-		add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts' ), 100 );
-		if ( method_exists( $this, 'admin_footer_scripts_' . $this->_current_view ) )
-			add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_' . $this->_current_view ), 101 );
+		add_action('admin_print_footer_scripts', array($this, 'admin_footer_scripts_global'), 99);
+		add_action('admin_print_footer_scripts', array($this, 'admin_footer_scripts'), 100);
+		if (method_exists($this, 'admin_footer_scripts_'.$this->_current_view))
+			add_action('admin_print_footer_scripts', array($this, 'admin_footer_scripts_'.$this->_current_view), 101);
 
 		//admin footer scripts
-		add_action('admin_footer', array( $this, 'admin_footer_global' ), 99 );
-		add_action('admin_footer', array( $this, 'admin_footer'), 100 );
-		if ( method_exists( $this, 'admin_footer_' . $this->_current_view ) )
-			add_action('admin_footer', array( $this, 'admin_footer_' . $this->_current_view ), 101 );
+		add_action('admin_footer', array($this, 'admin_footer_global'), 99);
+		add_action('admin_footer', array($this, 'admin_footer'), 100);
+		if (method_exists($this, 'admin_footer_'.$this->_current_view))
+			add_action('admin_footer', array($this, 'admin_footer_'.$this->_current_view), 101);
 
 
-		do_action( 'FHEE__EE_Admin_Page___load_page_dependencies__after_load', $this->page_slug );
+		do_action('FHEE__EE_Admin_Page___load_page_dependencies__after_load', $this->page_slug);
 		//targeted hook
-		do_action( 'FHEE__EE_Admin_Page___load_page_dependencies__after_load__' . $this->page_slug . '__' . $this->_req_action );
+		do_action('FHEE__EE_Admin_Page___load_page_dependencies__after_load__'.$this->page_slug.'__'.$this->_req_action);
 
 	}
 
@@ -697,7 +697,7 @@ 
 	private function _set_defaults() {
 		$this->_current_screen = $this->_admin_page_title = $this->_req_action = $this->_req_nonce = $this->_event = $this->_template_path = $this->_column_template_path = NULL;
 
-		$this->_nav_tabs = $this_views = $this->_page_routes = $this->_page_config =  $this->_default_route_query_args = array();
+		$this->_nav_tabs = $this_views = $this->_page_routes = $this->_page_config = $this->_default_route_query_args = array();
 
 		$this->default_nav_tab_name = 'overview';
 
@@ -724,7 +724,7 @@ 
 	public function route_admin_request() {
 		try {
 			$this->_route_admin_request();
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 	}
@@ -735,7 +735,7 @@ 
 		$this->_wp_page_slug = $wp_page_slug;
 
 		//if in network admin then we need to append "-network" to the page slug. Why? Because that's how WP rolls...
-		if ( is_network_admin() ) {
+		if (is_network_admin()) {
 			$this->_wp_page_slug .= '-network';
 		}
 	}
@@ -748,53 +748,53 @@ 
 	 * @return void
 	 */
 	protected function _verify_routes() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		if ( !$this->_current_page && !defined( 'DOING_AJAX')) return FALSE;
+		if ( ! $this->_current_page && ! defined('DOING_AJAX')) return FALSE;
 
 		$this->_route = FALSE;
 		$func = FALSE;
 		$args = array();
 
 		// check that the page_routes array is not empty
-		if ( empty( $this->_page_routes )) {
+		if (empty($this->_page_routes)) {
 			// user error msg
-			$error_msg = sprintf( __('No page routes have been set for the %s admin page.', 'event_espresso'), $this->_admin_page_title );
+			$error_msg = sprintf(__('No page routes have been set for the %s admin page.', 'event_espresso'), $this->_admin_page_title);
 			// developer error msg
-			$error_msg .=  '||' . $error_msg . __( ' Make sure the "set_page_routes()" method exists, and is setting the "_page_routes" array properly.', 'event_espresso' );
-			throw new EE_Error( $error_msg );
+			$error_msg .= '||'.$error_msg.__(' Make sure the "set_page_routes()" method exists, and is setting the "_page_routes" array properly.', 'event_espresso');
+			throw new EE_Error($error_msg);
 		}
 
 		// and that the requested page route exists
-		if ( array_key_exists( $this->_req_action, $this->_page_routes )) {
-			$this->_route = $this->_page_routes[ $this->_req_action ];
+		if (array_key_exists($this->_req_action, $this->_page_routes)) {
+			$this->_route = $this->_page_routes[$this->_req_action];
 			$this->_route_config = isset($this->_page_config[$this->_req_action]) ? $this->_page_config[$this->_req_action] : array();
 		} else {
 			// user error msg
-			$error_msg =  sprintf( __( 'The requested page route does not exist for the %s admin page.', 'event_espresso' ), $this->_admin_page_title );
+			$error_msg = sprintf(__('The requested page route does not exist for the %s admin page.', 'event_espresso'), $this->_admin_page_title);
 			// developer error msg
-			$error_msg .=  '||' . $error_msg . sprintf( __( ' Create a key in the "_page_routes" array named "%s" and set its value to the appropriate method.', 'event_espresso' ), $this->_req_action );
-			throw new EE_Error( $error_msg );
+			$error_msg .= '||'.$error_msg.sprintf(__(' Create a key in the "_page_routes" array named "%s" and set its value to the appropriate method.', 'event_espresso'), $this->_req_action);
+			throw new EE_Error($error_msg);
 		}
 
 		// and that a default route exists
-		if ( ! array_key_exists( 'default', $this->_page_routes )) {
+		if ( ! array_key_exists('default', $this->_page_routes)) {
 			// user error msg
-			$error_msg = sprintf( __( 'A default page route has not been set for the % admin page.', 'event_espresso' ), $this->_admin_page_title );
+			$error_msg = sprintf(__('A default page route has not been set for the % admin page.', 'event_espresso'), $this->_admin_page_title);
 			// developer error msg
-			$error_msg .=  '||' . $error_msg . __( ' Create a key in the "_page_routes" array named "default" and set its value to your default page method.', 'event_espresso' );
-			throw new EE_Error( $error_msg );
+			$error_msg .= '||'.$error_msg.__(' Create a key in the "_page_routes" array named "default" and set its value to your default page method.', 'event_espresso');
+			throw new EE_Error($error_msg);
 		}
 
 
 		//first lets' catch if the UI request has EVER been set.
-		if ( $this->_is_UI_request === NULL ) {
+		if ($this->_is_UI_request === NULL) {
 			//lets set if this is a UI request or not.
-			$this->_is_UI_request = ( ! isset( $this->_req_data['noheader'] ) || $this->_req_data['noheader'] !== TRUE ) ? TRUE : FALSE;
+			$this->_is_UI_request = ( ! isset($this->_req_data['noheader']) || $this->_req_data['noheader'] !== TRUE) ? TRUE : FALSE;
 
 
 			//wait a minute... we might have a noheader in the route array
-			$this->_is_UI_request = is_array($this->_route) && isset($this->_route['noheader'] ) && $this->_route['noheader'] ? FALSE : $this->_is_UI_request;
+			$this->_is_UI_request = is_array($this->_route) && isset($this->_route['noheader']) && $this->_route['noheader'] ? FALSE : $this->_is_UI_request;
 		}
 
 		$this->_set_current_labels();
@@ -809,15 +809,15 @@ 
 	 * @param  string $route the route name we're verifying
 	 * @return mixed  (bool|Exception)      we'll throw an exception if this isn't a valid route.
 	 */
-	protected function _verify_route( $route ) {
-		if ( array_key_exists( $this->_req_action, $this->_page_routes )) {
+	protected function _verify_route($route) {
+		if (array_key_exists($this->_req_action, $this->_page_routes)) {
 			return true;
 		} else {
 			// user error msg
-			$error_msg =  sprintf( __( 'The given page route does not exist for the %s admin page.', 'event_espresso' ), $this->_admin_page_title );
+			$error_msg = sprintf(__('The given page route does not exist for the %s admin page.', 'event_espresso'), $this->_admin_page_title);
 			// developer error msg
-			$error_msg .=  '||' . $error_msg . sprintf( __( ' Check the route you are using in your method (%s) and make sure it matches a route set in your "_page_routes" array property', 'event_espresso' ), $route );
-			throw new EE_Error( $error_msg );
+			$error_msg .= '||'.$error_msg.sprintf(__(' Check the route you are using in your method (%s) and make sure it matches a route set in your "_page_routes" array property', 'event_espresso'), $route);
+			throw new EE_Error($error_msg);
 		}
 	}
 
@@ -831,18 +831,18 @@ 
 	 * @param  string $nonce_ref The nonce reference string (name0)
 	 * @return mixed (bool|die)
 	 */
-	protected function _verify_nonce( $nonce, $nonce_ref ) {
+	protected function _verify_nonce($nonce, $nonce_ref) {
 		// verify nonce against expected value
-		if ( ! wp_verify_nonce( $nonce, $nonce_ref) ) {
+		if ( ! wp_verify_nonce($nonce, $nonce_ref)) {
 			// these are not the droids you are looking for !!!
-			$msg = sprintf(__('%sNonce Fail.%s' , 'event_espresso'), '<a href="http://www.youtube.com/watch?v=56_S0WeTkzs">', '</a>' );
-			if ( WP_DEBUG ) {
-				$msg .= "\n  " . sprintf( __('In order to dynamically generate nonces for your actions, use the %s::add_query_args_and_nonce() method. May the Nonce be with you!', 'event_espresso' ), __CLASS__  );
+			$msg = sprintf(__('%sNonce Fail.%s', 'event_espresso'), '<a href="http://www.youtube.com/watch?v=56_S0WeTkzs">', '</a>');
+			if (WP_DEBUG) {
+				$msg .= "\n  ".sprintf(__('In order to dynamically generate nonces for your actions, use the %s::add_query_args_and_nonce() method. May the Nonce be with you!', 'event_espresso'), __CLASS__);
 			}
-			if ( ! defined( 'DOING_AJAX' )) {
-				wp_die( $msg );
+			if ( ! defined('DOING_AJAX')) {
+				wp_die($msg);
 			} else {
-				EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 				$this->_return_json();
 			}
 		}
@@ -860,63 +860,63 @@ 
 	 * @return void
 	 */
 	protected function _route_admin_request() {
-		if (  ! $this->_is_UI_request )
+		if ( ! $this->_is_UI_request)
 			$this->_verify_routes();
 
-		$nonce_check = isset( $this->_route_config['require_nonce'] ) ? $this->_route_config['require_nonce'] : TRUE;
+		$nonce_check = isset($this->_route_config['require_nonce']) ? $this->_route_config['require_nonce'] : TRUE;
 
-		if ( $this->_req_action != 'default' && $nonce_check ) {
+		if ($this->_req_action != 'default' && $nonce_check) {
 			// set nonce from post data
-			$nonce = isset($this->_req_data[ $this->_req_nonce  ]) ? sanitize_text_field( $this->_req_data[ $this->_req_nonce  ] ) : '';
-			$this->_verify_nonce( $nonce, $this->_req_nonce );
+			$nonce = isset($this->_req_data[$this->_req_nonce]) ? sanitize_text_field($this->_req_data[$this->_req_nonce]) : '';
+			$this->_verify_nonce($nonce, $this->_req_nonce);
 		}
 		//set the nav_tabs array but ONLY if this is  UI_request
-		if ( $this->_is_UI_request )
+		if ($this->_is_UI_request)
 			$this->_set_nav_tabs();
 
 		// grab callback function
-		$func = is_array( $this->_route ) ? $this->_route['func'] : $this->_route;
+		$func = is_array($this->_route) ? $this->_route['func'] : $this->_route;
 
 		// check if callback has args
-		$args = is_array( $this->_route ) && isset( $this->_route['args'] ) ? $this->_route['args'] : array();
+		$args = is_array($this->_route) && isset($this->_route['args']) ? $this->_route['args'] : array();
 
 		$error_msg = '';
 
 		//action right before calling route (hook is something like 'AHEE__Registrations_Admin_Page__route_admin_request')
-		if ( !did_action('AHEE__EE_Admin_Page__route_admin_request')) {
-			do_action( 'AHEE__EE_Admin_Page__route_admin_request', $this->_current_view, $this );
+		if ( ! did_action('AHEE__EE_Admin_Page__route_admin_request')) {
+			do_action('AHEE__EE_Admin_Page__route_admin_request', $this->_current_view, $this);
 		}
 
 		//right before calling the route, let's remove _wp_http_referer from the $_SERVER[REQUEST_URI] global (its now in _req_data for route processing).
-		$_SERVER['REQUEST_URI'] = remove_query_arg( '_wp_http_referer', wp_unslash( $_SERVER['REQUEST_URI'] ) );
+		$_SERVER['REQUEST_URI'] = remove_query_arg('_wp_http_referer', wp_unslash($_SERVER['REQUEST_URI']));
 
-		if ( ! empty( $func )) {
+		if ( ! empty($func)) {
 			$base_call = $addon_call = FALSE;
 			//try to access page route via this class
-			if ( ! is_array( $func ) && method_exists( $this, $func ) && ( $base_call = call_user_func_array( array( $this, &$func  ), $args ) ) === FALSE ) {
+			if ( ! is_array($func) && method_exists($this, $func) && ($base_call = call_user_func_array(array($this, &$func), $args)) === FALSE) {
 				// user error msg
-				$error_msg =  __( 'An error occurred. The  requested page route could not be found.', 'event_espresso' );
+				$error_msg = __('An error occurred. The  requested page route could not be found.', 'event_espresso');
 				// developer error msg
-				$error_msg .= '||' . sprintf( __( 'Page route "%s" could not be called. Check that the spelling for method names and actions in the "_page_routes" array are all correct.', 'event_espresso' ), $func );
+				$error_msg .= '||'.sprintf(__('Page route "%s" could not be called. Check that the spelling for method names and actions in the "_page_routes" array are all correct.', 'event_espresso'), $func);
 			}
 
 			//for pluggability by addons first let's see if just the function exists (this will also work in the case where $func is an array indicating class/method)
 			$args['admin_page_object'] = $this; //send along this admin page object for access by addons.
 
-			if ( $base_call === FALSE && ( $addon_call = call_user_func_array( $func, $args ) )=== FALSE ) {
-				$error_msg = __('An error occurred. The requested page route could not be found', 'event_espresso' );
-				$error_msg .= '||' . sprintf( __('Page route "%s" could not be called.  Check that the spelling for the function name and action in the "_page_routes" array filtered by your plugin is correct.', 'event_espresso'), $func );
+			if ($base_call === FALSE && ($addon_call = call_user_func_array($func, $args)) === FALSE) {
+				$error_msg = __('An error occurred. The requested page route could not be found', 'event_espresso');
+				$error_msg .= '||'.sprintf(__('Page route "%s" could not be called.  Check that the spelling for the function name and action in the "_page_routes" array filtered by your plugin is correct.', 'event_espresso'), $func);
 			}
 
 
-			if ( !empty( $error_msg ) && $base_call === FALSE && $addon_call === FALSE )
-				throw new EE_Error( $error_msg );
+			if ( ! empty($error_msg) && $base_call === FALSE && $addon_call === FALSE)
+				throw new EE_Error($error_msg);
 		}
 
 		//if we've routed and this route has a no headers route AND a sent_headers_route, then we need to reset the routing properties to the new route.
 		//now if UI request is FALSE and noheader is true AND we have a headers_sent_route in the route array then let's set UI_request to true because the no header route has a second func after headers have been sent.
-		if ( $this->_is_UI_request === FALSE && is_array( $this->_route) && ! empty( $this->_route['headers_sent_route'] ) ) {
-			$this->_reset_routing_properties( $this->_route['headers_sent_route'] );
+		if ($this->_is_UI_request === FALSE && is_array($this->_route) && ! empty($this->_route['headers_sent_route'])) {
+			$this->_reset_routing_properties($this->_route['headers_sent_route']);
 		}
 	}
 
@@ -932,7 +932,7 @@ 
 	 * @param  string    $new_route   New (non header) route to redirect to.
 	 * @return   void
 	 */
-	protected function _reset_routing_properties( $new_route ) {
+	protected function _reset_routing_properties($new_route) {
 		$this->_is_UI_request = TRUE;
 		//now we set the current route to whatever the headers_sent_route is set at
 		$this->_req_data['action'] = $new_route;
@@ -978,24 +978,24 @@ 
 	 * @param   bool    $exclude_nonce  If true, the the nonce will be excluded from the generated nonce.
 	 * 	@return string
 	 */
-	public static function add_query_args_and_nonce( $args = array(), $url = false, $sticky = false, $exclude_nonce = false ) {
+	public static function add_query_args_and_nonce($args = array(), $url = false, $sticky = false, $exclude_nonce = false) {
 		EE_Registry::instance()->load_helper('URL');
 
 		//if there is a _wp_http_referer include the values from the request but only if sticky = true
-		if ( $sticky ) {
+		if ($sticky) {
 			$request = $_REQUEST;
-			unset( $request['_wp_http_referer'] );
-			unset( $request['wp_referer'] );
-			foreach ( $request as $key => $value ) {
+			unset($request['_wp_http_referer']);
+			unset($request['wp_referer']);
+			foreach ($request as $key => $value) {
 				//do not add nonces
-				if ( strpos( $key, 'nonce' ) !== false ) {
+				if (strpos($key, 'nonce') !== false) {
 					continue;
 				}
-				$args['wp_referer[' . $key . ']'] = $value;
+				$args['wp_referer['.$key.']'] = $value;
 			}
 		}
 
-		return EEH_URL::add_query_args_and_nonce( $args, $url, $exclude_nonce );
+		return EEH_URL::add_query_args_and_nonce($args, $url, $exclude_nonce);
 	}
 
 
@@ -1011,8 +1011,8 @@ 
 	 * @uses EEH_Template::get_help_tab_link()
 	 * @return string              generated link
 	 */
-	protected function _get_help_tab_link( $help_tab_id, $icon_style = FALSE, $help_text = FALSE ) {
-		return EEH_Template::get_help_tab_link( $help_tab_id, $this->page_slug, $this->_req_action, $icon_style, $help_text );
+	protected function _get_help_tab_link($help_tab_id, $icon_style = FALSE, $help_text = FALSE) {
+		return EEH_Template::get_help_tab_link($help_tab_id, $this->page_slug, $this->_req_action, $icon_style, $help_text);
 	}
 
 
@@ -1029,30 +1029,30 @@ 
 	 */
 	protected function _add_help_tabs() {
 		$tour_buttons = '';
-		if ( isset( $this->_page_config[$this->_req_action] ) ) {
+		if (isset($this->_page_config[$this->_req_action])) {
 			$config = $this->_page_config[$this->_req_action];
 
 			//is there a help tour for the current route?  if there is let's setup the tour buttons
-			if ( isset( $this->_help_tour[$this->_req_action]) ) {
+			if (isset($this->_help_tour[$this->_req_action])) {
 				$tb = array();
 				$tour_buttons = '<div class="ee-abs-container"><div class="ee-help-tour-restart-buttons">';
-				foreach ( $this->_help_tour['tours'] as $tour ) {
+				foreach ($this->_help_tour['tours'] as $tour) {
 					//if this is the end tour then we don't need to setup a button
-					if ( $tour instanceof EE_Help_Tour_final_stop )
+					if ($tour instanceof EE_Help_Tour_final_stop)
 						continue;
-					$tb[] = '<button id="trigger-tour-' . $tour->get_slug() . '" class="button-primary trigger-ee-help-tour">' . $tour->get_label() . '</button>';
+					$tb[] = '<button id="trigger-tour-'.$tour->get_slug().'" class="button-primary trigger-ee-help-tour">'.$tour->get_label().'</button>';
 				}
 				$tour_buttons .= implode('<br />', $tb);
 				$tour_buttons .= '</div></div>';
 			}
 
 			// let's see if there is a help_sidebar set for the current route and we'll set that up for usage as well.
-			if ( is_array( $config ) && isset( $config['help_sidebar'] ) ) {
+			if (is_array($config) && isset($config['help_sidebar'])) {
 				//check that the callback given is valid
-				if ( !method_exists($this, $config['help_sidebar'] ) )
-					throw new EE_Error( sprintf( __('The _page_config array has a callback set for the "help_sidebar" option.  However the callback given (%s) is not a valid callback.  Doublecheck the spelling and make sure this method exists for the class %s', 'event_espresso'), $config['help_sidebar'], get_class($this) ) );
+				if ( ! method_exists($this, $config['help_sidebar']))
+					throw new EE_Error(sprintf(__('The _page_config array has a callback set for the "help_sidebar" option.  However the callback given (%s) is not a valid callback.  Doublecheck the spelling and make sure this method exists for the class %s', 'event_espresso'), $config['help_sidebar'], get_class($this)));
 
-				$content = apply_filters( 'FHEE__' . get_class($this) . '__add_help_tabs__help_sidebar', call_user_func( array( $this, $config['help_sidebar'] ) ) );
+				$content = apply_filters('FHEE__'.get_class($this).'__add_help_tabs__help_sidebar', call_user_func(array($this, $config['help_sidebar'])));
 
 				$content .= $tour_buttons; //add help tour buttons.
 
@@ -1061,49 +1061,49 @@ 
 			}
 
 			//if we DON'T have config help sidebar and there ARE toure buttons then we'll just add the tour buttons to the sidebar.
-			if ( !isset( $config['help_sidebar'] ) && !empty( $tour_buttons ) ) {
+			if ( ! isset($config['help_sidebar']) && ! empty($tour_buttons)) {
 				$this->_current_screen->set_help_sidebar($tour_buttons);
 			}
 
 			//handle if no help_tabs are set so the sidebar will still show for the help tour buttons
-			if ( !isset( $config['help_tabs'] ) && !empty($tour_buttons) ) {
+			if ( ! isset($config['help_tabs']) && ! empty($tour_buttons)) {
 				$_ht['id'] = $this->page_slug;
 				$_ht['title'] = __('Help Tours', 'event_espresso');
-				$_ht['content'] = '<p>' . __('The buttons to the right allow you to start/restart any help tours available for this page', 'event_espresso') . '</p>';
+				$_ht['content'] = '<p>'.__('The buttons to the right allow you to start/restart any help tours available for this page', 'event_espresso').'</p>';
 				$this->_current_screen->add_help_tab($_ht);
 				}/**/
 
 
-			if ( !isset( $config['help_tabs'] ) ) return; //no help tabs for this route
+			if ( ! isset($config['help_tabs'])) return; //no help tabs for this route
 
-			foreach ( (array) $config['help_tabs'] as $tab_id => $cfg ) {
+			foreach ((array) $config['help_tabs'] as $tab_id => $cfg) {
 				//we're here so there ARE help tabs!
 
 				//make sure we've got what we need
-				if ( !isset( $cfg['title'] ) )
-					throw new EE_Error( __('The _page_config array is not set up properly for help tabs.  It is missing a title', 'event_espresso') );
+				if ( ! isset($cfg['title']))
+					throw new EE_Error(__('The _page_config array is not set up properly for help tabs.  It is missing a title', 'event_espresso'));
 
 
-				if ( !isset($cfg['filename']) && !isset( $cfg['callback'] ) && !isset( $cfg['content'] ) )
-					throw new EE_Error( __('The _page_config array is not setup properly for help tabs. It is missing a either a filename reference, or a callback reference or a content reference so there is no way to know the content for the help tab', 'event_espresso') );
+				if ( ! isset($cfg['filename']) && ! isset($cfg['callback']) && ! isset($cfg['content']))
+					throw new EE_Error(__('The _page_config array is not setup properly for help tabs. It is missing a either a filename reference, or a callback reference or a content reference so there is no way to know the content for the help tab', 'event_espresso'));
 
 
 
 				//first priority goes to content.
-				if ( !empty($cfg['content'] ) ) {
-					$content = !empty($cfg['content']) ? $cfg['content'] : NULL;
+				if ( ! empty($cfg['content'])) {
+					$content = ! empty($cfg['content']) ? $cfg['content'] : NULL;
 
 				//second priority goes to filename
-				} else if ( !empty($cfg['filename'] ) ) {
-					$file_path = $this->_get_dir() . '/help_tabs/' . $cfg['filename'] . '.help_tab.php';
+				} else if ( ! empty($cfg['filename'])) {
+					$file_path = $this->_get_dir().'/help_tabs/'.$cfg['filename'].'.help_tab.php';
 
 
 					//it's possible that the file is located on decaf route (and above sets up for caf route, if this is the case then lets check decaf route too)
-					$file_path = !is_readable($file_path) ? EE_ADMIN_PAGES . basename($this->_get_dir()) . '/help_tabs/' . $cfg['filename'] . '.help_tab.php' : $file_path;
+					$file_path = ! is_readable($file_path) ? EE_ADMIN_PAGES.basename($this->_get_dir()).'/help_tabs/'.$cfg['filename'].'.help_tab.php' : $file_path;
 
 					//if file is STILL not readable then let's do a EE_Error so its more graceful than a fatal error.
-					if ( !is_readable($file_path) && !isset($cfg['callback']) ) {
-						EE_Error::add_error( sprintf( __('The filename given for the help tab %s is not a valid file and there is no other configuration for the tab content.  Please check that the string you set for the help tab on this route (%s) is the correct spelling.  The file should be in %s', 'event_espresso'), $tab_id, key($config), $file_path ), __FILE__, __FUNCTION__, __LINE__ );
+					if ( ! is_readable($file_path) && ! isset($cfg['callback'])) {
+						EE_Error::add_error(sprintf(__('The filename given for the help tab %s is not a valid file and there is no other configuration for the tab content.  Please check that the string you set for the help tab on this route (%s) is the correct spelling.  The file should be in %s', 'event_espresso'), $tab_id, key($config), $file_path), __FILE__, __FUNCTION__, __LINE__);
 						return;
 					}
 					$template_args['admin_page_obj'] = $this;
@@ -1114,21 +1114,21 @@ 
 
 
 				//check if callback is valid
-				if ( empty($content) && ( !isset($cfg['callback']) || !method_exists( $this, $cfg['callback'] ) ) ) {
-					EE_Error::add_error( sprintf( __('The callback given for a %s help tab on this page does not content OR a corresponding method for generating the content.  Check the spelling or make sure the method is present.', 'event_espresso'), $cfg['title'] ), __FILE__, __FUNCTION__, __LINE__ );
+				if (empty($content) && ( ! isset($cfg['callback']) || ! method_exists($this, $cfg['callback']))) {
+					EE_Error::add_error(sprintf(__('The callback given for a %s help tab on this page does not content OR a corresponding method for generating the content.  Check the spelling or make sure the method is present.', 'event_espresso'), $cfg['title']), __FILE__, __FUNCTION__, __LINE__);
 					return;
 				}
 
 				//setup config array for help tab method
-				$id = $this->page_slug . '-' . $this->_req_action . '-' . $tab_id;
+				$id = $this->page_slug.'-'.$this->_req_action.'-'.$tab_id;
 				$_ht = array(
 					'id' => $id,
 					'title' => $cfg['title'],
-					'callback' => isset( $cfg['callback'] ) && empty($content) ? array( $this, $cfg['callback'] ) : NULL,
+					'callback' => isset($cfg['callback']) && empty($content) ? array($this, $cfg['callback']) : NULL,
 					'content' => $content
 					);
 
-				$this->_current_screen->add_help_tab( $_ht );
+				$this->_current_screen->add_help_tab($_ht);
 			}
 		}
 	}
@@ -1148,49 +1148,49 @@ 
 		$this->_help_tour = array();
 
 		//exit early if help tours are turned off globally
-		if ( ! EE_Registry::instance()->CFG->admin->help_tour_activation || ( defined( 'EE_DISABLE_HELP_TOURS' ) && EE_DISABLE_HELP_TOURS ) )
+		if ( ! EE_Registry::instance()->CFG->admin->help_tour_activation || (defined('EE_DISABLE_HELP_TOURS') && EE_DISABLE_HELP_TOURS))
 			return;
 
 		//loop through _page_config to find any help_tour defined
-		foreach ( $this->_page_config as $route => $config ) {
+		foreach ($this->_page_config as $route => $config) {
 			//we're only going to set things up for this route
-			if ( $route !== $this->_req_action )
+			if ($route !== $this->_req_action)
 				continue;
 
-			if ( isset( $config['help_tour'] ) ) {
+			if (isset($config['help_tour'])) {
 
-				foreach( $config['help_tour'] as $tour ) {
-					$file_path = $this->_get_dir() . '/help_tours/' . $tour . '.class.php';
+				foreach ($config['help_tour'] as $tour) {
+					$file_path = $this->_get_dir().'/help_tours/'.$tour.'.class.php';
 					//let's see if we can get that file... if not its possible this is a decaf route not set in caffienated so lets try and get the caffeinated equivalent
-					$file_path = !is_readable($file_path) ? EE_ADMIN_PAGES . basename($this->_get_dir()) . '/help_tours/' . $tour . '.class.php' : $file_path;
+					$file_path = ! is_readable($file_path) ? EE_ADMIN_PAGES.basename($this->_get_dir()).'/help_tours/'.$tour.'.class.php' : $file_path;
 
 					//if file is STILL not readable then let's do a EE_Error so its more graceful than a fatal error.
-					if ( !is_readable($file_path) ) {
-						EE_Error::add_error( sprintf( __('The file path given for the help tour (%s) is not a valid path.  Please check that the string you set for the help tour on this route (%s) is the correct spelling', 'event_espresso'), $file_path, $tour ), __FILE__, __FUNCTION__, __LINE__ );
+					if ( ! is_readable($file_path)) {
+						EE_Error::add_error(sprintf(__('The file path given for the help tour (%s) is not a valid path.  Please check that the string you set for the help tour on this route (%s) is the correct spelling', 'event_espresso'), $file_path, $tour), __FILE__, __FUNCTION__, __LINE__);
 						return;
 					}
 
 					require_once $file_path;
-					if ( !class_exists( $tour ) ) {
-						$error_msg[] = sprintf( __('Something went wrong with loading the %s Help Tour Class.', 'event_espresso' ), $tour);
-						$error_msg[] = $error_msg[0] . "\r\n" . sprintf( __( 'There is no class in place for the %s help tour.%s Make sure you have <strong>%s</strong> defined in the "help_tour" array for the %s route of the % admin page.', 'event_espresso'), $tour, '<br />', $tour, $this->_req_action, get_class($this) );
-						throw new EE_Error( implode( '||', $error_msg ));
+					if ( ! class_exists($tour)) {
+						$error_msg[] = sprintf(__('Something went wrong with loading the %s Help Tour Class.', 'event_espresso'), $tour);
+						$error_msg[] = $error_msg[0]."\r\n".sprintf(__('There is no class in place for the %s help tour.%s Make sure you have <strong>%s</strong> defined in the "help_tour" array for the %s route of the % admin page.', 'event_espresso'), $tour, '<br />', $tour, $this->_req_action, get_class($this));
+						throw new EE_Error(implode('||', $error_msg));
 					}
 					$a = new ReflectionClass($tour);
 					$tour_obj = $a->newInstance($this->_is_caf);
 
 					$tours[] = $tour_obj;
-					$this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator( $tour_obj );
+					$this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator($tour_obj);
 				}
 
 				//let's inject the end tour stop element common to all pages... this will only get seen once per machine.
 				$end_stop_tour = new EE_Help_Tour_final_stop($this->_is_caf);
 				$tours[] = $end_stop_tour;
-				$this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator( $end_stop_tour );
+				$this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator($end_stop_tour);
 			}
 		}
 
-		if ( !empty( $tours ) )
+		if ( ! empty($tours))
 			$this->_help_tour['tours'] = $tours;
 
 		//thats it!  Now that the $_help_tours property is set (or not) the scripts and html should be taken care of automatically.
@@ -1206,13 +1206,13 @@ 
 	 * @return void
 	 */
 	protected function _add_qtips() {
-		if ( isset( $this->_route_config['qtips'] ) ) {
+		if (isset($this->_route_config['qtips'])) {
 			$qtips = (array) $this->_route_config['qtips'];
 			//load qtip loader
 			EE_Registry::instance()->load_helper('Qtip_Loader', array(), TRUE);
 			$path = array(
-				$this->_get_dir() . '/qtips/',
-				EE_ADMIN_PAGES . basename($this->_get_dir()) . '/qtips/'
+				$this->_get_dir().'/qtips/',
+				EE_ADMIN_PAGES.basename($this->_get_dir()).'/qtips/'
 				);
 			EEH_Qtip_Loader::instance()->register($qtips, $path);
 		}
@@ -1229,41 +1229,41 @@ 
 	 * @return void
 	 */
 	protected function _set_nav_tabs() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$i = 0;
-		foreach ( $this->_page_config as $slug => $config ) {
-			if ( !is_array( $config ) || ( is_array($config) && (isset($config['nav']) && !$config['nav'] ) || !isset($config['nav'] ) ) )
+		foreach ($this->_page_config as $slug => $config) {
+			if ( ! is_array($config) || (is_array($config) && (isset($config['nav']) && ! $config['nav']) || ! isset($config['nav'])))
 				continue; //no nav tab for this config
 
 			//check for persistent flag
-			if ( isset( $config['nav']['persistent']) && !$config['nav']['persistent'] && $slug !== $this->_req_action )
+			if (isset($config['nav']['persistent']) && ! $config['nav']['persistent'] && $slug !== $this->_req_action)
 				continue; //nav tab is only to appear when route requested.
 
-			if ( ! $this->check_user_access( $slug, TRUE ) )
+			if ( ! $this->check_user_access($slug, TRUE))
 				continue; //no nav tab becasue current user does not have access.
 
-			$css_class = isset( $config['css_class'] ) ? $config['css_class'] . ' ' : '';
+			$css_class = isset($config['css_class']) ? $config['css_class'].' ' : '';
 			$this->_nav_tabs[$slug] = array(
-				'url' => isset($config['nav']['url']) ? $config['nav']['url'] : self::add_query_args_and_nonce( array( 'action'=>$slug ), $this->_admin_base_url ),
-				'link_text' => isset( $config['nav']['label'] ) ? $config['nav']['label'] : ucwords(str_replace('_', ' ', $slug ) ),
-				'css_class' => $this->_req_action == $slug ? $css_class . 'nav-tab-active' : $css_class,
-				'order' => isset( $config['nav']['order'] ) ? $config['nav']['order'] : $i
+				'url' => isset($config['nav']['url']) ? $config['nav']['url'] : self::add_query_args_and_nonce(array('action'=>$slug), $this->_admin_base_url),
+				'link_text' => isset($config['nav']['label']) ? $config['nav']['label'] : ucwords(str_replace('_', ' ', $slug)),
+				'css_class' => $this->_req_action == $slug ? $css_class.'nav-tab-active' : $css_class,
+				'order' => isset($config['nav']['order']) ? $config['nav']['order'] : $i
 				);
 			$i++;
 		}
 
 		//if $this->_nav_tabs is empty then lets set the default
-		if ( empty( $this->_nav_tabs ) ) {
+		if (empty($this->_nav_tabs)) {
 			$this->_nav_tabs[$this->default_nav_tab_name] = array(
 				'url' => $this->admin_base_url,
-				'link_text' => ucwords( str_replace( '_', ' ', $this->default_nav_tab_name ) ),
+				'link_text' => ucwords(str_replace('_', ' ', $this->default_nav_tab_name)),
 				'css_class' => 'nav-tab-active',
 				'order' => 10
 				);
 		}
 
 		//now let's sort the tabs according to order
-		usort( $this->_nav_tabs, array($this, '_sort_nav_tabs' ));
+		usort($this->_nav_tabs, array($this, '_sort_nav_tabs'));
 
 	}
 
@@ -1279,10 +1279,10 @@ 
 	 * @return void
 	 */
 	private function _set_current_labels() {
-		if ( is_array($this->_route_config) && isset($this->_route_config['labels']) ) {
-			foreach ( $this->_route_config['labels'] as $label => $text ) {
-				if ( is_array($text) ) {
-					foreach ( $text as $sublabel => $subtext ) {
+		if (is_array($this->_route_config) && isset($this->_route_config['labels'])) {
+			foreach ($this->_route_config['labels'] as $label => $text) {
+				if (is_array($text)) {
+					foreach ($text as $sublabel => $subtext) {
 						$this->_labels[$label][$sublabel] = $subtext;
 					}
 				} else {
@@ -1303,24 +1303,24 @@ 
 	 * 		@param bool   $verify_only Default is FALSE which means if user check fails then wp_die().  Otherwise just return false if verify fail.
 	*		@return 		BOOL|wp_die()
 	*/
-	public function check_user_access( $route_to_check = '', $verify_only = FALSE ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$route_to_check = empty( $route_to_check ) ? $this->_req_action : $route_to_check;
-		$capability = ! empty( $route_to_check ) && isset( $this->_page_routes[$route_to_check] ) && is_array( $this->_page_routes[$route_to_check] ) && ! empty( $this->_page_routes[$route_to_check]['capability'] ) ? $this->_page_routes[$route_to_check]['capability'] : NULL;
+	public function check_user_access($route_to_check = '', $verify_only = FALSE) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$route_to_check = empty($route_to_check) ? $this->_req_action : $route_to_check;
+		$capability = ! empty($route_to_check) && isset($this->_page_routes[$route_to_check]) && is_array($this->_page_routes[$route_to_check]) && ! empty($this->_page_routes[$route_to_check]['capability']) ? $this->_page_routes[$route_to_check]['capability'] : NULL;
 
-		if ( empty( $capability ) && empty( $route_to_check )  ) {
-			$capability = is_array( $this->_route ) && empty( $this->_route['capability'] ) ? 'manage_options' : $this->_route['capability'];
+		if (empty($capability) && empty($route_to_check)) {
+			$capability = is_array($this->_route) && empty($this->_route['capability']) ? 'manage_options' : $this->_route['capability'];
 		} else {
-			$capability = empty( $capability ) ? 'manage_options' : $capability;
+			$capability = empty($capability) ? 'manage_options' : $capability;
 		}
 
-		$id = is_array( $this->_route ) && ! empty( $this->_route['obj_id'] ) ? $this->_route['obj_id'] : 0;
+		$id = is_array($this->_route) && ! empty($this->_route['obj_id']) ? $this->_route['obj_id'] : 0;
 
-		if (( ! function_exists( 'is_admin' ) || ! EE_Registry::instance()->CAP->current_user_can( $capability, $this->page_slug . '_' . $route_to_check, $id ) ) && ! defined( 'DOING_AJAX')) {
-			if ( $verify_only ) {
+		if (( ! function_exists('is_admin') || ! EE_Registry::instance()->CAP->current_user_can($capability, $this->page_slug.'_'.$route_to_check, $id)) && ! defined('DOING_AJAX')) {
+			if ($verify_only) {
 				return FALSE;
 			} else {
-				wp_die( __('You do not have access to this route.', 'event_espresso' ) );
+				wp_die(__('You do not have access to this route.', 'event_espresso'));
 			}
 		}
 		return TRUE;
@@ -1397,7 +1397,7 @@ 
 		$this->_add_admin_page_overlay();
 
 		//if metaboxes are present we need to add the nonce field
-		if ( ( isset($this->_route_config['metaboxes']) || ( isset($this->_route_config['has_metaboxes']) && $this->_route_config['has_metaboxes'] ) || isset($this->_route_config['list_table']) ) ) {
+		if ((isset($this->_route_config['metaboxes']) || (isset($this->_route_config['has_metaboxes']) && $this->_route_config['has_metaboxes']) || isset($this->_route_config['list_table']))) {
 			wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false);
 			wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false);
 		}
@@ -1416,20 +1416,20 @@ 
 	 */
 	public function admin_footer_global() {
 		//dialog container for dialog helper
-		$d_cont = '<div class="ee-admin-dialog-container auto-hide hidden">' . "\n";
+		$d_cont = '<div class="ee-admin-dialog-container auto-hide hidden">'."\n";
 		$d_cont .= '<div class="ee-notices"></div>';
 		$d_cont .= '<div class="ee-admin-dialog-container-inner-content"></div>';
 		$d_cont .= '</div>';
 		echo $d_cont;
 
 		//help tour stuff?
-		if ( isset( $this->_help_tour[$this->_req_action] ) ) {
+		if (isset($this->_help_tour[$this->_req_action])) {
 			echo implode('<br />', $this->_help_tour[$this->_req_action]);
 		}
 
 		//current set timezone for timezone js
 		EE_Registry::instance()->load_helper('DTT_Helper');
-		echo '<span id="current_timezone" class="hidden">' . EEH_DTT_Helper::get_timezone() . '</span>';
+		echo '<span id="current_timezone" class="hidden">'.EEH_DTT_Helper::get_timezone().'</span>';
 	}
 
 
@@ -1453,18 +1453,18 @@ 
 	 * @access protected
 	 * @return string content
 	 */
-	protected function _set_help_popup_content( $help_array = array(), $display = FALSE ) {
+	protected function _set_help_popup_content($help_array = array(), $display = FALSE) {
 		$content = '';
 
-		$help_array = empty( $help_array ) ? $this->_get_help_content() : $help_array;
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_help_popup.template.php';
+		$help_array = empty($help_array) ? $this->_get_help_content() : $help_array;
+		$template_path = EE_ADMIN_TEMPLATE.'admin_help_popup.template.php';
 
 
 		//loop through the array and setup content
-		foreach ( $help_array as $trigger => $help ) {
+		foreach ($help_array as $trigger => $help) {
 			//make sure the array is setup properly
-			if ( !isset($help['title']) || !isset($help['content'] ) ) {
-				throw new EE_Error( __('Does not look like the popup content array has been setup correctly.  Might want to double check that.  Read the comments for the _get_help_popup_content method found in "EE_Admin_Page" class', 'event_espresso') );
+			if ( ! isset($help['title']) || ! isset($help['content'])) {
+				throw new EE_Error(__('Does not look like the popup content array has been setup correctly.  Might want to double check that.  Read the comments for the _get_help_popup_content method found in "EE_Admin_Page" class', 'event_espresso'));
 			}
 
 			//we're good so let'd setup the template vars and then assign parsed template content to our content.
@@ -1474,10 +1474,10 @@ 
 				'help_popup_content' => $help['content']
 				);
 
-			$content .= EEH_Template::display_template( $template_path, $template_args, TRUE );
+			$content .= EEH_Template::display_template($template_path, $template_args, TRUE);
 		}
 
-		if ( $display )
+		if ($display)
 			echo $content;
 		else
 			return $content;
@@ -1494,18 +1494,18 @@ 
 	 */
 	private function _get_help_content() {
 		//what is the method we're looking for?
-		$method_name = '_help_popup_content_' . $this->_req_action;
+		$method_name = '_help_popup_content_'.$this->_req_action;
 
 		//if method doesn't exist let's get out.
-		if ( !method_exists( $this, $method_name ) )
+		if ( ! method_exists($this, $method_name))
 			return array();
 
 		//k we're good to go let's retrieve the help array
-		$help_array = call_user_func( array( $this, $method_name ) );
+		$help_array = call_user_func(array($this, $method_name));
 
 		//make sure we've got an array!
-		if ( !is_array($help_array) ) {
-			throw new EE_Error( __('Something went wrong with help popup content generation. Expecting an array and well, this ain\'t no array bub.', 'event_espresso' ) );
+		if ( ! is_array($help_array)) {
+			throw new EE_Error(__('Something went wrong with help popup content generation. Expecting an array and well, this ain\'t no array bub.', 'event_espresso'));
 		}
 
 		return $help_array;
@@ -1527,27 +1527,27 @@ 
 	 * @param array $dimensions an array of dimensions for the box (array(h,w))
 	 * @return string
 	 */
-	protected function _set_help_trigger( $trigger_id, $display = TRUE, $dimensions = array( '400', '640') ) {
+	protected function _set_help_trigger($trigger_id, $display = TRUE, $dimensions = array('400', '640')) {
 
-		if ( defined('DOING_AJAX') ) return;
+		if (defined('DOING_AJAX')) return;
 
 		//let's check and see if there is any content set for this popup.  If there isn't then we'll include a default title and content so that developers know something needs to be corrected
 		$help_array = $this->_get_help_content();
 		$help_content = '';
 
-		if ( empty( $help_array ) || !isset( $help_array[$trigger_id] ) ) {
+		if (empty($help_array) || ! isset($help_array[$trigger_id])) {
 			$help_array[$trigger_id] = array(
 				'title' => __('Missing Content', 'event_espresso'),
 				'content' => __('A trigger has been set that doesn\'t have any corresponding content. Make sure you have set the help content. (see the "_set_help_popup_content" method in the EE_Admin_Page for instructions.)', 'event_espresso')
 				);
-			$help_content = $this->_set_help_popup_content( $help_array, FALSE );
+			$help_content = $this->_set_help_popup_content($help_array, FALSE);
 		}
 
 		//let's setup the trigger
-		$content = '<a class="ee-dialog" href="?height='. $dimensions[0] . '&width=' . $dimensions[1] . '&inlineId=' . $trigger_id . '" target="_blank"><span class="question ee-help-popup-question"></span></a>';
-		$content = $content . $help_content;
+		$content = '<a class="ee-dialog" href="?height='.$dimensions[0].'&width='.$dimensions[1].'&inlineId='.$trigger_id.'" target="_blank"><span class="question ee-help-popup-question"></span></a>';
+		$content = $content.$help_content;
 
-		if ( $display )
+		if ($display)
 			echo $content;
 		else
 			return $content;
@@ -1604,15 +1604,15 @@ 
 	public function load_global_scripts_styles() {
 		/** STYLES **/
 		// add debugging styles
-		if ( WP_DEBUG ) {
-			add_action('admin_head', array( $this, 'add_xdebug_style' ));
+		if (WP_DEBUG) {
+			add_action('admin_head', array($this, 'add_xdebug_style'));
 		}
 
 		//register all styles
-		wp_register_style( 'espresso-ui-theme', EE_GLOBAL_ASSETS_URL . 'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css', array(),EVENT_ESPRESSO_VERSION );
-		wp_register_style('ee-admin-css', EE_ADMIN_URL . 'assets/ee-admin-page.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_register_style('espresso-ui-theme', EE_GLOBAL_ASSETS_URL.'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_register_style('ee-admin-css', EE_ADMIN_URL.'assets/ee-admin-page.css', array(), EVENT_ESPRESSO_VERSION);
 		//helpers styles
-		wp_register_style('ee-text-links', EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('ee-text-links', EE_PLUGIN_DIR_URL.'core/helpers/assets/ee_text_list_helper.css', array(), EVENT_ESPRESSO_VERSION);
 		//enqueue global styles
 		wp_enqueue_style('ee-admin-css');
 
@@ -1620,66 +1620,66 @@ 
 		/** SCRIPTS **/
 
 		//register all scripts
-		wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script('ee-dialog', EE_ADMIN_URL . 'assets/ee-dialog-helper.js', array('jquery', 'jquery-ui-draggable'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script('ee_admin_js', EE_ADMIN_URL . 'assets/ee-admin-page.js', array( 'espresso_core', 'ee-parse-uri', 'ee-dialog'), EVENT_ESPRESSO_VERSION, true );
+		wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('ee-dialog', EE_ADMIN_URL.'assets/ee-dialog-helper.js', array('jquery', 'jquery-ui-draggable'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('ee_admin_js', EE_ADMIN_URL.'assets/ee-admin-page.js', array('espresso_core', 'ee-parse-uri', 'ee-dialog'), EVENT_ESPRESSO_VERSION, true);
 
-		wp_register_script('jquery-ui-timepicker-addon', EE_GLOBAL_ASSETS_URL . 'scripts/jquery-ui-timepicker-addon.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), EVENT_ESPRESSO_VERSION, true );
+		wp_register_script('jquery-ui-timepicker-addon', EE_GLOBAL_ASSETS_URL.'scripts/jquery-ui-timepicker-addon.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), EVENT_ESPRESSO_VERSION, true);
 		// register jQuery Validate - see /includes/functions/wp_hooks.php
-		add_filter( 'FHEE_load_jquery_validate', '__return_true' );
+		add_filter('FHEE_load_jquery_validate', '__return_true');
 		add_filter('FHEE_load_joyride', '__return_true');
 
 		//script for sorting tables
-		wp_register_script('espresso_ajax_table_sorting', EE_ADMIN_URL . "assets/espresso_ajax_table_sorting.js", array('ee_admin_js', 'jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('espresso_ajax_table_sorting', EE_ADMIN_URL."assets/espresso_ajax_table_sorting.js", array('ee_admin_js', 'jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE);
 		//script for parsing uri's
-		wp_register_script( 'ee-parse-uri', EE_GLOBAL_ASSETS_URL . 'scripts/parseuri.js', array(), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('ee-parse-uri', EE_GLOBAL_ASSETS_URL.'scripts/parseuri.js', array(), EVENT_ESPRESSO_VERSION, TRUE);
 		//and parsing associative serialized form elements
-		wp_register_script( 'ee-serialize-full-array', EE_GLOBAL_ASSETS_URL . 'scripts/jquery.serializefullarray.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('ee-serialize-full-array', EE_GLOBAL_ASSETS_URL.'scripts/jquery.serializefullarray.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
 		//helpers scripts
-		wp_register_script('ee-text-links', EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script( 'ee-moment-core', EE_THIRD_PARTY_URL . 'moment/moment-with-locales.min.js', array(), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script( 'ee-moment', EE_THIRD_PARTY_URL . 'moment/moment-timezone-with-data.min.js', array('ee-moment-core'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script( 'ee-datepicker', EE_ADMIN_URL . 'assets/ee-datepicker.js', array('jquery-ui-timepicker-addon','ee-moment'), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('ee-text-links', EE_PLUGIN_DIR_URL.'core/helpers/assets/ee_text_list_helper.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('ee-moment-core', EE_THIRD_PARTY_URL.'moment/moment-with-locales.min.js', array(), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('ee-moment', EE_THIRD_PARTY_URL.'moment/moment-timezone-with-data.min.js', array('ee-moment-core'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('ee-datepicker', EE_ADMIN_URL.'assets/ee-datepicker.js', array('jquery-ui-timepicker-addon', 'ee-moment'), EVENT_ESPRESSO_VERSION, TRUE);
 
 		//google charts
-		wp_register_script( 'google-charts', 'https://www.gstatic.com/charts/loader.js', array(), EVENT_ESPRESSO_VERSION, false );
+		wp_register_script('google-charts', 'https://www.gstatic.com/charts/loader.js', array(), EVENT_ESPRESSO_VERSION, false);
 
 		//enqueue global scripts
 
 		//taking care of metaboxes
-		if ( ( isset($this->_route_config['metaboxes'] ) || isset($this->_route_config['has_metaboxes']) ) && empty( $this->_cpt_route) ) {
+		if ((isset($this->_route_config['metaboxes']) || isset($this->_route_config['has_metaboxes'])) && empty($this->_cpt_route)) {
 			wp_enqueue_script('dashboard');
 		}
 
 		//enqueue thickbox for ee help popups.  default is to enqueue unless its explicitly set to false since we're assuming all EE pages will have popups
-		if ( ! isset( $this->_route_config['has_help_popups']) || ( isset( $this->_route_config['has_help_popups']) && $this->_route_config['has_help_popups'] ) ) {
+		if ( ! isset($this->_route_config['has_help_popups']) || (isset($this->_route_config['has_help_popups']) && $this->_route_config['has_help_popups'])) {
 			wp_enqueue_script('ee_admin_js');
 			wp_enqueue_style('ee-admin-css');
 		}
 
 
 		//localize script for ajax lazy loading
-		$lazy_loader_container_ids = apply_filters( 'FHEE__EE_Admin_Page_Core__load_global_scripts_styles__loader_containers', array('espresso_news_post_box_content') );
-		wp_localize_script( 'ee_admin_js', 'eeLazyLoadingContainers', $lazy_loader_container_ids);
+		$lazy_loader_container_ids = apply_filters('FHEE__EE_Admin_Page_Core__load_global_scripts_styles__loader_containers', array('espresso_news_post_box_content'));
+		wp_localize_script('ee_admin_js', 'eeLazyLoadingContainers', $lazy_loader_container_ids);
 
 
 		/**
 		 * help tour stuff
 		 */
-		if ( !empty( $this->_help_tour ) ) {
+		if ( ! empty($this->_help_tour)) {
 
 			//register the js for kicking things off
-			wp_enqueue_script('ee-help-tour', EE_ADMIN_URL . 'assets/ee-help-tour.js', array('jquery-joyride'), EVENT_ESPRESSO_VERSION, TRUE );
+			wp_enqueue_script('ee-help-tour', EE_ADMIN_URL.'assets/ee-help-tour.js', array('jquery-joyride'), EVENT_ESPRESSO_VERSION, TRUE);
 
 			//setup tours for the js tour object
-			foreach ( $this->_help_tour['tours'] as $tour ) {
+			foreach ($this->_help_tour['tours'] as $tour) {
 				$tours[] = array(
 					'id' => $tour->get_slug(),
 					'options' => $tour->get_options()
 					);
 			}
 
-			wp_localize_script('ee-help-tour', 'EE_HELP_TOUR', array('tours' => $tours ) );
+			wp_localize_script('ee-help-tour', 'EE_HELP_TOUR', array('tours' => $tours));
 
 			//admin_footer_global will take care of making sure our help_tour skeleton gets printed via the info stored in $this->_help_tour
 		}
@@ -1697,52 +1697,52 @@ 
 	public function admin_footer_scripts_eei18n_js_strings() {
 
 		EE_Registry::$i18n_js_strings['ajax_url'] = WP_AJAX_URL;
-		EE_Registry::$i18n_js_strings['confirm_delete'] = __( 'Are you absolutely sure you want to delete this item?\nThis action will delete ALL DATA associated with this item!!!\nThis can NOT be undone!!!', 'event_espresso' );
-
-		EE_Registry::$i18n_js_strings['January'] = __( 'January', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['February'] = __( 'February', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['March'] = __( 'March', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['April'] = __( 'April', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['May'] = __( 'May', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['June'] = __( 'June', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['July'] = __( 'July', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['August'] = __( 'August', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['September'] = __( 'September', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['October'] = __( 'October', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['November'] = __( 'November', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['December'] = __( 'December', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Jan'] = __( 'Jan', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Feb'] = __( 'Feb', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Mar'] = __( 'Mar', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Apr'] = __( 'Apr', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['May'] = __( 'May', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Jun'] = __( 'Jun', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Jul'] = __( 'Jul', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Aug'] = __( 'Aug', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Sep'] = __( 'Sep', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Oct'] = __( 'Oct', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Nov'] = __( 'Nov', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Dec'] = __( 'Dec', 'event_espresso' );
-
-		EE_Registry::$i18n_js_strings['Sunday'] = __( 'Sunday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Monday'] = __( 'Monday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Tuesday'] = __( 'Tuesday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Wednesday'] = __( 'Wednesday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Thursday'] = __( 'Thursday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Friday'] = __( 'Friday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Saturday'] = __( 'Saturday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Sun'] = __( 'Sun', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Mon'] = __( 'Mon', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Tue'] = __( 'Tue', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Wed'] = __( 'Wed', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Thu'] = __( 'Thu', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Fri'] = __( 'Fri', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Sat'] = __( 'Sat', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['confirm_delete'] = __('Are you absolutely sure you want to delete this item?\nThis action will delete ALL DATA associated with this item!!!\nThis can NOT be undone!!!', 'event_espresso');
+
+		EE_Registry::$i18n_js_strings['January'] = __('January', 'event_espresso');
+		EE_Registry::$i18n_js_strings['February'] = __('February', 'event_espresso');
+		EE_Registry::$i18n_js_strings['March'] = __('March', 'event_espresso');
+		EE_Registry::$i18n_js_strings['April'] = __('April', 'event_espresso');
+		EE_Registry::$i18n_js_strings['May'] = __('May', 'event_espresso');
+		EE_Registry::$i18n_js_strings['June'] = __('June', 'event_espresso');
+		EE_Registry::$i18n_js_strings['July'] = __('July', 'event_espresso');
+		EE_Registry::$i18n_js_strings['August'] = __('August', 'event_espresso');
+		EE_Registry::$i18n_js_strings['September'] = __('September', 'event_espresso');
+		EE_Registry::$i18n_js_strings['October'] = __('October', 'event_espresso');
+		EE_Registry::$i18n_js_strings['November'] = __('November', 'event_espresso');
+		EE_Registry::$i18n_js_strings['December'] = __('December', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Jan'] = __('Jan', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Feb'] = __('Feb', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Mar'] = __('Mar', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Apr'] = __('Apr', 'event_espresso');
+		EE_Registry::$i18n_js_strings['May'] = __('May', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Jun'] = __('Jun', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Jul'] = __('Jul', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Aug'] = __('Aug', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Sep'] = __('Sep', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Oct'] = __('Oct', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Nov'] = __('Nov', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Dec'] = __('Dec', 'event_espresso');
+
+		EE_Registry::$i18n_js_strings['Sunday'] = __('Sunday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Monday'] = __('Monday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Tuesday'] = __('Tuesday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Wednesday'] = __('Wednesday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Thursday'] = __('Thursday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Friday'] = __('Friday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Saturday'] = __('Saturday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Sun'] = __('Sun', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Mon'] = __('Mon', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Tue'] = __('Tue', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Wed'] = __('Wed', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Thu'] = __('Thu', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Fri'] = __('Fri', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Sat'] = __('Sat', 'event_espresso');
 
 		//setting on espresso_core instead of ee_admin_js because espresso_core is enqueued by the maintenance
 		//admin page when in maintenance mode and ee_admin_js is not loaded then.  This works everywhere else because
 		//espresso_core is listed as a dependency of ee_admin_js.
-		wp_localize_script( 'espresso_core', 'eei18n', EE_Registry::$i18n_js_strings );
+		wp_localize_script('espresso_core', 'eei18n', EE_Registry::$i18n_js_strings);
 
 	}
 
@@ -1776,23 +1776,23 @@ 
 	protected function _set_list_table() {
 
 		//first is this a list_table view?
-		if ( !isset($this->_route_config['list_table']) )
+		if ( ! isset($this->_route_config['list_table']))
 			return; //not a list_table view so get out.
 
 		//list table functions are per view specific (because some admin pages might have more than one listtable!)
 
-		if ( call_user_func( array( $this, '_set_list_table_views_' . $this->_req_action ) ) === FALSE ) {
+		if (call_user_func(array($this, '_set_list_table_views_'.$this->_req_action)) === FALSE) {
 			//user error msg
-			$error_msg = __('An error occurred. The requested list table views could not be found.', 'event_espresso' );
+			$error_msg = __('An error occurred. The requested list table views could not be found.', 'event_espresso');
 			//developer error msg
-			$error_msg .= '||' . sprintf( __('List table views for "%s" route could not be setup. Check that you have the corresponding method, "%s" set up for defining list_table_views for this route.', 'event_espresso' ), $this->_req_action, '_set_list_table_views_' . $this->_req_action );
-			throw new EE_Error( $error_msg );
+			$error_msg .= '||'.sprintf(__('List table views for "%s" route could not be setup. Check that you have the corresponding method, "%s" set up for defining list_table_views for this route.', 'event_espresso'), $this->_req_action, '_set_list_table_views_'.$this->_req_action);
+			throw new EE_Error($error_msg);
 		}
 
 		//let's provide the ability to filter the views per PAGE AND ROUTE, per PAGE, and globally
-		$this->_views = apply_filters( 'FHEE_list_table_views_' . $this->page_slug . '_' . $this->_req_action, $this->_views );
-		$this->_views = apply_filters( 'FHEE_list_table_views_' . $this->page_slug, $this->_views );
-		$this->_views = apply_filters( 'FHEE_list_table_views', $this->_views );
+		$this->_views = apply_filters('FHEE_list_table_views_'.$this->page_slug.'_'.$this->_req_action, $this->_views);
+		$this->_views = apply_filters('FHEE_list_table_views_'.$this->page_slug, $this->_views);
+		$this->_views = apply_filters('FHEE_list_table_views', $this->_views);
 
 		$this->_set_list_table_view();
 		$this->_set_list_table_object();
@@ -1814,14 +1814,14 @@ 
 	*		@return array
 	*/
 	protected function _set_list_table_view() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 
 		// looking at active items or dumpster diving ?
-		if ( ! isset( $this->_req_data['status'] ) || ! array_key_exists( $this->_req_data['status'], $this->_views )) {
-			$this->_view = isset( $this->_views['in_use'] ) ? 'in_use' : 'all';
+		if ( ! isset($this->_req_data['status']) || ! array_key_exists($this->_req_data['status'], $this->_views)) {
+			$this->_view = isset($this->_views['in_use']) ? 'in_use' : 'all';
 		} else {
-			$this->_view = sanitize_key( $this->_req_data['status'] );
+			$this->_view = sanitize_key($this->_req_data['status']);
 		}
 	}
 
@@ -1832,9 +1832,9 @@ 
 	 * WP_List_Table objects need to be loaded fairly early so automatic stuff WP does is taken care of.
 	 */
 	protected function _set_list_table_object() {
-		if ( isset($this->_route_config['list_table'] ) ) {
-			if ( !class_exists( $this->_route_config['list_table'] ) )
-				throw new EE_Error( sprintf( __('The %s class defined for the list table does not exist.  Please check the spelling of the class ref in the $_page_config property on %s.', 'event_espresso'), $this->_route_config['list_table'], get_class($this) ) );
+		if (isset($this->_route_config['list_table'])) {
+			if ( ! class_exists($this->_route_config['list_table']))
+				throw new EE_Error(sprintf(__('The %s class defined for the list table does not exist.  Please check the spelling of the class ref in the $_page_config property on %s.', 'event_espresso'), $this->_route_config['list_table'], get_class($this)));
 			$a = new ReflectionClass($this->_route_config['list_table']);
 			$this->_list_table_object = $a->newInstance($this);
 		}
@@ -1853,27 +1853,27 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_list_table_view_RLs( $extra_query_args = array() ) {
+	public function get_list_table_view_RLs($extra_query_args = array()) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		if ( empty( $this->_views )) {
+		if (empty($this->_views)) {
 			$this->_views = array();
 		}
 
 		// cycle thru views
-		foreach ( $this->_views as $key => $view ) {
+		foreach ($this->_views as $key => $view) {
 			$query_args = array();
 			// check for current view
-			$this->_views[ $key ]['class'] = $this->_view == $view['slug'] ? 'current' : '';
+			$this->_views[$key]['class'] = $this->_view == $view['slug'] ? 'current' : '';
 			$query_args['action'] = $this->_req_action;
-			$query_args[$this->_req_action.'_nonce'] = wp_create_nonce( $query_args['action'] . '_nonce' );
+			$query_args[$this->_req_action.'_nonce'] = wp_create_nonce($query_args['action'].'_nonce');
 			$query_args['status'] = $view['slug'];
 			//merge any other arguments sent in.
-			if ( isset( $extra_query_args[$view['slug']] ) ) {
-				$query_args = array_merge( $query_args, $extra_query_args[$view['slug']] );
+			if (isset($extra_query_args[$view['slug']])) {
+				$query_args = array_merge($query_args, $extra_query_args[$view['slug']]);
 			}
-			$this->_views[ $key ]['url'] = EE_Admin_Page::add_query_args_and_nonce( $query_args, $this->_admin_base_url );
+			$this->_views[$key]['url'] = EE_Admin_Page::add_query_args_and_nonce($query_args, $this->_admin_base_url);
 		}
 
 		return $this->_views;
@@ -1890,15 +1890,15 @@ 
 	 * @param int $max_entries total number of rows in the table
 	 * @return string
 	*/
-	protected function _entries_per_page_dropdown( $max_entries = FALSE ) {
+	protected function _entries_per_page_dropdown($max_entries = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$values = array( 10, 25, 50, 100 );
-		$per_page = ( ! empty( $this->_req_data['per_page'] )) ? absint( $this->_req_data['per_page'] ) : 10;
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$values = array(10, 25, 50, 100);
+		$per_page = ( ! empty($this->_req_data['per_page'])) ? absint($this->_req_data['per_page']) : 10;
 
-		if ( $max_entries ) {
+		if ($max_entries) {
 			$values[] = $max_entries;
-			sort( $values );
+			sort($values);
 		}
 
 		$entries_per_page_dropdown = '
@@ -1907,15 +1907,15 @@ 
 					Show
 					<select id="entries-per-page-slct" name="entries-per-page-slct">';
 
-		foreach ( $values as $value ) {
-			if ( $value < $max_entries ) {
-				$selected = $value == $per_page ?  ' selected="' . $per_page . '"' : '';
+		foreach ($values as $value) {
+			if ($value < $max_entries) {
+				$selected = $value == $per_page ? ' selected="'.$per_page.'"' : '';
 				$entries_per_page_dropdown .= '
 						<option value="'.$value.'"'.$selected.'>'.$value.'&nbsp;&nbsp;</option>';
 			}
 		}
 
-		$selected = $max_entries == $per_page ?  ' selected="' . $per_page . '"' : '';
+		$selected = $max_entries == $per_page ? ' selected="'.$per_page.'"' : '';
 		$entries_per_page_dropdown .= '
 						<option value="'.$max_entries.'"'.$selected.'>All&nbsp;&nbsp;</option>';
 
@@ -1938,8 +1938,8 @@ 
 	*		@return 		void
 	*/
 	public function _set_search_attributes() {
-		$this->_template_args['search']['btn_label'] = sprintf( __( 'Search %s', 'event_espresso' ), empty( $this->_search_btn_label ) ? $this->page_label : $this->_search_btn_label );
-		$this->_template_args['search']['callback'] = 'search_' . $this->page_slug;
+		$this->_template_args['search']['btn_label'] = sprintf(__('Search %s', 'event_espresso'), empty($this->_search_btn_label) ? $this->page_label : $this->_search_btn_label);
+		$this->_template_args['search']['callback'] = 'search_'.$this->page_slug;
 	}
 
 	/*** END LIST TABLE METHODS **/
@@ -1958,20 +1958,20 @@ 
 	 * @return void
 	*/
 	private function _add_registered_meta_boxes() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		//we only add meta boxes if the page_route calls for it
-		if ( is_array($this->_route_config) && isset( $this->_route_config['metaboxes'] ) && is_array($this->_route_config['metaboxes']) ) {
+		if (is_array($this->_route_config) && isset($this->_route_config['metaboxes']) && is_array($this->_route_config['metaboxes'])) {
 
 
 			//this simply loops through the callbacks provided and checks if there is a corresponding callback registered by the child - if there is then we go ahead and process the metabox loader.
-			foreach ( $this->_route_config['metaboxes'] as $metabox_callback ) {
-				if ( call_user_func( array($this, &$metabox_callback) ) === FALSE ) {
+			foreach ($this->_route_config['metaboxes'] as $metabox_callback) {
+				if (call_user_func(array($this, &$metabox_callback)) === FALSE) {
 					// user error msg
-				$error_msg =  __( 'An error occurred. The  requested metabox could not be found.', 'event_espresso' );
+				$error_msg = __('An error occurred. The  requested metabox could not be found.', 'event_espresso');
 				// developer error msg
-				$error_msg .= '||' . sprintf( __( 'The metabox with the string "%s" could not be called. Check that the spelling for method names and actions in the "_page_config[\'metaboxes\']" array are all correct.', 'event_espresso' ), $metabox_callback );
-				throw new EE_Error( $error_msg );
+				$error_msg .= '||'.sprintf(__('The metabox with the string "%s" could not be called. Check that the spelling for method names and actions in the "_page_config[\'metaboxes\']" array are all correct.', 'event_espresso'), $metabox_callback);
+				throw new EE_Error($error_msg);
 				}
 			}
 		}
@@ -1988,17 +1988,17 @@ 
 	 * @return void
 	 */
 	private function _add_screen_columns() {
-		if ( is_array($this->_route_config) && isset( $this->_route_config['columns'] ) && is_array($this->_route_config['columns']) && count( $this->_route_config['columns'] == 2 ) ) {
+		if (is_array($this->_route_config) && isset($this->_route_config['columns']) && is_array($this->_route_config['columns']) && count($this->_route_config['columns'] == 2)) {
 
-			add_screen_option('layout_columns', array('max' => (int) $this->_route_config['columns'][0], 'default' => (int) $this->_route_config['columns'][1] ) );
+			add_screen_option('layout_columns', array('max' => (int) $this->_route_config['columns'][0], 'default' => (int) $this->_route_config['columns'][1]));
 			$this->_template_args['num_columns'] = $this->_route_config['columns'][0];
 			$screen_id = $this->_current_screen->id;
 			$screen_columns = (int) get_user_option("screen_layout_$screen_id");
-			$total_columns = !empty($screen_columns) ? $screen_columns : $this->_route_config['columns'][1];
-			$this->_template_args['current_screen_widget_class'] = 'columns-' . $total_columns;
+			$total_columns = ! empty($screen_columns) ? $screen_columns : $this->_route_config['columns'][1];
+			$this->_template_args['current_screen_widget_class'] = 'columns-'.$total_columns;
 			$this->_template_args['current_page'] = $this->_wp_page_slug;
 			$this->_template_args['screen'] = $this->_current_screen;
-			$this->_column_template_path = EE_ADMIN_TEMPLATE . 'admin_details_metabox_column_wrapper.template.php';
+			$this->_column_template_path = EE_ADMIN_TEMPLATE.'admin_details_metabox_column_wrapper.template.php';
 
 			//finally if we don't have has_metaboxes set in the route config let's make sure it IS set other wise the necessary hidden fields for this won't be loaded.
 			$this->_route_config['has_metaboxes'] = TRUE;
@@ -2015,11 +2015,11 @@ 
 	 */
 
 	private function _espresso_news_post_box() {
-		$news_box_title = apply_filters( 'FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __( 'New @ Event Espresso', 'event_espresso' ) );
-		add_meta_box( 'espresso_news_post_box', $news_box_title, array(
+		$news_box_title = apply_filters('FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __('New @ Event Espresso', 'event_espresso'));
+		add_meta_box('espresso_news_post_box', $news_box_title, array(
 			$this,
 			'espresso_news_post_box'
-		), $this->_wp_page_slug, 'side' );
+		), $this->_wp_page_slug, 'side');
 	}
 
 
@@ -2027,14 +2027,14 @@ 
 	 * Code for setting up espresso ratings request metabox.
 	 */
 	protected function _espresso_ratings_request() {
-		if ( ! apply_filters( 'FHEE_show_ratings_request_meta_box', true ) ) {
+		if ( ! apply_filters('FHEE_show_ratings_request_meta_box', true)) {
 			return '';
 		}
-		$ratings_box_title = apply_filters( 'FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __('Keep Event Espresso Decaf Free', 'event_espresso') );
-		add_meta_box( 'espresso_ratings_request', $ratings_box_title, array(
+		$ratings_box_title = apply_filters('FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __('Keep Event Espresso Decaf Free', 'event_espresso'));
+		add_meta_box('espresso_ratings_request', $ratings_box_title, array(
 			$this,
 			'espresso_ratings_request'
-		), $this->_wp_page_slug, 'side' );
+		), $this->_wp_page_slug, 'side');
 	}
 
 
@@ -2042,35 +2042,35 @@ 
 	 * Code for setting up espresso ratings request metabox content.
 	 */
 	public function espresso_ratings_request() {
-		$template_path = EE_ADMIN_TEMPLATE . 'espresso_ratings_request_content.template.php';
-		EE_Registry::instance()->load_helper( 'Template' );
-		EEH_Template::display_template( $template_path, array() );
+		$template_path = EE_ADMIN_TEMPLATE.'espresso_ratings_request_content.template.php';
+		EE_Registry::instance()->load_helper('Template');
+		EEH_Template::display_template($template_path, array());
 	}
 
 
 
 
-	public static function cached_rss_display( $rss_id, $url ) {
-		$loading = '<p class="widget-loading hide-if-no-js">' . __( 'Loading&#8230;' ) . '</p><p class="hide-if-js">' . __( 'This widget requires JavaScript.' ) . '</p>';
-		$doing_ajax = ( defined( 'DOING_AJAX' ) && DOING_AJAX );
-		$pre = '<div class="espresso-rss-display">' . "\n\t";
-		$pre .= '<span id="' . $rss_id . '_url" class="hidden">' . $url . '</span>';
-		$post = '</div>' . "\n";
+	public static function cached_rss_display($rss_id, $url) {
+		$loading = '<p class="widget-loading hide-if-no-js">'.__('Loading&#8230;').'</p><p class="hide-if-js">'.__('This widget requires JavaScript.').'</p>';
+		$doing_ajax = (defined('DOING_AJAX') && DOING_AJAX);
+		$pre = '<div class="espresso-rss-display">'."\n\t";
+		$pre .= '<span id="'.$rss_id.'_url" class="hidden">'.$url.'</span>';
+		$post = '</div>'."\n";
 
-		$cache_key = 'ee_rss_' . md5( $rss_id );
-		if ( FALSE != ( $output = get_transient( $cache_key ) ) ) {
-			echo $pre . $output . $post;
+		$cache_key = 'ee_rss_'.md5($rss_id);
+		if (FALSE != ($output = get_transient($cache_key))) {
+			echo $pre.$output.$post;
 			return TRUE;
 		}
 
-		if ( ! $doing_ajax ) {
-			echo $pre . $loading . $post;
+		if ( ! $doing_ajax) {
+			echo $pre.$loading.$post;
 			return FALSE;
 		}
 
 		ob_start();
-		wp_widget_rss_output($url, array('show_date' => 0, 'items' => 5) );
-		set_transient( $cache_key, ob_get_flush(), 12 * HOUR_IN_SECONDS );
+		wp_widget_rss_output($url, array('show_date' => 0, 'items' => 5));
+		set_transient($cache_key, ob_get_flush(), 12 * HOUR_IN_SECONDS);
 		return TRUE;
 
 	}
@@ -2082,13 +2082,13 @@ 
 	  	<div id="espresso_news_post_box_content" class="infolinks">
 	  		<?php
 	  		// Get RSS Feed(s)
-	  		$feed_url = apply_filters( 'FHEE__EE_Admin_Page__espresso_news_post_box__feed_url', 'http://eventespresso.com/feed/' );
+	  		$feed_url = apply_filters('FHEE__EE_Admin_Page__espresso_news_post_box__feed_url', 'http://eventespresso.com/feed/');
 	  		$url = urlencode($feed_url);
-	  		self::cached_rss_display( 'espresso_news_post_box_content', $url );
+	  		self::cached_rss_display('espresso_news_post_box_content', $url);
 
 	  		?>
 	  	</div>
-	  	<?php do_action( 'AHEE__EE_Admin_Page__espresso_news_post_box__after_content'); ?>
+	  	<?php do_action('AHEE__EE_Admin_Page__espresso_news_post_box__after_content'); ?>
 	  </div>
 		<?php
 	}
@@ -2109,32 +2109,32 @@ 
 
 	protected function _espresso_sponsors_post_box() {
 
-		$show_sponsors = apply_filters( 'FHEE_show_sponsors_meta_box', TRUE );
-		if ( $show_sponsors )
-			add_meta_box('espresso_sponsors_post_box', __('Event Espresso Highlights', 'event_espresso'), array( $this, 'espresso_sponsors_post_box'), $this->_wp_page_slug, 'side');
+		$show_sponsors = apply_filters('FHEE_show_sponsors_meta_box', TRUE);
+		if ($show_sponsors)
+			add_meta_box('espresso_sponsors_post_box', __('Event Espresso Highlights', 'event_espresso'), array($this, 'espresso_sponsors_post_box'), $this->_wp_page_slug, 'side');
 	}
 
 
 	public function espresso_sponsors_post_box() {
-		$templatepath = EE_ADMIN_TEMPLATE . 'admin_general_metabox_contents_espresso_sponsors.template.php';
-		EEH_Template::display_template( $templatepath );
+		$templatepath = EE_ADMIN_TEMPLATE.'admin_general_metabox_contents_espresso_sponsors.template.php';
+		EEH_Template::display_template($templatepath);
 	}
 
 
 
 	private function _publish_post_box() {
-		$meta_box_ref = 'espresso_' . $this->page_slug . '_editor_overview';
+		$meta_box_ref = 'espresso_'.$this->page_slug.'_editor_overview';
 
 		//if there is a array('label' => array('publishbox' => 'some title') ) present in the _page_config array then we'll use that for the metabox label.  Otherwise we'll just use publish (publishbox itself could be an array of labels indexed by routes)
-		if ( !empty( $this->_labels['publishbox'] ) ) {
-			$box_label = is_array( $this->_labels['publishbox'] ) ? $this->_labels['publishbox'][$this->_req_action] : $this->_labels['publishbox'];
+		if ( ! empty($this->_labels['publishbox'])) {
+			$box_label = is_array($this->_labels['publishbox']) ? $this->_labels['publishbox'][$this->_req_action] : $this->_labels['publishbox'];
 		} else {
 			$box_label = __('Publish', 'event_espresso');
 		}
 
-		$box_label = apply_filters( 'FHEE__EE_Admin_Page___publish_post_box__box_label', $box_label, $this->_req_action, $this );
+		$box_label = apply_filters('FHEE__EE_Admin_Page___publish_post_box__box_label', $box_label, $this->_req_action, $this);
 
-		add_meta_box( $meta_box_ref, $box_label, array( $this, 'editor_overview' ), $this->_current_screen->id, 'side', 'high' );
+		add_meta_box($meta_box_ref, $box_label, array($this, 'editor_overview'), $this->_current_screen->id, 'side', 'high');
 
 	}
 
@@ -2142,9 +2142,9 @@ 
 
 	public function editor_overview() {
 		//if we have extra content set let's add it in if not make sure its empty
-		$this->_template_args['publish_box_extra_content'] = isset( $this->_template_args['publish_box_extra_content'] ) ? $this->_template_args['publish_box_extra_content'] : '';
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_details_publish_metabox.template.php';
-		echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$this->_template_args['publish_box_extra_content'] = isset($this->_template_args['publish_box_extra_content']) ? $this->_template_args['publish_box_extra_content'] : '';
+		$template_path = EE_ADMIN_TEMPLATE.'admin_details_publish_metabox.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 	}
 
 
@@ -2160,8 +2160,8 @@ 
 	 * @see $this->_set_publish_post_box_vars for param details
 	 * @since 4.6.0
 	 */
-	public function set_publish_post_box_vars( $name = null, $id = false, $delete = false, $save_close_redirect_URL = null, $both_btns = true ) {
-		$this->_set_publish_post_box_vars( $name, $id, $delete, $save_close_redirect_URL, $both_btns );
+	public function set_publish_post_box_vars($name = null, $id = false, $delete = false, $save_close_redirect_URL = null, $both_btns = true) {
+		$this->_set_publish_post_box_vars($name, $id, $delete, $save_close_redirect_URL, $both_btns);
 	}
 
 
@@ -2180,24 +2180,24 @@ 
 	 * @param	string	$post_save_redirect_URL	custom URL to redirect to after Save & Close has been completed
 	 * @param	boolean	$both_btns	whether to display BOTH the "Save & Close" and "Save" buttons or just the Save button
 	 */
-	protected function _set_publish_post_box_vars( $name = NULL, $id = FALSE, $delete = FALSE, $save_close_redirect_URL = NULL, $both_btns = TRUE ) {
+	protected function _set_publish_post_box_vars($name = NULL, $id = FALSE, $delete = FALSE, $save_close_redirect_URL = NULL, $both_btns = TRUE) {
 
 		// if Save & Close, use a custom redirect URL or default to the main page?
-		$save_close_redirect_URL = ! empty( $save_close_redirect_URL ) ? $save_close_redirect_URL : $this->_admin_base_url;
+		$save_close_redirect_URL = ! empty($save_close_redirect_URL) ? $save_close_redirect_URL : $this->_admin_base_url;
 		// create the Save & Close and Save buttons
-		$this->_set_save_buttons( $both_btns, array(), array(), $save_close_redirect_URL );
+		$this->_set_save_buttons($both_btns, array(), array(), $save_close_redirect_URL);
 		//if we have extra content set let's add it in if not make sure its empty
-		$this->_template_args['publish_box_extra_content'] = isset( $this->_template_args['publish_box_extra_content'] ) ? $this->_template_args['publish_box_extra_content'] : '';
+		$this->_template_args['publish_box_extra_content'] = isset($this->_template_args['publish_box_extra_content']) ? $this->_template_args['publish_box_extra_content'] : '';
 
 
-		if ( $delete && ! empty( $id )  ) {
+		if ($delete && ! empty($id)) {
 			$delete = is_bool($delete) ? 'delete' : $delete; //make sure we have a default if just true is sent.
-			$delete_link_args = array( $name => $id );
-			$delete = $this->get_action_link_or_button( $delete, $delete, $delete_link_args, 'submitdelete deletion');
+			$delete_link_args = array($name => $id);
+			$delete = $this->get_action_link_or_button($delete, $delete, $delete_link_args, 'submitdelete deletion');
 		}
 
-		$this->_template_args['publish_delete_link'] = !empty( $id ) ? $delete : '';
-		if ( ! empty( $name ) && ! empty( $id ) ) {
+		$this->_template_args['publish_delete_link'] = ! empty($id) ? $delete : '';
+		if ( ! empty($name) && ! empty($id)) {
 			$hidden_field_arr[$name] = array(
 				'type' => 'hidden',
 				'value' => $id
@@ -2207,7 +2207,7 @@ 
 			$hf = '';
 		}
 		// add hidden field
-		$this->_template_args['publish_hidden_fields'] = ! empty( $hf ) ? $hf[$name]['field'] : $hf;
+		$this->_template_args['publish_hidden_fields'] = ! empty($hf) ? $hf[$name]['field'] : $hf;
 
 	}
 
@@ -2224,8 +2224,8 @@ 
 		<noscript>
 			<div id="no-js-message" class="error">
 				<p style="font-size:1.3em;">
-					<span style="color:red;"><?php _e( 'Warning!', 'event_espresso' ); ?></span>
-					<?php _e( 'Javascript is currently turned off for your browser. Javascript must be enabled in order for all of the features on this page to function properly. Please turn your javascript back on.', 'event_espresso' ); ?>
+					<span style="color:red;"><?php _e('Warning!', 'event_espresso'); ?></span>
+					<?php _e('Javascript is currently turned off for your browser. Javascript must be enabled in order for all of the features on this page to function properly. Please turn your javascript back on.', 'event_espresso'); ?>
 				</p>
 			</div>
 		</noscript>
@@ -2245,7 +2245,7 @@ 
 	*		@return 		string
 	*/
 	private function _display_espresso_notices() {
-		$notices = $this->_get_transient( TRUE );
+		$notices = $this->_get_transient(TRUE);
 		echo stripslashes($notices);
 	}
 
@@ -2297,11 +2297,11 @@ 
 	 * @param string  $priority      give this metabox a priority (using accepted priorities for wp meta boxes)
 	 * @param boolean $create_func   default is true.  Basically we can say we don't WANT to have the runtime function created but just set our own callback for wp's add_meta_box.
 	 */
-	public function _add_admin_page_meta_box( $action, $title, $callback, $callback_args, $column = 'normal', $priority = 'high', $create_func = true ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, $callback );
+	public function _add_admin_page_meta_box($action, $title, $callback, $callback_args, $column = 'normal', $priority = 'high', $create_func = true) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, $callback);
 
 		//if we have empty callback args and we want to automatically create the metabox callback then we need to make sure the callback args are generated.
-		if ( empty( $callback_args ) && $create_func ) {
+		if (empty($callback_args) && $create_func) {
 			$callback_args = array(
 				'template_path' => $this->_template_path,
 				'template_args' => $this->_template_args,
@@ -2311,7 +2311,7 @@ 
 		//if $create_func is true (default) then we automatically create the function for displaying the actual meta box.  If false then we take the $callback reference passed through and use it instead (so callers can define their own callback function/method if they wish)
 		$call_back_func = $create_func ? create_function('$post, $metabox', 'do_action( "AHEE_log", __FILE__, __FUNCTION__, ""); echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );') : $callback;
 
-		add_meta_box( str_replace( '_', '-', $action ) . '-mbox', $title, $call_back_func, $this->_wp_page_slug, $column, $priority, $callback_args );
+		add_meta_box(str_replace('_', '-', $action).'-mbox', $title, $call_back_func, $this->_wp_page_slug, $column, $priority, $callback_args);
 	}
 
 
@@ -2324,7 +2324,7 @@ 
 	 */
 	public function display_admin_page_with_metabox_columns() {
 		$this->_template_args['post_body_content'] = $this->_template_args['admin_page_content'];
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $this->_column_template_path, $this->_template_args, TRUE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_column_template_path, $this->_template_args, TRUE);
 
 		//the final wrapper
 		$this->admin_page_wrapper();
@@ -2367,7 +2367,7 @@ 
 	 * @return void
 	 */
 	public function display_about_admin_page() {
-		$this->_display_admin_page( FALSE, TRUE );
+		$this->_display_admin_page(FALSE, TRUE);
 	}
 
 
@@ -2383,26 +2383,26 @@ 
 	 * @return html           admin_page
 	 */
 	private function _display_admin_page($sidebar = false, $about = FALSE) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		//custom remove metaboxes hook to add or remove any metaboxes to/from Admin pages.
-		do_action( 'AHEE__EE_Admin_Page___display_admin_page__modify_metaboxes' );
+		do_action('AHEE__EE_Admin_Page___display_admin_page__modify_metaboxes');
 
 		// set current wp page slug - looks like: event-espresso_page_event_categories
 		// keep in mind "event-espresso" COULD be something else if the top level menu label has been translated.
 		$this->_template_args['current_page'] = $this->_wp_page_slug;
 
-		$template_path = $sidebar ?  EE_ADMIN_TEMPLATE . 'admin_details_wrapper.template.php' : EE_ADMIN_TEMPLATE . 'admin_details_wrapper_no_sidebar.template.php';
+		$template_path = $sidebar ? EE_ADMIN_TEMPLATE.'admin_details_wrapper.template.php' : EE_ADMIN_TEMPLATE.'admin_details_wrapper_no_sidebar.template.php';
 
-		if ( defined('DOING_AJAX' ) )
-			$template_path = EE_ADMIN_TEMPLATE . 'admin_details_wrapper_no_sidebar_ajax.template.php';
+		if (defined('DOING_AJAX'))
+			$template_path = EE_ADMIN_TEMPLATE.'admin_details_wrapper_no_sidebar_ajax.template.php';
 
-		$template_path = !empty($this->_column_template_path) ? $this->_column_template_path : $template_path;
+		$template_path = ! empty($this->_column_template_path) ? $this->_column_template_path : $template_path;
 
-		$this->_template_args['post_body_content'] = isset( $this->_template_args['admin_page_content'] ) ? $this->_template_args['admin_page_content'] : '';
+		$this->_template_args['post_body_content'] = isset($this->_template_args['admin_page_content']) ? $this->_template_args['admin_page_content'] : '';
 		$this->_template_args['before_admin_page_content'] = isset($this->_template_args['before_admin_page_content']) ? $this->_template_args['before_admin_page_content'] : '';
 		$this->_template_args['after_admin_page_content'] = isset($this->_template_args['after_admin_page_content']) ? $this->_template_args['after_admin_page_content'] : '';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 
 		// the final template wrapper
@@ -2422,7 +2422,7 @@ 
 	 * @param bool   $display_sidebar whether to use the sidebar template or the full template for the page.  TRUE = SHOW sidebar, FALSE = no sidebar. Default no sidebar.
 	 * @return void
 	 */
-	public function display_admin_caf_preview_page( $utm_campaign_source = '', $display_sidebar = TRUE ) {
+	public function display_admin_caf_preview_page($utm_campaign_source = '', $display_sidebar = TRUE) {
 		//let's generate a default preview action button if there isn't one already present.
 		$this->_labels['buttons']['buy_now'] = __('Upgrade Now', 'event_espresso');
 		$buy_now_url = add_query_arg(
@@ -2435,10 +2435,10 @@ 
 			),
 		'http://eventespresso.com/pricing/'
 		);
-		$this->_template_args['preview_action_button'] = ! isset( $this->_template_args['preview_action_button'] ) ? $this->get_action_link_or_button( '', 'buy_now', array(), 'button-primary button-large', $buy_now_url, true ) : $this->_template_args['preview_action_button'];
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_caf_full_page_preview.template.php';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
-		$this->_display_admin_page( $display_sidebar );
+		$this->_template_args['preview_action_button'] = ! isset($this->_template_args['preview_action_button']) ? $this->get_action_link_or_button('', 'buy_now', array(), 'button-primary button-large', $buy_now_url, true) : $this->_template_args['preview_action_button'];
+		$template_path = EE_ADMIN_TEMPLATE.'admin_caf_full_page_preview.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
+		$this->_display_admin_page($display_sidebar);
 	}
 
 
@@ -2472,41 +2472,41 @@ 
 	 * @param boolean $sidebar whether to display with sidebar or not.
 	 * @return html
 	 */
-	private function _display_admin_list_table_page( $sidebar = false ) {
+	private function _display_admin_list_table_page($sidebar = false) {
 		//setup search attributes
 		$this->_set_search_attributes();
 		$this->_template_args['current_page'] = $this->_wp_page_slug;
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_list_wrapper.template.php';
+		$template_path = EE_ADMIN_TEMPLATE.'admin_list_wrapper.template.php';
 
-		$this->_template_args['table_url'] = defined( 'DOING_AJAX') ? add_query_arg( array( 'noheader' => 'true', 'route' => $this->_req_action), $this->_admin_base_url ) : add_query_arg( array( 'route' => $this->_req_action), $this->_admin_base_url);
+		$this->_template_args['table_url'] = defined('DOING_AJAX') ? add_query_arg(array('noheader' => 'true', 'route' => $this->_req_action), $this->_admin_base_url) : add_query_arg(array('route' => $this->_req_action), $this->_admin_base_url);
 		$this->_template_args['list_table'] = $this->_list_table_object;
 		$this->_template_args['current_route'] = $this->_req_action;
-		$this->_template_args['list_table_class'] = get_class( $this->_list_table_object );
+		$this->_template_args['list_table_class'] = get_class($this->_list_table_object);
 
 		$ajax_sorting_callback = $this->_list_table_object->get_ajax_sorting_callback();
-		if( ! empty( $ajax_sorting_callback )) {
-			$sortable_list_table_form_fields = wp_nonce_field( $ajax_sorting_callback . '_nonce', $ajax_sorting_callback . '_nonce', FALSE, FALSE );
+		if ( ! empty($ajax_sorting_callback)) {
+			$sortable_list_table_form_fields = wp_nonce_field($ajax_sorting_callback.'_nonce', $ajax_sorting_callback.'_nonce', FALSE, FALSE);
 //			$reorder_action = 'espresso_' . $ajax_sorting_callback . '_nonce';
 //			$sortable_list_table_form_fields = wp_nonce_field( $reorder_action, 'ajax_table_sort_nonce', FALSE, FALSE );
-			$sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_page" name="ajax_table_sort_page" value="' . $this->page_slug .'" />';
-			$sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_action" name="ajax_table_sort_action" value="' . $ajax_sorting_callback . '" />';
+			$sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_page" name="ajax_table_sort_page" value="'.$this->page_slug.'" />';
+			$sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_action" name="ajax_table_sort_action" value="'.$ajax_sorting_callback.'" />';
 		} else {
 			$sortable_list_table_form_fields = '';
 		}
 
 		$this->_template_args['sortable_list_table_form_fields'] = $sortable_list_table_form_fields;
-		$hidden_form_fields = isset( $this->_template_args['list_table_hidden_fields'] ) ? $this->_template_args['list_table_hidden_fields'] : '';
-		$nonce_ref = $this->_req_action . '_nonce';
-		$hidden_form_fields .= '<input type="hidden" name="' . $nonce_ref . '" value="' . wp_create_nonce( $nonce_ref ) . '">';
+		$hidden_form_fields = isset($this->_template_args['list_table_hidden_fields']) ? $this->_template_args['list_table_hidden_fields'] : '';
+		$nonce_ref = $this->_req_action.'_nonce';
+		$hidden_form_fields .= '<input type="hidden" name="'.$nonce_ref.'" value="'.wp_create_nonce($nonce_ref).'">';
 		$this->_template_args['list_table_hidden_fields'] = $hidden_form_fields;
 
 		//display message about search results?
-		$this->_template_args['before_list_table'] .= apply_filters( 'FHEE__EE_Admin_Page___display_admin_list_table_page__before_list_table__template_arg', !empty( $this->_req_data['s'] ) ? '<p class="ee-search-results">' . sprintf( __('Displaying search results for the search string: <strong><em>%s</em></strong>', 'event_espresso'), trim($this->_req_data['s'], '%') ) . '</p>' : '', $this->page_slug, $this->_req_data, $this->_req_action );
+		$this->_template_args['before_list_table'] .= apply_filters('FHEE__EE_Admin_Page___display_admin_list_table_page__before_list_table__template_arg', ! empty($this->_req_data['s']) ? '<p class="ee-search-results">'.sprintf(__('Displaying search results for the search string: <strong><em>%s</em></strong>', 'event_espresso'), trim($this->_req_data['s'], '%')).'</p>' : '', $this->page_slug, $this->_req_data, $this->_req_action);
 
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 		// the final template wrapper
-		if ( $sidebar )
+		if ($sidebar)
 			$this->display_admin_page_with_sidebar();
 		else
 			$this->display_admin_page_with_no_sidebar();
@@ -2529,9 +2529,9 @@ 
 	 * @param  array $items  see above for format of array
 	 * @return string        html string of legend
 	 */
-	protected function _display_legend( $items ) {
-		$template_args['items'] = apply_filters( 'FHEE__EE_Admin_Page___display_legend__items', (array) $items, $this );
-		$legend_template = EE_ADMIN_TEMPLATE . 'admin_details_legend.template.php';
+	protected function _display_legend($items) {
+		$template_args['items'] = apply_filters('FHEE__EE_Admin_Page___display_legend__items', (array) $items, $this);
+		$legend_template = EE_ADMIN_TEMPLATE.'admin_details_legend.template.php';
 		return EEH_Template::display_template($legend_template, $template_args, TRUE);
 	}
 
@@ -2556,31 +2556,31 @@ 
 	 *
 	 * @return json object
 	 */
-	protected function _return_json( $sticky_notices = FALSE ) {
+	protected function _return_json($sticky_notices = FALSE) {
 
 		//make sure any EE_Error notices have been handled.
-		$this->_process_notices( array(), true, $sticky_notices );
+		$this->_process_notices(array(), true, $sticky_notices);
 
 
-		$data = isset( $this->_template_args['data'] ) ? $this->_template_args['data'] : array();
+		$data = isset($this->_template_args['data']) ? $this->_template_args['data'] : array();
 		unset($this->_template_args['data']);
 		$json = array(
-			'error' => isset( $this->_template_args['error'] ) ? $this->_template_args['error'] : FALSE,
-			'success' => isset( $this->_template_args['success'] ) ? $this->_template_args['success'] : FALSE,
+			'error' => isset($this->_template_args['error']) ? $this->_template_args['error'] : FALSE,
+			'success' => isset($this->_template_args['success']) ? $this->_template_args['success'] : FALSE,
 			'notices' => EE_Error::get_notices(),
-			'content' => isset( $this->_template_args['admin_page_content'] ) ? $this->_template_args['admin_page_content'] : '',
-			'data' => array_merge( $data, array('template_args' => $this->_template_args ) ),
+			'content' => isset($this->_template_args['admin_page_content']) ? $this->_template_args['admin_page_content'] : '',
+			'data' => array_merge($data, array('template_args' => $this->_template_args)),
 			'isEEajax' => TRUE //special flag so any ajax.Success methods in js can identify this return package as a EEajax package.
 			);
 
 
 		// make sure there are no php errors or headers_sent.  Then we can set correct json header.
-		if ( NULL === error_get_last() || ! headers_sent() )
+		if (NULL === error_get_last() || ! headers_sent())
 			header('Content-Type: application/json; charset=UTF-8');
-                if( function_exists( 'wp_json_encode' ) ) {
-                    echo wp_json_encode( $json );
+                if (function_exists('wp_json_encode')) {
+                    echo wp_json_encode($json);
                 } else {
-                    echo json_encode( $json );
+                    echo json_encode($json);
                 }
 		exit();
 	}
@@ -2592,11 +2592,11 @@ 
 	 * @return json_obj|EE_Error
 	 */
 	public function return_json() {
-		if ( defined('DOING_AJAX') && DOING_AJAX )
+		if (defined('DOING_AJAX') && DOING_AJAX)
 			$this->_return_json();
 
 		else {
-			throw new EE_Error( sprintf( __('The public %s method can only be called when DOING_AJAX = TRUE', 'event_espresso'), __FUNCTION__ ) );
+			throw new EE_Error(sprintf(__('The public %s method can only be called when DOING_AJAX = TRUE', 'event_espresso'), __FUNCTION__));
 		}
 	}
 
@@ -2611,7 +2611,7 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function set_hook_object( EE_Admin_Hooks $hook_obj ) {
+	public function set_hook_object(EE_Admin_Hooks $hook_obj) {
 		$this->_hook_obj = $hook_obj;
 	}
 
@@ -2627,33 +2627,33 @@ 
 	*/
 	public function admin_page_wrapper($about = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$this->_nav_tabs = $this->_get_main_nav_tabs();
 
 		$this->_template_args['nav_tabs'] = $this->_nav_tabs;
 		$this->_template_args['admin_page_title'] = $this->_admin_page_title;
 
-		$this->_template_args['before_admin_page_content'] = apply_filters( 'FHEE_before_admin_page_content' . $this->_current_page . $this->_current_view, isset( $this->_template_args['before_admin_page_content'] ) ? $this->_template_args['before_admin_page_content'] : '');
-		$this->_template_args['after_admin_page_content'] = apply_filters( 'FHEE_after_admin_page_content' . $this->_current_page . $this->_current_view, isset( $this->_template_args['after_admin_page_content'] ) ? $this->_template_args['after_admin_page_content'] : '');
+		$this->_template_args['before_admin_page_content'] = apply_filters('FHEE_before_admin_page_content'.$this->_current_page.$this->_current_view, isset($this->_template_args['before_admin_page_content']) ? $this->_template_args['before_admin_page_content'] : '');
+		$this->_template_args['after_admin_page_content'] = apply_filters('FHEE_after_admin_page_content'.$this->_current_page.$this->_current_view, isset($this->_template_args['after_admin_page_content']) ? $this->_template_args['after_admin_page_content'] : '');
 
 		$this->_template_args['after_admin_page_content'] .= $this->_set_help_popup_content();
 
 
 
 		// load settings page wrapper template
-		$template_path = !defined( 'DOING_AJAX' ) ? EE_ADMIN_TEMPLATE . 'admin_wrapper.template.php' : EE_ADMIN_TEMPLATE . 'admin_wrapper_ajax.template.php';
+		$template_path = ! defined('DOING_AJAX') ? EE_ADMIN_TEMPLATE.'admin_wrapper.template.php' : EE_ADMIN_TEMPLATE.'admin_wrapper_ajax.template.php';
 
 		//about page?
-		$template_path = $about ? EE_ADMIN_TEMPLATE . 'about_admin_wrapper.template.php' : $template_path;
+		$template_path = $about ? EE_ADMIN_TEMPLATE.'about_admin_wrapper.template.php' : $template_path;
 
 
-		if ( defined( 'DOING_AJAX' ) ) {
-			$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		if (defined('DOING_AJAX')) {
+			$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 			$this->_return_json();
 		} else {
-			EEH_Template::display_template( $template_path, $this->_template_args );
+			EEH_Template::display_template($template_path, $this->_template_args);
 		}
 
 	}
@@ -2666,7 +2666,7 @@ 
 	 */
 	protected function _get_main_nav_tabs() {
 		//let's generate the html using the EEH_Tabbed_Content helper.  We do this here so that it's possible for child classes to add in nav tabs dynamically at the last minute (rather than setting in the page_routes array)
-		EE_Registry::instance()->load_helper( 'Tabbed_Content' );
+		EE_Registry::instance()->load_helper('Tabbed_Content');
 		return EEH_Tabbed_Content::display_admin_nav_tabs($this->_nav_tabs);
 	}
 
@@ -2682,7 +2682,7 @@ 
 	*		@access public
 	*		@return void
 	*/
-	private function _sort_nav_tabs( $a, $b ) {
+	private function _sort_nav_tabs($a, $b) {
 		if ($a['order'] == $b['order']) {
 	        return 0;
 	    }
@@ -2703,8 +2703,8 @@ 
 	 * 	@uses EEH_Form_Fields::get_form_fields (/helper/EEH_Form_Fields.helper.php)
 	 * 	@uses EEH_Form_Fields::get_form_fields_array (/helper/EEH_Form_Fields.helper.php)
 	 */
-	protected function _generate_admin_form_fields( $input_vars = array(), $generator = 'string', $id = FALSE ) {
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
+	protected function _generate_admin_form_fields($input_vars = array(), $generator = 'string', $id = FALSE) {
+		EE_Registry::instance()->load_helper('Form_Fields');
 		$content = $generator == 'string' ? EEH_Form_Fields::get_form_fields($input_vars, $id) : EEH_Form_Fields::get_form_fields_array($input_vars);
 		return $content;
 	}
@@ -2726,25 +2726,25 @@ 
 	 * @param array $actions if included allows us to set the actions that each button will carry out (i.e. via the "name" value in the button).  We can also use this to just dump default actions by submitting some other value.
 	 * @param bool|string|null $referrer if false then we just do the default action on save and close.  Other wise it will use the $referrer string. IF null, then we don't do ANYTHING on save and close (normal form handling).
 	 */
-	protected function _set_save_buttons($both = TRUE, $text = array(), $actions = array(), $referrer = NULL ) {
+	protected function _set_save_buttons($both = TRUE, $text = array(), $actions = array(), $referrer = NULL) {
 		//make sure $text and $actions are in an array
 		$text = (array) $text;
 		$actions = (array) $actions;
 		$referrer_url = empty($referrer) ? '' : $referrer;
-		$referrer_url = !$referrer ? '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="' . $_SERVER['REQUEST_URI'] .'" />' : '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="' . $referrer .'" />';
+		$referrer_url = ! $referrer ? '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="'.$_SERVER['REQUEST_URI'].'" />' : '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="'.$referrer.'" />';
 
-		$button_text = !empty($text) ? $text : array( __('Save', 'event_espresso'), __('Save and Close', 'event_espresso') );
-		$default_names = array( 'save', 'save_and_close' );
+		$button_text = ! empty($text) ? $text : array(__('Save', 'event_espresso'), __('Save and Close', 'event_espresso'));
+		$default_names = array('save', 'save_and_close');
 
 		//add in a hidden index for the current page (so save and close redirects properly)
 		$this->_template_args['save_buttons'] = $referrer_url;
 
-		foreach ( $button_text as $key => $button ) {
+		foreach ($button_text as $key => $button) {
 			$ref = $default_names[$key];
-			$id = $this->_current_view . '_' . $ref;
-			$name = !empty($actions) ? $actions[$key] : $ref;
-			$this->_template_args['save_buttons'] .= '<input type="submit" class="button-primary ' . $ref . '" value="' . $button . '" name="' . $name . '" id="' . $id . '" />';
-			if ( !$both ) break;
+			$id = $this->_current_view.'_'.$ref;
+			$name = ! empty($actions) ? $actions[$key] : $ref;
+			$this->_template_args['save_buttons'] .= '<input type="submit" class="button-primary '.$ref.'" value="'.$button.'" name="'.$name.'" id="'.$id.'" />';
+			if ( ! $both) break;
 		}
 
 	}
@@ -2757,8 +2757,8 @@ 
 	 * @since 4.6.0
 	 *
 	 */
-	public function set_add_edit_form_tags( $route = '', $additional_hidden_fields = array() ) {
-		$this->_set_add_edit_form_tags( $route, $additional_hidden_fields );
+	public function set_add_edit_form_tags($route = '', $additional_hidden_fields = array()) {
+		$this->_set_add_edit_form_tags($route, $additional_hidden_fields);
 	}
 
 
@@ -2771,30 +2771,30 @@ 
 	 * @param array $additional_hidden_fields any additional hidden fields required in the form header
 	 * @return void
 	 */
-	protected function _set_add_edit_form_tags( $route = '', $additional_hidden_fields = array() ) {
+	protected function _set_add_edit_form_tags($route = '', $additional_hidden_fields = array()) {
 
-		if ( empty( $route )) {
+		if (empty($route)) {
 			$user_msg = __('An error occurred. No action was set for this page\'s form.', 'event_espresso');
-			$dev_msg = $user_msg . "\n" . sprintf( __('The $route argument is required for the %s->%s method.', 'event_espresso'), __FUNCTION__, __CLASS__ );
-			EE_Error::add_error( $user_msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__ );
+			$dev_msg = $user_msg."\n".sprintf(__('The $route argument is required for the %s->%s method.', 'event_espresso'), __FUNCTION__, __CLASS__);
+			EE_Error::add_error($user_msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 		// open form
-		$this->_template_args['before_admin_page_content'] = '<form name="form" method="post" action="' . $this->_admin_base_url . '" id="' . $route . '_event_form" >';
+		$this->_template_args['before_admin_page_content'] = '<form name="form" method="post" action="'.$this->_admin_base_url.'" id="'.$route.'_event_form" >';
 		// add nonce
-		$nonce = wp_nonce_field( $route . '_nonce', $route . '_nonce', FALSE, FALSE );
+		$nonce = wp_nonce_field($route.'_nonce', $route.'_nonce', FALSE, FALSE);
 //		$nonce = wp_nonce_field( $route . '_nonce', '_wpnonce', FALSE, FALSE );
-		$this->_template_args['before_admin_page_content'] .= "\n\t" . $nonce;
+		$this->_template_args['before_admin_page_content'] .= "\n\t".$nonce;
 		// add REQUIRED form action
 		$hidden_fields = array(
-				'action' => array( 'type' => 'hidden', 'value' => $route ),
+				'action' => array('type' => 'hidden', 'value' => $route),
 			);
 		// merge arrays
-		$hidden_fields = is_array( $additional_hidden_fields) ? array_merge( $hidden_fields, $additional_hidden_fields ) : $hidden_fields;
+		$hidden_fields = is_array($additional_hidden_fields) ? array_merge($hidden_fields, $additional_hidden_fields) : $hidden_fields;
 		// generate form fields
-		$form_fields = $this->_generate_admin_form_fields( $hidden_fields, 'array' );
+		$form_fields = $this->_generate_admin_form_fields($hidden_fields, 'array');
 		// add fields to form
-		foreach ( $form_fields as $field_name => $form_field ) {
-			$this->_template_args['before_admin_page_content'] .= "\n\t" . $form_field['field'];
+		foreach ($form_fields as $field_name => $form_field) {
+			$this->_template_args['before_admin_page_content'] .= "\n\t".$form_field['field'];
 		}
 
 		// close form
@@ -2811,8 +2811,8 @@ 
 	 * @see EE_Admin_Page::_redirect_after_action() for params.
 	 * @since 4.5.0
 	 */
-	public function redirect_after_action( $success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE ) {
-		$this->_redirect_after_action( $success, $what, $action_desc, $query_args, $override_overwrite );
+	public function redirect_after_action($success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE) {
+		$this->_redirect_after_action($success, $what, $action_desc, $query_args, $override_overwrite);
 	}
 
 
@@ -2827,32 +2827,32 @@ 
 	 *	@access protected
 	 *	@return void
 	 */
-	protected function _redirect_after_action( $success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE ) {
+	protected function _redirect_after_action($success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		//class name for actions/filters.
 		$classname = get_class($this);
 
 		//set redirect url. Note if there is a "page" index in the $query_args then we go with vanilla admin.php route, otherwise we go with whatever is set as the _admin_base_url
-		$redirect_url = isset( $query_args['page'] ) ? admin_url('admin.php') : $this->_admin_base_url;
-		$notices = EE_Error::get_notices( FALSE );
+		$redirect_url = isset($query_args['page']) ? admin_url('admin.php') : $this->_admin_base_url;
+		$notices = EE_Error::get_notices(FALSE);
 
 		// overwrite default success messages //BUT ONLY if overwrite not overridden
-		if ( ! $override_overwrite || ! empty( $notices['errors'] )) {
+		if ( ! $override_overwrite || ! empty($notices['errors'])) {
 			EE_Error::overwrite_success();
 		}
 		// how many records affected ? more than one record ? or just one ?
-		if ( $success > 1 && empty( $notices['errors'] )) {
+		if ($success > 1 && empty($notices['errors'])) {
 			// set plural msg
-			EE_Error::add_success( sprintf( __('The "%s" have been successfully %s.', 'event_espresso'), $what, $action_desc ), __FILE__, __FUNCTION__, __LINE__);
-		} else if ( $success == 1 && empty( $notices['errors'] )) {
+			EE_Error::add_success(sprintf(__('The "%s" have been successfully %s.', 'event_espresso'), $what, $action_desc), __FILE__, __FUNCTION__, __LINE__);
+		} else if ($success == 1 && empty($notices['errors'])) {
 			// set singular msg
-			EE_Error::add_success( sprintf( __('The "%s" has been successfully %s.', 'event_espresso'), $what, $action_desc), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_success(sprintf(__('The "%s" has been successfully %s.', 'event_espresso'), $what, $action_desc), __FILE__, __FUNCTION__, __LINE__);
 		}
 
 		// check that $query_args isn't something crazy
-		if ( ! is_array( $query_args )) {
+		if ( ! is_array($query_args)) {
 			$query_args = array();
 		}
 
@@ -2865,36 +2865,36 @@ 
 		 * @param array $query_args   The original query_args array coming into the
 		 *                          		method.
 		 */
-		do_action( 'AHEE__' . $classname . '___redirect_after_action__before_redirect_modification_' . $this->_req_action, $query_args );
+		do_action('AHEE__'.$classname.'___redirect_after_action__before_redirect_modification_'.$this->_req_action, $query_args);
 
 		//calculate where we're going (if we have a "save and close" button pushed)
-		if ( isset($this->_req_data['save_and_close'] ) && isset($this->_req_data['save_and_close_referrer'] ) ) {
+		if (isset($this->_req_data['save_and_close']) && isset($this->_req_data['save_and_close_referrer'])) {
 			// even though we have the save_and_close referrer, we need to parse the url for the action in order to generate a nonce
-			$parsed_url = parse_url( $this->_req_data['save_and_close_referrer'] );
+			$parsed_url = parse_url($this->_req_data['save_and_close_referrer']);
 			// regenerate query args array from refferer URL
-			parse_str( $parsed_url['query'], $query_args );
+			parse_str($parsed_url['query'], $query_args);
 			// correct page and action will be in the query args now
-			$redirect_url = admin_url( 'admin.php' );
+			$redirect_url = admin_url('admin.php');
 		}
 
 		//merge any default query_args set in _default_route_query_args property
-		if ( ! empty( $this->_default_route_query_args ) && ! $this->_is_UI_request ) {
+		if ( ! empty($this->_default_route_query_args) && ! $this->_is_UI_request) {
 			$args_to_merge = array();
-			foreach ( $this->_default_route_query_args as $query_param => $query_value ) {
+			foreach ($this->_default_route_query_args as $query_param => $query_value) {
 				//is there a wp_referer array in our _default_route_query_args property?
-				if ( $query_param == 'wp_referer'  ) {
+				if ($query_param == 'wp_referer') {
 					$query_value = (array) $query_value;
-					foreach ( $query_value as $reference => $value ) {
-						if ( strpos( $reference, 'nonce' ) !== false ) {
+					foreach ($query_value as $reference => $value) {
+						if (strpos($reference, 'nonce') !== false) {
 							continue;
 						}
 
 						//finally we will override any arguments in the referer with
 						//what might be set on the _default_route_query_args array.
-						if ( isset( $this->_default_route_query_args[$reference] ) ) {
-							$args_to_merge[$reference] = urlencode( $this->_default_route_query_args[$reference] );
+						if (isset($this->_default_route_query_args[$reference])) {
+							$args_to_merge[$reference] = urlencode($this->_default_route_query_args[$reference]);
 						} else {
-							$args_to_merge[$reference] = urlencode( $value );
+							$args_to_merge[$reference] = urlencode($value);
 						}
 					}
 					continue;
@@ -2905,7 +2905,7 @@ 
 
 			//now let's merge these arguments but override with what was specifically sent in to the
 			//redirect.
-			$query_args = array_merge( $args_to_merge, $query_args );
+			$query_args = array_merge($args_to_merge, $query_args);
 		}
 
 		$this->_process_notices($query_args);
@@ -2914,19 +2914,19 @@ 
 		// generate redirect url
 
 		// if redirecting to anything other than the main page, add a nonce
-		if ( isset( $query_args['action'] )) {
+		if (isset($query_args['action'])) {
 			// manually generate wp_nonce and merge that with the query vars becuz the wp_nonce_url function wrecks havoc on some vars
-			$query_args['_wpnonce'] = wp_create_nonce( $query_args['action'] . '_nonce' );
+			$query_args['_wpnonce'] = wp_create_nonce($query_args['action'].'_nonce');
 		}
 
 		//we're adding some hooks and filters in here for processing any things just before redirects (example: an admin page has done an insert or update and we want to run something after that).
-		do_action( 'AHEE_redirect_' . $classname . $this->_req_action, $query_args );
+		do_action('AHEE_redirect_'.$classname.$this->_req_action, $query_args);
 
-		$redirect_url = apply_filters( 'FHEE_redirect_' . $classname . $this->_req_action, self::add_query_args_and_nonce( $query_args, $redirect_url ), $query_args );
+		$redirect_url = apply_filters('FHEE_redirect_'.$classname.$this->_req_action, self::add_query_args_and_nonce($query_args, $redirect_url), $query_args);
 
 
 		// check if we're doing ajax.  If we are then lets just return the results and js can handle how it wants.
-		if ( defined('DOING_AJAX' ) ) {
+		if (defined('DOING_AJAX')) {
 			$default_data = array(
 				'close' => TRUE,
 				'redirect_url' => $redirect_url,
@@ -2935,11 +2935,11 @@ 
 				);
 
 			$this->_template_args['success'] = $success;
-			$this->_template_args['data'] = !empty($this->_template_args['data']) ? array_merge($default_data, $this->_template_args['data'] ): $default_data;
+			$this->_template_args['data'] = ! empty($this->_template_args['data']) ? array_merge($default_data, $this->_template_args['data']) : $default_data;
 			$this->_return_json();
 		}
 
-		wp_safe_redirect( $redirect_url );
+		wp_safe_redirect($redirect_url);
 		exit();
 	}
 
@@ -2955,14 +2955,14 @@ 
 	 * @param bool    $sticky_notices      This is used to flag that regardless of whether this is doing_ajax or not, we still save a transient for the notice.
 	 * @return void
 	 */
-	protected function _process_notices( $query_args = array(), $skip_route_verify = FALSE , $sticky_notices = TRUE ) {
+	protected function _process_notices($query_args = array(), $skip_route_verify = FALSE, $sticky_notices = TRUE) {
 
 		$this->_template_args['notices'] = EE_Error::get_notices();
 
 		//IF this isn't ajax we need to create a transient for the notices using the route (however, overridden if $sticky_notices == true)
-		if ( ! defined( 'DOING_AJAX' ) || $sticky_notices ) {
-			$route = isset( $query_args['action'] ) ? $query_args['action'] : 'default';
-			$this->_add_transient( $route, $this->_template_args['notices'], TRUE, $skip_route_verify );
+		if ( ! defined('DOING_AJAX') || $sticky_notices) {
+			$route = isset($query_args['action']) ? $query_args['action'] : 'default';
+			$this->_add_transient($route, $this->_template_args['notices'], TRUE, $skip_route_verify);
 		}
 	}
 
@@ -2984,32 +2984,32 @@ 
 	 *
 	 * @return string html for button
 	 */
-	public function get_action_link_or_button($action, $type = 'add', $extra_request = array(), $class = 'button-primary', $base_url = FALSE, $exclude_nonce = false ) {
+	public function get_action_link_or_button($action, $type = 'add', $extra_request = array(), $class = 'button-primary', $base_url = FALSE, $exclude_nonce = false) {
 		//first let's validate the action (if $base_url is FALSE otherwise validation will happen further along)
-		if ( !isset($this->_page_routes[$action]) && !$base_url )
-			throw new EE_Error( sprintf( __('There is no page route for given action for the button.  This action was given: %s', 'event_espresso'), $action) );
+		if ( ! isset($this->_page_routes[$action]) && ! $base_url)
+			throw new EE_Error(sprintf(__('There is no page route for given action for the button.  This action was given: %s', 'event_espresso'), $action));
 
-		if ( !isset( $this->_labels['buttons'][$type] ) )
-			throw new EE_Error( sprintf( __('There is no label for the given button type (%s). Labels are set in the <code>_page_config</code> property.', 'event_espresso'), $type) );
+		if ( ! isset($this->_labels['buttons'][$type]))
+			throw new EE_Error(sprintf(__('There is no label for the given button type (%s). Labels are set in the <code>_page_config</code> property.', 'event_espresso'), $type));
 
 		//finally check user access for this button.
-		$has_access = $this->check_user_access( $action, TRUE );
-		if ( ! $has_access ) {
+		$has_access = $this->check_user_access($action, TRUE);
+		if ( ! $has_access) {
 			return '';
 		}
 
-		$_base_url = !$base_url ? $this->_admin_base_url : $base_url;
+		$_base_url = ! $base_url ? $this->_admin_base_url : $base_url;
 
 		$query_args = array(
 			'action' => $action  );
 
 		//merge extra_request args but make sure our original action takes precedence and doesn't get overwritten.
-		if ( !empty($extra_request) )
-			$query_args = array_merge( $extra_request, $query_args );
+		if ( ! empty($extra_request))
+			$query_args = array_merge($extra_request, $query_args);
 
-		$url = self::add_query_args_and_nonce( $query_args, $_base_url, false, $exclude_nonce );
+		$url = self::add_query_args_and_nonce($query_args, $_base_url, false, $exclude_nonce);
 
-		$button = EEH_Template::get_button_or_link( $url, $this->_labels['buttons'][$type], $class );
+		$button = EEH_Template::get_button_or_link($url, $this->_labels['buttons'][$type], $class);
 
 		return $button;
 	}
@@ -3029,11 +3029,11 @@ 
 		$args = array(
 			'label' => $this->_admin_page_title,
 			'default' => 10,
-			'option' => $this->_current_page . '_' . $this->_current_view . '_per_page'
+			'option' => $this->_current_page.'_'.$this->_current_view.'_per_page'
 			);
 		//ONLY add the screen option if the user has access to it.
-		if ( $this->check_user_access( $this->_current_view, true ) ) {
-			add_screen_option( $option, $args );
+		if ($this->check_user_access($this->_current_view, true)) {
+			add_screen_option($option, $args);
 		}
 	}
 
@@ -3049,36 +3049,36 @@ 
 	 * @return void
 	 */
 	private function _set_per_page_screen_options() {
-		if ( isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options']) ) {
-			check_admin_referer( 'screen-options-nonce', 'screenoptionnonce' );
+		if (isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options'])) {
+			check_admin_referer('screen-options-nonce', 'screenoptionnonce');
 
-			if ( !$user = wp_get_current_user() )
+			if ( ! $user = wp_get_current_user())
 			return;
 			$option = $_POST['wp_screen_options']['option'];
 			$value = $_POST['wp_screen_options']['value'];
 
-			if ( $option != sanitize_key( $option ) )
+			if ($option != sanitize_key($option))
 				return;
 
 			$map_option = $option;
 
 			$option = str_replace('-', '_', $option);
 
-			switch ( $map_option ) {
-				case $this->_current_page . '_' .  $this->_current_view . '_per_page':
+			switch ($map_option) {
+				case $this->_current_page.'_'.$this->_current_view.'_per_page':
 					$value = (int) $value;
-					if ( $value < 1 || $value > 999 )
+					if ($value < 1 || $value > 999)
 						return;
 					break;
 				default:
-					$value = apply_filters( 'FHEE__EE_Admin_Page___set_per_page_screen_options__value', false, $option, $value );
-					if ( false === $value )
+					$value = apply_filters('FHEE__EE_Admin_Page___set_per_page_screen_options__value', false, $option, $value);
+					if (false === $value)
 						return;
 					break;
 			}
 
 			update_user_meta($user->ID, $option, $value);
-			wp_safe_redirect( remove_query_arg( array('pagenum', 'apage', 'paged'), wp_get_referer() ) );
+			wp_safe_redirect(remove_query_arg(array('pagenum', 'apage', 'paged'), wp_get_referer()));
 			exit;
 		}
 	}
@@ -3089,8 +3089,8 @@ 
 	 * This just allows for setting the $_template_args property if it needs to be set outside the object
 	 * @param array $data array that will be assigned to template args.
 	 */
-	public function set_template_args( $data ) {
-		$this->_template_args = array_merge( $this->_template_args, (array) $data );
+	public function set_template_args($data) {
+		$this->_template_args = array_merge($this->_template_args, (array) $data);
 	}
 
 
@@ -3106,26 +3106,26 @@ 
 	 * @param bool $skip_route_verify Used to indicate we want to skip route verification.  This is usually ONLY used when we are adding a transient before page_routes have been defined.
 	 * @return void
 	 */
-	protected function _add_transient( $route, $data, $notices = FALSE, $skip_route_verify = FALSE ) {
+	protected function _add_transient($route, $data, $notices = FALSE, $skip_route_verify = FALSE) {
 		$user_id = get_current_user_id();
 
-		if ( !$skip_route_verify )
+		if ( ! $skip_route_verify)
 			$this->_verify_route($route);
 
 
 		//now let's set the string for what kind of transient we're setting
-		$transient = $notices ? 'ee_rte_n_tx_' . $route . '_' . $user_id : 'rte_tx_' . $route . '_' . $user_id;
-		$data = $notices ? array( 'notices' => $data ) : $data;
+		$transient = $notices ? 'ee_rte_n_tx_'.$route.'_'.$user_id : 'rte_tx_'.$route.'_'.$user_id;
+		$data = $notices ? array('notices' => $data) : $data;
 		//is there already a transient for this route?  If there is then let's ADD to that transient
-		$existing = is_multisite() && is_network_admin() ? get_site_transient( $transient ) : get_transient( $transient );
-		if ( $existing ) {
-			$data = array_merge( (array) $data, (array) $existing );
+		$existing = is_multisite() && is_network_admin() ? get_site_transient($transient) : get_transient($transient);
+		if ($existing) {
+			$data = array_merge((array) $data, (array) $existing);
 		}
 
-		if ( is_multisite() && is_network_admin() ) {
-			set_site_transient( $transient, $data, 8 );
+		if (is_multisite() && is_network_admin()) {
+			set_site_transient($transient, $data, 8);
 		} else {
-			set_transient( $transient, $data, 8 );
+			set_transient($transient, $data, 8);
 		}
 	}
 
@@ -3137,18 +3137,18 @@ 
 	 * @param bool $notices true we get notices transient. False we just return normal route transient
 	 * @return mixed data
 	 */
-	protected function _get_transient( $notices = FALSE, $route = FALSE ) {
+	protected function _get_transient($notices = FALSE, $route = FALSE) {
 		$user_id = get_current_user_id();
-		$route = !$route ? $this->_req_action : $route;
-		$transient = $notices ? 'ee_rte_n_tx_' . $route . '_' . $user_id : 'rte_tx_' . $route . '_' . $user_id;
-		$data = is_multisite() && is_network_admin() ? get_site_transient( $transient ) : get_transient( $transient );
+		$route = ! $route ? $this->_req_action : $route;
+		$transient = $notices ? 'ee_rte_n_tx_'.$route.'_'.$user_id : 'rte_tx_'.$route.'_'.$user_id;
+		$data = is_multisite() && is_network_admin() ? get_site_transient($transient) : get_transient($transient);
 		//delete transient after retrieval (just in case it hasn't expired);
-		if ( is_multisite() && is_network_admin() ) {
-			delete_site_transient( $transient );
+		if (is_multisite() && is_network_admin()) {
+			delete_site_transient($transient);
 		} else {
-			delete_transient( $transient );
+			delete_transient($transient);
 		}
-		return $notices && isset( $data['notices'] ) ? $data['notices'] : $data;
+		return $notices && isset($data['notices']) ? $data['notices'] : $data;
 	}
 
 
@@ -3165,12 +3165,12 @@ 
 
 		//retrieve all existing transients
 		$query = "SELECT option_name FROM $wpdb->options WHERE option_name LIKE '%rte_tx_%' OR option_name LIKE '%rte_n_tx_%'";
-		if ( $results = $wpdb->get_results( $query ) ) {
-			foreach ( $results as $result ) {
-				$transient = str_replace( '_transient_', '', $result->option_name );
-				get_transient( $transient );
-				if ( is_multisite() && is_network_admin() ) {
-					get_site_transient( $transient );
+		if ($results = $wpdb->get_results($query)) {
+			foreach ($results as $result) {
+				$transient = str_replace('_transient_', '', $result->option_name);
+				get_transient($transient);
+				if (is_multisite() && is_network_admin()) {
+					get_site_transient($transient);
 				}
 			}
 		}
@@ -3294,23 +3294,23 @@ 
 	 * @param string $line	line no where error occurred
 	 * @return boolean
 	 */
-	protected function _update_espresso_configuration( $tab, $config, $file = '', $func = '', $line = '' ) {
+	protected function _update_espresso_configuration($tab, $config, $file = '', $func = '', $line = '') {
 
 		//remove any options that are NOT going to be saved with the config settings.
-		if ( isset( $config->core->ee_ueip_optin ) ) {
+		if (isset($config->core->ee_ueip_optin)) {
 			$config->core->ee_ueip_has_notified = TRUE;
 			// TODO: remove the following two lines and make sure values are migrated from 3.1
-			update_option( 'ee_ueip_optin', $config->core->ee_ueip_optin);
-			update_option( 'ee_ueip_has_notified', TRUE );
+			update_option('ee_ueip_optin', $config->core->ee_ueip_optin);
+			update_option('ee_ueip_has_notified', TRUE);
 		}
 		// and save it (note we're also doing the network save here)
-		$net_saved = is_main_site() ? EE_Network_Config::instance()->update_config( FALSE, FALSE ) : TRUE;
-		$config_saved = EE_Config::instance()->update_espresso_config( FALSE, FALSE );
-		if ( $config_saved && $net_saved ) {
-			EE_Error::add_success( sprintf( __('"%s" have been successfully updated.', 'event_espresso'), $tab ));
+		$net_saved = is_main_site() ? EE_Network_Config::instance()->update_config(FALSE, FALSE) : TRUE;
+		$config_saved = EE_Config::instance()->update_espresso_config(FALSE, FALSE);
+		if ($config_saved && $net_saved) {
+			EE_Error::add_success(sprintf(__('"%s" have been successfully updated.', 'event_espresso'), $tab));
 			return TRUE;
 		} else {
-			EE_Error::add_error( sprintf( __('The "%s" were not updated.', 'event_espresso'), $tab ), $file, $func, $line  );
+			EE_Error::add_error(sprintf(__('The "%s" were not updated.', 'event_espresso'), $tab), $file, $func, $line);
 			return FALSE;
 		}
 	}
@@ -3323,7 +3323,7 @@ 
 	 * Returns an array to be used for EE_FOrm_Fields.helper.php's select_input as the $values argument.
 	 * @return array
 	 */
-	public function get_yes_no_values(){
+	public function get_yes_no_values() {
 		return $this->_yes_no_values;
 	}
 
@@ -3345,8 +3345,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function _next_link( $url, $class = 'dashicons dashicons-arrow-right' ) {
-		return '<a class="' . $class . '" href="' . $url . '"></a>';
+	protected function _next_link($url, $class = 'dashicons dashicons-arrow-right') {
+		return '<a class="'.$class.'" href="'.$url.'"></a>';
 	}
 
 
@@ -3360,8 +3360,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function _previous_link( $url, $class = 'dashicons dashicons-arrow-left' ) {
-		return '<a class="' . $class . '" href="' . $url . '"></a>';
+	protected function _previous_link($url, $class = 'dashicons dashicons-arrow-left') {
+		return '<a class="'.$class.'" href="'.$url.'"></a>';
 	}
 
 
@@ -3380,8 +3380,8 @@ 
 	 * @return bool success/fail
 	 */
 	protected function _process_resend_registration() {
-		$this->_template_args['success'] = EED_Messages::process_resend( $this->_req_data );
-		do_action( 'AHEE__EE_Admin_Page___process_resend_registration', $this->_template_args['success'], $this->_req_data );
+		$this->_template_args['success'] = EED_Messages::process_resend($this->_req_data);
+		do_action('AHEE__EE_Admin_Page___process_resend_registration', $this->_template_args['success'], $this->_req_data);
 		return $this->_template_args['success'];
 	}
 
@@ -3394,9 +3394,9 @@ 
 	 * @param \EE_Payment $payment
 	 * @return bool success/fail
 	 */
-	protected function _process_payment_notification( EE_Payment $payment ) {
-		add_filter( 'FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', '__return_true' );
-		$success = apply_filters( 'FHEE__EE_Admin_Page___process_admin_payment_notification__success', FALSE, $payment );
+	protected function _process_payment_notification(EE_Payment $payment) {
+		add_filter('FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', '__return_true');
+		$success = apply_filters('FHEE__EE_Admin_Page___process_admin_payment_notification__success', FALSE, $payment);
 		$this->_template_args['success'] = $success;
 		return $success;
 	}

core/EE_Payment_Processor.core.php

Indentation +13 added lines, -14 removed lines

@@ -1,21 +1,21 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 EE_Registry::instance()->load_class( 'Processor_Base' );
 /**
- *
- * EE_Payment_Processor
- *
- * Class for handling processing of payments for transactions.
- *
- * @package			Event Espresso
- * @subpackage		core/libraries/payment_methods
- * @author			Mike Nelson
- *
- */
+	 *
+	 * EE_Payment_Processor
+	 *
+	 * Class for handling processing of payments for transactions.
+	 *
+	 * @package			Event Espresso
+	 * @subpackage		core/libraries/payment_methods
+	 * @author			Mike Nelson
+	 *
+	 */
 class EE_Payment_Processor extends EE_Processor_Base {
 	/**
-     * 	@var EE_Payment_Processor $_instance
+	 * 	@var EE_Payment_Processor $_instance
 	 * 	@access 	private
-     */
+	 */
 	private static $_instance = NULL;
 
 
@@ -48,9 +48,8 @@ 
 
 
 	/**
-
 	 * Using the selected gateway, processes the payment for that transaction, and updates the transaction appropriately.
- 	 * Saves the payment that is generated
+	 * Saves the payment that is generated
 	 *
 	 * @param EE_Payment_Method 	$payment_method
 	 * @param EE_Transaction 				$transaction

Spacing +136 added lines, -136 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
-EE_Registry::instance()->load_class( 'Processor_Base' );
+EE_Registry::instance()->load_class('Processor_Base');
 /**
  *
  * EE_Payment_Processor
@@ -27,7 +27,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Payment_Processor ) {
+		if ( ! self::$_instance instanceof EE_Payment_Processor) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -42,7 +42,7 @@ 
 	 *@return EE_Payment_Processor
 	 */
 	private function __construct() {
-		do_action( 'AHEE__EE_Payment_Processor__construct' );
+		do_action('AHEE__EE_Payment_Processor__construct');
 	}
 
 
@@ -64,42 +64,42 @@ 
 	 * @param string 	       						$cancel_url 	URL to return to if off-site payments are cancelled
 	 * @return EE_Payment
 	 */
-	public function process_payment( EE_Payment_Method $payment_method, EE_Transaction $transaction, $amount = NULL, $billing_form = NULL, $return_url = NULL, $method = 'CART', $by_admin = FALSE, $update_txn = TRUE, $cancel_url = '' ) {
-		if( $amount < 0 ) {
+	public function process_payment(EE_Payment_Method $payment_method, EE_Transaction $transaction, $amount = NULL, $billing_form = NULL, $return_url = NULL, $method = 'CART', $by_admin = FALSE, $update_txn = TRUE, $cancel_url = '') {
+		if ($amount < 0) {
 			throw new EE_Error( 
 					sprintf(
-							__( 'Attempting to make a payment for a negative amount of %1$d for transaction %2$d. That should be a refund', 'event_espresso' ),
+							__('Attempting to make a payment for a negative amount of %1$d for transaction %2$d. That should be a refund', 'event_espresso'),
 							$amount,
 							$transaction->ID() ) );
 		}
 		// verify payment method
-		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj( $payment_method, TRUE );
+		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method, TRUE);
 		// verify transaction
-		EEM_Transaction::instance()->ensure_is_obj( $transaction );
-		$transaction->set_payment_method_ID( $payment_method->ID() );
+		EEM_Transaction::instance()->ensure_is_obj($transaction);
+		$transaction->set_payment_method_ID($payment_method->ID());
 		// verify payment method type
-		if ( $payment_method->type_obj() instanceof EE_PMT_Base ){
+		if ($payment_method->type_obj() instanceof EE_PMT_Base) {
 			$payment = $payment_method->type_obj()->process_payment(
 				$transaction,
-				min( $amount, $transaction->remaining() ),//make sure we don't overcharge
+				min($amount, $transaction->remaining()), //make sure we don't overcharge
 				$billing_form,
 				$return_url,
-				add_query_arg( array( 'ee_cancel_payment' => true ), $cancel_url ),
+				add_query_arg(array('ee_cancel_payment' => true), $cancel_url),
 				$method,
 				$by_admin
 			);
 			// check if payment method uses an off-site gateway
-			if ( $payment_method->type_obj()->payment_occurs() != EE_PMT_Base::offsite ) {
+			if ($payment_method->type_obj()->payment_occurs() != EE_PMT_Base::offsite) {
 				// don't process payments for off-site gateways yet because no payment has occurred yet
-				$this->update_txn_based_on_payment( $transaction, $payment, $update_txn );
+				$this->update_txn_based_on_payment($transaction, $payment, $update_txn);
 			}
 			return $payment;
 		} else {
 			EE_Error::add_error(
 				sprintf(
-					__( 'A valid payment method could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+					__('A valid payment method could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso'),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				), __FILE__, __FUNCTION__, __LINE__
 			);
 			return NULL;
@@ -115,14 +115,14 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	public function get_ipn_url_for_payment_method( $transaction, $payment_method ){
+	public function get_ipn_url_for_payment_method($transaction, $payment_method) {
 		/** @type EE_Transaction $transaction */
-		$transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction );
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 		$primary_reg = $transaction->primary_registration();
-		if( ! $primary_reg instanceof EE_Registration ){
-			throw new EE_Error(sprintf(__("Cannot get IPN URL for transaction with ID %d because it has no primary registration", "event_espresso"),$transaction->ID()));
+		if ( ! $primary_reg instanceof EE_Registration) {
+			throw new EE_Error(sprintf(__("Cannot get IPN URL for transaction with ID %d because it has no primary registration", "event_espresso"), $transaction->ID()));
 		}
-		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method,true);
+		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method, true);
 		$url = add_query_arg(
 			array(
 				'e_reg_url_link'=>$primary_reg->reg_url_link(),
@@ -149,81 +149,81 @@ 
 	 * @throws Exception
 	 * @return EE_Payment
 	 */
-	public function process_ipn( $_req_data, $transaction = NULL, $payment_method = NULL, $update_txn = true, $separate_IPN_request = true ){
-		$_req_data = $this->_remove_unusable_characters( $_req_data );
-		EE_Registry::instance()->load_model( 'Change_Log' );
-		EE_Processor_Base::set_IPN( $separate_IPN_request );
-		if( $transaction instanceof EE_Transaction && $payment_method instanceof EE_Payment_Method ){
-			$obj_for_log = EEM_Payment::instance()->get_one( array( array( 'TXN_ID' => $transaction->ID(), 'PMD_ID' => $payment_method->ID() ), 'order_by' => array( 'PAY_timestamp' => 'desc' ) ) );
-		}elseif( $payment_method instanceof EE_Payment ){
+	public function process_ipn($_req_data, $transaction = NULL, $payment_method = NULL, $update_txn = true, $separate_IPN_request = true) {
+		$_req_data = $this->_remove_unusable_characters($_req_data);
+		EE_Registry::instance()->load_model('Change_Log');
+		EE_Processor_Base::set_IPN($separate_IPN_request);
+		if ($transaction instanceof EE_Transaction && $payment_method instanceof EE_Payment_Method) {
+			$obj_for_log = EEM_Payment::instance()->get_one(array(array('TXN_ID' => $transaction->ID(), 'PMD_ID' => $payment_method->ID()), 'order_by' => array('PAY_timestamp' => 'desc')));
+		}elseif ($payment_method instanceof EE_Payment) {
 			$obj_for_log = $payment_method;
-		}elseif( $transaction instanceof EE_Transaction ){
+		}elseif ($transaction instanceof EE_Transaction) {
 			$obj_for_log = $transaction;
-		}else{
+		} else {
 			$obj_for_log = null;
 		}
 		$log = EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data received'=>$_req_data), $obj_for_log);
-		try{
+		try {
 			/**
 			 * @var EE_Payment $payment
 			 */
 			$payment = NULL;
-			if($transaction && $payment_method){
+			if ($transaction && $payment_method) {
 				/** @type EE_Transaction $transaction */
 				$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 				/** @type EE_Payment_Method $payment_method */
 				$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method);
-				if ( $payment_method->type_obj() instanceof EE_PMT_Base ) {
-						$payment = $payment_method->type_obj()->handle_ipn( $_req_data, $transaction );
+				if ($payment_method->type_obj() instanceof EE_PMT_Base) {
+						$payment = $payment_method->type_obj()->handle_ipn($_req_data, $transaction);
 						$log->set_object($payment);
 				} else {
 					// not a payment
 					EE_Error::add_error(
 						sprintf(
-							__( 'A valid payment method could not be determined due to a technical issue.%sPlease refresh your browser and try again or contact %s for assistance.', 'event_espresso' ),
+							__('A valid payment method could not be determined due to a technical issue.%sPlease refresh your browser and try again or contact %s for assistance.', 'event_espresso'),
 							'<br/>',
-							EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+							EE_Registry::instance()->CFG->organization->get_pretty('email')
 						),
 						__FILE__, __FUNCTION__, __LINE__
 					);
 				}
-			}else{
+			} else {
 				//that's actually pretty ok. The IPN just wasn't able
 				//to identify which transaction or payment method this was for
 				// give all active payment methods a chance to claim it
 				$active_pms = EEM_Payment_Method::instance()->get_all_active();
-				foreach( $active_pms as $payment_method ){
-					try{
-						$payment = $payment_method->type_obj()->handle_unclaimed_ipn( $_req_data );
+				foreach ($active_pms as $payment_method) {
+					try {
+						$payment = $payment_method->type_obj()->handle_unclaimed_ipn($_req_data);
 						EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $payment);
 						break;
-					} catch( EE_Error $e ) {
+					} catch (EE_Error $e) {
 						//that's fine- it apparently couldn't handle the IPN
 					}
 				}
 
 			}
 // 			EEM_Payment_Log::instance()->log("got to 7",$transaction,$payment_method);
-			if( $payment instanceof EE_Payment){
+			if ($payment instanceof EE_Payment) {
 				$payment->save();
 				//  update the TXN
-				$this->update_txn_based_on_payment( $transaction, $payment, $update_txn, $separate_IPN_request );
-			}else{
+				$this->update_txn_based_on_payment($transaction, $payment, $update_txn, $separate_IPN_request);
+			} else {
 				//we couldn't find the payment for this IPN... let's try and log at least SOMETHING
-				if($payment_method){
+				if ($payment_method) {
 					EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $payment_method);
-				}elseif($transaction){
+				}elseif ($transaction) {
 					EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $transaction);
 				}
 			}
 			return $payment;
 
-		} catch( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			do_action(
 				'AHEE__log', __FILE__, __FUNCTION__, sprintf(
-					__( 'Error occurred while receiving IPN. Transaction: %1$s, req data: %2$s. The error was "%3$s"', 'event_espresso' ),
-					print_r( $transaction, TRUE ),
-					print_r( $_req_data, TRUE ),
+					__('Error occurred while receiving IPN. Transaction: %1$s, req data: %2$s. The error was "%3$s"', 'event_espresso'),
+					print_r($transaction, TRUE),
+					print_r($_req_data, TRUE),
 					$e->getMessage()
 				)
 			);
@@ -237,14 +237,14 @@ 
 	 * @param array $request_data
 	 * @return array|string
 	 */
-	protected function _remove_unusable_characters( $request_data ) {
-		if( is_array( $request_data ) ) {
+	protected function _remove_unusable_characters($request_data) {
+		if (is_array($request_data)) {
 			$return_data = array();
-			foreach( $request_data as $key => $value ) {
-				$return_data[ $this->_remove_unusable_characters( $key ) ] = $this->_remove_unusable_characters( $value );
+			foreach ($request_data as $key => $value) {
+				$return_data[$this->_remove_unusable_characters($key)] = $this->_remove_unusable_characters($value);
 			}
-		}else{
-			$return_data =  preg_replace('/[^[:print:]]/', '', $request_data);
+		} else {
+			$return_data = preg_replace('/[^[:print:]]/', '', $request_data);
 		}
 		return $return_data;
 	}
@@ -266,13 +266,13 @@ 
 	 * @return EE_Payment
 	 * @deprecated 4.6.24 method is no longer used. Instead it is up to client code, like SPCO, to call handle_ipn() for offsite gateways that don't receive separate IPNs
 	 */
-	public function finalize_payment_for( $transaction, $update_txn = TRUE ){
+	public function finalize_payment_for($transaction, $update_txn = TRUE) {
 		/** @var $transaction EE_Transaction */
-		$transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction );
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 		$last_payment_method = $transaction->payment_method();
-		if ( $last_payment_method instanceof EE_Payment_Method ) {
-			$payment = $last_payment_method->type_obj()->finalize_payment_for( $transaction );
-			$this->update_txn_based_on_payment( $transaction, $payment, $update_txn );
+		if ($last_payment_method instanceof EE_Payment_Method) {
+			$payment = $last_payment_method->type_obj()->finalize_payment_for($transaction);
+			$this->update_txn_based_on_payment($transaction, $payment, $update_txn);
 			return $payment;
 		} else {
 			return NULL;
@@ -289,10 +289,10 @@ 
 	 * @internal param float $amount
 	 * @return EE_Payment
 	 */
-	public function process_refund( EE_Payment_Method $payment_method, EE_Payment $payment_to_refund, $refund_info = array() ){
-		if ( $payment_method instanceof EE_Payment_Method && $payment_method->type_obj()->supports_sending_refunds() ) {
-			$payment_method->type_obj()->process_refund( $payment_to_refund, $refund_info );
-			$this->update_txn_based_on_payment( $payment_to_refund->transaction(), $payment_to_refund );
+	public function process_refund(EE_Payment_Method $payment_method, EE_Payment $payment_to_refund, $refund_info = array()) {
+		if ($payment_method instanceof EE_Payment_Method && $payment_method->type_obj()->supports_sending_refunds()) {
+			$payment_method->type_obj()->process_refund($payment_to_refund, $refund_info);
+			$this->update_txn_based_on_payment($payment_to_refund->transaction(), $payment_to_refund);
 		}
 		return $payment_to_refund;
 	}
@@ -334,12 +334,12 @@ 
 	 *                        TXN is locked before updating
 	 * @throws \EE_Error
 	 */
-	public function update_txn_based_on_payment( $transaction, $payment, $update_txn = true, $IPN = false ){
+	public function update_txn_based_on_payment($transaction, $payment, $update_txn = true, $IPN = false) {
 		$do_action = 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__not_successful';
 		/** @type EE_Transaction $transaction */
-		$transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction );
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 		// can we freely update the TXN at this moment?
-		if ( $IPN && $transaction->is_locked() ) {
+		if ($IPN && $transaction->is_locked()) {
 			// don't update the transaction at this exact moment
 			// because the TXN is active in another request
 			EE_Cron_Tasks::schedule_update_transaction_with_payment(
@@ -349,7 +349,7 @@ 
 			);
 		} else {
 			// verify payment and that it has been saved
-			if ( $payment instanceof EE_Payment && $payment->ID() ) {
+			if ($payment instanceof EE_Payment && $payment->ID()) {
 				//$this->log(
 				//	__CLASS__, __FUNCTION__, __LINE__,
 				//	$payment->transaction(),
@@ -358,8 +358,8 @@ 
 				//		'payment' => $payment,
 				//	)
 				//);
-				if( $payment->payment_method() instanceof EE_Payment_Method && $payment->payment_method()->type_obj() instanceof EE_PMT_Base ){
-					$payment->payment_method()->type_obj()->update_txn_based_on_payment( $payment );
+				if ($payment->payment_method() instanceof EE_Payment_Method && $payment->payment_method()->type_obj() instanceof EE_PMT_Base) {
+					$payment->payment_method()->type_obj()->update_txn_based_on_payment($payment);
 					//$this->log(
 					//	__CLASS__, __FUNCTION__, __LINE__,
 					//	$payment->transaction(),
@@ -368,36 +368,36 @@ 
 					//	)
 					//);
 					// update TXN registrations with payment info
-					$this->process_registration_payments( $transaction, $payment );
+					$this->process_registration_payments($transaction, $payment);
 				}
 				$do_action = $payment->just_approved() ? 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__successful' : $do_action;
 			} else {
 				// send out notifications
-				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' );
+				add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true');
 				$do_action = 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__no_payment_made';
 			}
 			// if this is an IPN, then we want to know the initial TXN status prior to updating the TXN
 			// so that we know whether the status has changed and notifications should be triggered
-			if ( $IPN ) {
+			if ($IPN) {
 				/** @type EE_Transaction_Processor $transaction_processor */
-				$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
-				$transaction_processor->set_old_txn_status( $transaction->status_ID() );
+				$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
+				$transaction_processor->set_old_txn_status($transaction->status_ID());
 			}
-			if ( $payment->status() !== EEM_Payment::status_id_failed ) {
+			if ($payment->status() !== EEM_Payment::status_id_failed) {
 				/** @type EE_Transaction_Payments $transaction_payments */
-				$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+				$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 				// set new value for total paid
-				$transaction_payments->calculate_total_payments_and_update_status( $transaction );
+				$transaction_payments->calculate_total_payments_and_update_status($transaction);
 				// call EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment() ???
-				if ( $update_txn ) {
-					$this->_post_payment_processing( $transaction, $payment, $IPN );
+				if ($update_txn) {
+					$this->_post_payment_processing($transaction, $payment, $IPN);
 				}
 			}
 			// granular hook for others to use.
-			do_action( $do_action, $transaction, $payment );
-			do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $do_action, '$do_action' );
+			do_action($do_action, $transaction, $payment);
+			do_action('AHEE_log', __CLASS__, __FUNCTION__, $do_action, '$do_action');
 			//global hook for others to use.
-			do_action( 'AHEE__EE_Payment_Processor__update_txn_based_on_payment', $transaction, $payment );
+			do_action('AHEE__EE_Payment_Processor__update_txn_based_on_payment', $transaction, $payment);
 		}
 	}
 
@@ -411,25 +411,25 @@ 
 	 * @param EE_Registration[] $registrations
 	 * @throws \EE_Error
 	 */
-	public function process_registration_payments( EE_Transaction $transaction, EE_Payment $payment, $registrations = array() ) {
+	public function process_registration_payments(EE_Transaction $transaction, EE_Payment $payment, $registrations = array()) {
 		// only process if payment was successful
-		if ( $payment->status() !== EEM_Payment::status_id_approved ) {
+		if ($payment->status() !== EEM_Payment::status_id_approved) {
 			return;
 		}
 		//EEM_Registration::instance()->show_next_x_db_queries();
-		if ( empty( $registrations )) {
+		if (empty($registrations)) {
 			// find registrations with monies owing that can receive a payment
-			$registrations = $transaction->registrations( array(
+			$registrations = $transaction->registrations(array(
 				array(
 					// only these reg statuses can receive payments
-					'STS_ID'  => array( 'IN', EEM_Registration::reg_statuses_that_allow_payment() ),
-					'REG_final_price'  => array( '!=', 0 ),
-					'REG_final_price*' => array( '!=', 'REG_paid', true ),
+					'STS_ID'  => array('IN', EEM_Registration::reg_statuses_that_allow_payment()),
+					'REG_final_price'  => array('!=', 0),
+					'REG_final_price*' => array('!=', 'REG_paid', true),
 				)
-			) );
+			));
 		}
 		// still nothing ??!??
-		if ( empty( $registrations )) {
+		if (empty($registrations)) {
 			return;
 		}
 		// todo: break out the following logic into a separate strategy class
@@ -441,28 +441,28 @@ 
 
 		$refund = $payment->is_a_refund();
 		// how much is available to apply to registrations?
-		$available_payment_amount = abs( $payment->amount() );
-		foreach ( $registrations as $registration ) {
-			if ( $registration instanceof EE_Registration ) {
+		$available_payment_amount = abs($payment->amount());
+		foreach ($registrations as $registration) {
+			if ($registration instanceof EE_Registration) {
 				// nothing left?
-				if ( $available_payment_amount <= 0 ) {
+				if ($available_payment_amount <= 0) {
 					break;
 				}
-				if ( $refund ) {
-					$available_payment_amount = $this->process_registration_refund( $registration, $payment, $available_payment_amount );
+				if ($refund) {
+					$available_payment_amount = $this->process_registration_refund($registration, $payment, $available_payment_amount);
 				} else {
-					$available_payment_amount = $this->process_registration_payment( $registration, $payment, $available_payment_amount );
+					$available_payment_amount = $this->process_registration_payment($registration, $payment, $available_payment_amount);
 				}
 			}
 		}
-		if ( $available_payment_amount > 0 && apply_filters( 'FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', false ) ) {
+		if ($available_payment_amount > 0 && apply_filters('FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', false)) {
 			EE_Error::add_attention(
 				sprintf(
-					__( 'A remainder of %1$s exists after applying this payment to Registration(s) %2$s.%3$sPlease verify that the original payment amount of %4$s is correct. If so, you should edit this payment and select at least one additional registration in the "Registrations to Apply Payment to" section, so that the remainder of this payment can be applied to the additional registration(s).', 'event_espresso' ),
-					EEH_Template::format_currency( $available_payment_amount ),
-					implode( ', ',  array_keys( $registrations ) ),
+					__('A remainder of %1$s exists after applying this payment to Registration(s) %2$s.%3$sPlease verify that the original payment amount of %4$s is correct. If so, you should edit this payment and select at least one additional registration in the "Registrations to Apply Payment to" section, so that the remainder of this payment can be applied to the additional registration(s).', 'event_espresso'),
+					EEH_Template::format_currency($available_payment_amount),
+					implode(', ', array_keys($registrations)),
 					'<br/>',
-					EEH_Template::format_currency( $payment->amount() )
+					EEH_Template::format_currency($payment->amount())
 				),
 				__FILE__, __FUNCTION__, __LINE__
 			);
@@ -479,17 +479,17 @@ 
 	 * @param float $available_payment_amount
 	 * @return float
 	 */
-	public function process_registration_payment( EE_Registration $registration, EE_Payment $payment, $available_payment_amount = 0.00 ) {
+	public function process_registration_payment(EE_Registration $registration, EE_Payment $payment, $available_payment_amount = 0.00) {
 		$owing = $registration->final_price() - $registration->paid();
-		if ( $owing > 0 ) {
+		if ($owing > 0) {
 			// don't allow payment amount to exceed the available payment amount, OR the amount owing
-			$payment_amount = min( $available_payment_amount, $owing );
+			$payment_amount = min($available_payment_amount, $owing);
 			// update $available_payment_amount
 			$available_payment_amount = $available_payment_amount - $payment_amount;
 			//calculate and set new REG_paid
-			$registration->set_paid( $registration->paid() + $payment_amount );
+			$registration->set_paid($registration->paid() + $payment_amount);
 			// now save it
-			$this->_apply_registration_payment( $registration, $payment, $payment_amount );
+			$this->_apply_registration_payment($registration, $payment, $payment_amount);
 		}
 		return $available_payment_amount;
 	}
@@ -504,19 +504,19 @@ 
 	 * @param float $payment_amount
 	 * @return float
 	 */
-	protected function _apply_registration_payment( EE_Registration $registration, EE_Payment $payment, $payment_amount = 0.00 ) {
+	protected function _apply_registration_payment(EE_Registration $registration, EE_Payment $payment, $payment_amount = 0.00) {
 		// find any existing reg payment records for this registration and payment
 		$existing_reg_payment = EEM_Registration_Payment::instance()->get_one(
-			array( array( 'REG_ID' => $registration->ID(), 'PAY_ID' => $payment->ID() ) )
+			array(array('REG_ID' => $registration->ID(), 'PAY_ID' => $payment->ID()))
 		);
 		// if existing registration payment exists
-		if ( $existing_reg_payment instanceof EE_Registration_Payment ) {
+		if ($existing_reg_payment instanceof EE_Registration_Payment) {
 			// then update that record
-			$existing_reg_payment->set_amount( $payment_amount );
+			$existing_reg_payment->set_amount($payment_amount);
 			$existing_reg_payment->save();
 		} else {
 			// or add new relation between registration and payment and set amount
-			$registration->_add_relation_to( $payment, 'Payment', array( 'RPY_amount' => $payment_amount ) );
+			$registration->_add_relation_to($payment, 'Payment', array('RPY_amount' => $payment_amount));
 			// make it stick
 			$registration->save();
 		}
@@ -532,21 +532,21 @@ 
 	 * @param float $available_refund_amount - IMPORTANT !!! SEND AVAILABLE REFUND AMOUNT AS A POSITIVE NUMBER
 	 * @return float
 	 */
-	public function process_registration_refund( EE_Registration $registration, EE_Payment $payment, $available_refund_amount = 0.00 ) {
+	public function process_registration_refund(EE_Registration $registration, EE_Payment $payment, $available_refund_amount = 0.00) {
 		//EEH_Debug_Tools::printr( $payment->amount(), '$payment->amount()', __FILE__, __LINE__ );
-		if ( $registration->paid() > 0 ) {
+		if ($registration->paid() > 0) {
 			// ensure $available_refund_amount is NOT negative
-			$available_refund_amount = abs( $available_refund_amount );
+			$available_refund_amount = abs($available_refund_amount);
 			// don't allow refund amount to exceed the available payment amount, OR the amount paid
-			$refund_amount = min( $available_refund_amount, $registration->paid() );
+			$refund_amount = min($available_refund_amount, $registration->paid());
 			// update $available_payment_amount
 			$available_refund_amount = $available_refund_amount - $refund_amount;
 			//calculate and set new REG_paid
-			$registration->set_paid( $registration->paid() - $refund_amount );
+			$registration->set_paid($registration->paid() - $refund_amount);
 			// convert payment amount back to a negative value for storage in the db
-			$refund_amount = abs( $refund_amount ) * -1;
+			$refund_amount = abs($refund_amount) * -1;
 			// now save it
-			$this->_apply_registration_payment( $registration, $payment, $refund_amount );
+			$this->_apply_registration_payment($registration, $payment, $refund_amount);
 		}
 		return $available_refund_amount;
 	}
@@ -564,12 +564,12 @@ 
 	 * @param EE_Payment     $payment
 	 * @param bool           $IPN
 	 */
-	protected function _post_payment_processing( EE_Transaction $transaction, EE_Payment $payment, $IPN = false ) {
+	protected function _post_payment_processing(EE_Transaction $transaction, EE_Payment $payment, $IPN = false) {
 
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 		// is the Payment Options Reg Step completed ?
-		$payment_options_step_completed = $transaction_processor->reg_step_completed( $transaction, 'payment_options' );
+		$payment_options_step_completed = $transaction_processor->reg_step_completed($transaction, 'payment_options');
 		// DEBUG LOG
 		//$this->log(
 		//	__CLASS__, __FUNCTION__, __LINE__,
@@ -582,14 +582,14 @@ 
 		// if the Payment Options Reg Step is completed...
 		$revisit = $payment_options_step_completed === true ? true : false;
 		// then this is kinda sorta a revisit with regards to payments at least
-		$transaction_processor->set_revisit( $revisit );
+		$transaction_processor->set_revisit($revisit);
 		// if this is an IPN, let's consider the Payment Options Reg Step completed if not already
 		if (
 			$IPN &&
 			$payment_options_step_completed !== true &&
-			( $payment->is_approved() || $payment->is_pending() )
+			($payment->is_approved() || $payment->is_pending())
 		) {
-			$payment_options_step_completed = $transaction_processor->set_reg_step_completed( $transaction, 'payment_options' );
+			$payment_options_step_completed = $transaction_processor->set_reg_step_completed($transaction, 'payment_options');
 		}
 		// DEBUG LOG
 		//$this->log(
@@ -601,11 +601,11 @@ 
 		//	)
 		//);
 		/** @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, but don't save transaction just yet
-		$transaction_payments->update_transaction_status_based_on_total_paid( $transaction, false );
+		$transaction_payments->update_transaction_status_based_on_total_paid($transaction, false);
 		// check if 'finalize_registration' step has been completed...
-		$finalized = $transaction_processor->reg_step_completed( $transaction, 'finalize_registration' );
+		$finalized = $transaction_processor->reg_step_completed($transaction, 'finalize_registration');
 		// DEBUG LOG
 		//$this->log(
 		//	__CLASS__, __FUNCTION__, __LINE__,
@@ -616,9 +616,9 @@ 
 		//	)
 		//);
 		//  if this is an IPN and the final step has not been initiated
-		if ( $IPN && $payment_options_step_completed && $finalized === false ) {
+		if ($IPN && $payment_options_step_completed && $finalized === false) {
 			// and if it hasn't already been set as being started...
-			$finalized = $transaction_processor->set_reg_step_initiated( $transaction, 'finalize_registration' );
+			$finalized = $transaction_processor->set_reg_step_initiated($transaction, 'finalize_registration');
 			// DEBUG LOG
 			//$this->log(
 			//	__CLASS__, __FUNCTION__, __LINE__,
@@ -631,13 +631,13 @@ 
 		}
 		$transaction->save();
 		// because the above will return false if the final step was not fully completed, we need to check again...
-		if ( $IPN && $finalized !== false ) {
+		if ($IPN && $finalized !== false) {
 			// and if we are all good to go, then send out notifications
-			add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' );
+			add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true');
 			// DEBUG LOG
 			//$this->log( __CLASS__, __FUNCTION__, __LINE__, $transaction );
 			//ok, now process the transaction according to the payment
-			$transaction_processor->update_transaction_and_registrations_after_checkout_or_payment( $transaction, $payment );
+			$transaction_processor->update_transaction_and_registrations_after_checkout_or_payment($transaction, $payment);
 		}
 		// DEBUG LOG
 		//$this->log(

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);
 	}
 
 

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;
+	}
 
 
 

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

public/Espresso_Arabica_2014/loop-espresso_venues.php

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 /**
- * This template will display The Loop that displays your venues 
- *
- * @ package		Event Espresso
- * @ author		Seth Shoultes
- * @ copyright	(c) 2008-2013 Event Espresso  All Rights Reserved.
- * @ license		http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link			http://www.eventespresso.com
- * @ version		4+
- */
+  * This template will display The Loop that displays your venues 
+  *
+  * @ package		Event Espresso
+  * @ author		Seth Shoultes
+  * @ copyright	(c) 2008-2013 Event Espresso  All Rights Reserved.
+  * @ license		http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+  * @ link			http://www.eventespresso.com
+  * @ version		4+
+  */
 
 if ( have_posts() ) : ?>