eventespresso / event-espresso-core

core/helpers/EEH_MSG_Template.helper.php

Spacing +78 added lines, -78 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -46,20 +46,20 @@ 
 	 * @throws \EE_Error
 	 * @return array|bool array of data required for the redirect to the correct edit page or FALSE if encountering problems.
 	 */
-	public static function generate_new_templates($messenger, $message_types, $GRP_ID = 0,  $global = FALSE) {
+	public static function generate_new_templates($messenger, $message_types, $GRP_ID = 0, $global = FALSE) {
 
 		//make sure message_type is an array.
 		$message_types = (array) $message_types;
 		$templates = array();
 		$success = TRUE;
 
-		if ( empty($messenger) ) {
-			throw new EE_Error( __('We need a messenger to generate templates!', 'event_espresso') );
+		if (empty($messenger)) {
+			throw new EE_Error(__('We need a messenger to generate templates!', 'event_espresso'));
 		}
 
 		//if we STILL have empty $message_types then we need to generate an error message b/c we NEED message types to do the template files.
-		if ( empty($message_types) ) {
-			throw new EE_Error( __('We need at least one message type to generate templates!', 'event_espresso') );
+		if (empty($message_types)) {
+			throw new EE_Error(__('We need at least one message type to generate templates!', 'event_espresso'));
 		}
 
 		self::_set_autoloader();
@@ -67,25 +67,25 @@ 
 
 		$MSG = new EE_messages();
 
-		foreach ( $message_types as $message_type ) {
+		foreach ($message_types as $message_type) {
 			//if global then let's attempt to get the GRP_ID for this combo IF GRP_ID is empty.
-			if ( $global && empty( $GRP_ID ) ) {
-				$GRP_ID = EEM_Message_Template_Group::instance()->get_one( array( array( 'MTP_messenger' => $messenger, 'MTP_message_type' => $message_type, 'MTP_is_global' => TRUE ) ) );
+			if ($global && empty($GRP_ID)) {
+				$GRP_ID = EEM_Message_Template_Group::instance()->get_one(array(array('MTP_messenger' => $messenger, 'MTP_message_type' => $message_type, 'MTP_is_global' => TRUE)));
 				$GRP_ID = $GRP_ID instanceof EE_Message_Template_Group ? $GRP_ID->ID() : 0;
 			}
 			//if this is global template generation. First let's determine if we already HAVE global templates for this messenger and message_type combination.  If we do then NO generation!!
-			if ( $global && self::already_generated($messenger, $message_type, $GRP_ID  ) ) {
+			if ($global && self::already_generated($messenger, $message_type, $GRP_ID)) {
 				$templates = TRUE;
 				continue; //get out we've already got generated templates for this.
 			}
 
 			$new_message_template_group = $MSG->create_new_templates($messenger, $message_type, $GRP_ID, $global);
 
-			if ( !$new_message_template_group ) {
+			if ( ! $new_message_template_group) {
 				$success = FALSE;
 				continue;
 			}
-			if ( $templates === TRUE ) $templates = array();
+			if ($templates === TRUE) $templates = array();
 			$templates[] = $new_message_template_group;
 		}
 
@@ -101,18 +101,18 @@ 
 	 * @param  bool  $update_to_active if true then we also toggle the template to active.
 	 * @return bool                true = generated, false = hasn't been generated.
 	 */
-	public static function already_generated( $messenger, $message_type, $GRP_ID = 0, $update_to_active = TRUE ) {
+	public static function already_generated($messenger, $message_type, $GRP_ID = 0, $update_to_active = TRUE) {
 		self::_set_autoloader();
 		$MTP = EEM_Message_Template::instance();
 
 		//what method we use depends on whether we have an GRP_ID or not
-		$count = empty( $GRP_ID ) ? EEM_Message_Template::instance()->count( array( array( 'Message_Template_Group.MTP_messenger' => $messenger, 'Message_Template_Group.MTP_message_type' => $message_type, 'Message_Template_Group.MTP_is_global' => TRUE ) ) ) :  $MTP->count( array( array( 'GRP_ID' => $GRP_ID ) ) );
+		$count = empty($GRP_ID) ? EEM_Message_Template::instance()->count(array(array('Message_Template_Group.MTP_messenger' => $messenger, 'Message_Template_Group.MTP_message_type' => $message_type, 'Message_Template_Group.MTP_is_global' => TRUE))) : $MTP->count(array(array('GRP_ID' => $GRP_ID)));
 
-		if ( $update_to_active ) {
-			self::update_to_active( $messenger, $message_type );
+		if ($update_to_active) {
+			self::update_to_active($messenger, $message_type);
 		}
 
-		return ( $count > 0 ) ? TRUE : FALSE;
+		return ($count > 0) ? TRUE : FALSE;
 	}
 
 
@@ -126,8 +126,8 @@ 
 	 * @static
 	 * @return  int 						count of updated records.
 	 */
-	public static function update_to_active( $messenger, $message_type ) {
-		return EEM_Message_Template_Group::instance()->update( array('MTP_is_active' => 1), array(array('MTP_messenger' => $messenger, 'MTP_message_type' => $message_type )) );
+	public static function update_to_active($messenger, $message_type) {
+		return EEM_Message_Template_Group::instance()->update(array('MTP_is_active' => 1), array(array('MTP_messenger' => $messenger, 'MTP_message_type' => $message_type)));
 	}
 
 
@@ -140,18 +140,18 @@ 
 	 *
 	 * @return int  count of updated records.
 	 */
-	public static function update_to_inactive( $messenger = '', $message_type = '' ) {
+	public static function update_to_inactive($messenger = '', $message_type = '') {
 		$query_args = array();
-		if ( empty( $messenger ) && empty( $message_type ) )
+		if (empty($messenger) && empty($message_type))
 			return 0;
-		if ( ! empty( $messenger ) ) {
+		if ( ! empty($messenger)) {
 			$query_args[0]['MTP_messenger'] = $messenger;
 		}
 
-		if ( ! empty( $message_type ) ) {
+		if ( ! empty($message_type)) {
 			$query_args[0]['MTP_message_type'] = $message_type;
 		}
-		return EEM_Message_Template_Group::instance()->update( array( 'MTP_is_active' => FALSE ), $query_args );
+		return EEM_Message_Template_Group::instance()->update(array('MTP_is_active' => FALSE), $query_args);
 	}
 
 
@@ -189,39 +189,39 @@ 
 	 *												OR
 	 * 												FALSE if no shortcodes found.
 	 */
-	public static function get_shortcodes( $message_type, $messenger, $fields = array(), $context = 'admin', $merged = FALSE ) {
+	public static function get_shortcodes($message_type, $messenger, $fields = array(), $context = 'admin', $merged = FALSE) {
 
-		$messenger_name = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $messenger ) ) );
-		$mt_name = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $message_type ) ) );
+		$messenger_name = str_replace(' ', '_', ucwords(str_replace('_', ' ', $messenger)));
+		$mt_name = str_replace(' ', '_', ucwords(str_replace('_', ' ', $message_type)));
 
 		//convert slug to object
-		$messenger = self::messenger_obj( $messenger );
+		$messenger = self::messenger_obj($messenger);
 
 		//validate class for getting our list of shortcodes
-		$classname = 'EE_Messages_' . $messenger_name . '_' . $mt_name . '_Validator';
-		if ( !class_exists( $classname ) ) {
-			$msg[] = __( 'The Validator class was unable to load', 'event_espresso');
-			$msg[] = sprintf( __('The class name compiled was %s. Please check and make sure the spelling and case is correct for the class name and that there is an autoloader in place for this class', 'event_espresso'), $classname );
-			throw new EE_Error( implode( '||', $msg ) );
+		$classname = 'EE_Messages_'.$messenger_name.'_'.$mt_name.'_Validator';
+		if ( ! class_exists($classname)) {
+			$msg[] = __('The Validator class was unable to load', 'event_espresso');
+			$msg[] = sprintf(__('The class name compiled was %s. Please check and make sure the spelling and case is correct for the class name and that there is an autoloader in place for this class', 'event_espresso'), $classname);
+			throw new EE_Error(implode('||', $msg));
 		}
 
-		$a = new ReflectionClass( $classname );
-		$_VLD = $a->newInstance( array(), $context );
+		$a = new ReflectionClass($classname);
+		$_VLD = $a->newInstance(array(), $context);
 		$valid_shortcodes = $_VLD->get_validators();
 
 		//let's make sure we're only getting the shortcode part of the validators
 		$shortcodes = array();
-		foreach( $valid_shortcodes as $field => $validators ) {
+		foreach ($valid_shortcodes as $field => $validators) {
 			$shortcodes[$field] = $validators['shortcodes'];
 			$fields[] = $field;
 		}
 		$valid_shortcodes = $shortcodes;
 
 		//if not all fields let's make sure we ONLY include the shortcodes for the specified fields.
-		if ( ! empty( $fields ) ) {
+		if ( ! empty($fields)) {
 			$specified_shortcodes = array();
-			foreach ( $fields as $field ) {
-				if ( isset( $valid_shortcodes[$field] ) )
+			foreach ($fields as $field) {
+				if (isset($valid_shortcodes[$field]))
 					$specified_shortcodes[$field] = $valid_shortcodes[$field];
 			}
 			$valid_shortcodes = $specified_shortcodes;
@@ -229,16 +229,16 @@ 
 
 
 		//if not merged then let's replace the fields with the localized fields
-		if ( ! $merged ) {
+		if ( ! $merged) {
 			//let's get all the fields for the set messenger so that we can get the localized label and use that in the returned array.
 			$field_settings = $messenger->get_template_fields();
 			$localized = array();
-			foreach ( $valid_shortcodes as $field => $shortcodes ) {
+			foreach ($valid_shortcodes as $field => $shortcodes) {
 				//get localized field label
-				if ( isset( $field_settings[$field] ) ) {
+				if (isset($field_settings[$field])) {
 					//possible that this is used as a main field.
-					if ( empty( $field_settings[$field] ) ) {
-						if ( isset( $field_settings['extra'][$field] ) ) {
+					if (empty($field_settings[$field])) {
+						if (isset($field_settings['extra'][$field])) {
 							$_field = $field_settings['extra'][$field]['main']['label'];
 						} else {
 							$_field = $field;
@@ -246,10 +246,10 @@ 
 					} else {
 						$_field = $field_settings[$field]['label'];
 					}
-				} else if ( isset( $field_settings['extra'] ) ) {
+				} else if (isset($field_settings['extra'])) {
 					//loop through extra "main fields" and see if any of their children have our field
-					foreach ( $field_settings['extra'] as $main_field => $fields ) {
-						if ( isset( $fields[$field] ) )
+					foreach ($field_settings['extra'] as $main_field => $fields) {
+						if (isset($fields[$field]))
 							$_field = $fields[$field]['label'];
 						else
 							$_field = $field;
@@ -257,8 +257,8 @@ 
 				} else {
 					$_field = $field;
 				}
-				if ( isset( $_field )) {
-					$localized[ $_field ] = $shortcodes;
+				if (isset($_field)) {
+					$localized[$_field] = $shortcodes;
 				}
 			}
 			$valid_shortcodes = $localized;
@@ -266,11 +266,11 @@ 
 
 
 		//if $merged then let's merge all the shortcodes into one list NOT indexed by field.
-		if ( $merged ) {
+		if ($merged) {
 			$merged_codes = array();
-			foreach ( $valid_shortcodes as $field => $shortcode ) {
-				foreach ( $shortcode as $code => $label ) {
-					if ( isset( $merged_codes[$code] ) )
+			foreach ($valid_shortcodes as $field => $shortcode) {
+				foreach ($shortcode as $code => $label) {
+					if (isset($merged_codes[$code]))
 						continue;
 					else
 						$merged_codes[$code] = $label;
@@ -292,15 +292,15 @@ 
 	 * @throws \EE_Error
 	 * @return EE_messenger
 	 */
-	public static function messenger_obj( $messenger ) {
-		$ref = ucwords( str_replace( '_', ' ', $messenger ) );
-		$ref = str_replace( ' ', '_', $ref );
-		$classname = 'EE_' . $ref . '_messenger';
+	public static function messenger_obj($messenger) {
+		$ref = ucwords(str_replace('_', ' ', $messenger));
+		$ref = str_replace(' ', '_', $ref);
+		$classname = 'EE_'.$ref.'_messenger';
 
-		if ( !class_exists($classname) ) {
+		if ( ! class_exists($classname)) {
 			$msg[] = __('Messenger class loading fail.', 'event_espresso');
-			$msg[] = sprintf( __('The class name checked was "%s". Please check the spelling and case of this reference and make sure it matches the appropriate messenger file name (minus the extension) in the "/core/messages/messenger/" directory', 'event_espresso'), $classname );
-			throw new EE_Error( implode( '||', $msg ) );
+			$msg[] = sprintf(__('The class name checked was "%s". Please check the spelling and case of this reference and make sure it matches the appropriate messenger file name (minus the extension) in the "/core/messages/messenger/" directory', 'event_espresso'), $classname);
+			throw new EE_Error(implode('||', $msg));
 		}
 
 		//made it here so let's instantiate the object and return it.
@@ -318,15 +318,15 @@ 
 	 * @throws \EE_Error
 	 * @return EE_message_type
 	 */
-	public static function message_type_obj( $message_type ) {
-		$ref = ucwords( str_replace( '_', ' ', $message_type ) );
-		$ref = str_replace( ' ', '_', $ref );
-		$classname = 'EE_' . $ref . '_message_type';
+	public static function message_type_obj($message_type) {
+		$ref = ucwords(str_replace('_', ' ', $message_type));
+		$ref = str_replace(' ', '_', $ref);
+		$classname = 'EE_'.$ref.'_message_type';
 
-		if ( !class_exists($classname) ) {
+		if ( ! class_exists($classname)) {
 			$msg[] = __('Message Type class loading fail.', 'event_espresso');
-			$msg[] = sprintf( __('The class name checked was "%s". Please check the spelling and case of this reference and make sure it matches the appropriate message type file name (minus the extension) in the "/core/messages/message_type/" directory', 'event_espresso'), $classname );
-			throw new EE_Error( implode( '||', $msg ) );
+			$msg[] = sprintf(__('The class name checked was "%s". Please check the spelling and case of this reference and make sure it matches the appropriate message type file name (minus the extension) in the "/core/messages/message_type/" directory', 'event_espresso'), $classname);
+			throw new EE_Error(implode('||', $msg));
 		}
 
 		//made it here so let's instantiate the object and return it.
@@ -345,10 +345,10 @@ 
 	 * @param  string   $message_type message type to check for.
 	 * @return boolean
 	 */
-	public static function is_mt_active( $message_type ) {
+	public static function is_mt_active($message_type) {
 		self::_set_autoloader();
-		$active_mts = EE_Registry::instance()->load_lib( 'messages' )->get_active_message_types();
-		return in_array( $message_type, $active_mts );
+		$active_mts = EE_Registry::instance()->load_lib('messages')->get_active_message_types();
+		return in_array($message_type, $active_mts);
 	}
 
 
@@ -361,10 +361,10 @@ 
 	 * @param  string  $messenger slug for messenger to check.
 	 * @return boolean
 	 */
-	public static function is_messenger_active( $messenger ) {
+	public static function is_messenger_active($messenger) {
 		self::_set_autoloader();
 		$active_messengers = EE_Registry::instance()->load_lib('messages')->get_active_messengers();
-		return isset( $active_messengers[ $messenger ] );
+		return isset($active_messengers[$messenger]);
 	}
 
 
@@ -378,7 +378,7 @@ 
 	 * @return array
 	 */
 	public static function get_active_messengers_in_db() {
-		return apply_filters( 'FHEE__EEH_MSG_Template__get_active_messengers_in_db', get_option( 'ee_active_messengers', array() ) );
+		return apply_filters('FHEE__EEH_MSG_Template__get_active_messengers_in_db', get_option('ee_active_messengers', array()));
 	}
 
 
@@ -393,8 +393,8 @@ 
 	 *
 	 * @return bool FALSE if not updated, TRUE if updated.
 	 */
-	public static function update_active_messengers_in_db( $data_to_save ) {
-		return update_option( 'ee_active_messengers', $data_to_save );
+	public static function update_active_messengers_in_db($data_to_save) {
+		return update_option('ee_active_messengers', $data_to_save);
 	}
 
 
@@ -413,7 +413,7 @@ 
 	 *
 	 * @return string          The generated url.
 	 */
-	public static function generate_url_trigger( $sending_messenger, $generating_messenger, $context, $message_type, EE_Registration $registration, $message_template_group, $data_id ) {
+	public static function generate_url_trigger($sending_messenger, $generating_messenger, $context, $message_type, EE_Registration $registration, $message_template_group, $data_id) {
 		$query_args = array(
 			'ee' => 'msg_url_trigger',
 			'snd_msgr' => $sending_messenger,
@@ -424,10 +424,10 @@ 
 			'GRP_ID' => $message_template_group,
 			'id' => $data_id
 			);
-		$url = add_query_arg( $query_args, get_site_url() );
+		$url = add_query_arg($query_args, get_site_url());
 
 		//made it here so now we can just get the url and filter it.  Filtered globally and by message type.
-		$url = apply_filters( 'FHEE__EEH_MSG_Template__generate_url_trigger', $url, $sending_messenger, $generating_messenger, $context, $message_type, $registration, $message_template_group, $data_id );
+		$url = apply_filters('FHEE__EEH_MSG_Template__generate_url_trigger', $url, $sending_messenger, $generating_messenger, $context, $message_type, $registration, $message_template_group, $data_id);
 
 		return $url;
 	}

Braces +21 added lines, -14 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -85,7 +86,9 @@ 
 				$success = FALSE;
 				continue;
 			}
-			if ( $templates === TRUE ) $templates = array();
+			if ( $templates === TRUE ) {
+				$templates = array();
+			}
 			$templates[] = $new_message_template_group;
 		}
 
@@ -142,8 +145,9 @@ 
 	 */
 	public static function update_to_inactive( $messenger = '', $message_type = '' ) {
 		$query_args = array();
-		if ( empty( $messenger ) && empty( $message_type ) )
-			return 0;
+		if ( empty( $messenger ) && empty( $message_type ) ) {
+					return 0;
+		}
 		if ( ! empty( $messenger ) ) {
 			$query_args[0]['MTP_messenger'] = $messenger;
 		}
@@ -221,8 +225,9 @@ 
 		if ( ! empty( $fields ) ) {
 			$specified_shortcodes = array();
 			foreach ( $fields as $field ) {
-				if ( isset( $valid_shortcodes[$field] ) )
-					$specified_shortcodes[$field] = $valid_shortcodes[$field];
+				if ( isset( $valid_shortcodes[$field] ) ) {
+									$specified_shortcodes[$field] = $valid_shortcodes[$field];
+				}
 			}
 			$valid_shortcodes = $specified_shortcodes;
 		}
@@ -249,10 +254,11 @@ 
 				} else if ( isset( $field_settings['extra'] ) ) {
 					//loop through extra "main fields" and see if any of their children have our field
 					foreach ( $field_settings['extra'] as $main_field => $fields ) {
-						if ( isset( $fields[$field] ) )
-							$_field = $fields[$field]['label'];
-						else
-							$_field = $field;
+						if ( isset( $fields[$field] ) ) {
+													$_field = $fields[$field]['label'];
+						} else {
+													$_field = $field;
+						}
 					}
 				} else {
 					$_field = $field;
@@ -270,10 +276,11 @@ 
 			$merged_codes = array();
 			foreach ( $valid_shortcodes as $field => $shortcode ) {
 				foreach ( $shortcode as $code => $label ) {
-					if ( isset( $merged_codes[$code] ) )
-						continue;
-					else
-						$merged_codes[$code] = $label;
+					if ( isset( $merged_codes[$code] ) ) {
+											continue;
+					} else {
+											$merged_codes[$code] = $label;
+					}
 				}
 			}
 			$valid_shortcodes = $merged_codes;

core/helpers/EEH_Money.helper.php

Indentation +12 added lines, -12 removed lines

@@ -8,18 +8,18 @@
  */
 if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
  /**
- *
- * Money helper class.
- * This class has helper methods that help with money related conversions and calculations.
- *
- * @since %VER%
- *
- * @package		Event Espresso
- * @subpackage	helpers
- * @author		Darren Ethier
- *
- * ------------------------------------------------------------------------
- */
+  *
+  * Money helper class.
+  * This class has helper methods that help with money related conversions and calculations.
+  *
+  * @since %VER%
+  *
+  * @package		Event Espresso
+  * @subpackage	helpers
+  * @author		Darren Ethier
+  *
+  * ------------------------------------------------------------------------
+  */
 class EEH_Money extends EEH_Base  {
 
 

Spacing +9 added lines, -9 removed lines

@@ -20,7 +20,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEH_Money extends EEH_Base  {
+class EEH_Money extends EEH_Base {
 
 
 	/**
@@ -29,15 +29,15 @@ 
 	 * @param int|string $incoming_value
 	 * @return float
 	 */
-	public static function convert_to_float_from_localized_money( $incoming_value ) {
+	public static function convert_to_float_from_localized_money($incoming_value) {
 		//remove thousands separator
-		$money_value = str_replace( EE_Registry::instance()->CFG->currency->thsnds, '', $incoming_value );
+		$money_value = str_replace(EE_Registry::instance()->CFG->currency->thsnds, '', $incoming_value);
 
 		//replace decimal place with standard decimal.
-		$money_value = str_replace( EE_Registry::instance()->CFG->currency->dec_mrk, '.', $money_value );
+		$money_value = str_replace(EE_Registry::instance()->CFG->currency->dec_mrk, '.', $money_value);
 
 		//float it! and round to three decimal places
-		$money_value = round ( (float) $money_value, 3 );
+		$money_value = round((float) $money_value, 3);
 		return $money_value;
 	}
 
@@ -57,12 +57,12 @@ 
 	 * @throws \EE_Error
 	 */
 
-	public static function compare_floats( $float1, $float2, $operator='=' ) {
+	public static function compare_floats($float1, $float2, $operator = '=') {
 		// Check numbers to 5 digits of precision
 		$epsilon = 0.00001;
 
-		$float1 = (float)$float1;
-		$float2 = (float)$float2;
+		$float1 = (float) $float1;
+		$float2 = (float) $float2;
 
 		switch ($operator) {
 			// equal
@@ -116,7 +116,7 @@ 
 				}
 				break;
 			default:
-				throw new EE_Error(__( "Unknown operator '" . $operator . "' in EEH_Money::compare_floats()", 'event_espresso' ) );
+				throw new EE_Error(__("Unknown operator '".$operator."' in EEH_Money::compare_floats()", 'event_espresso'));
 		}
 
 		return false;

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
  * @subpackage plugin api, messages
  * @since           4.5.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Use this to register or deregister a new message template pack variation for the EE messages system.

core/helpers/EEH_Parse_Shortcodes.helper.php

Spacing +38 added lines, -38 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -83,7 +83,7 @@ 
 	 * @param INT 					 $GRP_ID 	       The message template grp_id for the specific template being parsed.
 	 * @return string                   The parsed template string
 	 */
-	public function parse_message_template( $template, EE_Messages_Addressee $data, $valid_shortcodes, EE_message_type $message_type, EE_messenger $messenger, $context, $GRP_ID ) {
+	public function parse_message_template($template, EE_Messages_Addressee $data, $valid_shortcodes, EE_message_type $message_type, EE_messenger $messenger, $context, $GRP_ID) {
 		$extra_data = array(
 			'messenger' => $messenger,
 			'message_type' => $message_type,
@@ -91,7 +91,7 @@ 
 			'GRP_ID' => $GRP_ID
 			);
 
-		$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;
@@ -102,9 +102,9 @@ 
 	}
 
 
-	public function parse_attendee_list_template( $template, EE_Registration $registration, $valid_shortcodes, $extra_data = array() ) {
+	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->_init_data($template, $registration, $valid_shortcodes, $extra_data);
 
 		$this->_template = is_array($template) ? $template['attendee_list'] : $template;
 
@@ -112,8 +112,8 @@ 
 		return $parsed;
 	}
 
-	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;
 
@@ -122,8 +122,8 @@ 
 	}
 
 
-	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;
 
@@ -133,26 +133,26 @@ 
 
 
 
-	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;
 
 		$parsed = $this->_parse_message_template();
 		return $parsed;
 	}
 
 
-	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;
 
 		$parsed = $this->_parse_message_template();
 		return $parsed;
 	}
 
 
-	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;
 
@@ -161,8 +161,8 @@ 
 	}
 
 
-	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;
 
@@ -171,13 +171,13 @@ 
 	}
 
 
-	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);
 	}
 
 
@@ -196,7 +196,7 @@ 
 
 
 		//now let's get a list of shortcodes that are found in the given template
-		$possible_shortcodes = preg_match_all( '/(\[.+?\])/', $this->_template, $matches );
+		$possible_shortcodes = preg_match_all('/(\[.+?\])/', $this->_template, $matches);
 		$shortcodes = (array) $matches[0]; //this should be an array of shortcodes in the template string.
 
 		$matched_code = array();
@@ -221,31 +221,31 @@ 
 			'[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 ) {
+			foreach ($this->_shortcode_objs as $sc_obj) {
 				$data_send = '';
 
 				//we need to setup any dynamic shortcodes so that they work with the array_key_exists
-				$sc = preg_match_all( '/(\[[A-Za-z0-9\_]+_\*)/', $shortcode, $matches );
-				$sc_to_verify = !empty($matches[0] ) ? $matches[0][0] . ']' : $shortcode;
+				$sc = preg_match_all('/(\[[A-Za-z0-9\_]+_\*)/', $shortcode, $matches);
+				$sc_to_verify = ! empty($matches[0]) ? $matches[0][0].']' : $shortcode;
 
-				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;
@@ -267,13 +267,13 @@ 
 	 * @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 ) ) {
-				$a = new ReflectionClass( $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)) {
+				$a = new ReflectionClass($classname);
 				$this->_shortcode_objs[] = $a->newInstance();
 			}
 		}

Braces +2 added lines, -1 removed lines

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

core/helpers/EEH_Sideloader.helper.php

Spacing +37 added lines, -37 removed lines

@@ -28,7 +28,7 @@ 
 
 
 
-require_once( EE_HELPERS . 'EEH_Base.helper.php' );
+require_once(EE_HELPERS.'EEH_Base.helper.php');
 class EEH_Sideloader extends EEH_Base {
 
 	private $_upload_to;
@@ -43,8 +43,8 @@ 
 	 * @access public
 	 * @param array $init array fo initializing the sideloader if keys match the properties.
 	 */
-	public function __construct( $init = array() ) {
-		$this->_init( $init );
+	public function __construct($init = array()) {
+		$this->_init($init);
 	}
 
 
@@ -55,24 +55,24 @@ 
 	 * @param  array  $init array on init (keys match properties others ignored)
 	 * @return void
 	 */
-	private function _init( $init ) {
+	private function _init($init) {
 		$defaults = array(
 			'_upload_to' => $this->_get_wp_uploads_dir(),
 			'_upload_from' => '',
 			'_permissions' => 0644,
-			'_new_file_name' => 'EE_Sideloader_' . uniqid() . '.default'
+			'_new_file_name' => 'EE_Sideloader_'.uniqid().'.default'
 			);
 
-		$props = array_merge( $defaults, $init );
+		$props = array_merge($defaults, $init);
 
-		foreach ( $props as $key => $val ) {
-			if ( EEH_Class_Tools::has_property( $this, $key ) ) {
+		foreach ($props as $key => $val) {
+			if (EEH_Class_Tools::has_property($this, $key)) {
 				$this->$key = $val;
 			}
 		}
 
 		//make sure we include the required wp file for needed functions
-		require_once( ABSPATH . 'wp-admin/includes/file.php' );
+		require_once(ABSPATH.'wp-admin/includes/file.php');
 	}
 
 
@@ -80,16 +80,16 @@ 
 	private function _get_wp_uploads_dir() {}
 
 	//setters
-	public function set_upload_to( $upload_to_folder ) {
+	public function set_upload_to($upload_to_folder) {
 		$this->_upload_to = $upload_to_folder;
 	}
-	public function set_upload_from( $upload_from_folder ) {
+	public function set_upload_from($upload_from_folder) {
 		$this->_upload_from_folder = $upload_from_folder;
 	}
-	public function set_permissions( $permissions ) {
+	public function set_permissions($permissions) {
 		$this->_permissions = $permissions;
 	}
-	public function set_new_file_name( $new_file_name ) {
+	public function set_new_file_name($new_file_name) {
 		$this->_new_file_name = $new_file_name;
 	}
 
@@ -111,34 +111,34 @@ 
 	//upload methods
 	public function sideload() {
 		//setup temp dir
-		$temp_file = wp_tempnam( $this->_upload_from );
+		$temp_file = wp_tempnam($this->_upload_from);
 
-		if ( !$temp_file ) {
-			EE_Error::add_error( __('Something went wrong with the upload.  Unable to create a tmp file for the uploaded file on the server', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $temp_file) {
+			EE_Error::add_error(__('Something went wrong with the upload.  Unable to create a tmp file for the uploaded file on the server', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
-		do_action( 'AHEE__EEH_Sideloader__sideload__before', $this, $temp_file );
+		do_action('AHEE__EEH_Sideloader__sideload__before', $this, $temp_file);
 
-		$wp_remote_args = apply_filters( 'FHEE__EEH_Sideloader__sideload__wp_remote_args', array( 'timeout' => 500, 'stream' => true, 'filename' => $temp_file ), $this, $temp_file );
+		$wp_remote_args = apply_filters('FHEE__EEH_Sideloader__sideload__wp_remote_args', array('timeout' => 500, 'stream' => true, 'filename' => $temp_file), $this, $temp_file);
 
-		$response = wp_safe_remote_get( $this->_upload_from, $wp_remote_args );
+		$response = wp_safe_remote_get($this->_upload_from, $wp_remote_args);
 
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
-			unlink( $temp_file );
-			if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-				EE_Error::add_error( sprintf( __('Unable to upload the file.  Either the path given to upload from is incorrect, or something else happened.  Here is the response returned:<br />%s<br />Here is the path given: %s', 'event_espresso'), var_export( $response, true ), $this->_upload_from ), __FILE__, __FUNCTION__, __LINE__ );
+		if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response)) {
+			unlink($temp_file);
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				EE_Error::add_error(sprintf(__('Unable to upload the file.  Either the path given to upload from is incorrect, or something else happened.  Here is the response returned:<br />%s<br />Here is the path given: %s', 'event_espresso'), var_export($response, true), $this->_upload_from), __FILE__, __FUNCTION__, __LINE__);
 			}
 			return false;
 		}
 
 		//possible md5 check
-		$content_md5 = wp_remote_retrieve_header( $response, 'content-md5' );
-		if ( $content_md5 ) {
-			$md5_check = verify_file_md5( $temp_file, $content_md5 );
-			if ( is_wp_error( $md5_check ) ) {
-				unlink( $temp_file );
-				EE_Error::add_error( $md5_check->get_error_message(), __FILE__, __FUNCTION__, __LINE__ );
+		$content_md5 = wp_remote_retrieve_header($response, 'content-md5');
+		if ($content_md5) {
+			$md5_check = verify_file_md5($temp_file, $content_md5);
+			if (is_wp_error($md5_check)) {
+				unlink($temp_file);
+				EE_Error::add_error($md5_check->get_error_message(), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 		}
@@ -146,24 +146,24 @@ 
 		$file = $temp_file;
 
 		//now we have the file, let's get it in the right directory with the right name.
-		$path = apply_filters( 'FHEE__EEH_Sideloader__sideload__new_path', $this->_upload_to . $this->_new_file_name, $this );
+		$path = apply_filters('FHEE__EEH_Sideloader__sideload__new_path', $this->_upload_to.$this->_new_file_name, $this);
 
 		//move file in
-		if ( false === @ rename( $file, $path ) ) {
-			unlink( $temp_file );
-			EE_Error::add_error(  sprintf( __('Unable to move the file to new location (possible permissions errors). This is the path the class attempted to move the file to: %s', 'event_espresso' ), $path ), __FILE__, __FUNCTION__, __LINE__ );
+		if (false === @ rename($file, $path)) {
+			unlink($temp_file);
+			EE_Error::add_error(sprintf(__('Unable to move the file to new location (possible permissions errors). This is the path the class attempted to move the file to: %s', 'event_espresso'), $path), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
 		//set permissions
-		$permissions = apply_filters( 'FHEE__EEH_Sideloader__sideload__permissions_applied', $this->_permissions, $this );
-		chmod( $path, $permissions );
+		$permissions = apply_filters('FHEE__EEH_Sideloader__sideload__permissions_applied', $this->_permissions, $this);
+		chmod($path, $permissions);
 
 		//that's it.  let's allow for actions after file uploaded.
-		do_action( 'AHEE__EE_Sideloader__sideload_after', $this, $path );
+		do_action('AHEE__EE_Sideloader__sideload_after', $this, $path);
 
 		//unlink tempfile
-		@unlink( $temp_file );
+		@unlink($temp_file);
 		return true;
 	}
 

core/helpers/EEH_URL.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');
+}
 /**
  * EEH_URL helper
  * Helper class for URL-related PHP functions
@@ -62,7 +64,7 @@ 
 				isset($results['response']['code']) &&
 				$results['response']['code'] == '200'){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}

Spacing +44 added lines, -44 removed lines

@@ -9,7 +9,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEH_URL{
+class EEH_URL {
 
 	/**
 	 * _add_query_arg
@@ -20,26 +20,26 @@ 
 	 * @param string $url
 	 * @return string
 	 */
-	public static function add_query_args_and_nonce( $args = array(), $url = '' ) {
-		if ( empty( $url )) {
-			$user_msg = __('An error occurred. A URL is a required parameter for the add_query_args_and_nonce method.', 'event_espresso' );
-			$dev_msg = $user_msg . "\n" . sprintf(
-					__('In order to dynamically generate nonces for your actions, you need to supply a valid URL as a second parameter for the %s::add_query_args_and_nonce method.', 'event_espresso' ),
+	public static function add_query_args_and_nonce($args = array(), $url = '') {
+		if (empty($url)) {
+			$user_msg = __('An error occurred. A URL is a required parameter for the add_query_args_and_nonce method.', 'event_espresso');
+			$dev_msg = $user_msg."\n".sprintf(
+					__('In order to dynamically generate nonces for your actions, you need to supply a valid URL as a second parameter for the %s::add_query_args_and_nonce method.', 'event_espresso'),
 					__CLASS__
 				);
-			EE_Error::add_error( $user_msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($user_msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 		// check that an action exists
-		if ( isset( $args['action'] ) && ! empty( $args['action'] )) {
-			$args = array_merge( $args, array( $args['action'] . '_nonce' => wp_create_nonce( $args['action'] . '_nonce' )));
+		if (isset($args['action']) && ! empty($args['action'])) {
+			$args = array_merge($args, array($args['action'].'_nonce' => wp_create_nonce($args['action'].'_nonce')));
 		} else {
-			$args = array_merge( $args, array( 'action' => 'default', 'default_nonce' => wp_create_nonce( 'default_nonce' )));
+			$args = array_merge($args, array('action' => 'default', 'default_nonce' => wp_create_nonce('default_nonce')));
 		}
 
 		//finally, let's always add a return address (if present) :)
-		$args = !empty( $_REQUEST['action'] ) ? array_merge( $args, array( 'return' => $_REQUEST['action'] ) ) : $args;
+		$args = ! empty($_REQUEST['action']) ? array_merge($args, array('return' => $_REQUEST['action'])) : $args;
 
-		return add_query_arg( $args, $url );
+		return add_query_arg($args, $url);
 
 	}
 
@@ -51,17 +51,17 @@ 
 	 * @param string $url
 	 * @return boolean
 	 */
-	public static function remote_file_exists($url){
-		$results = wp_remote_request($url,array(
+	public static function remote_file_exists($url) {
+		$results = wp_remote_request($url, array(
 			'method'=>'GET',
 			'redirection'=>1,
 		));
-		if( ! $results instanceof WP_Error &&
+		if ( ! $results instanceof WP_Error &&
 				isset($results['response']) &&
 				isset($results['response']['code']) &&
-				$results['response']['code'] == '200'){
+				$results['response']['code'] == '200') {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -77,29 +77,29 @@ 
 	 * @param bool   $base_url_only - TRUE will only return the scheme and host with no other parameters
 	 * @return string
 	 */
-	public static function refactor_url( $url = '', $remove_query = TRUE, $base_url_only = FALSE ) {
+	public static function refactor_url($url = '', $remove_query = TRUE, $base_url_only = FALSE) {
 		// break apart incoming URL
-		$url_bits = parse_url( $url );
+		$url_bits = parse_url($url);
 		// HTTP or HTTPS ?
-		$scheme = isset( $url_bits[ 'scheme' ] ) ? $url_bits[ 'scheme' ] . '://' : 'http://';
+		$scheme = isset($url_bits['scheme']) ? $url_bits['scheme'].'://' : 'http://';
 		// domain
-		$host = isset( $url_bits[ 'host' ] ) ? $url_bits[ 'host' ] : '';
+		$host = isset($url_bits['host']) ? $url_bits['host'] : '';
 		// if only the base URL is requested, then return that now
-		if ( $base_url_only ) {
-			return $scheme . $host;
+		if ($base_url_only) {
+			return $scheme.$host;
 		}
-		$port = isset( $url_bits[ 'port' ] ) ? ':' . $url_bits[ 'port' ] : '';
-		$user = isset( $url_bits[ 'user' ] ) ? $url_bits[ 'user' ] : '';
-		$pass = isset( $url_bits[ 'pass' ] ) ? ':' . $url_bits[ 'pass' ] : '';
-		$pass = ( $user || $pass ) ? $pass . '@' : '';
-		$path = isset( $url_bits[ 'path' ] ) ? $url_bits[ 'path' ] : '';
+		$port = isset($url_bits['port']) ? ':'.$url_bits['port'] : '';
+		$user = isset($url_bits['user']) ? $url_bits['user'] : '';
+		$pass = isset($url_bits['pass']) ? ':'.$url_bits['pass'] : '';
+		$pass = ($user || $pass) ? $pass.'@' : '';
+		$path = isset($url_bits['path']) ? $url_bits['path'] : '';
 		// if the query string is not required, then return what we have so far
-		if ( $remove_query ) {
-			return $scheme . $user . $pass . $host . $port . $path;
+		if ($remove_query) {
+			return $scheme.$user.$pass.$host.$port.$path;
 		}
-		$query = isset( $url_bits[ 'query' ] ) ? '?' . $url_bits[ 'query' ] : '';
-		$fragment = isset( $url_bits[ 'fragment' ] ) ? '#' . $url_bits[ 'fragment' ] : '';
-		return $scheme . $user . $pass . $host . $port . $path . $query . $fragment;
+		$query = isset($url_bits['query']) ? '?'.$url_bits['query'] : '';
+		$fragment = isset($url_bits['fragment']) ? '#'.$url_bits['fragment'] : '';
+		return $scheme.$user.$pass.$host.$port.$path.$query.$fragment;
 	}
 
 
@@ -112,29 +112,29 @@ 
 	 * @param bool   $as_array TRUE (default) will return query params as an array of key value pairs, FALSE will simply return the query string
 	 * @return string|array
 	 */
-	public static function get_query_string( $url = '', $as_array = TRUE ) {
+	public static function get_query_string($url = '', $as_array = TRUE) {
 		// break apart incoming URL
-		$url_bits = parse_url( $url );
+		$url_bits = parse_url($url);
 		// grab query string from URL
-		$query = isset( $url_bits[ 'query' ] ) ? $url_bits[ 'query' ] : '';
+		$query = isset($url_bits['query']) ? $url_bits['query'] : '';
 		// if we don't want the query string formatted into an array of key => value pairs, then just return it as is
-		if ( ! $as_array ) {
+		if ( ! $as_array) {
 			return $query;
 		}
 		// if no query string exists then just return an empty array now
-		if ( empty( $query )) {
+		if (empty($query)) {
 			return array();
 		}
 		// empty array to hold results
 		$query_params = array();
 		// now break apart the query string into separate params
-		$query = explode( '&', $query );
+		$query = explode('&', $query);
 		// loop thru our query params
-		foreach ( $query as $query_args ) {
+		foreach ($query as $query_args) {
 			// break apart the key value pairs
-			$query_args = explode( '=', $query_args );
+			$query_args = explode('=', $query_args);
 			// and add to our results array
-			$query_params[ $query_args[0] ] = $query_args[1];
+			$query_params[$query_args[0]] = $query_args[1];
 		}
 		return $query_params;
 	}
@@ -145,7 +145,7 @@ 
 	 * prevent_prefetching
 	 * @return void
 	 */
-	public static function prevent_prefetching(){
+	public static function prevent_prefetching() {
 		// prevent browsers from prefetching of the rel='next' link, because it may contain content that interferes with the registration process
 		remove_action('wp_head', 'adjacent_posts_rel_link_wp_head');
 	}
@@ -156,7 +156,7 @@ 
 	 * add_nocache_headers
 	 * @return void
 	 */
-	public static function add_nocache_headers(){
+	public static function add_nocache_headers() {
 		// add no cache headers
 //		add_action( 'wp_head' , array( 'EED_Single_Page_Checkout', 'nocache_headers' ), 10 );
 		// plus a little extra for nginx

core/helpers/EEH_Venue_View.helper.php

Spacing +109 added lines, -109 removed lines

@@ -44,16 +44,16 @@ 
 	 *                             		     regardless of access.
 	 * @return EE_Venue | null
 	 */
-	public static function get_venue( $VNU_ID = 0, $look_in_event = TRUE, $privacy_check = true ) {
-		$VNU_ID = absint( $VNU_ID );
+	public static function get_venue($VNU_ID = 0, $look_in_event = TRUE, $privacy_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
@@ -61,31 +61,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;
 									}
@@ -97,7 +97,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;
@@ -105,11 +105,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 );
+		return EEH_Venue_View::_get_venue($privacy_check);
 	}
 
 
@@ -121,9 +121,9 @@ 
 	 *                             		     regardless of access.
 	 *  @return 	EE_Venue
 	 */
-	protected static function _get_venue( $privacy_check = true ) {
+	protected static function _get_venue($privacy_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' ) ) {
+		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')) {
 			return null;
 		}
 		return EEH_Venue_View::$_venue instanceof EE_Venue ? EEH_Venue_View::$_venue : null;
@@ -139,8 +139,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();
 			}
 		}
@@ -160,9 +160,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;
 		}
 
@@ -178,9 +178,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 '';
@@ -195,12 +195,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 '';
 	}
@@ -215,22 +215,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);
 	}
 
 
@@ -245,11 +245,11 @@ 
 	 * @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 ) {
-			EE_Registry::instance()->load_helper( 'Formatter' );
-			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) {
+			EE_Registry::instance()->load_helper('Formatter');
+			return EEH_Address::format($venue, $type, $use_schema, $add_wrapper);
 		}
 		return '';
 	}
@@ -263,11 +263,11 @@ 
 	 * @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 ) {
-			EE_Registry::instance()->load_helper( 'Formatter' );
-			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) {
+			EE_Registry::instance()->load_helper('Formatter');
+			return EEH_Address::format($venue, 'inline', FALSE, FALSE);
 		}
 		return false;
 	}
@@ -282,31 +282,31 @@ 
 	 * @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 ) {
-			EE_Registry::instance()->load_helper( 'Formatter' );
+	public static function venue_name($link_to = 'details', $VNU_ID = 0) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			EE_Registry::instance()->load_helper('Formatter');
 			$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 :
@@ -326,10 +326,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 '';
 	}
@@ -344,13 +344,13 @@ 
 	 * @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 ) {
-			EE_Registry::instance()->load_helper( 'Formatter' );
+	public static function venue_website_link($VNU_ID = 0, $text = '') {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			EE_Registry::instance()->load_helper('Formatter');
 			$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 '';
 	}
@@ -364,11 +364,11 @@ 
 	 * @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 ) {
-			EE_Registry::instance()->load_helper( 'Formatter' );
-			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) {
+			EE_Registry::instance()->load_helper('Formatter');
+			return EEH_Schema::telephone($venue->phone());
 		}
 		return '';
 	}
@@ -384,51 +384,51 @@ 
 	 * @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()) {
 
-				EE_Registry::instance()->load_helper( 'Maps' );
-				EE_Registry::instance()->load_helper( 'Formatter' );
+				EE_Registry::instance()->load_helper('Maps');
+				EE_Registry::instance()->load_helper('Formatter');
 
 				$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);
 
 			}
 		}
@@ -443,7 +443,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()) {
 		EE_Registry::instance()->load_helper('Maps');
 		$state = $venue->state_obj();
 		$country = $venue->country_obj();
@@ -475,23 +475,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 '';

Braces +3 added lines, -1 removed lines

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

core/libraries/form_sections/EE_Sample_Form.form.php

Spacing +11 added lines, -11 removed lines

@@ -1,20 +1,20 @@ 
 <?php
-class EE_Sample_Form extends EE_Form_Section_Proper{
-	function __construct(){
+class EE_Sample_Form extends EE_Form_Section_Proper {
+	function __construct() {
 		$this->_subsections = array(
 			'h1'=>new EE_Form_Section_HTML('hello wordl'),
-			'name'=>new EE_Text_Input(array('required'=>true,'default'=>'your name here')),
+			'name'=>new EE_Text_Input(array('required'=>true, 'default'=>'your name here')),
 			'email'=>new EE_Email_Input(array('required'=>false)),
-			'shirt_size'=>new EE_Select_Input(array(''=>'Please select...', 's'=>  __("Small", "event_espresso"),'m'=>  __("Medium", "event_espresso"),'l'=>  __("Large", "event_espresso")),array('required'=>true,'default'=>'s')),
+			'shirt_size'=>new EE_Select_Input(array(''=>'Please select...', 's'=>  __("Small", "event_espresso"), 'm'=>  __("Medium", "event_espresso"), 'l'=>  __("Large", "event_espresso")), array('required'=>true, 'default'=>'s')),
 			'month_normal'=>new EE_Month_Input(),
 			'month_leading_zero'=>new EE_Month_Input(true),
 			'year_2'=>new EE_Year_Input(false, 1, 1),
-			'year_4'=>new EE_Year_Input(true, 0,10,array('default'=>'2017')),
+			'year_4'=>new EE_Year_Input(true, 0, 10, array('default'=>'2017')),
 			'yes_no'=>new EE_Yes_No_Input(array('html_label_text'=>  __("Yes or No", "event_espresso"))),
 			'credit_card'=>new EE_Credit_Card_Input(),
 			'image_1'=>new EE_Admin_File_Uploader_Input(),
 			'image_2'=>new EE_Admin_File_Uploader_Input(),
-			'skillz'=>new EE_Checkbox_Multi_Input(array('php'=>'PHP','mysql'=>'MYSQL'),array('default'=>array('php'))),
+			'skillz'=>new EE_Checkbox_Multi_Input(array('php'=>'PHP', 'mysql'=>'MYSQL'), array('default'=>array('php'))),
 			'float'=>new EE_Float_Input(),
 			'essay'=>new EE_Text_Area_Input(),
 			'amenities'=>new EE_Select_Multiple_Input(
@@ -40,16 +40,16 @@ 
 	 * Extra validation for the 'name' input.
 	 * @param EE_Text_Input $form_input
 	 */
-	function _validate_name($form_input){
-		if($form_input->raw_value() != 'Mike'){
+	function _validate_name($form_input) {
+		if ($form_input->raw_value() != 'Mike') {
 			$form_input->add_validation_error(__("You are not mike. You must be brent or darren. Thats ok, I guess", 'event_espresso'), 'not-mike');
 		}
 	}
 
-	function _validate(){
+	function _validate() {
 		parent::_validate();
-		if($this->_subsections['shirt_size']->normalized_value() =='s'
-				&& $this->_subsections['year_4']->normalized_value() < 2010){
+		if ($this->_subsections['shirt_size']->normalized_value() == 's'
+				&& $this->_subsections['year_4']->normalized_value() < 2010) {
 			$this->add_validation_error(__("If you want a small shirt, you should be born after 2010. Otherwise theyre just too big", 'event_espresso'), 'too-old');
 		}
 	}

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

Indentation +10 added lines, -10 removed lines

@@ -2,16 +2,16 @@
 if (!defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
- * EE_Form_Section_HTML
- * HTML to be laid out like a proper subsection
- *
- *
- * @package			Event Espresso
- * @subpackage
- * @author				Mike Nelson
- *
- * ------------------------------------------------------------------------
- */
+	 * EE_Form_Section_HTML
+	 * HTML to be laid out like a proper subsection
+	 *
+	 *
+	 * @package			Event Espresso
+	 * @subpackage
+	 * @author				Mike Nelson
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 class EE_Form_Section_HTML extends EE_Form_Section_Base{
 
 	protected $_html = '';

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
  * EE_Form_Section_HTML
@@ -12,7 +12,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Form_Section_HTML extends EE_Form_Section_Base{
+class EE_Form_Section_HTML extends EE_Form_Section_Base {
 
 	protected $_html = '';
 
@@ -22,9 +22,9 @@ 
 	 * @param string $html
 	 * @param array $options_array
 	 */
-	public function __construct( $html = '', $options_array = array() ) {
+	public function __construct($html = '', $options_array = array()) {
 		$this->_html = $html;
-		parent::__construct( $options_array );
+		parent::__construct($options_array);
 	}
 
 

Braces +2 added lines, -1 removed lines

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

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

Spacing +4 added lines, -4 removed lines

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

Braces +2 added lines, -1 removed lines

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