eventespresso / event-espresso-core

core/db_models/fields/EE_Money_Field.php

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		//so in case teh IPN is arriving later, let's try to process an IPN!
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

Spacing +8 added lines, -8 removed lines

@@ -2,8 +2,8 @@ 
 /**
  * Text_Fields is a base class for any fields which are have float value. (Exception: foreign and private key fields. Wish PHP had multiple-inheritance for this...)
  */
-class EE_Money_Field extends EE_Float_Field{
-	function get_wpdb_data_type(){
+class EE_Money_Field extends EE_Float_Field {
+	function get_wpdb_data_type() {
 		return '%f';
 	}
 	/**
@@ -15,20 +15,20 @@ 
 	 * @param type $schema
 	 * @return string
 	 */
-	function prepare_for_pretty_echoing($value_on_field_to_be_outputted,$schema = null){
+	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
 		$pretty_float = parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted);
 
-		if($schema == 'localized_float'){
+		if ($schema == 'localized_float') {
 			return $pretty_float;
 		}
-		if($schema == 'no_currency_code'){
+		if ($schema == 'no_currency_code') {
 //			echo "schema no currency!";
 			$display_code = false;
-		}else{
+		} else {
 			$display_code = true;
 		}
 		//we don't use the $pretty_float because format_currency will take care of it.
-		return EEH_Template::format_currency( $value_on_field_to_be_outputted, false, $display_code );
+		return EEH_Template::format_currency($value_on_field_to_be_outputted, false, $display_code);
 	}
 
 	/**
@@ -47,7 +47,7 @@ 
 		//now it's a float-style string or number
 		$float_val = parent::prepare_for_set($value_inputted_for_field_on_model_object);
 		//round to the correctly number of decimal places for this  currency
-		$rounded_value = round($float_val,  EE_Registry::instance()->CFG->currency->dec_plc);
+		$rounded_value = round($float_val, EE_Registry::instance()->CFG->currency->dec_plc);
 		return $rounded_value;
 	}
 

core/db_models/relations/EE_Belongs_To_Relation.php

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		//so in case teh IPN is arriving later, let's try to process an IPN!
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

Spacing +10 added lines, -10 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once( EE_MODELS . 'relations/EE_Model_Relation_Base.php');
+require_once(EE_MODELS.'relations/EE_Model_Relation_Base.php');
 /**
  * Class EE_Belongs_To_Relation
  *
@@ -36,10 +36,10 @@ 
 		//create the sql string like
 		$this_table_fk_field = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
 		$other_table_pk_field = $this->get_other_model()->get_primary_key_field();
-		$this_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()) . $this_table_fk_field->get_table_alias();
-		$other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()) . $other_table_pk_field->get_table_alias();
+		$this_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model()->get_this_model_name()).$this_table_fk_field->get_table_alias();
+		$other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_other_model()->get_this_model_name()).$other_table_pk_field->get_table_alias();
 		$other_table = $this->get_other_model()->get_table_for_alias($other_table_alias);
-		return $this->_left_join($other_table, $other_table_alias, $other_table_pk_field->get_table_column(), $this_table_alias, $this_table_fk_field->get_table_column()) . $this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
+		return $this->_left_join($other_table, $other_table_alias, $other_table_pk_field->get_table_column(), $this_table_alias, $this_table_fk_field->get_table_column()).$this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
 	}
 
 	/**
@@ -53,7 +53,7 @@ 
 		$other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 		//find the field on the other model which is a foreign key to this model
 		$fk_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
-		if ( $this_model_obj->get($fk_on_this_model->get_name()) != $other_model_obj->ID()){
+		if ($this_model_obj->get($fk_on_this_model->get_name()) != $other_model_obj->ID()) {
 			//set that field on the other model to this model's ID
 			$this_model_obj->set($fk_on_this_model->get_name(), $other_model_obj->ID());
 			$this_model_obj->save();
@@ -69,7 +69,7 @@ 
 	 */
 	function remove_relation_to($this_obj_or_id, $other_obj_or_id) {
 		$this_model_obj = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
-		$other_model_obj = $this->get_other_model()->ensure_is_obj( $other_obj_or_id );
+		$other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id);
 		//find the field on the other model which is a foreign key to this model
 		$fk_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
 		//set that field on the other model to this model's ID
@@ -86,15 +86,15 @@ 
 	 * @return EE_Base_Class[]
 	 */
 	public function get_all_related($model_obj_or_id, $query_params = array(), $values_already_prepared_by_model_object = false) {
-		if( $values_already_prepared_by_model_object !== false ) {
-			EE_Error::doing_it_wrong( 'EE_Model_Relation_Base::get_all_related', __( 'The argument $values_already_prepared_by_model_object is no longer used.', 'event_espresso' ), '4.8.1' );
+		if ($values_already_prepared_by_model_object !== false) {
+			EE_Error::doing_it_wrong('EE_Model_Relation_Base::get_all_related', __('The argument $values_already_prepared_by_model_object is no longer used.', 'event_espresso'), '4.8.1');
 		}
 		//get column on this model object which is a foreign key to the other model
 		$fk_field_obj = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
 		//get its value
-		if( $model_obj_or_id instanceof EE_Base_Class){
+		if ($model_obj_or_id instanceof EE_Base_Class) {
 			$model_obj = $model_obj_or_id;
-		}else{
+		} else {
 			$model_obj = $this->get_this_model()->ensure_is_obj($model_obj_or_id);
 		}
 		$ID_value_on_other_model = $model_obj->get($fk_field_obj->get_name());

core/db_models/strategies/EE_Soft_Delete_Where_Conditions.strategy.php

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		//so in case teh IPN is arriving later, let's try to process an IPN!
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  *
@@ -13,7 +13,7 @@ 
  * @author				Mike Nelson
  * @since		 	   4.6.0
  */
-class EE_Soft_Delete_Where_Conditions extends EE_Default_Where_Conditions{
+class EE_Soft_Delete_Where_Conditions extends EE_Default_Where_Conditions {
 	/**
 	 * Strategy for setting default soft delete where conditions. This strategy will find
 	 * the field of type 'EE_Trashed_Flag_Field', and add a condition that it be FALSE on all queries involving
@@ -22,12 +22,12 @@ 
 	 * Eg,
 	 *
 	 */
-	function __construct(){}
+	function __construct() {}
 	/**
 	 * Gets the where default where conditions for a custom post type model
 	 * @return array like EEM_Base::get_all's $query_params's index [0] (where conditions)
 	 */
-	protected function _get_default_where_conditions(){
+	protected function _get_default_where_conditions() {
 		$trashed_field_name = $this->deleted_field_name();
 		return array(
 			$trashed_field_name => false
@@ -39,12 +39,12 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	private function deleted_field_name(){
+	private function deleted_field_name() {
 		$field = $this->_model->get_a_field_of_type('EE_Trashed_Flag_Field');
-		if($field){
+		if ($field) {
 			return $field->get_name();
-		}else{
-			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?','event_espresso'),get_class($this),get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?', 'event_espresso'), get_class($this), get_class($this)));
 		}
 	}
 }
\ No newline at end of file

core/helpers/EEH_Class_Tools.helper.php

Braces +3 added lines, -1 removed lines

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

Spacing +34 added lines, -34 removed lines

@@ -35,35 +35,35 @@ 
 	 */
 	public static function get_called_class() {
 		$backtrace = debug_backtrace();
-		if ( isset( $backtrace[2] ) && is_array( $backtrace[2] ) && isset( $backtrace[2]['class'] ) && ! isset( $backtrace[2]['file'] )) {
+		if (isset($backtrace[2]) && is_array($backtrace[2]) && isset($backtrace[2]['class']) && ! isset($backtrace[2]['file'])) {
 			return $backtrace[2]['class'];
-		} else if ( isset( $backtrace[3] ) && is_array( $backtrace[3] ) && isset( $backtrace[3]['class'] ) && ! isset( $backtrace[3]['file'] )) {
+		} else if (isset($backtrace[3]) && is_array($backtrace[3]) && isset($backtrace[3]['class']) && ! isset($backtrace[3]['file'])) {
 			return $backtrace[3]['class'];
-		} else if ( isset( $backtrace[2] ) && is_array( $backtrace[2] ) && isset( $backtrace[2]['file'] ) && isset( $backtrace[2]['line'] )) {
-			if ( self::$file_line == $backtrace[2]['file'] . $backtrace[2]['line'] ) {
+		} else if (isset($backtrace[2]) && is_array($backtrace[2]) && isset($backtrace[2]['file']) && isset($backtrace[2]['line'])) {
+			if (self::$file_line == $backtrace[2]['file'].$backtrace[2]['line']) {
 				self::$i++;
 			} else {
 				self::$i = 0;
-				self::$file_line = $backtrace[2]['file'] . $backtrace[2]['line'];
+				self::$file_line = $backtrace[2]['file'].$backtrace[2]['line'];
 			}
 			// was  class method called via call_user_func ?
-			if ( $backtrace[2]['function'] == 'call_user_func' && isset( $backtrace[2]['args'] ) && is_array( $backtrace[2]['args'] )){
-				if ( isset( $backtrace[2]['args'][0] ) && isset( $backtrace[2]['args'][0][0] )) {
+			if ($backtrace[2]['function'] == 'call_user_func' && isset($backtrace[2]['args']) && is_array($backtrace[2]['args'])) {
+				if (isset($backtrace[2]['args'][0]) && isset($backtrace[2]['args'][0][0])) {
 					$called_class = $backtrace[2]['args'][0][0];
 					// is it an EE function ?
-					if ( strpos( $called_class, 'EE' ) === 0 ) {
-						$prefix_chars = strpos( $called_class, '_' ) + 1;
-						$prefix = substr( $called_class, 0, $prefix_chars );
-						$classname = substr( $called_class, $prefix_chars, strlen( $called_class ));
-						$classname = $prefix . str_replace( ' ', '_', ucwords( strtolower( str_replace( '_', ' ', $classname  ))));
+					if (strpos($called_class, 'EE') === 0) {
+						$prefix_chars = strpos($called_class, '_') + 1;
+						$prefix = substr($called_class, 0, $prefix_chars);
+						$classname = substr($called_class, $prefix_chars, strlen($called_class));
+						$classname = $prefix.str_replace(' ', '_', ucwords(strtolower(str_replace('_', ' ', $classname))));
 						return $classname;
 					}
 				}
 			} else {
-				$lines = file( $backtrace[2]['file'] );
-				preg_match_all( '/([a-zA-Z0-9\_]+)::' . $backtrace[2]['function'] . '/', $lines[$backtrace[2]['line']-1], $matches );
-				if ( isset( $matches[1] ) && isset( $matches[1][ self::$i ] )) {
-					return $matches[1][ self::$i ];
+				$lines = file($backtrace[2]['file']);
+				preg_match_all('/([a-zA-Z0-9\_]+)::'.$backtrace[2]['function'].'/', $lines[$backtrace[2]['line'] - 1], $matches);
+				if (isset($matches[1]) && isset($matches[1][self::$i])) {
+					return $matches[1][self::$i];
 				}
 			}
 		}
@@ -80,22 +80,22 @@ 
 	 * 	@param 	string 	$hook
 	 * 	@return 	array
 	 */
-	public static function get_class_names_for_all_callbacks_on_hook( $hook = NULL ) {
+	public static function get_class_names_for_all_callbacks_on_hook($hook = NULL) {
 		global $wp_filter;
 		$class_names = array();
 		// are any callbacks registered for this hook ?
-		if ( isset( $wp_filter[ $hook ] )) {
+		if (isset($wp_filter[$hook])) {
 			// loop thru all of the callbacks attached to the deprecated hookpoint
-			foreach( $wp_filter[ $hook ] as $priority ) {
-				foreach( $priority as $callback ) {
+			foreach ($wp_filter[$hook] as $priority) {
+				foreach ($priority as $callback) {
 					// is the callback a non-static class method ?
-					if ( isset( $callback['function'] ) && is_array( $callback['function'] )) {
-						if ( isset( $callback['function'][0] ) && is_object( $callback['function'][0] )) {
-							$class_names[] = get_class( $callback['function'][0] );
+					if (isset($callback['function']) && is_array($callback['function'])) {
+						if (isset($callback['function'][0]) && is_object($callback['function'][0])) {
+							$class_names[] = get_class($callback['function'][0]);
 						}
 					// test for static method
-					} else if ( strpos( $callback['function'], '::' ) !== FALSE ) {
-						$class = explode( '::', $callback['function'] );
+					} else if (strpos($callback['function'], '::') !== FALSE) {
+						$class = explode('::', $callback['function']);
 						$class_names[] = $class[0];
 					} else {
 						// just a function
@@ -116,24 +116,24 @@ 
 	 * 	@param		string 	$property
 	 * 	@return 		boolean
 	 */
-	public static function has_property( $class = NULL, $property = NULL ) {
+	public static function has_property($class = NULL, $property = NULL) {
 		// if $class or $property don't exist, then get out, cuz that would be like... fatal dude
-		if ( empty( $class ) || empty( $property )) {
+		if (empty($class) || empty($property)) {
 			return FALSE;
 		}
 		// if your hosting company doesn't cut the mustard
-		if ( version_compare( PHP_VERSION, '5.3.0' ) < 0 ) {
+		if (version_compare(PHP_VERSION, '5.3.0') < 0) {
 			// just in case $class is an actual instantiated object
-			if ( is_object( $class )) {
-				return isset( $class->{$property} ) ? TRUE : FALSE;
+			if (is_object($class)) {
+				return isset($class->{$property} ) ? TRUE : FALSE;
 			} else {
 				// use reflection for < PHP 5.3 to get details using just the class name
-				$reflector = new ReflectionClass( $class );
-				return $reflector->hasProperty( $property );
+				$reflector = new ReflectionClass($class);
+				return $reflector->hasProperty($property);
 			}
 		} else {
 			// or try regular property exists method which works as expected in PHP 5.3+
-			return property_exists( $class, $property );
+			return property_exists($class, $property);
 		}
 	}
 
@@ -143,7 +143,7 @@ 
 
 
 // if PHP version < 5.3
-if ( ! function_exists( 'get_called_class' )) {
+if ( ! function_exists('get_called_class')) {
 	/**
 	 * @return bool|string
 	 */

core/helpers/EEH_Event_View.helper.php

Braces +4 added lines, -2 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -89,7 +91,7 @@ 
 			$payment_method_slug = EE_Registry::instance()->REQ->get( 'ee_payment_method', NULL );
 			if( $payment_method_slug ) {
 				$payment_method = EEM_Payment_Method::instance()->get_one_by_slug( $payment_method_slug );
-			}else{
+			} else{
 				$payment_method = null;
 			}
 			/** @type EE_Payment_Processor $payment_processor */

Doc Comments +7 added lines, -7 removed lines

@@ -38,7 +38,7 @@ 
 	 *
 	 * @access    public
 	 * @param    int $EVT_ID
-	 * @return    object
+	 * @return    null|boolean
 	 */
 	public static function get_event( $EVT_ID = 0 ) {
 		$EVT_ID = $EVT_ID instanceof WP_Post ? $EVT_ID->ID : absint( $EVT_ID );
@@ -116,7 +116,7 @@ 
 	 *
 	 *  @access 	public
 	 * @param    int $EVT_ID
-	 *  @return 	string
+	 *  @return 	boolean
 	 */
 	public static function event_has_content_or_excerpt( $EVT_ID = 0 ) {
 		$event = EEH_Event_View::get_event( $EVT_ID );
@@ -136,7 +136,7 @@ 
 	 *    event_active_status
 	 *
 	 * @access    public
-	 * @param null $num_words
+	 * @param integer $num_words
 	 * @param null $more
 	 * @return    string
 	 */
@@ -322,7 +322,7 @@ 
 	 *
 	 * @access    public
 	 * @param int $EVT_ID
-	 * @return    string
+	 * @return    string|null
 	 */
 	public static function get_primary_date_obj( $EVT_ID = 0 ) {
 		$event = EEH_Event_View::get_event( $EVT_ID );
@@ -347,7 +347,7 @@ 
 	 *
 	 * @access    public
 	 * @param int $EVT_ID
-	 * @return    string
+	 * @return    string|null
 	 */
 	public static function get_last_date_obj( $EVT_ID = 0 ) {
 		$event = EEH_Event_View::get_event( $EVT_ID );
@@ -372,7 +372,7 @@ 
 	 *
 	 * @access    public
 	 * @param int $EVT_ID
-	 * @return    string
+	 * @return    string|null
 	 */
 	public static function get_earliest_date_obj( $EVT_ID = 0 ) {
 		$event = EEH_Event_View::get_event( $EVT_ID );
@@ -422,7 +422,7 @@ 
 	 *
 	 * @access    public
 	 * @param int $EVT_ID
-	 * @param null $include_expired
+	 * @param false|null $include_expired
 	 * @param bool $include_deleted
 	 * @param null $limit
 	 * @return EE_Datetime[]

Spacing +117 added lines, -117 removed lines

@@ -40,27 +40,27 @@ 
 	 * @param    int $EVT_ID
 	 * @return    object
 	 */
-	public static function get_event( $EVT_ID = 0 ) {
-		$EVT_ID = $EVT_ID instanceof WP_Post ? $EVT_ID->ID : absint( $EVT_ID );
+	public static function get_event($EVT_ID = 0) {
+		$EVT_ID = $EVT_ID instanceof WP_Post ? $EVT_ID->ID : absint($EVT_ID);
 		// do we already have the Event  you are looking for?
-		if ( EEH_Event_View::$_event instanceof EE_Event && $EVT_ID && EEH_Event_View::$_event->ID() === $EVT_ID ) {
+		if (EEH_Event_View::$_event instanceof EE_Event && $EVT_ID && EEH_Event_View::$_event->ID() === $EVT_ID) {
 			return EEH_Event_View::$_event;
 		}
 		EEH_Event_View::$_event = NULL;
 		// international newspaper?
 		global $post;
 		// if this is being called from an EE_Event post, then we can just grab the attached EE_Event object
-		 if ( isset( $post->post_type ) && $post->post_type == 'espresso_events' || $EVT_ID ) {
+		 if (isset($post->post_type) && $post->post_type == 'espresso_events' || $EVT_ID) {
 //			d( $post );
 			// grab the event we're looking for
-			if ( isset( $post->EE_Event ) && ( $EVT_ID == 0 || ( $EVT_ID == $post->ID ))) {
+			if (isset($post->EE_Event) && ($EVT_ID == 0 || ($EVT_ID == $post->ID))) {
 				EEH_Event_View::$_event = $post->EE_Event;
 //				d( EEH_Event_View::$_event );
 			}
 			// now if we STILL do NOT have an EE_Event model object, BUT we have an Event ID...
-			if ( ! EEH_Event_View::$_event instanceof EE_Event && $EVT_ID ) {
+			if ( ! EEH_Event_View::$_event instanceof EE_Event && $EVT_ID) {
 				// sigh... pull it from the db
-				EEH_Event_View::$_event = EEM_Event::instance()->get_one_by_ID( $EVT_ID );
+				EEH_Event_View::$_event = EEM_Event::instance()->get_one_by_ID($EVT_ID);
 //				d( EEH_Event_View::$_event );
 			}
 		}
@@ -76,8 +76,8 @@ 
 	 * @param    int $EVT_ID
 	 * @return    boolean
 	 */
-	public static function display_ticket_selector( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function display_ticket_selector($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		return $event instanceof EE_Event ? $event->display_ticket_selector() : FALSE;
 	}
 
@@ -90,9 +90,9 @@ 
 	 * @param    int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_status( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		return $event instanceof EE_Event ? $event->pretty_active_status( FALSE ) : '';
+	public static function event_status($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		return $event instanceof EE_Event ? $event->pretty_active_status(FALSE) : '';
 	}
 
 
@@ -104,8 +104,8 @@ 
 	 * @param    int $EVT_ID
 	 *  @return 	string
 	 */
-	public static function event_active_status( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function event_active_status($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		return $event instanceof EE_Event ? $event->pretty_active_status() : 'inactive';
 	}
 
@@ -118,13 +118,13 @@ 
 	 * @param    int $EVT_ID
 	 *  @return 	string
 	 */
-	public static function event_has_content_or_excerpt( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function event_has_content_or_excerpt($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		$has_content_or_excerpt = FALSE;
-		if ( $event instanceof EE_Event ) {
-			$has_content_or_excerpt = $event->description() != '' || $event->short_description( NULL, NULL, TRUE ) != '' ? TRUE : FALSE;
+		if ($event instanceof EE_Event) {
+			$has_content_or_excerpt = $event->description() != '' || $event->short_description(NULL, NULL, TRUE) != '' ? TRUE : FALSE;
 		}
-		if ( is_archive() && ! ( espresso_display_full_description_in_event_list() || espresso_display_excerpt_in_event_list() )) {
+		if (is_archive() && ! (espresso_display_full_description_in_event_list() || espresso_display_excerpt_in_event_list())) {
 			$has_content_or_excerpt = FALSE;
 		}
 		return $has_content_or_excerpt;
@@ -140,45 +140,45 @@ 
 	 * @param null $more
 	 * @return    string
 	 */
-	public static function event_content_or_excerpt( $num_words = NULL, $more = NULL ) {
+	public static function event_content_or_excerpt($num_words = NULL, $more = NULL) {
 		global $post;
 
 		ob_start();
-		if (( is_single() ) || ( is_archive() && espresso_display_full_description_in_event_list() )) {
+		if ((is_single()) || (is_archive() && espresso_display_full_description_in_event_list())) {
 
 			// admin has chosen "full description" for the "Event Espresso - Events > Templates > Display Description" option
 			the_content();
 
-		} else if (( is_archive() && has_excerpt( $post->ID ) && espresso_display_excerpt_in_event_list() ) ) {
+		} else if ((is_archive() && has_excerpt($post->ID) && espresso_display_excerpt_in_event_list())) {
 
 			// admin has chosen "excerpt (short desc)" for the "Event Espresso - Events > Templates > Display Description" option
 			// AND an excerpt actually exists
 			the_excerpt();
 
-		} else if (( is_archive() && ! has_excerpt( $post->ID ) && espresso_display_excerpt_in_event_list() )) {
+		} else if ((is_archive() && ! has_excerpt($post->ID) && espresso_display_excerpt_in_event_list())) {
 
 			// admin has chosen "excerpt (short desc)" for the "Event Espresso - Events > Templates > Display Description" option
 			// but NO excerpt actually exists, so we need to create one
-			if ( ! empty( $num_words )) {
-				if ( empty( $more )) {
-					$more_link_text = __( '(more…)' );
-					$more = ' <a href="' . get_permalink() . '" class="more-link">' . $more_link_text . '</a>';
-					$more = apply_filters( 'the_content_more_link', $more, $more_link_text );
+			if ( ! empty($num_words)) {
+				if (empty($more)) {
+					$more_link_text = __('(more&hellip;)');
+					$more = ' <a href="'.get_permalink().'" class="more-link">'.$more_link_text.'</a>';
+					$more = apply_filters('the_content_more_link', $more, $more_link_text);
 				}
-				$content = str_replace( 'NOMORELINK', '', get_the_content( 'NOMORELINK' ));
+				$content = str_replace('NOMORELINK', '', get_the_content('NOMORELINK'));
 
-				$content =  wp_trim_words( $content, $num_words, ' ' ) . $more;
+				$content = wp_trim_words($content, $num_words, ' ').$more;
 			} else {
-				$content =  get_the_content();
+				$content = get_the_content();
 			}
 			global $allowedtags;
-			$content = wp_kses( $content, $allowedtags );
-			$content = strip_shortcodes( $content );
-			echo apply_filters( 'the_content', $content );
+			$content = wp_kses($content, $allowedtags);
+			$content = strip_shortcodes($content);
+			echo apply_filters('the_content', $content);
 
 		} else {
 			// admin has chosen "none" for the "Event Espresso - Events > Templates > Display Description" option
-			echo apply_filters( 'the_content', '' );
+			echo apply_filters('the_content', '');
 		}
 		return ob_get_clean();
 	}
@@ -192,13 +192,13 @@ 
 	 * @param    int $EVT_ID
 	 *  @return 	EE_Ticket[]
 	 */
-	public static function event_tickets_available( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function event_tickets_available($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		$tickets_available_for_purchase = array();
-		if( $event instanceof EE_Event ) {
-			$datetimes = EEH_Event_View::get_all_date_obj( $EVT_ID, FALSE );
-			foreach( $datetimes as $datetime ) {
-				$tickets_available_for_purchase = array_merge( $tickets_available_for_purchase, $datetime->ticket_types_available_for_purchase() );
+		if ($event instanceof EE_Event) {
+			$datetimes = EEH_Event_View::get_all_date_obj($EVT_ID, FALSE);
+			foreach ($datetimes as $datetime) {
+				$tickets_available_for_purchase = array_merge($tickets_available_for_purchase, $datetime->ticket_types_available_for_purchase());
 			}
 		}
 		return $tickets_available_for_purchase;
@@ -214,22 +214,22 @@ 
 	 * @param 	  bool   $hide_uncategorized
 	 * @return    string
 	 */
-	public static function event_categories( $EVT_ID = 0, $hide_uncategorized = TRUE ) {
+	public static function event_categories($EVT_ID = 0, $hide_uncategorized = TRUE) {
 		$category_links = array();
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
-			$event_categories = get_the_terms( $event->ID(), 'espresso_event_categories' );
-			if ( $event_categories ) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
+			$event_categories = get_the_terms($event->ID(), 'espresso_event_categories');
+			if ($event_categories) {
 				// loop thru terms and create links
-				foreach ( $event_categories as $term ) {
-					$url = get_term_link( $term, 'espresso_venue_categories' );
-					if ( ! is_wp_error( $url ) && (( $hide_uncategorized && strtolower( $term->name ) != __( 'uncategorized', 'event_espresso' )) || ! $hide_uncategorized )) {
-						$category_links[] = '<a href="' . esc_url( $url ) . '" rel="tag">' . $term->name . '</a>';
+				foreach ($event_categories as $term) {
+					$url = get_term_link($term, 'espresso_venue_categories');
+					if ( ! is_wp_error($url) && (($hide_uncategorized && strtolower($term->name) != __('uncategorized', 'event_espresso')) || ! $hide_uncategorized)) {
+						$category_links[] = '<a href="'.esc_url($url).'" rel="tag">'.$term->name.'</a>';
 					}
 				}
 			}
 		}
-		return implode( ', ', $category_links );
+		return implode(', ', $category_links);
 	}
 
 
@@ -243,10 +243,10 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_event_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_primary_date_obj( $EVT_ID );
-		$format = ! empty( $dt_frmt ) && ! empty( $tm_frmt ) ? $dt_frmt . ' ' . $tm_frmt : $dt_frmt . $tm_frmt;
-		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime( 'DTT_EVT_start', $format ) :  '';
+	public static function the_event_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_primary_date_obj($EVT_ID);
+		$format = ! empty($dt_frmt) && ! empty($tm_frmt) ? $dt_frmt.' '.$tm_frmt : $dt_frmt.$tm_frmt;
+		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime('DTT_EVT_start', $format) : '';
 	}
 
 
@@ -260,10 +260,10 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_event_end_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_last_date_obj( $EVT_ID );
-		$format = ! empty( $dt_frmt ) && ! empty( $tm_frmt ) ? $dt_frmt . ' ' . $tm_frmt : $dt_frmt . $tm_frmt;
-		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime( 'DTT_EVT_end', $format ) : '';
+	public static function the_event_end_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_last_date_obj($EVT_ID);
+		$format = ! empty($dt_frmt) && ! empty($tm_frmt) ? $dt_frmt.' '.$tm_frmt : $dt_frmt.$tm_frmt;
+		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime('DTT_EVT_end', $format) : '';
 	}
 
 
@@ -277,10 +277,10 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_earliest_event_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_earliest_date_obj( $EVT_ID );
-		$format = ! empty( $dt_frmt ) && ! empty( $tm_frmt ) ? $dt_frmt . ' ' . $tm_frmt : $dt_frmt . $tm_frmt;
-		return $datetime instanceof EE_Datetime ?  $datetime->get_i18n_datetime( 'DTT_EVT_start', $format ) : '';
+	public static function the_earliest_event_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_earliest_date_obj($EVT_ID);
+		$format = ! empty($dt_frmt) && ! empty($tm_frmt) ? $dt_frmt.' '.$tm_frmt : $dt_frmt.$tm_frmt;
+		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime('DTT_EVT_start', $format) : '';
 	}
 
 
@@ -294,10 +294,10 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_latest_event_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_last_date_obj( $EVT_ID );
-		$format = ! empty( $dt_frmt ) && ! empty( $tm_frmt ) ? $dt_frmt . ' ' . $tm_frmt : $dt_frmt . $tm_frmt;
-		return $datetime instanceof EE_Datetime ?  $datetime->get_i18n_datetime( 'DTT_EVT_end', $format ) : '';
+	public static function the_latest_event_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_last_date_obj($EVT_ID);
+		$format = ! empty($dt_frmt) && ! empty($tm_frmt) ? $dt_frmt.' '.$tm_frmt : $dt_frmt.$tm_frmt;
+		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime('DTT_EVT_end', $format) : '';
 	}
 
 
@@ -309,13 +309,13 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_date_as_calendar_page( $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_primary_date_obj( $EVT_ID );
-		if ( $datetime instanceof EE_Datetime ) {
+	public static function event_date_as_calendar_page($EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_primary_date_obj($EVT_ID);
+		if ($datetime instanceof EE_Datetime) {
 	?>
 		<div class="event-date-calendar-page-dv">
-			<div class="event-date-calendar-page-month-dv"><?php echo $datetime->get_i18n_datetime( 'DTT_EVT_start', 'M' );?></div>
-			<div class="event-date-calendar-page-day-dv"><?php echo $datetime->start_date( 'd' );?></div>
+			<div class="event-date-calendar-page-month-dv"><?php echo $datetime->get_i18n_datetime('DTT_EVT_start', 'M'); ?></div>
+			<div class="event-date-calendar-page-day-dv"><?php echo $datetime->start_date('d'); ?></div>
 		</div>
 	<?php
 		}
@@ -330,17 +330,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_primary_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_primary_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_order' => 'ASC' )
+					'order_by' => array('DTT_order' => 'ASC')
 				)
 			);
-			return reset( $datetimes );
+			return reset($datetimes);
 		} else {
 			 return FALSE;
 		}
@@ -355,17 +355,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_last_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_last_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_order' => 'DESC' )
+					'order_by' => array('DTT_order' => 'DESC')
 				)
 			);
-			return end( $datetimes );
+			return end($datetimes);
 		} else {
 			return FALSE;
 		}
@@ -380,17 +380,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_earliest_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_earliest_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_EVT_start' => 'ASC' )
+					'order_by' => array('DTT_EVT_start' => 'ASC')
 				)
 			);
-			return reset( $datetimes );
+			return reset($datetimes);
 		} else {
 			 return FALSE;
 		}
@@ -405,17 +405,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_latest_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_latest_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_EVT_start' => 'DESC' )
+					'order_by' => array('DTT_EVT_start' => 'DESC')
 				)
 			);
-			return end( $datetimes );
+			return end($datetimes);
 		} else {
 			return FALSE;
 		}
@@ -433,17 +433,17 @@ 
 	 * @param null $limit
 	 * @return EE_Datetime[]
 	 */
-	public static function get_all_date_obj( $EVT_ID = 0, $include_expired = null, $include_deleted = false, $limit = NULL ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if($include_expired === null){
-			if($event instanceof EE_Event && $event->is_expired()){
+	public static function get_all_date_obj($EVT_ID = 0, $include_expired = null, $include_deleted = false, $limit = NULL) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($include_expired === null) {
+			if ($event instanceof EE_Event && $event->is_expired()) {
 				$include_expired = true;
-			}else{
+			} else {
 				$include_expired = false;
 			}
 		}
 
-		if ( $event instanceof EE_Event ) {
+		if ($event instanceof EE_Event) {
 			return $event->datetimes_ordered($include_expired, $include_deleted, $limit);
 		} else {
 			 return array();
@@ -459,11 +459,11 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_link_url( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
-			$url = $event->external_url() !== NULL && $event->external_url() !== '' ? $event->external_url() : get_permalink( $event->ID() );
-			return preg_match( "~^(?:f|ht)tps?://~i", $url ) ? $url : 'http://' . $url;
+	public static function event_link_url($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
+			$url = $event->external_url() !== NULL && $event->external_url() !== '' ? $event->external_url() : get_permalink($event->ID());
+			return preg_match("~^(?:f|ht)tps?://~i", $url) ? $url : 'http://'.$url;
 		}
 		return NULL;
 	}
@@ -477,10 +477,10 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_phone( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
-			return EEH_Schema::telephone( $event->phone() );
+	public static function event_phone($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
+			return EEH_Schema::telephone($event->phone());
 		}
 		return NULL;
 	}
@@ -497,23 +497,23 @@ 
 	 * @param string $after
 	 * @return    string
 	 */
-	public static function edit_event_link( $EVT_ID = 0, $link = '', $before = '', $after = '' ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function edit_event_link($EVT_ID = 0, $link = '', $before = '', $after = '') {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			// can the user edit this post ?
-			if ( current_user_can( 'edit_post', $event->ID() )) {
+			if (current_user_can('edit_post', $event->ID())) {
 				// set link text
-				$link = ! empty( $link ) ? $link : __('edit this event');
+				$link = ! empty($link) ? $link : __('edit this event');
 				// generate nonce
-				$nonce = wp_create_nonce( 'edit_nonce' );
+				$nonce = wp_create_nonce('edit_nonce');
 				// generate url to event editor for this event
-				$url = add_query_arg( array( 'page' => 'espresso_events', 'action' => 'edit', 'post' => $event->ID(), 'edit_nonce' => $nonce ), admin_url() );
+				$url = add_query_arg(array('page' => 'espresso_events', 'action' => 'edit', 'post' => $event->ID(), 'edit_nonce' => $nonce), admin_url());
 				// get edit CPT text
-				$post_type_obj = get_post_type_object( 'espresso_events' );
+				$post_type_obj = get_post_type_object('espresso_events');
 				// build final link html
-				$link = '<a class="post-edit-link" href="' . $url . '" title="' . esc_attr( $post_type_obj->labels->edit_item ) . '">' . $link . '</a>';
+				$link = '<a class="post-edit-link" href="'.$url.'" title="'.esc_attr($post_type_obj->labels->edit_item).'">'.$link.'</a>';
 				// put it all together
-				return $before . apply_filters( 'edit_post_link', $link, $event->ID() ) . $after;
+				return $before.apply_filters('edit_post_link', $link, $event->ID()).$after;
 			}
 		}
 		return '';

core/helpers/EEH_File.helper.php

Braces +3 added lines, -1 removed lines

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

Doc Comments -2 removed lines

@@ -595,8 +595,6 @@
 	 * converts it into a "remote" filepath (the filepath the currently-in-use 
 	 * $wp_filesystem needs to use access the folder or file).
 	 * See http://wordpress.stackexchange.com/questions/124900/using-wp-filesystem-in-plugins
-	 * @param WP_Filesystem_Base $wp_filesystem we aren't initially sure which one
-	 * is in use, so you need to provide it
 	 * @param string $local_filepath the filepath to the folder/file locally
 	 * @return string the remote filepath (eg the filepath the filesystem method, eg 
 	 * ftp or ssh, will use to access the folder

Spacing +179 added lines, -179 removed lines

@@ -12,8 +12,8 @@ 
  * @ version		 	4.0
  *
  */
-require_once( EE_HELPERS . 'EEH_Base.helper.php' );
-require_once( EE_INTERFACES . 'EEI_Interfaces.php' );
+require_once(EE_HELPERS.'EEH_Base.helper.php');
+require_once(EE_INTERFACES.'EEI_Interfaces.php');
 /**
  *
  * Class EEH_File
@@ -42,30 +42,30 @@ 
 	 * @throws EE_Error
 	 * @return WP_Filesystem_Base
 	 */
-	private static function _get_wp_filesystem( $filepath = null) {
-		if( apply_filters( 
+	private static function _get_wp_filesystem($filepath = null) {
+		if (apply_filters( 
 				'FHEE__EEH_File___get_wp_filesystem__allow_using_filesystem_direct', 
-				$filepath && EEH_File::is_in_uploads_folder( $filepath ), 
-				$filepath ) ) {
-			if( ! EEH_File::$_wp_filesystem_direct instanceof WP_Filesystem_Direct ) {
-				require_once(ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php');
+				$filepath && EEH_File::is_in_uploads_folder($filepath), 
+				$filepath )) {
+			if ( ! EEH_File::$_wp_filesystem_direct instanceof WP_Filesystem_Direct) {
+				require_once(ABSPATH.'wp-admin/includes/class-wp-filesystem-base.php');
 				$method = 'direct';
-				$wp_filesystem_direct_file = apply_filters( 'filesystem_method_file', ABSPATH . 'wp-admin/includes/class-wp-filesystem-' . $method . '.php', $method );
+				$wp_filesystem_direct_file = apply_filters('filesystem_method_file', ABSPATH.'wp-admin/includes/class-wp-filesystem-'.$method.'.php', $method);
 				//check constants defined, just like in wp-admin/includes/file.php's WP_Filesystem()
-				if ( ! defined('FS_CHMOD_DIR') ) {
-					define('FS_CHMOD_DIR', ( fileperms( ABSPATH ) & 0777 | 0755 ) );
+				if ( ! defined('FS_CHMOD_DIR')) {
+					define('FS_CHMOD_DIR', (fileperms(ABSPATH) & 0777 | 0755));
 				}
-				if ( ! defined('FS_CHMOD_FILE') ) {
-					define('FS_CHMOD_FILE', ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 ) );
+				if ( ! defined('FS_CHMOD_FILE')) {
+					define('FS_CHMOD_FILE', (fileperms(ABSPATH.'index.php') & 0777 | 0644));
 				}
-				require_once( $wp_filesystem_direct_file );
-				EEH_File::$_wp_filesystem_direct = new WP_Filesystem_Direct( array() );
+				require_once($wp_filesystem_direct_file);
+				EEH_File::$_wp_filesystem_direct = new WP_Filesystem_Direct(array());
 			}
 			return EEH_File::$_wp_filesystem_direct;
 		}
 		global $wp_filesystem;
 		// no filesystem setup ???
-		if ( ! $wp_filesystem instanceof WP_Filesystem_Base ) {
+		if ( ! $wp_filesystem instanceof WP_Filesystem_Base) {
 			// if some eager beaver's just trying to get in there too early...
 			// let them do it, because we are one of those eager beavers! :P
 			/**
@@ -78,34 +78,34 @@ 
 			 * and there may be troubles if the WP files are owned by a different user
 			 * than the server user. But both of these issues should exist in 4.4 and earlier too
 			 */
-			if ( FALSE && ! did_action( 'wp_loaded' )) {
+			if (FALSE && ! did_action('wp_loaded')) {
 				$msg = __('An attempt to access and/or write to a file on the server could not be completed due to a lack of sufficient credentials.', 'event_espresso');
-				if ( WP_DEBUG ) {
-					$msg .= '<br />' .  __('The WP Filesystem can not be accessed until after the "wp_loaded" hook has run, so it\'s best not to attempt access until the "admin_init" hookpoint.', 'event_espresso');
+				if (WP_DEBUG) {
+					$msg .= '<br />'.__('The WP Filesystem can not be accessed until after the "wp_loaded" hook has run, so it\'s best not to attempt access until the "admin_init" hookpoint.', 'event_espresso');
 				}
-				throw new EE_Error( $msg );
+				throw new EE_Error($msg);
 			} else {
 				// should be loaded if we are past the wp_loaded hook...
-				if ( ! function_exists( 'WP_Filesystem' )) {
-					require_once( ABSPATH . 'wp-admin/includes/file.php' );
-					require_once( ABSPATH . 'wp-admin/includes/template.php' );
+				if ( ! function_exists('WP_Filesystem')) {
+					require_once(ABSPATH.'wp-admin/includes/file.php');
+					require_once(ABSPATH.'wp-admin/includes/template.php');
 				}
 				// turn on output buffering so that we can capture the credentials form
 				ob_start();
-				$credentials = request_filesystem_credentials( '' );
+				$credentials = request_filesystem_credentials('');
 				// store credentials form for the time being
 				EEH_File::$_credentials_form = ob_get_clean();
 				// basically check for direct or previously configured access
-				if ( ! WP_Filesystem( $credentials ) ) {
+				if ( ! WP_Filesystem($credentials)) {
 					// if credentials do NOT exist
-					if ( $credentials === FALSE ) {
-						add_action( 'admin_notices', array( 'EEH_File', 'display_request_filesystem_credentials_form' ), 999 );
-						throw new EE_Error( __('An attempt to access and/or write to a file on the server could not be completed due to a lack of sufficient credentials.', 'event_espresso'));
-					} elseif( is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
-						add_action( 'admin_notices', array( 'EEH_File', 'display_request_filesystem_credentials_form' ), 999 );
+					if ($credentials === FALSE) {
+						add_action('admin_notices', array('EEH_File', 'display_request_filesystem_credentials_form'), 999);
+						throw new EE_Error(__('An attempt to access and/or write to a file on the server could not be completed due to a lack of sufficient credentials.', 'event_espresso'));
+					} elseif (is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
+						add_action('admin_notices', array('EEH_File', 'display_request_filesystem_credentials_form'), 999);
 						throw new EE_Error(
 								sprintf(
-										__( 'WP Filesystem Error: $1%s', 'event_espresso' ),
+										__('WP Filesystem Error: $1%s', 'event_espresso'),
 										$wp_filesystem->errors->get_error_message() ) );
 					}
 				}
@@ -118,8 +118,8 @@ 
 	 * display_request_filesystem_credentials_form
 	 */
 	public static function display_request_filesystem_credentials_form() {
-		if ( ! empty( EEH_File::$_credentials_form )) {
-			echo '<div class="updated espresso-notices-attention"><p>' . EEH_File::$_credentials_form . '</p></div>';
+		if ( ! empty(EEH_File::$_credentials_form)) {
+			echo '<div class="updated espresso-notices-attention"><p>'.EEH_File::$_credentials_form.'</p></div>';
 		}
 	}
 
@@ -137,29 +137,29 @@ 
 	 * @throws EE_Error
 	 * @return bool
 	 */
-	public static function verify_filepath_and_permissions( $full_file_path = '', $file_name = '', $file_ext = '', $type_of_file = '' ) {
+	public static function verify_filepath_and_permissions($full_file_path = '', $file_name = '', $file_ext = '', $type_of_file = '') {
 		// load WP_Filesystem and set file permissions
-		$wp_filesystem = EEH_File::_get_wp_filesystem( $full_file_path );
-		$full_file_path = EEH_File::standardise_directory_separators( $full_file_path );
-		if ( ! $wp_filesystem->is_readable( EEH_File::convert_local_filepath_to_remote_filepath( $full_file_path ) )) {
-			$file_name = ! empty( $type_of_file ) ? $file_name . ' ' . $type_of_file : $file_name;
-			$file_name .= ! empty( $file_ext ) ? ' file' : ' folder';
+		$wp_filesystem = EEH_File::_get_wp_filesystem($full_file_path);
+		$full_file_path = EEH_File::standardise_directory_separators($full_file_path);
+		if ( ! $wp_filesystem->is_readable(EEH_File::convert_local_filepath_to_remote_filepath($full_file_path))) {
+			$file_name = ! empty($type_of_file) ? $file_name.' '.$type_of_file : $file_name;
+			$file_name .= ! empty($file_ext) ? ' file' : ' folder';
 			$msg = sprintf(
-				__( 'The requested %1$s could not be found or is not readable, possibly due to an incorrect filepath, or incorrect file permissions.%2$s', 'event_espresso' ),
+				__('The requested %1$s could not be found or is not readable, possibly due to an incorrect filepath, or incorrect file permissions.%2$s', 'event_espresso'),
 				$file_name,
 				'<br />'
 			);
-			if ( EEH_File::exists( $full_file_path )) {
-				$msg .= EEH_File::_permissions_error_for_unreadable_filepath( $full_file_path, $type_of_file );
+			if (EEH_File::exists($full_file_path)) {
+				$msg .= EEH_File::_permissions_error_for_unreadable_filepath($full_file_path, $type_of_file);
 			} else {
 				// no file permissions means the file was not found
 				$msg .= sprintf(
-					__( 'Please ensure the following path is correct: "%s".', 'event_espresso' ),
+					__('Please ensure the following path is correct: "%s".', 'event_espresso'),
 					$full_file_path
 				);
 			}
-			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-				throw new EE_Error( $msg . '||' . $msg );
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				throw new EE_Error($msg.'||'.$msg);
 			}
 			return FALSE;
 		}
@@ -176,24 +176,24 @@ 
 	 * @param string $type_of_file - general type of file (ie: "module"), this is only used to improve error messages
 	 * @return string
 	 */
-	private static function _permissions_error_for_unreadable_filepath( $full_file_path = '', $type_of_file = '' ){
+	private static function _permissions_error_for_unreadable_filepath($full_file_path = '', $type_of_file = '') {
 		// load WP_Filesystem and set file permissions
-		$wp_filesystem = EEH_File::_get_wp_filesystem( $full_file_path );
+		$wp_filesystem = EEH_File::_get_wp_filesystem($full_file_path);
 		// check file permissions
-		$perms = $wp_filesystem->getchmod( EEH_File::convert_local_filepath_to_remote_filepath( $full_file_path ) );
-		if ( $perms ) {
+		$perms = $wp_filesystem->getchmod(EEH_File::convert_local_filepath_to_remote_filepath($full_file_path));
+		if ($perms) {
 			// file permissions exist, but way be set incorrectly
-			$type_of_file = ! empty( $type_of_file ) ? $type_of_file . ' ' : '';
-			$type_of_file .= ! empty( $type_of_file ) ? 'file' : 'folder';
+			$type_of_file = ! empty($type_of_file) ? $type_of_file.' ' : '';
+			$type_of_file .= ! empty($type_of_file) ? 'file' : 'folder';
 			return sprintf(
-				__( 'File permissions for the requested %1$s are currently set at "%2$s". The recommended permissions are 644 for files and 755 for folders.', 'event_espresso' ),
+				__('File permissions for the requested %1$s are currently set at "%2$s". The recommended permissions are 644 for files and 755 for folders.', 'event_espresso'),
 				$type_of_file,
 				$perms
 			);
 		} else {
 			// file exists but file permissions could not be read ?!?!
 			return sprintf(
-				__( 'Please ensure that the server and/or PHP configuration allows the current process to access the following file: "%s".', 'event_espresso' ),
+				__('Please ensure that the server and/or PHP configuration allows the current process to access the following file: "%s".', 'event_espresso'),
 				$full_file_path
 			);
 		}
@@ -211,35 +211,35 @@ 
 	 * can't write to it
 	 * @return bool false if folder isn't writable; true if it exists and is writeable,
 	 */
-	public static function ensure_folder_exists_and_is_writable( $folder = '' ){
-		if ( empty( $folder )) {
+	public static function ensure_folder_exists_and_is_writable($folder = '') {
+		if (empty($folder)) {
 			return false;
 		}
 		// remove ending DS
-		$folder = EEH_File::standardise_directory_separators( rtrim( $folder, '/\\' ));
-		$parent_folder = EEH_File::get_parent_folder( $folder );
+		$folder = EEH_File::standardise_directory_separators(rtrim($folder, '/\\'));
+		$parent_folder = EEH_File::get_parent_folder($folder);
 		// add DS to folder
-		$folder = EEH_File::end_with_directory_separator( $folder );
-		$wp_filesystem = EEH_File::_get_wp_filesystem( $folder );
-		if ( ! $wp_filesystem->is_dir( EEH_File::convert_local_filepath_to_remote_filepath( $folder ) ) ) {
+		$folder = EEH_File::end_with_directory_separator($folder);
+		$wp_filesystem = EEH_File::_get_wp_filesystem($folder);
+		if ( ! $wp_filesystem->is_dir(EEH_File::convert_local_filepath_to_remote_filepath($folder))) {
 			//ok so it doesn't exist. Does its parent? Can we write to it?
-			if(	! EEH_File::ensure_folder_exists_and_is_writable( $parent_folder ) ) {
+			if ( ! EEH_File::ensure_folder_exists_and_is_writable($parent_folder)) {
 				return false;
 			}
-			if ( ! EEH_File::verify_is_writable( $parent_folder, 'folder' )) {
+			if ( ! EEH_File::verify_is_writable($parent_folder, 'folder')) {
 				return false;
 			} else {
-				if ( ! $wp_filesystem->mkdir( EEH_File::convert_local_filepath_to_remote_filepath(  $folder ) ) ) {
-					if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-						$msg = sprintf( __( '"%s" could not be created.', 'event_espresso' ), $folder );
-						$msg .= EEH_File::_permissions_error_for_unreadable_filepath( $folder );
-						throw new EE_Error( $msg );
+				if ( ! $wp_filesystem->mkdir(EEH_File::convert_local_filepath_to_remote_filepath($folder))) {
+					if (defined('WP_DEBUG') && WP_DEBUG) {
+						$msg = sprintf(__('"%s" could not be created.', 'event_espresso'), $folder);
+						$msg .= EEH_File::_permissions_error_for_unreadable_filepath($folder);
+						throw new EE_Error($msg);
 					}
 					return false;
 				}
-				EEH_File::add_index_file( $folder );
+				EEH_File::add_index_file($folder);
 			}
-		} elseif ( ! EEH_File::verify_is_writable( $folder, 'folder' )) {
+		} elseif ( ! EEH_File::verify_is_writable($folder, 'folder')) {
 			return false;
 		}
 		return true;
@@ -254,15 +254,15 @@ 
 	 * @throws EE_Error
 	 * @return bool
 	 */
-	public static function verify_is_writable( $full_path = '', $file_or_folder = 'folder' ){
+	public static function verify_is_writable($full_path = '', $file_or_folder = 'folder') {
 		// load WP_Filesystem and set file permissions
-		$wp_filesystem = EEH_File::_get_wp_filesystem( $full_path );
-		$full_path = EEH_File::standardise_directory_separators( $full_path );
-		if ( ! $wp_filesystem->is_writable( EEH_File::convert_local_filepath_to_remote_filepath( $full_path ) ) ) {
-			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-				$msg = sprintf( __( 'The "%1$s" %2$s is not writable.', 'event_espresso' ), $full_path, $file_or_folder );
-				$msg .= EEH_File::_permissions_error_for_unreadable_filepath( $full_path );
-				throw new EE_Error( $msg );
+		$wp_filesystem = EEH_File::_get_wp_filesystem($full_path);
+		$full_path = EEH_File::standardise_directory_separators($full_path);
+		if ( ! $wp_filesystem->is_writable(EEH_File::convert_local_filepath_to_remote_filepath($full_path))) {
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				$msg = sprintf(__('The "%1$s" %2$s is not writable.', 'event_espresso'), $full_path, $file_or_folder);
+				$msg .= EEH_File::_permissions_error_for_unreadable_filepath($full_path);
+				throw new EE_Error($msg);
 			}
 			return FALSE;
 		}
@@ -279,25 +279,25 @@ 
 	 * @throws EE_Error
 	 * @return bool
 	 */
-	public static function ensure_file_exists_and_is_writable( $full_file_path = '' ) {
+	public static function ensure_file_exists_and_is_writable($full_file_path = '') {
 		// load WP_Filesystem and set file permissions
-		$wp_filesystem = EEH_File::_get_wp_filesystem( $full_file_path );
-		$full_file_path = EEH_File::standardise_directory_separators( $full_file_path );
-		$parent_folder = EEH_File::get_parent_folder( $full_file_path );
-		if ( ! EEH_File::exists( $full_file_path )) {
-			if( ! EEH_File::ensure_folder_exists_and_is_writable( $parent_folder ) ) {
+		$wp_filesystem = EEH_File::_get_wp_filesystem($full_file_path);
+		$full_file_path = EEH_File::standardise_directory_separators($full_file_path);
+		$parent_folder = EEH_File::get_parent_folder($full_file_path);
+		if ( ! EEH_File::exists($full_file_path)) {
+			if ( ! EEH_File::ensure_folder_exists_and_is_writable($parent_folder)) {
 				return false;
 			}
-			if ( ! $wp_filesystem->touch( EEH_File::convert_local_filepath_to_remote_filepath( $full_file_path ) ) ) {
-				if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-					$msg = sprintf( __( 'The "%s" file could not be created.', 'event_espresso' ), $full_file_path );
-					$msg .= EEH_File::_permissions_error_for_unreadable_filepath( $full_file_path );
-					throw new EE_Error( $msg );
+			if ( ! $wp_filesystem->touch(EEH_File::convert_local_filepath_to_remote_filepath($full_file_path))) {
+				if (defined('WP_DEBUG') && WP_DEBUG) {
+					$msg = sprintf(__('The "%s" file could not be created.', 'event_espresso'), $full_file_path);
+					$msg .= EEH_File::_permissions_error_for_unreadable_filepath($full_file_path);
+					throw new EE_Error($msg);
 				}
 				return false;
 			}
 		}
-		if ( ! EEH_File::verify_is_writable( $full_file_path, 'file' )) {
+		if ( ! EEH_File::verify_is_writable($full_file_path, 'file')) {
 			return false;
 		}
 		return true;
@@ -309,15 +309,15 @@ 
 	 * @param string $file_or_folder_path
 	 * @return string parent folder, ENDING with a directory separator
 	 */
-	public static function get_parent_folder( $file_or_folder_path ) {
+	public static function get_parent_folder($file_or_folder_path) {
 		//find the last DS, ignoring a DS on the very end
 		//eg if given "/var/something/somewhere/", we want to get "somewhere"'s
 		//parent folder, "/var/something/"
-		$ds = strrpos( $file_or_folder_path, DS, -2 );
-		return substr( $file_or_folder_path, 0, $ds + 1 );
+		$ds = strrpos($file_or_folder_path, DS, -2);
+		return substr($file_or_folder_path, 0, $ds + 1);
 	}
 	
-	public static function ensure_folder_exists_recursively( $folder ) {
+	public static function ensure_folder_exists_recursively($folder) {
 		
 	}
 
@@ -328,12 +328,12 @@ 
 	 * @param string $full_file_path
 	 * @return string
 	 */
-	public static function get_file_contents( $full_file_path = '' ){
-		$full_file_path = EEH_File::standardise_directory_separators( $full_file_path );
-		if ( EEH_File::verify_filepath_and_permissions( $full_file_path, EEH_File::get_filename_from_filepath( $full_file_path ) , EEH_File::get_file_extension( $full_file_path ))) {
+	public static function get_file_contents($full_file_path = '') {
+		$full_file_path = EEH_File::standardise_directory_separators($full_file_path);
+		if (EEH_File::verify_filepath_and_permissions($full_file_path, EEH_File::get_filename_from_filepath($full_file_path), EEH_File::get_file_extension($full_file_path))) {
 			// load WP_Filesystem and set file permissions
-			$wp_filesystem = EEH_File::_get_wp_filesystem( $full_file_path );
-			return $wp_filesystem->get_contents(EEH_File::convert_local_filepath_to_remote_filepath( $full_file_path ) );
+			$wp_filesystem = EEH_File::_get_wp_filesystem($full_file_path);
+			return $wp_filesystem->get_contents(EEH_File::convert_local_filepath_to_remote_filepath($full_file_path));
 		}
 		return '';
 	}
@@ -348,26 +348,26 @@ 
 	 * @throws EE_Error
 	 * @return bool
 	 */
-	public static function write_to_file( $full_file_path = '', $file_contents = '', $file_type = '' ){
-		$full_file_path = EEH_File::standardise_directory_separators( $full_file_path );
-		$file_type = ! empty( $file_type ) ? rtrim( $file_type, ' ' ) . ' ' : '';
-		$folder = EEH_File::remove_filename_from_filepath( $full_file_path );
-		if ( ! EEH_File::verify_is_writable( $folder, 'folder' )) {
-			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-				$msg = sprintf( __( 'The %1$sfile located at "%2$s" is not writable.', 'event_espresso' ), $file_type, $full_file_path );
-				$msg .= EEH_File::_permissions_error_for_unreadable_filepath( $full_file_path );
-				throw new EE_Error( $msg );
+	public static function write_to_file($full_file_path = '', $file_contents = '', $file_type = '') {
+		$full_file_path = EEH_File::standardise_directory_separators($full_file_path);
+		$file_type = ! empty($file_type) ? rtrim($file_type, ' ').' ' : '';
+		$folder = EEH_File::remove_filename_from_filepath($full_file_path);
+		if ( ! EEH_File::verify_is_writable($folder, 'folder')) {
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				$msg = sprintf(__('The %1$sfile located at "%2$s" is not writable.', 'event_espresso'), $file_type, $full_file_path);
+				$msg .= EEH_File::_permissions_error_for_unreadable_filepath($full_file_path);
+				throw new EE_Error($msg);
 			}
 			return FALSE;
 		}
 		// load WP_Filesystem and set file permissions
-		$wp_filesystem = EEH_File::_get_wp_filesystem( $full_file_path );
+		$wp_filesystem = EEH_File::_get_wp_filesystem($full_file_path);
 		// write the file
-		if ( ! $wp_filesystem->put_contents(EEH_File::convert_local_filepath_to_remote_filepath( $full_file_path ), $file_contents )) {
-			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-				$msg = sprintf( __( 'The %1$sfile located at "%2$s" could not be written to.', 'event_espresso' ), $file_type, $full_file_path );
-				$msg .= EEH_File::_permissions_error_for_unreadable_filepath( $full_file_path, 'f' );
-				throw new EE_Error( $msg );
+		if ( ! $wp_filesystem->put_contents(EEH_File::convert_local_filepath_to_remote_filepath($full_file_path), $file_contents)) {
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				$msg = sprintf(__('The %1$sfile located at "%2$s" could not be written to.', 'event_espresso'), $file_type, $full_file_path);
+				$msg .= EEH_File::_permissions_error_for_unreadable_filepath($full_file_path, 'f');
+				throw new EE_Error($msg);
 			}
 			return FALSE;
 		}
@@ -382,9 +382,9 @@ 
 	 * @param boolean|string $type 'd' for directory, 'f' for file
 	 * @return boolean
 	 */
-	public static function delete( $filepath, $recursive = false, $type = false ) {
+	public static function delete($filepath, $recursive = false, $type = false) {
 		$wp_filesystem = EEH_File::_get_wp_filesystem();
-		return $wp_filesystem->delete( $filepath, $recursive, $type ) ? TRUE : FALSE;
+		return $wp_filesystem->delete($filepath, $recursive, $type) ? TRUE : FALSE;
 	}
 
 
@@ -396,9 +396,9 @@ 
 	 * @param string $full_file_path
 	 * @return bool
 	 */
-	public static function exists( $full_file_path = '' ) {
-		$wp_filesystem = EEH_File::_get_wp_filesystem( $full_file_path );
-		return $wp_filesystem->exists( EEH_File::convert_local_filepath_to_remote_filepath( $full_file_path ) ) ? TRUE : FALSE;
+	public static function exists($full_file_path = '') {
+		$wp_filesystem = EEH_File::_get_wp_filesystem($full_file_path);
+		return $wp_filesystem->exists(EEH_File::convert_local_filepath_to_remote_filepath($full_file_path)) ? TRUE : FALSE;
 	}
 
 
@@ -410,9 +410,9 @@ 
 	 * @param string $full_file_path
 	 * @return bool
 	 */
-	public static function is_readable( $full_file_path = '' ) {
-		$wp_filesystem = EEH_File::_get_wp_filesystem( $full_file_path );
-		if( $wp_filesystem->is_readable( EEH_File::convert_local_filepath_to_remote_filepath(  $full_file_path ) ) ) {
+	public static function is_readable($full_file_path = '') {
+		$wp_filesystem = EEH_File::_get_wp_filesystem($full_file_path);
+		if ($wp_filesystem->is_readable(EEH_File::convert_local_filepath_to_remote_filepath($full_file_path))) {
 			return true;
 		} else {
 			return false;
@@ -428,8 +428,8 @@ 
 	 * @param string $full_file_path
 	 * @return string
 	 */
-	public static function remove_filename_from_filepath( $full_file_path = '' ) {
-		return pathinfo( $full_file_path, PATHINFO_DIRNAME );
+	public static function remove_filename_from_filepath($full_file_path = '') {
+		return pathinfo($full_file_path, PATHINFO_DIRNAME);
 	}
 
 
@@ -439,8 +439,8 @@ 
 	 * @param string $full_file_path
 	 * @return string
 	 */
-	public static function get_filename_from_filepath( $full_file_path = '' ) {
-		return pathinfo( $full_file_path, PATHINFO_BASENAME );
+	public static function get_filename_from_filepath($full_file_path = '') {
+		return pathinfo($full_file_path, PATHINFO_BASENAME);
 	}
 
 
@@ -450,8 +450,8 @@ 
 	 * @param string $full_file_path
 	 * @return string
 	 */
-	public static function get_file_extension( $full_file_path = '' ) {
-		return pathinfo( $full_file_path, PATHINFO_EXTENSION );
+	public static function get_file_extension($full_file_path = '') {
+		return pathinfo($full_file_path, PATHINFO_EXTENSION);
 	}
 
 
@@ -461,10 +461,10 @@ 
 	 * @param string $folder
 	 * @return bool
 	 */
-	public static function add_htaccess_deny_from_all( $folder = '' ) {
-		$folder = EEH_File::standardise_and_end_with_directory_separator( $folder );
-		if ( ! EEH_File::exists( $folder . '.htaccess' ) ) {
-			if ( ! EEH_File::write_to_file( $folder . '.htaccess', 'deny from all', '.htaccess' )) {
+	public static function add_htaccess_deny_from_all($folder = '') {
+		$folder = EEH_File::standardise_and_end_with_directory_separator($folder);
+		if ( ! EEH_File::exists($folder.'.htaccess')) {
+			if ( ! EEH_File::write_to_file($folder.'.htaccess', 'deny from all', '.htaccess')) {
 				return FALSE;
 			}
 		}
@@ -477,10 +477,10 @@ 
 	 * @param string $folder
 	 * @return boolean
 	 */
-	public static function add_index_file( $folder ) {
-		$folder = EEH_File::standardise_and_end_with_directory_separator( $folder );
-		if ( ! EEH_File::exists( $folder . 'index.php' ) ) {
-			if ( ! EEH_File::write_to_file( $folder . 'index.php', 'You are not permitted to read from this folder', '.php' )) {
+	public static function add_index_file($folder) {
+		$folder = EEH_File::standardise_and_end_with_directory_separator($folder);
+		if ( ! EEH_File::exists($folder.'index.php')) {
+			if ( ! EEH_File::write_to_file($folder.'index.php', 'You are not permitted to read from this folder', '.php')) {
 				return false;
 			}
 		}
@@ -495,11 +495,11 @@ 
 	 * @param string $file_path
 	 * @return string
 	 */
-	public static function get_classname_from_filepath_with_standard_filename( $file_path ){
+	public static function get_classname_from_filepath_with_standard_filename($file_path) {
 		//extract file from path
-		$filename = basename( $file_path );
+		$filename = basename($file_path);
 		//now remove the first period and everything after
-		$pos_of_first_period = strpos( $filename,'.' );
+		$pos_of_first_period = strpos($filename, '.');
 		return substr($filename, 0, $pos_of_first_period);
 	}
 
@@ -511,8 +511,8 @@ 
 	 * @param string $file_path
 	 * @return string
 	 */
-	public static function standardise_directory_separators( $file_path ){
-		return str_replace( array( '\\', '/' ), DS, $file_path );
+	public static function standardise_directory_separators($file_path) {
+		return str_replace(array('\\', '/'), DS, $file_path);
 	}
 
 
@@ -523,8 +523,8 @@ 
 	 * @param string $file_path
 	 * @return string
 	 */
-	public static function end_with_directory_separator( $file_path ){
-		return rtrim( $file_path, '/\\' ) . DS;
+	public static function end_with_directory_separator($file_path) {
+		return rtrim($file_path, '/\\').DS;
 	}
 
 
@@ -534,8 +534,8 @@ 
 	 * @param $file_path
 	 * @return string
 	 */
-	public static function standardise_and_end_with_directory_separator( $file_path ){
-		return self::end_with_directory_separator( self::standardise_directory_separators( $file_path ));
+	public static function standardise_and_end_with_directory_separator($file_path) {
+		return self::end_with_directory_separator(self::standardise_directory_separators($file_path));
 	}
 
 
@@ -552,21 +552,21 @@ 
 	 *		if $index_numerically == FALSE (Default) keys are what the class names SHOULD be;
 	 *		 and values are their filepaths
 	 */
-	public static function get_contents_of_folders( $folder_paths = array(), $index_numerically = FALSE ){
+	public static function get_contents_of_folders($folder_paths = array(), $index_numerically = FALSE) {
 		$class_to_folder_path = array();
-		foreach( $folder_paths as $folder_path ){
-			$folder_path = self::standardise_and_end_with_directory_separator( $folder_path );
+		foreach ($folder_paths as $folder_path) {
+			$folder_path = self::standardise_and_end_with_directory_separator($folder_path);
 			// load WP_Filesystem and set file permissions
-			$files_in_folder = glob( $folder_path . '*' );
+			$files_in_folder = glob($folder_path.'*');
 			$class_to_folder_path = array();
-			if ( $files_in_folder ) {
-				foreach( $files_in_folder as $file_path ){
+			if ($files_in_folder) {
+				foreach ($files_in_folder as $file_path) {
 					//only add files, not folders
-					if ( ! is_dir( $file_path )) {
-						if ( $index_numerically ) {
+					if ( ! is_dir($file_path)) {
+						if ($index_numerically) {
 							$class_to_folder_path[] = $file_path;
 						} else {
-							$classname = self::get_classname_from_filepath_with_standard_filename( $file_path );
+							$classname = self::get_classname_from_filepath_with_standard_filename($file_path);
 							$class_to_folder_path[$classname] = $file_path;
 						}
 					}
@@ -586,39 +586,39 @@ 
 	 * @return boolean success
 	 * @throws EE_Error
 	 */
-	public static function copy( $source_file, $destination_file, $overwrite = FALSE ){
-		$full_source_path = EEH_File::standardise_directory_separators( $source_file );
-		if( ! EEH_File::exists( $full_source_path ) ){
-			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-				$msg = sprintf( __( 'The file located at "%2$s" is not readable or doesn\'t exist.', 'event_espresso' ), $full_source_path );
-				$msg .= EEH_File::_permissions_error_for_unreadable_filepath( $full_source_path );
-				throw new EE_Error( $msg );
+	public static function copy($source_file, $destination_file, $overwrite = FALSE) {
+		$full_source_path = EEH_File::standardise_directory_separators($source_file);
+		if ( ! EEH_File::exists($full_source_path)) {
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				$msg = sprintf(__('The file located at "%2$s" is not readable or doesn\'t exist.', 'event_espresso'), $full_source_path);
+				$msg .= EEH_File::_permissions_error_for_unreadable_filepath($full_source_path);
+				throw new EE_Error($msg);
 			}
 			return FALSE;
 		}
 
-		$full_dest_path = EEH_File::standardise_directory_separators( $destination_file );
-		$folder = EEH_File::remove_filename_from_filepath( $full_dest_path );
-		if ( ! EEH_File::verify_is_writable( $folder, 'folder' )) {
-			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-				$msg = sprintf( __( 'The file located at "%2$s" is not writable.', 'event_espresso' ), $full_dest_path );
-				$msg .= EEH_File::_permissions_error_for_unreadable_filepath( $full_dest_path );
-				throw new EE_Error( $msg );
+		$full_dest_path = EEH_File::standardise_directory_separators($destination_file);
+		$folder = EEH_File::remove_filename_from_filepath($full_dest_path);
+		if ( ! EEH_File::verify_is_writable($folder, 'folder')) {
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				$msg = sprintf(__('The file located at "%2$s" is not writable.', 'event_espresso'), $full_dest_path);
+				$msg .= EEH_File::_permissions_error_for_unreadable_filepath($full_dest_path);
+				throw new EE_Error($msg);
 			}
 			return FALSE;
 		}
 
 		// load WP_Filesystem and set file permissions
-		$wp_filesystem = EEH_File::_get_wp_filesystem( $destination_file );
+		$wp_filesystem = EEH_File::_get_wp_filesystem($destination_file);
 		// write the file
 		if ( ! $wp_filesystem->copy( 
-						EEH_File::convert_local_filepath_to_remote_filepath( $full_source_path ), 
-						EEH_File::convert_local_filepath_to_remote_filepath( $full_dest_path ), 
+						EEH_File::convert_local_filepath_to_remote_filepath($full_source_path), 
+						EEH_File::convert_local_filepath_to_remote_filepath($full_dest_path), 
 						$overwrite )) {
-			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-				$msg = sprintf( __( 'Attempted writing to file %1$s, but could not, probably because of permissions issues', 'event_espresso' ), $full_source_path );
-				$msg .= EEH_File::_permissions_error_for_unreadable_filepath( $full_source_path, 'f' );
-				throw new EE_Error( $msg );
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				$msg = sprintf(__('Attempted writing to file %1$s, but could not, probably because of permissions issues', 'event_espresso'), $full_source_path);
+				$msg .= EEH_File::_permissions_error_for_unreadable_filepath($full_source_path, 'f');
+				throw new EE_Error($msg);
 			}
 			return FALSE;
 		}
@@ -630,9 +630,9 @@ 
 	 * @param string $filepath
 	 * @return boolean
 	 */
-	public static function is_in_uploads_folder( $filepath ) {
+	public static function is_in_uploads_folder($filepath) {
 		$uploads = wp_upload_dir();
-		return strpos( $filepath, $uploads[ 'basedir' ] ) === 0 ? true : false;
+		return strpos($filepath, $uploads['basedir']) === 0 ? true : false;
 	}
 	
 	/**
@@ -646,9 +646,9 @@ 
 	 * @return string the remote filepath (eg the filepath the filesystem method, eg 
 	 * ftp or ssh, will use to access the folder
 	 */
-	public static function convert_local_filepath_to_remote_filepath( $local_filepath ) {
-		$wp_filesystem = EEH_File::_get_wp_filesystem( $local_filepath );
-		return str_replace( WP_CONTENT_DIR . DS, $wp_filesystem->wp_content_dir(), $local_filepath );
+	public static function convert_local_filepath_to_remote_filepath($local_filepath) {
+		$wp_filesystem = EEH_File::_get_wp_filesystem($local_filepath);
+		return str_replace(WP_CONTENT_DIR.DS, $wp_filesystem->wp_content_dir(), $local_filepath);
 	}
 }
 // End of file EEH_File.helper.php

core/helpers/EEH_Line_Item.helper.php

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 		//so in case teh IPN is arriving later, let's try to process an IPN!
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
 			return $this->handle_ipn($_POST, $transaction );
-		}else{
+		} else{
 			return parent::finalize_payment_for( $transaction );
 		}
 	}

Doc Comments +3 added lines, -2 removed lines

@@ -610,7 +610,7 @@ 
 	 * Deletes ALL children of the passed line item
 	 *
 	 * @param EE_Line_Item $parent_line_item
-	 * @return bool
+	 * @return integer
 	 */
 	public static function delete_all_child_items( EE_Line_Item $parent_line_item ) {
 		$deleted = 0;
@@ -848,6 +848,7 @@ 
 	 * @param \EE_Line_Item $parent_line_item - the line item to find descendants of
 	 * @param string $line_item_type one of the EEM_Line_Item constants
 	 * @param string | NULL $obj_type object model class name (minus prefix) or NULL to ignore object type when searching
+	 * @param string $obj_type
 	 * @return EE_Line_Item[]
 	 */
 	protected static function _get_descendants_by_type_and_object_type( EE_Line_Item $parent_line_item, $line_item_type, $obj_type = NULL ) {
@@ -873,7 +874,7 @@ 
 	 * @uses  EEH_Line_Item::_get_descendants_by_type_and_object_type()
 	 * @param \EE_Line_Item $parent_line_item - the line item to find descendants of
 	 * @param string $OBJ_type object type (like Event)
-	 * @param array $OBJ_IDs array of OBJ_IDs
+	 * @param string[] $OBJ_IDs array of OBJ_IDs
 	 * @return EE_Line_Item[]
 	 */
 	public static function get_line_items_by_object_type_and_IDs( EE_Line_Item $parent_line_item, $OBJ_type = '', $OBJ_IDs = array() ) {

Indentation +33 added lines, -33 removed lines

@@ -551,15 +551,15 @@ 
 	}
 
 	/**
-	  * Given the grand total line item and a ticket, finds the event sub-total
-	  * line item the ticket's purchase should be added onto
-	  *
-	  * @access public
-	  * @param EE_Line_Item $grand_total the grand total line item
-	  * @param EE_Ticket $ticket
-	  * @throws \EE_Error
-	  * @return EE_Line_Item
-	  */
+	 * Given the grand total line item and a ticket, finds the event sub-total
+	 * line item the ticket's purchase should be added onto
+	 *
+	 * @access public
+	 * @param EE_Line_Item $grand_total the grand total line item
+	 * @param EE_Ticket $ticket
+	 * @throws \EE_Error
+	 * @return EE_Line_Item
+	 */
 	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 ) {
@@ -807,22 +807,22 @@ 
 		$add_to_existing_line_item = false
 	) {
 		$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 );
-	            EEM_Line_Item::instance()->delete(
-		            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 );
-            } else {
-                //no existing tax item. Create it
+			$taxable_total = $total_line_item->taxable_total();
+
+			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() ) )
+				);
+			} 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 );
+			} else {
+				//no existing tax item. Create it
 				$new_tax = EE_Line_Item::new_instance( array(
 					'TXN_ID'      => $total_line_item->TXN_ID(),
 					'LIN_name'    => $name ? $name : __( 'Tax', 'event_espresso' ),
@@ -835,16 +835,16 @@ 
 				) );
 			}
 
-            $new_tax = apply_filters(
+			$new_tax = apply_filters(
 				'FHEE__EEH_Line_Item__set_total_tax_to__new_tax_subtotal',
 				$new_tax,
 				$total_line_item
-            );
-            $new_tax->save();
-            $tax_subtotal->set_total( $new_tax->total() );
-            $tax_subtotal->save();
-            $total_line_item->recalculate_total_including_taxes();
-            return $new_tax;
+			);
+			$new_tax->save();
+			$tax_subtotal->set_total( $new_tax->total() );
+			$tax_subtotal->save();
+			$total_line_item->recalculate_total_including_taxes();
+			return $new_tax;
 	}
 
 
@@ -990,7 +990,7 @@ 
 			if ( $child_line_item instanceof EE_Line_Item ) {
 				if (
 					$child_line_item->type() === $line_item_type
-				    && (
+					&& (
 						$child_line_item->OBJ_type() === $obj_type || $obj_type === null
 					)
 				) {

Spacing +294 added lines, -294 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
@@ -42,8 +42,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,
@@ -51,7 +51,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,
@@ -61,7 +61,7 @@ 
 			$line_item,
 			$parent_line_item
 		);
-		return self::add_item( $parent_line_item, $line_item );
+		return self::add_item($parent_line_item, $line_item);
 	}
 
 
@@ -83,7 +83,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,
@@ -91,7 +91,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()
 		));
@@ -99,7 +99,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);
 	}
 
 
@@ -120,15 +120,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;
@@ -144,11 +144,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()
@@ -158,8 +158,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;
@@ -176,16 +176,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);
 			}
 		}
 	}
@@ -201,17 +201,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);
 			}
 		}
 	}
@@ -226,15 +226,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);
 			}
 		}
 	}
@@ -249,44 +249,44 @@ 
 	 * @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,
@@ -296,18 +296,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;
 	}
@@ -327,11 +327,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();
@@ -347,11 +347,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);
 	}
 
 
@@ -363,9 +363,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);
 	}
 
 
@@ -378,12 +378,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);
 		}
 	}
 
@@ -398,8 +398,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,
@@ -409,9 +409,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;
 	}
 
@@ -425,19 +425,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;
 	}
 
@@ -452,21 +452,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;
 	}
 
@@ -481,11 +481,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
@@ -494,8 +494,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;
 	}
 
@@ -508,8 +508,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');
 	}
 
 	/**
@@ -517,8 +517,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');
 	}
 
 	/**
@@ -526,7 +526,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() : '';
 	}
 
@@ -540,27 +540,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()
 				)
@@ -579,31 +579,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;
 	}
@@ -624,13 +624,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);
 	}
 
 
@@ -643,19 +643,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(),
@@ -673,7 +673,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);
 				}
 			}
 		}
@@ -690,10 +690,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();
 	}
@@ -707,16 +707,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++;
 			}
@@ -738,9 +738,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',
 				__(
@@ -750,20 +750,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 {
@@ -796,33 +796,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(
@@ -831,7 +831,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;
@@ -853,14 +853,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);
 		}
 	}
 
@@ -873,8 +873,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');
 	}
 
 
@@ -887,7 +887,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,
@@ -904,8 +904,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');
 	}
 
 
@@ -918,8 +918,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);
 	}
 
 
@@ -930,8 +930,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);
 	}
 
 
@@ -942,8 +942,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);
 	}
 
 
@@ -956,8 +956,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);
 	}
 
 
@@ -976,8 +976,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
 				    && (
@@ -1017,7 +1017,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);
 	}
 
 
@@ -1036,12 +1036,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 (
-					is_array( $OBJ_IDs )
+					is_array($OBJ_IDs)
 					&& $child_line_item->OBJ_type() === $OBJ_type
-					&& in_array( $child_line_item->OBJ_ID(), $OBJ_IDs )
+					&& in_array($child_line_item->OBJ_ID(), $OBJ_IDs)
 				) {
 					$objects[] = $child_line_item;
 				} else {
@@ -1071,8 +1071,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);
 	}
 
 
@@ -1086,8 +1086,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);
 	}
 
 
@@ -1101,15 +1101,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;
 			}
 		}
@@ -1126,22 +1126,22 @@ 
 	 * @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 "\n<br />";
-		for( $i = 0; $i < $indentation; $i++ ){
+		for ($i = 0; $i < $indentation; $i++) {
 			echo " - ";
 		}
-		if( $line_item->is_percent() ) {
-			$breakdown = $line_item->percent() . '%';
+		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() . "( " . $line_item->ID() . " ) : " . $line_item->type() . " $" . $line_item->total() . "(" . $breakdown . ")";
-		if( $line_item->is_taxable() ){
+		echo $line_item->name()."( ".$line_item->ID()." ) : ".$line_item->type()." $".$line_item->total()."(".$breakdown.")";
+		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);
 			}
 		}
@@ -1182,97 +1182,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];
 							}
 						}
 					}
@@ -1290,16 +1290,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(
 			__(
@@ -1308,10 +1308,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;
 	}
@@ -1327,15 +1327,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;
@@ -1352,24 +1352,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);
 	}
 
 
@@ -1382,19 +1382,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++;
@@ -1424,8 +1424,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
 		) {
@@ -1433,8 +1433,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);
 	}
 
 
@@ -1446,9 +1446,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);
 	}
 
 
@@ -1459,9 +1459,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);
 	}
 
 
@@ -1473,9 +1473,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);
 	}
 
 
@@ -1487,9 +1487,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);
 	}
 
 
@@ -1501,9 +1501,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/helpers/EEH_Parse_Shortcodes.helper.php

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

Spacing +37 added lines, -37 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -97,67 +97,67 @@ 
 			'message_type' => $message_type,
 			'message' => $message
 			);
-		$this->_init_data( $template, $data, $valid_shortcodes, $extra_data );
+		$this->_init_data($template, $data, $valid_shortcodes, $extra_data);
 		$this->_template = is_array($template) ? $template['main'] : $template;
 		return $this->_parse_message_template();
 	}
 
 
-	public function parse_attendee_list_template( $template, EE_Registration $registration, $valid_shortcodes, $extra_data = array() ) {
-		$this->_init_data( $template, $registration, $valid_shortcodes, $extra_data );
+	public function parse_attendee_list_template($template, EE_Registration $registration, $valid_shortcodes, $extra_data = array()) {
+		$this->_init_data($template, $registration, $valid_shortcodes, $extra_data);
 		$this->_template = is_array($template) ? $template['attendee_list'] : $template;
 		return $this->_parse_message_template();
 	}
 
-	public function parse_event_list_template( $template, EE_Event $event, $valid_shortcodes, $extra_data = array() ) {
-		$this->_init_data( $template, $event, $valid_shortcodes, $extra_data );
+	public function parse_event_list_template($template, EE_Event $event, $valid_shortcodes, $extra_data = array()) {
+		$this->_init_data($template, $event, $valid_shortcodes, $extra_data);
 		$this->_template = is_array($template) ? $template['event_list'] : $template;
 		return $this->_parse_message_template();
 	}
 
 
-	public function parse_ticket_list_template( $template, EE_Ticket $ticket, $valid_shortcodes, $extra_data = array() ) {
-		$this->_init_data( $template, $ticket, $valid_shortcodes, $extra_data );
+	public function parse_ticket_list_template($template, EE_Ticket $ticket, $valid_shortcodes, $extra_data = array()) {
+		$this->_init_data($template, $ticket, $valid_shortcodes, $extra_data);
 		$this->_template = is_array($template) ? $template['ticket_list'] : $template;
 		return $this->_parse_message_template();
 	}
 
 
 
-	public function parse_line_item_list_template( $template, EE_Line_Item $line_item, $valid_shortcodes, $extra_data = array() ) {
-		$this->_init_data( $template, $line_item, $valid_shortcodes, $extra_data );
-		$this->_template = is_array( $template ) ? $template['ticket_line_item_no_pms'] : $template;
+	public function parse_line_item_list_template($template, EE_Line_Item $line_item, $valid_shortcodes, $extra_data = array()) {
+		$this->_init_data($template, $line_item, $valid_shortcodes, $extra_data);
+		$this->_template = is_array($template) ? $template['ticket_line_item_no_pms'] : $template;
 		return $this->_parse_message_template();
 	}
 
 
-	public function parse_payment_list_template( $template, EE_Payment $payment_item, $valid_shortcodes, $extra_data = array() ) {
-		$this->_init_data( $template, $payment_item, $valid_shortcodes, $extra_data );
-		$this->_template = is_array( $template ) ? $template['payment_list'] : $template;
+	public function parse_payment_list_template($template, EE_Payment $payment_item, $valid_shortcodes, $extra_data = array()) {
+		$this->_init_data($template, $payment_item, $valid_shortcodes, $extra_data);
+		$this->_template = is_array($template) ? $template['payment_list'] : $template;
 		return $this->_parse_message_template();
 	}
 
 
-	public function parse_datetime_list_template( $template, EE_Datetime $datetime, $valid_shortcodes, $extra_data = array() ) {
-		$this->_init_data( $template, $datetime, $valid_shortcodes, $extra_data );
+	public function parse_datetime_list_template($template, EE_Datetime $datetime, $valid_shortcodes, $extra_data = array()) {
+		$this->_init_data($template, $datetime, $valid_shortcodes, $extra_data);
 		$this->_template = is_array($template) ? $template['datetime_list'] : $template;
 		return $this->_parse_message_template();
 	}
 
 
-	public function parse_question_list_template( $template, EE_Answer $answer, $valid_shortcodes, $extra_data = array() ) {
-		$this->_init_data( $template, $answer, $valid_shortcodes, $extra_data );
+	public function parse_question_list_template($template, EE_Answer $answer, $valid_shortcodes, $extra_data = array()) {
+		$this->_init_data($template, $answer, $valid_shortcodes, $extra_data);
 		$this->_template = is_array($template) ? $template['question_list'] : $template;
 		return $this->_parse_message_template();
 	}
 
 
-	private function _init_data( $template, $data, $valid_shortcodes, $extra_data = array() ) {
+	private function _init_data($template, $data, $valid_shortcodes, $extra_data = array()) {
 		$this->_reset_props();
 		$this->_data['template'] = $template;
 		$this->_data['data'] = $data;
 		$this->_data['extra_data'] = $extra_data;
-		$this->_set_shortcodes( $valid_shortcodes );
+		$this->_set_shortcodes($valid_shortcodes);
 	}
 
 
@@ -175,7 +175,7 @@ 
 	 */
 	private function _parse_message_template() {
 		//now let's get a list of shortcodes that are found in the given template
-		preg_match_all( '/(\[.+?\])/', $this->_template, $matches );
+		preg_match_all('/(\[.+?\])/', $this->_template, $matches);
 		$shortcodes = (array) $matches[0]; //this should be an array of shortcodes in the template string.
 
 		$matched_code = array();
@@ -200,30 +200,30 @@ 
 			'[PAYMENT_LIST_*]'
 			);
 
-		$list_type_shortcodes = apply_filters( 'FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes', $list_type_shortcodes );
+		$list_type_shortcodes = apply_filters('FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes', $list_type_shortcodes);
 
 		//now lets go ahead and loop through our parsers for each shortcode and setup the values
-		foreach ( $shortcodes as $shortcode ) {
+		foreach ($shortcodes as $shortcode) {
 
-			foreach ( $this->_shortcode_objs as $sc_obj ) {
-				if ( $sc_obj instanceof EE_Shortcodes ){
+			foreach ($this->_shortcode_objs as $sc_obj) {
+				if ($sc_obj instanceof EE_Shortcodes) {
 					//we need to setup any dynamic shortcodes so that they work with the array_key_exists
-					preg_match_all( '/(\[[A-Za-z0-9\_]+_\*)/', $shortcode, $matches );
-					$sc_to_verify = !empty($matches[0] ) ? $matches[0][0] . ']' : $shortcode;
+					preg_match_all('/(\[[A-Za-z0-9\_]+_\*)/', $shortcode, $matches);
+					$sc_to_verify = ! empty($matches[0]) ? $matches[0][0].']' : $shortcode;
 
-					if ( !array_key_exists( $sc_to_verify, $sc_obj->get_shortcodes() ) ) {
+					if ( ! array_key_exists($sc_to_verify, $sc_obj->get_shortcodes())) {
 						continue; //the given shortcode isn't in this object
 					}
 
 					//if this isn't  a "list" type shortcode then we'll send along the data vanilla instead of in an array.
-					if ( ! in_array( $sc_to_verify, $list_type_shortcodes ) ) {
-						$data_send = !is_object($this->_data) && isset($this->_data['data']) ? $this->_data['data'] : $this->_data;
+					if ( ! in_array($sc_to_verify, $list_type_shortcodes)) {
+						$data_send = ! is_object($this->_data) && isset($this->_data['data']) ? $this->_data['data'] : $this->_data;
 					} else {
 						$data_send = $this->_data;
 					}
 
 
-					$parsed = $sc_obj->parser( $shortcode, $data_send, $this->_data['extra_data'] );
+					$parsed = $sc_obj->parser($shortcode, $data_send, $this->_data['extra_data']);
 
 					$matched_code[] = $shortcode;
 					$sc_values[] = $parsed;
@@ -246,12 +246,12 @@ 
 	 * @param array $valid_shortcodes an array of strings corresponding to EE_Shortcode Library objects
 	 * @return void
 	 */
-	private function _set_shortcodes( $valid_shortcodes ) {
-		foreach ( $valid_shortcodes as $shortcode_ref ) {
-			$ref = ucwords( str_replace('_', ' ', $shortcode_ref ) );
-			$ref = str_replace( ' ', '_', $ref );
-			$classname = 'EE_' . $ref . '_Shortcodes';
-			if ( class_exists( $classname ) ) {
+	private function _set_shortcodes($valid_shortcodes) {
+		foreach ($valid_shortcodes as $shortcode_ref) {
+			$ref = ucwords(str_replace('_', ' ', $shortcode_ref));
+			$ref = str_replace(' ', '_', $ref);
+			$classname = 'EE_'.$ref.'_Shortcodes';
+			if (class_exists($classname)) {
 				$this->_shortcode_objs[] = new $classname;
 			}
 		}

core/helpers/EEH_Venue_View.helper.php

Braces +3 added lines, -1 removed lines

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

Indentation -1 removed lines

@@ -799,7 +799,6 @@
 
 
 	/**
-
 	 *
 	 * 	 If the the first date starts at midnight on one day, and the next date ends at midnight on the
 	 * 	 very next day then this method will return true.

Spacing +110 added lines, -110 removed lines

@@ -45,16 +45,16 @@ 
 	 * @param bool $password_check
 	 * @return \EE_Venue|null
 	 */
-	public static function get_venue( $VNU_ID = 0, $look_in_event = TRUE, $privacy_check = true, $password_check = true ) {
-		$VNU_ID = absint( $VNU_ID );
+	public static function get_venue($VNU_ID = 0, $look_in_event = TRUE, $privacy_check = true, $password_check = true) {
+		$VNU_ID = absint($VNU_ID);
 		// do we already have the Venue you are looking for?
-		if ( EEH_Venue_View::$_venue instanceof EE_Venue && EEH_Venue_View::$_venue->ID() == $VNU_ID ) {
-			return EEH_Venue_View::_get_venue( $privacy_check );
+		if (EEH_Venue_View::$_venue instanceof EE_Venue && EEH_Venue_View::$_venue->ID() == $VNU_ID) {
+			return EEH_Venue_View::_get_venue($privacy_check);
 		}
 		// international newspaper?
 		global $post;
-		if ( $post instanceof WP_Post ) {
-			switch ( $post->post_type ) {
+		if ($post instanceof WP_Post) {
+			switch ($post->post_type) {
 				// if this is being called from an EE_Venue post,
 				// and the EE_Venue post corresponds to the EE_Venue that is being asked for,
 				// then we can try to just grab the attached EE_Venue object
@@ -62,31 +62,31 @@ 
 					// the post already contains the related EE_Venue object AND one of the following is TRUE:
 					// the requested Venue ID matches the post ID OR...
 					// there was no specific Venue ID requested
-					if ( isset( $post->EE_Venue ) && ( $VNU_ID == $post->ID || ! $VNU_ID )) {
+					if (isset($post->EE_Venue) && ($VNU_ID == $post->ID || ! $VNU_ID)) {
 						// use existing related EE_Venue object
-						EEH_Venue_View::$_venue =  $post->EE_Venue;
-					} else if ( $VNU_ID ) {
+						EEH_Venue_View::$_venue = $post->EE_Venue;
+					} else if ($VNU_ID) {
 						// there WAS a specific Venue ID requested, but it's NOT the current post object
-						EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID( $VNU_ID );
+						EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
 					} else {
 						// no specific Venue ID requested, so use post ID to generate EE_Venue object
-						EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID( $post->ID );
+						EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID($post->ID);
 					}
 				break;
 
 				case 'espresso_events':
-					if ( $look_in_event ) {
+					if ($look_in_event) {
 						// grab the events related venues
 						$venues = EEH_Venue_View::get_event_venues();
 						// make sure the result is an array
-						$venues = is_array( $venues ) ? $venues : array();
+						$venues = is_array($venues) ? $venues : array();
 						// do we have an ID for a specific venue?
-						if ( $VNU_ID ) {
+						if ($VNU_ID) {
 							// loop thru the related venues
-							foreach( $venues as $venue ) {
-								if ( $venue instanceof EE_Venue ) {
+							foreach ($venues as $venue) {
+								if ($venue instanceof EE_Venue) {
 									// until we find the venue we're looking for
-									if ( $venue->ID() == $VNU_ID ) {
+									if ($venue->ID() == $VNU_ID) {
 										EEH_Venue_View::$_venue = $venue;
 										break;
 									}
@@ -98,7 +98,7 @@ 
 							// then the global post is an events post and this function was called with no argument
 						} else {
 							// just grab the first related event venue
-							EEH_Venue_View::$_venue = reset( $venues );
+							EEH_Venue_View::$_venue = reset($venues);
 						}
 					}
 				break;
@@ -106,11 +106,11 @@ 
 			}
 		}
 		// now if we STILL do NOT have an EE_Venue model object, BUT we have a Venue ID...
-		if ( ! EEH_Venue_View::$_venue instanceof EE_Venue && $VNU_ID ) {
+		if ( ! EEH_Venue_View::$_venue instanceof EE_Venue && $VNU_ID) {
 			// sigh... pull it from the db
-			EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID( $VNU_ID );
+			EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
 		}
-		return EEH_Venue_View::_get_venue( $privacy_check, $password_check );
+		return EEH_Venue_View::_get_venue($privacy_check, $password_check);
 	}
 
 
@@ -123,13 +123,13 @@ 
 	 * @param bool $password_check
 	 * @return 	EE_Venue
 	 */
-	protected static function _get_venue( $privacy_check = true, $password_check = true ) {
+	protected static function _get_venue($privacy_check = true, $password_check = true) {
 		// check for private venues.
 		if (
 			EEH_Venue_View::$_venue instanceof EE_Venue
 			&& EEH_Venue_View::$_venue->status() == 'private'
 			&& $privacy_check
-			&& ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_private_venues', 'get_venues' )
+			&& ! EE_Registry::instance()->CAP->current_user_can('ee_read_private_venues', 'get_venues')
 		) {
 			return null;
 		}
@@ -137,7 +137,7 @@ 
 		if (
 			EEH_Venue_View::$_venue instanceof EE_Venue
 			&& $password_check
-			&& post_password_required( EEH_Venue_View::$_venue->ID() )
+			&& post_password_required(EEH_Venue_View::$_venue->ID())
 		) {
 			return null;
 		}
@@ -154,8 +154,8 @@ 
 	 */
 	public static function get_event_venues() {
 		global $post;
-		if ( $post->post_type == 'espresso_events' ) {
-			if ( isset( $post->EE_Event ) && $post->EE_Event instanceof EE_Event ) {
+		if ($post->post_type == 'espresso_events') {
+			if (isset($post->EE_Event) && $post->EE_Event instanceof EE_Event) {
 				return $post->EE_Event->venues();
 			}
 		}
@@ -175,9 +175,9 @@ 
 	 *
 	 * @return bool|null
 	 */
-	public static function is_venue_private( $VNU_ID = false ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID, true, true );
-		if ( ! $venue instanceof EE_Venue ) {
+	public static function is_venue_private($VNU_ID = false) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID, true, true);
+		if ( ! $venue instanceof EE_Venue) {
 			return null;
 		}
 
@@ -192,11 +192,11 @@ 
 	 * @param bool $VNU_ID venue to check (optional). If not included will use internally derived venue object.
 	 * @return bool
 	 */
-	public static function is_venue_password_protected( $VNU_ID = false ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID, true, true, false );
+	public static function is_venue_password_protected($VNU_ID = false) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID, true, true, false);
 		if (
 			$venue instanceof EE_Venue
-			&& post_password_required( $venue->ID() )
+			&& post_password_required($venue->ID())
 		) {
 			return true;
 		}
@@ -213,13 +213,13 @@ 
 	 *
 	 * @return string
 	 */
-	public static function password_protected_venue_form( $VNU_ID = false ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID, true, true, false );
+	public static function password_protected_venue_form($VNU_ID = false) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID, true, true, false);
 		if (
 			$venue instanceof EE_Venue
-			&& post_password_required( $venue->ID() )
+			&& post_password_required($venue->ID())
 		) {
-			return get_the_password_form( $venue->ID() );
+			return get_the_password_form($venue->ID());
 		}
 		return '';
 	}
@@ -233,9 +233,9 @@ 
 	 * @param int $VNU_ID
 	 * @return string
 	 */
-	public static function venue_description( $VNU_ID = 0 ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
+	public static function venue_description($VNU_ID = 0) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
 			return$venue->description();
 		}
 		return '';
@@ -250,12 +250,12 @@ 
 	 * @param int $VNU_ID
 	 * @return string
 	 */
-	public static function venue_excerpt( $VNU_ID = 0 ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
+	public static function venue_excerpt($VNU_ID = 0) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
 			$excerpt = $venue->excerpt() != NULL && $venue->excerpt() ? $venue->excerpt() : $venue->description();
-			$venue_link = ' ' . EEH_Venue_View::venue_details_link( $venue->ID(), __( 'more', 'event_espresso' ) . '…' );
-			return ! empty( $excerpt ) ? wp_trim_words( $excerpt, 25, '' ) . $venue_link : '';
+			$venue_link = ' '.EEH_Venue_View::venue_details_link($venue->ID(), __('more', 'event_espresso').'…');
+			return ! empty($excerpt) ? wp_trim_words($excerpt, 25, '').$venue_link : '';
 		}
 		return '';
 	}
@@ -270,22 +270,22 @@ 
 	 * @param bool $hide_uncategorized
 	 * @return string
 	 */
-	public static function venue_categories( $VNU_ID = 0, $hide_uncategorized = TRUE ) {
+	public static function venue_categories($VNU_ID = 0, $hide_uncategorized = TRUE) {
 		$category_links = array();
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
 			// get category terms
-			if ( $venue_categories = get_the_terms( $venue->ID(), 'espresso_venue_categories' )) {
+			if ($venue_categories = get_the_terms($venue->ID(), 'espresso_venue_categories')) {
 				// loop thru terms and create links
-				foreach ( $venue_categories as $term ) {
-					$url = get_term_link( $term, 'espresso_venue_categories' );
-					if ( ! is_wp_error( $url ) && (( $hide_uncategorized && strtolower( $term->name ) != __( 'uncategorized', 'event_espresso' )) || ! $hide_uncategorized )) {
-						$category_links[] = '<a href="' . esc_url( $url ) . '" rel="tag">' . $term->name . '</a> ';
+				foreach ($venue_categories as $term) {
+					$url = get_term_link($term, 'espresso_venue_categories');
+					if ( ! is_wp_error($url) && (($hide_uncategorized && strtolower($term->name) != __('uncategorized', 'event_espresso')) || ! $hide_uncategorized)) {
+						$category_links[] = '<a href="'.esc_url($url).'" rel="tag">'.$term->name.'</a> ';
 					}
 				}
 			}
 		}
-		return implode( ', ', $category_links );
+		return implode(', ', $category_links);
 	}
 
 
@@ -300,10 +300,10 @@ 
 	 * @param bool $add_wrapper
 	 * @return string
 	 */
-	public static function venue_address( $type = 'multiline', $VNU_ID = 0, $use_schema = true, $add_wrapper = true ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
-			return EEH_Address::format( $venue, $type, $use_schema, $add_wrapper );
+	public static function venue_address($type = 'multiline', $VNU_ID = 0, $use_schema = true, $add_wrapper = true) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			return EEH_Address::format($venue, $type, $use_schema, $add_wrapper);
 		}
 		return '';
 	}
@@ -317,10 +317,10 @@ 
 	 * @param int $VNU_ID
 	 * @return bool|string
 	 */
-	public static function venue_has_address( $VNU_ID = 0 ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
-			return EEH_Address::format( $venue, 'inline', FALSE, FALSE );
+	public static function venue_has_address($VNU_ID = 0) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			return EEH_Address::format($venue, 'inline', FALSE, FALSE);
 		}
 		return false;
 	}
@@ -335,30 +335,30 @@ 
 	 * @param int $VNU_ID
 	 * @return string
 	 */
-	public static function venue_name( $link_to = 'details', $VNU_ID = 0 ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
+	public static function venue_name($link_to = 'details', $VNU_ID = 0) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
 			$venue_name = apply_filters(
 				'FHEE__EEH_Venue__venue_name__append_private_venue_name',
 				EEH_Venue_View::is_venue_private()
-					? EEH_Venue_View::$_venue->name() . "&nbsp;" . __( '(Private)', 'event_espresso' )
+					? EEH_Venue_View::$_venue->name()."&nbsp;".__('(Private)', 'event_espresso')
 					: EEH_Venue_View::$_venue->name(),
 				EEH_Venue_View::$_venue
 			);
-			$venue_name = EEH_Schema::name( $venue_name );
+			$venue_name = EEH_Schema::name($venue_name);
 
 			//if venue is trashed then ignore the "link to" setting because the venue is trashed.
-			if ( $venue->get('status') == 'trash' ) {
+			if ($venue->get('status') == 'trash') {
 				$link_to = '';
 			}
-			switch( $link_to ) {
+			switch ($link_to) {
 
 				case 'details' :
-					return EEH_Venue_View::venue_details_link( $venue->ID(), $venue_name );
+					return EEH_Venue_View::venue_details_link($venue->ID(), $venue_name);
 				break;
 
 				case 'website' :
-					return EEH_Venue_View::venue_website_link( $venue->ID(), $venue_name );
+					return EEH_Venue_View::venue_website_link($venue->ID(), $venue_name);
 				break;
 
 				default :
@@ -378,10 +378,10 @@ 
 	 * @param    string $text
 	 * @return string
 	 */
-	public static function venue_details_link( $VNU_ID = 0, $text = '' ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
-			return EEH_Schema::url( get_permalink( $venue->ID() ), $text );
+	public static function venue_details_link($VNU_ID = 0, $text = '') {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			return EEH_Schema::url(get_permalink($venue->ID()), $text);
 		}
 		return '';
 	}
@@ -396,12 +396,12 @@ 
 	 * @param    string $text
 	 * @return string
 	 */
-	public static function venue_website_link( $VNU_ID = 0, $text = '' ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
+	public static function venue_website_link($VNU_ID = 0, $text = '') {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
 			$url = $venue->venue_url();
-			$text = ! empty( $text ) ? $text : $url;
-			return ! empty( $url ) ? EEH_Schema::url( $url, $text ) : '';
+			$text = ! empty($text) ? $text : $url;
+			return ! empty($url) ? EEH_Schema::url($url, $text) : '';
 		}
 		return '';
 	}
@@ -415,10 +415,10 @@ 
 	 * @param int $VNU_ID
 	 * @return string
 	 */
-	public static function venue_phone( $VNU_ID = 0) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
-			return EEH_Schema::telephone( $venue->phone() );
+	public static function venue_phone($VNU_ID = 0) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			return EEH_Schema::telephone($venue->phone());
 		}
 		return '';
 	}
@@ -434,48 +434,48 @@ 
 	 * @param    array $gmap map options
 	 * @return string
 	 */
-	public static function venue_gmap( $VNU_ID = 0, $map_ID = FALSE, $gmap = array() ) {
+	public static function venue_gmap($VNU_ID = 0, $map_ID = FALSE, $gmap = array()) {
 
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
 			// check for global espresso_events post and use it's ID if no map_ID is set
 			global $post;
-			$map_ID = empty( $map_ID ) && $post->post_type == 'espresso_events' ? $post->ID : $map_ID;
+			$map_ID = empty($map_ID) && $post->post_type == 'espresso_events' ? $post->ID : $map_ID;
 			// grab map settings
 			$map_cfg = EE_Registry::instance()->CFG->map_settings;
 			// are maps enabled ?
-			if ( $map_cfg->use_google_maps && $venue->enable_for_gmap() ) {
+			if ($map_cfg->use_google_maps && $venue->enable_for_gmap()) {
 
 				$details_page = is_single();
 				$options = array();
-				$options['map_ID'] = $map_ID && $map_ID != $venue->ID() ? $map_ID . '-' . $venue->ID()/* . '-' . $static_map_id*/ : $venue->ID()/* . '-' . $static_map_id*/;
+				$options['map_ID'] = $map_ID && $map_ID != $venue->ID() ? $map_ID.'-'.$venue->ID()/* . '-' . $static_map_id*/ : $venue->ID()/* . '-' . $static_map_id*/;
 
-				$options['location'] = EEH_Address::format( $venue, 'inline', FALSE, FALSE );
+				$options['location'] = EEH_Address::format($venue, 'inline', FALSE, FALSE);
 
 				$options['ee_map_width'] = $details_page ? $map_cfg->event_details_map_width : $map_cfg->event_list_map_width;
-				$options['ee_map_width'] = isset( $gmap['ee_map_width'] ) && ! empty( $gmap['ee_map_width'] ) ? $gmap['ee_map_width'] : $options['ee_map_width'];
+				$options['ee_map_width'] = isset($gmap['ee_map_width']) && ! empty($gmap['ee_map_width']) ? $gmap['ee_map_width'] : $options['ee_map_width'];
 
 				$options['ee_map_height'] = $details_page ? $map_cfg->event_details_map_height : $map_cfg->event_list_map_height;
-				$options['ee_map_height'] = isset( $gmap['ee_map_height'] ) && ! empty( $gmap['ee_map_height'] ) ? $gmap['ee_map_height'] : $options['ee_map_height'];
+				$options['ee_map_height'] = isset($gmap['ee_map_height']) && ! empty($gmap['ee_map_height']) ? $gmap['ee_map_height'] : $options['ee_map_height'];
 
 				$options['ee_map_zoom'] = $details_page ? $map_cfg->event_details_map_zoom : $map_cfg->event_list_map_zoom;
-				$options['ee_map_zoom'] = isset( $gmap['ee_map_zoom'] ) && ! empty( $gmap['ee_map_zoom'] ) ? $gmap['ee_map_zoom'] : $options['ee_map_zoom'];
+				$options['ee_map_zoom'] = isset($gmap['ee_map_zoom']) && ! empty($gmap['ee_map_zoom']) ? $gmap['ee_map_zoom'] : $options['ee_map_zoom'];
 
 				$options['ee_map_nav_display'] = $details_page ? $map_cfg->event_details_display_nav : $map_cfg->event_list_display_nav;
-				$options['ee_map_nav_display'] = isset( $gmap['ee_map_nav_display'] ) && ! empty( $gmap['ee_map_nav_display'] ) ? 'true' : $options['ee_map_nav_display'];;
+				$options['ee_map_nav_display'] = isset($gmap['ee_map_nav_display']) && ! empty($gmap['ee_map_nav_display']) ? 'true' : $options['ee_map_nav_display']; ;
 
 				$options['ee_map_nav_size'] = $details_page ? $map_cfg->event_details_nav_size : $map_cfg->event_list_nav_size;
-				$options['ee_map_nav_size'] =  isset( $gmap['ee_map_nav_size'] ) && ! empty( $gmap['ee_map_nav_size'] )? $gmap['ee_map_nav_size'] : $options['ee_map_nav_size'];
+				$options['ee_map_nav_size'] = isset($gmap['ee_map_nav_size']) && ! empty($gmap['ee_map_nav_size']) ? $gmap['ee_map_nav_size'] : $options['ee_map_nav_size'];
 
 				$options['ee_map_type_control'] = $details_page ? $map_cfg->event_details_control_type : $map_cfg->event_list_control_type;
-				$options['ee_map_type_control'] =  isset( $gmap['ee_map_type_control'] ) && ! empty( $gmap['ee_map_type_control'] )? $gmap['ee_map_type_control'] : $options['ee_map_type_control'];
+				$options['ee_map_type_control'] = isset($gmap['ee_map_type_control']) && ! empty($gmap['ee_map_type_control']) ? $gmap['ee_map_type_control'] : $options['ee_map_type_control'];
 
 				$options['ee_map_align'] = $details_page ? $map_cfg->event_details_map_align : $map_cfg->event_list_map_align;
-				$options['ee_map_align'] =  isset( $gmap['ee_map_align'] ) && ! empty( $gmap['ee_map_align'] )? $gmap['ee_map_align'] : $options['ee_map_align'];
+				$options['ee_map_align'] = isset($gmap['ee_map_align']) && ! empty($gmap['ee_map_align']) ? $gmap['ee_map_align'] : $options['ee_map_align'];
 
-				$options['ee_static_url'] =  isset( $gmap['ee_static_url'] ) && ! empty( $gmap['ee_static_url'] ) ? (bool)absint( $gmap['ee_static_url'] ) : $venue->google_map_link();
+				$options['ee_static_url'] = isset($gmap['ee_static_url']) && ! empty($gmap['ee_static_url']) ? (bool) absint($gmap['ee_static_url']) : $venue->google_map_link();
 
-				return EEH_Maps::google_map( $options );
+				return EEH_Maps::google_map($options);
 
 			}
 		}
@@ -490,7 +490,7 @@ 
 	 * @param array $atts like EEH_Maps::google_map_link
 	 * @return string
 	 */
-	public static function espresso_google_static_map( EE_Venue $venue, $atts = array() ){
+	public static function espresso_google_static_map(EE_Venue $venue, $atts = array()) {
 		$state = $venue->state_obj();
 		$country = $venue->country_obj();
 		$atts = shortcode_atts(
@@ -521,23 +521,23 @@ 
 	 * @param string $after
 	 * @return string
 	 */
-	public static function edit_venue_link( $VNU_ID = 0, $link = '', $before = '<p class="edit-venue-lnk small-txt">', $after = '</p>' ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
+	public static function edit_venue_link($VNU_ID = 0, $link = '', $before = '<p class="edit-venue-lnk small-txt">', $after = '</p>') {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
 			// can the user edit this post ?
-			if ( current_user_can( 'edit_post', $venue->ID() )) {
+			if (current_user_can('edit_post', $venue->ID())) {
 				// set link text
-				$link = ! empty( $link ) ? $link : __('edit this venue');
+				$link = ! empty($link) ? $link : __('edit this venue');
 				// generate nonce
-				$nonce = wp_create_nonce( 'edit_nonce' );
+				$nonce = wp_create_nonce('edit_nonce');
 				// generate url to venue editor for this venue
-				$url = add_query_arg( array( 'page' => 'espresso_venues', 'action' => 'edit', 'post' => $venue->ID(), 'edit_nonce' => $nonce ), admin_url( 'admin.php' ) );
+				$url = add_query_arg(array('page' => 'espresso_venues', 'action' => 'edit', 'post' => $venue->ID(), 'edit_nonce' => $nonce), admin_url('admin.php'));
 				// get edit CPT text
-				$post_type_obj = get_post_type_object( 'espresso_venues' );
+				$post_type_obj = get_post_type_object('espresso_venues');
 				// build final link html
-				$link = '<a class="post-edit-link" href="' . $url . '" title="' . esc_attr( $post_type_obj->labels->edit_item ) . '">' . $link . '</a>';
+				$link = '<a class="post-edit-link" href="'.$url.'" title="'.esc_attr($post_type_obj->labels->edit_item).'">'.$link.'</a>';
 				// put it all together
-				return $before . apply_filters( 'edit_post_link', $link, $venue->ID() ) . $after;
+				return $before.apply_filters('edit_post_link', $link, $venue->ID()).$after;
 			}
 		}
 		return '';