eventespresso / event-espresso-core

core/helpers/EEH_Line_Item.helper.php

Spacing +346 added lines, -346 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'); }
 /**
  *
  * EEH_Line_Item
@@ -45,8 +45,8 @@ 
 	 * @return boolean success
 	 * @throws \EE_Error
 	 */
-	public static function add_unrelated_item( EE_Line_Item $parent_line_item, $name, $unit_price, $description = '', $quantity = 1, $taxable = FALSE, $code = NULL  ){
-		$items_subtotal = self::get_pre_tax_subtotal( $parent_line_item );
+	public static function add_unrelated_item(EE_Line_Item $parent_line_item, $name, $unit_price, $description = '', $quantity = 1, $taxable = FALSE, $code = NULL) {
+		$items_subtotal = self::get_pre_tax_subtotal($parent_line_item);
 		$line_item = EE_Line_Item::new_instance(array(
 			'LIN_name' => $name,
 			'LIN_desc' => $description,
@@ -54,7 +54,7 @@ 
 			'LIN_quantity' => $quantity,
 			'LIN_percent' => null,
 			'LIN_is_taxable' => $taxable,
-			'LIN_order' => $items_subtotal instanceof EE_Line_Item ? count( $items_subtotal->children() ) : 0,
+			'LIN_order' => $items_subtotal instanceof EE_Line_Item ? count($items_subtotal->children()) : 0,
 			'LIN_total' => (float) $unit_price * (int) $quantity,
 			'LIN_type'=>  EEM_Line_Item::type_line_item,
 			'LIN_code' => $code,
@@ -64,7 +64,7 @@ 
 			$line_item,
 			$parent_line_item
 		);
-		return self::add_item( $parent_line_item, $line_item );
+		return self::add_item($parent_line_item, $line_item);
 	}
 
 
@@ -86,7 +86,7 @@ 
 	 * @return boolean success
 	 * @throws \EE_Error
 	 */
-	public static function add_percentage_based_item( EE_Line_Item $parent_line_item, $name, $percentage_amount, $description = '', $taxable = FALSE ){
+	public static function add_percentage_based_item(EE_Line_Item $parent_line_item, $name, $percentage_amount, $description = '', $taxable = FALSE) {
 		$line_item = EE_Line_Item::new_instance(array(
 			'LIN_name' => $name,
 			'LIN_desc' => $description,
@@ -94,7 +94,7 @@ 
 			'LIN_percent' => $percentage_amount,
 			'LIN_quantity' => NULL,
 			'LIN_is_taxable' => $taxable,
-			'LIN_total' => (float) ( $percentage_amount * ( $parent_line_item->total() / 100 ) ),
+			'LIN_total' => (float) ($percentage_amount * ($parent_line_item->total() / 100)),
 			'LIN_type'=>  EEM_Line_Item::type_line_item,
 			'LIN_parent' => $parent_line_item->ID()
 		));
@@ -102,7 +102,7 @@ 
 			'FHEE__EEH_Line_Item__add_percentage_based_item__line_item',
 			$line_item
 		);
-		return self::add_item( $parent_line_item, $line_item );
+		return self::add_item($parent_line_item, $line_item);
 	}
 
 
@@ -123,15 +123,15 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function add_ticket_purchase( EE_Line_Item $total_line_item, EE_Ticket $ticket, $qty = 1 ){
-		if ( ! $total_line_item instanceof EE_Line_Item || ! $total_line_item->is_total() ) {
-			throw new EE_Error( sprintf( __( 'A valid line item total is required in order to add tickets. A line item of type "%s" was passed.', 'event_espresso' ), $ticket->ID(), $total_line_item->ID() ) );
+	public static function add_ticket_purchase(EE_Line_Item $total_line_item, EE_Ticket $ticket, $qty = 1) {
+		if ( ! $total_line_item instanceof EE_Line_Item || ! $total_line_item->is_total()) {
+			throw new EE_Error(sprintf(__('A valid line item total is required in order to add tickets. A line item of type "%s" was passed.', 'event_espresso'), $ticket->ID(), $total_line_item->ID()));
 		}
 		// either increment the qty for an existing ticket
-		$line_item = self::increment_ticket_qty_if_already_in_cart( $total_line_item, $ticket, $qty );
+		$line_item = self::increment_ticket_qty_if_already_in_cart($total_line_item, $ticket, $qty);
 		// or add a new one
-		if ( ! $line_item instanceof EE_Line_Item ) {
-			$line_item = self::create_ticket_line_item( $total_line_item, $ticket, $qty );
+		if ( ! $line_item instanceof EE_Line_Item) {
+			$line_item = self::create_ticket_line_item($total_line_item, $ticket, $qty);
 		}
 		$total_line_item->recalculate_total_including_taxes();
 		return $line_item;
@@ -147,11 +147,11 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function increment_ticket_qty_if_already_in_cart( EE_Line_Item $total_line_item, EE_Ticket $ticket, $qty = 1 ) {
+	public static function increment_ticket_qty_if_already_in_cart(EE_Line_Item $total_line_item, EE_Ticket $ticket, $qty = 1) {
 		$line_item = null;
-		if ( $total_line_item instanceof EE_Line_Item && $total_line_item->is_total() ) {
-			$ticket_line_items = EEH_Line_Item::get_ticket_line_items( $total_line_item );
-			foreach ( (array)$ticket_line_items as $ticket_line_item ) {
+		if ($total_line_item instanceof EE_Line_Item && $total_line_item->is_total()) {
+			$ticket_line_items = EEH_Line_Item::get_ticket_line_items($total_line_item);
+			foreach ((array) $ticket_line_items as $ticket_line_item) {
 				if (
 					$ticket_line_item instanceof EE_Line_Item
 					&& (int) $ticket_line_item->OBJ_ID() === (int) $ticket->ID()
@@ -161,8 +161,8 @@ 
 				}
 			}
 		}
-		if ( $line_item instanceof EE_Line_Item ) {
-			EEH_Line_Item::increment_quantity( $line_item, $qty );
+		if ($line_item instanceof EE_Line_Item) {
+			EEH_Line_Item::increment_quantity($line_item, $qty);
 			return $line_item;
 		}
 		return null;
@@ -179,16 +179,16 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public static function increment_quantity( EE_Line_Item $line_item, $qty = 1 ) {
-		if( ! $line_item->is_percent() ) {
+	public static function increment_quantity(EE_Line_Item $line_item, $qty = 1) {
+		if ( ! $line_item->is_percent()) {
 			$qty += $line_item->quantity();
-			$line_item->set_quantity( $qty );
-			$line_item->set_total( $line_item->unit_price() * $qty );
+			$line_item->set_quantity($qty);
+			$line_item->set_total($line_item->unit_price() * $qty);
 			$line_item->save();
 		}
-		foreach( $line_item->children() as $child ) {
-			if( $child->is_sub_line_item() ) {
-				EEH_Line_Item::update_quantity( $child, $qty );
+		foreach ($line_item->children() as $child) {
+			if ($child->is_sub_line_item()) {
+				EEH_Line_Item::update_quantity($child, $qty);
 			}
 		}
 	}
@@ -204,17 +204,17 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public static function decrement_quantity( EE_Line_Item $line_item, $qty = 1 ) {
-		if( ! $line_item->is_percent() ) {
+	public static function decrement_quantity(EE_Line_Item $line_item, $qty = 1) {
+		if ( ! $line_item->is_percent()) {
 			$qty = $line_item->quantity() - $qty;
-			$qty = max( $qty, 0 );
-			$line_item->set_quantity( $qty );
-			$line_item->set_total( $line_item->unit_price() * $qty );
+			$qty = max($qty, 0);
+			$line_item->set_quantity($qty);
+			$line_item->set_total($line_item->unit_price() * $qty);
 			$line_item->save();
 		}
-		foreach( $line_item->children() as $child ) {
-			if( $child->is_sub_line_item() ) {
-				EEH_Line_Item::update_quantity( $child, $qty );
+		foreach ($line_item->children() as $child) {
+			if ($child->is_sub_line_item()) {
+				EEH_Line_Item::update_quantity($child, $qty);
 			}
 		}
 	}
@@ -229,15 +229,15 @@ 
 	 * @param int          $new_quantity
 	 * @throws \EE_Error
 	 */
-	public static function update_quantity( EE_Line_Item $line_item, $new_quantity ) {
-		if( ! $line_item->is_percent() ) {
-			$line_item->set_quantity( $new_quantity );
-			$line_item->set_total( $line_item->unit_price() * $new_quantity );
+	public static function update_quantity(EE_Line_Item $line_item, $new_quantity) {
+		if ( ! $line_item->is_percent()) {
+			$line_item->set_quantity($new_quantity);
+			$line_item->set_total($line_item->unit_price() * $new_quantity);
 			$line_item->save();
 		}
-		foreach( $line_item->children() as $child ) {
-			if( $child->is_sub_line_item() ) {
-				EEH_Line_Item::update_quantity( $child, $new_quantity );
+		foreach ($line_item->children() as $child) {
+			if ($child->is_sub_line_item()) {
+				EEH_Line_Item::update_quantity($child, $new_quantity);
 			}
 		}
 	}
@@ -252,43 +252,43 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function create_ticket_line_item( EE_Line_Item $total_line_item, EE_Ticket $ticket, $qty = 1 ) {
+	public static function create_ticket_line_item(EE_Line_Item $total_line_item, EE_Ticket $ticket, $qty = 1) {
 		$datetimes = $ticket->datetimes();
-		$first_datetime = reset( $datetimes );
-		if( $first_datetime instanceof EE_Datetime && $first_datetime->event() instanceof EE_Event ) {
+		$first_datetime = reset($datetimes);
+		if ($first_datetime instanceof EE_Datetime && $first_datetime->event() instanceof EE_Event) {
 			$first_datetime_name = $first_datetime->event()->name();
 		} else {
-			$first_datetime_name = __( 'Event', 'event_espresso' );
+			$first_datetime_name = __('Event', 'event_espresso');
 		}
-		$event = sprintf( _x( '(For %1$s)', '(For Event Name)', 'event_espresso' ), $first_datetime_name );
+		$event = sprintf(_x('(For %1$s)', '(For Event Name)', 'event_espresso'), $first_datetime_name);
 		// get event subtotal line
-		$events_sub_total = self::get_event_line_item_for_ticket( $total_line_item, $ticket );
+		$events_sub_total = self::get_event_line_item_for_ticket($total_line_item, $ticket);
 		// add $ticket to cart
-		$line_item = EE_Line_Item::new_instance( array(
+		$line_item = EE_Line_Item::new_instance(array(
 			'LIN_name'       	=> $ticket->name(),
-			'LIN_desc'       		=> $ticket->description() !== '' ? $ticket->description() . ' ' . $event : $event,
+			'LIN_desc'       		=> $ticket->description() !== '' ? $ticket->description().' '.$event : $event,
 			'LIN_unit_price' 	=> $ticket->price(),
 			'LIN_quantity'   	=> $qty,
 			'LIN_is_taxable' 	=> $ticket->taxable(),
-			'LIN_order'      	=> count( $events_sub_total->children() ),
+			'LIN_order'      	=> count($events_sub_total->children()),
 			'LIN_total'      		=> $ticket->price() * $qty,
 			'LIN_type'       		=> EEM_Line_Item::type_line_item,
 			'OBJ_ID'         		=> $ticket->ID(),
 			'OBJ_type'       	=> 'Ticket'
-		) );
+		));
 		$line_item = apply_filters(
 			'FHEE__EEH_Line_Item__create_ticket_line_item__line_item',
 			$line_item
 		);
-		$events_sub_total->add_child_line_item( $line_item );
+		$events_sub_total->add_child_line_item($line_item);
 		//now add the sub-line items
 		$running_total_for_ticket = 0;
-		foreach ( $ticket->prices( array( 'order_by' => array( 'PRC_order' => 'ASC' ) ) ) as $price ) {
+		foreach ($ticket->prices(array('order_by' => array('PRC_order' => 'ASC'))) as $price) {
 			$sign = $price->is_discount() ? -1 : 1;
 			$price_total = $price->is_percent()
 				? $running_total_for_ticket * $price->amount() / 100
 				: $price->amount() * $qty;
-			$sub_line_item = EE_Line_Item::new_instance( array(
+			$sub_line_item = EE_Line_Item::new_instance(array(
 				'LIN_name'       	=> $price->name(),
 				'LIN_desc'       		=> $price->desc(),
 				'LIN_quantity'   	=> $price->is_percent() ? null : $qty,
@@ -298,18 +298,18 @@ 
 				'LIN_type'       		=> EEM_Line_Item::type_sub_line_item,
 				'OBJ_ID'         		=> $price->ID(),
 				'OBJ_type'       	=> 'Price'
-			) );
+			));
 			$sub_line_item = apply_filters(
 				'FHEE__EEH_Line_Item__create_ticket_line_item__sub_line_item',
 				$sub_line_item
 			);
-			if ( $price->is_percent() ) {
-				$sub_line_item->set_percent( $sign * $price->amount() );
+			if ($price->is_percent()) {
+				$sub_line_item->set_percent($sign * $price->amount());
 			} else {
-				$sub_line_item->set_unit_price( $sign * $price->amount() );
+				$sub_line_item->set_unit_price($sign * $price->amount());
 			}
 			$running_total_for_ticket += $price_total;
-			$line_item->add_child_line_item( $sub_line_item );
+			$line_item->add_child_line_item($sub_line_item);
 		}
 		return $line_item;
 	}
@@ -329,11 +329,11 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public static function add_item( EE_Line_Item $total_line_item, EE_Line_Item $item ){
-		$pre_tax_subtotal = self::get_pre_tax_subtotal( $total_line_item );
-		if ( $pre_tax_subtotal instanceof EE_Line_Item ){
+	public static function add_item(EE_Line_Item $total_line_item, EE_Line_Item $item) {
+		$pre_tax_subtotal = self::get_pre_tax_subtotal($total_line_item);
+		if ($pre_tax_subtotal instanceof EE_Line_Item) {
 			$success = $pre_tax_subtotal->add_child_line_item($item);
-		}else{
+		} else {
 			return FALSE;
 		}
 		$total_line_item->recalculate_total_including_taxes();
@@ -352,34 +352,34 @@ 
 	 * @return bool success
 	 * @throws \EE_Error
 	 */
-	public static function cancel_ticket_line_item( EE_Line_Item $ticket_line_item, $qty = 1 ) {
+	public static function cancel_ticket_line_item(EE_Line_Item $ticket_line_item, $qty = 1) {
 		// validate incoming line_item
-		if ( $ticket_line_item->OBJ_type() !== 'Ticket' ) {
+		if ($ticket_line_item->OBJ_type() !== 'Ticket') {
 			throw new EE_Error(
 				sprintf(
-					__( 'The supplied line item must have an Object Type of "Ticket", not %1$s.', 'event_espresso' ),
+					__('The supplied line item must have an Object Type of "Ticket", not %1$s.', 'event_espresso'),
 					$ticket_line_item->type()
 				)
 			);
 		}
-		if ( $ticket_line_item->quantity() < $qty ) {
+		if ($ticket_line_item->quantity() < $qty) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Can not cancel %1$d ticket(s) because the supplied line item has a quantity of %2$d.', 'event_espresso' ),
+					__('Can not cancel %1$d ticket(s) because the supplied line item has a quantity of %2$d.', 'event_espresso'),
 					$qty,
 					$ticket_line_item->quantity()
 				)
 			);
 		}
 		// decrement ticket quantity; don't rely on auto-fixing when recalculating totals to do this
-		$ticket_line_item->set_quantity( $ticket_line_item->quantity() - $qty );
-		foreach( $ticket_line_item->children() as $child_line_item ) {
-			if(
+		$ticket_line_item->set_quantity($ticket_line_item->quantity() - $qty);
+		foreach ($ticket_line_item->children() as $child_line_item) {
+			if (
 				$child_line_item->is_sub_line_item()
 				&& ! $child_line_item->is_percent()
 				&& ! $child_line_item->is_cancellation()
 			) {
-				$child_line_item->set_quantity( $child_line_item->quantity() - $qty );
+				$child_line_item->set_quantity($child_line_item->quantity() - $qty);
 			}
 		}
 		// get cancellation sub line item
@@ -387,37 +387,37 @@ 
 			$ticket_line_item,
 			EEM_Line_Item::type_cancellation
 		);
-		$cancellation_line_item = reset( $cancellation_line_item );
+		$cancellation_line_item = reset($cancellation_line_item);
 		// verify that this ticket was indeed previously cancelled
-		if ( $cancellation_line_item instanceof EE_Line_Item ) {
+		if ($cancellation_line_item instanceof EE_Line_Item) {
 			// increment cancelled quantity
-			$cancellation_line_item->set_quantity( $cancellation_line_item->quantity() + $qty );
+			$cancellation_line_item->set_quantity($cancellation_line_item->quantity() + $qty);
 		} else {
 			// create cancellation sub line item
-			$cancellation_line_item = EE_Line_Item::new_instance( array(
-				'LIN_name'       => __( 'Cancellation', 'event_espresso' ),
+			$cancellation_line_item = EE_Line_Item::new_instance(array(
+				'LIN_name'       => __('Cancellation', 'event_espresso'),
 				'LIN_desc'       => sprintf(
-					_x( 'Cancelled %1$s : %2$s', 'Cancelled Ticket Name : 2015-01-01 11:11', 'event_espresso' ),
+					_x('Cancelled %1$s : %2$s', 'Cancelled Ticket Name : 2015-01-01 11:11', 'event_espresso'),
 					$ticket_line_item->name(),
-					current_time( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ) )
+					current_time(get_option('date_format').' '.get_option('time_format'))
 				),
 				'LIN_unit_price' => 0, // $ticket_line_item->unit_price()
 				'LIN_quantity'   => $qty,
 				'LIN_is_taxable' => $ticket_line_item->is_taxable(),
-				'LIN_order'      => count( $ticket_line_item->children() ),
+				'LIN_order'      => count($ticket_line_item->children()),
 				'LIN_total'      => 0, // $ticket_line_item->unit_price()
 				'LIN_type'       => EEM_Line_Item::type_cancellation,
-			) );
-			$ticket_line_item->add_child_line_item( $cancellation_line_item );
+			));
+			$ticket_line_item->add_child_line_item($cancellation_line_item);
 		}
-		if ( $ticket_line_item->save_this_and_descendants() > 0 ) {
+		if ($ticket_line_item->save_this_and_descendants() > 0) {
 			// decrement parent line item quantity
 			$event_line_item = $ticket_line_item->parent();
-			if ( $event_line_item instanceof EE_Line_Item && $event_line_item->OBJ_type() === 'Event' ) {
-				$event_line_item->set_quantity( $event_line_item->quantity() - $qty );
+			if ($event_line_item instanceof EE_Line_Item && $event_line_item->OBJ_type() === 'Event') {
+				$event_line_item->set_quantity($event_line_item->quantity() - $qty);
 				$event_line_item->save();
 			}
-			EEH_Line_Item::get_grand_total_and_recalculate_everything( $ticket_line_item );
+			EEH_Line_Item::get_grand_total_and_recalculate_everything($ticket_line_item);
 			return true;
 		}
 		return false;
@@ -435,12 +435,12 @@ 
 	 * @return bool success
 	 * @throws \EE_Error
 	 */
-	public static function reinstate_canceled_ticket_line_item( EE_Line_Item $ticket_line_item, $qty = 1 ) {
+	public static function reinstate_canceled_ticket_line_item(EE_Line_Item $ticket_line_item, $qty = 1) {
 		// validate incoming line_item
-		if ( $ticket_line_item->OBJ_type() !== 'Ticket' ) {
+		if ($ticket_line_item->OBJ_type() !== 'Ticket') {
 			throw new EE_Error(
 				sprintf(
-					__( 'The supplied line item must have an Object Type of "Ticket", not %1$s.', 'event_espresso' ),
+					__('The supplied line item must have an Object Type of "Ticket", not %1$s.', 'event_espresso'),
 					$ticket_line_item->type()
 				)
 			);
@@ -450,42 +450,42 @@ 
 			$ticket_line_item,
 			EEM_Line_Item::type_cancellation
 		);
-		$cancellation_line_item = reset( $cancellation_line_item );
+		$cancellation_line_item = reset($cancellation_line_item);
 		// verify that this ticket was indeed previously cancelled
-		if ( ! $cancellation_line_item instanceof EE_Line_Item ) {
+		if ( ! $cancellation_line_item instanceof EE_Line_Item) {
 			return false;
 		}
-		if ( $cancellation_line_item->quantity() > $qty ) {
+		if ($cancellation_line_item->quantity() > $qty) {
 			// decrement cancelled quantity
-			$cancellation_line_item->set_quantity( $cancellation_line_item->quantity() - $qty );
-		} else if ( $cancellation_line_item->quantity() == $qty ) {
+			$cancellation_line_item->set_quantity($cancellation_line_item->quantity() - $qty);
+		} else if ($cancellation_line_item->quantity() == $qty) {
 			// decrement cancelled quantity in case anyone still has the object kicking around
-			$cancellation_line_item->set_quantity( $cancellation_line_item->quantity() - $qty );
+			$cancellation_line_item->set_quantity($cancellation_line_item->quantity() - $qty);
 			// delete because quantity will end up as 0
 			$cancellation_line_item->delete();
 			// and attempt to destroy the object,
 			// even though PHP won't actually destroy it until it needs the memory
-			unset( $cancellation_line_item );
+			unset($cancellation_line_item);
 		} else {
 			// what ?!?! negative quantity ?!?!
 			throw new EE_Error(
 				sprintf(
-					__( 'Can not reinstate %1$d cancelled ticket(s) because the cancelled ticket quantity is only %2$d.',
-						'event_espresso' ),
+					__('Can not reinstate %1$d cancelled ticket(s) because the cancelled ticket quantity is only %2$d.',
+						'event_espresso'),
 					$qty,
 					$cancellation_line_item->quantity()
 				)
 			);
 		}
 		// increment ticket quantity
-		$ticket_line_item->set_quantity( $ticket_line_item->quantity() + $qty );
-		if ( $ticket_line_item->save_this_and_descendants() > 0 ) {
+		$ticket_line_item->set_quantity($ticket_line_item->quantity() + $qty);
+		if ($ticket_line_item->save_this_and_descendants() > 0) {
 			// increment parent line item quantity
 			$event_line_item = $ticket_line_item->parent();
-			if ( $event_line_item instanceof EE_Line_Item && $event_line_item->OBJ_type() === 'Event' ) {
-				$event_line_item->set_quantity( $event_line_item->quantity() + $qty );
+			if ($event_line_item instanceof EE_Line_Item && $event_line_item->OBJ_type() === 'Event') {
+				$event_line_item->set_quantity($event_line_item->quantity() + $qty);
 			}
-			EEH_Line_Item::get_grand_total_and_recalculate_everything( $ticket_line_item );
+			EEH_Line_Item::get_grand_total_and_recalculate_everything($ticket_line_item);
 			return true;
 		}
 		return false;
@@ -500,8 +500,8 @@ 
 	 * @param EE_Line_Item $line_item
 	 * @return \EE_Line_Item
 	 */
-	public static function get_grand_total_and_recalculate_everything( EE_Line_Item $line_item ){
-		$grand_total_line_item = EEH_Line_Item::find_transaction_grand_total_for_line_item( $line_item );
+	public static function get_grand_total_and_recalculate_everything(EE_Line_Item $line_item) {
+		$grand_total_line_item = EEH_Line_Item::find_transaction_grand_total_for_line_item($line_item);
 		return $grand_total_line_item->recalculate_total_including_taxes();
 	}
 
@@ -514,11 +514,11 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function get_pre_tax_subtotal( EE_Line_Item $total_line_item ){
-		$pre_tax_subtotal = $total_line_item->get_child_line_item( 'pre-tax-subtotal' );
+	public static function get_pre_tax_subtotal(EE_Line_Item $total_line_item) {
+		$pre_tax_subtotal = $total_line_item->get_child_line_item('pre-tax-subtotal');
 		return $pre_tax_subtotal instanceof EE_Line_Item
 			? $pre_tax_subtotal
-			: self::create_pre_tax_subtotal( $total_line_item );
+			: self::create_pre_tax_subtotal($total_line_item);
 	}
 
 
@@ -530,9 +530,9 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function get_taxes_subtotal( EE_Line_Item $total_line_item ){
-		$taxes = $total_line_item->get_child_line_item( 'taxes' );
-		return $taxes ? $taxes : self::create_taxes_subtotal( $total_line_item );
+	public static function get_taxes_subtotal(EE_Line_Item $total_line_item) {
+		$taxes = $total_line_item->get_child_line_item('taxes');
+		return $taxes ? $taxes : self::create_taxes_subtotal($total_line_item);
 	}
 
 
@@ -545,12 +545,12 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public static function set_TXN_ID( EE_Line_Item $line_item, $transaction = NULL ){
-		if( $transaction ){
+	public static function set_TXN_ID(EE_Line_Item $line_item, $transaction = NULL) {
+		if ($transaction) {
 			/** @type EEM_Transaction $EEM_Transaction */
-			$EEM_Transaction = EE_Registry::instance()->load_model( 'Transaction' );
-			$TXN_ID = $EEM_Transaction->ensure_is_ID( $transaction );
-			$line_item->set_TXN_ID( $TXN_ID );
+			$EEM_Transaction = EE_Registry::instance()->load_model('Transaction');
+			$TXN_ID = $EEM_Transaction->ensure_is_ID($transaction);
+			$line_item->set_TXN_ID($TXN_ID);
 		}
 	}
 
@@ -565,8 +565,8 @@ 
 	 * @return \EE_Line_Item of type total
 	 * @throws \EE_Error
 	 */
-	public static function create_total_line_item( $transaction = NULL ){
-		$total_line_item = EE_Line_Item::new_instance( array(
+	public static function create_total_line_item($transaction = NULL) {
+		$total_line_item = EE_Line_Item::new_instance(array(
 			'LIN_code'	=> 'total',
 			'LIN_name'	=> __('Grand Total', 'event_espresso'),
 			'LIN_type'	=> EEM_Line_Item::type_total,
@@ -576,9 +576,9 @@ 
 			'FHEE__EEH_Line_Item__create_total_line_item__total_line_item',
 			$total_line_item
 		);
-		self::set_TXN_ID( $total_line_item, $transaction );
-		self::create_pre_tax_subtotal( $total_line_item, $transaction );
-		self::create_taxes_subtotal( $total_line_item, $transaction );
+		self::set_TXN_ID($total_line_item, $transaction);
+		self::create_pre_tax_subtotal($total_line_item, $transaction);
+		self::create_taxes_subtotal($total_line_item, $transaction);
 		return $total_line_item;
 	}
 
@@ -592,19 +592,19 @@ 
 	 * @return EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	protected static function create_pre_tax_subtotal( EE_Line_Item $total_line_item, $transaction = NULL ){
-		$pre_tax_line_item = EE_Line_Item::new_instance( array(
+	protected static function create_pre_tax_subtotal(EE_Line_Item $total_line_item, $transaction = NULL) {
+		$pre_tax_line_item = EE_Line_Item::new_instance(array(
 			'LIN_code' 	=> 'pre-tax-subtotal',
-			'LIN_name' 	=> __( 'Pre-Tax Subtotal', 'event_espresso' ),
+			'LIN_name' 	=> __('Pre-Tax Subtotal', 'event_espresso'),
 			'LIN_type' 	=> EEM_Line_Item::type_sub_total
-		) );
+		));
 		$pre_tax_line_item = apply_filters(
 			'FHEE__EEH_Line_Item__create_pre_tax_subtotal__pre_tax_line_item',
 			$pre_tax_line_item
 		);
-		self::set_TXN_ID( $pre_tax_line_item, $transaction );
-		$total_line_item->add_child_line_item( $pre_tax_line_item );
-		self::create_event_subtotal( $pre_tax_line_item, $transaction );
+		self::set_TXN_ID($pre_tax_line_item, $transaction);
+		$total_line_item->add_child_line_item($pre_tax_line_item);
+		self::create_event_subtotal($pre_tax_line_item, $transaction);
 		return $pre_tax_line_item;
 	}
 
@@ -619,21 +619,21 @@ 
 	 * @return EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	protected static function create_taxes_subtotal( EE_Line_Item $total_line_item, $transaction = NULL ){
+	protected static function create_taxes_subtotal(EE_Line_Item $total_line_item, $transaction = NULL) {
 		$tax_line_item = EE_Line_Item::new_instance(array(
 			'LIN_code'	=> 'taxes',
 			'LIN_name' 	=> __('Taxes', 'event_espresso'),
 			'LIN_type'	=> EEM_Line_Item::type_tax_sub_total,
-			'LIN_order' => 1000,//this should always come last
+			'LIN_order' => 1000, //this should always come last
 		));
 		$tax_line_item = apply_filters(
 			'FHEE__EEH_Line_Item__create_taxes_subtotal__tax_line_item',
 			$tax_line_item
 		);
-		self::set_TXN_ID( $tax_line_item, $transaction );
-		$total_line_item->add_child_line_item( $tax_line_item );
+		self::set_TXN_ID($tax_line_item, $transaction);
+		$total_line_item->add_child_line_item($tax_line_item);
 		//and lastly, add the actual taxes
-		self::apply_taxes( $total_line_item );
+		self::apply_taxes($total_line_item);
 		return $tax_line_item;
 	}
 
@@ -648,11 +648,11 @@ 
 	 * @return EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function create_event_subtotal( EE_Line_Item $pre_tax_line_item, $transaction = NULL, $event = NULL ){
+	public static function create_event_subtotal(EE_Line_Item $pre_tax_line_item, $transaction = NULL, $event = NULL) {
 		$event_line_item = EE_Line_Item::new_instance(array(
-			'LIN_code'	=> self::get_event_code( $event ),
-			'LIN_name' 	=> self::get_event_name( $event ),
-			'LIN_desc' 	=> self::get_event_desc( $event ),
+			'LIN_code'	=> self::get_event_code($event),
+			'LIN_name' 	=> self::get_event_name($event),
+			'LIN_desc' 	=> self::get_event_desc($event),
 			'LIN_type'	=> EEM_Line_Item::type_sub_total,
 			'OBJ_type' 	=> 'Event',
 			'OBJ_ID' 		=>  $event instanceof EE_Event ? $event->ID() : 0
@@ -661,8 +661,8 @@ 
 			'FHEE__EEH_Line_Item__create_event_subtotal__event_line_item',
 			$event_line_item
 		);
-		self::set_TXN_ID( $event_line_item, $transaction );
-		$pre_tax_line_item->add_child_line_item( $event_line_item );
+		self::set_TXN_ID($event_line_item, $transaction);
+		$pre_tax_line_item->add_child_line_item($event_line_item);
 		return $event_line_item;
 	}
 
@@ -675,8 +675,8 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public static function get_event_code( $event ) {
-		return 'event-' . ( $event instanceof EE_Event ? $event->ID() : '0' );
+	public static function get_event_code($event) {
+		return 'event-'.($event instanceof EE_Event ? $event->ID() : '0');
 	}
 
 	/**
@@ -684,8 +684,8 @@ 
 	 * @param EE_Event $event
 	 * @return string
 	 */
-	public static function get_event_name( $event ) {
-		return $event instanceof EE_Event ? $event->name() : __( 'Event', 'event_espresso' );
+	public static function get_event_name($event) {
+		return $event instanceof EE_Event ? $event->name() : __('Event', 'event_espresso');
 	}
 
 	/**
@@ -693,7 +693,7 @@ 
 	 * @param EE_Event $event
 	 * @return string
 	 */
-	public static function get_event_desc( $event ) {
+	public static function get_event_desc($event) {
 		return $event instanceof EE_Event ? $event->short_description() : '';
 	}
 
@@ -707,27 +707,27 @@ 
 	  * @throws \EE_Error
 	  * @return EE_Line_Item
 	  */
-	public static function get_event_line_item_for_ticket( EE_Line_Item $grand_total, EE_Ticket $ticket ) {
+	public static function get_event_line_item_for_ticket(EE_Line_Item $grand_total, EE_Ticket $ticket) {
 		$first_datetime = $ticket->first_datetime();
-		if ( ! $first_datetime instanceof EE_Datetime ) {
+		if ( ! $first_datetime instanceof EE_Datetime) {
 			throw new EE_Error(
-				sprintf( __( 'The supplied ticket (ID %d) has no datetimes', 'event_espresso' ), $ticket->ID() )
+				sprintf(__('The supplied ticket (ID %d) has no datetimes', 'event_espresso'), $ticket->ID())
 			);
 		}
 		$event = $first_datetime->event();
-		if ( ! $event instanceof EE_Event ) {
+		if ( ! $event instanceof EE_Event) {
 			throw new EE_Error(
 				sprintf(
-					__( 'The supplied ticket (ID %d) has no event data associated with it.', 'event_espresso' ),
+					__('The supplied ticket (ID %d) has no event data associated with it.', 'event_espresso'),
 					$ticket->ID()
 				)
 			);
 		}
-		$events_sub_total = EEH_Line_Item::get_event_line_item( $grand_total, $event );
-		if ( ! $events_sub_total instanceof EE_Line_Item ) {
+		$events_sub_total = EEH_Line_Item::get_event_line_item($grand_total, $event);
+		if ( ! $events_sub_total instanceof EE_Line_Item) {
 			throw new EE_Error(
 				sprintf(
-					__( 'There is no events sub-total for ticket %s on total line item %d', 'event_espresso' ),
+					__('There is no events sub-total for ticket %s on total line item %d', 'event_espresso'),
 					$ticket->ID(),
 					$grand_total->ID()
 				)
@@ -746,31 +746,31 @@ 
 	 * @return EE_Line_Item for the event subtotal which is a child of $grand_total
 	 * @throws \EE_Error
 	 */
-	public static function get_event_line_item( EE_Line_Item $grand_total, $event ) {
+	public static function get_event_line_item(EE_Line_Item $grand_total, $event) {
 		/** @type EE_Event $event */
-		$event = EEM_Event::instance()->ensure_is_obj( $event, true );
+		$event = EEM_Event::instance()->ensure_is_obj($event, true);
 		$event_line_item = NULL;
 		$found = false;
-		foreach ( EEH_Line_Item::get_event_subtotals( $grand_total ) as $event_line_item ) {
+		foreach (EEH_Line_Item::get_event_subtotals($grand_total) as $event_line_item) {
 			// default event subtotal, we should only ever find this the first time this method is called
-			if ( ! $event_line_item->OBJ_ID() ) {
+			if ( ! $event_line_item->OBJ_ID()) {
 				// let's use this! but first... set the event details
-				EEH_Line_Item::set_event_subtotal_details( $event_line_item, $event );
+				EEH_Line_Item::set_event_subtotal_details($event_line_item, $event);
 				$found = true;
 				break;
-			} else if ( $event_line_item->OBJ_ID() === $event->ID() ) {
+			} else if ($event_line_item->OBJ_ID() === $event->ID()) {
 				// found existing line item for this event in the cart, so break out of loop and use this one
 				$found = true;
 				break;
 			}
 		}
-		if ( ! $found ) {
+		if ( ! $found) {
 			//there is no event sub-total yet, so add it
-			$pre_tax_subtotal = EEH_Line_Item::get_pre_tax_subtotal( $grand_total );
+			$pre_tax_subtotal = EEH_Line_Item::get_pre_tax_subtotal($grand_total);
 			// create a new "event" subtotal below that
-			$event_line_item = EEH_Line_Item::create_event_subtotal( $pre_tax_subtotal, null, $event );
+			$event_line_item = EEH_Line_Item::create_event_subtotal($pre_tax_subtotal, null, $event);
 			// and set the event details
-			EEH_Line_Item::set_event_subtotal_details( $event_line_item, $event );
+			EEH_Line_Item::set_event_subtotal_details($event_line_item, $event);
 		}
 		return $event_line_item;
 	}
@@ -791,13 +791,13 @@ 
 		EE_Event $event,
 		$transaction = null
 	) {
-		if ( $event instanceof EE_Event ) {
-			$event_line_item->set_code( self::get_event_code( $event ) );
-			$event_line_item->set_name( self::get_event_name( $event ) );
-			$event_line_item->set_desc( self::get_event_desc( $event ) );
-			$event_line_item->set_OBJ_ID( $event->ID() );
+		if ($event instanceof EE_Event) {
+			$event_line_item->set_code(self::get_event_code($event));
+			$event_line_item->set_name(self::get_event_name($event));
+			$event_line_item->set_desc(self::get_event_desc($event));
+			$event_line_item->set_OBJ_ID($event->ID());
 		}
-		self::set_TXN_ID( $event_line_item, $transaction );
+		self::set_TXN_ID($event_line_item, $transaction);
 	}
 
 
@@ -810,19 +810,19 @@ 
 	 * @param EE_Line_Item $total_line_item of type EEM_Line_Item::type_total
 	 * @throws \EE_Error
 	 */
-	public static function apply_taxes( EE_Line_Item $total_line_item ){
+	public static function apply_taxes(EE_Line_Item $total_line_item) {
 		/** @type EEM_Price $EEM_Price */
-		$EEM_Price = EE_Registry::instance()->load_model( 'Price' );
+		$EEM_Price = EE_Registry::instance()->load_model('Price');
 		// get array of taxes via Price Model
 		$ordered_taxes = $EEM_Price->get_all_prices_that_are_taxes();
-		ksort( $ordered_taxes );
-		$taxes_line_item = self::get_taxes_subtotal( $total_line_item );
+		ksort($ordered_taxes);
+		$taxes_line_item = self::get_taxes_subtotal($total_line_item);
 		//just to be safe, remove its old tax line items
 		$taxes_line_item->delete_children_line_items();
 		//loop thru taxes
-		foreach ( $ordered_taxes as $order => $taxes ) {
-			foreach ( $taxes as $tax ) {
-				if ( $tax instanceof EE_Price ) {
+		foreach ($ordered_taxes as $order => $taxes) {
+			foreach ($taxes as $tax) {
+				if ($tax instanceof EE_Price) {
 					$tax_line_item = EE_Line_Item::new_instance(
 						array(
 							'LIN_name'       => $tax->name(),
@@ -840,7 +840,7 @@ 
 						'FHEE__EEH_Line_Item__apply_taxes__tax_line_item',
 						$tax_line_item
 					);
-					$taxes_line_item->add_child_line_item( $tax_line_item );
+					$taxes_line_item->add_child_line_item($tax_line_item);
 				}
 			}
 		}
@@ -857,10 +857,10 @@ 
 	 * @return float
 	 * @throws \EE_Error
 	 */
-	public static function ensure_taxes_applied( $total_line_item ){
-		$taxes_subtotal = self::get_taxes_subtotal( $total_line_item );
-		if( ! $taxes_subtotal->children()){
-			self::apply_taxes( $total_line_item );
+	public static function ensure_taxes_applied($total_line_item) {
+		$taxes_subtotal = self::get_taxes_subtotal($total_line_item);
+		if ( ! $taxes_subtotal->children()) {
+			self::apply_taxes($total_line_item);
 		}
 		return $taxes_subtotal->total();
 	}
@@ -874,16 +874,16 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public static function delete_all_child_items( EE_Line_Item $parent_line_item ) {
+	public static function delete_all_child_items(EE_Line_Item $parent_line_item) {
 		$deleted = 0;
-		foreach ( $parent_line_item->children() as $child_line_item ) {
-			if ( $child_line_item instanceof EE_Line_Item ) {
-				$deleted += EEH_Line_Item::delete_all_child_items( $child_line_item );
-				if ( $child_line_item->ID() ) {
+		foreach ($parent_line_item->children() as $child_line_item) {
+			if ($child_line_item instanceof EE_Line_Item) {
+				$deleted += EEH_Line_Item::delete_all_child_items($child_line_item);
+				if ($child_line_item->ID()) {
 					$child_line_item->delete();
-					unset( $child_line_item );
+					unset($child_line_item);
 				} else {
-					$parent_line_item->delete_child_line_item( $child_line_item->code() );
+					$parent_line_item->delete_child_line_item($child_line_item->code());
 				}
 				$deleted++;
 			}
@@ -905,9 +905,9 @@ 
 	 * @param array|bool|string $line_item_codes
 	 * @return int number of items successfully removed
 	 */
-	public static function delete_items( EE_Line_Item $total_line_item, $line_item_codes = FALSE ) {
+	public static function delete_items(EE_Line_Item $total_line_item, $line_item_codes = FALSE) {
 
-		if( $total_line_item->type() !== EEM_Line_Item::type_total ){
+		if ($total_line_item->type() !== EEM_Line_Item::type_total) {
 			EE_Error::doing_it_wrong(
 				'EEH_Line_Item::delete_items',
 				__(
@@ -917,20 +917,20 @@ 
 				'4.6.18'
 			);
 		}
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		// check if only a single line_item_id was passed
-		if ( ! empty( $line_item_codes ) && ! is_array( $line_item_codes )) {
+		if ( ! empty($line_item_codes) && ! is_array($line_item_codes)) {
 			// place single line_item_id in an array to appear as multiple line_item_ids
-			$line_item_codes = array ( $line_item_codes );
+			$line_item_codes = array($line_item_codes);
 		}
 		$removals = 0;
 		// cycle thru line_item_ids
-		foreach ( $line_item_codes as $line_item_id ) {
+		foreach ($line_item_codes as $line_item_id) {
 			$removals += $total_line_item->delete_child_line_item($line_item_id);
 		}
 
-		if ( $removals > 0 ) {
+		if ($removals > 0) {
 			$total_line_item->recalculate_taxes_and_tax_total();
 			return $removals;
 		} else {
@@ -963,33 +963,33 @@ 
 		$code = null,
 		$add_to_existing_line_item = false
 	) {
-		$tax_subtotal = self::get_taxes_subtotal( $total_line_item );
+		$tax_subtotal = self::get_taxes_subtotal($total_line_item);
             $taxable_total = $total_line_item->taxable_total();
 
-            if( $add_to_existing_line_item ) {
-                $new_tax = $tax_subtotal->get_child_line_item( $code );
+            if ($add_to_existing_line_item) {
+                $new_tax = $tax_subtotal->get_child_line_item($code);
 	            EEM_Line_Item::instance()->delete(
-		            array( array( 'LIN_code' => array( '!=', $code ), 'LIN_parent' => $tax_subtotal->ID() ) )
+		            array(array('LIN_code' => array('!=', $code), 'LIN_parent' => $tax_subtotal->ID()))
 	            );
             } else {
                 $new_tax = null;
                 $tax_subtotal->delete_children_line_items();
             }
-            if( $new_tax ) {
-                $new_tax->set_total( $new_tax->total() + $amount );
-                $new_tax->set_percent( $taxable_total ? $new_tax->total() / $taxable_total * 100 : 0 );
+            if ($new_tax) {
+                $new_tax->set_total($new_tax->total() + $amount);
+                $new_tax->set_percent($taxable_total ? $new_tax->total() / $taxable_total * 100 : 0);
             } else {
                 //no existing tax item. Create it
-				$new_tax = EE_Line_Item::new_instance( array(
+				$new_tax = EE_Line_Item::new_instance(array(
 					'TXN_ID'      => $total_line_item->TXN_ID(),
-					'LIN_name'    => $name ? $name : __( 'Tax', 'event_espresso' ),
+					'LIN_name'    => $name ? $name : __('Tax', 'event_espresso'),
 					'LIN_desc'    => $description ? $description : '',
-					'LIN_percent' => $taxable_total ? ( $amount / $taxable_total * 100 ) : 0,
+					'LIN_percent' => $taxable_total ? ($amount / $taxable_total * 100) : 0,
 					'LIN_total'   => $amount,
 					'LIN_parent'  => $tax_subtotal->ID(),
 					'LIN_type'    => EEM_Line_Item::type_tax,
 					'LIN_code'    => $code
-				) );
+				));
 			}
 
             $new_tax = apply_filters(
@@ -998,7 +998,7 @@ 
 				$total_line_item
             );
             $new_tax->save();
-            $tax_subtotal->set_total( $new_tax->total() );
+            $tax_subtotal->set_total($new_tax->total());
             $tax_subtotal->save();
             $total_line_item->recalculate_total_including_taxes();
             return $new_tax;
@@ -1020,14 +1020,14 @@ 
 		$code_substring_for_whitelist = null
 	) {
 		$whitelisted = false;
-		if( $code_substring_for_whitelist !== null ) {
-			$whitelisted = strpos( $line_item->code(), $code_substring_for_whitelist ) !== false ? true : false;
+		if ($code_substring_for_whitelist !== null) {
+			$whitelisted = strpos($line_item->code(), $code_substring_for_whitelist) !== false ? true : false;
 		}
-		if( ! $whitelisted && $line_item->is_line_item() ) {
-			$line_item->set_is_taxable( $taxable );
+		if ( ! $whitelisted && $line_item->is_line_item()) {
+			$line_item->set_is_taxable($taxable);
 		}
-		foreach( $line_item->children() as $child_line_item ) {
-			EEH_Line_Item::set_line_items_taxable( $child_line_item, $taxable, $code_substring_for_whitelist );
+		foreach ($line_item->children() as $child_line_item) {
+			EEH_Line_Item::set_line_items_taxable($child_line_item, $taxable, $code_substring_for_whitelist);
 		}
 	}
 
@@ -1040,8 +1040,8 @@ 
 	 * @param \EE_Line_Item $parent_line_item - the line item to find descendants of
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_event_subtotals( EE_Line_Item $parent_line_item ) {
-		return self::get_subtotals_of_object_type( $parent_line_item, 'Event' );
+	public static function get_event_subtotals(EE_Line_Item $parent_line_item) {
+		return self::get_subtotals_of_object_type($parent_line_item, 'Event');
 	}
 
 
@@ -1054,7 +1054,7 @@ 
 	 * @param string $obj_type
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_subtotals_of_object_type( EE_Line_Item $parent_line_item, $obj_type = '' ) {
+	public static function get_subtotals_of_object_type(EE_Line_Item $parent_line_item, $obj_type = '') {
 		return self::_get_descendants_by_type_and_object_type(
 			$parent_line_item,
 			EEM_Line_Item::type_sub_total,
@@ -1071,8 +1071,8 @@ 
 	 * @param \EE_Line_Item $parent_line_item - the line item to find descendants of
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_ticket_line_items( EE_Line_Item $parent_line_item ) {
-		return self::get_line_items_of_object_type( $parent_line_item, 'Ticket' );
+	public static function get_ticket_line_items(EE_Line_Item $parent_line_item) {
+		return self::get_line_items_of_object_type($parent_line_item, 'Ticket');
 	}
 
 
@@ -1085,8 +1085,8 @@ 
 	 * @param string $obj_type
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_line_items_of_object_type( EE_Line_Item $parent_line_item, $obj_type = '' ) {
-		return self::_get_descendants_by_type_and_object_type( $parent_line_item, EEM_Line_Item::type_line_item, $obj_type );
+	public static function get_line_items_of_object_type(EE_Line_Item $parent_line_item, $obj_type = '') {
+		return self::_get_descendants_by_type_and_object_type($parent_line_item, EEM_Line_Item::type_line_item, $obj_type);
 	}
 
 
@@ -1097,8 +1097,8 @@ 
 	 * @param \EE_Line_Item $parent_line_item - the line item to find descendants of
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_tax_descendants( EE_Line_Item $parent_line_item ) {
-		return EEH_Line_Item::get_descendants_of_type( $parent_line_item, EEM_Line_Item::type_tax );
+	public static function get_tax_descendants(EE_Line_Item $parent_line_item) {
+		return EEH_Line_Item::get_descendants_of_type($parent_line_item, EEM_Line_Item::type_tax);
 	}
 
 
@@ -1109,8 +1109,8 @@ 
 	 * @param \EE_Line_Item $parent_line_item - the line item to find descendants of
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_line_item_descendants( EE_Line_Item $parent_line_item ) {
-		return EEH_Line_Item::get_descendants_of_type( $parent_line_item, EEM_Line_Item::type_line_item );
+	public static function get_line_item_descendants(EE_Line_Item $parent_line_item) {
+		return EEH_Line_Item::get_descendants_of_type($parent_line_item, EEM_Line_Item::type_line_item);
 	}
 
 
@@ -1123,8 +1123,8 @@ 
 	 * @param string $line_item_type one of the EEM_Line_Item constants
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_descendants_of_type( EE_Line_Item $parent_line_item, $line_item_type ) {
-		return self::_get_descendants_by_type_and_object_type( $parent_line_item, $line_item_type, NULL );
+	public static function get_descendants_of_type(EE_Line_Item $parent_line_item, $line_item_type) {
+		return self::_get_descendants_by_type_and_object_type($parent_line_item, $line_item_type, NULL);
 	}
 
 
@@ -1143,8 +1143,8 @@ 
 		$obj_type = null
 	) {
 		$objects = array();
-		foreach ( $parent_line_item->children() as $child_line_item ) {
-			if ( $child_line_item instanceof EE_Line_Item ) {
+		foreach ($parent_line_item->children() as $child_line_item) {
+			if ($child_line_item instanceof EE_Line_Item) {
 				if (
 					$child_line_item->type() === $line_item_type
 				    && (
@@ -1184,7 +1184,7 @@ 
 		$OBJ_type = '',
 		$OBJ_IDs = array()
 	) {
-		return self::_get_descendants_by_object_type_and_object_ID( $parent_line_item, $OBJ_type, $OBJ_IDs );
+		return self::_get_descendants_by_object_type_and_object_ID($parent_line_item, $OBJ_type, $OBJ_IDs);
 	}
 
 
@@ -1203,12 +1203,12 @@ 
 		$OBJ_IDs
 	) {
 		$objects = array();
-		foreach ( $parent_line_item->children() as $child_line_item ) {
-			if ( $child_line_item instanceof EE_Line_Item ) {
+		foreach ($parent_line_item->children() as $child_line_item) {
+			if ($child_line_item instanceof EE_Line_Item) {
 				if (
 					$child_line_item->OBJ_type() === $OBJ_type
-					&& is_array( $OBJ_IDs )
-					&& in_array( $child_line_item->OBJ_ID(), $OBJ_IDs )
+					&& is_array($OBJ_IDs)
+					&& in_array($child_line_item->OBJ_ID(), $OBJ_IDs)
 				) {
 					$objects[] = $child_line_item;
 				} else {
@@ -1238,8 +1238,8 @@ 
 	 * @param string $type like one of the EEM_Line_Item::type_*
 	 * @return EE_Line_Item
 	 */
-	public static function get_nearest_descendant_of_type( EE_Line_Item $parent_line_item, $type ) {
-		return self::_get_nearest_descendant( $parent_line_item, 'LIN_type' , $type );
+	public static function get_nearest_descendant_of_type(EE_Line_Item $parent_line_item, $type) {
+		return self::_get_nearest_descendant($parent_line_item, 'LIN_type', $type);
 	}
 
 
@@ -1253,8 +1253,8 @@ 
 	 * @param string $code any value used for LIN_code
 	 * @return EE_Line_Item
 	 */
-	public static function get_nearest_descendant_having_code( EE_Line_Item $parent_line_item, $code ) {
-		return self::_get_nearest_descendant( $parent_line_item, 'LIN_code' , $code );
+	public static function get_nearest_descendant_having_code(EE_Line_Item $parent_line_item, $code) {
+		return self::_get_nearest_descendant($parent_line_item, 'LIN_code', $code);
 	}
 
 
@@ -1268,15 +1268,15 @@ 
 	 * @param string $value any value stored in $search_field
 	 * @return EE_Line_Item
 	 */
-	protected static function _get_nearest_descendant( EE_Line_Item $parent_line_item, $search_field, $value ) {
-		foreach( $parent_line_item->children() as $child ){
-			if ( $child->get( $search_field ) == $value ){
+	protected static function _get_nearest_descendant(EE_Line_Item $parent_line_item, $search_field, $value) {
+		foreach ($parent_line_item->children() as $child) {
+			if ($child->get($search_field) == $value) {
 				return $child;
 			}
 		}
-		foreach( $parent_line_item->children() as $child ){
-			$descendant_found = self::_get_nearest_descendant( $child, $search_field, $value );
-			if ( $descendant_found ){
+		foreach ($parent_line_item->children() as $child) {
+			$descendant_found = self::_get_nearest_descendant($child, $search_field, $value);
+			if ($descendant_found) {
 				return $descendant_found;
 			}
 		}
@@ -1293,24 +1293,24 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function find_transaction_grand_total_for_line_item( EE_Line_Item $line_item ){
-		if ( $line_item->TXN_ID() ) {
-			$total_line_item = $line_item->transaction()->total_line_item( false );
-			if ( $total_line_item instanceof EE_Line_Item ) {
+	public static function find_transaction_grand_total_for_line_item(EE_Line_Item $line_item) {
+		if ($line_item->TXN_ID()) {
+			$total_line_item = $line_item->transaction()->total_line_item(false);
+			if ($total_line_item instanceof EE_Line_Item) {
 				return $total_line_item;
 			}
 		} else {
 			$line_item_parent = $line_item->parent();
-			if ( $line_item_parent instanceof EE_Line_Item ) {
-				if ( $line_item_parent->is_total() ) {
+			if ($line_item_parent instanceof EE_Line_Item) {
+				if ($line_item_parent->is_total()) {
 					return $line_item_parent;
 				}
-				return EEH_Line_Item::find_transaction_grand_total_for_line_item( $line_item_parent );
+				return EEH_Line_Item::find_transaction_grand_total_for_line_item($line_item_parent);
 			}
 		}
 		throw new EE_Error(
 			sprintf(
-				__( 'A valid grand total for line item %1$d was not found.', 'event_espresso' ),
+				__('A valid grand total for line item %1$d was not found.', 'event_espresso'),
 				$line_item->ID()
 			)
 		);
@@ -1327,31 +1327,31 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public static function visualize( EE_Line_Item $line_item, $indentation = 0 ){
+	public static function visualize(EE_Line_Item $line_item, $indentation = 0) {
 		echo defined('EE_TESTS_DIR') ? "\n" : '<br />';
-		if ( ! $indentation ) {
-			echo defined( 'EE_TESTS_DIR' ) ? "\n" : '<br />';
+		if ( ! $indentation) {
+			echo defined('EE_TESTS_DIR') ? "\n" : '<br />';
 		}
-		for( $i = 0; $i < $indentation; $i++ ){
+		for ($i = 0; $i < $indentation; $i++) {
 			echo ". ";
 		}
 		$breakdown = '';
-		if ( $line_item->is_line_item()){
-			if ( $line_item->is_percent() ) {
+		if ($line_item->is_line_item()) {
+			if ($line_item->is_percent()) {
 				$breakdown = "{$line_item->percent()}%";
 			} else {
-				$breakdown = '$' . "{$line_item->unit_price()} x {$line_item->quantity()}";
+				$breakdown = '$'."{$line_item->unit_price()} x {$line_item->quantity()}";
 			}
 		}
-		echo $line_item->name() . " [ ID:{$line_item->ID()} | qty:{$line_item->quantity()} ] {$line_item->type()} : " . '$' . "{$line_item->total()}";
-		if ( $breakdown ) {
+		echo $line_item->name()." [ ID:{$line_item->ID()} | qty:{$line_item->quantity()} ] {$line_item->type()} : ".'$'."{$line_item->total()}";
+		if ($breakdown) {
 			echo " ( {$breakdown} )";
 		}
-		if( $line_item->is_taxable() ){
+		if ($line_item->is_taxable()) {
 			echo "  * taxable";
 		}
-		if( $line_item->children() ){
-			foreach($line_item->children() as $child){
+		if ($line_item->children()) {
+			foreach ($line_item->children() as $child) {
 				self::visualize($child, $indentation + 1);
 			}
 		}
@@ -1392,97 +1392,97 @@ 
 	 *                                          is theirs, which can be done with
 	 *                                          `EEM_Line_Item::instance()->get_line_item_for_registration( $registration );`
 	 */
-	public static function calculate_reg_final_prices_per_line_item( EE_Line_Item $line_item, $billable_ticket_quantities = array() ) {
+	public static function calculate_reg_final_prices_per_line_item(EE_Line_Item $line_item, $billable_ticket_quantities = array()) {
 		//init running grand total if not already
-		if ( ! isset( $running_totals[ 'total' ] ) ) {
-			$running_totals[ 'total' ] = 0;
+		if ( ! isset($running_totals['total'])) {
+			$running_totals['total'] = 0;
 		}
-		if( ! isset( $running_totals[ 'taxable' ] ) ) {
-			$running_totals[ 'taxable' ] = array( 'total' => 0 );
+		if ( ! isset($running_totals['taxable'])) {
+			$running_totals['taxable'] = array('total' => 0);
 		}
-		foreach ( $line_item->children() as $child_line_item ) {
-			switch ( $child_line_item->type() ) {
+		foreach ($line_item->children() as $child_line_item) {
+			switch ($child_line_item->type()) {
 
 				case EEM_Line_Item::type_sub_total :
-					$running_totals_from_subtotal = EEH_Line_Item::calculate_reg_final_prices_per_line_item( $child_line_item, $billable_ticket_quantities );
+					$running_totals_from_subtotal = EEH_Line_Item::calculate_reg_final_prices_per_line_item($child_line_item, $billable_ticket_quantities);
 					//combine arrays but preserve numeric keys
-					$running_totals = array_replace_recursive( $running_totals_from_subtotal, $running_totals );
-					$running_totals[ 'total' ] += $running_totals_from_subtotal[ 'total' ];
-					$running_totals[ 'taxable'][ 'total' ] += $running_totals_from_subtotal[ 'taxable' ][ 'total' ];
+					$running_totals = array_replace_recursive($running_totals_from_subtotal, $running_totals);
+					$running_totals['total'] += $running_totals_from_subtotal['total'];
+					$running_totals['taxable']['total'] += $running_totals_from_subtotal['taxable']['total'];
 					break;
 
 				case EEM_Line_Item::type_tax_sub_total :
 
 					//find how much the taxes percentage is
-					if ( $child_line_item->percent() !== 0 ) {
+					if ($child_line_item->percent() !== 0) {
 						$tax_percent_decimal = $child_line_item->percent() / 100;
 					} else {
 						$tax_percent_decimal = EE_Taxes::get_total_taxes_percentage() / 100;
 					}
 					//and apply to all the taxable totals, and add to the pretax totals
-					foreach ( $running_totals as $line_item_id => $this_running_total ) {
+					foreach ($running_totals as $line_item_id => $this_running_total) {
 						//"total" and "taxable" array key is an exception
-						if ( $line_item_id === 'taxable' ) {
+						if ($line_item_id === 'taxable') {
 							continue;
 						}
-						$taxable_total = $running_totals[ 'taxable' ][ $line_item_id ];
-						$running_totals[ $line_item_id ] += ( $taxable_total * $tax_percent_decimal );
+						$taxable_total = $running_totals['taxable'][$line_item_id];
+						$running_totals[$line_item_id] += ($taxable_total * $tax_percent_decimal);
 					}
 					break;
 
 				case EEM_Line_Item::type_line_item :
 
 					// ticket line items or ????
-					if ( $child_line_item->OBJ_type() === 'Ticket' ) {
+					if ($child_line_item->OBJ_type() === 'Ticket') {
 						// kk it's a ticket
-						if ( isset( $running_totals[ $child_line_item->ID() ] ) ) {
+						if (isset($running_totals[$child_line_item->ID()])) {
 							//huh? that shouldn't happen.
-							$running_totals[ 'total' ] += $child_line_item->total();
+							$running_totals['total'] += $child_line_item->total();
 						} else {
 							//its not in our running totals yet. great.
-							if ( $child_line_item->is_taxable() ) {
+							if ($child_line_item->is_taxable()) {
 								$taxable_amount = $child_line_item->unit_price();
 							} else {
 								$taxable_amount = 0;
 							}
 							// are we only calculating totals for some tickets?
-							if ( isset( $billable_ticket_quantities[ $child_line_item->OBJ_ID() ] ) ) {
-								$quantity = $billable_ticket_quantities[ $child_line_item->OBJ_ID() ];
-								$running_totals[ $child_line_item->ID() ] = $quantity
+							if (isset($billable_ticket_quantities[$child_line_item->OBJ_ID()])) {
+								$quantity = $billable_ticket_quantities[$child_line_item->OBJ_ID()];
+								$running_totals[$child_line_item->ID()] = $quantity
 									? $child_line_item->unit_price()
 									: 0;
-								$running_totals[ 'taxable' ][ $child_line_item->ID() ] = $quantity
+								$running_totals['taxable'][$child_line_item->ID()] = $quantity
 									? $taxable_amount
 									: 0;
 							} else {
 								$quantity = $child_line_item->quantity();
-								$running_totals[ $child_line_item->ID() ] = $child_line_item->unit_price();
-								$running_totals[ 'taxable' ][ $child_line_item->ID() ] = $taxable_amount;
+								$running_totals[$child_line_item->ID()] = $child_line_item->unit_price();
+								$running_totals['taxable'][$child_line_item->ID()] = $taxable_amount;
 							}
-							$running_totals[ 'taxable' ][ 'total' ] += $taxable_amount * $quantity;
-							$running_totals[ 'total' ] += $child_line_item->unit_price() * $quantity;
+							$running_totals['taxable']['total'] += $taxable_amount * $quantity;
+							$running_totals['total'] += $child_line_item->unit_price() * $quantity;
 						}
 					} else {
 						// it's some other type of item added to the cart
 						// it should affect the running totals
 						// basically we want to convert it into a PERCENT modifier. Because
 						// more clearly affect all registration's final price equally
-						$line_items_percent_of_running_total = $running_totals[ 'total' ] > 0
-							? ( $child_line_item->total() / $running_totals[ 'total' ] ) + 1
+						$line_items_percent_of_running_total = $running_totals['total'] > 0
+							? ($child_line_item->total() / $running_totals['total']) + 1
 							: 1;
-						foreach ( $running_totals as $line_item_id => $this_running_total ) {
+						foreach ($running_totals as $line_item_id => $this_running_total) {
 							//the "taxable" array key is an exception
-							if ( $line_item_id === 'taxable' ) {
+							if ($line_item_id === 'taxable') {
 								continue;
 							}
 							// update the running totals
 							// yes this actually even works for the running grand total!
-							$running_totals[ $line_item_id ] =
+							$running_totals[$line_item_id] =
 								$line_items_percent_of_running_total * $this_running_total;
 
-							if ( $child_line_item->is_taxable() ) {
-								$running_totals[ 'taxable' ][ $line_item_id ] =
-									$line_items_percent_of_running_total * $running_totals[ 'taxable' ][ $line_item_id ];
+							if ($child_line_item->is_taxable()) {
+								$running_totals['taxable'][$line_item_id] =
+									$line_items_percent_of_running_total * $running_totals['taxable'][$line_item_id];
 							}
 						}
 					}
@@ -1500,16 +1500,16 @@ 
 	 * @return float | null
 	 * @throws \OutOfRangeException
 	 */
-	public static function calculate_final_price_for_ticket_line_item( \EE_Line_Item $total_line_item, \EE_Line_Item $ticket_line_item ) {
+	public static function calculate_final_price_for_ticket_line_item(\EE_Line_Item $total_line_item, \EE_Line_Item $ticket_line_item) {
 		static $final_prices_per_ticket_line_item = array();
-		if ( empty( $final_prices_per_ticket_line_item ) ) {
+		if (empty($final_prices_per_ticket_line_item)) {
 			$final_prices_per_ticket_line_item = \EEH_Line_Item::calculate_reg_final_prices_per_line_item(
 				$total_line_item
 			);
 		}
 		//ok now find this new registration's final price
-		if ( isset( $final_prices_per_ticket_line_item[ $ticket_line_item->ID() ] ) ) {
-			return $final_prices_per_ticket_line_item[ $ticket_line_item->ID() ];
+		if (isset($final_prices_per_ticket_line_item[$ticket_line_item->ID()])) {
+			return $final_prices_per_ticket_line_item[$ticket_line_item->ID()];
 		}
 		$message = sprintf(
 			__(
@@ -1518,10 +1518,10 @@ 
 			),
 			$ticket_line_item->ID()
 		);
-		if ( WP_DEBUG ) {
-			throw new \OutOfRangeException( $message );
+		if (WP_DEBUG) {
+			throw new \OutOfRangeException($message);
 		} else {
-			EE_Log::instance()->log( __CLASS__, __FUNCTION__, $message );
+			EE_Log::instance()->log(__CLASS__, __FUNCTION__, $message);
 		}
 		return null;
 	}
@@ -1537,15 +1537,15 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function billable_line_item_tree( EE_Line_Item $line_item, $registrations ) {
-		$copy_li = EEH_Line_Item::billable_line_item( $line_item, $registrations );
-		foreach ( $line_item->children() as $child_li ) {
-			$copy_li->add_child_line_item( EEH_Line_Item::billable_line_item_tree( $child_li, $registrations ) );
+	public static function billable_line_item_tree(EE_Line_Item $line_item, $registrations) {
+		$copy_li = EEH_Line_Item::billable_line_item($line_item, $registrations);
+		foreach ($line_item->children() as $child_li) {
+			$copy_li->add_child_line_item(EEH_Line_Item::billable_line_item_tree($child_li, $registrations));
 		}
 		//if this is the grand total line item, make sure the totals all add up
 		//(we could have duplicated this logic AS we copied the line items, but
 		//it seems DRYer this way)
-		if ( $copy_li->type() === EEM_Line_Item::type_total ) {
+		if ($copy_li->type() === EEM_Line_Item::type_total) {
 			$copy_li->recalculate_total_including_taxes();
 		}
 		return $copy_li;
@@ -1562,24 +1562,24 @@ 
 	 * @throws \EE_Error
 	 * @param EE_Registration[] $registrations
 	 */
-	public static function billable_line_item( EE_Line_Item $line_item, $registrations ) {
+	public static function billable_line_item(EE_Line_Item $line_item, $registrations) {
 		$new_li_fields = $line_item->model_field_array();
-		if ( $line_item->type() === EEM_Line_Item::type_line_item &&
+		if ($line_item->type() === EEM_Line_Item::type_line_item &&
 			$line_item->OBJ_type() === 'Ticket'
 		) {
 			$count = 0;
-			foreach ( $registrations as $registration ) {
-				if ( $line_item->OBJ_ID() === $registration->ticket_ID() &&
-					in_array( $registration->status_ID(), EEM_Registration::reg_statuses_that_allow_payment() )
+			foreach ($registrations as $registration) {
+				if ($line_item->OBJ_ID() === $registration->ticket_ID() &&
+					in_array($registration->status_ID(), EEM_Registration::reg_statuses_that_allow_payment())
 				) {
 					$count++;
 				}
 			}
-			$new_li_fields[ 'LIN_quantity' ] = $count;
+			$new_li_fields['LIN_quantity'] = $count;
 		}
 		//don't set the total. We'll leave that up to the code that calculates it
-		unset( $new_li_fields[ 'LIN_ID' ], $new_li_fields[ 'LIN_parent' ], $new_li_fields[ 'LIN_total' ] );
-		return EE_Line_Item::new_instance( $new_li_fields );
+		unset($new_li_fields['LIN_ID'], $new_li_fields['LIN_parent'], $new_li_fields['LIN_total']);
+		return EE_Line_Item::new_instance($new_li_fields);
 	}
 
 
@@ -1592,19 +1592,19 @@ 
 	 * @return \EE_Line_Item|null
 	 * @throws \EE_Error
 	 */
-	public static function non_empty_line_items( EE_Line_Item $line_item ) {
-		$copied_li = EEH_Line_Item::non_empty_line_item( $line_item );
-		if ( $copied_li === null ) {
+	public static function non_empty_line_items(EE_Line_Item $line_item) {
+		$copied_li = EEH_Line_Item::non_empty_line_item($line_item);
+		if ($copied_li === null) {
 			return null;
 		}
 		//if this is an event subtotal, we want to only include it if it
 		//has a non-zero total and at least one ticket line item child
 		$ticket_children = 0;
-		foreach ( $line_item->children() as $child_li ) {
-			$child_li_copy = EEH_Line_Item::non_empty_line_items( $child_li );
-			if ( $child_li_copy !== null ) {
-				$copied_li->add_child_line_item( $child_li_copy );
-				if ( $child_li_copy->type() === EEM_Line_Item::type_line_item &&
+		foreach ($line_item->children() as $child_li) {
+			$child_li_copy = EEH_Line_Item::non_empty_line_items($child_li);
+			if ($child_li_copy !== null) {
+				$copied_li->add_child_line_item($child_li_copy);
+				if ($child_li_copy->type() === EEM_Line_Item::type_line_item &&
 					$child_li_copy->OBJ_type() === 'Ticket'
 				) {
 					$ticket_children++;
@@ -1634,8 +1634,8 @@ 
 	 * @return EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function non_empty_line_item( EE_Line_Item $line_item ) {
-		if ( $line_item->type() === EEM_Line_Item::type_line_item &&
+	public static function non_empty_line_item(EE_Line_Item $line_item) {
+		if ($line_item->type() === EEM_Line_Item::type_line_item &&
 			$line_item->OBJ_type() === 'Ticket' &&
 			$line_item->quantity() === 0
 		) {
@@ -1643,8 +1643,8 @@ 
 		}
 		$new_li_fields = $line_item->model_field_array();
 		//don't set the total. We'll leave that up to the code that calculates it
-		unset( $new_li_fields[ 'LIN_ID' ], $new_li_fields[ 'LIN_parent' ] );
-		return EE_Line_Item::new_instance( $new_li_fields );
+		unset($new_li_fields['LIN_ID'], $new_li_fields['LIN_parent']);
+		return EE_Line_Item::new_instance($new_li_fields);
 	}
 
 
@@ -1656,9 +1656,9 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function get_items_subtotal( EE_Line_Item $total_line_item ){
-		EE_Error::doing_it_wrong( 'EEH_Line_Item::get_items_subtotal()', __('Method replaced with EEH_Line_Item::get_pre_tax_subtotal()', 'event_espresso'), '4.6.0' );
-		return self::get_pre_tax_subtotal( $total_line_item );
+	public static function get_items_subtotal(EE_Line_Item $total_line_item) {
+		EE_Error::doing_it_wrong('EEH_Line_Item::get_items_subtotal()', __('Method replaced with EEH_Line_Item::get_pre_tax_subtotal()', 'event_espresso'), '4.6.0');
+		return self::get_pre_tax_subtotal($total_line_item);
 	}
 
 
@@ -1669,9 +1669,9 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function create_default_total_line_item( $transaction = NULL) {
-		EE_Error::doing_it_wrong( 'EEH_Line_Item::create_default_total_line_item()', __('Method replaced with EEH_Line_Item::create_total_line_item()', 'event_espresso'), '4.6.0' );
-		return self::create_total_line_item( $transaction );
+	public static function create_default_total_line_item($transaction = NULL) {
+		EE_Error::doing_it_wrong('EEH_Line_Item::create_default_total_line_item()', __('Method replaced with EEH_Line_Item::create_total_line_item()', 'event_espresso'), '4.6.0');
+		return self::create_total_line_item($transaction);
 	}
 
 
@@ -1683,9 +1683,9 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function create_default_tickets_subtotal( EE_Line_Item $total_line_item, $transaction = NULL) {
-		EE_Error::doing_it_wrong( 'EEH_Line_Item::create_default_tickets_subtotal()', __('Method replaced with EEH_Line_Item::create_pre_tax_subtotal()', 'event_espresso'), '4.6.0' );
-		return self::create_pre_tax_subtotal( $total_line_item, $transaction );
+	public static function create_default_tickets_subtotal(EE_Line_Item $total_line_item, $transaction = NULL) {
+		EE_Error::doing_it_wrong('EEH_Line_Item::create_default_tickets_subtotal()', __('Method replaced with EEH_Line_Item::create_pre_tax_subtotal()', 'event_espresso'), '4.6.0');
+		return self::create_pre_tax_subtotal($total_line_item, $transaction);
 	}
 
 
@@ -1697,9 +1697,9 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function create_default_taxes_subtotal( EE_Line_Item $total_line_item, $transaction = NULL) {
-		EE_Error::doing_it_wrong( 'EEH_Line_Item::create_default_taxes_subtotal()', __('Method replaced with EEH_Line_Item::create_taxes_subtotal()', 'event_espresso'), '4.6.0' );
-		return self::create_taxes_subtotal( $total_line_item, $transaction );
+	public static function create_default_taxes_subtotal(EE_Line_Item $total_line_item, $transaction = NULL) {
+		EE_Error::doing_it_wrong('EEH_Line_Item::create_default_taxes_subtotal()', __('Method replaced with EEH_Line_Item::create_taxes_subtotal()', 'event_espresso'), '4.6.0');
+		return self::create_taxes_subtotal($total_line_item, $transaction);
 	}
 
 
@@ -1711,9 +1711,9 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function create_default_event_subtotal( EE_Line_Item $total_line_item, $transaction = NULL) {
-		EE_Error::doing_it_wrong( 'EEH_Line_Item::create_default_event_subtotal()', __('Method replaced with EEH_Line_Item::create_event_subtotal()', 'event_espresso'), '4.6.0' );
-		return self::create_event_subtotal( $total_line_item, $transaction );
+	public static function create_default_event_subtotal(EE_Line_Item $total_line_item, $transaction = NULL) {
+		EE_Error::doing_it_wrong('EEH_Line_Item::create_default_event_subtotal()', __('Method replaced with EEH_Line_Item::create_event_subtotal()', 'event_espresso'), '4.6.0');
+		return self::create_event_subtotal($total_line_item, $transaction);
 	}
 
 

core/db_classes/EE_Datetime.class.php

Doc Comments +7 added lines, -7 removed lines

@@ -240,7 +240,7 @@ 
 	 * Sets qty of reserved tickets for this datetime
 	 *
 	 * @param int $reserved
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_reserved( $reserved ) {
 		// reserved can not go below zero
@@ -254,7 +254,7 @@ 
 	 * increments reserved by amount passed by $qty
 	 *
 	 * @param int $qty
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function increase_reserved( $qty = 1 ) {
 		$reserved = $this->reserved() + absint( $qty );
@@ -267,7 +267,7 @@ 
 	 * decrements (subtracts) reserved by amount passed by $qty
 	 *
 	 * @param int $qty
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function decrease_reserved( $qty = 1 ) {
 		$reserved = $this->reserved() - absint( $qty );
@@ -363,7 +363,7 @@ 
 	 *        get event start date.  Provide either the date format, or NULL to re-use the
 	 * last-used format, or '' to use the default date format
 	 *
-	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
+	 * @param string $dt_frmt - string representation of date format defaults to 'F j, Y'
 	 * @return        mixed        string on success, FALSE on fail
 	 */
 	public function start_date( $dt_frmt = NULL ) {
@@ -386,7 +386,7 @@ 
 	 *        get end date. Provide either the date format, or NULL to re-use the
 	 * last-used format, or '' to use the default date format
 	 *
-	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
+	 * @param string $dt_frmt - string representation of date format defaults to 'F j, Y'
 	 * @return        mixed        string on success, FALSE on fail
 	 */
 	public function end_date( $dt_frmt = NULL ) {
@@ -412,7 +412,7 @@ 
 	 * @param string $dt_frmt     - string representation of date format defaults to WP settings
 	 * @param string $conjunction - conjunction junction what's your function ? this string joins the start date with
 	 *                            the end date ie: Jan 01 "to" Dec 31
-	 * @return mixed        string on success, FALSE on fail
+	 * @return string        string on success, FALSE on fail
 	 * @throws \EE_Error
 	 */
 	public function date_range( $dt_frmt = NULL, $conjunction = ' - ' ) {
@@ -484,7 +484,7 @@ 
 	 * @param string $tm_format   string representation of time format defaults to 'g:i a'
 	 * @param string $conjunction conjunction junction what's your function ?
 	 *                            this string joins the start date with the end date ie: Jan 01 "to" Dec 31
-	 * @return mixed              string on success, FALSE on fail
+	 * @return string              string on success, FALSE on fail
 	 * @throws \EE_Error
 	 */
 	public function time_range( $tm_format = null, $conjunction = ' - ' ) {

Indentation +11 added lines, -11 removed lines

@@ -510,19 +510,19 @@ 
 	/**
 	 * This returns a range representation of the date and times.
 	 * Output is dependent on the difference (or similarity) between DTT_EVT_start and DTT_EVT_end.
-     * Also, the return value is localized.
-     *
-     * @param string $dt_format
+	 * Also, the return value is localized.
+	 *
+	 * @param string $dt_format
 	 * @param string $tm_format
 	 * @param string $conjunction used between two different dates or times.
-     *                            ex: Dec 1{$conjunction}}Dec 6, or 2pm{$conjunction}3pm
-     * @param string $separator   used between the date and time formats.
-     *                            ex: Dec 1, 2016{$separator}2pm
+	 *                            ex: Dec 1{$conjunction}}Dec 6, or 2pm{$conjunction}3pm
+	 * @param string $separator   used between the date and time formats.
+	 *                            ex: Dec 1, 2016{$separator}2pm
 	 * @return string
 	 * @throws \EE_Error
 	 */
 	public function date_and_time_range( $dt_format = '', $tm_format = '', $conjunction = ' - ' , $separator = ' '
-    ) {
+	) {
 		$dt_format = ! empty( $dt_format ) ? $dt_format : $this->_dt_frmt;
 		$tm_format = ! empty( $tm_format ) ? $tm_format : $this->_tm_frmt;
 		$full_format = $dt_format . $separator . $tm_format;
@@ -536,14 +536,14 @@ 
 			//start and end date are the same but times are different
 			case ( $this->start_date() === $this->end_date() ) :
 				$output = $this->get_i18n_datetime( 'DTT_EVT_start', $full_format )
-				          . $conjunction
-				          . $this->get_i18n_datetime( 'DTT_EVT_end', $tm_format );
+						  . $conjunction
+						  . $this->get_i18n_datetime( 'DTT_EVT_end', $tm_format );
 				break;
 			//all other conditions
 			default :
 				$output = $this->get_i18n_datetime( 'DTT_EVT_start', $full_format )
-				          . $conjunction
-				          . $this->get_i18n_datetime( 'DTT_EVT_end', $full_format );
+						  . $conjunction
+						  . $this->get_i18n_datetime( 'DTT_EVT_end', $full_format );
 				break;
 		}
 		return $output;

Spacing +151 added lines, -151 removed lines

@@ -1,5 +1,5 @@ 
-<?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
@@ -74,9 +74,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Datetime
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -87,8 +87,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Datetime
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -96,8 +96,8 @@ 
 	/**
 	 * @param $name
 	 */
-	public function set_name( $name ) {
-		$this->set( 'DTT_name', $name );
+	public function set_name($name) {
+		$this->set('DTT_name', $name);
 	}
 
 
@@ -105,8 +105,8 @@ 
 	/**
 	 * @param $description
 	 */
-	public function set_description( $description ) {
-		$this->set( 'DTT_description', $description );
+	public function set_description($description) {
+		$this->set('DTT_description', $description);
 	}
 
 
@@ -118,8 +118,8 @@ 
 	 *
 	 * @param        string $date a string representation of the event's date ex:  Dec. 25, 2025 or 12-25-2025
 	 */
-	public function set_start_date( $date ) {
-		$this->_set_date_for( $date, 'DTT_EVT_start' );
+	public function set_start_date($date) {
+		$this->_set_date_for($date, 'DTT_EVT_start');
 	}
 
 
@@ -131,8 +131,8 @@ 
 	 *
 	 * @param        string $time a string representation of the event time ex:  9am  or  7:30 PM
 	 */
-	public function set_start_time( $time ) {
-		$this->_set_time_for( $time, 'DTT_EVT_start' );
+	public function set_start_time($time) {
+		$this->_set_time_for($time, 'DTT_EVT_start');
 	}
 
 
@@ -144,8 +144,8 @@ 
 	 *
 	 * @param        string $date a string representation of the event's date ex:  Dec. 25, 2025 or 12-25-2025
 	 */
-	public function set_end_date( $date ) {
-		$this->_set_date_for( $date, 'DTT_EVT_end' );
+	public function set_end_date($date) {
+		$this->_set_date_for($date, 'DTT_EVT_end');
 	}
 
 
@@ -157,8 +157,8 @@ 
 	 *
 	 * @param        string $time a string representation of the event time ex:  9am  or  7:30 PM
 	 */
-	public function set_end_time( $time ) {
-		$this->_set_time_for( $time, 'DTT_EVT_end' );
+	public function set_end_time($time) {
+		$this->_set_time_for($time, 'DTT_EVT_end');
 	}
 
 
@@ -170,8 +170,8 @@ 
 	 *
 	 * @param        int $reg_limit
 	 */
-	public function set_reg_limit( $reg_limit ) {
-		$this->set( 'DTT_reg_limit', $reg_limit );
+	public function set_reg_limit($reg_limit) {
+		$this->set('DTT_reg_limit', $reg_limit);
 	}
 
 
@@ -183,7 +183,7 @@ 
 	 * @return        mixed        int on success, FALSE on fail
 	 */
 	public function sold() {
-		return $this->get_raw( 'DTT_sold' );
+		return $this->get_raw('DTT_sold');
 	}
 
 
@@ -193,10 +193,10 @@ 
 	 *
 	 * @param        int $sold
 	 */
-	public function set_sold( $sold ) {
+	public function set_sold($sold) {
 		// sold can not go below zero
-		$sold = max( 0, $sold );
-		$this->set( 'DTT_sold', $sold );
+		$sold = max(0, $sold);
+		$this->set('DTT_sold', $sold);
 	}
 
 
@@ -205,11 +205,11 @@ 
 	 * increments sold by amount passed by $qty
 	 * @param int $qty
 	 */
-	public function increase_sold( $qty = 1 ) {
+	public function increase_sold($qty = 1) {
 		$sold = $this->sold() + $qty;
 		// remove ticket reservation
-		$this->decrease_reserved( $qty );
-		$this->set_sold( $sold );
+		$this->decrease_reserved($qty);
+		$this->set_sold($sold);
 	}
 
 
@@ -218,9 +218,9 @@ 
 	 * decrements (subtracts) sold amount passed by $qty
 	 * @param int $qty
 	 */
-	public function decrease_sold( $qty = 1 ) {
+	public function decrease_sold($qty = 1) {
 		$sold = $this->sold() - $qty;
-		$this->set_sold( $sold );
+		$this->set_sold($sold);
 	}
 
 
@@ -231,7 +231,7 @@ 
 	 * @return int
 	 */
 	function reserved() {
-		return $this->get_raw( 'DTT_reserved' );
+		return $this->get_raw('DTT_reserved');
 	}
 
 
@@ -242,10 +242,10 @@ 
 	 * @param int $reserved
 	 * @return boolean
 	 */
-	function set_reserved( $reserved ) {
+	function set_reserved($reserved) {
 		// reserved can not go below zero
-		$reserved = max( 0, intval( $reserved ) );
-		$this->set( 'DTT_reserved', $reserved );
+		$reserved = max(0, intval($reserved));
+		$this->set('DTT_reserved', $reserved);
 	}
 
 
@@ -256,9 +256,9 @@ 
 	 * @param int $qty
 	 * @return boolean
 	 */
-	function increase_reserved( $qty = 1 ) {
-		$reserved = $this->reserved() + absint( $qty );
-		return $this->set_reserved( $reserved );
+	function increase_reserved($qty = 1) {
+		$reserved = $this->reserved() + absint($qty);
+		return $this->set_reserved($reserved);
 	}
 
 
@@ -269,9 +269,9 @@ 
 	 * @param int $qty
 	 * @return boolean
 	 */
-	function decrease_reserved( $qty = 1 ) {
-		$reserved = $this->reserved() - absint( $qty );
-		return $this->set_reserved( $reserved );
+	function decrease_reserved($qty = 1) {
+		$reserved = $this->reserved() - absint($qty);
+		return $this->set_reserved($reserved);
 	}
 
 
@@ -292,7 +292,7 @@ 
 	 * @return string
 	 */
 	public function name() {
-		return $this->get( 'DTT_name' );
+		return $this->get('DTT_name');
 	}
 
 
@@ -302,7 +302,7 @@ 
 	 * @return string
 	 */
 	public function description() {
-		return $this->get( 'DTT_description' );
+		return $this->get('DTT_description');
 	}
 
 
@@ -312,7 +312,7 @@ 
 	 * @return boolean          TRUE if is primary, FALSE if not.
 	 */
 	public function is_primary() {
-		return $this->get( 'DTT_is_primary' );
+		return $this->get('DTT_is_primary');
 	}
 
 
@@ -322,7 +322,7 @@ 
 	 * @return int         The order of the datetime for this event.
 	 */
 	public function order() {
-		return $this->get( 'DTT_order' );
+		return $this->get('DTT_order');
 	}
 
 
@@ -332,7 +332,7 @@ 
 	 * @return int
 	 */
 	public function parent() {
-		return $this->get( 'DTT_parent' );
+		return $this->get('DTT_parent');
 	}
 
 
@@ -348,10 +348,10 @@ 
 	 * @param    bool   $echo         - whether we echo or return (note echoing uses "pretty" formats, otherwise we use the standard formats)
 	 * @return    string|bool|void  string on success, FALSE on fail
 	 */
-	private function _show_datetime( $date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE ) {
+	private function _show_datetime($date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE) {
 		$field_name = "DTT_EVT_{$start_or_end}";
-		$dtt = $this->_get_datetime( $field_name, $dt_frmt, $tm_frmt, $date_or_time, $echo );
-		if ( ! $echo ) {
+		$dtt = $this->_get_datetime($field_name, $dt_frmt, $tm_frmt, $date_or_time, $echo);
+		if ( ! $echo) {
 			return $dtt;
 		}
 		return '';
@@ -366,8 +366,8 @@ 
 	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function start_date( $dt_frmt = NULL ) {
-		return $this->_show_datetime( 'D', 'start', $dt_frmt );
+	public function start_date($dt_frmt = NULL) {
+		return $this->_show_datetime('D', 'start', $dt_frmt);
 	}
 
 
@@ -376,8 +376,8 @@ 
 	 * Echoes start_date()
 	 * @param string $dt_frmt
 	 */
-	public function e_start_date( $dt_frmt = NULL ) {
-		$this->_show_datetime( 'D', 'start', $dt_frmt, NULL, TRUE );
+	public function e_start_date($dt_frmt = NULL) {
+		$this->_show_datetime('D', 'start', $dt_frmt, NULL, TRUE);
 	}
 
 
@@ -389,8 +389,8 @@ 
 	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function end_date( $dt_frmt = NULL ) {
-		return $this->_show_datetime( 'D', 'end', $dt_frmt );
+	public function end_date($dt_frmt = NULL) {
+		return $this->_show_datetime('D', 'end', $dt_frmt);
 	}
 
 
@@ -399,8 +399,8 @@ 
 	 * Echoes the end date. See end_date()
 	 * @param string $dt_frmt
 	 */
-	public function e_end_date( $dt_frmt = NULL ) {
-		$this->_show_datetime( 'D', 'end', $dt_frmt, NULL, TRUE );
+	public function e_end_date($dt_frmt = NULL) {
+		$this->_show_datetime('D', 'end', $dt_frmt, NULL, TRUE);
 	}
 
 
@@ -415,11 +415,11 @@ 
 	 * @return mixed        string on success, FALSE on fail
 	 * @throws \EE_Error
 	 */
-	public function date_range( $dt_frmt = NULL, $conjunction = ' - ' ) {
-		$dt_frmt = ! empty( $dt_frmt ) ? $dt_frmt : $this->_dt_frmt;
-		$start = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_start', $dt_frmt ) );
-		$end = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_end', $dt_frmt ) );
-		return $start !== $end ? $start . $conjunction . $end : $start;
+	public function date_range($dt_frmt = NULL, $conjunction = ' - ') {
+		$dt_frmt = ! empty($dt_frmt) ? $dt_frmt : $this->_dt_frmt;
+		$start = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_start', $dt_frmt));
+		$end = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_end', $dt_frmt));
+		return $start !== $end ? $start.$conjunction.$end : $start;
 	}
 
 
@@ -429,8 +429,8 @@ 
 	 * @param string $conjunction
 	 * @throws \EE_Error
 	 */
-	public function e_date_range( $dt_frmt = NULL, $conjunction = ' - ' ) {
-		echo $this->date_range( $dt_frmt, $conjunction );
+	public function e_date_range($dt_frmt = NULL, $conjunction = ' - ') {
+		echo $this->date_range($dt_frmt, $conjunction);
 	}
 
 
@@ -441,8 +441,8 @@ 
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function start_time( $tm_format = NULL ) {
-		return $this->_show_datetime( 'T', 'start', NULL, $tm_format );
+	public function start_time($tm_format = NULL) {
+		return $this->_show_datetime('T', 'start', NULL, $tm_format);
 	}
 
 
@@ -450,8 +450,8 @@ 
 	/**
 	 * @param null $tm_format
 	 */
-	public function e_start_time( $tm_format = NULL ) {
-		$this->_show_datetime( 'T', 'start', NULL, $tm_format, TRUE );
+	public function e_start_time($tm_format = NULL) {
+		$this->_show_datetime('T', 'start', NULL, $tm_format, TRUE);
 	}
 
 
@@ -462,8 +462,8 @@ 
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
 	 * @return        mixed        string on success, FALSE on fail
 	 */
-	public function end_time( $tm_format = NULL ) {
-		return $this->_show_datetime( 'T', 'end', NULL, $tm_format );
+	public function end_time($tm_format = NULL) {
+		return $this->_show_datetime('T', 'end', NULL, $tm_format);
 	}
 
 
@@ -471,8 +471,8 @@ 
 	/**
 	 * @param null $tm_format
 	 */
-	public function e_end_time( $tm_format = NULL ) {
-		$this->_show_datetime( 'T', 'end', NULL, $tm_format, TRUE );
+	public function e_end_time($tm_format = NULL) {
+		$this->_show_datetime('T', 'end', NULL, $tm_format, TRUE);
 	}
 
 
@@ -487,11 +487,11 @@ 
 	 * @return mixed              string on success, FALSE on fail
 	 * @throws \EE_Error
 	 */
-	public function time_range( $tm_format = null, $conjunction = ' - ' ) {
-		$tm_format = !empty( $tm_format ) ? $tm_format : $this->_tm_frmt;
-		$start = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_start', $tm_format ) );
-		$end = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_end',  $tm_format ) );
-		return $start !== $end ? $start . $conjunction . $end : $start;
+	public function time_range($tm_format = null, $conjunction = ' - ') {
+		$tm_format = ! empty($tm_format) ? $tm_format : $this->_tm_frmt;
+		$start = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_start', $tm_format));
+		$end = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_end', $tm_format));
+		return $start !== $end ? $start.$conjunction.$end : $start;
 	}
 
 
@@ -501,8 +501,8 @@ 
 	 * @param string $conjunction
 	 * @throws \EE_Error
 	 */
-	public function e_time_range( $tm_format = NULL, $conjunction = ' - ' ) {
-		echo $this->time_range( $tm_format, $conjunction );
+	public function e_time_range($tm_format = NULL, $conjunction = ' - ') {
+		echo $this->time_range($tm_format, $conjunction);
 	}
 
 
@@ -521,29 +521,29 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function date_and_time_range( $dt_format = '', $tm_format = '', $conjunction = ' - ' , $separator = ' '
+	public function date_and_time_range($dt_format = '', $tm_format = '', $conjunction = ' - ', $separator = ' '
     ) {
-		$dt_format = ! empty( $dt_format ) ? $dt_format : $this->_dt_frmt;
-		$tm_format = ! empty( $tm_format ) ? $tm_format : $this->_tm_frmt;
-		$full_format = $dt_format . $separator . $tm_format;
+		$dt_format = ! empty($dt_format) ? $dt_format : $this->_dt_frmt;
+		$tm_format = ! empty($tm_format) ? $tm_format : $this->_tm_frmt;
+		$full_format = $dt_format.$separator.$tm_format;
 
 		//the range output depends on various conditions
-		switch ( true ) {
+		switch (true) {
 			//start date timestamp and end date timestamp are the same.
-			case ( $this->get_raw( 'DTT_EVT_start' ) === $this->get_raw( 'DTT_EVT_end' ) ) :
-				$output = $this->get_i18n_datetime( 'DTT_EVT_start', $full_format );
+			case ($this->get_raw('DTT_EVT_start') === $this->get_raw('DTT_EVT_end')) :
+				$output = $this->get_i18n_datetime('DTT_EVT_start', $full_format);
 				break;
 			//start and end date are the same but times are different
-			case ( $this->start_date() === $this->end_date() ) :
-				$output = $this->get_i18n_datetime( 'DTT_EVT_start', $full_format )
+			case ($this->start_date() === $this->end_date()) :
+				$output = $this->get_i18n_datetime('DTT_EVT_start', $full_format)
 				          . $conjunction
-				          . $this->get_i18n_datetime( 'DTT_EVT_end', $tm_format );
+				          . $this->get_i18n_datetime('DTT_EVT_end', $tm_format);
 				break;
 			//all other conditions
 			default :
-				$output = $this->get_i18n_datetime( 'DTT_EVT_start', $full_format )
+				$output = $this->get_i18n_datetime('DTT_EVT_start', $full_format)
 				          . $conjunction
-				          . $this->get_i18n_datetime( 'DTT_EVT_end', $full_format );
+				          . $this->get_i18n_datetime('DTT_EVT_end', $full_format);
 				break;
 		}
 		return $output;
@@ -561,8 +561,8 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function e_date_and_time_range( $dt_format = '', $tm_format = '', $conjunction = ' - ' ) {
-		echo $this->date_and_time_range( $dt_format, $tm_format, $conjunction );
+	public function e_date_and_time_range($dt_format = '', $tm_format = '', $conjunction = ' - ') {
+		echo $this->date_and_time_range($dt_format, $tm_format, $conjunction);
 	}
 
 
@@ -574,8 +574,8 @@ 
 	 * @param 	string 	$tm_format - string representation of time format defaults to 'g:i a'
 	 * @return 	mixed 	string on success, FALSE on fail
 	 */
-	public function start_date_and_time( $dt_format = NULL, $tm_format = NULL ) {
-		return $this->_show_datetime( '', 'start', $dt_format, $tm_format );
+	public function start_date_and_time($dt_format = NULL, $tm_format = NULL) {
+		return $this->_show_datetime('', 'start', $dt_format, $tm_format);
 	}
 
 
@@ -584,8 +584,8 @@ 
 	 * @param null $dt_frmt
 	 * @param null $tm_format
 	 */
-	public function e_start_date_and_time( $dt_frmt = NULL, $tm_format = NULL ) {
-		$this->_show_datetime( '', 'start', $dt_frmt, $tm_format, TRUE );
+	public function e_start_date_and_time($dt_frmt = NULL, $tm_format = NULL) {
+		$this->_show_datetime('', 'start', $dt_frmt, $tm_format, TRUE);
 	}
 
 
@@ -599,11 +599,11 @@ 
 	 * @param bool   $round_up
 	 * @return float|int|mixed
 	 */
-	public function length( $units = 'seconds', $round_up = FALSE ) {
-		$start = $this->get_raw( 'DTT_EVT_start' );
-		$end = $this->get_raw( 'DTT_EVT_end' );
+	public function length($units = 'seconds', $round_up = FALSE) {
+		$start = $this->get_raw('DTT_EVT_start');
+		$end = $this->get_raw('DTT_EVT_end');
 		$length_in_units = $end - $start;
-		switch ( $units ) {
+		switch ($units) {
 			//NOTE: We purposefully don't use "break;" in order to chain the divisions
 			/** @noinspection PhpMissingBreakStatementInspection */
 			case 'days':
@@ -616,10 +616,10 @@ 
 				$length_in_units /= 60;
 			case 'seconds':
 			default:
-				$length_in_units = ceil( $length_in_units );
+				$length_in_units = ceil($length_in_units);
 		}
-		if ( $round_up ) {
-			$length_in_units = max( $length_in_units, 1 );
+		if ($round_up) {
+			$length_in_units = max($length_in_units, 1);
 		}
 		return $length_in_units;
 	}
@@ -633,8 +633,8 @@ 
 	 * @param bool | string 	$tm_format - string representation of time format defaults to 'g:i a'
 	 * @return 	mixed        		string on success, FALSE on fail
 	 */
-	public function end_date_and_time( $dt_frmt = FALSE, $tm_format = FALSE ) {
-		return $this->_show_datetime( '', 'end', $dt_frmt, $tm_format );
+	public function end_date_and_time($dt_frmt = FALSE, $tm_format = FALSE) {
+		return $this->_show_datetime('', 'end', $dt_frmt, $tm_format);
 	}
 
 
@@ -643,8 +643,8 @@ 
 	 * @param bool $dt_frmt
 	 * @param bool $tm_format
 	 */
-	public function e_end_date_and_time( $dt_frmt = FALSE, $tm_format = FALSE ) {
-		$this->_show_datetime( '', 'end', $dt_frmt, $tm_format, TRUE );
+	public function e_end_date_and_time($dt_frmt = FALSE, $tm_format = FALSE) {
+		$this->_show_datetime('', 'end', $dt_frmt, $tm_format, TRUE);
 	}
 
 
@@ -655,7 +655,7 @@ 
 	 * @return        int
 	 */
 	public function start() {
-		return $this->get_raw( 'DTT_EVT_start' );
+		return $this->get_raw('DTT_EVT_start');
 	}
 
 
@@ -666,7 +666,7 @@ 
 	 * @return        int
 	 */
 	public function end() {
-		return $this->get_raw( 'DTT_EVT_end' );
+		return $this->get_raw('DTT_EVT_end');
 	}
 
 
@@ -677,7 +677,7 @@ 
 	 * @return        mixed        int on success, FALSE on fail
 	 */
 	public function reg_limit() {
-		return $this->get_raw( 'DTT_reg_limit' );
+		return $this->get_raw('DTT_reg_limit');
 	}
 
 
@@ -705,15 +705,15 @@ 
 	 * 																	the spaces remaining for this particular datetime, hence the flag.
 	 * @return 	int
 	 */
-	public function spaces_remaining( $consider_tickets = FALSE ) {
+	public function spaces_remaining($consider_tickets = FALSE) {
 		// tickets remaining available for purchase
 		//no need for special checks for infinite, because if DTT_reg_limit == EE_INF, then EE_INF - x = EE_INF
 		$dtt_remaining = $this->reg_limit() - $this->sold();
-		if ( ! $consider_tickets ) {
+		if ( ! $consider_tickets) {
 			return $dtt_remaining;
 		}
 		$tickets_remaining = $this->tickets_remaining();
-		return min( $dtt_remaining, $tickets_remaining );
+		return min($dtt_remaining, $tickets_remaining);
 	}
 
 
@@ -724,19 +724,19 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return int
 	 */
-	public function tickets_remaining( $query_params = array() ) {
+	public function tickets_remaining($query_params = array()) {
 		$sum = 0;
-		$tickets = $this->tickets( $query_params );
-		if ( ! empty( $tickets ) ) {
-			foreach ( $tickets as $ticket ) {
-				if ( $ticket instanceof EE_Ticket ) {
+		$tickets = $this->tickets($query_params);
+		if ( ! empty($tickets)) {
+			foreach ($tickets as $ticket) {
+				if ($ticket instanceof EE_Ticket) {
 					// get the actual amount of tickets that can be sold
-					$qty = $ticket->qty( 'saleable' );
-					if ( $qty === EE_INF ) {
+					$qty = $ticket->qty('saleable');
+					if ($qty === EE_INF) {
 						return EE_INF;
 					}
 					// no negative ticket quantities plz
-					if ( $qty > 0 ) {
+					if ($qty > 0) {
 						$sum += $qty;
 					}
 				}
@@ -753,8 +753,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return int
 	 */
-	public function sum_tickets_initially_available( $query_params = array() ) {
-		return $this->sum_related( 'Ticket', $query_params, 'TKT_qty' );
+	public function sum_tickets_initially_available($query_params = array()) {
+		return $this->sum_related('Ticket', $query_params, 'TKT_qty');
 	}
 
 
@@ -766,7 +766,7 @@ 
 	 * @return int
 	 */
 	public function total_tickets_available_at_this_datetime() {
-		return $this->spaces_remaining( true );
+		return $this->spaces_remaining(true);
 	}
 
 
@@ -777,7 +777,7 @@ 
 	 * @return boolean
 	 */
 	public function is_upcoming() {
-		return ( $this->get_raw( 'DTT_EVT_start' ) > time() );
+		return ($this->get_raw('DTT_EVT_start') > time());
 	}
 
 
@@ -787,7 +787,7 @@ 
 	 * @return boolean
 	 */
 	public function is_active() {
-		return ( $this->get_raw( 'DTT_EVT_start' ) < time() && $this->get_raw( 'DTT_EVT_end' ) > time() );
+		return ($this->get_raw('DTT_EVT_start') < time() && $this->get_raw('DTT_EVT_end') > time());
 	}
 
 
@@ -797,7 +797,7 @@ 
 	 * @return boolean
 	 */
 	public function is_expired() {
-		return ( $this->get_raw( 'DTT_EVT_end' ) < time() );
+		return ($this->get_raw('DTT_EVT_end') < time());
 	}
 
 
@@ -808,16 +808,16 @@ 
 	 */
 	public function get_active_status() {
 		$total_tickets_for_this_dtt = $this->total_tickets_available_at_this_datetime();
-		if ( $total_tickets_for_this_dtt !== FALSE && $total_tickets_for_this_dtt < 1 ) {
+		if ($total_tickets_for_this_dtt !== FALSE && $total_tickets_for_this_dtt < 1) {
 			return EE_Datetime::sold_out;
 		}
-		if ( $this->is_expired() ) {
+		if ($this->is_expired()) {
 			return EE_Datetime::expired;
 		}
-		if ( $this->is_upcoming() ) {
+		if ($this->is_upcoming()) {
 			return EE_Datetime::upcoming;
 		}
-		if ( $this->is_active() ) {
+		if ($this->is_active()) {
 			return EE_Datetime::active;
 		}
 		return NULL;
@@ -831,24 +831,24 @@ 
 	 * @param  boolean $use_dtt_name if TRUE then we'll use DTT->name() if its not empty.
 	 * @return string
 	 */
-	public function get_dtt_display_name( $use_dtt_name = FALSE ) {
-		if ( $use_dtt_name ) {
+	public function get_dtt_display_name($use_dtt_name = FALSE) {
+		if ($use_dtt_name) {
 			$dtt_name = $this->name();
-			if ( !empty( $dtt_name ) ) {
+			if ( ! empty($dtt_name)) {
 				return $dtt_name;
 			}
 		}
 		//first condition is to see if the months are different
-		if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) ) {
-			$display_date = $this->start_date( 'M j\, Y g:i a' ) . ' - ' . $this->end_date( 'M j\, Y g:i a' );
+		if (date('m', $this->get_raw('DTT_EVT_start')) != date('m', $this->get_raw('DTT_EVT_end'))) {
+			$display_date = $this->start_date('M j\, Y g:i a').' - '.$this->end_date('M j\, Y g:i a');
 			//next condition is if its the same month but different day
 		}
 		else {
-			if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) == date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) && date( 'd', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'd', $this->get_raw( 'DTT_EVT_end' ) ) ) {
-				$display_date = $this->start_date( 'M j\, g:i a' ) . ' - ' . $this->end_date( 'M j\, g:i a Y' );
+			if (date('m', $this->get_raw('DTT_EVT_start')) == date('m', $this->get_raw('DTT_EVT_end')) && date('d', $this->get_raw('DTT_EVT_start')) != date('d', $this->get_raw('DTT_EVT_end'))) {
+				$display_date = $this->start_date('M j\, g:i a').' - '.$this->end_date('M j\, g:i a Y');
 			}
 			else {
-				$display_date = $this->start_date( 'F j\, Y' ) . ' @ ' . $this->start_date( 'g:i a' ) . ' - ' . $this->end_date( 'g:i a' );
+				$display_date = $this->start_date('F j\, Y').' @ '.$this->start_date('g:i a').' - '.$this->end_date('g:i a');
 			}
 		}
 		return $display_date;
@@ -862,8 +862,8 @@ 
 *@param array $query_params see EEM_Base::get_all()
 	 * @return EE_Ticket[]
 	 */
-	public function tickets( $query_params = array() ) {
-		return $this->get_many_related( 'Ticket', $query_params );
+	public function tickets($query_params = array()) {
+		return $this->get_many_related('Ticket', $query_params);
 	}
 
 
@@ -873,21 +873,21 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return EE_Ticket[]
 	 */
-	public function ticket_types_available_for_purchase( $query_params = array() ) {
+	public function ticket_types_available_for_purchase($query_params = array()) {
 		// first check if datetime is valid
-		if ( ! ( $this->is_upcoming() || $this->is_active() ) || $this->sold_out() ) {
+		if ( ! ($this->is_upcoming() || $this->is_active()) || $this->sold_out()) {
 			return array();
 		}
-		if ( empty( $query_params ) ) {
+		if (empty($query_params)) {
 			$query_params = array(
 				array(
-					'TKT_start_date' => array( '<=', EEM_Ticket::instance()->current_time_for_query( 'TKT_start_date' ) ),
-					'TKT_end_date'   => array( '>=', EEM_Ticket::instance()->current_time_for_query( 'TKT_end_date' ) ),
+					'TKT_start_date' => array('<=', EEM_Ticket::instance()->current_time_for_query('TKT_start_date')),
+					'TKT_end_date'   => array('>=', EEM_Ticket::instance()->current_time_for_query('TKT_end_date')),
 					'TKT_deleted'    => false
 				)
 			);
 		}
-		return $this->tickets( $query_params );
+		return $this->tickets($query_params);
 	}
 
 
@@ -897,7 +897,7 @@ 
 	 * @return EE_Event
 	 */
 	public function event() {
-		return $this->get_first_related( 'Event' );
+		return $this->get_first_related('Event');
 	}
 
 
@@ -909,13 +909,13 @@ 
 	 */
 	public function update_sold() {
 		$count_regs_for_this_datetime = EEM_Registration::instance()->count(
-			array( array(
+			array(array(
 				'STS_ID' 					=> EEM_Registration::status_id_approved,
 				'REG_deleted' 				=> 0,
 				'Ticket.Datetime.DTT_ID' 	=> $this->ID(),
-			) )
+			))
 		);
-		$this->set( 'DTT_sold', $count_regs_for_this_datetime );
+		$this->set('DTT_sold', $count_regs_for_this_datetime);
 		$this->save();
 		return $count_regs_for_this_datetime;
 	}

modules/single_page_checkout/inc/EE_SPCO_JSON_Response.php

Spacing +40 added lines, -40 removed lines

@@ -107,71 +107,71 @@ 
 	public function __toString() {
 		$JSON_response = array();
 		// grab notices
-		$notices = EE_Error::get_notices( FALSE );
-		$this->set_attention( isset( $notices['attention'] ) ? $notices['attention'] : '' );
-		$this->set_errors( isset( $notices['errors'] ) ? $notices['errors'] : '' );
-		$this->set_success( isset( $notices['success'] ) ? $notices['success'] : '' );
+		$notices = EE_Error::get_notices(FALSE);
+		$this->set_attention(isset($notices['attention']) ? $notices['attention'] : '');
+		$this->set_errors(isset($notices['errors']) ? $notices['errors'] : '');
+		$this->set_success(isset($notices['success']) ? $notices['success'] : '');
 		// add notices to JSON response, but only if they exist
-		if ( $this->attention() ) {
+		if ($this->attention()) {
 			$JSON_response['attention'] = $this->attention();
 		}
-		if ( $this->errors() ) {
+		if ($this->errors()) {
 			$JSON_response['errors'] = $this->errors();
 		}
-		if ( $this->unexpected_errors() ) {
+		if ($this->unexpected_errors()) {
 			$JSON_response['unexpected_errors'] = $this->unexpected_errors();
 		}
-		if ( $this->success() ) {
+		if ($this->success()) {
 			$JSON_response['success'] = $this->success();
 		}
 		// but if NO notices are set... at least set the "success" as a key so that the JS knows everything worked
-		if ( ! isset( $JSON_response[ 'attention' ] ) && ! isset( $JSON_response[ 'errors' ] ) && ! isset( $JSON_response[ 'success' ] ) ) {
+		if ( ! isset($JSON_response['attention']) && ! isset($JSON_response['errors']) && ! isset($JSON_response['success'])) {
 			$JSON_response['success'] = null;
 		}
 		// set redirect_url, IF it exists
-		if ( $this->redirect_url() ) {
+		if ($this->redirect_url()) {
 			$JSON_response['redirect_url'] = $this->redirect_url();
 		}
 		// set registration_time_limit, IF it exists
-		if ( $this->registration_time_limit() ) {
+		if ($this->registration_time_limit()) {
 			$JSON_response['registration_time_limit'] = $this->registration_time_limit();
 		}
 		// set payment_amount, IF it exists
-		if ( $this->payment_amount() !== null ) {
-			$JSON_response[ 'payment_amount' ] = $this->payment_amount();
+		if ($this->payment_amount() !== null) {
+			$JSON_response['payment_amount'] = $this->payment_amount();
 		}
 		// grab generic return data
 		$return_data = $this->return_data();
 		// add billing form validation rules
-		if ( $this->validation_rules() ) {
+		if ($this->validation_rules()) {
 			$return_data['validation_rules'] = $this->validation_rules();
 		}
 		// set reg_step_html, IF it exists
-		if ( $this->reg_step_html() ) {
+		if ($this->reg_step_html()) {
 			$return_data['reg_step_html'] = $this->reg_step_html();
 		}
 		// set method of payment, IF it exists
-		if ( $this->method_of_payment() ) {
+		if ($this->method_of_payment()) {
 			$return_data['method_of_payment'] = $this->method_of_payment();
 		}
 		// set "plz_select_method_of_payment" message, IF it exists
-		if ( $this->plz_select_method_of_payment() ) {
+		if ($this->plz_select_method_of_payment()) {
 			$return_data['plz_select_method_of_payment'] = $this->plz_select_method_of_payment();
 		}
 		// set redirect_form, IF it exists
-		if ( $this->redirect_form() ) {
+		if ($this->redirect_form()) {
 			$return_data['redirect_form'] = $this->redirect_form();
 		}
 		// and finally, add return_data array to main JSON response array, IF it contains anything
 		// why did we add some of the above properties to the return data array?
 		// because it is easier and cleaner in the Javascript to deal with this way
-		if ( ! empty( $return_data )) {
+		if ( ! empty($return_data)) {
 			$JSON_response['return_data'] = $return_data;
 		}
 		// filter final array
-		$JSON_response = apply_filters( 'FHEE__EE_SPCO_JSON_Response___toString__JSON_response', $JSON_response );
+		$JSON_response = apply_filters('FHEE__EE_SPCO_JSON_Response___toString__JSON_response', $JSON_response);
 		// return encoded array
-		return wp_json_encode( $JSON_response );
+		return wp_json_encode($JSON_response);
 	}
 
 
@@ -179,7 +179,7 @@ 
 	/**
 	 * @param string $attention
 	 */
-	public function set_attention( $attention ) {
+	public function set_attention($attention) {
 		$this->_attention = $attention;
 	}
 
@@ -197,7 +197,7 @@ 
 	/**
 	 * @param string $errors
 	 */
-	public function set_errors( $errors ) {
+	public function set_errors($errors) {
 		$this->_errors = $errors;
 	}
 
@@ -224,7 +224,7 @@ 
 	/**
 	 * @param string $unexpected_errors
 	 */
-	public function set_unexpected_errors( $unexpected_errors ) {
+	public function set_unexpected_errors($unexpected_errors) {
 		$this->_unexpected_errors = $unexpected_errors;
 	}
 
@@ -233,7 +233,7 @@ 
 	/**
 	 * @param string $success
 	 */
-	public function set_success( $success ) {
+	public function set_success($success) {
 		$this->_success = $success;
 	}
 
@@ -251,7 +251,7 @@ 
 	/**
 	 * @param string $method_of_payment
 	 */
-	public function set_method_of_payment( $method_of_payment ) {
+	public function set_method_of_payment($method_of_payment) {
 		$this->_method_of_payment = $method_of_payment;
 	}
 
@@ -278,8 +278,8 @@ 
 	/**
 	 * @param float $payment_amount
 	 */
-	public function set_payment_amount( $payment_amount ) {
-		$this->_payment_amount = EEH_Money::convert_to_float_from_localized_money( $payment_amount );
+	public function set_payment_amount($payment_amount) {
+		$this->_payment_amount = EEH_Money::convert_to_float_from_localized_money($payment_amount);
 	}
 
 
@@ -287,7 +287,7 @@ 
 	/**
 	 * @param string $next_step_html
 	 */
-	public function set_reg_step_html( $next_step_html ) {
+	public function set_reg_step_html($next_step_html) {
 		$this->_reg_step_html = $next_step_html;
 	}
 
@@ -305,7 +305,7 @@ 
 	/**
 	 * @param string $redirect_form
 	 */
-	public function set_redirect_form( $redirect_form ) {
+	public function set_redirect_form($redirect_form) {
 		$this->_redirect_form = $redirect_form;
 	}
 
@@ -315,7 +315,7 @@ 
 	 * @return string
 	 */
 	public function redirect_form() {
-		return ! empty( $this->_redirect_form ) ? $this->_redirect_form : FALSE;
+		return ! empty($this->_redirect_form) ? $this->_redirect_form : FALSE;
 	}
 
 
@@ -323,7 +323,7 @@ 
 	/**
 	 * @param string $plz_select_method_of_payment
 	 */
-	public function set_plz_select_method_of_payment( $plz_select_method_of_payment ) {
+	public function set_plz_select_method_of_payment($plz_select_method_of_payment) {
 		$this->_plz_select_method_of_payment = $plz_select_method_of_payment;
 	}
 
@@ -341,7 +341,7 @@ 
 	/**
 	 * @param string $redirect_url
 	 */
-	public function set_redirect_url( $redirect_url ) {
+	public function set_redirect_url($redirect_url) {
 		$this->_redirect_url = $redirect_url;
 	}
 
@@ -368,7 +368,7 @@ 
 	/**
 	 * @param string $registration_time_limit
 	 */
-	public function set_registration_time_limit( $registration_time_limit ) {
+	public function set_registration_time_limit($registration_time_limit) {
 		$this->_registration_time_limit = $registration_time_limit;
 	}
 
@@ -377,8 +377,8 @@ 
 	/**
 	 * @param array $return_data
 	 */
-	public function set_return_data( $return_data ) {
-		$this->_return_data = array_merge( $this->_return_data, $return_data );
+	public function set_return_data($return_data) {
+		$this->_return_data = array_merge($this->_return_data, $return_data);
 	}
 
 
@@ -395,9 +395,9 @@ 
 	/**
 	 * @param array $validation_rules
 	 */
-	public function add_validation_rules( $validation_rules = array() ) {
-		if ( is_array( $validation_rules ) && ! empty( $validation_rules )) {
-			$this->_validation_rules = array_merge( $this->_validation_rules, $validation_rules );
+	public function add_validation_rules($validation_rules = array()) {
+		if (is_array($validation_rules) && ! empty($validation_rules)) {
+			$this->_validation_rules = array_merge($this->_validation_rules, $validation_rules);
 		}
 	}
 
@@ -407,7 +407,7 @@ 
 	 * @return array | bool
 	 */
 	public function validation_rules() {
-		return ! empty( $this->_validation_rules ) ? $this->_validation_rules : FALSE;
+		return ! empty($this->_validation_rules) ? $this->_validation_rules : FALSE;
 	}
 
 

core/data_migration_scripts/EE_DMS_Core_4_9_0.dms.php

Spacing +5 added lines, -5 removed lines

@@ -9,7 +9,7 @@ 
 //unfortunately, this needs to be done upon INCLUSION of this file,
 //instead of construction, because it only gets constructed on first page load
 //(all other times it gets resurrected from a wordpress option)
-$stages = glob(EE_CORE . 'data_migration_scripts/4_9_0_stages/*');
+$stages = glob(EE_CORE.'data_migration_scripts/4_9_0_stages/*');
 $class_to_filepath = array();
 foreach ($stages as $filepath) {
     $matches = array();
@@ -67,7 +67,7 @@ 
         } elseif ( ! $version_string) {
             //			echo "no version string provided: $version_string";
             //no version string provided... this must be pre 4.3
-            return false;//changed mind. dont want people thinking they should migrate yet because they cant
+            return false; //changed mind. dont want people thinking they should migrate yet because they cant
         } else {
             //			echo "$version_string doesnt apply";
             return false;
@@ -91,7 +91,7 @@ 
      */
     public function schema_changes_before_migration()
     {
-        require_once(EE_HELPERS . 'EEH_Activation.helper.php');
+        require_once(EE_HELPERS.'EEH_Activation.helper.php');
         $now_in_mysql = current_time('mysql', true);
         $table_name = 'esp_answer';
         $sql = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -674,13 +674,13 @@ 
         );
         foreach ($addon_tables as $table_name) {
             $complete_table_name = $this->_table_analysis->ensureTableNameHasPrefix($table_name);
-            if($this->_table_analysis->tableExists( $complete_table_name )){
+            if ($this->_table_analysis->tableExists($complete_table_name)) {
                 $tables_to_check[] = $complete_table_name;
             }
         }
         $tables_to_check = array_unique($tables_to_check);
         foreach ($tables_to_check as $table_name) {
-            if ( ! apply_filters('FHEE__EE_DMS_Core_4_9_0__verify_db_collations__check_overridden', false, $table_name ) ) {
+            if ( ! apply_filters('FHEE__EE_DMS_Core_4_9_0__verify_db_collations__check_overridden', false, $table_name)) {
                 maybe_convert_table_to_utf8mb4($table_name);
             }
         }

Indentation +247 added lines, -247 removed lines

@@ -12,9 +12,9 @@ 
 $stages = glob(EE_CORE . 'data_migration_scripts/4_9_0_stages/*');
 $class_to_filepath = array();
 foreach ($stages as $filepath) {
-    $matches = array();
-    preg_match('~4_9_0_stages/(.*).dmsstage.php~', $filepath, $matches);
-    $class_to_filepath[$matches[1]] = $filepath;
+	$matches = array();
+	preg_match('~4_9_0_stages/(.*).dmsstage.php~', $filepath, $matches);
+	$class_to_filepath[$matches[1]] = $filepath;
 }
 //give addons a chance to autoload their stages too
 $class_to_filepath = apply_filters('FHEE__EE_DMS_4_9_0__autoloaded_stages', $class_to_filepath);
@@ -33,67 +33,67 @@ 
 class EE_DMS_Core_4_9_0 extends EE_Data_Migration_Script_Base
 {
 
-    /**
-     * return EE_DMS_Core_4_9_0
-     *
-     * @param TableManager  $table_manager
-     * @param TableAnalysis $table_analysis
-     */
-    public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null)
-    {
-        $this->_pretty_name = esc_html__("Data Update to Event Espresso 4.9.0", "event_espresso");
-        $this->_priority = 10;
-        $this->_migration_stages = array(
-            new EE_DMS_4_9_0_Email_System_Question(),
-            new EE_DMS_4_9_0_Answers_With_No_Registration(),
-        );
-        parent::__construct($table_manager, $table_analysis);
-    }
+	/**
+	 * return EE_DMS_Core_4_9_0
+	 *
+	 * @param TableManager  $table_manager
+	 * @param TableAnalysis $table_analysis
+	 */
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null)
+	{
+		$this->_pretty_name = esc_html__("Data Update to Event Espresso 4.9.0", "event_espresso");
+		$this->_priority = 10;
+		$this->_migration_stages = array(
+			new EE_DMS_4_9_0_Email_System_Question(),
+			new EE_DMS_4_9_0_Answers_With_No_Registration(),
+		);
+		parent::__construct($table_manager, $table_analysis);
+	}
 
 
 
-    /**
-     * Whether to migrate or not.
-     *
-     * @param array $version_array
-     * @return bool
-     */
-    public function can_migrate_from_version($version_array)
-    {
-        $version_string = $version_array['Core'];
-        if (version_compare($version_string, '4.9.0', '<=') && version_compare($version_string, '4.8.0', '>=')) {
-            //			echo "$version_string can be migrated from";
-            return true;
-        } elseif ( ! $version_string) {
-            //			echo "no version string provided: $version_string";
-            //no version string provided... this must be pre 4.3
-            return false;//changed mind. dont want people thinking they should migrate yet because they cant
-        } else {
-            //			echo "$version_string doesnt apply";
-            return false;
-        }
-    }
+	/**
+	 * Whether to migrate or not.
+	 *
+	 * @param array $version_array
+	 * @return bool
+	 */
+	public function can_migrate_from_version($version_array)
+	{
+		$version_string = $version_array['Core'];
+		if (version_compare($version_string, '4.9.0', '<=') && version_compare($version_string, '4.8.0', '>=')) {
+			//			echo "$version_string can be migrated from";
+			return true;
+		} elseif ( ! $version_string) {
+			//			echo "no version string provided: $version_string";
+			//no version string provided... this must be pre 4.3
+			return false;//changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
+			//			echo "$version_string doesnt apply";
+			return false;
+		}
+	}
 
 
 
-    /**
-     * @return bool
-     */
-    public function schema_changes_before_migration()
-    {
-        require_once(EE_HELPERS . 'EEH_Activation.helper.php');
-        $now_in_mysql = current_time('mysql', true);
-        $table_name = 'esp_answer';
-        $sql = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+	/**
+	 * @return bool
+	 */
+	public function schema_changes_before_migration()
+	{
+		require_once(EE_HELPERS . 'EEH_Activation.helper.php');
+		$now_in_mysql = current_time('mysql', true);
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					ANS_value text NOT NULL,
 					PRIMARY KEY  (ANS_ID),
 					KEY REG_ID (REG_ID),
 					KEY QST_ID (QST_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_attendee_meta';
-        $sql = "ATTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_attendee_meta';
+		$sql = "ATTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				ATT_ID bigint(20) unsigned NOT NULL,
 				ATT_fname varchar(45) NOT NULL,
 				ATT_lname varchar(45) NOT	NULL,
@@ -110,9 +110,9 @@ 
 				KEY ATT_email (ATT_email),
 				KEY ATT_lname (ATT_lname),
 				KEY ATT_fname (ATT_fname)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_checkin';
-        $sql = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_checkin';
+		$sql = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				REG_ID int(10) unsigned NOT NULL,
 				DTT_ID int(10) unsigned NOT NULL,
 				CHK_in tinyint(1) unsigned NOT NULL DEFAULT 1,
@@ -120,9 +120,9 @@ 
 				PRIMARY KEY  (CHK_ID),
 				KEY REG_ID (REG_ID),
 				KEY DTT_ID (DTT_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_country';
-        $sql = "CNT_ISO varchar(2) NOT NULL,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_country';
+		$sql = "CNT_ISO varchar(2) NOT NULL,
 				CNT_ISO3 varchar(3) NOT NULL,
 				RGN_ID tinyint(3) unsigned DEFAULT NULL,
 				CNT_name varchar(45) NOT NULL,
@@ -138,25 +138,25 @@ 
 				CNT_is_EU tinyint(1) DEFAULT '0',
 				CNT_active tinyint(1) DEFAULT '0',
 				PRIMARY KEY  (CNT_ISO)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_currency';
-        $sql = "CUR_code varchar(6) NOT NULL,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_currency';
+		$sql = "CUR_code varchar(6) NOT NULL,
 				CUR_single varchar(45) DEFAULT 'dollar',
 				CUR_plural varchar(45) DEFAULT 'dollars',
 				CUR_sign varchar(45) DEFAULT '$',
 				CUR_dec_plc varchar(1) NOT NULL DEFAULT '2',
 				CUR_active tinyint(1) DEFAULT '0',
 				PRIMARY KEY  (CUR_code)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_currency_payment_method';
-        $sql = "CPM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_currency_payment_method';
+		$sql = "CPM_ID int(11) NOT NULL AUTO_INCREMENT,
 				CUR_code varchar(6) NOT NULL,
 				PMD_ID int(11) NOT NULL,
 				PRIMARY KEY  (CPM_ID),
 				KEY PMD_ID (PMD_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_datetime';
-        $sql = "DTT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_datetime';
+		$sql = "DTT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				DTT_name varchar(255) NOT NULL DEFAULT '',
 				DTT_description text NOT NULL,
@@ -173,25 +173,25 @@ 
 				KEY DTT_EVT_start (DTT_EVT_start),
 				KEY EVT_ID (EVT_ID),
 				KEY DTT_is_primary (DTT_is_primary)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = "esp_datetime_ticket";
-        $sql = "DTK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = "esp_datetime_ticket";
+		$sql = "DTK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				DTT_ID int(10) unsigned NOT NULL,
 				TKT_ID int(10) unsigned NOT NULL,
 				PRIMARY KEY  (DTK_ID),
 				KEY DTT_ID (DTT_ID),
 				KEY TKT_ID (TKT_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_message_template';
-        $sql = "EMT_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_message_template';
+		$sql = "EMT_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL DEFAULT 0,
 				GRP_ID int(10) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EMT_ID),
 				KEY EVT_ID (EVT_ID),
 				KEY GRP_ID (GRP_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_meta';
-        $sql = "EVTM_ID int(10) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_meta';
+		$sql = "EVTM_ID int(10) NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				EVT_display_desc tinyint(1) unsigned NOT NULL DEFAULT 1,
 				EVT_display_ticket_selector tinyint(1) unsigned NOT NULL DEFAULT 1,
@@ -206,34 +206,34 @@ 
 				EVT_donations tinyint(1) NULL,
 				PRIMARY KEY  (EVTM_ID),
 				KEY EVT_ID (EVT_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_question_group';
-        $sql = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				QSG_ID int(10) unsigned NOT NULL,
 				EQG_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EQG_ID),
 				KEY EVT_ID (EVT_ID),
 				KEY QSG_ID (QSG_ID)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_venue';
-        $sql = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_venue';
+		$sql = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				VNU_ID bigint(20) unsigned NOT NULL,
 				EVV_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_extra_meta';
-        $sql = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_extra_meta';
+		$sql = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID int(11) DEFAULT NULL,
 				EXM_type varchar(45) DEFAULT NULL,
 				EXM_key varchar(45) DEFAULT NULL,
 				EXM_value text,
 				PRIMARY KEY  (EXM_ID),
 				KEY EXM_type (EXM_type,OBJ_ID,EXM_key)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_extra_join';
-        $sql = "EXJ_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_extra_join';
+		$sql = "EXJ_ID int(11) NOT NULL AUTO_INCREMENT,
 				EXJ_first_model_id varchar(6) NOT NULL,
 				EXJ_first_model_name varchar(20) NOT NULL,
 				EXJ_second_model_id varchar(6) NOT NULL,
@@ -241,9 +241,9 @@ 
 				PRIMARY KEY  (EXJ_ID),
 				KEY first_model (EXJ_first_model_name,EXJ_first_model_id),
 				KEY second_model (EXJ_second_model_name,EXJ_second_model_id)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_line_item';
-        $sql = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_line_item';
+		$sql = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
 				LIN_code varchar(245) NOT NULL DEFAULT '',
 				TXN_ID int(11) DEFAULT NULL,
 				LIN_name varchar(245) NOT NULL DEFAULT '',
@@ -262,9 +262,9 @@ 
 				PRIMARY KEY  (LIN_ID),
 				KEY LIN_code (LIN_code(191)),
 				KEY TXN_ID (TXN_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_log';
-        $sql = "LOG_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_log';
+		$sql = "LOG_ID int(11) NOT NULL AUTO_INCREMENT,
 				LOG_time datetime DEFAULT NULL,
 				OBJ_ID varchar(45) DEFAULT NULL,
 				OBJ_type varchar(45) DEFAULT NULL,
@@ -275,9 +275,9 @@ 
 				KEY LOG_time (LOG_time),
 				KEY OBJ (OBJ_type,OBJ_ID),
 				KEY LOG_type (LOG_type)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_message';
-        $sql = "MSG_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_message';
+		$sql = "MSG_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
 				GRP_ID int(10) unsigned NULL,
 				MSG_token varchar(255) NULL,
 				TXN_ID int(10) unsigned NULL,
@@ -309,18 +309,18 @@ 
 				KEY STS_ID (STS_ID),
 				KEY MSG_created (MSG_created),
 				KEY MSG_modified (MSG_modified)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_message_template';
-        $sql = "MTP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_message_template';
+		$sql = "MTP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				GRP_ID int(10) unsigned NOT NULL,
 				MTP_context varchar(50) NOT NULL,
 				MTP_template_field varchar(30) NOT NULL,
 				MTP_content text NOT NULL,
 				PRIMARY KEY  (MTP_ID),
 				KEY GRP_ID (GRP_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_message_template_group';
-        $sql = "GRP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_message_template_group';
+		$sql = "GRP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				MTP_user_id int(10) NOT NULL DEFAULT '1',
 				MTP_name varchar(245) NOT NULL DEFAULT '',
 				MTP_description varchar(245) NOT NULL DEFAULT '',
@@ -332,9 +332,9 @@ 
 				MTP_is_active tinyint(1) NOT NULL DEFAULT '1',
 				PRIMARY KEY  (GRP_ID),
 				KEY MTP_user_id (MTP_user_id)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_payment';
-        $sql = "PAY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_payment';
+		$sql = "PAY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				TXN_ID int(10) unsigned DEFAULT NULL,
 				STS_ID varchar(3) DEFAULT NULL,
 				PAY_timestamp datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -351,9 +351,9 @@ 
 				PRIMARY KEY  (PAY_ID),
 				KEY PAY_timestamp (PAY_timestamp),
 				KEY TXN_ID (TXN_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_payment_method';
-        $sql = "PMD_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_payment_method';
+		$sql = "PMD_ID int(11) NOT NULL AUTO_INCREMENT,
 				PMD_type varchar(124) DEFAULT NULL,
 				PMD_name varchar(255) DEFAULT NULL,
 				PMD_desc text,
@@ -369,24 +369,24 @@ 
 				PRIMARY KEY  (PMD_ID),
 				UNIQUE KEY PMD_slug_UNIQUE (PMD_slug),
 				KEY PMD_type (PMD_type)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = "esp_ticket_price";
-        $sql = "TKP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = "esp_ticket_price";
+		$sql = "TKP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				TKT_ID int(10) unsigned NOT NULL,
 				PRC_ID int(10) unsigned NOT NULL,
 				PRIMARY KEY  (TKP_ID),
 				KEY TKT_ID (TKT_ID),
 				KEY PRC_ID (PRC_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = "esp_ticket_template";
-        $sql = "TTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = "esp_ticket_template";
+		$sql = "TTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				TTM_name varchar(45) NOT NULL,
 				TTM_description text,
 				TTM_file varchar(45),
 				PRIMARY KEY  (TTM_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question';
-        $sql = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question';
+		$sql = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				QST_display_text text NOT NULL,
 				QST_admin_label varchar(255) NOT NULL,
 				QST_system varchar(25) DEFAULT NULL,
@@ -400,18 +400,18 @@ 
 				QST_deleted tinyint(2) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (QST_ID),
 				KEY QST_order (QST_order)';
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question_group_question';
-        $sql = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				QSG_ID int(10) unsigned NOT NULL,
 				QST_ID int(10) unsigned NOT NULL,
 				QGQ_order int(10) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (QGQ_ID),
 				KEY QST_ID (QST_ID),
 				KEY QSG_ID_order (QSG_ID,QGQ_order)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question_option';
-        $sql = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				QSO_value varchar(255) NOT NULL,
 				QSO_desc text NOT NULL,
 				QST_ID int(10) unsigned NOT NULL,
@@ -421,9 +421,9 @@ 
 				PRIMARY KEY  (QSO_ID),
 				KEY QST_ID (QST_ID),
 				KEY QSO_order (QSO_order)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_registration';
-        $sql = "REG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_registration';
+		$sql = "REG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				ATT_ID bigint(20) unsigned NOT NULL,
 				TXN_ID int(10) unsigned NOT NULL,
@@ -447,18 +447,18 @@ 
 				KEY TKT_ID (TKT_ID),
 				KEY EVT_ID (EVT_ID),
 				KEY STS_ID (STS_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_registration_payment';
-        $sql = "RPY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_registration_payment';
+		$sql = "RPY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  REG_ID int(10) unsigned NOT NULL,
 					  PAY_ID int(10) unsigned NULL,
 					  RPY_amount decimal(10,3) NOT NULL DEFAULT '0.00',
 					  PRIMARY KEY  (RPY_ID),
 					  KEY REG_ID (REG_ID),
 					  KEY PAY_ID (PAY_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_state';
-        $sql = "STA_ID smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_state';
+		$sql = "STA_ID smallint(5) unsigned NOT NULL AUTO_INCREMENT,
 				CNT_ISO varchar(2) NOT NULL,
 				STA_abbrev varchar(24) NOT NULL,
 				STA_name varchar(100) NOT NULL,
@@ -466,9 +466,9 @@ 
 				PRIMARY KEY  (STA_ID),
 				KEY STA_abbrev (STA_abbrev),
 				KEY CNT_ISO (CNT_ISO)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_status';
-        $sql = "STS_ID varchar(3) NOT NULL,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_status';
+		$sql = "STS_ID varchar(3) NOT NULL,
 				STS_code varchar(45) NOT NULL,
 				STS_type varchar(45) NOT NULL,
 				STS_can_edit tinyint(1) NOT NULL DEFAULT 0,
@@ -476,9 +476,9 @@ 
 				STS_open tinyint(1) NOT NULL DEFAULT 1,
 				UNIQUE KEY STS_ID_UNIQUE (STS_ID),
 				KEY STS_type (STS_type)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_transaction';
-        $sql = "TXN_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_transaction';
+		$sql = "TXN_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				TXN_timestamp datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 				TXN_total decimal(10,3) DEFAULT '0.00',
 				TXN_paid decimal(10,3) NOT NULL DEFAULT '0.00',
@@ -490,9 +490,9 @@ 
 				PRIMARY KEY  (TXN_ID),
 				KEY TXN_timestamp (TXN_timestamp),
 				KEY STS_ID (STS_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_venue_meta';
-        $sql = "VNUM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_venue_meta';
+		$sql = "VNUM_ID int(11) NOT NULL AUTO_INCREMENT,
 			VNU_ID bigint(20) unsigned NOT NULL DEFAULT 0,
 			VNU_address varchar(255) DEFAULT NULL,
 			VNU_address2 varchar(255) DEFAULT NULL,
@@ -511,10 +511,10 @@ 
 			KEY VNU_ID (VNU_ID),
 			KEY STA_ID (STA_ID),
 			KEY CNT_ISO (CNT_ISO)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        //modified tables
-        $table_name = "esp_price";
-        $sql = "PRC_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		//modified tables
+		$table_name = "esp_price";
+		$sql = "PRC_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				PRT_ID tinyint(3) unsigned NOT NULL,
 				PRC_amount decimal(10,3) NOT NULL DEFAULT '0.00',
 				PRC_name varchar(245) NOT NULL,
@@ -527,9 +527,9 @@ 
 				PRC_parent int(10) unsigned DEFAULT 0,
 				PRIMARY KEY  (PRC_ID),
 				KEY PRT_ID (PRT_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = "esp_price_type";
-        $sql = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = "esp_price_type";
+		$sql = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
 				PRT_name varchar(45) NOT NULL,
 				PBT_ID tinyint(3) unsigned NOT NULL DEFAULT '1',
 				PRT_is_percent tinyint(1) NOT NULL DEFAULT '0',
@@ -538,9 +538,9 @@ 
 				PRT_deleted tinyint(1) NOT NULL DEFAULT '0',
 				UNIQUE KEY PRT_name_UNIQUE (PRT_name),
 				PRIMARY KEY  (PRT_ID)";
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = "esp_ticket";
-        $sql = "TKT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = "esp_ticket";
+		$sql = "TKT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				TTM_ID int(10) unsigned NOT NULL,
 				TKT_name varchar(245) NOT NULL DEFAULT '',
 				TKT_description text NOT NULL,
@@ -563,9 +563,9 @@ 
 				TKT_deleted tinyint(1) NOT NULL DEFAULT '0',
 				PRIMARY KEY  (TKT_ID),
 				KEY TKT_start_date (TKT_start_date)";
-        $this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question_group';
-        $sql = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question_group';
+		$sql = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				QSG_name varchar(255) NOT NULL,
 				QSG_identifier varchar(100) NOT NULL,
 				QSG_desc text NULL,
@@ -578,105 +578,105 @@ 
 				PRIMARY KEY  (QSG_ID),
 				UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier),
 				KEY QSG_order (QSG_order)';
-        $this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
-        /** @var EE_DMS_Core_4_1_0 $script_4_1_defaults */
-        $script_4_1_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
-        //(because many need to convert old string states to foreign keys into the states table)
-        $script_4_1_defaults->insert_default_states();
-        $script_4_1_defaults->insert_default_countries();
-        /** @var EE_DMS_Core_4_5_0 $script_4_5_defaults */
-        $script_4_5_defaults = EE_Registry::instance()->load_dms('Core_4_5_0');
-        $script_4_5_defaults->insert_default_price_types();
-        $script_4_5_defaults->insert_default_prices();
-        $script_4_5_defaults->insert_default_tickets();
-        /** @var EE_DMS_Core_4_6_0 $script_4_6_defaults */
-        $script_4_6_defaults = EE_Registry::instance()->load_dms('Core_4_6_0');
-        $script_4_6_defaults->add_default_admin_only_payments();
-        $script_4_6_defaults->insert_default_currencies();
-        /** @var EE_DMS_Core_4_8_0 $script_4_8_defaults */
-        $script_4_8_defaults = EE_Registry::instance()->load_dms('Core_4_8_0');
-        $script_4_8_defaults->verify_new_countries();
-        $script_4_8_defaults->verify_new_currencies();
-        $this->verify_db_collations();
-        return true;
-    }
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
+		/** @var EE_DMS_Core_4_1_0 $script_4_1_defaults */
+		$script_4_1_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
+		//(because many need to convert old string states to foreign keys into the states table)
+		$script_4_1_defaults->insert_default_states();
+		$script_4_1_defaults->insert_default_countries();
+		/** @var EE_DMS_Core_4_5_0 $script_4_5_defaults */
+		$script_4_5_defaults = EE_Registry::instance()->load_dms('Core_4_5_0');
+		$script_4_5_defaults->insert_default_price_types();
+		$script_4_5_defaults->insert_default_prices();
+		$script_4_5_defaults->insert_default_tickets();
+		/** @var EE_DMS_Core_4_6_0 $script_4_6_defaults */
+		$script_4_6_defaults = EE_Registry::instance()->load_dms('Core_4_6_0');
+		$script_4_6_defaults->add_default_admin_only_payments();
+		$script_4_6_defaults->insert_default_currencies();
+		/** @var EE_DMS_Core_4_8_0 $script_4_8_defaults */
+		$script_4_8_defaults = EE_Registry::instance()->load_dms('Core_4_8_0');
+		$script_4_8_defaults->verify_new_countries();
+		$script_4_8_defaults->verify_new_currencies();
+		$this->verify_db_collations();
+		return true;
+	}
 
 
 
-    /**
-     * @return boolean
-     */
-    public function schema_changes_after_migration()
-    {
-        return true;
-    }
+	/**
+	 * @return boolean
+	 */
+	public function schema_changes_after_migration()
+	{
+		return true;
+	}
 
 
 
-    public function migration_page_hooks()
-    {
-    }
+	public function migration_page_hooks()
+	{
+	}
 
 
 
-    /**
-     * Verify all EE4 models' tables use utf8mb4 collation
-     *
-     * @return void
-     */
-    public function verify_db_collations()
-    {
-        if (get_option('ee_verified_db_collations', false)) {
-            return;
-        }
-        // grab tables from each model
-        $tables_to_check = array();
-        foreach (EE_Registry::instance()->non_abstract_db_models as $model_name) {
-            if (method_exists($model_name, 'instance')) {
-                $model_obj = call_user_func(array($model_name, 'instance'));
-                if ($model_obj instanceof EEM_Base) {
-                    foreach ($model_obj->get_tables() as $table) {
-                        if (
-                            strpos($table->get_table_name(), 'esp_')
-                            && (is_main_site()//for main tables, verify global tables
-                                || ! $table->is_global()//if not the main site, then only verify non-global tables (avoid doubling up)
-                            )
-                            && function_exists('maybe_convert_table_to_utf8mb4')
-                        ) {
-                            $tables_to_check[] = $table->get_table_name();
-                        }
-                    }
-                }
-            }
-        }
-        //and let's just be sure these addons' tables get migrated too. They already get handled if their addons are active
-        //when this code is run, but not otherwise. Once we record what tables EE added, we'll be able to use that instead
-        //of hard-coding this
-        $addon_tables = array(
-            //mailchimp
-            'esp_event_mailchimp_list_group',
-            'esp_event_question_mailchimp_field',
-            //multisite
-            'esp_blog_meta',
-            //people
-            'esp_people_to_post',
-            //promotions
-            'esp_promotion',
-            'esp_promotion_object',
-        );
-        foreach ($addon_tables as $table_name) {
-            $complete_table_name = $this->_table_analysis->ensureTableNameHasPrefix($table_name);
-            if($this->_table_analysis->tableExists( $complete_table_name )){
-                $tables_to_check[] = $complete_table_name;
-            }
-        }
-        $tables_to_check = array_unique($tables_to_check);
-        foreach ($tables_to_check as $table_name) {
-            if ( ! apply_filters('FHEE__EE_DMS_Core_4_9_0__verify_db_collations__check_overridden', false, $table_name ) ) {
-                maybe_convert_table_to_utf8mb4($table_name);
-            }
-        }
-        //ok and now let's remember this was done (without needing to check the db schemas all over again)
-        add_option('ee_verified_db_collations', true, null, 'no');
-    }
+	/**
+	 * Verify all EE4 models' tables use utf8mb4 collation
+	 *
+	 * @return void
+	 */
+	public function verify_db_collations()
+	{
+		if (get_option('ee_verified_db_collations', false)) {
+			return;
+		}
+		// grab tables from each model
+		$tables_to_check = array();
+		foreach (EE_Registry::instance()->non_abstract_db_models as $model_name) {
+			if (method_exists($model_name, 'instance')) {
+				$model_obj = call_user_func(array($model_name, 'instance'));
+				if ($model_obj instanceof EEM_Base) {
+					foreach ($model_obj->get_tables() as $table) {
+						if (
+							strpos($table->get_table_name(), 'esp_')
+							&& (is_main_site()//for main tables, verify global tables
+								|| ! $table->is_global()//if not the main site, then only verify non-global tables (avoid doubling up)
+							)
+							&& function_exists('maybe_convert_table_to_utf8mb4')
+						) {
+							$tables_to_check[] = $table->get_table_name();
+						}
+					}
+				}
+			}
+		}
+		//and let's just be sure these addons' tables get migrated too. They already get handled if their addons are active
+		//when this code is run, but not otherwise. Once we record what tables EE added, we'll be able to use that instead
+		//of hard-coding this
+		$addon_tables = array(
+			//mailchimp
+			'esp_event_mailchimp_list_group',
+			'esp_event_question_mailchimp_field',
+			//multisite
+			'esp_blog_meta',
+			//people
+			'esp_people_to_post',
+			//promotions
+			'esp_promotion',
+			'esp_promotion_object',
+		);
+		foreach ($addon_tables as $table_name) {
+			$complete_table_name = $this->_table_analysis->ensureTableNameHasPrefix($table_name);
+			if($this->_table_analysis->tableExists( $complete_table_name )){
+				$tables_to_check[] = $complete_table_name;
+			}
+		}
+		$tables_to_check = array_unique($tables_to_check);
+		foreach ($tables_to_check as $table_name) {
+			if ( ! apply_filters('FHEE__EE_DMS_Core_4_9_0__verify_db_collations__check_overridden', false, $table_name ) ) {
+				maybe_convert_table_to_utf8mb4($table_name);
+			}
+		}
+		//ok and now let's remember this was done (without needing to check the db schemas all over again)
+		add_option('ee_verified_db_collations', true, null, 'no');
+	}
 }
\ No newline at end of file

modules/add_new_state/EED_Add_New_State.module.php

Spacing +165 added lines, -165 removed lines

@@ -16,7 +16,7 @@ 
 	 * @return EED_Add_New_State
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -27,16 +27,16 @@ 
 	 *  	@return 		void
 	 */
 	public static function set_hooks() {
-		add_action( 'wp_loaded', array( 'EED_Add_New_State', 'set_definitions' ), 2 );
-		add_action( 'wp_enqueue_scripts', array( 'EED_Add_New_State', 'translate_js_strings' ), 0 );
-		add_action( 'wp_enqueue_scripts', array( 'EED_Add_New_State', 'wp_enqueue_scripts' ), 10 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', array( 'EED_Add_New_State', 'display_add_new_state_micro_form' ), 1, 1 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form', array( 'EED_Add_New_State', 'display_add_new_state_micro_form' ), 1, 1 );
-		add_filter( 'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', array( 'EED_Add_New_State', 'unset_new_state_request_params' ), 10, 1 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', array( 'EED_Add_New_State', 'inject_new_reg_state_into_options' ), 10, 5 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', array( 'EED_Add_New_State', 'inject_new_reg_country_into_options' ), 10, 5 );
-		add_filter( 'FHEE__EE_State_Select_Input____construct__state_options', array( 'EED_Add_New_State', 'state_options' ), 10, 1 );
-		add_filter( 'FHEE__EE_Country_Select_Input____construct__country_options', array( 'EED_Add_New_State', 'country_options' ), 10, 1 );
+		add_action('wp_loaded', array('EED_Add_New_State', 'set_definitions'), 2);
+		add_action('wp_enqueue_scripts', array('EED_Add_New_State', 'translate_js_strings'), 0);
+		add_action('wp_enqueue_scripts', array('EED_Add_New_State', 'wp_enqueue_scripts'), 10);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', array('EED_Add_New_State', 'display_add_new_state_micro_form'), 1, 1);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form', array('EED_Add_New_State', 'display_add_new_state_micro_form'), 1, 1);
+		add_filter('FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', array('EED_Add_New_State', 'unset_new_state_request_params'), 10, 1);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', array('EED_Add_New_State', 'inject_new_reg_state_into_options'), 10, 5);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', array('EED_Add_New_State', 'inject_new_reg_country_into_options'), 10, 5);
+		add_filter('FHEE__EE_State_Select_Input____construct__state_options', array('EED_Add_New_State', 'state_options'), 10, 1);
+		add_filter('FHEE__EE_Country_Select_Input____construct__country_options', array('EED_Add_New_State', 'country_options'), 10, 1);
 	}
 
 	/**
@@ -46,20 +46,20 @@ 
 	 *  	@return 		void
 	 */
 	public static function set_hooks_admin() {
-		add_action( 'wp_loaded', array( 'EED_Add_New_State', 'set_definitions' ), 2 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', array( 'EED_Add_New_State', 'display_add_new_state_micro_form' ), 1, 1 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form', array( 'EED_Add_New_State', 'display_add_new_state_micro_form' ), 1, 1 );
-		add_action( 'wp_ajax_espresso_add_new_state', array( 'EED_Add_New_State', 'add_new_state' ));
-		add_action( 'wp_ajax_nopriv_espresso_add_new_state', array( 'EED_Add_New_State', 'add_new_state' ));
-		add_filter( 'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', array( 'EED_Add_New_State', 'unset_new_state_request_params' ), 10, 1 );
-		add_action( 'AHEE__General_Settings_Admin_Page__update_country_settings__state_saved', array( 'EED_Add_New_State', 'update_country_settings' ), 10, 3 );
-		add_action( 'AHEE__General_Settings_Admin_Page__delete_state__state_deleted', array( 'EED_Add_New_State', 'update_country_settings' ), 10, 3 );
-		add_filter( 'FHEE__EE_State_Select_Input____construct__state_options', array( 'EED_Add_New_State', 'state_options' ), 10, 1 );
-		add_filter( 'FHEE__EE_Country_Select_Input____construct__country_options', array( 'EED_Add_New_State', 'country_options' ), 10, 1 );
+		add_action('wp_loaded', array('EED_Add_New_State', 'set_definitions'), 2);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form', array('EED_Add_New_State', 'display_add_new_state_micro_form'), 1, 1);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form', array('EED_Add_New_State', 'display_add_new_state_micro_form'), 1, 1);
+		add_action('wp_ajax_espresso_add_new_state', array('EED_Add_New_State', 'add_new_state'));
+		add_action('wp_ajax_nopriv_espresso_add_new_state', array('EED_Add_New_State', 'add_new_state'));
+		add_filter('FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item', array('EED_Add_New_State', 'unset_new_state_request_params'), 10, 1);
+		add_action('AHEE__General_Settings_Admin_Page__update_country_settings__state_saved', array('EED_Add_New_State', 'update_country_settings'), 10, 3);
+		add_action('AHEE__General_Settings_Admin_Page__delete_state__state_deleted', array('EED_Add_New_State', 'update_country_settings'), 10, 3);
+		add_filter('FHEE__EE_State_Select_Input____construct__state_options', array('EED_Add_New_State', 'state_options'), 10, 1);
+		add_filter('FHEE__EE_Country_Select_Input____construct__country_options', array('EED_Add_New_State', 'country_options'), 10, 1);
 		//add_filter( 'FHEE__Single_Page_Checkout___check_form_submission__request_params', array( 'EED_Add_New_State', 'filter_checkout_request_params' ), 10, 1 );
-		add_filter( 'FHEE__EE_Form_Section_Proper__receive_form_submission__request_data', array( 'EED_Add_New_State', 'filter_checkout_request_params' ), 10, 1 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', array( 'EED_Add_New_State', 'inject_new_reg_state_into_options' ), 10, 5 );
-		add_filter( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', array( 'EED_Add_New_State', 'inject_new_reg_country_into_options' ), 10, 5 );
+		add_filter('FHEE__EE_Form_Section_Proper__receive_form_submission__request_data', array('EED_Add_New_State', 'filter_checkout_request_params'), 10, 1);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options', array('EED_Add_New_State', 'inject_new_reg_state_into_options'), 10, 5);
+		add_filter('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options', array('EED_Add_New_State', 'inject_new_reg_country_into_options'), 10, 5);
 	}
 
 
@@ -71,8 +71,8 @@ 
 	 *  	@return 		void
 	 */
 	public static function set_definitions() {
-		define( 'ANS_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		define( 'ANS_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
+		define('ANS_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		define('ANS_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
 	}
 
 
@@ -84,7 +84,7 @@ 
 	 * @param \WP $WP
 	 * @return        void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 	}
 
 
@@ -112,9 +112,9 @@ 
 	 * 	@return 		void
 	 */
 	public static function wp_enqueue_scripts() {
-		if ( apply_filters( 'EED_Single_Page_Checkout__SPCO_active', false ) ) {
-			wp_register_script( 'add_new_state', ANS_ASSETS_URL . 'add_new_state.js', array( 'espresso_core', 'single_page_checkout' ), EVENT_ESPRESSO_VERSION, true );
-			wp_enqueue_script( 'add_new_state' );
+		if (apply_filters('EED_Single_Page_Checkout__SPCO_active', false)) {
+			wp_register_script('add_new_state', ANS_ASSETS_URL.'add_new_state.js', array('espresso_core', 'single_page_checkout'), EVENT_ESPRESSO_VERSION, true);
+			wp_enqueue_script('add_new_state');
 		}
 	}
 
@@ -128,34 +128,34 @@ 
 	 * @return 	string
 	 */
 //	public static function display_add_new_state_micro_form( $html, EE_Form_Input_With_Options_Base $input ){
-	public static function display_add_new_state_micro_form( EE_Form_Section_Proper $question_group_reg_form ){
+	public static function display_add_new_state_micro_form(EE_Form_Section_Proper $question_group_reg_form) {
 		// only add the 'new_state_micro_form' when displaying reg forms,
 		// not during processing since we process the 'new_state_micro_form' in it's own AJAX request
-		$action = EE_Registry::instance()->REQ->get( 'action', '' );
+		$action = EE_Registry::instance()->REQ->get('action', '');
 		// is the "state" question in this form section?
-		$input = $question_group_reg_form->get_subsection( 'state' );
-		if ( $action === 'process_reg_step' || $action === 'update_reg_step' ) {
+		$input = $question_group_reg_form->get_subsection('state');
+		if ($action === 'process_reg_step' || $action === 'update_reg_step') {
 			//ok then all we need to do is make sure the input's HTML name is consistent
 			//by forcing it to set it now, like it did while getting the form for display
-			if( $input instanceof EE_State_Select_Input ) {
+			if ($input instanceof EE_State_Select_Input) {
 				$input->html_name();
 			}
 			return $question_group_reg_form;
 		}
 		
 		// we're only doing this for state select inputs
-		if ( $input instanceof EE_State_Select_Input ) {
+		if ($input instanceof EE_State_Select_Input) {
 			// grab any set values from the request
-			$country_name = str_replace( 'state', 'nsmf_new_state_country', $input->html_name() );
-			$state_name = str_replace( 'state', 'nsmf_new_state_name', $input->html_name() );
-			$abbrv_name = str_replace( 'state', 'nsmf_new_state_abbrv', $input->html_name() );
-			$new_state_submit_id = str_replace( 'state', 'new_state', $input->html_id() );
+			$country_name = str_replace('state', 'nsmf_new_state_country', $input->html_name());
+			$state_name = str_replace('state', 'nsmf_new_state_name', $input->html_name());
+			$abbrv_name = str_replace('state', 'nsmf_new_state_abbrv', $input->html_name());
+			$new_state_submit_id = str_replace('state', 'new_state', $input->html_id());
 			$country_options = array();
 			$countries = EEM_Country::instance()->get_all_countries();
-			if ( ! empty( $countries )) {
-				foreach( $countries as $country ){
-					if ( $country instanceof EE_Country ) {
-						$country_options[ $country->ID() ] = $country->name();
+			if ( ! empty($countries)) {
+				foreach ($countries as $country) {
+					if ($country instanceof EE_Country) {
+						$country_options[$country->ID()] = $country->name();
 					}
 				}
 			}
@@ -168,8 +168,8 @@ 
 						// add hidden input to indicate that a new state is being added
 						'add_new_state' 	=> new EE_Hidden_Input(
 							array(
-								'html_name' 	=> str_replace( 'state', 'nsmf_add_new_state', $input->html_name() ),
-								'html_id' 			=> str_replace( 'state', 'nsmf_add_new_state', $input->html_id() ),
+								'html_name' 	=> str_replace('state', 'nsmf_add_new_state', $input->html_name()),
+								'html_id' 			=> str_replace('state', 'nsmf_add_new_state', $input->html_id()),
 								'default'			=> 0
 							)
 						),
@@ -181,10 +181,10 @@ 
 									'',
 									__('click here to add a new state/province', 'event_espresso'),
 									'',
-									'display-' . $input->html_id(),
+									'display-'.$input->html_id(),
 									'ee-form-add-new-state-lnk display-the-hidden smaller-text hide-if-no-js',
 									'',
-									'data-target="' . $input->html_id() . '"'
+									'data-target="'.$input->html_id().'"'
 								)
 							)
 						),
@@ -192,13 +192,13 @@ 
 						'add_new_state_micro_form' =>new EE_Form_Section_HTML(
 							apply_filters(
 								'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_micro_form',
-								EEH_HTML::div( '', $input->html_id() . '-dv', 'ee-form-add-new-state-dv', 'display: none;' ) .
-								EEH_HTML::h6( __('If your State/Province does not appear in the list above, you can easily add it by doing the following:', 'event_espresso')) .
-								EEH_HTML::ul() .
-								EEH_HTML::li( __('first select the Country that your State/Province belongs to', 'event_espresso') ) .
-								EEH_HTML::li( __('enter the name of your State/Province', 'event_espresso') ) .
-								EEH_HTML::li( __('enter a two to six letter abbreviation for the name of your State/Province', 'event_espresso') ) .
-								EEH_HTML::li( __('click the ADD button', 'event_espresso') ) .
+								EEH_HTML::div('', $input->html_id().'-dv', 'ee-form-add-new-state-dv', 'display: none;').
+								EEH_HTML::h6(__('If your State/Province does not appear in the list above, you can easily add it by doing the following:', 'event_espresso')).
+								EEH_HTML::ul().
+								EEH_HTML::li(__('first select the Country that your State/Province belongs to', 'event_espresso')).
+								EEH_HTML::li(__('enter the name of your State/Province', 'event_espresso')).
+								EEH_HTML::li(__('enter a two to six letter abbreviation for the name of your State/Province', 'event_espresso')).
+								EEH_HTML::li(__('click the ADD button', 'event_espresso')).
 								EEH_HTML::ulx()
 							)
 						),
@@ -207,10 +207,10 @@ 
 							$country_options,
 							array(
 								'html_name' 			=> $country_name,
-								'html_id' 					=> str_replace( 'state', 'nsmf_new_state_country', $input->html_id() ),
-								'html_class' 			=> $input->html_class() . ' new-state-country',
+								'html_id' 					=> str_replace('state', 'nsmf_new_state_country', $input->html_id()),
+								'html_class' 			=> $input->html_class().' new-state-country',
 								'html_label_text'		=> __('New State/Province Country', 'event_espresso'),
-								'default'					=> EE_Registry::instance()->REQ->get( $country_name, '' ),
+								'default'					=> EE_Registry::instance()->REQ->get($country_name, ''),
 								'required' 				=> false
 							)
 						),
@@ -218,23 +218,23 @@ 
 						'new_state_name' => new EE_Text_Input(
 							array(
 								'html_name' 			=> $state_name,
-								'html_id' 					=> str_replace( 'state', 'nsmf_new_state_name', $input->html_id() ),
-								'html_class' 			=> $input->html_class() . ' new-state-state',
+								'html_id' 					=> str_replace('state', 'nsmf_new_state_name', $input->html_id()),
+								'html_class' 			=> $input->html_class().' new-state-state',
 								'html_label_text'		=> __('New State/Province Name', 'event_espresso'),
-								'default'					=> EE_Registry::instance()->REQ->get( $state_name, '' ),
+								'default'					=> EE_Registry::instance()->REQ->get($state_name, ''),
 								'required' 				=> false
 							)
 						),
-						'spacer' => new EE_Form_Section_HTML( EEH_HTML::br() ),
+						'spacer' => new EE_Form_Section_HTML(EEH_HTML::br()),
 						// NEW STATE NAME
 						'new_state_abbrv' => new EE_Text_Input(
 							array(
 								'html_name' 					=> $abbrv_name,
-								'html_id' 							=> str_replace( 'state', 'nsmf_new_state_abbrv', $input->html_id() ),
-								'html_class' 					=> $input->html_class() . ' new-state-abbrv',
+								'html_id' 							=> str_replace('state', 'nsmf_new_state_abbrv', $input->html_id()),
+								'html_class' 					=> $input->html_class().' new-state-abbrv',
 								'html_label_text'				=> __('New State/Province Abbreviation', 'event_espresso'),
 								'html_other_attributes'	=> 'size="24"',
-								'default'							=> EE_Registry::instance()->REQ->get( $abbrv_name, '' ),
+								'default'							=> EE_Registry::instance()->REQ->get($abbrv_name, ''),
 								'required' 						=> false
 							)
 						),
@@ -242,15 +242,15 @@ 
 						'add_new_state_submit_button' => new EE_Form_Section_HTML(
 							apply_filters(
 								'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_submit_button',
-								EEH_HTML::nbsp(3) .
+								EEH_HTML::nbsp(3).
 								EEH_HTML::link(
 									'',
 									__('ADD', 'event_espresso'),
 									'',
-									'submit-' . $new_state_submit_id,
+									'submit-'.$new_state_submit_id,
 									'ee-form-add-new-state-submit button button-secondary',
 									'',
-									'data-target="' . $new_state_submit_id . '"'
+									'data-target="'.$new_state_submit_id.'"'
 								)
 							)
 						),
@@ -258,18 +258,18 @@ 
 						'add_new_state_extra' => new EE_Form_Section_HTML(
 							apply_filters(
 								'FHEE__EED_Add_New_State__display_add_new_state_micro_form__add_new_state_extra',
-								EEH_HTML::br(2) .
-								EEH_HTML::div( '', '', 'small-text' ) .
-								EEH_HTML::strong( __('Don\'t know your State/Province Abbreviation?', 'event_espresso') ) .
-								EEH_HTML::br() .
+								EEH_HTML::br(2).
+								EEH_HTML::div('', '', 'small-text').
+								EEH_HTML::strong(__('Don\'t know your State/Province Abbreviation?', 'event_espresso')).
+								EEH_HTML::br().
 								sprintf(
 									__('You can look here: %s, for a list of Countries and links to their State/Province Abbreviations ("Subdivisions assigned codes" column).', 'event_espresso'),
-									EEH_HTML::link( 'http://en.wikipedia.org/wiki/ISO_3166-2', 'http://en.wikipedia.org/wiki/ISO_3166-2', '', '', 'ee-form-add-new-state-wiki-lnk' )
-								) .
-								EEH_HTML::divx() .
-								EEH_HTML::br() .
-								EEH_HTML::link( '', __('cancel new state/province', 'event_espresso'), '', 'hide-' . $input->html_id(), 'ee-form-cancel-new-state-lnk smaller-text', '', 'data-target="' . $input->html_id() . '"' ) .
-								EEH_HTML::divx() .
+									EEH_HTML::link('http://en.wikipedia.org/wiki/ISO_3166-2', 'http://en.wikipedia.org/wiki/ISO_3166-2', '', '', 'ee-form-add-new-state-wiki-lnk')
+								).
+								EEH_HTML::divx().
+								EEH_HTML::br().
+								EEH_HTML::link('', __('cancel new state/province', 'event_espresso'), '', 'hide-'.$input->html_id(), 'ee-form-cancel-new-state-lnk smaller-text', '', 'data-target="'.$input->html_id().'"').
+								EEH_HTML::divx().
 								EEH_HTML::br()
 							)
 						)
@@ -277,7 +277,7 @@ 
 					)
 				)
 			);
-			$question_group_reg_form->add_subsections( array( 'new_state_micro_form' => $new_state_micro_form ), 'state', false );
+			$question_group_reg_form->add_subsections(array('new_state_micro_form' => $new_state_micro_form), 'state', false);
 		}
 		return $question_group_reg_form;
 	}
@@ -295,50 +295,50 @@ 
 	public static function add_new_state() {
 		$REQ = EE_Registry::instance()->load_core('Request_Handler');
 		if (
-			$REQ->is_set( 'nsmf_add_new_state' )
-			&& $REQ->get( 'nsmf_add_new_state' ) == 1
+			$REQ->is_set('nsmf_add_new_state')
+			&& $REQ->get('nsmf_add_new_state') == 1
 		) {
 			EE_Registry::instance()->load_model('State');
 			// grab country ISO code, new state name, and new state abbreviation
-			$state_country = $REQ->is_set( 'nsmf_new_state_country' )
-				? sanitize_text_field( $REQ->get( 'nsmf_new_state_country' ) )
+			$state_country = $REQ->is_set('nsmf_new_state_country')
+				? sanitize_text_field($REQ->get('nsmf_new_state_country'))
 				: false;
-			$state_name = $REQ->is_set( 'nsmf_new_state_name' )
-				? sanitize_text_field( $REQ->get( 'nsmf_new_state_name' ) )
+			$state_name = $REQ->is_set('nsmf_new_state_name')
+				? sanitize_text_field($REQ->get('nsmf_new_state_name'))
 				: false;
-			$state_abbr = $REQ->is_set( 'nsmf_new_state_abbrv' )
-				? sanitize_text_field( $REQ->get( 'nsmf_new_state_abbrv' ) )
+			$state_abbr = $REQ->is_set('nsmf_new_state_abbrv')
+				? sanitize_text_field($REQ->get('nsmf_new_state_abbrv'))
 				: false;
 //echo '<h4>$state_country : ' . $state_country . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 //echo '<h4>$state_name : ' . $state_name . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 //echo '<h4>$state_abbr : ' . $state_abbr . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 
-			if ( $state_country && $state_name && $state_abbr ) {
-				$new_state = EED_Add_New_State::save_new_state_to_db( array(
-					'CNT_ISO'=> strtoupper( $state_country ),
-					'STA_abbrev' => strtoupper( $state_abbr ),
-					'STA_name' => ucwords( $state_name ),
+			if ($state_country && $state_name && $state_abbr) {
+				$new_state = EED_Add_New_State::save_new_state_to_db(array(
+					'CNT_ISO'=> strtoupper($state_country),
+					'STA_abbrev' => strtoupper($state_abbr),
+					'STA_name' => ucwords($state_name),
 					'STA_active' => FALSE
 				));
 
-				if ( $new_state instanceof EE_State ) {
+				if ($new_state instanceof EE_State) {
 					// clean house
-					EE_Registry::instance()->REQ->un_set( 'nsmf_add_new_state' );
-					EE_Registry::instance()->REQ->un_set( 'nsmf_new_state_country' );
-					EE_Registry::instance()->REQ->un_set( 'nsmf_new_state_name' );
-					EE_Registry::instance()->REQ->un_set( 'nsmf_new_state_abbrv' );
+					EE_Registry::instance()->REQ->un_set('nsmf_add_new_state');
+					EE_Registry::instance()->REQ->un_set('nsmf_new_state_country');
+					EE_Registry::instance()->REQ->un_set('nsmf_new_state_name');
+					EE_Registry::instance()->REQ->un_set('nsmf_new_state_abbrv');
 
 					// get any existing new states
 					$new_states = EE_Registry::instance()->SSN->get_session_data(
 						'nsmf_new_states'
 					);
-					$new_states[ $new_state->ID() ] = $new_state;
+					$new_states[$new_state->ID()] = $new_state;
 					EE_Registry::instance()->SSN->set_session_data(
-						array( 'nsmf_new_states' => $new_states )
+						array('nsmf_new_states' => $new_states)
 					);
 
-					if ( EE_Registry::instance()->REQ->ajax ) {
-						echo wp_json_encode( array(
+					if (EE_Registry::instance()->REQ->ajax) {
+						echo wp_json_encode(array(
 							'success' => TRUE,
 							'id' => $new_state->ID(),
 							'name' => $new_state->name(),
@@ -353,12 +353,12 @@ 
 				}
 
 			} else {
-				$error = __( 'A new State/Province could not be added because invalid or missing data was received.', 'event_espresso' );
-				if ( EE_Registry::instance()->REQ->ajax ) {
-					echo wp_json_encode( array( 'error' => $error ));
+				$error = __('A new State/Province could not be added because invalid or missing data was received.', 'event_espresso');
+				if (EE_Registry::instance()->REQ->ajax) {
+					echo wp_json_encode(array('error' => $error));
 					exit();
 				} else {
-					EE_Error::add_error( $error, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 		}
@@ -376,11 +376,11 @@ 
 	 * @param array $request_params
 	 * @return array
 	 */
-	public static function filter_checkout_request_params ( $request_params ) {
-		foreach ( $request_params as $form_section ) {
-			if ( is_array( $form_section )) {
-				EED_Add_New_State::unset_new_state_request_params( $form_section );
-				EED_Add_New_State::filter_checkout_request_params( $form_section );
+	public static function filter_checkout_request_params($request_params) {
+		foreach ($request_params as $form_section) {
+			if (is_array($form_section)) {
+				EED_Add_New_State::unset_new_state_request_params($form_section);
+				EED_Add_New_State::filter_checkout_request_params($form_section);
 			}
 		}
 		return $request_params;
@@ -395,12 +395,12 @@ 
 	 * @param array $request_params
 	 * @return        boolean
 	 */
-	public static function unset_new_state_request_params ( $request_params ) {
-		unset( $request_params[ 'new_state_micro_form' ] );
-		unset( $request_params[ 'new_state_micro_add_new_state' ] );
-		unset( $request_params[ 'new_state_micro_new_state_country' ] );
-		unset( $request_params[ 'new_state_micro_new_state_name' ] );
-		unset( $request_params[ 'new_state_micro_new_state_abbrv' ] );
+	public static function unset_new_state_request_params($request_params) {
+		unset($request_params['new_state_micro_form']);
+		unset($request_params['new_state_micro_add_new_state']);
+		unset($request_params['new_state_micro_new_state_country']);
+		unset($request_params['new_state_micro_new_state_name']);
+		unset($request_params['new_state_micro_new_state_abbrv']);
 		return $request_params;
 	}
 
@@ -413,25 +413,25 @@ 
 	 * @param array $props_n_values
 	 * @return        boolean
 	 */
-	public static function save_new_state_to_db ( $props_n_values = array() ) {
+	public static function save_new_state_to_db($props_n_values = array()) {
 //		EEH_Debug_Tools::printr( $props_n_values, '$props_n_values  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		$existing_state = EEM_State::instance()->get_all( array( $props_n_values, 'limit' => 1 ));
-		if ( ! empty( $existing_state )) {
-			return array_pop( $existing_state );
+		$existing_state = EEM_State::instance()->get_all(array($props_n_values, 'limit' => 1));
+		if ( ! empty($existing_state)) {
+			return array_pop($existing_state);
 		}
-		$new_state = EE_State::new_instance( $props_n_values );
-		if ( $new_state instanceof EE_State ) {
+		$new_state = EE_State::new_instance($props_n_values);
+		if ($new_state instanceof EE_State) {
 			// if not non-ajax admin
-			$new_state_key = 'new-state-added-' . $new_state->country_iso() . '-' . $new_state->abbrev();
+			$new_state_key = 'new-state-added-'.$new_state->country_iso().'-'.$new_state->abbrev();
 			$new_state_notice = sprintf(
-					__( 'A new State named "%1$s (%2$s)" was dynamically added from an Event Espresso form for the Country of "%3$s".%5$sTo verify, edit, and/or delete this new State, please go to the %4$s and update the States / Provinces section.%5$sCheck "Yes" to have this new State added to dropdown select lists in forms.', 'event_espresso' ),
-					'<b>' . $new_state->name() . '</b>',
-					'<b>' . $new_state->abbrev() . '</b>',
-					'<b>' . $new_state->country()->name() . '</b>',
-					'<a href="' . add_query_arg( array( 'page' => 'espresso_general_settings', 'action' => 'country_settings', 'country' => $new_state->country_iso() ), admin_url( 'admin.php' )) . '">' . __( 'Event Espresso - General Settings > Countries Tab', 'event_espresso' ) . '</a>',
+					__('A new State named "%1$s (%2$s)" was dynamically added from an Event Espresso form for the Country of "%3$s".%5$sTo verify, edit, and/or delete this new State, please go to the %4$s and update the States / Provinces section.%5$sCheck "Yes" to have this new State added to dropdown select lists in forms.', 'event_espresso'),
+					'<b>'.$new_state->name().'</b>',
+					'<b>'.$new_state->abbrev().'</b>',
+					'<b>'.$new_state->country()->name().'</b>',
+					'<a href="'.add_query_arg(array('page' => 'espresso_general_settings', 'action' => 'country_settings', 'country' => $new_state->country_iso()), admin_url('admin.php')).'">'.__('Event Espresso - General Settings > Countries Tab', 'event_espresso').'</a>',
 					'<br />'
 			);
-			EE_Error::add_persistent_admin_notice( $new_state_key, $new_state_notice );
+			EE_Error::add_persistent_admin_notice($new_state_key, $new_state_notice);
 			$new_state->save();
 			EEM_State::instance()->reset_cached_states();
 			return $new_state;
@@ -450,22 +450,22 @@ 
 	 * @param array  $cols_n_values
 	 * @return        boolean
 	 */
-	public static function update_country_settings( $CNT_ISO = '', $STA_ID = '', $cols_n_values = array() ) {
-		$CNT_ISO = ! empty( $CNT_ISO ) ? $CNT_ISO : FALSE;
-		if ( ! $CNT_ISO ) {
-			EE_Error::add_error( __( 'An invalid or missing Country ISO Code was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+	public static function update_country_settings($CNT_ISO = '', $STA_ID = '', $cols_n_values = array()) {
+		$CNT_ISO = ! empty($CNT_ISO) ? $CNT_ISO : FALSE;
+		if ( ! $CNT_ISO) {
+			EE_Error::add_error(__('An invalid or missing Country ISO Code was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
-		$STA_abbrev = is_array( $cols_n_values ) && isset( $cols_n_values['STA_abbrev'] ) ? $cols_n_values['STA_abbrev'] : FALSE;
-		if (  ! $STA_abbrev && ! empty( $STA_ID )) {
-			$state = EEM_State::instance()->get_one_by_ID( $STA_ID );
-			if ( $state instanceof EE_State ) {
+		$STA_abbrev = is_array($cols_n_values) && isset($cols_n_values['STA_abbrev']) ? $cols_n_values['STA_abbrev'] : FALSE;
+		if ( ! $STA_abbrev && ! empty($STA_ID)) {
+			$state = EEM_State::instance()->get_one_by_ID($STA_ID);
+			if ($state instanceof EE_State) {
 				$STA_abbrev = $state->abbrev();
 			}
 		}
-		if ( ! $STA_abbrev ) {
-			EE_Error::add_error( __( 'An invalid or missing State Abbreviation was received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $STA_abbrev) {
+			EE_Error::add_error(__('An invalid or missing State Abbreviation was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
-		EE_Error::dismiss_persistent_admin_notice( $CNT_ISO . '-' . $STA_abbrev, TRUE, TRUE );
+		EE_Error::dismiss_persistent_admin_notice($CNT_ISO.'-'.$STA_abbrev, TRUE, TRUE);
 	}
 
 
@@ -481,19 +481,19 @@ 
 	 * @param $answer
 	 * @return bool
 	 */
-	public static function inject_new_reg_state_into_options( $state_options = array(), EE_SPCO_Reg_Step_Attendee_Information $reg_step, EE_Registration $registration, EE_Question $question, $answer ) {
-		if ( $answer instanceof EE_Answer  && $question instanceof EE_Question && $question->type() === EEM_Question::QST_type_state ) {
+	public static function inject_new_reg_state_into_options($state_options = array(), EE_SPCO_Reg_Step_Attendee_Information $reg_step, EE_Registration $registration, EE_Question $question, $answer) {
+		if ($answer instanceof EE_Answer && $question instanceof EE_Question && $question->type() === EEM_Question::QST_type_state) {
 			$STA_ID = $answer->value();
-			if ( ! empty( $STA_ID ) ) {
-				$state = EEM_State::instance()->get_one_by_ID( $STA_ID );
-				if ( $state instanceof EE_State ) {
+			if ( ! empty($STA_ID)) {
+				$state = EEM_State::instance()->get_one_by_ID($STA_ID);
+				if ($state instanceof EE_State) {
 					$country = $state->country();
-					if ( $country instanceof EE_Country ) {
-						if ( ! isset( $state_options[ $country->name() ] )) {
-							$state_options[ $country->name() ] = array();
+					if ($country instanceof EE_Country) {
+						if ( ! isset($state_options[$country->name()])) {
+							$state_options[$country->name()] = array();
 						}
-						if ( ! isset( $state_options[ $country->name() ][ $STA_ID ] )) {
-							$state_options[ $country->name() ][ $STA_ID ] = $state->name();
+						if ( ! isset($state_options[$country->name()][$STA_ID])) {
+							$state_options[$country->name()][$STA_ID] = $state->name();
 						}
 					}
 				}
@@ -515,14 +515,14 @@ 
 	 * @param $answer
 	 * @return bool
 	 */
-	public static function inject_new_reg_country_into_options( $country_options = array(), EE_SPCO_Reg_Step_Attendee_Information $reg_step, EE_Registration $registration, EE_Question $question, $answer ) {
-		if ( $answer instanceof EE_Answer && $question instanceof EE_Question && $question->type() === EEM_Question::QST_type_country ) {
+	public static function inject_new_reg_country_into_options($country_options = array(), EE_SPCO_Reg_Step_Attendee_Information $reg_step, EE_Registration $registration, EE_Question $question, $answer) {
+		if ($answer instanceof EE_Answer && $question instanceof EE_Question && $question->type() === EEM_Question::QST_type_country) {
 			$CNT_ISO = $answer->value();
-			if ( ! empty( $CNT_ISO ) ) {
-				$country = EEM_Country::instance()->get_one_by_ID( $CNT_ISO );
-				if ( $country instanceof EE_Country ) {
-					if ( ! isset( $country_options[ $CNT_ISO ] ) ) {
-						$country_options[ $CNT_ISO ] = $country->name();
+			if ( ! empty($CNT_ISO)) {
+				$country = EEM_Country::instance()->get_one_by_ID($CNT_ISO);
+				if ($country instanceof EE_Country) {
+					if ( ! isset($country_options[$CNT_ISO])) {
+						$country_options[$CNT_ISO] = $country->name();
 					}
 				}
 			}
@@ -539,14 +539,14 @@ 
 	 * @param EE_State[]  $state_options
 	 * @return        boolean
 	 */
-	public static function state_options( $state_options = array() ) {
+	public static function state_options($state_options = array()) {
 		$new_states = EED_Add_New_State::_get_new_states();
-		foreach ( $new_states as $new_state ) {
+		foreach ($new_states as $new_state) {
 			if (
 				$new_state instanceof EE_State
 				&& $new_state->country() instanceof EE_Country
 			) {
-				$state_options[ $new_state->country()->name() ][ $new_state->ID() ] = $new_state->name();
+				$state_options[$new_state->country()->name()][$new_state->ID()] = $new_state->name();
 			}
 		}
 		return $state_options;
@@ -562,12 +562,12 @@ 
 	 */
 	protected static function _get_new_states() {
 		$new_states = array();
-		if ( EE_Registry::instance()->SSN instanceof EE_Session ) {
+		if (EE_Registry::instance()->SSN instanceof EE_Session) {
 			$new_states = EE_Registry::instance()->SSN->get_session_data(
 				'nsmf_new_states'
 			);
 		}
-		return is_array( $new_states ) ? $new_states : array();
+		return is_array($new_states) ? $new_states : array();
 	}
 
 
@@ -579,14 +579,14 @@ 
 	 * @param EE_Country[]  $country_options
 	 * @return        boolean
 	 */
-	public static function country_options( $country_options = array() ) {
+	public static function country_options($country_options = array()) {
 		$new_states = EED_Add_New_State::_get_new_states();
-		foreach ( $new_states as $new_state ) {
+		foreach ($new_states as $new_state) {
 			if (
 				$new_state instanceof EE_State
 				&& $new_state->country() instanceof EE_Country
 			) {
-				$country_options[ $new_state->country()->ID() ] = $new_state->country()->name();
+				$country_options[$new_state->country()->ID()] = $new_state->country()->name();
 			}
 		}
 		return $country_options;

modules/bot_trap/EED_Bot_Trap.module.php

Indentation +57 added lines, -57 removed lines

@@ -30,11 +30,11 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-        if (
+		if (
 			apply_filters( 'FHEE__EED_Bot_Trap__set_hooks__use_bot_trap', true ) &&
 			\EE_Registry::instance()->CFG->registration->use_bot_trap
 		) {
-            \EED_Bot_Trap::set_trap();
+			\EED_Bot_Trap::set_trap();
 			// redirect bots to bogus success page
 			\EE_Config::register_route( 'ticket_selection_received', 'EED_Bot_Trap', 'display_bot_trap_success' );
 		}
@@ -49,18 +49,18 @@ 
 	 *  @return 	void
 	 */
 	public static function set_trap() {
-        define('EE_BOT_TRAP_BASE_URL', plugin_dir_url(__FILE__) . DS);
-        add_action(
-            'AHEE__ticket_selector_chart__template__after_ticket_selector',
-            array('EED_Bot_Trap', 'generate_bot_trap'),
-            10, 2
-        );
-        add_action(
-            'EED_Ticket_Selector__process_ticket_selections__before',
-            array('EED_Bot_Trap', 'process_bot_trap'),
-            1, 2
-        );
-    }
+		define('EE_BOT_TRAP_BASE_URL', plugin_dir_url(__FILE__) . DS);
+		add_action(
+			'AHEE__ticket_selector_chart__template__after_ticket_selector',
+			array('EED_Bot_Trap', 'generate_bot_trap'),
+			10, 2
+		);
+		add_action(
+			'EED_Ticket_Selector__process_ticket_selections__before',
+			array('EED_Bot_Trap', 'process_bot_trap'),
+			1, 2
+		);
+	}
 
 
 
@@ -71,15 +71,15 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-        if (
-            defined('DOING_AJAX')
-            && DOING_AJAX
-            && apply_filters('FHEE__EED_Bot_Trap__set_hooks__use_bot_trap', true)
-            && \EE_Registry::instance()->CFG->registration->use_bot_trap
-        ) {
-            \EED_Bot_Trap::set_trap();
-        }
-        add_action(
+		if (
+			defined('DOING_AJAX')
+			&& DOING_AJAX
+			&& apply_filters('FHEE__EED_Bot_Trap__set_hooks__use_bot_trap', true)
+			&& \EE_Registry::instance()->CFG->registration->use_bot_trap
+		) {
+			\EED_Bot_Trap::set_trap();
+		}
+		add_action(
 			'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
 			array( 'EED_Bot_Trap', 'bot_trap_settings_form' ),
 			5
@@ -130,23 +130,23 @@ 
 
 
 	/**
-     * process_bot_trap
-     *
-     * @param array|string $triggered_trap_callback Callback that will be executed for handling the
-     *                                              response if the bot trap is triggered.
-     *                                              It should receive one argument: a boolean indicating
-     *                                              whether the trap was triggered by suspicious timing or not.
+	 * process_bot_trap
+	 *
+	 * @param array|string $triggered_trap_callback Callback that will be executed for handling the
+	 *                                              response if the bot trap is triggered.
+	 *                                              It should receive one argument: a boolean indicating
+	 *                                              whether the trap was triggered by suspicious timing or not.
 	 */
 	public static function process_bot_trap( $triggered_trap_callback = array() ) {
-        // what's your email address Mr. Bot ?
+		// what's your email address Mr. Bot ?
 		$empty_trap = isset( $_REQUEST[ 'tkt-slctr-request-processor-email' ] )
-                      && $_REQUEST[ 'tkt-slctr-request-processor-email' ] === ''
-            ? true
-            : false;
+					  && $_REQUEST[ 'tkt-slctr-request-processor-email' ] === ''
+			? true
+			: false;
 		// get encrypted timestamp for when the form was originally displayed
 		$bot_trap_timestamp = isset( $_REQUEST[ 'tkt-slctr-request-processor-token' ] )
-            ? sanitize_text_field( $_REQUEST[ 'tkt-slctr-request-processor-token' ] )
-            : '';
+			? sanitize_text_field( $_REQUEST[ 'tkt-slctr-request-processor-token' ] )
+			: '';
 		// decrypt and convert to absolute  integer
 		if ( EE_Registry::instance()->CFG->registration->use_encryption ) {
 			EE_Registry::instance()->load_core( 'EE_Encryption' );
@@ -156,17 +156,17 @@ 
 		}
 		// ticket form submitted too impossibly fast ( after now ) or more than an hour later ???
 		$suspicious_timing = $bot_trap_timestamp > time() || $bot_trap_timestamp < ( time() - HOUR_IN_SECONDS )
-            ? true
-            : false;
+			? true
+			: false;
 		// are we human ?
 		if ( $empty_trap && ! $suspicious_timing ) {
-		    do_action('AHEE__EED_Bot_Trap__process_bot_trap__trap_not_triggered');
+			do_action('AHEE__EED_Bot_Trap__process_bot_trap__trap_not_triggered');
 			return;
 		}
 		// check the given callback is valid first before executing
 		if ( ! is_callable($triggered_trap_callback ) ) {
 			// invalid callback so lets just sub in our default.
-            $triggered_trap_callback = array( 'EED_Bot_Trap', 'triggered_trap_response' );
+			$triggered_trap_callback = array( 'EED_Bot_Trap', 'triggered_trap_response' );
 		}
 		call_user_func_array($triggered_trap_callback, array( $suspicious_timing ) );
 	}
@@ -192,21 +192,21 @@ 
 			);
 		}
 		$redirect_url = apply_filters('FHEE__EED_Bot_Trap__process_bot_trap__redirect_url', $redirect_url);
-        // if AJAX, return the redirect URL
-        if (defined('DOING_AJAX') && DOING_AJAX) {
-            echo wp_json_encode(
-                array_merge(
-                    \EE_Error::get_notices(false),
-                    array(
-                       'redirect_url' => $redirect_url
-                    )
-                )
-            );
-            exit();
-        }
-        wp_safe_redirect($redirect_url);
-        exit();
-    }
+		// if AJAX, return the redirect URL
+		if (defined('DOING_AJAX') && DOING_AJAX) {
+			echo wp_json_encode(
+				array_merge(
+					\EE_Error::get_notices(false),
+					array(
+					   'redirect_url' => $redirect_url
+					)
+				)
+			);
+			exit();
+		}
+		wp_safe_redirect($redirect_url);
+		exit();
+	}
 
 
 
@@ -237,9 +237,9 @@ 
 	 * @return    void
 	 */
 	public static function bot_trap_settings_form() {
-        EED_Bot_Trap::_bot_trap_settings_form()->enqueue_js();
-        echo EED_Bot_Trap::_bot_trap_settings_form()->get_html();
-    }
+		EED_Bot_Trap::_bot_trap_settings_form()->enqueue_js();
+		echo EED_Bot_Trap::_bot_trap_settings_form()->get_html();
+	}
 
 
 

modules/batch/EED_Batch.module.php

Indentation +1 added lines, -1 removed lines

@@ -250,7 +250,7 @@
 		if ( NULL === error_get_last() || ! headers_sent() ) {
 			header('Content-Type: application/json; charset=UTF-8');
 		}
-        echo wp_json_encode( $json );
+		echo wp_json_encode( $json );
 		exit();
 	}
 	

Spacing +55 added lines, -55 removed lines

@@ -17,13 +17,13 @@ 
  * @since		 	   4.8.30.rc.007
  *
  */
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
-define( 'BATCH_URL', plugin_dir_url( __FILE__ ) );
+define('BATCH_URL', plugin_dir_url(__FILE__));
 
-class EED_Batch extends EED_Module{
+class EED_Batch extends EED_Module {
 	
 	/**
 	 * Possibly value for $_REQUEST[ 'batch' ]. Indicates to run a job that
@@ -70,9 +70,9 @@ 
 	public static function set_hooks() {
 		//because this is a possibel attack vector, let's have this disabled until 
 		//we at least have a real use for it on the frontend
-		if( apply_filters( 'FHEE__EED_Batch__set_hooks__enable_frontend_batch', false ) ) {
-			add_action( 'wp_enqueue_scripts', array( self::instance(), 'enqueue_scripts' ) );
-			add_filter( 'template_include', array( self::instance(), 'override_template' ), 99 );
+		if (apply_filters('FHEE__EED_Batch__set_hooks__enable_frontend_batch', false)) {
+			add_action('wp_enqueue_scripts', array(self::instance(), 'enqueue_scripts'));
+			add_filter('template_include', array(self::instance(), 'override_template'), 99);
 		}
 	}
 	
@@ -80,28 +80,28 @@ 
 	 * Initializes some hooks for the admin in order to run batch jobs
 	 */
 	public static function set_hooks_admin() {
-		add_action( 'admin_menu', array( self::instance(), 'register_admin_pages' ) );
-		add_action( 'admin_enqueue_scripts', array( self::instance(), 'enqueue_scripts' ) );
+		add_action('admin_menu', array(self::instance(), 'register_admin_pages'));
+		add_action('admin_enqueue_scripts', array(self::instance(), 'enqueue_scripts'));
 		
 		//ajax
-		add_action('wp_ajax_espresso_batch_continue',array(self::instance(),'batch_continue'));
-		add_action('wp_ajax_espresso_batch_cleanup',array(self::instance(),'batch_cleanup'));
-		add_action('wp_ajax_nopriv_espresso_batch_continue',array(self::instance(),'batch_continue'));
-		add_action('wp_ajax_nopriv_espresso_batch_cleanup',array(self::instance(),'batch_cleanup'));
+		add_action('wp_ajax_espresso_batch_continue', array(self::instance(), 'batch_continue'));
+		add_action('wp_ajax_espresso_batch_cleanup', array(self::instance(), 'batch_cleanup'));
+		add_action('wp_ajax_nopriv_espresso_batch_continue', array(self::instance(), 'batch_continue'));
+		add_action('wp_ajax_nopriv_espresso_batch_cleanup', array(self::instance(), 'batch_cleanup'));
 	}
 	
 	/**
 	 * Enqueues batch scripts on the frontend or admin, and creates a job
 	 */
 	public function enqueue_scripts() { 
-		if( isset( $_REQUEST[ 'espresso_batch' ] ) 
+		if (isset($_REQUEST['espresso_batch']) 
 			|| 
 			( 
-				isset( $_REQUEST[ 'page' ] )
-				&& $_REQUEST[ 'page' ] == 'espresso_batch'
+				isset($_REQUEST['page'])
+				&& $_REQUEST['page'] == 'espresso_batch'
 			) 
 		) { 
-			switch( $this->batch_request_type() ) {
+			switch ($this->batch_request_type()) {
 				case self::batch_job:
 					$this->enqueue_scripts_styles_batch_create();
 					break;
@@ -117,11 +117,11 @@ 
 	 */
 	public function enqueue_scripts_styles_batch_create() {	
 		$job_response = $this->_enqueue_batch_job_scripts_and_styles_and_start_job();
-		wp_enqueue_script( 'batch_runner_init', BATCH_URL . '/assets/batch_runner_init.js', array( 'batch_runner' ), EVENT_ESPRESSO_VERSION, true );
-		wp_localize_script( 'batch_runner_init', 'ee_job_response', $job_response->to_array() );
-		wp_localize_script( 'batch_runner_init', 'ee_job_i18n', 
+		wp_enqueue_script('batch_runner_init', BATCH_URL.'/assets/batch_runner_init.js', array('batch_runner'), EVENT_ESPRESSO_VERSION, true);
+		wp_localize_script('batch_runner_init', 'ee_job_response', $job_response->to_array());
+		wp_localize_script('batch_runner_init', 'ee_job_i18n', 
 			array(
-				'return_url' => $_REQUEST['return_url' ],
+				'return_url' => $_REQUEST['return_url'],
 			));
 	}
 	
@@ -131,15 +131,15 @@ 
 	public function enqueue_scripts_styles_batch_file_create() {
 		//creates a job based on the request variable
 		$job_response = $this->_enqueue_batch_job_scripts_and_styles_and_start_job();
-		wp_enqueue_script( 'batch_file_runner_init', BATCH_URL . '/assets/batch_file_runner_init.js', array( 'batch_runner' ), EVENT_ESPRESSO_VERSION, true );
-		wp_localize_script( 'batch_file_runner_init', 'ee_job_response', $job_response->to_array() );
-		wp_localize_script( 'batch_file_runner_init', 'ee_job_i18n', 
+		wp_enqueue_script('batch_file_runner_init', BATCH_URL.'/assets/batch_file_runner_init.js', array('batch_runner'), EVENT_ESPRESSO_VERSION, true);
+		wp_localize_script('batch_file_runner_init', 'ee_job_response', $job_response->to_array());
+		wp_localize_script('batch_file_runner_init', 'ee_job_i18n', 
 				array(
 					'download_and_redirecting' => sprintf( 
 							__('File Generation complete. Downloading, and %1$sredirecting%2$s...', 'event_espresso'),
-							'<a href="' . $_REQUEST['return_url' ] .'">',
+							'<a href="'.$_REQUEST['return_url'].'">',
 							'</a>' ),
-					'return_url' => $_REQUEST['return_url' ],
+					'return_url' => $_REQUEST['return_url'],
 				));
 	}
 	
@@ -150,18 +150,18 @@ 
 	 * @return \EventEspressoBatchRequest\Helpers\JobStepResponse
 	 */
 	protected function _enqueue_batch_job_scripts_and_styles_and_start_job() {
-		wp_register_script( 'progress_bar', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/progress_bar.js', array( 'jquery' ) );
-		wp_enqueue_style( 'progress_bar', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/progress_bar.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_script( 'batch_runner', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/batch_runner.js', array( 'progress_bar' ));
+		wp_register_script('progress_bar', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/progress_bar.js', array('jquery'));
+		wp_enqueue_style('progress_bar', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/progress_bar.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_script('batch_runner', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/batch_runner.js', array('progress_bar'));
 		//just copy the bits of EE admin's eei18n that we need in the JS
-		wp_localize_script( 'batch_runner', 'eei18n', array( 'ajax_url' => WP_AJAX_URL, 'is_admin' => (bool)is_admin() ) );
-		$job_handler_classname = stripslashes( $_GET[ 'job_handler' ] );
+		wp_localize_script('batch_runner', 'eei18n', array('ajax_url' => WP_AJAX_URL, 'is_admin' => (bool) is_admin()));
+		$job_handler_classname = stripslashes($_GET['job_handler']);
 		$request_data = array_diff_key( 
 				$_REQUEST, 
-				array_flip( array( 'action',  'page', 'ee', 'batch' ) ) );
+				array_flip(array('action', 'page', 'ee', 'batch')) );
 		$batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor();
 		//eg 'EventEspressoBatchRequest\JobHandlers\RegistrationsReport'
-		$job_response = $batch_runner->create_job( $job_handler_classname, $request_data );
+		$job_response = $batch_runner->create_job($job_handler_classname, $request_data);
 		//remember the response for later. We need it to display the page body
 		$this->_job_step_response = $job_response;
 		return $job_response;
@@ -172,9 +172,9 @@ 
 	 * @param string $template
 	 * @return string
 	 */
-	public function override_template( $template ) {
-		if( isset( $_REQUEST[ 'espresso_batch' ] ) && isset( $_REQUEST[ 'batch' ] ) ) {
-			return EE_MODULES . 'batch' . DS . 'templates' . DS . 'batch_frontend_wrapper.template.html';
+	public function override_template($template) {
+		if (isset($_REQUEST['espresso_batch']) && isset($_REQUEST['batch'])) {
+			return EE_MODULES.'batch'.DS.'templates'.DS.'batch_frontend_wrapper.template.html';
 		}
 		return $template;
 	}
@@ -185,11 +185,11 @@ 
 	public function register_admin_pages() {
 		add_submenu_page( 
 			'', //parent slug. we don't want this to actually appear in the menu
-			__( 'Batch Job', 'event_espresso' ), //page title
+			__('Batch Job', 'event_espresso'), //page title
 			'n/a', //menu title
 			'read', //we want this page to actually be accessible to anyone,  
 			'espresso_batch', //menu slug
-			array( self::instance(), 'show_admin_page' )
+			array(self::instance(), 'show_admin_page')
 		);
 	}
 	
@@ -199,8 +199,8 @@ 
 	 */
 	public function show_admin_page() { 
 		echo EEH_Template::locate_template( 
-			EE_MODULES . 'batch' . DS . 'templates' . DS . 'batch_wrapper.template.html', 
-			array( 'batch_request_type' => $this->batch_request_type() )
+			EE_MODULES.'batch'.DS.'templates'.DS.'batch_wrapper.template.html', 
+			array('batch_request_type' => $this->batch_request_type())
 		);
 	}
 	
@@ -208,10 +208,10 @@ 
 	 * Receives ajax calls for continuing a job
 	 */
 	public function batch_continue() {
-		$job_id = sanitize_text_field( $_REQUEST[ 'job_id' ] );
+		$job_id = sanitize_text_field($_REQUEST['job_id']);
 		$batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor();
-		$response_obj = $batch_runner->continue_job( $job_id);
-		$this->_return_json( $response_obj->to_array() );
+		$response_obj = $batch_runner->continue_job($job_id);
+		$this->_return_json($response_obj->to_array());
 	}
 	
 	/**
@@ -219,10 +219,10 @@ 
 	 * @return type
 	 */
 	public function batch_cleanup() {
-		$job_id = sanitize_text_field( $_REQUEST[ 'job_id' ] );
+		$job_id = sanitize_text_field($_REQUEST['job_id']);
 		$batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor();
-		$response_obj = $batch_runner->cleanup_job( $job_id );
-		$this->_return_json( $response_obj->to_array() );
+		$response_obj = $batch_runner->cleanup_job($job_id);
+		$this->_return_json($response_obj->to_array());
 	}
 	
 	
@@ -238,7 +238,7 @@ 
 	 *	'isEEajax' => true,//indicates this is a response from EE
 	 * )
 	 */
-	protected function _return_json( $data ) {
+	protected function _return_json($data) {
 		$json = array(
 			'notices' => EE_Error::get_notices(),
 			'data' => $data,
@@ -247,10 +247,10 @@ 
 
 
 		// make sure there are no php errors or headers_sent.  Then we can set correct json header.
-		if ( NULL === error_get_last() || ! headers_sent() ) {
+		if (NULL === error_get_last() || ! headers_sent()) {
 			header('Content-Type: application/json; charset=UTF-8');
 		}
-        echo wp_json_encode( $json );
+        echo wp_json_encode($json);
 		exit();
 	}
 	
@@ -266,16 +266,16 @@ 
 	 * @return string: EED_Batch::batch_job, EED_Batch::batch_file_job, EED_Batch::batch_not_job
 	 */
 	public function batch_request_type() {
-		if( $this->_batch_request_type === null ) {
-			if( isset( $_GET[ 'batch' ] ) ) {
-				if( $_GET[ 'batch' ] == self::batch_job ) {
+		if ($this->_batch_request_type === null) {
+			if (isset($_GET['batch'])) {
+				if ($_GET['batch'] == self::batch_job) {
 					$this->_batch_request_type = self::batch_job;
-				} elseif( $_GET[ 'batch' ] == self::batch_file_job ) {
+				} elseif ($_GET['batch'] == self::batch_file_job) {
 					$this->_batch_request_type = self::batch_file_job;
 				}
 			}
 			//if we didn't find that it was a batch request, indicate it wasn't
-			if( $this->_batch_request_type === null ) {
+			if ($this->_batch_request_type === null) {
 				$this->_batch_request_type = self::batch_not_job;
 			}
 		}
@@ -286,7 +286,7 @@ 
 	 * Unnecessary
 	 * @param type $WP
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 		
 	}
 

shortcodes/espresso_thank_you/EES_Espresso_Thank_You.shortcode.php

Spacing +135 added lines, -135 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -91,7 +91,7 @@ 
 	 * @return    void
 	 */
 	public static function set_hooks() {
-		add_action( 'wp_loaded', array( 'EES_Espresso_Thank_You', 'set_definitions' ), 2 );
+		add_action('wp_loaded', array('EES_Espresso_Thank_You', 'set_definitions'), 2);
 	}
 
 
@@ -104,22 +104,22 @@ 
 	 */
 	public static function set_hooks_admin() {
 		// AJAX for IPN monitoring
-		add_filter( 'heartbeat_received', array( 'EES_Espresso_Thank_You', 'thank_you_page_IPN_monitor' ), 10, 3 );
+		add_filter('heartbeat_received', array('EES_Espresso_Thank_You', 'thank_you_page_IPN_monitor'), 10, 3);
 		add_filter(
 			'heartbeat_nopriv_received',
-			array( 'EES_Espresso_Thank_You', 'thank_you_page_IPN_monitor' ),
+			array('EES_Espresso_Thank_You', 'thank_you_page_IPN_monitor'),
 			10,
 			3
 		);
 		add_action(
 			'wp_ajax_espresso_resend_reg_confirmation_email',
-			array( 'EES_Espresso_Thank_You', 'resend_reg_confirmation_email' ),
+			array('EES_Espresso_Thank_You', 'resend_reg_confirmation_email'),
 			10,
 			2
 		);
 		add_action(
 			'wp_ajax_nopriv_espresso_resend_reg_confirmation_email',
-			array( 'EES_Espresso_Thank_You', 'resend_reg_confirmation_email' ),
+			array('EES_Espresso_Thank_You', 'resend_reg_confirmation_email'),
 			10,
 			2
 		);
@@ -134,8 +134,8 @@ 
 	 * @return    void
 	 */
 	public static function set_definitions() {
-		define( 'THANK_YOU_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		define( 'THANK_YOU_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ ) ) . 'templates' . DS );
+		define('THANK_YOU_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		define('THANK_YOU_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
 	}
 
 
@@ -147,13 +147,13 @@ 
 	 * @return    EE_Transaction
 	 */
 	public function get_txn() {
-		if ( $this->_current_txn instanceof EE_Transaction ) {
+		if ($this->_current_txn instanceof EE_Transaction) {
 			return $this->_current_txn;
 		}
-		$TXN_model = EE_Registry::instance()->load_model( 'Transaction' );
-		if ( ! $TXN_model instanceof EEM_Transaction ) {
+		$TXN_model = EE_Registry::instance()->load_model('Transaction');
+		if ( ! $TXN_model instanceof EEM_Transaction) {
 			EE_Error::add_error(
-				__( 'The transaction model could not be established.', 'event_espresso' ),
+				__('The transaction model could not be established.', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -161,9 +161,9 @@ 
 			return null;
 		}
 		//get the transaction. yes, we may have just loaded it, but it may have been updated, or this may be via an ajax request
-		$this->_current_txn = $TXN_model->get_transaction_from_reg_url_link( $this->_reg_url_link );
+		$this->_current_txn = $TXN_model->get_transaction_from_reg_url_link($this->_reg_url_link);
 		// verify TXN
-		if ( WP_DEBUG && ! $this->_current_txn instanceof EE_Transaction ) {
+		if (WP_DEBUG && ! $this->_current_txn instanceof EE_Transaction) {
 			EE_Error::add_error(
 				__(
 					'No transaction information could be retrieved or the transaction data is not of the correct type.',
@@ -187,16 +187,16 @@ 
 	 * @param int $since
 	 * @return    mixed array of EE_Payment || FALSE
 	 */
-	public function get_txn_payments( $since = 0 ) {
-		if ( ! $this->get_txn() ) {
+	public function get_txn_payments($since = 0) {
+		if ( ! $this->get_txn()) {
 			return false;
 		}
-		$args = array( 'order_by' => array( 'PAY_timestamp' => 'ASC' ) );
-		if ( $since > 0 ) {
-			$args[0] = array( 'PAY_timestamp' => array( '>', $since ) );
+		$args = array('order_by' => array('PAY_timestamp' => 'ASC'));
+		if ($since > 0) {
+			$args[0] = array('PAY_timestamp' => array('>', $since));
 		}
 		// get array of payments with most recent first
-		return $this->_current_txn->payments( $args );
+		return $this->_current_txn->payments($args);
 	}
 
 
@@ -208,11 +208,11 @@ 
 	 * @return    void
 	 */
 	private function _get_reg_url_link() {
-		if ( ! empty( $this->_reg_url_link ) ) {
+		if ( ! empty($this->_reg_url_link)) {
 			return;
 		}
 		// only do thank you page stuff if we have a REG_url_link in the url
-		if ( WP_DEBUG && ! EE_Registry::instance()->REQ->is_set( 'e_reg_url_link' ) ) {
+		if (WP_DEBUG && ! EE_Registry::instance()->REQ->is_set('e_reg_url_link')) {
 			EE_Error::add_error(
 				__(
 					'No transaction information could be retrieved because the registration URL link is missing or invalid.',
@@ -225,7 +225,7 @@ 
 			return;
 		}
 		// check for reg_url_link
-		$this->_reg_url_link = EE_Registry::instance()->REQ->get( 'e_reg_url_link' );
+		$this->_reg_url_link = EE_Registry::instance()->REQ->get('e_reg_url_link');
 	}
 
 
@@ -237,8 +237,8 @@ 
 	 * @param    string $reg_url_link
 	 * @return    string
 	 */
-	public function set_reg_url_link( $reg_url_link = null ) {
-		$this->_reg_url_link = ! empty( $reg_url_link ) ? $reg_url_link : $this->_reg_url_link;
+	public function set_reg_url_link($reg_url_link = null) {
+		$this->_reg_url_link = ! empty($reg_url_link) ? $reg_url_link : $this->_reg_url_link;
 	}
 
 
@@ -251,28 +251,28 @@ 
 	 * @param    WP $WP
 	 * @return    void
 	 */
-	public function run( WP $WP ) {
+	public function run(WP $WP) {
 		// remove site_url() from thank you page URL
-		$thank_you_page_URL = substr( EE_Registry::instance()->CFG->core->thank_you_page_url(), strlen( home_url() ) );
+		$thank_you_page_URL = substr(EE_Registry::instance()->CFG->core->thank_you_page_url(), strlen(home_url()));
 		// remove other non-essential details from URL
-		$thank_you_page_URL = trim( parse_url( $thank_you_page_URL, PHP_URL_PATH ), '/' );
+		$thank_you_page_URL = trim(parse_url($thank_you_page_URL, PHP_URL_PATH), '/');
 		// ensure this shortcode doesn't trigger on anything BUT the thank you page
-		if ( isset( $WP->request ) && trim( $WP->request, '/' ) !== $thank_you_page_URL ) {
+		if (isset($WP->request) && trim($WP->request, '/') !== $thank_you_page_URL) {
 			return;
 		} else if (
-			isset( $WP->query_vars['page_id'] )
-			&& (int)$WP->query_vars['page_id'] !== (int)EE_Registry::instance()->CFG->core->thank_you_page_id
+			isset($WP->query_vars['page_id'])
+			&& (int) $WP->query_vars['page_id'] !== (int) EE_Registry::instance()->CFG->core->thank_you_page_id
 		) {
 			return;
 		}
 		$this->_get_reg_url_link();
 		// resend_reg_confirmation_email ?
-		if ( EE_Registry::instance()->REQ->is_set( 'resend' ) ) {
+		if (EE_Registry::instance()->REQ->is_set('resend')) {
 			EES_Espresso_Thank_You::resend_reg_confirmation_email();
 		}
 		// load assets
-		add_action( 'wp_enqueue_scripts', array( $this, 'load_js' ), 10 );
-		EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ );
+		add_action('wp_enqueue_scripts', array($this, 'load_js'), 10);
+		EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
 		$this->_translate_strings();
 	}
 
@@ -326,12 +326,12 @@ 
 	public function load_js() {
 		wp_register_script(
 			'thank_you_page',
-			THANK_YOU_ASSETS_URL . 'thank_you_page.js',
-			array( 'espresso_core', 'heartbeat' ),
+			THANK_YOU_ASSETS_URL.'thank_you_page.js',
+			array('espresso_core', 'heartbeat'),
 			EVENT_ESPRESSO_VERSION,
 			true
 		);
-		wp_enqueue_script( 'thank_you_page' );
+		wp_enqueue_script('thank_you_page');
 	}
 
 
@@ -345,9 +345,9 @@ 
 	 */
 	public function init() {
 		$this->_get_reg_url_link();
-		if ( ! $this->get_txn() ) {
+		if ( ! $this->get_txn()) {
 			echo EEH_HTML::div(
-				EEH_HTML::h4( __( 'We\'re sorry...', 'event_espresso' ), '', '' ) .
+				EEH_HTML::h4(__('We\'re sorry...', 'event_espresso'), '', '').
 				sprintf(
 					__(
 						'This is a system page for displaying transaction information after a purchase.%1$sYou are most likely seeing this notice because you have navigated to this page%1$sthrough some means other than completing a transaction.%1$sSorry for the disappointment, but you will most likely find nothing of interest here.%1$s%1$s',
@@ -361,8 +361,8 @@ 
 			return null;
 		}
 		// if we've made it to the Thank You page, then let's toggle any "Failed" transactions to "Incomplete"
-		if ( $this->_current_txn->status_ID() === EEM_Transaction::failed_status_code ) {
-			$this->_current_txn->set_status( EEM_Transaction::incomplete_status_code );
+		if ($this->_current_txn->status_ID() === EEM_Transaction::failed_status_code) {
+			$this->_current_txn->set_status(EEM_Transaction::incomplete_status_code);
 			$this->_current_txn->save();
 		}
 		$this->_primary_registrant = $this->_current_txn->primary_registration() instanceof EE_Registration
@@ -375,15 +375,15 @@ 
 		);
 		$this->_show_try_pay_again_link = $show_try_pay_again_link_default;
 		// txn status ?
-		if ( $this->_current_txn->is_completed() ) {
+		if ($this->_current_txn->is_completed()) {
 			$this->_show_try_pay_again_link = $show_try_pay_again_link_default;
 		} else if (
 			$this->_current_txn->is_incomplete()
-			&& ( $this->_primary_registrant->is_approved()
-			|| $this->_primary_registrant->is_pending_payment() )
+			&& ($this->_primary_registrant->is_approved()
+			|| $this->_primary_registrant->is_pending_payment())
 		) {
 			$this->_show_try_pay_again_link = true;
-		} else if ( $this->_primary_registrant->is_approved() || $this->_primary_registrant->is_pending_payment() ) {
+		} else if ($this->_primary_registrant->is_approved() || $this->_primary_registrant->is_pending_payment()) {
 			// its pending
 			$this->_show_try_pay_again_link = isset(
 				EE_Registry::instance()->CFG->registration->show_pending_payment_options
@@ -409,21 +409,21 @@ 
 		}
 		// link to SPCO
 		$revisit_spco_url = add_query_arg(
-			array( 'ee' => '_register', 'revisit' => true, 'e_reg_url_link' => $this->_reg_url_link ),
+			array('ee' => '_register', 'revisit' => true, 'e_reg_url_link' => $this->_reg_url_link),
 			EE_Registry::instance()->CFG->core->reg_page_url()
 		);
 		// link to SPCO payment_options
 		$this->_SPCO_payment_options_url = $this->_primary_registrant instanceof EE_Registration
 			? $this->_primary_registrant->payment_overview_url()
 			: add_query_arg(
-				array( 'step' => 'payment_options' ),
+				array('step' => 'payment_options'),
 				$revisit_spco_url
 			);
 		// link to SPCO attendee_information
 		$this->_SPCO_attendee_information_url = $this->_primary_registrant instanceof EE_Registration
 			? $this->_primary_registrant->edit_attendee_information_url()
 			: false;
-		do_action( 'AHEE__EES_Espresso_Thank_You__init_end', $this->_current_txn );
+		do_action('AHEE__EES_Espresso_Thank_You__init_end', $this->_current_txn);
 		// set no cache headers and constants
 		EE_System::do_not_cache();
 	}
@@ -438,15 +438,15 @@ 
 	 * @return    string
 	 * @throws \EE_Error
 	 */
-	public function process_shortcode( $attributes = array() ) {
+	public function process_shortcode($attributes = array()) {
 		$this->init();
-		if ( ! $this->_current_txn instanceof EE_Transaction ) {
+		if ( ! $this->_current_txn instanceof EE_Transaction) {
 			return EE_Error::get_notices();
 		}
 		//EEH_Debug_Tools::log( __CLASS__, __FUNCTION__, __LINE__, array( $this->_current_txn ), true, 	'EE_Transaction: ' . $this->_current_txn->ID() );
 		// link to receipt
-		$template_args['TXN_receipt_url'] = $this->_current_txn->receipt_url( 'html' );
-		if ( ! empty( $template_args['TXN_receipt_url'] ) ) {
+		$template_args['TXN_receipt_url'] = $this->_current_txn->receipt_url('html');
+		if ( ! empty($template_args['TXN_receipt_url'])) {
 			$template_args['order_conf_desc'] = __(
 				'%1$sCongratulations%2$sYour registration has been successfully processed.%3$sCheck your email for your registration confirmation or click the button below to view / download / print a full description of your purchases and registration information.',
 				'event_espresso'
@@ -458,13 +458,13 @@ 
 			);
 		}
 		$template_args['transaction'] = $this->_current_txn;
-		$template_args['revisit'] = EE_Registry::instance()->REQ->get( 'revisit', false );
-		add_action( 'AHEE__thank_you_page_overview_template__content', array( $this, 'get_registration_details' ) );
-		if ( $this->_is_primary && ! $this->_current_txn->is_free() ) {
-			add_action( 'AHEE__thank_you_page_overview_template__content', array( $this, 'get_ajax_content' ) );
+		$template_args['revisit'] = EE_Registry::instance()->REQ->get('revisit', false);
+		add_action('AHEE__thank_you_page_overview_template__content', array($this, 'get_registration_details'));
+		if ($this->_is_primary && ! $this->_current_txn->is_free()) {
+			add_action('AHEE__thank_you_page_overview_template__content', array($this, 'get_ajax_content'));
 		}
 		return EEH_Template::locate_template(
-			THANK_YOU_TEMPLATES_PATH . 'thank-you-page-overview.template.php',
+			THANK_YOU_TEMPLATES_PATH.'thank-you-page-overview.template.php',
 			$template_args,
 			true,
 			true
@@ -485,15 +485,15 @@ 
 	 * @return    array
 	 * @throws \EE_Error
 	 */
-	public static function thank_you_page_IPN_monitor( $response = array(), $data = array() ) {
+	public static function thank_you_page_IPN_monitor($response = array(), $data = array()) {
 		// does this heartbeat contain our data ?
-		if ( ! isset( $data['espresso_thank_you_page'] ) ) {
+		if ( ! isset($data['espresso_thank_you_page'])) {
 			return $response;
 		}
 		// check for reg_url_link in the incoming heartbeat data
-		if ( ! isset( $data['espresso_thank_you_page']['e_reg_url_link'] ) ) {
+		if ( ! isset($data['espresso_thank_you_page']['e_reg_url_link'])) {
 			$response['espresso_thank_you_page'] = array(
-			'errors' => ! empty( $notices['errors'] )
+			'errors' => ! empty($notices['errors'])
 				? $notices['errors']
 				: __(
 					'No transaction information could be retrieved because the registration URL link is missing or invalid.',
@@ -508,15 +508,15 @@ 
 		EES_Espresso_Thank_You::set_definitions();
 		/** @var $espresso_thank_you_page EES_Espresso_Thank_You */
 		$espresso_thank_you_page = EES_Espresso_Thank_You::instance();
-		$espresso_thank_you_page->set_reg_url_link( $data['espresso_thank_you_page']['e_reg_url_link'] );
+		$espresso_thank_you_page->set_reg_url_link($data['espresso_thank_you_page']['e_reg_url_link']);
 		$espresso_thank_you_page->init();
 		//get TXN
 		$TXN = $espresso_thank_you_page->get_txn();
 		// no TXN? then get out
-		if ( ! $TXN instanceof EE_Transaction ) {
+		if ( ! $TXN instanceof EE_Transaction) {
 			$notices = EE_Error::get_notices();
 			$response['espresso_thank_you_page'] = array(
-			'errors' => ! empty( $notices['errors'] )
+			'errors' => ! empty($notices['errors'])
 				? $notices['errors']
 				: sprintf(
 					__(
@@ -529,13 +529,13 @@ 
 			return $response;
 		}
 		// grab transient of TXN's status
-		$txn_status = isset( $data['espresso_thank_you_page']['txn_status'] )
+		$txn_status = isset($data['espresso_thank_you_page']['txn_status'])
 			? $data['espresso_thank_you_page']['txn_status']
 			: null;
 		// has the TXN status changed since we last checked (or empty because this is the first time running through this code)?
-		if ( $txn_status !== $TXN->status_ID() ) {
+		if ($txn_status !== $TXN->status_ID()) {
 			// switch between two possible basic outcomes
-			switch ( $TXN->status_ID() ) {
+			switch ($TXN->status_ID()) {
 				// TXN has been updated in some way
 				case EEM_Transaction::overpaid_status_code:
 				case EEM_Transaction::complete_status_code:
@@ -550,25 +550,25 @@ 
 				case EEM_Transaction::failed_status_code:
 				default:
 					// keep on waiting...
-					return $espresso_thank_you_page->_update_server_wait_time( $data['espresso_thank_you_page'] );
+					return $espresso_thank_you_page->_update_server_wait_time($data['espresso_thank_you_page']);
 			}
 			// or is the TXN still failed (never been updated) ???
-		} else if ( $TXN->failed() ) {
+		} else if ($TXN->failed()) {
 			// keep on waiting...
-			return $espresso_thank_you_page->_update_server_wait_time( $data['espresso_thank_you_page'] );
+			return $espresso_thank_you_page->_update_server_wait_time($data['espresso_thank_you_page']);
 		}
 		// TXN is happening so let's get the payments now
 		// if we've already gotten payments then the heartbeat data will contain the timestamp of the last time we checked
-		$since = isset( $data['espresso_thank_you_page']['get_payments_since'] )
+		$since = isset($data['espresso_thank_you_page']['get_payments_since'])
 			? $data['espresso_thank_you_page']['get_payments_since']
 			: 0;
 		// then check for payments
-		$payments = $espresso_thank_you_page->get_txn_payments( $since );
+		$payments = $espresso_thank_you_page->get_txn_payments($since);
 		// has a payment been processed ?
-		if ( ! empty( $payments ) || $espresso_thank_you_page->_is_offline_payment_method ) {
-			if ( $since ) {
+		if ( ! empty($payments) || $espresso_thank_you_page->_is_offline_payment_method) {
+			if ($since) {
 				$response['espresso_thank_you_page'] = array(
-					'new_payments'        => $espresso_thank_you_page->get_new_payments( $payments ),
+					'new_payments'        => $espresso_thank_you_page->get_new_payments($payments),
 					'transaction_details' => $espresso_thank_you_page->get_transaction_details(),
 					'txn_status'          => $TXN->status_ID()
 				);
@@ -594,9 +594,9 @@ 
 	 * @param    array $thank_you_page_data thank you page portion of the incoming JSON array from the WP heartbeat data
 	 * @return    array
 	 */
-	private function _update_server_wait_time( $thank_you_page_data = array() ) {
+	private function _update_server_wait_time($thank_you_page_data = array()) {
 		$response['espresso_thank_you_page'] = array(
-			'still_waiting' => isset( $thank_you_page_data['initial_access'] )
+			'still_waiting' => isset($thank_you_page_data['initial_access'])
 				? time() - $thank_you_page_data['initial_access']
 				: 0,
 			'txn_status'    => $this->_current_txn->status_ID()
@@ -621,17 +621,17 @@ 
 		$template_args['is_primary'] = $this->_is_primary;
 		$template_args['SPCO_attendee_information_url'] = $this->_SPCO_attendee_information_url;
 		$template_args['resend_reg_confirmation_url'] = add_query_arg(
-			array( 'token' => $this->_reg_url_link, 'resend_reg_confirmation' => 'true' ),
+			array('token' => $this->_reg_url_link, 'resend_reg_confirmation' => 'true'),
 			EE_Registry::instance()->CFG->core->thank_you_page_url()
 		);
 		// verify template arguments
-		EEH_Template_Validator::verify_instanceof( $template_args['transaction'], '$transaction', 'EE_Transaction' );
+		EEH_Template_Validator::verify_instanceof($template_args['transaction'], '$transaction', 'EE_Transaction');
 		EEH_Template_Validator::verify_isnt_null(
 			$template_args['SPCO_attendee_information_url'],
 			'$SPCO_attendee_information_url'
 		);
 		echo EEH_Template::locate_template(
-			THANK_YOU_TEMPLATES_PATH . 'thank-you-page-registration-details.template.php',
+			THANK_YOU_TEMPLATES_PATH.'thank-you-page-registration-details.template.php',
 			$template_args,
 			true,
 			true
@@ -644,16 +644,16 @@ 
 	 *    resend_reg_confirmation_email
 	 */
 	public static function resend_reg_confirmation_email() {
-		EE_Registry::instance()->load_core( 'Request_Handler' );
-		$reg_url_link = EE_Registry::instance()->REQ->get( 'token' );
+		EE_Registry::instance()->load_core('Request_Handler');
+		$reg_url_link = EE_Registry::instance()->REQ->get('token');
 		// was a REG_ID passed ?
-		if ( $reg_url_link ) {
-			$registration = EE_Registry::instance()->load_model( 'Registration' )->get_one(
-				array( array( 'REG_url_link' => $reg_url_link ) )
+		if ($reg_url_link) {
+			$registration = EE_Registry::instance()->load_model('Registration')->get_one(
+				array(array('REG_url_link' => $reg_url_link))
 			);
-			if ( $registration instanceof EE_Registration ) {
+			if ($registration instanceof EE_Registration) {
 				// resend email
-				EED_Messages::process_resend( array( '_REG_ID' => $registration->ID() ) );
+				EED_Messages::process_resend(array('_REG_ID' => $registration->ID()));
 			} else {
 				EE_Error::add_error(
 					__(
@@ -677,16 +677,16 @@ 
 			);
 		}
 		// request sent via AJAX ?
-		if ( EE_FRONT_AJAX ) {
-			echo wp_json_encode( EE_Error::get_notices( false ) );
+		if (EE_FRONT_AJAX) {
+			echo wp_json_encode(EE_Error::get_notices(false));
 			die();
 			// or was JS disabled ?
 		} else {
 			// save errors so that they get picked up on the next request
-			EE_Error::get_notices( true, true );
+			EE_Error::get_notices(true, true);
 			wp_safe_redirect(
 				add_query_arg(
-					array( 'e_reg_url_link' => $reg_url_link ),
+					array('e_reg_url_link' => $reg_url_link),
 					EE_Registry::instance()->CFG->core->thank_you_page_url()
 				)
 			);
@@ -702,26 +702,26 @@ 
 	 * @return    void
 	 */
 	public function get_ajax_content() {
-		if ( ! $this->get_txn() ) {
+		if ( ! $this->get_txn()) {
 			return;
 		}
 		// first determine which event(s) require pre-approval or not
 		$events = array();
 		$events_requiring_pre_approval = array();
-		foreach ( $this->_current_txn->registrations() as $registration ) {
-			if ( $registration instanceof EE_Registration ) {
+		foreach ($this->_current_txn->registrations() as $registration) {
+			if ($registration instanceof EE_Registration) {
 				$event = $registration->event();
-				if ( $event instanceof EE_Event ) {
-					if ( $registration->is_not_approved() && $registration->event() instanceof EE_Event ) {
-						$events_requiring_pre_approval[ $event->ID() ] = $event;
+				if ($event instanceof EE_Event) {
+					if ($registration->is_not_approved() && $registration->event() instanceof EE_Event) {
+						$events_requiring_pre_approval[$event->ID()] = $event;
 					} else {
-						$events[ $event->ID() ] = $event;
+						$events[$event->ID()] = $event;
 					}
 				}
 			}
 		}
-		$this->display_details_for_events_requiring_pre_approval( $events_requiring_pre_approval );
-		$this->display_details_for_events( $events );
+		$this->display_details_for_events_requiring_pre_approval($events_requiring_pre_approval);
+		$this->display_details_for_events($events);
 	}
 
 
@@ -733,8 +733,8 @@ 
 	 * @param EE_Event[] $events
 	 * @return string
 	 */
-	public function display_details_for_events( $events = array() ) {
-		if ( ! empty( $events ) ) {
+	public function display_details_for_events($events = array()) {
+		if ( ! empty($events)) {
 			?>
 			<div id="espresso-thank-you-page-ajax-content-dv">
 				<div id="espresso-thank-you-page-ajax-transaction-dv"></div>
@@ -746,7 +746,7 @@ 
 							'event_espresso'
 							); ?></span>
 					</div>
-					<?php if ( ! $this->_is_offline_payment_method && ! $this->_payments_closed ) : ?>
+					<?php if ( ! $this->_is_offline_payment_method && ! $this->_payments_closed) : ?>
 						<p id="ee-ajax-loading-pg" class="highlight-bg small-text clear">
 							<?php echo apply_filters(
 								'EES_Espresso_Thank_You__get_ajax_content__waiting_for_IPN_msg',
@@ -757,7 +757,7 @@ 
 							); ?>
 							<br/>
 							<span class="jst-rght ee-block small-text lt-grey-text">
-								<?php _e( 'current wait time ', 'event_espresso' ); ?>
+								<?php _e('current wait time ', 'event_espresso'); ?>
 							<span id="espresso-thank-you-page-ajax-time-dv">00:00:00</span></span>
 						</p>
 					<?php endif; ?>
@@ -777,11 +777,11 @@ 
 	 * @param EE_Event[] $events
 	 * @return string
 	 */
-	public function display_details_for_events_requiring_pre_approval( $events = array() ) {
-		if ( ! empty( $events ) ) {
+	public function display_details_for_events_requiring_pre_approval($events = array()) {
+		if ( ! empty($events)) {
 			?>
 			<div id="espresso-thank-you-page-not-approved-message-dv">
-				<h4 class="orange-text"><?php _e( 'Important Notice:', 'event_espresso' ); ?></h4>
+				<h4 class="orange-text"><?php _e('Important Notice:', 'event_espresso'); ?></h4>
 				<p id="events-requiring-pre-approval-pg" class="small-text">
 					<?php echo apply_filters(
 						'AHEE__EES_Espresso_Thank_You__get_ajax_content__not_approved_message',
@@ -792,8 +792,8 @@ 
 					); ?>
 				</p>
 				<ul class="events-requiring-pre-approval-ul">
-					<?php foreach ( $events as $event ) {
-						if ( $event instanceof EE_Event ) {
+					<?php foreach ($events as $event) {
+						if ($event instanceof EE_Event) {
 							echo '<li><span class="dashicons dashicons-marker ee-icon-size-16 orange-text"></span>',
 								$event->name(),
 								'</li>';
@@ -820,12 +820,12 @@ 
 		$template_args = array();
 		$template_args['transaction'] = $this->_current_txn;
 		$template_args['reg_url_link'] = $this->_reg_url_link;
-		$template_args['primary_registrant_name'] = $this->_primary_registrant->attendee()->full_name( true );
+		$template_args['primary_registrant_name'] = $this->_primary_registrant->attendee()->full_name(true);
 		// link to SPCO payment_options
 		$template_args['show_try_pay_again_link'] = $this->_show_try_pay_again_link;
 		$template_args['SPCO_payment_options_url'] = $this->_SPCO_payment_options_url;
 		// verify template arguments
-		EEH_Template_Validator::verify_instanceof( $template_args['transaction'], '$transaction', 'EE_Transaction' );
+		EEH_Template_Validator::verify_instanceof($template_args['transaction'], '$transaction', 'EE_Transaction');
 		EEH_Template_Validator::verify_isnt_null(
 			$template_args['show_try_pay_again_link'],
 			'$show_try_pay_again_link'
@@ -835,7 +835,7 @@ 
 			'$SPCO_payment_options_url'
 		);
 		return EEH_Template::locate_template(
-			THANK_YOU_TEMPLATES_PATH . 'thank-you-page-transaction-details.template.php',
+			THANK_YOU_TEMPLATES_PATH.'thank-you-page-transaction-details.template.php',
 			$template_args,
 			true,
 			true
@@ -852,9 +852,9 @@ 
 	 * @return    string
 	 * @throws \EE_Error
 	 */
-	public function get_payment_row_html( $payment = null ) {
+	public function get_payment_row_html($payment = null) {
 		$html = '';
-		if ( $payment instanceof EE_Payment ) {
+		if ($payment instanceof EE_Payment) {
 			if (
 				$payment->payment_method() instanceof EE_Payment_Method
 				&& $payment->status() === EEM_Payment::status_id_failed
@@ -863,31 +863,31 @@ 
 				// considering the registrant has made it to the Thank You page,
 				// any failed payments may actually be pending and the IPN is just slow
 				// so let's
-				$payment->set_status( EEM_Payment::status_id_pending );
+				$payment->set_status(EEM_Payment::status_id_pending);
 			}
 			$payment_declined_msg = $payment->STS_ID() === EEM_Payment::status_id_declined
-				? '<br /><span class="small-text">' . $payment->gateway_response() . '</span>'
+				? '<br /><span class="small-text">'.$payment->gateway_response().'</span>'
 				: '';
 			$html .= '
 				<tr>
 					<td>
-						' . $payment->timestamp() . '
+						' . $payment->timestamp().'
 					</td>
 					<td>
 						' . (
 								$payment->payment_method() instanceof EE_Payment_Method
 									? $payment->payment_method()->name()
-									: __( 'Unknown', 'event_espresso' )
-							) . '
+									: __('Unknown', 'event_espresso')
+							).'
 					</td>
 					<td class="jst-rght">
-						' . EEH_Template::format_currency( $payment->amount() ) . '
+						' . EEH_Template::format_currency($payment->amount()).'
 					</td>
 					<td class="jst-rght" style="line-height:1;">
-						' . $payment->pretty_status( true ) . $payment_declined_msg . '
+						' . $payment->pretty_status(true).$payment_declined_msg.'
 					</td>
 				</tr>';
-			do_action( 'AHEE__thank_you_page_payment_details_template__after_each_payment', $payment );
+			do_action('AHEE__thank_you_page_payment_details_template__after_each_payment', $payment);
 		}
 		return $html;
 	}
@@ -902,14 +902,14 @@ 
 	 * @return    string
 	 * @throws \EE_Error
 	 */
-	public function get_payment_details( $payments = array() ) {
+	public function get_payment_details($payments = array()) {
 		//prepare variables for displaying
 		$template_args = array();
 		$template_args['transaction'] = $this->_current_txn;
 		$template_args['reg_url_link'] = $this->_reg_url_link;
 		$template_args['payments'] = array();
-		foreach ( $payments as $payment ) {
-			$template_args['payments'][] = $this->get_payment_row_html( $payment );
+		foreach ($payments as $payment) {
+			$template_args['payments'][] = $this->get_payment_row_html($payment);
 		}
 		//create a hacky payment object, but dont save it
 		$payment = EE_Payment::new_instance(
@@ -922,8 +922,8 @@ 
 			)
 		);
 		$payment_method = $this->_current_txn->payment_method();
-		if ( $payment_method instanceof EE_Payment_Method && $payment_method->type_obj() instanceof EE_PMT_Base ) {
-			$template_args['gateway_content'] = $payment_method->type_obj()->payment_overview_content( $payment );
+		if ($payment_method instanceof EE_Payment_Method && $payment_method->type_obj() instanceof EE_PMT_Base) {
+			$template_args['gateway_content'] = $payment_method->type_obj()->payment_overview_content($payment);
 		} else {
 			$template_args['gateway_content'] = '';
 		}
@@ -931,19 +931,19 @@ 
 		$template_args['show_try_pay_again_link'] = $this->_show_try_pay_again_link;
 		$template_args['SPCO_payment_options_url'] = $this->_SPCO_payment_options_url;
 		// verify template arguments
-		EEH_Template_Validator::verify_instanceof( $template_args['transaction'], '$transaction', 'EE_Transaction' );
-		EEH_Template_Validator::verify_isnt_null( $template_args['payments'], '$payments' );
+		EEH_Template_Validator::verify_instanceof($template_args['transaction'], '$transaction', 'EE_Transaction');
+		EEH_Template_Validator::verify_isnt_null($template_args['payments'], '$payments');
 		EEH_Template_Validator::verify_isnt_null(
 			$template_args['show_try_pay_again_link'],
 			'$show_try_pay_again_link'
 		);
-		EEH_Template_Validator::verify_isnt_null( $template_args['gateway_content'], '$gateway_content' );
+		EEH_Template_Validator::verify_isnt_null($template_args['gateway_content'], '$gateway_content');
 		EEH_Template_Validator::verify_isnt_null(
 			$template_args['SPCO_payment_options_url'],
 			'$SPCO_payment_options_url'
 		);
 		return EEH_Template::locate_template(
-			THANK_YOU_TEMPLATES_PATH . 'thank-you-page-payment-details.template.php',
+			THANK_YOU_TEMPLATES_PATH.'thank-you-page-payment-details.template.php',
 			$template_args,
 			true,
 			true
@@ -960,11 +960,11 @@ 
 	 * @return    string
 	 * @throws \EE_Error
 	 */
-	public function get_new_payments( $payments = array() ) {
+	public function get_new_payments($payments = array()) {
 		$payments_html = '';
 		//prepare variables for displaying
-		foreach ( $payments as $payment ) {
-			$payments_html .= $this->get_payment_row_html( $payment );
+		foreach ($payments as $payment) {
+			$payments_html .= $this->get_payment_row_html($payment);
 		}
 		return $payments_html;
 	}

admin_pages/general_settings/General_Settings_Admin_Page.core.php

Indentation +1025 added lines, -1025 removed lines

@@ -2,7 +2,7 @@ 
 use EventEspresso\admin_pages\general_settings\AdminOptionsSettings;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('NO direct script access allowed');
+	exit('NO direct script access allowed');
 }
 
 /**
@@ -22,1138 +22,1138 @@ 
 {
     
     
-    /**
-     * _question_group
-     * holds the specific question group object for the question group details screen
-     * @var object
-     */
-    protected $_question_group;
+	/**
+	 * _question_group
+	 * holds the specific question group object for the question group details screen
+	 * @var object
+	 */
+	protected $_question_group;
     
     
-    public function __construct($routing = true)
-    {
-        parent::__construct($routing);
-    }
+	public function __construct($routing = true)
+	{
+		parent::__construct($routing);
+	}
     
     
-    protected function _init_page_props()
-    {
-        $this->page_slug        = GEN_SET_PG_SLUG;
-        $this->page_label       = GEN_SET_LABEL;
-        $this->_admin_base_url  = GEN_SET_ADMIN_URL;
-        $this->_admin_base_path = GEN_SET_ADMIN;
-    }
+	protected function _init_page_props()
+	{
+		$this->page_slug        = GEN_SET_PG_SLUG;
+		$this->page_label       = GEN_SET_LABEL;
+		$this->_admin_base_url  = GEN_SET_ADMIN_URL;
+		$this->_admin_base_path = GEN_SET_ADMIN;
+	}
     
     
-    protected function _ajax_hooks()
-    {
-        add_action('wp_ajax_espresso_display_country_settings', array($this, 'display_country_settings'));
-        add_action('wp_ajax_espresso_display_country_states', array($this, 'display_country_states'));
-        add_action('wp_ajax_espresso_delete_state', array($this, 'delete_state'), 10, 3);
-        add_action('wp_ajax_espresso_add_new_state', array($this, 'add_new_state'));
-    }
+	protected function _ajax_hooks()
+	{
+		add_action('wp_ajax_espresso_display_country_settings', array($this, 'display_country_settings'));
+		add_action('wp_ajax_espresso_display_country_states', array($this, 'display_country_states'));
+		add_action('wp_ajax_espresso_delete_state', array($this, 'delete_state'), 10, 3);
+		add_action('wp_ajax_espresso_add_new_state', array($this, 'add_new_state'));
+	}
     
     
-    protected function _define_page_props()
-    {
-        $this->_admin_page_title = GEN_SET_LABEL;
-        $this->_labels           = array(
-            'publishbox' => __('Update Settings', 'event_espresso')
-        );
-    }
+	protected function _define_page_props()
+	{
+		$this->_admin_page_title = GEN_SET_LABEL;
+		$this->_labels           = array(
+			'publishbox' => __('Update Settings', 'event_espresso')
+		);
+	}
     
     
-    protected function _set_page_routes()
-    {
-        $this->_page_routes = array(
+	protected function _set_page_routes()
+	{
+		$this->_page_routes = array(
             
-            'critical_pages'                => array(
-                'func'       => '_espresso_page_settings',
-                'capability' => 'manage_options'
-            ),
-            'update_espresso_page_settings' => array(
-                'func'       => '_update_espresso_page_settings',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ),
-            'default'                       => array(
-                'func'       => '_your_organization_settings',
-                'capability' => 'manage_options',
-            ),
+			'critical_pages'                => array(
+				'func'       => '_espresso_page_settings',
+				'capability' => 'manage_options'
+			),
+			'update_espresso_page_settings' => array(
+				'func'       => '_update_espresso_page_settings',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			),
+			'default'                       => array(
+				'func'       => '_your_organization_settings',
+				'capability' => 'manage_options',
+			),
             
-            'update_your_organization_settings' => array(
-                'func'       => '_update_your_organization_settings',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ),
+			'update_your_organization_settings' => array(
+				'func'       => '_update_your_organization_settings',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			),
             
-            'admin_option_settings' => array(
-                'func'       => '_admin_option_settings',
-                'capability' => 'manage_options',
-            ),
+			'admin_option_settings' => array(
+				'func'       => '_admin_option_settings',
+				'capability' => 'manage_options',
+			),
             
-            'update_admin_option_settings' => array(
-                'func'       => '_update_admin_option_settings',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ),
+			'update_admin_option_settings' => array(
+				'func'       => '_update_admin_option_settings',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			),
             
-            'country_settings' => array(
-                'func'       => '_country_settings',
-                'capability' => 'manage_options'
-            ),
+			'country_settings' => array(
+				'func'       => '_country_settings',
+				'capability' => 'manage_options'
+			),
             
-            'update_country_settings' => array(
-                'func'       => '_update_country_settings',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ),
+			'update_country_settings' => array(
+				'func'       => '_update_country_settings',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			),
             
-            'display_country_settings' => array(
-                'func'       => 'display_country_settings',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ),
+			'display_country_settings' => array(
+				'func'       => 'display_country_settings',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			),
             
-            'add_new_state' => array(
-                'func'       => 'add_new_state',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ),
+			'add_new_state' => array(
+				'func'       => 'add_new_state',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			),
             
-            'delete_state' => array(
-                'func'       => 'delete_state',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            )
-        );
-    }
-    
-    
-    protected function _set_page_config()
-    {
-        $this->_page_config = array(
-            'critical_pages'        => array(
-                'nav'           => array(
-                    'label' => __('Critical Pages', 'event_espresso'),
-                    'order' => 50
-                ),
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
-                'help_tabs'     => array(
-                    'general_settings_critical_pages_help_tab' => array(
-                        'title'    => __('Critical Pages', 'event_espresso'),
-                        'filename' => 'general_settings_critical_pages'
-                    )
-                ),
-                'help_tour'     => array('Critical_Pages_Help_Tour'),
-                'require_nonce' => false
-            ),
-            'default'               => array(
-                'nav'           => array(
-                    'label' => __('Your Organization', 'event_espresso'),
-                    'order' => 20
-                ),
-                'help_tabs'     => array(
-                    'general_settings_your_organization_help_tab' => array(
-                        'title'    => __('Your Organization', 'event_espresso'),
-                        'filename' => 'general_settings_your_organization'
-                    )
-                ),
-                'help_tour'     => array('Your_Organization_Help_Tour'),
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
-                'require_nonce' => false
-            ),
-            'admin_option_settings' => array(
-                'nav'           => array(
-                    'label' => __('Admin Options', 'event_espresso'),
-                    'order' => 60
-                ),
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
-                'help_tabs'     => array(
-                    'general_settings_admin_options_help_tab' => array(
-                        'title'    => __('Admin Options', 'event_espresso'),
-                        'filename' => 'general_settings_admin_options'
-                    )
-                ),
-                'help_tour'     => array('Admin_Options_Help_Tour'),
-                'require_nonce' => false
-            ),
-            'country_settings'      => array(
-                'nav'           => array(
-                    'label' => __('Countries', 'event_espresso'),
-                    'order' => 70
-                ),
-                'help_tabs'     => array(
-                    'general_settings_countries_help_tab' => array(
-                        'title'    => __('Countries', 'event_espresso'),
-                        'filename' => 'general_settings_countries'
-                    )
-                ),
-                'help_tour'     => array('Countries_Help_Tour'),
-                'require_nonce' => false
-            )
-        );
-    }
-    
-    
-    protected function _add_screen_options()
-    {
-    }
-    
-    protected function _add_feature_pointers()
-    {
-    }
-    
-    public function load_scripts_styles()
-    {
-        //styles
-        wp_enqueue_style('espresso-ui-theme');
-        //scripts
-        wp_enqueue_script('ee_admin_js');
-    }
-    
-    public function admin_init()
-    {
-        EE_Registry::$i18n_js_strings['invalid_server_response'] = __('An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.',
-            'event_espresso');
-        EE_Registry::$i18n_js_strings['error_occurred']          = __('An error occurred! Please refresh the page and try again.',
-            'event_espresso');
-        EE_Registry::$i18n_js_strings['confirm_delete_state']    = __('Are you sure you want to delete this State / Province?',
-            'event_espresso');
-        $protocol                                                = isset($_SERVER['HTTPS']) ? 'https://' : 'http://';
-        EE_Registry::$i18n_js_strings['ajax_url']                = admin_url('admin-ajax.php?page=espresso_general_settings',
-            $protocol);
-    }
-    
-    public function admin_notices()
-    {
-    }
-    
-    public function admin_footer_scripts()
-    {
-    }
-    
-    
-    public function load_scripts_styles_default()
-    {
-        //styles
-        wp_enqueue_style('thickbox');
-        //scripts
-        wp_enqueue_script('media-upload');
-        wp_enqueue_script('thickbox');
-        wp_register_script('organization_settings', GEN_SET_ASSETS_URL . 'your_organization_settings.js',
-            array('jquery', 'media-upload', 'thickbox'), EVENT_ESPRESSO_VERSION, true);
-        wp_register_style('organization-css', GEN_SET_ASSETS_URL . 'organization.css', array(), EVENT_ESPRESSO_VERSION);
-        wp_enqueue_script('organization_settings');
-        wp_enqueue_style('organization-css');
-        $confirm_image_delete = array(
-            'text' => __('Do you really want to delete this image? Please remember to save your settings to complete the removal.',
-                'event_espresso')
-        );
-        wp_localize_script('organization_settings', 'confirm_image_delete', $confirm_image_delete);
+			'delete_state' => array(
+				'func'       => 'delete_state',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			)
+		);
+	}
+    
+    
+	protected function _set_page_config()
+	{
+		$this->_page_config = array(
+			'critical_pages'        => array(
+				'nav'           => array(
+					'label' => __('Critical Pages', 'event_espresso'),
+					'order' => 50
+				),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
+				'help_tabs'     => array(
+					'general_settings_critical_pages_help_tab' => array(
+						'title'    => __('Critical Pages', 'event_espresso'),
+						'filename' => 'general_settings_critical_pages'
+					)
+				),
+				'help_tour'     => array('Critical_Pages_Help_Tour'),
+				'require_nonce' => false
+			),
+			'default'               => array(
+				'nav'           => array(
+					'label' => __('Your Organization', 'event_espresso'),
+					'order' => 20
+				),
+				'help_tabs'     => array(
+					'general_settings_your_organization_help_tab' => array(
+						'title'    => __('Your Organization', 'event_espresso'),
+						'filename' => 'general_settings_your_organization'
+					)
+				),
+				'help_tour'     => array('Your_Organization_Help_Tour'),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
+				'require_nonce' => false
+			),
+			'admin_option_settings' => array(
+				'nav'           => array(
+					'label' => __('Admin Options', 'event_espresso'),
+					'order' => 60
+				),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
+				'help_tabs'     => array(
+					'general_settings_admin_options_help_tab' => array(
+						'title'    => __('Admin Options', 'event_espresso'),
+						'filename' => 'general_settings_admin_options'
+					)
+				),
+				'help_tour'     => array('Admin_Options_Help_Tour'),
+				'require_nonce' => false
+			),
+			'country_settings'      => array(
+				'nav'           => array(
+					'label' => __('Countries', 'event_espresso'),
+					'order' => 70
+				),
+				'help_tabs'     => array(
+					'general_settings_countries_help_tab' => array(
+						'title'    => __('Countries', 'event_espresso'),
+						'filename' => 'general_settings_countries'
+					)
+				),
+				'help_tour'     => array('Countries_Help_Tour'),
+				'require_nonce' => false
+			)
+		);
+	}
+    
+    
+	protected function _add_screen_options()
+	{
+	}
+    
+	protected function _add_feature_pointers()
+	{
+	}
+    
+	public function load_scripts_styles()
+	{
+		//styles
+		wp_enqueue_style('espresso-ui-theme');
+		//scripts
+		wp_enqueue_script('ee_admin_js');
+	}
+    
+	public function admin_init()
+	{
+		EE_Registry::$i18n_js_strings['invalid_server_response'] = __('An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.',
+			'event_espresso');
+		EE_Registry::$i18n_js_strings['error_occurred']          = __('An error occurred! Please refresh the page and try again.',
+			'event_espresso');
+		EE_Registry::$i18n_js_strings['confirm_delete_state']    = __('Are you sure you want to delete this State / Province?',
+			'event_espresso');
+		$protocol                                                = isset($_SERVER['HTTPS']) ? 'https://' : 'http://';
+		EE_Registry::$i18n_js_strings['ajax_url']                = admin_url('admin-ajax.php?page=espresso_general_settings',
+			$protocol);
+	}
+    
+	public function admin_notices()
+	{
+	}
+    
+	public function admin_footer_scripts()
+	{
+	}
+    
+    
+	public function load_scripts_styles_default()
+	{
+		//styles
+		wp_enqueue_style('thickbox');
+		//scripts
+		wp_enqueue_script('media-upload');
+		wp_enqueue_script('thickbox');
+		wp_register_script('organization_settings', GEN_SET_ASSETS_URL . 'your_organization_settings.js',
+			array('jquery', 'media-upload', 'thickbox'), EVENT_ESPRESSO_VERSION, true);
+		wp_register_style('organization-css', GEN_SET_ASSETS_URL . 'organization.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_script('organization_settings');
+		wp_enqueue_style('organization-css');
+		$confirm_image_delete = array(
+			'text' => __('Do you really want to delete this image? Please remember to save your settings to complete the removal.',
+				'event_espresso')
+		);
+		wp_localize_script('organization_settings', 'confirm_image_delete', $confirm_image_delete);
         
-    }
-    
-    public function load_scripts_styles_country_settings()
-    {
-        //scripts
-        wp_register_script('gen_settings_countries', GEN_SET_ASSETS_URL . 'gen_settings_countries.js',
-            array('ee_admin_js'), EVENT_ESPRESSO_VERSION, true);
-        wp_register_style('organization-css', GEN_SET_ASSETS_URL . 'organization.css', array(), EVENT_ESPRESSO_VERSION);
-        wp_enqueue_script('gen_settings_countries');
-        wp_enqueue_style('organization-css');
+	}
+    
+	public function load_scripts_styles_country_settings()
+	{
+		//scripts
+		wp_register_script('gen_settings_countries', GEN_SET_ASSETS_URL . 'gen_settings_countries.js',
+			array('ee_admin_js'), EVENT_ESPRESSO_VERSION, true);
+		wp_register_style('organization-css', GEN_SET_ASSETS_URL . 'organization.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_script('gen_settings_countries');
+		wp_enqueue_style('organization-css');
         
-    }
-    
-    
-    /*************        Espresso Pages        *************/
-    /**
-     * _espresso_page_settings
-     *
-     * @throws \EE_Error
-     */
-    protected function _espresso_page_settings()
-    {
-        // Check to make sure all of the main pages are setup properly,
-        // if not create the default pages and display an admin notice
-        EEH_Activation::verify_default_pages_exist();
-        $this->_transient_garbage_collection();
-        $this->_template_args['values']             = $this->_yes_no_values;
-        $this->_template_args['reg_page_id']        = isset(EE_Registry::instance()->CFG->core->reg_page_id)
-            ? EE_Registry::instance()->CFG->core->reg_page_id
-            : null;
-        $this->_template_args['reg_page_obj']       = isset(EE_Registry::instance()->CFG->core->reg_page_id)
-            ? get_page(EE_Registry::instance()->CFG->core->reg_page_id)
-            : false;
-        $this->_template_args['txn_page_id']        = isset(EE_Registry::instance()->CFG->core->txn_page_id)
-            ? EE_Registry::instance()->CFG->core->txn_page_id
-            : null;
-        $this->_template_args['txn_page_obj']       = isset(EE_Registry::instance()->CFG->core->txn_page_id)
-            ? get_page(EE_Registry::instance()->CFG->core->txn_page_id)
-            : false;
-        $this->_template_args['thank_you_page_id']  = isset(EE_Registry::instance()->CFG->core->thank_you_page_id)
-            ? EE_Registry::instance()->CFG->core->thank_you_page_id
-            : null;
-        $this->_template_args['thank_you_page_obj'] = isset(EE_Registry::instance()->CFG->core->thank_you_page_id)
-            ? get_page(EE_Registry::instance()->CFG->core->thank_you_page_id)
-            : false;
-        $this->_template_args['cancel_page_id']     = isset(EE_Registry::instance()->CFG->core->cancel_page_id)
-            ? EE_Registry::instance()->CFG->core->cancel_page_id
-            : null;
-        $this->_template_args['cancel_page_obj']    = isset(EE_Registry::instance()->CFG->core->cancel_page_id)
-            ? get_page(EE_Registry::instance()->CFG->core->cancel_page_id)
-            : false;
-        $this->_set_add_edit_form_tags('update_espresso_page_settings');
-        $this->_set_publish_post_box_vars(null, false, false, null, false);
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            GEN_SET_TEMPLATE_PATH . 'espresso_page_settings.template.php',
-            $this->_template_args,
-            true
-        );
-        $this->display_admin_page_with_sidebar();
+	}
+    
+    
+	/*************        Espresso Pages        *************/
+	/**
+	 * _espresso_page_settings
+	 *
+	 * @throws \EE_Error
+	 */
+	protected function _espresso_page_settings()
+	{
+		// Check to make sure all of the main pages are setup properly,
+		// if not create the default pages and display an admin notice
+		EEH_Activation::verify_default_pages_exist();
+		$this->_transient_garbage_collection();
+		$this->_template_args['values']             = $this->_yes_no_values;
+		$this->_template_args['reg_page_id']        = isset(EE_Registry::instance()->CFG->core->reg_page_id)
+			? EE_Registry::instance()->CFG->core->reg_page_id
+			: null;
+		$this->_template_args['reg_page_obj']       = isset(EE_Registry::instance()->CFG->core->reg_page_id)
+			? get_page(EE_Registry::instance()->CFG->core->reg_page_id)
+			: false;
+		$this->_template_args['txn_page_id']        = isset(EE_Registry::instance()->CFG->core->txn_page_id)
+			? EE_Registry::instance()->CFG->core->txn_page_id
+			: null;
+		$this->_template_args['txn_page_obj']       = isset(EE_Registry::instance()->CFG->core->txn_page_id)
+			? get_page(EE_Registry::instance()->CFG->core->txn_page_id)
+			: false;
+		$this->_template_args['thank_you_page_id']  = isset(EE_Registry::instance()->CFG->core->thank_you_page_id)
+			? EE_Registry::instance()->CFG->core->thank_you_page_id
+			: null;
+		$this->_template_args['thank_you_page_obj'] = isset(EE_Registry::instance()->CFG->core->thank_you_page_id)
+			? get_page(EE_Registry::instance()->CFG->core->thank_you_page_id)
+			: false;
+		$this->_template_args['cancel_page_id']     = isset(EE_Registry::instance()->CFG->core->cancel_page_id)
+			? EE_Registry::instance()->CFG->core->cancel_page_id
+			: null;
+		$this->_template_args['cancel_page_obj']    = isset(EE_Registry::instance()->CFG->core->cancel_page_id)
+			? get_page(EE_Registry::instance()->CFG->core->cancel_page_id)
+			: false;
+		$this->_set_add_edit_form_tags('update_espresso_page_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
+			GEN_SET_TEMPLATE_PATH . 'espresso_page_settings.template.php',
+			$this->_template_args,
+			true
+		);
+		$this->display_admin_page_with_sidebar();
         
-    }
-    
-    protected function _update_espresso_page_settings()
-    {
-        // capture incoming request data
-        $reg_page_id       = isset($this->_req_data['reg_page_id']) ? absint($this->_req_data['reg_page_id']) : EE_Registry::instance()->CFG->core->reg_page_id;
-        $txn_page_id       = isset($this->_req_data['txn_page_id']) ? absint($this->_req_data['txn_page_id']) : EE_Registry::instance()->CFG->core->txn_page_id;
-        $thank_you_page_id = isset($this->_req_data['thank_you_page_id']) ? absint($this->_req_data['thank_you_page_id']) : EE_Registry::instance()->CFG->core->thank_you_page_id;
-        $cancel_page_id    = isset($this->_req_data['cancel_page_id']) ? absint($this->_req_data['cancel_page_id']) : EE_Registry::instance()->CFG->core->cancel_page_id;
-        // pack critical_pages into an array
-        $critical_pages = array(
-            'reg_page_id'       => $reg_page_id,
-            'txn_page_id'       => $txn_page_id,
-            'thank_you_page_id' => $thank_you_page_id,
-            'cancel_page_id'    => $cancel_page_id
-        );
-        foreach ($critical_pages as $critical_page_name => $critical_page_id) {
-            // has the page changed ?
-            if (EE_Registry::instance()->CFG->core->{$critical_page_name} !== $critical_page_id) {
-                // grab post object for old page
-                $post = get_post(EE_Registry::instance()->CFG->core->{$critical_page_name});
-                // update post shortcodes for old page
-                EventEspresso\core\admin\PostShortcodeTracking::parse_post_content_on_save($critical_page_id, $post);
-                // grab post object for new page
-                $post = get_post($critical_page_id);
-                // update post shortcodes for new page
-                EventEspresso\core\admin\PostShortcodeTracking::parse_post_content_on_save($critical_page_id, $post);
-            }
-        }
-        // set page IDs
-        EE_Registry::instance()->CFG->core->reg_page_id       = $reg_page_id;
-        EE_Registry::instance()->CFG->core->txn_page_id       = $txn_page_id;
-        EE_Registry::instance()->CFG->core->thank_you_page_id = $thank_you_page_id;
-        EE_Registry::instance()->CFG->core->cancel_page_id    = $cancel_page_id;
+	}
+    
+	protected function _update_espresso_page_settings()
+	{
+		// capture incoming request data
+		$reg_page_id       = isset($this->_req_data['reg_page_id']) ? absint($this->_req_data['reg_page_id']) : EE_Registry::instance()->CFG->core->reg_page_id;
+		$txn_page_id       = isset($this->_req_data['txn_page_id']) ? absint($this->_req_data['txn_page_id']) : EE_Registry::instance()->CFG->core->txn_page_id;
+		$thank_you_page_id = isset($this->_req_data['thank_you_page_id']) ? absint($this->_req_data['thank_you_page_id']) : EE_Registry::instance()->CFG->core->thank_you_page_id;
+		$cancel_page_id    = isset($this->_req_data['cancel_page_id']) ? absint($this->_req_data['cancel_page_id']) : EE_Registry::instance()->CFG->core->cancel_page_id;
+		// pack critical_pages into an array
+		$critical_pages = array(
+			'reg_page_id'       => $reg_page_id,
+			'txn_page_id'       => $txn_page_id,
+			'thank_you_page_id' => $thank_you_page_id,
+			'cancel_page_id'    => $cancel_page_id
+		);
+		foreach ($critical_pages as $critical_page_name => $critical_page_id) {
+			// has the page changed ?
+			if (EE_Registry::instance()->CFG->core->{$critical_page_name} !== $critical_page_id) {
+				// grab post object for old page
+				$post = get_post(EE_Registry::instance()->CFG->core->{$critical_page_name});
+				// update post shortcodes for old page
+				EventEspresso\core\admin\PostShortcodeTracking::parse_post_content_on_save($critical_page_id, $post);
+				// grab post object for new page
+				$post = get_post($critical_page_id);
+				// update post shortcodes for new page
+				EventEspresso\core\admin\PostShortcodeTracking::parse_post_content_on_save($critical_page_id, $post);
+			}
+		}
+		// set page IDs
+		EE_Registry::instance()->CFG->core->reg_page_id       = $reg_page_id;
+		EE_Registry::instance()->CFG->core->txn_page_id       = $txn_page_id;
+		EE_Registry::instance()->CFG->core->thank_you_page_id = $thank_you_page_id;
+		EE_Registry::instance()->CFG->core->cancel_page_id    = $cancel_page_id;
         
-        EE_Registry::instance()->CFG->core = apply_filters('FHEE__General_Settings_Admin_Page___update_espresso_page_settings__CFG_core',
-            EE_Registry::instance()->CFG->core, $this->_req_data);
+		EE_Registry::instance()->CFG->core = apply_filters('FHEE__General_Settings_Admin_Page___update_espresso_page_settings__CFG_core',
+			EE_Registry::instance()->CFG->core, $this->_req_data);
         
-        $what       = __('Critical Pages & Shortcodes', 'event_espresso');
-        $success    = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG->core, __FILE__,
-            __FUNCTION__, __LINE__);
-        $query_args = array(
-            'action' => 'critical_pages'
-        );
-        $this->_redirect_after_action(false, '', '', $query_args, true);
+		$what       = __('Critical Pages & Shortcodes', 'event_espresso');
+		$success    = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG->core, __FILE__,
+			__FUNCTION__, __LINE__);
+		$query_args = array(
+			'action' => 'critical_pages'
+		);
+		$this->_redirect_after_action(false, '', '', $query_args, true);
         
-    }
+	}
     
     
-    /*************        Your Organization        *************/
+	/*************        Your Organization        *************/
     
     
-    protected function _your_organization_settings()
-    {
+	protected function _your_organization_settings()
+	{
         
-        $this->_template_args['site_license_key']       = isset(EE_Registry::instance()->NET_CFG->core->site_license_key) ? EE_Registry::instance()->NET_CFG->core->get_pretty('site_license_key') : '';
-        $this->_template_args['organization_name']      = isset(EE_Registry::instance()->CFG->organization->name) ? EE_Registry::instance()->CFG->organization->get_pretty('name') : '';
-        $this->_template_args['organization_address_1'] = isset(EE_Registry::instance()->CFG->organization->address_1) ? EE_Registry::instance()->CFG->organization->get_pretty('address_1') : '';
-        $this->_template_args['organization_address_2'] = isset(EE_Registry::instance()->CFG->organization->address_2) ? EE_Registry::instance()->CFG->organization->get_pretty('address_2') : '';
-        $this->_template_args['organization_city']      = isset(EE_Registry::instance()->CFG->organization->city) ? EE_Registry::instance()->CFG->organization->get_pretty('city') : '';
-        $this->_template_args['organization_zip']       = isset(EE_Registry::instance()->CFG->organization->zip) ? EE_Registry::instance()->CFG->organization->get_pretty('zip') : '';
-        $this->_template_args['organization_email']     = isset(EE_Registry::instance()->CFG->organization->email) ? EE_Registry::instance()->CFG->organization->get_pretty('email') : '';
-        $this->_template_args['organization_phone']     = isset(EE_Registry::instance()->CFG->organization->phone) ? EE_Registry::instance()->CFG->organization->get_pretty('phone') : '';
-        $this->_template_args['organization_vat']       = isset(EE_Registry::instance()->CFG->organization->vat) ? EE_Registry::instance()->CFG->organization->get_pretty('vat') : '';
-        $this->_template_args['currency_sign']          = isset(EE_Registry::instance()->CFG->currency->sign) ? EE_Registry::instance()->CFG->currency->get_pretty('sign') : '$';
-        $this->_template_args['organization_logo_url']  = isset(EE_Registry::instance()->CFG->organization->logo_url) ? EE_Registry::instance()->CFG->organization->get_pretty('logo_url') : false;
-        $this->_template_args['organization_facebook']  = isset(EE_Registry::instance()->CFG->organization->facebook) ? EE_Registry::instance()->CFG->organization->get_pretty('facebook') : '';
-        $this->_template_args['organization_twitter']   = isset(EE_Registry::instance()->CFG->organization->twitter) ? EE_Registry::instance()->CFG->organization->get_pretty('twitter') : '';
-        $this->_template_args['organization_linkedin']  = isset(EE_Registry::instance()->CFG->organization->linkedin) ? EE_Registry::instance()->CFG->organization->get_pretty('linkedin') : '';
-        $this->_template_args['organization_pinterest'] = isset(EE_Registry::instance()->CFG->organization->pinterest) ? EE_Registry::instance()->CFG->organization->get_pretty('pinterest') : '';
-        $this->_template_args['organization_google']    = isset(EE_Registry::instance()->CFG->organization->google) ? EE_Registry::instance()->CFG->organization->get_pretty('google') : '';
-        $this->_template_args['organization_instagram'] = isset(EE_Registry::instance()->CFG->organization->instagram) ? EE_Registry::instance()->CFG->organization->get_pretty('instagram') : '';
-        //UXIP settings
-        $this->_template_args['ee_ueip_optin'] = isset(EE_Registry::instance()->CFG->core->ee_ueip_optin) ? EE_Registry::instance()->CFG->core->get_pretty('ee_ueip_optin') : true;
+		$this->_template_args['site_license_key']       = isset(EE_Registry::instance()->NET_CFG->core->site_license_key) ? EE_Registry::instance()->NET_CFG->core->get_pretty('site_license_key') : '';
+		$this->_template_args['organization_name']      = isset(EE_Registry::instance()->CFG->organization->name) ? EE_Registry::instance()->CFG->organization->get_pretty('name') : '';
+		$this->_template_args['organization_address_1'] = isset(EE_Registry::instance()->CFG->organization->address_1) ? EE_Registry::instance()->CFG->organization->get_pretty('address_1') : '';
+		$this->_template_args['organization_address_2'] = isset(EE_Registry::instance()->CFG->organization->address_2) ? EE_Registry::instance()->CFG->organization->get_pretty('address_2') : '';
+		$this->_template_args['organization_city']      = isset(EE_Registry::instance()->CFG->organization->city) ? EE_Registry::instance()->CFG->organization->get_pretty('city') : '';
+		$this->_template_args['organization_zip']       = isset(EE_Registry::instance()->CFG->organization->zip) ? EE_Registry::instance()->CFG->organization->get_pretty('zip') : '';
+		$this->_template_args['organization_email']     = isset(EE_Registry::instance()->CFG->organization->email) ? EE_Registry::instance()->CFG->organization->get_pretty('email') : '';
+		$this->_template_args['organization_phone']     = isset(EE_Registry::instance()->CFG->organization->phone) ? EE_Registry::instance()->CFG->organization->get_pretty('phone') : '';
+		$this->_template_args['organization_vat']       = isset(EE_Registry::instance()->CFG->organization->vat) ? EE_Registry::instance()->CFG->organization->get_pretty('vat') : '';
+		$this->_template_args['currency_sign']          = isset(EE_Registry::instance()->CFG->currency->sign) ? EE_Registry::instance()->CFG->currency->get_pretty('sign') : '$';
+		$this->_template_args['organization_logo_url']  = isset(EE_Registry::instance()->CFG->organization->logo_url) ? EE_Registry::instance()->CFG->organization->get_pretty('logo_url') : false;
+		$this->_template_args['organization_facebook']  = isset(EE_Registry::instance()->CFG->organization->facebook) ? EE_Registry::instance()->CFG->organization->get_pretty('facebook') : '';
+		$this->_template_args['organization_twitter']   = isset(EE_Registry::instance()->CFG->organization->twitter) ? EE_Registry::instance()->CFG->organization->get_pretty('twitter') : '';
+		$this->_template_args['organization_linkedin']  = isset(EE_Registry::instance()->CFG->organization->linkedin) ? EE_Registry::instance()->CFG->organization->get_pretty('linkedin') : '';
+		$this->_template_args['organization_pinterest'] = isset(EE_Registry::instance()->CFG->organization->pinterest) ? EE_Registry::instance()->CFG->organization->get_pretty('pinterest') : '';
+		$this->_template_args['organization_google']    = isset(EE_Registry::instance()->CFG->organization->google) ? EE_Registry::instance()->CFG->organization->get_pretty('google') : '';
+		$this->_template_args['organization_instagram'] = isset(EE_Registry::instance()->CFG->organization->instagram) ? EE_Registry::instance()->CFG->organization->get_pretty('instagram') : '';
+		//UXIP settings
+		$this->_template_args['ee_ueip_optin'] = isset(EE_Registry::instance()->CFG->core->ee_ueip_optin) ? EE_Registry::instance()->CFG->core->get_pretty('ee_ueip_optin') : true;
         
-        $STA_ID                         = isset(EE_Registry::instance()->CFG->organization->STA_ID) ? EE_Registry::instance()->CFG->organization->STA_ID : 4;
-        $this->_template_args['states'] = new EE_Question_Form_Input(
-            EE_Question::new_instance(array(
-                'QST_ID'           => 0,
-                'QST_display_text' => __('State/Province', 'event_espresso'),
-                'QST_system'       => 'admin-state'
-            )),
-            EE_Answer::new_instance(array(
-                'ANS_ID'    => 0,
-                'ANS_value' => $STA_ID
-            )),
-            array(
-                'input_id'       => 'organization_state',
-                'input_name'     => 'organization_state',
-                'input_prefix'   => '',
-                'append_qstn_id' => false
-            )
-        );
+		$STA_ID                         = isset(EE_Registry::instance()->CFG->organization->STA_ID) ? EE_Registry::instance()->CFG->organization->STA_ID : 4;
+		$this->_template_args['states'] = new EE_Question_Form_Input(
+			EE_Question::new_instance(array(
+				'QST_ID'           => 0,
+				'QST_display_text' => __('State/Province', 'event_espresso'),
+				'QST_system'       => 'admin-state'
+			)),
+			EE_Answer::new_instance(array(
+				'ANS_ID'    => 0,
+				'ANS_value' => $STA_ID
+			)),
+			array(
+				'input_id'       => 'organization_state',
+				'input_name'     => 'organization_state',
+				'input_prefix'   => '',
+				'append_qstn_id' => false
+			)
+		);
         
-        $CNT_ISO                           = isset(EE_Registry::instance()->CFG->organization->CNT_ISO) ? EE_Registry::instance()->CFG->organization->CNT_ISO : 'US';
-        $this->_template_args['countries'] = new EE_Question_Form_Input(
-            EE_Question::new_instance(array(
-                'QST_ID'           => 0,
-                'QST_display_text' => __('Country', 'event_espresso'),
-                'QST_system'       => 'admin-country'
-            )),
-            EE_Answer::new_instance(array(
-                'ANS_ID'    => 0,
-                'ANS_value' => $CNT_ISO
-            )),
-            array(
-                'input_id'       => 'organization_country',
-                'input_name'     => 'organization_country',
-                'input_prefix'   => '',
-                'append_qstn_id' => false
-            )
-        );
+		$CNT_ISO                           = isset(EE_Registry::instance()->CFG->organization->CNT_ISO) ? EE_Registry::instance()->CFG->organization->CNT_ISO : 'US';
+		$this->_template_args['countries'] = new EE_Question_Form_Input(
+			EE_Question::new_instance(array(
+				'QST_ID'           => 0,
+				'QST_display_text' => __('Country', 'event_espresso'),
+				'QST_system'       => 'admin-country'
+			)),
+			EE_Answer::new_instance(array(
+				'ANS_ID'    => 0,
+				'ANS_value' => $CNT_ISO
+			)),
+			array(
+				'input_id'       => 'organization_country',
+				'input_name'     => 'organization_country',
+				'input_prefix'   => '',
+				'append_qstn_id' => false
+			)
+		);
         
-        add_filter('FHEE__EEH_Form_Fields__label_html', array($this, 'country_form_field_label_wrap'), 10, 2);
-        add_filter('FHEE__EEH_Form_Fields__input_html', array($this, 'country_form_field_input__wrap'), 10, 2);
+		add_filter('FHEE__EEH_Form_Fields__label_html', array($this, 'country_form_field_label_wrap'), 10, 2);
+		add_filter('FHEE__EEH_Form_Fields__input_html', array($this, 'country_form_field_input__wrap'), 10, 2);
         
-        //PUE verification stuff
-        $ver_option_key                                    = 'puvererr_' . basename(EE_PLUGIN_BASENAME);
-        $verify_fail                                       = get_option($ver_option_key);
-        $this->_template_args['site_license_key_verified'] = $verify_fail || ! empty($verify_fail) || (empty($this->_template_args['site_license_key']) && empty($verify_fail)) ? '<span class="dashicons dashicons-admin-network ee-icon-color-ee-red ee-icon-size-20"></span>' : '<span class="dashicons dashicons-admin-network ee-icon-color-ee-green ee-icon-size-20"></span>';
+		//PUE verification stuff
+		$ver_option_key                                    = 'puvererr_' . basename(EE_PLUGIN_BASENAME);
+		$verify_fail                                       = get_option($ver_option_key);
+		$this->_template_args['site_license_key_verified'] = $verify_fail || ! empty($verify_fail) || (empty($this->_template_args['site_license_key']) && empty($verify_fail)) ? '<span class="dashicons dashicons-admin-network ee-icon-color-ee-red ee-icon-size-20"></span>' : '<span class="dashicons dashicons-admin-network ee-icon-color-ee-green ee-icon-size-20"></span>';
         
-        $this->_set_add_edit_form_tags('update_your_organization_settings');
-        $this->_set_publish_post_box_vars(null, false, false, null, false);
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH . 'your_organization_settings.template.php',
-            $this->_template_args, true);
+		$this->_set_add_edit_form_tags('update_your_organization_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH . 'your_organization_settings.template.php',
+			$this->_template_args, true);
         
-        $this->display_admin_page_with_sidebar();
-    }
-    
-    protected function _update_your_organization_settings()
-    {
-        if (is_main_site()) {
-            EE_Registry::instance()->NET_CFG->core->site_license_key = isset($this->_req_data['site_license_key']) ? sanitize_text_field($this->_req_data['site_license_key']) : EE_Registry::instance()->NET_CFG->core->site_license_key;
-        }
-        EE_Registry::instance()->CFG->organization->name      = isset($this->_req_data['organization_name']) ? sanitize_text_field($this->_req_data['organization_name']) : EE_Registry::instance()->CFG->organization->name;
-        EE_Registry::instance()->CFG->organization->address_1 = isset($this->_req_data['organization_address_1']) ? sanitize_text_field($this->_req_data['organization_address_1']) : EE_Registry::instance()->CFG->organization->address_1;
-        EE_Registry::instance()->CFG->organization->address_2 = isset($this->_req_data['organization_address_2']) ? sanitize_text_field($this->_req_data['organization_address_2']) : EE_Registry::instance()->CFG->organization->address_2;
-        EE_Registry::instance()->CFG->organization->city      = isset($this->_req_data['organization_city']) ? sanitize_text_field($this->_req_data['organization_city']) : EE_Registry::instance()->CFG->organization->city;
-        EE_Registry::instance()->CFG->organization->STA_ID    = isset($this->_req_data['organization_state']) ? absint($this->_req_data['organization_state']) : EE_Registry::instance()->CFG->organization->STA_ID;
-        EE_Registry::instance()->CFG->organization->CNT_ISO   = isset($this->_req_data['organization_country']) ? sanitize_text_field($this->_req_data['organization_country']) : EE_Registry::instance()->CFG->organization->CNT_ISO;
-        EE_Registry::instance()->CFG->organization->zip       = isset($this->_req_data['organization_zip']) ? sanitize_text_field($this->_req_data['organization_zip']) : EE_Registry::instance()->CFG->organization->zip;
-        EE_Registry::instance()->CFG->organization->email     = isset($this->_req_data['organization_email']) ? sanitize_email($this->_req_data['organization_email']) : EE_Registry::instance()->CFG->organization->email;
-        EE_Registry::instance()->CFG->organization->vat       = isset($this->_req_data['organization_vat']) ? sanitize_text_field($this->_req_data['organization_vat']) : EE_Registry::instance()->CFG->organization->vat;
-        EE_Registry::instance()->CFG->organization->phone     = isset($this->_req_data['organization_phone']) ? sanitize_text_field($this->_req_data['organization_phone']) : EE_Registry::instance()->CFG->organization->phone;
-        EE_Registry::instance()->CFG->organization->logo_url  = isset($this->_req_data['organization_logo_url']) ? esc_url_raw($this->_req_data['organization_logo_url']) : EE_Registry::instance()->CFG->organization->logo_url;
-        EE_Registry::instance()->CFG->organization->facebook  = isset($this->_req_data['organization_facebook']) ? esc_url_raw($this->_req_data['organization_facebook']) : EE_Registry::instance()->CFG->organization->facebook;
-        EE_Registry::instance()->CFG->organization->twitter   = isset($this->_req_data['organization_twitter']) ? esc_url_raw($this->_req_data['organization_twitter']) : EE_Registry::instance()->CFG->organization->twitter;
-        EE_Registry::instance()->CFG->organization->linkedin  = isset($this->_req_data['organization_linkedin']) ? esc_url_raw($this->_req_data['organization_linkedin']) : EE_Registry::instance()->CFG->organization->linkedin;
-        EE_Registry::instance()->CFG->organization->pinterest = isset($this->_req_data['organization_pinterest']) ? esc_url_raw($this->_req_data['organization_pinterest']) : EE_Registry::instance()->CFG->organization->pinterest;
-        EE_Registry::instance()->CFG->organization->google    = isset($this->_req_data['organization_google']) ? esc_url_raw($this->_req_data['organization_google']) : EE_Registry::instance()->CFG->organization->google;
-        EE_Registry::instance()->CFG->organization->instagram = isset($this->_req_data['organization_instagram']) ? esc_url_raw($this->_req_data['organization_instagram']) : EE_Registry::instance()->CFG->organization->instagram;
-        EE_Registry::instance()->CFG->core->ee_ueip_optin     = isset($this->_req_data['ueip_optin']) && ! empty($this->_req_data['ueip_optin']) ? $this->_req_data['ueip_optin'] : EE_Registry::instance()->CFG->core->ee_ueip_optin;
+		$this->display_admin_page_with_sidebar();
+	}
+    
+	protected function _update_your_organization_settings()
+	{
+		if (is_main_site()) {
+			EE_Registry::instance()->NET_CFG->core->site_license_key = isset($this->_req_data['site_license_key']) ? sanitize_text_field($this->_req_data['site_license_key']) : EE_Registry::instance()->NET_CFG->core->site_license_key;
+		}
+		EE_Registry::instance()->CFG->organization->name      = isset($this->_req_data['organization_name']) ? sanitize_text_field($this->_req_data['organization_name']) : EE_Registry::instance()->CFG->organization->name;
+		EE_Registry::instance()->CFG->organization->address_1 = isset($this->_req_data['organization_address_1']) ? sanitize_text_field($this->_req_data['organization_address_1']) : EE_Registry::instance()->CFG->organization->address_1;
+		EE_Registry::instance()->CFG->organization->address_2 = isset($this->_req_data['organization_address_2']) ? sanitize_text_field($this->_req_data['organization_address_2']) : EE_Registry::instance()->CFG->organization->address_2;
+		EE_Registry::instance()->CFG->organization->city      = isset($this->_req_data['organization_city']) ? sanitize_text_field($this->_req_data['organization_city']) : EE_Registry::instance()->CFG->organization->city;
+		EE_Registry::instance()->CFG->organization->STA_ID    = isset($this->_req_data['organization_state']) ? absint($this->_req_data['organization_state']) : EE_Registry::instance()->CFG->organization->STA_ID;
+		EE_Registry::instance()->CFG->organization->CNT_ISO   = isset($this->_req_data['organization_country']) ? sanitize_text_field($this->_req_data['organization_country']) : EE_Registry::instance()->CFG->organization->CNT_ISO;
+		EE_Registry::instance()->CFG->organization->zip       = isset($this->_req_data['organization_zip']) ? sanitize_text_field($this->_req_data['organization_zip']) : EE_Registry::instance()->CFG->organization->zip;
+		EE_Registry::instance()->CFG->organization->email     = isset($this->_req_data['organization_email']) ? sanitize_email($this->_req_data['organization_email']) : EE_Registry::instance()->CFG->organization->email;
+		EE_Registry::instance()->CFG->organization->vat       = isset($this->_req_data['organization_vat']) ? sanitize_text_field($this->_req_data['organization_vat']) : EE_Registry::instance()->CFG->organization->vat;
+		EE_Registry::instance()->CFG->organization->phone     = isset($this->_req_data['organization_phone']) ? sanitize_text_field($this->_req_data['organization_phone']) : EE_Registry::instance()->CFG->organization->phone;
+		EE_Registry::instance()->CFG->organization->logo_url  = isset($this->_req_data['organization_logo_url']) ? esc_url_raw($this->_req_data['organization_logo_url']) : EE_Registry::instance()->CFG->organization->logo_url;
+		EE_Registry::instance()->CFG->organization->facebook  = isset($this->_req_data['organization_facebook']) ? esc_url_raw($this->_req_data['organization_facebook']) : EE_Registry::instance()->CFG->organization->facebook;
+		EE_Registry::instance()->CFG->organization->twitter   = isset($this->_req_data['organization_twitter']) ? esc_url_raw($this->_req_data['organization_twitter']) : EE_Registry::instance()->CFG->organization->twitter;
+		EE_Registry::instance()->CFG->organization->linkedin  = isset($this->_req_data['organization_linkedin']) ? esc_url_raw($this->_req_data['organization_linkedin']) : EE_Registry::instance()->CFG->organization->linkedin;
+		EE_Registry::instance()->CFG->organization->pinterest = isset($this->_req_data['organization_pinterest']) ? esc_url_raw($this->_req_data['organization_pinterest']) : EE_Registry::instance()->CFG->organization->pinterest;
+		EE_Registry::instance()->CFG->organization->google    = isset($this->_req_data['organization_google']) ? esc_url_raw($this->_req_data['organization_google']) : EE_Registry::instance()->CFG->organization->google;
+		EE_Registry::instance()->CFG->organization->instagram = isset($this->_req_data['organization_instagram']) ? esc_url_raw($this->_req_data['organization_instagram']) : EE_Registry::instance()->CFG->organization->instagram;
+		EE_Registry::instance()->CFG->core->ee_ueip_optin     = isset($this->_req_data['ueip_optin']) && ! empty($this->_req_data['ueip_optin']) ? $this->_req_data['ueip_optin'] : EE_Registry::instance()->CFG->core->ee_ueip_optin;
         
-        EE_Registry::instance()->CFG->currency = new EE_Currency_Config(EE_Registry::instance()->CFG->organization->CNT_ISO);
+		EE_Registry::instance()->CFG->currency = new EE_Currency_Config(EE_Registry::instance()->CFG->organization->CNT_ISO);
         
-        EE_Registry::instance()->CFG = apply_filters('FHEE__General_Settings_Admin_Page___update_your_organization_settings__CFG',
-            EE_Registry::instance()->CFG);
+		EE_Registry::instance()->CFG = apply_filters('FHEE__General_Settings_Admin_Page___update_your_organization_settings__CFG',
+			EE_Registry::instance()->CFG);
         
-        $what    = 'Your Organization Settings';
-        $success = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG, __FILE__, __FUNCTION__,
-            __LINE__);
+		$what    = 'Your Organization Settings';
+		$success = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG, __FILE__, __FUNCTION__,
+			__LINE__);
         
-        $this->_redirect_after_action($success, $what, 'updated', array('action' => 'default'));
+		$this->_redirect_after_action($success, $what, 'updated', array('action' => 'default'));
         
-    }
-    
-    
-    
-    /*************        Admin Options        *************/
-    
-    
-    /**
-     * _admin_option_settings
-     *
-     * @throws \EE_Error
-     * @throws \LogicException
-     */
-    protected function _admin_option_settings()
-    {
-        $this->_template_args['admin_page_content'] = '';
-        try {
-            $admin_options_settings_form = new AdminOptionsSettings(EE_Registry::instance());
-            // still need this for the old school form in Extend_General_Settings_Admin_Page
-            $this->_template_args['values'] = $this->_yes_no_values;
-            // also need to account for the do_action that was in the old template
-            $admin_options_settings_form->setTemplateArgs($this->_template_args);
-            $this->_template_args['admin_page_content'] = $admin_options_settings_form->display();
-        } catch (Exception $e) {
-            EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-        }
-        $this->_set_add_edit_form_tags('update_admin_option_settings');
-        $this->_set_publish_post_box_vars(null, false, false, null, false);
-        $this->display_admin_page_with_sidebar();
-    }
-    
-    
-    /**
-     * _update_admin_option_settings
-     *
-     * @throws \EE_Error
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     * @throws \EventEspresso\core\exceptions\InvalidFormSubmissionException
-     * @throws \InvalidArgumentException
-     * @throws \LogicException
-     */
-    protected function _update_admin_option_settings()
-    {
-        try {
-            $admin_options_settings_form = new AdminOptionsSettings(EE_Registry::instance());
-            $admin_options_settings_form->process($this->_req_data[$admin_options_settings_form->slug()]);
-            EE_Registry::instance()->CFG->admin = apply_filters(
-                'FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin',
-                EE_Registry::instance()->CFG->admin
-            );
-        } catch (Exception $e) {
-            EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-        }
-        $this->_redirect_after_action(
-            apply_filters(
-                'FHEE__General_Settings_Admin_Page___update_admin_option_settings__success',
-                $this->_update_espresso_configuration(
-                    'Admin Options',
-                    EE_Registry::instance()->CFG->admin,
-                    __FILE__, __FUNCTION__, __LINE__
-                )
-            ),
-            'Admin Options',
-            'updated',
-            array('action' => 'admin_option_settings')
-        );
+	}
+    
+    
+    
+	/*************        Admin Options        *************/
+    
+    
+	/**
+	 * _admin_option_settings
+	 *
+	 * @throws \EE_Error
+	 * @throws \LogicException
+	 */
+	protected function _admin_option_settings()
+	{
+		$this->_template_args['admin_page_content'] = '';
+		try {
+			$admin_options_settings_form = new AdminOptionsSettings(EE_Registry::instance());
+			// still need this for the old school form in Extend_General_Settings_Admin_Page
+			$this->_template_args['values'] = $this->_yes_no_values;
+			// also need to account for the do_action that was in the old template
+			$admin_options_settings_form->setTemplateArgs($this->_template_args);
+			$this->_template_args['admin_page_content'] = $admin_options_settings_form->display();
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+		}
+		$this->_set_add_edit_form_tags('update_admin_option_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$this->display_admin_page_with_sidebar();
+	}
+    
+    
+	/**
+	 * _update_admin_option_settings
+	 *
+	 * @throws \EE_Error
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 * @throws \EventEspresso\core\exceptions\InvalidFormSubmissionException
+	 * @throws \InvalidArgumentException
+	 * @throws \LogicException
+	 */
+	protected function _update_admin_option_settings()
+	{
+		try {
+			$admin_options_settings_form = new AdminOptionsSettings(EE_Registry::instance());
+			$admin_options_settings_form->process($this->_req_data[$admin_options_settings_form->slug()]);
+			EE_Registry::instance()->CFG->admin = apply_filters(
+				'FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin',
+				EE_Registry::instance()->CFG->admin
+			);
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+		}
+		$this->_redirect_after_action(
+			apply_filters(
+				'FHEE__General_Settings_Admin_Page___update_admin_option_settings__success',
+				$this->_update_espresso_configuration(
+					'Admin Options',
+					EE_Registry::instance()->CFG->admin,
+					__FILE__, __FUNCTION__, __LINE__
+				)
+			),
+			'Admin Options',
+			'updated',
+			array('action' => 'admin_option_settings')
+		);
         
-    }
+	}
     
     
-    /*************        Countries        *************/
+	/*************        Countries        *************/
     
     
-    protected function _country_settings()
-    {
+	protected function _country_settings()
+	{
         
-        $CNT_ISO = isset(EE_Registry::instance()->CFG->organization->CNT_ISO) ? EE_Registry::instance()->CFG->organization->CNT_ISO : 'US';
-        $CNT_ISO = isset($this->_req_data['country']) ? strtoupper(sanitize_text_field($this->_req_data['country'])) : $CNT_ISO;
+		$CNT_ISO = isset(EE_Registry::instance()->CFG->organization->CNT_ISO) ? EE_Registry::instance()->CFG->organization->CNT_ISO : 'US';
+		$CNT_ISO = isset($this->_req_data['country']) ? strtoupper(sanitize_text_field($this->_req_data['country'])) : $CNT_ISO;
         
-        //load field generator helper
+		//load field generator helper
         
-        $this->_template_args['values'] = $this->_yes_no_values;
+		$this->_template_args['values'] = $this->_yes_no_values;
         
-        $this->_template_args['countries'] = new EE_Question_Form_Input(
-            EE_Question::new_instance(array(
-                'QST_ID'           => 0,
-                'QST_display_text' => __('Select Country', 'event_espresso'),
-                'QST_system'       => 'admin-country'
-            )),
-            EE_Answer::new_instance(array(
-                'ANS_ID'    => 0,
-                'ANS_value' => $CNT_ISO
-            )),
-            array(
-                'input_id'       => 'country',
-                'input_name'     => 'country',
-                'input_prefix'   => '',
-                'append_qstn_id' => false
-            )
-        );
+		$this->_template_args['countries'] = new EE_Question_Form_Input(
+			EE_Question::new_instance(array(
+				'QST_ID'           => 0,
+				'QST_display_text' => __('Select Country', 'event_espresso'),
+				'QST_system'       => 'admin-country'
+			)),
+			EE_Answer::new_instance(array(
+				'ANS_ID'    => 0,
+				'ANS_value' => $CNT_ISO
+			)),
+			array(
+				'input_id'       => 'country',
+				'input_name'     => 'country',
+				'input_prefix'   => '',
+				'append_qstn_id' => false
+			)
+		);
 //		EEH_Debug_Tools::printr( $this->_template_args['countries'], 'countries  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
         
-        add_filter('FHEE__EEH_Form_Fields__label_html', array($this, 'country_form_field_label_wrap'), 10, 2);
-        add_filter('FHEE__EEH_Form_Fields__input_html', array($this, 'country_form_field_input__wrap'), 10, 2);
-        $this->_template_args['country_details_settings'] = $this->display_country_settings();
-        $this->_template_args['country_states_settings']  = $this->display_country_states();
+		add_filter('FHEE__EEH_Form_Fields__label_html', array($this, 'country_form_field_label_wrap'), 10, 2);
+		add_filter('FHEE__EEH_Form_Fields__input_html', array($this, 'country_form_field_input__wrap'), 10, 2);
+		$this->_template_args['country_details_settings'] = $this->display_country_settings();
+		$this->_template_args['country_states_settings']  = $this->display_country_states();
         
-        $this->_set_add_edit_form_tags('update_country_settings');
-        $this->_set_publish_post_box_vars(null, false, false, null, false);
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH . 'countries_settings.template.php',
-            $this->_template_args, true);
-        $this->display_admin_page_with_no_sidebar();
-    }
-    
-    
-    /**
-     *        display_country_settings
-     *
-     * @access    public
-     *
-     * @param    string $CNT_ISO
-     *
-     * @return        mixed        string | array
-     */
-    public function display_country_settings($CNT_ISO = '')
-    {
+		$this->_set_add_edit_form_tags('update_country_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH . 'countries_settings.template.php',
+			$this->_template_args, true);
+		$this->display_admin_page_with_no_sidebar();
+	}
+    
+    
+	/**
+	 *        display_country_settings
+	 *
+	 * @access    public
+	 *
+	 * @param    string $CNT_ISO
+	 *
+	 * @return        mixed        string | array
+	 */
+	public function display_country_settings($CNT_ISO = '')
+	{
         
-        $CNT_ISO = isset($this->_req_data['country']) ? strtoupper(sanitize_text_field($this->_req_data['country'])) : $CNT_ISO;
-        if ( ! $CNT_ISO) {
-            return '';
-        }
+		$CNT_ISO = isset($this->_req_data['country']) ? strtoupper(sanitize_text_field($this->_req_data['country'])) : $CNT_ISO;
+		if ( ! $CNT_ISO) {
+			return '';
+		}
         
-        // for ajax
-        remove_all_filters('FHEE__EEH_Form_Fields__label_html');
-        remove_all_filters('FHEE__EEH_Form_Fields__input_html');
-        add_filter('FHEE__EEH_Form_Fields__label_html', array($this, 'country_form_field_label_wrap'), 10, 2);
-        add_filter('FHEE__EEH_Form_Fields__input_html', array($this, 'country_form_field_input__wrap'), 10, 2);
-        $country = EEM_Country::instance()->get_one_by_ID($CNT_ISO);
-        //EEH_Debug_Tools::printr( $country, '$country  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-        $country_input_types            = array(
-            'CNT_active'      => array(
-                'type'             => 'RADIO_BTN',
-                'input_name'       => 'cntry[' . $CNT_ISO . ']',
-                'class'            => '',
-                'options'          => $this->_yes_no_values,
-                'use_desc_4_label' => true
-            ),
-            'CNT_ISO'         => array(
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'small-text'
-            ),
-            'CNT_ISO3'        => array(
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'small-text'
-            ),
-            'RGN_ID'          => array(
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'small-text'
-            ),
-            'CNT_name'        => array(
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'regular-text'
-            ),
-            'CNT_cur_code'    => array(
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'small-text'
-            ),
-            'CNT_cur_single'  => array(
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'medium-text'
-            ),
-            'CNT_cur_plural'  => array(
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'medium-text'
-            ),
-            'CNT_cur_sign'    => array(
-                'type'         => 'TEXT',
-                'input_name'   => 'cntry[' . $CNT_ISO . ']',
-                'class'        => 'small-text',
-                'htmlentities' => false
-            ),
-            'CNT_cur_sign_b4' => array(
-                'type'             => 'RADIO_BTN',
-                'input_name'       => 'cntry[' . $CNT_ISO . ']',
-                'class'            => '',
-                'options'          => $this->_yes_no_values,
-                'use_desc_4_label' => true
-            ),
-            'CNT_cur_dec_plc' => array(
-                'type'       => 'RADIO_BTN',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => '',
-                'options'    => array(
-                    array('id' => 0, 'text' => ''),
-                    array('id' => 1, 'text' => ''),
-                    array('id' => 2, 'text' => ''),
-                    array('id' => 3, 'text' => '')
-                )
-            ),
-            'CNT_cur_dec_mrk' => array(
-                'type'             => 'RADIO_BTN',
-                'input_name'       => 'cntry[' . $CNT_ISO . ']',
-                'class'            => '',
-                'options'          => array(
-                    array(
-                        'id'   => ',',
-                        'text' => __(', (comma)', 'event_espresso')
-                    ),
-                    array('id' => '.', 'text' => __('. (decimal)', 'event_espresso'))
-                ),
-                'use_desc_4_label' => true
-            ),
-            'CNT_cur_thsnds'  => array(
-                'type'             => 'RADIO_BTN',
-                'input_name'       => 'cntry[' . $CNT_ISO . ']',
-                'class'            => '',
-                'options'          => array(
-                    array(
-                        'id'   => ',',
-                        'text' => __(', (comma)', 'event_espresso')
-                    ),
-                    array('id' => '.', 'text' => __('. (decimal)', 'event_espresso'))
-                ),
-                'use_desc_4_label' => true
-            ),
-            'CNT_tel_code'    => array(
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'small-text'
-            ),
-            'CNT_is_EU'       => array(
-                'type'             => 'RADIO_BTN',
-                'input_name'       => 'cntry[' . $CNT_ISO . ']',
-                'class'            => '',
-                'options'          => $this->_yes_no_values,
-                'use_desc_4_label' => true
-            )
-        );
-        $this->_template_args['inputs'] = EE_Question_Form_Input::generate_question_form_inputs_for_object($country,
-            $country_input_types);
-        $country_details_settings       = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH . 'country_details_settings.template.php',
-            $this->_template_args, true);
+		// for ajax
+		remove_all_filters('FHEE__EEH_Form_Fields__label_html');
+		remove_all_filters('FHEE__EEH_Form_Fields__input_html');
+		add_filter('FHEE__EEH_Form_Fields__label_html', array($this, 'country_form_field_label_wrap'), 10, 2);
+		add_filter('FHEE__EEH_Form_Fields__input_html', array($this, 'country_form_field_input__wrap'), 10, 2);
+		$country = EEM_Country::instance()->get_one_by_ID($CNT_ISO);
+		//EEH_Debug_Tools::printr( $country, '$country  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
+		$country_input_types            = array(
+			'CNT_active'      => array(
+				'type'             => 'RADIO_BTN',
+				'input_name'       => 'cntry[' . $CNT_ISO . ']',
+				'class'            => '',
+				'options'          => $this->_yes_no_values,
+				'use_desc_4_label' => true
+			),
+			'CNT_ISO'         => array(
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'small-text'
+			),
+			'CNT_ISO3'        => array(
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'small-text'
+			),
+			'RGN_ID'          => array(
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'small-text'
+			),
+			'CNT_name'        => array(
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'regular-text'
+			),
+			'CNT_cur_code'    => array(
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'small-text'
+			),
+			'CNT_cur_single'  => array(
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'medium-text'
+			),
+			'CNT_cur_plural'  => array(
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'medium-text'
+			),
+			'CNT_cur_sign'    => array(
+				'type'         => 'TEXT',
+				'input_name'   => 'cntry[' . $CNT_ISO . ']',
+				'class'        => 'small-text',
+				'htmlentities' => false
+			),
+			'CNT_cur_sign_b4' => array(
+				'type'             => 'RADIO_BTN',
+				'input_name'       => 'cntry[' . $CNT_ISO . ']',
+				'class'            => '',
+				'options'          => $this->_yes_no_values,
+				'use_desc_4_label' => true
+			),
+			'CNT_cur_dec_plc' => array(
+				'type'       => 'RADIO_BTN',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => '',
+				'options'    => array(
+					array('id' => 0, 'text' => ''),
+					array('id' => 1, 'text' => ''),
+					array('id' => 2, 'text' => ''),
+					array('id' => 3, 'text' => '')
+				)
+			),
+			'CNT_cur_dec_mrk' => array(
+				'type'             => 'RADIO_BTN',
+				'input_name'       => 'cntry[' . $CNT_ISO . ']',
+				'class'            => '',
+				'options'          => array(
+					array(
+						'id'   => ',',
+						'text' => __(', (comma)', 'event_espresso')
+					),
+					array('id' => '.', 'text' => __('. (decimal)', 'event_espresso'))
+				),
+				'use_desc_4_label' => true
+			),
+			'CNT_cur_thsnds'  => array(
+				'type'             => 'RADIO_BTN',
+				'input_name'       => 'cntry[' . $CNT_ISO . ']',
+				'class'            => '',
+				'options'          => array(
+					array(
+						'id'   => ',',
+						'text' => __(', (comma)', 'event_espresso')
+					),
+					array('id' => '.', 'text' => __('. (decimal)', 'event_espresso'))
+				),
+				'use_desc_4_label' => true
+			),
+			'CNT_tel_code'    => array(
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'small-text'
+			),
+			'CNT_is_EU'       => array(
+				'type'             => 'RADIO_BTN',
+				'input_name'       => 'cntry[' . $CNT_ISO . ']',
+				'class'            => '',
+				'options'          => $this->_yes_no_values,
+				'use_desc_4_label' => true
+			)
+		);
+		$this->_template_args['inputs'] = EE_Question_Form_Input::generate_question_form_inputs_for_object($country,
+			$country_input_types);
+		$country_details_settings       = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH . 'country_details_settings.template.php',
+			$this->_template_args, true);
         
-        if (defined('DOING_AJAX')) {
-            $notices = EE_Error::get_notices(false, false, false);
-            echo wp_json_encode(array(
-                'return_data' => $country_details_settings,
-                'success'     => $notices['success'],
-                'errors'      => $notices['errors']
-            ));
-            die();
-        } else {
-            return $country_details_settings;
-        }
+		if (defined('DOING_AJAX')) {
+			$notices = EE_Error::get_notices(false, false, false);
+			echo wp_json_encode(array(
+				'return_data' => $country_details_settings,
+				'success'     => $notices['success'],
+				'errors'      => $notices['errors']
+			));
+			die();
+		} else {
+			return $country_details_settings;
+		}
         
-    }
-    
-    
-    /**
-     *        display_country_states
-     *
-     * @access    public
-     *
-     * @param    string $CNT_ISO
-     *
-     * @return        string
-     */
-    public function display_country_states($CNT_ISO = '')
-    {
+	}
+    
+    
+	/**
+	 *        display_country_states
+	 *
+	 * @access    public
+	 *
+	 * @param    string $CNT_ISO
+	 *
+	 * @return        string
+	 */
+	public function display_country_states($CNT_ISO = '')
+	{
         
-        $CNT_ISO = isset($this->_req_data['country']) ? sanitize_text_field($this->_req_data['country']) : $CNT_ISO;
+		$CNT_ISO = isset($this->_req_data['country']) ? sanitize_text_field($this->_req_data['country']) : $CNT_ISO;
         
-        if ( ! $CNT_ISO) {
-            return '';
-        }
-        // for ajax
-        remove_all_filters('FHEE__EEH_Form_Fields__label_html');
-        remove_all_filters('FHEE__EEH_Form_Fields__input_html');
-        add_filter('FHEE__EEH_Form_Fields__label_html', array($this, 'state_form_field_label_wrap'), 10, 2);
-        add_filter('FHEE__EEH_Form_Fields__input_html', array($this, 'state_form_field_input__wrap'), 10, 2);
-        $states = EEM_State::instance()->get_all_states_for_these_countries(array($CNT_ISO => $CNT_ISO));
+		if ( ! $CNT_ISO) {
+			return '';
+		}
+		// for ajax
+		remove_all_filters('FHEE__EEH_Form_Fields__label_html');
+		remove_all_filters('FHEE__EEH_Form_Fields__input_html');
+		add_filter('FHEE__EEH_Form_Fields__label_html', array($this, 'state_form_field_label_wrap'), 10, 2);
+		add_filter('FHEE__EEH_Form_Fields__input_html', array($this, 'state_form_field_input__wrap'), 10, 2);
+		$states = EEM_State::instance()->get_all_states_for_these_countries(array($CNT_ISO => $CNT_ISO));
 
 //			echo '<h4>$CNT_ISO : ' . $CNT_ISO . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 //			global $wpdb;
 //			echo '<h4>' . $wpdb->last_query . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 //			EEH_Debug_Tools::printr( $states, '$states  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-        if ($states) {
-            foreach ($states as $STA_ID => $state) {
-                if ($state instanceof EE_State) {
-                    //STA_abbrev 	STA_name 	STA_active
-                    $state_input_types                                           = array(
-                        'STA_abbrev' => array(
-                            'type'       => 'TEXT',
-                            'input_name' => 'states[' . $STA_ID . ']',
-                            'class'      => 'mid-text'
-                        ),
-                        'STA_name'   => array(
-                            'type'       => 'TEXT',
-                            'input_name' => 'states[' . $STA_ID . ']',
-                            'class'      => 'regular-text'
-                        ),
-                        'STA_active' => array(
-                            'type'             => 'RADIO_BTN',
-                            'input_name'       => 'states[' . $STA_ID . ']',
-                            'options'          => $this->_yes_no_values,
-                            'use_desc_4_label' => true
-                        )
-                    );
-                    $this->_template_args['states'][$STA_ID]['inputs']           = EE_Question_Form_Input::generate_question_form_inputs_for_object($state,
-                        $state_input_types);
-                    $query_args                                                  = array(
-                        'action'     => 'delete_state',
-                        'STA_ID'     => $STA_ID,
-                        'CNT_ISO'    => $CNT_ISO,
-                        'STA_abbrev' => $state->abbrev()
-                    );
-                    $this->_template_args['states'][$STA_ID]['delete_state_url'] = EE_Admin_Page::add_query_args_and_nonce($query_args,
-                        GEN_SET_ADMIN_URL);
-                }
-            }
-        } else {
-            $this->_template_args['states'] = false;
-        }
+		if ($states) {
+			foreach ($states as $STA_ID => $state) {
+				if ($state instanceof EE_State) {
+					//STA_abbrev 	STA_name 	STA_active
+					$state_input_types                                           = array(
+						'STA_abbrev' => array(
+							'type'       => 'TEXT',
+							'input_name' => 'states[' . $STA_ID . ']',
+							'class'      => 'mid-text'
+						),
+						'STA_name'   => array(
+							'type'       => 'TEXT',
+							'input_name' => 'states[' . $STA_ID . ']',
+							'class'      => 'regular-text'
+						),
+						'STA_active' => array(
+							'type'             => 'RADIO_BTN',
+							'input_name'       => 'states[' . $STA_ID . ']',
+							'options'          => $this->_yes_no_values,
+							'use_desc_4_label' => true
+						)
+					);
+					$this->_template_args['states'][$STA_ID]['inputs']           = EE_Question_Form_Input::generate_question_form_inputs_for_object($state,
+						$state_input_types);
+					$query_args                                                  = array(
+						'action'     => 'delete_state',
+						'STA_ID'     => $STA_ID,
+						'CNT_ISO'    => $CNT_ISO,
+						'STA_abbrev' => $state->abbrev()
+					);
+					$this->_template_args['states'][$STA_ID]['delete_state_url'] = EE_Admin_Page::add_query_args_and_nonce($query_args,
+						GEN_SET_ADMIN_URL);
+				}
+			}
+		} else {
+			$this->_template_args['states'] = false;
+		}
 //		EEH_Debug_Tools::printr( $this->_template_args['states'], 'states  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-        $this->_template_args['add_new_state_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'add_new_state'),
-            GEN_SET_ADMIN_URL);
+		$this->_template_args['add_new_state_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'add_new_state'),
+			GEN_SET_ADMIN_URL);
         
-        $state_details_settings = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH . 'state_details_settings.template.php',
-            $this->_template_args, true);
+		$state_details_settings = EEH_Template::display_template(GEN_SET_TEMPLATE_PATH . 'state_details_settings.template.php',
+			$this->_template_args, true);
         
-        if (defined('DOING_AJAX')) {
-            $notices = EE_Error::get_notices(false, false, false);
-            echo wp_json_encode(array(
-                'return_data' => $state_details_settings,
-                'success'     => $notices['success'],
-                'errors'      => $notices['errors']
-            ));
-            die();
-        } else {
-            return $state_details_settings;
-        }
+		if (defined('DOING_AJAX')) {
+			$notices = EE_Error::get_notices(false, false, false);
+			echo wp_json_encode(array(
+				'return_data' => $state_details_settings,
+				'success'     => $notices['success'],
+				'errors'      => $notices['errors']
+			));
+			die();
+		} else {
+			return $state_details_settings;
+		}
         
-    }
+	}
     
     
-    /**
-     *        add_new_state
-     *
-     * @access    public
-     * @return        void
-     */
-    public function add_new_state()
-    {
+	/**
+	 *        add_new_state
+	 *
+	 * @access    public
+	 * @return        void
+	 */
+	public function add_new_state()
+	{
         
-        $success = true;
+		$success = true;
         
-        $CNT_ISO = isset($this->_req_data['CNT_ISO']) ? strtoupper(sanitize_text_field($this->_req_data['CNT_ISO'])) : false;
-        if ( ! $CNT_ISO) {
-            EE_Error::add_error(__('No Country ISO code or an invalid Country ISO code was received.',
-                'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
-            $success = false;
-        }
-        $STA_abbrev = isset($this->_req_data['STA_abbrev']) ? sanitize_text_field($this->_req_data['STA_abbrev']) : false;
-        if ( ! $STA_abbrev) {
-            EE_Error::add_error(__('No State ISO code or an invalid State ISO code was received.', 'event_espresso'),
-                __FILE__, __FUNCTION__, __LINE__);
-            $success = false;
-        }
-        $STA_name = isset($this->_req_data['STA_name']) ? sanitize_text_field($this->_req_data['STA_name']) :
-            false;
-        if ( ! $STA_name) {
-            EE_Error::add_error(__('No State name or an invalid State name was received.', 'event_espresso'), __FILE__,
-                __FUNCTION__, __LINE__);
-            $success = false;
-        }
+		$CNT_ISO = isset($this->_req_data['CNT_ISO']) ? strtoupper(sanitize_text_field($this->_req_data['CNT_ISO'])) : false;
+		if ( ! $CNT_ISO) {
+			EE_Error::add_error(__('No Country ISO code or an invalid Country ISO code was received.',
+				'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
+			$success = false;
+		}
+		$STA_abbrev = isset($this->_req_data['STA_abbrev']) ? sanitize_text_field($this->_req_data['STA_abbrev']) : false;
+		if ( ! $STA_abbrev) {
+			EE_Error::add_error(__('No State ISO code or an invalid State ISO code was received.', 'event_espresso'),
+				__FILE__, __FUNCTION__, __LINE__);
+			$success = false;
+		}
+		$STA_name = isset($this->_req_data['STA_name']) ? sanitize_text_field($this->_req_data['STA_name']) :
+			false;
+		if ( ! $STA_name) {
+			EE_Error::add_error(__('No State name or an invalid State name was received.', 'event_espresso'), __FILE__,
+				__FUNCTION__, __LINE__);
+			$success = false;
+		}
         
-        if ($success) {
-            $cols_n_values = array(
-                'CNT_ISO'    => $CNT_ISO,
-                'STA_abbrev' => $STA_abbrev,
-                'STA_name'   => $STA_name,
-                'STA_active' => true
-            );
-            $success       = EEM_State::instance()->insert($cols_n_values);
-            EE_Error::add_success(__('The State was added successfully.', 'event_espresso'));
-        }
+		if ($success) {
+			$cols_n_values = array(
+				'CNT_ISO'    => $CNT_ISO,
+				'STA_abbrev' => $STA_abbrev,
+				'STA_name'   => $STA_name,
+				'STA_active' => true
+			);
+			$success       = EEM_State::instance()->insert($cols_n_values);
+			EE_Error::add_success(__('The State was added successfully.', 'event_espresso'));
+		}
         
-        if (defined('DOING_AJAX')) {
-            $notices = EE_Error::get_notices(false, false, false);
-            echo wp_json_encode(array_merge($notices, array('return_data' => $CNT_ISO)));
-            die();
-        } else {
-            $this->_redirect_after_action($success, 'State', 'added', array('action' => 'country_settings'));
-        }
-    }
-    
-    
-    /**
-     *        delete_state
-     *
-     * @access    public
-     * @return        boolean | void
-     */
-    public function delete_state()
-    {
-        $CNT_ISO    = isset($this->_req_data['CNT_ISO']) ? strtoupper(sanitize_text_field($this->_req_data['CNT_ISO'])) : false;
-        $STA_ID     = isset($this->_req_data['STA_ID']) ? sanitize_text_field($this->_req_data['STA_ID']) : false;
-        $STA_abbrev = isset($this->_req_data['STA_abbrev']) ? sanitize_text_field($this->_req_data['STA_abbrev']) : false;
-        if ( ! $STA_ID) {
-            EE_Error::add_error(__('No State ID or an invalid State ID was received.', 'event_espresso'), __FILE__,
-                __FUNCTION__, __LINE__);
+		if (defined('DOING_AJAX')) {
+			$notices = EE_Error::get_notices(false, false, false);
+			echo wp_json_encode(array_merge($notices, array('return_data' => $CNT_ISO)));
+			die();
+		} else {
+			$this->_redirect_after_action($success, 'State', 'added', array('action' => 'country_settings'));
+		}
+	}
+    
+    
+	/**
+	 *        delete_state
+	 *
+	 * @access    public
+	 * @return        boolean | void
+	 */
+	public function delete_state()
+	{
+		$CNT_ISO    = isset($this->_req_data['CNT_ISO']) ? strtoupper(sanitize_text_field($this->_req_data['CNT_ISO'])) : false;
+		$STA_ID     = isset($this->_req_data['STA_ID']) ? sanitize_text_field($this->_req_data['STA_ID']) : false;
+		$STA_abbrev = isset($this->_req_data['STA_abbrev']) ? sanitize_text_field($this->_req_data['STA_abbrev']) : false;
+		if ( ! $STA_ID) {
+			EE_Error::add_error(__('No State ID or an invalid State ID was received.', 'event_espresso'), __FILE__,
+				__FUNCTION__, __LINE__);
             
-            return false;
-        }
-        $success = EEM_State::instance()->delete_by_ID($STA_ID);
-        if ($success !== false) {
-            do_action('AHEE__General_Settings_Admin_Page__delete_state__state_deleted', $CNT_ISO, $STA_ID,
-                array('STA_abbrev' => $STA_abbrev));
-            EE_Error::add_success(__('The State was deleted successfully.', 'event_espresso'));
-        }
-        if (defined('DOING_AJAX')) {
-            $notices                = EE_Error::get_notices(false, false);
-            $notices['return_data'] = true;
-            echo wp_json_encode($notices);
-            die();
-        } else {
-            $this->_redirect_after_action($success, 'State', 'deleted', array('action' => 'country_settings'));
-        }
-    }
-    
-    
-    /**
-     *        _update_country_settings
-     *
-     * @access    protected
-     * @return        void
-     */
-    protected function _update_country_settings()
-    {
+			return false;
+		}
+		$success = EEM_State::instance()->delete_by_ID($STA_ID);
+		if ($success !== false) {
+			do_action('AHEE__General_Settings_Admin_Page__delete_state__state_deleted', $CNT_ISO, $STA_ID,
+				array('STA_abbrev' => $STA_abbrev));
+			EE_Error::add_success(__('The State was deleted successfully.', 'event_espresso'));
+		}
+		if (defined('DOING_AJAX')) {
+			$notices                = EE_Error::get_notices(false, false);
+			$notices['return_data'] = true;
+			echo wp_json_encode($notices);
+			die();
+		} else {
+			$this->_redirect_after_action($success, 'State', 'deleted', array('action' => 'country_settings'));
+		}
+	}
+    
+    
+	/**
+	 *        _update_country_settings
+	 *
+	 * @access    protected
+	 * @return        void
+	 */
+	protected function _update_country_settings()
+	{
 //		EEH_Debug_Tools::printr( $this->_req_data, '$this->_req_data  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-        // grab the country ISO code
-        $CNT_ISO = isset($this->_req_data['country']) ? strtoupper(sanitize_text_field($this->_req_data['country'])) : false;
-        if ( ! $CNT_ISO) {
-            EE_Error::add_error(__('No Country ISO code or an invalid Country ISO code was received.',
-                'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
+		// grab the country ISO code
+		$CNT_ISO = isset($this->_req_data['country']) ? strtoupper(sanitize_text_field($this->_req_data['country'])) : false;
+		if ( ! $CNT_ISO) {
+			EE_Error::add_error(__('No Country ISO code or an invalid Country ISO code was received.',
+				'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
             
-            return;
-        }
-        $cols_n_values                    = array();
-        $cols_n_values['CNT_ISO3']        = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_ISO3']) ? strtoupper(sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_ISO3'])) : false;
-        $cols_n_values['RGN_ID']          = isset($this->_req_data['cntry'][$CNT_ISO]['RGN_ID']) ? absint($this->_req_data['cntry'][$CNT_ISO]['RGN_ID']) : null;
-        $cols_n_values['CNT_name']        = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_name']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_name']) : null;
-        $cols_n_values['CNT_cur_code']    = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_code']) ? strtoupper(sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_code'])) : 'USD';
-        $cols_n_values['CNT_cur_single']  = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_single']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_single']) : 'dollar';
-        $cols_n_values['CNT_cur_plural']  = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_plural']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_plural']) : 'dollars';
-        $cols_n_values['CNT_cur_sign']    = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign']) : '$';
-        $cols_n_values['CNT_cur_sign_b4'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign_b4']) ? absint($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign_b4']) : true;
-        $cols_n_values['CNT_cur_dec_plc'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_plc']) ? absint($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_plc']) : 2;
-        $cols_n_values['CNT_cur_dec_mrk'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_mrk']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_mrk']) : '.';
-        $cols_n_values['CNT_cur_thsnds']  = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_thsnds']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_thsnds']) : ',';
-        $cols_n_values['CNT_tel_code']    = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_tel_code']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_tel_code']) : null;
-        $cols_n_values['CNT_is_EU']       = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_is_EU']) ? absint($this->_req_data['cntry'][$CNT_ISO]['CNT_is_EU']) : false;
-        $cols_n_values['CNT_active']      = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_active']) ? absint($this->_req_data['cntry'][$CNT_ISO]['CNT_active']) : false;
-        // allow filtering of country data
-        $cols_n_values = apply_filters('FHEE__General_Settings_Admin_Page___update_country_settings__cols_n_values',
-            $cols_n_values);
-        //EEH_Debug_Tools::printr( $cols_n_values, '$cols_n_values  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-        // where values
-        $where_cols_n_values = array(array('CNT_ISO' => $CNT_ISO));
-        // run the update
-        $success = EEM_Country::instance()->update($cols_n_values, $where_cols_n_values);
+			return;
+		}
+		$cols_n_values                    = array();
+		$cols_n_values['CNT_ISO3']        = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_ISO3']) ? strtoupper(sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_ISO3'])) : false;
+		$cols_n_values['RGN_ID']          = isset($this->_req_data['cntry'][$CNT_ISO]['RGN_ID']) ? absint($this->_req_data['cntry'][$CNT_ISO]['RGN_ID']) : null;
+		$cols_n_values['CNT_name']        = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_name']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_name']) : null;
+		$cols_n_values['CNT_cur_code']    = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_code']) ? strtoupper(sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_code'])) : 'USD';
+		$cols_n_values['CNT_cur_single']  = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_single']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_single']) : 'dollar';
+		$cols_n_values['CNT_cur_plural']  = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_plural']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_plural']) : 'dollars';
+		$cols_n_values['CNT_cur_sign']    = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign']) : '$';
+		$cols_n_values['CNT_cur_sign_b4'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign_b4']) ? absint($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_sign_b4']) : true;
+		$cols_n_values['CNT_cur_dec_plc'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_plc']) ? absint($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_plc']) : 2;
+		$cols_n_values['CNT_cur_dec_mrk'] = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_mrk']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_dec_mrk']) : '.';
+		$cols_n_values['CNT_cur_thsnds']  = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_thsnds']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_cur_thsnds']) : ',';
+		$cols_n_values['CNT_tel_code']    = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_tel_code']) ? sanitize_text_field($this->_req_data['cntry'][$CNT_ISO]['CNT_tel_code']) : null;
+		$cols_n_values['CNT_is_EU']       = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_is_EU']) ? absint($this->_req_data['cntry'][$CNT_ISO]['CNT_is_EU']) : false;
+		$cols_n_values['CNT_active']      = isset($this->_req_data['cntry'][$CNT_ISO]['CNT_active']) ? absint($this->_req_data['cntry'][$CNT_ISO]['CNT_active']) : false;
+		// allow filtering of country data
+		$cols_n_values = apply_filters('FHEE__General_Settings_Admin_Page___update_country_settings__cols_n_values',
+			$cols_n_values);
+		//EEH_Debug_Tools::printr( $cols_n_values, '$cols_n_values  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
+		// where values
+		$where_cols_n_values = array(array('CNT_ISO' => $CNT_ISO));
+		// run the update
+		$success = EEM_Country::instance()->update($cols_n_values, $where_cols_n_values);
 //		global $wpdb;
 //		echo '<h4>' . $wpdb->last_query . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
 //		echo '<h4>$success : ' . $success . '  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span></h4>';
-        if (isset($this->_req_data['states']) && is_array($this->_req_data['states']) && $success !== false) {
-            // allow filtering of states data
-            $states = apply_filters('FHEE__General_Settings_Admin_Page___update_country_settings__states',
-                $this->_req_data['states']);
+		if (isset($this->_req_data['states']) && is_array($this->_req_data['states']) && $success !== false) {
+			// allow filtering of states data
+			$states = apply_filters('FHEE__General_Settings_Admin_Page___update_country_settings__states',
+				$this->_req_data['states']);
 //			EEH_Debug_Tools::printr( $states, '$states  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-            // loop thru state data ( looks like : states[75][STA_name] )
-            foreach ($states as $STA_ID => $state) {
-                $cols_n_values = array(
-                    'CNT_ISO'    => $CNT_ISO,
-                    'STA_abbrev' => sanitize_text_field($state['STA_abbrev']),
-                    'STA_name'   => sanitize_text_field($state['STA_name']),
-                    'STA_active' => (bool)absint($state['STA_active'])
-                );
-                // where values
-                $where_cols_n_values = array(array('STA_ID' => $STA_ID));
-                // run the update
-                $success = EEM_State::instance()->update($cols_n_values, $where_cols_n_values);
-                if ($success !== false) {
-                    do_action('AHEE__General_Settings_Admin_Page__update_country_settings__state_saved', $CNT_ISO,
-                        $STA_ID, $cols_n_values);
-                }
-            }
-        }
-        // check if country being edited matches org option country, and if so, then  update EE_Config with new settings
-        if (isset(EE_Registry::instance()->CFG->organization->CNT_ISO) && $CNT_ISO == EE_Registry::instance()->CFG->organization->CNT_ISO) {
-            EE_Registry::instance()->CFG->currency = new EE_Currency_Config($CNT_ISO);
-            EE_Registry::instance()->CFG->update_espresso_config();
-        }
-        $this->_redirect_after_action($success, 'Countries', 'updated',
-            array('action' => 'country_settings', 'country' => $CNT_ISO));
-    }
-    
-    
-    /**
-     *        form_form_field_label_wrap
-     *
-     * @access        public
-     *
-     * @param        string $label
-     *
-     * @return        string
-     */
-    public function country_form_field_label_wrap($label, $required_text)
-    {
-        return '
+			// loop thru state data ( looks like : states[75][STA_name] )
+			foreach ($states as $STA_ID => $state) {
+				$cols_n_values = array(
+					'CNT_ISO'    => $CNT_ISO,
+					'STA_abbrev' => sanitize_text_field($state['STA_abbrev']),
+					'STA_name'   => sanitize_text_field($state['STA_name']),
+					'STA_active' => (bool)absint($state['STA_active'])
+				);
+				// where values
+				$where_cols_n_values = array(array('STA_ID' => $STA_ID));
+				// run the update
+				$success = EEM_State::instance()->update($cols_n_values, $where_cols_n_values);
+				if ($success !== false) {
+					do_action('AHEE__General_Settings_Admin_Page__update_country_settings__state_saved', $CNT_ISO,
+						$STA_ID, $cols_n_values);
+				}
+			}
+		}
+		// check if country being edited matches org option country, and if so, then  update EE_Config with new settings
+		if (isset(EE_Registry::instance()->CFG->organization->CNT_ISO) && $CNT_ISO == EE_Registry::instance()->CFG->organization->CNT_ISO) {
+			EE_Registry::instance()->CFG->currency = new EE_Currency_Config($CNT_ISO);
+			EE_Registry::instance()->CFG->update_espresso_config();
+		}
+		$this->_redirect_after_action($success, 'Countries', 'updated',
+			array('action' => 'country_settings', 'country' => $CNT_ISO));
+	}
+    
+    
+	/**
+	 *        form_form_field_label_wrap
+	 *
+	 * @access        public
+	 *
+	 * @param        string $label
+	 *
+	 * @return        string
+	 */
+	public function country_form_field_label_wrap($label, $required_text)
+	{
+		return '
 			<tr>
 				<th>
 					' . $label . '
 				</th>';
-    }
-    
-    
-    /**
-     *        form_form_field_input__wrap
-     *
-     * @access        public
-     *
-     * @param        string $label
-     *
-     * @return        string
-     */
-    public function country_form_field_input__wrap($input, $label)
-    {
-        return '
+	}
+    
+    
+	/**
+	 *        form_form_field_input__wrap
+	 *
+	 * @access        public
+	 *
+	 * @param        string $label
+	 *
+	 * @return        string
+	 */
+	public function country_form_field_input__wrap($input, $label)
+	{
+		return '
 				<td class="general-settings-country-input-td">
 					' . $input . '
 				</td>
 			</tr>';
-    }
-    
-    
-    /**
-     *        form_form_field_label_wrap
-     *
-     * @access        public
-     *
-     * @param        string $label
-     * @param        string $required_text
-     *
-     * @return        string
-     */
-    public function state_form_field_label_wrap($label, $required_text)
-    {
-        return $required_text;
-    }
-    
-    
-    /**
-     *        form_form_field_input__wrap
-     *
-     * @access        public
-     *
-     * @param        string $label
-     *
-     * @return        string
-     */
-    public function state_form_field_input__wrap($input, $label)
-    {
-        return '
+	}
+    
+    
+	/**
+	 *        form_form_field_label_wrap
+	 *
+	 * @access        public
+	 *
+	 * @param        string $label
+	 * @param        string $required_text
+	 *
+	 * @return        string
+	 */
+	public function state_form_field_label_wrap($label, $required_text)
+	{
+		return $required_text;
+	}
+    
+    
+	/**
+	 *        form_form_field_input__wrap
+	 *
+	 * @access        public
+	 *
+	 * @param        string $label
+	 *
+	 * @return        string
+	 */
+	public function state_form_field_input__wrap($input, $label)
+	{
+		return '
 				<td class="general-settings-country-state-input-td">
 					' . $input . '
 				</td>';
         
-    }
+	}
     
     
     
     
     
     
-    /***********/
+	/***********/
     
     
-    /**
-     * displays edit and view links for critical EE pages
-     *
-     * @access public
-     *
-     * @param int $ee_page_id
-     *
-     * @return string
-     */
-    public static function edit_view_links($ee_page_id)
-    {
-        $links = '<a href="' . add_query_arg(array('post' => $ee_page_id, 'action' => 'edit'),
-                admin_url('post.php')) . '" >' . __('Edit', 'event_espresso') . '</a>';
-        $links .= ' &nbsp;|&nbsp; ';
-        $links .= '<a href="' . get_permalink($ee_page_id) . '" >' . __('View', 'event_espresso') . '</a>';
+	/**
+	 * displays edit and view links for critical EE pages
+	 *
+	 * @access public
+	 *
+	 * @param int $ee_page_id
+	 *
+	 * @return string
+	 */
+	public static function edit_view_links($ee_page_id)
+	{
+		$links = '<a href="' . add_query_arg(array('post' => $ee_page_id, 'action' => 'edit'),
+				admin_url('post.php')) . '" >' . __('Edit', 'event_espresso') . '</a>';
+		$links .= ' &nbsp;|&nbsp; ';
+		$links .= '<a href="' . get_permalink($ee_page_id) . '" >' . __('View', 'event_espresso') . '</a>';
         
-        return $links;
-    }
-    
-    
-    /**
-     * displays page and shortcode status for critical EE pages
-     *
-     * @param WP page object $ee_page
-     *
-     * @return string
-     */
-    public static function page_and_shortcode_status($ee_page, $shortcode)
-    {
+		return $links;
+	}
+    
+    
+	/**
+	 * displays page and shortcode status for critical EE pages
+	 *
+	 * @param WP page object $ee_page
+	 *
+	 * @return string
+	 */
+	public static function page_and_shortcode_status($ee_page, $shortcode)
+	{
         
-        // page status
-        if (isset($ee_page->post_status) && $ee_page->post_status == 'publish') {
-            $pg_colour = 'green';
-            $pg_status = sprintf(__('Page%sStatus%sOK', 'event_espresso'), '&nbsp;', '&nbsp;');
-        } else {
-            $pg_colour = 'red';
-            $pg_status = sprintf(__('Page%sVisibility%sProblem', 'event_espresso'), '&nbsp;', '&nbsp;');
-        }
+		// page status
+		if (isset($ee_page->post_status) && $ee_page->post_status == 'publish') {
+			$pg_colour = 'green';
+			$pg_status = sprintf(__('Page%sStatus%sOK', 'event_espresso'), '&nbsp;', '&nbsp;');
+		} else {
+			$pg_colour = 'red';
+			$pg_status = sprintf(__('Page%sVisibility%sProblem', 'event_espresso'), '&nbsp;', '&nbsp;');
+		}
         
-        // shortcode status
-        if (isset($ee_page->post_content) && strpos($ee_page->post_content, $shortcode) !== false) {
-            $sc_colour = 'green';
-            $sc_status = sprintf(__('Shortcode%sOK', 'event_espresso'), '&nbsp;');
-        } else {
-            $sc_colour = 'red';
-            $sc_status = sprintf(__('Shortcode%sProblem', 'event_espresso'), '&nbsp;');
-        }
+		// shortcode status
+		if (isset($ee_page->post_content) && strpos($ee_page->post_content, $shortcode) !== false) {
+			$sc_colour = 'green';
+			$sc_status = sprintf(__('Shortcode%sOK', 'event_espresso'), '&nbsp;');
+		} else {
+			$sc_colour = 'red';
+			$sc_status = sprintf(__('Shortcode%sProblem', 'event_espresso'), '&nbsp;');
+		}
         
-        return '<span style="color:' . $pg_colour . '; margin-right:2em;"><strong>' . $pg_status . '</strong></span><span style="color:' . $sc_colour . '"><strong>' . $sc_status . '</strong></span>';
+		return '<span style="color:' . $pg_colour . '; margin-right:2em;"><strong>' . $pg_status . '</strong></span><span style="color:' . $sc_colour . '"><strong>' . $sc_status . '</strong></span>';
         
-    }
-    
-    
-    /**
-     * generates a dropdown of all parent pages - copied from WP core
-     *
-     * @param unknown_type $default
-     * @param unknown_type $parent
-     * @param unknown_type $level
-     *
-     * @return unknown
-     */
-    public static function page_settings_dropdown($default = 0, $parent = 0, $level = 0)
-    {
-        global $wpdb;
-        $items = $wpdb->get_results($wpdb->prepare("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' AND post_status != 'trash' ORDER BY menu_order",
-            $parent));
+	}
+    
+    
+	/**
+	 * generates a dropdown of all parent pages - copied from WP core
+	 *
+	 * @param unknown_type $default
+	 * @param unknown_type $parent
+	 * @param unknown_type $level
+	 *
+	 * @return unknown
+	 */
+	public static function page_settings_dropdown($default = 0, $parent = 0, $level = 0)
+	{
+		global $wpdb;
+		$items = $wpdb->get_results($wpdb->prepare("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' AND post_status != 'trash' ORDER BY menu_order",
+			$parent));
         
-        if ($items) {
-            foreach ($items as $item) {
-                $pad = str_repeat('&nbsp;', $level * 3);
-                if ($item->ID == $default) {
-                    $current = ' selected="selected"';
-                } else {
-                    $current = '';
-                }
+		if ($items) {
+			foreach ($items as $item) {
+				$pad = str_repeat('&nbsp;', $level * 3);
+				if ($item->ID == $default) {
+					$current = ' selected="selected"';
+				} else {
+					$current = '';
+				}
                 
-                echo "\n\t<option class='level-$level' value='$item->ID'$current>$pad " . esc_html($item->post_title) . "</option>";
-                parent_dropdown($default, $item->ID, $level + 1);
-            }
-        } else {
-            return false;
-        }
-    }
+				echo "\n\t<option class='level-$level' value='$item->ID'$current>$pad " . esc_html($item->post_title) . "</option>";
+				parent_dropdown($default, $item->ID, $level + 1);
+			}
+		} else {
+			return false;
+		}
+	}
     
     
 } //ends Forms_Admin_Page class