eventespresso / event-espresso-core

core/libraries/shortcodes/EE_Event_Author_Shortcodes.lib.php

Spacing +22 added lines, -22 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -49,54 +49,54 @@ 
 
 
 
-	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;
 
 		//now it's possible that $recipient is not an instance of EE_Messages_Addressee in which case we need to see if $this->_data is an instance of $event.
 		$event = $this->_data instanceof EE_Event ? $this->_data : NULL;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee && ! $event instanceof EE_Event )
+		if ( ! $recipient instanceof EE_Messages_Addressee && ! $event instanceof EE_Event)
 			return '';
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[EVENT_AUTHOR_FNAME]' :
-				$fname =  !empty( $recipient ) ? $recipient->fname : NULL;
-				if ( empty( $fname ) && !empty( $event ) ) {
-					$user = $this->_get_author_for_event( $event );
+				$fname = ! empty($recipient) ? $recipient->fname : NULL;
+				if (empty($fname) && ! empty($event)) {
+					$user = $this->_get_author_for_event($event);
 					$fname = $user->first_name;
 				}
 				return $fname;
 				break;
 
 			case '[EVENT_AUTHOR_LNAME]' :
-				$lname =  !empty( $recipient ) ? $recipient->lname : NULL;
-				if ( empty( $lname ) && !empty( $event ) ) {
-					$user = $this->_get_author_for_event( $event );
+				$lname = ! empty($recipient) ? $recipient->lname : NULL;
+				if (empty($lname) && ! empty($event)) {
+					$user = $this->_get_author_for_event($event);
 					$lname = $user->last_name;
 				}
 				return $lname;
 				break;
 
 			case '[EVENT_AUTHOR_FORMATTED_EMAIL]' :
-				if ( !empty( $recipient ) ) {
-					$email =  !empty( $recipient->fname ) ? $recipient->fname . ' ' . $recipient->lname . '<' . $recipient->admin_email . '>' : EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) . '<' . $recipient->admin_email . '>';
+				if ( ! empty($recipient)) {
+					$email = ! empty($recipient->fname) ? $recipient->fname.' '.$recipient->lname.'<'.$recipient->admin_email.'>' : EE_Registry::instance()->CFG->organization->get_pretty('name').'<'.$recipient->admin_email.'>';
 				} else {
 					$email = NULL;
 				}
-				if ( empty( $email ) && ! empty( $event ) ) {
-					$user = $this->_get_author_for_event( $event );
-					$email = ! empty( $user->first_name ) ? $user->first_name . ' ' . $user->last_name . '<' . $user->user_email . '>' : EE_Registry::instance()->CFG->organization->get_pretty( 'name' ) . '<' . $user->user_email . '>';
+				if (empty($email) && ! empty($event)) {
+					$user = $this->_get_author_for_event($event);
+					$email = ! empty($user->first_name) ? $user->first_name.' '.$user->last_name.'<'.$user->user_email.'>' : EE_Registry::instance()->CFG->organization->get_pretty('name').'<'.$user->user_email.'>';
 				}
 				return $email;
 				break;
 
 			case '[EVENT_AUTHOR_EMAIL]' :
-				$email = ! empty( $recipient ) ? $recipient->admin_email : NULL;
-				if ( empty( $email ) && !empty( $event ) ) {
-					$user = $this->_get_author_for_event( $event );
+				$email = ! empty($recipient) ? $recipient->admin_email : NULL;
+				if (empty($email) && ! empty($event)) {
+					$user = $this->_get_author_for_event($event);
 					$email = $user->user_email;
 				}
 				return $email;
@@ -117,9 +117,9 @@ 
 	 *
 	 * @return WP_User
 	 */
-	private function _get_author_for_event( EE_Event $event ) {
+	private function _get_author_for_event(EE_Event $event) {
 		$author_id = $event->wp_user();
-		$user_data = get_userdata( (int) $author_id );
+		$user_data = get_userdata((int) $author_id);
 		return $user_data;
 		break;
 	}

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
@@ -58,8 +59,9 @@ 
 		//now it's possible that $recipient is not an instance of EE_Messages_Addressee in which case we need to see if $this->_data is an instance of $event.
 		$event = $this->_data instanceof EE_Event ? $this->_data : NULL;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee && ! $event instanceof EE_Event )
-			return '';
+		if ( ! $recipient instanceof EE_Messages_Addressee && ! $event instanceof EE_Event ) {
+					return '';
+		}
 
 		switch ( $shortcode ) {
 			case '[EVENT_AUTHOR_FNAME]' :

core/libraries/shortcodes/EE_Event_List_Shortcodes.lib.php

Spacing +10 added lines, -10 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -48,8 +48,8 @@ 
 
 
 
-	protected function _parser( $shortcode ) {
-		switch ( $shortcode ) {
+	protected function _parser($shortcode) {
+		switch ($shortcode) {
 			case '[EVENT_LIST]' :
 				return $this->_get_event_list();
 				break;
@@ -67,10 +67,10 @@ 
 		$this->_set_shortcode_helper();
 
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
+		if ($this->_data['data'] instanceof EE_Messages_Addressee)
 			return $this->_get_event_list_for_main();
 
-		else if ( $this->_data['data'] instanceof EE_Registration )
+		else if ($this->_data['data'] instanceof EE_Registration)
 			return $this->_get_event_list_for_registration();
 
 		//prevent recursive loop
@@ -91,7 +91,7 @@ 
 		$events = '';
 
 		//now we need to loop through the events array in EE_Messages_Addressee and send data to the EE_Parser helper.
-		foreach ( $data->events as $event ) {
+		foreach ($data->events as $event) {
 			$events .= $this->_shortcode_helper->parse_event_list_template($template, $event['event'], $valid_shortcodes, $this->_extra_data);
 		}
 		return $events;
@@ -107,7 +107,7 @@ 
 	 */
 	private function _get_event_list_for_registration() {
 		$valid_shortcodes = array('event', 'ticket_list', 'datetime_list', 'attendee', 'event_author', 'recipient_details', 'recipient_list', 'venue');
-		$template = is_array( $this->_data['template'] ) && isset($this->_data['template']['event_list']) ? $this->_data['template']['event_list'] : $this->_extra_data['template']['event_list'];
+		$template = is_array($this->_data['template']) && isset($this->_data['template']['event_list']) ? $this->_data['template']['event_list'] : $this->_extra_data['template']['event_list'];
 		$registration = $this->_data['data'];
 
 		//let's remove any existing [ATTENDEE_LIST] shortcode from the event list template so that we don't get recursion.
@@ -120,7 +120,7 @@ 
 		//we're NOT going to prepare a list of attendees this time around
 		$events = '';
 
-		foreach ( (array) $all_events as $event ) {
+		foreach ((array) $all_events as $event) {
 			$events .= $this->_shortcode_helper->parse_event_list_template($template, $event, $valid_shortcodes, $this->_extra_data);
 		}
 
@@ -129,8 +129,8 @@ 
 
 
 
-	private function _get_events_from_registration( EE_Registration $registration ) {
-		return isset( $this->_extra_data['data']->registrations ) ? array($this->_extra_data['data']->registrations[$registration->ID()]['evt_obj']) : array();
+	private function _get_events_from_registration(EE_Registration $registration) {
+		return isset($this->_extra_data['data']->registrations) ? array($this->_extra_data['data']->registrations[$registration->ID()]['evt_obj']) : array();
 	}
 
 

Braces +10 added lines, -8 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
@@ -67,15 +68,16 @@ 
 		$this->_set_shortcode_helper();
 
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_event_list_for_main();
-
-		else if ( $this->_data['data'] instanceof EE_Registration )
-			return $this->_get_event_list_for_registration();
+		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_event_list_for_main();
+		} else if ( $this->_data['data'] instanceof EE_Registration ) {
+					return $this->_get_event_list_for_registration();
+		}
 
 		//prevent recursive loop
-		else
-			return '';
+		else {
+					return '';
+		}
 	}
 
 

core/libraries/shortcodes/EE_Event_Meta_Shortcodes.lib.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -51,19 +51,19 @@ 
 	 * @param  mixed (array|object) $data      incoming data object/array
 	 * @return string            parsed code.
 	 */
-	public function parser( $shortcode, $data, $extra_data = array() ) {
+	public function parser($shortcode, $data, $extra_data = array()) {
 		
 		//all shortcodes will be checked in the post_meta table (assuming the shortcode matches the post_meta key);
-		if ( empty( $this->_data['ID'] ) )
+		if (empty($this->_data['ID']))
 			return ''; //need the event id to do anything!
 
 		$meta = get_post_meta($this->_data['ID'], $shortcode, true);
 
-		return !empty( $meta ) ? $meta : '';
+		return ! empty($meta) ? $meta : '';
 	}
 
 
-	protected function _parser( $shortcode ) {}
+	protected function _parser($shortcode) {}
 
 
 } //end EE_Event_Meta_Shortcodes class
\ No newline at end of file

Braces +6 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
@@ -54,8 +55,10 @@ 
 	public function parser( $shortcode, $data, $extra_data = array() ) {
 		
 		//all shortcodes will be checked in the post_meta table (assuming the shortcode matches the post_meta key);
-		if ( empty( $this->_data['ID'] ) )
-			return ''; //need the event id to do anything!
+		if ( empty( $this->_data['ID'] ) ) {
+					return '';
+		}
+		//need the event id to do anything!
 
 		$meta = get_post_meta($this->_data['ID'], $shortcode, true);
 

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_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_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;