eventespresso / event-espresso-core

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_invoice_settings.dmsstage.php

Spacing +6 added lines, -6 removed lines

@@ -27,7 +27,7 @@ 
 	 * Just initializes the status of the migration
 	 */
 	public function __construct() {
-		$this->_pretty_name = __( 'Update Invoice Settings', 'event_espresso' );
+		$this->_pretty_name = __('Update Invoice Settings', 'event_espresso');
 		parent::__construct();
 	}
 
@@ -54,13 +54,13 @@ 
 	 * @throws EE_Error
 	 * @return int number of items ACTUALLY migrated
 	 */
-	protected function _migration_step( $num_items = 1 ){
+	protected function _migration_step($num_items = 1) {
 
 		$templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
-		$overridden_invoice_body = EEH_Template::locate_template( $templates_relative_path . 'invoice_body.template.php', NULL, FALSE, FALSE, TRUE );
-		$overridden_receipt_body= EEH_Template::locate_template( $templates_relative_path . 'receipt_body.template.php', NULL, FALSE, FALSE, TRUE );
-		if( $overridden_invoice_body || $overridden_receipt_body ) {
-			EE_Error::add_persistent_admin_notice( 'invoice_overriding_templates', sprintf( __( 'Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overriden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents (but this will be removed in an upcoming version). We recommend deleting your old Invoice/Receipt templates and using the new messages system. Then modify the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.')), TRUE );
+		$overridden_invoice_body = EEH_Template::locate_template($templates_relative_path.'invoice_body.template.php', NULL, FALSE, FALSE, TRUE);
+		$overridden_receipt_body = EEH_Template::locate_template($templates_relative_path.'receipt_body.template.php', NULL, FALSE, FALSE, TRUE);
+		if ($overridden_invoice_body || $overridden_receipt_body) {
+			EE_Error::add_persistent_admin_notice('invoice_overriding_templates', sprintf(__('Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overriden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents (but this will be removed in an upcoming version). We recommend deleting your old Invoice/Receipt templates and using the new messages system. Then modify the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.')), TRUE);
 		}
 
 		//regardless of whether it worked or not, we ought to continue the migration

core/libraries/form_sections/base/EE_Form_Section_HTML_From_Template.form.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,9 +25,9 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Form_Section_HTML_From_Template extends EE_Form_Section_HTML{
-	public function __construct($template_file,$args = array(), $options_array = array()) {
-		$html = EEH_Template::locate_template( $template_file, $args );
+class EE_Form_Section_HTML_From_Template extends EE_Form_Section_HTML {
+	public function __construct($template_file, $args = array(), $options_array = array()) {
+		$html = EEH_Template::locate_template($template_file, $args);
 
 //		echo " filepath:$template_file html $html";
 		parent::__construct($html, $options_array);

Braces +2 added lines, -1 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

core/libraries/form_sections/payment_methods/EE_Billing_Info_Form.form.php

Spacing +10 added lines, -10 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 /**
  *
  * EE_Billing_Info_Form
@@ -11,7 +11,7 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_Billing_Info_Form extends EE_Form_Section_Proper{
+class EE_Billing_Info_Form extends EE_Form_Section_Proper {
 
 	/**
 	 * The payment method this billing form is for
@@ -26,10 +26,10 @@ 
 	 * @param EE_Payment_Method $payment_method
 	 * @param array $options_array @see EE_Form_Section_Proper::__construct()
 	 */
-	public function __construct( EE_Payment_Method $payment_method, $options_array= array()){
+	public function __construct(EE_Payment_Method $payment_method, $options_array = array()) {
 		$this->_pm_instance = $payment_method;
 		$this->_layout_strategy = new EE_Div_Per_Section_Layout();
-		parent::__construct( $options_array );
+		parent::__construct($options_array);
 
 	}
 
@@ -40,7 +40,7 @@ 
 	 * @param EE_Payment_Method $payment_method
 	 * @return void
 	 */
-	public function set_payment_method( EE_Payment_Method $payment_method ){
+	public function set_payment_method(EE_Payment_Method $payment_method) {
 		$this->_pm_instance = $payment_method;
 	}
 
@@ -50,7 +50,7 @@ 
 	 * Returns the instance of the payment method this billing form is for
 	 * @return EE_Payment_Method
 	 */
-	public function payment_method(){
+	public function payment_method() {
 		return $this->_pm_instance;
 	}
 
@@ -60,10 +60,10 @@ 
 	 * payment_fields_autofilled_notice_html
 	 * @return string
 	 */
-	public function payment_fields_autofilled_notice_html(){
+	public function payment_fields_autofilled_notice_html() {
 		return  new EE_Form_Section_HTML(
 			EEH_HTML::p(
-				apply_filters( 'FHEE__EE_Billing_Info_Form__payment_fields_autofilled_notice_html_text', __( 'Payment fields have been autofilled because you are in debug mode', 'event_espresso' )),
+				apply_filters('FHEE__EE_Billing_Info_Form__payment_fields_autofilled_notice_html_text', __('Payment fields have been autofilled because you are in debug mode', 'event_espresso')),
 				'',
 				'important-notice'
 			)
@@ -75,8 +75,8 @@ 
 	/**
 	 * @return string
 	 */
-	public function html_class(){
-		return ! empty( $this->_html_class ) ? $this->_html_class . ' ee-billing-form' : 'ee-billing-form';
+	public function html_class() {
+		return ! empty($this->_html_class) ? $this->_html_class.' ee-billing-form' : 'ee-billing-form';
 	}
 
 

core/helpers/EEH_Address.helper.php

Spacing +18 added lines, -18 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -35,24 +35,24 @@ 
 		$add_wrapper = true
 	) {
 		// check that incoming object implements the EEI_Address interface
-		if ( ! $obj_with_address instanceof EEI_Address ) {
-			$msg = __( 'The address could not be formatted.', 'event_espresso' );
+		if ( ! $obj_with_address instanceof EEI_Address) {
+			$msg = __('The address could not be formatted.', 'event_espresso');
 			$dev_msg = __(
 				'The Address Formatter requires passed objects to implement the EEI_Address interface.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__);
 			return null;
 		}
 		// obtain an address formatter
-		$formatter = EEH_Address::_get_formatter( $type );
+		$formatter = EEH_Address::_get_formatter($type);
 		// apply schema.org formatting ?
 		$use_schema = ! is_admin() ? $use_schema : false;
 		$formatted_address = $use_schema
-			? EEH_Address::_schema_formatting( $formatter, $obj_with_address )
-			: EEH_Address::_regular_formatting( $formatter, $obj_with_address, $add_wrapper );
+			? EEH_Address::_schema_formatting($formatter, $obj_with_address)
+			: EEH_Address::_regular_formatting($formatter, $obj_with_address, $add_wrapper);
 		$formatted_address = $add_wrapper && ! $use_schema
-			? '<div class="espresso-address-dv">' . $formatted_address . '</div>'
+			? '<div class="espresso-address-dv">'.$formatted_address.'</div>'
 			: $formatted_address;
 		// return the formatted address
 		return $formatted_address;
@@ -67,8 +67,8 @@ 
 	 * @param string $type how the address is formatted. for example: 'multiline' or 'inline'
 	 * @return EEI_Address_Formatter
 	 */
-	private static function _get_formatter( $type ) {
-		switch ( $type ) {
+	private static function _get_formatter($type) {
+		switch ($type) {
 			case 'multiline' :
 				return new EventEspresso\core\services\address\formatters\MultiLineAddressFormatter();
 			case 'inline' :
@@ -121,15 +121,15 @@ 
 	 * @param object EEI_Address $obj_with_address
 	 * @return string
 	 */
-	private static function _schema_formatting( EEI_Address_Formatter $formatter, EEI_Address $obj_with_address ) {
+	private static function _schema_formatting(EEI_Address_Formatter $formatter, EEI_Address $obj_with_address) {
 		$formatted_address = '<div itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">';
 		$formatted_address .= $formatter->format(
-			EEH_Schema::streetAddress( $obj_with_address ),
-			EEH_Schema::postOfficeBoxNumber( $obj_with_address ),
-			EEH_Schema::addressLocality( $obj_with_address ),
-			EEH_Schema::addressRegion( $obj_with_address ),
-			EEH_Schema::postalCode( $obj_with_address ),
-			EEH_Schema::addressCountry( $obj_with_address ),
+			EEH_Schema::streetAddress($obj_with_address),
+			EEH_Schema::postOfficeBoxNumber($obj_with_address),
+			EEH_Schema::addressLocality($obj_with_address),
+			EEH_Schema::addressRegion($obj_with_address),
+			EEH_Schema::postalCode($obj_with_address),
+			EEH_Schema::addressCountry($obj_with_address),
 			$obj_with_address->country_ID()
 		);
 		$formatted_address .= '</div>';

core/CPTs/EE_CPT_Venue_Strategy.core.php

Spacing +10 added lines, -10 removed lines

@@ -39,15 +39,15 @@ 
 	 * @param 	array 	$arguments
 	 * @return \EE_CPT_Venue_Strategy
 	 */
-	public function __construct( $arguments = array() ) {
-		$this->CPT = isset( $arguments['CPT'] ) ? $arguments['CPT'] : NULL;
-		$WP_Query = isset( $arguments['WP_Query'] ) ? $arguments['WP_Query'] : NULL;
-		if ( $WP_Query instanceof WP_Query && ! $WP_Query->is_tag ) {
-			$WP_Query->is_espresso_venue_single = is_singular() && isset( $WP_Query->query->post_type ) && $WP_Query->query->post_type == 'espresso_venues' ? TRUE : FALSE;
+	public function __construct($arguments = array()) {
+		$this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : NULL;
+		$WP_Query = isset($arguments['WP_Query']) ? $arguments['WP_Query'] : NULL;
+		if ($WP_Query instanceof WP_Query && ! $WP_Query->is_tag) {
+			$WP_Query->is_espresso_venue_single = is_singular() && isset($WP_Query->query->post_type) && $WP_Query->query->post_type == 'espresso_venues' ? TRUE : FALSE;
 			$WP_Query->is_espresso_venue_archive = is_post_type_archive('espresso_venues') ? TRUE : FALSE;
-			$WP_Query->is_espresso_venue_taxonomy = is_tax( 'espresso_venue_categories' ) ? TRUE : FALSE;
+			$WP_Query->is_espresso_venue_taxonomy = is_tax('espresso_venue_categories') ? TRUE : FALSE;
 		}
-		add_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 );
+		add_filter('the_posts', array($this, 'the_posts'), 1, 2);
 	}
 
 
@@ -60,12 +60,12 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    void
 	 */
-	public function the_posts( $posts, WP_Query $wp_query) {
+	public function the_posts($posts, WP_Query $wp_query) {
 		// automagically load the EEH_Venue_View helper so that it's functions are available
-		if ( isset( EE_Registry::instance()->CFG->map_settings->use_google_maps ) && EE_Registry::instance()->CFG->map_settings->use_google_maps ) {
+		if (isset(EE_Registry::instance()->CFG->map_settings->use_google_maps) && EE_Registry::instance()->CFG->map_settings->use_google_maps) {
 			EEH_Maps::espresso_google_map_js();
 		}
-		remove_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 );
+		remove_filter('the_posts', array($this, 'the_posts'), 1, 2);
 		return $posts;
 	}
 

Braces +3 added lines, -1 removed lines

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

core/services/address/formatters/NullAddressFormatter.php

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\address\formatters;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -28,7 +28,7 @@ 
 	 * @param string $CNT_ISO
 	 * @return string
 	 */
-	public function format( $address, $address2, $city, $state, $zip, $country, $CNT_ISO ) {
+	public function format($address, $address2, $city, $state, $zip, $country, $CNT_ISO) {
 		return null;
 	}
 

core/services/address/formatters/AddressFormatter.php

Spacing +5 added lines, -5 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\address\formatters;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -41,14 +41,14 @@ 
 		// swap address part placeholders for the real text
 		$formatted_address = str_replace(
 		// find
-			array( '{address}', '{address2}', '{city}', '{state}', '{zip}', '{country}' ),
+			array('{address}', '{address2}', '{city}', '{state}', '{zip}', '{country}'),
 			// replace
-			array( $address, $address2, $city, $state, $zip, $country ),
+			array($address, $address2, $city, $state, $zip, $country),
 			// string
 			$formatted_address
 		);
 		// remove placeholder from start and end, reduce repeating placeholders to singles, then replace with HTML line breaks
-		return preg_replace( '/%+/', $sub, trim( $formatted_address, '%' ) );
+		return preg_replace('/%+/', $sub, trim($formatted_address, '%'));
 	}
 
 

core/services/address/formatters/MultiLineAddressFormatter.php

Spacing +4 added lines, -4 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\address\formatters;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -29,7 +29,7 @@ 
 	 * @param string $CNT_ISO
 	 * @return string
 	 */
-	public function format( $address, $address2, $city, $state, $zip, $country, $CNT_ISO ) {
+	public function format($address, $address2, $city, $state, $zip, $country, $CNT_ISO) {
 		$address_formats = apply_filters(
 			'FHEE__EE_MultiLine_Address_Formatter__address_formats',
 			array(
@@ -40,7 +40,7 @@ 
 			)
 		);
 		// if the incoming country has a set format, use that, else use the default
-		$formatted_address = isset( $address_formats[ $CNT_ISO ] ) ? $address_formats[ $CNT_ISO ]
+		$formatted_address = isset($address_formats[$CNT_ISO]) ? $address_formats[$CNT_ISO]
 			: $address_formats['ZZ'];
 		return $this->parse_formatted_address(
 			$address,

core/services/address/formatters/InlineAddressFormatter.php

Spacing +4 added lines, -4 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\address\formatters;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -28,7 +28,7 @@ 
 	 * @param string $CNT_ISO
 	 * @return string
 	 */
-	public function format( $address, $address2, $city, $state, $zip, $country, $CNT_ISO ) {
+	public function format($address, $address2, $city, $state, $zip, $country, $CNT_ISO) {
 		$address_formats = apply_filters(
 			'FHEE__EE_Inline_Address_Formatter__address_formats',
 			array(
@@ -39,7 +39,7 @@ 
 			)
 		);
 		// if the incoming country has a set format, use that, else use the default
-		$formatted_address = isset( $address_formats[ $CNT_ISO ] ) ? $address_formats[ $CNT_ISO ]
+		$formatted_address = isset($address_formats[$CNT_ISO]) ? $address_formats[$CNT_ISO]
 			: $address_formats['ZZZ'];
 		return $this->parse_formatted_address(
 			$address,