eventespresso / event-espresso-core

admin_pages/transactions/EE_Admin_Transactions_List_Table.class.php

Indentation +9 added lines, -9 removed lines

@@ -151,7 +151,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function column_TXN_ID( EE_Transaction $item ){
-    	$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
 	   $content = '<a href="' . $view_lnk_url . '" title="' . esc_attr__( 'Go to Transaction Details', 'event_espresso' ) . '">' . $item->ID() . '</a>';
 
 	   //txn timestamp
@@ -321,7 +321,7 @@ 
 	 * @throws \EE_Error
 	 */
  	public function column_event_name( EE_Transaction $item ){
-    	$actions = array();
+		$actions = array();
 		$event = $item->primary_registration()->get_first_related('Event');
 		if ( !empty( $event ) ) {
 			$edit_event_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$event->ID() ), EVENTS_ADMIN_URL );
@@ -350,18 +350,18 @@ 
 	 */
  	public function column_actions( EE_Transaction $item ){
 
-    	$registration = $item->primary_registration();
-    	$attendee = $registration->attendee();
+		$registration = $item->primary_registration();
+		$attendee = $registration->attendee();
 
-        //Build row actions
+		//Build row actions
 		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
 		$dl_invoice_lnk_url = $registration->invoice_url();
 		$dl_receipt_lnk_url = $registration->receipt_url();
 		$view_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$registration->ID() ), REG_ADMIN_URL );
 		$send_pay_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'send_payment_reminder', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
-	    $related_messages_link = EEH_MSG_Template::get_message_action_link( 'see_notifications_for', null, array(
-		    'TXN_ID' => $item->ID()
-	    ));
+		$related_messages_link = EEH_MSG_Template::get_message_action_link( 'see_notifications_for', null, array(
+			'TXN_ID' => $item->ID()
+		));
 
 		//Build row actions
 		$view_lnk = '
@@ -434,7 +434,7 @@ 
 		}
 
 		return $this->_action_string( $view_lnk . $dl_invoice_lnk . $dl_receipt_lnk . $view_reg_lnk . $send_pay_lnk . $view_related_messages_lnk, $item, 'ul', 'txn-overview-actions-ul' );
-    }
+	}
 
 
 }

Spacing +85 added lines, -85 removed lines

@@ -31,8 +31,8 @@ 
 	/**
 	 * @param \Transactions_Admin_Page $admin_page
 	 */
-	public function __construct( \Transactions_Admin_Page $admin_page ){
-		parent::__construct( $admin_page );
+	public function __construct(\Transactions_Admin_Page $admin_page) {
+		parent::__construct($admin_page);
 		$this->_status = $this->_admin_page->get_transaction_status_array();
 	}
 
@@ -42,9 +42,9 @@ 
 	 *_setup_data
 	 */
 	protected function _setup_data() {
-		$this->_data = $this->_admin_page->get_transactions( $this->_per_page );
-		$status = ! empty( $this->_req_data['status'] )? $this->_req_data['status'] : 'all';
-		$this->_all_data_count = $this->_admin_page->get_transactions( $this->_per_page, TRUE, $status );
+		$this->_data = $this->_admin_page->get_transactions($this->_per_page);
+		$status = ! empty($this->_req_data['status']) ? $this->_req_data['status'] : 'all';
+		$this->_all_data_count = $this->_admin_page->get_transactions($this->_per_page, TRUE, $status);
 	}
 
 
@@ -59,25 +59,25 @@ 
 			'ajax' => TRUE,
 			'screen' => $this->_admin_page->get_current_screen()->id
 			);
-		$ID_column_name = __( 'ID', 'event_espresso' );
+		$ID_column_name = __('ID', 'event_espresso');
 		$ID_column_name .= ' : <span class="show-on-mobile-view-only" style="float:none">';
-		$ID_column_name .= __( 'Transaction Date', 'event_espresso' );
+		$ID_column_name .= __('Transaction Date', 'event_espresso');
 		$ID_column_name .= '</span> ';
 		$this->_columns = array(
 			'TXN_ID' => $ID_column_name,
-			'TXN_timestamp'	=> __( 'Transaction Date', 'event_espresso' ),
-			'TXN_total' => __( 'Total', 'event_espresso' ),
-			'TXN_paid' => __( 'Paid', 'event_espresso' ),
-			'ATT_fname' => __( 'Primary Registrant', 'event_espresso' ),
-			'event_name' => __( 'Event', 'event_espresso' ),
-			'actions' => __( 'Actions', 'event_espresso' )
+			'TXN_timestamp'	=> __('Transaction Date', 'event_espresso'),
+			'TXN_total' => __('Total', 'event_espresso'),
+			'TXN_paid' => __('Paid', 'event_espresso'),
+			'ATT_fname' => __('Primary Registrant', 'event_espresso'),
+			'event_name' => __('Event', 'event_espresso'),
+			'actions' => __('Actions', 'event_espresso')
 		);
 
 		$this->_sortable_columns = array(
-			'TXN_ID' => array( 'TXN_ID' => FALSE ),
-			'event_name' => array( 'event_name'=> FALSE ),
-			'ATT_fname'	=> array( 'ATT_fname'=> FALSE ),
-			'TXN_timestamp'	=> array( 'TXN_timestamp'=> TRUE ) //true means its already sorted
+			'TXN_ID' => array('TXN_ID' => FALSE),
+			'event_name' => array('event_name'=> FALSE),
+			'ATT_fname'	=> array('ATT_fname'=> FALSE),
+			'TXN_timestamp'	=> array('TXN_timestamp'=> TRUE) //true means its already sorted
 		);
 
 		$this->_primary_column = 'TXN_ID';
@@ -95,11 +95,11 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	protected function _get_row_class( $item ) {
-		$class = parent::_get_row_class( $item );
+	protected function _get_row_class($item) {
+		$class = parent::_get_row_class($item);
 		//add status class
-		$class .= ' ee-status-strip txn-status-' . $item->status_ID();
-		if ( $this->_has_checkbox_column ) {
+		$class .= ' ee-status-strip txn-status-'.$item->status_ID();
+		if ($this->_has_checkbox_column) {
 			$class .= ' has-checkbox-column';
 		}
 		return $class;
@@ -116,8 +116,8 @@ 
 	 */
 	protected function _get_table_filters() {
 		$filters = array();
-		$start_date = isset( $this->_req_data['txn-filter-start-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-start-date'] ) : date( 'm/d/Y', strtotime( '-10 year' ));
-		$end_date = isset( $this->_req_data['txn-filter-end-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-end-date'] ) : date( 'm/d/Y' );
+		$start_date = isset($this->_req_data['txn-filter-start-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-start-date']) : date('m/d/Y', strtotime('-10 year'));
+		$end_date = isset($this->_req_data['txn-filter-end-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-end-date']) : date('m/d/Y');
 		ob_start();
 		?>
 		<label for="txn-filter-start-date">Display Transactions from </label>
@@ -136,9 +136,9 @@ 
 	 *_add_view_counts
 	 */
 	protected function _add_view_counts() {
-		$this->_views['all']['count'] = $this->_admin_page->get_transactions( $this->_per_page, TRUE, 'all' );
-		$this->_views['abandoned']['count'] = $this->_admin_page->get_transactions( $this->_per_page, TRUE, 'abandoned' );
-		$this->_views['failed']['count'] = $this->_admin_page->get_transactions( $this->_per_page, TRUE, 'failed' );
+		$this->_views['all']['count'] = $this->_admin_page->get_transactions($this->_per_page, TRUE, 'all');
+		$this->_views['abandoned']['count'] = $this->_admin_page->get_transactions($this->_per_page, TRUE, 'abandoned');
+		$this->_views['failed']['count'] = $this->_admin_page->get_transactions($this->_per_page, TRUE, 'failed');
 	}
 
 
@@ -150,12 +150,12 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_TXN_ID( EE_Transaction $item ){
-    	$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
-	   $content = '<a href="' . $view_lnk_url . '" title="' . esc_attr__( 'Go to Transaction Details', 'event_espresso' ) . '">' . $item->ID() . '</a>';
+	public function column_TXN_ID(EE_Transaction $item) {
+    	$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
+	   $content = '<a href="'.$view_lnk_url.'" title="'.esc_attr__('Go to Transaction Details', 'event_espresso').'">'.$item->ID().'</a>';
 
 	   //txn timestamp
-	   $content .= '  <span class="show-on-mobile-view-only">' . $this->_get_txn_timestamp( $item ) . '</span>';
+	   $content .= '  <span class="show-on-mobile-view-only">'.$this->_get_txn_timestamp($item).'</span>';
 	   return $content;
 	}
 
@@ -166,18 +166,18 @@ 
 	 * @return mixed|string|void
 	 * @throws \EE_Error
 	 */
-	protected function _get_txn_timestamp( EE_Transaction $item ) {
+	protected function _get_txn_timestamp(EE_Transaction $item) {
 		//txn timestamp
 		// is TXN less than 2 hours old ?
 		if (
-			( $item->failed() || $item->is_abandoned() )
+			($item->failed() || $item->is_abandoned())
 			&& (
-				( time() - EE_Registry::instance()->SSN->lifespan() ) < $item->datetime( false, true )
+				(time() - EE_Registry::instance()->SSN->lifespan()) < $item->datetime(false, true)
 			)
 		) {
-			$timestamp = __( 'TXN in progress...', 'event_espresso' );
+			$timestamp = __('TXN in progress...', 'event_espresso');
 	   } else {
-			$timestamp = $item->get_i18n_datetime( 'TXN_timestamp' );
+			$timestamp = $item->get_i18n_datetime('TXN_timestamp');
 		}
 		return $timestamp;
 	}
@@ -191,8 +191,8 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_cb($item ){
-		return sprintf( '<input type="checkbox" name="%1$s[]" value="%2$s" />', $this->_wp_list_args['singular'],  $item->ID());
+	public function column_cb($item) {
+		return sprintf('<input type="checkbox" name="%1$s[]" value="%2$s" />', $this->_wp_list_args['singular'], $item->ID());
 	}
 
 
@@ -204,11 +204,11 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_TXN_timestamp( EE_Transaction $item ){
-		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
-		$txn_date = '<a href="'.$view_lnk_url.'" title="' . esc_attr__( 'View Transaction Details for TXN #', 'event_espresso' ) . $item->ID() . '">' . $this->_get_txn_timestamp( $item ) . '</a>';
+	public function column_TXN_timestamp(EE_Transaction $item) {
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
+		$txn_date = '<a href="'.$view_lnk_url.'" title="'.esc_attr__('View Transaction Details for TXN #', 'event_espresso').$item->ID().'">'.$this->_get_txn_timestamp($item).'</a>';
 		//status
-		$txn_date .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $item->status_ID(), false, 'sentence' ) . '</span>';
+		$txn_date .= '<br><span class="ee-status-text-small">'.EEH_Template::pretty_status($item->status_ID(), false, 'sentence').'</span>';
 		return $txn_date;
 	}
 
@@ -221,11 +221,11 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_TXN_total( EE_Transaction $item ){
-		if ( $item->get('TXN_total') > 0 ) {
-			return '<span class="txn-pad-rght">' . apply_filters( 'FHEE__EE_Admin_Transactions_List_Table__column_TXN_total__TXN_total', $item->get_pretty('TXN_total'), $item ) . '</span>';
+	public function column_TXN_total(EE_Transaction $item) {
+		if ($item->get('TXN_total') > 0) {
+			return '<span class="txn-pad-rght">'.apply_filters('FHEE__EE_Admin_Transactions_List_Table__column_TXN_total__TXN_total', $item->get_pretty('TXN_total'), $item).'</span>';
 		} else {
-			return '<span class="txn-overview-free-event-spn">' . __( 'free', 'event_espresso' ) . '</span>';
+			return '<span class="txn-overview-free-event-spn">'.__('free', 'event_espresso').'</span>';
 		}
 	}
 
@@ -238,17 +238,17 @@ 
 	 * @return mixed|string
 	 * @throws \EE_Error
 	 */
-	public function column_TXN_paid( EE_Transaction $item ){
+	public function column_TXN_paid(EE_Transaction $item) {
 		$transaction_total = $item->get('TXN_total');
 		$transaction_paid = $item->get('TXN_paid');
 
-		if ( \EEH_Money::compare_floats( $transaction_total, 0,'>' ) ) {
+		if (\EEH_Money::compare_floats($transaction_total, 0, '>')) {
 			// monies owing
 			$span_class = 'txn-overview-part-payment-spn';
-			if ( \EEH_Money::compare_floats( $transaction_paid, $transaction_total, '>=' ) ) {
+			if (\EEH_Money::compare_floats($transaction_paid, $transaction_total, '>=')) {
 				// paid in full
 				$span_class = 'txn-overview-full-payment-spn';
-			} elseif ( \EEH_Money::compare_floats( $transaction_paid, 0, '==' ) ) {
+			} elseif (\EEH_Money::compare_floats($transaction_paid, 0, '==')) {
 				// no payments made
 				$span_class = 'txn-overview-no-payment-spn';
 			}
@@ -258,11 +258,11 @@ 
 		}
 
 		$payment_method = $item->payment_method();
-		$payment_method_name = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name() : __( 'Unknown', 'event_espresso' );
+		$payment_method_name = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name() : __('Unknown', 'event_espresso');
 
-		$content = '<span class="' . $span_class . ' txn-pad-rght">' . $transaction_paid !== 0 ? $item->get_pretty('TXN_paid') : $transaction_paid . '</span>';
-		if ( $transaction_paid > 0 ) {
-			$content .= '<br><span class="ee-status-text-small">' . sprintf( __( '...via %s', 'event_espresso' ), $payment_method_name ) . '</span>';
+		$content = '<span class="'.$span_class.' txn-pad-rght">'.$transaction_paid !== 0 ? $item->get_pretty('TXN_paid') : $transaction_paid.'</span>';
+		if ($transaction_paid > 0) {
+			$content .= '<br><span class="ee-status-text-small">'.sprintf(__('...via %s', 'event_espresso'), $payment_method_name).'</span>';
 		}
 		return $content;
 	}
@@ -276,13 +276,13 @@ 
 	 * @return string|void
 	 * @throws \EE_Error
 	 */
-	public function column_ATT_fname( EE_Transaction $item ){
+	public function column_ATT_fname(EE_Transaction $item) {
 		$primary_reg = $item->primary_registration();
 		$attendee = $primary_reg->get_first_related('Attendee');
-		if ( $attendee instanceof EE_Attendee ) {
-			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$primary_reg->ID() ), REG_ADMIN_URL );
-			$content = EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $primary_reg->ID() ) ? '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'View Registration Details', 'event_espresso' ) . '">' . $attendee->full_name() . '</a>' : $attendee->full_name();
-			$content .= '<br>' . $attendee->email();
+		if ($attendee instanceof EE_Attendee) {
+			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_registration', '_REG_ID'=>$primary_reg->ID()), REG_ADMIN_URL);
+			$content = EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $primary_reg->ID()) ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'">'.$attendee->full_name().'</a>' : $attendee->full_name();
+			$content .= '<br>'.$attendee->email();
 			return $content;
 		}
 		return $item->failed() || $item->is_abandoned() ? __('no contact record.', 'event_espresso') : __('No contact record, because the transaction was abandoned or the registration process failed.', 'event_espresso');
@@ -297,13 +297,13 @@ 
 	 * @return string|void
 	 * @throws \EE_Error
 	 */
-	public function column_ATT_email( EE_Transaction $item ){
+	public function column_ATT_email(EE_Transaction $item) {
 		$attendee = $item->primary_registration()->get_first_related('Attendee');
-		if ( ! empty( $attendee ) ) {
-			return '<a href="mailto:' . $attendee->get( 'ATT_email' ) . '">' . $attendee->get( 'ATT_email' ) . '</a>';
+		if ( ! empty($attendee)) {
+			return '<a href="mailto:'.$attendee->get('ATT_email').'">'.$attendee->get('ATT_email').'</a>';
 		} else {
 			return $item->failed() || $item->is_abandoned()
-				? __( 'no contact record.', 'event_espresso' )
+				? __('no contact record.', 'event_espresso')
 				: __(
 					'No contact record, because the transaction was abandoned or the registration process failed.',
 					'event_espresso'
@@ -320,20 +320,20 @@ 
 	 * @return string|void
 	 * @throws \EE_Error
 	 */
- 	public function column_event_name( EE_Transaction $item ){
+ 	public function column_event_name(EE_Transaction $item) {
     	$actions = array();
 		$event = $item->primary_registration()->get_first_related('Event');
-		if ( !empty( $event ) ) {
-			$edit_event_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$event->ID() ), EVENTS_ADMIN_URL );
+		if ( ! empty($event)) {
+			$edit_event_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit', 'post'=>$event->ID()), EVENTS_ADMIN_URL);
 			$event_name = $event->get('EVT_name');
 
 			//filter this view by transactions for this event
-			$txn_by_event_lnk = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default', 'EVT_ID' => $event->ID() ) );
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $event->ID() ) ) {
-				$actions['filter_by_event'] = '<a href="' . $txn_by_event_lnk . '" title="' . esc_attr__('Filter transactions by this event', 'event_espresso') . '">' . __('View Transactions for this event', 'event_espresso') . '</a>';
+			$txn_by_event_lnk = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'EVT_ID' => $event->ID()));
+			if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $event->ID())) {
+				$actions['filter_by_event'] = '<a href="'.$txn_by_event_lnk.'" title="'.esc_attr__('Filter transactions by this event', 'event_espresso').'">'.__('View Transactions for this event', 'event_espresso').'</a>';
 			}
 
-			return sprintf('%1$s %2$s', EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $event->ID() ) ? '<a href="' . $edit_event_url . '" title="' . sprintf( esc_attr__( 'Edit Event: %s', 'event_espresso' ), $event->get('EVT_name') ) .'">' .  wp_trim_words( $event_name, 30, '...' ) . '</a>' : wp_trim_words( $event_name, 30, '...' ), $this->row_actions($actions) );
+			return sprintf('%1$s %2$s', EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $event->ID()) ? '<a href="'.$edit_event_url.'" title="'.sprintf(esc_attr__('Edit Event: %s', 'event_espresso'), $event->get('EVT_name')).'">'.wp_trim_words($event_name, 30, '...').'</a>' : wp_trim_words($event_name, 30, '...'), $this->row_actions($actions));
 		} else {
 			return __('The event associated with this transaction via the primary registration cannot be retrieved.', 'event_espresso');
 		}
@@ -348,35 +348,35 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
- 	public function column_actions( EE_Transaction $item ){
+ 	public function column_actions(EE_Transaction $item) {
 
     	$registration = $item->primary_registration();
     	$attendee = $registration->attendee();
 
         //Build row actions
-		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
 		$dl_invoice_lnk_url = $registration->invoice_url();
 		$dl_receipt_lnk_url = $registration->receipt_url();
-		$view_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$registration->ID() ), REG_ADMIN_URL );
-		$send_pay_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'send_payment_reminder', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
-	    $related_messages_link = EEH_MSG_Template::get_message_action_link( 'see_notifications_for', null, array(
+		$view_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_registration', '_REG_ID'=>$registration->ID()), REG_ADMIN_URL);
+		$send_pay_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'send_payment_reminder', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
+	    $related_messages_link = EEH_MSG_Template::get_message_action_link('see_notifications_for', null, array(
 		    'TXN_ID' => $item->ID()
 	    ));
 
 		//Build row actions
 		$view_lnk = '
 			<li>
-				<a href="'.$view_lnk_url.'" title="' . esc_attr__( 'View Transaction Details', 'event_espresso' ) . '" class="tiny-text">
+				<a href="'.$view_lnk_url.'" title="'.esc_attr__('View Transaction Details', 'event_espresso').'" class="tiny-text">
 					<span class="dashicons dashicons-cart"></span>
 				</a>
 			</li>';
 
 		$dl_invoice_lnk = '';
 		//only show invoice link if message type is active.
-		if ( $attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active( 'invoice' ) ) {
+		if ($attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active('invoice')) {
 			$dl_invoice_lnk = '
 			<li>
-				<a title="' . esc_attr__( 'View Transaction Invoice', 'event_espresso' ) . '" target="_blank" href="'.$dl_invoice_lnk_url.'" class="tiny-text">
+				<a title="' . esc_attr__('View Transaction Invoice', 'event_espresso').'" target="_blank" href="'.$dl_invoice_lnk_url.'" class="tiny-text">
 					<span class="dashicons dashicons-media-spreadsheet ee-icon-size-18"></span>
 				</a>
 			</li>';
@@ -384,17 +384,17 @@ 
 
 		$dl_receipt_lnk = '';
 		//only show receipt link if message type is active.
-		if ( $attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active( 'receipt' ) ) {
+		if ($attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active('receipt')) {
 			$dl_receipt_lnk = '
 			<li>
-				<a title="' . esc_attr__( 'View Transaction Receipt', 'event_espresso' ) . '" target="_blank" href="'.$dl_receipt_lnk_url.'" class="tiny-text">
+				<a title="' . esc_attr__('View Transaction Receipt', 'event_espresso').'" target="_blank" href="'.$dl_receipt_lnk_url.'" class="tiny-text">
 					<span class="dashicons dashicons-media-default ee-icon-size-18"></span>
 				</a>
 			</li>';
 		}
 
 		//only show payment reminder link if the message type is active.
-		if ( EEH_MSG_Template::is_mt_active( 'payment_reminder' ) ) {
+		if (EEH_MSG_Template::is_mt_active('payment_reminder')) {
 			$send_pay_lnk = $attendee instanceof EE_Attendee
 							&& EE_Registry::instance()->CAP->current_user_can(
 								'ee_send_message',
@@ -402,7 +402,7 @@ 
 							)
 				? '
 				<li>
-					<a href="'.$send_pay_lnk_url.'" title="' . esc_attr__( 'Send Payment Reminder', 'event_espresso' ) . '" class="tiny-text">
+					<a href="'.$send_pay_lnk_url.'" title="'.esc_attr__('Send Payment Reminder', 'event_espresso').'" class="tiny-text">
 						<span class="dashicons dashicons-email-alt"></span>
 					</a>
 				</li>'
@@ -422,18 +422,18 @@ 
 		)
 			? '
 				<li>
-					<a href="'.$view_reg_lnk_url.'" title="' . esc_attr__( 'View Registration Details', 'event_espresso' ) . '" class="tiny-text">
+					<a href="'.$view_reg_lnk_url.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'" class="tiny-text">
 						<span class="dashicons dashicons-clipboard"></span>
 					</a>
 				</li>'
 			: '';
 
 		$view_related_messages_lnk = '';
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_global_messages', 'view_filtered_messages' ) ) {
-			$view_related_messages_lnk = '<li>' . $related_messages_link . '</li>';
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_global_messages', 'view_filtered_messages')) {
+			$view_related_messages_lnk = '<li>'.$related_messages_link.'</li>';
 		}
 
-		return $this->_action_string( $view_lnk . $dl_invoice_lnk . $dl_receipt_lnk . $view_reg_lnk . $send_pay_lnk . $view_related_messages_lnk, $item, 'ul', 'txn-overview-actions-ul' );
+		return $this->_action_string($view_lnk.$dl_invoice_lnk.$dl_receipt_lnk.$view_reg_lnk.$send_pay_lnk.$view_related_messages_lnk, $item, 'ul', 'txn-overview-actions-ul');
     }
 
 

admin_pages/registrations/EE_Registrations_List_Table.class.php

Indentation +19 added lines, -19 removed lines

@@ -370,18 +370,18 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-    public function column_cb($item){
+	public function column_cb($item){
 	/** checkbox/lock **/
 	$transaction = $item->get_first_related( 'Transaction' );
 	$payment_count = $transaction instanceof EE_Transaction ? $transaction->count_related( 'Payment' ) : 0;
-	    return $payment_count > 0
-		    ? sprintf( '<input type="checkbox" name="_REG_ID[]" value="%1$s" />', $item->ID() )
-		      . '<span class="ee-lock-icon"></span>'
-		    : sprintf(
-			    '<input type="checkbox" name="_REG_ID[]" value="%1$s" />',
-			    $item->ID()
-		    );
-    }
+		return $payment_count > 0
+			? sprintf( '<input type="checkbox" name="_REG_ID[]" value="%1$s" />', $item->ID() )
+			  . '<span class="ee-lock-icon"></span>'
+			: sprintf(
+				'<input type="checkbox" name="_REG_ID[]" value="%1$s" />',
+				$item->ID()
+			);
+	}
 
 
 
@@ -417,7 +417,7 @@ 
 	 */
 	public function column__REG_date(EE_Registration $item){
 		$this->_set_related_details($item);
-       		 //Build row actions
+	   		 //Build row actions
 		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=> $this->_transaction_details['id'] ), TXN_ADMIN_URL );
 		$view_link = EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction') ? '<a class="ee-status-color-' . $this->_transaction_details['status'] . '" href="'.$view_lnk_url.'" title="' . esc_attr( $this->_transaction_details['title_attr'] ) . '">' . $item->get_i18n_datetime( 'REG_date' ) . '</a>' : $item->get_i18n_datetime( 'REG_date' );
 		$view_link .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $this->_transaction_details['status'], false, 'sentence' ) . '</span>';
@@ -471,7 +471,7 @@ 
 		} else {
 			return __( 'There is no ticket on this registration', 'event_espresso' );
 		}
-    }
+	}
 
 
 
@@ -494,14 +494,14 @@ 
 		$t = $item->get_first_related('Transaction');
 		$payment_count = $t instanceof EE_Transaction ? $t->count_related('Payment') : 0;
 
-	    //append group count to name
-	    $link .= '&nbsp;' . sprintf(__( '(%1$s / %2$s)', 'event_espresso' ), $item->count(), $item->group_size());
+		//append group count to name
+		$link .= '&nbsp;' . sprintf(__( '(%1$s / %2$s)', 'event_espresso' ), $item->count(), $item->group_size());
 
-	    //append reg_code
-	    $link .= '<br>' . sprintf( __( 'Reg Code: %s', 'event_espresso' ), $item->get('REG_code') );
+		//append reg_code
+		$link .= '<br>' . sprintf( __( 'Reg Code: %s', 'event_espresso' ), $item->get('REG_code') );
 
-	    //reg status text for accessibility
-	    $link .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $item->status_ID(), false, 'sentence' ) . '</span>';
+		//reg status text for accessibility
+		$link .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $item->status_ID(), false, 'sentence' ) . '</span>';
 
 		//trash/restore/delete actions
 		$actions = array();
@@ -731,14 +731,14 @@ 
 		//message list table link (filtered by REG_ID
 		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_messages', 'view_filtered_messages' ) ) {
 			$filtered_messages_link = '<li>'
-			                          . EEH_MSG_Template::get_message_action_link(
+									  . EEH_MSG_Template::get_message_action_link(
 											'see_notifications_for',
 											null,
 											array(
 												'_REG_ID' => $item->ID()
 												)
 											)
-			                          . '</li>';
+									  . '</li>';
 		}
 
 		return $this->_action_string( $view_lnk . $edit_lnk . $resend_reg_lnk . $view_txn_lnk . $dl_invoice_lnk . $filtered_messages_link, $item, 'ul', 'reg-overview-actions-ul' );

Spacing +166 added lines, -166 removed lines

@@ -54,13 +54,13 @@ 
 	/**
 	 * @param \Registrations_Admin_Page $admin_page
 	 */
-	public function __construct( Registrations_Admin_Page $admin_page ){
-		if ( ! empty( $_GET['event_id'] ) ) {
+	public function __construct(Registrations_Admin_Page $admin_page) {
+		if ( ! empty($_GET['event_id'])) {
 			$extra_query_args = array();
-			foreach ( $admin_page->get_views() as $key => $view_details ) {
-				$extra_query_args[$view_details['slug']] = array( 'event_id' => $_GET['event_id'] );
+			foreach ($admin_page->get_views() as $key => $view_details) {
+				$extra_query_args[$view_details['slug']] = array('event_id' => $_GET['event_id']);
 			}
-			$this->_views = $admin_page->get_list_table_view_RLs( $extra_query_args );
+			$this->_views = $admin_page->get_list_table_view_RLs($extra_query_args);
 		}
 		parent::__construct($admin_page);
 		$this->_status = $this->_admin_page->get_registration_status_array();
@@ -75,8 +75,8 @@ 
 	 * @return void
 	 */
 	protected function _setup_data() {
-		$this->_data = $this->_admin_page->get_registrations( $this->_per_page );
-		$this->_all_data_count = $this->_admin_page->get_registrations( $this->_per_page, TRUE, FALSE, FALSE );
+		$this->_data = $this->_admin_page->get_registrations($this->_per_page);
+		$this->_all_data_count = $this->_admin_page->get_registrations($this->_per_page, TRUE, FALSE, FALSE);
 	}
 
 
@@ -93,30 +93,30 @@ 
 			'ajax' => TRUE,
 			'screen' => $this->_admin_page->get_current_screen()->id
 			);
-		$ID_column_name = __( 'ID', 'event_espresso' );
+		$ID_column_name = __('ID', 'event_espresso');
 		$ID_column_name .= ' : <span class="show-on-mobile-view-only" style="float:none">';
-		$ID_column_name .= __( 'Registrant Name', 'event_espresso' );
+		$ID_column_name .= __('Registrant Name', 'event_espresso');
 		$ID_column_name .= '</span> ';
-		if ( isset( $_GET['event_id'] )) {
+		if (isset($_GET['event_id'])) {
 			$this->_columns = array(
 				'cb' => '<input type="checkbox" />', //Render a checkbox instead of text
 				'_REG_ID' => $ID_column_name,
-				'ATT_fname' => __( 'Name', 'event_espresso' ),
+				'ATT_fname' => __('Name', 'event_espresso'),
 				'ATT_email' =>  __('Email', 'event_espresso'),
-				'_REG_date' => __( 'Reg Date', 'event_espresso' ),
-				'PRC_amount' => __( 'TKT Price', 'event_espresso' ),
-				'_REG_final_price' => __( 'Final Price', 'event_espresso' ),
-				'TXN_total' => __( 'Total Txn', 'event_espresso' ),
+				'_REG_date' => __('Reg Date', 'event_espresso'),
+				'PRC_amount' => __('TKT Price', 'event_espresso'),
+				'_REG_final_price' => __('Final Price', 'event_espresso'),
+				'TXN_total' => __('Total Txn', 'event_espresso'),
 				'TXN_paid' => __('Paid', 'event_espresso'),
-				'actions' => __( 'Actions', 'event_espresso' )
+				'actions' => __('Actions', 'event_espresso')
 				);
 			$this->_bottom_buttons = array(
 					'report'=> array(
 					'route' => 'registrations_report',
 					'extra_request' =>
 						array(
-							'EVT_ID'=> isset( $this->_req_data['event_id'] ) ? $this->_req_data['event_id'] : null,
-							'return_url' => urlencode( "//{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}" )
+							'EVT_ID'=> isset($this->_req_data['event_id']) ? $this->_req_data['event_id'] : null,
+							'return_url' => urlencode("//{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}")
 						)
 				),
 			);
@@ -124,19 +124,19 @@ 
 			$this->_columns = array(
 				'cb' => '<input type="checkbox" />', //Render a checkbox instead of text
 				'_REG_ID' => $ID_column_name,
-				'ATT_fname' => __( 'Name', 'event_espresso' ),
-				'_REG_date' => __( 'TXN Date', 'event_espresso' ),
-				'event_name' => __( 'Event', 'event_espresso' ),
-				'DTT_EVT_start' => __( 'Event Date', 'event_espresso' ),
-				'_REG_final_price' => __( 'Price', 'event_espresso' ),
-				'_REG_paid' => __( 'Paid', 'event_espresso' ),
-				'actions' => __( 'Actions', 'event_espresso' )
+				'ATT_fname' => __('Name', 'event_espresso'),
+				'_REG_date' => __('TXN Date', 'event_espresso'),
+				'event_name' => __('Event', 'event_espresso'),
+				'DTT_EVT_start' => __('Event Date', 'event_espresso'),
+				'_REG_final_price' => __('Price', 'event_espresso'),
+				'_REG_paid' => __('Paid', 'event_espresso'),
+				'actions' => __('Actions', 'event_espresso')
 			);
 			$this->_bottom_buttons = array(
 				'report_all'=> array(
 				'route' => 'registrations_report',
 				'extra_request' => array(
-					'return_url' => urlencode( "//{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}" ) )
+					'return_url' => urlencode("//{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}") )
 				),
 			);
 		}
@@ -144,11 +144,11 @@ 
 		$this->_primary_column = '_REG_ID';
 
 		$this->_sortable_columns = array(
-			'_REG_date' => array( '_REG_date' => TRUE ),   //true means its already sorted
-			'ATT_fname' => array( 'ATT_fname' => FALSE ),
-			'event_name' => array( 'event_name' => FALSE ),
-			'DTT_EVT_start'	=> array( 'DTT_EVT_start' => FALSE ),
-			'_REG_ID' => array( '_REG_ID' => FALSE ),
+			'_REG_date' => array('_REG_date' => TRUE), //true means its already sorted
+			'ATT_fname' => array('ATT_fname' => FALSE),
+			'event_name' => array('event_name' => FALSE),
+			'DTT_EVT_start'	=> array('DTT_EVT_start' => FALSE),
+			'_REG_ID' => array('_REG_ID' => FALSE),
 		);
 
 		$this->_hidden_columns = array();
@@ -162,11 +162,11 @@ 
 	 * @param  EE_Registration $item the current item
 	 * @return string
 	 */
-	protected function _get_row_class( $item ) {
-		$class = parent::_get_row_class( $item );
+	protected function _get_row_class($item) {
+		$class = parent::_get_row_class($item);
 		//add status class
-		$class .= ' ee-status-strip reg-status-' . $item->status_ID();
-		if ( $this->_has_checkbox_column ) {
+		$class .= ' ee-status-strip reg-status-'.$item->status_ID();
+		if ($this->_has_checkbox_column) {
 			$class .= ' has-checkbox-column';
 		}
 		return $class;
@@ -180,9 +180,9 @@ 
 	 * @param EE_Registration $registration
 	 * @throws \EE_Error
 	 */
-	protected function _set_related_details( EE_Registration $registration ) {
+	protected function _set_related_details(EE_Registration $registration) {
 
-		$transaction = $registration->get_first_related( 'Transaction' );
+		$transaction = $registration->get_first_related('Transaction');
 		$status = $transaction instanceof EE_Transaction
 			? $transaction->status_ID()
 			: EEM_Transaction::failed_status_code;
@@ -191,8 +191,8 @@ 
 			'status' => $status,
 			'id' => $transaction instanceof EE_Transaction ? $transaction->ID() : 0,
 			'title_attr' => sprintf(
-				__( 'View Transaction Details (%s)', 'event_espresso' ),
-				EEH_Template::pretty_status( $status, false, 'sentence' )
+				__('View Transaction Details (%s)', 'event_espresso'),
+				EEH_Template::pretty_status($status, false, 'sentence')
 			)
 		);
 
@@ -203,8 +203,8 @@ 
 			'status' => $status,
 			'id' => $event instanceof EE_Event ? $event->ID() : 0,
 			'title_attr' => sprintf(
-				__( 'Edit Event (%s)', 'event_espresso' ),
-				EEH_Template::pretty_status( $status, false, 'sentence' )
+				__('Edit Event (%s)', 'event_espresso'),
+				EEH_Template::pretty_status($status, false, 'sentence')
 			)
 		);
 	}
@@ -221,30 +221,30 @@ 
 
 		//todo we're currently using old functions here. We need to move things into the Events_Admin_Page() class as methods.
 
-		$cur_date = isset( $this->_req_data['month_range'] ) ? $this->_req_data['month_range'] : '';
-		$cur_category = isset( $this->_req_data['EVT_CAT'] ) ? $this->_req_data['EVT_CAT'] : -1;
-		$reg_status = isset( $this->_req_data['_reg_status'] ) ? $this->_req_data['_reg_status'] : '';
+		$cur_date = isset($this->_req_data['month_range']) ? $this->_req_data['month_range'] : '';
+		$cur_category = isset($this->_req_data['EVT_CAT']) ? $this->_req_data['EVT_CAT'] : -1;
+		$reg_status = isset($this->_req_data['_reg_status']) ? $this->_req_data['_reg_status'] : '';
 
-		$filters[] = EEH_Form_Fields::generate_registration_months_dropdown( $cur_date, $reg_status, $cur_category );
-		$filters[] = EEH_Form_Fields::generate_event_category_dropdown( $cur_category );
+		$filters[] = EEH_Form_Fields::generate_registration_months_dropdown($cur_date, $reg_status, $cur_category);
+		$filters[] = EEH_Form_Fields::generate_event_category_dropdown($cur_category);
 
 		$status = array();
-		$status[] = array( 'id' => 0, 'text' => __('Select Status', 'event_espresso') );
-		foreach ( $this->_status as $key => $value ) {
-			$status[] = array( 'id' => $key, 'text' => $value );
+		$status[] = array('id' => 0, 'text' => __('Select Status', 'event_espresso'));
+		foreach ($this->_status as $key => $value) {
+			$status[] = array('id' => $key, 'text' => $value);
 		}
-		if ( $this->_view !== 'incomplete' ) {
+		if ($this->_view !== 'incomplete') {
 			$filters[] = EEH_Form_Fields::select_input(
 				'_reg_status',
 				$status,
-				isset( $this->_req_data['_reg_status'] )
-					? strtoupper( sanitize_key( $this->_req_data['_reg_status'] ))
+				isset($this->_req_data['_reg_status'])
+					? strtoupper(sanitize_key($this->_req_data['_reg_status']))
 					: ''
 			);
 		}
 
-		if ( isset( $this->_req_data['event_id'] ) ) {
-			$filters[] = EEH_Form_Fields::hidden_input( 'event_id',  $this->_req_data['event_id'], 'reg_event_id' );
+		if (isset($this->_req_data['event_id'])) {
+			$filters[] = EEH_Form_Fields::hidden_input('event_id', $this->_req_data['event_id'], 'reg_event_id');
 		}
 
 		return $filters;
@@ -263,9 +263,9 @@ 
 		$this->_views['all']['count'] = $this->_total_registrations();
 		$this->_views['month']['count'] = $this->_total_registrations_this_month();
 		$this->_views['today']['count'] = $this->_total_registrations_today();
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_registrations', 'espresso_registrations_trash_registrations' ) ) {
-			$this->_views['incomplete']['count'] = $this->_total_registrations( 'incomplete' );
-			$this->_views['trash']['count'] = $this->_total_registrations( 'trash' );
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_registrations', 'espresso_registrations_trash_registrations')) {
+			$this->_views['incomplete']['count'] = $this->_total_registrations('incomplete');
+			$this->_views['trash']['count'] = $this->_total_registrations('trash');
 		}
 	}
 
@@ -279,23 +279,23 @@ 
 	 * @return int
 	 * @throws \EE_Error
 	 */
-	protected function _total_registrations( $view = '' ){
+	protected function _total_registrations($view = '') {
 		$_where = array();
-		$EVT_ID = isset( $this->_req_data['event_id'] ) ? absint( $this->_req_data['event_id'] ) : FALSE;
-		if( $EVT_ID ) {
+		$EVT_ID = isset($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : FALSE;
+		if ($EVT_ID) {
 			$_where['EVT_ID'] = $EVT_ID;
 		}
-		switch ( $view ) {
+		switch ($view) {
 			case 'trash' :
-				return EEM_Registration::instance()->count_deleted( array( $_where ));
+				return EEM_Registration::instance()->count_deleted(array($_where));
 				break;
 			case 'incomplete' :
 				$_where['STS_ID'] = EEM_Registration::status_id_incomplete;
 				break;
 			default :
-				$_where['STS_ID'] = array( '!=', EEM_Registration::status_id_incomplete );
+				$_where['STS_ID'] = array('!=', EEM_Registration::status_id_incomplete);
 		}
-		return EEM_Registration::instance()->count( array( $_where ));
+		return EEM_Registration::instance()->count(array($_where));
 	}
 
 
@@ -307,32 +307,32 @@ 
 	 * @return int
 	 * @throws \EE_Error
 	 */
-	protected function _total_registrations_this_month(){
-		$EVT_ID = isset( $this->_req_data['event_id'] ) ? absint( $this->_req_data['event_id'] ) : FALSE;
-		$_where = $EVT_ID ? array( 'EVT_ID' => $EVT_ID ) : array();
+	protected function _total_registrations_this_month() {
+		$EVT_ID = isset($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : FALSE;
+		$_where = $EVT_ID ? array('EVT_ID' => $EVT_ID) : array();
 		$this_year_r = date('Y', current_time('timestamp'));
 		$time_start = ' 00:00:00';
 		$time_end = ' 23:59:59';
 		$this_month_r = date('m', current_time('timestamp'));
-		$days_this_month = date( 't', current_time('timestamp') );
+		$days_this_month = date('t', current_time('timestamp'));
 		//setup date query.
 		$beginning_string = EEM_Registration::instance()->convert_datetime_for_query(
 			'REG_date',
-			$this_year_r . '-' . $this_month_r . '-01' . ' ' . $time_start,
+			$this_year_r.'-'.$this_month_r.'-01'.' '.$time_start,
 			'Y-m-d H:i:s'
 		);
 		$end_string = EEM_Registration::instance()->convert_datetime_for_query(
 			'REG_date',
-			$this_year_r . '-' . $this_month_r . '-' . $days_this_month . ' ' . $time_end,
+			$this_year_r.'-'.$this_month_r.'-'.$days_this_month.' '.$time_end,
 			'Y-m-d H:i:s'
 		);
-		$_where['REG_date']= array('BETWEEN',
+		$_where['REG_date'] = array('BETWEEN',
 			array(
 				$beginning_string,
 				$end_string
 		));
-		$_where['STS_ID'] = array( '!=', EEM_Registration::status_id_incomplete );
-		return EEM_Registration::instance()->count(array( $_where ) );
+		$_where['STS_ID'] = array('!=', EEM_Registration::status_id_incomplete);
+		return EEM_Registration::instance()->count(array($_where));
 	}
 
 
@@ -344,20 +344,20 @@ 
 	 * @return int
 	 * @throws \EE_Error
 	 */
-	protected function _total_registrations_today(){
+	protected function _total_registrations_today() {
 
-		$EVT_ID = isset( $this->_req_data['event_id'] ) ? absint( $this->_req_data['event_id'] ) : FALSE;
-		$_where = $EVT_ID ? array( 'EVT_ID' => $EVT_ID ) : array();
+		$EVT_ID = isset($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : FALSE;
+		$_where = $EVT_ID ? array('EVT_ID' => $EVT_ID) : array();
 		$current_date = date('Y-m-d', current_time('timestamp'));
 		$time_start = ' 00:00:00';
 		$time_end = ' 23:59:59';
-		$_where['REG_date']= array('BETWEEN',
+		$_where['REG_date'] = array('BETWEEN',
 			array(
-				EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $current_date . $time_start, 'Y-m-d H:i:s' ),
-				EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $current_date . $time_end, 'Y-m-d H:i:s' )
+				EEM_Registration::instance()->convert_datetime_for_query('REG_date', $current_date.$time_start, 'Y-m-d H:i:s'),
+				EEM_Registration::instance()->convert_datetime_for_query('REG_date', $current_date.$time_end, 'Y-m-d H:i:s')
 		));
-		$_where['STS_ID'] = array( '!=', EEM_Registration::status_id_incomplete );
-		return EEM_Registration::instance()->count(array( $_where ) );
+		$_where['STS_ID'] = array('!=', EEM_Registration::status_id_incomplete);
+		return EEM_Registration::instance()->count(array($_where));
 	}
 
 
@@ -370,12 +370,12 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-    public function column_cb($item){
+    public function column_cb($item) {
 	/** checkbox/lock **/
-	$transaction = $item->get_first_related( 'Transaction' );
-	$payment_count = $transaction instanceof EE_Transaction ? $transaction->count_related( 'Payment' ) : 0;
+	$transaction = $item->get_first_related('Transaction');
+	$payment_count = $transaction instanceof EE_Transaction ? $transaction->count_related('Payment') : 0;
 	    return $payment_count > 0
-		    ? sprintf( '<input type="checkbox" name="_REG_ID[]" value="%1$s" />', $item->ID() )
+		    ? sprintf('<input type="checkbox" name="_REG_ID[]" value="%1$s" />', $item->ID())
 		      . '<span class="ee-lock-icon"></span>'
 		    : sprintf(
 			    '<input type="checkbox" name="_REG_ID[]" value="%1$s" />',
@@ -393,14 +393,14 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column__REG_ID(EE_Registration $item){
+	public function column__REG_ID(EE_Registration $item) {
 		$attendee = $item->attendee();
 		$content = $item->ID();
 		$content .= '<div class="show-on-mobile-view-only">';
 		$content .= '<br>';
 		$content .= $attendee instanceof EE_Attendee ? $attendee->full_name() : '';
-		$content .= '&nbsp;' . sprintf(__( '(%1$s / %2$s)', 'event_espresso' ), $item->count(), $item->group_size());
-		$content .= '<br>' . sprintf( __( 'Reg Code: %s', 'event_espresso' ), $item->get('REG_code') );
+		$content .= '&nbsp;'.sprintf(__('(%1$s / %2$s)', 'event_espresso'), $item->count(), $item->group_size());
+		$content .= '<br>'.sprintf(__('Reg Code: %s', 'event_espresso'), $item->get('REG_code'));
 		$content .= '</div>';
 		return $content;
 	}
@@ -415,12 +415,12 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column__REG_date(EE_Registration $item){
+	public function column__REG_date(EE_Registration $item) {
 		$this->_set_related_details($item);
        		 //Build row actions
-		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=> $this->_transaction_details['id'] ), TXN_ADMIN_URL );
-		$view_link = EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction') ? '<a class="ee-status-color-' . $this->_transaction_details['status'] . '" href="'.$view_lnk_url.'" title="' . esc_attr( $this->_transaction_details['title_attr'] ) . '">' . $item->get_i18n_datetime( 'REG_date' ) . '</a>' : $item->get_i18n_datetime( 'REG_date' );
-		$view_link .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $this->_transaction_details['status'], false, 'sentence' ) . '</span>';
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=> $this->_transaction_details['id']), TXN_ADMIN_URL);
+		$view_link = EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction') ? '<a class="ee-status-color-'.$this->_transaction_details['status'].'" href="'.$view_lnk_url.'" title="'.esc_attr($this->_transaction_details['title_attr']).'">'.$item->get_i18n_datetime('REG_date').'</a>' : $item->get_i18n_datetime('REG_date');
+		$view_link .= '<br><span class="ee-status-text-small">'.EEH_Template::pretty_status($this->_transaction_details['status'], false, 'sentence').'</span>';
 		return $view_link;
 	}
 
@@ -434,18 +434,18 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_event_name(EE_Registration $item){
-		$this->_set_related_details( $item );
+	public function column_event_name(EE_Registration $item) {
+		$this->_set_related_details($item);
 		// page=espresso_events&action=edit_event&EVT_ID=2&edit_event_nonce=cf3a7e5b62
-		$edit_event_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$item->event_ID() ), EVENTS_ADMIN_URL );
+		$edit_event_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit', 'post'=>$item->event_ID()), EVENTS_ADMIN_URL);
 		$event_name = $item->event_name();
 		$event_name = $event_name ? $event_name : __("No Associated Event", 'event_espresso');
-		$edit_event = EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'edit_event', $item->event_ID() ) ? '<a class="ee-status-color-' . $this->_event_details['status'] . '" href="' . $edit_event_url . '" title="' . esc_attr( $this->_event_details['title_attr'] ) .'">' .  wp_trim_words( $event_name, 30, '...' ) . '</a>' : wp_trim_words( $event_name, 30, '...' ) ;
+		$edit_event = EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'edit_event', $item->event_ID()) ? '<a class="ee-status-color-'.$this->_event_details['status'].'" href="'.$edit_event_url.'" title="'.esc_attr($this->_event_details['title_attr']).'">'.wp_trim_words($event_name, 30, '...').'</a>' : wp_trim_words($event_name, 30, '...');
 
-		$edit_event_url = EE_Admin_Page::add_query_args_and_nonce( array( 'event_id'=>$item->event_ID() ), REG_ADMIN_URL );
-		$actions['event_filter'] = '<a href="' . $edit_event_url . '" title="' . sprintf( esc_attr__( 'Filter this list to only show registrations for %s', 'event_espresso' ), $event_name ) .'">' .  __( 'View Registrations', 'event_espresso' ) . '</a>';
+		$edit_event_url = EE_Admin_Page::add_query_args_and_nonce(array('event_id'=>$item->event_ID()), REG_ADMIN_URL);
+		$actions['event_filter'] = '<a href="'.$edit_event_url.'" title="'.sprintf(esc_attr__('Filter this list to only show registrations for %s', 'event_espresso'), $event_name).'">'.__('View Registrations', 'event_espresso').'</a>';
 
-		return sprintf('%1$s %2$s', $edit_event, $this->row_actions($actions) );
+		return sprintf('%1$s %2$s', $edit_event, $this->row_actions($actions));
 	}
 
 
@@ -458,18 +458,18 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-   	public function column_DTT_EVT_start(EE_Registration $item){
+   	public function column_DTT_EVT_start(EE_Registration $item) {
 		$datetime_strings = array();
-		$ticket = $item->ticket( TRUE );
-		if ( $ticket instanceof EE_Ticket ) {
+		$ticket = $item->ticket(TRUE);
+		if ($ticket instanceof EE_Ticket) {
 			$remove_defaults = array('default_where_conditions' => 'none');
 			$datetimes = $ticket->datetimes($remove_defaults);
-			foreach($datetimes as $datetime){
-				$datetime_strings[] = $datetime->get_i18n_datetime( 'DTT_EVT_start' );
+			foreach ($datetimes as $datetime) {
+				$datetime_strings[] = $datetime->get_i18n_datetime('DTT_EVT_start');
 			}
-			return implode("<br />",$datetime_strings);
+			return implode("<br />", $datetime_strings);
 		} else {
-			return __( 'There is no ticket on this registration', 'event_espresso' );
+			return __('There is no ticket on this registration', 'event_espresso');
 		}
     }
 
@@ -483,45 +483,45 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-   	public function column_ATT_fname(EE_Registration $item){
+   	public function column_ATT_fname(EE_Registration $item) {
    		$attendee = $item->attendee();
 
-		$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$item->ID() ), REG_ADMIN_URL );
+		$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_registration', '_REG_ID'=>$item->ID()), REG_ADMIN_URL);
 		$attendee_name = $attendee instanceof EE_Attendee ? $attendee->full_name() : '';
-		$link = EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ? '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'View Registration Details', 'event_espresso' ) . '">' . $attendee_name . '</a>' : $attendee_name;
+		$link = EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID()) ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'">'.$attendee_name.'</a>' : $attendee_name;
 		$link .= $item->count() === 1 ? '&nbsp;<sup><div class="dashicons dashicons-star-filled lt-blue-icon ee-icon-size-8"></div></sup>' : '';
 
 		$t = $item->get_first_related('Transaction');
 		$payment_count = $t instanceof EE_Transaction ? $t->count_related('Payment') : 0;
 
 	    //append group count to name
-	    $link .= '&nbsp;' . sprintf(__( '(%1$s / %2$s)', 'event_espresso' ), $item->count(), $item->group_size());
+	    $link .= '&nbsp;'.sprintf(__('(%1$s / %2$s)', 'event_espresso'), $item->count(), $item->group_size());
 
 	    //append reg_code
-	    $link .= '<br>' . sprintf( __( 'Reg Code: %s', 'event_espresso' ), $item->get('REG_code') );
+	    $link .= '<br>'.sprintf(__('Reg Code: %s', 'event_espresso'), $item->get('REG_code'));
 
 	    //reg status text for accessibility
-	    $link .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $item->status_ID(), false, 'sentence' ) . '</span>';
+	    $link .= '<br><span class="ee-status-text-small">'.EEH_Template::pretty_status($item->status_ID(), false, 'sentence').'</span>';
 
 		//trash/restore/delete actions
 		$actions = array();
-		if ( $this->_view !== 'trash' && $payment_count === 0 && EE_Registry::instance()->CAP->current_user_can( 'ee_delete_registration', 'espresso_registrations_trash_registrations', $item->ID() ) ) {
-			$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'trash_registrations', '_REG_ID'=>$item->ID() ), REG_ADMIN_URL );
-			$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="' . esc_attr__( 'Trash Registration', 'event_espresso' ) . '">' . __( 'Trash', 'event_espresso' ) . '</a>';
-		} elseif ( $this->_view === 'trash' ) {
+		if ($this->_view !== 'trash' && $payment_count === 0 && EE_Registry::instance()->CAP->current_user_can('ee_delete_registration', 'espresso_registrations_trash_registrations', $item->ID())) {
+			$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'trash_registrations', '_REG_ID'=>$item->ID()), REG_ADMIN_URL);
+			$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="'.esc_attr__('Trash Registration', 'event_espresso').'">'.__('Trash', 'event_espresso').'</a>';
+		} elseif ($this->_view === 'trash') {
 			// restore registration link
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_registration', 'espresso_registrations_restore_registrations', $item->ID() ) ) {
-				$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'restore_registrations', '_REG_ID'=>$item->ID() ), REG_ADMIN_URL );
-				$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="' . esc_attr__( 'Restore Registration', 'event_espresso' ) . '">' . __( 'Restore', 'event_espresso' ) . '</a>';
+			if (EE_Registry::instance()->CAP->current_user_can('ee_delete_registration', 'espresso_registrations_restore_registrations', $item->ID())) {
+				$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'restore_registrations', '_REG_ID'=>$item->ID()), REG_ADMIN_URL);
+				$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="'.esc_attr__('Restore Registration', 'event_espresso').'">'.__('Restore', 'event_espresso').'</a>';
 			}
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_registration', 'espresso_registrations_ee_delete_registrations', $item->ID() ) ) {
-				$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'delete_registrations', '_REG_ID'=>$item->ID() ), REG_ADMIN_URL );
+			if (EE_Registry::instance()->CAP->current_user_can('ee_delete_registration', 'espresso_registrations_ee_delete_registrations', $item->ID())) {
+				$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'delete_registrations', '_REG_ID'=>$item->ID()), REG_ADMIN_URL);
 
-				$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="' . esc_attr__( 'Delete Registration Permanently', 'event_espresso' ). '">' . __( 'Delete', 'event_espresso' ) . '</a>';
+				$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="'.esc_attr__('Delete Registration Permanently', 'event_espresso').'">'.__('Delete', 'event_espresso').'</a>';
 			}
 		}
 
-		return sprintf('%1$s %2$s', $link, $this->row_actions($actions) );
+		return sprintf('%1$s %2$s', $link, $this->row_actions($actions));
 	}
 
 
@@ -534,7 +534,7 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_ATT_email( EE_Registration $item ) {
+	public function column_ATT_email(EE_Registration $item) {
 		$attendee = $item->get_first_related('Attendee');
 		return ! $attendee instanceof EE_Attendee ? __('No attached contact record.', 'event_espresso') : $attendee->email();
 	}
@@ -548,8 +548,8 @@ 
 	 * @param \EE_Registration $item
 	 * @return string
 	 */
-	public function column__REG_count(EE_Registration $item){
-		return  sprintf(__( '%1$s / %2$s', 'event_espresso' ), $item->count(), $item->group_size());
+	public function column__REG_count(EE_Registration $item) {
+		return  sprintf(__('%1$s / %2$s', 'event_espresso'), $item->count(), $item->group_size());
 	}
 
 
@@ -561,16 +561,16 @@ 
 	 * @param \EE_Registration $item
 	 * @return string
 	 */
-	public function column_PRC_amount(EE_Registration $item){
+	public function column_PRC_amount(EE_Registration $item) {
 		$ticket = $item->ticket();
 
-		$content = isset( $_GET['event_id'] ) && $ticket instanceof EE_Ticket ? '<span class="TKT_name">' . $ticket->name() . '</span><br />' : '';
+		$content = isset($_GET['event_id']) && $ticket instanceof EE_Ticket ? '<span class="TKT_name">'.$ticket->name().'</span><br />' : '';
 
-		if ( $item->final_price() > 0 ) {
-			$content .= '<span class="reg-pad-rght">' . $item->pretty_final_price() . '</span>';
+		if ($item->final_price() > 0) {
+			$content .= '<span class="reg-pad-rght">'.$item->pretty_final_price().'</span>';
 		} else {
 			// free event
-			$content .= '<span class="reg-overview-free-event-spn reg-pad-rght">' . __( 'free', 'event_espresso' ) . '</span>';
+			$content .= '<span class="reg-overview-free-event-spn reg-pad-rght">'.__('free', 'event_espresso').'</span>';
 		}
 
 		return $content;
@@ -586,11 +586,11 @@ 
 	 * @param \EE_Registration $item
 	 * @return string
 	 */
-	public function column__REG_final_price(EE_Registration $item){
+	public function column__REG_final_price(EE_Registration $item) {
 		$ticket = $item->ticket();
-		$content = isset( $_GET['event_id'] ) || ! $ticket instanceof EE_Ticket ? '' : '<span class="TKT_name">' . $ticket->name() . '</span><br />';
+		$content = isset($_GET['event_id']) || ! $ticket instanceof EE_Ticket ? '' : '<span class="TKT_name">'.$ticket->name().'</span><br />';
 
-		$content .= '<span class="reg-pad-rght">' .  $item->pretty_final_price() . '</span>';
+		$content .= '<span class="reg-pad-rght">'.$item->pretty_final_price().'</span>';
 		return $content;
 
 	}
@@ -604,13 +604,13 @@ 
 	 * @param \EE_Registration $item
 	 * @return string
 	 */
-	public function column__REG_paid(EE_Registration $item){
+	public function column__REG_paid(EE_Registration $item) {
 		$payment_method = $item->payment_method();
-		$payment_method_name = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name() : __( 'Unknown', 'event_espresso' );
+		$payment_method_name = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name() : __('Unknown', 'event_espresso');
 
-		$content = '<span class="reg-pad-rght">' .  $item->pretty_paid() . '</span>';
-		if ( $item->paid() > 0 ) {
-			$content .= '<br><span class="ee-status-text-small">' . sprintf( __( '...via %s', 'event_espresso' ), $payment_method_name ) . '</span>';
+		$content = '<span class="reg-pad-rght">'.$item->pretty_paid().'</span>';
+		if ($item->paid() > 0) {
+			$content .= '<br><span class="ee-status-text-small">'.sprintf(__('...via %s', 'event_espresso'), $payment_method_name).'</span>';
 		}
 		return $content;
 	}
@@ -625,11 +625,11 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_TXN_total(EE_Registration $item){
-		if($item->transaction()){
-			$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->transaction_ID() ), TXN_ADMIN_URL );
-			return EE_Registry::instance()->CAP->current_user_can( 'ee_read_transaction', 'espresso_transactions_view_transaction', $item->transaction_ID() ) ? '<span class="reg-pad-rght"><a class="status-'. $item->transaction()->status_ID() .'" href="'.$view_txn_lnk_url.'"  title="' . esc_attr__( 'View Transaction', 'event_espresso' ) . '">'  . $item->transaction()->pretty_total() . '</a></span>' : '<span class="reg-pad-rght">' . $item->transaction()->pretty_total() . '</span>';
-		}else{
+	public function column_TXN_total(EE_Registration $item) {
+		if ($item->transaction()) {
+			$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->transaction_ID()), TXN_ADMIN_URL);
+			return EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction', $item->transaction_ID()) ? '<span class="reg-pad-rght"><a class="status-'.$item->transaction()->status_ID().'" href="'.$view_txn_lnk_url.'"  title="'.esc_attr__('View Transaction', 'event_espresso').'">'.$item->transaction()->pretty_total().'</a></span>' : '<span class="reg-pad-rght">'.$item->transaction()->pretty_total().'</span>';
+		} else {
 			return __("None", "event_espresso");
 		}
 	}
@@ -644,15 +644,15 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function column_TXN_paid(EE_Registration $item){
+	public function column_TXN_paid(EE_Registration $item) {
 
-		if ( $item->count() === 1 ) {
+		if ($item->count() === 1) {
 			$transaction = $item->transaction() ? $item->transaction() : EE_Transaction::new_instance();
-			if ( $transaction->paid() >= $transaction->total() ) {
+			if ($transaction->paid() >= $transaction->total()) {
 				return '<span class="reg-pad-rght"><div class="dashicons dashicons-yes green-icon"></div></span>';
 			} else {
-				$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->transaction_ID() ), TXN_ADMIN_URL );
-				return EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction', $item->transaction_ID() ) ? '<span class="reg-pad-rght"><a class="status-'. $transaction->status_ID() .'" href="'.$view_txn_lnk_url.'"  title="' . esc_attr__( 'View Transaction', 'event_espresso' ) . '">' . $item->transaction()->pretty_paid() . '</a><span>' : '<span class="reg-pad-rght">' . $item->transaction()->pretty_paid() . '</span>';
+				$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->transaction_ID()), TXN_ADMIN_URL);
+				return EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction', $item->transaction_ID()) ? '<span class="reg-pad-rght"><a class="status-'.$transaction->status_ID().'" href="'.$view_txn_lnk_url.'"  title="'.esc_attr__('View Transaction', 'event_espresso').'">'.$item->transaction()->pretty_paid().'</a><span>' : '<span class="reg-pad-rght">'.$item->transaction()->pretty_paid().'</span>';
 			}
 		}
 
@@ -672,44 +672,44 @@ 
 	 */
 	public function column_actions(EE_Registration $item) {
 		$attendee = $item->attendee();
-		$this->_set_related_details( $item );
+		$this->_set_related_details($item);
 
 		//Build row actions
-		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$item->ID() ), REG_ADMIN_URL );
-		$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit_attendee', 'post'=>$item->attendee_ID() ), REG_ADMIN_URL );
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_registration', '_REG_ID'=>$item->ID()), REG_ADMIN_URL);
+		$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_attendee', 'post'=>$item->attendee_ID()), REG_ADMIN_URL);
 
 		// page=attendees&event_admin_reports=resend_email&registration_id=43653465634&event_id=2&form_action=resend_email
 		//$resend_reg_lnk_url_params = array( 'action'=>'resend_registration', '_REG_ID'=>$item->REG_ID );
-		$resend_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'resend_registration', '_REG_ID'=>$item->ID() ), REG_ADMIN_URL, true );
+		$resend_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'resend_registration', '_REG_ID'=>$item->ID()), REG_ADMIN_URL, true);
 
 
 		//Build row actions
-		$view_lnk = EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ? '
+		$view_lnk = EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID()) ? '
 			<li>
-			<a href="'.$view_lnk_url.'" title="' . esc_attr__( 'View Registration Details', 'event_espresso' ) . '" class="tiny-text">
+			<a href="'.$view_lnk_url.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'" class="tiny-text">
 				<div class="dashicons dashicons-clipboard"></div>
 			</a>
 			</li>' : '';
 
-		$edit_lnk = EE_Registry::instance()->CAP->current_user_can('ee_edit_contacts', 'espresso_registrations_edit_attendee' ) &&  $attendee instanceof EE_Attendee ?'
+		$edit_lnk = EE_Registry::instance()->CAP->current_user_can('ee_edit_contacts', 'espresso_registrations_edit_attendee') && $attendee instanceof EE_Attendee ? '
 			<li>
-			<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Contact Details', 'event_espresso' ) . '" class="tiny-text">
+			<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Contact Details', 'event_espresso').'" class="tiny-text">
 				<div class="ee-icon ee-icon-user-edit ee-icon-size-16"></div>
 			</a>
 			</li>' : '';
 
-		 $resend_reg_lnk = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_resend_registration', $item->ID() ) ? '
+		 $resend_reg_lnk = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_resend_registration', $item->ID()) ? '
 			<li>
-			<a href="'.$resend_reg_lnk_url.'" title="' . esc_attr__( 'Resend Registration Details', 'event_espresso' ) . '" class="tiny-text">
+			<a href="'.$resend_reg_lnk_url.'" title="'.esc_attr__('Resend Registration Details', 'event_espresso').'" class="tiny-text">
 				<div class="dashicons dashicons-email-alt"></div>
 			</a>
 			</li>' : '';
 
 		// page=transactions&action=view_transaction&txn=256&_wpnonce=6414da4dbb
-		$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$this->_transaction_details['id'] ), TXN_ADMIN_URL );
-		$view_txn_lnk = EE_Registry::instance()->CAP->current_user_can( 'ee_read_transaction', 'espresso_transactions_view_transaction', $this->_transaction_details['id'] ) ? '
+		$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$this->_transaction_details['id']), TXN_ADMIN_URL);
+		$view_txn_lnk = EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction', $this->_transaction_details['id']) ? '
 			<li>
-			<a class="ee-status-color-' . $this->_transaction_details['status'] . ' tiny-text" href="'.$view_txn_lnk_url.'"  title="' . $this->_transaction_details['title_attr'] . '">
+			<a class="ee-status-color-' . $this->_transaction_details['status'].' tiny-text" href="'.$view_txn_lnk_url.'"  title="'.$this->_transaction_details['title_attr'].'">
 				<div class="dashicons dashicons-cart"></div>
 			</a>
 			</li>' : '';
@@ -718,10 +718,10 @@ 
 		$dl_invoice_lnk = '';
 		$dl_invoice_lnk_url = $item->invoice_url();
 		//only show invoice link if message type is active.
-		if ( $attendee instanceof EE_Attendee && $item->is_primary_registrant() && EEH_MSG_Template::is_mt_active( 'invoice' ) ) {
+		if ($attendee instanceof EE_Attendee && $item->is_primary_registrant() && EEH_MSG_Template::is_mt_active('invoice')) {
 			$dl_invoice_lnk = '
 		<li>
-			<a title="' . esc_attr__( 'View Transaction Invoice', 'event_espresso' ) . '" target="_blank" href="'.$dl_invoice_lnk_url.'" class="tiny-text">
+			<a title="' . esc_attr__('View Transaction Invoice', 'event_espresso').'" target="_blank" href="'.$dl_invoice_lnk_url.'" class="tiny-text">
 				<span class="dashicons dashicons-media-spreadsheet ee-icon-size-18"></span>
 			</a>
 		</li>';
@@ -729,7 +729,7 @@ 
 
 		$filtered_messages_link = '';
 		//message list table link (filtered by REG_ID
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_global_messages', 'view_filtered_messages' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_global_messages', 'view_filtered_messages')) {
 			$filtered_messages_link = '<li>'
 			                          . EEH_MSG_Template::get_message_action_link(
 											'see_notifications_for',
@@ -741,7 +741,7 @@ 
 			                          . '</li>';
 		}
 
-		return $this->_action_string( $view_lnk . $edit_lnk . $resend_reg_lnk . $view_txn_lnk . $dl_invoice_lnk . $filtered_messages_link, $item, 'ul', 'reg-overview-actions-ul' );
+		return $this->_action_string($view_lnk.$edit_lnk.$resend_reg_lnk.$view_txn_lnk.$dl_invoice_lnk.$filtered_messages_link, $item, 'ul', 'reg-overview-actions-ul');
 	}
 
 }

core/middleware/EE_Recommended_Versions.core.php

Spacing +20 added lines, -20 removed lines

@@ -22,32 +22,32 @@ 
 	 * @param 	EE_Response $response
 	 * @return 	EE_Response
 	 */
-	public function handle_request( EE_Request $request, EE_Response $response ) {
+	public function handle_request(EE_Request $request, EE_Response $response) {
 		$this->_request = $request;
 		$this->_response = $response;
 		//$this->_response->add_output( "\n\t IN >>  " . __CLASS__ );
 		//$this->_response->set_notice( 1, 'hey look at this' );
 		// check required WP version
-		if ( ! $this->_minimum_wp_version_required() ) {
-			$this->_request->un_set( 'activate', true );
-			add_action( 'admin_notices', array( $this, 'minimum_wp_version_error' ), 1 );
+		if ( ! $this->_minimum_wp_version_required()) {
+			$this->_request->un_set('activate', true);
+			add_action('admin_notices', array($this, 'minimum_wp_version_error'), 1);
 			//$this->_response->add_output( "\n<br />" . 'minimum_wp_version_error' );
 			$this->_response->terminate_request();
 			$this->_response->deactivate_plugin();
 		}
 		// check required PHP version
-		if ( ! $this->_minimum_php_version_required() ) {
-			$this->_request->un_set( 'activate', true );
-			add_action( 'admin_notices', array( $this, 'minimum_php_version_error' ), 1 );
+		if ( ! $this->_minimum_php_version_required()) {
+			$this->_request->un_set('activate', true);
+			add_action('admin_notices', array($this, 'minimum_php_version_error'), 1);
 			//$this->_response->add_output( "\n<br />" . 'minimum_php_version_error' );
 			$this->_response->terminate_request();
 			$this->_response->deactivate_plugin();
 		}
 		// check recommended PHP version
-		if ( ! $this->_minimum_php_version_recommended() ) {
+		if ( ! $this->_minimum_php_version_recommended()) {
 			$this->_display_minimum_recommended_php_version_notice();
 		}
-		$this->_response = $this->process_request_stack( $this->_request, $this->_response );
+		$this->_response = $this->process_request_stack($this->_request, $this->_response);
 		//$this->_response->add_output( "\n\t OUT << " . __CLASS__ );
 		return $this->_response;
 	}
@@ -61,9 +61,9 @@ 
 	 * @param string $min_version
 	 * @return boolean
 	 */
-	private function _check_wp_version( $min_version = EE_MIN_WP_VER_REQUIRED ) {
+	private function _check_wp_version($min_version = EE_MIN_WP_VER_REQUIRED) {
 		global $wp_version;
-		return version_compare( $wp_version, $min_version, '>=' ) ? true : false;
+		return version_compare($wp_version, $min_version, '>=') ? true : false;
 	}
 
 
@@ -75,7 +75,7 @@ 
 	 * @return boolean
 	 */
 	private function _minimum_wp_version_required() {
-		return $this->_check_wp_version( EE_MIN_WP_VER_REQUIRED );
+		return $this->_check_wp_version(EE_MIN_WP_VER_REQUIRED);
 	}
 
 
@@ -87,8 +87,8 @@ 
 	 * @param string $min_version
 	 * @return boolean
 	 */
-	private function _check_php_version( $min_version = EE_MIN_PHP_VER_RECOMMENDED ) {
-		return version_compare( PHP_VERSION, $min_version, '>=' ) ? true : false;
+	private function _check_php_version($min_version = EE_MIN_PHP_VER_RECOMMENDED) {
+		return version_compare(PHP_VERSION, $min_version, '>=') ? true : false;
 	}
 
 
@@ -100,7 +100,7 @@ 
 	 * @return boolean
 	 */
 	private function _minimum_php_version_required() {
-		return $this->_check_php_version( EE_MIN_PHP_VER_REQUIRED );
+		return $this->_check_php_version(EE_MIN_PHP_VER_REQUIRED);
 	}
 
 
@@ -112,7 +112,7 @@ 
 	 * @return boolean
 	 */
 	private function _minimum_php_version_recommended() {
-		return $this->_check_php_version( EE_MIN_PHP_VER_RECOMMENDED );
+		return $this->_check_php_version(EE_MIN_PHP_VER_RECOMMENDED);
 	}
 
 
@@ -129,7 +129,7 @@ 
 			<p>
 				<?php
 				printf(
-					__( 'We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso' ),
+					__('We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso'),
 					EE_MIN_WP_VER_REQUIRED,
 					$wp_version,
 					'<br/>',
@@ -154,7 +154,7 @@ 
 			<p>
 				<?php
 				printf(
-					__( 'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso' ),
+					__('We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso'),
 					EE_MIN_PHP_VER_REQUIRED,
 					PHP_VERSION,
 					'<br/>',
@@ -176,9 +176,9 @@ 
 	 */
 	private function _display_minimum_recommended_php_version_notice() {
 		EE_Error::add_persistent_admin_notice(
-			'php_version_' . str_replace( '.', '-', EE_MIN_PHP_VER_RECOMMENDED ) . '_recommended',
+			'php_version_'.str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED).'_recommended',
 			sprintf(
-				__( 'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso' ),
+				__('Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso'),
 				EE_MIN_PHP_VER_RECOMMENDED,
 				PHP_VERSION,
 				'<br/>',

modules/venue_single/EED_Venue_Single.module.php

Spacing +27 added lines, -27 removed lines

@@ -27,7 +27,7 @@ 
 	 * @return EED_Venue_Single
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 	/**
@@ -37,7 +37,7 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-		EE_Config::register_route( 'venue', 'Venue_Single', 'run' );
+		EE_Config::register_route('venue', 'Venue_Single', 'run');
 //		EE_Config::register_view( 'venue', 0, EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'single-espresso_venues.php' );
 	}
 
@@ -58,10 +58,10 @@ 
 	 * @access    public
 	 * @param \WP $WP
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 		// check what template is loaded
-		add_filter( 'template_include',  array( $this, 'template_include' ), 999, 1 );
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 10 );
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
 	}
 
 
@@ -73,15 +73,15 @@ 
 	 * @param  string $template
 	 * @return string
 	 */
-	public function template_include( $template ) {
+	public function template_include($template) {
 		// not a custom template?
-		if ( EE_Registry::instance()->load_core( 'Front_Controller', array(), false, true )->get_selected_template() != 'single-espresso_venues.php' ) {
+		if (EE_Registry::instance()->load_core('Front_Controller', array(), false, true)->get_selected_template() != 'single-espresso_venues.php') {
 			EEH_Template::load_espresso_theme_functions();
 			// then add extra event data via hooks
-			add_filter( 'the_title', array( $this, 'the_title' ), 100, 1 );
-			add_filter( 'the_content', array( $this, 'venue_details' ), 100 );
+			add_filter('the_title', array($this, 'the_title'), 100, 1);
+			add_filter('the_content', array($this, 'venue_details'), 100);
 			// don't display entry meta because the existing theme will take car of that
-			add_filter( 'FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false' );
+			add_filter('FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false');
 		}
 		return $template;
 	}
@@ -95,7 +95,7 @@ 
 	 * @param  string $title
 	 * @return string
 	 */
-	public function the_title( $title = '' ) {
+	public function the_title($title = '') {
 		return $title;
 	}
 
@@ -107,7 +107,7 @@ 
 	 * @param  string $content
 	 * @return string
 	 */
-	public function venue_details( $content ) {
+	public function venue_details($content) {
 		global $post;
 		if (
 			$post->post_type == 'espresso_venues'
@@ -117,16 +117,16 @@ 
 			// it uses the_content() for displaying the $post->post_content
 			// so in order to load a template that uses the_content() from within a callback being used to filter the_content(),
 			// we need to first remove this callback from being applied to the_content() (otherwise it will recurse and blow up the interweb)
-			remove_filter( 'the_content', array( $this, 'venue_details' ), 100 );
+			remove_filter('the_content', array($this, 'venue_details'), 100);
 			// add filters we want
-			add_filter( 'the_content', array( $this, 'venue_location' ), 110 );
+			add_filter('the_content', array($this, 'venue_location'), 110);
 			// now load our template
-			$template = EEH_Template::locate_template( 'content-espresso_venues-details.php' );
+			$template = EEH_Template::locate_template('content-espresso_venues-details.php');
 			// remove other filters we added so they won't get applied to the next post
-			remove_filter( 'the_content', array( $this, 'venue_location' ), 110 );
+			remove_filter('the_content', array($this, 'venue_location'), 110);
 		}
 		// we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
-		return ! empty( $template ) ? $template : $content;
+		return ! empty($template) ? $template : $content;
 	}
 
 
@@ -138,8 +138,8 @@ 
 	 * @param  string $content
 	 * @return string
 	 */
-	public function venue_location( $content ) {
-		return $content . EEH_Template::locate_template( 'content-espresso_venues-location.php' );
+	public function venue_location($content) {
+		return $content.EEH_Template::locate_template('content-espresso_venues-location.php');
 	}
 
 
@@ -152,16 +152,16 @@ 
 	 */
 	public function wp_enqueue_scripts() {
 		// get some style
-		if ( apply_filters( 'FHEE_enable_default_espresso_css', TRUE ) && is_single() ) {
+		if (apply_filters('FHEE_enable_default_espresso_css', TRUE) && is_single()) {
 			// first check theme folder
-			if ( is_readable( get_stylesheet_directory() . $this->theme . DS . 'style.css' )) {
-				wp_register_style( $this->theme, get_stylesheet_directory_uri() . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
-			} else if ( is_readable( EE_TEMPLATES . $this->theme . DS . 'style.css' )) {
-				wp_register_style( $this->theme, EE_TEMPLATES_URL . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
+			if (is_readable(get_stylesheet_directory().$this->theme.DS.'style.css')) {
+				wp_register_style($this->theme, get_stylesheet_directory_uri().$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
+			} else if (is_readable(EE_TEMPLATES.$this->theme.DS.'style.css')) {
+				wp_register_style($this->theme, EE_TEMPLATES_URL.$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
 			}
-			wp_enqueue_style( $this->theme );
-			if ( EE_Registry::instance()->CFG->map_settings->use_google_maps ) {
-				add_action('wp_enqueue_scripts', array( 'EEH_Maps', 'espresso_google_map_js' ), 11 );
+			wp_enqueue_style($this->theme);
+			if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
+				add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
 			}
 		}
 	}

modules/venues_archive/EED_Venues_Archive.module.php

Spacing +31 added lines, -31 removed lines

@@ -27,7 +27,7 @@ 
 	 * @return EED_Venues_Archive
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 	/**
@@ -37,7 +37,7 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-		EE_Config::register_route( 'venues', 'Venues_Archive', 'run' );
+		EE_Config::register_route('venues', 'Venues_Archive', 'run');
 //		EE_Config::register_view( 'venues', 0, EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_venues.php' );
 	}
 
@@ -58,10 +58,10 @@ 
 	 * @access    public
 	 * @param \WP $WP
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 		// check what template is loaded
-		add_filter( 'template_include',  array( $this, 'template_include' ), 999, 1 );
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 10 );
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
 	}
 
 
@@ -73,18 +73,18 @@ 
 	 * @param  string $template
 	 * @return string
 	 */
-	public function template_include( $template ) {
+	public function template_include($template) {
 		// not a custom template?
-		if ( EE_Registry::instance()->load_core( 'Front_Controller', array(), false, true )->get_selected_template() != 'archive-espresso_venues.php' ) {
+		if (EE_Registry::instance()->load_core('Front_Controller', array(), false, true)->get_selected_template() != 'archive-espresso_venues.php') {
 			EEH_Template::load_espresso_theme_functions();
 			// then add extra event data via hooks
-			add_filter( 'the_title', array( $this, 'the_title' ), 100, 1 );
+			add_filter('the_title', array($this, 'the_title'), 100, 1);
 			// don't know if theme uses the_excerpt
-			add_filter( 'the_excerpt', array( $this, 'venue_details' ), 100 );
+			add_filter('the_excerpt', array($this, 'venue_details'), 100);
 			// or the_content
-			add_filter( 'the_content', array( $this, 'venue_details' ), 100 );
+			add_filter('the_content', array($this, 'venue_details'), 100);
 			// don't display entry meta because the existing theme will take care of that
-			add_filter( 'FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false' );
+			add_filter('FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false');
 		}
 		return $template;
 	}
@@ -98,7 +98,7 @@ 
 	 * @param  string $title
 	 * @return string
 	 */
-	public function the_title( $title = '' ) {
+	public function the_title($title = '') {
 		return $title;
 	}
 
@@ -110,7 +110,7 @@ 
 	 * @param  string $content
 	 * @return string
 	 */
-	public function venue_details( $content ) {
+	public function venue_details($content) {
 		global $post;
 		if (
 			$post->post_type == 'espresso_venues'
@@ -120,22 +120,22 @@ 
 			// it uses the_content() for displaying the $post->post_content
 			// so in order to load a template that uses the_content() from within a callback being used to filter the_content(),
 			// we need to first remove this callback from being applied to the_content() (otherwise it will recurse and blow up the interweb)
-			remove_filter( 'the_excerpt', array( $this, 'venue_details' ), 100 );
-			remove_filter( 'the_content', array( $this, 'venue_details' ), 100 );
+			remove_filter('the_excerpt', array($this, 'venue_details'), 100);
+			remove_filter('the_content', array($this, 'venue_details'), 100);
 			// add filters we want
-			add_filter( 'the_content', array( $this, 'venue_location' ), 110 );
-			add_filter( 'the_excerpt', array( $this, 'venue_location' ), 110 );
+			add_filter('the_content', array($this, 'venue_location'), 110);
+			add_filter('the_excerpt', array($this, 'venue_location'), 110);
 			// now load our template
-			$template = EEH_Template::locate_template( 'content-espresso_venues-details.php' );
+			$template = EEH_Template::locate_template('content-espresso_venues-details.php');
 			//now add our filter back in, plus some others
-			add_filter( 'the_excerpt', array( $this, 'venue_details' ), 100 );
-			add_filter( 'the_content', array( $this, 'venue_details' ), 100 );
+			add_filter('the_excerpt', array($this, 'venue_details'), 100);
+			add_filter('the_content', array($this, 'venue_details'), 100);
 			// remove other filters we added so they won't get applied to the next post
-			remove_filter( 'the_content', array( $this, 'venue_location' ), 110 );
-			remove_filter( 'the_excerpt', array( $this, 'venue_location' ), 110 );
+			remove_filter('the_content', array($this, 'venue_location'), 110);
+			remove_filter('the_excerpt', array($this, 'venue_location'), 110);
 			// we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
 		}
-		return ! empty( $template ) ? $template : $content;
+		return ! empty($template) ? $template : $content;
 	}
 
 
@@ -147,8 +147,8 @@ 
 	 * @param  string $content
 	 * @return string
 	 */
-	public function venue_location( $content ) {
-		return $content . EEH_Template::locate_template( 'content-espresso_venues-location.php' );
+	public function venue_location($content) {
+		return $content.EEH_Template::locate_template('content-espresso_venues-location.php');
 	}
 
 
@@ -162,14 +162,14 @@ 
 	 */
 	public function wp_enqueue_scripts() {
 		// get some style
-		if ( apply_filters( 'FHEE_enable_default_espresso_css', TRUE ) && is_archive() ) {
+		if (apply_filters('FHEE_enable_default_espresso_css', TRUE) && is_archive()) {
 			// first check theme folder
-			if ( is_readable( get_stylesheet_directory() . $this->theme . DS . 'style.css' )) {
-				wp_register_style( $this->theme, get_stylesheet_directory_uri() . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
-			} else if ( is_readable( EE_TEMPLATES . $this->theme . DS . 'style.css' )) {
-				wp_register_style( $this->theme, EE_TEMPLATES_URL . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
+			if (is_readable(get_stylesheet_directory().$this->theme.DS.'style.css')) {
+				wp_register_style($this->theme, get_stylesheet_directory_uri().$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
+			} else if (is_readable(EE_TEMPLATES.$this->theme.DS.'style.css')) {
+				wp_register_style($this->theme, EE_TEMPLATES_URL.$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
 			}
-			wp_enqueue_style( $this->theme );
+			wp_enqueue_style($this->theme);
 		}
 	}
 

admin_pages/registrations/form_sections/EE_Registration_Custom_Questions_Form.form.php

Spacing +37 added lines, -37 removed lines

@@ -13,11 +13,11 @@ 
  * @since		 	   4.8.30.rc.009
  *
  */
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
-class EE_Registration_Custom_Questions_Form extends EE_Form_Section_Proper{
+class EE_Registration_Custom_Questions_Form extends EE_Form_Section_Proper {
 	/**
 	 *
 	 * @var EE_Registration
@@ -29,16 +29,16 @@ 
 	 * @param EE_Registration $reg
 	 * @param array $options
 	 */
-	public function __construct( EE_Registration $reg, $options = array() ) {
+	public function __construct(EE_Registration $reg, $options = array()) {
 		$this->_registration = $reg;
-		if( ! isset( $options[ 'layout_strategy' ] ) ) {
-			$options[ 'layout_strategy' ] = new EE_Admin_Two_Column_Layout();
+		if ( ! isset($options['layout_strategy'])) {
+			$options['layout_strategy'] = new EE_Admin_Two_Column_Layout();
 		}
-		if( ! isset( $options[ 'html_id' ] ) ) {
-			$options[ 'html_id' ] = 'reg-admin-attendee-questions-frm';
+		if ( ! isset($options['html_id'])) {
+			$options['html_id'] = 'reg-admin-attendee-questions-frm';
 		}
 		$this->build_form_from_registration();
-		parent::__construct( $options );
+		parent::__construct($options);
 	}
 
 
@@ -52,8 +52,8 @@ 
 
 	public function build_form_from_registration() {
 		$reg = $this->get_registration();
-		if( ! $reg instanceof EE_Registration ) {
-			throw new EE_Error( __( 'We cannot build the registration custom questions form because there is no registration set on it yet', 'event_espresso') );
+		if ( ! $reg instanceof EE_Registration) {
+			throw new EE_Error(__('We cannot build the registration custom questions form because there is no registration set on it yet', 'event_espresso'));
 		}
 		//we want to get all their question groups
 		$question_groups = EEM_Question_Group::instance()->get_all(
@@ -63,16 +63,16 @@ 
 					'Event_Question_Group.EQG_primary' => $reg->count() == 1 ? TRUE : FALSE,
 					'OR' => array(
 						'Question.QST_system*blank' =>  '',
-						'Question.QST_system*null' => array( 'IS_NULL' ) 
+						'Question.QST_system*null' => array('IS_NULL') 
 					)
 				),
-				'order_by' => array( 'QSG_order' => 'ASC' )
+				'order_by' => array('QSG_order' => 'ASC')
 			)
 		);
 		//get each question groups questions
-		foreach( $question_groups as $question_group ) {
-			if ( $question_group instanceof EE_Question_Group ) {
-				$this->_subsections[ $question_group->ID() ] = $this->build_subform_from_question_group(
+		foreach ($question_groups as $question_group) {
+			if ($question_group instanceof EE_Question_Group) {
+				$this->_subsections[$question_group->ID()] = $this->build_subform_from_question_group(
 					$question_group,
 					$reg
 				);
@@ -89,16 +89,16 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	public function build_subform_from_question_group( $question_group, $registration ) {
-		if( ! $question_group instanceof EE_Question_Group ||
+	public function build_subform_from_question_group($question_group, $registration) {
+		if ( ! $question_group instanceof EE_Question_Group ||
 			! $registration instanceof EE_Registration) {
-			throw new EE_Error( __( 'A valid question group and registration must be passed to EE_Registration_Custom_Question_Form', 'event_espresso' ) );
+			throw new EE_Error(__('A valid question group and registration must be passed to EE_Registration_Custom_Question_Form', 'event_espresso'));
 		}
 		$parts_of_subsection = array(
 			'title' => new EE_Form_Section_HTML(
-					EEH_HTML::h5( $question_group->name(),
+					EEH_HTML::h5($question_group->name(),
 					$question_group->identifier(),
-					'espresso-question-group-title-h5 section-title' )
+					'espresso-question-group-title-h5 section-title')
 				)
 		);
 		$questions = $question_group->questions( 
@@ -106,17 +106,17 @@ 
 				array( 
 					'OR' => array(
 						'QST_system*blank' => '',
-						'QST_system*null' => array( 'IS_NULL' )
+						'QST_system*null' => array('IS_NULL')
 					)
 				)
 			)
 		);
-		foreach( $questions as $question ) {
-			$parts_of_subsection[ $question->ID() ] = $question->generate_form_input( $registration );
+		foreach ($questions as $question) {
+			$parts_of_subsection[$question->ID()] = $question->generate_form_input($registration);
 		}
-		$parts_of_subsection[ 'edit_link' ] = new EE_Form_Section_HTML(
-				'<tr><th/><td class="reg-admin-edit-attendee-question-td"><a class="reg-admin-edit-attendee-question-lnk" href="#" title="' . esc_attr__( 'click to edit question', 'event_espresso' ) . '">
-					<span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __( 'edit the above question group', 'event_espresso' ) . '</span>
+		$parts_of_subsection['edit_link'] = new EE_Form_Section_HTML(
+				'<tr><th/><td class="reg-admin-edit-attendee-question-td"><a class="reg-admin-edit-attendee-question-lnk" href="#" title="'.esc_attr__('click to edit question', 'event_espresso').'">
+					<span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __('edit the above question group', 'event_espresso').'</span>
 					<div class="dashicons dashicons-edit"></div>
 				</a></td></tr>'
 			);
@@ -136,12 +136,12 @@ 
 	protected function _normalize($req_data) {
 		$this->_received_submission = TRUE;
 		$this->_validation_errors = array();
-		foreach($this->get_validatable_subsections() as $subsection){
-			if( $subsection->form_data_present_in( $req_data ) ) {
-				try{
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			if ($subsection->form_data_present_in($req_data)) {
+				try {
 					$subsection->_normalize($req_data);
-				}catch( EE_Validation_Error $e ){
-					$subsection->add_validation_error( $e );
+				} catch (EE_Validation_Error $e) {
+					$subsection->add_validation_error($e);
 				}
 			}
 		}
@@ -156,13 +156,13 @@ 
 	 * calling parent::_validate() first.
 	 */
 	protected function _validate() {
-		foreach($this->get_validatable_subsections() as $subsection_name => $subsection){
-			if( $subsection->form_data_present_in( array_merge( $_GET, $_POST ) ) ) {
-				if(method_exists($this,'_validate_'.$subsection_name)){
-					call_user_func_array(array($this,'_validate_'.$subsection_name), array($subsection));
+		foreach ($this->get_validatable_subsections() as $subsection_name => $subsection) {
+			if ($subsection->form_data_present_in(array_merge($_GET, $_POST))) {
+				if (method_exists($this, '_validate_'.$subsection_name)) {
+					call_user_func_array(array($this, '_validate_'.$subsection_name), array($subsection));
 				}
 				$subsection->_validate();
-			} elseif( $subsection instanceof EE_Form_Section_Proper ) {
+			} elseif ($subsection instanceof EE_Form_Section_Proper) {
 				$subsection->_received_submission = true;
 			}
 		}

core/db_classes/EE_Export.class.php

Spacing +170 added lines, -170 removed lines

@@ -1,5 +1,5 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 /**
  * EE_Export class
  * 
@@ -39,11 +39,11 @@ 
 	  * @access private
 	  * @param array $request_data
 	  */
- 	private function __construct( $request_data = array() ) {
+ 	private function __construct($request_data = array()) {
 		$this->_req_data = $request_data;
-		$this->today = date("Y-m-d",time());
-		require_once( EE_CLASSES . 'EE_CSV.class.php' );
-		$this->EE_CSV= EE_CSV::instance();
+		$this->today = date("Y-m-d", time());
+		require_once(EE_CLASSES.'EE_CSV.class.php');
+		$this->EE_CSV = EE_CSV::instance();
 	}
 
 
@@ -55,10 +55,10 @@ 
 	  * @param array $request_data
 	  * @return \EE_Export
 	  */
-	public static function instance( $request_data = array() ) {
+	public static function instance($request_data = array()) {
 		// check if class object is instantiated
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Export )) {
-			self::$_instance = new self( $request_data );
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Export)) {
+			self::$_instance = new self($request_data);
 		}
 		return self::$_instance;
 	}
@@ -72,15 +72,15 @@ 
 	public function export() {
 
 		// in case of bulk exports, the "actual" action will be in action2, but first check regular action for "export" keyword
-		if ( isset( $this->_req_data['action'] ) && strpos( $this->_req_data['action'], 'export' ) === FALSE ) {
+		if (isset($this->_req_data['action']) && strpos($this->_req_data['action'], 'export') === FALSE) {
 			// check if action2 has export action
-			if ( isset( $this->_req_data['action2'] ) && strpos( $this->_req_data['action2'], 'export' ) !== FALSE ) {
+			if (isset($this->_req_data['action2']) && strpos($this->_req_data['action2'], 'export') !== FALSE) {
 				// whoop! there it is!
 				$this->_req_data['action'] = $this->_req_data['action2'];
 			}
 		}
 
-		$this->_req_data['export'] = isset( $this->_req_data['export'] ) ? $this->_req_data['export'] : '';
+		$this->_req_data['export'] = isset($this->_req_data['export']) ? $this->_req_data['export'] : '';
 
 		switch ($this->_req_data['export']) {
 			case 'report':
@@ -94,7 +94,7 @@ 
 					break;
 
 					case 'registrations_report_for_event':
-						$this->report_registrations_for_event( $this->_req_data['EVT_ID'] );
+						$this->report_registrations_for_event($this->_req_data['EVT_ID']);
 					break;
 
 					case 'attendees':
@@ -106,7 +106,7 @@ 
 					break;
 
 					default:
-						EE_Error::add_error(__('An error occurred! The requested export report could not be found.','event_espresso'), __FILE__, __FUNCTION__, __LINE__ ) ;
+						EE_Error::add_error(__('An error occurred! The requested export report could not be found.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 						return FALSE;
 					break;
 
@@ -124,7 +124,7 @@ 
 	 * Downloads a CSV file with all the columns, but no data. This should be used for importing
 	 * @return null kills execution
 	 */
-	function export_sample(){
+	function export_sample() {
 		$event = EEM_Event::instance()->get_one();
 		$this->_req_data['EVT_ID'] = $event->ID();
 		$this->export_all_event_data();
@@ -150,23 +150,23 @@ 
 		$state_country_query_params = array();
 		$question_group_query_params = array();
 		$question_query_params = array();
-		if ( isset( $this->_req_data['EVT_ID'] )) {
+		if (isset($this->_req_data['EVT_ID'])) {
 			// do we have an array of IDs ?
 
-			if ( is_array( $this->_req_data['EVT_ID'] )) {
-				$EVT_IDs =  array_map( 'sanitize_text_field', $this->_req_data['EVT_ID'] );
-				$value_to_equal = array('IN',$EVT_IDs);
+			if (is_array($this->_req_data['EVT_ID'])) {
+				$EVT_IDs = array_map('sanitize_text_field', $this->_req_data['EVT_ID']);
+				$value_to_equal = array('IN', $EVT_IDs);
 				$filename = 'events';
 			} else {
 				// generate regular where = clause
-				$EVT_ID = absint( $this->_req_data['EVT_ID'] );
+				$EVT_ID = absint($this->_req_data['EVT_ID']);
 				$value_to_equal = $EVT_ID;
 				$event = EE_Registry::instance()->load_model('Event')->get_one_by_ID($EVT_ID);
 
-				$filename = 'event-' . ( $event instanceof EE_Event ? $event->slug() : __( 'unknown', 'event_espresso' ) );
+				$filename = 'event-'.($event instanceof EE_Event ? $event->slug() : __('unknown', 'event_espresso'));
 
 			}
-			$event_query_params[0]['EVT_ID'] =$value_to_equal;
+			$event_query_params[0]['EVT_ID'] = $value_to_equal;
 			$related_models_query_params[0]['Event.EVT_ID'] = $value_to_equal;
 			$related_through_reg_query_params[0]['Registration.EVT_ID'] = $value_to_equal;
 			$datetime_ticket_query_params[0]['Datetime.EVT_ID'] = $value_to_equal;
@@ -210,42 +210,42 @@ 
 
 			);
 
-		$model_data = $this->_get_export_data_for_models( $models_to_export );
+		$model_data = $this->_get_export_data_for_models($models_to_export);
 
-		$filename = $this->generate_filename ( $filename );
+		$filename = $this->generate_filename($filename);
 
-		if ( ! $this->EE_CSV->export_multiple_model_data_to_csv( $filename, $model_data )) {
-			EE_Error::add_error(__("'An error occurred and the Event details could not be exported from the database.'", "event_espresso"), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $this->EE_CSV->export_multiple_model_data_to_csv($filename, $model_data)) {
+			EE_Error::add_error(__("'An error occurred and the Event details could not be exported from the database.'", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
-	function report_attendees(){
+	function report_attendees() {
 		$attendee_rows = EEM_Attendee::instance()->get_all_wpdb_results( 
 			array( 
-				'force_join' => array( 'State', 'Country' ), 
+				'force_join' => array('State', 'Country'), 
 				'caps' => EEM_Base::caps_read_admin 
 			) 
 		);
 		$csv_data = array();
-		foreach( $attendee_rows as $attendee_row ){
+		foreach ($attendee_rows as $attendee_row) {
 			$csv_row = array();
-			foreach( EEM_Attendee::instance()->field_settings() as $field_name => $field_obj ){
-				if( $field_name == 'STA_ID' ){
-					$state_name_field = EEM_State::instance()->field_settings_for( 'STA_name' );
-					$csv_row[ __( 'State', 'event_espresso' ) ] = $attendee_row[ $state_name_field->get_qualified_column() ];
-				}elseif( $field_name == 'CNT_ISO' ){
-					$country_name_field = EEM_Country::instance()->field_settings_for( 'CNT_name' );
-					$csv_row[ __( 'Country', 'event_espresso' ) ] = $attendee_row[ $country_name_field->get_qualified_column() ];
-				}else{
-					$csv_row[ $field_obj->get_nicename() ] = $attendee_row[ $field_obj->get_qualified_column() ];
+			foreach (EEM_Attendee::instance()->field_settings() as $field_name => $field_obj) {
+				if ($field_name == 'STA_ID') {
+					$state_name_field = EEM_State::instance()->field_settings_for('STA_name');
+					$csv_row[__('State', 'event_espresso')] = $attendee_row[$state_name_field->get_qualified_column()];
+				}elseif ($field_name == 'CNT_ISO') {
+					$country_name_field = EEM_Country::instance()->field_settings_for('CNT_name');
+					$csv_row[__('Country', 'event_espresso')] = $attendee_row[$country_name_field->get_qualified_column()];
+				} else {
+					$csv_row[$field_obj->get_nicename()] = $attendee_row[$field_obj->get_qualified_column()];
 				}
 			}
 			$csv_data[] = $csv_row;
 		}
 
-		$filename = $this->generate_filename ( 'contact-list-report' );
+		$filename = $this->generate_filename('contact-list-report');
 
-		$handle = $this->EE_CSV->begin_sending_csv( $filename);
+		$handle = $this->EE_CSV->begin_sending_csv($filename);
 		$this->EE_CSV->write_data_array_to_csv($handle, $csv_data);
 		$this->EE_CSV->end_sending_csv($handle);
 	}
@@ -262,18 +262,18 @@ 
 		$countries_that_have_an_attendee = EEM_Country::instance()->get_all(array(0=>array('Attendee.ATT_ID'=>array('IS NOT NULL'))));
 //		$states_to_export_query_params
 		$models_to_export = array(
-			'Country'=>array(array('CNT_ISO'=>array('IN',array_keys($countries_that_have_an_attendee)))),
-			'State'=>array(array('STA_ID'=>array('IN',array_keys($states_that_have_an_attendee)))),
+			'Country'=>array(array('CNT_ISO'=>array('IN', array_keys($countries_that_have_an_attendee)))),
+			'State'=>array(array('STA_ID'=>array('IN', array_keys($states_that_have_an_attendee)))),
 			'Attendee'=>array(),
 		);
 
 
 
-		$model_data = $this->_get_export_data_for_models( $models_to_export );
-		$filename = $this->generate_filename ( 'all-attendees' );
+		$model_data = $this->_get_export_data_for_models($models_to_export);
+		$filename = $this->generate_filename('all-attendees');
 
-		if ( ! $this->EE_CSV->export_multiple_model_data_to_csv( $filename, $model_data )) {
-			EE_Error::add_error(__('An error occurred and the Attendee data could not be exported from the database.','event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $this->EE_CSV->export_multiple_model_data_to_csv($filename, $model_data)) {
+			EE_Error::add_error(__('An error occurred and the Attendee data could not be exported from the database.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -285,19 +285,19 @@ 
 	 * @param boolean|string $pretty_schema true to display pretty, a string to use a specific "Schema", or false to NOT display pretty
 	 * @return string
 	 */
-	protected function _prepare_value_from_db_for_display( $model, $field_name,  $raw_db_value, $pretty_schema = true ) {
-		$field_obj = $model->field_settings_for( $field_name );
-		$value_on_model_obj = $field_obj->prepare_for_set_from_db( $raw_db_value );
-		if( $field_obj instanceof EE_Datetime_Field ) {
-			$field_obj->set_date_format( EE_CSV::instance()->get_date_format_for_csv( $field_obj->get_date_format( $pretty_schema ) ), $pretty_schema );
-			$field_obj->set_time_format( EE_CSV::instance()->get_time_format_for_csv( $field_obj->get_time_format( $pretty_schema ) ), $pretty_schema );
+	protected function _prepare_value_from_db_for_display($model, $field_name, $raw_db_value, $pretty_schema = true) {
+		$field_obj = $model->field_settings_for($field_name);
+		$value_on_model_obj = $field_obj->prepare_for_set_from_db($raw_db_value);
+		if ($field_obj instanceof EE_Datetime_Field) {
+			$field_obj->set_date_format(EE_CSV::instance()->get_date_format_for_csv($field_obj->get_date_format($pretty_schema)), $pretty_schema);
+			$field_obj->set_time_format(EE_CSV::instance()->get_time_format_for_csv($field_obj->get_time_format($pretty_schema)), $pretty_schema);
 		}
-		if( $pretty_schema === true){
-			return $field_obj->prepare_for_pretty_echoing( $value_on_model_obj );
-		}elseif( is_string( $pretty_schema ) ) {
-			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj, $pretty_schema );
-		}else{
-			return $field_obj->prepare_for_get( $value_on_model_obj );
+		if ($pretty_schema === true) {
+			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj);
+		}elseif (is_string($pretty_schema)) {
+			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj, $pretty_schema);
+		} else {
+			return $field_obj->prepare_for_get($value_on_model_obj);
 		}
 	}
 
@@ -306,7 +306,7 @@ 
 	 * and the questions associated with the registrations
 	 * @param int $event_id
 	 */
-	function report_registrations_for_event( $event_id = NULL ){
+	function report_registrations_for_event($event_id = NULL) {
 		$reg_fields_to_include = array(
 				'TXN_ID',
 				'ATT_ID',
@@ -338,126 +338,126 @@ 
 				array(
 					'OR' => array(
 						//don't include registrations from failed or abandoned transactions...
-						'Transaction.STS_ID' => array( 'NOT IN', array( EEM_Transaction::failed_status_code, EEM_Transaction::abandoned_status_code ) ),
+						'Transaction.STS_ID' => array('NOT IN', array(EEM_Transaction::failed_status_code, EEM_Transaction::abandoned_status_code)),
 						//unless the registration is approved, in which case include it regardless of transaction status
 						'STS_ID' => EEM_Registration::status_id_approved
 						),
-					'Ticket.TKT_deleted' => array( 'IN', array( true, false ) )
+					'Ticket.TKT_deleted' => array('IN', array(true, false))
 					),
-				'order_by' => array('Transaction.TXN_ID'=>'asc','REG_count'=>'asc'),
-				'force_join' => array( 'Transaction', 'Ticket', 'Attendee' ),
+				'order_by' => array('Transaction.TXN_ID'=>'asc', 'REG_count'=>'asc'),
+				'force_join' => array('Transaction', 'Ticket', 'Attendee'),
 				'caps' => EEM_Base::caps_read_admin
 			),
 			$event_id
 		);
-		if( $event_id ){
-			$query_params[0]['EVT_ID'] =  $event_id;
-		}else{
-			$query_params[ 'force_join' ][] = 'Event';
+		if ($event_id) {
+			$query_params[0]['EVT_ID'] = $event_id;
+		} else {
+			$query_params['force_join'][] = 'Event';
 		}
-		$registration_rows = $reg_model->get_all_wpdb_results( $query_params );
+		$registration_rows = $reg_model->get_all_wpdb_results($query_params);
 		//get all questions which relate to someone in this group
 		$registration_ids = array();
-		foreach( $registration_rows as $reg_row ) {
-			$registration_ids[] = intval( $reg_row[ 'Registration.REG_ID'] );
+		foreach ($registration_rows as $reg_row) {
+			$registration_ids[] = intval($reg_row['Registration.REG_ID']);
 		}
 //		EEM_Question::instance()->show_next_x_db_queries();
-		$questions_for_these_regs_rows = EEM_Question::instance()->get_all_wpdb_results(array(array('Answer.REG_ID'=>array('IN',$registration_ids))));
-		foreach($registration_rows as $reg_row){
-			if ( is_array( $reg_row ) ) {
+		$questions_for_these_regs_rows = EEM_Question::instance()->get_all_wpdb_results(array(array('Answer.REG_ID'=>array('IN', $registration_ids))));
+		foreach ($registration_rows as $reg_row) {
+			if (is_array($reg_row)) {
 				$reg_csv_array = array();
-				if( ! $event_id ){
+				if ( ! $event_id) {
 					//get the event's name and Id
-					$reg_csv_array[ __( 'Event', 'event_espresso' ) ] = sprintf( __( '%1$s (%2$s)', 'event_espresso' ), $this->_prepare_value_from_db_for_display( EEM_Event::instance(), 'EVT_name', $reg_row[ 'Event_CPT.post_title'] ), $reg_row[ 'Event_CPT.ID' ] );
+					$reg_csv_array[__('Event', 'event_espresso')] = sprintf(__('%1$s (%2$s)', 'event_espresso'), $this->_prepare_value_from_db_for_display(EEM_Event::instance(), 'EVT_name', $reg_row['Event_CPT.post_title']), $reg_row['Event_CPT.ID']);
 				}
-				$is_primary_reg = $reg_row[ 'Registration.REG_count' ] == '1' ? true : false;
+				$is_primary_reg = $reg_row['Registration.REG_count'] == '1' ? true : false;
 				/*@var $reg_row EE_Registration */
-				foreach($reg_fields_to_include as $field_name){
+				foreach ($reg_fields_to_include as $field_name) {
 					$field = $reg_model->field_settings_for($field_name);
-					if($field_name == 'REG_final_price'){
-						$value = $this->_prepare_value_from_db_for_display( $reg_model, $field_name, $reg_row[ 'Registration.REG_final_price'], 'localized_float' );
-					}elseif( $field_name == 'REG_count' ){
-						$value = sprintf( __( '%s of %s', 'event_espresso' ), $this->_prepare_value_from_db_for_display( $reg_model, 'REG_count', $reg_row['Registration.REG_count'] ), $this->_prepare_value_from_db_for_display( $reg_model, 'REG_group_size', $reg_row['Registration.REG_group_size' ] ) );
-					}elseif( $field_name == 'REG_date' ) {
-						$value = $this->_prepare_value_from_db_for_display( $reg_model, $field_name, $reg_row[ 'Registration.REG_date'], 'no_html' );
-					}else{
-						$value = $this->_prepare_value_from_db_for_display( $reg_model, $field_name, $reg_row[ $field->get_qualified_column() ] );
+					if ($field_name == 'REG_final_price') {
+						$value = $this->_prepare_value_from_db_for_display($reg_model, $field_name, $reg_row['Registration.REG_final_price'], 'localized_float');
+					}elseif ($field_name == 'REG_count') {
+						$value = sprintf(__('%s of %s', 'event_espresso'), $this->_prepare_value_from_db_for_display($reg_model, 'REG_count', $reg_row['Registration.REG_count']), $this->_prepare_value_from_db_for_display($reg_model, 'REG_group_size', $reg_row['Registration.REG_group_size']));
+					}elseif ($field_name == 'REG_date') {
+						$value = $this->_prepare_value_from_db_for_display($reg_model, $field_name, $reg_row['Registration.REG_date'], 'no_html');
+					} else {
+						$value = $this->_prepare_value_from_db_for_display($reg_model, $field_name, $reg_row[$field->get_qualified_column()]);
 					}
 					$reg_csv_array[$this->_get_column_name_for_field($field)] = $value;
-					if($field_name == 'REG_final_price'){
+					if ($field_name == 'REG_final_price') {
 						//add a column named Currency after the final price
 						$reg_csv_array[__("Currency", "event_espresso")] = EE_Config::instance()->currency->code;
 					}
 				}
 				//get pretty status
-				$stati = EEM_Status::instance()->localized_status( array(
-					$reg_row[ 'Registration.STS_ID' ] => __( 'unknown', 'event_espresso' ),
-					$reg_row[ 'TransactionTable.STS_ID' ] => __( 'unknown', 'event_espresso' ) ),
+				$stati = EEM_Status::instance()->localized_status(array(
+					$reg_row['Registration.STS_ID'] => __('unknown', 'event_espresso'),
+					$reg_row['TransactionTable.STS_ID'] => __('unknown', 'event_espresso') ),
 						FALSE,
-						'sentence' );
-				$reg_csv_array[__("Registration Status", 'event_espresso')] = $stati[ $reg_row[ 'Registration.STS_ID' ] ];
+						'sentence');
+				$reg_csv_array[__("Registration Status", 'event_espresso')] = $stati[$reg_row['Registration.STS_ID']];
 				//get pretty trnasaction status
-				$reg_csv_array[__("Transaction Status", 'event_espresso')] = $stati[ $reg_row[ 'TransactionTable.STS_ID' ] ];
-				$reg_csv_array[ __( 'Transaction Amount Due', 'event_espresso' ) ] = $is_primary_reg ? $this->_prepare_value_from_db_for_display( EEM_Transaction::instance(), 'TXN_total', $reg_row[ 'TransactionTable.TXN_total' ], 'localized_float' ) : '0.00';
-				$reg_csv_array[ __( 'Amount Paid', 'event_espresso' )] = $is_primary_reg ? $this->_prepare_value_from_db_for_display( EEM_Transaction::instance(), 'TXN_paid', $reg_row[ 'TransactionTable.TXN_paid' ], 'localized_float' ) : '0.00';
+				$reg_csv_array[__("Transaction Status", 'event_espresso')] = $stati[$reg_row['TransactionTable.STS_ID']];
+				$reg_csv_array[__('Transaction Amount Due', 'event_espresso')] = $is_primary_reg ? $this->_prepare_value_from_db_for_display(EEM_Transaction::instance(), 'TXN_total', $reg_row['TransactionTable.TXN_total'], 'localized_float') : '0.00';
+				$reg_csv_array[__('Amount Paid', 'event_espresso')] = $is_primary_reg ? $this->_prepare_value_from_db_for_display(EEM_Transaction::instance(), 'TXN_paid', $reg_row['TransactionTable.TXN_paid'], 'localized_float') : '0.00';
 				$payment_methods = array();
 				$gateway_txn_ids_etc = array();
 				$payment_times = array();
-				if( $is_primary_reg && $reg_row[ 'TransactionTable.TXN_ID' ] ){
+				if ($is_primary_reg && $reg_row['TransactionTable.TXN_ID']) {
 					$payments_info = EEM_Payment::instance()->get_all_wpdb_results(
 							array(
 								array(
-									'TXN_ID' => $reg_row[ 'TransactionTable.TXN_ID' ],
+									'TXN_ID' => $reg_row['TransactionTable.TXN_ID'],
 									'STS_ID' => EEM_Payment::status_id_approved
 								),
-								'force_join' => array( 'Payment_Method' ),
+								'force_join' => array('Payment_Method'),
 
 							),
 							ARRAY_A,
 							'Payment_Method.PMD_admin_name as name, Payment.PAY_txn_id_chq_nmbr as gateway_txn_id, Payment.PAY_timestamp as payment_time' );
 
-					foreach( $payments_info as $payment_method_and_gateway_txn_id ){
-						$payment_methods[] = isset( $payment_method_and_gateway_txn_id[ 'name' ] ) ? $payment_method_and_gateway_txn_id[ 'name' ] : __( 'Unknown', 'event_espresso' );
-						$gateway_txn_ids_etc[] = isset( $payment_method_and_gateway_txn_id[ 'gateway_txn_id' ] ) ? $payment_method_and_gateway_txn_id[ 'gateway_txn_id' ] : '';
-						$payment_times[] = isset( $payment_method_and_gateway_txn_id[ 'payment_time' ] ) ? $payment_method_and_gateway_txn_id[ 'payment_time' ] : '';
+					foreach ($payments_info as $payment_method_and_gateway_txn_id) {
+						$payment_methods[] = isset($payment_method_and_gateway_txn_id['name']) ? $payment_method_and_gateway_txn_id['name'] : __('Unknown', 'event_espresso');
+						$gateway_txn_ids_etc[] = isset($payment_method_and_gateway_txn_id['gateway_txn_id']) ? $payment_method_and_gateway_txn_id['gateway_txn_id'] : '';
+						$payment_times[] = isset($payment_method_and_gateway_txn_id['payment_time']) ? $payment_method_and_gateway_txn_id['payment_time'] : '';
 					}
 
 				}
-				$reg_csv_array[ __( 'Payment Date(s)', 'event_espresso' ) ] = implode( ',', $payment_times );
-				$reg_csv_array[ __( 'Payment Method(s)', 'event_espresso' ) ] = implode( ",", $payment_methods );
-				$reg_csv_array[ __( 'Gateway Transaction ID(s)', 'event_espresso' )] = implode( ',', $gateway_txn_ids_etc );
+				$reg_csv_array[__('Payment Date(s)', 'event_espresso')] = implode(',', $payment_times);
+				$reg_csv_array[__('Payment Method(s)', 'event_espresso')] = implode(",", $payment_methods);
+				$reg_csv_array[__('Gateway Transaction ID(s)', 'event_espresso')] = implode(',', $gateway_txn_ids_etc);
 
 				//get whether or not the user has checked in
-				$reg_csv_array[__("Check-Ins", "event_espresso")] = $reg_model->count_related( $reg_row[ 'Registration.REG_ID'] , 'Checkin' );
+				$reg_csv_array[__("Check-Ins", "event_espresso")] = $reg_model->count_related($reg_row['Registration.REG_ID'], 'Checkin');
 				//get ticket of registration and its price
 				$ticket_model = EE_Registry::instance()->load_model('Ticket');
-				if( $reg_row[ 'Ticket.TKT_ID'] ) {
-					$ticket_name = $this->_prepare_value_from_db_for_display( $ticket_model, 'TKT_name', $reg_row[ 'Ticket.TKT_name' ] );
+				if ($reg_row['Ticket.TKT_ID']) {
+					$ticket_name = $this->_prepare_value_from_db_for_display($ticket_model, 'TKT_name', $reg_row['Ticket.TKT_name']);
 					$datetimes_strings = array();
-					foreach( EEM_Datetime::instance()->get_all_wpdb_results( array( array( 'Ticket.TKT_ID' => $reg_row[ 'Ticket.TKT_ID' ] ), 'order_by' => array( 'DTT_EVT_start' => 'ASC' ), 'default_where_conditions' => 'none' ) ) as $datetime){
-						$datetimes_strings[] = $this->_prepare_value_from_db_for_display( EEM_Datetime::instance(), 'DTT_EVT_start', $datetime[ 'Datetime.DTT_EVT_start'] );
+					foreach (EEM_Datetime::instance()->get_all_wpdb_results(array(array('Ticket.TKT_ID' => $reg_row['Ticket.TKT_ID']), 'order_by' => array('DTT_EVT_start' => 'ASC'), 'default_where_conditions' => 'none')) as $datetime) {
+						$datetimes_strings[] = $this->_prepare_value_from_db_for_display(EEM_Datetime::instance(), 'DTT_EVT_start', $datetime['Datetime.DTT_EVT_start']);
 					}
 
 				} else {
-					$ticket_name = __( 'Unknown', 'event_espresso' );
-					$datetimes_strings = array( __( 'Unknown', 'event_espresso' ) );
+					$ticket_name = __('Unknown', 'event_espresso');
+					$datetimes_strings = array(__('Unknown', 'event_espresso'));
 				}
 				$reg_csv_array[$ticket_model->field_settings_for('TKT_name')->get_nicename()] = $ticket_name;
 				$reg_csv_array[__("Datetimes of Ticket", "event_espresso")] = implode(", ", $datetimes_strings);
 				//get datetime(s) of registration
 
 				//add attendee columns
-				foreach($att_fields_to_include as $att_field_name){
+				foreach ($att_fields_to_include as $att_field_name) {
 					$field_obj = EEM_Attendee::instance()->field_settings_for($att_field_name);
-					if( $reg_row[ 'Attendee_CPT.ID' ]){
-						if($att_field_name == 'STA_ID'){
-							$value = EEM_State::instance()->get_var( array( array( 'STA_ID' => $reg_row[ 'Attendee_Meta.STA_ID' ] ) ), 'STA_name' );
-						}elseif($att_field_name == 'CNT_ISO'){
-							$value = EEM_Country::instance()->get_var( array( array( 'CNT_ISO' => $reg_row[ 'Attendee_Meta.CNT_ISO' ] ) ), 'CNT_name' );
-						}else{
-							$value = $this->_prepare_value_from_db_for_display( EEM_Attendee::instance(), $att_field_name, $reg_row[ $field_obj->get_qualified_column() ] );
+					if ($reg_row['Attendee_CPT.ID']) {
+						if ($att_field_name == 'STA_ID') {
+							$value = EEM_State::instance()->get_var(array(array('STA_ID' => $reg_row['Attendee_Meta.STA_ID'])), 'STA_name');
+						}elseif ($att_field_name == 'CNT_ISO') {
+							$value = EEM_Country::instance()->get_var(array(array('CNT_ISO' => $reg_row['Attendee_Meta.CNT_ISO'])), 'CNT_name');
+						} else {
+							$value = $this->_prepare_value_from_db_for_display(EEM_Attendee::instance(), $att_field_name, $reg_row[$field_obj->get_qualified_column()]);
 						}
-					}else{
+					} else {
 						$value = '';
 					}
 
@@ -465,56 +465,56 @@ 
 				}
 
 				//make sure each registration has the same questions in the same order
-				foreach($questions_for_these_regs_rows as $question_row){
-					if( ! isset($reg_csv_array[$question_row[ 'Question.QST_admin_label']])){
-						$reg_csv_array[$question_row[ 'Question.QST_admin_label' ] ] = null;
+				foreach ($questions_for_these_regs_rows as $question_row) {
+					if ( ! isset($reg_csv_array[$question_row['Question.QST_admin_label']])) {
+						$reg_csv_array[$question_row['Question.QST_admin_label']] = null;
 					}
 				}
 				//now fill out the questions THEY answered
-				foreach( EEM_Answer::instance()->get_all_wpdb_results( array( array( 'REG_ID' => $reg_row[ 'Registration.REG_ID' ] ), 'force_join' => array( 'Question' ) ) ) as $answer_row){
+				foreach (EEM_Answer::instance()->get_all_wpdb_results(array(array('REG_ID' => $reg_row['Registration.REG_ID']), 'force_join' => array('Question'))) as $answer_row) {
 					/* @var $answer EE_Answer */
-					if( $answer_row[ 'Question.QST_ID' ] ){
-						$question_label = $this->_prepare_value_from_db_for_display( EEM_Question::instance(), 'QST_admin_label', $answer_row[ 'Question.QST_admin_label' ] );
-					}else{
-						$question_label = sprintf( __( 'Question $s', 'event_espresso' ), $answer_row[ 'Answer.QST_ID' ] );
+					if ($answer_row['Question.QST_ID']) {
+						$question_label = $this->_prepare_value_from_db_for_display(EEM_Question::instance(), 'QST_admin_label', $answer_row['Question.QST_admin_label']);
+					} else {
+						$question_label = sprintf(__('Question $s', 'event_espresso'), $answer_row['Answer.QST_ID']);
 					}
-                                        if( isset( $answer_row[ 'Question.QST_type'] ) && $answer_row[ 'Question.QST_type' ] == EEM_Question::QST_type_state ) {
-                                            $reg_csv_array[ $question_label ] = EEM_State::instance()->get_state_name_by_ID( $answer_row[ 'Answer.ANS_value' ] );
+                                        if (isset($answer_row['Question.QST_type']) && $answer_row['Question.QST_type'] == EEM_Question::QST_type_state) {
+                                            $reg_csv_array[$question_label] = EEM_State::instance()->get_state_name_by_ID($answer_row['Answer.ANS_value']);
                                         } else {
-                                            $reg_csv_array[ $question_label ] = $this->_prepare_value_from_db_for_display( EEM_Answer::instance(), 'ANS_value', $answer_row[ 'Answer.ANS_value' ] );
+                                            $reg_csv_array[$question_label] = $this->_prepare_value_from_db_for_display(EEM_Answer::instance(), 'ANS_value', $answer_row['Answer.ANS_value']);
                                         }
 				}
-				$registrations_csv_ready_array[] = apply_filters( 'FHEE__EE_Export__report_registrations__reg_csv_array', $reg_csv_array, $reg_row );
+				$registrations_csv_ready_array[] = apply_filters('FHEE__EE_Export__report_registrations__reg_csv_array', $reg_csv_array, $reg_row);
 			}
 		}
 
 		//if we couldn't export anything, we want to at least show the column headers
-		if(empty($registrations_csv_ready_array)){
+		if (empty($registrations_csv_ready_array)) {
 			$reg_csv_array = array();
 			$model_and_fields_to_include = array(
 				'Registration' => $reg_fields_to_include,
 				'Attendee' => $att_fields_to_include
 			);
-			foreach($model_and_fields_to_include as $model_name => $field_list){
+			foreach ($model_and_fields_to_include as $model_name => $field_list) {
 				$model = EE_Registry::instance()->load_model($model_name);
-				foreach($field_list as $field_name){
+				foreach ($field_list as $field_name) {
 					$field = $model->field_settings_for($field_name);
-					$reg_csv_array[$this->_get_column_name_for_field($field)] = null;//$registration->get($field->get_name());
+					$reg_csv_array[$this->_get_column_name_for_field($field)] = null; //$registration->get($field->get_name());
 				}
 			}
 			$registrations_csv_ready_array [] = $reg_csv_array;
 		}
-		if( $event_id ){
-			$event_slug =  EEM_Event::instance()->get_var( array( array( 'EVT_ID' => $event_id ) ), 'EVT_slug' );
-			if( ! $event_slug ) {
-				$event_slug = __( 'unknown', 'event_espresso' );
+		if ($event_id) {
+			$event_slug = EEM_Event::instance()->get_var(array(array('EVT_ID' => $event_id)), 'EVT_slug');
+			if ( ! $event_slug) {
+				$event_slug = __('unknown', 'event_espresso');
 			}
-		}else{
-			$event_slug = __( 'all', 'event_espresso' );
+		} else {
+			$event_slug = __('all', 'event_espresso');
 		}
-		$filename = sprintf( "registrations-for-%s", $event_slug );
+		$filename = sprintf("registrations-for-%s", $event_slug);
 
-		$handle = $this->EE_CSV->begin_sending_csv( $filename);
+		$handle = $this->EE_CSV->begin_sending_csv($filename);
 		$this->EE_CSV->write_data_array_to_csv($handle, $registrations_csv_ready_array);
 		$this->EE_CSV->end_sending_csv($handle);
 	}
@@ -524,7 +524,7 @@ 
 	 * @param EE_Model_Field_Base $field
 	 * @return string
 	 */
-	protected function _get_column_name_for_field(EE_Model_Field_Base $field){
+	protected function _get_column_name_for_field(EE_Model_Field_Base $field) {
 		return $field->get_nicename()."[".$field->get_name()."]";
 	}
 
@@ -537,17 +537,17 @@ 
 	function export_categories() {
 		// are any Event IDs set?
 		$query_params = array();
-		if ( isset( $this->_req_data['EVT_CAT_ID'] )) {
+		if (isset($this->_req_data['EVT_CAT_ID'])) {
 			// do we have an array of IDs ?
-			if ( is_array( $this->_req_data['EVT_CAT_ID'] )) {
+			if (is_array($this->_req_data['EVT_CAT_ID'])) {
 				// generate an "IN (CSV)" where clause
-				$EVT_CAT_IDs = array_map( 'sanitize_text_field', $this->_req_data['EVT_CAT_ID'] );
+				$EVT_CAT_IDs = array_map('sanitize_text_field', $this->_req_data['EVT_CAT_ID']);
 				$filename = 'event-categories';
-				$query_params[0]['term_taxonomy_id'] = array('IN',$EVT_CAT_IDs);
+				$query_params[0]['term_taxonomy_id'] = array('IN', $EVT_CAT_IDs);
 			} else {
 				// generate regular where = clause
-				$EVT_CAT_ID = absint( $this->_req_data['EVT_CAT_ID'] );
-				$filename = 'event-category#' . $EVT_CAT_ID;
+				$EVT_CAT_ID = absint($this->_req_data['EVT_CAT_ID']);
+				$filename = 'event-category#'.$EVT_CAT_ID;
 				$query_params[0]['term_taxonomy_id'] = $EVT_CAT_ID;
 			}
 		} else {
@@ -559,11 +559,11 @@ 
 				'Term_Taxonomy' => $query_params
 			);
 
-		$table_data = $this->_get_export_data_for_models( $tables_to_export );
-		$filename = $this->generate_filename ( $filename );
+		$table_data = $this->_get_export_data_for_models($tables_to_export);
+		$filename = $this->generate_filename($filename);
 
-		if ( ! $this->EE_CSV->export_multiple_model_data_to_csv( $filename, $table_data )) {
-			EE_Error::add_error(__('An error occurred and the Category details could not be exported from the database.','event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $this->EE_CSV->export_multiple_model_data_to_csv($filename, $table_data)) {
+			EE_Error::add_error(__('An error occurred and the Category details could not be exported from the database.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -574,13 +574,13 @@ 
 	 *		  @param string - export_name
 	 *			@return string on success, FALSE on fail
 	 */
-	private function generate_filename ( $export_name = '' ) {
-		if ( $export_name != '' ) {
-			$filename = get_bloginfo('name') . '-' . $export_name;
-			$filename = sanitize_key( $filename ) . '-' . $this->today;
+	private function generate_filename($export_name = '') {
+		if ($export_name != '') {
+			$filename = get_bloginfo('name').'-'.$export_name;
+			$filename = sanitize_key($filename).'-'.$this->today;
 			return $filename;
-		}	 else {
-			EE_Error::add_error(__("No filename was provided", "event_espresso"), __FILE__, __FUNCTION__, __LINE__ );
+		} else {
+			EE_Error::add_error(__("No filename was provided", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return false;
 	}
@@ -593,12 +593,12 @@ 
 	 *	@param array $models_to_export keys are model names (eg 'Event', 'Attendee', etc.) and values are arrays of query params like on EEM_Base::get_all
 	 *	@return array on success, FALSE on fail
 	 */
-	private function _get_export_data_for_models( $models_to_export = array() ) {
+	private function _get_export_data_for_models($models_to_export = array()) {
 		$table_data = FALSE;
-		if ( is_array( $models_to_export ) ) {
-			foreach ( $models_to_export as $model_name => $query_params ) {
+		if (is_array($models_to_export)) {
+			foreach ($models_to_export as $model_name => $query_params) {
 				//check for a numerically-indexed array. in that case, $model_name is the value!!
-				if(is_int($model_name)){
+				if (is_int($model_name)) {
 					$model_name = $query_params;
 					$query_params = array();
 				}
@@ -606,17 +606,17 @@ 
 				$model_objects = $model->get_all($query_params);
 
 				$table_data[$model_name] = array();
-				foreach($model_objects as $model_object){
+				foreach ($model_objects as $model_object) {
 					$model_data_array = array();
 					$fields = $model->field_settings();
-					foreach($fields as $field){
+					foreach ($fields as $field) {
 						$column_name = $field->get_nicename()."[".$field->get_name()."]";
-						if($field instanceof EE_Datetime_Field){
+						if ($field instanceof EE_Datetime_Field) {
 //							$field->set_date_format('Y-m-d');
 //							$field->set_time_format('H:i:s');
-							$model_data_array[$column_name] = $model_object->get_datetime($field->get_name(),'Y-m-d','H:i:s');
+							$model_data_array[$column_name] = $model_object->get_datetime($field->get_name(), 'Y-m-d', 'H:i:s');
 						}
-						else{
+						else {
 							$model_data_array[$column_name] = $model_object->get($field->get_name());
 						}
 					}

caffeinated/payment_methods/Aim/help_tabs/payment_methods_overview_aim.help_tab.php

Spacing +5 added lines, -5 removed lines

@@ -3,7 +3,7 @@ 
 <?php _e('Adjust the settings for the Authorize.net AIM payment gateway.', 'event_espresso'); ?>
 </p>
 <p>
-<?php printf( __( 'See %1$shere%2$s for list of currencies supported by Authorize.net AIM.', 'event_espresso' ), "<a href='http://www.authorize.net/international/'  target='_blank'>","</a>" ); ?>
+<?php printf(__('See %1$shere%2$s for list of currencies supported by Authorize.net AIM.', 'event_espresso'), "<a href='http://www.authorize.net/international/'  target='_blank'>", "</a>"); ?>
 </p>
 <p><strong><?php _e('Authorize.net AIM Settings', 'event_espresso'); ?></strong></p>
 <ul>
@@ -28,16 +28,16 @@ 
 <?php _e('By logging into Authorize.net, you can change which payment fields are required by Authorize.net when processing payments. These settings affect both the Advanced Integration Method (AIM, this) and the Simple Integration Method (SIM, different). The payment method settings "Excluded Payment Form Fields" and "Required Payment Form Fields" allow you to change the billing form in Event Espresso to reflect your payment form settings in Authorize.net.', 'event_espresso'); ?>
 <br>
 <?php printf( 
-		__( 'To change your payment form settings in Authorize.net, %1$slog in to authorize.net%2$s, go to %3$sAccount then Payment Form%2$s, then %4$sForm Fields%2$s. It will look similar to %5$sthis%2$s. If you make a field required in Authorize.net, you should also make it required in Event Espresso. If it isn\'t required in Authorize.net, and you want to simplify the billing form in Event Espresso, you can exclude it from the Event Espresso Form too.'),
+		__('To change your payment form settings in Authorize.net, %1$slog in to authorize.net%2$s, go to %3$sAccount then Payment Form%2$s, then %4$sForm Fields%2$s. It will look similar to %5$sthis%2$s. If you make a field required in Authorize.net, you should also make it required in Event Espresso. If it isn\'t required in Authorize.net, and you want to simplify the billing form in Event Espresso, you can exclude it from the Event Espresso Form too.'),
 		'<a href="http://authorize.net" target="_blank">',
 		'</a>',
 		'<a href="https://monosnap.com/file/nebVteOkEXcdDIos88SojStWOifP23" target="_blank">',
 		'<a href="https://monosnap.com/file/WyxGJtev87TcDmdGBEZ2oi1xaBIQAm" target="_blank">',
-		'<a href="https://monosnap.com/image/DbCJNfEesWXeSNUs1wLIpGYODFw52m" target="_blank">');?>
+		'<a href="https://monosnap.com/image/DbCJNfEesWXeSNUs1wLIpGYODFw52m" target="_blank">'); ?>
 </li>
 <li>
-	<strong><?php _e( 'Server', 'event_espresso');?></strong>
-	<?php _e( 'Use this setting to change the server where Authorize.net AIM requests are sent. Change this to "Authorize.net/Akamai" before June 30th 2016 to verify your server wil work with Authorize.net\'s servers which will be in use after that date.', 'event_espresso' );?>
+	<strong><?php _e('Server', 'event_espresso'); ?></strong>
+	<?php _e('Use this setting to change the server where Authorize.net AIM requests are sent. Change this to "Authorize.net/Akamai" before June 30th 2016 to verify your server wil work with Authorize.net\'s servers which will be in use after that date.', 'event_espresso'); ?>
 </li>
 <li>
 <strong><?php _e('Button Image URL', 'event_espresso'); ?></strong><br />

core/CPTs/EE_CPT_Strategy.core.php

Spacing +105 added lines, -105 removed lines

@@ -78,7 +78,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_CPT_Strategy ) {
+		if ( ! self::$_instance instanceof EE_CPT_Strategy) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -101,7 +101,7 @@ 
 //		d( $this->_CPT_endpoints );
 //		d( $this->_CPT_taxonomies );
 
-		add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ), 5 );
+		add_action('pre_get_posts', array($this, 'pre_get_posts'), 5);
 	}
 
 
@@ -114,9 +114,9 @@ 
 	 */
 	private function _set_CPT_endpoints() {
 		$_CPT_endpoints = array();
-		if ( is_array( $this->_CPTs )) {
-			foreach ( $this->_CPTs as $CPT_type => $CPT ) {
-				$_CPT_endpoints [ $CPT['plural_slug'] ] = $CPT_type;
+		if (is_array($this->_CPTs)) {
+			foreach ($this->_CPTs as $CPT_type => $CPT) {
+				$_CPT_endpoints [$CPT['plural_slug']] = $CPT_type;
 			}
 		}
 		return $_CPT_endpoints;
@@ -131,7 +131,7 @@ 
 	 * @param WP_Query $WP_Query
 	 * @return void
 	 */
-	private function _set_EE_tags_on_WP_Query( WP_Query $WP_Query) {
+	private function _set_EE_tags_on_WP_Query(WP_Query $WP_Query) {
 		$WP_Query->is_espresso_event_single = FALSE;
 		$WP_Query->is_espresso_event_archive = FALSE;
 		$WP_Query->is_espresso_event_taxonomy = FALSE;
@@ -158,16 +158,16 @@ 
 	 */
 	private function _set_CPT_taxonomies() {
 		// check if taxonomies have already been set
-		if ( empty( $this->_CPT_taxonomies )) {
+		if (empty($this->_CPT_taxonomies)) {
 			// and that this CPT has taxonomies registered for it
-			if ( isset( $this->CPT['args'] ) && isset( $this->CPT['args']['taxonomies'] )) {
+			if (isset($this->CPT['args']) && isset($this->CPT['args']['taxonomies'])) {
 				// if so then grab them, but we want the taxonomy name as the key
-				$taxonomies = array_flip( $this->CPT['args']['taxonomies'] );
+				$taxonomies = array_flip($this->CPT['args']['taxonomies']);
 				// then grab the list of ALL taxonomies
 				$all_taxonomies = EE_Register_CPTs::get_taxonomies();
-				foreach ( $taxonomies as $taxonomy => $details ) {
+				foreach ($taxonomies as $taxonomy => $details) {
 					// add details to our taxonomies if they exist
-					$taxonomies[ $taxonomy ] = isset( $all_taxonomies[ $taxonomy ] ) ? $all_taxonomies[ $taxonomy ] : NULL;
+					$taxonomies[$taxonomy] = isset($all_taxonomies[$taxonomy]) ? $all_taxonomies[$taxonomy] : NULL;
 				}
 				$this->_CPT_taxonomies = $taxonomies;
 			}
@@ -192,11 +192,11 @@ 
 	 * @return void
 	 */
 	private function _set_CPT_terms() {
-		if ( empty( $this->_CPT_terms )) {
+		if (empty($this->_CPT_terms)) {
 			$terms = EEM_Term::instance()->get_all_CPT_post_tags();
-			foreach ( $terms as $term ) {
-				if ( $term instanceof EE_Term ) {
-					$this->_CPT_terms[ $term->slug() ] = $term;
+			foreach ($terms as $term) {
+				if ($term instanceof EE_Term) {
+					$this->_CPT_terms[$term->slug()] = $term;
 				}
 			}
 		}
@@ -211,24 +211,24 @@ 
 	 * @param $WP_Query
 	 * @return void
 	 */
-	private function _set_post_type_for_terms( WP_Query $WP_Query ) {
+	private function _set_post_type_for_terms(WP_Query $WP_Query) {
 		// is a tag set ?
-		if ( isset( $WP_Query->query['tag'] )) {
+		if (isset($WP_Query->query['tag'])) {
 			// set post_tags
 			$this->_set_CPT_terms();
 			// is this tag archive term in the list of terms used by our CPTs ?
-			$term = isset ( $this->_CPT_terms[ $WP_Query->query['tag'] ] ) ? $this->_CPT_terms[ $WP_Query->query['tag'] ] : NULL;
+			$term = isset ($this->_CPT_terms[$WP_Query->query['tag']]) ? $this->_CPT_terms[$WP_Query->query['tag']] : NULL;
 			// verify the term
-			if ( $term instanceof EE_Term ) {
-				$term->post_type  = array_merge( array( 'post', 'page' ), (array)$term->post_type );
-				$term->post_type = apply_filters( 'FHEE__EE_CPT_Strategy___set_post_type_for_terms__term_post_type', $term->post_type, $term );
+			if ($term instanceof EE_Term) {
+				$term->post_type = array_merge(array('post', 'page'), (array) $term->post_type);
+				$term->post_type = apply_filters('FHEE__EE_CPT_Strategy___set_post_type_for_terms__term_post_type', $term->post_type, $term);
 				// if a post type is already set
-				if ( isset( $WP_Query->query_vars['post_type'] )) {
+				if (isset($WP_Query->query_vars['post_type'])) {
 						// add to existing array
-						$term->post_type = array_merge ( (array)$WP_Query->query_vars['post_type'], $term->post_type );
+						$term->post_type = array_merge((array) $WP_Query->query_vars['post_type'], $term->post_type);
 				}
 				// just set post_type to our CPT
-				$WP_Query->set( 'post_type', $term->post_type );
+				$WP_Query->set('post_type', $term->post_type);
 			}
 		}
 	}
@@ -243,17 +243,17 @@ 
 	 * in order for is_archive() and is_single() methods to work properly.
 	 * @return void
 	 */
-	public function _possibly_set_ee_request_var(){
+	public function _possibly_set_ee_request_var() {
 		// check if ee action var has been set
-		if ( ! EE_Registry::instance()->REQ->is_set( 'ee' )) {
+		if ( ! EE_Registry::instance()->REQ->is_set('ee')) {
 			// check that route exists for CPT archive slug
-			if ( is_archive() && EE_Config::get_route( $this->CPT['plural_slug'] )) {
+			if (is_archive() && EE_Config::get_route($this->CPT['plural_slug'])) {
 				// ie: set "ee" to "events"
-				EE_Registry::instance()->REQ->set( 'ee', $this->CPT['plural_slug'] );
+				EE_Registry::instance()->REQ->set('ee', $this->CPT['plural_slug']);
 			// or does it match a single page CPT like /event/
-			} else if ( is_single() && EE_Config::get_route( $this->CPT['singular_slug'] )) {
+			} else if (is_single() && EE_Config::get_route($this->CPT['singular_slug'])) {
 				// ie: set "ee" to "event"
-				EE_Registry::instance()->REQ->set( 'ee', $this->CPT['singular_slug'] );
+				EE_Registry::instance()->REQ->set('ee', $this->CPT['singular_slug']);
 			}
 		}
 	}
@@ -267,11 +267,11 @@ 
 	 * @param WP_Query $WP_Query
 	 * @return void
 	 */
-	public function _set_paging( $WP_Query ) {
-		if ( $WP_Query->is_main_query() && apply_filters( 'FHEE__EE_CPT_Strategy___set_paging', TRUE )) {
-			$page = ( get_query_var('page') ) ? get_query_var('page') : NULL;
-			$paged = ( get_query_var('paged') ) ? get_query_var('paged') : $page;
-			$WP_Query->set( 'paged', $paged );
+	public function _set_paging($WP_Query) {
+		if ($WP_Query->is_main_query() && apply_filters('FHEE__EE_CPT_Strategy___set_paging', TRUE)) {
+			$page = (get_query_var('page')) ? get_query_var('page') : NULL;
+			$paged = (get_query_var('paged')) ? get_query_var('paged') : $page;
+			$WP_Query->set('paged', $paged);
 		}
 	}
 
@@ -288,35 +288,35 @@ 
 	 * @param WP_Query $WP_Query
 	 * @return void
 	 */
-	public function pre_get_posts( $WP_Query ) {
+	public function pre_get_posts($WP_Query) {
 		// check that post-type is set
-		if ( ! $WP_Query instanceof WP_Query ) {
+		if ( ! $WP_Query instanceof WP_Query) {
 			return;
 		}
 
 		// add our conditionals
-		$this->_set_EE_tags_on_WP_Query( $WP_Query );
+		$this->_set_EE_tags_on_WP_Query($WP_Query);
 		// check for terms
-		$this->_set_post_type_for_terms( $WP_Query );
+		$this->_set_post_type_for_terms($WP_Query);
 		// make sure paging is always set
-		$this->_set_paging( $WP_Query );
+		$this->_set_paging($WP_Query);
 
 		// is a taxonomy set ?
-		if ( $WP_Query->is_tax ) {
+		if ($WP_Query->is_tax) {
 			// loop thru our taxonomies
-			foreach ( $this->_CPT_taxonomies as $CPT_taxonomy => $CPT_taxonomy_details ) {
+			foreach ($this->_CPT_taxonomies as $CPT_taxonomy => $CPT_taxonomy_details) {
 				// check if one of our taxonomies is set as a query var
-				if ( isset( $WP_Query->query[ $CPT_taxonomy ] )) {
+				if (isset($WP_Query->query[$CPT_taxonomy])) {
 					// but which CPT does that correspond to??? hmmm... guess we gotta go looping
-					foreach ( $this->_CPTs as $post_type => $CPT ) {
+					foreach ($this->_CPTs as $post_type => $CPT) {
 						// verify our CPT has args, is public and has taxonomies set
-						if ( isset( $CPT['args'] ) && $CPT['args']['public'] && ! empty( $CPT['args']['taxonomies'] )) {
+						if (isset($CPT['args']) && $CPT['args']['public'] && ! empty($CPT['args']['taxonomies'])) {
 							// does the captured taxonomy belong to this CPT ?
-							if ( in_array( $CPT_taxonomy, $CPT['args']['taxonomies'] )) {
+							if (in_array($CPT_taxonomy, $CPT['args']['taxonomies'])) {
 								// if so, then add this CPT post_type to the current query's array of post_types'
-								$WP_Query->query_vars['post_type'] = isset( $WP_Query->query_vars['post_type'] ) ? (array)$WP_Query->query_vars['post_type'] : array();
+								$WP_Query->query_vars['post_type'] = isset($WP_Query->query_vars['post_type']) ? (array) $WP_Query->query_vars['post_type'] : array();
 								$WP_Query->query_vars['post_type'][] = $post_type;
-								switch( $post_type ) {
+								switch ($post_type) {
 									case 'espresso_events' :
 										$WP_Query->is_espresso_event_taxonomy = TRUE;
 										break;
@@ -337,27 +337,27 @@ 
 //		d( $CPT_taxonomy );
 //		d( $WP_Query );
 
-		if ( isset( $WP_Query->query_vars['post_type'] )) {
+		if (isset($WP_Query->query_vars['post_type'])) {
 			// loop thru post_types as array
-			foreach ( (array)$WP_Query->query_vars['post_type'] as $post_type ) {
+			foreach ((array) $WP_Query->query_vars['post_type'] as $post_type) {
 
 				// is current query for an EE CPT ?
-				if ( isset( $this->_CPTs[ $post_type ] )) {
+				if (isset($this->_CPTs[$post_type])) {
 					// is EE on or off ?
-					if ( EE_Maintenance_Mode::instance()->level() ) {
+					if (EE_Maintenance_Mode::instance()->level()) {
 						// reroute CPT template view to maintenance_mode.template.php
-						if( ! has_filter( 'template_include',array( 'EE_Maintenance_Mode', 'template_include' ))){
-							add_filter( 'template_include', array( 'EE_Maintenance_Mode', 'template_include' ), 99999 );
+						if ( ! has_filter('template_include', array('EE_Maintenance_Mode', 'template_include'))) {
+							add_filter('template_include', array('EE_Maintenance_Mode', 'template_include'), 99999);
 						}
-						if( has_filter( 'the_content',array( EE_Maintenance_Mode::instance(), 'the_content' ) ) ) {
-							add_filter( 'the_content', array( $this, 'inject_EE_shortcode_placeholder' ), 1 );
+						if (has_filter('the_content', array(EE_Maintenance_Mode::instance(), 'the_content'))) {
+							add_filter('the_content', array($this, 'inject_EE_shortcode_placeholder'), 1);
 						}
 						return;
 					}
 					// load EE_Request_Handler (this was added as a result of https://events.codebasehq.com/projects/event-espresso/tickets/9037
-					EE_Registry::instance()->load_core( 'Request_Handler' );
+					EE_Registry::instance()->load_core('Request_Handler');
 					// grab details for the CPT the current query is for
-					$this->CPT = $this->_CPTs[ $post_type ];
+					$this->CPT = $this->_CPTs[$post_type];
 					// set post type
 					$this->CPT['post_type'] = $post_type;
 					// set taxonomies
@@ -365,27 +365,27 @@ 
 					// the post or category or term that is triggering EE
 					$this->CPT['espresso_page'] = EE_Registry::instance()->REQ->is_espresso_page();
 					// requested post name
-					$this->CPT['post_name'] = EE_Registry::instance()->REQ->get( 'post_name' );
+					$this->CPT['post_name'] = EE_Registry::instance()->REQ->get('post_name');
 					//d( $this->CPT );
 					// add support for viewing 'private', 'draft', or 'pending' posts
-					if ( is_user_logged_in() && isset( $WP_Query->query_vars['p'] ) && $WP_Query->query_vars['p'] != 0 && current_user_can( 'edit_post', $WP_Query->query_vars['p'] )) {
+					if (is_user_logged_in() && isset($WP_Query->query_vars['p']) && $WP_Query->query_vars['p'] != 0 && current_user_can('edit_post', $WP_Query->query_vars['p'])) {
 						// we can just inject directly into the WP_Query object
-						$WP_Query->query['post_status'] = array( 'publish', 'private', 'draft', 'pending' );
+						$WP_Query->query['post_status'] = array('publish', 'private', 'draft', 'pending');
 						// now set the main 'ee' request var so that the appropriate module can load the appropriate template(s)
-						EE_Registry::instance()->REQ->set( 'ee', $this->CPT['singular_slug'] );
+						EE_Registry::instance()->REQ->set('ee', $this->CPT['singular_slug']);
 					}
 					$this->_possibly_set_ee_request_var();
 					// convert post_type to model name
-					$model_name = str_replace( 'EE_', '', $this->CPT['class_name'] );
+					$model_name = str_replace('EE_', '', $this->CPT['class_name']);
 					// get CPT table data via CPT Model
-					$this->CPT_model = EE_Registry::instance()->load_model( $model_name );
+					$this->CPT_model = EE_Registry::instance()->load_model($model_name);
 					$this->CPT['tables'] = $this->CPT_model->get_tables();
 					// is there a Meta Table for this CPT?
-					$this->CPT['meta_table'] = isset( $this->CPT['tables'][ $model_name . '_Meta' ] ) ? $this->CPT['tables'][ $model_name . '_Meta' ] : FALSE;
+					$this->CPT['meta_table'] = isset($this->CPT['tables'][$model_name.'_Meta']) ? $this->CPT['tables'][$model_name.'_Meta'] : FALSE;
 					// creates classname like:  CPT_Event_Strategy
-					$CPT_Strategy_class_name = 'CPT_' . $model_name . '_Strategy';
+					$CPT_Strategy_class_name = 'CPT_'.$model_name.'_Strategy';
 					// load and instantiate
-					 $CPT_Strategy = EE_Registry::instance()->load_core ( $CPT_Strategy_class_name, array( 'WP_Query' => $WP_Query, 'CPT' => $this->CPT ));
+					 $CPT_Strategy = EE_Registry::instance()->load_core($CPT_Strategy_class_name, array('WP_Query' => $WP_Query, 'CPT' => $this->CPT));
 
 					// !!!!!!!!!!  IMPORTANT !!!!!!!!!!!!
 					// here's the list of available filters in the WP_Query object
@@ -397,13 +397,13 @@ 
 					// 'post_limits'
 					// 'posts_fields'
 					// 'posts_join'
-					add_filter( 'posts_fields', array( $this, 'posts_fields' ));
-					add_filter( 'posts_join',	array( $this, 'posts_join' ));
-					add_filter( 'get_' . $this->CPT['post_type'] . '_metadata', array( $CPT_Strategy, 'get_EE_post_type_metadata' ), 1, 4 );
-					add_filter( 'the_posts',	array( $this, 'the_posts' ), 1, 1 );
-					add_filter( 'get_edit_post_link', array( $this, 'get_edit_post_link' ), 10, 2 );
+					add_filter('posts_fields', array($this, 'posts_fields'));
+					add_filter('posts_join', array($this, 'posts_join'));
+					add_filter('get_'.$this->CPT['post_type'].'_metadata', array($CPT_Strategy, 'get_EE_post_type_metadata'), 1, 4);
+					add_filter('the_posts', array($this, 'the_posts'), 1, 1);
+					add_filter('get_edit_post_link', array($this, 'get_edit_post_link'), 10, 2);
 
-					$this->_do_template_filters( $WP_Query );
+					$this->_do_template_filters($WP_Query);
 				}
 			}
 		}
@@ -418,13 +418,13 @@ 
 	 * @param $SQL
 	 * @return    string
 	 */
-	public function posts_fields( $SQL ) {
+	public function posts_fields($SQL) {
 		// does this CPT have a meta table ?
-		if ( ! empty( $this->CPT['meta_table'] )) {
+		if ( ! empty($this->CPT['meta_table'])) {
 			// adds something like ", wp_esp_event_meta.* " to WP Query SELECT statement
-			$SQL .= ', ' . $this->CPT['meta_table']->get_table_name() . '.* ' ;
+			$SQL .= ', '.$this->CPT['meta_table']->get_table_name().'.* ';
 		}
-		remove_filter( 'posts_fields', array( $this, 'posts_fields' ));
+		remove_filter('posts_fields', array($this, 'posts_fields'));
 		return $SQL;
 	}
 
@@ -452,14 +452,14 @@ 
 	 * @param $SQL
 	 * @return    string
 	 */
-	public function posts_join( $SQL ) {
+	public function posts_join($SQL) {
 		// does this CPT have a meta table ?
-		if ( ! empty( $this->CPT['meta_table'] )) {
+		if ( ! empty($this->CPT['meta_table'])) {
 			global $wpdb;
 			// adds something like " LEFT JOIN wp_esp_event_meta ON ( wp_esp_event_meta.EVT_ID = wp_posts.ID ) " to WP Query JOIN statement
-			$SQL .= ' LEFT JOIN ' . $this->CPT['meta_table']->get_table_name() . ' ON ( ' . $this->CPT['meta_table']->get_table_name() . '.' . $this->CPT['meta_table']->get_fk_on_table() . ' = ' . $wpdb->posts . '.ID ) ';
+			$SQL .= ' LEFT JOIN '.$this->CPT['meta_table']->get_table_name().' ON ( '.$this->CPT['meta_table']->get_table_name().'.'.$this->CPT['meta_table']->get_fk_on_table().' = '.$wpdb->posts.'.ID ) ';
 		}
-		remove_filter( 'posts_join',	array( $this, 'posts_join' ));
+		remove_filter('posts_join', array($this, 'posts_join'));
 		return $SQL;
 	}
 
@@ -472,18 +472,18 @@ 
 	 * @param 	\WP_Post[] 	$posts
 	 * @return 	\WP_Post[]
 	 */
-	public function the_posts( $posts ) {
+	public function the_posts($posts) {
 //		d( $posts );
 		$CPT_class = $this->CPT['class_name'];
 		// loop thru posts
-		if ( is_array( $posts )) {
-			foreach( $posts as $key => $post ) {
-				if ( isset( $this->_CPTs[ $post->post_type ] )) {
-					$post->{$CPT_class} = $this->CPT_model->instantiate_class_from_post_object( $post );
+		if (is_array($posts)) {
+			foreach ($posts as $key => $post) {
+				if (isset($this->_CPTs[$post->post_type])) {
+					$post->{$CPT_class} = $this->CPT_model->instantiate_class_from_post_object($post);
 				}
 			}
 		}
-		remove_filter( 'the_posts',	array( $this, 'the_posts' ), 1 );
+		remove_filter('the_posts', array($this, 'the_posts'), 1);
 		return $posts;
 	}
 
@@ -494,17 +494,17 @@ 
 	 * @param $ID
 	 * @return string
 	 */
-	function get_edit_post_link( $url, $ID ) {
+	function get_edit_post_link($url, $ID) {
 		//need to make sure we only edit links if our cpt
 		global $post;
-		if ( ! isset( $this->_CPTs[ $post->post_type ] )) {
+		if ( ! isset($this->_CPTs[$post->post_type])) {
 			return $url;
 		}
 		//k made it here so all is good.
 		$scheme = is_ssl() ? 'https' : 'http';
-		$url = get_admin_url( EE_Config::instance()->core->current_blog_id, 'admin.php', $scheme );
+		$url = get_admin_url(EE_Config::instance()->core->current_blog_id, 'admin.php', $scheme);
 		// http://example.com/wp-admin/admin.php?page=espresso_events&action=edit&post=205&edit_nonce=0d403530d6
-		return wp_nonce_url( add_query_arg( array( 'page' => $post->post_type, 'post' =>$ID, 'action' =>'edit' ), $url ), 'edit', 'edit_nonce' );
+		return wp_nonce_url(add_query_arg(array('page' => $post->post_type, 'post' =>$ID, 'action' =>'edit'), $url), 'edit', 'edit_nonce');
 	}
 
 
@@ -518,11 +518,11 @@ 
 	 * @param WP_Query $WP_Query
 	 * @return void
 	 */
-	protected function _do_template_filters( WP_Query $WP_Query ) {
+	protected function _do_template_filters(WP_Query $WP_Query) {
 		// if it's the main query  and requested cpt supports page_templates,
-		if ( $WP_Query->is_main_query() && ! empty( $this->CPT['args']['page_templates'] ) ) {
+		if ($WP_Query->is_main_query() && ! empty($this->CPT['args']['page_templates'])) {
 			// then let's hook into the appropriate query_template hook
-			add_filter( 'single_template', array( $this, 'single_cpt_template' ) );
+			add_filter('single_template', array($this, 'single_cpt_template'));
 		}
 	}
 
@@ -536,17 +536,17 @@ 
 	 * @param string $current_template Existing default template path derived for this page call.
 	 * @return string the path to the full template file.
 	 */
-	public function single_cpt_template( $current_template ) {
+	public function single_cpt_template($current_template) {
 		$object = get_queried_object();
 		//does this called object HAVE a page template set that is something other than the default.
-		$template = get_post_meta( $object->ID, '_wp_page_template', true );
+		$template = get_post_meta($object->ID, '_wp_page_template', true);
 
 		//exit early if default or not set or invalid path (accounts for theme changes)
-		if ( $template == 'default' || empty( $template ) || ! is_readable( get_stylesheet_directory() . '/' . $template ) ) {
+		if ($template == 'default' || empty($template) || ! is_readable(get_stylesheet_directory().'/'.$template)) {
 			return $current_template;
 		}
 		//made it here so we SHOULD be able to just locate the template and then return it.
-		$template = locate_template( array($template)  );
+		$template = locate_template(array($template));
 
 		return $template;
 	}
@@ -594,9 +594,9 @@ 
 	 * @param 	array 	$arguments
 	 * @return 	\EE_CPT_Default_Strategy
 	 */
-	public function __construct( $arguments = array() ) {
-		$this->CPT = isset( $arguments['CPT'] ) ? $arguments['CPT'] : NULL;
-		$WP_Query = isset( $arguments['WP_Query'] ) ? $arguments['WP_Query'] : NULL;
+	public function __construct($arguments = array()) {
+		$this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : NULL;
+		$WP_Query = isset($arguments['WP_Query']) ? $arguments['WP_Query'] : NULL;
 		//EEH_Debug_Tools::printr( $this->CPT, '$this->CPT  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 //		add_filter( 'pre_get_posts', array( $this, 'pre_get_posts' ), 999 );
 //		add_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 );
@@ -611,9 +611,9 @@ 
 	 * @param 	\WP_Query $WP_Query
 	 * @return 	\WP_Query
 	 */
-	public function pre_get_posts(  WP_Query $WP_Query  ) {
+	public function pre_get_posts(WP_Query $WP_Query) {
 		//EEH_Debug_Tools::printr( $WP_Query, '$WP_Query  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive() ) {
+		if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
 			return $WP_Query;
 		}
 //		$WP_Query->set( 'post_type', array( $this->CPT['post_type'] ));
@@ -631,7 +631,7 @@ 
 	 * @param 	\WP_Query $WP_Query
 	 * @return 	\WP_Post[]
 	 */
-	public function the_posts(  $posts, WP_Query $WP_Query ) {
+	public function the_posts($posts, WP_Query $WP_Query) {
 		return $posts;
 	}
 
@@ -647,7 +647,7 @@ 
 	 * @param 	string 	$single
 	 * @return 	mixed
 	 */
-	public function get_EE_post_type_metadata( $meta_value = NULL, $post_id, $meta_key, $single ) {
+	public function get_EE_post_type_metadata($meta_value = NULL, $post_id, $meta_key, $single) {
 		return $meta_value;
 	}