eventespresso / event-espresso-core

core/libraries/messages/validators/email/EE_Messages_Email_Payment_Validator.class.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,11 +30,11 @@ 
 class EE_Messages_Email_Payment_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'payment';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -45,17 +45,17 @@ 
 
 		//modify just event_list
 		$new_config['event_list'] = array(
-			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
 			);
 		$new_config['ticket_list'] = array(
 			'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
 			);
 		$new_config['content'] = array(
-			'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+			'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
 			);
-		$this->_messenger->set_validator_config( $new_config );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		if ($this->_context != 'admin')
 			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Braces +5 added lines, -3 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
@@ -55,8 +56,9 @@ 
 			);
 		$this->_messenger->set_validator_config( $new_config );
 
-		if ( $this->_context != 'admin' )
-			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		if ( $this->_context != 'admin' ) {
+					$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
 	}

core/libraries/messages/validators/email/EE_Messages_Email_Registration_Summary_Validator.class.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -18,11 +18,11 @@ 
 class EE_Messages_Email_Registration_Summary_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'registration_summary';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -35,9 +35,9 @@ 
 			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
 			'required' => array('[EVENT_LIST]')
 			);
-		$this->_messenger->set_validator_config( $new_config );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		if ($this->_context != 'admin')
 			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Braces +5 added lines, -3 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *
@@ -37,8 +38,9 @@ 
 			);
 		$this->_messenger->set_validator_config( $new_config );
 
-		if ( $this->_context != 'admin' )
-			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		if ( $this->_context != 'admin' ) {
+					$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
 	}

core/libraries/messages/validators/email/EE_Messages_Email_Payment_Refund_Validator.class.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,11 +30,11 @@ 
 class EE_Messages_Email_Payment_Refund_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'payment_refund';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -45,17 +45,17 @@ 
 
 		//modify just event_list
 		$new_config['event_list'] = array(
-			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
 			);
 		$new_config['ticket_list'] = array(
 			'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
 			);
 		$new_config['content'] = array(
-			'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+			'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
 			);
-		$this->_messenger->set_validator_config( $new_config );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		if ($this->_context != 'admin')
 			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Braces +5 added lines, -3 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
@@ -55,8 +56,9 @@ 
 			);
 		$this->_messenger->set_validator_config( $new_config );
 
-		if ( $this->_context != 'admin' )
-			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		if ( $this->_context != 'admin' ) {
+					$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
 	}

core/libraries/messages/validators/EE_Messages_Validator.core.php

Braces +43 added lines, -26 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * EE_Messages_Validator class
@@ -121,13 +122,14 @@ 
 	 */
 	public function __construct( $fields, $context ) {
 		//check that _m_name and _mt_name have been set by child class otherwise we get out.
-		if ( empty($this->_m_name ) || empty( $this->_mt_name) )
-			throw new EE_Error(
+		if ( empty($this->_m_name ) || empty( $this->_mt_name) ) {
+					throw new EE_Error(
 				__(
 					'EE_Messages_Validator child classes MUST set the $_m_name and $_mt_name property.  Check that the child class is doing this',
 					'event_espresso'
 				)
 			);
+		}
 		$this->_fields = $fields;
 		$this->_context = $context;
 
@@ -228,8 +230,10 @@ 
 		$groups_per_field = array();
 
 		foreach ( $msgr_validator as $field => $config ) {
-			if ( empty($config) || !isset($config['shortcodes']) )
-				continue;  //Nothing to see here.
+			if ( empty($config) || !isset($config['shortcodes']) ) {
+							continue;
+			}
+			//Nothing to see here.
 			$groups_per_field[$field] = array_intersect( $config['shortcodes'], $mt_codes );
 			$shortcode_groups = array_merge( $config[ 'shortcodes'], $shortcode_groups );
 		}
@@ -268,8 +272,9 @@ 
 			$required = isset($config['required'])
 				? array_intersect($config['required'], array_keys($mt_codes))
 				: true;
-			if ( empty($required) )
-				continue;
+			if ( empty($required) ) {
+							continue;
+			}
 
 			//If we have an override then we use it to indicate the codes we want.
 			if ( isset( $this->_valid_shortcodes_modifier[$context][$field] ) ) {
@@ -310,8 +315,9 @@ 
 			$specific_excludes = $this->get_specific_shortcode_excludes();
 			if ( isset( $specific_excludes[$field] ) ) {
 				foreach( $specific_excludes[$field] as $sex ) {
-					if ( isset( $this->_validators[$field]['shortcodes'][$sex] ) )
-						unset( $this->_validators[$field]['shortcodes'][$sex] );
+					if ( isset( $this->_validators[$field]['shortcodes'][$sex] ) ) {
+											unset( $this->_validators[$field]['shortcodes'][$sex] );
+					}
 				}
 			}
 
@@ -385,10 +391,13 @@ 
 			//get the translated field label!
 			//first check if it's in the main fields list
 			if ( isset( $template_fields[$field] ) ) {
-				if ( empty( $template_fields[$field] ) )
-					$field_label = $field; //most likely the field is found in the 'extra' array.
-				else
-					$field_label = $template_fields[$field]['label'];
+				if ( empty( $template_fields[$field] ) ) {
+									$field_label = $field;
+				}
+				//most likely the field is found in the 'extra' array.
+				else {
+									$field_label = $template_fields[$field]['label'];
+				}
 			}
 
 			// if field label is empty OR is equal to the current field
@@ -402,8 +411,9 @@ 
 
 						// if we've got a 'main' secondary field, let's see if that matches what field we're on
 						// which means it contains the label for this field.
-						if ( $name == 'main' && $main_field == $field_label )
-							$field_label = $values['label'];
+						if ( $name == 'main' && $main_field == $field_label ) {
+													$field_label = $values['label'];
+						}
 					}
 				}
 			}
@@ -439,8 +449,8 @@ 
 			if ( isset( $this->_validators[$field]['type'] ) && !empty( $this->_validators[$field]['type'] ) ) {
 				switch ( $this->_validators[$field]['type'] ) {
 					case 'number' :
-						if ( !is_numeric($value) )
-							$err_msg .= sprintf(
+						if ( !is_numeric($value) ) {
+													$err_msg .= sprintf(
 								__(
 									'%3$sThe %1$s field is supposed to be a number. The value given (%2$s)  is not.  Please double-check and make sure the field contains a number%4$s',
 									'event_espresso'
@@ -450,11 +460,12 @@ 
 								'<p>',
 								'</p >'
 							);
+						}
 						break;
 					case 'email' :
 						$valid_email = $this->_validate_email($value);
-						if ( !$valid_email )
-							$err_msg .= htmlentities(
+						if ( !$valid_email ) {
+													$err_msg .= htmlentities(
 								sprintf(
 									__(
 										'The %1$s field has at least one string that is not a valid email address record.  Valid emails are in the format: "Name <email@something.com>" or "email@something.com" and multiple emails can be separated by a comma.'
@@ -463,6 +474,7 @@ 
 
 								)
 							);
+						}
 						break;
 					default :
 						break;
@@ -539,7 +551,10 @@ 
 			}
 		}
 
-		if ( empty( $diff ) ) return FALSE; //there is no diff, we have no invalid shortcodes, so return
+		if ( empty( $diff ) ) {
+			return FALSE;
+		}
+		//there is no diff, we have no invalid shortcodes, so return
 
 		//made it here? then let's assemble the error message
 		$invalid_shortcodes = implode( '</strong>,<strong>', $diff );
@@ -561,8 +576,9 @@ 
 
 		// empty strings will validate because this is how a message template
 		// for a particular context can be "turned off" (if there is no email then no message)
-		if ( empty( $value ) )
-			return $validate;
+		if ( empty( $value ) ) {
+					return $validate;
+		}
 
 		// first determine if there ARE any shortcodes.
 		// If there are shortcodes and then later we find that there were no other valid emails
@@ -579,8 +595,9 @@ 
 		// its possible that this message is being "turned off" for a particular context
 
 
-		if ( !empty($or_val) && empty($value) )
-			return $validate;
+		if ( !empty($or_val) && empty($value) ) {
+					return $validate;
+		}
 
 		//trim any commas from beginning and end of string ( after whitespace trimmed );
 		$value = trim( trim($value), ',' );
@@ -601,12 +618,12 @@ 
 			//either its of type "bob@whatever.com", or its of type "fname lname <few@few.few>"
 			if(is_email($email)){
 				continue;
-			}else{
+			} else{
 				$matches = array();
 				$validate = preg_match( '/(.*)<(.+)>/', $email, $matches ) ? TRUE : FALSE;
 				if( $validate && is_email($matches[2])){
 					continue;
-				}else{
+				} else{
 					return false;
 				}
 			}

Spacing +100 added lines, -100 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -119,9 +119,9 @@ 
 	 * @param       $context
 	 * @throws \EE_Error
 	 */
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		//check that _m_name and _mt_name have been set by child class otherwise we get out.
-		if ( empty($this->_m_name ) || empty( $this->_mt_name) )
+		if (empty($this->_m_name) || empty($this->_mt_name))
 			throw new EE_Error(
 				__(
 					'EE_Messages_Validator child classes MUST set the $_m_name and $_mt_name property.  Check that the child class is doing this',
@@ -167,14 +167,14 @@ 
 	 */
 	private function _load_objects() {
 		//load messenger
-		$messenger = ucwords( str_replace( '_', ' ', $this->_m_name ) );
-		$messenger = str_replace( ' ', '_', $messenger );
-		$messenger = 'EE_' . $messenger . '_messenger';
+		$messenger = ucwords(str_replace('_', ' ', $this->_m_name));
+		$messenger = str_replace(' ', '_', $messenger);
+		$messenger = 'EE_'.$messenger.'_messenger';
 
-		if ( ! class_exists( $messenger ) ) {
+		if ( ! class_exists($messenger)) {
 			throw new EE_Error(
 				sprintf(
-					__( 'There is no messenger class for the given string (%s)', 'event_espresso' ),
+					__('There is no messenger class for the given string (%s)', 'event_espresso'),
 					$this->_m_name
 				)
 			);
@@ -183,14 +183,14 @@ 
 		$this->_messenger = new $messenger();
 
 		//load message type
-		$message_type = ucwords( str_replace( '_', ' ', $this->_mt_name ) );
-		$message_type = str_replace( ' ', '_', $message_type );
-		$message_type = 'EE_' . $message_type . '_message_type';
+		$message_type = ucwords(str_replace('_', ' ', $this->_mt_name));
+		$message_type = str_replace(' ', '_', $message_type);
+		$message_type = 'EE_'.$message_type.'_message_type';
 
-		if ( !class_exists( $message_type ) ) {
+		if ( ! class_exists($message_type)) {
 			throw new EE_Error(
 				sprintf(
-					__( 'There is no message type class for the given string (%s)', 'event_espresso' ),
+					__('There is no message type class for the given string (%s)', 'event_espresso'),
 					$this->_mt_name
 				)
 			);
@@ -227,25 +227,25 @@ 
 		$shortcode_groups = $mt_codes;
 		$groups_per_field = array();
 
-		foreach ( $msgr_validator as $field => $config ) {
-			if ( empty($config) || !isset($config['shortcodes']) )
-				continue;  //Nothing to see here.
-			$groups_per_field[$field] = array_intersect( $config['shortcodes'], $mt_codes );
-			$shortcode_groups = array_merge( $config[ 'shortcodes'], $shortcode_groups );
+		foreach ($msgr_validator as $field => $config) {
+			if (empty($config) || ! isset($config['shortcodes']))
+				continue; //Nothing to see here.
+			$groups_per_field[$field] = array_intersect($config['shortcodes'], $mt_codes);
+			$shortcode_groups = array_merge($config['shortcodes'], $shortcode_groups);
 		}
 
-		$shortcode_groups = array_unique( $shortcode_groups);
+		$shortcode_groups = array_unique($shortcode_groups);
 
 		// okay now we've got our groups.
 		// Let's get the codes from the objects into an array indexed by group for easy retrieval later.
 		$codes_from_objs = array();
 
-		foreach ( $shortcode_groups as $group ) {
-			$ref = ucwords( str_replace('_', ' ', $group ) );
-			$ref = str_replace( ' ', '_', $ref );
-			$classname = 'EE_' . $ref . '_Shortcodes';
-			if ( class_exists( $classname ) ) {
-				$a = new ReflectionClass( $classname );
+		foreach ($shortcode_groups as $group) {
+			$ref = ucwords(str_replace('_', ' ', $group));
+			$ref = str_replace(' ', '_', $ref);
+			$classname = 'EE_'.$ref.'_Shortcodes';
+			if (class_exists($classname)) {
+				$a = new ReflectionClass($classname);
 				$obj = $a->newInstance();
 				$codes_from_objs[$group] = $obj->get_shortcodes();
 			}
@@ -254,8 +254,8 @@ 
 
 		//let's just replace the $mt shortcode group indexes with the actual shortcodes (unique)
 		$final_mt_codes = array();
-		foreach ( $mt_codes as $group ) {
-			$final_mt_codes = array_merge( $final_mt_codes, $codes_from_objs[$group] );
+		foreach ($mt_codes as $group) {
+			$final_mt_codes = array_merge($final_mt_codes, $codes_from_objs[$group]);
 		}
 
 		$mt_codes = $final_mt_codes;
@@ -263,60 +263,60 @@ 
 
 		// k now in this next loop we're going to loop through $msgr_validator again
 		// and setup the _validators property from the data we've setup so far.
-		foreach ( $msgr_validator as $field => $config ) {
+		foreach ($msgr_validator as $field => $config) {
 			//if required shortcode is not in our list of codes for the given field, then we skip this field.
 			$required = isset($config['required'])
 				? array_intersect($config['required'], array_keys($mt_codes))
 				: true;
-			if ( empty($required) )
+			if (empty($required))
 				continue;
 
 			//If we have an override then we use it to indicate the codes we want.
-			if ( isset( $this->_valid_shortcodes_modifier[$context][$field] ) ) {
-				$this->_validators[ $field ][ 'shortcodes' ] = $this->_reassemble_valid_shortcodes_from_group(
-					$this->_valid_shortcodes_modifier[ $context ][ $field ],
+			if (isset($this->_valid_shortcodes_modifier[$context][$field])) {
+				$this->_validators[$field]['shortcodes'] = $this->_reassemble_valid_shortcodes_from_group(
+					$this->_valid_shortcodes_modifier[$context][$field],
 					$codes_from_objs
 				);
 			}
 
 			//if we have specific shortcodes for a field then we need to use them
-			else if ( isset( $groups_per_field[$field] ) ) {
-				$this->_validators[ $field ][ 'shortcodes' ] = $this->_reassemble_valid_shortcodes_from_group(
-					$groups_per_field[ $field ],
+			else if (isset($groups_per_field[$field])) {
+				$this->_validators[$field]['shortcodes'] = $this->_reassemble_valid_shortcodes_from_group(
+					$groups_per_field[$field],
 					$codes_from_objs
 				);
 			}
 
 			//if empty config then we're assuming we're just going to use the shortcodes from the message type context
-			else if ( empty( $config ) ) {
+			else if (empty($config)) {
 				$this->_validators[$field]['shortcodes'] = $mt_codes;
 			}
 
 			//if we have specific shortcodes then we need to use them
-			else if ( isset($config['specific_shortcodes'] ) ) {
+			else if (isset($config['specific_shortcodes'])) {
 				$this->_validators[$field]['shortcodes'] = $config['specific_shortcodes'];
 			}
 
 			//otherwise the shortcodes are what is set by the messenger for that field
 			else {
-				foreach ( $config['shortcodes'] as $group ) {
+				foreach ($config['shortcodes'] as $group) {
 					$this->_validators[$field]['shortcodes'] = isset($this->_validators[$field]['shortcodes'])
-						? array_merge( $this->_validators[$field]['shortcodes'], $codes_from_objs[$group] )
+						? array_merge($this->_validators[$field]['shortcodes'], $codes_from_objs[$group])
 						: $codes_from_objs[$group];
 				}
 			}
 
 			//now let's just make sure that any excluded specific shortcodes are removed.
 			$specific_excludes = $this->get_specific_shortcode_excludes();
-			if ( isset( $specific_excludes[$field] ) ) {
-				foreach( $specific_excludes[$field] as $sex ) {
-					if ( isset( $this->_validators[$field]['shortcodes'][$sex] ) )
-						unset( $this->_validators[$field]['shortcodes'][$sex] );
+			if (isset($specific_excludes[$field])) {
+				foreach ($specific_excludes[$field] as $sex) {
+					if (isset($this->_validators[$field]['shortcodes'][$sex]))
+						unset($this->_validators[$field]['shortcodes'][$sex]);
 				}
 			}
 
 			//hey! don't forget to include the type if present!
-			$this->_validators[$field]['type'] = isset( $config['type'] ) ? $config['type'] : NULL;
+			$this->_validators[$field]['type'] = isset($config['type']) ? $config['type'] : NULL;
 		}
 	}
 
@@ -344,7 +344,7 @@ 
 	public function get_specific_shortcode_excludes() {
 		//specific validator filter
 		$shortcode_excludes = apply_filters(
-			'FHEE__' . get_class( $this ) . '__get_specific_shortcode_excludes;',
+			'FHEE__'.get_class($this).'__get_specific_shortcode_excludes;',
 			$this->_specific_shortcode_excludes,
 			$this->_context
 		);
@@ -372,20 +372,20 @@ 
 		//some defaults
 		$template_fields = $this->_messenger->get_template_fields();
 		//loop through the fields and check!
-		foreach ( $this->_fields as $field => $value ) {
+		foreach ($this->_fields as $field => $value) {
 			$this->_errors[$field] = array();
 			$err_msg = '';
 			$field_label = '';
 			//if field is not present in the _validators array then we continue
-			if ( !isset( $this->_validators[$field] ) ) {
-				unset( $this->_errors[$field] );
+			if ( ! isset($this->_validators[$field])) {
+				unset($this->_errors[$field]);
 				continue;
 			}
 
 			//get the translated field label!
 			//first check if it's in the main fields list
-			if ( isset( $template_fields[$field] ) ) {
-				if ( empty( $template_fields[$field] ) )
+			if (isset($template_fields[$field])) {
+				if (empty($template_fields[$field]))
 					$field_label = $field; //most likely the field is found in the 'extra' array.
 				else
 					$field_label = $template_fields[$field]['label'];
@@ -393,16 +393,16 @@ 
 
 			// if field label is empty OR is equal to the current field
 			// then we need to loop through the 'extra' fields in the template_fields config (if present)
-			if ( isset( $template_fields['extra'] ) && ( empty($field_label) ) || $field_label == $field ) {
-				foreach( $template_fields['extra'] as $main_field => $secondary_field ) {
-					foreach ( $secondary_field as $name => $values ) {
-						if ( $name == $field ) {
+			if (isset($template_fields['extra']) && (empty($field_label)) || $field_label == $field) {
+				foreach ($template_fields['extra'] as $main_field => $secondary_field) {
+					foreach ($secondary_field as $name => $values) {
+						if ($name == $field) {
 							$field_label = $values['label'];
 						}
 
 						// if we've got a 'main' secondary field, let's see if that matches what field we're on
 						// which means it contains the label for this field.
-						if ( $name == 'main' && $main_field == $field_label )
+						if ($name == 'main' && $main_field == $field_label)
 							$field_label = $values['label'];
 					}
 				}
@@ -410,27 +410,27 @@ 
 
 			//field is present. Let's validate shortcodes first (but only if shortcodes present).
 			if (
-				isset( $this->_validators[ $field ][ 'shortcodes' ] )
-				&& ! empty( $this->_validators[ $field ][ 'shortcodes' ] )
+				isset($this->_validators[$field]['shortcodes'])
+				&& ! empty($this->_validators[$field]['shortcodes'])
 			) {
-				$invalid_shortcodes = $this->_invalid_shortcodes( $value, $this->_validators[$field]['shortcodes'] );
+				$invalid_shortcodes = $this->_invalid_shortcodes($value, $this->_validators[$field]['shortcodes']);
 				// if true then that means there is a returned error message
 				// that we'll need to add to the _errors array for this field.
-				if ( $invalid_shortcodes ) {
+				if ($invalid_shortcodes) {
 					$v_s = array_keys($this->_validators[$field]['shortcodes']);
 					$err_msg = sprintf(
 						__(
 							'%3$sThe following shortcodes were found in the "%1$s" field that ARE not valid: %2$s%4$s',
 							'event_espresso'
 						),
-						'<strong>' . $field_label . '</strong>',
+						'<strong>'.$field_label.'</strong>',
 						$invalid_shortcodes,
 						'<p>',
 						'</p >'
 					);
 					$err_msg .= sprintf(
-						__( '%2$sValid shortcodes for this field are: %1$s%3$s', 'event_espresso' ),
-						implode( ', ', $v_s ),
+						__('%2$sValid shortcodes for this field are: %1$s%3$s', 'event_espresso'),
+						implode(', ', $v_s),
 						'<strong>',
 						'</strong>'
 					);
@@ -438,10 +438,10 @@ 
 			}
 
 			//if there's a "type" to be validated then let's do that too.
-			if ( isset( $this->_validators[$field]['type'] ) && !empty( $this->_validators[$field]['type'] ) ) {
-				switch ( $this->_validators[$field]['type'] ) {
+			if (isset($this->_validators[$field]['type']) && ! empty($this->_validators[$field]['type'])) {
+				switch ($this->_validators[$field]['type']) {
 					case 'number' :
-						if ( !is_numeric($value) )
+						if ( ! is_numeric($value))
 							$err_msg .= sprintf(
 								__(
 									'%3$sThe %1$s field is supposed to be a number. The value given (%2$s)  is not.  Please double-check and make sure the field contains a number%4$s',
@@ -455,7 +455,7 @@ 
 						break;
 					case 'email' :
 						$valid_email = $this->_validate_email($value);
-						if ( !$valid_email )
+						if ( ! $valid_email)
 							$err_msg .= htmlentities(
 								sprintf(
 									__(
@@ -472,23 +472,23 @@ 
 			}
 
 			//if $err_msg isn't empty let's setup the _errors array for this field.
-			if ( !empty($err_msg ) ) {
+			if ( ! empty($err_msg)) {
 				$this->_errors[$field]['msg'] = $err_msg;
 			} else {
-				unset( $this->_errors[$field] );
+				unset($this->_errors[$field]);
 			}
 		}
 
 		// if we have ANY errors, then we want to make sure we return the values
 		// for ALL the fields so the user doesn't have to retype them all.
-		if ( !empty( $this->_errors ) ) {
-			foreach ( $this->_fields as $field => $value ) {
+		if ( ! empty($this->_errors)) {
+			foreach ($this->_fields as $field => $value) {
 				$this->_errors[$field]['value'] = stripslashes($value);
 			}
 		}
 
 		//return any errors or just TRUE if everything validates
-		return empty( $this->_errors ) ? TRUE : $this->_errors;
+		return empty($this->_errors) ? TRUE : $this->_errors;
 	}
 
 
@@ -501,10 +501,10 @@ 
 	 * @param  array $codes_from_objs All the codes available.
 	 * @return array                   an array of actual shortcodes (that will be used for validation).
 	 */
-	private function _reassemble_valid_shortcodes_from_group( $groups, $codes_from_objs ) {
+	private function _reassemble_valid_shortcodes_from_group($groups, $codes_from_objs) {
 		$shortcodes = array();
-		foreach ( $groups as $group ) {
-			$shortcodes = array_merge( $shortcodes, $codes_from_objs[$group] );
+		foreach ($groups as $group) {
+			$shortcodes = array_merge($shortcodes, $codes_from_objs[$group]);
 		}
 		return $shortcodes;
 	}
@@ -523,29 +523,29 @@ 
 	 */
 	protected function _invalid_shortcodes($value, $valid_shortcodes) {
 		//first we need to go through the string and get the shortcodes in the string
-		preg_match_all( '/(\[.+?\])/', $value, $matches );
+		preg_match_all('/(\[.+?\])/', $value, $matches);
 		$incoming_shortcodes = (array) $matches[0];
 
 		//get a diff of the shortcodes in the string vs the valid shortcodes
-		$diff = array_diff( $incoming_shortcodes, array_keys($valid_shortcodes) );
+		$diff = array_diff($incoming_shortcodes, array_keys($valid_shortcodes));
 
 		//we need to account for custom codes so let's loop through the diff and remove any of those type of codes
-		foreach ( $diff as $ind => $code ) {
-			if ( preg_match('/(\[[A-Za-z0-9\_]+_\*)/', $code ) ) {
+		foreach ($diff as $ind => $code) {
+			if (preg_match('/(\[[A-Za-z0-9\_]+_\*)/', $code)) {
 				//strip the shortcode so we just have the BASE string (i.e. [ANSWER_*] )
 				$dynamic_sc = preg_replace('/(_\*+.+)/', '_*]', $code);
 				//does this exist in the $valid_shortcodes?  If so then unset.
-				if ( isset( $valid_shortcodes[$dynamic_sc] ) ) {
-					unset( $diff[$ind] );
+				if (isset($valid_shortcodes[$dynamic_sc])) {
+					unset($diff[$ind]);
 				}
 			}
 		}
 
-		if ( empty( $diff ) ) return FALSE; //there is no diff, we have no invalid shortcodes, so return
+		if (empty($diff)) return FALSE; //there is no diff, we have no invalid shortcodes, so return
 
 		//made it here? then let's assemble the error message
-		$invalid_shortcodes = implode( '</strong>,<strong>', $diff );
-		$invalid_shortcodes = '<strong>' . $invalid_shortcodes . '</strong>';
+		$invalid_shortcodes = implode('</strong>,<strong>', $diff);
+		$invalid_shortcodes = '<strong>'.$invalid_shortcodes.'</strong>';
 		return $invalid_shortcodes;
 	}
 
@@ -557,13 +557,13 @@ 
 	 * @param  string $value incoming value to validate
 	 * @return bool        true if the string validates, false if it doesn't
 	 */
-	protected function _validate_email( $value ) {
+	protected function _validate_email($value) {
 		$validate = TRUE;
 		$or_val = $value;
 
 		// empty strings will validate because this is how a message template
 		// for a particular context can be "turned off" (if there is no email then no message)
-		if ( empty( $value ) )
+		if (empty($value))
 			return $validate;
 
 		// first determine if there ARE any shortcodes.
@@ -581,19 +581,19 @@ 
 		// its possible that this message is being "turned off" for a particular context
 
 
-		if ( !empty($or_val) && empty($value) )
+		if ( ! empty($or_val) && empty($value))
 			return $validate;
 
 		//trim any commas from beginning and end of string ( after whitespace trimmed );
-		$value = trim( trim($value), ',' );
+		$value = trim(trim($value), ',');
 
 
 		//next we need to split up the string if its comma delimited.
 		$emails = explode(',', $value);
 		$empty = FALSE; //used to indicate that there is an empty comma.
 		//now let's loop through the emails and do our checks
-		foreach ( $emails as $email ) {
-			if ( empty($email) ) {
+		foreach ($emails as $email) {
+			if (empty($email)) {
 				$empty = TRUE;
 				continue;
 			}
@@ -601,20 +601,20 @@ 
 			//trim whitespace
 			$email = trim($email);
 			//either its of type "bob@whatever.com", or its of type "fname lname <few@few.few>"
-			if(is_email($email)){
+			if (is_email($email)) {
 				continue;
-			}else{
+			} else {
 				$matches = array();
-				$validate = preg_match( '/(.*)<(.+)>/', $email, $matches ) ? TRUE : FALSE;
-				if( $validate && is_email($matches[2])){
+				$validate = preg_match('/(.*)<(.+)>/', $email, $matches) ? TRUE : FALSE;
+				if ($validate && is_email($matches[2])) {
 					continue;
-				}else{
+				} else {
 					return false;
 				}
 			}
 		}
 
-		$validate = $empty && !$has_shortcodes ? FALSE : $validate;
+		$validate = $empty && ! $has_shortcodes ? FALSE : $validate;
 
 		return $validate;
 
@@ -630,7 +630,7 @@ 
 	 * @throws Exception
 	 * @return mixed
 	 */
-	public function __get( $property ) {
+	public function __get($property) {
 		$expected_properties_map = array(
 			/**
 			 * @deprecated 4.9.0
@@ -642,15 +642,15 @@ 
 			'_MSGTYP' => '_message_type'
 		);
 
-		if ( isset( $expected_properties_map[ $property ] ) ) {
-			return $this->{$expected_properties_map[ $property ]};
+		if (isset($expected_properties_map[$property])) {
+			return $this->{$expected_properties_map[$property]};
 		}
 
 		throw new Exception(
 			sprintf(
-				__( 'The property %1$s being requested on %2$s does not exist', 'event_espresso' ),
+				__('The property %1$s being requested on %2$s does not exist', 'event_espresso'),
 				$property,
-				get_class( $this )
+				get_class($this)
 			)
 		);
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -519,7 +519,7 @@
 	 *
 	 * @param  string $value            string to evaluate
 	 * @param  array  $valid_shortcodes array of shortcodes that are acceptable.
-	 * @return mixed (bool|string)  return either a list of invalid shortcodes OR false if the shortcodes validate.
+	 * @return false|string (bool|string)  return either a list of invalid shortcodes OR false if the shortcodes validate.
 	 */
 	protected function _invalid_shortcodes($value, $valid_shortcodes) {
 		//first we need to go through the string and get the shortcodes in the string

caffeinated/core/libraries/messages/message_type/payment_cancelled/EE_Messages_Email_Payment_Cancelled_Validator.class.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -18,11 +18,11 @@ 
 class EE_Messages_Email_Payment_Cancelled_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'payment_cancelled';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -33,17 +33,17 @@ 
 
 		//modify just event_list
 		$new_config['event_list'] = array(
-			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
 			);
 		$new_config['ticket_list'] = array(
 			'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
 			);
 		$new_config['content'] = array(
-			'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+			'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
 			);
-		$this->_messenger->set_validator_config( $new_config );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		if ($this->_context != 'admin')
 			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Braces +5 added lines, -3 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * EE_Messages_Email_Payment_Cancelled_Validator class
@@ -43,8 +44,9 @@ 
 			);
 		$this->_messenger->set_validator_config( $new_config );
 
-		if ( $this->_context != 'admin' )
-			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		if ( $this->_context != 'admin' ) {
+					$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
 	}

caffeinated/core/libraries/messages/message_type/payment_declined/EE_Messages_Email_Payment_Declined_Validator.class.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,11 +30,11 @@ 
 class EE_Messages_Email_Payment_Declined_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'payment_declined';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -45,17 +45,17 @@ 
 
 		//modify just event_list
 		$new_config['event_list'] = array(
-			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
 			);
 		$new_config['ticket_list'] = array(
 			'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
 			);
 		$new_config['content'] = array(
-			'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+			'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
 			);
-		$this->_messenger->set_validator_config( $new_config );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		if ($this->_context != 'admin')
 			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Braces +5 added lines, -3 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
@@ -55,8 +56,9 @@ 
 			);
 		$this->_messenger->set_validator_config( $new_config );
 
-		if ( $this->_context != 'admin' )
-			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		if ( $this->_context != 'admin' ) {
+					$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
 	}

caffeinated/core/libraries/messages/message_type/declined_registration/EE_Messages_Email_Declined_Registration_Validator.class.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,11 +30,11 @@ 
 class EE_Messages_Email_Declined_Registration_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'declined_registration';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -47,9 +47,9 @@ 
 			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
 			'required' => array('[EVENT_LIST]')
 			);
-		$this->_messenger->set_validator_config( $new_config );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		if ($this->_context != 'admin')
 			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Braces +5 added lines, -3 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
@@ -55,8 +56,9 @@ 
 			);
 		$this->_messenger->set_validator_config( $new_config );
 
-		if ( $this->_context != 'admin' )
-			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		if ( $this->_context != 'admin' ) {
+					$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
 	}

caffeinated/core/libraries/messages/message_type/payment_failed/EE_Messages_Email_Payment_Failed_Validator.class.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -18,11 +18,11 @@ 
 class EE_Messages_Email_Payment_Failed_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'payment_failed';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -33,17 +33,17 @@ 
 
 		//modify just event_list
 		$new_config['event_list'] = array(
-			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
 			);
 		$new_config['ticket_list'] = array(
 			'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
 			);
 		$new_config['content'] = array(
-			'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+			'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
 			);
-		$this->_messenger->set_validator_config( $new_config );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		if ($this->_context != 'admin')
 			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Braces +5 added lines, -3 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * EE_Messages_Email_Payment_Failed_Validator class
@@ -43,8 +44,9 @@ 
 			);
 		$this->_messenger->set_validator_config( $new_config );
 
-		if ( $this->_context != 'admin' )
-			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		if ( $this->_context != 'admin' ) {
+					$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
 	}

caffeinated/core/libraries/messages/message_type/payment_reminder/EE_Messages_Email_Payment_Reminder_Validator.class.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,11 +30,11 @@ 
 class EE_Messages_Email_Payment_Reminder_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'payment_reminder';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -45,17 +45,17 @@ 
 
 		//modify just event_list
 		$new_config['event_list'] = array(
-			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
 			);
 		$new_config['ticket_list'] = array(
 			'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
 			);
 		$new_config['content'] = array(
-			'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+			'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
 			);
-		$this->_messenger->set_validator_config( $new_config );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		if ($this->_context != 'admin')
 			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Braces +5 added lines, -3 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
@@ -55,8 +56,9 @@ 
 			);
 		$this->_messenger->set_validator_config( $new_config );
 
-		if ( $this->_context != 'admin' )
-			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		if ( $this->_context != 'admin' ) {
+					$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
 	}