eventespresso / event-espresso-core

core/libraries/messages/EE_Messenger_Collection_Loader.lib.php

Spacing +22 added lines, -22 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -32,8 +32,8 @@ 
 	 *
 	 * @param EE_Messenger_Collection $messengers
 	 */
-	public function __construct( EE_Messenger_Collection $messengers ) {
-		$this->set_messenger_collection( $messengers );
+	public function __construct(EE_Messenger_Collection $messengers) {
+		$this->set_messenger_collection($messengers);
 	}
 
 
@@ -50,7 +50,7 @@ 
 	/**
 	 * @param mixed $messengers
 	 */
-	public function set_messenger_collection( EE_Messenger_Collection $messengers ) {
+	public function set_messenger_collection(EE_Messenger_Collection $messengers) {
 		$this->_messenger_collection = $messengers;
 	}
 
@@ -63,41 +63,41 @@ 
 	 * @param  string $folder
 	 * @throws \EE_Error
 	 */
-	public function load_messengers_from_folder( $folder = '' ) {
+	public function load_messengers_from_folder($folder = '') {
 		//make sure autoloaders are set (fail-safe)
 		EED_Messages::set_autoloaders();
-		$folder = ! empty( $folder ) ? $folder : EE_LIBRARIES . 'messages' . DS . 'messenger';
-		$folder .= $folder[ strlen( $folder ) - 1 ] != DS ? DS : '';
+		$folder = ! empty($folder) ? $folder : EE_LIBRARIES.'messages'.DS.'messenger';
+		$folder .= $folder[strlen($folder) - 1] != DS ? DS : '';
 		// get all the files in that folder that end in ".class.php
 		$filepaths = apply_filters(
 			'FHEE__EE_messages__get_installed__messenger_files',
-			glob( $folder . '*.class.php' )
+			glob($folder.'*.class.php')
 		);
-		if ( empty( $filepaths ) ) {
+		if (empty($filepaths)) {
 			return;
 		}
-		foreach ( (array) $filepaths as $file_path ) {
+		foreach ((array) $filepaths as $file_path) {
 			// extract filename from path
-			$file_path = basename( $file_path );
+			$file_path = basename($file_path);
 			// now remove any file extensions
-			$messenger_class_name = substr( $file_path, 0, strpos( $file_path, '.' ) );
+			$messenger_class_name = substr($file_path, 0, strpos($file_path, '.'));
 
 			//first check to see if the class name represents an actual messenger class.
-			if ( strpos( strtolower( $messenger_class_name ), 'messenger' ) === false ) {
+			if (strpos(strtolower($messenger_class_name), 'messenger') === false) {
 				continue;
 			}
 
-			if ( ! class_exists( $messenger_class_name ) ) {
+			if ( ! class_exists($messenger_class_name)) {
 				throw new EE_Error(
 					sprintf(
-						__( 'The "%1$s" messenger class can\'t be loaded from %2$s.  Likely there is a typo in the class name or the file name.', 'event_espresso' ),
+						__('The "%1$s" messenger class can\'t be loaded from %2$s.  Likely there is a typo in the class name or the file name.', 'event_espresso'),
 						$messenger_class_name,
 						$file_path
 					)
 				);
 			}
 
-			$this->_load_messenger( new $messenger_class_name() );
+			$this->_load_messenger(new $messenger_class_name());
 		}
 	}
 
@@ -113,10 +113,10 @@ 
 		EED_Messages::set_autoloaders();
 		$active_messengers = apply_filters(
 			'FHEE__EEH_MSG_Template__get_active_messengers_in_db',
-			get_option( 'ee_active_messengers', array() )
+			get_option('ee_active_messengers', array())
 		);
-		foreach ( (array) $active_messengers as $active_messenger_classname => $active_messenger ) {
-			$this->_load_messenger( $active_messenger );
+		foreach ((array) $active_messengers as $active_messenger_classname => $active_messenger) {
+			$this->_load_messenger($active_messenger);
 		}
 	}
 
@@ -128,8 +128,8 @@ 
 	 * @param \EE_messenger $messenger
 	 * @return bool
 	 */
-	protected function _load_messenger( EE_messenger $messenger ) {
-		if ( $this->messenger_collection()->has_by_name( $messenger->name ) ) {
+	protected function _load_messenger(EE_messenger $messenger) {
+		if ($this->messenger_collection()->has_by_name($messenger->name)) {
 			return true;
 		}
 		return $this->messenger_collection()->add(

core/libraries/messages/EE_Payment_Base_message_type.lib.php

Spacing +7 added lines, -7 removed lines

@@ -51,26 +51,26 @@
 
 
 
-	protected function _get_data_for_context( $context, EE_Registration $registration, $id ) {
+	protected function _get_data_for_context($context, EE_Registration $registration, $id) {
 
 		//use the registration to get the transaction.
 		$transaction = $registration->transaction();
 
 		//bail early if no transaction
-		if ( ! $transaction instanceof EE_Transaction ) {
-			throw new EE_Error( __('The given registration does not have an associated transaction. Something is wrong.', 'event_espresso' ) );
+		if ( ! $transaction instanceof EE_Transaction) {
+			throw new EE_Error(__('The given registration does not have an associated transaction. Something is wrong.', 'event_espresso'));
 		}
 
-		$payment = ! empty( $id ) ? EEM_Payment::instance()->get_one( array( array( 'PAY_ID' => $id, 'TXN_ID' => $transaction->ID() ) ) ) : 0;
+		$payment = ! empty($id) ? EEM_Payment::instance()->get_one(array(array('PAY_ID' => $id, 'TXN_ID' => $transaction->ID()))) : 0;
 
-		return array( $transaction, $payment );
+		return array($transaction, $payment);
 	}
 
 
 
-	protected function _get_admin_content_events_edit_for_messenger( EE_messenger $messenger ) {
+	protected function _get_admin_content_events_edit_for_messenger(EE_messenger $messenger) {
 		//this is just a test
-		return $this->name . ' Message Type for ' . $messenger->name . ' Messenger ';
+		return $this->name.' Message Type for '.$messenger->name.' Messenger ';
 	}
 
 	/**

core/libraries/messages/EE_Registration_Base_message_type.lib.php

Spacing +20 added lines, -20 removed lines

@@ -38,35 +38,35 @@ 
 	}
 
 
-	protected function _get_admin_content_events_edit_for_messenger( EE_messenger $messenger ) {
+	protected function _get_admin_content_events_edit_for_messenger(EE_messenger $messenger) {
 		//this is just a test
-		return $this->name . ' Message Type for ' . $messenger->name . ' Messenger ';
+		return $this->name.' Message Type for '.$messenger->name.' Messenger ';
 	}
 
 
 
 
 	protected function _set_data_handler() {
-		if ( is_array( $this->_data ) ) {
-			$data_type = reset( $this->_data );
+		if (is_array($this->_data)) {
+			$data_type = reset($this->_data);
 
-			if ( is_array( $data_type ) ) {
+			if (is_array($data_type)) {
 				//grab the first item and see if its a registration.
-				$maybe_reg = isset( $data_type[0] ) && is_array( $data_type[0] ) ? reset( $data_type[0] ) : reset( $data_type );
-				if ( $maybe_reg instanceof EE_Registration ) {
+				$maybe_reg = isset($data_type[0]) && is_array($data_type[0]) ? reset($data_type[0]) : reset($data_type);
+				if ($maybe_reg instanceof EE_Registration) {
 					//is $data_type itself just an array of registrations?
-					if ( isset( $data_type[1] ) && $data_type[1] instanceof EE_Registration  ) {
+					if (isset($data_type[1]) && $data_type[1] instanceof EE_Registration) {
 						$regs = $data_type;
 					} else {
-						$regs = is_array( $data_type[0] ) ? $data_type[0] : array( $maybe_reg );
+						$regs = is_array($data_type[0]) ? $data_type[0] : array($maybe_reg);
 					}
 
-					foreach ( $regs as $reg ) {
-						if ( $reg instanceof EE_Registration ) {
+					foreach ($regs as $reg) {
+						if ($reg instanceof EE_Registration) {
 							$this->_regs_for_sending[] = $reg->ID();
 						}
 					}
-					$this->_data = isset( $this->_data[1] ) ? array( $maybe_reg->transaction(), null, $this->_data[1] ) : array( $maybe_reg->transaction() );
+					$this->_data = isset($this->_data[1]) ? array($maybe_reg->transaction(), null, $this->_data[1]) : array($maybe_reg->transaction());
 					$this->_data_handler = 'Gateways';
 				} else {
 					$this->_data_handler = 'Gateways';
@@ -83,18 +83,18 @@ 
 
 
 
-	protected function _get_data_for_context( $context, EE_Registration $registration, $id ) {
-		if ( $context  == 'admin' ) {
+	protected function _get_data_for_context($context, EE_Registration $registration, $id) {
+		if ($context == 'admin') {
 			//use the registration to get the transaction.
 			$transaction = $registration->transaction();
 
 			//bail early if no transaction
-			if ( ! $transaction instanceof EE_Transaction ) {
-				throw new EE_Error( __('The given registration does not have an associated transaction. Something is wrong.', 'event_espresso' ) );
+			if ( ! $transaction instanceof EE_Transaction) {
+				throw new EE_Error(__('The given registration does not have an associated transaction. Something is wrong.', 'event_espresso'));
 			}
 
-			$payment = !empty( $id ) ? EEM_Payment::instance()->get_one( array( array( 'PAY_ID' => $id, 'TXN_ID' => $transaction->ID() ) ) ) : 0;
-			return array( $transaction, $payment );
+			$payment = ! empty($id) ? EEM_Payment::instance()->get_one(array(array('PAY_ID' => $id, 'TXN_ID' => $transaction->ID()))) : 0;
+			return array($transaction, $payment);
 		} else {
 			return $registration;
 		}
@@ -120,7 +120,7 @@ 
 	 * @return array array of EE_Messages_Addressee objects
 	 */
 	protected function _admin_addressees() {
-		if ( $this->_single_message )
+		if ($this->_single_message)
 			return array();
 		return parent::_admin_addressees();
 	}
@@ -128,7 +128,7 @@ 
 
 
 	protected function _primary_attendee_addressees() {
-		if ( $this->_single_message )
+		if ($this->_single_message)
 			return array();
 
 		return parent::_primary_attendee_addressees();

core/libraries/messages/data_class/EE_Messages_Preview_incoming_data.class.php

Spacing +84 added lines, -84 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -29,8 +29,8 @@ 
 	 * For the constructor of this special preview class.  We're either looking for an event id or empty data.  If we have an event id (or ids) then we'll use that as the source for the "dummy" data.  If the data is empty then we'll get the first three published events from the users database and use that as a source.
 	 * @param array $data
 	 */
-	public function __construct( $data = array() ) {
-		$this->_data = isset( $data['event_ids'] ) ? $data['event_ids'] : array();
+	public function __construct($data = array()) {
+		$this->_data = isset($data['event_ids']) ? $data['event_ids'] : array();
 		$this->_setup_attendees_events();
 		parent::__construct($data);
 	}
@@ -46,7 +46,7 @@ 
 	 *
 	 * @return array   The prepped data for db
 	 */
-	static public function convert_data_for_persistent_storage( $data ) {
+	static public function convert_data_for_persistent_storage($data) {
 		return $data;
 	}
 
@@ -61,7 +61,7 @@ 
 	 *
 	 * @return array
 	 */
-	static public function convert_data_from_persistent_storage( $data ) {
+	static public function convert_data_from_persistent_storage($data) {
 		return $data;
 	}
 
@@ -78,12 +78,12 @@ 
 		$attendees = $this->_get_some_attendees();
 
 		//if empty $data we'll do a query to get some events from the server. otherwise we'll retrieve the event data for the given ids.
-		$events = $this->_get_some_events( $this->_data );
+		$events = $this->_get_some_events($this->_data);
 
 		$answers_n_questions = $this->_get_some_q_and_as();
 
-		if ( count( $events ) < 1 ) {
-			throw new EE_Error( __('We can\'t generate a preview for you because there are no active events in your database', 'event_espresso' ) );
+		if (count($events) < 1) {
+			throw new EE_Error(__('We can\'t generate a preview for you because there are no active events in your database', 'event_espresso'));
 		}
 
 
@@ -93,14 +93,14 @@ 
 
 		//we'll actually use the generated line_item identifiers for our loop
 		$dtts = $tkts = array();
-		foreach( $events as $id => $event ) {
-			if ( ! $event instanceof EE_Event ) {
+		foreach ($events as $id => $event) {
+			if ( ! $event instanceof EE_Event) {
 				continue;
 			}
 			$this->_events[$id]['ID'] = $id;
 			$this->_events[$id]['name'] = $event->get('EVT_name');
 			$datetime = $event->get_first_related('Datetime');
-			$tickets = $datetime instanceof EE_Datetime ? $datetime->get_many_related('Ticket', array('default_where_conditions' => 'none') ) : array();
+			$tickets = $datetime instanceof EE_Datetime ? $datetime->get_many_related('Ticket', array('default_where_conditions' => 'none')) : array();
 			$this->_events[$id]['event'] = $event;
 			$this->_events[$id]['reg_objs'] = array();
 			$this->_events[$id]['tkt_objs'] = $tickets;
@@ -108,51 +108,51 @@ 
 
 			$dttcache = array();
 			$tkts = array();
-			foreach ( $tickets as $ticket ) {
-				if ( ! $ticket instanceof EE_Ticket ) {
+			foreach ($tickets as $ticket) {
+				if ( ! $ticket instanceof EE_Ticket) {
 					continue;
 				}
 				$reldatetime = $ticket->datetimes();
-				$tkts[ $ticket->ID() ] = array();
-				$tkts[ $ticket->ID() ][ 'ticket' ] = $ticket;
-				$tkts[ $ticket->ID() ][ 'dtt_objs' ] = $reldatetime;
-				$tkts[ $ticket->ID() ][ 'att_objs' ] = $attendees;
-				$tkts[ $ticket->ID() ][ 'count' ] = count( $attendees );
-				$tkts[ $ticket->ID() ][ 'EE_Event' ] = $event;
-				foreach ( $reldatetime as $datetime ) {
-					if ( $datetime instanceof EE_Datetime && ! isset( $dtts[ $datetime->ID() ] ) ) {
-						$this->_events[ $id ][ 'dtt_objs' ][ $datetime->ID() ] = $datetime;
-						$dtts[ $datetime->ID() ][ 'datetime' ] = $datetime;
-						$dtts[ $datetime->ID() ][ 'tkt_objs' ][] = $ticket;
-						$dtts[ $datetime->ID() ][ 'evt_objs' ][] = $event;
-						$dttcache[ $datetime->ID() ] = $datetime;
+				$tkts[$ticket->ID()] = array();
+				$tkts[$ticket->ID()]['ticket'] = $ticket;
+				$tkts[$ticket->ID()]['dtt_objs'] = $reldatetime;
+				$tkts[$ticket->ID()]['att_objs'] = $attendees;
+				$tkts[$ticket->ID()]['count'] = count($attendees);
+				$tkts[$ticket->ID()]['EE_Event'] = $event;
+				foreach ($reldatetime as $datetime) {
+					if ($datetime instanceof EE_Datetime && ! isset($dtts[$datetime->ID()])) {
+						$this->_events[$id]['dtt_objs'][$datetime->ID()] = $datetime;
+						$dtts[$datetime->ID()]['datetime'] = $datetime;
+						$dtts[$datetime->ID()]['tkt_objs'][] = $ticket;
+						$dtts[$datetime->ID()]['evt_objs'][] = $event;
+						$dttcache[$datetime->ID()] = $datetime;
 					}
 				}
 			}
 
-			$this->_events[$id]['total_attendees'] = count( $attendees );
+			$this->_events[$id]['total_attendees'] = count($attendees);
 			$this->_events[$id]['att_objs'] = $attendees;
 
 			//let's also setup the dummy attendees property!
-			foreach ( $attendees as $att_key => $attendee ) {
-				if ( ! $attendee instanceof EE_Attendee ) {
+			foreach ($attendees as $att_key => $attendee) {
+				if ( ! $attendee instanceof EE_Attendee) {
 					continue;
 				}
-				$this->_attendees[$att_key]['line_ref'][] = $id;  //so later it can be determined what events this attendee registered for!
+				$this->_attendees[$att_key]['line_ref'][] = $id; //so later it can be determined what events this attendee registered for!
 				$this->_attendees[$att_key]['evt_objs'][] = $event;
 				$this->_attendees[$att_key]['att_obj'] = $attendee;
 				//$this->_attendees[$att_key]['registration_id'] = 0;
 				$this->_attendees[$att_key]['attendee_email'] = $attendee->email();
 				$this->_attendees[$att_key]['tkt_objs'] = $tickets;
-				if ( $att_key == 999999991 ) {
+				if ($att_key == 999999991) {
 					$this->_attendees[$att_key]['ans_objs'][999] = $answers_n_questions['answers'][999];
 					$this->_attendees[$att_key]['ans_objs'][1002] = $answers_n_questions['answers'][1002];
 					$this->_attendees[$att_key]['ans_objs'][1005] = $answers_n_questions['answers'][1005];
-				} elseif ( $att_key == 999999992 ) {
+				} elseif ($att_key == 999999992) {
 					$this->_attendees[$att_key]['ans_objs'][1000] = $answers_n_questions['answers'][1000];
 					$this->_attendees[$att_key]['ans_objs'][1003] = $answers_n_questions['answers'][1003];
 					$this->_attendees[$att_key]['ans_objs'][1006] = $answers_n_questions['answers'][1006];
-				} elseif ( $att_key == 999999993 ) {
+				} elseif ($att_key == 999999993) {
 					$this->_attendees[$att_key]['ans_objs'][1001] = $answers_n_questions['answers'][1001];
 					$this->_attendees[$att_key]['ans_objs'][1004] = $answers_n_questions['answers'][1004];
 					$this->_attendees[$att_key]['ans_objs'][1007] = $answers_n_questions['answers'][1007];
@@ -225,11 +225,11 @@ 
 
 		//let's generate the attendee objects
 		$attendees = array();
-		$var_array = array('fname','lname','email','address','address2','city','staid','cntry','zip','phone','deleted','attid');
+		$var_array = array('fname', 'lname', 'email', 'address', 'address2', 'city', 'staid', 'cntry', 'zip', 'phone', 'deleted', 'attid');
 
 		//EE_Registry::instance()->load_class( 'Attendee', array(), FALSE, false, TRUE );
-		foreach ( $dummy_attendees as $dummy ) {
-			$att = array_combine( $var_array, $dummy );
+		foreach ($dummy_attendees as $dummy) {
+			$att = array_combine($var_array, $dummy);
 			extract($att);
 			/** @var $fname string */
 			/** @var $lname string */
@@ -346,15 +346,15 @@ 
 
 		$qsts = array();
 		//first the questions
-		foreach ( $quests_array as $qst ) {
-			$qstobj = array_combine( $qst_columns, $qst );
+		foreach ($quests_array as $qst) {
+			$qstobj = array_combine($qst_columns, $qst);
 			$qsts[$qstobj['QST_ID']] = EE_Question::new_instance($qstobj);
 		}
 
 		//now the answers (and we'll setup our arrays)
 		$q_n_as = array();
-		foreach ( $ans_array as $ans ) {
-			$ansobj = array_combine( $ans_columns, $ans );
+		foreach ($ans_array as $ans) {
+			$ansobj = array_combine($ans_columns, $ans);
 			$ansobj = EE_Answer::new_instance($ansobj);
 			$q_n_as['answers'][$ansobj->ID()] = $ansobj;
 			$q_n_as['questions'][$ansobj->ID()] = $qsts[$ansobj->get('QST_ID')];
@@ -376,25 +376,25 @@ 
 	 * @param  array  $event_ids if set, this will be an array of event ids to obtain events for.
 	 * @return array    An array of event objects from the db.
 	 */
-	private function _get_some_events( $event_ids = array() ) {
+	private function _get_some_events($event_ids = array()) {
 
 		//HEY, if we have an evt_id then we want to make sure we use that for the preview (because a specific event template is being viewed);
-		$event_ids = isset( $_REQUEST['evt_id'] ) && !empty( $_REQUEST['evt_id'] )
-			? array( $_REQUEST['evt_id'] )
+		$event_ids = isset($_REQUEST['evt_id']) && ! empty($_REQUEST['evt_id'])
+			? array($_REQUEST['evt_id'])
 			: $event_ids;
 
-		$limit = !empty( $event_ids )
+		$limit = ! empty($event_ids)
 			? NULL
-			: apply_filters( 'FHEE__EE_Messages_Preview_incoming_data___get_some_events__limit', '0,1' );
+			: apply_filters('FHEE__EE_Messages_Preview_incoming_data___get_some_events__limit', '0,1');
 
-		$where = ! empty( $event_ids )
+		$where = ! empty($event_ids)
 			? array(
-				'EVT_ID' => array( 'IN', $event_ids ),
-				'Datetime.Ticket.TKT_ID' => array( '>', 1 )
+				'EVT_ID' => array('IN', $event_ids),
+				'Datetime.Ticket.TKT_ID' => array('>', 1)
 			)
-			: array( 'Datetime.Ticket.TKT_ID' => array( '>', 1 ) );
+			: array('Datetime.Ticket.TKT_ID' => array('>', 1));
 
-		$events = EE_Registry::instance()->load_model('Event')->get_all(array($where, 'limit' => $limit ) );
+		$events = EE_Registry::instance()->load_model('Event')->get_all(array($where, 'limit' => $limit));
 
 		return $events;
 	}
@@ -407,17 +407,17 @@ 
 	protected function _setup_data() {
 
 		//need to figure out the running total for test purposes so... we're going to create a temp cart and add the tickets to it!
-		if ( EE_Registry::instance()->SSN instanceof EE_Session ) {
-			EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ );
+		if (EE_Registry::instance()->SSN instanceof EE_Session) {
+			EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
 			$session = EE_Registry::instance()->SSN;
 		} else {
-			$session = EE_Registry::instance()->load_core( 'Session' );
+			$session = EE_Registry::instance()->load_core('Session');
 		}
-		$cart = EE_Cart::instance( null, $session );
+		$cart = EE_Cart::instance(null, $session);
 
 
 		//add tickets to cart
-		foreach ( $this->tickets as $ticket ) {
+		foreach ($this->tickets as $ticket) {
 			$cart->add_ticket_to_cart($ticket['ticket']);
 		}
 
@@ -441,14 +441,14 @@ 
 		//note we're setting up a reg object for each attendee in each event but ALSO adding to the reg_object array.
 		$this->reg_objs = array();
 		$regid = 9999990;
-		foreach ( $this->_attendees as $key => $attendee ) {
+		foreach ($this->_attendees as $key => $attendee) {
 			//note we need to setup reg_objects for each event this attendee belongs to
 			$regatt = $attendee['att_obj'] instanceof EE_Attendee ? $attendee['att_obj']->ID() : null;
 			$regtxn = $this->txn->ID();
 			$regcnt = 1;
-			foreach ( $attendee['line_ref'] as $evtid ) {
-				foreach ( $this->_events[$evtid]['tkt_objs'] as $ticket ) {
-					if ( ! $ticket instanceof EE_Ticket ) {
+			foreach ($attendee['line_ref'] as $evtid) {
+				foreach ($this->_events[$evtid]['tkt_objs'] as $ticket) {
+					if ( ! $ticket instanceof EE_Ticket) {
 						continue;
 					}
 					$reg_array = array(
@@ -460,14 +460,14 @@ 
 						'REG_date' => time(),
 						'REG_final_price' => $ticket->get('TKT_price'),
 						'REG_session' => 'dummy_session_id',
-						'REG_code' => $regid . '-dummy-generated-code',
-						'REG_url_link' => $regcnt . '-daafpapasdlfakasdfpqasdfasdf',
+						'REG_code' => $regid.'-dummy-generated-code',
+						'REG_url_link' => $regcnt.'-daafpapasdlfakasdfpqasdfasdf',
 						'REG_count' => $regcnt,
 						'REG_group_size' => $this->_events[$evtid]['total_attendees'],
 						'REG_att_is_going' => TRUE,
 						'REG_ID' => $regid
 					);
-					$REG_OBJ =  EE_Registration::new_instance( $reg_array );
+					$REG_OBJ = EE_Registration::new_instance($reg_array);
 					$this->_attendees[$key]['reg_objs'][$regid] = $REG_OBJ;
 					$this->_events[$evtid]['reg_objs'][] = $REG_OBJ;
 					$this->reg_objs[] = $REG_OBJ;
@@ -483,40 +483,40 @@ 
 
 		//setup line items!
 		EE_Registry::instance()->load_helper('Line_Item');
-		$line_item_total = EEH_Line_Item::create_total_line_item( $this->txn );
+		$line_item_total = EEH_Line_Item::create_total_line_item($this->txn);
 
 		//add tickets
-		foreach ( $this->tickets as $tktid => $item ) {
+		foreach ($this->tickets as $tktid => $item) {
 			$qty = $item['count'];
 			$ticket = $item['ticket'];
-			EEH_Line_Item::add_ticket_purchase( $line_item_total, $ticket, $qty );
+			EEH_Line_Item::add_ticket_purchase($line_item_total, $ticket, $qty);
 		}
 
-		$shipping_line_item = EE_Line_Item::new_instance( array(
-			'LIN_name' => __( 'Shipping Surcharge', 'event_espresso' ),
-			'LIN_desc' => __( 'Sent via Millenium Falcon', 'event_espresso' ),
+		$shipping_line_item = EE_Line_Item::new_instance(array(
+			'LIN_name' => __('Shipping Surcharge', 'event_espresso'),
+			'LIN_desc' => __('Sent via Millenium Falcon', 'event_espresso'),
 			'LIN_unit_price' => 20,
 			'LIN_quantity' => 1,
 			'LIN_is_taxable' => TRUE,
 			'LIN_total' => 20,
 			'LIN_type' => EEM_Line_Item::type_line_item
 		));
-		EEH_Line_Item::add_item($line_item_total, $shipping_line_item );
-		$this->additional_line_items = array( $shipping_line_item );
+		EEH_Line_Item::add_item($line_item_total, $shipping_line_item);
+		$this->additional_line_items = array($shipping_line_item);
 
 		//now let's add taxes
-		EEH_Line_Item::apply_taxes( $line_item_total );
+		EEH_Line_Item::apply_taxes($line_item_total);
 
 		//now we should be able to get the items we need from this object
-		$event_line_items = EEH_Line_Item::get_pre_tax_subtotal( $line_item_total )->children();
+		$event_line_items = EEH_Line_Item::get_pre_tax_subtotal($line_item_total)->children();
 		$line_items = array();
-		foreach ( $event_line_items as $line_id => $line_item ) {
-			if ( ! $line_item instanceof EE_Line_Item || $line_item->OBJ_type() !== 'Event' ) {
+		foreach ($event_line_items as $line_id => $line_item) {
+			if ( ! $line_item instanceof EE_Line_Item || $line_item->OBJ_type() !== 'Event') {
 				continue;
 			}
-			$ticket_line_items = EEH_Line_Item::get_ticket_line_items( $line_item );
-			foreach ( $ticket_line_items as $ticket_line_id => $ticket_line_item ) {
-				if ( ! $ticket_line_item instanceof EE_Line_Item ) {
+			$ticket_line_items = EEH_Line_Item::get_ticket_line_items($line_item);
+			foreach ($ticket_line_items as $ticket_line_id => $ticket_line_item) {
+				if ( ! $ticket_line_item instanceof EE_Line_Item) {
 					continue;
 				}
 				$this->tickets[$ticket_line_item->OBJ_ID()]['line_item'] = $ticket_line_item;
@@ -532,12 +532,12 @@ 
 		//add proper total to transaction object.
 		$grand_total = $line_item_total->recalculate_total_including_taxes();
 		$this->grand_total_line_item = $line_item_total;
-		$this->txn->set_total( $grand_total );
+		$this->txn->set_total($grand_total);
 
 
 		//add additional details for each registration
-		foreach ( $this->reg_objs as $reg ) {
-			if ( ! $reg instanceof EE_Registration ) {
+		foreach ($this->reg_objs as $reg) {
+			if ( ! $reg instanceof EE_Registration) {
 				continue;
 			}
 			$this->_registrations[$reg->ID()]['tkt_obj'] = $this->tickets[$reg->get('TKT_ID')]['ticket'];
@@ -562,17 +562,17 @@ 
 				? $this->_attendees[999999991]['att_obj']->fname()
 				: '',
 
-			'lname' => $this->_attendees[ 999999991 ][ 'att_obj' ] instanceof EE_Attendee
+			'lname' => $this->_attendees[999999991]['att_obj'] instanceof EE_Attendee
 				? $this->_attendees[999999991]['att_obj']->lname()
 				: '',
 
-			'email' => $this->_attendees[ 999999991 ][ 'att_obj' ] instanceof EE_Attendee
+			'email' => $this->_attendees[999999991]['att_obj'] instanceof EE_Attendee
 				? $this->_attendees[999999991]['att_obj']->email()
 				: '',
 
 			'att_obj' => $this->_attendees[999999991]['att_obj'],
 
-			'reg_obj' => array_shift( $attendees_to_shift[999999991]['reg_objs'] )
+			'reg_obj' => array_shift($attendees_to_shift[999999991]['reg_objs'])
 		);
 
 		//reg_info property
@@ -580,7 +580,7 @@ 
 		$this->reg_info = array();
 
 		//let's set a reg_obj for messengers expecting one.
-		$this->reg_obj = array_pop( $this->_attendees[999999991]['reg_objs'] );
+		$this->reg_obj = array_pop($this->_attendees[999999991]['reg_objs']);
 
 
 		//the below are just dummy items.

core/libraries/messages/data_class/EE_Messages_REG_incoming_data.class.php

Spacing +23 added lines, -23 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -29,20 +29,20 @@ 
 	 * @param EE_Registration|array $data
 	 * @throws \EE_Error
 	 */
-	public function __construct( $data ) {
+	public function __construct($data) {
 		$filtered_reg_status = null;
 
-		if ( ! is_array( $data ) && $data instanceof EE_Registration ) {
+		if ( ! is_array($data) && $data instanceof EE_Registration) {
 			$this->reg_obj = $data;
 		} else {
-			$this->reg_obj = is_array( $data ) && isset( $data[0] ) && $data[0] instanceof EE_Registration ? $data[0] : null;
-			$filtered_reg_status = is_array( $data ) && ! empty( $data[1] ) ? $data[1] : null;
+			$this->reg_obj = is_array($data) && isset($data[0]) && $data[0] instanceof EE_Registration ? $data[0] : null;
+			$filtered_reg_status = is_array($data) && ! empty($data[1]) ? $data[1] : null;
 		}
 
-		if ( ! $this->reg_obj instanceof EE_Registration ) {
+		if ( ! $this->reg_obj instanceof EE_Registration) {
 			throw new EE_Error(
 				sprintf(
-					__( '%1$s requires the incoming data argument to be an instance of %2$s or an array where the first value is an instance of %2$s', 'event_espresso'),
+					__('%1$s requires the incoming data argument to be an instance of %2$s or an array where the first value is an instance of %2$s', 'event_espresso'),
 					'EE_Messages_REG_incoming_data',
 					'EE_Registration'
 				)
@@ -64,18 +64,18 @@ 
 	 *
 	 * @return array   The prepped data for db
 	 */
-	static public function convert_data_for_persistent_storage( $data ) {
+	static public function convert_data_for_persistent_storage($data) {
 		$prepped_data = array();
-		if ( ! is_array( $data ) && $data instanceof EE_Registration ) {
+		if ( ! is_array($data) && $data instanceof EE_Registration) {
 			$prepped_data['Registration'] = $data->ID();
 			return $prepped_data;
-		} elseif ( ! is_array( $data ) ) {
+		} elseif ( ! is_array($data)) {
 			return array();
 		} else {
-			if ( $data[0] instanceof EE_Registration ) {
+			if ($data[0] instanceof EE_Registration) {
 				$prepped_data['Registration'] = $data[0];
 			}
-			if ( ! empty( $data[1] ) ) {
+			if ( ! empty($data[1])) {
 				$prepped_data['filter'] = $data[1];
 			}
 		}
@@ -91,17 +91,17 @@ 
 	 *
 	 * @return mixed
 	 */
-	static public function convert_data_from_persistent_storage( $data ) {
+	static public function convert_data_from_persistent_storage($data) {
 		$registration = null;
 		//$data['Registration'] could be either an ID (back compat) or a registration object (prepped using old system).
-		if ( isset( $data[ 'Registration' ] ) ) {
-			$registration = $data[ 'Registration' ] instanceof EE_Registration
-				? $data[ 'Registration' ]
-				: EEM_Registration::instance()->get_one_by_ID( $data[ 'Registration' ] );
+		if (isset($data['Registration'])) {
+			$registration = $data['Registration'] instanceof EE_Registration
+				? $data['Registration']
+				: EEM_Registration::instance()->get_one_by_ID($data['Registration']);
 		}
 		$prepped_data = array(
 			0 => $registration,
-			1 => isset( $data['filter'] ) ? $data['filter'] : null
+			1 => isset($data['filter']) ? $data['filter'] : null
 		);
 		return $prepped_data;
 	}
@@ -119,18 +119,18 @@ 
 		$this->txn = $this->reg_obj->transaction();
 		//possible session stuff?
 		$session = $this->txn->session_data();
-		$session_data =  $session instanceof EE_Session ? $session->get_session_data() : array();
+		$session_data = $session instanceof EE_Session ? $session->get_session_data() : array();
 
 		//other data from the session (if possible)
-		$this->user_id = isset( $session_data['user_id'] ) ? $session_data['user_id'] : '';
-		$this->ip_address = isset( $session_data['ip_address'] ) ? $session_data['ip_address'] : '';
-		$this->user_agent = isset( $session_data['user_agent'] ) ? $session_data['user_agent'] : '';
+		$this->user_id = isset($session_data['user_id']) ? $session_data['user_id'] : '';
+		$this->ip_address = isset($session_data['ip_address']) ? $session_data['ip_address'] : '';
+		$this->user_agent = isset($session_data['user_agent']) ? $session_data['user_agent'] : '';
 		$this->init_access = $this->last_access = '';
 
 		$this->payment = $this->txn->get_first_related('Payment');
 		// if there is no payments associated with the transaction
 		// then we just create a default payment object for potential parsing.
-		$this->payment = empty( $this->payment )
+		$this->payment = empty($this->payment)
 			? EE_Payment::new_instance(
 				array(
 					'STS_ID'               => EEM_Payment::status_id_pending,

core/libraries/messages/defaults/EE_Messages_Template_Defaults.lib.php

Spacing +23 added lines, -23 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'NO direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('NO direct script access allowed');
 }
 
 /**
@@ -109,14 +109,14 @@ 
 	 *                              about where to obtain the templates.
 	 *
 	 */
-	final private function _set_templates( $template_pack ) {
+	final private function _set_templates($template_pack) {
 
 		//get the corresponding template pack object (if present.  If not then we just load the default and add a
 		//notice).  The class name should be something like 'EE_Messages_Template_Pack_Default' where "default' would be
 		//the incoming template pack reference.
-		$class_name = 'EE_Messages_Template_Pack_' . str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $template_pack ) ) );
+		$class_name = 'EE_Messages_Template_Pack_'.str_replace(' ', '_', ucwords(str_replace('_', ' ', $template_pack)));
 
-		if ( ! class_exists( $class_name ) ) {
+		if ( ! class_exists($class_name)) {
 			EE_Error::add_error(
 				sprintf(
 					__(
@@ -135,7 +135,7 @@ 
 		$template_pack = new $class_name;
 
 		//get all the templates from the template pack.
-		$this->_templates = $template_pack->get_templates( $this->_messenger, $this->_message_type );
+		$this->_templates = $template_pack->get_templates($this->_messenger, $this->_message_type);
 	}
 
 
@@ -159,15 +159,15 @@ 
 	public function create_new_templates() {
 		$template_pack = 'default';
 		//if we have the GRP_ID then let's use that to see if there is a set template pack and use that for the new templates.
-		if ( ! empty( $this->_GRP_ID ) ) {
-			$message_template_group = $this->_message_template_group_model->get_one_by_ID( $this->_GRP_ID );
+		if ( ! empty($this->_GRP_ID)) {
+			$message_template_group = $this->_message_template_group_model->get_one_by_ID($this->_GRP_ID);
 			$template_pack = $message_template_group instanceof EE_Message_Template_Group
 				? $message_template_group->get_template_pack_name()
 				: 'default';
 			//we also need to reset the template variation to default
-			$message_template_group->set_template_pack_variation( 'default' );
+			$message_template_group->set_template_pack_variation('default');
 		}
-		return $this->_create_new_templates( $template_pack );
+		return $this->_create_new_templates($template_pack);
 	}
 
 
@@ -181,12 +181,12 @@ 
 	 *                              which will contain information about where to obtain the templates.
 	 * @return mixed (array|bool) 	success array or false.
 	 */
-	protected function _create_new_templates( $template_pack ) {
+	protected function _create_new_templates($template_pack) {
 
-		$this->_set_templates( $template_pack );
+		$this->_set_templates($template_pack);
 
 		//necessary properties are set, let's save the default templates
-		if ( empty( $this->_GRP_ID ) ) {
+		if (empty($this->_GRP_ID)) {
 			$main_template_data = array(
 				'MTP_messenger'    => $this->_messenger->name,
 				'MTP_message_type' => $this->_message_type->name,
@@ -197,24 +197,24 @@ 
 				'MTP_is_active'    => 1,
 			);
 			//let's insert the above and get our GRP_ID, then reset the template data array to just include the GRP_ID
-			$grp_id = $this->_message_template_group_model->insert( $main_template_data );
-			if ( empty( $grp_id ) ) {
+			$grp_id = $this->_message_template_group_model->insert($main_template_data);
+			if (empty($grp_id)) {
 				return $grp_id;
 			}
 			$this->_GRP_ID = $grp_id;
 		}
 
-		$template_data = array( 'GRP_ID' => $this->_GRP_ID );
+		$template_data = array('GRP_ID' => $this->_GRP_ID);
 
-		foreach ( $this->_contexts as $context => $details ) {
-			foreach ( $this->_fields as $field => $field_type ) {
-				if ( $field != 'extra' ) {
+		foreach ($this->_contexts as $context => $details) {
+			foreach ($this->_fields as $field => $field_type) {
+				if ($field != 'extra') {
 					$template_data['MTP_context'] = $context;
 					$template_data['MTP_template_field'] = $field;
-					$template_data['MTP_content'] = $this->_templates[ $context ][ $field ];
+					$template_data['MTP_content'] = $this->_templates[$context][$field];
 
-					$MTP = $this->_message_template_model->insert( $template_data );
-					if ( ! $MTP ) {
+					$MTP = $this->_message_template_model->insert($template_data);
+					if ( ! $MTP) {
 						EE_Error::add_error(
 							sprintf(
 								__(
@@ -238,7 +238,7 @@ 
 
 		return array(
 			'GRP_ID'      => $this->_GRP_ID,
-			'MTP_context' => key( $this->_contexts )
+			'MTP_context' => key($this->_contexts)
 		);
 	}
 

core/libraries/messages/messenger/EE_Email_messenger.class.php

Spacing +52 added lines, -52 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -29,7 +29,7 @@ 
 /**
  * This sets up the email messenger for the EE_messages (notifications) subsystem in EE.
  */
-class EE_Email_messenger extends EE_messenger  {
+class EE_Email_messenger extends EE_messenger {
 
 	/**
 	 * The following are the properties that email requires for the message going out.
@@ -77,7 +77,7 @@ 
 	protected function _set_valid_shortcodes() {
 		//remember by leaving the other fields not set, those fields will inherit the valid shortcodes from the message type.
 		$this->_valid_shortcodes = array(
-			'to' => array('email','event_author', 'primary_registration_details', 'recipient_details'),
+			'to' => array('email', 'event_author', 'primary_registration_details', 'recipient_details'),
 			'from' => array('email', 'event_author', 'primary_registration_details', 'recipient_details')
 			);
 	}
@@ -111,7 +111,7 @@ 
 				'shortcodes' => array('organization', 'primary_registration_details', 'event_author', 'primary_registration_details', 'recipient_details')
 				),
 			'content' => array(
-				'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'primary_registration_details', 'primary_registration_list', 'event_author', 'recipient_details', 'recipient_list', 'transaction', 'messenger')
+				'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'primary_registration_details', 'primary_registration_list', 'event_author', 'recipient_details', 'recipient_list', 'transaction', 'messenger')
 				),
 			'attendee_list' => array(
 				'shortcodes' => array('attendee', 'event_list', 'ticket_list'),
@@ -122,7 +122,7 @@ 
 				'required' => array('[EVENT_LIST]')
 				),
 			'ticket_list' => array(
-				'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list','primary_registration_details', 'recipient_details'),
+				'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'primary_registration_details', 'recipient_details'),
 				'required' => array('[TICKET_LIST]')
 				),
 			'datetime_list' => array(
@@ -141,21 +141,21 @@ 
 	 *
 	 * @since 4.5.0
 	 */
-	public function do_secondary_messenger_hooks( $sending_messenger_name ) {
-		if ( $sending_messenger_name = 'html' ) {
-			add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10, 8 );
+	public function do_secondary_messenger_hooks($sending_messenger_name) {
+		if ($sending_messenger_name = 'html') {
+			add_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10, 8);
 		}
 	}
 
 
 
 
-	public function add_email_css( $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack ) {
+	public function add_email_css($variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack) {
 		//prevent recursion on this callback.
-		remove_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10 );
-		$variation = $this->get_variation( $template_pack, $message_type, $url, 'main', $variation, FALSE  );
+		remove_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10);
+		$variation = $this->get_variation($template_pack, $message_type, $url, 'main', $variation, FALSE);
 
-		add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10, 8 );
+		add_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10, 8);
 		return $variation;
 	}
 
@@ -187,7 +187,7 @@ 
 				'required' => FALSE,
 				'validation' => FALSE,
 				'format' => '%s',
-				'value' => sprintf( __('Test email sent from %s', 'event_espresso'), get_bloginfo('name') ),
+				'value' => sprintf(__('Test email sent from %s', 'event_espresso'), get_bloginfo('name')),
 				'default'=> '',
 				'css_class' => ''
 				)
@@ -349,16 +349,16 @@ 
 	 * @return bool | WP_Error  true if message delivered, false if it didn't deliver OR bubble up any error object if present.
 	 */
 	protected function _send_message() {
-		$success =  wp_mail(
-			html_entity_decode( $this->_to, ENT_QUOTES, "UTF-8" ),
-			stripslashes( html_entity_decode( $this->_subject, ENT_QUOTES, "UTF-8" )),
+		$success = wp_mail(
+			html_entity_decode($this->_to, ENT_QUOTES, "UTF-8"),
+			stripslashes(html_entity_decode($this->_subject, ENT_QUOTES, "UTF-8")),
 			$this->_body(),
 			$this->_headers()
 		);
-		if ( ! $success ) {
+		if ( ! $success) {
 			EE_Error::add_error(
 				sprintf(
-					__( 'The email did not send successfully.%3$sThe WordPress wp_mail function is used for sending mails but does not give any useful information when an email fails to send.%3$sIt is possible the "to" address (%1$s) or "from" address (%2$s) is invalid.%3$s', 'event_espresso'),
+					__('The email did not send successfully.%3$sThe WordPress wp_mail function is used for sending mails but does not give any useful information when an email fails to send.%3$sIt is possible the "to" address (%1$s) or "from" address (%2$s) is invalid.%3$s', 'event_espresso'),
 					$this->_to,
 					$this->_from,
 					'<br />'
@@ -377,7 +377,7 @@ 
 	 * @return string html body of the message content and the related css.
 	 */
 	protected function _preview() {
-		return $this->_body( true );
+		return $this->_body(true);
 	}
 
 
@@ -391,18 +391,18 @@ 
 	 * @return string formatted header for email
 	 */
 	protected function _headers() {
-		$from = stripslashes_deep( html_entity_decode($this->_from,  ENT_QUOTES,"UTF-8" ) );
+		$from = stripslashes_deep(html_entity_decode($this->_from, ENT_QUOTES, "UTF-8"));
 		$headers = array(
 			'MIME-Version: 1.0',
-			'From:' . $from,
-			'Reply-To:' . $from,
+			'From:'.$from,
+			'Reply-To:'.$from,
 			'Content-Type:text/html; charset=utf-8'
 			);
 
 		//but wait!  Header's for the from is NOT reliable because some plugins don't respect From: as set in the header.
-		add_filter( 'wp_mail_from',  array( $this, 'set_from_address' ), 100 );
-		add_filter( 'wp_mail_from_name', array( $this, 'set_from_name' ), 100 );
-		return apply_filters( 'FHEE__EE_Email_messenger___headers', $headers, $this->_incoming_message_type, $this );
+		add_filter('wp_mail_from', array($this, 'set_from_address'), 100);
+		add_filter('wp_mail_from_name', array($this, 'set_from_name'), 100);
+		return apply_filters('FHEE__EE_Email_messenger___headers', $headers, $this->_incoming_message_type, $this);
 	}
 
 
@@ -418,19 +418,19 @@ 
 	 * @return array
 	 */
 	private function _parse_from() {
-		if ( strpos( $this->_from, '<' ) !== false ) {
-			$from_name = substr( $this->_from, 0, strpos( $this->_from, '<' ) - 1 );
-			$from_name = str_replace( '"', '', $from_name );
-			$from_name = trim( $from_name );
-
-			$from_email = substr( $this->_from, strpos( $this->_from, '<' ) + 1 );
-			$from_email = str_replace( '>', '', $from_email );
-			$from_email = trim( $from_email );
+		if (strpos($this->_from, '<') !== false) {
+			$from_name = substr($this->_from, 0, strpos($this->_from, '<') - 1);
+			$from_name = str_replace('"', '', $from_name);
+			$from_name = trim($from_name);
+
+			$from_email = substr($this->_from, strpos($this->_from, '<') + 1);
+			$from_email = str_replace('>', '', $from_email);
+			$from_email = trim($from_email);
 		} else {
 			$from_name = '';
-			$from_email = trim( $this->_from );
+			$from_email = trim($this->_from);
 		}
-		return array( $from_name, $from_email );
+		return array($from_name, $from_email);
 	}
 
 
@@ -443,7 +443,7 @@ 
 	 *
 	 * @param string $from_email What the original from_email is.
 	 */
-	public function set_from_address( $from_email ) {
+	public function set_from_address($from_email) {
 		$parsed_from = $this->_parse_from();
 		return $parsed_from[1];
 	}
@@ -458,13 +458,13 @@ 
 	 *
 	 * @param string $from_name The original from_name.
 	 */
-	public function set_from_name( $from_name ) {
+	public function set_from_name($from_name) {
 		$parsed_from = $this->_parse_from();
-		if ( is_array( $parsed_from) && ! empty( $parsed_from[0] ) ) {
-			$from_name =  $parsed_from[0];
+		if (is_array($parsed_from) && ! empty($parsed_from[0])) {
+			$from_name = $parsed_from[0];
 		}
 
-		return stripslashes_deep( html_entity_decode($from_name,  ENT_QUOTES,"UTF-8" ) );
+		return stripslashes_deep(html_entity_decode($from_name, ENT_QUOTES, "UTF-8"));
 	}
 
 
@@ -475,14 +475,14 @@ 
 	 * @param bool $preview will determine whether this is preview template or not.
 	 * @return string formatted body for email.
 	 */
-	protected function _body( $preview = false ) {
+	protected function _body($preview = false) {
 		//setup template args!
 		$this->_template_args = array(
 			'subject' => $this->_subject,
 			'from' => $this->_from,
-			'main_body' => wpautop(stripslashes_deep( html_entity_decode($this->_content,  ENT_QUOTES,"UTF-8" ) ))
+			'main_body' => wpautop(stripslashes_deep(html_entity_decode($this->_content, ENT_QUOTES, "UTF-8")))
 			);
-		$body =  $this->_get_main_template( $preview );
+		$body = $this->_get_main_template($preview);
 
 		/**
 		 * This filter allows one to bypass the CSSToInlineStyles tool and leave the body untouched.
@@ -490,17 +490,17 @@ 
 		 * @type    bool    $preview    Indicates whether a preview is being generated or not.
 		 * @return  bool    true  indicates to use the inliner, false bypasses it.
 		 */
-		if ( apply_filters( 'FHEE__EE_Email_messenger__apply_CSSInliner ', true, $preview ) ) {
+		if (apply_filters('FHEE__EE_Email_messenger__apply_CSSInliner ', true, $preview)) {
 
 			//require CssToInlineStyles library and its dependencies via composer autoloader
-			require_once EE_THIRD_PARTY . 'cssinliner/vendor/autoload.php';
+			require_once EE_THIRD_PARTY.'cssinliner/vendor/autoload.php';
 
 			//now if this isn't a preview, let's setup the body so it has inline styles
-			if ( ! $preview || ( $preview && defined( 'DOING_AJAX' ) ) ) {
-				$style = file_get_contents( $this->get_variation( $this->_tmp_pack, $this->_incoming_message_type->name, FALSE, 'main', $this->_variation ), TRUE );
-				$CSS = new TijsVerkoyen\CssToInlineStyles\CssToInlineStyles( $body, $style );
-				$body = ltrim( $CSS->convert( true ), ">\n" ); //for some reason the library has a bracket and new line at the beginning.  This takes care of that.
-				$body = ltrim( $body, "<?" ); //see https://events.codebasehq.com/projects/event-espresso/tickets/8609
+			if ( ! $preview || ($preview && defined('DOING_AJAX'))) {
+				$style = file_get_contents($this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, FALSE, 'main', $this->_variation), TRUE);
+				$CSS = new TijsVerkoyen\CssToInlineStyles\CssToInlineStyles($body, $style);
+				$body = ltrim($CSS->convert(true), ">\n"); //for some reason the library has a bracket and new line at the beginning.  This takes care of that.
+				$body = ltrim($body, "<?"); //see https://events.codebasehq.com/projects/event-espresso/tickets/8609
 			}
 
 		}
@@ -519,8 +519,8 @@ 
 	public function get_existing_test_settings() {
 		$settings = parent::get_existing_test_settings();
 		//override subject if present because we always want it to be fresh.
-		if ( is_array( $settings ) && ! empty( $settings['subject'] ) ) {
-			$settings['subject'] = sprintf( __('Test email sent from %s', 'event_espresso'), get_bloginfo('name') );
+		if (is_array($settings) && ! empty($settings['subject'])) {
+			$settings['subject'] = sprintf(__('Test email sent from %s', 'event_espresso'), get_bloginfo('name'));
 		}
 		return $settings;
 	}

core/libraries/shortcodes/EE_Shortcodes.lib.php

Braces +9 added lines, -5 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
@@ -197,8 +198,10 @@ 
 		$sc_to_verify = !empty($matches[0] ) ? $matches[0][0] . ']' : $shortcode;
 
 		//first we want to make sure this is a valid shortcode
-		if ( !array_key_exists($sc_to_verify, $this->_shortcodes ) )
-			return false; //get out, this parser doesn't handle the incoming shortcode.
+		if ( !array_key_exists($sc_to_verify, $this->_shortcodes ) ) {
+					return false;
+		}
+		//get out, this parser doesn't handle the incoming shortcode.
 		$this->_data = $data;
 		$this->_extra_data = $extra_data;
 		$this->_set_messages_properties();
@@ -276,8 +279,9 @@ 
 		}
 
 		//next test to make sure we've got got a data index in the incoming data array
-		if ( !isset( $this->_data['data'] ) )
-			throw new EE_Error( __('The incoming data does not have the required data index in its array', 'event_espresso') );
+		if ( !isset( $this->_data['data'] ) ) {
+					throw new EE_Error( __('The incoming data does not have the required data index in its array', 'event_espresso') );
+		}
 
 		//all is well let's make sure _extra_data always has the values needed.
 		//let's make sure that extra_data includes all templates (for later parsing if necessary)

Spacing +24 added lines, -24 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -171,7 +171,7 @@ 
 
 
 	public function get_shortcode_helper() {
-		if ( ! $this->_shortcode_helper instanceof EEH_Parse_Shortcodes ) {
+		if ( ! $this->_shortcode_helper instanceof EEH_Parse_Shortcodes) {
 			$this->_set_shortcode_helper();
 		}
 		return $this->_shortcode_helper;
@@ -185,25 +185,25 @@ 
 	 * @param  mixed (object|array) $extra_data extra incoming data (usually EE_Messages_Addressee)
 	 * @return string            parsed shortcode.
 	 */
-	public function parser($shortcode, $data, $extra_data = array() ) {
+	public function parser($shortcode, $data, $extra_data = array()) {
 
 		//filter setup shortcodes
 		$this->_shortcodes = $this->get_shortcodes();
 
 		//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;
 
 		//first we want to make sure this is a valid shortcode
-		if ( !array_key_exists($sc_to_verify, $this->_shortcodes ) )
+		if ( ! array_key_exists($sc_to_verify, $this->_shortcodes))
 			return false; //get out, this parser doesn't handle the incoming shortcode.
 		$this->_data = $data;
 		$this->_extra_data = $extra_data;
 		$this->_set_messages_properties();
-		$parsed = apply_filters( 'FHEE__' . get_class($this) . '__parser_after', $this->_parser($shortcode), $shortcode, $data, $extra_data, $this );
+		$parsed = apply_filters('FHEE__'.get_class($this).'__parser_after', $this->_parser($shortcode), $shortcode, $data, $extra_data, $this);
 
 		//note the below filter applies to ALL shortcode parsers... be careful!
-		$parsed = apply_filters( 'FHEE__EE_Shortcodes__parser_after', $parsed, $shortcode, $data, $extra_data, $this );
+		$parsed = apply_filters('FHEE__EE_Shortcodes__parser_after', $parsed, $shortcode, $data, $extra_data, $this);
 		return $parsed;
 	}
 
@@ -219,10 +219,10 @@ 
 	 * @return array array of shortcodes => description pairs
 	 */
 	public function get_shortcodes() {
-		$this->_shortcodes = apply_filters( 'FHEE__' . get_class($this) . '__shortcodes', $this->_shortcodes, $this );
+		$this->_shortcodes = apply_filters('FHEE__'.get_class($this).'__shortcodes', $this->_shortcodes, $this);
 
 		//note the below filter applies to ALL shortcode parsers... be careful!
-		$this->_shortcodes = apply_filters( 'FHEE__EE_Shortcodes__shortcodes', $this->_shortcodes, $this );
+		$this->_shortcodes = apply_filters('FHEE__EE_Shortcodes__shortcodes', $this->_shortcodes, $this);
 
 		return $this->_shortcodes;
 	}
@@ -252,7 +252,7 @@ 
 	 * @param mixed (object|array) $data incoming data for the parser.  The data could be either an object or array because there are some shortcodes that might be replaced by prepared data that has multiple items in a list (i.e. list of attendees in an event and we're showing fname/lname for each attendee).  In this case data will be in an array.  Otherwise the data shoudl be in a properly formatted object.  The EEH_Parse_Shortcodes.helper.php describes the data object we're expecting.
 	 * @return string parsed shortcode
 	 */
-	abstract protected function _parser( $shortcode );
+	abstract protected function _parser($shortcode);
 
 
 
@@ -264,22 +264,22 @@ 
 	protected function _validate_list_requirements() {
 
 		//first test to make sure we've got an array!
-		if ( !is_array($this->_data) ) {
-			throw new EE_Error( sprintf( __('Expecting an array for the data sent to %s. Instead it was %s', 'event_espresso'), get_class($this), gettype( $this->_data ) ) );
+		if ( ! is_array($this->_data)) {
+			throw new EE_Error(sprintf(__('Expecting an array for the data sent to %s. Instead it was %s', 'event_espresso'), get_class($this), gettype($this->_data)));
 		}
 
 		//next test to make sure we've got the required template in the index!
-		if ( !isset( $this->_data['template'] ) ) {
-			throw new EE_Error( sprintf( __('The incoming data does not have the required template index in its array', 'event_espresso') ) );
+		if ( ! isset($this->_data['template'])) {
+			throw new EE_Error(sprintf(__('The incoming data does not have the required template index in its array', 'event_espresso')));
 		}
 
 		//next test to make sure we've got got a data index in the incoming data array
-		if ( !isset( $this->_data['data'] ) )
-			throw new EE_Error( __('The incoming data does not have the required data index in its array', 'event_espresso') );
+		if ( ! isset($this->_data['data']))
+			throw new EE_Error(__('The incoming data does not have the required data index in its array', 'event_espresso'));
 
 		//all is well let's make sure _extra_data always has the values needed.
 		//let's make sure that extra_data includes all templates (for later parsing if necessary)
-		if ( empty( $this->_extra_data ) || ( empty( $this->_extra_data['data'] ) && empty( $this->_extra_data['template'] ) ) ) {
+		if (empty($this->_extra_data) || (empty($this->_extra_data['data']) && empty($this->_extra_data['template']))) {
 			$this->_extra_data['data'] = $this->_data['data'];
 			$this->_extra_data['template'] = $this->_data['template'];
 		}
@@ -296,16 +296,16 @@ 
 	 *
 	 * @return array An array with the attributes
 	 */
-	protected function _get_shortcode_attrs( $shortcode ) {
+	protected function _get_shortcode_attrs($shortcode) {
 		//make sure the required wp helper function is present
 		//require the shortcode file if necessary
-		if ( ! function_exists( 'shortcode_parse_atts' ) ) {
-			require_once( ABSPATH . WPINC . '/shortcodes.php');
+		if ( ! function_exists('shortcode_parse_atts')) {
+			require_once(ABSPATH.WPINC.'/shortcodes.php');
 		}
 
 		//let's get any attributes that may be present and set the defaults.
-		$shortcode_to_parse = str_replace( '[', '', str_replace( ']', '', $shortcode ) );
-		return shortcode_parse_atts( $shortcode_to_parse );
+		$shortcode_to_parse = str_replace('[', '', str_replace(']', '', $shortcode));
+		return shortcode_parse_atts($shortcode_to_parse);
 	}
 
 
@@ -320,7 +320,7 @@ 
 	 */
 	protected function _set_messages_properties() {
 		//should be in _extra_data
-		if ( isset( $this->_extra_data['messenger'] ) ) {
+		if (isset($this->_extra_data['messenger'])) {
 			$this->_messenger = $this->_extra_data['messenger'];
 			$this->_message_type = $this->_extra_data['message_type'];
 			$this->_context = $this->_extra_data['message'] instanceof EE_Message ? $this->_extra_data['message']->context() : '';

core/libraries/form_sections/inputs/EE_Phone_Input.input.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -15,15 +15,15 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_Phone_Input extends EE_Text_Input{
+class EE_Phone_Input extends EE_Text_Input {
 	/**
 	 * @param array $options
 	 */
-	function __construct($options = array()){
-		$this->_add_validation_strategy( new EE_Text_Validation_Strategy( 
-			__( 'Please enter a valid phone number. Eg 123-456-7890 or 1234567890', 'event_espresso' ), 
+	function __construct($options = array()) {
+		$this->_add_validation_strategy(new EE_Text_Validation_Strategy( 
+			__('Please enter a valid phone number. Eg 123-456-7890 or 1234567890', 'event_espresso'), 
 			'~^(([\d]{10})|([\d]{3}-[\d]{3}-[\d]{4}))$~'));
-		parent::__construct( $options );
+		parent::__construct($options);
 	}
 }