eventespresso / event-espresso-core

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

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

core/libraries/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_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)

core/libraries/shortcodes/EE_Ticket_List_Shortcodes.lib.php

Braces +12 added lines, -11 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -68,18 +69,18 @@ 
 		$this->_set_shortcode_helper();
 
 
-		if ( $this->_data['data'] instanceof EE_Messages_Addressee )
-			return $this->_get_ticket_list_for_main();
-
-		else if ( $this->_data['data'] instanceof EE_Registration )
-			return $this->_get_ticket_list_for_attendee();
-
-		else if ( $this->_data['data'] instanceof EE_Event )
-			return $this->_get_ticket_list_for_event();
+		if ( $this->_data['data'] instanceof EE_Messages_Addressee ) {
+					return $this->_get_ticket_list_for_main();
+		} else if ( $this->_data['data'] instanceof EE_Registration ) {
+					return $this->_get_ticket_list_for_attendee();
+		} else if ( $this->_data['data'] instanceof EE_Event ) {
+					return $this->_get_ticket_list_for_event();
+		}
 
 		//prevent recursive loop
-		else
-			return '';
+		else {
+					return '';
+		}
 	}
 
 

Spacing +13 added lines, -13 removed lines

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

core/libraries/shortcodes/EE_Ticket_Shortcodes.lib.php

Braces +5 added lines, -3 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -80,8 +81,9 @@ 
 
 
 		//If there is no event object by now then get out.
-		if ( ! $this->_ticket instanceof EE_Ticket )
-			return '';
+		if ( ! $this->_ticket instanceof EE_Ticket ) {
+					return '';
+		}
 
 		switch ( $shortcode ) {
 

Spacing +18 added lines, -18 removed lines

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

core/templates/maintenance_mode.template.php

Spacing +2 added lines, -2 removed lines

@@ -20,10 +20,10 @@
 		<div id="ee-maintenance-mode-dv" class="" role="main">
 			<article id="ee-maintenance-mode">
 				<header class="event-header">
-					<h1  id="ee-maintenance-mode-h1"><?php _e( 'Maintenance Mode', 'event_espresso' ); ?></h1>
+					<h1  id="ee-maintenance-mode-h1"><?php _e('Maintenance Mode', 'event_espresso'); ?></h1>
 				</header>
 				<div class="ee-maintenance-mode-dv">
-					<p><?php _e( 'Event Registration has been temporarily closed while system maintenance is being performed. We\'re sorry for any inconveniences this may have caused. Please try back again later.	', 'event_espresso' ); ?></p>
+					<p><?php _e('Event Registration has been temporarily closed while system maintenance is being performed. We\'re sorry for any inconveniences this may have caused. Please try back again later.	', 'event_espresso'); ?></p>
 				</div>
 			</article>
 		</div>

espresso.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('ABSPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('ABSPATH')) {
+	exit('No direct script access allowed');
+}
 /*
   Plugin Name:		Event Espresso
   Plugin URI:  		http://eventespresso.com/pricing/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=wordpress_plugins_page&utm_content=support_link

Spacing +78 added lines, -78 removed lines

@@ -40,7 +40,7 @@ 
  */
 
 //Returns the plugin version
-if ( ! function_exists( 'espresso_version' )) {
+if ( ! function_exists('espresso_version')) {
 	/**
 	 * espresso_version
 	 * @return string
@@ -49,92 +49,92 @@ 
 		return '4.6.26.rc.000';
 	}
 } else {
-	unset( $_GET['activate'] );
-	add_action( 'admin_notices', 'espresso_duplicate_plugin_error', 1 );
+	unset($_GET['activate']);
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 }
 // define versions
-define( 'EVENT_ESPRESSO_VERSION', espresso_version());
-define( 'EE_MIN_WP_VER_REQUIRED', '4.0' );
-define( 'EE_MIN_WP_VER_RECOMMENDED', '4.1' );
-define( 'EE_MIN_PHP_VER_REQUIRED', '5.3.0' );
-define( 'EE_MIN_PHP_VER_RECOMMENDED', '5.4.33' );
-define( 'EVENT_ESPRESSO_POWERED_BY', 'Event Espresso - ' . EVENT_ESPRESSO_VERSION );
-define( 'EVENT_ESPRESSO_MAIN_FILE', __FILE__ );
+define('EVENT_ESPRESSO_VERSION', espresso_version());
+define('EE_MIN_WP_VER_REQUIRED', '4.0');
+define('EE_MIN_WP_VER_RECOMMENDED', '4.1');
+define('EE_MIN_PHP_VER_REQUIRED', '5.3.0');
+define('EE_MIN_PHP_VER_RECOMMENDED', '5.4.33');
+define('EVENT_ESPRESSO_POWERED_BY', 'Event Espresso - '.EVENT_ESPRESSO_VERSION);
+define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
 
 //used to be DIRECTORY_SEPARATOR, but that caused issues on windows
-if ( ! defined( 'DS' )) {
-	define( 'DS', '/' );
+if ( ! defined('DS')) {
+	define('DS', '/');
 }
-if ( ! defined( 'PS' )) {
-	define( 'PS', PATH_SEPARATOR );
+if ( ! defined('PS')) {
+	define('PS', PATH_SEPARATOR);
 }
-if( ! defined( 'SP' )){
-	define( 'SP', ' ' );
+if ( ! defined('SP')) {
+	define('SP', ' ');
 }
-if( ! defined( 'EENL' )){
-	define( 'EENL', "\n" );
+if ( ! defined('EENL')) {
+	define('EENL', "\n");
 }
 
 
-define( 'EE_SUPPORT_EMAIL', 'support@eventespresso.com');
+define('EE_SUPPORT_EMAIL', 'support@eventespresso.com');
 // define the plugin directory and URL
-define( 'EE_PLUGIN_BASENAME', plugin_basename( EVENT_ESPRESSO_MAIN_FILE ));
-define( 'EE_PLUGIN_DIR_PATH', plugin_dir_path( EVENT_ESPRESSO_MAIN_FILE ));
-define( 'EE_PLUGIN_DIR_URL', plugin_dir_url( EVENT_ESPRESSO_MAIN_FILE ));
+define('EE_PLUGIN_BASENAME', plugin_basename(EVENT_ESPRESSO_MAIN_FILE));
+define('EE_PLUGIN_DIR_PATH', plugin_dir_path(EVENT_ESPRESSO_MAIN_FILE));
+define('EE_PLUGIN_DIR_URL', plugin_dir_url(EVENT_ESPRESSO_MAIN_FILE));
 // main root folder paths
-define( 'EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH . 'admin_pages' . DS );
-define( 'EE_CORE', EE_PLUGIN_DIR_PATH . 'core' . DS );
-define( 'EE_MODULES', EE_PLUGIN_DIR_PATH . 'modules' . DS );
-define( 'EE_PUBLIC', EE_PLUGIN_DIR_PATH . 'public' . DS );
-define( 'EE_SHORTCODES', EE_PLUGIN_DIR_PATH . 'shortcodes' . DS );
-define( 'EE_WIDGETS', EE_PLUGIN_DIR_PATH . 'widgets' . DS );
-define( 'EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH . 'payment_methods' . DS);
-define( 'EE_CAFF_PATH', EE_PLUGIN_DIR_PATH . 'caffeinated' . DS );
+define('EE_ADMIN_PAGES', EE_PLUGIN_DIR_PATH.'admin_pages'.DS);
+define('EE_CORE', EE_PLUGIN_DIR_PATH.'core'.DS);
+define('EE_MODULES', EE_PLUGIN_DIR_PATH.'modules'.DS);
+define('EE_PUBLIC', EE_PLUGIN_DIR_PATH.'public'.DS);
+define('EE_SHORTCODES', EE_PLUGIN_DIR_PATH.'shortcodes'.DS);
+define('EE_WIDGETS', EE_PLUGIN_DIR_PATH.'widgets'.DS);
+define('EE_PAYMENT_METHODS', EE_PLUGIN_DIR_PATH.'payment_methods'.DS);
+define('EE_CAFF_PATH', EE_PLUGIN_DIR_PATH.'caffeinated'.DS);
 // core system paths
-define( 'EE_ADMIN', EE_CORE . 'admin' . DS );
-define( 'EE_CPTS', EE_CORE . 'CPTs' . DS );
-define( 'EE_CLASSES', EE_CORE . 'db_classes' . DS );
-define( 'EE_BUSINESS', EE_CORE . 'business' . DS );
-define( 'EE_MODELS', EE_CORE . 'db_models' . DS );
-define( 'EE_HELPERS', EE_CORE . 'helpers' . DS );
-define( 'EE_LIBRARIES', EE_CORE . 'libraries' . DS );
-define( 'EE_TEMPLATES', EE_CORE . 'templates' . DS );
-define( 'EE_THIRD_PARTY', EE_CORE . 'third_party_libs' . DS );
-define( 'EE_GLOBAL_ASSETS', EE_TEMPLATES . 'global_assets' . DS );
-define( 'EE_FORM_SECTIONS', EE_LIBRARIES  .'form_sections' . DS );
+define('EE_ADMIN', EE_CORE.'admin'.DS);
+define('EE_CPTS', EE_CORE.'CPTs'.DS);
+define('EE_CLASSES', EE_CORE.'db_classes'.DS);
+define('EE_BUSINESS', EE_CORE.'business'.DS);
+define('EE_MODELS', EE_CORE.'db_models'.DS);
+define('EE_HELPERS', EE_CORE.'helpers'.DS);
+define('EE_LIBRARIES', EE_CORE.'libraries'.DS);
+define('EE_TEMPLATES', EE_CORE.'templates'.DS);
+define('EE_THIRD_PARTY', EE_CORE.'third_party_libs'.DS);
+define('EE_GLOBAL_ASSETS', EE_TEMPLATES.'global_assets'.DS);
+define('EE_FORM_SECTIONS', EE_LIBRARIES.'form_sections'.DS);
 // gateways
-define( 'EE_GATEWAYS', EE_MODULES . 'gateways' . DS );
-define( 'EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL . 'modules' . DS . 'gateways' . DS );
+define('EE_GATEWAYS', EE_MODULES.'gateways'.DS);
+define('EE_GATEWAYS_URL', EE_PLUGIN_DIR_URL.'modules'.DS.'gateways'.DS);
 // asset URL paths
-define( 'EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'templates' . DS );
-define( 'EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL . 'global_assets' . DS );
-define( 'EE_IMAGES_URL',  EE_GLOBAL_ASSETS_URL . 'images' . DS );
-define( 'EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL . 'core' . DS . 'third_party_libs' . DS );
-define( 'EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL . 'core/helpers/assets/' );
-define( 'EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL . 'core/libraries/');
+define('EE_TEMPLATES_URL', EE_PLUGIN_DIR_URL.'core'.DS.'templates'.DS);
+define('EE_GLOBAL_ASSETS_URL', EE_TEMPLATES_URL.'global_assets'.DS);
+define('EE_IMAGES_URL', EE_GLOBAL_ASSETS_URL.'images'.DS);
+define('EE_THIRD_PARTY_URL', EE_PLUGIN_DIR_URL.'core'.DS.'third_party_libs'.DS);
+define('EE_HELPERS_ASSETS', EE_PLUGIN_DIR_URL.'core/helpers/assets/');
+define('EE_LIBRARIES_URL', EE_PLUGIN_DIR_URL.'core/libraries/');
 
 // define upload paths
 $uploads = wp_upload_dir();
 // define the uploads directory and URL
-define( 'EVENT_ESPRESSO_UPLOAD_DIR', $uploads['basedir'] . DS . 'espresso' . DS );
-define( 'EVENT_ESPRESSO_UPLOAD_URL', $uploads['baseurl'] . DS . 'espresso' . DS );
+define('EVENT_ESPRESSO_UPLOAD_DIR', $uploads['basedir'].DS.'espresso'.DS);
+define('EVENT_ESPRESSO_UPLOAD_URL', $uploads['baseurl'].DS.'espresso'.DS);
 // define the templates directory and URL
-define( 'EVENT_ESPRESSO_TEMPLATE_DIR', $uploads['basedir'] . DS . 'espresso' . DS . 'templates' . DS );
-define( 'EVENT_ESPRESSO_TEMPLATE_URL', $uploads['baseurl'] . DS . 'espresso' . DS . 'templates' . DS );
+define('EVENT_ESPRESSO_TEMPLATE_DIR', $uploads['basedir'].DS.'espresso'.DS.'templates'.DS);
+define('EVENT_ESPRESSO_TEMPLATE_URL', $uploads['baseurl'].DS.'espresso'.DS.'templates'.DS);
 // define the gateway directory and URL
-define( 'EVENT_ESPRESSO_GATEWAY_DIR', $uploads['basedir'] . DS . 'espresso' . DS . 'gateways' . DS );
-define( 'EVENT_ESPRESSO_GATEWAY_URL', $uploads['baseurl'] . DS . 'espresso' . DS . 'gateways' . DS );
+define('EVENT_ESPRESSO_GATEWAY_DIR', $uploads['basedir'].DS.'espresso'.DS.'gateways'.DS);
+define('EVENT_ESPRESSO_GATEWAY_URL', $uploads['baseurl'].DS.'espresso'.DS.'gateways'.DS);
 // languages folder/path
-define( 'EE_LANGUAGES_SAFE_LOC', '..' . DS . 'uploads' . DS . 'espresso' . DS . 'languages' . DS );
-define( 'EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'languages' . DS );
+define('EE_LANGUAGES_SAFE_LOC', '..'.DS.'uploads'.DS.'espresso'.DS.'languages'.DS);
+define('EE_LANGUAGES_SAFE_DIR', EVENT_ESPRESSO_UPLOAD_DIR.'languages'.DS);
 //check for dompdf fonts in uploads
-if( file_exists(EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS ) ){
-	define( 'DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR . 'fonts' . DS  );
+if (file_exists(EVENT_ESPRESSO_UPLOAD_DIR.'fonts'.DS)) {
+	define('DOMPDF_FONT_DIR', EVENT_ESPRESSO_UPLOAD_DIR.'fonts'.DS);
 }
 
 //ajax constants
-define( 'EE_FRONT_AJAX', isset($_REQUEST['ee_front_ajax']) || isset( $_REQUEST['data']['ee_front_ajax'] ) ? TRUE : FALSE );
-define( 'EE_ADMIN_AJAX', isset($_REQUEST['ee_admin_ajax']) || isset( $_REQUEST['data']['ee_admin_ajax'] ) ? TRUE : FALSE );
+define('EE_FRONT_AJAX', isset($_REQUEST['ee_front_ajax']) || isset($_REQUEST['data']['ee_front_ajax']) ? TRUE : FALSE);
+define('EE_ADMIN_AJAX', isset($_REQUEST['ee_admin_ajax']) || isset($_REQUEST['data']['ee_admin_ajax']) ? TRUE : FALSE);
 //just a handy constant occasionally needed for finding values representing infinity in the DB
 //you're better to use this than its straight value (currently -1) in case you ever
 //want to change its default value! or find when -1 means infinity
@@ -149,10 +149,10 @@ 
 function espresso_duplicate_plugin_error() {
 	?>
 	<div class="error">
-	<p><?php _e( 'Can not run multiple versions of Event Espresso! Please deactivate one of the versions.', 'event_espresso' ); ?></p>
+	<p><?php _e('Can not run multiple versions of Event Espresso! Please deactivate one of the versions.', 'event_espresso'); ?></p>
 	</div>
 	<?php
-	EE_System::deactivate_plugin( EE_PLUGIN_BASENAME );
+	EE_System::deactivate_plugin(EE_PLUGIN_BASENAME);
 }
 
 
@@ -162,9 +162,9 @@ 
  * 	adds a wp-option to indicate that EE has been activated via the WP admin plugins page
  */
 function espresso_plugin_activation() {
-	update_option( 'ee_espresso_activation', TRUE );
+	update_option('ee_espresso_activation', TRUE);
 }
-register_activation_hook( EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation' );
+register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
 
 
 
@@ -172,10 +172,10 @@ 
  * 	espresso_plugin_deactivation
  */
 function espresso_plugin_deactivation() {
-	espresso_load_required( 'EEH_Activation', EE_HELPERS . 'EEH_Activation.helper.php' );
+	espresso_load_required('EEH_Activation', EE_HELPERS.'EEH_Activation.helper.php');
 	EEH_Activation::plugin_deactivation();
 }
-register_deactivation_hook( EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation' );
+register_deactivation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation');
 
 
 
@@ -185,15 +185,15 @@ 
  */
 function espresso_load_error_handling() {
 	// load debugging tools
-	if ( WP_DEBUG === TRUE ) {
-		require_once( EE_HELPERS . 'EEH_Debug_Tools.helper.php' );
+	if (WP_DEBUG === TRUE) {
+		require_once(EE_HELPERS.'EEH_Debug_Tools.helper.php');
 		EEH_Debug_Tools::instance();
 	}
 	// load error handling
-	if ( is_readable( EE_CORE . 'EE_Error.core.php' )) {
-		 require_once( EE_CORE . 'EE_Error.core.php' );
+	if (is_readable(EE_CORE.'EE_Error.core.php')) {
+		 require_once(EE_CORE.'EE_Error.core.php');
 	} else {
-		wp_die( __( 'The EE_Error core class could not be loaded.', 'event_espresso' ));
+		wp_die(__('The EE_Error core class could not be loaded.', 'event_espresso'));
 	}
 }
 
@@ -203,13 +203,13 @@ 
  * 	espresso_load_required
  * 	given a class name and path, this function will load that file or throw an exception
  */
-function espresso_load_required( $classname, $full_path_to_file ) {
+function espresso_load_required($classname, $full_path_to_file) {
 	espresso_load_error_handling();
-	if ( is_readable( $full_path_to_file )) {
-		require_once( $full_path_to_file );
+	if (is_readable($full_path_to_file)) {
+		require_once($full_path_to_file);
 	} else {
-		throw new EE_Error ( sprintf (
-			__( 'The %s class file could not be located or is not readable due to file permissions.', 'event_espresso' ),
+		throw new EE_Error(sprintf(
+			__('The %s class file could not be located or is not readable due to file permissions.', 'event_espresso'),
 			$classname
 		));
 	}
@@ -217,5 +217,5 @@ 
 
 
 
-espresso_load_required( 'EE_System', EE_CORE . 'EE_System.core.php' );
+espresso_load_required('EE_System', EE_CORE.'EE_System.core.php');
 EE_System::instance();