eventespresso / event-espresso-core

core/libraries/shortcodes/EE_Recipient_List_Shortcodes.lib.php

Spacing +46 added lines, -46 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;
@@ -67,34 +67,34 @@ 
 		$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'] );
-		} else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee ) {
-			return $this->_get_recipient_ticket_list_parsed( $this->_extra_data['data'] );
+		if ($this->_data['data'] instanceof EE_Messages_Addressee) {
+			return $this->_get_recipient_ticket_list_parsed($this->_data['data']);
+		} else if ($this->_extra_data['data'] instanceof EE_Messages_Addressee) {
+			return $this->_get_recipient_ticket_list_parsed($this->_extra_data['data']);
 		} else {
 			return '';
 		}
 	}
 
 
-	private function _get_recipient_ticket_list_parsed( EE_Messages_Addressee $data ) {
+	private function _get_recipient_ticket_list_parsed(EE_Messages_Addressee $data) {
 		//first get registrations just for this attendee.
 		$att = $data->att_obj;
 		$registrations_on_attendee = $att instanceof EE_Attendee ? $data->attendees[$att->ID()]['reg_objs'] : array();
-		$registrations_on_attendee = empty( $registrations_on_attendee ) && $data->reg_obj instanceof EE_Registration ? array( $data->reg_obj ) : $registrations_on_attendee;
+		$registrations_on_attendee = empty($registrations_on_attendee) && $data->reg_obj instanceof EE_Registration ? array($data->reg_obj) : $registrations_on_attendee;
 		$tkts = array();
 
 		//if we're coming in from the main content then $this->_data['data'] is instanceof EE_Messages_Addressee.
 		//which means we want to get tickets for all events this addressee is a part of.
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
-			$valid_shortcodes = array('ticket', 'event_list', 'attendee_list','datetime_list', 'registration_details', 'attendee', 'recipient_details');
+		if ($this->_data['data'] instanceof EE_Messages_Addressee) {
+			$valid_shortcodes = array('ticket', 'event_list', 'attendee_list', 'datetime_list', 'registration_details', 'attendee', 'recipient_details');
 			$template = $this->_data['template'];
 
 			//tickets will be tickets for all registrations on this attendee.
-			foreach ( $registrations_on_attendee as $reg ) {
-				if ( $reg instanceof EE_Registration ) {
-					$ticket = isset( $data->registrations[$reg->ID()] ) && is_array( $data->registrations[$reg->ID()] ) && isset( $data->registrations[$reg->ID()]['tkt_obj'] ) ? $data->registrations[$reg->ID()]['tkt_obj'] : null;
-					if ( $ticket instanceof EE_Ticket ) {
+			foreach ($registrations_on_attendee as $reg) {
+				if ($reg instanceof EE_Registration) {
+					$ticket = isset($data->registrations[$reg->ID()]) && is_array($data->registrations[$reg->ID()]) && isset($data->registrations[$reg->ID()]['tkt_obj']) ? $data->registrations[$reg->ID()]['tkt_obj'] : null;
+					if ($ticket instanceof EE_Ticket) {
 						$tkts[$ticket->ID()] = $ticket;
 					}
 				}
@@ -103,16 +103,16 @@ 
 
 		//if coming from the context of the event list parser, then let's return just the tickets for that event.
 		$event = $this->_data['data'];
-		if ( $event instanceof EE_Event ) {
+		if ($event instanceof EE_Event) {
 			$valid_shortcodes = array('ticket', 'attendee_list', 'datetime_list', 'attendee', 'recipient_details');
-			$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.
-			foreach ( $registrations_on_attendee as $reg ) {
-				if ( $reg instanceof EE_Registration && $reg->event_ID() == $event->ID() ) {
-					$ticket = isset( $data->registrations[$reg->ID()] ) && is_array( $data->registrations[$reg->ID()] ) && isset( $data->registrations[$reg->ID()]['tkt_obj'] ) ? $data->registrations[$reg->ID()]['tkt_obj'] : null;
-					if ( $ticket instanceof EE_Ticket ) {
+			foreach ($registrations_on_attendee as $reg) {
+				if ($reg instanceof EE_Registration && $reg->event_ID() == $event->ID()) {
+					$ticket = isset($data->registrations[$reg->ID()]) && is_array($data->registrations[$reg->ID()]) && isset($data->registrations[$reg->ID()]['tkt_obj']) ? $data->registrations[$reg->ID()]['tkt_obj'] : null;
+					if ($ticket instanceof EE_Ticket) {
 						$tkts[$ticket->ID()] = $ticket;
 					}
 				}
@@ -120,8 +120,8 @@ 
 		}
 
 		$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;
 	}
@@ -137,11 +137,11 @@ 
 		$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']  );
+		if ($this->_data['data'] instanceof EE_Messages_Addressee)
+			return $this->_get_recipient_datetime_list_parsed($this->_data['data']);
 
-		else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_datetime_list_parsed( $this->_extra_data['data'] );
+		else if ($this->_extra_data['data'] instanceof EE_Messages_Addressee)
+			return $this->_get_recipient_datetime_list_parsed($this->_extra_data['data']);
 
 		else
 			return '';
@@ -149,26 +149,26 @@ 
 	}
 
 
-	private function _get_recipient_datetime_list_parsed( EE_Messages_Addressee $data ) {
+	private function _get_recipient_datetime_list_parsed(EE_Messages_Addressee $data) {
 		//first get registrations just for this attendee.
 		$att = $data->att_obj;
 		$registrations_on_attendee = $att instanceof EE_Attendee ? $data->attendees[$att->ID()]['reg_objs'] : null;
-		$registrations_on_attendee = empty( $registrations_on_attendee ) && $data->reg_obj instanceof EE_Registration ? array( $data->reg_obj ) : array();
-		$valid_shortcodes = array( 'datetime', 'attendee', 'recipient_details' );
+		$registrations_on_attendee = empty($registrations_on_attendee) && $data->reg_obj instanceof EE_Registration ? array($data->reg_obj) : array();
+		$valid_shortcodes = array('datetime', 'attendee', 'recipient_details');
 		$template = '';
 		$dtts = array();
 
 		//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) {
 			$template = $this->_data['template'];
 
 			//dtts will be datetimes for all registrations on this attendee
-			foreach ( $registrations_on_attendee as $reg ) {
-				if ( $reg instanceof EE_Registration ) {
-					$dtt_objs = isset( $data->registrations[$reg->ID()] ) && is_array( $data->registrations[$reg->ID()] ) && isset( $data->registrations[$reg->ID()]['dtt_objs'] ) ? $data->registrations[$reg->ID()]['dtt_objs'] : array();
+			foreach ($registrations_on_attendee as $reg) {
+				if ($reg instanceof EE_Registration) {
+					$dtt_objs = isset($data->registrations[$reg->ID()]) && is_array($data->registrations[$reg->ID()]) && isset($data->registrations[$reg->ID()]['dtt_objs']) ? $data->registrations[$reg->ID()]['dtt_objs'] : array();
 					$dtt_objs = (array) $dtt_objs;
-					foreach ( $dtt_objs as $dtt_obj ) {
-						if ( $dtt_obj instanceof EE_Datetime ) {
+					foreach ($dtt_objs as $dtt_obj) {
+						if ($dtt_obj instanceof EE_Datetime) {
 							$dtts[$dtt_obj->ID()] = $dtt_obj;
 						}
 					}
@@ -178,18 +178,18 @@ 
 
 		//if coming from the context of the event list parser, then let's just return the datetimes for the specific event.
 		$event = $this->_data['data'];
-		if ( $event instanceof EE_Event ) {
-			$template = is_array( $this->_data['template'] ) && isset($this->_data['template']['datetime_list']) ? $this->_data['template']['datetime_list'] : $this->_extra_data['template']['datetime_list'];
+		if ($event instanceof EE_Event) {
+			$template = is_array($this->_data['template']) && isset($this->_data['template']['datetime_list']) ? $this->_data['template']['datetime_list'] : $this->_extra_data['template']['datetime_list'];
 
 			//data will be datetimes for this event for this recipient
-			foreach ( $registrations_on_attendee as $reg ) {
-				if ( $reg instanceof EE_Registration && $reg->event_ID() == $event->ID() ) {
-					$ticket = isset( $data->registrations[$reg->ID()] ) && is_array( $data->registrations[$reg->ID()] ) && isset( $data->registrations[$reg->ID()]['tkt_obj'] ) ? $data->registrations[$reg->ID()]['tkt_obj'] : null;
-					if ( $ticket instanceof EE_Ticket ) {
-						$dtt_objs = isset( $data->tickets[$ticket->ID()] ) && is_array( $data->tickets[$ticket->ID()] ) && isset( $data->tickets[$ticket->ID()]['dtt_objs'] ) ? $data->tickets[$ticket->ID()]['dtt_objs'] : array();
+			foreach ($registrations_on_attendee as $reg) {
+				if ($reg instanceof EE_Registration && $reg->event_ID() == $event->ID()) {
+					$ticket = isset($data->registrations[$reg->ID()]) && is_array($data->registrations[$reg->ID()]) && isset($data->registrations[$reg->ID()]['tkt_obj']) ? $data->registrations[$reg->ID()]['tkt_obj'] : null;
+					if ($ticket instanceof EE_Ticket) {
+						$dtt_objs = isset($data->tickets[$ticket->ID()]) && is_array($data->tickets[$ticket->ID()]) && isset($data->tickets[$ticket->ID()]['dtt_objs']) ? $data->tickets[$ticket->ID()]['dtt_objs'] : array();
 						$dtt_objs = (array) $dtt_objs;
-						foreach ( $dtt_objs as $dtt_obj ) {
-							if ( $dtt_obj instanceof EE_Datetime ) {
+						foreach ($dtt_objs as $dtt_obj) {
+							if ($dtt_obj instanceof EE_Datetime) {
 								$dtts[$dtt_obj->ID()] = $dtt_obj;
 							}
 						}
@@ -199,8 +199,8 @@ 
 		}
 
 		$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;
 	}

Braces +7 added lines, -8 removed lines

@@ -137,14 +137,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']  );
-
-		else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_recipient_datetime_list_parsed( $this->_extra_data['data'] );
-
-		else
-			return '';
+		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_recipient_datetime_list_parsed( $this->_data['data']  );
+		} else if ( $this->_extra_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_recipient_datetime_list_parsed( $this->_extra_data['data'] );
+		} else {
+					return '';
+		}
 
 	}
 

core/libraries/shortcodes/EE_Ticket_List_Shortcodes.lib.php

Spacing +14 added lines, -14 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -48,8 +48,8 @@ 
 
 
 
-	protected function _parser( $shortcode ) {
-		switch ( $shortcode ) {
+	protected function _parser($shortcode) {
+		switch ($shortcode) {
 			case '[TICKET_LIST]' :
 				return $this->_get_ticket_list();
 				break;
@@ -68,13 +68,13 @@ 
 		$this->_set_shortcode_helper();
 
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
+		if ($this->_data['data'] instanceof EE_Messages_Addressee)
 			return $this->_get_ticket_list_for_main();
 
-		else if ( $this->_data['data'] instanceof EE_Registration )
+		else if ($this->_data['data'] instanceof EE_Registration)
 			return $this->_get_ticket_list_for_attendee();
 
-		else if ( $this->_data['data'] instanceof EE_Event )
+		else if ($this->_data['data'] instanceof EE_Event)
 			return $this->_get_ticket_list_for_event();
 
 		//prevent recursive loop
@@ -91,14 +91,14 @@ 
 	 * This returns the parsed ticket list for main template;
 	 */
 	private function _get_ticket_list_for_main() {
-		$valid_shortcodes = array('ticket', 'event_list', 'attendee_list','datetime_list', 'attendee', 'line_item_list', 'primary_registration_details', 'recipient_details' );
+		$valid_shortcodes = array('ticket', 'event_list', 'attendee_list', 'datetime_list', 'attendee', 'line_item_list', 'primary_registration_details', 'recipient_details');
 		$template = $this->_data['template'];
 		$data = $this->_data['data'];
 		$tktparsed = '';
 
 
 		//now we need to loop through the ticket list and send data to the EE_Parser helper.
-		foreach ( $data->tickets as $ticket ) {
+		foreach ($data->tickets as $ticket) {
 			$tktparsed .= $this->_shortcode_helper->parse_ticket_list_template($template, $ticket['ticket'], $valid_shortcodes, $this->_extra_data);
 		}
 
@@ -112,8 +112,8 @@ 
 	 * @return string
 	 */
 	private function _get_ticket_list_for_event() {
-		$valid_shortcodes = array('ticket', 'attendee_list', 'datetime_list', 'attendee', 'venue', 'line_item_list', 'primary_registration_details', 'recipient_details' );
-		$template = is_array($this->_data['template'] ) && isset($this->_data['template']['ticket_list']) ? $this->_data['template']['ticket_list'] : $this->_extra_data['template']['ticket_list'];
+		$valid_shortcodes = array('ticket', 'attendee_list', 'datetime_list', 'attendee', 'venue', 'line_item_list', 'primary_registration_details', 'recipient_details');
+		$template = is_array($this->_data['template']) && isset($this->_data['template']['ticket_list']) ? $this->_data['template']['ticket_list'] : $this->_extra_data['template']['ticket_list'];
 		$event = $this->_data['data'];
 
 		//let's remove any existing [EVENT_LIST] shortcodes from the ticket list template so that we don't get recursion.
@@ -124,7 +124,7 @@ 
 		$tickets = $this->_get_tickets_from_event($event);
 
 		//each ticket in this case should be an ticket object.
-		foreach ( $tickets as $ticket ) {
+		foreach ($tickets as $ticket) {
 			$tkt_parsed .= $this->_shortcode_helper->parse_ticket_list_template($template, $ticket, $valid_shortcodes, $this->_extra_data);
 		}
 
@@ -151,18 +151,18 @@ 
 		$tickets = $this->_get_ticket_list_from_registration($registration);
 
 		//each ticket in this case should be an ticket object.
-		foreach ( $tickets as $ticket ) {
+		foreach ($tickets 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 ) {
+	private function _get_tickets_from_event(EE_Event $event) {
 		return isset($this->_extra_data['data']->events) ? $this->_extra_data['data']->events[$event->ID()]['tkt_objs'] : array();
 	}
 
-	private function _get_ticket_list_from_registration( EE_Registration $registration, $att = NULL ) {
+	private function _get_ticket_list_from_registration(EE_Registration $registration, $att = NULL) {
 		return isset($this->_extra_data['data']->registrations) ? array($this->_extra_data['data']->registrations[$registration->ID()]['tkt_obj']) : array();
 	}
 

Braces +12 added lines, -11 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
@@ -68,18 +69,18 @@ 
 		$this->_set_shortcode_helper();
 
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_ticket_list_for_main();
-
-		else if ( $this->_data['data'] instanceof EE_Registration )
-			return $this->_get_ticket_list_for_attendee();
-
-		else if ( $this->_data['data'] instanceof EE_Event )
-			return $this->_get_ticket_list_for_event();
+		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_ticket_list_for_main();
+		} else if ( $this->_data['data'] instanceof EE_Registration ) {
+					return $this->_get_ticket_list_for_attendee();
+		} else if ( $this->_data['data'] instanceof EE_Event ) {
+					return $this->_get_ticket_list_for_event();
+		}
 
 		//prevent recursive loop
-		else
-			return '';
+		else {
+					return '';
+		}
 	}
 
 

core/libraries/shortcodes/EE_Ticket_Shortcodes.lib.php

Braces +5 added lines, -3 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
@@ -80,8 +81,9 @@ 
 
 
 		//If there is no event object by now then get out.
-		if ( ! $this->_ticket instanceof EE_Ticket )
-			return '';
+		if ( ! $this->_ticket instanceof EE_Ticket ) {
+					return '';
+		}
 
 		switch ( $shortcode ) {
 

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');
 
 /**
@@ -50,38 +50,38 @@ 
 			'[TICKET_PRICE]' => __('The price of the ticket', 'event_espresso'),
 			'[TICKET_PRICE_WITH_TAXES]' => __('The price of the ticket including any taxes that might be on the ticket', 'event_espresso'),
 			'[TKT_QTY_PURCHASED]' => __('The total quantity of the current ticket in the list that has been purchased in this transaction', 'event_espresso'),
-			'[TKT_USES_*]' => __( 'This attribute based shortcode parses to show the number of uses the ticket has.  The optional "schema" attribute can be used to indicate what schema is used when the uses is infinite.  Options are:', 'event_espresso' ) .
-				'<p><ul>' .
-				'<li><strong>symbol</strong>:' . __('This returns the &infin; symbol.', 'event_espresso') . '</li>' .
-				'<li><strong>text</strong>:' . __('This returns the word, "Unlimited". This is also the default if the "schema" attribute is not used.', 'event_espresso' ) . '</li>' .
-				'<li><strong>{custom}</strong>:' . __('You can put anything you want as a string instead and that will be used.  So you could have the world "any" and whenever uses for a ticket is infinity, this shortcode will parse to "any".', 'event_espresso' ) . '</li>' .
+			'[TKT_USES_*]' => __('This attribute based shortcode parses to show the number of uses the ticket has.  The optional "schema" attribute can be used to indicate what schema is used when the uses is infinite.  Options are:', 'event_espresso').
+				'<p><ul>'.
+				'<li><strong>symbol</strong>:'.__('This returns the &infin; symbol.', 'event_espresso').'</li>'.
+				'<li><strong>text</strong>:'.__('This returns the word, "Unlimited". This is also the default if the "schema" attribute is not used.', 'event_espresso').'</li>'.
+				'<li><strong>{custom}</strong>:'.__('You can put anything you want as a string instead and that will be used.  So you could have the world "any" and whenever uses for a ticket is infinity, this shortcode will parse to "any".', 'event_espresso').'</li>'.
 				'</ul></p>'
 			);
 	}
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
 		$this->_ticket = $this->_data instanceof EE_Ticket ? $this->_data : null;
 
 		$aee = $this->_data instanceof EE_Messages_Addressee ? $this->_data : null;
-		$aee = ! $aee instanceof EE_Messages_Addressee && is_array( $this->_extra_data ) && isset( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $aee;
+		$aee = ! $aee instanceof EE_Messages_Addressee && is_array($this->_extra_data) && isset($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $aee;
 
 
 		//possible EE_Line_Item may be incoming data
-		$this->_ticket = empty( $this->_ticket ) && $this->_data instanceof EE_Line_Item && $aee instanceof EE_Messages_Addressee && ! empty( $aee->line_items_with_children[$this->_data->ID()]['EE_Ticket'] ) && $aee->line_items_with_children[$this->_data->ID()]['EE_Ticket'] instanceof EE_Ticket ? $aee->line_items_with_children[$this->_data->ID()]['EE_Ticket'] : $this->_ticket;
+		$this->_ticket = empty($this->_ticket) && $this->_data instanceof EE_Line_Item && $aee instanceof EE_Messages_Addressee && ! empty($aee->line_items_with_children[$this->_data->ID()]['EE_Ticket']) && $aee->line_items_with_children[$this->_data->ID()]['EE_Ticket'] instanceof EE_Ticket ? $aee->line_items_with_children[$this->_data->ID()]['EE_Ticket'] : $this->_ticket;
 
 		//if still no ticket, then let's see if there is a reg_obj.  If there IS, then we'll try and grab the ticket from the reg_obj instead.
-		if ( empty( $this->_ticket ) ) {
+		if (empty($this->_ticket)) {
 			$this->_ticket = $aee instanceof EE_Messages_Addressee && $aee->reg_obj instanceof EE_Registration ? $aee->reg_obj->ticket() : NULL;
 		}
 
 
 		//If there is no event object by now then get out.
-		if ( ! $this->_ticket instanceof EE_Ticket )
+		if ( ! $this->_ticket instanceof EE_Ticket)
 			return '';
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[TICKET_ID]' :
 				return $this->_ticket->ID();
@@ -96,11 +96,11 @@ 
 				break;
 
 			case '[TICKET_PRICE]' :
-				return EEH_Template::format_currency( $this->_ticket->get('TKT_price') );
+				return EEH_Template::format_currency($this->_ticket->get('TKT_price'));
 				break;
 
 			case '[TICKET_PRICE_WITH_TAXES]' :
-				return EEH_Template::format_currency( $this->_ticket->get_ticket_total_with_taxes() );
+				return EEH_Template::format_currency($this->_ticket->get_ticket_total_with_taxes());
 				break;
 
 			case '[TKT_QTY_PURCHASED]' :
@@ -108,10 +108,10 @@ 
 				break;
 		}
 
-		if ( strpos( $shortcode, '[TKT_USES_*') !== FALSE  ) {
-			$attrs = $this->_get_shortcode_attrs( $shortcode );
-			$schema = empty( $attrs['schema'] ) ? null : $attrs['schema'];
-			return $this->_ticket->get_pretty( 'TKT_uses', $schema );
+		if (strpos($shortcode, '[TKT_USES_*') !== FALSE) {
+			$attrs = $this->_get_shortcode_attrs($shortcode);
+			$schema = empty($attrs['schema']) ? null : $attrs['schema'];
+			return $this->_ticket->get_pretty('TKT_uses', $schema);
 		}
 		return '';
 

modules/certificate/EED_Certificate.module.php

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
 	 * @return EED_Module
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -60,7 +60,7 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 //		add_filter( 'FHEE_load_ee_config', '__return_true' );
 //		add_filter( 'FHEE_run_EE_wp', '__return_true' );
 //		add_filter( 'FHEE_load_EE_Session', '__return_true' );
@@ -79,8 +79,8 @@ 
 	 *  @return 	void
 	 */
 	public function certificate_launch() {
-		if ( EE_Registry::instance()->REQ->is_set( 'id' ) && EE_Registry::instance()->REQ->is_set( 'r_id' )) {
-			echo espresso_certificate_launch( EE_Registry::instance()->REQ->get( 'id' ), EE_Registry::instance()->REQ->get( 'r_id' ));
+		if (EE_Registry::instance()->REQ->is_set('id') && EE_Registry::instance()->REQ->is_set('r_id')) {
+			echo espresso_certificate_launch(EE_Registry::instance()->REQ->get('id'), EE_Registry::instance()->REQ->get('r_id'));
 		}
 	}
 
@@ -114,7 +114,7 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function the_content( $content ) {
+	public function the_content($content) {
 		$content .= $this->ouput;
 		return $content;
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 	 * 
 	 *  @access 	public
 	 *  @param		array 	$attributes
-	 *  @return 	void
+	 *  @return 	string
 	 */
 	public function process_shortcode( $attributes = array() ) {
 		extract( $attributes );

Braces +3 added lines, -1 removed lines

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

modules/csv/EED_Csv.module.php

Spacing +4 added lines, -4 removed lines

@@ -29,7 +29,7 @@ 
 	 * @return EED_Csv
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -60,7 +60,7 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 //		add_filter( 'FHEE_load_ee_config', '__return_true' );
 //		add_filter( 'FHEE_run_EE_wp', '__return_true' );
 //		add_filter( 'FHEE_load_EE_Session', '__return_true' );
@@ -79,7 +79,7 @@ 
 	 *  @return 	void
 	 */
 	public function export() {
-		$Export = EE_Registry::instance()->load_class( 'Export' );
+		$Export = EE_Registry::instance()->load_class('Export');
 		$Export->export();
 	}
 
@@ -93,7 +93,7 @@ 
 	 *  @return 	void
 	 */
 	public function import() {
-		$Import = EE_Registry::instance()->load_class( 'Import' );
+		$Import = EE_Registry::instance()->load_class('Import');
 		$Import->import();
 	}
 

Braces +3 added lines, -1 removed lines

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

modules/feeds/templates/espresso_events_feed.template.php

Spacing +9 added lines, -9 removed lines

@@ -10,13 +10,13 @@
  * @ version		4+
  */
  ?>
-<p><?php  _e( 'Event Organizer: ', 'event_espresso' ) . espresso_organization_name( $EVT_ID ); ?><br/>
-<?php  _e( 'Organizer Email: ', 'event_espresso' ) . espresso_organization_email( $EVT_ID ); ?><br/>
-<?php  _e( 'Event Phone: ', 'event_espresso' ) . espresso_event_phone( $EVT_ID ); ?></p>
-<p><?php  _e( 'Event Status: ', 'event_espresso' ) . espresso_event_status( $EVT_ID );?></p>
-<p><?php  _e( 'Categories: ', 'event_espresso' ) . espresso_event_categories( $EVT_ID );?></p>
-<?php  _e( 'Dates and Times: ', 'event_espresso' ) . espresso_list_of_event_dates( $EVT_ID );?>
-<?php  _e( 'Available Tickets: ', 'event_espresso' ) . espresso_event_tickets_available( $EVT_ID );?>
-<p><?php  _e( 'Event Venue: ', 'event_espresso' ) . espresso_venue_name( NULL, FALSE ); ?></p>
-<p><?php  echo __( 'Description: ', 'event_espresso' ) . $event_description; ?></p><br/>
+<p><?php  _e('Event Organizer: ', 'event_espresso').espresso_organization_name($EVT_ID); ?><br/>
+<?php  _e('Organizer Email: ', 'event_espresso').espresso_organization_email($EVT_ID); ?><br/>
+<?php  _e('Event Phone: ', 'event_espresso').espresso_event_phone($EVT_ID); ?></p>
+<p><?php  _e('Event Status: ', 'event_espresso').espresso_event_status($EVT_ID); ?></p>
+<p><?php  _e('Categories: ', 'event_espresso').espresso_event_categories($EVT_ID); ?></p>
+<?php  _e('Dates and Times: ', 'event_espresso').espresso_list_of_event_dates($EVT_ID); ?>
+<?php  _e('Available Tickets: ', 'event_espresso').espresso_event_tickets_available($EVT_ID); ?>
+<p><?php  _e('Event Venue: ', 'event_espresso').espresso_venue_name(NULL, FALSE); ?></p>
+<p><?php  echo __('Description: ', 'event_espresso').$event_description; ?></p><br/>
  
\ No newline at end of file

modules/feeds/templates/espresso_venues_feed.template.php

Spacing +7 added lines, -7 removed lines

@@ -10,11 +10,11 @@
  * @ version		4+
  */
  ?>
-<p><?php  _e( 'Organizer Name: ', 'event_espresso' ) . espresso_organization_name( $VNU_ID ); ?><br/>
-<?php  _e( 'Organizer Email: ', 'event_espresso' ) . espresso_organization_email( $VNU_ID ); ?><br/>
-<?php  _e( 'Venue Phone: ', 'event_espresso' ) . espresso_venue_phone( $VNU_ID ); ?></p>
-<p><?php  _e( 'Categories: ', 'event_espresso' ) . espresso_venue_categories( $VNU_ID );?></p>
-<p><?php  _e( 'Address: ', 'event_espresso' ) . espresso_venue_address( $VNU_ID );?></p>
-<p><?php  _e( 'Website: ', 'event_espresso' ) . espresso_venue_website( $VNU_ID );?></p>
-<p><?php  echo __( 'Description: ', 'event_espresso' )  . $venue_description; ?></p><br/>
+<p><?php  _e('Organizer Name: ', 'event_espresso').espresso_organization_name($VNU_ID); ?><br/>
+<?php  _e('Organizer Email: ', 'event_espresso').espresso_organization_email($VNU_ID); ?><br/>
+<?php  _e('Venue Phone: ', 'event_espresso').espresso_venue_phone($VNU_ID); ?></p>
+<p><?php  _e('Categories: ', 'event_espresso').espresso_venue_categories($VNU_ID); ?></p>
+<p><?php  _e('Address: ', 'event_espresso').espresso_venue_address($VNU_ID); ?></p>
+<p><?php  _e('Website: ', 'event_espresso').espresso_venue_website($VNU_ID); ?></p>
+<p><?php  echo __('Description: ', 'event_espresso').$venue_description; ?></p><br/>
  
\ No newline at end of file

modules/gateways/Invoice/lib/Invoice.class.php

Braces +10 added lines, -9 removed lines

@@ -50,7 +50,7 @@ 
 		//Get the CSS file
 		if( isset( $themes[ $theme_requested ] ) ) {
 			$template_args['invoice_css'] = $themes[ $theme_requested ];
-		}else{
+		} else{
 			$template_args['invoice_css'] = $this->invoice_payment_method->get_extra_meta( 'legacy_invoice_css', TRUE, 'simple.css' );
 		}
 
@@ -78,7 +78,7 @@ 
 		$attendee_state = $primary_attendee->state_obj();
 		if($attendee_state){
 			$attendee_state_name = $attendee_state->name();
-		}else{
+		} else{
 			$attendee_state_name = '';
 		}
 		$template_args['attendee_state'] = $attendee_state_name;
@@ -149,7 +149,7 @@ 
 			$EE->load_helper( 'Venue_View' );
 //			d($template_args);
 			$template_args['download_link'] = $this->registration->receipt_url('download');
-		}else{
+		} else{
 			//it's just an invoice we're accessing
 			$template_args['download_link'] = $this->registration->invoice_url('download');
 		}
@@ -165,7 +165,7 @@ 
 		$template_header = EEH_Template::locate_template( $templates_relative_path . 'invoice_header.template.php', $template_args, TRUE, TRUE );
 		if(isset($_GET['receipt'])){
 			$template_body = EEH_Template::locate_template( $templates_relative_path . 'receipt_body.template.php', $template_args, TRUE, TRUE );
-		}else{
+		} else{
 			$template_body = EEH_Template::locate_template( $templates_relative_path . 'invoice_body.template.php', $template_args, TRUE, TRUE );
 		}
 
@@ -190,7 +190,7 @@ 
 		//Create the PDF
 		if(array_key_exists('html',$_GET)){
 			echo $content;
-		}else{
+		} else{
 			//only load dompdf if nobody else has yet...
 			if( ! defined('DOMPDF_DIR')){
 				define('DOMPDF_ENABLE_REMOTE', TRUE);
@@ -214,7 +214,7 @@ 
 	function check_if_any_line_items_have_a_description(EE_Line_Item $line_item){
 		if($line_item->desc()){
 			return true;
-		}else{
+		} else{
 			foreach($line_item->children() as $child_line_item){
 				if($this->check_if_any_line_items_have_a_description($child_line_item)){
 					return true;
@@ -258,7 +258,7 @@ 
 		$org_state = EE_Registry::instance()->load_model( 'State' )->get_one_by_ID( $EE->CFG->organization->STA_ID );
 		if($org_state){
 			$org_state_name = $org_state->name();
-		}else{
+		} else{
 			$org_state_name = '';
 		}
 		$ReplaceValues = array(
@@ -285,8 +285,9 @@ 
 	public function espressoLoadData($items) {
 		$lines = $items;
 		$data = array();
-		foreach ($lines as $line)
-			$data[] = explode(';', chop($line));
+		foreach ($lines as $line) {
+					$data[] = explode(';', chop($line));
+		}
 
 		return $data;
 	}

Spacing +77 added lines, -77 removed lines

@@ -21,23 +21,23 @@ 
 	private $EE;
 	public function __construct($url_link = 0) {
 
-		if ( $this->registration = EE_Registry::instance()->load_model( 'Registration' )->get_registration_for_reg_url_link( $url_link)) {
+		if ($this->registration = EE_Registry::instance()->load_model('Registration')->get_registration_for_reg_url_link($url_link)) {
 			$this->transaction = $this->registration->transaction();
 
-			$payment_settings = EE_Config::instance()->gateway->payment_settings;//get_user_meta(EE_Registry::instance()->CFG->wp_user, 'payment_settings', TRUE);
-			$this->invoice_payment_method = EEM_Payment_Method::instance()->get_one_of_type( 'Invoice' );
+			$payment_settings = EE_Config::instance()->gateway->payment_settings; //get_user_meta(EE_Registry::instance()->CFG->wp_user, 'payment_settings', TRUE);
+			$this->invoice_payment_method = EEM_Payment_Method::instance()->get_one_of_type('Invoice');
 		} else {
-			EE_Error::add_error( __( 'Your request appears to be missing some required data, and no information for your transaction could be retrieved.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('Your request appears to be missing some required data, and no information for your transaction could be retrieved.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 
 	}
 
-	public function send_invoice( $download = FALSE ) {
+	public function send_invoice($download = FALSE) {
 		$template_args = array();
 		$EE = EE_Registry::instance();
 
 		//allow the request to override the default theme defined in the invoice settings
-		$theme_requested = ( isset( $_REQUEST['theme'] ) && $_REQUEST['theme'] > 0 && $_REQUEST['theme'] < 8 ) ? absint( $_REQUEST['theme'] ) : null;
+		$theme_requested = (isset($_REQUEST['theme']) && $_REQUEST['theme'] > 0 && $_REQUEST['theme'] < 8) ? absint($_REQUEST['theme']) : null;
 		$themes = array(
 										1 => "simple.css",
 										2 => "bauhaus.css",
@@ -48,26 +48,26 @@ 
 										7 => "union.css"
 									);
 		//Get the CSS file
-		if( isset( $themes[ $theme_requested ] ) ) {
-			$template_args['invoice_css'] = $themes[ $theme_requested ];
-		}else{
-			$template_args['invoice_css'] = $this->invoice_payment_method->get_extra_meta( 'legacy_invoice_css', TRUE, 'simple.css' );
+		if (isset($themes[$theme_requested])) {
+			$template_args['invoice_css'] = $themes[$theme_requested];
+		} else {
+			$template_args['invoice_css'] = $this->invoice_payment_method->get_extra_meta('legacy_invoice_css', TRUE, 'simple.css');
 		}
 
-		if (is_dir(EVENT_ESPRESSO_GATEWAY_DIR . '/invoice')) {
-			$template_args['base_url'] = EVENT_ESPRESSO_GATEWAY_URL . 'Invoice/lib/templates/';
+		if (is_dir(EVENT_ESPRESSO_GATEWAY_DIR.'/invoice')) {
+			$template_args['base_url'] = EVENT_ESPRESSO_GATEWAY_URL.'Invoice/lib/templates/';
 		} else {
-			$template_args['base_url'] = EE_GATEWAYS . '/Invoice/lib/templates/';
+			$template_args['base_url'] = EE_GATEWAYS.'/Invoice/lib/templates/';
 		}
 		$primary_attendee = $this->transaction->primary_registration()->attendee();
 
-		$template_args['organization'] = $EE->CFG->organization->get_pretty( 'name' );
-		$template_args['street'] = empty( $EE->CFG->organization->address_2 ) ? $EE->CFG->organization->get_pretty( 'address_1' ) : $EE->CFG->organization->get_pretty( 'address_1' ) . '<br>' . $EE->CFG->organization->get_pretty( 'address_2' );
-		$template_args['city'] = $EE->CFG->organization->get_pretty( 'city' );
-		$template_args['state'] = EE_Registry::instance()->load_model( 'State' )->get_one_by_ID( $EE->CFG->organization->STA_ID );
-		$template_args['country'] = EE_Registry::instance()->load_model( 'Country' )->get_one_by_ID( $EE->CFG->organization->CNT_ISO );
-		$template_args['zip'] = $EE->CFG->organization->get_pretty( 'zip' );
-		$template_args['email'] = $EE->CFG->organization->get_pretty( 'email' );
+		$template_args['organization'] = $EE->CFG->organization->get_pretty('name');
+		$template_args['street'] = empty($EE->CFG->organization->address_2) ? $EE->CFG->organization->get_pretty('address_1') : $EE->CFG->organization->get_pretty('address_1').'<br>'.$EE->CFG->organization->get_pretty('address_2');
+		$template_args['city'] = $EE->CFG->organization->get_pretty('city');
+		$template_args['state'] = EE_Registry::instance()->load_model('State')->get_one_by_ID($EE->CFG->organization->STA_ID);
+		$template_args['country'] = EE_Registry::instance()->load_model('Country')->get_one_by_ID($EE->CFG->organization->CNT_ISO);
+		$template_args['zip'] = $EE->CFG->organization->get_pretty('zip');
+		$template_args['email'] = $EE->CFG->organization->get_pretty('email');
 
 		$template_args['registration_code'] = $this->registration->reg_code();
 		$template_args['registration_date'] = $this->registration->date();
@@ -76,9 +76,9 @@ 
 		$template_args['attendee_address2'] = $primary_attendee->address2();
 		$template_args['attendee_city'] = $primary_attendee->city();
 		$attendee_state = $primary_attendee->state_obj();
-		if($attendee_state){
+		if ($attendee_state) {
 			$attendee_state_name = $attendee_state->name();
-		}else{
+		} else {
 			$attendee_state_name = '';
 		}
 		$template_args['attendee_state'] = $attendee_state_name;
@@ -102,9 +102,9 @@ 
 		if ($template_args['amount_pd'] != $template_args['total_cost']) {
 			//$template_args['net_total'] = $this->espressoInvoiceTotals( __('SubTotal', 'event_espresso'), $this->transaction->total());//$this->session_data['cart']['REG']['sub_total']);
 			$tax_items = $this->transaction->tax_items();
-			if(!empty($tax_items) ){
+			if ( ! empty($tax_items)) {
 				foreach ($tax_items as $tax) {
-					$template_args['net_total'] .= $this->espressoInvoiceTotals( $tax->name(), $tax->total());
+					$template_args['net_total'] .= $this->espressoInvoiceTotals($tax->name(), $tax->total());
 				}
 			}
 
@@ -114,30 +114,30 @@ 
 			} else {
 				$text = __('Extra', 'event_espresso');
 			}
-			$template_args['discount'] = $this->espressoInvoiceTotals( $text, $difference );
+			$template_args['discount'] = $this->espressoInvoiceTotals($text, $difference);
 		}
 
 		$template_args['currency_symbol'] = $EE->CFG->currency->sign;
-		$template_args['template_payment_instructions'] = wpautop(stripslashes_deep(html_entity_decode($this->invoice_payment_method->get_extra_meta( 'pdf_instructions', TRUE ), ENT_QUOTES)));
-		$template_args['shameless_plug'] = apply_filters( 'FHEE_Invoice__send_invoice__shameless_plug',true );
-		if(isset($_GET['receipt'])){
+		$template_args['template_payment_instructions'] = wpautop(stripslashes_deep(html_entity_decode($this->invoice_payment_method->get_extra_meta('pdf_instructions', TRUE), ENT_QUOTES)));
+		$template_args['shameless_plug'] = apply_filters('FHEE_Invoice__send_invoice__shameless_plug', true);
+		if (isset($_GET['receipt'])) {
 			//receipt-specific stuff
 			$events_for_txn = EEM_Event::instance()->get_all(array(array('Registration.TXN_ID'=>$this->transaction->ID())));
 			$ticket_line_items_per_event = array();
 			$registrations_per_line_item = array();
 			$venues_for_events = array();
-			foreach($events_for_txn as $event_id => $event){
-				$line_items_for_this_event = EEM_Line_Item::instance()->get_all(array(array('Ticket.Datetime.EVT_ID'=>$event_id,'TXN_ID'=>$this->transaction->ID())));
+			foreach ($events_for_txn as $event_id => $event) {
+				$line_items_for_this_event = EEM_Line_Item::instance()->get_all(array(array('Ticket.Datetime.EVT_ID'=>$event_id, 'TXN_ID'=>$this->transaction->ID())));
 				$ticket_line_items_per_event[$event_id] = $line_items_for_this_event;
-				foreach($line_items_for_this_event as $line_item_id => $line_item){
+				foreach ($line_items_for_this_event as $line_item_id => $line_item) {
 					$ticket = $line_item->ticket();
-					$registrations_for_this_ticket = EEM_Registration::instance()->get_all(array(array('TKT_ID'=>$ticket->ID(),'TXN_ID'=>$this->transaction->ID())));
+					$registrations_for_this_ticket = EEM_Registration::instance()->get_all(array(array('TKT_ID'=>$ticket->ID(), 'TXN_ID'=>$this->transaction->ID())));
 					$registrations_per_line_item[$line_item_id] = $registrations_for_this_ticket;
 				}
 				$venues_for_events = array_merge($venues_for_events, $event->venues());
 			}
-			$tax_total_line_item = EEM_Line_Item::instance()->get_one(array(array('TXN_ID'=>$this->transaction->ID(),'LIN_type'=>  EEM_Line_Item::type_tax_sub_total)));
-			$questions_to_skip = array(EEM_Attendee::system_question_fname,EEM_Attendee::system_question_lname,  EEM_Attendee::system_question_email);
+			$tax_total_line_item = EEM_Line_Item::instance()->get_one(array(array('TXN_ID'=>$this->transaction->ID(), 'LIN_type'=>  EEM_Line_Item::type_tax_sub_total)));
+			$questions_to_skip = array(EEM_Attendee::system_question_fname, EEM_Attendee::system_question_lname, EEM_Attendee::system_question_email);
 
 
 			$template_args['events_for_txn'] = $events_for_txn;
@@ -148,53 +148,53 @@ 
 			$template_args['questions_to_skip'] = $questions_to_skip;
 //			d($template_args);
 			$template_args['download_link'] = $this->registration->receipt_url('download');
-		}else{
+		} else {
 			//it's just an invoice we're accessing
 			$template_args['download_link'] = $this->registration->invoice_url('download');
 		}
 
 		//Get the HTML as an object
 		$templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
-		$template_header = EEH_Template::locate_template( $templates_relative_path . 'invoice_header.template.php', $template_args, TRUE, TRUE );
-		if(isset($_GET['receipt'])){
-			$template_body = EEH_Template::locate_template( $templates_relative_path . 'receipt_body.template.php', $template_args, TRUE, TRUE );
-		}else{
-			$template_body = EEH_Template::locate_template( $templates_relative_path . 'invoice_body.template.php', $template_args, TRUE, TRUE );
+		$template_header = EEH_Template::locate_template($templates_relative_path.'invoice_header.template.php', $template_args, TRUE, TRUE);
+		if (isset($_GET['receipt'])) {
+			$template_body = EEH_Template::locate_template($templates_relative_path.'receipt_body.template.php', $template_args, TRUE, TRUE);
+		} else {
+			$template_body = EEH_Template::locate_template($templates_relative_path.'invoice_body.template.php', $template_args, TRUE, TRUE);
 		}
 
 
-		$template_footer = EEH_Template::locate_template( $templates_relative_path . 'invoice_footer.template.php', $template_args, TRUE, TRUE );
+		$template_footer = EEH_Template::locate_template($templates_relative_path.'invoice_footer.template.php', $template_args, TRUE, TRUE);
 
-		$copies =  ! empty( $_REQUEST['copies'] ) ? $_REQUEST['copies'] : 1;
+		$copies = ! empty($_REQUEST['copies']) ? $_REQUEST['copies'] : 1;
 
 		$content = $this->espresso_replace_invoice_shortcodes($template_header);
-		for( $x = 1; $x <= $copies; $x++ ) {
+		for ($x = 1; $x <= $copies; $x++) {
 			$content .= $this->espresso_replace_invoice_shortcodes($template_body);
 		}
 		$content .= $this->espresso_replace_invoice_shortcodes($template_footer);
 
 		//Check if debugging or mobile is set
-		if (!empty($_REQUEST['html'])) {
+		if ( ! empty($_REQUEST['html'])) {
 			echo $content;
 			exit(0);
 		}
-		$invoice_name = $template_args['organization'] . ' ' . __('Invoice #', 'event_espresso') . $template_args['registration_code'] . __(' for ', 'event_espresso') . $template_args['name'];
-		$invoice_name = str_replace( ' ', '_', $invoice_name );
+		$invoice_name = $template_args['organization'].' '.__('Invoice #', 'event_espresso').$template_args['registration_code'].__(' for ', 'event_espresso').$template_args['name'];
+		$invoice_name = str_replace(' ', '_', $invoice_name);
 		//Create the PDF
-		if(array_key_exists('html',$_GET)){
+		if (array_key_exists('html', $_GET)) {
 			echo $content;
-		}else{
+		} else {
 			//only load dompdf if nobody else has yet...
-			if( ! defined('DOMPDF_DIR')){
+			if ( ! defined('DOMPDF_DIR')) {
 				define('DOMPDF_ENABLE_REMOTE', TRUE);
 				define('DOMPDF_ENABLE_JAVASCRIPT', FALSE);
 				define('DOMPDF_ENABLE_CSS_FLOAT', TRUE);
-				require_once(EE_THIRD_PARTY . 'dompdf/dompdf_config.inc.php');
+				require_once(EE_THIRD_PARTY.'dompdf/dompdf_config.inc.php');
 			}
 			$dompdf = new DOMPDF();
 			$dompdf->load_html($content);
 			$dompdf->render();
-			$dompdf->stream($invoice_name . ".pdf", array( 'Attachment' => $download ));
+			$dompdf->stream($invoice_name.".pdf", array('Attachment' => $download));
 		}
 		exit(0);
 	}
@@ -204,12 +204,12 @@ 
 	 * @param EE_Line_Item $line_item
 	 * @return boolean
 	 */
-	function check_if_any_line_items_have_a_description(EE_Line_Item $line_item){
-		if($line_item->desc()){
+	function check_if_any_line_items_have_a_description(EE_Line_Item $line_item) {
+		if ($line_item->desc()) {
 			return true;
-		}else{
-			foreach($line_item->children() as $child_line_item){
-				if($this->check_if_any_line_items_have_a_description($child_line_item)){
+		} else {
+			foreach ($line_item->children() as $child_line_item) {
+				if ($this->check_if_any_line_items_have_a_description($child_line_item)) {
 					return true;
 				}
 			}
@@ -219,14 +219,14 @@ 
 	}
 
 //Perform the shortcode replacement
-	function espresso_replace_invoice_shortcodes( $content ) {
+	function espresso_replace_invoice_shortcodes($content) {
 
 		$EE = EE_Registry::instance();
 		//Create the logo
-		$invoice_logo_url = $this->invoice_payment_method->get_extra_meta('pdf_logo_image', TRUE,  $EE->CFG->organization->logo_url );
-		if (!empty($invoice_logo_url)) {
+		$invoice_logo_url = $this->invoice_payment_method->get_extra_meta('pdf_logo_image', TRUE, $EE->CFG->organization->logo_url);
+		if ( ! empty($invoice_logo_url)) {
 			$image_size = getimagesize($invoice_logo_url);
-			$invoice_logo_image = '<img class="logo screen" src="' . $invoice_logo_url . '" ' . $image_size[3] . ' alt="logo" /> ';
+			$invoice_logo_image = '<img class="logo screen" src="'.$invoice_logo_url.'" '.$image_size[3].' alt="logo" /> ';
 		} else {
 			$invoice_logo_image = '';
 		}
@@ -248,28 +248,28 @@ 
 				"[instructions]",
 		);
 		$primary_attendee = $this->transaction->primary_registration()->attendee();
-		$org_state = EE_Registry::instance()->load_model( 'State' )->get_one_by_ID( $EE->CFG->organization->STA_ID );
-		if($org_state){
+		$org_state = EE_Registry::instance()->load_model('State')->get_one_by_ID($EE->CFG->organization->STA_ID);
+		if ($org_state) {
 			$org_state_name = $org_state->name();
-		}else{
+		} else {
 			$org_state_name = '';
 		}
 		$ReplaceValues = array(
-				$EE->CFG->organization->get_pretty( 'name' ),
+				$EE->CFG->organization->get_pretty('name'),
 				$this->registration->reg_code(),
 				$this->transaction->ID(),
 				$primary_attendee->full_name(),
-				(is_dir(EVENT_ESPRESSO_GATEWAY_DIR . '/invoice')) ? EVENT_ESPRESSO_GATEWAY_URL . 'Invoice/lib/templates/' : EE_GATEWAYS_URL . 'Invoice/lib/templates/',
-				$this->registration->invoice_url(),//home_url() . '/?download_invoice=true&amp;id=' . $this->registration->reg_url_link(),
+				(is_dir(EVENT_ESPRESSO_GATEWAY_DIR.'/invoice')) ? EVENT_ESPRESSO_GATEWAY_URL.'Invoice/lib/templates/' : EE_GATEWAYS_URL.'Invoice/lib/templates/',
+				$this->registration->invoice_url(), //home_url() . '/?download_invoice=true&amp;id=' . $this->registration->reg_url_link(),
 				$invoice_logo_image,
-				empty( $EE->CFG->organization->address_2 ) ? $EE->CFG->organization->get_pretty( 'address_1' ) : $EE->CFG->organization->get_pretty( 'address_1' ) . '<br>' . $EE->CFG->organization->get_pretty( 'address_2' ),
-				$EE->CFG->organization->get_pretty( 'city' ),
+				empty($EE->CFG->organization->address_2) ? $EE->CFG->organization->get_pretty('address_1') : $EE->CFG->organization->get_pretty('address_1').'<br>'.$EE->CFG->organization->get_pretty('address_2'),
+				$EE->CFG->organization->get_pretty('city'),
 				$org_state_name,
-				$EE->CFG->organization->get_pretty( 'zip' ),
-				$EE->CFG->organization->get_pretty( 'email' ),
+				$EE->CFG->organization->get_pretty('zip'),
+				$EE->CFG->organization->get_pretty('email'),
 				$EE->CFG->organization->vat,
-				$this->registration->get_i18n_datetime( 'REG_date', get_option( 'date_format' ) ),
-				$this->invoice_payment_method->get_extra_meta( 'pdf_instructions', TRUE ),
+				$this->registration->get_i18n_datetime('REG_date', get_option('date_format')),
+				$this->invoice_payment_method->get_extra_meta('pdf_instructions', TRUE),
 		);
 
 		return str_replace($SearchValues, $ReplaceValues, $content);
@@ -292,12 +292,12 @@ 
 		if ($total_cost < 0) {
 			$total_cost = (-1) * $total_cost;
 		}
-		$find = array( ' ' );
-		$replace = array( '-' );
-		$row_id = strtolower( str_replace( $find, $replace, $text ));
+		$find = array(' ');
+		$replace = array('-');
+		$row_id = strtolower(str_replace($find, $replace, $text));
 		$html .= '<tr id="'.$row_id.'-tr"><td colspan="4">&nbsp;</td>';
-		$html .= '<td class="item_r">' . $text . '</td>';
-		$html .= '<td class="item_r">' . $total_cost . '</td>';
+		$html .= '<td class="item_r">'.$text.'</td>';
+		$html .= '<td class="item_r">'.$total_cost.'</td>';
 		$html .= '</tr>';
 		return $html;
 	}

modules/gateways/Invoice/lib/templates/invoice_body.template.php

Switch Indentation +3 added lines, -3 removed lines

@@ -154,12 +154,12 @@
 							<td class="item_r"><?php echo $line_item->total_no_code();?></td>
 						</tr>
 						<?php break;
-					case EEM_Line_Item::type_tax:
-							?>
+						case EEM_Line_Item::type_tax:
+								?>
 						<tr class="item sub-item tax-total">
 							<td class="item_l"><?php echo $line_item->name(); ?></td>
 							<?php if ($show_line_item_description){?><td class="item_l"><?php echo $line_item->desc() ?></td><?php }?>
-							<td colspan="2" class="item_c"><?php echo $line_item->percent(); ?>%</td>
+								<td colspan="2" class="item_c"><?php echo $line_item->percent(); ?>%</td>
 
 							<td class="item_r"><?php echo $line_item->total_no_code();?></td>
 						</tr><?php break;

Spacing +43 added lines, -43 removed lines

@@ -45,13 +45,13 @@ 
 					</div>
 					 <!--#client-details vcard-->
 
-		<h2><?php _e("Purchases",'event_espresso')?></h2>
+		<h2><?php _e("Purchases", 'event_espresso')?></h2>
 		<table class="invoice-amount">
 
 			<thead>
 				<tr class="header_row">
 					<th class="left ticket_th"><?php _e('Item', 'event_espresso'); ?></th>
-					<?php if ($show_line_item_description){?><th class="left event_th"><?php _e('Description', 'event_espresso'); ?></th><?php }?>
+					<?php if ($show_line_item_description) {?><th class="left event_th"><?php _e('Description', 'event_espresso'); ?></th><?php }?>
 					<th class="quantity_th"><?php _e('Qty', 'event_espresso'); ?></th>
 					<th class="left event_th"><?php _e('Price', 'event_espresso'); ?></th>
 					<th class="subtotal_th item_r"><?php _e('Total', 'event_espresso'); ?></th>
@@ -65,56 +65,56 @@ 
 				 * @param EE_Line_Item $line_item
 				 * @param boolean $odd for indicating whether to style this line item as an 'odd' or 'even'
 				 */
-				function ee_invoice_display_line_item(EE_Line_Item $line_item, $show_line_item_description, $odd = false){
-					switch($line_item->type()){
+				function ee_invoice_display_line_item(EE_Line_Item $line_item, $show_line_item_description, $odd = false) {
+					switch ($line_item->type()) {
 						case EEM_Line_Item::type_total:
-							foreach($line_item->children() as $child_line_item){
-								ee_invoice_display_line_item($child_line_item,$show_line_item_description);
+							foreach ($line_item->children() as $child_line_item) {
+								ee_invoice_display_line_item($child_line_item, $show_line_item_description);
 								}?>
 							<tr><td colspan="<?php echo $show_line_item_description ? 5 : 4 ?>"><hr></td></tr>
 							<tr class="total_tr odd">
 								<td colspan="<?php echo $show_line_item_description ? 2 : 1 ?>">&nbsp;</td>
 								<td colspan="2" class="total" id="total_currency"><?php _e('Total', 'event_espresso'); ?></td>
-								<td class="total"><?php echo $line_item->total_no_code();?></td>
+								<td class="total"><?php echo $line_item->total_no_code(); ?></td>
 							</tr>
 						<?php break;
 
 
 						case EEM_Line_Item::type_sub_total:
-							foreach($line_item->children() as $child_line_item){
+							foreach ($line_item->children() as $child_line_item) {
 							//$odd = !$odd;
-								ee_invoice_display_line_item($child_line_item,$show_line_item_description,$odd);
+								ee_invoice_display_line_item($child_line_item, $show_line_item_description, $odd);
 							}?>
 							<tr class="total_tr odd">
 								<td colspan="<?php echo $show_line_item_description ? 2 : 1 ?>">&nbsp;</td>
 								<td colspan="2" class="total" id="total_currency"><?php _e('Sub-Total', 'event_espresso'); ?></td>
-								<td class="total"><?php echo $line_item->total_no_code();?></td>
+								<td class="total"><?php echo $line_item->total_no_code(); ?></td>
 							</tr>
 						<?php break;
 
 
 						case EEM_Line_Item::type_tax_sub_total:
-							foreach($line_item->children() as $child_line_item){
-								$odd = !$odd;
+							foreach ($line_item->children() as $child_line_item) {
+								$odd = ! $odd;
 								ee_invoice_display_line_item($child_line_item, $show_line_item_description, $odd);
 							}?>
 							<tr class="total_tr odd">
 								<td colspan="<?php echo $show_line_item_description ? 2 : 1 ?>">&nbsp;</td>
 								<td colspan="2" class="total" id="total_currency"><?php _e('Tax Total', 'event_espresso'); ?></td>
-								<td class="total"><?php echo $line_item->total_no_code();?></td>
+								<td class="total"><?php echo $line_item->total_no_code(); ?></td>
 							</tr>
 						<?php break;
 
 
 						case EEM_Line_Item::type_line_item:
 							$subitems = $line_item->children();
-							$has_subitems  = count($subitems) > 1 ;
-							if($has_subitems){
+							$has_subitems = count($subitems) > 1;
+							if ($has_subitems) {
 							?>
-							<tr class="item <?php echo $odd ?   'odd' : ''; ?>">
+							<tr class="item <?php echo $odd ? 'odd' : ''; ?>">
 								<td class="item_l"><?php echo $line_item->name() ?></td>
-								<?php if ($show_line_item_description){?><td class="item_l"><?php echo $line_item->desc() ?></td><?php }?>
-								<td class="item_l"><?php echo $line_item->quantity();?></td>
+								<?php if ($show_line_item_description) {?><td class="item_l"><?php echo $line_item->desc() ?></td><?php }?>
+								<td class="item_l"><?php echo $line_item->quantity(); ?></td>
 
 								<td class="item_c"><?php echo $line_item->unit_price_no_code()?></td>
 
@@ -122,15 +122,15 @@ 
 								<?php //<td class="item_l"><?php  $datetimes_strings = array(); foreach($datetimes as $datetime){ $datetimes_strings[]= $datetime->start_date_and_time();} echo implode(", ",$datetimes_strings); ?>
 							</tr>
 							<?php
-								if( $has_subitems ){
-									foreach($line_item->children() as $child_line_item){
-										ee_invoice_display_line_item($child_line_item,$show_line_item_description, $odd);
+								if ($has_subitems) {
+									foreach ($line_item->children() as $child_line_item) {
+										ee_invoice_display_line_item($child_line_item, $show_line_item_description, $odd);
 									}
 								}
-							}else{//no subitems - just show this line item ?>
-								<tr class="item <?php echo $odd ?   'odd' : ''; ?>">
+							} else {//no subitems - just show this line item ?>
+								<tr class="item <?php echo $odd ? 'odd' : ''; ?>">
 									<td class="item_l"><?php echo $line_item->name()?></td>
-									<?php if ($show_line_item_description){?><td class="item_l"><?php echo $line_item->desc() ?></td><?php }?>
+									<?php if ($show_line_item_description) {?><td class="item_l"><?php echo $line_item->desc() ?></td><?php }?>
 									<td class="item_l"><?php echo $line_item->quantity()?></td>
 									<td class="item_c"><?php echo $line_item->unit_price_no_code()?></td>
 									<td class="item_r"> <?php echo $line_item->total_no_code(); echo $line_item->is_taxable() ? '*' : ''?> </td>
@@ -143,32 +143,32 @@ 
 							?>
 						<tr class="item subitem-row">
 							<td class="item_l subitem"><?php echo $line_item->name(); ?></td>
-							<?php if ($show_line_item_description){?><td class="item_l"><?php echo $line_item->desc() ?></td><?php }?>
+							<?php if ($show_line_item_description) {?><td class="item_l"><?php echo $line_item->desc() ?></td><?php }?>
 							<?php if ($line_item->is_percent()) { ?>
 									<td></td>
-									<td class="item_c"><?php echo $line_item->percent();?>%</td>
-							<?php }else{//flat discount/surcharge ?>
+									<td class="item_c"><?php echo $line_item->percent(); ?>%</td>
+							<?php } else {//flat discount/surcharge ?>
 									<td></td>
-									<td class="item_c"><?php echo $line_item->unit_price_no_code();?></td>
+									<td class="item_c"><?php echo $line_item->unit_price_no_code(); ?></td>
 							<?php } ?>
-							<td class="item_r"><?php echo $line_item->total_no_code();?></td>
+							<td class="item_r"><?php echo $line_item->total_no_code(); ?></td>
 						</tr>
 						<?php break;
 					case EEM_Line_Item::type_tax:
 							?>
 						<tr class="item sub-item tax-total">
 							<td class="item_l"><?php echo $line_item->name(); ?></td>
-							<?php if ($show_line_item_description){?><td class="item_l"><?php echo $line_item->desc() ?></td><?php }?>
+							<?php if ($show_line_item_description) {?><td class="item_l"><?php echo $line_item->desc() ?></td><?php }?>
 							<td colspan="2" class="item_c"><?php echo $line_item->percent(); ?>%</td>
 
-							<td class="item_r"><?php echo $line_item->total_no_code();?></td>
+							<td class="item_r"><?php echo $line_item->total_no_code(); ?></td>
 						</tr><?php break;
 					}
 				}
-				$c=false;
+				$c = false;
 				/* @var $transaction EE_Transaction */
 				$total_line_item = $transaction->total_line_item();
-				ee_invoice_display_line_item($total_line_item,$show_line_item_description);
+				ee_invoice_display_line_item($total_line_item, $show_line_item_description);
 				/* foreach($transaction->registrations() as $registration){
 					 ?>
 					<tr class="item <?php echo ($c = !$c) ? ' odd' : ''; ?>">
@@ -183,13 +183,13 @@ 
 			</tbody>
 
 		</table>
-		<p><?php _e("* taxable items", "event_espresso");?></p>
-		<h2><?php _e("Payments",'event_espresso')?></h2>
+		<p><?php _e("* taxable items", "event_espresso"); ?></p>
+		<h2><?php _e("Payments", 'event_espresso')?></h2>
 		<table class="invoice-amount">
 			<thead>
 				<tr class="header_row">
 					<th ><span class=""><?php _e('Payment Method', 'event_espresso'); ?></span></th>
-					<th class='left datetime_th'><?php _e("Date",'event_espresso')?></th>
+					<th class='left datetime_th'><?php _e("Date", 'event_espresso')?></th>
 					<th ><span class=""><?php _e('Transaction Id / Cheque #', 'event_espresso'); ?></span></th>
 					<th ><span class=""><?php _e('P.O. / S.O.#', 'event_espresso'); ?></span></th>
 					<th ><span class=""><?php _e('Status', 'event_espresso'); ?></span></th>
@@ -199,29 +199,29 @@ 
 			<tbody>
 				<?php
 				$c = false;
-				if(!empty($payments)){
+				if ( ! empty($payments)) {
 
-					foreach($payments as $payment){
+					foreach ($payments as $payment) {
 						/* @var $payment EE_Payment */?>
-					<tr class='item <?php echo (($c = !$c) ? ' odd' : '')?>'>
+					<tr class='item <?php echo (($c = ! $c) ? ' odd' : '')?>'>
 						<td><?php $payment->e('PAY_gateway')?></td>
 						<td><?php echo $payment->timestamp('D M j, Y')?></td>
 						<td><?php $payment->e('PAY_txn_id_chq_nmbr')?></td>
 						<td><?php $payment->e('PAY_po_number')?></td>
 						<td><?php $payment->e_pretty_status()?></td>
-						<td class='item_r'><?php echo EEH_Template::format_currency($payment->amount());?></td>
+						<td class='item_r'><?php echo EEH_Template::format_currency($payment->amount()); ?></td>
 					</tr>
 					<?php }
-				}else{?>
+				} else {?>
 					<tr class='item'>
-						<td class='aln-cntr' colspan=6><?php _e("No approved payments have been received",'event_espresso')?></td>
+						<td class='aln-cntr' colspan=6><?php _e("No approved payments have been received", 'event_espresso')?></td>
 					</tr>
 				<?php }
 ?>
 			</tbody>
 			<tfoot>
 				<tr class='total_tr'><td colspan="4"></td>
-					<td class="item_r"><?php _e('Total Paid','event_espresso')?></td>
+					<td class="item_r"><?php _e('Total Paid', 'event_espresso')?></td>
 					<td class="item_r"><?php echo EEH_Template::format_currency($amount_pd)?> </td>
 				</tr>
 				<?php //echo $discount; ?>

Braces +3 added lines, -3 removed lines

@@ -127,7 +127,7 @@ 
 										ee_invoice_display_line_item($child_line_item,$show_line_item_description, $odd);
 									}
 								}
-							}else{//no subitems - just show this line item ?>
+							} else{//no subitems - just show this line item ?>
 								<tr class="item <?php echo $odd ?   'odd' : ''; ?>">
 									<td class="item_l"><?php echo $line_item->name()?></td>
 									<?php if ($show_line_item_description){?><td class="item_l"><?php echo $line_item->desc() ?></td><?php }?>
@@ -147,7 +147,7 @@ 
 							<?php if ($line_item->is_percent()) { ?>
 									<td></td>
 									<td class="item_c"><?php echo $line_item->percent();?>%</td>
-							<?php }else{//flat discount/surcharge ?>
+							<?php } else{//flat discount/surcharge ?>
 									<td></td>
 									<td class="item_c"><?php echo $line_item->unit_price_no_code();?></td>
 							<?php } ?>
@@ -212,7 +212,7 @@ 
 						<td class='item_r'><?php echo EEH_Template::format_currency($payment->amount());?></td>
 					</tr>
 					<?php }
-				}else{?>
+				} else{?>
 					<tr class='item'>
 						<td class='aln-cntr' colspan=6><?php _e("No approved payments have been received",'event_espresso')?></td>
 					</tr>