eventespresso / event-espresso-core

core/libraries/form_sections/strategies/layout/EE_Admin_Two_Column_Layout.strategy.php

Spacing +18 added lines, -18 removed lines

@@ -13,9 +13,9 @@ 
 	 *
 	 * @return string
 	 */
-	public function layout_form_begin( $additional_args = array() ) {
+	public function layout_form_begin($additional_args = array()) {
 		$this->_form_section->set_html_class('form-table');
-		return parent::layout_form_begin( $additional_args );
+		return parent::layout_form_begin($additional_args);
 	}
 
 
@@ -25,10 +25,10 @@ 
 	 * @param EE_Form_Section_Proper $form_section
 	 * @return string
 	 */
-	public function layout_subsection( $form_section ){
-		if ( $form_section instanceof EE_Form_Section_Proper ) {
-			return EEH_HTML::no_row( $form_section->get_html_and_js(), 2 );
-		} else if ( $form_section instanceof EE_Form_Section_HTML ) {
+	public function layout_subsection($form_section) {
+		if ($form_section instanceof EE_Form_Section_Proper) {
+			return EEH_HTML::no_row($form_section->get_html_and_js(), 2);
+		} else if ($form_section instanceof EE_Form_Section_HTML) {
 			return $form_section->get_html_and_js();
 		}
 		return '';
@@ -41,36 +41,36 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function layout_input( $input ) {
+	public function layout_input($input) {
 
 		if (
 			$input->get_display_strategy() instanceof EE_Text_Area_Display_Strategy ||
 			$input->get_display_strategy() instanceof EE_Text_Input_Display_Strategy ||
 			$input->get_display_strategy() instanceof EE_Admin_File_Uploader_Display_Strategy
 		) {
-			$input->set_html_class( $input->html_class() . ' large-text' );
+			$input->set_html_class($input->html_class().' large-text');
 		}
-		if ( $input instanceof EE_Text_Area_Input ) {
-			$input->set_rows( 4 );
-			$input->set_cols( 60 );
+		if ($input instanceof EE_Text_Area_Input) {
+			$input->set_rows(4);
+			$input->set_cols(60);
 		}
 		// no need to repeat the label for checkboxes, radios, etc
-		if ( $input instanceof EE_Form_Input_With_Options_Base ) {
+		if ($input instanceof EE_Form_Input_With_Options_Base) {
 			// so if label is in the input html, let's remove that
-			$input_html = str_replace( $input->html_label_text(), '', $input->get_html_for_input() );
+			$input_html = str_replace($input->html_label_text(), '', $input->get_html_for_input());
 		} else {
 			$input_html = $input->get_html_for_input();
 		}
 		// maybe add errors and help text ?
-		$input_html .= $input->get_html_for_errors() != '' ? EEH_HTML::nl() . $input->get_html_for_errors() : '';
-		$input_html .= $input->get_html_for_help() != '' ? EEH_HTML::nl() . $input->get_html_for_help() : '';
+		$input_html .= $input->get_html_for_errors() != '' ? EEH_HTML::nl().$input->get_html_for_errors() : '';
+		$input_html .= $input->get_html_for_help() != '' ? EEH_HTML::nl().$input->get_html_for_help() : '';
 		//overriding parent to add wp admin specific things.
 		$html = '';
-		if ( $input instanceof EE_Hidden_Input ) {
-			$html .= EEH_HTML::no_row( $input->get_html_for_input(), 2 );
+		if ($input instanceof EE_Hidden_Input) {
+			$html .= EEH_HTML::no_row($input->get_html_for_input(), 2);
 		} else {
 			$html .= EEH_HTML::tr(
-				EEH_HTML::th( $input->get_html_for_label(), '', '',  '', 'scope="row"' ) . EEH_HTML::td( $input_html )
+				EEH_HTML::th($input->get_html_for_label(), '', '', '', 'scope="row"').EEH_HTML::td($input_html)
 			);
 		}
 		return $html;

core/libraries/messages/data_class/EE_Messages_Gateways_incoming_data.class.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -41,20 +41,20 @@ 
 	 * incoming data is expected to be a EE_Transaction object and (possibly) EE_Payment object in an array.
 	 * @param array $data
 	 */
-	public function __construct( $data ) {
+	public function __construct($data) {
 
 		//test for valid params
-		if ( ! ( $data[0] instanceof EE_Transaction ))
-			throw new EE_Error( __('Incoming data for the Gateways data handler must have an EE_Transaction object as the value for the first array index.', 'event_espresso') );
+		if ( ! ($data[0] instanceof EE_Transaction))
+			throw new EE_Error(__('Incoming data for the Gateways data handler must have an EE_Transaction object as the value for the first array index.', 'event_espresso'));
 
-		if ( empty( $data[1] ) || ! $data[1] instanceof  EE_Payment  )
-			$pmt_obj = $this->_get_empty_payment_obj( $data[0] );
+		if (empty($data[1]) || ! $data[1] instanceof  EE_Payment)
+			$pmt_obj = $this->_get_empty_payment_obj($data[0]);
 
 		$data = array(
 			'txn_obj' => $data[0],
 			'pmt_obj' => isset($pmt_obj) ? $pmt_obj : $data[1],
 			);
-		parent::__construct( $data );
+		parent::__construct($data);
 	}
 
 
@@ -62,8 +62,8 @@ 
 	 * This sets up an empty EE_Payment object for the purpose of shortcode parsing.  Note that this doesn't actually get saved to the db.
 	 * @return EE_Payment
 	 */
-	private function _get_empty_payment_obj( EE_Transaction $txn ) {
-		$PMT = EE_Payment::new_instance( array(
+	private function _get_empty_payment_obj(EE_Transaction $txn) {
+		$PMT = EE_Payment::new_instance(array(
 			'STS_ID' => EEM_Payment::status_id_pending,
 			'PAY_timestamp' => (int) current_time('timestamp'),
 			'PMD_ID' => $txn->payment_method_ID(),
@@ -86,9 +86,9 @@ 
 
 
 		//other data from the session (if possible)
-		$this->user_id = isset( $session_data['user_id'] ) ? $session_data['user_id'] : '';
-		$this->ip_address = isset( $session_data['ip_address'] ) ? $session_data['ip_address'] : '';
-		$this->user_agent = isset( $session_data['user_agent'] ) ? $session_data['user_agent'] : '';
+		$this->user_id = isset($session_data['user_id']) ? $session_data['user_id'] : '';
+		$this->ip_address = isset($session_data['ip_address']) ? $session_data['ip_address'] : '';
+		$this->user_agent = isset($session_data['user_agent']) ? $session_data['user_agent'] : '';
 		$this->init_access = $this->last_access = '';
 
 		$this->reg_objs = $this->txn->get_many_related('Registration');

Braces +8 added lines, -5 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -44,11 +45,13 @@ 
 	public function __construct( $data ) {
 
 		//test for valid params
-		if ( ! ( $data[0] instanceof EE_Transaction ))
-			throw new EE_Error( __('Incoming data for the Gateways data handler must have an EE_Transaction object as the value for the first array index.', 'event_espresso') );
+		if ( ! ( $data[0] instanceof EE_Transaction )) {
+					throw new EE_Error( __('Incoming data for the Gateways data handler must have an EE_Transaction object as the value for the first array index.', 'event_espresso') );
+		}
 
-		if ( empty( $data[1] ) || ! $data[1] instanceof  EE_Payment  )
-			$pmt_obj = $this->_get_empty_payment_obj( $data[0] );
+		if ( empty( $data[1] ) || ! $data[1] instanceof  EE_Payment  ) {
+					$pmt_obj = $this->_get_empty_payment_obj( $data[0] );
+		}
 
 		$data = array(
 			'txn_obj' => $data[0],

core/libraries/messages/data_class/EE_Messages_REG_incoming_data.class.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -44,7 +44,7 @@ 
 	 *
 	 * @param EE_Registration $data
 	 */
-	public function __construct( EE_Registration $data ) {
+	public function __construct(EE_Registration $data) {
 
 		$this->reg_obj = $data;
 
@@ -69,16 +69,16 @@ 
 
 		//possible session stuff?
 		$session = $this->txn->session_data();
-		$session_data =  $session instanceof EE_Session ? $session->get_session_data() : array();
+		$session_data = $session instanceof EE_Session ? $session->get_session_data() : array();
 
 		//other data from the session (if possible)
-		$this->user_id = isset( $session_data['user_id'] ) ? $session_data['user_id'] : '';
-		$this->ip_address = isset( $session_data['ip_address'] ) ? $session_data['ip_address'] : '';
-		$this->user_agent = isset( $session_data['user_agent'] ) ? $session_data['user_agent'] : '';
+		$this->user_id = isset($session_data['user_id']) ? $session_data['user_id'] : '';
+		$this->ip_address = isset($session_data['ip_address']) ? $session_data['ip_address'] : '';
+		$this->user_agent = isset($session_data['user_agent']) ? $session_data['user_agent'] : '';
 		$this->init_access = $this->last_access = '';
 
 		$this->payment = $this->txn->get_first_related('Payment');
-		$this->payment = empty( $this->payment ) ? EE_Payment::new_instance( array(
+		$this->payment = empty($this->payment) ? EE_Payment::new_instance(array(
 			'STS_ID' => EEM_Payment::status_id_pending,
 			'PAY_timestamp' => (int) current_time('timestamp'),
 			'PMD_ID' => $this->txn->payment_method_ID(),

Braces +2 added lines, -1 removed lines

@@ -1,6 +1,7 @@
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso

core/libraries/messages/data_class/EE_Messages_incoming_data.core.php

Spacing +21 added lines, -21 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -233,7 +233,7 @@ 
 	 * constructor
 	 * @param mixed $data incoming data object|array.  Suggested that child classes use typehinting for expected data object.  But here parent will be generic because we don't know what's coming in.
 	 */
-	public function __construct( $data ) {
+	public function __construct($data) {
 		$this->_data = $data;
 		$this->_setup_data();
 
@@ -268,8 +268,8 @@ 
 		$regchk = array_values($this->reg_objs);
 		$regchk = array_shift($regchk);
 		//verify that reg_objs is set
-		if ( !is_array( $this->reg_objs) && ! $regchk instanceof EE_Registration )
-			throw new EE_Error( __('In order to assemble the data correctly, the "reg_objs" property must be an array of EE_Registration objects', 'event_espresso') );
+		if ( ! is_array($this->reg_objs) && ! $regchk instanceof EE_Registration)
+			throw new EE_Error(__('In order to assemble the data correctly, the "reg_objs" property must be an array of EE_Registration objects', 'event_espresso'));
 
 		//get all attendee and events associated with the registrations in this transaction
 		$events = $event_setup = $evt_cache = $tickets = $datetimes = $answers = $questions = array();
@@ -277,15 +277,15 @@ 
 		$total_ticket_count = 0;
 
 
-		if ( !empty( $this->reg_objs ) ) {
+		if ( ! empty($this->reg_objs)) {
 			$event_attendee_count = array();
-			foreach ( $this->reg_objs as $reg ) {
+			foreach ($this->reg_objs as $reg) {
 				$evt_id = $reg->event_ID();
 				$ticket = $reg->get_first_related('Ticket');
 				$relateddatetime = $ticket->datetimes();
 				$total_ticket_count++;
 				$tickets[$ticket->ID()]['ticket'] = $ticket;
-				$tickets[$ticket->ID()]['count'] = is_array($tickets[$ticket->ID()]) && isset( $tickets[$ticket->ID()]['count'] ) ? $tickets[$ticket->ID()]['count'] + 1 : 1;
+				$tickets[$ticket->ID()]['count'] = is_array($tickets[$ticket->ID()]) && isset($tickets[$ticket->ID()]['count']) ? $tickets[$ticket->ID()]['count'] + 1 : 1;
 				$tickets[$ticket->ID()]['att_objs'][$reg->attendee_ID()] = $reg->attendee();
 				$tickets[$ticket->ID()]['dtt_objs'] = $relateddatetime;
 				$tickets[$ticket->ID()]['reg_objs'][$reg->ID()] = $reg;
@@ -295,7 +295,7 @@ 
 				$eventsetup[$evt_id]['reg_objs'][$reg->ID()] = $reg;
 				$eventsetup[$evt_id]['tkt_objs'][$ticket->ID()] = $ticket;
 				$eventsetup[$evt_id]['att_objs'][$reg->attendee_ID()] = $reg->attendee();
-				$event_attendee_count[$evt_id] = isset( $event_attendee_count[$evt_id] ) ? $event_attendee_count[$evt_id] + 1 : 0;
+				$event_attendee_count[$evt_id] = isset($event_attendee_count[$evt_id]) ? $event_attendee_count[$evt_id] + 1 : 0;
 				$attendees[$reg->attendee_ID()]['line_ref'][] = $evt_id;
 				$attendees[$reg->attendee_ID()]['att_obj'] = $reg->attendee();
 				$attendees[$reg->attendee_ID()]['reg_objs'][$reg->ID()] = $reg;
@@ -312,19 +312,19 @@ 
 
 				//set up answer objects
 				$rel_ans = $reg->get_many_related('Answer');
-				foreach ( $rel_ans as $ansid => $answer ) {
-					if ( !isset( $questions[$ansid] ) ) {
+				foreach ($rel_ans as $ansid => $answer) {
+					if ( ! isset($questions[$ansid])) {
 						$questions[$ansid] = $answer->get_first_related('Question');
 					}
 					$answers[$ansid] = $answer;
 					$registrations[$reg->ID()]['ans_objs'][$ansid] = $answer;
 				}
 
-				foreach ( $relateddatetime as $dtt_id => $datetime ) {
+				foreach ($relateddatetime as $dtt_id => $datetime) {
 					$eventsetup[$evt_id]['dtt_objs'][$dtt_id] = $datetime;
 					$registrations[$reg->ID()]['dtt_objs'][$dtt_id] = $datetime;
 
-					if ( isset( $datetimes[$dtt_id] ) )
+					if (isset($datetimes[$dtt_id]))
 						continue; //already have this info in the datetimes array.
 
 					$datetimes[$dtt_id]['tkt_objs'][] = $ticket;
@@ -337,9 +337,9 @@ 
 			//let's loop through the unique event=>reg items and setup data on them
 
 
-			if ( !empty( $eventsetup) ) {
-				foreach ( $eventsetup as $eid => $items ) {
-					$ticket_line_items_for_event = EEM_Line_Item::instance()->get_all(array(array('Ticket.Datetime.EVT_ID'=>$evt_id,'TXN_ID'=>$this->txn->ID()), 'default_where_conditions' => 'none'));
+			if ( ! empty($eventsetup)) {
+				foreach ($eventsetup as $eid => $items) {
+					$ticket_line_items_for_event = EEM_Line_Item::instance()->get_all(array(array('Ticket.Datetime.EVT_ID'=>$evt_id, 'TXN_ID'=>$this->txn->ID()), 'default_where_conditions' => 'none'));
 					$events[$eid] = array(
 						'ID' => $eid,
 						'event' => $evtcache[$eid],
@@ -354,7 +354,7 @@ 
 
 					//make sure the tickets have the line items setup for them.
 					$line_items = array();
-					foreach ( $ticket_line_items_for_event as $line_id => $line_item ) {
+					foreach ($ticket_line_items_for_event as $line_id => $line_item) {
 						$tickets[$line_item->ticket()->ID()]['line_item'] = $line_item;
 						$tickets[$line_item->ticket()->ID()]['sub_line_items'] = $line_item->children();
 						$line_items[$line_item->ID()]['children'] = $line_item->children();
@@ -378,7 +378,7 @@ 
 		$this->total_ticket_count = $total_ticket_count;
 		$this->registrations = $registrations;
 
-		$this->tax_line_items =  $this->txn->tax_items();
+		$this->tax_line_items = $this->txn->tax_items();
 		$this->additional_line_items = $this->txn->non_ticket_line_items();
 		$this->payments = $this->txn->payments();
 
@@ -388,10 +388,10 @@ 
 		//let's get just the primary_attendee_data!  First we get the primary registration object.
 		$primary_reg = $this->txn->primary_registration(TRUE);
 		// verify
-		if( $primary_reg instanceof EE_Registration ) {
+		if ($primary_reg instanceof EE_Registration) {
 
 			// get attendee object
-			if( $primary_reg->attendee() instanceof EE_Attendee ) {
+			if ($primary_reg->attendee() instanceof EE_Attendee) {
 
 				//now we can setup the primary_attendee_data array
 				$this->primary_attendee_data = array(
@@ -403,11 +403,11 @@ 
 				);
 
 			} else {
-				EE_Error::add_error( __('Incoming data does not have a valid Attendee object for the primary registrant.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('Incoming data does not have a valid Attendee object for the primary registrant.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			}
 
 		} else {
-			EE_Error::add_error( __('Incoming data does not have a valid Registration object for the primary registrant.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('Incoming data does not have a valid Registration object for the primary registrant.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 

Braces +9 added lines, -5 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -268,8 +269,9 @@ 
 		$regchk = array_values($this->reg_objs);
 		$regchk = array_shift($regchk);
 		//verify that reg_objs is set
-		if ( !is_array( $this->reg_objs) && ! $regchk instanceof EE_Registration )
-			throw new EE_Error( __('In order to assemble the data correctly, the "reg_objs" property must be an array of EE_Registration objects', 'event_espresso') );
+		if ( !is_array( $this->reg_objs) && ! $regchk instanceof EE_Registration ) {
+					throw new EE_Error( __('In order to assemble the data correctly, the "reg_objs" property must be an array of EE_Registration objects', 'event_espresso') );
+		}
 
 		//get all attendee and events associated with the registrations in this transaction
 		$events = $event_setup = $evt_cache = $tickets = $datetimes = $answers = $questions = array();
@@ -324,8 +326,10 @@ 
 					$eventsetup[$evt_id]['dtt_objs'][$dtt_id] = $datetime;
 					$registrations[$reg->ID()]['dtt_objs'][$dtt_id] = $datetime;
 
-					if ( isset( $datetimes[$dtt_id] ) )
-						continue; //already have this info in the datetimes array.
+					if ( isset( $datetimes[$dtt_id] ) ) {
+											continue;
+					}
+					//already have this info in the datetimes array.
 
 					$datetimes[$dtt_id]['tkt_objs'][] = $ticket;
 					$datetimes[$dtt_id]['datetime'] = $datetime;

core/libraries/messages/defaults/default/email_declined_registration_event_list_attendee.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 <p class="callout">
-	<strong><?php _e( 'Event Name:', 'event_espresso' ); ?></strong> <a href="[EVENT_URL]">[EVENT]</a>
+	<strong><?php _e('Event Name:', 'event_espresso'); ?></strong> <a href="[EVENT_URL]">[EVENT]</a>
 </p>
\ No newline at end of file

core/libraries/shortcodes/EE_Recipient_Details_Shortcodes.lib.php

Spacing +18 added lines, -18 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -48,29 +48,29 @@ 
 			'[RECIPIENT_ADDRESS2]' => __('Whatever was in the address 2 field for the recipient of the message.', 'event_espresso'),
 			'[RECIPIENT_CITY]' => __('The city for the recipient of the message.', 'event_espresso'),
 			'[RECIPIENT_ZIP_PC]' => __('The ZIP (or Postal) Code for the recipient of the message.', 'event_espresso'),
-			'[RECIPIENT_ADDRESS_STATE]' => __('The state/province for the recipient of the message.', 'event_espresso' ),
+			'[RECIPIENT_ADDRESS_STATE]' => __('The state/province for the recipient of the message.', 'event_espresso'),
 			'[RECIPIENT_COUNTRY]' => __('The country for the recipient of the message.', 'event_espresso'),
-			'[RECIPIENT_ANSWER_*]' => __('This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this recipient, then it will be output in place of this shortcode.', 'event_espresso' )
+			'[RECIPIENT_ANSWER_*]' => __('This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this recipient, then it will be output in place of this shortcode.', 'event_espresso')
 			);
 	}
 
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
 		//make sure we end up with a copy of the EE_Messages_Addressee object
 		$this->_recipient = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
-		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $this->_recipient;
-		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $this->_recipient;
+		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $this->_recipient;
+		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $this->_recipient;
 
-		if ( ! $this->_recipient instanceof EE_Messages_Addressee )
+		if ( ! $this->_recipient instanceof EE_Messages_Addressee)
 			return '';
 
 		$attendee = $this->_recipient->att_obj;
-		if ( ! $attendee instanceof EE_Attendee )
+		if ( ! $attendee instanceof EE_Attendee)
 			return '';
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[RECIPIENT_FNAME]' :
 				return $attendee->fname();
 				break;
@@ -84,13 +84,13 @@ 
 				break;
 
 			case '[RECIPIENT_REGISTRATION_CODE]' :
-				if ( ! $this->_recipient->reg_obj instanceof EE_Registration )
+				if ( ! $this->_recipient->reg_obj instanceof EE_Registration)
 					return '';
 				return $this->_recipient->reg_obj->reg_code();
 				break;
 
 			case '[RECIPIENT_EDIT_REGISTRATION_LINK]' :
-				if ( ! $this->_recipient->reg_obj instanceof EE_Registration )
+				if ( ! $this->_recipient->reg_obj instanceof EE_Registration)
 					return '';
 				return $this->_recipient->reg_obj->edit_attendee_information_url();
 				break;
@@ -126,19 +126,19 @@ 
 				break;
 		}
 
-		if ( strpos( $shortcode, '[RECIPIENT_ANSWER_*' ) !== false ) {
-			$shortcode = str_replace( '[RECIPIENT_ANSWER_*', '', $shortcode );
-			$shortcode = trim( str_replace( ']', '', $shortcode ) );
+		if (strpos($shortcode, '[RECIPIENT_ANSWER_*') !== false) {
+			$shortcode = str_replace('[RECIPIENT_ANSWER_*', '', $shortcode);
+			$shortcode = trim(str_replace(']', '', $shortcode));
 
 
 			//now let's figure out what question has this text
-			if ( empty( $this->_recipient->questions ) || ! $this->_recipient->reg_obj instanceof EE_Registration ) {
+			if (empty($this->_recipient->questions) || ! $this->_recipient->reg_obj instanceof EE_Registration) {
 				return '';
 			}
 
-			foreach ( $this->_recipient->questions as $ansid => $question ) {
-				if ( $question->get('QST_display_text') == $shortcode && isset( $this->_recipient->registrations[$this->_recipient->reg_obj->ID()]['ans_objs'][$ansid] ) ) {
-					return $this->_recipient->registrations[$this->_recipient->reg_obj->ID()]['ans_objs'][$ansid]->get_pretty( 'ANS_value', 'no_wpautop' );
+			foreach ($this->_recipient->questions as $ansid => $question) {
+				if ($question->get('QST_display_text') == $shortcode && isset($this->_recipient->registrations[$this->_recipient->reg_obj->ID()]['ans_objs'][$ansid])) {
+					return $this->_recipient->registrations[$this->_recipient->reg_obj->ID()]['ans_objs'][$ansid]->get_pretty('ANS_value', 'no_wpautop');
 				}
 			}
 		}

Braces +14 added lines, -9 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -63,12 +64,14 @@ 
 		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $this->_recipient;
 		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $this->_recipient;
 
-		if ( ! $this->_recipient instanceof EE_Messages_Addressee )
-			return '';
+		if ( ! $this->_recipient instanceof EE_Messages_Addressee ) {
+					return '';
+		}
 
 		$attendee = $this->_recipient->att_obj;
-		if ( ! $attendee instanceof EE_Attendee )
-			return '';
+		if ( ! $attendee instanceof EE_Attendee ) {
+					return '';
+		}
 
 		switch ( $shortcode ) {
 			case '[RECIPIENT_FNAME]' :
@@ -84,14 +87,16 @@ 
 				break;
 
 			case '[RECIPIENT_REGISTRATION_CODE]' :
-				if ( ! $this->_recipient->reg_obj instanceof EE_Registration )
-					return '';
+				if ( ! $this->_recipient->reg_obj instanceof EE_Registration ) {
+									return '';
+				}
 				return $this->_recipient->reg_obj->reg_code();
 				break;
 
 			case '[RECIPIENT_EDIT_REGISTRATION_LINK]' :
-				if ( ! $this->_recipient->reg_obj instanceof EE_Registration )
-					return '';
+				if ( ! $this->_recipient->reg_obj instanceof EE_Registration ) {
+									return '';
+				}
 				return $this->_recipient->reg_obj->edit_attendee_information_url();
 				break;
 

core/libraries/shortcodes/EE_Recipient_List_Shortcodes.lib.php

Spacing +38 added lines, -38 removed lines

@@ -43,8 +43,8 @@ 
 
 
 
-	protected function _parser( $shortcode ) {
-		switch ( $shortcode ) {
+	protected function _parser($shortcode) {
+		switch ($shortcode) {
 			case '[RECIPIENT_TICKET_LIST]' :
 				return $this->_get_recipient_ticket_list();
 				break;
@@ -64,58 +64,58 @@ 
 	 * @param  boolean $primary whether we're getting the primary registrant ticket_list.
 	 * @return string
 	 */
-	private function _get_recipient_ticket_list( $primary = FALSE ) {
+	private function _get_recipient_ticket_list($primary = FALSE) {
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_ticket_list_parsed( $this->_data['data'], $primary );
+		if ($this->_data['data'] instanceof EE_Messages_Addressee)
+			return $this->_get_recipient_ticket_list_parsed($this->_data['data'], $primary);
 
-		else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_ticket_list_parsed( $this->_extra_data['data'], $primary );
+		else if ($this->_extra_data['data'] instanceof EE_Messages_Addressee)
+			return $this->_get_recipient_ticket_list_parsed($this->_extra_data['data'], $primary);
 
 		else
 			return '';
 	}
 
 
-	private function _get_recipient_ticket_list_parsed( EE_Messages_Addressee $data, $primary = FALSE ) {
+	private function _get_recipient_ticket_list_parsed(EE_Messages_Addressee $data, $primary = FALSE) {
 		$registration = $primary ? $data->primary_reg_obj : $data->reg_obj;
-			if ( ! $registration instanceof EE_Registration ) return '';
+			if ( ! $registration instanceof EE_Registration) return '';
 		//setup valid shortcodes depending on what the status of the $this->_data property is
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
-			$valid_shortcodes = array('ticket', 'event_list', 'attendee_list','datetime_list', 'registration_details', 'attendee');
+		if ($this->_data['data'] instanceof EE_Messages_Addressee) {
+			$valid_shortcodes = array('ticket', 'event_list', 'attendee_list', 'datetime_list', 'registration_details', 'attendee');
 			$template = $this->_data['template'];
 			$tkts = array($data->registrations[$registration->ID()]['tkt_obj']);
 			$data = $this->_data;
-		} elseif ( $this->_data['data'] instanceof EE_Event ) {
+		} elseif ($this->_data['data'] instanceof EE_Event) {
 			$valid_shortcodes = array('ticket', 'attendee_list', 'datetime_list', 'attendee');
-			$template = is_array($this->_data['template'] ) && isset($this->_data['template']['ticket_list']) ? $this->_data['template']['ticket_list'] : $this->_extra_data['template']['ticket_list'];
+			$template = is_array($this->_data['template']) && isset($this->_data['template']['ticket_list']) ? $this->_data['template']['ticket_list'] : $this->_extra_data['template']['ticket_list'];
 			//let's remove any existing [EVENT_LIST] shortcode from the ticket list template so that we don't get recursion.
 			$template = str_replace('[EVENT_LIST]', '', $template);
 			//data will be tickets for this event for this recipient.
-			$tkts = $this->_get_tickets_from_event( $this->_data['data'], $registration );
+			$tkts = $this->_get_tickets_from_event($this->_data['data'], $registration);
 			$data = $this->_extra_data;
 		} else {
 			return '';
 		}
 
 		$tkt_parsed = '';
-		foreach ( $tkts as $ticket ) {
-			$tkt_parsed .= $this->_shortcode_helper->parse_ticket_list_template( $template, $ticket, $valid_shortcodes, $this->_extra_data );
+		foreach ($tkts as $ticket) {
+			$tkt_parsed .= $this->_shortcode_helper->parse_ticket_list_template($template, $ticket, $valid_shortcodes, $this->_extra_data);
 		}
 		return $tkt_parsed;
 	}
 
 
-	private function _get_tickets_from_event( EE_Event $event, $reg = NULL ) {
+	private function _get_tickets_from_event(EE_Event $event, $reg = NULL) {
 		$evt_tkts = isset($this->_extra_data['data']->events) ? $this->_extra_data['data']->events[$event->ID()]['tkt_objs'] : array();
 
-		if ( $reg instanceof EE_Registration && $this->_extra_data['data'] instanceof EE_Messages_Addressee ) {
+		if ($reg instanceof EE_Registration && $this->_extra_data['data'] instanceof EE_Messages_Addressee) {
 			$adj_tkts = array();
 			//return only tickets for the given attendee
-			foreach ( $evt_tkts as $tkt ) {
-				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj'] ) && $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj']->ID() == $tkt->ID() )
+			foreach ($evt_tkts as $tkt) {
+				if (isset($this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj']) && $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj']->ID() == $tkt->ID())
 					$adj_tkts[] = $tkt;
 			}
 			$evt_tkts = $adj_tkts;
@@ -132,58 +132,58 @@ 
 	 * @param  boolean $primary whether we're getting the primary registrant ticket_list.
 	 * @return string
 	 */
-	private function _get_recipient_datetime_list( $primary = FALSE ) {
+	private function _get_recipient_datetime_list($primary = FALSE) {
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_datetime_list_parsed( $this->_data['data'], $primary );
+		if ($this->_data['data'] instanceof EE_Messages_Addressee)
+			return $this->_get_recipient_datetime_list_parsed($this->_data['data'], $primary);
 
-		else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_datetime_list_parsed( $this->_extra_data['data'], $primary );
+		else if ($this->_extra_data['data'] instanceof EE_Messages_Addressee)
+			return $this->_get_recipient_datetime_list_parsed($this->_extra_data['data'], $primary);
 
 		else
 			return '';
 
-		return $this->_get_recipient_datetime_list_parsed( $this->_data['data'], $primary);
+		return $this->_get_recipient_datetime_list_parsed($this->_data['data'], $primary);
 	}
 
 
-	private function _get_recipient_datetime_list_parsed( EE_Messages_Addressee $data, $primary = FALSE ) {
+	private function _get_recipient_datetime_list_parsed(EE_Messages_Addressee $data, $primary = FALSE) {
 		$registration = $primary ? $data->primary_reg_obj : $data->reg_obj;
-		if ( ! $registration instanceof EE_Registration ) return '';
+		if ( ! $registration instanceof EE_Registration) return '';
 		//setup valid shortcodes depending on what the status of the $this->_data property is
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
+		if ($this->_data['data'] instanceof EE_Messages_Addressee) {
 			$valid_shortcodes = array('datetime', 'attendee');
 			$template = $this->_data['template'];
 			$dtts = $data->registrations[$registration->ID()]['dtt_objs'];
 			$data = $this->_data;
-		} elseif ( $this->_data['data'] instanceof EE_Event ) {
+		} elseif ($this->_data['data'] instanceof EE_Event) {
 			$valid_shortcodes = array('datetime', 'attendee');
-			$template = is_array($this->_data['template'] ) && isset($this->_data['template']['datetime_list']) ? $this->_data['template']['datetime_list'] : $this->_extra_data['template']['datetime_list'];
-			$dtts = $this->_get_datetimes_from_event( $this->_data['data'], $registration );
+			$template = is_array($this->_data['template']) && isset($this->_data['template']['datetime_list']) ? $this->_data['template']['datetime_list'] : $this->_extra_data['template']['datetime_list'];
+			$dtts = $this->_get_datetimes_from_event($this->_data['data'], $registration);
 			$data = $this->_extra_data;
 		} else {
 			return '';
 		}
 
 		$dtt_parsed = '';
-		foreach ( $dtts as $datetime ) {
-			$dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template( $template, $datetime, $valid_shortcodes, $this->_extra_data );
+		foreach ($dtts as $datetime) {
+			$dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template($template, $datetime, $valid_shortcodes, $this->_extra_data);
 		}
 		return $dtt_parsed;
 	}
 
 
 
-	private function _get_datetimes_from_event( EE_Event $event, $reg = NULL ) {
+	private function _get_datetimes_from_event(EE_Event $event, $reg = NULL) {
 		$evt_dtts = isset($this->_extra_data['data']->events) ? $this->_extra_data['data']->events[$event->ID()]['dtt_objs'] : array();
 
-		if ( $reg instanceof EE_Registration && $this->_extra_data['data'] instanceof EE_Messages_Addressee ) {
+		if ($reg instanceof EE_Registration && $this->_extra_data['data'] instanceof EE_Messages_Addressee) {
 			$adj_dtts = array();
 			//return only dtts for the given attendee
-			foreach ( $evt_dtts as $dtt ) {
-				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['dtt_objs'][$dtt->ID()] ) )
+			foreach ($evt_dtts as $dtt) {
+				if (isset($this->_extra_data['data']->registrations[$reg->ID()]['dtt_objs'][$dtt->ID()]))
 					$adj_dtts[] = $dtt;
 			}
 			$evt_dtts = $adj_dtts;

Braces +26 added lines, -22 removed lines

@@ -69,20 +69,21 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_ticket_list_parsed( $this->_data['data'], $primary );
-
-		else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_ticket_list_parsed( $this->_extra_data['data'], $primary );
-
-		else
-			return '';
+		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_recipient_ticket_list_parsed( $this->_data['data'], $primary );
+		} else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_recipient_ticket_list_parsed( $this->_extra_data['data'], $primary );
+		} else {
+					return '';
+		}
 	}
 
 
 	private function _get_recipient_ticket_list_parsed( EE_Messages_Addressee $data, $primary = FALSE ) {
 		$registration = $primary ? $data->primary_reg_obj : $data->reg_obj;
-			if ( ! $registration instanceof EE_Registration ) return '';
+			if ( ! $registration instanceof EE_Registration ) {
+				return '';
+			}
 		//setup valid shortcodes depending on what the status of the $this->_data property is
 		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
 			$valid_shortcodes = array('ticket', 'event_list', 'attendee_list','datetime_list', 'registration_details', 'attendee');
@@ -116,8 +117,9 @@ 
 			$adj_tkts = array();
 			//return only tickets for the given attendee
 			foreach ( $evt_tkts as $tkt ) {
-				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj'] ) && $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj']->ID() == $tkt->ID() )
-					$adj_tkts[] = $tkt;
+				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj'] ) && $this->_extra_data['data']->registrations[$reg->ID()]['tkt_obj']->ID() == $tkt->ID() ) {
+									$adj_tkts[] = $tkt;
+				}
 			}
 			$evt_tkts = $adj_tkts;
 		}
@@ -137,14 +139,13 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_datetime_list_parsed( $this->_data['data'], $primary );
-
-		else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_datetime_list_parsed( $this->_extra_data['data'], $primary );
-
-		else
-			return '';
+		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_recipient_datetime_list_parsed( $this->_data['data'], $primary );
+		} else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_recipient_datetime_list_parsed( $this->_extra_data['data'], $primary );
+		} else {
+					return '';
+		}
 
 		return $this->_get_recipient_datetime_list_parsed( $this->_data['data'], $primary);
 	}
@@ -152,7 +153,9 @@ 
 
 	private function _get_recipient_datetime_list_parsed( EE_Messages_Addressee $data, $primary = FALSE ) {
 		$registration = $primary ? $data->primary_reg_obj : $data->reg_obj;
-		if ( ! $registration instanceof EE_Registration ) return '';
+		if ( ! $registration instanceof EE_Registration ) {
+			return '';
+		}
 		//setup valid shortcodes depending on what the status of the $this->_data property is
 		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
 			$valid_shortcodes = array('datetime', 'attendee');
@@ -184,8 +187,9 @@ 
 			$adj_dtts = array();
 			//return only dtts for the given attendee
 			foreach ( $evt_dtts as $dtt ) {
-				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['dtt_objs'][$dtt->ID()] ) )
-					$adj_dtts[] = $dtt;
+				if ( isset( $this->_extra_data['data']->registrations[$reg->ID()]['dtt_objs'][$dtt->ID()] ) ) {
+									$adj_dtts[] = $dtt;
+				}
 			}
 			$evt_dtts = $adj_dtts;
 		}

modules/single_page_checkout/templates/payment_options/events_requiring_pre_approval.template.php

Spacing +4 added lines, -4 removed lines

@@ -1,13 +1,13 @@
 
-	<h4 class="orange-text"><?php _e('Important Notice:', 'event_espresso');?></h4>
+	<h4 class="orange-text"><?php _e('Important Notice:', 'event_espresso'); ?></h4>
 	<p id="events-requiring-pre-approval-pg" class="small-text drk-grey-text">
 		<?php echo $events_requiring_pre_approval_msg; ?>
 	</p>
-	<h6><?php _e('Events Requiring Pre-Approval:', 'event_espresso');?></h6>
+	<h6><?php _e('Events Requiring Pre-Approval:', 'event_espresso'); ?></h6>
 	<ul id="spco-pre-approval-events-ul"><?php echo $events_requiring_pre_approval; ?></ul>
 
-	<?php echo $default_hidden_inputs;  ?>
-	<?php echo $extra_hidden_inputs;  ?>
+	<?php echo $default_hidden_inputs; ?>
+	<?php echo $extra_hidden_inputs; ?>
 
 	<!--	<input id="reg-page-selected-method-of-payment" type="hidden" value="payments_closed" name="selected_method_of_payment">-->
 <!--	<input type="hidden" id="reg-page-no-payment-required-payment_options" name="_reg-page-no-payment-required" value="1" />-->

modules/single_page_checkout/templates/payment_options/no_payment_required.template.php

Spacing +6 added lines, -6 removed lines

@@ -1,22 +1,22 @@
 <?php
-if( is_array( $registrations_for_free_events ) && ! empty( $registrations_for_free_events ) ) {
+if (is_array($registrations_for_free_events) && ! empty($registrations_for_free_events)) {
 	echo apply_filters(
 		'FHEE__registration_page_payment_options__no_payment_required_hdr',
 		sprintf(
-			__( '%1$sNo Payment Required%2$s', 'event_espresso' ),
+			__('%1$sNo Payment Required%2$s', 'event_espresso'),
 			'<h6>',
 			'</h6>'
 		)
 	);
-	foreach ( $registrations_for_free_events as $registration_for_free_event ) {
-		if ( $registration_for_free_event instanceof EE_Registration && $registration_for_free_event->ticket()->is_free() ) {
-			if ( $registration_for_free_event->event() instanceof EE_Event ) {
+	foreach ($registrations_for_free_events as $registration_for_free_event) {
+		if ($registration_for_free_event instanceof EE_Registration && $registration_for_free_event->ticket()->is_free()) {
+			if ($registration_for_free_event->event() instanceof EE_Event) {
 				?>
 				<p>
 					<?php echo apply_filters(
 						'FHEE__registration_page_payment_options__no_payment_required_pg',
 						sprintf(
-							__( '%1$s is a free event, so no billing will occur.', 'event_espresso' ),
+							__('%1$s is a free event, so no billing will occur.', 'event_espresso'),
 							$registration_for_free_event->event()->name()
 						)
 					); ?>