eventespresso / event-espresso-core

core/libraries/line_item_filters/EE_Line_Item_Filter_Base.class.php

Spacing +3 added lines, -3 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');
 }
 /**
  * Class EE_Line_Item_Filter_Base
@@ -24,7 +24,7 @@ 
 	 * @param \EEI_Line_Item $line_item
 	 * @return \EEI_Line_Item
 	 */
-	public function process( EEI_Line_Item $line_item ) {
+	public function process(EEI_Line_Item $line_item) {
 		return $line_item;
 	}
 

core/libraries/messages/EE_Messages_Generator.lib.php

Indentation +5 added lines, -5 removed lines

@@ -464,8 +464,8 @@ 
 		//if the 'to' field is empty (messages will ALWAYS have a "to" field, then we get out because that means this
 		//context is turned off) EXCEPT if we're previewing
 		if ( empty( $templates['to'][ $context ] )
-		     && ! $this->_generation_queue->get_queue()->is_preview()
-		     && ! $this->_current_messenger->allow_empty_to_field() ) {
+			 && ! $this->_generation_queue->get_queue()->is_preview()
+			 && ! $this->_current_messenger->allow_empty_to_field() ) {
 			//we silently exit here and do NOT record a fail because the message is "turned off" by having no "to" field.
 			return false;
 		}
@@ -583,9 +583,9 @@ 
 		 * Check if there is any generation data, but only if this is not for a preview.
 		 */
 		if ( ! $this->_generation_queue->get_queue()->get_generation_data()
-		     && (
-			     ! $this->_generation_queue->get_queue()->is_preview()
-			     && $this->_generation_queue->get_queue()->get_data_handler() !== 'EE_Messages_Preview_incoming_data' )
+			 && (
+				 ! $this->_generation_queue->get_queue()->is_preview()
+				 && $this->_generation_queue->get_queue()->get_data_handler() !== 'EE_Messages_Preview_incoming_data' )
 		) {
 			$this->_error_msg[] = __( 'There is no generation data for this message. Unable to generate.' );
 		}

Spacing +112 added lines, -112 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' )) { exit( 'No direct script access allowed' ); }
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 
 /**
  * This class is used for generating EE_Message objects with given info.
@@ -116,17 +116,17 @@ 
 	 *
 	 * @return EE_Messages_Queue  The new queue for holding generated EE_Message objects.
 	 */
-	public function generate( $save = true ) {
+	public function generate($save = true) {
 		//iterate through the messages in the queue, generate, and add to new queue.
 		$this->_generation_queue->get_queue()->rewind();
-		while ( $this->_generation_queue->get_queue()->valid() ) {
+		while ($this->_generation_queue->get_queue()->valid()) {
 			//reset "current" properties
 			$this->_reset_current_properties();
 
 			/** @type EE_Message $msg */
 			$msg = $this->_generation_queue->get_queue()->current();
 
-			if ( $this->_verify() ) {
+			if ($this->_verify()) {
 				//let's get generating!
 				$this->_generate();
 			}
@@ -138,26 +138,26 @@ 
 			$this->_generation_queue->get_queue()->next();
 			$next_msg = $this->_generation_queue->get_queue()->current();
 			//restore pointer to current item
-			$this->_generation_queue->get_queue()->set_current( $msg );
+			$this->_generation_queue->get_queue()->set_current($msg);
 
 			//if there are error messages then let's set the status and the error message.
-			if ( $this->_error_msg ) {
+			if ($this->_error_msg) {
 				//if the status is already debug only, then let's leave it at that.
-				if ( $msg->STS_ID() !== EEM_Message::status_debug_only ) {
-					$msg->set_STS_ID( EEM_Message::status_failed );
+				if ($msg->STS_ID() !== EEM_Message::status_debug_only) {
+					$msg->set_STS_ID(EEM_Message::status_failed);
 				}
 				$msg->set_error_message(
-					__( 'Message failed to generate for the following reasons: ' )
+					__('Message failed to generate for the following reasons: ')
 					. "\n"
-					. implode( "\n", $this->_error_msg )
+					. implode("\n", $this->_error_msg)
 				);
-				$msg->set_modified( time() );
+				$msg->set_modified(time());
 			} else {
 				//remove from db
 				$this->_generation_queue->get_queue()->delete();
 			}
 			//next item
-			$this->_generation_queue->get_queue()->set_current( $next_msg );
+			$this->_generation_queue->get_queue()->set_current($next_msg);
 		}
 
 		//generation queue is ALWAYS saved to record any errors in the generation process.
@@ -170,7 +170,7 @@ 
 		 * so a EE_Extra_Meta entry could be created and attached to the EE_Message.  In those cases the save flag is
 		 * irrelevant.
 		 */
-		if ( $save ) {
+		if ($save) {
 			$this->_ready_queue->save();
 		}
 
@@ -188,7 +188,7 @@ 
 	protected function _reset_current_properties() {
 		$this->_verified = false;
 		//make sure any _data value in the current message type is reset
-		if ( $this->_current_message_type instanceof EE_message_type ) {
+		if ($this->_current_message_type instanceof EE_message_type) {
 			$this->_current_message_type->reset_data();
 		}
 		$this->_current_messenger = $this->_current_message_type = $this->_current_data_handler = null;
@@ -207,7 +207,7 @@ 
 	 */
 	protected function _generate() {
 		//double check verification has run and that everything is ready to work with (saves us having to validate everything again).
-		if ( ! $this->_verified ) {
+		if ( ! $this->_verified) {
 			return false; //get out because we don't have a valid setup to work with.
 		}
 
@@ -217,34 +217,34 @@ 
 				$this->_current_data_handler,
 				$this->_generation_queue->get_queue()->current()->context()
 			);
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$this->_error_msg[] = $e->getMessage();
 			return false;
 		}
 
 
 		//if no addressees then get out because there is nothing to generation (possible bad data).
-		if ( ! $this->_valid_addressees( $addressees ) ) {
-			$this->_generation_queue->get_queue()->current()->set_STS_ID( EEM_Message::status_debug_only );
-			$this->_error_msg[] = __( 'This is not a critical error but an informational notice. Unable to generate messages EE_Messages_Addressee objects.  There were no attendees prepared by the data handler.
-			  Sometimes this is because messages only get generated for certain registration statuses. For example, the ticket notice message type only goes to approved registrations.', 'event_espresso' );
+		if ( ! $this->_valid_addressees($addressees)) {
+			$this->_generation_queue->get_queue()->current()->set_STS_ID(EEM_Message::status_debug_only);
+			$this->_error_msg[] = __('This is not a critical error but an informational notice. Unable to generate messages EE_Messages_Addressee objects.  There were no attendees prepared by the data handler.
+			  Sometimes this is because messages only get generated for certain registration statuses. For example, the ticket notice message type only goes to approved registrations.', 'event_espresso');
 			return false;
 		}
 
 		$message_template_group = $this->_get_message_template_group();
 
 		//in the unlikely event there is no EE_Message_Template_Group available, get out!
-		if ( ! $message_template_group instanceof EE_Message_Template_Group ) {
-			$this->_error_msg[] = __( 'Unable to get the Message Templates for the Message being generated.  No message template group accessible.', 'event_espresso' );
+		if ( ! $message_template_group instanceof EE_Message_Template_Group) {
+			$this->_error_msg[] = __('Unable to get the Message Templates for the Message being generated.  No message template group accessible.', 'event_espresso');
 			return false;
 		}
 
 		//get formatted templates for using to parse and setup EE_Message objects.
-		$templates = $this->_get_templates( $message_template_group );
+		$templates = $this->_get_templates($message_template_group);
 
 
 		//setup new EE_Message objects (and add to _ready_queue)
-		return $this->_assemble_messages( $addressees, $templates, $message_template_group );
+		return $this->_assemble_messages($addressees, $templates, $message_template_group);
 	}
 
 
@@ -262,17 +262,17 @@ 
 		//so let's use that.
 		$GRP_ID = $this->_generation_queue->get_queue()->current()->GRP_ID();
 
-		if ( $GRP_ID ) {
+		if ($GRP_ID) {
 			//attempt to retrieve from repo first
-			$GRP = $this->_template_collection->get_by_ID( $GRP_ID );
-			if ( $GRP instanceof EE_Message_Template_Group ) {
-				return $GRP;  //got it!
+			$GRP = $this->_template_collection->get_by_ID($GRP_ID);
+			if ($GRP instanceof EE_Message_Template_Group) {
+				return $GRP; //got it!
 			}
 
 			//nope don't have it yet.  Get from DB then add to repo
-			$GRP = EEM_Message_Template_Group::instance()->get_one_by_ID( $GRP_ID );
-			if ( $GRP instanceof EE_Message_Template_Group ) {
-				$this->_template_collection->add( $GRP );
+			$GRP = EEM_Message_Template_Group::instance()->get_one_by_ID($GRP_ID);
+			if ($GRP instanceof EE_Message_Template_Group) {
+				$this->_template_collection->add($GRP);
 			}
 			return $GRP;
 		}
@@ -291,41 +291,41 @@ 
 		//in vanilla EE we're assuming there's only one event.
 		//However, if there are multiple events then we'll just use the default templates instead of different
 		// templates per event (which could create problems).
-		if ( count( $this->_current_data_handler->events ) === 1 ) {
-			foreach ( $this->_current_data_handler->events as $event ) {
+		if (count($this->_current_data_handler->events) === 1) {
+			foreach ($this->_current_data_handler->events as $event) {
 				$EVT_ID = $event['ID'];
 			}
 		}
 
 		//before going any further, let's see if its in the queue
-		$GRP = $this->_template_collection->get_by_key( $this->_template_collection->get_key( $this->_current_messenger->name, $this->_current_message_type->name, $EVT_ID ) );
+		$GRP = $this->_template_collection->get_by_key($this->_template_collection->get_key($this->_current_messenger->name, $this->_current_message_type->name, $EVT_ID));
 
-		if ( $GRP instanceof EE_Message_Template_Group ) {
+		if ($GRP instanceof EE_Message_Template_Group) {
 			return $GRP;
 		}
 
 		//nope still no GRP?
 		//first we get the global template in case it has an override set.
-		$global_template_qa = array_merge( array( 'MTP_is_global' => true ), $template_qa );
-		$global_GRP = EEM_Message_Template_Group::instance()->get_one( array( $global_template_qa ) );
+		$global_template_qa = array_merge(array('MTP_is_global' => true), $template_qa);
+		$global_GRP = EEM_Message_Template_Group::instance()->get_one(array($global_template_qa));
 
 		//if this is an override, then we just return it.
-		if ( $global_GRP instanceof EE_Message_Template_Group && $global_GRP->get( 'MTP_is_override' ) ) {
-			$this->_template_collection->add( $global_GRP, $EVT_ID );
+		if ($global_GRP instanceof EE_Message_Template_Group && $global_GRP->get('MTP_is_override')) {
+			$this->_template_collection->add($global_GRP, $EVT_ID);
 			return $global_GRP;
 		}
 
 		//STILL here? Okay that means we want to see if there is event specific group and if there is we return it,
 		//otherwise we return the global group we retrieved.
-		if ( $EVT_ID ) {
+		if ($EVT_ID) {
 			$template_qa['Event.EVT_ID'] = $EVT_ID;
 		}
 
-		$GRP = EEM_Message_Template_Group::instance()->get_one( array( $template_qa ) );
+		$GRP = EEM_Message_Template_Group::instance()->get_one(array($template_qa));
 		$GRP = $GRP instanceof EE_Message_Template_Group ? $GRP : $global_GRP;
 
-		if ( $GRP instanceof EE_Message_Template_Group ) {
-			$this->_template_collection->add( $GRP, $EVT_ID );
+		if ($GRP instanceof EE_Message_Template_Group) {
+			$this->_template_collection->add($GRP, $EVT_ID);
 			return $GRP;
 		}
 
@@ -349,15 +349,15 @@ 
 	 *                      )
 	 *                  )
 	 */
-	protected function _get_templates( EE_Message_Template_Group $message_template_group ) {
+	protected function _get_templates(EE_Message_Template_Group $message_template_group) {
 		$templates = array();
 		$context_templates = $message_template_group->context_templates();
-		foreach ( $context_templates as $context => $template_fields ) {
-			foreach ( $template_fields as $template_field => $template_obj ) {
-				if ( ! $template_obj instanceof EE_Message_Template ) {
+		foreach ($context_templates as $context => $template_fields) {
+			foreach ($template_fields as $template_field => $template_obj) {
+				if ( ! $template_obj instanceof EE_Message_Template) {
 					continue;
 				}
-				$templates[ $template_field ][ $context ] = $template_obj->get( 'MTP_content' );
+				$templates[$template_field][$context] = $template_obj->get('MTP_content');
 			}
 		}
 		return $templates;
@@ -379,20 +379,20 @@ 
 	 *                get added to the queue with EEM_Message::status_idle, unsuccessfully generated messages will get added
 	 *                to the queue as EEM_Message::status_failed.  Very rarely should "false" be returned from this method.
 	 */
-	protected function _assemble_messages( $addressees, $templates, EE_Message_Template_Group $message_template_group ) {
+	protected function _assemble_messages($addressees, $templates, EE_Message_Template_Group $message_template_group) {
 
 		//if templates are empty then get out because we can't generate anything.
-		if ( ! $templates ) {
+		if ( ! $templates) {
 			return false;
 		}
 
 		//We use this as the counter for generated messages because don't forget we may be executing this inside of a
 		//generation_queue.  So _ready_queue may have generated EE_Message objects already.
 		$generated_count = 0;
-		foreach ( $addressees as $context => $recipients ) {
-			foreach ( $recipients as $recipient ) {
-				$message = $this->_setup_message_object( $context, $recipient, $templates, $message_template_group );
-				if ( $message instanceof EE_Message ) {
+		foreach ($addressees as $context => $recipients) {
+			foreach ($recipients as $recipient) {
+				$message = $this->_setup_message_object($context, $recipient, $templates, $message_template_group);
+				if ($message instanceof EE_Message) {
 					$this->_ready_queue->add(
 						$message,
 						array(),
@@ -427,7 +427,7 @@ 
 	) {
 		//stuff we already know
 		$transaction_id = $recipient->txn instanceof EE_Transaction ? $recipient->txn->ID() : 0;
-		$transaction_id = empty( $transaction_id ) && $this->_current_data_handler->txn instanceof EE_Transaction
+		$transaction_id = empty($transaction_id) && $this->_current_data_handler->txn instanceof EE_Transaction
 			? $this->_current_data_handler->txn->ID()
 			: $transaction_id;
 		$message_fields = array(
@@ -440,7 +440,7 @@ 
 
 		//recipient id and type should be on the EE_Messages_Addressee object but if this is empty, let's try to grab the
 		//info from the att_obj found in the EE_Messages_Addressee object.
-		if ( empty( $recipient->recipient_id ) || empty( $recipient->recipient_type ) ) {
+		if (empty($recipient->recipient_id) || empty($recipient->recipient_type)) {
 			$message_fields['MSG_recipient_ID'] = $recipient->att_obj instanceof EE_Attendee
 				? $recipient->att_obj->ID()
 				: 0;
@@ -449,7 +449,7 @@ 
 			$message_fields['MSG_recipient_ID'] = $recipient->recipient_id;
 			$message_fields['MSG_recipient_type'] = $recipient->recipient_type;
 		}
-		$message = EE_Message_Factory::create( $message_fields );
+		$message = EE_Message_Factory::create($message_fields);
 
 		//grab valid shortcodes for shortcode parser
 		$mt_shortcodes = $this->_current_message_type->get_valid_shortcodes();
@@ -457,43 +457,43 @@ 
 
 		//if the 'to' field is empty (messages will ALWAYS have a "to" field, then we get out because that means this
 		//context is turned off) EXCEPT if we're previewing
-		if ( empty( $templates['to'][ $context ] )
+		if (empty($templates['to'][$context])
 		     && ! $this->_generation_queue->get_queue()->is_preview()
-		     && ! $this->_current_messenger->allow_empty_to_field() ) {
+		     && ! $this->_current_messenger->allow_empty_to_field()) {
 			//we silently exit here and do NOT record a fail because the message is "turned off" by having no "to" field.
 			return false;
 		}
 		$error_msg = array();
-		foreach ( $templates as $field => $field_context ) {
+		foreach ($templates as $field => $field_context) {
 			$error_msg = array();
 			//let's setup the valid shortcodes for the incoming context.
-			$valid_shortcodes = $mt_shortcodes[ $context ];
+			$valid_shortcodes = $mt_shortcodes[$context];
 			//merge in valid shortcodes for the field.
-			$shortcodes = isset($m_shortcodes[ $field ]) ? $m_shortcodes[ $field ] : $valid_shortcodes;
-			if ( isset( $templates[ $field ][ $context ] ) ) {
+			$shortcodes = isset($m_shortcodes[$field]) ? $m_shortcodes[$field] : $valid_shortcodes;
+			if (isset($templates[$field][$context])) {
 				//prefix field.
-				$column_name = 'MSG_' . $field;
+				$column_name = 'MSG_'.$field;
 				try {
 					$content = $this->_shortcode_parser->parse_message_template(
-						$templates[ $field ][ $context ],
+						$templates[$field][$context],
 						$recipient,
 						$shortcodes,
 						$this->_current_message_type,
 						$this->_current_messenger,
 						$message );
-					$message->set_field_or_extra_meta( $column_name, $content );
-				} catch ( EE_Error $e ) {
-					$error_msg[] = sprintf( __( 'There was a problem generating the content for the field %s: %s', 'event_espresso' ), $field, $e->getMessage() );
-					$message->set_STS_ID( EEM_Message::status_failed );
+					$message->set_field_or_extra_meta($column_name, $content);
+				} catch (EE_Error $e) {
+					$error_msg[] = sprintf(__('There was a problem generating the content for the field %s: %s', 'event_espresso'), $field, $e->getMessage());
+					$message->set_STS_ID(EEM_Message::status_failed);
 				}
 			}
 		}
 
-		if ( $message->STS_ID() === EEM_Message::status_failed ) {
-			$error_msg = __( 'There were problems generating this message:', 'event_espresso' ) . "\n" . implode( "\n", $error_msg );
-			$message->set_error_message( $error_msg );
+		if ($message->STS_ID() === EEM_Message::status_failed) {
+			$error_msg = __('There were problems generating this message:', 'event_espresso')."\n".implode("\n", $error_msg);
+			$message->set_error_message($error_msg);
 		} else {
-			$message->set_STS_ID( EEM_Message::status_idle );
+			$message->set_STS_ID(EEM_Message::status_idle);
 		}
 		return $message;
 	}
@@ -527,14 +527,14 @@ 
 	 * @param array $addressees  Keys correspond to contexts for the message type and values are EE_Messages_Addressee[]
 	 * @return bool
 	 */
-	protected function _valid_addressees( $addressees ) {
-		if ( ! $addressees || ! is_array( $addressees ) ) {
+	protected function _valid_addressees($addressees) {
+		if ( ! $addressees || ! is_array($addressees)) {
 			return false;
 		}
 
-		foreach( $addressees as $addressee_array ) {
-			foreach ( $addressee_array as $addressee ) {
-				if ( ! $addressee instanceof EE_Messages_Addressee ) {
+		foreach ($addressees as $addressee_array) {
+			foreach ($addressee_array as $addressee) {
+				if ( ! $addressee instanceof EE_Messages_Addressee) {
 					return false;
 				}
 			}
@@ -555,19 +555,19 @@ 
 	protected function _validate_messenger_and_message_type() {
 
 		//first are there any existing error messages?  If so then return.
-		if ( $this->_error_msg ) {
+		if ($this->_error_msg) {
 			return false;
 		}
 		/** @type EE_Message $message */
 		$message = $this->_generation_queue->get_queue()->current();
 		try {
-			$this->_current_messenger = $message->valid_messenger( true ) ? $message->messenger_object() : null;
-		} catch ( Exception $e ) {
+			$this->_current_messenger = $message->valid_messenger(true) ? $message->messenger_object() : null;
+		} catch (Exception $e) {
 			$this->_error_msg[] = $e->getMessage();
 		}
 		try {
-			$this->_current_message_type = $message->valid_message_type( true ) ? $message->message_type_object() : null;
-		} catch ( Exception $e ) {
+			$this->_current_message_type = $message->valid_message_type(true) ? $message->message_type_object() : null;
+		} catch (Exception $e) {
 			$this->_error_msg[] = $e->getMessage();
 		}
 
@@ -579,10 +579,10 @@ 
 			     ! $this->_generation_queue->get_queue()->is_preview()
 			     && $this->_generation_queue->get_queue()->get_data_handler() !== 'EE_Messages_Preview_incoming_data' )
 		) {
-			$this->_error_msg[] = __( 'There is no generation data for this message. Unable to generate.' );
+			$this->_error_msg[] = __('There is no generation data for this message. Unable to generate.');
 		}
 
-		return empty( $this->_error_msg );
+		return empty($this->_error_msg);
 	}
 
 
@@ -599,7 +599,7 @@ 
 
 		//First, are there any existing error messages?  If so, return because if there were errors elsewhere this can't
 		//be used anyways.
-		if ( $this->_error_msg ) {
+		if ($this->_error_msg) {
 			return false;
 		}
 
@@ -608,29 +608,29 @@ 
 		/** @type EE_Messages_incoming_data $data_handler_class_name - well not really... just the class name actually */
 		$data_handler_class_name = $this->_generation_queue->get_queue()->get_data_handler()
 			? $this->_generation_queue->get_queue()->get_data_handler()
-			: 'EE_Messages_' .  $this->_current_message_type->get_data_handler( $generation_data ) . '_incoming_data';
+			: 'EE_Messages_'.$this->_current_message_type->get_data_handler($generation_data).'_incoming_data';
 
 		//If this EE_Message is for a preview, then let's switch out to the preview data handler.
-		if ( $this->_generation_queue->get_queue()->is_preview() ) {
-			$data_handler_class_name  = 'EE_Messages_Preview_incoming_data';
+		if ($this->_generation_queue->get_queue()->is_preview()) {
+			$data_handler_class_name = 'EE_Messages_Preview_incoming_data';
 		}
 
 		//First get the class name for the data handler (and also verifies it exists.
-		if ( ! class_exists( $data_handler_class_name ) ) {
+		if ( ! class_exists($data_handler_class_name)) {
 			$this->_error_msg[] = sprintf(
-				__( 'The included data handler class name does not match any valid, accessible, "EE_Messages_incoming_data" classes.  Looking for %s.', 'event_espresso' ),
+				__('The included data handler class name does not match any valid, accessible, "EE_Messages_incoming_data" classes.  Looking for %s.', 'event_espresso'),
 				$data_handler_class_name
 			);
 			return false;
 		}
 
 		//convert generation_data for data_handler_instantiation.
-		$generation_data = $data_handler_class_name::convert_data_from_persistent_storage( $generation_data );
+		$generation_data = $data_handler_class_name::convert_data_from_persistent_storage($generation_data);
 
 		//note, this may set error messages as well.
-		$this->_set_data_handler( $generation_data, $data_handler_class_name );
+		$this->_set_data_handler($generation_data, $data_handler_class_name);
 
-		return empty( $this->_error_msg );
+		return empty($this->_error_msg);
 	}
 
 
@@ -647,16 +647,16 @@ 
 	 *
 	 * @return void.
 	 */
-	protected function _set_data_handler( $generating_data, $data_handler_class_name ) {
+	protected function _set_data_handler($generating_data, $data_handler_class_name) {
 		//valid classname for the data handler.  Now let's setup the key for the data handler repository to see if there
 		//is already a ready data handler in the repository.
-		$this->_current_data_handler = $this->_data_handler_collection->get_by_key( $this->_data_handler_collection->get_key( $data_handler_class_name, $generating_data ) );
-		if ( ! $this->_current_data_handler instanceof EE_messages_incoming_data ) {
+		$this->_current_data_handler = $this->_data_handler_collection->get_by_key($this->_data_handler_collection->get_key($data_handler_class_name, $generating_data));
+		if ( ! $this->_current_data_handler instanceof EE_messages_incoming_data) {
 			//no saved data_handler in the repo so let's set one up and add it to the repo.
 			try {
-				$this->_current_data_handler = new $data_handler_class_name( $generating_data );
-				$this->_data_handler_collection->add( $this->_current_data_handler, $generating_data );
-			} catch( EE_Error $e ) {
+				$this->_current_data_handler = new $data_handler_class_name($generating_data);
+				$this->_data_handler_collection->add($this->_current_data_handler, $generating_data);
+			} catch (EE_Error $e) {
 				$this->_error_msg[] = $e->get_error();
 			}
 		}
@@ -676,13 +676,13 @@ 
 	 * @param bool                   $preview Indicate whether this is being used for a preview or not.
 	 * @return mixed Prepped data for persisting to the queue.  false is returned if unable to prep data.
 	 */
-	protected function _prepare_data_for_queue( EE_Message_To_Generate $message_to_generate, $preview ) {
+	protected function _prepare_data_for_queue(EE_Message_To_Generate $message_to_generate, $preview) {
 		/** @type EE_Messages_incoming_data $data_handler - well not really... just the class name actually */
-		$data_handler = $message_to_generate->get_data_handler_class_name( $preview );
-		if ( ! $message_to_generate->valid() ) {
+		$data_handler = $message_to_generate->get_data_handler_class_name($preview);
+		if ( ! $message_to_generate->valid()) {
 			return false; //unable to get the data because the info in the EE_Message_To_Generate class is invalid.
 		}
-		return $data_handler::convert_data_for_persistent_storage( $message_to_generate->data() );
+		return $data_handler::convert_data_for_persistent_storage($message_to_generate->data());
 	}
 
 
@@ -695,26 +695,26 @@ 
 	 * @param EE_Message_To_Generate $message_to_generate
 	 * @param bool                   $test_send Whether this is just a test send or not.  Typically used for previews.
 	 */
-	public function create_and_add_message_to_queue( EE_Message_To_Generate $message_to_generate, $test_send = false ) {
+	public function create_and_add_message_to_queue(EE_Message_To_Generate $message_to_generate, $test_send = false) {
 		//prep data
-		$data = $this->_prepare_data_for_queue( $message_to_generate, $message_to_generate->preview() );
+		$data = $this->_prepare_data_for_queue($message_to_generate, $message_to_generate->preview());
 
 		$message = $message_to_generate->get_EE_Message();
 
 		//is there a GRP_ID in the request?
-		if ( $GRP_ID = EE_Registry::instance()->REQ->get( 'GRP_ID' ) ) {
-			$message->set_GRP_ID( $GRP_ID );
+		if ($GRP_ID = EE_Registry::instance()->REQ->get('GRP_ID')) {
+			$message->set_GRP_ID($GRP_ID);
 		}
 
-		if ( $data === false ) {
-			$message->set_STS_ID( EEM_Message::status_failed );
-			$message->set_error_message( __( 'Unable to prepare data for persistence to the database.', 'event_espresso' ) );
+		if ($data === false) {
+			$message->set_STS_ID(EEM_Message::status_failed);
+			$message->set_error_message(__('Unable to prepare data for persistence to the database.', 'event_espresso'));
 		} else {
 			//make sure that the data handler is cached on the message as well
 			$data['data_handler_class_name'] = $message_to_generate->get_data_handler_class_name();
 		}
 
-		$this->_generation_queue->add( $message, $data, $message_to_generate->preview(), $test_send );
+		$this->_generation_queue->add($message, $data, $message_to_generate->preview(), $test_send);
 	}
 
 

core/libraries/messages/EE_messenger.lib.php

Braces +17 added lines, -11 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -717,8 +718,9 @@ 
 		$wrapper_template = $this->_tmp_pack->get_wrapper( $this->name, $type );
 
 		//check file exists and is readable
-		if ( !is_readable( $wrapper_template ) )
-			throw new EE_Error( sprintf( __('Unable to access the template file for the %s messenger main content wrapper.  The location being attempted is %s.', 'event_espresso' ), ucwords($this->label['singular']) , $wrapper_template ) );
+		if ( !is_readable( $wrapper_template ) ) {
+					throw new EE_Error( sprintf( __('Unable to access the template file for the %s messenger main content wrapper.  The location being attempted is %s.', 'event_espresso' ), ucwords($this->label['singular']) , $wrapper_template ) );
+		}
 
 		//require template helper
 		EE_Registry::instance()->load_helper( 'Template' );
@@ -788,20 +790,24 @@ 
 	 */
 	public function get_field_label( $field ) {
 		//first let's see if the field requests is in the top level array.
-		if ( isset( $this->_template_fields[$field] ) && !empty( $this->_template_fields[$field]['label'] ) )
-			return $this->_template[$field]['label'];
+		if ( isset( $this->_template_fields[$field] ) && !empty( $this->_template_fields[$field]['label'] ) ) {
+					return $this->_template[$field]['label'];
+		}
 
 		//nope so let's look in the extra array to see if it's there HOWEVER if the field exists as a top level index in the extra array then we know the label is in the 'main' index.
-		if ( isset( $this->_template_fields['extra'] ) && !empty( $this->_template_fields['extra'][$field] ) && !empty( $this->_template_fields['extra'][$field]['main']['label'] )  )
-			return $this->_template_fields['extra'][$field]['main']['label'];
+		if ( isset( $this->_template_fields['extra'] ) && !empty( $this->_template_fields['extra'][$field] ) && !empty( $this->_template_fields['extra'][$field]['main']['label'] )  ) {
+					return $this->_template_fields['extra'][$field]['main']['label'];
+		}
 
 		//now it's possible this field may just be existing in any of the extra array items.
 		if ( !empty( $this->_template_fields['extra'] ) && is_array( $this->_template_fields['extra'] ) ) {
 			foreach ( $this->_template_fields['extra'] as $main_field => $subfields ) {
-				if ( !is_array( $subfields ) )
-					continue;
-				if ( isset( $subfields[$field] ) && !empty( $subfields[$field]['label'] ) )
-					return $subfields[$field]['label'];
+				if ( !is_array( $subfields ) ) {
+									continue;
+				}
+				if ( isset( $subfields[$field] ) && !empty( $subfields[$field]['label'] ) ) {
+									return $subfields[$field]['label'];
+				}
 			}
 		}
 

Doc Comments +2 added lines, -2 removed lines

@@ -503,7 +503,7 @@ 
 	/**
 	 * @param $message_types
 	 * @param array $extra
-	 * @return mixed|string
+	 * @return string
 	 */
 	protected function _get_admin_content_events_edit( $message_types, $extra ) {
 		//defaults
@@ -771,7 +771,7 @@ 
 	 * All this does is set the existing test settings (in the db) for the messenger
 	 *
 	 * @access public
-	 * @param $settings
+	 * @param string $settings
 	 * @return bool success/fail
 	 */
 	public function set_existing_test_settings( $settings ) {

Spacing +97 added lines, -97 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -289,7 +289,7 @@ 
 	 * @return void
 	 */
 	public function enqueue_scripts_styles() {
-		do_action( 'AHEE__EE_messenger__enqueue_scripts_styles');
+		do_action('AHEE__EE_messenger__enqueue_scripts_styles');
 	}
 
 
@@ -359,7 +359,7 @@ 
 
 		$this->_supports_labels->template_variation_description = __('These are different styles to choose from for the selected template structure.  Usually these affect things like font style, color, borders etc.  In some cases the styles will also make minor layout changes.');
 
-		$this->_supports_labels = apply_filters( 'FHEE__EE_messenger___set_supports_labels_defaults___supports_labels', $this->_supports_labels, $this );
+		$this->_supports_labels = apply_filters('FHEE__EE_messenger___set_supports_labels_defaults___supports_labels', $this->_supports_labels, $this);
 	}
 
 
@@ -374,10 +374,10 @@ 
 	 * @return stdClass
 	 */
 	public function get_supports_labels() {
-		if ( empty( $this->_supports_labels->template_pack ) || empty( $this->_supports_labels->template_variation) ) {
+		if (empty($this->_supports_labels->template_pack) || empty($this->_supports_labels->template_variation)) {
 			$this->_set_supports_labels_defaults();
 		}
-		return apply_filters( 'FHEE__EE_messenger__get_supports_labels', $this->_supports_labels, $this );
+		return apply_filters('FHEE__EE_messenger__get_supports_labels', $this->_supports_labels, $this);
 	}
 
 
@@ -397,10 +397,10 @@ 
 	 *
 	 * @return string                    path or url for the requested variation.
 	 */
-	public function get_variation( EE_Messages_Template_Pack $pack, $message_type_name, $url = FALSE, $type = 'main', $variation = 'default', $skip_filters = FALSE ) {
+	public function get_variation(EE_Messages_Template_Pack $pack, $message_type_name, $url = FALSE, $type = 'main', $variation = 'default', $skip_filters = FALSE) {
 		$this->_tmp_pack = $pack;
-		$variation_path = apply_filters( 'EE_messenger__get_variation__variation', false, $pack, $this->name, $message_type_name, $url, $type, $variation, $skip_filters );
-		$variation_path = empty( $variation_path ) ? $this->_tmp_pack->get_variation( $this->name, $message_type_name, $type, $variation, $url, '.css', $skip_filters ) : $variation_path;
+		$variation_path = apply_filters('EE_messenger__get_variation__variation', false, $pack, $this->name, $message_type_name, $url, $type, $variation, $skip_filters);
+		$variation_path = empty($variation_path) ? $this->_tmp_pack->get_variation($this->name, $message_type_name, $type, $variation, $url, '.css', $skip_filters) : $variation_path;
 		return $variation_path;
 
 	}
@@ -418,13 +418,13 @@ 
 	 * @return array
 	 */
 	public function get_default_message_types() {
-		$class = get_class( $this );
+		$class = get_class($this);
 
 		//messenger specific filter
-		$default_types = apply_filters( 'FHEE__' . $class . '__get_default_message_types__default_types', $this->_default_message_types, $this );
+		$default_types = apply_filters('FHEE__'.$class.'__get_default_message_types__default_types', $this->_default_message_types, $this);
 
 		//all messengers filter
-		$default_types = apply_filters( 'FHEE__EE_messenger__get_default_message_types__default_types', $default_types, $this );
+		$default_types = apply_filters('FHEE__EE_messenger__get_default_message_types__default_types', $default_types, $this);
 		return $default_types;
 	}
 
@@ -439,14 +439,14 @@ 
 	 * @return array
 	 */
 	public function get_valid_message_types() {
-		$class = get_class( $this );
+		$class = get_class($this);
 
 		//messenger specific filter
 		//messenger specific filter
-		$valid_types = apply_filters( 'FHEE__' . $class . '__get_valid_message_types__valid_types', $this->_valid_message_types, $this );
+		$valid_types = apply_filters('FHEE__'.$class.'__get_valid_message_types__valid_types', $this->_valid_message_types, $this);
 
 		//all messengers filter
-		$valid_types = apply_filters( 'FHEE__EE_messenger__get_valid_message_types__valid_types', $valid_types, $this );
+		$valid_types = apply_filters('FHEE__EE_messenger__get_valid_message_types__valid_types', $valid_types, $this);
 		return $valid_types;
 	}
 
@@ -460,7 +460,7 @@ 
 	 * @access public
 	 * @param array $new_config Whatever is put in here will reset the _validator_config property
 	 */
-	public function set_validator_config( $new_config ) {
+	public function set_validator_config($new_config) {
 		$this->_validator_config = $new_config;
 	}
 
@@ -476,8 +476,8 @@ 
 	public function get_validator_config() {
 		$class = get_class($this);
 
-		$config = apply_filters( 'FHEE__' . $class . '__get_validator_config', $this->_validator_config, $this );
-		$config = apply_filters( 'FHEE__EE_messenger__get_validator_config', $config, $this );
+		$config = apply_filters('FHEE__'.$class.'__get_validator_config', $this->_validator_config, $this);
+		$config = apply_filters('FHEE__EE_messenger__get_validator_config', $config, $this);
 		return $config;
 	}
 
@@ -494,8 +494,8 @@ 
 	 * @access public
 	 * @return string content for page
 	 */
-	public function get_messenger_admin_page_content( $page, $action = null, $extra = array(), $message_types = array() ) {
-		return $this->_get_admin_page_content( $page, $action, $extra, $message_types );
+	public function get_messenger_admin_page_content($page, $action = null, $extra = array(), $message_types = array()) {
+		return $this->_get_admin_page_content($page, $action, $extra, $message_types);
 	}
 
 
@@ -505,20 +505,20 @@ 
 	 * @param array $extra
 	 * @return mixed|string
 	 */
-	protected function _get_admin_content_events_edit( $message_types, $extra ) {
+	protected function _get_admin_content_events_edit($message_types, $extra) {
 		//defaults
 		$template_args = array();
 		$selector_rows = '';
 
 		//we don't need message types here so we're just going to ignore. we do, however, expect the event id here. The event id is needed to provide a link to setup a custom template for this event.
-		$event_id = isset( $extra['event'] ) ? $extra['event'] : NULL;
+		$event_id = isset($extra['event']) ? $extra['event'] : NULL;
 
-		$template_wrapper_path = EE_LIBRARIES . 'messages/messenger/admin_templates/event_switcher_wrapper.template.php';
-		$template_row_path = EE_LIBRARIES . 'messages/messenger/admin_templates/event_switcher_row.template.php';
+		$template_wrapper_path = EE_LIBRARIES.'messages/messenger/admin_templates/event_switcher_wrapper.template.php';
+		$template_row_path = EE_LIBRARIES.'messages/messenger/admin_templates/event_switcher_row.template.php';
 
 		//array of template objects for global and custom (non-trashed) (but remember just for this messenger!)
 		$global_templates = EEM_Message_Template_Group::instance()->get_all(
-			array( array( 'MTP_messenger' => $this->name, 'MTP_is_global' => true, 'MTP_is_active' => true ) )
+			array(array('MTP_messenger' => $this->name, 'MTP_is_global' => true, 'MTP_is_active' => true))
 		);
 		$templates_for_event = EEM_Message_Template_Group::instance()->get_all_custom_templates_by_event(
 			$event_id,
@@ -527,55 +527,55 @@ 
 				'MTP_is_active' => true
 			)
 		);
-		$templates_for_event = !empty( $templates_for_event ) ? $templates_for_event : array();
+		$templates_for_event = ! empty($templates_for_event) ? $templates_for_event : array();
 
 		//so we need to setup the rows for the selectors and we use the global mtpgs (cause those will the active message template groups)
-		foreach ( $global_templates as $mtpgID => $mtpg ) {
-			if ( $mtpg instanceof EE_Message_Template_Group ) {
+		foreach ($global_templates as $mtpgID => $mtpg) {
+			if ($mtpg instanceof EE_Message_Template_Group) {
 				//verify this message type is supposed to show on this page
 				$mtp_obj = $mtpg->message_type_obj();
-				if ( ! $mtp_obj instanceof EE_message_type ) {
+				if ( ! $mtp_obj instanceof EE_message_type) {
 					continue;
 				}
-				$mtp_obj->admin_registered_pages = (array)$mtp_obj->admin_registered_pages;
-				if ( ! in_array( 'events_edit', $mtp_obj->admin_registered_pages ) ) {
+				$mtp_obj->admin_registered_pages = (array) $mtp_obj->admin_registered_pages;
+				if ( ! in_array('events_edit', $mtp_obj->admin_registered_pages)) {
 					continue;
 				}
 				$select_values = array();
-				$select_values[ $mtpgID ] = __( 'Global', 'event_espresso' );
-				$default_value = array_key_exists( $mtpgID, $templates_for_event ) && ! $mtpg->get( 'MTP_is_override' ) ? $mtpgID : null;
+				$select_values[$mtpgID] = __('Global', 'event_espresso');
+				$default_value = array_key_exists($mtpgID, $templates_for_event) && ! $mtpg->get('MTP_is_override') ? $mtpgID : null;
 				//if the override has been set for the global template, then that means even if there are custom templates already created we ignore them because of the set override.
-				if ( ! $mtpg->get( 'MTP_is_override' ) ) {
+				if ( ! $mtpg->get('MTP_is_override')) {
 					//any custom templates for this message type?
-					$custom_templates = EEM_Message_Template_Group::instance()->get_custom_message_template_by_m_and_mt( $this->name, $mtpg->message_type() );
-					foreach ( $custom_templates as $cmtpgID => $cmtpg ) {
-						$select_values[ $cmtpgID ] = $cmtpg->name();
-						$default_value = array_key_exists( $cmtpgID, $templates_for_event ) ? $cmtpgID : $default_value;
+					$custom_templates = EEM_Message_Template_Group::instance()->get_custom_message_template_by_m_and_mt($this->name, $mtpg->message_type());
+					foreach ($custom_templates as $cmtpgID => $cmtpg) {
+						$select_values[$cmtpgID] = $cmtpg->name();
+						$default_value = array_key_exists($cmtpgID, $templates_for_event) ? $cmtpgID : $default_value;
 					}
 				}
 				//if there is no $default_value then we set it as the global
-				$default_value = empty( $default_value ) ? $mtpgID : $default_value;
-				$edit_url = EEH_URL::add_query_args_and_nonce( array( 'page' => 'espresso_messages', 'action' => 'edit_message_template', 'id' => $default_value ), admin_url( 'admin.php' ) );
-				$create_url = EEH_URL::add_query_args_and_nonce( array( 'page' => 'espresso_messages', 'action' => 'add_new_message_template', 'GRP_ID' => $default_value ), admin_url( 'admin.php' ) );
-				$st_args[ 'mt_name' ] = ucwords( $mtp_obj->label[ 'singular' ] );
-				$st_args[ 'mt_slug' ] = $mtpg->message_type();
-				$st_args[ 'messenger_slug' ] = $this->name;
-				$st_args[ 'selector' ] = EEH_Form_Fields::select_input( 'event_message_templates_relation[' . $mtpgID . ']', $select_values, $default_value, 'data-messenger="' . $this->name . '" data-messagetype="' . $mtpg->message_type() . '"', 'message-template-selector' );
+				$default_value = empty($default_value) ? $mtpgID : $default_value;
+				$edit_url = EEH_URL::add_query_args_and_nonce(array('page' => 'espresso_messages', 'action' => 'edit_message_template', 'id' => $default_value), admin_url('admin.php'));
+				$create_url = EEH_URL::add_query_args_and_nonce(array('page' => 'espresso_messages', 'action' => 'add_new_message_template', 'GRP_ID' => $default_value), admin_url('admin.php'));
+				$st_args['mt_name'] = ucwords($mtp_obj->label['singular']);
+				$st_args['mt_slug'] = $mtpg->message_type();
+				$st_args['messenger_slug'] = $this->name;
+				$st_args['selector'] = EEH_Form_Fields::select_input('event_message_templates_relation['.$mtpgID.']', $select_values, $default_value, 'data-messenger="'.$this->name.'" data-messagetype="'.$mtpg->message_type().'"', 'message-template-selector');
 				//note that  message template group that has override_all_custom set will remove the ability to set a custom message template based off of the global (and that also in turn overrides any other custom templates).
-				$st_args[ 'create_button' ] = $mtpg->get( 'MTP_is_override' ) ? '' : '<a data-messenger="' . $this->name . '" data-messagetype="' . $mtpg->message_type() . '" data-grpid="' . $default_value . '" target="_blank" href="' . $create_url . '" class="button button-small create-mtpg-button">' . __( 'Create New Custom', 'event_espresso' ) . '</a>';
-				$st_args[ 'create_button' ] = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_messages', 'espresso_messages_add_new_message_template' ) ? $st_args[ 'create_button' ] : '';
-				$st_args[ 'edit_button' ] = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $mtpgID ) ? '<a data-messagetype="' . $mtpg->message_type() . '" data-grpid="' . $default_value . '" target="_blank" href="' . $edit_url . '" class="button button-small edit-mtpg-button">' . __( 'Edit', 'event_espresso' ) . '</a>' : '';
-				$selector_rows .= EEH_Template::display_template( $template_row_path, $st_args, true );
+				$st_args['create_button'] = $mtpg->get('MTP_is_override') ? '' : '<a data-messenger="'.$this->name.'" data-messagetype="'.$mtpg->message_type().'" data-grpid="'.$default_value.'" target="_blank" href="'.$create_url.'" class="button button-small create-mtpg-button">'.__('Create New Custom', 'event_espresso').'</a>';
+				$st_args['create_button'] = EE_Registry::instance()->CAP->current_user_can('ee_edit_messages', 'espresso_messages_add_new_message_template') ? $st_args['create_button'] : '';
+				$st_args['edit_button'] = EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $mtpgID) ? '<a data-messagetype="'.$mtpg->message_type().'" data-grpid="'.$default_value.'" target="_blank" href="'.$edit_url.'" class="button button-small edit-mtpg-button">'.__('Edit', 'event_espresso').'</a>' : '';
+				$selector_rows .= EEH_Template::display_template($template_row_path, $st_args, true);
 			}
 		}
 
 		//if no selectors present then get out.
-		if ( empty( $selector_rows ) ) {
+		if (empty($selector_rows)) {
 			return '';
 		}
 
 		$template_args['selector_rows'] = $selector_rows;
-		return EEH_Template::display_template( $template_wrapper_path, $template_args, TRUE );
+		return EEH_Template::display_template($template_wrapper_path, $template_args, TRUE);
 	}
 
 
@@ -590,8 +590,8 @@ 
 	 * @return array $this->_template_fields
 	 */
 	public function get_template_fields() {
-		$template_fields = apply_filters( 'FHEE__' . get_class($this) . '__get_template_fields', $this->_template_fields, $this );
-		$template_fields = apply_filters( 'FHEE__EE_messenger__get_template_fields', $template_fields, $this );
+		$template_fields = apply_filters('FHEE__'.get_class($this).'__get_template_fields', $this->_template_fields, $this);
+		$template_fields = apply_filters('FHEE__EE_messenger__get_template_fields', $template_fields, $this);
 		return $template_fields;
 	}
 
@@ -605,9 +605,9 @@ 
 	 * @param mixed $value
 	 */
 	protected function _set_template_value($item, $value) {
-		if ( array_key_exists($item, $this->_template_fields) ) {
-			$prop = '_' . $item;
-			$this->{$prop}= $value;
+		if (array_key_exists($item, $this->_template_fields)) {
+			$prop = '_'.$item;
+			$this->{$prop} = $value;
 		}
 	}
 
@@ -618,8 +618,8 @@ 
 	 * @return bool Very important that all messengers return bool for successful send or not.  Error messages can be
 	 *              added to EE_Error.
 	 */
-	public function send_message( $message, EE_message_type $message_type ) {
-		$this->_validate_and_setup( $message );
+	public function send_message($message, EE_message_type $message_type) {
+		$this->_validate_and_setup($message);
 		$this->_incoming_message_type = $message_type;
 		return $this->_send_message();
 	}
@@ -633,28 +633,28 @@ 
 	 * @param  bool   $send    true we will actually use the _send method (for test sends). FALSE we just return preview
 	 * @return string          return the message html content
 	 */
-	public function get_preview( EE_Message $message, EE_message_type $message_type, $send = false ) {
-		$this->_validate_and_setup( $message );
+	public function get_preview(EE_Message $message, EE_message_type $message_type, $send = false) {
+		$this->_validate_and_setup($message);
 
 		$this->_incoming_message_type = $message_type;
 
-		if ( $send ) {
+		if ($send) {
 			//are we overriding any existing template fields?
 			$settings = $this->get_existing_test_settings();
-			if ( !empty( $settings ) ) {
-				foreach( $settings as $field => $value ) {
-					$this->_set_template_value( $field, $value );
+			if ( ! empty($settings)) {
+				foreach ($settings as $field => $value) {
+					$this->_set_template_value($field, $value);
 				}
 			}
 		}
 
 		//enqueue preview js so that any links/buttons on the page are disabled.
-		if ( ! $send ) {
+		if ( ! $send) {
 			// the below may seem like duplication.  However, typically if a messenger enqueues scripts/styles,
 			// it deregisters all existing wp scripts and styles first.  So the second hook ensures our previewer still gets setup.
-			add_action( 'admin_enqueue_scripts', array( $this, 'add_preview_script' ), 10 );
-			add_action( 'wp_enqueue_scripts', array( $this, 'add_preview_script' ), 10 );
-			add_action( 'AHEE__EE_messenger__enqueue_scripts_styles', array( $this, 'add_preview_script' ), 10 );
+			add_action('admin_enqueue_scripts', array($this, 'add_preview_script'), 10);
+			add_action('wp_enqueue_scripts', array($this, 'add_preview_script'), 10);
+			add_action('AHEE__EE_messenger__enqueue_scripts_styles', array($this, 'add_preview_script'), 10);
 		}
 
 		return $send ? $this->_send_message() : $this->_preview();
@@ -672,10 +672,10 @@ 
 	 */
 	public function add_preview_script() {
 		//error message
-		EE_Registry::$i18n_js_strings[ 'links_disabled' ] = __( 'All the links on this page have been disabled because this is a generated preview message for the purpose of ensuring layout, style, and content setup.  To test generated links, you must trigger an actual message notification.', 'event_espresso' );
-		wp_register_script( 'ee-messages-preview-js', EE_LIBRARIES_URL . 'messages/messenger/assets/js/ee-messages-preview.js', array( 'jquery' ), EVENT_ESPRESSO_VERSION, true );
-		wp_localize_script( 'ee-messages-preview-js', 'eei18n', EE_Registry::$i18n_js_strings );
-		wp_enqueue_script( 'ee-messages-preview-js' );
+		EE_Registry::$i18n_js_strings['links_disabled'] = __('All the links on this page have been disabled because this is a generated preview message for the purpose of ensuring layout, style, and content setup.  To test generated links, you must trigger an actual message notification.', 'event_espresso');
+		wp_register_script('ee-messages-preview-js', EE_LIBRARIES_URL.'messages/messenger/assets/js/ee-messages-preview.js', array('jquery'), EVENT_ESPRESSO_VERSION, true);
+		wp_localize_script('ee-messages-preview-js', 'eei18n', EE_Registry::$i18n_js_strings);
+		wp_enqueue_script('ee-messages-preview-js');
 	}
 
 
@@ -686,13 +686,13 @@ 
 	 * @param  EE_Message $message
 	 * @throws EE_Error
 	 */
-	protected function _validate_and_setup( EE_Message $message ) {
+	protected function _validate_and_setup(EE_Message $message) {
 		$template_pack = $message->get_template_pack();
 		$variation = $message->get_template_pack_variation();
 
 		//verify we have the required template pack value on the $message object.
-		if ( ! $template_pack instanceof EE_Messages_Template_Pack ) {
-			throw new EE_Error( __('Incoming $message object must have an EE_Messages_Template_Pack object available.', 'event_espresso' ) );
+		if ( ! $template_pack instanceof EE_Messages_Template_Pack) {
+			throw new EE_Error(__('Incoming $message object must have an EE_Messages_Template_Pack object available.', 'event_espresso'));
 		}
 
 		$this->_tmp_pack = $template_pack;
@@ -701,11 +701,11 @@ 
 
 		$template_fields = $this->get_template_fields();
 
-		foreach ( $template_fields as $template => $value ) {
-			if ( $template !== 'extra' ) {
-				$column_value = $message->get_field_or_extra_meta( 'MSG_' . $template );
+		foreach ($template_fields as $template => $value) {
+			if ($template !== 'extra') {
+				$column_value = $message->get_field_or_extra_meta('MSG_'.$template);
 				$message_template_value = $column_value ? $column_value : null;
-				$this->_set_template_value( $template, $message_template_value );
+				$this->_set_template_value($template, $message_template_value);
 			}
 		}
 	}
@@ -720,19 +720,19 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	protected function _get_main_template( $preview = FALSE ) {
+	protected function _get_main_template($preview = FALSE) {
 		$type = $preview ? 'preview' : 'main';
 
-		$wrapper_template = $this->_tmp_pack->get_wrapper( $this->name, $type );
+		$wrapper_template = $this->_tmp_pack->get_wrapper($this->name, $type);
 
 		//check file exists and is readable
-		if ( !is_readable( $wrapper_template ) )
-			throw new EE_Error( sprintf( __('Unable to access the template file for the %s messenger main content wrapper.  The location being attempted is %s.', 'event_espresso' ), ucwords($this->label['singular']) , $wrapper_template ) );
+		if ( ! is_readable($wrapper_template))
+			throw new EE_Error(sprintf(__('Unable to access the template file for the %s messenger main content wrapper.  The location being attempted is %s.', 'event_espresso'), ucwords($this->label['singular']), $wrapper_template));
 
 		//add message type to template args
 		$this->_template_args['message_type'] = $this->_incoming_message_type;
 
-		return EEH_Template::display_template( $wrapper_template, $this->_template_args, TRUE );
+		return EEH_Template::display_template($wrapper_template, $this->_template_args, TRUE);
 	}
 
 
@@ -768,9 +768,9 @@ 
 	 */
 	public function get_existing_test_settings() {
 		/** @var EE_Message_Resource_Manager $Message_Resource_Manager */
-		$Message_Resource_Manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+		$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		$settings = $Message_Resource_Manager->get_active_messengers_option();
-		return isset( $settings[ $this->name ]['test_settings'] ) ? $settings[ $this->name ]['test_settings'] : array();
+		return isset($settings[$this->name]['test_settings']) ? $settings[$this->name]['test_settings'] : array();
 	}
 
 
@@ -782,12 +782,12 @@ 
 	 * @param $settings
 	 * @return bool success/fail
 	 */
-	public function set_existing_test_settings( $settings ) {
+	public function set_existing_test_settings($settings) {
 		/** @var EE_Message_Resource_Manager $Message_Resource_Manager */
-		$Message_Resource_Manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+		$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		$existing = $Message_Resource_Manager->get_active_messengers_option();
-		$existing[ $this->name ]['test_settings'] = $settings;
-		return $Message_Resource_Manager->update_active_messengers_option( $existing );
+		$existing[$this->name]['test_settings'] = $settings;
+		return $Message_Resource_Manager->update_active_messengers_option($existing);
 	}
 
 
@@ -800,21 +800,21 @@ 
 	 * @param string $field The field to retrieve the label for
 	 * @return string        	  The label
 	 */
-	public function get_field_label( $field ) {
+	public function get_field_label($field) {
 		//first let's see if the field requests is in the top level array.
-		if ( isset( $this->_template_fields[$field] ) && !empty( $this->_template_fields[$field]['label'] ) )
+		if (isset($this->_template_fields[$field]) && ! empty($this->_template_fields[$field]['label']))
 			return $this->_template[$field]['label'];
 
 		//nope so let's look in the extra array to see if it's there HOWEVER if the field exists as a top level index in the extra array then we know the label is in the 'main' index.
-		if ( isset( $this->_template_fields['extra'] ) && !empty( $this->_template_fields['extra'][$field] ) && !empty( $this->_template_fields['extra'][$field]['main']['label'] )  )
+		if (isset($this->_template_fields['extra']) && ! empty($this->_template_fields['extra'][$field]) && ! empty($this->_template_fields['extra'][$field]['main']['label']))
 			return $this->_template_fields['extra'][$field]['main']['label'];
 
 		//now it's possible this field may just be existing in any of the extra array items.
-		if ( !empty( $this->_template_fields['extra'] ) && is_array( $this->_template_fields['extra'] ) ) {
-			foreach ( $this->_template_fields['extra'] as $main_field => $subfields ) {
-				if ( !is_array( $subfields ) )
+		if ( ! empty($this->_template_fields['extra']) && is_array($this->_template_fields['extra'])) {
+			foreach ($this->_template_fields['extra'] as $main_field => $subfields) {
+				if ( ! is_array($subfields))
 					continue;
-				if ( isset( $subfields[$field] ) && !empty( $subfields[$field]['label'] ) )
+				if (isset($subfields[$field]) && ! empty($subfields[$field]['label']))
 					return $subfields[$field]['label'];
 			}
 		}
@@ -835,7 +835,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function do_secondary_messenger_hooks( $sending_messenger_name ) {
+	public function do_secondary_messenger_hooks($sending_messenger_name) {
 		return;
 	}
 

modules/bot_trap/EED_Bot_Trap.module.php

Braces +3 added lines, -1 removed lines

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

Spacing +47 added lines, -47 removed lines

@@ -18,7 +18,7 @@ 
 	 * @return EED_Bot_Trap
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -31,22 +31,22 @@ 
 	 */
 	public static function set_hooks() {
 		if (
-			apply_filters( 'FHEE__EED_Bot_Trap__set_hooks__use_bot_trap', true ) &&
+			apply_filters('FHEE__EED_Bot_Trap__set_hooks__use_bot_trap', true) &&
 			EE_Registry::instance()->CFG->registration->use_bot_trap
 		) {
-			define( 'EE_BOT_TRAP_BASE_URL', plugin_dir_url( __FILE__ ) . DS );
+			define('EE_BOT_TRAP_BASE_URL', plugin_dir_url(__FILE__).DS);
 			add_action(
 				'AHEE__ticket_selector_chart__template__after_ticket_selector',
-				array( 'EED_Bot_Trap', 'generate_bot_trap' ),
+				array('EED_Bot_Trap', 'generate_bot_trap'),
 				10, 2
 			);
 			add_action(
 				'EED_Ticket_Selector__process_ticket_selections__before',
-				array( 'EED_Bot_Trap', 'process_bot_trap' ),
+				array('EED_Bot_Trap', 'process_bot_trap'),
 				1, 2
 			);
 			// redirect bots to bogus success page
-			EE_Config::register_route( 'ticket_selection_received', 'EED_Bot_Trap', 'display_bot_trap_success' );
+			EE_Config::register_route('ticket_selection_received', 'EED_Bot_Trap', 'display_bot_trap_success');
 		}
 	}
 
@@ -61,12 +61,12 @@ 
 	public static function set_hooks_admin() {
 		add_action(
 			'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
-			array( 'EED_Bot_Trap', 'bot_trap_settings_form' ),
+			array('EED_Bot_Trap', 'bot_trap_settings_form'),
 			10
 		);
 		add_filter(
 			'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration',
-			array( 'EED_Bot_Trap', 'update_bot_trap_settings_form' ),
+			array('EED_Bot_Trap', 'update_bot_trap_settings_form'),
 			10, 1
 		);
 	}
@@ -80,7 +80,7 @@ 
 	 * @param    WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {}
+	public function run($WP) {}
 
 
 
@@ -91,14 +91,14 @@ 
 	 * @return    void
 	 */
 	public static function generate_bot_trap() {
-		$do_not_enter = __( 'please do not enter anything in this input', 'event_espresso' );
+		$do_not_enter = __('please do not enter anything in this input', 'event_espresso');
 		$html = '<div id="tkt-slctr-request-processor-dv" style="float:left; margin-left:-999em;">';
-		$html .= '<label for="tkt-slctr-request-processor-email">' . $do_not_enter  . '</label>';
+		$html .= '<label for="tkt-slctr-request-processor-email">'.$do_not_enter.'</label>';
 		$html .= '<input type="email" name="tkt-slctr-request-processor-email" value=""/>';
 		$html .= '<input type="hidden" name="tkt-slctr-request-processor-token" value="';
-		if ( EE_Registry::instance()->CFG->registration->use_encryption ) {
-			EE_Registry::instance()->load_core( 'EE_Encryption' );
-			$html .= EE_Encryption::instance()->encrypt( time() );
+		if (EE_Registry::instance()->CFG->registration->use_encryption) {
+			EE_Registry::instance()->load_core('EE_Encryption');
+			$html .= EE_Encryption::instance()->encrypt(time());
 		} else {
 			$html .= time();
 		}
@@ -117,35 +117,35 @@ 
 	 */
 	public static function process_bot_trap() {
 		// what's your email address Mr. Bot ?
-		$empty_trap = isset( $_REQUEST[ 'tkt-slctr-request-processor-email' ] ) && $_REQUEST[ 'tkt-slctr-request-processor-email' ] == '' ? true : false;
+		$empty_trap = isset($_REQUEST['tkt-slctr-request-processor-email']) && $_REQUEST['tkt-slctr-request-processor-email'] == '' ? true : false;
 		// get encrypted timestamp for when the form was originally displayed
-		$bot_trap_timestamp = isset( $_REQUEST[ 'tkt-slctr-request-processor-token' ] ) ? sanitize_text_field( $_REQUEST[ 'tkt-slctr-request-processor-token' ] ) : '';
+		$bot_trap_timestamp = isset($_REQUEST['tkt-slctr-request-processor-token']) ? sanitize_text_field($_REQUEST['tkt-slctr-request-processor-token']) : '';
 		// decrypt and convert to absolute  integer
-		if ( EE_Registry::instance()->CFG->registration->use_encryption ) {
-			EE_Registry::instance()->load_core( 'EE_Encryption' );
-			$bot_trap_timestamp = absint( EE_Encryption::instance()->decrypt( $bot_trap_timestamp ) );
+		if (EE_Registry::instance()->CFG->registration->use_encryption) {
+			EE_Registry::instance()->load_core('EE_Encryption');
+			$bot_trap_timestamp = absint(EE_Encryption::instance()->decrypt($bot_trap_timestamp));
 		} else {
-			$bot_trap_timestamp = absint( $bot_trap_timestamp );
+			$bot_trap_timestamp = absint($bot_trap_timestamp);
 		}
 		// ticket form submitted too impossibly fast ( after now ) or more than an hour later ???
-		$suspicious_timing = $bot_trap_timestamp > time() || $bot_trap_timestamp < ( time() - HOUR_IN_SECONDS ) ? true : false;
+		$suspicious_timing = $bot_trap_timestamp > time() || $bot_trap_timestamp < (time() - HOUR_IN_SECONDS) ? true : false;
 		// are we human ?
-		if ( $empty_trap && ! $suspicious_timing ) {
+		if ($empty_trap && ! $suspicious_timing) {
 			return;
 		}
 		// UH OH...
 		$redirect_url = add_query_arg(
-			array( 'ee' => 'ticket_selection_received' ),
+			array('ee' => 'ticket_selection_received'),
 			EE_Registry::instance()->CFG->core->reg_page_url()
 		);
-		if ( $suspicious_timing ) {
+		if ($suspicious_timing) {
 			$redirect_url = add_query_arg(
-				array( 'ee-notice' => urlencode( __( 'We\'re sorry, but your ticket selections could not be processed due to a server timing error. Please hit the back button on your browser and try again.', 'event_espresso' ) ) ),
+				array('ee-notice' => urlencode(__('We\'re sorry, but your ticket selections could not be processed due to a server timing error. Please hit the back button on your browser and try again.', 'event_espresso'))),
 				$redirect_url
 			);
 		}
 		wp_safe_redirect(
-			apply_filters( 'FHEE__EED_Bot_Trap__process_bot_trap__redirect_url', $redirect_url )
+			apply_filters('FHEE__EED_Bot_Trap__process_bot_trap__redirect_url', $redirect_url)
 		);
 		exit();
 	}
@@ -160,10 +160,10 @@ 
 	 * @return    void
 	 */
 	public static function display_bot_trap_success() {
-		add_filter( 'FHEE__EED_Single_Page_Checkout__run', '__return_false' );
-		$bot_notice = __( 'Thank you so much. Your ticket selections have been received for consideration.', 'event_espresso' );
-		$bot_notice = isset( $_REQUEST[ 'ee-notice' ] ) && $_REQUEST[ 'ee-notice' ] !== '' ? sanitize_text_field( stripslashes( $_REQUEST[ 'ee-notice' ] ) ) : $bot_notice;
-		EE_Registry::instance()->REQ->add_output( EEH_HTML::div( $bot_notice, '', 'ee-attention' ) );
+		add_filter('FHEE__EED_Single_Page_Checkout__run', '__return_false');
+		$bot_notice = __('Thank you so much. Your ticket selections have been received for consideration.', 'event_espresso');
+		$bot_notice = isset($_REQUEST['ee-notice']) && $_REQUEST['ee-notice'] !== '' ? sanitize_text_field(stripslashes($_REQUEST['ee-notice'])) : $bot_notice;
+		EE_Registry::instance()->REQ->add_output(EEH_HTML::div($bot_notice, '', 'ee-attention'));
 	}
 
 
@@ -197,20 +197,20 @@ 
 				'html_id'         			=> 'bot_trap_settings',
 				'layout_strategy' 	=> new EE_Admin_Two_Column_Layout(),
 				'subsections'     		=> array(
-					'bot_trap_hdr' 		=> new EE_Form_Section_HTML( EEH_HTML::h2( __( 'Bot Trap Settings', 'event_espresso' ) ) ),
+					'bot_trap_hdr' 		=> new EE_Form_Section_HTML(EEH_HTML::h2(__('Bot Trap Settings', 'event_espresso'))),
 					'use_bot_trap' 		=> new EE_Yes_No_Input(
 						array(
-							'html_label_text' 	=> __( 'Enable Bot Trap', 'event_espresso' ),
-							'html_help_text' 		=>  __( 'The Event Espresso Bot Trap will insert a fake input into your Ticket Selector forms that is hidden from regular site visitors, but visible to spam bots. Because the input asks for an email address, it is irresistible to spam bots who will of course enter text into it. Since regular site visitors can not see this input, any value detected during form submission means a bot has been detected, which will then be blocked from submitting the form.', 'event_espresso' ),
-							'default'        			=> isset( EE_Registry::instance()->CFG->registration->use_bot_trap ) ? EE_Registry::instance()->CFG->registration->use_bot_trap : true,
+							'html_label_text' 	=> __('Enable Bot Trap', 'event_espresso'),
+							'html_help_text' 		=>  __('The Event Espresso Bot Trap will insert a fake input into your Ticket Selector forms that is hidden from regular site visitors, but visible to spam bots. Because the input asks for an email address, it is irresistible to spam bots who will of course enter text into it. Since regular site visitors can not see this input, any value detected during form submission means a bot has been detected, which will then be blocked from submitting the form.', 'event_espresso'),
+							'default'        			=> isset(EE_Registry::instance()->CFG->registration->use_bot_trap) ? EE_Registry::instance()->CFG->registration->use_bot_trap : true,
 							'required'        		=> false
 						)
 					),
 					'use_encryption' 		=> new EE_Yes_No_Input(
 						array(
-							'html_label_text' 	=> __( 'Encrypt Bot Trap Data', 'event_espresso' ),
-							'html_help_text' 		=>  __( 'One way to detect spam bots is by looking at how long it takes them to submit a form. They are often inhumanly fast, or will submit forms hours, days, or even weeks after the form was first scraped off the web. The Event Espresso Bot Trap will send a timestamp with the Ticket Selector form when it is submitted. By default, this timestamp is encrypted so that the spam bots can not change it, but encryption may cause issues on some servers due to configuration "conflicts". If you continuously get caught in the bot trap, then try setting this option to "No". This may increase the number of spam submissions you receive, but increases server compatibility.', 'event_espresso' ),
-							'default'        			=> isset( EE_Registry::instance()->CFG->registration->use_encryption ) ? EE_Registry::instance()->CFG->registration->use_encryption : true,
+							'html_label_text' 	=> __('Encrypt Bot Trap Data', 'event_espresso'),
+							'html_help_text' 		=>  __('One way to detect spam bots is by looking at how long it takes them to submit a form. They are often inhumanly fast, or will submit forms hours, days, or even weeks after the form was first scraped off the web. The Event Espresso Bot Trap will send a timestamp with the Ticket Selector form when it is submitted. By default, this timestamp is encrypted so that the spam bots can not change it, but encryption may cause issues on some servers due to configuration "conflicts". If you continuously get caught in the bot trap, then try setting this option to "No". This may increase the number of spam submissions you receive, but increases server compatibility.', 'event_espresso'),
+							'default'        			=> isset(EE_Registry::instance()->CFG->registration->use_encryption) ? EE_Registry::instance()->CFG->registration->use_encryption : true,
 							'required'        		=> false
 						)
 					),
@@ -228,30 +228,30 @@ 
 	 * @param \EE_Registration_Config $EE_Registration_Config
 	 * @return \EE_Registration_Config
 	 */
-	public static function update_bot_trap_settings_form( EE_Registration_Config $EE_Registration_Config ) {
+	public static function update_bot_trap_settings_form(EE_Registration_Config $EE_Registration_Config) {
 		try {
 			$bot_trap_settings_form = EED_Bot_Trap::_bot_trap_settings_form();
 			// if not displaying a form, then check for form submission
-			if ( $bot_trap_settings_form->was_submitted() ) {
+			if ($bot_trap_settings_form->was_submitted()) {
 				// capture form data
 				$bot_trap_settings_form->receive_form_submission();
 				// validate form data
-				if ( $bot_trap_settings_form->is_valid() ) {
+				if ($bot_trap_settings_form->is_valid()) {
 					// grab validated data from form
 					$valid_data = $bot_trap_settings_form->valid_data();
-					if ( isset( $valid_data[ 'use_bot_trap' ], $valid_data[ 'use_encryption' ] ) ) {
-						$EE_Registration_Config->use_bot_trap = $valid_data[ 'use_bot_trap' ];
-						$EE_Registration_Config->use_encryption = $valid_data[ 'use_encryption' ];
+					if (isset($valid_data['use_bot_trap'], $valid_data['use_encryption'])) {
+						$EE_Registration_Config->use_bot_trap = $valid_data['use_bot_trap'];
+						$EE_Registration_Config->use_encryption = $valid_data['use_encryption'];
 					} else {
-						EE_Error::add_error( __( 'Invalid or missing Bot Trap settings. Please refresh the form and try again.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+						EE_Error::add_error(__('Invalid or missing Bot Trap settings. Please refresh the form and try again.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					}
 				} else {
-					if ( $bot_trap_settings_form->submission_error_message() != '' ) {
-						EE_Error::add_error( $bot_trap_settings_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ );
+					if ($bot_trap_settings_form->submission_error_message() != '') {
+						EE_Error::add_error($bot_trap_settings_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__);
 					}
 				}
 			}
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 		return $EE_Registration_Config;

modules/messages/EED_Messages.module.php

Indentation +5 added lines, -5 removed lines

@@ -912,11 +912,11 @@
 				sprintf(
 					_n(
 						'%d message successfully queued for resending.',
-				        '%d messages successfully queued for resending.',
-				        $queue_count,
-				        'event_espresso'
-				    ),
-				    $queue_count
+						'%d messages successfully queued for resending.',
+						$queue_count,
+						'event_espresso'
+					),
+					$queue_count
 				)
 			);
 		} else {

Braces +3 added lines, -1 removed lines

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

Doc Comments +2 added lines, -2 removed lines

@@ -541,7 +541,7 @@ 
 	 *
 	 * @param string  $payment_status The payment status being matched.
 	 *
-	 * @return string|bool The payment message type slug matching the status or false if no match.
+	 * @return string|false The payment message type slug matching the status or false if no match.
 	 */
 	protected static function _get_payment_message_type( $payment_status ) {
 		EE_Registry::instance()->load_helper( 'MSG_Template' );
@@ -871,7 +871,7 @@ 
 	 * @since 4.9.0
 	 * @param $message_ids
 	 *
-	 * @return bool | EE_Messages_Queue  false if no messages sent.
+	 * @return EE_Messages_Queue | EE_Messages_Queue  false if no messages sent.
 	 */
 	public static function send_now( $message_ids ) {
 		self::_load_controller();

Spacing +178 added lines, -178 removed lines

@@ -69,7 +69,7 @@ 
 	 * @return EED_Module
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -84,11 +84,11 @@ 
 	 */
 	public static function set_hooks() {
 		//actions
-		add_action( 'AHEE__EE_Payment_Processor__update_txn_based_on_payment', array( 'EED_Messages', 'payment' ), 10, 2 );
-		add_action( 'AHEE__EE_Registration_Processor__trigger_registration_update_notifications', array( 'EED_Messages', 'maybe_registration' ), 10, 2 );
+		add_action('AHEE__EE_Payment_Processor__update_txn_based_on_payment', array('EED_Messages', 'payment'), 10, 2);
+		add_action('AHEE__EE_Registration_Processor__trigger_registration_update_notifications', array('EED_Messages', 'maybe_registration'), 10, 2);
 		//filters
-		add_filter( 'FHEE__EE_Registration__receipt_url__receipt_url', array( 'EED_Messages', 'registration_message_trigger_url' ), 10, 4 );
-		add_filter( 'FHEE__EE_Registration__invoice_url__invoice_url', array( 'EED_Messages', 'registration_message_trigger_url' ), 10, 4 );
+		add_filter('FHEE__EE_Registration__receipt_url__receipt_url', array('EED_Messages', 'registration_message_trigger_url'), 10, 4);
+		add_filter('FHEE__EE_Registration__invoice_url__invoice_url', array('EED_Messages', 'registration_message_trigger_url'), 10, 4);
 		//register routes
 		self::_register_routes();
 	}
@@ -101,16 +101,16 @@ 
 	 */
 	public static function set_hooks_admin() {
 		//actions
-		add_action( 'AHEE__EE_Payment_Processor__update_txn_based_on_payment', array( 'EED_Messages', 'payment' ), 10, 2 );
-		add_action( 'AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', array( 'EED_Messages', 'payment_reminder' ), 10 );
-		add_action( 'AHEE__EE_Registration_Processor__trigger_registration_update_notifications', array( 'EED_Messages', 'maybe_registration' ), 10, 3 );
-		add_action( 'AHEE__Extend_Registrations_Admin_Page___newsletter_selected_send__with_registrations', array( 'EED_Messages', 'send_newsletter_message' ), 10, 2 );
-		add_action( 'AHEE__EES_Espresso_Cancelled__process_shortcode__transaction', array( 'EED_Messages', 'cancelled_registration' ), 10 );
-		add_action( 'AHEE__EE_Admin_Page___process_admin_payment_notification', array( 'EED_Messages', 'process_admin_payment' ), 10, 1 );
+		add_action('AHEE__EE_Payment_Processor__update_txn_based_on_payment', array('EED_Messages', 'payment'), 10, 2);
+		add_action('AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', array('EED_Messages', 'payment_reminder'), 10);
+		add_action('AHEE__EE_Registration_Processor__trigger_registration_update_notifications', array('EED_Messages', 'maybe_registration'), 10, 3);
+		add_action('AHEE__Extend_Registrations_Admin_Page___newsletter_selected_send__with_registrations', array('EED_Messages', 'send_newsletter_message'), 10, 2);
+		add_action('AHEE__EES_Espresso_Cancelled__process_shortcode__transaction', array('EED_Messages', 'cancelled_registration'), 10);
+		add_action('AHEE__EE_Admin_Page___process_admin_payment_notification', array('EED_Messages', 'process_admin_payment'), 10, 1);
 		//filters
-		add_filter( 'FHEE__EE_Admin_Page___process_resend_registration__success', array( 'EED_Messages', 'process_resend' ), 10, 2 );
-		add_filter( 'FHEE__EE_Registration__receipt_url__receipt_url', array( 'EED_Messages', 'registration_message_trigger_url' ), 10, 4 );
-		add_filter( 'FHEE__EE_Registration__invoice_url__invoice_url', array( 'EED_Messages', 'registration_message_trigger_url' ), 10, 4 );
+		add_filter('FHEE__EE_Admin_Page___process_resend_registration__success', array('EED_Messages', 'process_resend'), 10, 2);
+		add_filter('FHEE__EE_Registration__receipt_url__receipt_url', array('EED_Messages', 'registration_message_trigger_url'), 10, 4);
+		add_filter('FHEE__EE_Registration__invoice_url__invoice_url', array('EED_Messages', 'registration_message_trigger_url'), 10, 4);
 	}
 
 
@@ -124,11 +124,11 @@ 
 	 * @return void
 	 */
 	protected static function _register_routes() {
-		EE_Config::register_route( 'msg_url_trigger', 'Messages', 'run' );
-		EE_Config::register_route( 'msg_cron_trigger', 'Messages', 'run_cron' );
-		EE_Config::register_route( 'msg_browser_trigger', 'Messages', 'browser_trigger' );
-		EE_Config::register_route( 'msg_browser_error_trigger', 'Messages', 'browser_error_trigger' );
-		do_action( 'AHEE__EED_Messages___register_routes' );
+		EE_Config::register_route('msg_url_trigger', 'Messages', 'run');
+		EE_Config::register_route('msg_cron_trigger', 'Messages', 'run_cron');
+		EE_Config::register_route('msg_browser_trigger', 'Messages', 'browser_trigger');
+		EE_Config::register_route('msg_browser_error_trigger', 'Messages', 'browser_error_trigger');
+		do_action('AHEE__EED_Messages___register_routes');
 	}
 
 
@@ -139,18 +139,18 @@ 
 	 * @since 4.9.0
 	 * @param WP $WP
 	 */
-	public function browser_trigger( $WP ) {
+	public function browser_trigger($WP) {
 		//ensure controller is loaded
 		self::_load_controller();
-		$token = EE_Registry::instance()->REQ->get( 'token' );
+		$token = EE_Registry::instance()->REQ->get('token');
 		try {
-			$mtg = new EE_Message_Generated_From_Token( $token, 'html', self::$_message_resource_manager );
-			self::$_MSG_PROCESSOR->generate_and_send_now( $mtg );
-		} catch( EE_Error $e ) {
-			$error_msg = __( 'Please note that a system message failed to send due to a technical issue.', 'event_espresso' );
+			$mtg = new EE_Message_Generated_From_Token($token, 'html', self::$_message_resource_manager);
+			self::$_MSG_PROCESSOR->generate_and_send_now($mtg);
+		} catch (EE_Error $e) {
+			$error_msg = __('Please note that a system message failed to send due to a technical issue.', 'event_espresso');
 			// add specific message for developers if WP_DEBUG in on
-			$error_msg .= '||' . $e->getMessage();
-			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+			$error_msg .= '||'.$e->getMessage();
+			EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -166,20 +166,20 @@ 
 	 * @since 4.9.0
 	 * @param $WP
 	 */
-	public function browser_error_trigger( $WP ) {
-		$token = EE_Registry::instance()->REQ->get( 'token' );
-		if ( $token ) {
-			$message = EEM_Message::instance()->get_one_by_token( $token );
-			if ( $message instanceof EE_Message ) {
-				header( 'HTTP/1.1 200 OK' );
-				$error_msg = nl2br( $message->error_message() );
+	public function browser_error_trigger($WP) {
+		$token = EE_Registry::instance()->REQ->get('token');
+		if ($token) {
+			$message = EEM_Message::instance()->get_one_by_token($token);
+			if ($message instanceof EE_Message) {
+				header('HTTP/1.1 200 OK');
+				$error_msg = nl2br($message->error_message());
 				?>
 				<!DOCTYPE html>
 				<html>
 					<head></head>
 					<body>
-						<?php echo empty( $error_msg )
-						? esc_html__( 'Unfortunately, we were unable to capture the error message for this message.', 'event_espresso' )
+						<?php echo empty($error_msg)
+						? esc_html__('Unfortunately, we were unable to capture the error message for this message.', 'event_espresso')
 						: wp_kses(
 							$error_msg,
 							array(
@@ -214,19 +214,19 @@ 
 	 * @throws EE_Error
 	 * @return    void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 		//ensure controller is loaded
 		self::_load_controller();
 		// attempt to process message
 		try {
 			/** @type EE_Message_To_Generate_From_Request $message_to_generate */
-			$message_to_generate = EE_Registry::instance()->load_lib( 'Message_To_Generate_From_Request' );
-			self::$_MSG_PROCESSOR->generate_and_send_now( $message_to_generate );
-		} catch ( EE_Error $e ) {
-			$error_msg = __( 'Please note that a system message failed to send due to a technical issue.', 'event_espresso' );
+			$message_to_generate = EE_Registry::instance()->load_lib('Message_To_Generate_From_Request');
+			self::$_MSG_PROCESSOR->generate_and_send_now($message_to_generate);
+		} catch (EE_Error $e) {
+			$error_msg = __('Please note that a system message failed to send due to a technical issue.', 'event_espresso');
 			// add specific message for developers if WP_DEBUG in on
-			$error_msg .= '||' . $e->getMessage();
-			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+			$error_msg .= '||'.$e->getMessage();
+			EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -235,33 +235,33 @@ 
 	 * This is triggered by the 'msg_cron_trigger' route.
 	 * @param WP $WP
 	 */
-	public function run_cron( $WP ) {
+	public function run_cron($WP) {
 		self::_load_controller();
 		//get required vars
-		$cron_type = EE_Registry::instance()->REQ->get( 'type' );
-		$transient_key = EE_Registry::instance()->REQ->get( 'key' );
-		header( 'HTTP/1.1 200 OK' );
+		$cron_type = EE_Registry::instance()->REQ->get('type');
+		$transient_key = EE_Registry::instance()->REQ->get('key');
+		header('HTTP/1.1 200 OK');
 
 		//now let's verify transient, if not valid exit immediately
-		if ( ! get_transient( $transient_key ) ) {
+		if ( ! get_transient($transient_key)) {
 			/**
 			 * trigger error so this gets in the error logs.  This is important because it happens on a non-user request.
 			 */
-			trigger_error( esc_attr__( 'Invalid Request (Transient does not exist)', 'event_espresso' ) );
+			trigger_error(esc_attr__('Invalid Request (Transient does not exist)', 'event_espresso'));
 		}
 
 		//if made it here, lets' delete the transient to keep the db clean
-		delete_transient( $transient_key );
+		delete_transient($transient_key);
 
-		$method = 'batch_' . $cron_type . '_from_queue';
-		if ( method_exists( self::$_MSG_PROCESSOR, $method ) ) {
+		$method = 'batch_'.$cron_type.'_from_queue';
+		if (method_exists(self::$_MSG_PROCESSOR, $method)) {
 			self::$_MSG_PROCESSOR->$method();
 		} else {
 			//no matching task
 			/**
 			 * trigger error so this gets in the error logs.  This is important because it happens on a non user request.
 			 */
-			trigger_error( esc_attr( sprintf( __( 'There is no task corresponding to this route %s', 'event_espresso' ), $cron_type ) ) );
+			trigger_error(esc_attr(sprintf(__('There is no task corresponding to this route %s', 'event_espresso'), $cron_type)));
 		}
 		exit();
 	}
@@ -279,9 +279,9 @@ 
 	 *
 	 * @return EE_Messages_Template_Pack
 	 */
-	public static function get_template_pack( $template_pack_name ) {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		return EEH_MSG_Template::get_template_pack( $template_pack_name );
+	public static function get_template_pack($template_pack_name) {
+		EE_Registry::instance()->load_helper('MSG_Template');
+		return EEH_MSG_Template::get_template_pack($template_pack_name);
 	}
 
 
@@ -295,14 +295,14 @@ 
 	 * @return EE_Messages_Template_Pack[]
 	 */
 	public static function get_template_packs() {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+		EE_Registry::instance()->load_helper('MSG_Template');
 
 		//for backward compat, let's make sure this returns in the same format as originally.
 		$template_pack_collection = EEH_MSG_Template::get_template_pack_collection();
 		$template_pack_collection->rewind();
 		$template_packs = array();
-		while ( $template_pack_collection->valid() ) {
-			$template_packs[ $template_pack_collection->current()->dbref ] = $template_pack_collection->current();
+		while ($template_pack_collection->valid()) {
+			$template_packs[$template_pack_collection->current()->dbref] = $template_pack_collection->current();
 			$template_pack_collection->next();
 		}
 		return $template_packs;
@@ -318,14 +318,14 @@ 
 	 * @return void
 	 */
 	public static function set_autoloaders() {
-		if ( empty( self::$_MSG_PATHS ) ) {
+		if (empty(self::$_MSG_PATHS)) {
 			self::_set_messages_paths();
-			foreach ( self::$_MSG_PATHS as $path ) {
-				EEH_Autoloader::register_autoloaders_for_each_file_in_folder( $path );
+			foreach (self::$_MSG_PATHS as $path) {
+				EEH_Autoloader::register_autoloaders_for_each_file_in_folder($path);
 			}
 			// add aliases
-			EEH_Autoloader::add_alias( 'EE_messages', 'EE_messages' );
-			EEH_Autoloader::add_alias( 'EE_messenger', 'EE_messenger' );
+			EEH_Autoloader::add_alias('EE_messages', 'EE_messages');
+			EEH_Autoloader::add_alias('EE_messenger', 'EE_messenger');
 		}
 	}
 
@@ -353,10 +353,10 @@ 
 			'shortcodes',
 			);
 		$paths = array();
-		foreach ( $dir_ref as $index => $dir ) {
-			$paths[ $index ] = EE_LIBRARIES . $dir;
+		foreach ($dir_ref as $index => $dir) {
+			$paths[$index] = EE_LIBRARIES.$dir;
 		}
-		self::$_MSG_PATHS = apply_filters( 'FHEE__EED_Messages___set_messages_paths___MSG_PATHS', $paths );
+		self::$_MSG_PATHS = apply_filters('FHEE__EED_Messages___set_messages_paths___MSG_PATHS', $paths);
 	}
 
 
@@ -367,12 +367,12 @@ 
 	 * @return void
 	 */
 	protected static function _load_controller() {
-		if ( ! self::$_MSG_PROCESSOR instanceof EE_Messages_Processor ) {
-			EE_Registry::instance()->load_core( 'Request_Handler' );
+		if ( ! self::$_MSG_PROCESSOR instanceof EE_Messages_Processor) {
+			EE_Registry::instance()->load_core('Request_Handler');
 			self::set_autoloaders();
-			self::$_EEMSG = EE_Registry::instance()->load_lib( 'messages' );
-			self::$_MSG_PROCESSOR = EE_Registry::instance()->load_lib( 'Messages_Processor' );
-			self::$_message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+			self::$_EEMSG = EE_Registry::instance()->load_lib('messages');
+			self::$_MSG_PROCESSOR = EE_Registry::instance()->load_lib('Messages_Processor');
+			self::$_message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		}
 	}
 
@@ -381,10 +381,10 @@ 
 	/**
 	 * @param EE_Transaction $transaction
 	 */
-	public static function payment_reminder( EE_Transaction $transaction ) {
+	public static function payment_reminder(EE_Transaction $transaction) {
 		self::_load_controller();
-		$data = array( $transaction, null );
-		self::$_MSG_PROCESSOR->generate_for_all_active_messengers( 'payment_reminder', $data );
+		$data = array($transaction, null);
+		self::$_MSG_PROCESSOR->generate_for_all_active_messengers('payment_reminder', $data);
 	}
 
 
@@ -395,14 +395,14 @@ 
 	 * @param  EE_Payment object
 	 * @return void
 	 */
-	public static function payment( EE_Transaction $transaction, EE_Payment $payment ) {
+	public static function payment(EE_Transaction $transaction, EE_Payment $payment) {
 		self::_load_controller();
-		$data = array( $transaction, $payment );
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		$message_type = EEH_MSG_Template::convert_payment_status_to_message_type( $payment->STS_ID() );
+		$data = array($transaction, $payment);
+		EE_Registry::instance()->load_helper('MSG_Template');
+		$message_type = EEH_MSG_Template::convert_payment_status_to_message_type($payment->STS_ID());
 		//if payment amount is less than 0 then switch to payment_refund message type.
 		$message_type = $payment->amount() < 0 ? 'payment_refund' : $message_type;
-		self::$_MSG_PROCESSOR->generate_for_all_active_messengers( $message_type, $data );
+		self::$_MSG_PROCESSOR->generate_for_all_active_messengers($message_type, $data);
 	}
 
 
@@ -410,10 +410,10 @@ 
 	/**
 	 * @param EE_Transaction $transaction
 	 */
-	public static function cancelled_registration( EE_Transaction $transaction ) {
+	public static function cancelled_registration(EE_Transaction $transaction) {
 		self::_load_controller();
-		$data = array( $transaction, null );
-		self::$_MSG_PROCESSOR->generate_for_all_active_messengers( 'cancelled_registration', $data );
+		$data = array($transaction, null);
+		self::$_MSG_PROCESSOR->generate_for_all_active_messengers('cancelled_registration', $data);
 	}
 
 
@@ -426,9 +426,9 @@ 
 	 * @param array $extra_details
 	 * @return void
 	 */
-	public static function maybe_registration( EE_Registration $registration, $extra_details = array() ) {
+	public static function maybe_registration(EE_Registration $registration, $extra_details = array()) {
 
-		if ( ! self::_verify_registration_notification_send( $registration, $extra_details ) ) {
+		if ( ! self::_verify_registration_notification_send($registration, $extra_details)) {
 			//no messages please
 			return;
 		}
@@ -443,22 +443,22 @@ 
 		$mtgs = array();
 
 		//loop through registrations and trigger messages once per status.
-		foreach ( $all_registrations as $reg ) {
+		foreach ($all_registrations as $reg) {
 
 			//already triggered?
-			if ( in_array( $reg->status_ID(), $statuses_sent ) ) {
+			if (in_array($reg->status_ID(), $statuses_sent)) {
 				continue;
 			}
 
-			$message_type = EEH_MSG_Template::convert_reg_status_to_message_type( $reg->status_ID() );
-			$mtgs = $mtgs + self::$_MSG_PROCESSOR->setup_mtgs_for_all_active_messengers( $message_type, array( $registration->transaction(), null, $reg->status_ID() ) );
+			$message_type = EEH_MSG_Template::convert_reg_status_to_message_type($reg->status_ID());
+			$mtgs = $mtgs + self::$_MSG_PROCESSOR->setup_mtgs_for_all_active_messengers($message_type, array($registration->transaction(), null, $reg->status_ID()));
 			$statuses_sent[] = $reg->status_ID();
 		}
 
-		$mtgs = $mtgs + self::$_MSG_PROCESSOR->setup_mtgs_for_all_active_messengers( 'registration_summary', array( $registration->transaction(), null ) );
+		$mtgs = $mtgs + self::$_MSG_PROCESSOR->setup_mtgs_for_all_active_messengers('registration_summary', array($registration->transaction(), null));
 
 		//batch queue and initiate request
-		self::$_MSG_PROCESSOR->batch_queue_for_generation_and_persist( $mtgs );
+		self::$_MSG_PROCESSOR->batch_queue_for_generation_and_persist($mtgs);
 		self::$_MSG_PROCESSOR->get_queue()->initiate_request_by_priority();
 	}
 
@@ -473,39 +473,39 @@ 
 	 *
 	 * @return bool          true = send away, false = nope halt the presses.
 	 */
-	protected static function _verify_registration_notification_send( EE_Registration $registration, $extra_details = array() ) {
+	protected static function _verify_registration_notification_send(EE_Registration $registration, $extra_details = array()) {
 		 //self::log(
 		 //	__CLASS__, __FUNCTION__, __LINE__,
 		 //	$registration->transaction(),
 		 //	array( '$extra_details' => $extra_details )
 		 //);
 		// currently only using this to send messages for the primary registrant
-		if ( ! $registration->is_primary_registrant() ) {
+		if ( ! $registration->is_primary_registrant()) {
 			return false;
 		}
 		// first we check if we're in admin and not doing front ajax
-		if ( is_admin() && ! EE_FRONT_AJAX ) {
+		if (is_admin() && ! EE_FRONT_AJAX) {
 			//make sure appropriate admin params are set for sending messages
-			if ( empty( $_REQUEST['txn_reg_status_change']['send_notifications'] ) || ! absint( $_REQUEST['txn_reg_status_change']['send_notifications'] ) ) {
+			if (empty($_REQUEST['txn_reg_status_change']['send_notifications']) || ! absint($_REQUEST['txn_reg_status_change']['send_notifications'])) {
 				//no messages sent please.
 				return false;
 			}
 		} else {
 			// frontend request (either regular or via AJAX)
 			// TXN is NOT finalized ?
-			if ( ! isset( $extra_details['finalized'] ) || $extra_details['finalized'] === false ) {
+			if ( ! isset($extra_details['finalized']) || $extra_details['finalized'] === false) {
 				return false;
 			}
 			// return visit but nothing changed ???
 			if (
-				isset( $extra_details['revisit'], $extra_details['status_updates'] ) &&
+				isset($extra_details['revisit'], $extra_details['status_updates']) &&
 				$extra_details['revisit'] && ! $extra_details['status_updates']
 			) {
 				return false;
 			}
 			// NOT sending messages && reg status is something other than "Not-Approved"
 			if (
-				! apply_filters( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', false ) &&
+				! apply_filters('FHEE__EED_Messages___maybe_registration__deliver_notifications', false) &&
 				$registration->status_ID() !== EEM_Registration::status_id_not_approved
 			) {
 				return false;
@@ -527,10 +527,10 @@ 
 	 *
 	 * @return array
 	 */
-	protected static function _get_reg_status_array( $reg_status = '' ) {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		return EEH_MSG_Template::convert_reg_status_to_message_type( $reg_status )
-			? EEH_MSG_Template::convert_reg_status_to_message_type( $reg_status )
+	protected static function _get_reg_status_array($reg_status = '') {
+		EE_Registry::instance()->load_helper('MSG_Template');
+		return EEH_MSG_Template::convert_reg_status_to_message_type($reg_status)
+			? EEH_MSG_Template::convert_reg_status_to_message_type($reg_status)
 			: EEH_MSG_Template::reg_status_to_message_type_array();
 	}
 
@@ -546,10 +546,10 @@ 
 	 *
 	 * @return string|bool The payment message type slug matching the status or false if no match.
 	 */
-	protected static function _get_payment_message_type( $payment_status ) {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		return EEH_MSG_Template::convert_payment_status_to_message_type( $payment_status )
-			? EEH_MSG_Template::convert_payment_status_to_message_type( $payment_status )
+	protected static function _get_payment_message_type($payment_status) {
+		EE_Registry::instance()->load_helper('MSG_Template');
+		return EEH_MSG_Template::convert_payment_status_to_message_type($payment_status)
+			? EEH_MSG_Template::convert_payment_status_to_message_type($payment_status)
 			: false;
 	}
 
@@ -563,33 +563,33 @@ 
 	 * @param array $req_data This is the $_POST & $_GET data sent from EE_Admin Pages
 	 * @return bool          success/fail
 	 */
-	public static function process_resend( $req_data ) {
+	public static function process_resend($req_data) {
 		self::_load_controller();
 
 		//if $msgID in this request then skip to the new resend_message
-		if ( EE_Registry::instance()->REQ->get( 'MSG_ID' ) ) {
+		if (EE_Registry::instance()->REQ->get('MSG_ID')) {
 			return self::resend_message();
 		}
 
 		//make sure any incoming request data is set on the REQ so that it gets picked up later.
 		$req_data = (array) $req_data;
-		foreach( $req_data as $request_key => $request_value ) {
-			EE_Registry::instance()->REQ->set( $request_key, $request_value );
+		foreach ($req_data as $request_key => $request_value) {
+			EE_Registry::instance()->REQ->set($request_key, $request_value);
 		}
 
-		if ( ! $messages_to_send = self::$_MSG_PROCESSOR->setup_messages_to_generate_from_registration_ids_in_request() ) {
+		if ( ! $messages_to_send = self::$_MSG_PROCESSOR->setup_messages_to_generate_from_registration_ids_in_request()) {
 			return false;
 		}
 
 		try {
-			self::$_MSG_PROCESSOR->batch_queue_for_generation_and_persist( $messages_to_send );
+			self::$_MSG_PROCESSOR->batch_queue_for_generation_and_persist($messages_to_send);
 			self::$_MSG_PROCESSOR->get_queue()->initiate_request_by_priority();
-		} catch( EE_Error $e ) {
-			EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ );
+		} catch (EE_Error $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		EE_Error::add_success(
-			__( 'Messages have been successfully queued for generation and sending.', 'event_espresso' )
+			__('Messages have been successfully queued for generation and sending.', 'event_espresso')
 		);
 		return true; //everything got queued.
 	}
@@ -602,17 +602,17 @@ 
 	public static function resend_message() {
 		self::_load_controller();
 
-		$msgID = EE_Registry::instance()->REQ->get( 'MSG_ID' );
-		if ( ! $msgID ) {
-			EE_Error::add_error( __( 'Something went wrong because there is no "MSG_ID" value in the request', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		$msgID = EE_Registry::instance()->REQ->get('MSG_ID');
+		if ( ! $msgID) {
+			EE_Error::add_error(__('Something went wrong because there is no "MSG_ID" value in the request', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
-		self::$_MSG_PROCESSOR->setup_messages_from_ids_and_send( (array) $msgID );
+		self::$_MSG_PROCESSOR->setup_messages_from_ids_and_send((array) $msgID);
 
 		//setup success message.
-		$count_ready_for_resend = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue( EEM_Message::status_resend );
-		EE_Error::add_success( sprintf(
+		$count_ready_for_resend = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue(EEM_Message::status_resend);
+		EE_Error::add_success(sprintf(
 			_n(
 				'There was %d message queued for resending.',
 				'There were %d messages queued for resending.',
@@ -620,7 +620,7 @@ 
 				'event_espresso'
 			),
 			$count_ready_for_resend
-		) );
+		));
 		return true;
 	}
 
@@ -633,13 +633,13 @@ 
 	 * @param  EE_Payment $payment EE_payment object
 	 * @return bool              success/fail
 	 */
-	public static function process_admin_payment( EE_Payment $payment ) {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+	public static function process_admin_payment(EE_Payment $payment) {
+		EE_Registry::instance()->load_helper('MSG_Template');
 		//we need to get the transaction object
 		$transaction = $payment->transaction();
-		if ( $transaction instanceof EE_Transaction ) {
-			$data = array( $transaction, $payment );
-			$message_type = EEH_MSG_Template::convert_payment_status_to_message_type( $payment->STS_ID() );
+		if ($transaction instanceof EE_Transaction) {
+			$data = array($transaction, $payment);
+			$message_type = EEH_MSG_Template::convert_payment_status_to_message_type($payment->STS_ID());
 
 			//if payment amount is less than 0 then switch to payment_refund message type.
 			$message_type = $payment->amount() < 0 ? 'payment_refund' : $message_type;
@@ -649,17 +649,17 @@ 
 
 			self::_load_controller();
 
-			self::$_MSG_PROCESSOR->generate_for_all_active_messengers( $message_type, $data );
+			self::$_MSG_PROCESSOR->generate_for_all_active_messengers($message_type, $data);
 
 			//get count of queued for generation
-			$count_to_generate = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue( EEM_Message::status_incomplete );
+			$count_to_generate = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue(EEM_Message::status_incomplete);
 
-			if ( $count_to_generate > 0 ) {
-				add_filter( 'FHEE__EE_Admin_Page___process_admin_payment_notification__success', '__return_true' );
+			if ($count_to_generate > 0) {
+				add_filter('FHEE__EE_Admin_Page___process_admin_payment_notification__success', '__return_true');
 				return true;
 			} else {
-				$count_failed = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue( EEM_Message::instance()->stati_indicating_failed_sending() );
-				EE_Error::add_error( sprintf(
+				$count_failed = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue(EEM_Message::instance()->stati_indicating_failed_sending());
+				EE_Error::add_error(sprintf(
 					_n(
 						'The payment notification generation failed.',
 						'%d payment notifications failed being sent.',
@@ -667,7 +667,7 @@ 
 						'event_espresso'
 					),
 					$count_failed
-				), __FILE__, __FUNCTION__, __LINE__ );
+				), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 		} else {
@@ -690,11 +690,11 @@ 
 	 * @param  int      	      $grp_id     a specific message template group id.
 	 * @return void
 	 */
-	public static function send_newsletter_message( $registrations, $grp_id ) {
+	public static function send_newsletter_message($registrations, $grp_id) {
 		//make sure mtp is id and set it in the EE_Request Handler later messages setup.
-		EE_Registry::instance()->REQ->set( 'GRP_ID', (int) $grp_id );
+		EE_Registry::instance()->REQ->set('GRP_ID', (int) $grp_id);
 		self::_load_controller();
-		self::$_MSG_PROCESSOR->generate_for_all_active_messengers( 'newsletter', $registrations );
+		self::$_MSG_PROCESSOR->generate_for_all_active_messengers('newsletter', $registrations);
 	}
 
 
@@ -709,9 +709,9 @@ 
 	 * @param string 	$message_type
 	 * @return 	string
 	 */
-	public static function registration_message_trigger_url( $registration_message_trigger_url, EE_Registration $registration, $messenger = 'html', $message_type = 'invoice' ) {
+	public static function registration_message_trigger_url($registration_message_trigger_url, EE_Registration $registration, $messenger = 'html', $message_type = 'invoice') {
 		// whitelist $messenger
-		switch ( $messenger ) {
+		switch ($messenger) {
 			case 'pdf' :
 				$sending_messenger = 'pdf';
 				$generating_messenger = 'html';
@@ -723,7 +723,7 @@ 
 				break;
 		}
 		// whitelist $message_type
-		switch ( $message_type ) {
+		switch ($message_type) {
 			case 'receipt' :
 				$message_type = 'receipt';
 				break;
@@ -733,7 +733,7 @@ 
 				break;
 		}
 		// verify that both the messenger AND the message type are active
-		if ( EEH_MSG_Template::is_messenger_active( $sending_messenger ) && EEH_MSG_Template::is_mt_active( $message_type ) ) {
+		if (EEH_MSG_Template::is_messenger_active($sending_messenger) && EEH_MSG_Template::is_mt_active($message_type)) {
 			//need to get the correct message template group for this (i.e. is there a custom invoice for the event this registration is registered for?)
 			$template_query_params = array(
 				'MTP_is_active' => true,
@@ -742,16 +742,16 @@ 
 				'Event.EVT_ID' => $registration->event_ID()
 			);
 			//get the message template group.
-			$msg_template_group = EEM_Message_Template_Group::instance()->get_one( array( $template_query_params ) );
+			$msg_template_group = EEM_Message_Template_Group::instance()->get_one(array($template_query_params));
 			//if we don't have an EE_Message_Template_Group then return
-			if ( ! $msg_template_group instanceof EE_Message_Template_Group ) {
+			if ( ! $msg_template_group instanceof EE_Message_Template_Group) {
 				// remove EVT_ID from query params so that global templates get picked up
-				unset( $template_query_params['Event.EVT_ID'] );
+				unset($template_query_params['Event.EVT_ID']);
 				//get global template as the fallback
-				$msg_template_group = EEM_Message_Template_Group::instance()->get_one( array( $template_query_params ) );
+				$msg_template_group = EEM_Message_Template_Group::instance()->get_one(array($template_query_params));
 			}
 			//if we don't have an EE_Message_Template_Group then return
-			if ( ! $msg_template_group instanceof EE_Message_Template_Group ) {
+			if ( ! $msg_template_group instanceof EE_Message_Template_Group) {
 				return '';
 			}
 			// generate the URL
@@ -780,7 +780,7 @@ 
 	 * @param bool 	  $send true we will do a test send using the messenger delivery, false we just do a regular preview
 	 * @return string          The body of the message.
 	 */
-	public static function preview_message( $type, $context, $messenger, $send = false ) {
+	public static function preview_message($type, $context, $messenger, $send = false) {
 		self::_load_controller();
 		$mtg = new EE_Message_To_Generate(
 			$messenger,
@@ -789,8 +789,8 @@ 
 			$context,
 			true
 		);
-		$generated_preview_queue = self::$_MSG_PROCESSOR->generate_for_preview( $mtg );
-		if ( $generated_preview_queue instanceof EE_Messages_Queue ) {
+		$generated_preview_queue = self::$_MSG_PROCESSOR->generate_for_preview($mtg);
+		if ($generated_preview_queue instanceof EE_Messages_Queue) {
 			return $generated_preview_queue->get_queue()->current()->content();
 		} else {
 			return $generated_preview_queue;
@@ -817,7 +817,7 @@ 
 	 *
 	 * @return bool          success or fail.
 	 */
-	public static function send_message_with_messenger_only( $messenger, $message_type, EE_Messages_Queue $queue, $custom_subject = '' ) {
+	public static function send_message_with_messenger_only($messenger, $message_type, EE_Messages_Queue $queue, $custom_subject = '') {
 		self::_load_controller();
 		/** @type EE_Message_To_Generate_From_Queue $message_to_generate */
 		$message_to_generate = EE_Registry::instance()->load_lib(
@@ -829,7 +829,7 @@ 
 				$custom_subject,
 			)
 		);
-		return self::$_MSG_PROCESSOR->queue_for_sending( $message_to_generate );
+		return self::$_MSG_PROCESSOR->queue_for_sending($message_to_generate);
 	}
 
 
@@ -842,22 +842,22 @@ 
 	 * @param array     $message_ids An array of message ids
 	 * @return bool | EE_Messages_Queue     false if nothing was generated, EE_Messages_Queue containing generated messages.
 	 */
-	public static function generate_now( $message_ids ) {
+	public static function generate_now($message_ids) {
 		self::_load_controller();
 		$messages = EEM_Message::instance()->get_all(
 			array(
 				0 => array(
-					'MSG_ID' => array( 'IN', $message_ids ),
+					'MSG_ID' => array('IN', $message_ids),
 					'STS_ID' => EEM_Message::status_incomplete,
 				)
 			)
 		);
 
-		$generated_queue = self::$_MSG_PROCESSOR->batch_generate_from_queue( $messages );
+		$generated_queue = self::$_MSG_PROCESSOR->batch_generate_from_queue($messages);
 
-		if ( ! $generated_queue instanceof EE_Messages_Queue ) {
+		if ( ! $generated_queue instanceof EE_Messages_Queue) {
 			EE_Error::add_error(
-				__( 'The messages were not generated.  This is usually because there is already a batch being generated on a separate request.  You can wait a minute or two and try again.', 'event_espresso' ),
+				__('The messages were not generated.  This is usually because there is already a batch being generated on a separate request.  You can wait a minute or two and try again.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -876,28 +876,28 @@ 
 	 *
 	 * @return bool | EE_Messages_Queue  false if no messages sent.
 	 */
-	public static function send_now( $message_ids ) {
+	public static function send_now($message_ids) {
 		self::_load_controller();
 		$messages = EEM_Message::instance()->get_all(
 			array(
 				0 => array(
-					'MSG_ID' => array( 'IN', $message_ids ),
-					'STS_ID' => array( 'IN', array( EEM_Message::status_idle, EEM_Message::status_resend, EEM_Message::status_retry ) )
+					'MSG_ID' => array('IN', $message_ids),
+					'STS_ID' => array('IN', array(EEM_Message::status_idle, EEM_Message::status_resend, EEM_Message::status_retry))
 				)
 			)
 		);
 
-		$sent_queue = self::$_MSG_PROCESSOR->batch_send_from_queue( $messages );
+		$sent_queue = self::$_MSG_PROCESSOR->batch_send_from_queue($messages);
 
-		if ( ! $sent_queue instanceof EE_Messages_Queue ) {
+		if ( ! $sent_queue instanceof EE_Messages_Queue) {
 			EE_Error::add_error(
-				__( 'The messages were not sent.  This is usually because there is already a batch being sent on a separate request.  You can wait a minute or two and try again.', 'event_espresso' ),
+				__('The messages were not sent.  This is usually because there is already a batch being sent on a separate request.  You can wait a minute or two and try again.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		} else {
 			//can count how many sent by using the messages in the queue
-			$sent_count = $sent_queue->count_STS_in_queue( EEM_Message::instance()->stati_indicating_sent() );
-			if ( $sent_count > 0 ) {
+			$sent_count = $sent_queue->count_STS_in_queue(EEM_Message::instance()->stati_indicating_sent());
+			if ($sent_count > 0) {
 				EE_Error::add_success(
 					sprintf(
 						_n(
@@ -912,8 +912,8 @@ 
 			} else {
 				EE_Error::overwrite_errors();
 				EE_Error::add_error(
-					__( 'No message was sent because of problems with sending. Either all the messages you selected were not a sendable message, they were ALREADY sent on a different scheduled task, or there was an error.
-					If there was an error, you can look at the messages in the message activity list table for any error messages.', 'event_espresso' ),
+					__('No message was sent because of problems with sending. Either all the messages you selected were not a sendable message, they were ALREADY sent on a different scheduled task, or there was an error.
+					If there was an error, you can look at the messages in the message activity list table for any error messages.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -934,13 +934,13 @@ 
 	 *
 	 * @return bool  true means messages were successfully queued for resending, false means none were queued for resending.
 	 */
-	public static function queue_for_resending( $message_ids ) {
+	public static function queue_for_resending($message_ids) {
 		self::_load_controller();
-		self::$_MSG_PROCESSOR->setup_messages_from_ids_and_send( $message_ids );
+		self::$_MSG_PROCESSOR->setup_messages_from_ids_and_send($message_ids);
 
 		//get queue and count
-		$queue_count = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue( EEM_Message::status_resend );
-		if ( $queue_count > 0 ) {
+		$queue_count = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue(EEM_Message::status_resend);
+		if ($queue_count > 0) {
 			EE_Error::add_success(
 				sprintf(
 					_n(
@@ -954,7 +954,7 @@ 
 			);
 		} else {
 			EE_Error::add_error(
-				__( 'No messages were queued for resending. This usually only happens when all the messages flagged for resending are not a status that can be resent.', 'event_espresso' ),
+				__('No messages were queued for resending. This usually only happens when all the messages flagged for resending are not a status that can be resent.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -976,16 +976,16 @@ 
 	 * @param array $info
 	 * @param bool $display_request
 	 */
-	protected static function log( $class = '', $func = '', $line = '', EE_Transaction $transaction, $info = array(), $display_request = false ) {
-		if ( WP_DEBUG && false ) {
-			if ( $transaction instanceof EE_Transaction ) {
+	protected static function log($class = '', $func = '', $line = '', EE_Transaction $transaction, $info = array(), $display_request = false) {
+		if (WP_DEBUG && false) {
+			if ($transaction instanceof EE_Transaction) {
 				// don't serialize objects
-				$info = EEH_Debug_Tools::strip_objects( $info );
+				$info = EEH_Debug_Tools::strip_objects($info);
 				$info['TXN_status'] = $transaction->status_ID();
 				$info['TXN_reg_steps'] = $transaction->reg_steps();
-				if ( $transaction->ID() ) {
-					$index = 'EE_Transaction: ' . $transaction->ID();
-					EEH_Debug_Tools::log( $class, $func, $line, $info, $display_request, $index );
+				if ($transaction->ID()) {
+					$index = 'EE_Transaction: '.$transaction->ID();
+					EEH_Debug_Tools::log($class, $func, $line, $info, $display_request, $index);
 				}
 			}
 		}

modules/single_page_checkout/reg_steps/payment_options/payment_options_main.template.php

Spacing +13 added lines, -13 removed lines

@@ -1,37 +1,37 @@
 
 	<h4 id="reg-page-totals-hdr" class="">
-		<span class="drk-grey-text"><?php _e('Registrations:', 'event_espresso'); ?></span> <?php echo $reg_count;?>
+		<span class="drk-grey-text"><?php _e('Registrations:', 'event_espresso'); ?></span> <?php echo $reg_count; ?>
 	</h4>
 
 	<div class="spco-payment-info-dv">
 		<table id="spco-payment-info-table">
 			<thead>
 				<tr>
-					<th scope="col" width=""><?php _e('Name and Description', 'event_espresso');?></th>
-					<th scope="col" width="15%" class="jst-cntr"><?php _e('Price', 'event_espresso');?></th>
-					<th scope="col" width="5%" class="jst-cntr"><?php _e( 'Qty', 'event_espresso' ); ?></th>
-					<th scope="col" width="15%" class="jst-cntr"><?php _e('Total', 'event_espresso');?></th>
-					<?php	do_action( 'AHEE__registration_page_payment_options__payment_info_table_thead_row_end' ); ?>
+					<th scope="col" width=""><?php _e('Name and Description', 'event_espresso'); ?></th>
+					<th scope="col" width="15%" class="jst-cntr"><?php _e('Price', 'event_espresso'); ?></th>
+					<th scope="col" width="5%" class="jst-cntr"><?php _e('Qty', 'event_espresso'); ?></th>
+					<th scope="col" width="15%" class="jst-cntr"><?php _e('Total', 'event_espresso'); ?></th>
+					<?php	do_action('AHEE__registration_page_payment_options__payment_info_table_thead_row_end'); ?>
 				</tr>
 			</thead>
 			<tbody>
-			<?php echo $transaction_details;?>
-			<?php	do_action( 'AHEE__registration_page_payment_options__payment_info_table_tbody_end' ); ?>
+			<?php echo $transaction_details; ?>
+			<?php	do_action('AHEE__registration_page_payment_options__payment_info_table_tbody_end'); ?>
 			</tbody>
 		</table>
 	</div>
 	<div class="clear-float"> </div>
 
-	<?php  echo $before_payment_options;  ?>
+	<?php  echo $before_payment_options; ?>
 
 	<div id="methods-of-payment">
 		<?php echo $payment_options; ?>
-		<a id="reg-page-select-other-method-of-payment-lnk" class="hidden smaller-text right" rel=""><?php echo apply_filters( 'FHEE__registration_page_payment_options__select_other_method_of_payment_lnk', __( 'select a different method of payment:', 'event_espresso' )); ?></a>
+		<a id="reg-page-select-other-method-of-payment-lnk" class="hidden smaller-text right" rel=""><?php echo apply_filters('FHEE__registration_page_payment_options__select_other_method_of_payment_lnk', __('select a different method of payment:', 'event_espresso')); ?></a>
 	</div>
 	<!-- end #methods-of-payment -->
 
-	<?php  echo $after_payment_options;  ?>
+	<?php  echo $after_payment_options; ?>
 
-	<?php  echo $default_hidden_inputs;  ?>
-	<?php  echo $extra_hidden_inputs;  ?>
+	<?php  echo $default_hidden_inputs; ?>
+	<?php  echo $extra_hidden_inputs; ?>
 

public/Espresso_Arabica_2014/content-espresso_venues-details.php

Spacing +13 added lines, -13 removed lines

@@ -1,43 +1,43 @@
 <?php //echo '<h1>' . __FILE__ . '</h1>'; ?>
 <?php global $post; ?>
 <div class="venue-content">
-<?php if ( apply_filters( 'FHEE__content_espresso_venues_details_template__display_entry_meta', TRUE )): ?>
+<?php if (apply_filters('FHEE__content_espresso_venues_details_template__display_entry_meta', TRUE)): ?>
 	<div class="entry-meta">
-		<span class="tags-links"><?php espresso_venue_categories( $post->ID, TRUE, TRUE ); ?></span>
+		<span class="tags-links"><?php espresso_venue_categories($post->ID, TRUE, TRUE); ?></span>
 		<?php
-			if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
+			if ( ! post_password_required() && (comments_open() || get_comments_number())) :
 		?>
-		<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'event_espresso' ), __( '1 Comment', 'event_espresso' ), __( '% Comments', 'event_espresso' ) ); ?></span>
+		<span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'event_espresso'), __('1 Comment', 'event_espresso'), __('% Comments', 'event_espresso')); ?></span>
 		<?php
 			endif;
 
-			edit_post_link( __( 'Edit', 'event_espresso' ), '<span class="edit-link">', '</span>' );
+			edit_post_link(__('Edit', 'event_espresso'), '<span class="edit-link">', '</span>');
 		?>
 	</div>
 <?php  endif; ?>
 	
 	<h3 class="event-venues-h3 ee-event-h3">
-		<?php _e( 'Details', 'event_espresso' ); ?>
+		<?php _e('Details', 'event_espresso'); ?>
 	</h3>
 
-	<?php if ( $venue_phone = espresso_venue_phone( $post->ID, FALSE )) : ?>
+	<?php if ($venue_phone = espresso_venue_phone($post->ID, FALSE)) : ?>
 	<p>
-		<span class="small-text"><strong><?php _e( 'Venue Phone:', 'event_espresso' ); ?> </strong></span><?php echo $venue_phone; ?>
+		<span class="small-text"><strong><?php _e('Venue Phone:', 'event_espresso'); ?> </strong></span><?php echo $venue_phone; ?>
 	</p>
 	<?php endif; ?>
-	<?php if ( $venue_website = espresso_venue_website( $post->ID, FALSE )) : ?>
+	<?php if ($venue_website = espresso_venue_website($post->ID, FALSE)) : ?>
 	<p>
-		<span class="small-text"><strong><?php _e( 'Venue Website:', 'event_espresso' ); ?> </strong></span><?php echo $venue_website; ?>
+		<span class="small-text"><strong><?php _e('Venue Website:', 'event_espresso'); ?> </strong></span><?php echo $venue_website; ?>
 	</p>
 	<?php endif; ?>
 	<?php 
-	do_action( 'AHEE__content_espresso_venues_details_template__before_the_content', $post ); 
-	if ( is_archive() && has_excerpt( $post->ID )) {
+	do_action('AHEE__content_espresso_venues_details_template__before_the_content', $post); 
+	if (is_archive() && has_excerpt($post->ID)) {
 		the_excerpt();
 	} else {
 		the_content();
 	}
-	do_action( 'AHEE__content_espresso_venues_details_template__after_the_content', $post ); 
+	do_action('AHEE__content_espresso_venues_details_template__after_the_content', $post); 
 	?>
 </div>
 <!-- .venue-content -->

core/db_models/EEM_Post_Meta.model.php

Braces +3 added lines, -1 removed lines

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

Spacing +9 added lines, -9 removed lines

@@ -31,20 +31,20 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 
 class EEM_Post_Meta extends EEM_Base {
 
   	// private instance of the EE_Post_Meta object
 	protected static $_instance = NULL;
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Post Meta','event_espresso');
-		$this->plural_item = __('Post Metas','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Post Meta', 'event_espresso');
+		$this->plural_item = __('Post Metas', 'event_espresso');
 		$this->_tables = array(
 			'Post_Meta'=> new EE_Primary_Table('postmeta', 'meta_id')
 		);
-		$models_this_can_attach_to = array_keys( EE_Registry::instance()->cpt_models() );
+		$models_this_can_attach_to = array_keys(EE_Registry::instance()->cpt_models());
 		$this->_fields = array(
 			'Post_Meta'=>array(
 				'meta_id'=>new EE_Primary_Key_Int_Field('meta_id', __("Meta ID", "event_espresso")),
@@ -53,13 +53,13 @@ 
 				'meta_value'=>new EE_Maybe_Serialized_Text_Field('meta_value', __("Meta Value", "event_espresso"), true)
 			));
 		$this->_model_relations = array();
-		foreach($models_this_can_attach_to as $model){
+		foreach ($models_this_can_attach_to as $model) {
 			$this->_model_relations[$model] = new EE_Belongs_To_Relation();
 		}
-		foreach( $this->cap_contexts_to_cap_action_map() as $cap_context => $action ) {
-			$this->_cap_restriction_generators[ $cap_context ] = new EE_Restriction_Generator_Meta( 'meta_key', 'meta_value' );
+		foreach ($this->cap_contexts_to_cap_action_map() as $cap_context => $action) {
+			$this->_cap_restriction_generators[$cap_context] = new EE_Restriction_Generator_Meta('meta_key', 'meta_value');
 		}
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 

admin_pages/venues/Venues_Admin_Page.core.php

Doc Comments +1 added lines, -1 removed lines

@@ -944,7 +944,7 @@
 	 * @access  private
 	 * @param  int $VNU_ID
 	 * @param  string $venue_status
-	 * @return void
+	 * @return boolean
 	 */
 	private function _change_venue_status( $VNU_ID = 0, $venue_status = '' ) {
 		// grab venue id

Braces +12 added lines, -7 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -893,8 +894,9 @@ 
 		}
 		$action = $venue_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
 
-		if ( $redirect_after )
-			$this->_redirect_after_action($success, 'Venue', $action, array('action' => 'default'));
+		if ( $redirect_after ) {
+					$this->_redirect_after_action($success, 'Venue', $action, array('action' => 'default'));
+		}
 
 	}
 
@@ -1013,8 +1015,9 @@ 
 			$msg = __('An error occurred. An venue could not be deleted because a valid venue ID was not not supplied.', 'event_espresso');
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
-		if ( $redirect_after )
-			$this->_redirect_after_action($success, 'Venue', 'deleted', array('action' => 'default'));
+		if ( $redirect_after ) {
+					$this->_redirect_after_action($success, 'Venue', 'deleted', array('action' => 'default'));
+		}
 	}
 
 
@@ -1185,8 +1188,10 @@ 
 	 * @return void
 	 */
 	private function _set_category_object() {
-		if ( isset( $this->_category->id ) && !empty( $this->_category->id ) )
-			return; //already have the category object so get out.
+		if ( isset( $this->_category->id ) && !empty( $this->_category->id ) ) {
+					return;
+		}
+		//already have the category object so get out.
 
 		//set default category object
 		$this->_set_empty_category_object();

Spacing +238 added lines, -238 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -62,10 +62,10 @@ 
 
 
 	protected function _init_page_props() {
-		require_once( EE_MODELS . 'EEM_Venue.model.php' );
+		require_once(EE_MODELS.'EEM_Venue.model.php');
 		$this->page_slug = EE_VENUES_PG_SLUG;
 		$this->_admin_base_url = EE_VENUES_ADMIN_URL;
-		$this->_admin_base_path = EE_ADMIN_PAGES . 'venues';
+		$this->_admin_base_path = EE_ADMIN_PAGES.'venues';
 		$this->page_label = __('Event Venues', 'event_espresso');
 		$this->_cpt_model_names = array(
 			'create_new' => 'EEM_Venue',
@@ -108,7 +108,7 @@ 
 				'edit' => __('Update Venue', 'event_espresso'),
 				'add_category' => __('Save New Category', 'event_espresso'),
 				'edit_category' => __('Update Category', 'event_espresso'),
-				'google_map_settings' => __( 'Update Settings', 'event_espresso' )
+				'google_map_settings' => __('Update Settings', 'event_espresso')
 				)
 		);
 	}
@@ -123,8 +123,8 @@ 
 		//load field generator helper
 
 		//is there a vnu_id in the request?
-		$vnu_id = ! empty( $this->_req_data['VNU_ID'] ) && ! is_array( $this->_req_data['VNU_ID'] ) ? $this->_req_data['VNU_ID'] : 0;
-		$vnu_id = ! empty( $this->_req_data['post'] ) ? $this->_req_data['post'] : $vnu_id;
+		$vnu_id = ! empty($this->_req_data['VNU_ID']) && ! is_array($this->_req_data['VNU_ID']) ? $this->_req_data['VNU_ID'] : 0;
+		$vnu_id = ! empty($this->_req_data['post']) ? $this->_req_data['post'] : $vnu_id;
 
 		$this->_page_routes = array(
 			'default' => array(
@@ -142,27 +142,27 @@ 
 				),
 			'trash_venue' => array(
 				'func' => '_trash_or_restore_venue',
-				'args' => array( 'venue_status' => 'trash' ),
+				'args' => array('venue_status' => 'trash'),
 				'noheader' => TRUE,
 				'capability' => 'ee_delete_venue',
 				'obj_id' => $vnu_id
 				),
 			'trash_venues' => array(
 				'func' => '_trash_or_restore_venues',
-				'args' => array( 'venue_status' => 'trash' ),
+				'args' => array('venue_status' => 'trash'),
 				'noheader' => TRUE,
 				'capability' => 'ee_delete_venues'
 				),
 			'restore_venue' => array(
 				'func' => '_trash_or_restore_venue',
-				'args' => array( 'venue_status' => 'draft' ),
+				'args' => array('venue_status' => 'draft'),
 				'noheader' => TRUE,
 				'capability' => 'ee_delete_venue',
 				'obj_id' => $vnu_id
 				),
 			'restore_venues' => array(
 				'func' => '_trash_or_restore_venues',
-				'args' => array( 'venue_status' => 'draft' ),
+				'args' => array('venue_status' => 'draft'),
 				'noheader' => TRUE,
 				'capability' => 'ee_delete_venues'
 				),
@@ -264,7 +264,7 @@ 
 						'filename' => 'venues_overview_views_bulk_actions_search'
 					)
 				),
-				'help_tour' => array( 'Venues_Overview_Help_Tour' ),
+				'help_tour' => array('Venues_Overview_Help_Tour'),
 				'metaboxes' => array('_espresso_news_post_box', '_espresso_links_post_box'),
 				'require_nonce' => FALSE
 			),
@@ -300,7 +300,7 @@ 
 						'filename' => 'venues_editor_other'
 					)
 				),
-				'help_tour' => array( 'Venues_Add_Venue_Help_Tour' ),
+				'help_tour' => array('Venues_Add_Venue_Help_Tour'),
 				'metaboxes' => array('_venue_editor_metaboxes'),
 				'require_nonce' => FALSE
 				),
@@ -309,7 +309,7 @@ 
 					'label' => __('Edit Venue', 'event_espresso'),
 					'order' => 5,
 					'persistent' => FALSE,
-					'url' => isset($this->_req_data['post']) ? add_query_arg(array('post' => $this->_req_data['post'] ), $this->_current_page_view_url )  : $this->_admin_base_url
+					'url' => isset($this->_req_data['post']) ? add_query_arg(array('post' => $this->_req_data['post']), $this->_current_page_view_url) : $this->_admin_base_url
 				),
 				'help_tabs' => array(
 					'venues_editor_help_tab' => array(
@@ -346,14 +346,14 @@ 
 					'label' => __('Google Maps'),
 					'order' => 40
 				),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'help_tabs' => array(
 					'general_settings_google_maps_help_tab' => array(
 						'title' => __('Google Maps', 'event_espresso'),
 						'filename' => 'general_settings_google_maps'
 					)
 				),
-				'help_tour' => array( 'Google_Maps_Help_Tour' ),
+				'help_tour' => array('Google_Maps_Help_Tour'),
 				'require_nonce' => FALSE
 			),
 			//venue category stuff
@@ -369,7 +369,7 @@ 
 						'filename' => 'venues_add_category'
 					)
 				),
-				'help_tour' => array( 'Venues_Add_Category_Help_Tour' ),
+				'help_tour' => array('Venues_Add_Category_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 			'edit_category' => array(
@@ -377,7 +377,7 @@ 
 					'label' => __('Edit Category', 'event_espresso'),
 					'order' => 15,
 					'persistent' => FALSE,
-					'url' => isset($this->_req_data['EVT_CAT_ID']) ? add_query_arg(array('EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID'] ), $this->_current_page_view_url )  : $this->_admin_base_url
+					'url' => isset($this->_req_data['EVT_CAT_ID']) ? add_query_arg(array('EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID']), $this->_current_page_view_url) : $this->_admin_base_url
 					),
 				'metaboxes' => array('_publish_post_box'),
 				'help_tabs' => array(
@@ -413,7 +413,7 @@ 
 						'filename' => 'venues_categories_other'
 					)
 				),
-				'help_tour' => array( 'Venues_Categories_Help_Tour' ),
+				'help_tour' => array('Venues_Categories_Help_Tour'),
 				'metaboxes' => $this->_default_espresso_metaboxes,
 				'require_nonce' => FALSE
 				)
@@ -470,7 +470,7 @@ 
 
 
 	public function load_scripts_styles() {
-		wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL . 'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL.'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('ee-cat-admin');
 	}
 
@@ -493,7 +493,7 @@ 
 	public function load_scripts_styles_edit() {
 		//styles
 		wp_enqueue_style('espresso-ui-theme');
-		wp_register_style( 'espresso_venues', EE_VENUES_ASSETS_URL . 'ee-venues-admin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_venues', EE_VENUES_ASSETS_URL.'ee-venues-admin.css', array(), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_venues');
 	}
 
@@ -512,13 +512,13 @@ 
 				)
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_venues', 'espresso_venues_trash_venues' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_venues', 'espresso_venues_trash_venues')) {
 			$this->_views['all']['bulk_action'] = array(
 				'trash_venues' => __('Move to Trash', 'event_espresso')
 			);
 			$this->_views['trash'] = array(
 				'slug' => 'trash',
-				'label' => __( 'Trash', 'event_espresso' ),
+				'label' => __('Trash', 'event_espresso'),
 				'count' => 0,
 				'bulk_action' => array(
 					'restore_venues' => __('Restore from Trash', 'event_espresso'),
@@ -551,8 +551,8 @@ 
 
 
 	protected function _overview_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$this->_template_args['after_list_table'] = EEH_Template::get_button_or_link( get_post_type_archive_link('espresso_venues'), __("View Venue Archive Page", "event_espresso"), 'button' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$this->_template_args['after_list_table'] = EEH_Template::get_button_or_link(get_post_type_archive_link('espresso_venues'), __("View Venue Archive Page", "event_espresso"), 'button');
 		$this->_admin_page_title .= $this->get_action_link_or_button('create_new', 'add', array(), 'add-new-h2');
 		$this->_search_btn_label = __('Venues', 'event_espresso');
 		$this->display_admin_list_table_page_with_sidebar();
@@ -566,8 +566,8 @@ 
 			'vnu_url' => $this->_cpt_model_obj->venue_url(),
 			'vnu_phone' => $this->_cpt_model_obj->phone()
 			);
-		$template = EE_VENUES_TEMPLATE_PATH . 'venue_publish_box_extras.template.php';
-		EEH_Template::display_template( $template, $extra_rows );
+		$template = EE_VENUES_TEMPLATE_PATH.'venue_publish_box_extras.template.php';
+		EEH_Template::display_template($template, $extra_rows);
 	}
 
 
@@ -582,115 +582,115 @@ 
 		$default_map_settings = new stdClass();
 		$default_map_settings->use_google_maps = TRUE;
 		// for event details pages (reg page)
-		$default_map_settings->event_details_map_width = 585; 			// ee_map_width_single
-		$default_map_settings->event_details_map_height = 362; 			// ee_map_height_single
-		$default_map_settings->event_details_map_zoom = 14; 			// ee_map_zoom_single
-		$default_map_settings->event_details_display_nav = TRUE; 			// ee_map_nav_display_single
-		$default_map_settings->event_details_nav_size = FALSE; 			// ee_map_nav_size_single
-		$default_map_settings->event_details_control_type = 'default'; 		// ee_map_type_control_single
-		$default_map_settings->event_details_map_align = 'center'; 			// ee_map_align_single
+		$default_map_settings->event_details_map_width = 585; // ee_map_width_single
+		$default_map_settings->event_details_map_height = 362; // ee_map_height_single
+		$default_map_settings->event_details_map_zoom = 14; // ee_map_zoom_single
+		$default_map_settings->event_details_display_nav = TRUE; // ee_map_nav_display_single
+		$default_map_settings->event_details_nav_size = FALSE; // ee_map_nav_size_single
+		$default_map_settings->event_details_control_type = 'default'; // ee_map_type_control_single
+		$default_map_settings->event_details_map_align = 'center'; // ee_map_align_single
 		// for event list pages
-		$default_map_settings->event_list_map_width = 300; 			// ee_map_width
-		$default_map_settings->event_list_map_height = 185; 		// ee_map_height
-		$default_map_settings->event_list_map_zoom = 12; 			// ee_map_zoom
-		$default_map_settings->event_list_display_nav = FALSE; 		// ee_map_nav_display
-		$default_map_settings->event_list_nav_size = TRUE; 			// ee_map_nav_size
-		$default_map_settings->event_list_control_type = 'dropdown'; 		// ee_map_type_control
-		$default_map_settings->event_list_map_align = 'center'; 			// ee_map_align
+		$default_map_settings->event_list_map_width = 300; // ee_map_width
+		$default_map_settings->event_list_map_height = 185; // ee_map_height
+		$default_map_settings->event_list_map_zoom = 12; // ee_map_zoom
+		$default_map_settings->event_list_display_nav = FALSE; // ee_map_nav_display
+		$default_map_settings->event_list_nav_size = TRUE; // ee_map_nav_size
+		$default_map_settings->event_list_control_type = 'dropdown'; // ee_map_type_control
+		$default_map_settings->event_list_map_align = 'center'; // ee_map_align
 
 		$this->_template_args['map_settings'] =
-			isset( EE_Registry::instance()->CFG->map_settings ) && ! empty( EE_Registry::instance()->CFG->map_settings )
-				? (object)array_merge( (array)$default_map_settings, (array)EE_Registry::instance()->CFG->map_settings )
+			isset(EE_Registry::instance()->CFG->map_settings) && ! empty(EE_Registry::instance()->CFG->map_settings)
+				? (object) array_merge((array) $default_map_settings, (array) EE_Registry::instance()->CFG->map_settings)
 				: $default_map_settings;
 
-		$this->_set_add_edit_form_tags( 'update_google_map_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( EE_VENUES_TEMPLATE_PATH . 'google_map.template.php', $this->_template_args, TRUE );
+		$this->_set_add_edit_form_tags('update_google_map_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(EE_VENUES_TEMPLATE_PATH.'google_map.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 	}
 
 	protected function _update_google_map_settings() {
 
 		EE_Registry::instance()->CFG->map_settings->use_google_maps =
-			isset( $this->_req_data['use_google_maps'] )
-				? absint( $this->_req_data['use_google_maps'] )
+			isset($this->_req_data['use_google_maps'])
+				? absint($this->_req_data['use_google_maps'])
 				: EE_Registry::instance()->CFG->map_settings->use_google_maps;
 
 		EE_Registry::instance()->CFG->map_settings->event_details_map_width =
-			isset( $this->_req_data['event_details_map_width'] )
-				? absint( $this->_req_data['event_details_map_width'] )
+			isset($this->_req_data['event_details_map_width'])
+				? absint($this->_req_data['event_details_map_width'])
 				: EE_Registry::instance()->CFG->map_settings->event_details_map_width;
 
 		EE_Registry::instance()->CFG->map_settings->event_details_map_height =
-			isset( $this->_req_data['event_details_map_height'] )
-				? absint( $this->_req_data['event_details_map_height'] )
+			isset($this->_req_data['event_details_map_height'])
+				? absint($this->_req_data['event_details_map_height'])
 				: EE_Registry::instance()->CFG->map_settings->event_details_map_height;
 
 		EE_Registry::instance()->CFG->map_settings->event_details_map_zoom =
-			isset( $this->_req_data['event_details_map_zoom'] )
-				? absint( $this->_req_data['event_details_map_zoom'] )
+			isset($this->_req_data['event_details_map_zoom'])
+				? absint($this->_req_data['event_details_map_zoom'])
 				: EE_Registry::instance()->CFG->map_settings->event_details_map_zoom;
 
 		EE_Registry::instance()->CFG->map_settings->event_details_display_nav =
-			isset( $this->_req_data['event_details_display_nav'] )
-				? absint( $this->_req_data['event_details_display_nav'] )
+			isset($this->_req_data['event_details_display_nav'])
+				? absint($this->_req_data['event_details_display_nav'])
 				: EE_Registry::instance()->CFG->map_settings->event_details_display_nav;
 
 		EE_Registry::instance()->CFG->map_settings->event_details_nav_size =
-			isset( $this->_req_data['event_details_nav_size'] )
-				? absint( $this->_req_data['event_details_nav_size'] )
+			isset($this->_req_data['event_details_nav_size'])
+				? absint($this->_req_data['event_details_nav_size'])
 				: EE_Registry::instance()->CFG->map_settings->event_details_nav_size;
 
 		EE_Registry::instance()->CFG->map_settings->event_details_control_type =
-			isset( $this->_req_data['event_details_control_type'] )
-				? sanitize_text_field( $this->_req_data['event_details_control_type'] )
+			isset($this->_req_data['event_details_control_type'])
+				? sanitize_text_field($this->_req_data['event_details_control_type'])
 				: EE_Registry::instance()->CFG->map_settings->event_details_control_type;
 
 		EE_Registry::instance()->CFG->map_settings->event_details_map_align =
-			isset( $this->_req_data['event_details_map_align'] )
-				? sanitize_text_field( $this->_req_data['event_details_map_align'] )
+			isset($this->_req_data['event_details_map_align'])
+				? sanitize_text_field($this->_req_data['event_details_map_align'])
 				: EE_Registry::instance()->CFG->map_settings->event_details_map_align;
 
 		EE_Registry::instance()->CFG->map_settings->event_list_map_width =
-			isset( $this->_req_data['event_list_map_width'] )
-				? absint( $this->_req_data['event_list_map_width'] )
+			isset($this->_req_data['event_list_map_width'])
+				? absint($this->_req_data['event_list_map_width'])
 				: EE_Registry::instance()->CFG->map_settings->event_list_map_width;
 
 		EE_Registry::instance()->CFG->map_settings->event_list_map_height =
-			isset( $this->_req_data['event_list_map_height'] )
-				? absint( $this->_req_data['event_list_map_height'] )
+			isset($this->_req_data['event_list_map_height'])
+				? absint($this->_req_data['event_list_map_height'])
 				: EE_Registry::instance()->CFG->map_settings->event_list_map_height;
 
 		EE_Registry::instance()->CFG->map_settings->event_list_map_zoom =
-			isset( $this->_req_data['event_list_map_zoom'] )
-				? absint( $this->_req_data['event_list_map_zoom'] )
+			isset($this->_req_data['event_list_map_zoom'])
+				? absint($this->_req_data['event_list_map_zoom'])
 				: EE_Registry::instance()->CFG->map_settings->event_list_map_zoom;
 
 		EE_Registry::instance()->CFG->map_settings->event_list_display_nav =
-			isset( $this->_req_data['event_list_display_nav'] )
-				? absint( $this->_req_data['event_list_display_nav'] )
+			isset($this->_req_data['event_list_display_nav'])
+				? absint($this->_req_data['event_list_display_nav'])
 				: EE_Registry::instance()->CFG->map_settings->event_list_display_nav;
 
 		EE_Registry::instance()->CFG->map_settings->event_list_nav_size =
-			isset( $this->_req_data['event_list_nav_size'] )
-				? absint( $this->_req_data['event_list_nav_size'] )
+			isset($this->_req_data['event_list_nav_size'])
+				? absint($this->_req_data['event_list_nav_size'])
 				: EE_Registry::instance()->CFG->map_settings->event_list_nav_size;
 
 		EE_Registry::instance()->CFG->map_settings->event_list_control_type =
-			isset( $this->_req_data['event_list_control_type'] )
-				? sanitize_text_field( $this->_req_data['event_list_control_type'] )
+			isset($this->_req_data['event_list_control_type'])
+				? sanitize_text_field($this->_req_data['event_list_control_type'])
 				: EE_Registry::instance()->CFG->map_settings->event_list_control_type;
 
 		EE_Registry::instance()->CFG->map_settings->event_list_map_align =
-			isset( $this->_req_data['event_list_map_align'] )
-				? sanitize_text_field( $this->_req_data['event_list_map_align'] )
+			isset($this->_req_data['event_list_map_align'])
+				? sanitize_text_field($this->_req_data['event_list_map_align'])
 				: EE_Registry::instance()->CFG->map_settings->event_list_map_align;
 
-		EE_Registry::instance()->CFG->map_settings = apply_filters( 'FHEE__Extend_General_Settings_Admin_Page___update_google_map_settings__CFG_map_settings', EE_Registry::instance()->CFG->map_settings );
+		EE_Registry::instance()->CFG->map_settings = apply_filters('FHEE__Extend_General_Settings_Admin_Page___update_google_map_settings__CFG_map_settings', EE_Registry::instance()->CFG->map_settings);
 
 		$what = 'Google Map Settings';
-		$success = $this->_update_espresso_configuration( $what, EE_Registry::instance()->CFG->map_settings, __FILE__, __FUNCTION__, __LINE__ );
-		$this->_redirect_after_action( $success, $what, 'updated', array( 'action' => 'google_map_settings' ) );
+		$success = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG->map_settings, __FILE__, __FUNCTION__, __LINE__);
+		$this->_redirect_after_action($success, $what, 'updated', array('action' => 'google_map_settings'));
 
 	}
 
@@ -699,9 +699,9 @@ 
 	protected function _venue_editor_metaboxes() {
 		$this->verify_cpt_object();
 
-		add_meta_box( 'espresso_venue_address_options', __('Physical Location', 'event_espresso'), array( $this, 'venue_address_metabox'), $this->page_slug, 'side', 'default' );
-		add_meta_box( 'espresso_venue_gmap_options', __('Google Map', 'event_espresso'), array( $this, 'venue_gmap_metabox'), $this->page_slug, 'side', 'default' );
-		add_meta_box( 'espresso_venue_virtual_loc_options', __('Virtual Location', 'event_espresso'), array( $this, 'venue_virtual_loc_metabox'), $this->page_slug, 'side', 'default' );
+		add_meta_box('espresso_venue_address_options', __('Physical Location', 'event_espresso'), array($this, 'venue_address_metabox'), $this->page_slug, 'side', 'default');
+		add_meta_box('espresso_venue_gmap_options', __('Google Map', 'event_espresso'), array($this, 'venue_gmap_metabox'), $this->page_slug, 'side', 'default');
+		add_meta_box('espresso_venue_virtual_loc_options', __('Virtual Location', 'event_espresso'), array($this, 'venue_virtual_loc_metabox'), $this->page_slug, 'side', 'default');
 
 	}
 
@@ -709,23 +709,23 @@ 
 
 	public function venue_gmap_metabox() {
 		$template_args = array(
-			'vnu_enable_for_gmap' => EEH_Form_Fields::select_input('vnu_enable_for_gmap', $this->get_yes_no_values(), $this->_cpt_model_obj->enable_for_gmap() ),
+			'vnu_enable_for_gmap' => EEH_Form_Fields::select_input('vnu_enable_for_gmap', $this->get_yes_no_values(), $this->_cpt_model_obj->enable_for_gmap()),
 			'vnu_google_map_link' => $this->_cpt_model_obj->google_map_link(),
 			);
-		$template = EE_VENUES_TEMPLATE_PATH . 'venue_gmap_metabox_content.template.php';
-		EEH_Template::display_template( $template, $template_args );
+		$template = EE_VENUES_TEMPLATE_PATH.'venue_gmap_metabox_content.template.php';
+		EEH_Template::display_template($template, $template_args);
 	}
 
 
 
 	public function venue_address_metabox() {
 
-		$template_args['_venue'] =$this->_cpt_model_obj;
+		$template_args['_venue'] = $this->_cpt_model_obj;
 
 		$template_args['states_dropdown'] = EEH_Form_Fields::generate_form_input(
 			$QFI = new EE_Question_Form_Input(
-				EE_Question::new_instance( array( 'QST_display_text' => 'State', 'QST_system' => 'state' )),
-				EE_Answer::new_instance( array(  'ANS_value'=> $this->_cpt_model_obj->state_ID() )),
+				EE_Question::new_instance(array('QST_display_text' => 'State', 'QST_system' => 'state')),
+				EE_Answer::new_instance(array('ANS_value'=> $this->_cpt_model_obj->state_ID())),
 				array(
 					'input_name' =>  'sta_id',
 					'input_id' => 'sta_id',
@@ -737,8 +737,8 @@ 
 		);
 		$template_args['countries_dropdown'] = EEH_Form_Fields::generate_form_input(
 			$QFI = new EE_Question_Form_Input(
-				EE_Question::new_instance( array( 'QST_display_text' => 'Country', 'QST_system' => 'country' )),
-				EE_Answer::new_instance( array(  'ANS_value'=> $this->_cpt_model_obj->country_ID() )),
+				EE_Question::new_instance(array('QST_display_text' => 'Country', 'QST_system' => 'country')),
+				EE_Answer::new_instance(array('ANS_value'=> $this->_cpt_model_obj->country_ID())),
 				array(
 					'input_name' =>  'cnt_iso',
 					'input_id' => 'cnt_iso',
@@ -749,8 +749,8 @@ 
 			)
 		);
 
-		$template = EE_VENUES_TEMPLATE_PATH . 'venue_address_metabox_content.template.php';
-		EEH_Template::display_template( $template, $template_args );
+		$template = EE_VENUES_TEMPLATE_PATH.'venue_address_metabox_content.template.php';
+		EEH_Template::display_template($template, $template_args);
 	}
 
 
@@ -762,8 +762,8 @@ 
 		$template_args = array(
 			'_venue' => $this->_cpt_model_obj
 			);
-		$template = EE_VENUES_TEMPLATE_PATH . 'venue_virtual_location_metabox_content.template.php';
-		EEH_Template::display_template( $template, $template_args );
+		$template = EE_VENUES_TEMPLATE_PATH.'venue_virtual_location_metabox_content.template.php';
+		EEH_Template::display_template($template, $template_args);
 	}
 
 
@@ -786,52 +786,52 @@ 
 	 * @param  object $post    Post object (with "blessed" WP properties)
 	 * @return void
 	 */
-	protected function _insert_update_cpt_item( $post_id, $post ) {
+	protected function _insert_update_cpt_item($post_id, $post) {
 
-		if ( $post instanceof WP_Post && $post->post_type !== 'espresso_venues' ) {
-			return;// get out we're not processing the saving of venues.
+		if ($post instanceof WP_Post && $post->post_type !== 'espresso_venues') {
+			return; // get out we're not processing the saving of venues.
 		}
 
-		$wheres = array( $this->_venue_model->primary_key_name() => $post_id );
+		$wheres = array($this->_venue_model->primary_key_name() => $post_id);
 
 		$venue_values = array(
-			'VNU_address' => !empty( $this->_req_data['vnu_address'] ) ? $this->_req_data['vnu_address'] : NULL,
-			'VNU_address2' => !empty( $this->_req_data['vnu_address2'] ) ? $this->_req_data['vnu_address2'] : NULL,
-			'VNU_city' => !empty( $this->_req_data['vnu_city'] ) ? $this->_req_data['vnu_city'] : NULL,
-			'STA_ID' => !empty( $this->_req_data['sta_id'] ) ? $this->_req_data['sta_id'] : NULL,
-			'CNT_ISO' => !empty( $this->_req_data['cnt_iso'] ) ? $this->_req_data['cnt_iso'] : NULL,
-			'VNU_zip' => !empty( $this->_req_data['vnu_zip'] ) ? $this->_req_data['vnu_zip'] : NULL,
-			'VNU_phone' => !empty( $this->_req_data['vnu_phone'] ) ? $this->_req_data['vnu_phone'] : NULL,
-			'VNU_capacity' => !empty( $this->_req_data['vnu_capacity'] ) ? str_replace( ',', '', $this->_req_data['vnu_capacity'] ) : EE_INF,
-			'VNU_url' => !empty( $this->_req_data['vnu_url'] ) ? $this->_req_data['vnu_url'] : NULL,
-			'VNU_virtual_phone' => !empty( $this->_req_data['vnu_virtual_phone'] ) ? $this->_req_data['vnu_virtual_phone'] : NULL,
-			'VNU_virtual_url' => !empty( $this->_req_data['vnu_virtual_url'] ) ? $this->_req_data['vnu_virtual_url'] : NULL,
-			'VNU_enable_for_gmap' => !empty( $this->_req_data['vnu_enable_for_gmap'] ) ? TRUE : FALSE,
-			'VNU_google_map_link' => !empty( $this->_req_data['vnu_google_map_link'] ) ? $this->_req_data['vnu_google_map_link'] : NULL
+			'VNU_address' => ! empty($this->_req_data['vnu_address']) ? $this->_req_data['vnu_address'] : NULL,
+			'VNU_address2' => ! empty($this->_req_data['vnu_address2']) ? $this->_req_data['vnu_address2'] : NULL,
+			'VNU_city' => ! empty($this->_req_data['vnu_city']) ? $this->_req_data['vnu_city'] : NULL,
+			'STA_ID' => ! empty($this->_req_data['sta_id']) ? $this->_req_data['sta_id'] : NULL,
+			'CNT_ISO' => ! empty($this->_req_data['cnt_iso']) ? $this->_req_data['cnt_iso'] : NULL,
+			'VNU_zip' => ! empty($this->_req_data['vnu_zip']) ? $this->_req_data['vnu_zip'] : NULL,
+			'VNU_phone' => ! empty($this->_req_data['vnu_phone']) ? $this->_req_data['vnu_phone'] : NULL,
+			'VNU_capacity' => ! empty($this->_req_data['vnu_capacity']) ? str_replace(',', '', $this->_req_data['vnu_capacity']) : EE_INF,
+			'VNU_url' => ! empty($this->_req_data['vnu_url']) ? $this->_req_data['vnu_url'] : NULL,
+			'VNU_virtual_phone' => ! empty($this->_req_data['vnu_virtual_phone']) ? $this->_req_data['vnu_virtual_phone'] : NULL,
+			'VNU_virtual_url' => ! empty($this->_req_data['vnu_virtual_url']) ? $this->_req_data['vnu_virtual_url'] : NULL,
+			'VNU_enable_for_gmap' => ! empty($this->_req_data['vnu_enable_for_gmap']) ? TRUE : FALSE,
+			'VNU_google_map_link' => ! empty($this->_req_data['vnu_google_map_link']) ? $this->_req_data['vnu_google_map_link'] : NULL
 			);
 
 		//update venue
-		$success = $this->_venue_model->update( $venue_values, array( $wheres ) );
+		$success = $this->_venue_model->update($venue_values, array($wheres));
 
 		//get venue_object for other metaboxes that might be added via the filter... though it would seem to make sense to just use $this->_venue_model->get_one_by_ID( $post_id ).. i have to setup where conditions to override the filters in the model that filter out autodraft and inherit statuses so we GET the inherit id!
-		$get_one_where = array( $this->_venue_model->primary_key_name() => $post_id, 'status' => $post->post_status  );
-		$venue = $this->_venue_model->get_one( array( $get_one_where ) );
+		$get_one_where = array($this->_venue_model->primary_key_name() => $post_id, 'status' => $post->post_status);
+		$venue = $this->_venue_model->get_one(array($get_one_where));
 
 		//notice we've applied a filter for venue metabox callbacks but we don't actually have any default venue metaboxes in use.  So this is just here for addons to more easily hook into venue saves.
-		$venue_update_callbacks = apply_filters( 'FHEE__Venues_Admin_Page___insert_update_cpt_item__venue_update_callbacks', array() );
+		$venue_update_callbacks = apply_filters('FHEE__Venues_Admin_Page___insert_update_cpt_item__venue_update_callbacks', array());
 
 		$att_success = TRUE;
 
-		foreach ( $venue_update_callbacks as $v_callback ) {
-			$_succ = call_user_func_array( $v_callback, array( $venue,  $this->_req_data ) );
-			$att_success = !$att_success ? $att_success : $_succ; //if ANY of these updates fail then we want the appropriate global error message
+		foreach ($venue_update_callbacks as $v_callback) {
+			$_succ = call_user_func_array($v_callback, array($venue, $this->_req_data));
+			$att_success = ! $att_success ? $att_success : $_succ; //if ANY of these updates fail then we want the appropriate global error message
 		}
 
 		//any errors?
-		if ( $success && !$att_success ) {
-			EE_Error::add_error( __('Venue Details saved successfully but something went wrong with saving attachments.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
-		} else if ( $success === FALSE ) {
-			EE_Error::add_error( __('Venue Details did not save successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ($success && ! $att_success) {
+			EE_Error::add_error(__('Venue Details saved successfully but something went wrong with saving attachments.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
+		} else if ($success === FALSE) {
+			EE_Error::add_error(__('Venue Details did not save successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -839,9 +839,9 @@ 
 
 
 
-	public function trash_cpt_item( $post_id ) {
+	public function trash_cpt_item($post_id) {
 		$this->_req_data['VNU_ID'] = $post_id;
-		$this->_trash_or_restore_venue( 'trash', FALSE );
+		$this->_trash_or_restore_venue('trash', FALSE);
 	}
 
 
@@ -849,18 +849,18 @@ 
 
 
 
-	public function restore_cpt_item( $post_id ) {
+	public function restore_cpt_item($post_id) {
 		$this->_req_data['VNU_ID'] = $post_id;
-		$this->_trash_or_restore_venue( 'draft', FALSE );
+		$this->_trash_or_restore_venue('draft', FALSE);
 	}
 
 
 
 
 
-	public function delete_cpt_item( $post_id ) {
+	public function delete_cpt_item($post_id) {
 		$this->_req_data['VNU_ID'] = $post_id;
-		$this->_delete_venue( FALSE );
+		$this->_delete_venue(FALSE);
 	}
 
 
@@ -875,15 +875,15 @@ 
 
 
 
-	protected function _trash_or_restore_venue( $venue_status = 'trash', $redirect_after = TRUE ) {
-		$VNU_ID = isset( $this->_req_data['VNU_ID'] ) ? absint( $this->_req_data['VNU_ID'] ) : FALSE;
+	protected function _trash_or_restore_venue($venue_status = 'trash', $redirect_after = TRUE) {
+		$VNU_ID = isset($this->_req_data['VNU_ID']) ? absint($this->_req_data['VNU_ID']) : FALSE;
 
 		//loop thru venues
-		if ( $VNU_ID ) {
+		if ($VNU_ID) {
 			//clean status
-			$venue_status = sanitize_key( $venue_status );
+			$venue_status = sanitize_key($venue_status);
 			// grab status
-			if (!empty($venue_status)) {
+			if ( ! empty($venue_status)) {
 				$success = $this->_change_venue_status($VNU_ID, $venue_status);
 			} else {
 				$success = FALSE;
@@ -897,7 +897,7 @@ 
 		}
 		$action = $venue_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
 
-		if ( $redirect_after )
+		if ($redirect_after)
 			$this->_redirect_after_action($success, 'Venue', $action, array('action' => 'default'));
 
 	}
@@ -906,11 +906,11 @@ 
 
 
 
-	protected function _trash_or_restore_venues( $venue_status = 'trash' ) {
+	protected function _trash_or_restore_venues($venue_status = 'trash') {
 		// clean status
 		$venue_status = sanitize_key($venue_status);
 		// grab status
-		if (!empty($venue_status)) {
+		if ( ! empty($venue_status)) {
 			$success = TRUE;
 			//determine the event id and set to array.
 			$VNU_IDs = isset($this->_req_data['venue_id']) ? (array) $this->_req_data['venue_id'] : array();
@@ -950,20 +950,20 @@ 
 	 * @param  string $venue_status
 	 * @return void
 	 */
-	private function _change_venue_status( $VNU_ID = 0, $venue_status = '' ) {
+	private function _change_venue_status($VNU_ID = 0, $venue_status = '') {
 		// grab venue id
-		if (! $VNU_ID) {
+		if ( ! $VNU_ID) {
 			$msg = __('An error occurred. No Venue ID or an invalid Venue ID was received.', 'event_espresso');
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
-		$this->_cpt_model_obj = EEM_Venue::instance()->get_one_by_ID( $VNU_ID );
+		$this->_cpt_model_obj = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
 
 		// clean status
 		$venue_status = sanitize_key($venue_status);
 		// grab status
-		if ( ! $venue_status ) {
+		if ( ! $venue_status) {
 			$msg = __('An error occurred. No Venue Status or an invalid Venue Status was received.', 'event_espresso');
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
@@ -984,7 +984,7 @@ 
 				$hook = FALSE;
 		}
 		//use class to change status
-		$this->_cpt_model_obj->set_status( $venue_status );
+		$this->_cpt_model_obj->set_status($venue_status);
 		$success = $this->_cpt_model_obj->save();
 
 		if ($success === FALSE) {
@@ -1003,21 +1003,21 @@ 
 	 * @param  bool $redirect_after
 	 * @return void
 	 */
-	protected function _delete_venue( $redirect_after = true ) {
+	protected function _delete_venue($redirect_after = true) {
 		//determine the venue id and set to array.
 		$VNU_ID = isset($this->_req_data['VNU_ID']) ? absint($this->_req_data['VNU_ID']) : NULL;
-		$VNU_ID = isset( $this->_req_data['post'] ) ? absint( $this->_req_data['post'] ) : $VNU_ID;
+		$VNU_ID = isset($this->_req_data['post']) ? absint($this->_req_data['post']) : $VNU_ID;
 
 
 		// loop thru venues
 		if ($VNU_ID) {
-			$success = $this->_delete_or_trash_venue( $VNU_ID );
+			$success = $this->_delete_or_trash_venue($VNU_ID);
 		} else {
 			$success = FALSE;
 			$msg = __('An error occurred. An venue could not be deleted because a valid venue ID was not not supplied.', 'event_espresso');
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
-		if ( $redirect_after )
+		if ($redirect_after)
 			$this->_redirect_after_action($success, 'Venue', 'deleted', array('action' => 'default'));
 	}
 
@@ -1049,7 +1049,7 @@ 
 	//todo: put in parent
 	private function _delete_or_trash_venue($VNU_ID = FALSE) {
 		// grab event id
-		if (!$VNU_ID = absint($VNU_ID)) {
+		if ( ! $VNU_ID = absint($VNU_ID)) {
 			$msg = __('An error occurred. No Venue ID or an invalid Venue ID was received.', 'event_espresso');
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
@@ -1069,7 +1069,7 @@ 
 			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		do_action( 'AHEE__Venues_Admin_Page___delete_or_trash_venue__after_venue_deleted' );
+		do_action('AHEE__Venues_Admin_Page___delete_or_trash_venue__after_venue_deleted');
 		return TRUE;
 	}
 
@@ -1080,11 +1080,11 @@ 
 	/* QUERIES */
 
 
-	public function get_venues( $per_page = 10, $count = FALSE ) {
+	public function get_venues($per_page = 10, $count = FALSE) {
 
-		$_orderby = !empty( $this->_req_data['orderby'] ) ? $this->_req_data['orderby'] : '';
+		$_orderby = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : '';
 
-		switch ( $_orderby ) {
+		switch ($_orderby) {
 			case 'id':
 				$orderby = 'VNU_ID';
 				break;
@@ -1102,43 +1102,43 @@ 
 		}
 
 
-		$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC';
+		$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC';
 
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $per_page ) && !empty( $per_page ) ? $per_page : 10;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($per_page) && ! empty($per_page) ? $per_page : 10;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
 
-		$offset = ($current_page-1)*$per_page;
+		$offset = ($current_page - 1) * $per_page;
 		$limit = array($offset, $per_page);
 
-		$category = isset( $this->_req_data['category'] ) && $this->_req_data['category'] > 0 ? $this->_req_data['category'] : NULL;
+		$category = isset($this->_req_data['category']) && $this->_req_data['category'] > 0 ? $this->_req_data['category'] : NULL;
 		$where = array();
 
 		//only set initial status if it is in the incoming request.  Otherwise the "all" view display's all statuses.
-		if ( isset( $this->_req_data['status'] ) && $this->_req_data['status'] != 'all' ) {
+		if (isset($this->_req_data['status']) && $this->_req_data['status'] != 'all') {
 			$where['status'] = $this->_req_data['status'];
 		}
 
-		if ( isset( $this->_req_data['venue_status'] ) ) {
+		if (isset($this->_req_data['venue_status'])) {
 			$where['status'] = $this->_req_data['venue_status'];
 		}
 
 
-		if ( $category ) {
+		if ($category) {
 			$where['Term_Taxonomy.taxonomy'] = 'espresso_venue_categories';
 			$where['Term_Taxonomy.term_id'] = $category;
 		}
 
 
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_venues', 'get_venues' ) ) {
-			$where['VNU_wp_user'] =  get_current_user_id();
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_venues', 'get_venues')) {
+			$where['VNU_wp_user'] = get_current_user_id();
 		} else {
-				if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_private_venues', 'get_venues' ) ) {
+				if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_private_venues', 'get_venues')) {
 					$where['OR'] = array(
-						'status*restrict_private' => array( '!=', 'private' ),
+						'status*restrict_private' => array('!=', 'private'),
 						'AND'                     => array(
-							'status*inclusive' => array( '=', 'private' ),
+							'status*inclusive' => array('=', 'private'),
 							'VNU_wp_user'      => get_current_user_id()
 						)
 					);
@@ -1148,30 +1148,30 @@ 
 
 
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$where['OR'] = array(
-				'VNU_name' => array('LIKE',$sstr ),
-				'VNU_desc' => array('LIKE',$sstr ),
-				'VNU_short_desc' => array( 'LIKE',$sstr ),
-				'VNU_address' => array( 'LIKE', $sstr ),
-				'VNU_address2' => array( 'LIKE', $sstr ),
-				'VNU_city' => array( 'LIKE', $sstr ),
-				'VNU_zip' => array( 'LIKE', $sstr ),
-				'VNU_phone' => array( 'LIKE', $sstr ),
-				'VNU_url' => array( 'LIKE', $sstr ),
-				'VNU_virtual_phone' => array( 'LIKE', $sstr ),
-				'VNU_virtual_url' => array( 'LIKE', $sstr ),
-				'VNU_google_map_link' => array( 'LIKE', $sstr ),
-				'Event.EVT_name' => array('LIKE', $sstr ),
-				'Event.EVT_desc' => array('LIKE', $sstr ),
-				'Event.EVT_phone' => array('LIKE', $sstr ),
-				'Event.EVT_external_URL' => array('LIKE', $sstr ),
+				'VNU_name' => array('LIKE', $sstr),
+				'VNU_desc' => array('LIKE', $sstr),
+				'VNU_short_desc' => array('LIKE', $sstr),
+				'VNU_address' => array('LIKE', $sstr),
+				'VNU_address2' => array('LIKE', $sstr),
+				'VNU_city' => array('LIKE', $sstr),
+				'VNU_zip' => array('LIKE', $sstr),
+				'VNU_phone' => array('LIKE', $sstr),
+				'VNU_url' => array('LIKE', $sstr),
+				'VNU_virtual_phone' => array('LIKE', $sstr),
+				'VNU_virtual_url' => array('LIKE', $sstr),
+				'VNU_google_map_link' => array('LIKE', $sstr),
+				'Event.EVT_name' => array('LIKE', $sstr),
+				'Event.EVT_desc' => array('LIKE', $sstr),
+				'Event.EVT_phone' => array('LIKE', $sstr),
+				'Event.EVT_external_URL' => array('LIKE', $sstr),
 				);
 		}
 
 
-		$venues = $count ? $this->_venue_model->count( array($where), 'VNU_ID' ) : $this->_venue_model->get_all( array( $where, 'limit' => $limit, 'order_by' => $orderby, 'order' => $sort ) );
+		$venues = $count ? $this->_venue_model->count(array($where), 'VNU_ID') : $this->_venue_model->get_all(array($where, 'limit' => $limit, 'order_by' => $orderby, 'order' => $sort));
 
 		return $venues;
 
@@ -1189,22 +1189,22 @@ 
 	 * @return void
 	 */
 	private function _set_category_object() {
-		if ( isset( $this->_category->id ) && !empty( $this->_category->id ) )
+		if (isset($this->_category->id) && ! empty($this->_category->id))
 			return; //already have the category object so get out.
 
 		//set default category object
 		$this->_set_empty_category_object();
 
 		//only set if we've got an id
-		if ( !isset($this->_req_data['VEN_CAT_ID'] ) ) {
+		if ( ! isset($this->_req_data['VEN_CAT_ID'])) {
 			return;
 		}
 
 		$category_id = absint($this->_req_data['VEN_CAT_ID']);
-		$term = get_term( $category_id, 'espresso_venue_categories' );
+		$term = get_term($category_id, 'espresso_venue_categories');
 
 
-		if ( !empty( $term ) ) {
+		if ( ! empty($term)) {
 			$this->_category->category_name = $term->name;
 			$this->_category->category_identifier = $term->slug;
 			$this->_category->category_desc = $term->description;
@@ -1218,14 +1218,14 @@ 
 
 	private function _set_empty_category_object() {
 		$this->_category = new stdClass();
-		$this->_category->category_name = $this->_category->category_identifier = $this->_category->category_desc  = '';
+		$this->_category->category_name = $this->_category->category_identifier = $this->_category->category_desc = '';
 		$this->_category->id = $this->_category->parent = 0;
 	}
 
 
 
 	protected function _category_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$this->_admin_page_title .= $this->get_action_link_or_button('add_category', 'add_category', array(), 'add-new-h2');
 		$this->_search_btn_label = __('Venue Categories', 'event_espresso');
 		$this->display_admin_list_table_page_with_sidebar();
@@ -1241,13 +1241,13 @@ 
 		$this->_set_add_edit_form_tags($route);
 
 		$this->_set_category_object();
-		$id = !empty($this->_category->id) ? $this->_category->id : '';
+		$id = ! empty($this->_category->id) ? $this->_category->id : '';
 
 		$delete_action = 'delete_category';
 
-		$redirect = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'category_list' ), $this->_admin_base_url );
+		$redirect = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'category_list'), $this->_admin_base_url);
 
-		$this->_set_publish_post_box_vars( 'VEN_CAT_ID', $id, $delete_action, $redirect );
+		$this->_set_publish_post_box_vars('VEN_CAT_ID', $id, $delete_action, $redirect);
 
 		//take care of contents
 		$this->_template_args['admin_page_content'] = $this->_category_details_content();
@@ -1261,25 +1261,25 @@ 
 			'type' => 'wp_editor',
 			'value' => EEH_Formatter::admin_format_content($this->_category->category_desc),
 			'class' => 'my_editor_custom',
-			'wpeditor_args' => array( 'media_buttons' => FALSE )
+			'wpeditor_args' => array('media_buttons' => FALSE)
 		);
-		$_wp_editor = $this->_generate_admin_form_fields( $editor_args, 'array' );
+		$_wp_editor = $this->_generate_admin_form_fields($editor_args, 'array');
 
-		$all_terms = get_terms( array('espresso_venue_categories' ), array( 'hide_empty' => 0, 'exclude' => array( $this->_category->id ) ) );
+		$all_terms = get_terms(array('espresso_venue_categories'), array('hide_empty' => 0, 'exclude' => array($this->_category->id)));
 
 		//setup category select for term parents.
 		$category_select_values[] = array(
 			'text' => __('No Parent', 'event_espresso'),
 			'id' => 0
 			);
-		foreach ( $all_terms as $term ) {
+		foreach ($all_terms as $term) {
 			$category_select_values[] = array(
 				'text' => $term->name,
 				'id' => $term->term_id
 				);
 		}
 
-		$category_select = EEH_Form_Fields::select_input( 'category_parent', $category_select_values, $this->_category->parent );
+		$category_select = EEH_Form_Fields::select_input('category_parent', $category_select_values, $this->_category->parent);
 		$template_args = array(
 			'category' => $this->_category,
 			'category_select' => $category_select,
@@ -1288,15 +1288,15 @@ 
 			'disable' => '',
 			'disabled_message' =>FALSE
 			);
-		$template = EVENTS_TEMPLATE_PATH . 'event_category_details.template.php';
-		return EEH_Template::display_template($template, $template_args, TRUE );
+		$template = EVENTS_TEMPLATE_PATH.'event_category_details.template.php';
+		return EEH_Template::display_template($template, $template_args, TRUE);
 	}
 
 
 	protected function _delete_categories() {
-		$cat_ids = isset( $this->_req_data['VEN_CAT_ID'] ) ? (array) $this->_req_data['VEN_CAT_ID'] : (array) $this->_req_data['category_id'];
+		$cat_ids = isset($this->_req_data['VEN_CAT_ID']) ? (array) $this->_req_data['VEN_CAT_ID'] : (array) $this->_req_data['category_id'];
 
-		foreach ( $cat_ids as $cat_id ) {
+		foreach ($cat_ids as $cat_id) {
 			$this->_delete_category($cat_id);
 		}
 
@@ -1304,7 +1304,7 @@ 
 		$query_args = array(
 			'action' => 'category_list'
 			);
-		$this->_redirect_after_action(0,'','',$query_args);
+		$this->_redirect_after_action(0, '', '', $query_args);
 
 	}
 
@@ -1313,58 +1313,58 @@ 
 
 
 	protected function _delete_category($cat_id) {
-		$cat_id = absint( $cat_id );
-		wp_delete_term( $cat_id, 'espresso_venue_categories' );
+		$cat_id = absint($cat_id);
+		wp_delete_term($cat_id, 'espresso_venue_categories');
 	}
 
 
 
 	protected function _insert_or_update_category($new_category) {
 
-		$cat_id = $new_category ? $this->_insert_category() : $this->_insert_category( TRUE );
+		$cat_id = $new_category ? $this->_insert_category() : $this->_insert_category(TRUE);
 		$success = 0; //we already have a success message so lets not send another.
-		if ( $cat_id ) {
+		if ($cat_id) {
 			$query_args = array(
 				'action'     => 'edit_category',
 				'VEN_CAT_ID' => $cat_id
 			);
 		} else {
-			$query_args = array( 'action' => 'add_category' );
+			$query_args = array('action' => 'add_category');
 		}
-		$this->_redirect_after_action( $success, '','', $query_args, TRUE );
+		$this->_redirect_after_action($success, '', '', $query_args, TRUE);
 
 	}
 
 
 
-	private function _insert_category( $update = FALSE ) {
+	private function _insert_category($update = FALSE) {
 		$cat_id = $update ? $this->_req_data['VEN_CAT_ID'] : '';
-		$category_name= isset( $this->_req_data['category_name'] ) ? $this->_req_data['category_name'] : '';
-		$category_desc= isset( $this->_req_data['category_desc'] ) ? $this->_req_data['category_desc'] : '';
-		$category_parent = isset( $this->_req_data['category_parent'] ) ? $this->_req_data['category_parent'] : 0;
+		$category_name = isset($this->_req_data['category_name']) ? $this->_req_data['category_name'] : '';
+		$category_desc = isset($this->_req_data['category_desc']) ? $this->_req_data['category_desc'] : '';
+		$category_parent = isset($this->_req_data['category_parent']) ? $this->_req_data['category_parent'] : 0;
 
-		if ( empty( $category_name ) ) {
-			$msg = __( 'You must add a name for the category.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($category_name)) {
+			$msg = __('You must add a name for the category.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
 
-		$term_args=array(
+		$term_args = array(
 			'name'=>$category_name,
 			'description'=>$category_desc,
 			'parent'=>$category_parent
 		);
 
-		$insert_ids = $update ? wp_update_term( $cat_id, 'espresso_venue_categories', $term_args ) :wp_insert_term( $category_name, 'espresso_venue_categories', $term_args );
+		$insert_ids = $update ? wp_update_term($cat_id, 'espresso_venue_categories', $term_args) : wp_insert_term($category_name, 'espresso_venue_categories', $term_args);
 
-		if ( !is_array( $insert_ids ) ) {
-			$msg = __( 'An error occurred and the category has not been saved to the database.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! is_array($insert_ids)) {
+			$msg = __('An error occurred and the category has not been saved to the database.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		} else {
 			$cat_id = $insert_ids['term_id'];
-			$msg = sprintf ( __('The category %s was successfuly created', 'event_espresso'), $category_name );
-			EE_Error::add_success( $msg );
+			$msg = sprintf(__('The category %s was successfuly created', 'event_espresso'), $category_name);
+			EE_Error::add_success($msg);
 		}
 
 		return $cat_id;
@@ -1384,11 +1384,11 @@ 
 			'category_ids' => $this->_req_data['VEN_CAT_ID']
 			);
 
-		$this->_req_data = array_merge( $this->_req_data, $new_request_args );
+		$this->_req_data = array_merge($this->_req_data, $new_request_args);
 
-		if ( is_readable( EE_CLASSES . 'EE_Export.class.php') ) {
-			require_once( EE_CLASSES . 'EE_Export.class.php');
-			$EE_Export = EE_Export::instance( $this->_req_data );
+		if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+			require_once(EE_CLASSES.'EE_Export.class.php');
+			$EE_Export = EE_Export::instance($this->_req_data);
 			$EE_Export->export();
 		}
 
@@ -1400,7 +1400,7 @@ 
 
 	protected function _import_categories() {
 
-		require_once(EE_CLASSES . 'EE_Import.class.php');
+		require_once(EE_CLASSES.'EE_Import.class.php');
 		EE_Import::instance()->import();
 
 	}
@@ -1408,29 +1408,29 @@ 
 
 
 
-	public function get_categories( $per_page = 10, $current_page = 1, $count = FALSE ) {
+	public function get_categories($per_page = 10, $current_page = 1, $count = FALSE) {
 
 		//testing term stuff
-		$orderby = isset( $this->_req_data['orderby'] ) ? $this->_req_data['orderby'] : 'Term.term_id';
-		$order = isset( $this->_req_data['order'] ) ? $this->_req_data['order'] : 'DESC';
-		$limit = ($current_page-1)*$per_page;
-		$where = array( 'taxonomy' => 'espresso_venue_categories' );
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		$orderby = isset($this->_req_data['orderby']) ? $this->_req_data['orderby'] : 'Term.term_id';
+		$order = isset($this->_req_data['order']) ? $this->_req_data['order'] : 'DESC';
+		$limit = ($current_page - 1) * $per_page;
+		$where = array('taxonomy' => 'espresso_venue_categories');
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$where['OR'] = array(
-				'Term.name' => array( 'LIKE', $sstr),
-				'description' => array( 'LIKE', $sstr )
+				'Term.name' => array('LIKE', $sstr),
+				'description' => array('LIKE', $sstr)
 				);
 		}
 
 		$query_params = array(
 			$where,
-			'order_by' => array( $orderby => $order ),
-			'limit' => $limit . ',' . $per_page,
+			'order_by' => array($orderby => $order),
+			'limit' => $limit.','.$per_page,
 			'force_join' => array('Term')
 			);
 
-		$categories = $count ? EEM_Term_Taxonomy::instance()->count( $query_params, 'term_id' ) :EEM_Term_Taxonomy::instance()->get_all( $query_params );
+		$categories = $count ? EEM_Term_Taxonomy::instance()->count($query_params, 'term_id') : EEM_Term_Taxonomy::instance()->get_all($query_params);
 
 		return $categories;
 	}