eventespresso / event-espresso-core

public/Espresso_Arabica_2014/content-espresso_events-details.php

Spacing +13 added lines, -13 removed lines

@@ -3,30 +3,30 @@
 global $post;
 ?>
 <div class="event-content">
-<?php if ( apply_filters( 'FHEE__content_espresso_events_details_template__display_entry_meta', TRUE )): ?>
+<?php if (apply_filters('FHEE__content_espresso_events_details_template__display_entry_meta', TRUE)): ?>
 	<div class="entry-meta">
-		<span class="tags-links"><?php espresso_event_categories( $post->ID, TRUE, TRUE ); ?></span>
+		<span class="tags-links"><?php espresso_event_categories($post->ID, TRUE, TRUE); ?></span>
 	<?php
-		if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
+		if ( ! post_password_required() && (comments_open() || get_comments_number())) :
 	?>
-	<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'event_espresso' ), __( '1 Comment', 'event_espresso' ), __( '% Comments', 'event_espresso' ) ); ?></span>
+	<span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'event_espresso'), __('1 Comment', 'event_espresso'), __('% Comments', 'event_espresso')); ?></span>
 	<?php
 		endif;
-		edit_post_link( __( 'Edit', 'event_espresso' ), '<span class="edit-link">', '</span>' );
+		edit_post_link(__('Edit', 'event_espresso'), '<span class="edit-link">', '</span>');
 	?>
 	</div>
 <?php endif;
-	$event_phone = espresso_event_phone( $post->ID, FALSE );
-	if ( $event_phone != '' ) : ?>
+	$event_phone = espresso_event_phone($post->ID, FALSE);
+	if ($event_phone != '') : ?>
 	<p>
-		<span class="small-text"><strong><?php _e( 'Event Phone:', 'event_espresso' ); ?> </strong></span> <?php echo $event_phone; ?>
+		<span class="small-text"><strong><?php _e('Event Phone:', 'event_espresso'); ?> </strong></span> <?php echo $event_phone; ?>
 	</p>
-<?php endif;  ?>
+<?php endif; ?>
 <?php
-	if ( apply_filters( 'FHEE__content_espresso_events_details_template__display_the_content', true ) ) {
-		do_action( 'AHEE_event_details_before_the_content', $post );
-		apply_filters( 'FHEE__content_espresso_events_details_template__the_content', espresso_event_content_or_excerpt() );
-		do_action( 'AHEE_event_details_after_the_content', $post );
+	if (apply_filters('FHEE__content_espresso_events_details_template__display_the_content', true)) {
+		do_action('AHEE_event_details_before_the_content', $post);
+		apply_filters('FHEE__content_espresso_events_details_template__the_content', espresso_event_content_or_excerpt());
+		do_action('AHEE_event_details_after_the_content', $post);
 	}
  ?>
 </div>

public/Espresso_Arabica_2014/content-espresso_events-shortcode.php

Spacing +16 added lines, -16 removed lines

@@ -21,22 +21,22 @@ 
  * and/or use any of the template tags functions found in:
  * \wp-content\plugins\event-espresso-core\public\template_tags.php
  ************************** IMPORTANT **************************/
-add_filter( 'FHEE__content_espresso_events__template_loaded', '__return_false' );
+add_filter('FHEE__content_espresso_events__template_loaded', '__return_false');
 
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
 
 global $post;
-$event_class = has_excerpt( $post->ID ) ? ' has-excerpt' : '';
-$event_class = apply_filters( 'FHEE__content_espresso_events__event_class', $event_class );
+$event_class = has_excerpt($post->ID) ? ' has-excerpt' : '';
+$event_class = apply_filters('FHEE__content_espresso_events__event_class', $event_class);
 ?>
-<?php do_action( 'AHEE_event_details_before_post', $post ); ?>
-<article id="post-<?php the_ID(); ?>" <?php post_class( $event_class ); ?>>
+<?php do_action('AHEE_event_details_before_post', $post); ?>
+<article id="post-<?php the_ID(); ?>" <?php post_class($event_class); ?>>
 
-<?php if ( is_single() ) : ?>
+<?php if (is_single()) : ?>
 
-	<div id="espresso-event-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?>
+	<div id="espresso-event-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv">
+		<?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-header'); ?>
 	</div>
 
 	<div class="espresso-event-wrapper-dv">
@@ -46,16 +46,16 @@ 
 		<?php //espresso_get_template_part( 'content', 'espresso_events-details' ); ?>
 		<?php //espresso_get_template_part( 'content', 'espresso_events-venues' ); ?>
 		<footer class="event-meta">
-			<?php do_action( 'AHEE_event_details_footer_top', $post ); ?>
-			<?php do_action( 'AHEE_event_details_footer_bottom', $post ); ?>
+			<?php do_action('AHEE_event_details_footer_top', $post); ?>
+			<?php do_action('AHEE_event_details_footer_bottom', $post); ?>
 		</footer>
 	</div>
 
-<?php elseif ( is_archive() ) : ?>
+<?php elseif (is_archive()) : ?>
 
-	<div id="espresso-event-list-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?>
+	<div id="espresso-event-list-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv">
+		<?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-header'); ?>
 	</div>
 
 	<div class="espresso-event-list-wrapper-dv">
@@ -70,5 +70,5 @@ 
 
 </article>
 <!-- #post -->
-<?php do_action( 'AHEE_event_details_after_post', $post );
+<?php do_action('AHEE_event_details_after_post', $post);
 

public/Espresso_Arabica_2014/content-espresso_events-venues.php

Spacing +28 added lines, -28 removed lines

@@ -1,54 +1,54 @@
 <?php
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
-if (( is_single() && espresso_display_venue_in_event_details() ) || ( is_archive() && espresso_display_venue_in_event_list() ) ) :
+if ((is_single() && espresso_display_venue_in_event_details()) || (is_archive() && espresso_display_venue_in_event_list())) :
 	global $post;
-	do_action( 'AHEE_event_details_before_venue_details', $post );
-	$venue_name = espresso_venue_name( 0, 'details', FALSE );
-	if ( empty( $venue_name ) && espresso_is_venue_private() ) {
-		do_action( 'AHEE_event_details_after_venue_details', $post );
+	do_action('AHEE_event_details_before_venue_details', $post);
+	$venue_name = espresso_venue_name(0, 'details', FALSE);
+	if (empty($venue_name) && espresso_is_venue_private()) {
+		do_action('AHEE_event_details_after_venue_details', $post);
 		return '';
 	}
 ?>
 
 <div class="espresso-venue-dv<?php echo espresso_is_venue_private() ? ' espresso-private-venue-dv' : ''; ?>">
 	<h3 class="event-venues-h3 ee-event-h3">
-		<?php _e( 'Location', 'event_espresso' ); ?>
+		<?php _e('Location', 'event_espresso'); ?>
 	</h3>
-	<h4><strong><?php _e( 'Venue:', 'event_espresso' ); ?></strong>&nbsp;&nbsp; <strong> <?php echo $venue_name; ?></strong></h4>
+	<h4><strong><?php _e('Venue:', 'event_espresso'); ?></strong>&nbsp;&nbsp; <strong> <?php echo $venue_name; ?></strong></h4>
 	<p><span class="smaller-text tags-links"><?php echo espresso_venue_categories(); ?></span></p>
-<?php  if ( $venue_phone = espresso_venue_phone( $post->ID, FALSE )) : ?>
+<?php  if ($venue_phone = espresso_venue_phone($post->ID, FALSE)) : ?>
 	<p>
-		<span class="small-text"><strong><?php _e( 'Venue Phone:', 'event_espresso' ); ?></strong></span> <?php echo $venue_phone; ?>
+		<span class="small-text"><strong><?php _e('Venue Phone:', 'event_espresso'); ?></strong></span> <?php echo $venue_phone; ?>
 	</p>
-<?php endif;  ?>
-<?php  if ( espresso_venue_has_address( $post->ID )) : ?>
-	<strong><span class="dashicons dashicons-location-alt"></span><?php _e( 'Address:', 'event_espresso' ); ?></strong>
-	<?php espresso_venue_address( 'inline' ); ?>
-	<?php espresso_venue_gmap( $post->ID ); ?>
+<?php endif; ?>
+<?php  if (espresso_venue_has_address($post->ID)) : ?>
+	<strong><span class="dashicons dashicons-location-alt"></span><?php _e('Address:', 'event_espresso'); ?></strong>
+	<?php espresso_venue_address('inline'); ?>
+	<?php espresso_venue_gmap($post->ID); ?>
 	<div class="clear"><br/></div>
-<?php endif;  ?>
+<?php endif; ?>
 
-	<?php $VNU_ID = espresso_venue_id( $post->ID ); ?>
-	<?php if ( is_single() ) : ?>
-		<?php $venue_description = espresso_venue_description( $VNU_ID, FALSE ); ?>
-		<?php if ( $venue_description ) : ?>
+	<?php $VNU_ID = espresso_venue_id($post->ID); ?>
+	<?php if (is_single()) : ?>
+		<?php $venue_description = espresso_venue_description($VNU_ID, FALSE); ?>
+		<?php if ($venue_description) : ?>
 	<p>
-		<strong><?php _e( 'Description:', 'event_espresso' ); ?></strong><br/>
-		<?php echo do_shortcode( $venue_description ); ?>
+		<strong><?php _e('Description:', 'event_espresso'); ?></strong><br/>
+		<?php echo do_shortcode($venue_description); ?>
 	</p>
-		<?php endif;  ?>
+		<?php endif; ?>
 	<?php else : ?>
-		<?php $venue_excerpt = espresso_venue_excerpt( $VNU_ID, FALSE ); ?>
-		<?php if ( $venue_excerpt ) : ?>
+		<?php $venue_excerpt = espresso_venue_excerpt($VNU_ID, FALSE); ?>
+		<?php if ($venue_excerpt) : ?>
 	<p>
-		<strong><?php _e( 'Description:', 'event_espresso' ); ?></strong><br/>
+		<strong><?php _e('Description:', 'event_espresso'); ?></strong><br/>
 		<?php echo $venue_excerpt; ?>
 	</p>
-			<?php endif;  ?>
-		<?php endif;  ?>
+			<?php endif; ?>
+		<?php endif; ?>
 </div>
 <!-- .espresso-venue-dv -->
 <?php
-do_action( 'AHEE_event_details_after_venue_details', $post );
+do_action('AHEE_event_details_after_venue_details', $post);
 endif;
 ?>

Braces +5 added lines, -2 removed lines

@@ -37,8 +37,11 @@
 		<?php echo do_shortcode( $venue_description ); ?>
 	</p>
 		<?php endif;  ?>
-	<?php else : ?>
-		<?php $venue_excerpt = espresso_venue_excerpt( $VNU_ID, FALSE ); ?>
+	<?php else {
+	: ?>
+		<?php $venue_excerpt = espresso_venue_excerpt( $VNU_ID, FALSE );
+}
+?>
 		<?php if ( $venue_excerpt ) : ?>
 	<p>
 		<strong><?php _e( 'Description:', 'event_espresso' ); ?></strong><br/>

public/Espresso_Arabica_2014/content-espresso_events.php

Spacing +24 added lines, -24 removed lines

@@ -18,52 +18,52 @@
  * and/or use any of the template tags functions found in:
  * \wp-content\plugins\event-espresso-core\public\template_tags.php
  ************************** IMPORTANT **************************/
-add_filter( 'FHEE__content_espresso_events__template_loaded', '__return_true' );
+add_filter('FHEE__content_espresso_events__template_loaded', '__return_true');
 
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
 
 global $post;
-$event_class = has_excerpt( $post->ID ) ? ' has-excerpt' : '';
-$event_class = apply_filters( 'FHEE__content_espresso_events__event_class', $event_class );
+$event_class = has_excerpt($post->ID) ? ' has-excerpt' : '';
+$event_class = apply_filters('FHEE__content_espresso_events__event_class', $event_class);
 ?>
-<?php do_action( 'AHEE_event_details_before_post', $post ); ?>
-<article id="post-<?php the_ID(); ?>" <?php post_class( $event_class ); ?>>
+<?php do_action('AHEE_event_details_before_post', $post); ?>
+<article id="post-<?php the_ID(); ?>" <?php post_class($event_class); ?>>
 
-<?php if ( is_single() ) : ?>
+<?php if (is_single()) : ?>
 
-	<div id="espresso-event-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?>
+	<div id="espresso-event-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv">
+		<?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-header'); ?>
 	</div>
 
 	<div class="espresso-event-wrapper-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_events-tickets' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-datetimes' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-details' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-venues' ); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-tickets'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-datetimes'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-details'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-venues'); ?>
 		<footer class="event-meta">
-			<?php do_action( 'AHEE_event_details_footer_top', $post ); ?>
-			<?php do_action( 'AHEE_event_details_footer_bottom', $post ); ?>
+			<?php do_action('AHEE_event_details_footer_top', $post); ?>
+			<?php do_action('AHEE_event_details_footer_bottom', $post); ?>
 		</footer>
 	</div>
 
-<?php elseif ( is_archive() ) : ?>
+<?php elseif (is_archive()) : ?>
 
-	<div id="espresso-event-list-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?>
+	<div id="espresso-event-list-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv">
+		<?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-header'); ?>
 	</div>
 
 	<div class="espresso-event-list-wrapper-dv">
-		<?php espresso_get_template_part( 'content', 'espresso_events-tickets' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-datetimes' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-details' ); ?>
-		<?php espresso_get_template_part( 'content', 'espresso_events-venues' ); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-tickets'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-datetimes'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-details'); ?>
+		<?php espresso_get_template_part('content', 'espresso_events-venues'); ?>
 	</div>
 
 <?php endif; ?>
 
 </article>
 <!-- #post -->
-<?php do_action( 'AHEE_event_details_after_post', $post );
+<?php do_action('AHEE_event_details_after_post', $post);
 

shortcodes/espresso_thank_you/templates/thank-you-page-registration-details.template.php

Spacing +22 added lines, -22 removed lines

@@ -5,75 +5,75 @@ 
 /** @type string $SPCO_attendee_information_url */
 ?>
 <h3 class="ee-registration-details-h3"><?php _e('Registration Details', 'event_espresso'); ?></h3>
-<?php  do_action( 'AHEE__thank_you_page_registration_details_template__after_heading' ); ?>
+<?php  do_action('AHEE__thank_you_page_registration_details_template__after_heading'); ?>
 
 <div class="ee-registration-details-dv">
 <?php
 $registrations = $transaction->registrations();
-$registrations = is_array( $registrations ) ? $registrations : array();
-$reg_count = count( $registrations );
+$registrations = is_array($registrations) ? $registrations : array();
+$reg_count = count($registrations);
 $reg_cntr = 0;
 $event_name = '';
-foreach ( $registrations as $registration ) {
-	if ( $registration instanceof EE_Registration ) {
-		if ( $event_name != $registration->event_name() && ! empty( $event_name )) { ?>
+foreach ($registrations as $registration) {
+	if ($registration instanceof EE_Registration) {
+		if ($event_name != $registration->event_name() && ! empty($event_name)) { ?>
 		</tbody>
 	</table>
 		<?php
 		}
 		$reg_cntr++;
-		if ( $event_name != $registration->event_name() ) {
+		if ($event_name != $registration->event_name()) {
 	?>
 	<h5>
-		<span class="smaller-text grey-text"><?php _e('for','event_espresso');?>: </span> <?php echo htmlentities( $registration->event_name(), ENT_QUOTES, 'UTF-8' );?>
+		<span class="smaller-text grey-text"><?php _e('for', 'event_espresso'); ?>: </span> <?php echo htmlentities($registration->event_name(), ENT_QUOTES, 'UTF-8'); ?>
 	</h5>
 	<table class='ee-table ee-registrations-list'>
 		<thead>
 			<tr>
 				<th width="40%">
-					<?php _e("Registrant Name",'event_espresso')?>
+					<?php _e("Registrant Name", 'event_espresso')?>
 				</th>
 				<th width="25%" class="jst-left">
-					<?php _e("REG Code",'event_espresso');?>
+					<?php _e("REG Code", 'event_espresso'); ?>
 				</th>
 				<th width="35%" class="jst-left">
-					<?php _e("REG Status",'event_espresso');?>
+					<?php _e("REG Status", 'event_espresso'); ?>
 				</th>
 			</tr>
 		</thead>
 		<tbody>
 	<?php
 		}
-		if ( $is_primary || ( ! $is_primary && $reg_url_link == $registration->reg_url_link() )) { ?>
+		if ($is_primary || ( ! $is_primary && $reg_url_link == $registration->reg_url_link())) { ?>
 			<tr>
 				<td width="40%">
 				<?php
-					if ( $registration->attendee() instanceof EE_Attendee ) {
-						echo $registration->attendee()->full_name( TRUE );
+					if ($registration->attendee() instanceof EE_Attendee) {
+						echo $registration->attendee()->full_name(TRUE);
 					}
 				?>
 					<p class="tiny-text" style="margin: .75em 0 0;">
 					<?php
-					if ( $registration->count_question_groups() ) {
+					if ($registration->count_question_groups()) {
 					?>
-						<a class="ee-icon-only-lnk" href="<?php echo $registration->edit_attendee_information_url();?>" title="<?php esc_attr_e('Click here to edit Attendee Information', 'event_espresso');?>"><span class="ee-icon ee-icon-user-edit"></span><?php _e('edit info', 'event_espresso');?></a>
+						<a class="ee-icon-only-lnk" href="<?php echo $registration->edit_attendee_information_url(); ?>" title="<?php esc_attr_e('Click here to edit Attendee Information', 'event_espresso'); ?>"><span class="ee-icon ee-icon-user-edit"></span><?php _e('edit info', 'event_espresso'); ?></a>
 					<?php } ?>
-						<a class="ee-resend-reg-confirmation-email ee-icon-only-lnk" href="<?php echo add_query_arg( array( 'token'=>$registration->reg_url_link(), 'resend_reg_confirmation' => 'true' ), EE_Registry::instance()->CFG->core->thank_you_page_url() );?>" title="<?php esc_attr_e('Click here to resend the Registration Confirmation email', 'event_espresso');?>" rel="<?php echo $registration->reg_url_link();?>"><span class="dashicons dashicons-email-alt"></span><?php _e('resend email', 'event_espresso');?></a>
+						<a class="ee-resend-reg-confirmation-email ee-icon-only-lnk" href="<?php echo add_query_arg(array('token'=>$registration->reg_url_link(), 'resend_reg_confirmation' => 'true'), EE_Registry::instance()->CFG->core->thank_you_page_url()); ?>" title="<?php esc_attr_e('Click here to resend the Registration Confirmation email', 'event_espresso'); ?>" rel="<?php echo $registration->reg_url_link(); ?>"><span class="dashicons dashicons-email-alt"></span><?php _e('resend email', 'event_espresso'); ?></a>
 					</p>
 				</td>
 				<td width="25%" class="jst-left">
 					<?php $registration->e('REG_code') ?>
 				</td>
 				<td width="35%" class="jst-left">
-					<?php $registration->e_pretty_status( TRUE )?>
+					<?php $registration->e_pretty_status(TRUE)?>
 				</td>
 			</tr>
-            <?php  do_action( 'AHEE__thank_you_page_registration_details_template__after_registration_table_row', $registration ); ?>
+            <?php  do_action('AHEE__thank_you_page_registration_details_template__after_registration_table_row', $registration); ?>
         <?php
 			$event_name = $registration->event_name();
 
 		}
-		if ( $reg_cntr >= $reg_count ) {
+		if ($reg_cntr >= $reg_count) {
 			?>
 			</tbody>
 			</table>
@@ -82,13 +82,13 @@ 
 	}
 }
 ?>
-<?php if ( $is_primary && $SPCO_attendee_information_url ) { ?>
+<?php if ($is_primary && $SPCO_attendee_information_url) { ?>
 	<p class="small-text jst-rght">
 		<a href='<?php echo $SPCO_attendee_information_url?>'><?php _e("Click here to edit All Attendee Information", 'event_espresso'); ?></a>
 	</p>
 <?php } ?>
 
-    <?php  do_action( 'AHEE__thank_you_page_registration_details_template__after_registration_details' ); ?>
+    <?php  do_action('AHEE__thank_you_page_registration_details_template__after_registration_details'); ?>
 
 </div>
 <!-- end of .registration-details -->

payment_methods/Invoice/EE_PMT_Invoice.pm.php

Spacing +26 added lines, -26 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_PMT_Invoice extends EE_PMT_Base{
+class EE_PMT_Invoice extends EE_PMT_Base {
 
 
 
@@ -36,7 +36,7 @@ 
 	 */
 	public function __construct($pm_instance = NULL) {
 		$this->_pretty_name = __("Invoice", 'event_espresso');
-		$this->_default_description = __( 'After clicking "Finalize Registration", you will be given instructions on how to access your invoice and complete your payment.', 'event_espresso' );
+		$this->_default_description = __('After clicking "Finalize Registration", you will be given instructions on how to access your invoice and complete your payment.', 'event_espresso');
 		parent::__construct($pm_instance);
 		$this->_default_button_url = $this->file_url().'lib'.DS.'invoice-logo.png';
 	}
@@ -48,7 +48,7 @@ 
 	 * @param \EE_Transaction $transaction
 	 * @return NULL
 	 */
-	public function generate_new_billing_form( EE_Transaction $transaction = NULL ) {
+	public function generate_new_billing_form(EE_Transaction $transaction = NULL) {
 		return NULL;
 	}
 
@@ -61,53 +61,53 @@ 
 	public function generate_new_settings_form() {
 		$pdf_payee_input_name = 'pdf_payee_name';
 		$confirmation_text_input_name = 'page_confirmation_text';
-		$form =  new EE_Payment_Method_Form(array(
+		$form = new EE_Payment_Method_Form(array(
 //				'payment_method_type' => $this,
 				'extra_meta_inputs'=>array(
 					$pdf_payee_input_name => new EE_Text_Input(array(
-						'html_label_text' => sprintf( __( 'Payee Name %s', 'event_espresso' ), $this->get_help_tab_link())
+						'html_label_text' => sprintf(__('Payee Name %s', 'event_espresso'), $this->get_help_tab_link())
 					)),
 					'pdf_payee_email' => new EE_Email_Input(array(
-						'html_label_text' => sprintf( __( 'Payee Email %s', 'event_espresso' ), $this->get_help_tab_link()),
+						'html_label_text' => sprintf(__('Payee Email %s', 'event_espresso'), $this->get_help_tab_link()),
 					)),
 					'pdf_payee_tax_number' => new EE_Text_Input(array(
-						'html_label_text' => sprintf( __( 'Payee Tax Number %s', 'event_espresso' ), $this->get_help_tab_link()),
+						'html_label_text' => sprintf(__('Payee Tax Number %s', 'event_espresso'), $this->get_help_tab_link()),
 						)),
-					'pdf_payee_address' => new EE_Text_Area_Input( array(
-						'html_label_text' => sprintf( __( 'Payee Address %s', 'event_espresso' ), $this->get_help_tab_link() ),
-						'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+					'pdf_payee_address' => new EE_Text_Area_Input(array(
+						'html_label_text' => sprintf(__('Payee Address %s', 'event_espresso'), $this->get_help_tab_link()),
+						'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
 					)),
 					'pdf_instructions'=>new EE_Text_Area_Input(array(
-						'html_label_text'=>  sprintf(__("Instructions %s", "event_espresso"),  $this->get_help_tab_link()),
+						'html_label_text'=>  sprintf(__("Instructions %s", "event_espresso"), $this->get_help_tab_link()),
 						'default'=>  __("Please send this invoice with payment attached to the address above, or use the payment link below. Payment must be received within 48 hours of event date.", 'event_espresso'),
-						'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+						'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
 					)),
 					'pdf_logo_image'=>new EE_Admin_File_Uploader_Input(array(
-						'html_label_text'=>  sprintf(__("Logo Image %s", "event_espresso"),  $this->get_help_tab_link()),
+						'html_label_text'=>  sprintf(__("Logo Image %s", "event_espresso"), $this->get_help_tab_link()),
 						'default'=>  EE_Config::instance()->organization->logo_url,
 						'html_help_text'=>  __("(Logo for the top left of the invoice)", 'event_espresso'),
 					)),
 					$confirmation_text_input_name =>new EE_Text_Area_Input(array(
-						'html_label_text'=>  sprintf(__("Confirmation Text %s", "event_espresso"),  $this->get_help_tab_link()),
+						'html_label_text'=>  sprintf(__("Confirmation Text %s", "event_espresso"), $this->get_help_tab_link()),
 						'default'=>  __("Payment must be received within 48 hours of event date.  Details about where to send payment is included on the invoice.", 'event_espresso'),
-						'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+						'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
 					)),
 					'page_extra_info'=>new EE_Text_Area_Input(array(
-						'html_label_text'=>  sprintf(__("Extra Info %s", "event_espresso"),  $this->get_help_tab_link()),
-						'validation_strategies' => array( new EE_Full_HTML_Validation_Strategy() ),
+						'html_label_text'=>  sprintf(__("Extra Info %s", "event_espresso"), $this->get_help_tab_link()),
+						'validation_strategies' => array(new EE_Full_HTML_Validation_Strategy()),
 					)),
 				),
 				'include'=>array(
-					'PMD_ID', 'PMD_name','PMD_desc','PMD_admin_name','PMD_admin_desc', 'PMD_type','PMD_slug', 'PMD_open_by_default','PMD_button_url','PMD_scope','Currency','PMD_order',
-					$pdf_payee_input_name, 'pdf_payee_email', 'pdf_payee_tax_number', 'pdf_payee_address', 'pdf_instructions','pdf_logo_image',
+					'PMD_ID', 'PMD_name', 'PMD_desc', 'PMD_admin_name', 'PMD_admin_desc', 'PMD_type', 'PMD_slug', 'PMD_open_by_default', 'PMD_button_url', 'PMD_scope', 'Currency', 'PMD_order',
+					$pdf_payee_input_name, 'pdf_payee_email', 'pdf_payee_tax_number', 'pdf_payee_address', 'pdf_instructions', 'pdf_logo_image',
 					$confirmation_text_input_name, 'page_extra_info'),
 			));
 		$form->add_subsections(
-			array( 'header1' => new EE_Form_Section_HTML_From_Template( 'payment_methods/Invoice/templates/invoice_settings_header_display.template.php' )),
+			array('header1' => new EE_Form_Section_HTML_From_Template('payment_methods/Invoice/templates/invoice_settings_header_display.template.php')),
 			$pdf_payee_input_name
 		);
 		$form->add_subsections(
-			array( 'header2'=>new EE_Form_Section_HTML_From_Template( 'payment_methods/Invoice/templates/invoice_settings_header_gateway.template.php' )),
+			array('header2'=>new EE_Form_Section_HTML_From_Template('payment_methods/Invoice/templates/invoice_settings_header_gateway.template.php')),
 			$confirmation_text_input_name
 		);
 		return $form;
@@ -120,7 +120,7 @@ 
 	 * @see EE_PMT_Base::help_tabs_config()
 	 * @return array
 	 */
-	public function help_tabs_config(){
+	public function help_tabs_config() {
 		return array(
 			$this->get_help_tab_name() => array(
 				'title' => __('Invoice Settings', 'event_espresso'),
@@ -138,17 +138,17 @@ 
 	 * @param \EE_Payment $payment
 	 * @return string
 	 */
-	public function payment_overview_content( EE_Payment $payment ){
+	public function payment_overview_content(EE_Payment $payment) {
 		EE_Registry::instance()->load_helper('Template');
 		return EEH_Template::locate_template(
-			'payment_methods' . DS . 'Invoice'. DS . 'templates'.DS.'invoice_payment_details_content.template.php',
+			'payment_methods'.DS.'Invoice'.DS.'templates'.DS.'invoice_payment_details_content.template.php',
 			array_merge(
 				array(
 					'payment_method'			=> $this->_pm_instance,
 					'payment'						=> $payment,
 					'page_confirmation_text'					=> '',
 					'page_extra_info'	=> '',
-					'invoice_url' 					=> $payment->transaction()->primary_registration()->invoice_url( 'html' )
+					'invoice_url' 					=> $payment->transaction()->primary_registration()->invoice_url('html')
 				),
 				$this->_pm_instance->all_extra_meta_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/interfaces/EEI_Interfaces.php

Indentation +22 added lines, -22 removed lines

@@ -295,23 +295,23 @@ 
 	 * @param float $amount
 	 * @param string $name
 	 * @param string $description
-         * @param string $code 
-         * @param boolean $add_to_existing_line_item if true and a duplicate line item with 
-         *  the same code is found, $amount will be added onto it; otherwise will simply
-         *  set the taxes to match $amount
+	 * @param string $code 
+	 * @param boolean $add_to_existing_line_item if true and a duplicate line item with 
+	 *  the same code is found, $amount will be added onto it; otherwise will simply
+	 *  set the taxes to match $amount
 	 * @return EE_Line_Item the new tax created
 	 */
 	public function set_total_tax_to( EE_Line_Item $total_line_item, $amount, $name  = NULL, $description = NULL, $code = NULL, $add_to_existing_line_item = false );
         
-         /**
-         * Makes all the line items which are children of $line_item taxable (or not).
-         * Does NOT save the line items
-         * @param EE_Line_Item $line_item
-         * @param boolean $taxable
-         * @param string $code_substring_for_whitelist if this string is part of the line item's code
-         *  it will be whitelisted (ie, except from becoming taxable)
-         */
-        public static function set_line_items_taxable( EE_Line_Item $line_item, $taxable = true, $code_substring_for_whitelist = null );
+		 /**
+		  * Makes all the line items which are children of $line_item taxable (or not).
+		  * Does NOT save the line items
+		  * @param EE_Line_Item $line_item
+		  * @param boolean $taxable
+		  * @param string $code_substring_for_whitelist if this string is part of the line item's code
+		  *  it will be whitelisted (ie, except from becoming taxable)
+		  */
+		public static function set_line_items_taxable( EE_Line_Item $line_item, $taxable = true, $code_substring_for_whitelist = null );
 
 	/**
 	 * Adds a simple item ( unrelated to any other model object) to the total line item,
@@ -341,15 +341,15 @@ 
  */
 interface EEHI_Money{
 		/**
-	 * For comparing floats. Default operator is '=', but see the $operator below for all options.
-	 * This should be used to compare floats instead of normal '==' because floats
-	 * are inherently imprecise, and so you can sometimes have two floats that appear to be identical
-	 * but actually differ by 0.00000001.
-	 * @param float $float1
-	 * @param float $float2
-	 * @param string $operator  The operator. Valid options are =, <=, <, >=, >, <>, eq, lt, lte, gt, gte, ne
-	 * @return boolean whether the equation is true or false
-	 */
+		 * For comparing floats. Default operator is '=', but see the $operator below for all options.
+		 * This should be used to compare floats instead of normal '==' because floats
+		 * are inherently imprecise, and so you can sometimes have two floats that appear to be identical
+		 * but actually differ by 0.00000001.
+		 * @param float $float1
+		 * @param float $float2
+		 * @param string $operator  The operator. Valid options are =, <=, <, >=, >, <>, eq, lt, lte, gt, gte, ne
+		 * @return boolean whether the equation is true or false
+		 */
 	function compare_floats( $float1, $float2, $operator='=' );
 }
 

Spacing +21 added lines, -21 removed lines

@@ -5,7 +5,7 @@ 
 /**
  * Interface EEI_Base
  */
-interface EEI_Base{
+interface EEI_Base {
 	/**
 	 * gets the unique ID of the model object. If it hasn't been saved yet
 	 * to the database, this should be 0 or NULL
@@ -32,7 +32,7 @@ 
 	 * @return int records updated (or BOOLEAN if we actually ended up inserting the extra meta row)
 	 * NOTE: if the values haven't changed, returns 0
 	 */
-	public function update_extra_meta($meta_key,$meta_value,$previous_value = NULL);
+	public function update_extra_meta($meta_key, $meta_value, $previous_value = NULL);
 
 	/**
 	 * Adds a new extra meta record. If $unique is set to TRUE, we'll first double-check
@@ -43,7 +43,7 @@ 
 	 * @param boolean $unique
 	 * @return boolean
 	 */
-	public function add_extra_meta($meta_key,$meta_value,$unique = false);
+	public function add_extra_meta($meta_key, $meta_value, $unique = false);
 
 	/**
 	 * Deletes all the extra meta rows for this record as specified by key. If $meta_value
@@ -52,7 +52,7 @@ 
 	 * @param string $meta_value
 	 * @return int number of extra meta rows deleted
 	 */
-	public function delete_extra_meta($meta_key,$meta_value = NULL);
+	public function delete_extra_meta($meta_key, $meta_value = NULL);
 
 	/**
 	 * Gets the extra meta with the given meta key. If you specify "single" we just return 1, otherwise
@@ -63,7 +63,7 @@ 
 	 * @param mixed $default if we don't find anything, what should we return?
 	 * @return mixed single value if $single; array if ! $single
 	 */
-	public function get_extra_meta($meta_key,$single = FALSE,$default = NULL);
+	public function get_extra_meta($meta_key, $single = FALSE, $default = NULL);
 }
 
 
@@ -90,7 +90,7 @@ 
 	 * @param 	EE_Response $response
 	 * @return 	EE_Response
 	 */
-	public function handle_request( EE_Request $request, EE_Response $response );
+	public function handle_request(EE_Request $request, EE_Response $response);
 }
 
 
@@ -106,7 +106,7 @@ 
 	 * @param EE_Request $request
 	 * @param EE_Response $response
 	 */
-	public function handle_response( EE_Request $request, EE_Response $response );
+	public function handle_response(EE_Request $request, EE_Response $response);
 }
 
 
@@ -271,7 +271,7 @@ 
 	 * @param string $country
 	 * @param string $CNT_ISO
 	 */
-	public function format( $address, $address2, $city, $state, $zip, $country, $CNT_ISO );
+	public function format($address, $address2, $city, $state, $zip, $country, $CNT_ISO);
 }
 
 
@@ -281,13 +281,13 @@ 
 /**
  * Interface EEHI_Line_Item
  */
-interface EEHI_Line_Item{
+interface EEHI_Line_Item {
 	/**
 	 * Adds an item to the purchase in the right spot
 	 * @param EE_Line_Item $total_line_item
 	 * @param EE_Line_Item $line_item
 	 */
-	public function add_item( EE_line_Item $total_line_item, EE_Line_Item $line_item );
+	public function add_item(EE_line_Item $total_line_item, EE_Line_Item $line_item);
 	/**
 	 * Overwrites the previous tax by clearing out the old taxes, and creates a new
 	 * tax and updates the total line item accordingly
@@ -301,7 +301,7 @@ 
          *  set the taxes to match $amount
 	 * @return EE_Line_Item the new tax created
 	 */
-	public function set_total_tax_to( EE_Line_Item $total_line_item, $amount, $name  = NULL, $description = NULL, $code = NULL, $add_to_existing_line_item = false );
+	public function set_total_tax_to(EE_Line_Item $total_line_item, $amount, $name = NULL, $description = NULL, $code = NULL, $add_to_existing_line_item = false);
         
          /**
          * Makes all the line items which are children of $line_item taxable (or not).
@@ -311,7 +311,7 @@ 
          * @param string $code_substring_for_whitelist if this string is part of the line item's code
          *  it will be whitelisted (ie, except from becoming taxable)
          */
-        public static function set_line_items_taxable( EE_Line_Item $line_item, $taxable = true, $code_substring_for_whitelist = null );
+        public static function set_line_items_taxable(EE_Line_Item $line_item, $taxable = true, $code_substring_for_whitelist = null);
 
 	/**
 	 * Adds a simple item ( unrelated to any other model object) to the total line item,
@@ -325,21 +325,21 @@ 
 	 * @param boolean $code if set to a value, ensures there is only one line item with that code
 	 * @return boolean success
 	 */
-	public function add_unrelated_item( EE_Line_Item $total_line_item, $name, $unit_price, $description = '', $quantity = 1, $taxable = FALSE, $code = null );
+	public function add_unrelated_item(EE_Line_Item $total_line_item, $name, $unit_price, $description = '', $quantity = 1, $taxable = FALSE, $code = null);
 
 	/**
 	 * Gets the line item for the taxes subtotal
 	 * @param EE_Line_Item $total_line_item of type EEM_Line_Item::type_total
 	 * @return \EE_Line_Item
 	 */
-	public static function get_taxes_subtotal( EE_Line_Item $total_line_item );
+	public static function get_taxes_subtotal(EE_Line_Item $total_line_item);
 }
 
 
 /**
  * Money-related helper
  */
-interface EEHI_Money{
+interface EEHI_Money {
 		/**
 	 * For comparing floats. Default operator is '=', but see the $operator below for all options.
 	 * This should be used to compare floats instead of normal '==' because floats
@@ -350,13 +350,13 @@ 
 	 * @param string $operator  The operator. Valid options are =, <=, <, >=, >, <>, eq, lt, lte, gt, gte, ne
 	 * @return boolean whether the equation is true or false
 	 */
-	function compare_floats( $float1, $float2, $operator='=' );
+	function compare_floats($float1, $float2, $operator = '=');
 }
 
 /**
  * Interface EEHI_Template
  */
-interface EEHI_Template{
+interface EEHI_Template {
 
 	/**
 	 * EEH_Template::format_currency
@@ -369,7 +369,7 @@ 
 	 * @param string   $cur_code_span_class
 	 * @return string the html output for the formatted money value
 	 */
-	public static function format_currency( $amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code' );
+	public static function format_currency($amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code');
 }
 
 
@@ -384,7 +384,7 @@ 
 	 * @param array $options
 	 * @return mixed
 	 */
-	public function display_line_item( EE_Line_Item $line_item, $options = array() );
+	public function display_line_item(EE_Line_Item $line_item, $options = array());
 
 }
 
@@ -396,7 +396,7 @@ 
 	 * @throws EE_Error
 	 * @return bool
 	 */
-	public static function ensure_file_exists_and_is_writable( $full_file_path = '' );
+	public static function ensure_file_exists_and_is_writable($full_file_path = '');
 	
 	/**
 	 * ensure_folder_exists_and_is_writable
@@ -405,7 +405,7 @@ 
 	 * @throws EE_Error
 	 * @return bool
 	 */
-	public static function ensure_folder_exists_and_is_writable( $folder = '' );
+	public static function ensure_folder_exists_and_is_writable($folder = '');
 }
 
 // End of file EEI_Interfaces.php

payment_methods/Paypal_Standard/EE_Paypal_Standard_Form.form.php

Spacing +38 added lines, -38 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -21,37 +21,37 @@ 
 	/**
 	 * @param EE_PMT_Paypal_Standard $payment_method_type
 	 */
-	public function __construct( $payment_method_type ){
+	public function __construct($payment_method_type) {
 		parent::__construct(
 			array(
 				'payment_method_type'          => $payment_method_type,
 				'extra_meta_inputs'            => array(
-					'paypal_id'        => new EE_Text_Input( array(
-						'html_label_text' => sprintf( __( "Paypal Email %s", 'event_espresso' ), $payment_method_type->get_help_tab_link() ),
-						'html_help_text'  => __( "Typically payment@example-domain.com", 'event_espresso' ),
+					'paypal_id'        => new EE_Text_Input(array(
+						'html_label_text' => sprintf(__("Paypal Email %s", 'event_espresso'), $payment_method_type->get_help_tab_link()),
+						'html_help_text'  => __("Typically payment@example-domain.com", 'event_espresso'),
 						'required'        => true
-					) ),
-					'image_url'        => new EE_Admin_File_Uploader_Input( array(
-						'html_help_text'  => __( "Used for your business/personal logo on the PayPal page", 'event_espresso' ),
-						'html_label_text' => __( 'Image URL', 'event_espresso' )
-					) ),
-					'paypal_taxes'     => new EE_Yes_No_Input( array(
-						'html_label_text' => sprintf( __( 'Paypal Calculates Taxes %s', 'event_espresso' ), $payment_method_type->get_help_tab_link() ),
-						'html_help_text'  => __( 'Whether Paypal should add taxes to the order', 'event_espresso' ),
+					)),
+					'image_url'        => new EE_Admin_File_Uploader_Input(array(
+						'html_help_text'  => __("Used for your business/personal logo on the PayPal page", 'event_espresso'),
+						'html_label_text' => __('Image URL', 'event_espresso')
+					)),
+					'paypal_taxes'     => new EE_Yes_No_Input(array(
+						'html_label_text' => sprintf(__('Paypal Calculates Taxes %s', 'event_espresso'), $payment_method_type->get_help_tab_link()),
+						'html_help_text'  => __('Whether Paypal should add taxes to the order', 'event_espresso'),
 						'default'         => false
-					) ),
-					'paypal_shipping'  => new EE_Yes_No_Input( array(
-						'html_label_text' => sprintf( __( 'Paypal Calculates Shipping %s', 'event_espresso' ), $payment_method_type->get_help_tab_link() ),
-						'html_help_text'  => __( 'Whether Paypal should add shipping surcharges', 'event_espresso' ),
+					)),
+					'paypal_shipping'  => new EE_Yes_No_Input(array(
+						'html_label_text' => sprintf(__('Paypal Calculates Shipping %s', 'event_espresso'), $payment_method_type->get_help_tab_link()),
+						'html_help_text'  => __('Whether Paypal should add shipping surcharges', 'event_espresso'),
 						'default'         => false
-					) ),
-					'shipping_details' => new EE_Select_Input( array(
-						EE_PMT_Paypal_Standard::shipping_info_none     => __( "Do not prompt for an address", 'event_espresso' ),
-						EE_PMT_Paypal_Standard::shipping_info_optional => __( "Prompt for an address, but do not require it", 'event_espresso' ),
-						EE_PMT_Paypal_Standard::shipping_info_required => __( "Prompt for an address, and require it", 'event_espresso' )
-					) ),
+					)),
+					'shipping_details' => new EE_Select_Input(array(
+						EE_PMT_Paypal_Standard::shipping_info_none     => __("Do not prompt for an address", 'event_espresso'),
+						EE_PMT_Paypal_Standard::shipping_info_optional => __("Prompt for an address, but do not require it", 'event_espresso'),
+						EE_PMT_Paypal_Standard::shipping_info_required => __("Prompt for an address, and require it", 'event_espresso')
+					)),
 				),
-				'before_form_content_template' => $payment_method_type->file_folder() . DS . 'templates' . DS . 'paypal_standard_settings_before_form.template.php',
+				'before_form_content_template' => $payment_method_type->file_folder().DS.'templates'.DS.'paypal_standard_settings_before_form.template.php',
 			)
 		);
 	}
@@ -61,28 +61,28 @@ 
 	/**
 	 * @param array $req_data
 	 */
-	protected function _normalize( $req_data ) {
-		parent::_normalize( $req_data );
-		$paypal_calculates_shipping = $this->get_input_value( 'paypal_shipping' );
-		$paypal_calculates_taxes = $this->get_input_value( 'paypal_taxes' );
-		$paypal_requests_address_info = $this->get_input_value( 'shipping_details' );
+	protected function _normalize($req_data) {
+		parent::_normalize($req_data);
+		$paypal_calculates_shipping = $this->get_input_value('paypal_shipping');
+		$paypal_calculates_taxes = $this->get_input_value('paypal_taxes');
+		$paypal_requests_address_info = $this->get_input_value('shipping_details');
 		if (
-			( $paypal_calculates_shipping || $paypal_calculates_taxes ) &&
+			($paypal_calculates_shipping || $paypal_calculates_taxes) &&
 			$paypal_requests_address_info == EE_PMT_Paypal_Standard::shipping_info_none
 		) {
 			//they want paypal to calculate taxes or shipping. They need to ask for
 			//address info, otherwise paypal can't calculate taxes or shipping
 			/** @type EE_Select_Input $shipping_details_input */
-			$shipping_details_input = $this->get_input( 'shipping_details' );
-			$shipping_details_input->set_default( EE_PMT_Paypal_Standard::shipping_info_optional );
+			$shipping_details_input = $this->get_input('shipping_details');
+			$shipping_details_input->set_default(EE_PMT_Paypal_Standard::shipping_info_optional);
 			$shipping_details_input_options = $shipping_details_input->options();
 			EE_Error::add_attention(
 				sprintf(
-					__( 'Automatically set "%s" to "%s" because Paypal requires address info in order to calculate shipping or taxes.', 'event_espresso' ),
-					strip_tags( $shipping_details_input->html_label_text() ),
-					isset( $shipping_details_input_options[ EE_PMT_Paypal_Standard::shipping_info_optional ] )
-						? $shipping_details_input_options[ EE_PMT_Paypal_Standard::shipping_info_optional ]
-						: __( 'Unknown', 'event_espresso' )
+					__('Automatically set "%s" to "%s" because Paypal requires address info in order to calculate shipping or taxes.', 'event_espresso'),
+					strip_tags($shipping_details_input->html_label_text()),
+					isset($shipping_details_input_options[EE_PMT_Paypal_Standard::shipping_info_optional])
+						? $shipping_details_input_options[EE_PMT_Paypal_Standard::shipping_info_optional]
+						: __('Unknown', 'event_espresso')
 				),
 				__FILE__, __FUNCTION__, __LINE__
 			);

payment_methods/Paypal_Standard/EEG_Paypal_Standard.gateway.php

Braces +4 added lines, -3 removed lines

@@ -77,7 +77,7 @@ 
 		parent::set_settings($settings_array);
 		if($this->_debug_mode){
 			$this->_gateway_url = 'https://www.sandbox.paypal.com/cgi-bin/webscr';
-		}else{
+		} else{
 			$this->_gateway_url = 'https://www.paypal.com/cgi-bin/webscr';
 		}
 	}
@@ -340,8 +340,9 @@ 
 		$update_info = array();
 		foreach ( $raw_post_array as $keyval ) {
 			$keyval = explode( '=', $keyval );
-			if ( count( $keyval ) == 2 )
-				$update_info[ $keyval[ 0 ] ] = urldecode( $keyval[ 1 ] );
+			if ( count( $keyval ) == 2 ) {
+							$update_info[ $keyval[ 0 ] ] = urldecode( $keyval[ 1 ] );
+			}
 		}
 		// read the IPN message sent from PayPal and prepend 'cmd=_notify-validate'
 		$req = 'cmd=_notify-validate';

Indentation +10 added lines, -10 removed lines

@@ -456,16 +456,16 @@
 
 		//might paypal have changed the taxes?
 		if( $this->_paypal_taxes && $payment_was_itemized ){
-                    //note that we're doing this BEFORE adding shipping; we actually want PayPal's shipping to remain non-taxable
-                    $this->_line_item->set_line_items_taxable( $transaction->total_line_item(), true, 'paypal_shipping' );
-                    $this->_line_item->set_total_tax_to(
-                            $transaction->total_line_item(),
-                            floatval( $update_info['tax'] ),
-                            __( 'Taxes', 'event_espresso' ),
-                            __( 'Calculated by Paypal', 'event_espresso' ),
-                            'paypal_tax'
-                    );
-                    $grand_total_needs_resaving = TRUE;
+					//note that we're doing this BEFORE adding shipping; we actually want PayPal's shipping to remain non-taxable
+					$this->_line_item->set_line_items_taxable( $transaction->total_line_item(), true, 'paypal_shipping' );
+					$this->_line_item->set_total_tax_to(
+							$transaction->total_line_item(),
+							floatval( $update_info['tax'] ),
+							__( 'Taxes', 'event_espresso' ),
+							__( 'Calculated by Paypal', 'event_espresso' ),
+							'paypal_tax'
+					);
+					$grand_total_needs_resaving = TRUE;
 		}
 
 		$shipping_amount = floatval( $update_info[ 'mc_shipping' ] );

Spacing +122 added lines, -122 removed lines

@@ -68,7 +68,7 @@ 
 	 * @return EEG_Paypal_Standard
 	 */
 	public function __construct() {
-		$this->set_uses_separate_IPN_request( true ) ;
+		$this->set_uses_separate_IPN_request(true);
 		parent::__construct();
 	}
 
@@ -78,11 +78,11 @@ 
 	 * Also sets the gateway url class variable based on whether debug mode is enabled or not
 	 * @param array $settings_array
 	 */
-	public function set_settings($settings_array){
+	public function set_settings($settings_array) {
 		parent::set_settings($settings_array);
-		if($this->_debug_mode){
+		if ($this->_debug_mode) {
 			$this->_gateway_url = 'https://www.sandbox.paypal.com/cgi-bin/webscr';
-		}else{
+		} else {
 			$this->_gateway_url = 'https://www.paypal.com/cgi-bin/webscr';
 		}
 	}
@@ -97,7 +97,7 @@ 
 	 * @param string      $cancel_url   URL to send the user to after a cancelled payment attempt on teh payment provider's website
 	 * @return EEI_Payment
 	 */
-	public function set_redirection_info( $payment, $billing_info = array(), $return_url = NULL, $notify_url = NULL, $cancel_url = NULL ){
+	public function set_redirection_info($payment, $billing_info = array(), $return_url = NULL, $notify_url = NULL, $cancel_url = NULL) {
 		$redirect_args = array();
 		$transaction = $payment->transaction();
 		$primary_registrant = $transaction->primary_registration();
@@ -107,42 +107,42 @@ 
 
 		$total_discounts_to_cart_total = $transaction->paid();
 		//only itemize the order if we're paying for the rest of the order's amount
-		if( $payment->amount() == $transaction->total() ) {
-			$payment->update_extra_meta( EEG_Paypal_Standard::itemized_payment_option_name, true );
+		if ($payment->amount() == $transaction->total()) {
+			$payment->update_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, true);
 			//this payment is for the remaining transaction amount,
 			//keep track of exactly how much the itemized order amount equals
 			$itemized_sum = 0;
 			$shipping_previously_added = 0;
 			//so let's show all the line items
-			foreach($total_line_item->get_items() as $line_item){
-				if ( $line_item instanceof EE_Line_Item ) {
+			foreach ($total_line_item->get_items() as $line_item) {
+				if ($line_item instanceof EE_Line_Item) {
 					//it's some kind of discount
-					if( $line_item->total() < 0 ) {
-						$total_discounts_to_cart_total += abs( $line_item->total() );
+					if ($line_item->total() < 0) {
+						$total_discounts_to_cart_total += abs($line_item->total());
 						$itemized_sum += $line_item->total();
 						continue;
 					}
 					//dont include shipping again.
-					if( strpos( $line_item->code(), 'paypal_shipping_') === 0 ) {
+					if (strpos($line_item->code(), 'paypal_shipping_') === 0) {
 						$shipping_previously_added = $line_item->total();
 						continue;
 					}
-					$redirect_args[ 'item_name_' . $item_num ] = substr(
-						sprintf( _x( '%1$s for %2$s', 'Ticket for Event', 'event_espresso' ), $line_item->name(), $line_item->ticket_event_name() ),
+					$redirect_args['item_name_'.$item_num] = substr(
+						sprintf(_x('%1$s for %2$s', 'Ticket for Event', 'event_espresso'), $line_item->name(), $line_item->ticket_event_name()),
 						0, 127
 					);
-					$redirect_args[ 'amount_' . $item_num ] = $line_item->unit_price();
-					$redirect_args[ 'quantity_' . $item_num ] = $line_item->quantity();
+					$redirect_args['amount_'.$item_num] = $line_item->unit_price();
+					$redirect_args['quantity_'.$item_num] = $line_item->quantity();
 					//if we're not letting PayPal calculate shipping, tell them its 0
-					if ( ! $this->_paypal_shipping ) {
-						$redirect_args[ 'shipping_' . $item_num ] = '0';
-						$redirect_args[ 'shipping2_' . $item_num ] = '0';
+					if ( ! $this->_paypal_shipping) {
+						$redirect_args['shipping_'.$item_num] = '0';
+						$redirect_args['shipping2_'.$item_num] = '0';
 					}
 					$item_num++;
 					$itemized_sum += $line_item->total();
 				}
 			}
-			$taxes_li = $this->_line_item->get_taxes_subtotal( $total_line_item );
+			$taxes_li = $this->_line_item->get_taxes_subtotal($total_line_item);
 			//ideally itemized sum equals the transaction total. but if not (which is weird)
 			//and the itemized sum is LESS than the transaction total
 			//add another line item
@@ -152,47 +152,47 @@ 
 					$transaction->total() - $itemized_sum - $taxes_li->total() - $shipping_previously_added,
 					2 
 				);
-			if( $itemized_sum_diff_from_txn_total < 0 ) {
+			if ($itemized_sum_diff_from_txn_total < 0) {
 				//itemized sum is too big
-				$total_discounts_to_cart_total += abs( $itemized_sum_diff_from_txn_total );
-			} elseif( $itemized_sum_diff_from_txn_total > 0 ) {
-				$redirect_args[ 'item_name_' . $item_num ] = substr(
-						__( 'Other charges', 'event_espresso' ), 0, 127 );
-				$redirect_args[ 'amount_' . $item_num ] = $this->format_currency( $itemized_sum_diff_from_txn_total );
-				$redirect_args[ 'quantity_' . $item_num ] = 1;
+				$total_discounts_to_cart_total += abs($itemized_sum_diff_from_txn_total);
+			} elseif ($itemized_sum_diff_from_txn_total > 0) {
+				$redirect_args['item_name_'.$item_num] = substr(
+						__('Other charges', 'event_espresso'), 0, 127 );
+				$redirect_args['amount_'.$item_num] = $this->format_currency($itemized_sum_diff_from_txn_total);
+				$redirect_args['quantity_'.$item_num] = 1;
 				$item_num++;
 			}
-			if( $total_discounts_to_cart_total > 0 ) {
-				$redirect_args[ 'discount_amount_cart' ] = $this->format_currency( $total_discounts_to_cart_total );
+			if ($total_discounts_to_cart_total > 0) {
+				$redirect_args['discount_amount_cart'] = $this->format_currency($total_discounts_to_cart_total);
 			}
 			//add our taxes to the order if we're NOT using PayPal's
-			if( ! $this->_paypal_taxes ){
+			if ( ! $this->_paypal_taxes) {
 				$redirect_args['tax_cart'] = $total_line_item->get_total_tax();
 			}
 		} else {
-			$payment->update_extra_meta( EEG_Paypal_Standard::itemized_payment_option_name, false );
+			$payment->update_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, false);
 			//partial payment that's not for the remaining amount, so we can't send an itemized list
-			$redirect_args['item_name_' . $item_num] = substr(
-				sprintf( __('Payment of %1$s for %2$s', "event_espresso"), $payment->amount(), $primary_registrant->reg_code() ),
+			$redirect_args['item_name_'.$item_num] = substr(
+				sprintf(__('Payment of %1$s for %2$s', "event_espresso"), $payment->amount(), $primary_registrant->reg_code()),
 				0, 127
 			);
-			$redirect_args['amount_' . $item_num] = $payment->amount();
-			$redirect_args['shipping_' . $item_num ] = '0';
-			$redirect_args['shipping2_' . $item_num ] = '0';
+			$redirect_args['amount_'.$item_num] = $payment->amount();
+			$redirect_args['shipping_'.$item_num] = '0';
+			$redirect_args['shipping2_'.$item_num] = '0';
 			$redirect_args['tax_cart'] = '0';
 			$item_num++;
 		}
 
-		if($this->_debug_mode){
-			$redirect_args['item_name_' . $item_num] = 'DEBUG INFO (this item only added in sandbox mode';
-			$redirect_args['amount_' . $item_num] = 0;
+		if ($this->_debug_mode) {
+			$redirect_args['item_name_'.$item_num] = 'DEBUG INFO (this item only added in sandbox mode';
+			$redirect_args['amount_'.$item_num] = 0;
 			$redirect_args['on0_'.$item_num] = 'NOTIFY URL';
-			$redirect_args['os0_' . $item_num] = $notify_url;
+			$redirect_args['os0_'.$item_num] = $notify_url;
 			$redirect_args['on1_'.$item_num] = 'RETURN URL';
-			$redirect_args['os1_' . $item_num] = $return_url;
+			$redirect_args['os1_'.$item_num] = $return_url;
 //			$redirect_args['option_index_' . $item_num] = 1; // <-- dunno if this is needed ?
-			$redirect_args['shipping_' . $item_num ] = '0';
-			$redirect_args['shipping2_' . $item_num ] = '0';
+			$redirect_args['shipping_'.$item_num] = '0';
+			$redirect_args['shipping2_'.$item_num] = '0';
 		}
 
 		$redirect_args['business'] = $this->_paypal_id;
@@ -202,14 +202,14 @@ 
 		$redirect_args['cmd'] = '_cart';
 		$redirect_args['upload'] = 1;
 		$redirect_args['currency_code'] = $payment->currency_code();
-		$redirect_args['rm'] = 2;//makes the user return with method=POST
-		if($this->_image_url){
+		$redirect_args['rm'] = 2; //makes the user return with method=POST
+		if ($this->_image_url) {
 			$redirect_args['image_url'] = $this->_image_url;
 		}
 		$redirect_args['no_shipping'] = $this->_shipping_details;
-		$redirect_args['bn'] = 'EventEspresso_SP';//EE will blow up if you change this
+		$redirect_args['bn'] = 'EventEspresso_SP'; //EE will blow up if you change this
 
-		$redirect_args = apply_filters( "FHEE__EEG_Paypal_Standard__set_redirection_info__arguments", $redirect_args, $this );
+		$redirect_args = apply_filters("FHEE__EEG_Paypal_Standard__set_redirection_info__arguments", $redirect_args, $this);
 
 		$payment->set_redirect_url($this->_gateway_url);
 		$payment->set_redirect_args($redirect_args);
@@ -230,55 +230,55 @@ 
 	 * @return \EEI_Payment updated
 	 * @throws \EE_Error
 	 */
-	public function handle_payment_update( $update_info, $transaction ){
+	public function handle_payment_update($update_info, $transaction) {
 		//verify there's payment data that's been sent
-		if ( empty( $update_info[ 'payment_status' ] ) || empty( $update_info[ 'txn_id' ] ) ) {
+		if (empty($update_info['payment_status']) || empty($update_info['txn_id'])) {
 			// waaaait... is this a PDT request? (see https://developer.paypal.com/docs/classic/products/payment-data-transfer/)
 			// indicated by the "tx" argument? If so, we don't need it. We'll just use the IPN data when it comes
-			if ( isset( $update_info[ 'tx' ] ) ) {
+			if (isset($update_info['tx'])) {
 				return $transaction->last_payment();
 			} else {
 				return null;
 			}
 		}
-		$payment = $this->_pay_model->get_payment_by_txn_id_chq_nmbr( $update_info[ 'txn_id' ] );
-		if ( ! $payment instanceof EEI_Payment ) {
+		$payment = $this->_pay_model->get_payment_by_txn_id_chq_nmbr($update_info['txn_id']);
+		if ( ! $payment instanceof EEI_Payment) {
 			$payment = $transaction->last_payment();
 		}
 		// ok, then validate the IPN. Even if we've already processed this payment,
 		// let PayPal know we don't want to hear from them anymore!
-		if ( ! $this->validate_ipn( $update_info, $payment ) ) {
+		if ( ! $this->validate_ipn($update_info, $payment)) {
 			return $payment;
 		}
 		//ok, well let's process this payment then!
-		switch ( $update_info[ 'payment_status' ] ) {
+		switch ($update_info['payment_status']) {
 
 			case 'Completed' :
 				$status = $this->_pay_model->approved_status();
-				$gateway_response = __( 'The payment is approved.', 'event_espresso' );
+				$gateway_response = __('The payment is approved.', 'event_espresso');
 				break;
 
 			case 'Pending' :
 				$status = $this->_pay_model->pending_status();
-				$gateway_response = __( 'The payment is in progress. Another message will be sent when payment is approved.', 'event_espresso' );
+				$gateway_response = __('The payment is in progress. Another message will be sent when payment is approved.', 'event_espresso');
 				break;
 
 			case 'Denied' :
 				$status = $this->_pay_model->declined_status();
-				$gateway_response = __( 'The payment has been declined.', 'event_espresso' );
+				$gateway_response = __('The payment has been declined.', 'event_espresso');
 				break;
 
 			case 'Expired' :
 			case 'Failed' :
 				$status = $this->_pay_model->failed_status();
-				$gateway_response = __( 'The payment failed for technical reasons or expired.', 'event_espresso' );
+				$gateway_response = __('The payment failed for technical reasons or expired.', 'event_espresso');
 				break;
 
 			case 'Refunded' :
 			case 'Partially_Refunded' :
 				// even though it's a refund, we consider the payment as approved, it just has a negative value
 				$status = $this->_pay_model->approved_status();
-				$gateway_response = __( 'The payment has been refunded. Please update registrations accordingly.', 'event_espresso' );
+				$gateway_response = __('The payment has been refunded. Please update registrations accordingly.', 'event_espresso');
 				break;
 
 			case 'Voided' :
@@ -286,25 +286,25 @@ 
 			case 'Canceled_Reversal' :
 			default :
 				$status = $this->_pay_model->cancelled_status();
-				$gateway_response = __( 'The payment was cancelled, reversed, or voided. Please update registrations accordingly.', 'event_espresso' );
+				$gateway_response = __('The payment was cancelled, reversed, or voided. Please update registrations accordingly.', 'event_espresso');
 				break;
 
 		}
 
 		//check if we've already processed this payment
-		if ( $payment instanceof EEI_Payment ) {
+		if ($payment instanceof EEI_Payment) {
 			//payment exists. if this has the exact same status and amount, don't bother updating. just return
-			if ( $payment->status() == $status && $payment->amount() == $update_info[ 'mc_gross' ] ) {
+			if ($payment->status() == $status && $payment->amount() == $update_info['mc_gross']) {
 				// DUPLICATED IPN! dont bother updating transaction foo!;
-				$message_log = sprintf( __( 'It appears we have received a duplicate IPN from PayPal for payment %d', 'event_espresso' ), $payment->ID() );
+				$message_log = sprintf(__('It appears we have received a duplicate IPN from PayPal for payment %d', 'event_espresso'), $payment->ID());
 			} else {
 				// new payment yippee !!!
-				$payment->set_status( $status );
-				$payment->set_amount( floatval( $update_info[ 'mc_gross' ] ) );
-				$payment->set_gateway_response( $gateway_response );
-				$payment->set_details( $update_info );
-				$payment->set_txn_id_chq_nmbr( $update_info[ 'txn_id' ] );
-				$message_log = sprintf( __( 'Updated payment either from IPN or as part of POST from PayPal', 'event_espresso' ) );
+				$payment->set_status($status);
+				$payment->set_amount(floatval($update_info['mc_gross']));
+				$payment->set_gateway_response($gateway_response);
+				$payment->set_details($update_info);
+				$payment->set_txn_id_chq_nmbr($update_info['txn_id']);
+				$message_log = sprintf(__('Updated payment either from IPN or as part of POST from PayPal', 'event_espresso'));
 			}
 			$this->log(
 				array(
@@ -316,11 +316,11 @@ 
 				$payment
 			);
 		}
-		do_action( 'FHEE__EEG_Paypal_Standard__handle_payment_update__payment_processed', $payment, $this );
+		do_action('FHEE__EEG_Paypal_Standard__handle_payment_update__payment_processed', $payment, $this);
 		// kill request here if this is a refund
-		if ( $update_info[ 'payment_status' ] == 'Refunded' || $update_info[ 'payment_status' ] == 'Partially_Refunded'   ) {
-			if ( apply_filters( 'FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true ) ) {
-				status_header( 200 );
+		if ($update_info['payment_status'] == 'Refunded' || $update_info['payment_status'] == 'Partially_Refunded') {
+			if (apply_filters('FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true)) {
+				status_header(200);
 				exit();
 			}
 		}
@@ -336,9 +336,9 @@ 
 	 * @param EE_Payment|EEI_Payment $payment
 	 * @return boolean
 	 */
-	public function validate_ipn( $update_info, $payment ) {
+	public function validate_ipn($update_info, $payment) {
 		//allow us to skip validating IPNs with PayPal (useful for testing)
-		if ( apply_filters( 'FHEE__EEG_Paypal_Standard__validate_ipn__skip', false ) ) {
+		if (apply_filters('FHEE__EEG_Paypal_Standard__validate_ipn__skip', false)) {
 			return true;
 		}
 		//...otherwise, we actually don't care what the $update_info is, we need to look
@@ -346,22 +346,22 @@ 
 		// Reading POSTed data directly from $_POST causes serialization issues with array data in the POST.
 		// Instead, read raw POST data from the input stream.
 		// @see https://gist.github.com/xcommerce-gists/3440401
-		$raw_post_data = file_get_contents( 'php://input' );
-		$raw_post_array = explode( '&', $raw_post_data );
+		$raw_post_data = file_get_contents('php://input');
+		$raw_post_array = explode('&', $raw_post_data);
 		$update_info = array();
-		foreach ( $raw_post_array as $keyval ) {
-			$keyval = explode( '=', $keyval );
-			if ( count( $keyval ) == 2 )
-				$update_info[ $keyval[ 0 ] ] = urldecode( $keyval[ 1 ] );
+		foreach ($raw_post_array as $keyval) {
+			$keyval = explode('=', $keyval);
+			if (count($keyval) == 2)
+				$update_info[$keyval[0]] = urldecode($keyval[1]);
 		}
 		// read the IPN message sent from PayPal and prepend 'cmd=_notify-validate'
 		$req = 'cmd=_notify-validate';
-		$get_magic_quotes_exists = function_exists( 'get_magic_quotes_gpc' ) ? true : false;
-		foreach ( $update_info as $key => $value ) {
-			if ( $get_magic_quotes_exists && get_magic_quotes_gpc() == 1 ) {
-				$value = urlencode( stripslashes( $value ) );
+		$get_magic_quotes_exists = function_exists('get_magic_quotes_gpc') ? true : false;
+		foreach ($update_info as $key => $value) {
+			if ($get_magic_quotes_exists && get_magic_quotes_gpc() == 1) {
+				$value = urlencode(stripslashes($value));
 			} else {
-				$value = urlencode( $value );
+				$value = urlencode($value);
 			}
 			$req .= "&$key=$value";
 		}
@@ -371,34 +371,34 @@ 
 			array(
 				'body' 				=> $req,
 				'sslverify' 		=> false,
-				'timeout' 		=> 60 ,
+				'timeout' 		=> 60,
 				// make sure to set a site specific unique "user-agent" string since the WordPres default gets declined by PayPal
 				// plz see: https://github.com/websharks/s2member/issues/610
-				'user-agent' 	=> 'Event Espresso v' . EVENT_ESPRESSO_VERSION . '; ' . home_url(),
+				'user-agent' 	=> 'Event Espresso v'.EVENT_ESPRESSO_VERSION.'; '.home_url(),
 				'httpversion' => '1.1'
 			)
 		);
 		// then check the response
-		if ( ! is_wp_error( $response ) && array_key_exists( 'body', $response ) && strcmp( $response[ 'body' ], "VERIFIED" ) == 0 ) {
+		if ( ! is_wp_error($response) && array_key_exists('body', $response) && strcmp($response['body'], "VERIFIED") == 0) {
 			return true;
 		} else {
 			// huh, something's wack... the IPN didn't validate. We must have replied to the IPN incorrectly,
 			// or their API must have changed: http://www.paypalobjects.com/en_US/ebook/PP_OrderManagement_IntegrationGuide/ipn.html
-			if( is_wp_error(  $response ) ) {
+			if (is_wp_error($response)) {
 				$error_msg = sprintf( 
-					__( 'WP Error. Code: "%1$s", Message: "%2$s", Data: "%3$s"', 'event_espresso' ),
+					__('WP Error. Code: "%1$s", Message: "%2$s", Data: "%3$s"', 'event_espresso'),
 					$response->get_error_code(),
 					$response->get_error_message(),
-					print_r( $response->get_error_data, true )
+					print_r($response->get_error_data, true)
 				);
-			} elseif( is_array( $response ) && isset( $response[ 'body' ] ) ) {
-				$error_msg = $response[ 'body' ];
+			} elseif (is_array($response) && isset($response['body'])) {
+				$error_msg = $response['body'];
 			} else {
-				$error_msg = print_r( $response, true );
+				$error_msg = print_r($response, true);
 			}
-			$payment->set_gateway_response( sprintf( __( "IPN Validation failed! Paypal responded with '%s'", "event_espresso" ), $error_msg ) );
-			$payment->set_details( array( 'REQUEST' => $update_info, 'VALIDATION_RESPONSE' => $response ) );
-			$payment->set_status( EEM_Payment::status_id_failed );
+			$payment->set_gateway_response(sprintf(__("IPN Validation failed! Paypal responded with '%s'", "event_espresso"), $error_msg));
+			$payment->set_details(array('REQUEST' => $update_info, 'VALIDATION_RESPONSE' => $response));
+			$payment->set_status(EEM_Payment::status_id_failed);
 			// log the results
 			$this->log(
 				array(
@@ -420,9 +420,9 @@ 
 	 */
 	protected function _process_response_url() {
 		EE_Registry::instance()->load_helper('URL');
-		if ( isset( $_SERVER[ 'HTTP_HOST' ], $_SERVER[ 'REQUEST_URI' ] ) ) {
+		if (isset($_SERVER['HTTP_HOST'], $_SERVER['REQUEST_URI'])) {
 			$url = is_ssl() ? 'https://' : 'http://';
-			$url .= EEH_URL::filter_input_server_url( 'HTTP_HOST' );
+			$url .= EEH_URL::filter_input_server_url('HTTP_HOST');
 			$url .= EEH_URL::filter_input_server_url();
 		} else {
 			$url = 'unknown';
@@ -438,30 +438,30 @@ 
 	 * like the taxes or shipping
 	 * @param EEI_Payment $payment
 	 */
-	public function update_txn_based_on_payment( $payment ) {
+	public function update_txn_based_on_payment($payment) {
 		$update_info = $payment->details();
 		$transaction = $payment->transaction();
-		$payment_was_itemized = $payment->get_extra_meta( EEG_Paypal_Standard::itemized_payment_option_name, true, false );
-		if( ! $transaction ){
-			$this->log( __( 'Payment with ID %d has no related transaction, and so update_txn_based_on_payment couldn\'t be executed properly', 'event_espresso' ), $payment );
+		$payment_was_itemized = $payment->get_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, true, false);
+		if ( ! $transaction) {
+			$this->log(__('Payment with ID %d has no related transaction, and so update_txn_based_on_payment couldn\'t be executed properly', 'event_espresso'), $payment);
 			return;
 		}
-		if( ! is_array( $update_info ) || ! isset( $update_info[ 'mc_shipping' ] ) || ! isset( $update_info[ 'tax' ] ) ) {
+		if ( ! is_array($update_info) || ! isset($update_info['mc_shipping']) || ! isset($update_info['tax'])) {
 			$this->log(
 				array(
 					'url' 				=> $this->_process_response_url(),
-					'message' 	=> __( 'Could not update transaction based on payment because the payment details have not yet been put on the payment. This normally happens during the IPN or returning from PayPal', 'event_espresso' ),
+					'message' 	=> __('Could not update transaction based on payment because the payment details have not yet been put on the payment. This normally happens during the IPN or returning from PayPal', 'event_espresso'),
 					'payment' 	=> $payment->model_field_array()
 				),
 				$payment
 			);
 			return;
 		}
-		if( $payment->status() !== $this->_pay_model->approved_status() ) {
+		if ($payment->status() !== $this->_pay_model->approved_status()) {
 			$this->log(
 				array(
 					'url' 				=> $this->_process_response_url(),
-					'message' 	=> __( 'We shouldn\'t update transactions taxes or shipping data from non-approved payments', 'event_espresso' ),
+					'message' 	=> __('We shouldn\'t update transactions taxes or shipping data from non-approved payments', 'event_espresso'),
 					'payment' 	=> $payment->model_field_array()
 				),
 				$payment
@@ -471,43 +471,43 @@ 
 		$grand_total_needs_resaving = false;
 
 		//might paypal have changed the taxes?
-		if( $this->_paypal_taxes && $payment_was_itemized ){
+		if ($this->_paypal_taxes && $payment_was_itemized) {
                     //note that we're doing this BEFORE adding shipping; we actually want PayPal's shipping to remain non-taxable
-                    $this->_line_item->set_line_items_taxable( $transaction->total_line_item(), true, 'paypal_shipping' );
+                    $this->_line_item->set_line_items_taxable($transaction->total_line_item(), true, 'paypal_shipping');
                     $this->_line_item->set_total_tax_to(
                             $transaction->total_line_item(),
-                            floatval( $update_info['tax'] ),
-                            __( 'Taxes', 'event_espresso' ),
-                            __( 'Calculated by Paypal', 'event_espresso' ),
+                            floatval($update_info['tax']),
+                            __('Taxes', 'event_espresso'),
+                            __('Calculated by Paypal', 'event_espresso'),
                             'paypal_tax'
                     );
                     $grand_total_needs_resaving = TRUE;
 		}
 
-		$shipping_amount = floatval( $update_info[ 'mc_shipping' ] );
+		$shipping_amount = floatval($update_info['mc_shipping']);
 		//might paypal have added shipping?
-		if( $this->_paypal_shipping && $shipping_amount && $payment_was_itemized ){
+		if ($this->_paypal_shipping && $shipping_amount && $payment_was_itemized) {
 			$this->_line_item->add_unrelated_item(
 				$transaction->total_line_item(),
-				sprintf( __('Shipping for transaction %1$s', 'event_espresso'), $transaction->ID() ),
+				sprintf(__('Shipping for transaction %1$s', 'event_espresso'), $transaction->ID()),
 				$shipping_amount,
 				__('Shipping charges calculated by Paypal', 'event_espresso'),
 				1,
 				false,
-				'paypal_shipping_' . $transaction->ID()
+				'paypal_shipping_'.$transaction->ID()
 			);
 			$grand_total_needs_resaving = true;
 		}
 
-		if( $grand_total_needs_resaving ){
-			$transaction->total_line_item()->save_this_and_descendants_to_txn( $transaction->ID() );
-			$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
-			$registration_processor->update_registration_final_prices( $transaction );
+		if ($grand_total_needs_resaving) {
+			$transaction->total_line_item()->save_this_and_descendants_to_txn($transaction->ID());
+			$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
+			$registration_processor->update_registration_final_prices($transaction);
 		}
 		$this->log(
 			array(
 				'url' 													=> $this->_process_response_url(),
-				'message' 										=> __( 'Updated transaction related to payment', 'event_espresso' ),
+				'message' 										=> __('Updated transaction related to payment', 'event_espresso'),
 				'transaction (updated)' 					=> $transaction->model_field_array(),
 				'payment (updated)' 						=> $payment->model_field_array(),
 				'use_paypal_shipping' 					=> $this->_paypal_shipping,