eventespresso / event-espresso-core

core/libraries/shortcodes/EE_Line_Item_List_Shortcodes.lib.php

Spacing +24 added lines, -24 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,16 +34,16 @@ 
 		$this->_shortcodes = array(
 			'[TICKET_LINE_ITEM_LIST]' => __('Outputs a list of ticket line items.', 'event_espresso'),
 			'[TAX_LINE_ITEM_LIST]' => __('Outputs a list of tax line items.', 'event_espresso'),
-			'[ADDITIONAL_LINE_ITEM_LIST]' => __( 'Outputs a list of additional line items (other charges or discounts)', 'event_espresso' ),
+			'[ADDITIONAL_LINE_ITEM_LIST]' => __('Outputs a list of additional line items (other charges or discounts)', 'event_espresso'),
 			'[PRICE_MODIFIER_LINE_ITEM_LIST]' => __('Outputs a list of price modifier line items', 'event_espresso')
 			);
 	}
 
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[TICKET_LINE_ITEM_LIST]' :
 				return $this->_get_ticket_line_item_list();
 				break;
@@ -80,28 +80,28 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( ! $this->_data['data'] instanceof EE_Ticket ) {
+		if ( ! $this->_data['data'] instanceof EE_Ticket) {
 			return '';
 		}
 
-		$valid_shortcodes = array( 'line_item', 'line_item_list', 'ticket' );
+		$valid_shortcodes = array('line_item', 'line_item_list', 'ticket');
 
 		$ticket = $this->_data['data'];
 		$templates = $this->_extra_data['template'];
 		$addressee_obj = $this->_extra_data['data'];
 
 		//made it here so we have an EE_Ticket, so we should have what we need.
-		$ticket_line_item = isset( $addressee_obj->tickets[$ticket->ID()]['line_item'] ) ? $addressee_obj->tickets[$ticket->ID()]['line_item'] : null;
-		$sub_line_items = isset( $addressee_obj->tickets[$ticket->ID()]['sub_line_items'] ) ? $addressee_obj->tickets[$ticket->ID()]['sub_line_items'] : array();
+		$ticket_line_item = isset($addressee_obj->tickets[$ticket->ID()]['line_item']) ? $addressee_obj->tickets[$ticket->ID()]['line_item'] : null;
+		$sub_line_items = isset($addressee_obj->tickets[$ticket->ID()]['sub_line_items']) ? $addressee_obj->tickets[$ticket->ID()]['sub_line_items'] : array();
 
-		$template = count( $sub_line_items ) < 2 ? $templates['ticket_line_item_no_pms'] : $templates['ticket_line_item_pms'];
+		$template = count($sub_line_items) < 2 ? $templates['ticket_line_item_no_pms'] : $templates['ticket_line_item_pms'];
 
-		if ( empty( $ticket_line_item ) || empty( $sub_line_items ) ) {
+		if (empty($ticket_line_item) || empty($sub_line_items)) {
 			return '';
 		}
 
 		//now we just return the appropriate template parsed for each ticket.
-		return $this->_shortcode_helper->parse_line_item_list_template( $template, $ticket_line_item, $valid_shortcodes, $this->_extra_data );
+		return $this->_shortcode_helper->parse_line_item_list_template($template, $ticket_line_item, $valid_shortcodes, $this->_extra_data);
 	}
 
 
@@ -119,18 +119,18 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( ! $this->_data['data'] instanceof EE_Messages_Addressee ) {
+		if ( ! $this->_data['data'] instanceof EE_Messages_Addressee) {
 			return '';
 		}
 
 		//made it here so we're good to go.
-		$valid_shortcodes = array( 'line_item' );
+		$valid_shortcodes = array('line_item');
 		$templates = $this->_data['template'];
 
 		$tax_line_items = $this->_data['data']->tax_line_items;
 		$line_item_list = '';
-		foreach ( $tax_line_items as $line_item ) {
-			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template( $templates['tax_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data );
+		foreach ($tax_line_items as $line_item) {
+			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template($templates['tax_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data);
 		}
 
 		return $line_item_list;
@@ -148,18 +148,18 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( ! $this->_data['data'] instanceof EE_Messages_Addressee ) {
+		if ( ! $this->_data['data'] instanceof EE_Messages_Addressee) {
 			return '';
 		}
 
 		//made it here so we're good to go.
-		$valid_shortcodes = array( 'line_item' );
+		$valid_shortcodes = array('line_item');
 		$templates = $this->_data['template'];
 
 		$additional_line_items = $this->_data['data']->additional_line_items;
 		$line_item_list = '';
-		foreach ( $additional_line_items as $line_item ) {
-			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template( $templates['additional_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data );
+		foreach ($additional_line_items as $line_item) {
+			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template($templates['additional_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data);
 		}
 
 
@@ -182,7 +182,7 @@ 
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
-		if ( ! $this->_data['data'] instanceof EE_Line_Item ) {
+		if ( ! $this->_data['data'] instanceof EE_Line_Item) {
 			return '';
 		}
 
@@ -191,16 +191,16 @@ 
 		$templates = $this->_extra_data['template'];
 		$addressee_obj = $this->_extra_data['data'];
 
-		$valid_shortcodes = array( 'line_item' );
+		$valid_shortcodes = array('line_item');
 
 		$main_line_item_id = $main_line_item->ID();
 
-		$price_mod_line_items = ! empty( $addressee_obj->line_items_with_children[$main_line_item_id]['children'] ) ? $addressee_obj->line_items_with_children[$main_line_item_id]['children'] : array();
+		$price_mod_line_items = ! empty($addressee_obj->line_items_with_children[$main_line_item_id]['children']) ? $addressee_obj->line_items_with_children[$main_line_item_id]['children'] : array();
 
 		$line_item_list = '';
 
-		foreach( $price_mod_line_items as $line_item ) {
-			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template( $templates['price_modifier_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data  );
+		foreach ($price_mod_line_items as $line_item) {
+			$line_item_list .= $this->_shortcode_helper->parse_line_item_list_template($templates['price_modifier_line_item_list'], $line_item, $valid_shortcodes, $this->_extra_data);
 		}
 
 		return $line_item_list;

Braces +2 added lines, -1 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');
+}
 
 /**
  *

core/libraries/shortcodes/EE_Line_Item_Shortcodes.lib.php

Spacing +11 added lines, -11 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,23 +34,23 @@ 
 			'[LINE_ITEM_NAME]' => __('Outputs the line item name.', 'event_espresso'),
 			'[LINE_ITEM_DESCRIPTION]' => __('Outputs a the description for the line item.', 'event_espresso'),
 			'[LINE_ITEM_QUANTITY]' => __('Outputs the quantity for this line item.', 'event_espresso'),
-			'[LINE_ITEM_AMOUNT]' => __('This will either output the unit price for a line item if its not a percent, or the percent of the line item (if it is percent).', 'event_espresso' ),
+			'[LINE_ITEM_AMOUNT]' => __('This will either output the unit price for a line item if its not a percent, or the percent of the line item (if it is percent).', 'event_espresso'),
 			'[LINE_ITEM_TOTAL]' => __('This outputs the line item total.', 'event_espresso'),
-			'[LINE_ITEM_TAXABLE_*]' => __('This attribute type shortcode allows users to indicate what to output if a line item is taxable or not.  One can use the key "symbol=" with the shortcode to indicate what they\'d like to represent a taxable line item.  So doing something like <code>[LINE_ITEM_TAXABLE_* symbol="*"]</code> means that when the line item is parsed, if it\'s taxable the "*" symbol will be returned.  The default symbol if no attribute is included is the "*" symbol.', 'event_espresso' )
+			'[LINE_ITEM_TAXABLE_*]' => __('This attribute type shortcode allows users to indicate what to output if a line item is taxable or not.  One can use the key "symbol=" with the shortcode to indicate what they\'d like to represent a taxable line item.  So doing something like <code>[LINE_ITEM_TAXABLE_* symbol="*"]</code> means that when the line item is parsed, if it\'s taxable the "*" symbol will be returned.  The default symbol if no attribute is included is the "*" symbol.', 'event_espresso')
 			);
 	}
 
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 		//ensure that the incoming object IS a line item.  If it isn't then bail early.
-		if ( ! $this->_data instanceof EE_Line_Item ) {
+		if ( ! $this->_data instanceof EE_Line_Item) {
 			return '';
 		}
 
 		$line_item = $this->_data;
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[LINE_ITEM_NAME]' :
 				return $line_item->name();
 				break;
@@ -64,7 +64,7 @@ 
 				break;
 
 			case '[LINE_ITEM_AMOUNT]' :
-				return $line_item->is_percent() ? $line_item->percent() . '%' : $line_item->unit_price_no_code();
+				return $line_item->is_percent() ? $line_item->percent().'%' : $line_item->unit_price_no_code();
 				break;
 
 			case '[LINE_ITEM_TOTAL]' :
@@ -72,10 +72,10 @@ 
 				break;
 		}
 
-		if ( strpos( $shortcode, '[LINE_ITEM_TAXABLE_*' ) !== FALSE ) {
-			$attrs = $this->_get_shortcode_attrs( $shortcode );
-			if ( $line_item->is_taxable() ) {
-				return !empty( $attrs['symbol'] ) ? $attrs['symbol'] : '*';
+		if (strpos($shortcode, '[LINE_ITEM_TAXABLE_*') !== FALSE) {
+			$attrs = $this->_get_shortcode_attrs($shortcode);
+			if ($line_item->is_taxable()) {
+				return ! empty($attrs['symbol']) ? $attrs['symbol'] : '*';
 			}
 		}
 

Braces +2 added lines, -1 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');
+}
 
 /**
  *

core/libraries/shortcodes/EE_Organization_Shortcodes.lib.php

Spacing +24 added lines, -24 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -63,91 +63,91 @@ 
 	}
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[COMPANY]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'name' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('name');
 				break;
 
 			case '[CO_ADD1]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'address_1' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('address_1');
 				break;
 
 			case '[CO_ADD2]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'address_2' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('address_2');
 				break;
 
 			case '[CO_CITY]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'city' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('city');
 				break;
 
 			case '[CO_STATE]' :
-				$state = EE_Registry::instance()->load_model( 'State' )->get_one_by_ID( EE_Registry::instance()->CFG->organization->STA_ID );
+				$state = EE_Registry::instance()->load_model('State')->get_one_by_ID(EE_Registry::instance()->CFG->organization->STA_ID);
 				return $state->name();
 				break;
 
 			case '[CO_ZIP]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'zip' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('zip');
 				break;
 
 			case '[CO_EMAIL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'email' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('email');
 				break;
 
 			case '[CO_PHONE]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'phone' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('phone');
 				break;
 
 			case '[CO_LOGO]' :
-				return '<img src="' . EE_Registry::instance()->CFG->organization->get_pretty( 'logo_url' ) . '" id="headerImage" />';
+				return '<img src="'.EE_Registry::instance()->CFG->organization->get_pretty('logo_url').'" id="headerImage" />';
 				break;
 
 			case '[CO_LOGO_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'logo_url' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('logo_url');
 				break;
 
 			case '[CO_FACEBOOK_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'facebook' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('facebook');
 				break;
 
 			case '[CO_TWITTER_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'twitter' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('twitter');
 				break;
 
 			case '[CO_PINTEREST_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'pinterest' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('pinterest');
 				break;
 
 			case '[CO_LINKEDIN_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'linkedin' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('linkedin');
 				break;
 
 			case '[CO_GOOGLE_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'google' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('google');
 				break;
 
 			case '[CO_INSTAGRAM_URL]' :
-				return EE_Registry::instance()->CFG->organization->get_pretty( 'instagram' );
+				return EE_Registry::instance()->CFG->organization->get_pretty('instagram');
 				break;
 
 		}
 
 		//also allow for parameter shortcode
-		if ( strpos( $shortcode, '[CO_TAX_NUMBER_*' ) !== FALSE ) {
+		if (strpos($shortcode, '[CO_TAX_NUMBER_*') !== FALSE) {
 			//first see if there is any company tax number set and bail early if not
 			$tax_number = EE_Registry::instance()->CFG->organization->vat;
-			if ( empty( $tax_number ) ) {
+			if (empty($tax_number)) {
 				return '';
 			}
 
 			//see if there are any attributes.
-			$attrs = $this->_get_shortcode_attrs( $shortcode );
+			$attrs = $this->_get_shortcode_attrs($shortcode);
 
 			//set custom attrs if present (or default)
-			$prefix = isset( $attrs['prefix'] ) ? $attrs['prefix'] : __('VAT/Tax Number: ', 'event_espresso');
-			return $prefix . $tax_number;
+			$prefix = isset($attrs['prefix']) ? $attrs['prefix'] : __('VAT/Tax Number: ', 'event_espresso');
+			return $prefix.$tax_number;
 		}
 
 		return '';

Braces +2 added lines, -1 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');
+}
 
 /**
  *

core/libraries/shortcodes/EE_Payment_List_Shortcodes.lib.php

Spacing +14 added lines, -14 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');
 
 /**
@@ -32,18 +32,18 @@ 
 		$this->label = __('Payment List Shortcodes', 'event_espresso');
 		$this->description = __('All shortcodes specific to payment lists', 'event_espresso');
 		$this->_shortcodes = array(
-			'[PAYMENT_LIST_*]' => __('Outputs a list of payment items. Note, this is a dynamic shortcode in that it accepts some attributes for setting certain defaults.  Attributes that are available are:', 'event_espresso') . '<p><ul>' .
-				'<li><strong>no_payments</strong>:' . sprintf( __('Indicate with this attribute what will be used if there are no payments present.  Default is: "%sNo approved payments have been received.%s"', 'event_espresso'),  htmlspecialchars('<td class="aln-cntr" colspan="6">'), htmlspecialchars('</td>') ) . '</li>' .
+			'[PAYMENT_LIST_*]' => __('Outputs a list of payment items. Note, this is a dynamic shortcode in that it accepts some attributes for setting certain defaults.  Attributes that are available are:', 'event_espresso').'<p><ul>'.
+				'<li><strong>no_payments</strong>:'.sprintf(__('Indicate with this attribute what will be used if there are no payments present.  Default is: "%sNo approved payments have been received.%s"', 'event_espresso'), htmlspecialchars('<td class="aln-cntr" colspan="6">'), htmlspecialchars('</td>')).'</li>'.
 				'</ul></p>'
 			);
 	}
 
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
-		if ( strpos( $shortcode, '[PAYMENT_LIST_*' ) !== FALSE ) {
-			return $this->_get_payment_list( $shortcode );
+		if (strpos($shortcode, '[PAYMENT_LIST_*') !== FALSE) {
+			return $this->_get_payment_list($shortcode);
 		}
 		return '';
 	}
@@ -60,33 +60,33 @@ 
 	 *
 	 * @return string parsed ticket line item list.
 	 */
-	private function _get_payment_list( $shortcode ) {
+	private function _get_payment_list($shortcode) {
 		$this->_validate_list_requirements();
 		$this->_set_shortcode_helper();
 
 
-		if ( ! $this->_data['data'] instanceof EE_Messages_Addressee ) {
+		if ( ! $this->_data['data'] instanceof EE_Messages_Addressee) {
 			return '';
 		}
 
-		$valid_shortcodes = array( 'payment' );
+		$valid_shortcodes = array('payment');
 
 		$addressee_obj = $this->_data['data'];
 		$templates = $this->_extra_data['template'];
 		$payments = $addressee_obj->payments;
 
 		//let's get any attributes that may be present and set the defaults.
-		$atts = $this->_get_shortcode_attrs( $shortcode );
+		$atts = $this->_get_shortcode_attrs($shortcode);
 
-		$no_payments_msg = empty( $atts['no_payments'] ) ?  __('No approved payments have been received.','event_espresso') : $atts['no_payments'];
+		$no_payments_msg = empty($atts['no_payments']) ? __('No approved payments have been received.', 'event_espresso') : $atts['no_payments'];
 
 		//made it here so we have an array of paymnets, so we should have what we need.
-		$payment_content = empty( $payments ) ? $no_payments_msg : '';
+		$payment_content = empty($payments) ? $no_payments_msg : '';
 
 		$payments = (array) $payments;
 
-		foreach ( $payments as $payment ) {
-			$payment_content .= $this->_shortcode_helper->parse_payment_list_template( $templates['payment_list'], $payment, $valid_shortcodes, $this->_extra_data );
+		foreach ($payments as $payment) {
+			$payment_content .= $this->_shortcode_helper->parse_payment_list_template($templates['payment_list'], $payment, $valid_shortcodes, $this->_extra_data);
 		}
 
 		return $payment_content;

Braces +2 added lines, -1 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');
+}
 
 /**
  *

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

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');
 
 /**
@@ -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,19 +128,19 @@ 
 				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 ) {
-				if ( $question->get('QST_display_text') == $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' );
+			foreach ($primary_registration->questions as $ansid => $question) {
+				if ($question->get('QST_display_text') == $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');
 				}
 			}
 		}

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;
 

core/libraries/shortcodes/EE_Recipient_Details_Shortcodes.lib.php

Spacing +32 added lines, -32 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -50,31 +50,31 @@ 
 			'[RECIPIENT_ADDRESS2]' => __('Whatever was in the address 2 field for the recipient of the message.', 'event_espresso'),
 			'[RECIPIENT_CITY]' => __('The city for the recipient of the message.', 'event_espresso'),
 			'[RECIPIENT_ZIP_PC]' => __('The ZIP (or Postal) Code for the recipient of the message.', 'event_espresso'),
-			'[RECIPIENT_ADDRESS_STATE]' => __('The state/province for the recipient of the message.', 'event_espresso' ),
+			'[RECIPIENT_ADDRESS_STATE]' => __('The state/province for the recipient of the message.', 'event_espresso'),
 			'[RECIPIENT_COUNTRY]' => __('The country for the recipient of the message.', 'event_espresso'),
-			'[RECIPIENT_ANSWER_*]' => __('This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this recipient, then it will be output in place of this shortcode.', 'event_espresso' )
+			'[RECIPIENT_ANSWER_*]' => __('This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this recipient, then it will be output in place of this shortcode.', 'event_espresso')
 			);
 	}
 
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
 		//make sure we end up with a copy of the EE_Messages_Addressee object
 		$this->_recipient = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
-		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $this->_recipient;
-		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $this->_recipient;
+		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $this->_recipient;
+		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $this->_recipient;
 
-		if ( ! $this->_recipient instanceof EE_Messages_Addressee )
+		if ( ! $this->_recipient instanceof EE_Messages_Addressee)
 			return '';
 
 		$attendee = $this->_recipient->att_obj;
-		if ( ! $attendee instanceof EE_Attendee )
+		if ( ! $attendee instanceof EE_Attendee)
 			return '';
 
-		$this->_registrations_for_recipient = isset( $this->_recipient->attendees[ $attendee->ID() ]['reg_objs'] ) ? $this->_recipient->attendees[ $attendee->ID() ]['reg_objs'] : array();
+		$this->_registrations_for_recipient = isset($this->_recipient->attendees[$attendee->ID()]['reg_objs']) ? $this->_recipient->attendees[$attendee->ID()]['reg_objs'] : array();
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[RECIPIENT_FNAME]' :
 				return $attendee->fname();
 				break;
@@ -88,13 +88,13 @@ 
 				break;
 
 			case '[RECIPIENT_REGISTRATION_CODE]' :
-				if ( ! $this->_recipient->reg_obj instanceof EE_Registration )
+				if ( ! $this->_recipient->reg_obj instanceof EE_Registration)
 					return '';
 				return $this->_get_reg_code();
 				break;
 
 			case '[RECIPIENT_EDIT_REGISTRATION_LINK]' :
-				if ( ! $this->_recipient->reg_obj instanceof EE_Registration )
+				if ( ! $this->_recipient->reg_obj instanceof EE_Registration)
 					return '';
 				return $this->_recipient->reg_obj->edit_attendee_information_url();
 				break;
@@ -130,19 +130,19 @@ 
 				break;
 		}
 
-		if ( strpos( $shortcode, '[RECIPIENT_ANSWER_*' ) !== false ) {
-			$shortcode = str_replace( '[RECIPIENT_ANSWER_*', '', $shortcode );
-			$shortcode = trim( str_replace( ']', '', $shortcode ) );
+		if (strpos($shortcode, '[RECIPIENT_ANSWER_*') !== false) {
+			$shortcode = str_replace('[RECIPIENT_ANSWER_*', '', $shortcode);
+			$shortcode = trim(str_replace(']', '', $shortcode));
 
 
 			//now let's figure out what question has this text
-			if ( empty( $this->_recipient->questions ) || ! $this->_recipient->reg_obj instanceof EE_Registration ) {
+			if (empty($this->_recipient->questions) || ! $this->_recipient->reg_obj instanceof EE_Registration) {
 				return '';
 			}
 
-			foreach ( $this->_recipient->questions as $ansid => $question ) {
-				if ( $question instanceof EE_Question && $question->display_text() == $shortcode && isset( $this->_recipient->registrations[$this->_recipient->reg_obj->ID()]['ans_objs'][$ansid] ) ) {
-					return $this->_recipient->registrations[$this->_recipient->reg_obj->ID()]['ans_objs'][$ansid]->get_pretty( 'ANS_value', 'no_wpautop' );
+			foreach ($this->_recipient->questions as $ansid => $question) {
+				if ($question instanceof EE_Question && $question->display_text() == $shortcode && isset($this->_recipient->registrations[$this->_recipient->reg_obj->ID()]['ans_objs'][$ansid])) {
+					return $this->_recipient->registrations[$this->_recipient->reg_obj->ID()]['ans_objs'][$ansid]->get_pretty('ANS_value', 'no_wpautop');
 				}
 			}
 		}
@@ -173,48 +173,48 @@ 
 	protected function _get_reg_code() {
 
 		//if only one related registration for the recipient then just return that reg code.
-		if ( count( $this->_registrations_for_recipient ) <= 1 )  {
+		if (count($this->_registrations_for_recipient) <= 1) {
 			return $this->_recipient->reg_obj->reg_code();
 		}
 
 		//k more than one registration so let's see if we can get specific to context
 		//are we parsing event_list?
-		if ( $this->_data instanceof EE_Event ) {
+		if ($this->_data instanceof EE_Event) {
 			$reg_code = array();
 			//loop through registrations for recipient and see if there is a match for this event
-			foreach ( $this->_registrations_for_recipient as $reg ) {
-				if ( $reg instanceof EE_Registration && $reg->event_ID() == $this->_data->ID() ) {
+			foreach ($this->_registrations_for_recipient as $reg) {
+				if ($reg instanceof EE_Registration && $reg->event_ID() == $this->_data->ID()) {
 					$reg_code[] = $reg->reg_code();
 				}
 			}
-			return implode( ', ', $reg_code );
+			return implode(', ', $reg_code);
 		}
 
 		//are we parsing ticket list?
-		if ( $this->_data instanceof EE_Ticket ) {
+		if ($this->_data instanceof EE_Ticket) {
 			$reg_code = array();
 			//loop through each registration for recipient and see if there is a match for this ticket
-			foreach ( $this->_registrations_for_recipient as $reg ) {
-				if ( $reg instanceof EE_Registration && $reg->ticket_ID() == $this->_data->ID() ) {
+			foreach ($this->_registrations_for_recipient as $reg) {
+				if ($reg instanceof EE_Registration && $reg->ticket_ID() == $this->_data->ID()) {
 					$reg_code = $reg->reg_code();
 				}
 			}
-			return implode( ', ', $reg_code );
+			return implode(', ', $reg_code);
 		}
 
 		//do we have a specific reg_obj?  Let's use it
-		if ( $this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration ) {
+		if ($this->_data instanceof EE_Messages_Addressee && $this->_data->reg_obj instanceof EE_Registration) {
 			return $this->_data->reg_obj->reg_code();
 		}
 
 		//not able to determine the single reg code so let's return a comma delimited list of reg codes.
 		$reg_code = array();
-		foreach ( $this->_registrations_for_recipient as $reg ) {
-			if ( $reg instanceof EE_Registration ) {
+		foreach ($this->_registrations_for_recipient as $reg) {
+			if ($reg instanceof EE_Registration) {
 				$reg_code[] = $reg->reg_code();
 			}
 		}
-		return implode(', ', $reg_code );
+		return implode(', ', $reg_code);
 	}
 
 

Braces +14 added lines, -9 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -65,12 +66,14 @@ 
 		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $this->_recipient;
 		$this->_recipient = ! $this->_recipient instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $this->_recipient;
 
-		if ( ! $this->_recipient instanceof EE_Messages_Addressee )
-			return '';
+		if ( ! $this->_recipient instanceof EE_Messages_Addressee ) {
+					return '';
+		}
 
 		$attendee = $this->_recipient->att_obj;
-		if ( ! $attendee instanceof EE_Attendee )
-			return '';
+		if ( ! $attendee instanceof EE_Attendee ) {
+					return '';
+		}
 
 		$this->_registrations_for_recipient = isset( $this->_recipient->attendees[ $attendee->ID() ]['reg_objs'] ) ? $this->_recipient->attendees[ $attendee->ID() ]['reg_objs'] : array();
 
@@ -88,14 +91,16 @@ 
 				break;
 
 			case '[RECIPIENT_REGISTRATION_CODE]' :
-				if ( ! $this->_recipient->reg_obj instanceof EE_Registration )
-					return '';
+				if ( ! $this->_recipient->reg_obj instanceof EE_Registration ) {
+									return '';
+				}
 				return $this->_get_reg_code();
 				break;
 
 			case '[RECIPIENT_EDIT_REGISTRATION_LINK]' :
-				if ( ! $this->_recipient->reg_obj instanceof EE_Registration )
-					return '';
+				if ( ! $this->_recipient->reg_obj instanceof EE_Registration ) {
+									return '';
+				}
 				return $this->_recipient->reg_obj->edit_attendee_information_url();
 				break;
 

core/libraries/shortcodes/EE_Recipient_List_Shortcodes.lib.php

Spacing +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_Shortcodes.lib.php

Spacing +25 added lines, -25 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -157,7 +157,7 @@ 
 	 */
 	protected function _set_shortcode_helper() {
 		//shortcode helper
-		EE_Registry::instance()->load_helper( 'Parse_Shortcodes' );
+		EE_Registry::instance()->load_helper('Parse_Shortcodes');
 		//get shortcode_replace instance- set when _get_messages is called in child...
 		$this->_shortcode_helper = new EEH_Parse_Shortcodes();
 	}
@@ -165,7 +165,7 @@ 
 
 
 	public function get_shortcode_helper() {
-		if ( ! $this->_shortcode_helper instanceof EEH_Parse_Shortcodes )
+		if ( ! $this->_shortcode_helper instanceof EEH_Parse_Shortcodes)
 			$this->_set_shortcode_helper();
 		return $this->_shortcode_helper;
 	}
@@ -178,25 +178,25 @@ 
 	 * @param  mixed (object|array) $extra_data extra incoming data (usually EE_Messages_Addressee)
 	 * @return string            parsed shortcode.
 	 */
-	public function parser($shortcode, $data, $extra_data = array() ) {
+	public function parser($shortcode, $data, $extra_data = array()) {
 
 		//filter setup shortcodes
 		$this->_shortcodes = $this->get_shortcodes();
 
 		//we need to setup any dynamic shortcodes so that they work with the array_key_exists
-		$sc = preg_match_all( '/(\[[A-Za-z0-9\_]+_\*)/', $shortcode, $matches );
-		$sc_to_verify = !empty($matches[0] ) ? $matches[0][0] . ']' : $shortcode;
+		$sc = preg_match_all('/(\[[A-Za-z0-9\_]+_\*)/', $shortcode, $matches);
+		$sc_to_verify = ! empty($matches[0]) ? $matches[0][0].']' : $shortcode;
 
 		//first we want to make sure this is a valid shortcode
-		if ( !array_key_exists($sc_to_verify, $this->_shortcodes ) )
+		if ( ! array_key_exists($sc_to_verify, $this->_shortcodes))
 			return false; //get out, this parser doesn't handle the incoming shortcode.
 		$this->_data = $data;
 		$this->_extra_data = $extra_data;
 		$this->_set_messages_properties();
-		$parsed = apply_filters( 'FHEE__' . get_class($this) . '__parser_after', $this->_parser($shortcode), $shortcode, $data, $extra_data, $this );
+		$parsed = apply_filters('FHEE__'.get_class($this).'__parser_after', $this->_parser($shortcode), $shortcode, $data, $extra_data, $this);
 
 		//note the below filter applies to ALL shortcode parsers... be careful!
-		$parsed = apply_filters( 'FHEE__EE_Shortcodes__parser_after', $parsed, $shortcode, $data, $extra_data, $this );
+		$parsed = apply_filters('FHEE__EE_Shortcodes__parser_after', $parsed, $shortcode, $data, $extra_data, $this);
 		return $parsed;
 	}
 
@@ -212,10 +212,10 @@ 
 	 * @return array array of shortcodes => description pairs
 	 */
 	public function get_shortcodes() {
-		$this->_shortcodes = apply_filters( 'FHEE__' . get_class($this) . '__shortcodes', $this->_shortcodes, $this );
+		$this->_shortcodes = apply_filters('FHEE__'.get_class($this).'__shortcodes', $this->_shortcodes, $this);
 
 		//note the below filter applies to ALL shortcode parsers... be careful!
-		$this->_shortcodes = apply_filters( 'FHEE__EE_Shortcodes__shortcodes', $this->_shortcodes, $this );
+		$this->_shortcodes = apply_filters('FHEE__EE_Shortcodes__shortcodes', $this->_shortcodes, $this);
 
 		return $this->_shortcodes;
 	}
@@ -245,7 +245,7 @@ 
 	 * @param mixed (object|array) $data incoming data for the parser.  The data could be either an object or array because there are some shortcodes that might be replaced by prepared data that has multiple items in a list (i.e. list of attendees in an event and we're showing fname/lname for each attendee).  In this case data will be in an array.  Otherwise the data shoudl be in a properly formatted object.  The EEH_Parse_Shortcodes.helper.php describes the data object we're expecting.
 	 * @return string parsed shortcode
 	 */
-	abstract protected function _parser( $shortcode );
+	abstract protected function _parser($shortcode);
 
 
 
@@ -257,22 +257,22 @@ 
 	protected function _validate_list_requirements() {
 
 		//first test to make sure we've got an array!
-		if ( !is_array($this->_data) ) {
-			throw new EE_Error( sprintf( __('Expecting an array for the data sent to %s. Instead it was %s', 'event_espresso'), get_class($this), gettype( $this->_data ) ) );
+		if ( ! is_array($this->_data)) {
+			throw new EE_Error(sprintf(__('Expecting an array for the data sent to %s. Instead it was %s', 'event_espresso'), get_class($this), gettype($this->_data)));
 		}
 
 		//next test to make sure we've got the required template in the index!
-		if ( !isset( $this->_data['template'] ) ) {
-			throw new EE_Error( sprintf( __('The incoming data does not have the required template index in its array', 'event_espresso') ) );
+		if ( ! isset($this->_data['template'])) {
+			throw new EE_Error(sprintf(__('The incoming data does not have the required template index in its array', 'event_espresso')));
 		}
 
 		//next test to make sure we've got got a data index in the incoming data array
-		if ( !isset( $this->_data['data'] ) )
-			throw new EE_Error( __('The incoming data does not have the required data index in its array', 'event_espresso') );
+		if ( ! isset($this->_data['data']))
+			throw new EE_Error(__('The incoming data does not have the required data index in its array', 'event_espresso'));
 
 		//all is well let's make sure _extra_data always has the values needed.
 		//let's make sure that extra_data includes all templates (for later parsing if necessary)
-		if ( empty( $this->_extra_data ) || ( empty( $this->_extra_data['data'] ) && empty( $this->_extra_data['template'] ) ) ) {
+		if (empty($this->_extra_data) || (empty($this->_extra_data['data']) && empty($this->_extra_data['template']))) {
 			$this->_extra_data['data'] = $this->_data['data'];
 			$this->_extra_data['template'] = $this->_data['template'];
 		}
@@ -289,16 +289,16 @@ 
 	 *
 	 * @return array An array with the attributes
 	 */
-	protected function _get_shortcode_attrs( $shortcode ) {
+	protected function _get_shortcode_attrs($shortcode) {
 		//make sure the required wp helper function is present
 		//require the shortcode file if necessary
-		if ( ! function_exists( 'shortcode_parse_atts' ) ) {
-			require_once( ABSPATH . WPINC . '/shortcodes.php');
+		if ( ! function_exists('shortcode_parse_atts')) {
+			require_once(ABSPATH.WPINC.'/shortcodes.php');
 		}
 
 		//let's get any attributes that may be present and set the defaults.
-		$shortcode_to_parse = str_replace( '[', '', str_replace( ']', '', $shortcode ) );
-		return shortcode_parse_atts( $shortcode_to_parse );
+		$shortcode_to_parse = str_replace('[', '', str_replace(']', '', $shortcode));
+		return shortcode_parse_atts($shortcode_to_parse);
 	}
 
 
@@ -313,7 +313,7 @@ 
 	 */
 	protected function _set_messages_properties() {
 		//should be in _extra_data
-		if ( isset( $this->_extra_data['messenger'] ) ) {
+		if (isset($this->_extra_data['messenger'])) {
 			$this->_messenger = $this->_extra_data['messenger'];
 			$this->_message_type = $this->_extra_data['message_type'];
 			$this->_context = $this->_extra_data['context'];

Braces +12 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
@@ -165,8 +166,9 @@ 
 
 
 	public function get_shortcode_helper() {
-		if ( ! $this->_shortcode_helper instanceof EEH_Parse_Shortcodes )
-			$this->_set_shortcode_helper();
+		if ( ! $this->_shortcode_helper instanceof EEH_Parse_Shortcodes ) {
+					$this->_set_shortcode_helper();
+		}
 		return $this->_shortcode_helper;
 	}
 
@@ -188,8 +190,10 @@ 
 		$sc_to_verify = !empty($matches[0] ) ? $matches[0][0] . ']' : $shortcode;
 
 		//first we want to make sure this is a valid shortcode
-		if ( !array_key_exists($sc_to_verify, $this->_shortcodes ) )
-			return false; //get out, this parser doesn't handle the incoming shortcode.
+		if ( !array_key_exists($sc_to_verify, $this->_shortcodes ) ) {
+					return false;
+		}
+		//get out, this parser doesn't handle the incoming shortcode.
 		$this->_data = $data;
 		$this->_extra_data = $extra_data;
 		$this->_set_messages_properties();
@@ -267,8 +271,9 @@ 
 		}
 
 		//next test to make sure we've got got a data index in the incoming data array
-		if ( !isset( $this->_data['data'] ) )
-			throw new EE_Error( __('The incoming data does not have the required data index in its array', 'event_espresso') );
+		if ( !isset( $this->_data['data'] ) ) {
+					throw new EE_Error( __('The incoming data does not have the required data index in its array', 'event_espresso') );
+		}
 
 		//all is well let's make sure _extra_data always has the values needed.
 		//let's make sure that extra_data includes all templates (for later parsing if necessary)