eventespresso / event-espresso-core

core/db_classes/EE_Payment.class.php

Doc Comments +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
 	 * @param array $props_n_values  incoming values
 	 * @param string $timezone  incoming timezone (if not set the timezone set for the website will be
 	 *                          		used.)
-	 * @param array $date_formats  incoming date_formats in an array where the first value is the
+	 * @param string[] $date_formats  incoming date_formats in an array where the first value is the
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Payment
 	 */
@@ -290,7 +290,7 @@ 
 	/**
 	 *        get Payment Amount
 	 * @access        public
-	 * @return float
+	 * @return boolean
 	 */
 	public function amount() {
 		return $this->get( 'PAY_amount' );
@@ -368,7 +368,7 @@ 
 
 	/**
 	 * Gets redirect_url
-	 * @return string
+	 * @return boolean
 	 */
 	function redirect_url() {
 		return $this->get('PAY_redirect_url');
@@ -378,7 +378,7 @@ 
 
 	/**
 	 * Gets redirect_args
-	 * @return array
+	 * @return boolean
 	 */
 	function redirect_args() {
 		return $this->get('PAY_redirect_args');
@@ -515,7 +515,7 @@ 
 	/**
 	 * Gets all the extra meta info on this payment
 	 * @param array $query_params like EEM_Base::get_all
-	 * @return EE_Extra_Meta
+	 * @return EE_Base_Class[]
 	 */
 	public function extra_meta( $query_params = array() ) {
 		return $this->get_many_related( 'Extra_Meta', $query_params );

Spacing +102 added lines, -102 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -22,7 +22,7 @@ 
  * @subpackage            includes/classes/EE_Payment.class.php
  * @author                Brent Christensen
  */
-class EE_Payment extends EE_Base_Class implements EEI_Payment{
+class EE_Payment extends EE_Base_Class implements EEI_Payment {
 
 	/**
 	 *
@@ -33,9 +33,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Payment
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -46,8 +46,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Payment
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -58,8 +58,8 @@ 
 	 * @access        public
 	 * @param int $TXN_ID
 	 */
-	public function set_transaction_id( $TXN_ID = 0 ) {
-		$this->set( 'TXN_ID', $TXN_ID );
+	public function set_transaction_id($TXN_ID = 0) {
+		$this->set('TXN_ID', $TXN_ID);
 	}
 
 
@@ -69,7 +69,7 @@ 
 	 * @return EE_Transaction
 	 */
 	public function transaction() {
-		return $this->get_first_related( 'Transaction' );
+		return $this->get_first_related('Transaction');
 	}
 
 
@@ -80,8 +80,8 @@ 
 	 * @access        public
 	 * @param        string $STS_ID
 	 */
-	public function set_status( $STS_ID = '' ) {
-		$this->set( 'STS_ID', $STS_ID );
+	public function set_status($STS_ID = '') {
+		$this->set('STS_ID', $STS_ID);
 	}
 
 
@@ -92,8 +92,8 @@ 
 	 * @access        public
 	 * @param        int $timestamp
 	 */
-	public function set_timestamp( $timestamp = 0 ) {
-		$this->set( 'PAY_timestamp', $timestamp );
+	public function set_timestamp($timestamp = 0) {
+		$this->set('PAY_timestamp', $timestamp);
 	}
 
 
@@ -104,8 +104,8 @@ 
 	* 		@access		public
 	*		@param		string		$PAY_source
 	*/
-	public function set_source( $PAY_source = '' ) {
-		$this->set('PAY_source',$PAY_source);
+	public function set_source($PAY_source = '') {
+		$this->set('PAY_source', $PAY_source);
 	}
 
 
@@ -116,8 +116,8 @@ 
 	 * @access        public
 	 * @param float $amount
 	 */
-	public function set_amount( $amount = 0.00 ) {
-		$this->set( 'PAY_amount', $amount );
+	public function set_amount($amount = 0.00) {
+		$this->set('PAY_amount', $amount);
 	}
 
 
@@ -128,8 +128,8 @@ 
 	 * @access        public
 	 * @param        string $gateway_response
 	 */
-	public function set_gateway_response( $gateway_response = '' ) {
-		$this->set( 'PAY_gateway_response', $gateway_response );
+	public function set_gateway_response($gateway_response = '') {
+		$this->set('PAY_gateway_response', $gateway_response);
 	}
 	/**
 	 * Returns the name of the paymetn method used on this payment (previously known merely as 'gateway')
@@ -138,12 +138,12 @@ 
 	 * @deprecated
 	 * @return string
 	 */
-	public function gateway(){
-		EE_Error::doing_it_wrong('EE_Payment::gateway', __( 'The method EE_Payment::gateway() has been deprecated. Consider instead using EE_Payment::payment_method()->name()', 'event_espresso' ), '4.6.0' );
-		if( $this->payment_method() ){
+	public function gateway() {
+		EE_Error::doing_it_wrong('EE_Payment::gateway', __('The method EE_Payment::gateway() has been deprecated. Consider instead using EE_Payment::payment_method()->name()', 'event_espresso'), '4.6.0');
+		if ($this->payment_method()) {
 			return $this->payment_method()->name();
-		}else{
-			return __( 'Unknown', 'event_espresso' );
+		} else {
+			return __('Unknown', 'event_espresso');
 		}
 	}
 
@@ -155,8 +155,8 @@ 
 	 * @access        public
 	 * @param        string $txn_id_chq_nmbr
 	 */
-	public function set_txn_id_chq_nmbr( $txn_id_chq_nmbr = '' ) {
-		$this->set( 'PAY_txn_id_chq_nmbr', $txn_id_chq_nmbr );
+	public function set_txn_id_chq_nmbr($txn_id_chq_nmbr = '') {
+		$this->set('PAY_txn_id_chq_nmbr', $txn_id_chq_nmbr);
 	}
 
 
@@ -167,8 +167,8 @@ 
 	 * @access        public
 	 * @param        string $po_number
 	 */
-	public function set_po_number( $po_number = '' ) {
-		$this->set( 'PAY_po_number', $po_number );
+	public function set_po_number($po_number = '') {
+		$this->set('PAY_po_number', $po_number);
 	}
 
 
@@ -179,8 +179,8 @@ 
 	 * @access        public
 	 * @param        string $extra_accntng
 	 */
-	public function set_extra_accntng( $extra_accntng = '' ) {
-		$this->set( 'PAY_extra_accntng', $extra_accntng );
+	public function set_extra_accntng($extra_accntng = '') {
+		$this->set('PAY_extra_accntng', $extra_accntng);
 	}
 
 
@@ -191,10 +191,10 @@ 
 	 * @access        public
 	 * @param        bool $via_admin
 	 */
-	public function set_payment_made_via_admin( $via_admin = FALSE ) {
-		if($via_admin){
-			$this->set('PAY_source',  EEM_Payment_Method::scope_admin);
-		}else{
+	public function set_payment_made_via_admin($via_admin = FALSE) {
+		if ($via_admin) {
+			$this->set('PAY_source', EEM_Payment_Method::scope_admin);
+		} else {
 			$this->set('PAY_source', EEM_Payment_Method::scope_cart);
 		}
 
@@ -208,13 +208,13 @@ 
 	 * @access        public
 	 * @param        string $details
 	 */
-	public function set_details( $details = '' ) {
-		if ( is_array( $details ) ) {
-			array_walk_recursive( $details, array( $this, '_strip_all_tags_within_array' ));
+	public function set_details($details = '') {
+		if (is_array($details)) {
+			array_walk_recursive($details, array($this, '_strip_all_tags_within_array'));
 		} else {
-			$details = wp_strip_all_tags( $details );
+			$details = wp_strip_all_tags($details);
 		}
-		$this->set( 'PAY_details', $details );
+		$this->set('PAY_details', $details);
 	}
 
 	/**
@@ -240,7 +240,7 @@ 
 	 * @access        public
 	 */
 	public function TXN_ID() {
-		return $this->get( 'TXN_ID' );
+		return $this->get('TXN_ID');
 	}
 
 
@@ -271,8 +271,8 @@ 
 	 * @param null $date_or_time
 	 * @return string
 	 */
-	public function timestamp( $dt_frmt = '', $tm_frmt = '', $date_or_time = NULL ) {
-		return $this->get_datetime('PAY_timestamp', $dt_frmt, $tm_frmt, $date_or_time );
+	public function timestamp($dt_frmt = '', $tm_frmt = '', $date_or_time = NULL) {
+		return $this->get_datetime('PAY_timestamp', $dt_frmt, $tm_frmt, $date_or_time);
 	}
 
 
@@ -293,7 +293,7 @@ 
 	 * @return float
 	 */
 	public function amount() {
-		return $this->get( 'PAY_amount' );
+		return $this->get('PAY_amount');
 	}
 
 
@@ -302,7 +302,7 @@ 
 	 * @return mixed
 	 */
 	public function amount_no_code() {
-		return $this->get_pretty( 'PAY_amount', 'no_currency_code' );
+		return $this->get_pretty('PAY_amount', 'no_currency_code');
 	}
 
 
@@ -312,7 +312,7 @@ 
 	 * @access        public
 	 */
 	public function gateway_response() {
-		return $this->get( 'PAY_gateway_response' );
+		return $this->get('PAY_gateway_response');
 	}
 
 
@@ -322,7 +322,7 @@ 
 	 * @access        public
 	 */
 	public function txn_id_chq_nmbr() {
-		return $this->get( 'PAY_txn_id_chq_nmbr' );
+		return $this->get('PAY_txn_id_chq_nmbr');
 	}
 
 
@@ -332,7 +332,7 @@ 
 	 * @access        public
 	 */
 	public function po_number() {
-		return $this->get( 'PAY_po_number' );
+		return $this->get('PAY_po_number');
 	}
 
 
@@ -342,7 +342,7 @@ 
 	 * @access        public
 	 */
 	public function extra_accntng() {
-		return $this->get( 'PAY_extra_accntng' );
+		return $this->get('PAY_extra_accntng');
 	}
 
 
@@ -362,7 +362,7 @@ 
 	 * @access        public
 	 */
 	public function details() {
-		return $this->get( 'PAY_details' );
+		return $this->get('PAY_details');
 	}
 
 
@@ -391,8 +391,8 @@ 
 	 * @param bool $show_icons
 	 * @return void
 	 */
-	public function e_pretty_status( $show_icons = FALSE ) {
-		echo $this->pretty_status( $show_icons );
+	public function e_pretty_status($show_icons = FALSE) {
+		echo $this->pretty_status($show_icons);
 	}
 
 
@@ -402,10 +402,10 @@ 
 	 * @param bool $show_icons
 	 * @return string
 	 */
-	public function pretty_status( $show_icons = FALSE ) {
-		$status = EEM_Status::instance()->localized_status( array( $this->STS_ID() => __( 'unknown', 'event_espresso' ) ), FALSE, 'sentence' );
+	public function pretty_status($show_icons = FALSE) {
+		$status = EEM_Status::instance()->localized_status(array($this->STS_ID() => __('unknown', 'event_espresso')), FALSE, 'sentence');
 		$icon = '';
-		switch ( $this->STS_ID() ) {
+		switch ($this->STS_ID()) {
 			case EEM_Payment::status_id_approved:
 				$icon = $show_icons ? '<span class="dashicons dashicons-yes ee-icon-size-24 green-text"></span>' : '';
 				break;
@@ -419,7 +419,7 @@ 
 				$icon = $show_icons ? '<span class="dashicons dashicons-no ee-icon-size-16 red-text"></span>' : '';
 				break;
 		}
-		return $icon . $status[ $this->STS_ID() ];
+		return $icon.$status[$this->STS_ID()];
 	}
 
 
@@ -430,7 +430,7 @@ 
 	 * @return boolean whether the payment is approved or not
 	 */
 	public function is_approved() {
-		return $this->status_is( EEM_Payment::status_id_approved );
+		return $this->status_is(EEM_Payment::status_id_approved);
 	}
 
 
@@ -442,8 +442,8 @@ 
 	 *                       one of the status_id_* on the EEM_Payment model
 	 * @return boolean whether the status of this payment equals the status id
 	 */
-	protected function status_is( $STS_ID ) {
-		if ( $STS_ID == $this->STS_ID() ) {
+	protected function status_is($STS_ID) {
+		if ($STS_ID == $this->STS_ID()) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -457,7 +457,7 @@ 
 	 * @return boolean whether the payment is pending or not
 	 */
 	public function is_pending() {
-		return $this->status_is( EEM_Payment::status_id_pending );
+		return $this->status_is(EEM_Payment::status_id_pending);
 	}
 
 
@@ -467,7 +467,7 @@ 
 	 * @return boolean
 	 */
 	public function is_cancelled() {
-		return $this->status_is( EEM_Payment::status_id_cancelled );
+		return $this->status_is(EEM_Payment::status_id_cancelled);
 	}
 
 
@@ -477,7 +477,7 @@ 
 	 * @return boolean
 	 */
 	public function is_declined() {
-		return $this->status_is( EEM_Payment::status_id_declined );
+		return $this->status_is(EEM_Payment::status_id_declined);
 	}
 
 
@@ -487,7 +487,7 @@ 
 	 * @return boolean
 	 */
 	public function is_failed() {
-		return $this->status_is( EEM_Payment::status_id_failed );
+		return $this->status_is(EEM_Payment::status_id_failed);
 	}
 
 
@@ -507,7 +507,7 @@ 
 	 * @return EE_Status
 	 */
 	public function status_obj() {
-		return $this->get_first_related( 'Status' );
+		return $this->get_first_related('Status');
 	}
 
 
@@ -517,8 +517,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Extra_Meta
 	 */
-	public function extra_meta( $query_params = array() ) {
-		return $this->get_many_related( 'Extra_Meta', $query_params );
+	public function extra_meta($query_params = array()) {
+		return $this->get_many_related('Extra_Meta', $query_params);
 	}
 
 
@@ -529,7 +529,7 @@ 
 	 * offline ones, dont' create payments)
 	 * @return EE_Payment_Method
 	 */
-	function payment_method(){
+	function payment_method() {
 		return $this->get_first_related('Payment_Method');
 	}
 
@@ -546,12 +546,12 @@ 
 	 * @param string $inside_form_html
 	 * @return string html
 	 */
-	function redirect_form( $inside_form_html = NULL ) {
+	function redirect_form($inside_form_html = NULL) {
 		$redirect_url = $this->redirect_url();
-		if ( ! empty( $redirect_url )) {
+		if ( ! empty($redirect_url)) {
 			EE_Registry::instance()->load_helper('HTML');
 			// what ? no inner form content?
-			if( $inside_form_html === NULL ) {
+			if ($inside_form_html === NULL) {
 				$inside_form_html = EEH_HTML::p(
 					sprintf(
 						__('If you are not automatically redirected to the payment website within 10 seconds... %1$s %2$s Click Here %3$s', 'event_espresso'),
@@ -569,17 +569,17 @@ 
 			);
 			//if it's a GET request, we need to remove all the GET params in the querystring
 			//and put them into the form instead
-			if( $method == 'GET' ) {
-				$querystring = parse_url( $redirect_url, PHP_URL_QUERY );
+			if ($method == 'GET') {
+				$querystring = parse_url($redirect_url, PHP_URL_QUERY);
 				$get_params = null;
-				parse_str( $querystring, $get_params );
-				$inside_form_html .= $this->_args_as_inputs( $get_params );
-				$redirect_url = str_replace( '?' . $querystring, '', $redirect_url );
+				parse_str($querystring, $get_params);
+				$inside_form_html .= $this->_args_as_inputs($get_params);
+				$redirect_url = str_replace('?'.$querystring, '', $redirect_url);
 			}
-			$form = EEH_HTML::nl(1) . '<form method="' . $method . '" name="gateway_form" action="' . $redirect_url . '">';
-			$form .= EEH_HTML::nl(1) . $this->redirect_args_as_inputs();
+			$form = EEH_HTML::nl(1).'<form method="'.$method.'" name="gateway_form" action="'.$redirect_url.'">';
+			$form .= EEH_HTML::nl(1).$this->redirect_args_as_inputs();
 			$form .= $inside_form_html;
-			$form .= EEH_HTML::nl(-1) . '</form>' . EEH_HTML::nl(-1);
+			$form .= EEH_HTML::nl(-1).'</form>'.EEH_HTML::nl(-1);
 			return $form;
 		} else {
 			return NULL;
@@ -594,8 +594,8 @@ 
 	 * and returns the html as a string
 	 * @return string
 	 */
-	function redirect_args_as_inputs(){
-		return $this->_args_as_inputs( $this->redirect_args() );
+	function redirect_args_as_inputs() {
+		return $this->_args_as_inputs($this->redirect_args());
 	}
 	
 	/**
@@ -604,12 +604,12 @@ 
 	 * @param array $args key-value pairs
 	 * @return string
 	 */
-	protected function _args_as_inputs( $args ) {
+	protected function _args_as_inputs($args) {
 		$html = '';
-		if( $args !== NULL && is_array( $args )) {
+		if ($args !== NULL && is_array($args)) {
 			EE_Registry::instance()->load_helper('HTML');
-			foreach( $args as $name => $value){
-				$html .= EEH_HTML::nl(0) . '<input type="hidden" name="' . $name . '" value="' . esc_attr( $value ) . '"/>';
+			foreach ($args as $name => $value) {
+				$html .= EEH_HTML::nl(0).'<input type="hidden" name="'.$name.'" value="'.esc_attr($value).'"/>';
 			}
 		}
 		return $html;
@@ -624,7 +624,7 @@ 
 	 * object itself)
 	 * @return string for the currency code
 	 */
-	public function currency_code(){
+	public function currency_code() {
 		return EE_Config::instance()->currency->code;
 	}
 
@@ -638,14 +638,14 @@ 
 	 * @access        private
 	 * @param        mixed $item
 	 */
-	private function _strip_all_tags_within_array( &$item ) {
-		if( is_object( $item ) ) {
+	private function _strip_all_tags_within_array(&$item) {
+		if (is_object($item)) {
 			$item = (array) $item;
 		}
-		if( is_array( $item ) ){
-			array_walk_recursive( $item, array( $this, '_strip_all_tags_within_array' ) );
-		}else{
-			$item = wp_strip_all_tags( $item );
+		if (is_array($item)) {
+			array_walk_recursive($item, array($this, '_strip_all_tags_within_array'));
+		} else {
+			$item = wp_strip_all_tags($item);
 		}
 	}
 
@@ -654,13 +654,13 @@ 
 	 * is approved and was created during this request). False otherwise.
 	 * @return boolean
 	 */
-	public function just_approved(){
-		EE_Registry::instance()->load_helper( 'Array' );
-		$original_status =EEH_Array::is_set( $this->_props_n_values_provided_in_constructor, 'STS_ID', $this->get_model()->field_settings_for( 'STS_ID' )->get_default_value() );
+	public function just_approved() {
+		EE_Registry::instance()->load_helper('Array');
+		$original_status = EEH_Array::is_set($this->_props_n_values_provided_in_constructor, 'STS_ID', $this->get_model()->field_settings_for('STS_ID')->get_default_value());
 		$current_status = $this->status();
-		if( $original_status !== EEM_Payment::status_id_approved && $current_status === EEM_Payment::status_id_approved ){
+		if ($original_status !== EEM_Payment::status_id_approved && $current_status === EEM_Payment::status_id_approved) {
 			return TRUE;
-		}else{
+		} else {
 			return FALSE;
 		}
 	}
@@ -672,11 +672,11 @@ 
 	 * @param string         $extra_cache_ref This allows the user to specify an extra cache ref for the given property (in cases where the same property may be used for different outputs - i.e. datetime, money etc.)
 	 * @return mixed
 	 */
-	public function get_pretty($field_name, $extra_cache_ref = NULL){
-		if( $field_name == 'PAY_gateway' ){
+	public function get_pretty($field_name, $extra_cache_ref = NULL) {
+		if ($field_name == 'PAY_gateway') {
 			return $this->gateway();
 		}
-		return  $this->_get_cached_property( $field_name, TRUE, $extra_cache_ref );
+		return  $this->_get_cached_property($field_name, TRUE, $extra_cache_ref);
 	}
 
 
@@ -686,8 +686,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Registration_Payment[]
 	 */
-	public function registration_payments( $query_params = array() ) {
-		return $this->get_many_related( 'Registration_Payment', $query_params );
+	public function registration_payments($query_params = array()) {
+		return $this->get_many_related('Registration_Payment', $query_params);
 	}
 
 

admin_pages/transactions/templates/txn_admin_details_main_meta_box_txn_details.template.php

Spacing +117 added lines, -117 removed lines

@@ -1,7 +1,7 @@ 
 <div id="admin-primary-mbox-dv" class="admin-primary-mbox-dv">
 
 	<h3 class="admin-primary-mbox-h4 hdr-has-icon">
-		<span class="dashicons dashicons-cart"></span><?php _e( 'Transaction Items', 'event_espresso' );?>
+		<span class="dashicons dashicons-cart"></span><?php _e('Transaction Items', 'event_espresso'); ?>
 	</h3>
 
 	<div class="admin-primary-mbox-tbl-wrap">
@@ -10,27 +10,27 @@ 
 	</div>
 
 	<a id="display-additional-transaction-session-info" class="display-the-hidden smaller-text" rel="additional-transaction-session-info">
-		<span class="dashicons dashicons-plus-alt"></span><?php _e( 'view additional transaction session details', 'event_espresso' );?>
+		<span class="dashicons dashicons-plus-alt"></span><?php _e('view additional transaction session details', 'event_espresso'); ?>
 	</a>
 
 	<div id="additional-transaction-session-info-dv" class="hidden">
 
 		<a id="hide-additional-transaction-session-info" class="hide-the-displayed hidden smaller-text" rel="additional-transaction-session-info">
-			<span class="dashicons dashicons-dismiss"></span><?php _e( 'hide additional transaction session details', 'event_espresso' );?>
+			<span class="dashicons dashicons-dismiss"></span><?php _e('hide additional transaction session details', 'event_espresso'); ?>
 		</a>
 	<br class="clear"/>
 
-		<h3 class="admin-primary-mbox-h4"><?php _e( 'Transaction Session Details', 'event_espresso' );?></h3>
+		<h3 class="admin-primary-mbox-h4"><?php _e('Transaction Session Details', 'event_espresso'); ?></h3>
 
 		<table id="admin-primary-mbox-txn-extra-session-info-tbl" class="form-table skinny-rows">
 			<tbody>
-			<?php foreach ( $txn_details as $key => $txn_detail ) : ?>
+			<?php foreach ($txn_details as $key => $txn_detail) : ?>
 				<tr>
 					<th>
-						<label for="<?php echo $key;?>"><?php echo $txn_detail['label'];?></label>
+						<label for="<?php echo $key; ?>"><?php echo $txn_detail['label']; ?></label>
 					</th>
 					<td>
-						<?php echo $txn_detail['value'];?>
+						<?php echo $txn_detail['value']; ?>
 					</td>
 				</tr>
 			<?php endforeach; // $txn_details?>
@@ -40,10 +40,10 @@ 
 	<br class="clear"/>
 
 
-	<?php if ( $attendee instanceof EE_Attendee && ( $grand_raw_total > 0 || $TXN_status != 'TCM' || ! empty( $payments ) ) ) : ?>
+	<?php if ($attendee instanceof EE_Attendee && ($grand_raw_total > 0 || $TXN_status != 'TCM' || ! empty($payments))) : ?>
 
 	<h3 class="admin-primary-mbox-h4 hdr-has-icon">
-		<span class="ee-icon ee-icon-cash"></span><?php _e( 'Payment Details', 'event_espresso' );?>
+		<span class="ee-icon ee-icon-cash"></span><?php _e('Payment Details', 'event_espresso'); ?>
 	</h3>
 
 	<div class="admin-primary-mbox-tbl-wrap">
@@ -52,79 +52,79 @@ 
 				<tr>
 					<th></th>
 					<th class="jst-cntr"></th>
-					<th class="jst-cntr"><?php _e( 'ID', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Date', 'event_espresso' );?></th>
-					<th class="jst-cntr"><?php _e( 'Source', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Method', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Gateway Response', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'TXN&nbsp;ID / CHQ&nbsp;#', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'P.O. / S.O.&nbsp;#', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Notes / Extra&nbsp;Accounting', 'event_espresso' );?></th>
-					<!--<th class="jst-left"><?php _e( 'Details', 'event_espresso' );?></th>-->
-					<th class="jst-cntr"><?php _e( 'Amount', 'event_espresso' );?></th>
+					<th class="jst-cntr"><?php _e('ID', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Date', 'event_espresso'); ?></th>
+					<th class="jst-cntr"><?php _e('Source', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Method', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Gateway Response', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('TXN&nbsp;ID / CHQ&nbsp;#', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('P.O. / S.O.&nbsp;#', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Notes / Extra&nbsp;Accounting', 'event_espresso'); ?></th>
+					<!--<th class="jst-left"><?php _e('Details', 'event_espresso'); ?></th>-->
+					<th class="jst-cntr"><?php _e('Amount', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
-		<?php if ( $payments ) : ?>
+		<?php if ($payments) : ?>
 			<?php $payment_total = 0; ?>
-			<?php foreach ( $payments as $PAY_ID => $payment ) :
-				$existing_reg_payment_json = isset( $existing_reg_payments[ $PAY_ID ] )
-					? wp_json_encode( $existing_reg_payments[ $PAY_ID ] )
+			<?php foreach ($payments as $PAY_ID => $payment) :
+				$existing_reg_payment_json = isset($existing_reg_payments[$PAY_ID])
+					? wp_json_encode($existing_reg_payments[$PAY_ID])
 					: '{}';
 				?>
-				<tr id="txn-admin-payment-tr-<?php echo $PAY_ID;?>">
+				<tr id="txn-admin-payment-tr-<?php echo $PAY_ID; ?>">
 					<td>
 						<span id="payment-status-<?php echo $PAY_ID; ?>" class="ee-status-strip-td ee-status-strip pymt-status-<?php echo $payment->STS_ID(); ?>"></span>
-						<div id="payment-STS_ID-<?php echo $PAY_ID;?>" class="hidden"><?php echo $payment->STS_ID();?></div>
-						<div id="reg-payments-<?php echo $PAY_ID;?>" class="hidden"><?php echo $existing_reg_payment_json; ?></div>
+						<div id="payment-STS_ID-<?php echo $PAY_ID; ?>" class="hidden"><?php echo $payment->STS_ID(); ?></div>
+						<div id="reg-payments-<?php echo $PAY_ID; ?>" class="hidden"><?php echo $existing_reg_payment_json; ?></div>
 					</td>
 					<td class=" jst-cntr">
 						<ul class="txn-overview-actions-ul">
 							<li>
-								<a class="txn-admin-payment-action-edit-lnk" title="<?php esc_attr_e( 'Edit Payment', 'event_espresso' );?>" data-payment-id="<?php echo $PAY_ID;?>">
+								<a class="txn-admin-payment-action-edit-lnk" title="<?php esc_attr_e('Edit Payment', 'event_espresso'); ?>" data-payment-id="<?php echo $PAY_ID; ?>">
 									<div class="dashicons dashicons-edit" style="margin: 0;"></div>
 								</a>
 							</li>
 							<li>
-								<a class="txn-admin-payment-action-delete-lnk" title="<?php esc_attr_e( 'Delete Payment', 'event_espresso' );?>" data-payment-id="<?php echo $PAY_ID;?>">
+								<a class="txn-admin-payment-action-delete-lnk" title="<?php esc_attr_e('Delete Payment', 'event_espresso'); ?>" data-payment-id="<?php echo $PAY_ID; ?>">
 									<div class="dashicons dashicons-trash" style="margin: 0;"></div>
 								</a>
 							</li>
 						</ul>
 					</td>
 					<td class=" jst-rght">
-						<div id="payment-id-<?php echo $PAY_ID;?>"><?php echo $PAY_ID;?></div>
+						<div id="payment-id-<?php echo $PAY_ID; ?>"><?php echo $PAY_ID; ?></div>
 					</td>
 					<td class=" jst-left">
-						<div id="payment-date-<?php echo $PAY_ID;?>" class="payment-date-dv"><?php echo $payment->timestamp('Y-m-d', 'g:i a');?></div>
+						<div id="payment-date-<?php echo $PAY_ID; ?>" class="payment-date-dv"><?php echo $payment->timestamp('Y-m-d', 'g:i a'); ?></div>
 					</td>
 					<td class=" jst-cntr">
-						<div id="payment-method-<?php echo $PAY_ID;?>">
-							<?php echo $payment->source();?>
+						<div id="payment-method-<?php echo $PAY_ID; ?>">
+							<?php echo $payment->source(); ?>
 						</div>
 					</td>
 					<td class=" jst-left">
-						<div id="payment-gateway-<?php echo $PAY_ID;?>">
-							<?php echo $payment->payment_method() ?  $payment->payment_method()->admin_name() : __("Unknown", 'event_espresso');?>
+						<div id="payment-gateway-<?php echo $PAY_ID; ?>">
+							<?php echo $payment->payment_method() ? $payment->payment_method()->admin_name() : __("Unknown", 'event_espresso'); ?>
 						</div>
-						<div id="payment-gateway-id-<?php echo $PAY_ID;?>" class="hidden"><?php echo $payment->payment_method() ? $payment->payment_method()->ID() : 0;?></div>
+						<div id="payment-gateway-id-<?php echo $PAY_ID; ?>" class="hidden"><?php echo $payment->payment_method() ? $payment->payment_method()->ID() : 0; ?></div>
 					</td>
 					<td class=" jst-left">
-						<div id="payment-response-<?php echo $PAY_ID;?>"><?php echo $payment->gateway_response();?></div>
+						<div id="payment-response-<?php echo $PAY_ID; ?>"><?php echo $payment->gateway_response(); ?></div>
 					</td>
 					<td class=" jst-left">
-						<div id="payment-txn-id-chq-nmbr-<?php echo $PAY_ID;?>"><?php echo $payment->txn_id_chq_nmbr();?></div>
+						<div id="payment-txn-id-chq-nmbr-<?php echo $PAY_ID; ?>"><?php echo $payment->txn_id_chq_nmbr(); ?></div>
 					</td>
 					<td class=" jst-left">
-						<div id="payment-po-nmbr-<?php echo $PAY_ID;?>"><?php echo $payment->po_number();?></div>
+						<div id="payment-po-nmbr-<?php echo $PAY_ID; ?>"><?php echo $payment->po_number(); ?></div>
 					</td>
 					<td class=" jst-left">
-						<div id="payment-accntng-<?php echo $PAY_ID;?>"><?php echo $payment->extra_accntng();?></div>
+						<div id="payment-accntng-<?php echo $PAY_ID; ?>"><?php echo $payment->extra_accntng(); ?></div>
 					</td>
 					<td class=" jst-rght">
-						<?php $payment_class = $payment->amount() > 0 ? 'txn-admin-payment-status-' . $payment->STS_ID() : 'txn-admin-payment-status-PDC'; ?>
-						<span class="<?php echo $payment_class;?>">
-							<div id="payment-amount-<?php echo $PAY_ID;?>" style="display:inline;"><?php echo EEH_Template::format_currency($payment->amount(), FALSE, FALSE ); ?></div>
+						<?php $payment_class = $payment->amount() > 0 ? 'txn-admin-payment-status-'.$payment->STS_ID() : 'txn-admin-payment-status-PDC'; ?>
+						<span class="<?php echo $payment_class; ?>">
+							<div id="payment-amount-<?php echo $PAY_ID; ?>" style="display:inline;"><?php echo EEH_Template::format_currency($payment->amount(), FALSE, FALSE); ?></div>
 						</span>
 					</td>
 				</tr>
@@ -134,25 +134,25 @@ 
 			<?php endforeach; // $payment?>
 			<?php
 				$pay_totals_class = $payment_total > $grand_raw_total ? ' important-notice' : '';
-				$overpaid = $payment_total > $grand_raw_total ? '<span id="overpaid">' . __( 'This transaction has been overpaid ! ', 'event_espresso' ) . '</span>' : '';
+				$overpaid = $payment_total > $grand_raw_total ? '<span id="overpaid">'.__('This transaction has been overpaid ! ', 'event_espresso').'</span>' : '';
 			?>
 				<tr id="txn-admin-no-payments-tr" class="admin-primary-mbox-total-tr hidden">
 					<td class=" jst-rght" colspan="11">
-						<span class="important-notice"><?php _e( 'No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.', 'event_espresso' ); ?></span>
+						<span class="important-notice"><?php _e('No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.', 'event_espresso'); ?></span>
 					</td>
 				</tr>
-				<tr id="txn-admin-payments-total-tr" class="admin-primary-mbox-total-tr<?php echo $pay_totals_class;?>">
-					<th class=" jst-rght" colspan="10"><span id="payments-total-spn"><?php echo $overpaid . sprintf( __( 'Payments Total %s', 'event_espresso' ), '(' . EE_Registry::instance()->CFG->currency->code . ')' );?></span></th>
-					<th class=" jst-rght"><span id="txn-admin-payment-total"><?php echo EEH_Template::format_currency($payment_total, FALSE, FALSE);?></span></th>
+				<tr id="txn-admin-payments-total-tr" class="admin-primary-mbox-total-tr<?php echo $pay_totals_class; ?>">
+					<th class=" jst-rght" colspan="10"><span id="payments-total-spn"><?php echo $overpaid.sprintf(__('Payments Total %s', 'event_espresso'), '('.EE_Registry::instance()->CFG->currency->code.')'); ?></span></th>
+					<th class=" jst-rght"><span id="txn-admin-payment-total"><?php echo EEH_Template::format_currency($payment_total, FALSE, FALSE); ?></span></th>
 				</tr>
 		<?php else : ?>
 				<tr id="txn-admin-no-payments-tr" class="admin-primary-mbox-total-tr">
 					<td class=" jst-rght" colspan="11">
-						<span class="important-notice"><?php _e( 'No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.', 'event_espresso' ); ?></span>
+						<span class="important-notice"><?php _e('No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.', 'event_espresso'); ?></span>
 					</td>
 				</tr>
 				<tr id="txn-admin-payments-total-tr" class="admin-primary-mbox-total-tr hidden">
-					<th class=" jst-rght" colspan="10"><span id="payments-total-spn"><?php echo __( 'Payments Total', 'event_espresso' );?></span></th>
+					<th class=" jst-rght" colspan="10"><span id="payments-total-spn"><?php echo __('Payments Total', 'event_espresso'); ?></span></th>
 					<th class=" jst-rght"><span id="txn-admin-payment-total"></span></th>
 				</tr>
 		<?php endif; // $payments?>
@@ -165,12 +165,12 @@ 
 					<td class=" jst-cntr">
 						<ul class="txn-overview-actions-ul">
 							<li>
-								<a class="txn-admin-payment-action-edit-lnk" title="<?php esc_attr_e( 'Edit Payment', 'event_espresso' );?>" data-payment-id="PAY_ID">
+								<a class="txn-admin-payment-action-edit-lnk" title="<?php esc_attr_e('Edit Payment', 'event_espresso'); ?>" data-payment-id="PAY_ID">
 									<div class="dashicons dashicons-edit" style="margin: 0;"></div>
 								</a>
 							</li>
 							<li>
-								<a class="txn-admin-payment-action-delete-lnk" title="<?php esc_attr_e( 'Delete Payment', 'event_espresso' );?>" data-payment-id="PAY_ID">
+								<a class="txn-admin-payment-action-delete-lnk" title="<?php esc_attr_e('Delete Payment', 'event_espresso'); ?>" data-payment-id="PAY_ID">
 									<div class="dashicons dashicons-trash" style="margin: 0;"></div>
 								</a>
 							</li>
@@ -217,12 +217,12 @@ 
 	<ul id="txn-admin-payment-options-ul">
 		<li>
 			<a id="display-txn-admin-apply-payment" class="button-primary no-icon no-hide" rel="txn-admin-apply-payment" > <!--display-the-hidden -->
-				<?php _e( 'Apply Payment', 'event_espresso' );?>
+				<?php _e('Apply Payment', 'event_espresso'); ?>
 			</a>
 		</li>
 		<li>
 			<a id="display-txn-admin-apply-refund" class="button-secondary no-icon no-hide" rel="txn-admin-apply-refund" >  <!--display-the-hidden -->
-				<?php _e( 'Apply Refund', 'event_espresso' );?>
+				<?php _e('Apply Refund', 'event_espresso'); ?>
 			</a>
 		</li>
 	</ul>
@@ -232,14 +232,14 @@ 
 
 		<h2 id="admin-modal-dialog-apply-payment-h2" class="admin-modal-dialog-h2 hdr-has-icon" style="display:none;">
 			<div class="ee-icon ee-icon-cash-add float-left"></div>
-			<?php echo __( 'Apply a Payment to Transaction #', 'event_espresso' ) . $txn_nmbr['value'];?>
+			<?php echo __('Apply a Payment to Transaction #', 'event_espresso').$txn_nmbr['value']; ?>
 		</h2>
 
 		<h2 id="admin-modal-dialog-edit-payment-h2" class="admin-modal-dialog-h2 hdr-has-icon" style="display:none;">
 			<div class="ee-icon ee-icon-cash-edit float-left"></div>
 			<?php
 			echo sprintf(
-				__( 'Edit Payment #%s for Transaction #%s', 'event_espresso' ),
+				__('Edit Payment #%s for Transaction #%s', 'event_espresso'),
 				'<span></span>',
 				$txn_nmbr['value']
 			);
@@ -250,7 +250,7 @@ 
 			<div class="ee-icon ee-icon-cash-edit float-left"></div>
 			<?php
 			echo sprintf(
-				__( 'Edit Refund #%s for Transaction #%s', 'event_espresso' ),
+				__('Edit Refund #%s for Transaction #%s', 'event_espresso'),
 				'<span></span>',
 				$txn_nmbr['value']
 			);
@@ -259,14 +259,14 @@ 
 
 		<h2 id="admin-modal-dialog-apply-refund-h2" class="admin-modal-dialog-h2 hdr-has-icon" style="display:none;">
 			<div class="ee-icon ee-icon-cash-remove float-left"></div>
-			<?php echo __( 'Apply a Refund to Transaction #', 'event_espresso' ) . $txn_nmbr['value'];?>
+			<?php echo __('Apply a Refund to Transaction #', 'event_espresso').$txn_nmbr['value']; ?>
 		</h2>
 
 		<form name="txn-admin-apply-payment-frm" id="txn-admin-apply-payment-frm" action="<?php echo $apply_payment_form_url; ?>">
 			<div class="admin-modal-dialog-wrap">
 				<div class="admin-modal-dialog-inner">
 
-					<input  type="hidden" name="espresso_apply_payment_nonce" id="espresso_apply_payment_nonce" value="<?php echo wp_create_nonce( 'espresso_apply_payment_nonce' );?>"/>
+					<input  type="hidden" name="espresso_apply_payment_nonce" id="espresso_apply_payment_nonce" value="<?php echo wp_create_nonce('espresso_apply_payment_nonce'); ?>"/>
 					<input  type="hidden" name="espresso_ajax" id="espresso-ajax" value="0"/>
 					<input  type="hidden" name="noheader" id="txn-admin-noheader-inp" value="0"/>
 					<input  type="hidden" name="txn_admin_payment[PAY_ID]" id="txn-admin-payment-payment-id-inp" class="txn-admin-apply-payment-inp" value="0"/>
@@ -274,108 +274,108 @@ 
 					<input  type="hidden" name="txn_admin_payment[type]" id="txn-admin-payment-type-inp" value="1"/>
 					<input  type="hidden" name="txn_admin_payment[details]" id="txn-admin-payment-details-inp" value=""/>
 					<input  type="hidden" name="txn_admin_delete_payment_form_url" id="txn-admin-delete-payment-form-url-inp" value="<?php echo $delete_payment_form_url; ?>"/>
-					<input  type="hidden" name="txn_admin_todays_date" id="txn-admin-todays-date-inp" value="<?php echo date( 'Y-m-d h:i a', current_time( 'timestamp' )); ?>"/>
+					<input  type="hidden" name="txn_admin_todays_date" id="txn-admin-todays-date-inp" value="<?php echo date('Y-m-d h:i a', current_time('timestamp')); ?>"/>
 
 					<div class="txn-admin-apply-payment-date-dv admin-modal-dialog-row">
-						<div class="validation-notice-dv"><?php _e( 'The following is  a required field', 'event_espresso' );?></div>
-						<label for="txn-admin-payment-date-inp" class=""><?php _e( 'Payment Date', 'event_espresso' );?></label>
-						<input name="[date]txn_admin_payment" id="txn-admin-payment-date-inp" class="txn-admin-apply-payment-inp required" type="text" value="<?php echo date( 'Y-m-d g:i a', current_time( 'timestamp' )); ?>"/>
-						<p class="description"><?php _e( 'The date the payment was actually made on', 'event_espresso' );?></p>
+						<div class="validation-notice-dv"><?php _e('The following is  a required field', 'event_espresso'); ?></div>
+						<label for="txn-admin-payment-date-inp" class=""><?php _e('Payment Date', 'event_espresso'); ?></label>
+						<input name="[date]txn_admin_payment" id="txn-admin-payment-date-inp" class="txn-admin-apply-payment-inp required" type="text" value="<?php echo date('Y-m-d g:i a', current_time('timestamp')); ?>"/>
+						<p class="description"><?php _e('The date the payment was actually made on', 'event_espresso'); ?></p>
 					</div>
 
 					<div class="txn-admin-apply-payment-amount-dv admin-modal-dialog-row">
-						<div class="validation-notice-dv"><?php _e( 'The following is  a required field', 'event_espresso' );?></div>
-						<label for="txn-admin-payment-amount-inp" class=""><?php _e( 'Amount', 'event_espresso' );?></label>
+						<div class="validation-notice-dv"><?php _e('The following is  a required field', 'event_espresso'); ?></div>
+						<label for="txn-admin-payment-amount-inp" class=""><?php _e('Amount', 'event_espresso'); ?></label>
 						<input name="txn_admin_payment[amount]" id="txn-admin-payment-amount-inp" class="txn-admin-apply-payment-inp required" type="text" value=""/>
-						<p class="description"><?php _e( 'The amount of the payment', 'event_espresso' );?></p>
+						<p class="description"><?php _e('The amount of the payment', 'event_espresso'); ?></p>
 					</div>
 
 					<div class="txn-admin-apply-payment-method-dv admin-modal-dialog-row">
-						<div class="validation-notice-dv"><?php _e( 'The following is  a required field', 'event_espresso' );?></div>
-						<label for="txn-admin-payment-method-inp" class=""><?php _e( 'Method of Payment', 'event_espresso' );?></label>
+						<div class="validation-notice-dv"><?php _e('The following is  a required field', 'event_espresso'); ?></div>
+						<label for="txn-admin-payment-method-inp" class=""><?php _e('Method of Payment', 'event_espresso'); ?></label>
 						<select name="txn_admin_payment[PMD_ID]" id="txn-admin-payment-method-slct" class="txn-admin-apply-payment-slct required" type="text" >
-						<?php foreach ( $payment_methods as $method ) : ?>
+						<?php foreach ($payment_methods as $method) : ?>
 							<?php $selected = $method->slug() == 'cash' ? ' selected="selected"' : ''; ?>
-							<option id="payment-method-opt-<?php echo $method->slug(); ?>" value="<?php echo $method->ID(); ?>"<?php echo $selected; ?>><?php echo sanitize_key( $method->admin_desc() ) ? substr( $method->admin_desc(), 0, 128) : $method->admin_name() ; ?>&nbsp;&nbsp;</option>
+							<option id="payment-method-opt-<?php echo $method->slug(); ?>" value="<?php echo $method->ID(); ?>"<?php echo $selected; ?>><?php echo sanitize_key($method->admin_desc()) ? substr($method->admin_desc(), 0, 128) : $method->admin_name(); ?>&nbsp;&nbsp;</option>
 						<?php endforeach; ?>
 						</select>
-						<p class="description"><?php _e( 'Whether the payment was made via PayPal, Credit Card, Cheque, or Cash', 'event_espresso' );?></p>
+						<p class="description"><?php _e('Whether the payment was made via PayPal, Credit Card, Cheque, or Cash', 'event_espresso'); ?></p>
 					</div>
 
 					<div class="mop-PP mop-CC mop-CHQ mop">
 						<div class="txn-admin-apply-payment-gw-txn-id-dv admin-modal-dialog-row">
-							<label for="txn-admin-payment-txn-id-inp" class=""><?php _e( 'TXN ID / CHQ #', 'event_espresso' );?></label>
+							<label for="txn-admin-payment-txn-id-inp" class=""><?php _e('TXN ID / CHQ #', 'event_espresso'); ?></label>
 							<input name="txn_admin_payment[txn_id_chq_nmbr]" id="txn-admin-payment-txn-id-chq-nmbr-inp" class="txn-admin-apply-payment-inp" type="text" maxlength="100"/>
-							<p class="description"><?php _e( 'The Transaction ID sent back from the payment gateway, or the Cheque #', 'event_espresso' );?></p>
+							<p class="description"><?php _e('The Transaction ID sent back from the payment gateway, or the Cheque #', 'event_espresso'); ?></p>
 						</div>
 					</div>
 
 					<div class="mop-CC mop" style="display:none">
 						<div class="txn-admin-apply-payment-response-dv admin-modal-dialog-row">
-							<label for="txn-admin-payment-gateway-response-inp" class=""><?php _e( 'Gateway Response', 'event_espresso' );?></label>
+							<label for="txn-admin-payment-gateway-response-inp" class=""><?php _e('Gateway Response', 'event_espresso'); ?></label>
 							<input name="txn_admin_payment[gateway_response]" id="txn-admin-payment-gateway-response-inp" class="txn-admin-apply-payment-inp" type="text"/>
-							<p class="description"><?php _e( 'The gateway response string (optional)', 'event_espresso' );?></p>
+							<p class="description"><?php _e('The gateway response string (optional)', 'event_espresso'); ?></p>
 						</div>
 					</div>
 
 					<div class="mop-PP mop-CC mop">
 						<div class="txn-admin-apply-payment-status-dv admin-modal-dialog-row">
-							<label for="txn-admin-payment-status-inp" class=""><?php _e( 'Payment Status', 'event_espresso' );?></label>
+							<label for="txn-admin-payment-status-inp" class=""><?php _e('Payment Status', 'event_espresso'); ?></label>
 							<select name="txn_admin_payment[status]" id="txn-admin-payment-status-slct" class="txn-admin-apply-payment-slct" type="text" >
-							<?php foreach ( $payment_status as $STS_ID => $STS_code ) : ?>
+							<?php foreach ($payment_status as $STS_ID => $STS_code) : ?>
 								<?php $selected = $STS_ID == 'PAP' ? ' selected="selected"' : ''; ?>
 								<option id="payment-status-opt-<?php echo $STS_ID; ?>" value="<?php echo $STS_ID; ?>"<?php echo $selected; ?>><?php echo $STS_code; ?>&nbsp;&nbsp;</option>
 							<?php endforeach; ?>
 							</select>
-							<p class="description"><?php _e( 'Whether the payment was approved, cancelled, declined or failed after submission to the gateway', 'event_espresso' );?></p>
+							<p class="description"><?php _e('Whether the payment was approved, cancelled, declined or failed after submission to the gateway', 'event_espresso'); ?></p>
 						</div>
 					</div>
 
 					<div class="txn-admin-apply-payment-po-nmbr-dv admin-modal-dialog-row">
-						<label for="txn-admin-payment-po-nmbr-inp" class=""><?php _e( 'P.O. / S.O. #', 'event_espresso' );?></label>
+						<label for="txn-admin-payment-po-nmbr-inp" class=""><?php _e('P.O. / S.O. #', 'event_espresso'); ?></label>
 						<input name="txn_admin_payment[po_number]" id="txn-admin-payment-po-nmbr-inp" class="txn-admin-apply-payment-inp" type="text" maxlength="100"/>
-						<p class="description"><?php _e( 'The Purchase or Sales Order Number if any (optional)', 'event_espresso' );?></p>
+						<p class="description"><?php _e('The Purchase or Sales Order Number if any (optional)', 'event_espresso'); ?></p>
 					</div>
 
 					<div class="txn-admin-apply-payment-accounting-dv admin-modal-dialog-row">
-						<label for="txn-admin-payment-accounting-inp" class="last"><?php _e( 'Notes / Extra Accounting', 'event_espresso' );?></label>
+						<label for="txn-admin-payment-accounting-inp" class="last"><?php _e('Notes / Extra Accounting', 'event_espresso'); ?></label>
 						<input name="txn_admin_payment[accounting]" id="txn-admin-payment-accounting-inp" class="txn-admin-apply-payment-inp" type="text" value="<?php echo $REG_code; ?>" maxlength="100"/>		<input type="hidden" id="txn-admin-reg-code-inp" value="<?php echo $REG_code; ?>"/>
-						<p class="description"><?php _e( 'An extra field you may use for accounting purposes or simple notes. Defaults to the primary registrant\'s registration code.', 'event_espresso' );?></p>
+						<p class="description"><?php _e('An extra field you may use for accounting purposes or simple notes. Defaults to the primary registrant\'s registration code.', 'event_espresso'); ?></p>
 					</div>
 
 					<div class="txn-admin-apply-payment-registrations-dv admin-modal-dialog-row">
-						<label for="txn-admin-payment-registrations-inp" class="last"><?php _e( 'Registrations to Apply Payment to:', 'event_espresso' ); ?></label>
+						<label for="txn-admin-payment-registrations-inp" class="last"><?php _e('Registrations to Apply Payment to:', 'event_espresso'); ?></label>
 						<label class="txn-admin-apply-payment-to-registrations-lbl">
 							<input type="radio" value="1" id="txn-admin-apply-payment-to-all-registrations-inp" name="txn_admin_payment[apply_to_all_registrations]"  checked="checked"/>
-							<?php _e( 'ALL Registrations', 'event_espresso' ); ?>
+							<?php _e('ALL Registrations', 'event_espresso'); ?>
 						</label>
 						<label class="txn-admin-apply-payment-to-registrations-lbl">
 							<input type="radio" value="0" id="txn-admin-apply-payment-to-some-registrations-inp" name="txn_admin_payment[apply_to_all_registrations]" />
-							<?php _e( 'Just the following Registrations', 'event_espresso' ); ?>
+							<?php _e('Just the following Registrations', 'event_espresso'); ?>
 						</label>
 						<?php echo $registrations_to_apply_payment_to; ?>
 					</div>
 
 					<div class="txn-admin-payment-reg-status-dv admin-modal-dialog-row">
-						<label for="txn-admin-payment-reg-status-inp" class="last"><?php _e( 'Change Registration Status?', 'event_espresso' );?></label>
+						<label for="txn-admin-payment-reg-status-inp" class="last"><?php _e('Change Registration Status?', 'event_espresso'); ?></label>
 						<?php echo $status_change_select; ?>
-						<p class="description"><?php _e( 'If you wish to change the status for the registrations selected above, then select which status from this dropdown.', 'event_espresso' ); ?></p>
+						<p class="description"><?php _e('If you wish to change the status for the registrations selected above, then select which status from this dropdown.', 'event_espresso'); ?></p>
 						<br/>
 					</div>
 
 					<div class="txn-admin-apply-payment-send-notifications-dv admin-modal-dialog-row">
 
-						<label for="txn-admin-payment-send-notifications-inp" class="last"><?php _e( 'Send Related Messages?', 'event_espresso' );?></label>
+						<label for="txn-admin-payment-send-notifications-inp" class="last"><?php _e('Send Related Messages?', 'event_espresso'); ?></label>
 						<label class="txn-admin-payment-send-notifications-lbl">
 							<input type="checkbox" value="1" name="txn_payments[send_notifications]" checked="checked" aria-checked="true" style="vertical-align: middle;">
-							<?php _e( 'Payment Messages?', 'event_espresso' ); ?>
+							<?php _e('Payment Messages?', 'event_espresso'); ?>
 						</label>
 						<label class="txn-admin-payment-send-notifications-lbl">
 							<input type="checkbox" value="1" name="txn_reg_status_change[send_notifications]" style="vertical-align: middle;">
-							<?php _e( 'Registration Messages?', 'event_espresso' ); ?>
+							<?php _e('Registration Messages?', 'event_espresso'); ?>
 						</label>
 						<br class="clear-float"/>
-						<p class="description"><?php printf( __('By default %1$sa payment message is sent to the primary registrant%2$s after submitting this form.%3$sHowever, if you check the "Registration Messages" box, the system will also send any related messages matching the status of the registrations to %1$seach registration for this transaction%2$s.', 'event_espresso'), '<strong>', '</strong>', '<br />' ); ?></p>
+						<p class="description"><?php printf(__('By default %1$sa payment message is sent to the primary registrant%2$s after submitting this form.%3$sHowever, if you check the "Registration Messages" box, the system will also send any related messages matching the status of the registrations to %1$seach registration for this transaction%2$s.', 'event_espresso'), '<strong>', '</strong>', '<br />'); ?></p>
 						<label></label>
 					</div>
 					<div class="clear"></div>
@@ -386,27 +386,27 @@ 
 			<ul id="admin-modal-dialog-options-ul">
 				<li>
 					<a id="txn-admin-modal-dialog-apply-payment-lnk" class="button-primary no-icon" style="display:none;" >
-						<?php _e( 'Apply Payment', 'event_espresso' );?>
+						<?php _e('Apply Payment', 'event_espresso'); ?>
 					</a>
 				</li>
 				<li>
 					<a id="txn-admin-modal-dialog-edit-payment-lnk" class="button-primary no-icon" style="display:none;" >
-						<?php _e( 'Save Payment Details', 'event_espresso' );?>
+						<?php _e('Save Payment Details', 'event_espresso'); ?>
 					</a>
 				</li>
 				<li>
 					<a id="txn-admin-modal-dialog-edit-refund-lnk" class="button-primary no-icon" style="display:none;" >
-						<?php _e( 'Save Refund Details', 'event_espresso' );?>
+						<?php _e('Save Refund Details', 'event_espresso'); ?>
 					</a>
 				</li>
 				<li>
 					<a id="txn-admin-modal-dialog-apply-refund-lnk" class="button-primary no-icon" style="display:none;" >
-						<?php _e( 'Apply Refund', 'event_espresso' );?>
+						<?php _e('Apply Refund', 'event_espresso'); ?>
 					</a>
 				</li>
 				<li>
 					<a id="txn-admin-modal-dialog-cancel-lnk" class="button-secondary no-icon" >
-						<?php _e( 'Cancel', 'event_espresso' );?>
+						<?php _e('Cancel', 'event_espresso'); ?>
 					</a>
 				</li>
 				<li>
@@ -423,29 +423,29 @@ 
 
 		<h2 id="admin-modal-dialog-delete-payment-h2" class="admin-modal-dialog-h2 hdr-has-icon" style="display:none;">
 			<span class="ee-icon ee-icon-cash-add"></span>
-			<?php echo __( 'Delete Payment/Refund for Transaction #', 'event_espresso' ) . $txn_nmbr['value'];?>
+			<?php echo __('Delete Payment/Refund for Transaction #', 'event_espresso').$txn_nmbr['value']; ?>
 		</h2>
 
 		<form name="txn-admin-delete-payment-frm" id="txn-admin-delete-payment-frm" action="<?php echo $delete_payment_url; ?>">
 			<div class="admin-modal-dialog-wrap">
 				<div class="admin-modal-dialog-inner">
 
-					<input  type="hidden" name="espresso_delete_payment_nonce" id="espresso_delete_payment_nonce" value="<?php echo wp_create_nonce( 'espresso_delete_payment_nonce' );?>"/>
+					<input  type="hidden" name="espresso_delete_payment_nonce" id="espresso_delete_payment_nonce" value="<?php echo wp_create_nonce('espresso_delete_payment_nonce'); ?>"/>
 					<input  type="hidden" name="delete_espresso_ajax" id="delete-espresso-ajax" value="0"/>
 					<input  type="hidden" name="delete_noheader" id="delete-txn-admin-noheader-inp" value="0"/>
 					<input  type="hidden" name="delete_txn_admin_payment[PAY_ID]" id="delete-txn-admin-payment-payment-id-inp" class="txn-admin-apply-payment-inp" value="0"/>
 					<input  type="hidden" name="delete_txn_admin_payment[TXN_ID]" id="delete-txn-admin-payment-txn-id-inp" value="<?php echo $txn_nmbr['value']; ?>"/>
 
 					<div class="txn-admin-apply-payment-accounting-dv admin-modal-dialog-row">
-						<label for="delete-txn-admin-payment-reg-status-inp" class="last"><?php _e( 'Change Registration Status?', 'event_espresso' );?></label>
+						<label for="delete-txn-admin-payment-reg-status-inp" class="last"><?php _e('Change Registration Status?', 'event_espresso'); ?></label>
 						<?php echo $delete_status_change_select; ?>
-						<p class="description"><?php printf( __('If you wish to change the status of all the registrations associated with this transaction after deleting this payment/refund, then select which status from this dropdown. %sNote: ALL registrations associated with this transaction will be updated to this new status.%s', 'event_espresso'), '<strong>', '</strong>' ); ?></p>
+						<p class="description"><?php printf(__('If you wish to change the status of all the registrations associated with this transaction after deleting this payment/refund, then select which status from this dropdown. %sNote: ALL registrations associated with this transaction will be updated to this new status.%s', 'event_espresso'), '<strong>', '</strong>'); ?></p>
 					</div>
 
 					<div class="ee-attention txn-admin-apply-payment-accounting-dv admin-modal-dialog-row">
-						<label for="delete-txn-admin-payment-accounting-inp" class="last"><?php _e( 'Send Related Messages?', 'event_espresso' );?></label>
+						<label for="delete-txn-admin-payment-accounting-inp" class="last"><?php _e('Send Related Messages?', 'event_espresso'); ?></label>
 						<input type="checkbox" value="1" name="delete_txn_reg_status_change[send_notifications]">
-						<p class="description"><?php _e( 'If you check this box, the system will send any related registration messages matching the status of the registrations to each registration for this transaction. No Payment notifications are sent when deleting a payment.', 'event_espresso' );?></p>
+						<p class="description"><?php _e('If you check this box, the system will send any related registration messages matching the status of the registrations to each registration for this transaction. No Payment notifications are sent when deleting a payment.', 'event_espresso'); ?></p>
 					</div>
 					<div class="clear"></div>
 
@@ -455,12 +455,12 @@ 
 			<ul id="del-admin-modal-dialog-options-ul">
 				<li>
 					<a id="txn-admin-modal-dialog-delete-lnk" class="button-primary no-icon" style="display:none;" >
-						<?php _e( 'Delete', 'event_espresso' );?>
+						<?php _e('Delete', 'event_espresso'); ?>
 					</a>
 				</li>
 				<li>
 					<a id="del-txn-admin-modal-dialog-cancel-lnk" class="button-secondary no-icon" >
-						<?php _e( 'Cancel', 'event_espresso' );?>
+						<?php _e('Cancel', 'event_espresso'); ?>
 					</a>
 				</li>
 				<li>
@@ -476,30 +476,30 @@ 
 	<?php endif; // $grand_raw_total > 0?>
 
 	<?php
-	if ( WP_DEBUG ) {
-		$delivered_messages = get_option( 'EED_Messages__payment', array() );
-		if ( isset( $delivered_messages[ $TXN_ID ] )) {
+	if (WP_DEBUG) {
+		$delivered_messages = get_option('EED_Messages__payment', array());
+		if (isset($delivered_messages[$TXN_ID])) {
 			?>
-			<h4 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-email-alt"></span><?php _e( 'Messages Sent to Primary Registrant', 'event_espresso' );?></h4>
+			<h4 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-email-alt"></span><?php _e('Messages Sent to Primary Registrant', 'event_espresso'); ?></h4>
 
 			<div class="admin-primary-mbox-tbl-wrap">
 				<table class="admin-primary-mbox-tbl">
 					<thead>
 						<tr>
-							<th class="jst-left"><?php _e( 'Date & Time', 'event_espresso' );?></th>
-							<th class="jst-left"><?php _e( 'Message Type', 'event_espresso' );?></th>
-							<th class="jst-left"><?php _e( 'Payment Status Upon Sending', 'event_espresso' );?></th>
-							<th class="jst-left"><?php _e( 'TXN Status Upon Sending', 'event_espresso' );?></th>
+							<th class="jst-left"><?php _e('Date & Time', 'event_espresso'); ?></th>
+							<th class="jst-left"><?php _e('Message Type', 'event_espresso'); ?></th>
+							<th class="jst-left"><?php _e('Payment Status Upon Sending', 'event_espresso'); ?></th>
+							<th class="jst-left"><?php _e('TXN Status Upon Sending', 'event_espresso'); ?></th>
 						</tr>
 					</thead>
 					<tbody>
-						<?php foreach ( $delivered_messages[ $TXN_ID ] as $timestamp => $delivered_message ) :
+						<?php foreach ($delivered_messages[$TXN_ID] as $timestamp => $delivered_message) :
 							?>
 							<tr>
-								<td class="jst-left"><?php echo gmdate( get_option('date_format') . ' ' . get_option('time_format'), ( $timestamp + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) ) );?></td>
-								<td class="jst-left"><?php echo isset( $delivered_message['message_type'] ) ? $delivered_message['message_type'] : '';?></td>
-								<td class="jst-left"><?php echo isset( $delivered_message['pay_status'] ) ? $delivered_message['pay_status'] : '';?></td>
-								<td class="jst-left"><?php echo isset( $delivered_message['txn_status'] ) ? $delivered_message['txn_status'] : '';?></td>
+								<td class="jst-left"><?php echo gmdate(get_option('date_format').' '.get_option('time_format'), ($timestamp + (get_option('gmt_offset') * HOUR_IN_SECONDS))); ?></td>
+								<td class="jst-left"><?php echo isset($delivered_message['message_type']) ? $delivered_message['message_type'] : ''; ?></td>
+								<td class="jst-left"><?php echo isset($delivered_message['pay_status']) ? $delivered_message['pay_status'] : ''; ?></td>
+								<td class="jst-left"><?php echo isset($delivered_message['txn_status']) ? $delivered_message['txn_status'] : ''; ?></td>
 							</tr>
 						<?php endforeach; // $delivered_messages?>
 					</tbody>

core/EE_Front_Controller.core.php

Spacing +122 added lines, -122 removed lines

@@ -61,7 +61,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof  EE_Front_Controller )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof  EE_Front_Controller)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -79,37 +79,37 @@ 
 	 */
 	private function __construct() {
 		// make sure template tags are loaded immediately so that themes don't break
-		add_action( 'AHEE__EE_System__core_loaded_and_ready', array( $this, 'load_espresso_template_tags' ), 10 );
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'load_espresso_template_tags'), 10);
 		// determine how to integrate WP_Query with the EE models
-		add_action( 'AHEE__EE_System__initialize', array( $this, 'employ_CPT_Strategy' ));
+		add_action('AHEE__EE_System__initialize', array($this, 'employ_CPT_Strategy'));
 		// load other resources and begin to actually run shortcodes and modules
-		add_action( 'wp_loaded', array( $this, 'wp_loaded' ), 5 );
+		add_action('wp_loaded', array($this, 'wp_loaded'), 5);
 		// analyse the incoming WP request
-		add_action( 'parse_request', array( $this, 'get_request' ), 1, 1 );
+		add_action('parse_request', array($this, 'get_request'), 1, 1);
 		// process any content shortcodes
-		add_action( 'parse_request', array( $this, '_initialize_shortcodes' ), 5 );
+		add_action('parse_request', array($this, '_initialize_shortcodes'), 5);
 		// process request with module factory
-		add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ), 10, 1 );
+		add_action('pre_get_posts', array($this, 'pre_get_posts'), 10, 1);
 		// before headers sent
-		add_action( 'wp', array( $this, 'wp' ), 5 );
+		add_action('wp', array($this, 'wp'), 5);
 		// load css and js
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 1 );
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 1);
 		// header
-		add_action('wp_head', array( $this, 'header_meta_tag' ), 5 );
-		add_filter( 'template_include', array( $this, 'template_include' ), 1 );
+		add_action('wp_head', array($this, 'header_meta_tag'), 5);
+		add_filter('template_include', array($this, 'template_include'), 1);
 		// display errors
-		add_action('loop_start', array( $this, 'display_errors' ), 2 );
+		add_action('loop_start', array($this, 'display_errors'), 2);
 		// the content
-		add_filter( 'the_content', array( $this, 'the_content' ), 5, 1 );
+		add_filter('the_content', array($this, 'the_content'), 5, 1);
 		//exclude our private cpt comments
-		add_filter( 'comments_clauses', array( $this, 'filter_wp_comments'), 10, 1 );
+		add_filter('comments_clauses', array($this, 'filter_wp_comments'), 10, 1);
 		//make sure any ajax requests will respect the url schema when requests are made against admin-ajax.php (http:// or https://)
-		add_filter( 'admin_url', array( $this, 'maybe_force_admin_ajax_ssl' ), 200, 1 );
+		add_filter('admin_url', array($this, 'maybe_force_admin_ajax_ssl'), 200, 1);
 		// action hook EE
-		do_action( 'AHEE__EE_Front_Controller__construct__done',$this );
+		do_action('AHEE__EE_Front_Controller__construct__done', $this);
 		// for checking that browser cookies are enabled
-		if ( apply_filters( 'FHEE__EE_Front_Controller____construct__set_test_cookie', true )) {
-			setcookie( 'ee_cookie_test', uniqid(), time() + 24 * HOUR_IN_SECONDS, '/' );
+		if (apply_filters('FHEE__EE_Front_Controller____construct__set_test_cookie', true)) {
+			setcookie('ee_cookie_test', uniqid(), time() + 24 * HOUR_IN_SECONDS, '/');
 		}
 	}
 
@@ -129,8 +129,8 @@ 
 	 * 	@return void
 	 */
 	public function load_espresso_template_tags() {
-		if ( is_readable( EE_PUBLIC . 'template_tags.php' )) {
-			require_once( EE_PUBLIC . 'template_tags.php' );
+		if (is_readable(EE_PUBLIC.'template_tags.php')) {
+			require_once(EE_PUBLIC.'template_tags.php');
 		}
 	}
 
@@ -145,12 +145,12 @@ 
 	 * @param  array $clauses array of comment clauses setup by WP_Comment_Query
 	 * @return array array of comment clauses with modifications.
 	 */
-	public function filter_wp_comments( $clauses ) {
+	public function filter_wp_comments($clauses) {
 		global $wpdb;
-		if ( strpos( $clauses['join'], $wpdb->posts ) !== FALSE ) {
+		if (strpos($clauses['join'], $wpdb->posts) !== FALSE) {
 			$cpts = EE_Register_CPTs::get_private_CPTs();
-			foreach ( $cpts as $cpt => $details ) {
-				$clauses['where'] .= $wpdb->prepare( " AND $wpdb->posts.post_type != %s", $cpt );
+			foreach ($cpts as $cpt => $details) {
+				$clauses['where'] .= $wpdb->prepare(" AND $wpdb->posts.post_type != %s", $cpt);
 			}
 		}
 		return $clauses;
@@ -167,8 +167,8 @@ 
 	 *  @return 	void
 	 */
 	public function employ_CPT_Strategy() {
-		if ( apply_filters( 'FHEE__EE_Front_Controller__employ_CPT_Strategy',true) ){
-			EE_Registry::instance()->load_core( 'CPT_Strategy' );
+		if (apply_filters('FHEE__EE_Front_Controller__employ_CPT_Strategy', true)) {
+			EE_Registry::instance()->load_core('CPT_Strategy');
 		}
 	}
 
@@ -180,9 +180,9 @@ 
 	 * @param  string $url    incoming url
 	 * @return string         final assembled url
 	 */
-	public function maybe_force_admin_ajax_ssl( $url ) {
-		if ( is_ssl() && preg_match( '/admin-ajax.php/', $url )) {
-			$url = str_replace( 'http://', 'https://', $url );
+	public function maybe_force_admin_ajax_ssl($url) {
+		if (is_ssl() && preg_match('/admin-ajax.php/', $url)) {
+			$url = str_replace('http://', 'https://', $url);
 		}
 		return $url;
 	}
@@ -219,12 +219,12 @@ 
 	 * @param WP $WP
 	 * @return void
 	 */
-	public function get_request( WP $WP ) {
-		do_action( 'AHEE__EE_Front_Controller__get_request__start' );
+	public function get_request(WP $WP) {
+		do_action('AHEE__EE_Front_Controller__get_request__start');
 		/** @var EE_Request_Handler $Request_Handler */
-		$Request_Handler = EE_Registry::instance()->load_core( 'Request_Handler' );
-		$Request_Handler->parse_request( $WP );
-		do_action( 'AHEE__EE_Front_Controller__get_request__complete' );
+		$Request_Handler = EE_Registry::instance()->load_core('Request_Handler');
+		$Request_Handler->parse_request($WP);
+		do_action('AHEE__EE_Front_Controller__get_request__complete');
 	}
 
 
@@ -236,22 +236,22 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public function _initialize_shortcodes( WP $WP ) {
-		do_action( 'AHEE__EE_Front_Controller__initialize_shortcodes__begin', $WP, $this );
+	public function _initialize_shortcodes(WP $WP) {
+		do_action('AHEE__EE_Front_Controller__initialize_shortcodes__begin', $WP, $this);
 		// grab post_name from request
-		$current_post = apply_filters( 'FHEE__EE_Front_Controller__initialize_shortcodes__current_post_name', EE_Registry::instance()->REQ->get( 'post_name' ));
+		$current_post = apply_filters('FHEE__EE_Front_Controller__initialize_shortcodes__current_post_name', EE_Registry::instance()->REQ->get('post_name'));
 		// if it's not set, then check if frontpage is blog
-		if ( empty( $current_post ) && get_option( 'show_on_front' ) == 'posts' ) {
+		if (empty($current_post) && get_option('show_on_front') == 'posts') {
 			// yup.. this is the posts page, prepare to load all shortcode modules
 			$current_post = 'posts';
-		} else if ( empty( $current_post ) && get_option( 'show_on_front' ) == 'page' ) {
+		} else if (empty($current_post) && get_option('show_on_front') == 'page') {
 			// some other page is set as the homepage
-			$page_on_front = get_option( 'page_on_front' );
-			if ( $page_on_front ) {
+			$page_on_front = get_option('page_on_front');
+			if ($page_on_front) {
 				// k now we need to find the post_name for this page
 				global $wpdb;
 				$SQL = "SELECT post_name from $wpdb->posts WHERE post_type='page' AND post_status='publish' AND ID=%d";
-				$page_on_front = $wpdb->get_var( $wpdb->prepare( $SQL, $page_on_front ));
+				$page_on_front = $wpdb->get_var($wpdb->prepare($SQL, $page_on_front));
 				// set the current post slug to what it actually is
 				$current_post = $page_on_front ? $page_on_front : $current_post;
 			}
@@ -259,58 +259,58 @@ 
 		// where are posts being displayed ?
 		$page_for_posts = EE_Config::get_page_for_posts();
 		// in case $current_post is hierarchical like: /parent-page/current-page
-		$current_post = basename( $current_post );
+		$current_post = basename($current_post);
 		// are we on a category page?
-		$term_exists = is_array( term_exists( $current_post, 'category' )) || array_key_exists( 'category_name', $WP->query_vars );
+		$term_exists = is_array(term_exists($current_post, 'category')) || array_key_exists('category_name', $WP->query_vars);
 		// make sure shortcodes are set
-		if ( isset( EE_Registry::instance()->CFG->core->post_shortcodes )) {
+		if (isset(EE_Registry::instance()->CFG->core->post_shortcodes)) {
 			// d( EE_Registry::instance()->CFG->core->post_shortcodes );
 			// cycle thru all posts with shortcodes set
-			foreach ( EE_Registry::instance()->CFG->core->post_shortcodes as $post_name => $post_shortcodes ) {
+			foreach (EE_Registry::instance()->CFG->core->post_shortcodes as $post_name => $post_shortcodes) {
 				// filter shortcodes so
-				$post_shortcodes = apply_filters( 'FHEE__Front_Controller__initialize_shortcodes__post_shortcodes', $post_shortcodes );
+				$post_shortcodes = apply_filters('FHEE__Front_Controller__initialize_shortcodes__post_shortcodes', $post_shortcodes);
 				// now cycle thru shortcodes
-				foreach ( $post_shortcodes as $shortcode_class => $post_id ) {
+				foreach ($post_shortcodes as $shortcode_class => $post_id) {
 					// are we on this page, or on the blog page, or an EE CPT category page ?
-					if ( $current_post == $post_name || $term_exists ) {
+					if ($current_post == $post_name || $term_exists) {
 						// verify shortcode is in list of registered shortcodes
-						if ( ! isset( EE_Registry::instance()->shortcodes->{$shortcode_class} )) {
-							if ( $current_post != $page_for_posts && current_user_can( 'edit_post', $post_id )) {
-								$msg = sprintf( __( 'The [%s] shortcode has not been properly registered or the corresponding addon/module is not active for some reason. Either fix/remove the shortcode from the post, or activate the addon/module the shortcode is associated with.', 'event_espresso' ), $shortcode_class );
-								EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
-								add_filter( 'FHEE_run_EE_the_content', '__return_true' );
+						if ( ! isset(EE_Registry::instance()->shortcodes->{$shortcode_class} )) {
+							if ($current_post != $page_for_posts && current_user_can('edit_post', $post_id)) {
+								$msg = sprintf(__('The [%s] shortcode has not been properly registered or the corresponding addon/module is not active for some reason. Either fix/remove the shortcode from the post, or activate the addon/module the shortcode is associated with.', 'event_espresso'), $shortcode_class);
+								EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+								add_filter('FHEE_run_EE_the_content', '__return_true');
 							}
-							add_shortcode( $shortcode_class, array( 'EES_Shortcode', 'invalid_shortcode_processor' ));
+							add_shortcode($shortcode_class, array('EES_Shortcode', 'invalid_shortcode_processor'));
 							continue;
 						}
 						// is this : a shortcodes set exclusively for this post, or for the home page, or a category, or a taxonomy ?
-						if ( isset( EE_Registry::instance()->CFG->core->post_shortcodes[ $current_post ] ) || $term_exists || $current_post == $page_for_posts ) {
+						if (isset(EE_Registry::instance()->CFG->core->post_shortcodes[$current_post]) || $term_exists || $current_post == $page_for_posts) {
 							// let's pause to reflect on this...
-							$sc_reflector = new ReflectionClass( 'EES_' . $shortcode_class );
+							$sc_reflector = new ReflectionClass('EES_'.$shortcode_class);
 							// ensure that class is actually a shortcode
-							if ( ! $sc_reflector->isSubclassOf( 'EES_Shortcode' ) && defined( 'WP_DEBUG' ) && WP_DEBUG === TRUE ) {
-								$msg = sprintf( __( 'The requested %s shortcode is not of the class "EES_Shortcode". Please check your files.', 'event_espresso' ), $shortcode_class );
-								EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
-								add_filter( 'FHEE_run_EE_the_content', '__return_true' );
+							if ( ! $sc_reflector->isSubclassOf('EES_Shortcode') && defined('WP_DEBUG') && WP_DEBUG === TRUE) {
+								$msg = sprintf(__('The requested %s shortcode is not of the class "EES_Shortcode". Please check your files.', 'event_espresso'), $shortcode_class);
+								EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+								add_filter('FHEE_run_EE_the_content', '__return_true');
 								continue;
 							}
 							// and pass the request object to the run method
 							EE_Registry::instance()->shortcodes->{$shortcode_class} = $sc_reflector->newInstance();
 							// fire the shortcode class's run method, so that it can activate resources
-							EE_Registry::instance()->shortcodes->{$shortcode_class}->run( $WP );
+							EE_Registry::instance()->shortcodes->{$shortcode_class}->run($WP);
 						}
 					// if this is NOT the "Posts page" and we have a valid entry for the "Posts page" in our tracked post_shortcodes array
-					} else if ( $post_name != $page_for_posts && isset( EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ] )) {
+					} else if ($post_name != $page_for_posts && isset(EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts])) {
 						// and the shortcode is not being tracked for this page
-						if ( ! isset( EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] )) {
+						if ( ! isset(EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts][$shortcode_class])) {
 							// then remove the "fallback" shortcode processor
-							remove_shortcode( $shortcode_class );
+							remove_shortcode($shortcode_class);
 						}
 					}
 				}
 			}
 		}
-		do_action( 'AHEE__EE_Front_Controller__initialize_shortcodes__end', $this );
+		do_action('AHEE__EE_Front_Controller__initialize_shortcodes__end', $this);
 	}
 
 
@@ -322,20 +322,20 @@ 
 	 * @param   WP_Query    $WP_Query
 	 * @return    void
 	 */
-	public function pre_get_posts( $WP_Query ) {
+	public function pre_get_posts($WP_Query) {
 		// only load Module_Request_Router if this is the main query
-		if ( $WP_Query->is_main_query() ) {
+		if ($WP_Query->is_main_query()) {
 			// load module request router
-			$Module_Request_Router = EE_Registry::instance()->load_core( 'Module_Request_Router' );
+			$Module_Request_Router = EE_Registry::instance()->load_core('Module_Request_Router');
 			// verify object
-			if ( $Module_Request_Router instanceof EE_Module_Request_Router ) {
+			if ($Module_Request_Router instanceof EE_Module_Request_Router) {
 				// cycle thru module routes
-				while ( $route = $Module_Request_Router->get_route( $WP_Query )) {
+				while ($route = $Module_Request_Router->get_route($WP_Query)) {
 					// determine module and method for route
-					$module = $Module_Request_Router->resolve_route( $route[0], $route[1] );
-					if( $module instanceof EED_Module ) {
+					$module = $Module_Request_Router->resolve_route($route[0], $route[1]);
+					if ($module instanceof EED_Module) {
 						// get registered view for route
-						$this->_template_path = $Module_Request_Router->get_view( $route );
+						$this->_template_path = $Module_Request_Router->get_view($route);
 						// grab module name
 						$module_name = $module->module_name();
 						// map the module to the module objects
@@ -362,7 +362,7 @@ 
 	 *  @return 	void
 	 */
 	public function wp() {
-		EE_Registry::instance()->load_helper( 'Template' );
+		EE_Registry::instance()->load_helper('Template');
 	}
 
 
@@ -380,30 +380,30 @@ 
 	public function wp_enqueue_scripts() {
 
 		// css is turned ON by default, but prior to the wp_enqueue_scripts hook, can be turned OFF  via:  add_filter( 'FHEE_load_css', '__return_false' );
-		if ( apply_filters( 'FHEE_load_css', TRUE ) ) {
+		if (apply_filters('FHEE_load_css', TRUE)) {
 
 			EE_Registry::instance()->CFG->template_settings->enable_default_style = TRUE;
 			//Load the ThemeRoller styles if enabled
-			if ( isset( EE_Registry::instance()->CFG->template_settings->enable_default_style ) && EE_Registry::instance()->CFG->template_settings->enable_default_style ) {
+			if (isset(EE_Registry::instance()->CFG->template_settings->enable_default_style) && EE_Registry::instance()->CFG->template_settings->enable_default_style) {
 
 				//Load custom style sheet if available
-				if ( isset( EE_Registry::instance()->CFG->template_settings->custom_style_sheet )) {
-					wp_register_style('espresso_custom_css', EVENT_ESPRESSO_UPLOAD_URL . 'css/' . EE_Registry::instance()->CFG->template_settings->custom_style_sheet, EVENT_ESPRESSO_VERSION );
+				if (isset(EE_Registry::instance()->CFG->template_settings->custom_style_sheet)) {
+					wp_register_style('espresso_custom_css', EVENT_ESPRESSO_UPLOAD_URL.'css/'.EE_Registry::instance()->CFG->template_settings->custom_style_sheet, EVENT_ESPRESSO_VERSION);
 					wp_enqueue_style('espresso_custom_css');
 				}
 
-				EE_Registry::instance()->load_helper( 'File' );
-				if ( is_readable( EVENT_ESPRESSO_UPLOAD_DIR . 'css/style.css' )) {
-					wp_register_style( 'espresso_default', EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css', array( 'dashicons' ), EVENT_ESPRESSO_VERSION );
+				EE_Registry::instance()->load_helper('File');
+				if (is_readable(EVENT_ESPRESSO_UPLOAD_DIR.'css/style.css')) {
+					wp_register_style('espresso_default', EVENT_ESPRESSO_UPLOAD_DIR.'css/espresso_default.css', array('dashicons'), EVENT_ESPRESSO_VERSION);
 				} else {
-					wp_register_style( 'espresso_default', EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css', array( 'dashicons' ), EVENT_ESPRESSO_VERSION );
+					wp_register_style('espresso_default', EE_GLOBAL_ASSETS_URL.'css/espresso_default.css', array('dashicons'), EVENT_ESPRESSO_VERSION);
 				}
 				wp_enqueue_style('espresso_default');
 
-				if ( is_readable( get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'style.css' )) {
-					wp_register_style( 'espresso_style', get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
+				if (is_readable(get_stylesheet_directory().EE_Config::get_current_theme().DS.'style.css')) {
+					wp_register_style('espresso_style', get_stylesheet_directory_uri().EE_Config::get_current_theme().DS.'style.css', array('dashicons', 'espresso_default'));
 				} else {
-					wp_register_style( 'espresso_style', EE_TEMPLATES_URL . EE_Config::get_current_theme() . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
+					wp_register_style('espresso_style', EE_TEMPLATES_URL.EE_Config::get_current_theme().DS.'style.css', array('dashicons', 'espresso_default'));
 				}
 
 			}
@@ -411,29 +411,29 @@ 
 		}
 
 		// js is turned ON by default, but prior to the wp_enqueue_scripts hook, can be turned OFF  via:  add_filter( 'FHEE_load_js', '__return_false' );
-		if ( apply_filters( 'FHEE_load_js', TRUE ) ) {
+		if (apply_filters('FHEE_load_js', TRUE)) {
 
-			wp_enqueue_script( 'jquery' );
+			wp_enqueue_script('jquery');
 			//let's make sure that all required scripts have been setup
-			if ( function_exists( 'wp_script_is' )) {
-				if ( ! wp_script_is( 'jquery' )) {
+			if (function_exists('wp_script_is')) {
+				if ( ! wp_script_is('jquery')) {
 					$msg = sprintf(
-						__( '%sJquery is not loaded!%sEvent Espresso is unable to load Jquery due to a conflict with your theme or another plugin.', 'event_espresso' ),
+						__('%sJquery is not loaded!%sEvent Espresso is unable to load Jquery due to a conflict with your theme or another plugin.', 'event_espresso'),
 						'<em><br />',
 						'</em>'
 					);
-					EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 			// load core js
-			wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_enqueue_script( 'espresso_core' );
-			wp_localize_script( 'espresso_core', 'eei18n', EE_Registry::$i18n_js_strings );
+			wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_enqueue_script('espresso_core');
+			wp_localize_script('espresso_core', 'eei18n', EE_Registry::$i18n_js_strings);
 
 		}
 
 		//qtip is turned OFF by default, but prior to the wp_enqueue_scripts hook, can be turned back on again via: add_filter('FHEE_load_qtip', '__return_true' );
-		if ( apply_filters( 'FHEE_load_qtip', FALSE ) ) {
+		if (apply_filters('FHEE_load_qtip', FALSE)) {
 			EE_Registry::instance()->load_helper('Qtip_Loader');
 			EEH_Qtip_Loader::instance()->register_and_enqueue();
 		}
@@ -441,11 +441,11 @@ 
 
 		//accounting.js library
 		// @link http://josscrowcroft.github.io/accounting.js/
-		if ( apply_filters( 'FHEE_load_accounting_js', FALSE ) ) {
-			$acct_js = EE_THIRD_PARTY_URL . 'accounting/accounting.js';
-			wp_register_script( 'ee-accounting', EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_register_script( 'ee-accounting-core', $acct_js, array('underscore'), '0.3.2', TRUE );
-			wp_enqueue_script( 'ee-accounting' );
+		if (apply_filters('FHEE_load_accounting_js', FALSE)) {
+			$acct_js = EE_THIRD_PARTY_URL.'accounting/accounting.js';
+			wp_register_script('ee-accounting', EE_GLOBAL_ASSETS_URL.'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_register_script('ee-accounting-core', $acct_js, array('underscore'), '0.3.2', TRUE);
+			wp_enqueue_script('ee-accounting');
 
 			$currency_config = array(
 				'currency' => array(
@@ -468,21 +468,21 @@ 
 			wp_localize_script('ee-accounting', 'EE_ACCOUNTING_CFG', $currency_config);
 		}
 
-		if ( ! function_exists( 'wp_head' )) {
+		if ( ! function_exists('wp_head')) {
 			$msg = sprintf(
-				__( '%sMissing wp_head() function.%sThe WordPress function wp_head() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.', 'event_espresso' ),
+				__('%sMissing wp_head() function.%sThe WordPress function wp_head() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.', 'event_espresso'),
 				'<em><br />',
 				'</em>'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
-		if ( ! function_exists( 'wp_footer' )) {
+		if ( ! function_exists('wp_footer')) {
 			$msg = sprintf(
-				__( '%sMissing wp_footer() function.%sThe WordPress function wp_footer() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.', 'event_espresso' ),
+				__('%sMissing wp_footer() function.%sThe WordPress function wp_footer() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.', 'event_espresso'),
 				'<em><br />',
 				'</em>'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 
 	}
@@ -496,7 +496,7 @@ 
 	 *  @return 	void
 	 */
 	public function header_meta_tag() {
-		print( apply_filters("FHEE__EE_Front_Controller__header_meta_tag","<meta name='generator' content='Event Espresso Version " . EVENT_ESPRESSO_VERSION . "' />"));
+		print(apply_filters("FHEE__EE_Front_Controller__header_meta_tag", "<meta name='generator' content='Event Espresso Version ".EVENT_ESPRESSO_VERSION."' />"));
 	}
 
 
@@ -510,9 +510,9 @@ 
 	 * @param   $the_content
 	 * @return    string
 	 */
-	public function the_content( $the_content ) {
+	public function the_content($the_content) {
 		// nothing gets loaded at this point unless other systems turn this hookpoint on by using:  add_filter( 'FHEE_run_EE_the_content', '__return_true' );
-		if ( apply_filters( 'FHEE_run_EE_the_content', FALSE ) ) {
+		if (apply_filters('FHEE_run_EE_the_content', FALSE)) {
 		}
 		return $the_content;
 	}
@@ -537,9 +537,9 @@ 
 	 */
 	public function display_errors() {
 		static $shown_already = FALSE;
-		do_action( 'AHEE__EE_Front_Controller__display_errors__begin' );
+		do_action('AHEE__EE_Front_Controller__display_errors__begin');
 		if (
-			apply_filters( 'FHEE__EE_Front_Controller__display_errors', TRUE )
+			apply_filters('FHEE__EE_Front_Controller__display_errors', TRUE)
 			&& ! $shown_already
 			&& is_main_query()
 			&& ! is_feed()
@@ -548,10 +548,10 @@ 
 		) {
 			echo EE_Error::get_notices();
 			$shown_already = TRUE;
-			EE_Registry::instance()->load_helper( 'Template' );
-			EEH_Template::display_template( EE_TEMPLATES . 'espresso-ajax-notices.template.php' );
+			EE_Registry::instance()->load_helper('Template');
+			EEH_Template::display_template(EE_TEMPLATES.'espresso-ajax-notices.template.php');
 		}
-		do_action( 'AHEE__EE_Front_Controller__display_errors__end' );
+		do_action('AHEE__EE_Front_Controller__display_errors__end');
 	}
 
 
@@ -566,12 +566,12 @@ 
 	 * @param   string $template_include_path
 	 * @return    string
 	 */
-	public function template_include( $template_include_path = NULL ) {
-		if ( EE_Registry::instance()->REQ->is_espresso_page() ) {
-			$this->_template_path = ! empty( $this->_template_path ) ? basename( $this->_template_path ) : basename( $template_include_path );
-			$template_path = EEH_Template::locate_template( $this->_template_path, array(), false );
-			$this->_template_path = ! empty( $template_path ) ? $template_path : $template_include_path;
-			$this->_template = basename( $this->_template_path );
+	public function template_include($template_include_path = NULL) {
+		if (EE_Registry::instance()->REQ->is_espresso_page()) {
+			$this->_template_path = ! empty($this->_template_path) ? basename($this->_template_path) : basename($template_include_path);
+			$template_path = EEH_Template::locate_template($this->_template_path, array(), false);
+			$this->_template_path = ! empty($template_path) ? $template_path : $template_include_path;
+			$this->_template = basename($this->_template_path);
 			return $this->_template_path;
 		}
 		return $template_include_path;
@@ -586,7 +586,7 @@ 
 	 * @param bool $with_path
 	 * @return    string
 	 */
-	public function get_selected_template( $with_path = FALSE ) {
+	public function get_selected_template($with_path = FALSE) {
 		return $with_path ? $this->_template_path : $this->_template;
 	}
 

core/EE_Load_Espresso_Core.core.php

Spacing +17 added lines, -17 removed lines

@@ -50,7 +50,7 @@ 
 	 * @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;
 		// central repository for classes
@@ -58,15 +58,15 @@ 
 		// workarounds for PHP < 5.3
 		$this->_load_class_tools();
 		// PSR4 Autoloaders
-		EE_Registry::instance()->load_core( 'EE_Psr4AutoloaderInit' );
+		EE_Registry::instance()->load_core('EE_Psr4AutoloaderInit');
 		// deprecated functions
-		espresso_load_required( 'EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php' );
+		espresso_load_required('EE_Deprecated', EE_CORE.'EE_Deprecated.core.php');
 		// load interfaces
-		espresso_load_required( 'EEI_Payment_Method_Interfaces', EE_LIBRARIES . 'payment_methods' . DS . 'EEI_Payment_Method_Interfaces.php' );
+		espresso_load_required('EEI_Payment_Method_Interfaces', EE_LIBRARIES.'payment_methods'.DS.'EEI_Payment_Method_Interfaces.php');
 		//// WP cron jobs
-		EE_Registry::instance()->load_core( 'Cron_Tasks' );
-		EE_Registry::instance()->load_core( 'Request_Handler' );
-		EE_Registry::instance()->load_core( 'EE_System' );
+		EE_Registry::instance()->load_core('Cron_Tasks');
+		EE_Registry::instance()->load_core('Request_Handler');
+		EE_Registry::instance()->load_core('EE_System');
 
 		return $this->response;
 	}
@@ -80,12 +80,12 @@ 
 	 * 	@return void
 	 */
 	private function _load_registry() {
-		if ( is_readable( EE_CORE . 'EE_Registry.core.php' )) {
-			require_once( EE_CORE . 'EE_Registry.core.php' );
+		if (is_readable(EE_CORE.'EE_Registry.core.php')) {
+			require_once(EE_CORE.'EE_Registry.core.php');
 		} else {
-			$msg = __( 'The EE_Registry core class could not be loaded.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
-			wp_die( EE_Error::get_notices() );
+			$msg = __('The EE_Registry core class could not be loaded.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			wp_die(EE_Error::get_notices());
 		}
 	}
 
@@ -97,11 +97,11 @@ 
 	 * 	@return void
 	 */
 	private function _load_class_tools() {
-		if ( is_readable( EE_HELPERS . 'EEH_Class_Tools.helper.php' )) {
-			require_once( EE_HELPERS . 'EEH_Class_Tools.helper.php' );
+		if (is_readable(EE_HELPERS.'EEH_Class_Tools.helper.php')) {
+			require_once(EE_HELPERS.'EEH_Class_Tools.helper.php');
 		} else {
-			$msg = __( 'The EEH_Class_Tools helper could not be loaded.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			$msg = __('The EEH_Class_Tools helper could not be loaded.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -116,7 +116,7 @@ 
 	 * @param \EE_Request $request
 	 * @param \EE_Response $response
 	 */
-	public function handle_response( EE_Request $request, EE_Response $response ) {
+	public function handle_response(EE_Request $request, EE_Response $response) {
 		//EEH_Debug_Tools::printr( $request, '$request', __FILE__, __LINE__ );
 		//EEH_Debug_Tools::printr( $response, '$response', __FILE__, __LINE__ );
 		//die();

core/business/EE_Transaction_Payments.class.php

Spacing +56 added lines, -56 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
-EE_Registry::instance()->load_class( 'Processor_Base' );
+EE_Registry::instance()->load_class('Processor_Base');
 
 /**
  * Class EE_Transaction_Payments
@@ -44,7 +44,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Transaction_Payments ) {
+		if ( ! self::$_instance instanceof EE_Transaction_Payments) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -72,9 +72,9 @@ 
 	/**
 	 * @param string $old_txn_status
 	 */
-	public function set_old_txn_status( $old_txn_status ) {
+	public function set_old_txn_status($old_txn_status) {
 		// only set the first time
-		if ( $this->_old_txn_status === null ) {
+		if ($this->_old_txn_status === null) {
 			$this->_old_txn_status = $old_txn_status;
 		}
 	}
@@ -93,7 +93,7 @@ 
 	/**
 	 * @param string $new_txn_status
 	 */
-	public function set_new_txn_status( $new_txn_status ) {
+	public function set_new_txn_status($new_txn_status) {
 		$this->_new_txn_status = $new_txn_status;
 	}
 
@@ -105,7 +105,7 @@ 
 	 * @return bool
 	 */
 	public function txn_status_updated() {
-		return $this->_new_txn_status !== $this->_old_txn_status && $this->_old_txn_status !== null  ? true : false;
+		return $this->_new_txn_status !== $this->_old_txn_status && $this->_old_txn_status !== null ? true : false;
 	}
 
 
@@ -124,22 +124,22 @@ 
 	 * @param 	boolean $update_txn  	whether to save the TXN
 	 * @return 	boolean 	 	whether the TXN was saved
 	 */
-	public function calculate_total_payments_and_update_status( EE_Transaction $transaction, $update_txn = true ){
+	public function calculate_total_payments_and_update_status(EE_Transaction $transaction, $update_txn = true) {
 		// verify transaction
-		if ( ! $transaction instanceof EE_Transaction ) {
-			EE_Error::add_error( __( 'Please provide a valid EE_Transaction object.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $transaction instanceof EE_Transaction) {
+			EE_Error::add_error(__('Please provide a valid EE_Transaction object.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// set incoming TXN_Status
-		$this->set_old_txn_status( $transaction->status_ID() );
+		$this->set_old_txn_status($transaction->status_ID());
 		// calculate total paid
-		$total_paid = $this->recalculate_total_payments_for_transaction( $transaction );
+		$total_paid = $this->recalculate_total_payments_for_transaction($transaction);
 		// if total paid has changed
-		if ( $total_paid != $transaction->paid() ) {
-			$transaction->set_paid( $total_paid );
+		if ($total_paid != $transaction->paid()) {
+			$transaction->set_paid($total_paid);
 			// maybe update status, and make sure to save transaction if not done already
-			if ( ! $this->update_transaction_status_based_on_total_paid( $transaction, $update_txn )) {
-				if ( $update_txn ) {
+			if ( ! $this->update_transaction_status_based_on_total_paid($transaction, $update_txn)) {
+				if ($update_txn) {
 					return $transaction->save() ? true : false;
 				}
 			} else {
@@ -160,18 +160,18 @@ 
 	 *		@param	string $payment_status, one of EEM_Payment's statuses, like 'PAP' (Approved). By default, searches for approved payments
 	 *		@return 		mixed		float on success, false on fail
 	 */
-	public function recalculate_total_payments_for_transaction( EE_Transaction $transaction, $payment_status = EEM_Payment::status_id_approved ) {
+	public function recalculate_total_payments_for_transaction(EE_Transaction $transaction, $payment_status = EEM_Payment::status_id_approved) {
 		// verify transaction
-		if ( ! $transaction instanceof EE_Transaction ) {
-			EE_Error::add_error( __( 'Please provide a valid EE_Transaction object.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $transaction instanceof EE_Transaction) {
+			EE_Error::add_error(__('Please provide a valid EE_Transaction object.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// ensure Payment model is loaded
-		EE_Registry::instance()->load_model( 'Payment' );
+		EE_Registry::instance()->load_model('Payment');
 		// calls EEM_Base::sum()
 		return EEM_Payment::instance()->sum(
 			// query params
-			array( array( 'TXN_ID' => $transaction->ID(), 'STS_ID' => $payment_status )),
+			array(array('TXN_ID' => $transaction->ID(), 'STS_ID' => $payment_status)),
 			// field to sum
 			'PAY_amount'
 		);
@@ -187,37 +187,37 @@ 
 	 * @return 	boolean 	 	whether the TXN was saved
 	 * @throws \EE_Error
 	 */
-	public function update_transaction_status_based_on_total_paid( EE_Transaction $transaction, $update_txn = TRUE ) {
+	public function update_transaction_status_based_on_total_paid(EE_Transaction $transaction, $update_txn = TRUE) {
 		// verify transaction
-		if ( ! $transaction instanceof EE_Transaction ) {
+		if ( ! $transaction instanceof EE_Transaction) {
 			EE_Error::add_error(
-				__( 'Please provide a valid EE_Transaction object.', 'event_espresso' ),
+				__('Please provide a valid EE_Transaction object.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 			return FALSE;
 		}
-		EE_Registry::instance()->load_helper( 'Money' );
+		EE_Registry::instance()->load_helper('Money');
 		// set incoming TXN_Status
-		$this->set_old_txn_status( $transaction->status_ID() );
+		$this->set_old_txn_status($transaction->status_ID());
 		// set transaction status based on comparison of TXN_paid vs TXN_total
-		if ( EEH_Money::compare_floats( $transaction->paid(), $transaction->total(), '>' ) ){
+		if (EEH_Money::compare_floats($transaction->paid(), $transaction->total(), '>')) {
 			$new_txn_status = EEM_Transaction::overpaid_status_code;
-		} else if ( EEH_Money::compare_floats( $transaction->paid(), $transaction->total() ) ) {
+		} else if (EEH_Money::compare_floats($transaction->paid(), $transaction->total())) {
 			$new_txn_status = EEM_Transaction::complete_status_code;
-		} else if ( EEH_Money::compare_floats( $transaction->paid(), $transaction->total(), '<' ) ) {
+		} else if (EEH_Money::compare_floats($transaction->paid(), $transaction->total(), '<')) {
 			$new_txn_status = EEM_Transaction::incomplete_status_code;
 		} else {
 			EE_Error::add_error(
-				__( 'The total paid calculation for this transaction is inaccurate.', 'event_espresso' ),
+				__('The total paid calculation for this transaction is inaccurate.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 			return FALSE;
 		}
-		if ( $new_txn_status !== $transaction->status_ID() ) {
+		if ($new_txn_status !== $transaction->status_ID()) {
 			// set incoming TXN_Status
-			$this->set_new_txn_status( $new_txn_status );
-			$transaction->set_status( $new_txn_status );
-			if ( $update_txn ) {
+			$this->set_new_txn_status($new_txn_status);
+			$transaction->set_status($new_txn_status);
+			if ($update_txn) {
 				return $transaction->save() ? TRUE : FALSE;
 			}
 		}
@@ -236,17 +236,17 @@ 
 	 * @param EE_Payment $payment
 	 * @return boolean
 	 */
-	public function delete_payment_and_update_transaction( EE_Payment $payment ) {
+	public function delete_payment_and_update_transaction(EE_Payment $payment) {
 		// verify payment
-		if ( ! $payment instanceof EE_Payment ) {
-			EE_Error::add_error( __( 'A valid Payment object was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $payment instanceof EE_Payment) {
+			EE_Error::add_error(__('A valid Payment object was not received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		if ( ! $this->delete_registration_payments_and_update_registrations( $payment ) ) {
+		if ( ! $this->delete_registration_payments_and_update_registrations($payment)) {
 			return false;
 		}
-		if ( ! $payment->delete() ) {
-			EE_Error::add_error( __( 'The payment could not be deleted.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $payment->delete()) {
+			EE_Error::add_error(__('The payment could not be deleted.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
@@ -257,14 +257,14 @@ 
 			|| $transaction->status_ID() === EEM_Transaction::failed_status_code
 			|| $payment->amount() === 0
 		) {
-			EE_Error::add_success( __( 'The Payment was successfully deleted.', 'event_espresso' ) );
+			EE_Error::add_success(__('The Payment was successfully deleted.', 'event_espresso'));
 			return true;
 		}
 
 
 		//if this fails, that just means that the transaction didn't get its status changed and/or updated.
 		//however the payment was still deleted.
-		if ( ! $this->calculate_total_payments_and_update_status( $transaction ) ) {
+		if ( ! $this->calculate_total_payments_and_update_status($transaction)) {
 
 			EE_Error::add_attention(
 				__(
@@ -298,28 +298,28 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function delete_registration_payments_and_update_registrations( EE_Payment $payment, $reg_payment_query_params = array() ) {
+	public function delete_registration_payments_and_update_registrations(EE_Payment $payment, $reg_payment_query_params = array()) {
 		$save_payment = false;
-		$reg_payment_query_params = ! empty( $reg_payment_query_params ) ? $reg_payment_query_params : array( array( 'PAY_ID' => $payment->ID() ) );
-		$registration_payments = EEM_Registration_Payment::instance()->get_all( $reg_payment_query_params );
-		if ( ! empty( $registration_payments )) {
-			foreach ( $registration_payments as $registration_payment ) {
-				if ( $registration_payment instanceof EE_Registration_Payment ) {
+		$reg_payment_query_params = ! empty($reg_payment_query_params) ? $reg_payment_query_params : array(array('PAY_ID' => $payment->ID()));
+		$registration_payments = EEM_Registration_Payment::instance()->get_all($reg_payment_query_params);
+		if ( ! empty($registration_payments)) {
+			foreach ($registration_payments as $registration_payment) {
+				if ($registration_payment instanceof EE_Registration_Payment) {
 					$amount_paid = $registration_payment->amount();
 					$registration = $registration_payment->registration();
-					if ( $registration instanceof EE_Registration ) {
-						$registration->set_paid( $registration->paid() - $amount_paid );
-						if ( $registration->save() ) {
-							if ( $registration_payment->delete() ) {
-								$registration->_remove_relation_to( $payment, 'Payment' );
-								$payment->_remove_relation_to( $registration, 'Registration' );
+					if ($registration instanceof EE_Registration) {
+						$registration->set_paid($registration->paid() - $amount_paid);
+						if ($registration->save()) {
+							if ($registration_payment->delete()) {
+								$registration->_remove_relation_to($payment, 'Payment');
+								$payment->_remove_relation_to($registration, 'Registration');
 							}
 							$save_payment = true;
 						}
 					} else {
 						EE_Error::add_error(
 							sprintf(
-								__( 'An invalid Registration object was associated with Registration Payment ID# %1$d.', 'event_espresso' ),
+								__('An invalid Registration object was associated with Registration Payment ID# %1$d.', 'event_espresso'),
 								$registration_payment->ID()
 							),
 							__FILE__, __FUNCTION__, __LINE__
@@ -329,7 +329,7 @@ 
 				} else {
 					EE_Error::add_error(
 						sprintf(
-							__( 'An invalid Registration Payment object was associated with payment ID# %1$d.', 'event_espresso' ),
+							__('An invalid Registration Payment object was associated with payment ID# %1$d.', 'event_espresso'),
 							$payment->ID()
 						),
 						__FILE__, __FUNCTION__, __LINE__
@@ -338,7 +338,7 @@ 
 				}
 			}
 		}
-		if ( $save_payment ) {
+		if ($save_payment) {
 			$payment->save();
 		}
 		return true;

core/db_classes/EE_Attendee.class.php

Spacing +97 added lines, -97 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -33,20 +33,20 @@ 
 	 * @param string $timezone
 	 * @param array $date_formats
 	 */
-	protected function __construct( $fieldValues = NULL, $bydb = FALSE, $timezone = NULL, $date_formats = array() ) {
-		if ( !isset( $fieldValues[ 'ATT_full_name' ] ) ) {
-			$fname = isset( $fieldValues[ 'ATT_fname' ] ) ? $fieldValues[ 'ATT_fname' ] . ' ' : '';
-			$lname = isset( $fieldValues[ 'ATT_lname' ] ) ? $fieldValues[ 'ATT_lname' ] : '';
-			$fieldValues[ 'ATT_full_name' ] = $fname . $lname;
+	protected function __construct($fieldValues = NULL, $bydb = FALSE, $timezone = NULL, $date_formats = array()) {
+		if ( ! isset($fieldValues['ATT_full_name'])) {
+			$fname = isset($fieldValues['ATT_fname']) ? $fieldValues['ATT_fname'].' ' : '';
+			$lname = isset($fieldValues['ATT_lname']) ? $fieldValues['ATT_lname'] : '';
+			$fieldValues['ATT_full_name'] = $fname.$lname;
 		}
-		if ( !isset( $fieldValues[ 'ATT_slug' ] ) ) {
+		if ( ! isset($fieldValues['ATT_slug'])) {
 			//			$fieldValues['ATT_slug'] = sanitize_key(wp_generate_password(20));
-			$fieldValues[ 'ATT_slug' ] = sanitize_title( $fieldValues[ 'ATT_full_name' ] );
+			$fieldValues['ATT_slug'] = sanitize_title($fieldValues['ATT_full_name']);
 		}
-		if ( !isset( $fieldValues[ 'ATT_short_bio' ] ) && isset( $fieldValues[ 'ATT_bio' ] ) ) {
-			$fieldValues[ 'ATT_short_bio' ] = substr( $fieldValues[ 'ATT_bio' ], 0, 50 );
+		if ( ! isset($fieldValues['ATT_short_bio']) && isset($fieldValues['ATT_bio'])) {
+			$fieldValues['ATT_short_bio'] = substr($fieldValues['ATT_bio'], 0, 50);
 		}
-		parent::__construct( $fieldValues, $bydb, $timezone, $date_formats );
+		parent::__construct($fieldValues, $bydb, $timezone, $date_formats);
 	}
 
 
@@ -60,9 +60,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -73,8 +73,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -85,8 +85,8 @@ 
 	 * @access        public
 	 * @param string $fname
 	 */
-	public function set_fname( $fname = '' ) {
-		$this->set( 'ATT_fname', $fname );
+	public function set_fname($fname = '') {
+		$this->set('ATT_fname', $fname);
 	}
 
 
@@ -97,8 +97,8 @@ 
 	 * @access        public
 	 * @param string $lname
 	 */
-	public function set_lname( $lname = '' ) {
-		$this->set( 'ATT_lname', $lname );
+	public function set_lname($lname = '') {
+		$this->set('ATT_lname', $lname);
 	}
 
 
@@ -109,8 +109,8 @@ 
 	 * @access        public
 	 * @param string $address
 	 */
-	public function set_address( $address = '' ) {
-		$this->set( 'ATT_address', $address );
+	public function set_address($address = '') {
+		$this->set('ATT_address', $address);
 	}
 
 
@@ -121,8 +121,8 @@ 
 	 * @access        public
 	 * @param        string $address2
 	 */
-	public function set_address2( $address2 = '' ) {
-		$this->set( 'ATT_address2', $address2 );
+	public function set_address2($address2 = '') {
+		$this->set('ATT_address2', $address2);
 	}
 
 
@@ -133,8 +133,8 @@ 
 	 * @access        public
 	 * @param        string $city
 	 */
-	public function set_city( $city = '' ) {
-		$this->set( 'ATT_city', $city );
+	public function set_city($city = '') {
+		$this->set('ATT_city', $city);
 	}
 
 
@@ -145,8 +145,8 @@ 
 	 * @access        public
 	 * @param        int $STA_ID
 	 */
-	public function set_state( $STA_ID = 0 ) {
-		$this->set( 'STA_ID', $STA_ID );
+	public function set_state($STA_ID = 0) {
+		$this->set('STA_ID', $STA_ID);
 	}
 
 
@@ -157,8 +157,8 @@ 
 	 * @access        public
 	 * @param        string $CNT_ISO
 	 */
-	public function set_country( $CNT_ISO = '' ) {
-		$this->set( 'CNT_ISO', $CNT_ISO );
+	public function set_country($CNT_ISO = '') {
+		$this->set('CNT_ISO', $CNT_ISO);
 	}
 
 
@@ -169,8 +169,8 @@ 
 	 * @access        public
 	 * @param        string $zip
 	 */
-	public function set_zip( $zip = '' ) {
-		$this->set( 'ATT_zip', $zip );
+	public function set_zip($zip = '') {
+		$this->set('ATT_zip', $zip);
 	}
 
 
@@ -181,8 +181,8 @@ 
 	 * @access        public
 	 * @param        string $email
 	 */
-	public function set_email( $email = '' ) {
-		$this->set( 'ATT_email', $email );
+	public function set_email($email = '') {
+		$this->set('ATT_email', $email);
 	}
 
 
@@ -193,8 +193,8 @@ 
 	 * @access        public
 	 * @param        string $phone
 	 */
-	public function set_phone( $phone = '' ) {
-		$this->set( 'ATT_phone', $phone );
+	public function set_phone($phone = '') {
+		$this->set('ATT_phone', $phone);
 	}
 
 
@@ -205,8 +205,8 @@ 
 	 * @access        public
 	 * @param        bool $ATT_deleted
 	 */
-	public function set_deleted( $ATT_deleted = FALSE ) {
-		$this->set( 'ATT_deleted', $ATT_deleted );
+	public function set_deleted($ATT_deleted = FALSE) {
+		$this->set('ATT_deleted', $ATT_deleted);
 	}
 
 
@@ -219,7 +219,7 @@ 
 	 * @return int
 	 */
 	public function wp_user() {
-		return $this->get( 'ATT_author' );
+		return $this->get('ATT_author');
 	}
 
 
@@ -230,7 +230,7 @@ 
 	 * @return string
 	 */
 	public function fname() {
-		return $this->get( 'ATT_fname' );
+		return $this->get('ATT_fname');
 	}
 
 
@@ -250,9 +250,9 @@ 
 	 * @param bool $apply_html_entities
 	 * @return string
 	 */
-	public function full_name( $apply_html_entities = FALSE ) {
-		$full_name = $this->fname() . ' ' . $this->lname();
-		return $apply_html_entities ? htmlentities( $full_name, ENT_QUOTES, 'UTF-8' ) : $full_name;
+	public function full_name($apply_html_entities = FALSE) {
+		$full_name = $this->fname().' '.$this->lname();
+		return $apply_html_entities ? htmlentities($full_name, ENT_QUOTES, 'UTF-8') : $full_name;
 	}
 
 
@@ -263,7 +263,7 @@ 
 	 * @return string
 	 */
 	public function lname() {
-		return $this->get( 'ATT_lname' );
+		return $this->get('ATT_lname');
 	}
 
 
@@ -277,26 +277,26 @@ 
 	 */
 	public function full_address_as_array() {
 		$full_address_array = array();
-		$initial_address_fields = array( 'ATT_address', 'ATT_address2', 'ATT_city', );
-		foreach ( $initial_address_fields as $address_field_name ) {
-			$address_fields_value = $this->get( $address_field_name );
-			if ( !empty( $address_fields_value ) ) {
-				$full_address_array[ ] = $address_fields_value;
+		$initial_address_fields = array('ATT_address', 'ATT_address2', 'ATT_city',);
+		foreach ($initial_address_fields as $address_field_name) {
+			$address_fields_value = $this->get($address_field_name);
+			if ( ! empty($address_fields_value)) {
+				$full_address_array[] = $address_fields_value;
 			}
 		}
 		//now handle state and country
 		$state_obj = $this->state_obj();
-		if ( !empty( $state_obj ) ) {
-			$full_address_array[ ] = $state_obj->name();
+		if ( ! empty($state_obj)) {
+			$full_address_array[] = $state_obj->name();
 		}
 		$country_obj = $this->country_obj();
-		if ( !empty( $country_obj ) ) {
-			$full_address_array[ ] = $country_obj->name();
+		if ( ! empty($country_obj)) {
+			$full_address_array[] = $country_obj->name();
 		}
 		//lastly get the xip
 		$zip_value = $this->zip();
-		if ( !empty( $zip_value ) ) {
-			$full_address_array[ ] = $zip_value;
+		if ( ! empty($zip_value)) {
+			$full_address_array[] = $zip_value;
 		}
 		return $full_address_array;
 	}
@@ -308,7 +308,7 @@ 
 	 * @return string
 	 */
 	public function address() {
-		return $this->get( 'ATT_address' );
+		return $this->get('ATT_address');
 	}
 
 
@@ -318,7 +318,7 @@ 
 	 * @return string
 	 */
 	public function address2() {
-		return $this->get( 'ATT_address2' );
+		return $this->get('ATT_address2');
 	}
 
 
@@ -328,7 +328,7 @@ 
 	 * @return string
 	 */
 	public function city() {
-		return $this->get( 'ATT_city' );
+		return $this->get('ATT_city');
 	}
 
 
@@ -338,7 +338,7 @@ 
 	 * @return string
 	 */
 	public function state_ID() {
-		return $this->get( 'STA_ID' );
+		return $this->get('STA_ID');
 	}
 
 
@@ -347,7 +347,7 @@ 
 	 * @return string
 	 */
 	public function state_abbrev() {
-		return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : __( 'Unknown', 'event_espresso' );
+		return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : __('Unknown', 'event_espresso');
 	}
 
 
@@ -357,18 +357,18 @@ 
 	 * @return EE_State
 	 */
 	public function state_obj() {
-		return $this->get_first_related( 'State' );
+		return $this->get_first_related('State');
 	}
 
 	/**
 	 * Returns the state's name, otherwise 'Unknown'
 	 * @return string
 	 */
-	public function state_name(){
-		if( $this->state_obj() ){
+	public function state_name() {
+		if ($this->state_obj()) {
 			return $this->state_obj()->name();
-		}else{
-			return __( 'Unknown', 'event_espresso' );
+		} else {
+			return __('Unknown', 'event_espresso');
 		}
 	}
 
@@ -381,7 +381,7 @@ 
 	 * @return string
 	 */
 	public function state() {
-		if ( apply_filters( 'FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj() ) ) {
+		if (apply_filters('FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj())) {
 			return $this->state_abbrev();
 		} else {
 			return $this->state_name();
@@ -395,7 +395,7 @@ 
 	 * @return string
 	 */
 	public function country_ID() {
-		return $this->get( 'CNT_ISO' );
+		return $this->get('CNT_ISO');
 	}
 
 
@@ -405,18 +405,18 @@ 
 	 * @return EE_Country
 	 */
 	public function country_obj() {
-		return $this->get_first_related( 'Country' );
+		return $this->get_first_related('Country');
 	}
 
 	/**
 	 * Returns the country's name if known, otherwise 'Unknown'
 	 * @return string
 	 */
-	public function country_name(){
-		if( $this->country_obj() ){
+	public function country_name() {
+		if ($this->country_obj()) {
 			return $this->country_obj()->name();
-		}else{
-			return __( 'Unknown', 'event_espresso' );
+		} else {
+			return __('Unknown', 'event_espresso');
 		}
 	}
 
@@ -429,7 +429,7 @@ 
 	 * @return string
 	 */
 	public function country() {
-		if ( apply_filters( 'FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj() ) ) {
+		if (apply_filters('FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj())) {
 			return $this->country_ID();
 		} else {
 			return $this->country_name();
@@ -443,7 +443,7 @@ 
 	 * @return string
 	 */
 	public function zip() {
-		return $this->get( 'ATT_zip' );
+		return $this->get('ATT_zip');
 	}
 
 
@@ -453,7 +453,7 @@ 
 	 * @return string
 	 */
 	public function email() {
-		return $this->get( 'ATT_email' );
+		return $this->get('ATT_email');
 	}
 
 
@@ -463,7 +463,7 @@ 
 	 * @return string
 	 */
 	public function phone() {
-		return $this->get( 'ATT_phone' );
+		return $this->get('ATT_phone');
 	}
 
 
@@ -473,7 +473,7 @@ 
 	 * @return        bool
 	 */
 	public function deleted() {
-		return $this->get( 'ATT_deleted' );
+		return $this->get('ATT_deleted');
 	}
 
 
@@ -483,8 +483,8 @@ 
 	 * @param array $query_params
 	 * @return EE_Registration[]
 	 */
-	public function get_registrations( $query_params = array() ) {
-		return $this->get_many_related( 'Registration', $query_params );
+	public function get_registrations($query_params = array()) {
+		return $this->get_many_related('Registration', $query_params);
 	}
 
 
@@ -494,7 +494,7 @@ 
 	 * @return EE_Registration
 	 */
 	public function get_most_recent_registration() {
-		return $this->get_first_related( 'Registration', array( 'order_by' => array( 'REG_date' => 'DESC' ) ) ); //null, 'REG_date', 'DESC', '=', 'OBJECT_K');
+		return $this->get_first_related('Registration', array('order_by' => array('REG_date' => 'DESC'))); //null, 'REG_date', 'DESC', '=', 'OBJECT_K');
 	}
 
 
@@ -504,8 +504,8 @@ 
 	 * @param int $event_id
 	 * @return EE_Registration
 	 */
-	public function get_most_recent_registration_for_event( $event_id ) {
-		return $this->get_first_related( 'Registration', array(array( 'EVT_ID' => $event_id ), 'order_by' => array('REG_date' => 'DESC')));//, '=', 'OBJECT_K' );
+	public function get_most_recent_registration_for_event($event_id) {
+		return $this->get_first_related('Registration', array(array('EVT_ID' => $event_id), 'order_by' => array('REG_date' => 'DESC'))); //, '=', 'OBJECT_K' );
 	}
 
 
@@ -515,7 +515,7 @@ 
 	 * @return array
 	 */
 	public function events() {
-		return $this->get_many_related( 'Event' );
+		return $this->get_many_related('Event');
 	}
 
 	/**
@@ -524,17 +524,17 @@ 
 	 * @param EE_Payment_Method $payment_method the _gateway_name property on the gateway class
 	 * @return EE_Form_Section_Proper
 	 */
-	public function billing_info_for_payment_method($payment_method){
+	public function billing_info_for_payment_method($payment_method) {
 		$pm_type = $payment_method->type_obj();
-		if( ! $pm_type instanceof EE_PMT_Base ){
+		if ( ! $pm_type instanceof EE_PMT_Base) {
 			return NULL;
 		}
-		$billing_info =  $this->get_post_meta( $this->get_billing_info_postmeta_name( $payment_method ), true );
-		if ( ! $billing_info){
+		$billing_info = $this->get_post_meta($this->get_billing_info_postmeta_name($payment_method), true);
+		if ( ! $billing_info) {
 			return NULL;
 		}
 		$billing_form = $pm_type->billing_form();
-		$billing_form->receive_form_submission( array( $billing_form->name() => $billing_info ), FALSE );
+		$billing_form->receive_form_submission(array($billing_form->name() => $billing_info), FALSE);
 		return $billing_form;
 	}
 
@@ -544,10 +544,10 @@ 
 	 * @param EE_Payment_Method $payment_method
 	 * @return string
 	 */
-	public function get_billing_info_postmeta_name($payment_method){
-		if( $payment_method->type_obj() instanceof EE_PMT_Base ){
-			return 'billing_info_' . $payment_method->type_obj()->system_name();
-		}else{
+	public function get_billing_info_postmeta_name($payment_method) {
+		if ($payment_method->type_obj() instanceof EE_PMT_Base) {
+			return 'billing_info_'.$payment_method->type_obj()->system_name();
+		} else {
 			return NULL;
 		}
 	}
@@ -558,13 +558,13 @@ 
 	 * @param EE_Payment_Method $payment_method
 	 * @return boolean
 	 */
-	public function save_and_clean_billing_info_for_payment_method($billing_form, $payment_method){
-		if( ! $billing_form instanceof EE_Billing_Attendee_Info_Form ){
-			EE_Error::add_error( __( 'Cannot save billing info because there is none.', 'event_espresso' ) );
+	public function save_and_clean_billing_info_for_payment_method($billing_form, $payment_method) {
+		if ( ! $billing_form instanceof EE_Billing_Attendee_Info_Form) {
+			EE_Error::add_error(__('Cannot save billing info because there is none.', 'event_espresso'));
 			return false;
 		}
 		$billing_form->clean_sensitive_data();
-		return update_post_meta($this->ID(), $this->get_billing_info_postmeta_name( $payment_method ), $billing_form->input_values( true ) );
+		return update_post_meta($this->ID(), $this->get_billing_info_postmeta_name($payment_method), $billing_form->input_values(true));
 	}
 
 }

core/db_classes/EE_Change_Log.class.php

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Change_Log extends EE_Base_Class{
+class EE_Change_Log extends EE_Base_Class {
 
 	/**
 	 *
@@ -36,9 +36,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -49,8 +49,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 	/**
 	 * Gets message
@@ -147,12 +147,12 @@ 
 	 * Gets the model object attached to this log
 	 * @return EE_Base_Class
 	 */
-	function object(){
+	function object() {
 		$model_name_of_related_obj = $this->OBJ_type();
 		$is_model_name = EE_Registry::instance()->is_model_name($model_name_of_related_obj);
-		if( ! $is_model_name ){
+		if ( ! $is_model_name) {
 			return null;
-		}else{
+		} else {
 			return $this->get_first_related($model_name_of_related_obj);
 		}
 	}
@@ -165,17 +165,17 @@ 
 	 * @param boolean $save
 	 * @return boolean if $save=true, NULL is $save=false
 	 */
-	function set_object($object, $save = TRUE ) {
-		if($object instanceof EE_Base_Class){
+	function set_object($object, $save = TRUE) {
+		if ($object instanceof EE_Base_Class) {
 			$this->set_OBJ_type($object->get_model()->get_this_model_name());
 			$this->set_OBJ_ID($object->ID());
-		}else{
+		} else {
 			$this->set_OBJ_type(NULL);
 			$this->set_OBJ_ID(NULL);
 		}
-		if($save){
+		if ($save) {
 			return $this->save();
-		}else{
+		} else {
 			return NULL;
 		}
 	}

core/db_classes/EE_Checkin.class.php

Spacing +8 added lines, -8 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__, '');
 /**
  * Event Espresso
  *
@@ -23,7 +23,7 @@ 
  * @subpackage		includes/classes/EE_Checkin.class.php
  * @author				Darren Ethier
  */
-class EE_Checkin extends EE_Base_Class{
+class EE_Checkin extends EE_Base_Class {
 
 	/**
 	 *
@@ -34,9 +34,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Checkin
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -47,8 +47,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Checkin
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 

core/db_classes/EE_Currency.class.php

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Currency extends EE_Base_Class{
+class EE_Currency extends EE_Base_Class {
 
 		/** Currency COde @var CUR_code*/ protected $_CUR_code = NULL;
 		/** Currency Name Singular @var CUR_single*/ protected $_CUR_single = NULL;
@@ -43,9 +43,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Attendee
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -56,8 +56,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Attendee
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 	/**
 	 * Gets code
@@ -159,8 +159,8 @@ 
 	 * Gets a prettier name
 	 * @return string
 	 */
-	function name(){
-		return sprintf(__("%s (%s)", "event_espresso"),$this->code(),$this->plural_name());
+	function name() {
+		return sprintf(__("%s (%s)", "event_espresso"), $this->code(), $this->plural_name());
 	}
 
 }