eventespresso / event-espresso-core

core/libraries/shortcodes/EE_Messenger_Shortcodes.lib.php

Braces +6 added lines, -3 removed lines

@@ -6,7 +6,9 @@ 
  * @package Event Espresso
  * @subpackage shortcodes library
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * EE_Messenger_Shortcodes
  *
@@ -69,8 +71,9 @@ 
 		$recipient = ! $recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $recipient;
 		$recipient = ! $recipient instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $recipient;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee )
-			return '';
+		if ( ! $recipient instanceof EE_Messages_Addressee ) {
+					return '';
+		}
 
 		switch ( $shortcode ) {
 			case '[DISPLAY_HTML_URL]' :

Spacing +26 added lines, -26 removed lines

@@ -41,22 +41,22 @@ 
 		$this->label = __('Messenger Shortcodes', 'event_espresso');
 		$this->description = __('All shortcodes that are messenger specific.', 'event_espresso');
 		/** @type EE_Message_Resource_Manager $message_resource_manager */
-		$message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+		$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		//add messages about what happens  when the messenger is active.
 		$this->_active_messengers = $message_resource_manager->active_messengers();
 
-		$this->_shortcodes['[DISPLAY_HTML_URL]'] =__('This will return a link to view the template in a browser if the html messenger is active.', 'event_espresso');
-		$this->_shortcodes['[DISPLAY_PDF_URL]'] = __('This will return a link to generate a pdf for the template if the pdf messenger is active.', 'event_espresso' );
+		$this->_shortcodes['[DISPLAY_HTML_URL]'] = __('This will return a link to view the template in a browser if the html messenger is active.', 'event_espresso');
+		$this->_shortcodes['[DISPLAY_PDF_URL]'] = __('This will return a link to generate a pdf for the template if the pdf messenger is active.', 'event_espresso');
 		$this->_shortcodes['[DISPLAY_PDF_BUTTON]'] = __('This will return html for a download pdf button trigger if the pdf messenger is active.', 'event_espresso');
 
 		//show error message about buttons/urls not working as expected if messenger deactivated.
-		if ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'update_message_template' ) {
-			if ( ! isset( $this->_active_messengers['pdf'] ) ) {
-				EE_Error::add_attention( __('Be aware that the pdf messenger is inactive.  This means that any pdf related shortcodes will parse to an empty string.', 'event_espresso' ) );
+		if (is_admin() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'update_message_template') {
+			if ( ! isset($this->_active_messengers['pdf'])) {
+				EE_Error::add_attention(__('Be aware that the pdf messenger is inactive.  This means that any pdf related shortcodes will parse to an empty string.', 'event_espresso'));
 			}
 
-			if ( !isset( $this->_active_messengers['html'] ) ) {
-				EE_Error::add_attention( __('Be aware that the html messenger is inactive. This means that any html related shortcodes will parse to an empty string.', 'event_espresso' ) );
+			if ( ! isset($this->_active_messengers['html'])) {
+				EE_Error::add_attention(__('Be aware that the html messenger is inactive. This means that any html related shortcodes will parse to an empty string.', 'event_espresso'));
 			}
 		}
 
@@ -64,24 +64,24 @@ 
 
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 		//make sure we end up with a copy of the EE_Messages_Addressee object
 		$recipient = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $recipient;
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $recipient;
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $recipient;
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $recipient;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee )
+		if ( ! $recipient instanceof EE_Messages_Addressee)
 			return '';
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[DISPLAY_HTML_URL]' :
-				return  isset( $this->_active_messengers['html'] ) ? $this->_get_url( $recipient, 'html' ) : '';
+				return  isset($this->_active_messengers['html']) ? $this->_get_url($recipient, 'html') : '';
 				break;
 			case '[DISPLAY_PDF_URL]' :
-				return  isset( $this->_active_messengers['pdf'] ) ? $this->_get_url( $recipient, 'pdf' ) : '';
+				return  isset($this->_active_messengers['pdf']) ? $this->_get_url($recipient, 'pdf') : '';
 				break;
 			case '[DISPLAY_PDF_BUTTON]' :
-				return  isset( $this->_active_messengers['pdf'] ) ? $this->_get_button( $recipient, 'pdf' ) : '';
+				return  isset($this->_active_messengers['pdf']) ? $this->_get_button($recipient, 'pdf') : '';
 				break;
 		}
 		return '';
@@ -99,11 +99,11 @@ 
 	 *
 	 * @return string                Generated html
 	 */
-	private function _get_button( EE_Messages_Addressee $recipient, $sending_messenger ) {
-		$download_text = $sending_messenger == 'pdf' ? __('Download PDF', 'event_espresso') : __('Show HTML', 'event_espresso' );
+	private function _get_button(EE_Messages_Addressee $recipient, $sending_messenger) {
+		$download_text = $sending_messenger == 'pdf' ? __('Download PDF', 'event_espresso') : __('Show HTML', 'event_espresso');
 		$content = '
-<form method="post" action="' . $this->_get_url( $recipient, $sending_messenger ) . '" >
-	<input class="print_button" type="submit" value="' . $download_text . '" />
+<form method="post" action="' . $this->_get_url($recipient, $sending_messenger).'" >
+	<input class="print_button" type="submit" value="' . $download_text.'" />
 </form>
 		';
 		return $content;
@@ -122,18 +122,18 @@ 
 	 * @return string The generated url for displaying the link.
 	 * @throws EE_Error
 	 */
-	private function _get_url( EE_Messages_Addressee $recipient, $sending_messenger ) {
+	private function _get_url(EE_Messages_Addressee $recipient, $sending_messenger) {
 
 		$reg = $recipient->reg_obj;
 		$reg = ! $reg instanceof EE_Registration ? $recipient->primary_reg_obj : $reg;
 
 
-		if ( $this->_message_type instanceof EE_message_type && $this->_message instanceof EE_Message ) {
-			EE_Registry::instance()->load_helper( 'MSG_Template' );
+		if ($this->_message_type instanceof EE_message_type && $this->_message instanceof EE_Message) {
+			EE_Registry::instance()->load_helper('MSG_Template');
 			try {
-				return EEH_MSG_Template::get_url_trigger( $this->_message_type, $this->_message, $reg, $sending_messenger );
-			} catch( EE_Error $e ) {
-				if ( WP_DEBUG ) {
+				return EEH_MSG_Template::get_url_trigger($this->_message_type, $this->_message, $reg, $sending_messenger);
+			} catch (EE_Error $e) {
+				if (WP_DEBUG) {
 					$e->get_error();
 				}
 			}

core/libraries/shortcodes/EE_Payment_Shortcodes.lib.php

Spacing +9 added lines, -9 removed lines

@@ -6,7 +6,7 @@ 
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -34,7 +34,7 @@ 
 			'[PAYMENT_TIMESTAMP]' => __('Outputs the date of the payment (using the default date format).', 'event_espresso'),
 			'[PAYMENT_METHOD]' => __('Outputs a the payment method.', 'event_espresso'),
 			'[PAYMENT_AMOUNT]' => __('Outputs the payment amount (with currency symbol).', 'event_espresso'),
-			'[PAYMENT_GATEWAY]' => __('Outputs the gateway used for the payment.', 'event_espresso' ),
+			'[PAYMENT_GATEWAY]' => __('Outputs the gateway used for the payment.', 'event_espresso'),
 			'[PAYMENT_GATEWAY_RESPONSE]' => __('Outputs the payment gateway response.', 'event_espresso'),
 			'[PAYMENT_GATEWAY_TXN_ID]' => __('This will either be the gateway transaction ID, or the manual ID added with payment applied via the admin.', 'event_espresso'),
 			'[PAYMENT_PO_NUMBER]' => __('Purchase Order number (if present)', 'event_espresso'),
@@ -46,15 +46,15 @@ 
 
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 		//ensure that the incoming object is an EE_Payment object.  If it isn't then bail early.
-		if ( ! $this->_data instanceof EE_Payment ) {
+		if ( ! $this->_data instanceof EE_Payment) {
 			return '';
 		}
 
 		$payment = $this->_data;
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[PAYMENT_TIMESTAMP]' :
 				return $payment->timestamp();
 				break;
@@ -70,10 +70,10 @@ 
 
 			case '[PAYMENT_GATEWAY]' :
 				//previously teh column 'PMD_ID' was more-or-less 'PAY_gateway'
-				if( $payment->payment_method() instanceof EE_Payment_Method ){
+				if ($payment->payment_method() instanceof EE_Payment_Method) {
 					return $payment->payment_method()->name();
-				}else{
-					return __( 'Unknown', 'event_espresso' );
+				} else {
+					return __('Unknown', 'event_espresso');
 				}
 				break;
 
@@ -98,7 +98,7 @@ 
 				break;
 
 			case '[PAYMENT_STATUS_WITH_ICONS]' :
-				return $payment->pretty_status( TRUE );
+				return $payment->pretty_status(TRUE);
 				break;
 
 			default :

Braces +3 added lines, -2 removed lines

@@ -6,8 +6,9 @@ 
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *
@@ -72,7 +73,7 @@ 
 				//previously teh column 'PMD_ID' was more-or-less 'PAY_gateway'
 				if( $payment->payment_method() instanceof EE_Payment_Method ){
 					return $payment->payment_method()->name();
-				}else{
+				} else{
 					return __( 'Unknown', 'event_espresso' );
 				}
 				break;

core/libraries/shortcodes/EE_Primary_Registration_Details_Shortcodes.lib.php

Braces +11 added lines, -7 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
@@ -61,14 +62,16 @@ 
 		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $primary_registration;
 		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $primary_registration;
 
-		if ( ! $primary_registration instanceof EE_Messages_Addressee )
-			return '';
+		if ( ! $primary_registration instanceof EE_Messages_Addressee ) {
+					return '';
+		}
 
 		$attendee = $primary_registration->primary_att_obj;
 		$primary_reg = $primary_registration->primary_reg_obj;
 
-		if ( ! $attendee instanceof EE_Attendee || ! $primary_reg instanceof EE_Registration )
-			return '';
+		if ( ! $attendee instanceof EE_Attendee || ! $primary_reg instanceof EE_Registration ) {
+					return '';
+		}
 
 		switch ( $shortcode ) {
 			case '[PRIMARY_REGISTRANT_FNAME]' :
@@ -118,8 +121,9 @@ 
 				break;
 
 			case '[PRIMARY_REGISTRANT_REGISTRATION_DATE]' :
-				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration )
-					return '';
+				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration ) {
+									return '';
+				}
 				return $primary_registration->primary_reg_obj->get_i18n_datetime( 'REG_date', get_option( 'date_format' ) );
 				break;
 

Spacing +19 added lines, -19 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -45,32 +45,32 @@ 
 			'[PRIMARY_REGISTRANT_ADDRESS2]' => __('Whatever was in the address 2 field for the primary registrant for the transaction.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_CITY]' => __('The city for the primary registrant for the transaction.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_ZIP_PC]' => __('The ZIP (or Postal) Code for the primary registrant for the transaction.', 'event_espresso'),
-			'[PRIMARY_REGISTRANT_ADDRESS_STATE]' => __('The state/province for the primary registrant for the transaction.', 'event_espresso' ),
+			'[PRIMARY_REGISTRANT_ADDRESS_STATE]' => __('The state/province for the primary registrant for the transaction.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_COUNTRY]' => __('The country for the primary registrant for the transaction.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_REGISTRATION_DATE]' => __('The date the registration occured for the primary registration.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]' => __('Generates a link for the given registration to edit this registration details on the frontend.', 'event_espresso'),
-			'[PRIMARY_REGISTRANT_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 primary registrant, then it will be output in place of this shortcode.', 'event_espresso' )
+			'[PRIMARY_REGISTRANT_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 primary registrant, 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
 		$primary_registration = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
-		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $primary_registration;
-		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $primary_registration;
+		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && is_array($this->_data) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $primary_registration;
+		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $primary_registration;
 
-		if ( ! $primary_registration instanceof EE_Messages_Addressee )
+		if ( ! $primary_registration instanceof EE_Messages_Addressee)
 			return '';
 
 		$attendee = $primary_registration->primary_att_obj;
 		$primary_reg = $primary_registration->primary_reg_obj;
 
-		if ( ! $attendee instanceof EE_Attendee || ! $primary_reg instanceof EE_Registration )
+		if ( ! $attendee instanceof EE_Attendee || ! $primary_reg instanceof EE_Registration)
 			return '';
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[PRIMARY_REGISTRANT_FNAME]' :
 				return $attendee->fname();
 				break;
@@ -118,9 +118,9 @@ 
 				break;
 
 			case '[PRIMARY_REGISTRANT_REGISTRATION_DATE]' :
-				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration )
+				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration)
 					return '';
-				return $primary_registration->primary_reg_obj->get_i18n_datetime( 'REG_date', get_option( 'date_format' ) );
+				return $primary_registration->primary_reg_obj->get_i18n_datetime('REG_date', get_option('date_format'));
 				break;
 
 			case '[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]' :
@@ -128,22 +128,22 @@ 
 				break;
 		}
 
-		if ( strpos( $shortcode, '[PRIMARY_REGISTRANT_ANSWER_*' ) !== false ) {
-			$shortcode = str_replace( '[PRIMARY_REGISTRANT_ANSWER_*', '', $shortcode );
-			$shortcode = trim( str_replace( ']', '', $shortcode ) );
+		if (strpos($shortcode, '[PRIMARY_REGISTRANT_ANSWER_*') !== false) {
+			$shortcode = str_replace('[PRIMARY_REGISTRANT_ANSWER_*', '', $shortcode);
+			$shortcode = trim(str_replace(']', '', $shortcode));
 
 
 			//now let's figure out what question has this text
-			if ( empty( $primary_registration->questions ) ) {
+			if (empty($primary_registration->questions)) {
 				return '';
 			}
 
-			foreach ( $primary_registration->questions as $ansid => $question ) {
+			foreach ($primary_registration->questions as $ansid => $question) {
 				if (
-					trim( $question->get( 'QST_display_text' ) ) == trim( $shortcode )
-					&& isset( $primary_registration->registrations[ $primary_reg->ID() ]['ans_objs'][ $ansid ] )
+					trim($question->get('QST_display_text')) == trim($shortcode)
+					&& isset($primary_registration->registrations[$primary_reg->ID()]['ans_objs'][$ansid])
 				) {
-					return $primary_registration->registrations[ $primary_reg->ID() ]['ans_objs'][ $ansid ]->get_pretty( 'ANS_value', 'no_wpautop' );
+					return $primary_registration->registrations[$primary_reg->ID()]['ans_objs'][$ansid]->get_pretty('ANS_value', 'no_wpautop');
 				}
 			}
 		}

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/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/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>

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

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 <!-- Base Stylesheet do not change or remove -->
 <link rel="stylesheet" type="text/css" href="[base_url]base.css" media="screen" />
 <!-- Print Style Sheet -->
-<link rel="stylesheet" type="text/css" href="[base_url]css/print/<?php echo str_replace('.css', '',$invoice_css); ?>_print.css" media="print" />
+<link rel="stylesheet" type="text/css" href="[base_url]css/print/<?php echo str_replace('.css', '', $invoice_css); ?>_print.css" media="print" />
 <!-- Primary Style Sheet -->
 <link rel="stylesheet" type="text/css" href="[base_url]css/<?php echo $invoice_css; ?>" />
 <!-- Make sure the buttons don't print -->