eventespresso / event-espresso-core

core/libraries/messages/EE_Messages_Queue.lib.php

Doc Comments +1 added lines, -1 removed lines

@@ -534,7 +534,7 @@
 *@param EE_Message            $message
 	 * @param EE_Messenger    $messenger
 	 * @param EE_message_type $message_type
-	 * @param $test_send
+	 * @param boolean $test_send
 	 * @return bool   true means all went well, false means, not so much.
 	 */
 	protected function _do_preview( EE_Message $message, EE_Messenger $messenger, EE_message_type $message_type, $test_send ) {

Spacing +97 added lines, -97 removed lines

@@ -71,8 +71,8 @@ 
 	 *
 	 * @param \EE_Message_Repository       $message_repository
 	 */
-	public function __construct( EE_Message_Repository $message_repository ) {
-		$this->_batch_count        = apply_filters( 'FHEE__EE_Messages_Queue___batch_count', 50 );
+	public function __construct(EE_Message_Repository $message_repository) {
+		$this->_batch_count        = apply_filters('FHEE__EE_Messages_Queue___batch_count', 50);
 		$this->_rate_limit         = $this->get_rate_limit();
 		$this->_message_repository = $message_repository;
 	}
@@ -91,10 +91,10 @@ 
 	 *                                 use the messenger send method but typically is based on preview data.
 	 * @return bool          Whether the message was successfully added to the repository or not.
 	 */
-	public function add( EE_Message $message, $data = array(), $preview = false, $test_send = false ) {
+	public function add(EE_Message $message, $data = array(), $preview = false, $test_send = false) {
 		$data['preview'] = $preview;
 		$data['test_send'] = $test_send;
-		return $this->_message_repository->add( $message, $data );
+		return $this->_message_repository->add($message, $data);
 	}
 
 
@@ -106,13 +106,13 @@ 
 	 * @param bool          $persist    This flag indicates whether to attempt to delete the object from the db as well.
 	 * @return bool
 	 */
-	public function remove( EE_Message $message, $persist = false ) {
-		if ( $persist && $this->_message_repository->current() !== $message ) {
+	public function remove(EE_Message $message, $persist = false) {
+		if ($persist && $this->_message_repository->current() !== $message) {
 			//get pointer on right message
-			if ( $this->_message_repository->has( $message ) ) {
+			if ($this->_message_repository->has($message)) {
 				$this->_message_repository->rewind();
-				while( $this->_message_repository->valid() ) {
-					if ( $this->_message_repository->current() === $message ) {
+				while ($this->_message_repository->valid()) {
+					if ($this->_message_repository->current() === $message) {
 						break;
 					}
 					$this->_message_repository->next();
@@ -121,7 +121,7 @@ 
 				return false;
 			}
 		}
-		return $persist ? $this->_message_repository->delete() : $this->_message_repository->remove( $message );
+		return $persist ? $this->_message_repository->delete() : $this->_message_repository->remove($message);
 	}
 
 
@@ -161,29 +161,29 @@ 
 	 * @return bool  true if successfully retrieved batch, false no batch ready.
 	 */
 	public function get_batch_to_generate() {
-		if ( $this->is_locked( EE_Messages_Queue::action_generating ) ) {
+		if ($this->is_locked(EE_Messages_Queue::action_generating)) {
 			return false;
 		}
 
 		//lock batch generation to prevent race conditions.
-		$this->lock_queue( EE_Messages_Queue::action_generating );
+		$this->lock_queue(EE_Messages_Queue::action_generating);
 
 		$query_args = array(
 			// key 0 = where conditions
-			0 => array( 'STS_ID' => EEM_Message::status_incomplete ),
+			0 => array('STS_ID' => EEM_Message::status_incomplete),
 			'order_by' => $this->_get_priority_orderby(),
 			'limit' => $this->_batch_count
 		);
-		$messages = EEM_Message::instance()->get_all( $query_args );
+		$messages = EEM_Message::instance()->get_all($query_args);
 
-		if ( ! $messages ) {
+		if ( ! $messages) {
 			return false; //nothing to generate
 		}
 
-		foreach ( $messages as $message ) {
-			if ( $message instanceof EE_Message ) {
+		foreach ($messages as $message) {
+			if ($message instanceof EE_Message) {
 				$data = $message->all_extra_meta_array();
-				$this->add( $message, $data );
+				$this->add($message, $data);
 			}
 		}
 		return true;
@@ -206,34 +206,34 @@ 
 	 *               to assist with notifying user.
 	 */
 	public function get_to_send_batch_and_send() {
-		if ( $this->is_locked( EE_Messages_Queue::action_sending ) || $this->_rate_limit < 1 ) {
+		if ($this->is_locked(EE_Messages_Queue::action_sending) || $this->_rate_limit < 1) {
 			return false;
 		}
 
-		$this->lock_queue( EE_Messages_Queue::action_sending );
+		$this->lock_queue(EE_Messages_Queue::action_sending);
 
 		$batch = $this->_batch_count < $this->_rate_limit ? $this->_batch_count : $this->_rate_limit;
 
 		$query_args = array(
 			// key 0 = where conditions
-			0 => array( 'STS_ID' => array( 'IN', EEM_Message::instance()->stati_indicating_to_send() ) ),
+			0 => array('STS_ID' => array('IN', EEM_Message::instance()->stati_indicating_to_send())),
 			'order_by' => $this->_get_priority_orderby(),
 			'limit' => $batch
 		);
 
-		$messages_to_send = EEM_Message::instance()->get_all( $query_args );
+		$messages_to_send = EEM_Message::instance()->get_all($query_args);
 
 
 		//any to send?
-		if ( ! $messages_to_send ) {
-			$this->unlock_queue( EE_Messages_Queue::action_sending );
+		if ( ! $messages_to_send) {
+			$this->unlock_queue(EE_Messages_Queue::action_sending);
 			return false;
 		}
 
 		//add to queue.
-		foreach ( $messages_to_send as $message ) {
-			if ( $message instanceof EE_Message ) {
-				$this->add( $message );
+		foreach ($messages_to_send as $message) {
+			if ($message instanceof EE_Message) {
+				$this->add($message);
 			}
 		}
 
@@ -241,7 +241,7 @@ 
 		$this->execute();
 
 		//release lock
-		$this->unlock_queue( EE_Messages_Queue::action_sending );
+		$this->unlock_queue(EE_Messages_Queue::action_sending);
 		return true;
 	}
 
@@ -253,8 +253,8 @@ 
 	 *
 	 * @param   string  $type   The type of queue being locked.
 	 */
-	public function lock_queue( $type = EE_Messages_Queue::action_generating ) {
-		set_transient( $this->_get_lock_key( $type ), 1, $this->_get_lock_expiry( $type ) );
+	public function lock_queue($type = EE_Messages_Queue::action_generating) {
+		set_transient($this->_get_lock_key($type), 1, $this->_get_lock_expiry($type));
 	}
 
 
@@ -265,8 +265,8 @@ 
 	 *
 	 * @param   string  $type   The type of queue being unlocked.
 	 */
-	public function unlock_queue( $type = EE_Messages_Queue::action_generating ) {
-		delete_transient( $this->_get_lock_key( $type ) );
+	public function unlock_queue($type = EE_Messages_Queue::action_generating) {
+		delete_transient($this->_get_lock_key($type));
 	}
 
 
@@ -277,8 +277,8 @@ 
 	 * @param string $type  The type of lock.
 	 * @return string
 	 */
-	protected function _get_lock_key( $type = EE_Messages_Queue::action_generating ) {
-		return '_ee_lock_' . $type;
+	protected function _get_lock_key($type = EE_Messages_Queue::action_generating) {
+		return '_ee_lock_'.$type;
 	}
 
 
@@ -289,8 +289,8 @@ 
 	 * @param string $type  The type of lock
 	 * @return int   time to expiry in seconds.
 	 */
-	protected function _get_lock_expiry( $type = EE_Messages_Queue::action_generating ) {
-		return (int) apply_filters( 'FHEE__EE_Messages_Queue__lock_expiry', HOUR_IN_SECONDS, $type );
+	protected function _get_lock_expiry($type = EE_Messages_Queue::action_generating) {
+		return (int) apply_filters('FHEE__EE_Messages_Queue__lock_expiry', HOUR_IN_SECONDS, $type);
 	}
 
 
@@ -308,7 +308,7 @@ 
 	 * @return int
 	 */
 	protected function _get_rate_limit_expiry() {
-		return (int) apply_filters( 'FHEE__EE_Messages_Queue__rate_limit_expiry', HOUR_IN_SECONDS );
+		return (int) apply_filters('FHEE__EE_Messages_Queue__rate_limit_expiry', HOUR_IN_SECONDS);
 	}
 
 
@@ -319,7 +319,7 @@ 
 	 * @return int
 	 */
 	protected function _default_rate_limit() {
-		return (int) apply_filters( 'FHEE__EE_Messages_Queue___rate_limit', 200 );
+		return (int) apply_filters('FHEE__EE_Messages_Queue___rate_limit', 200);
 	}
 
 
@@ -345,14 +345,14 @@ 
 	 * @param  string $type The type of lock being checked for.
 	 * @return bool
 	 */
-	public function is_locked( $type = EE_Messages_Queue::action_generating ) {
+	public function is_locked($type = EE_Messages_Queue::action_generating) {
 		/**
 		 * This filters the default is_locked behaviour.
 		 */
 		$is_locked = filter_var(
 			apply_filters(
 				'FHEE__EE_Messages_Queue__is_locked',
-				get_transient( $this->_get_lock_key( $type ) ),
+				get_transient($this->_get_lock_key($type)),
 				$this
 			),
 			FILTER_VALIDATE_BOOLEAN
@@ -363,7 +363,7 @@ 
 		 *            Also implemented here because messages processed on the same request should not have any locks applied.
 		 */
 		if (
-			apply_filters( 'FHEE__EE_Messages_Processor__initiate_request_by_priority__do_immediate_processing', false )
+			apply_filters('FHEE__EE_Messages_Processor__initiate_request_by_priority__do_immediate_processing', false)
 			|| EE_Registry::instance()->NET_CFG->core->do_messages_on_same_request
 		) {
 			$is_locked = false;
@@ -385,9 +385,9 @@ 
 	 * @return int
 	 */
 	public function get_rate_limit() {
-		if ( ! $rate_limit = get_transient( $this->_get_rate_limit_key() ) ) {
+		if ( ! $rate_limit = get_transient($this->_get_rate_limit_key())) {
 			$rate_limit = $this->_default_rate_limit();
-			set_transient( $this->_get_rate_limit_key(), $rate_limit, $this->_get_rate_limit_key() );
+			set_transient($this->_get_rate_limit_key(), $rate_limit, $this->_get_rate_limit_key());
 		}
 		return $rate_limit;
 	}
@@ -399,12 +399,12 @@ 
 	 * This updates existing rate limit with the new limit which is the old minus the batch.
 	 * @param int $batch_completed  This sets the new rate limit based on the given batch that was completed.
 	 */
-	public function set_rate_limit( $batch_completed ) {
+	public function set_rate_limit($batch_completed) {
 		//first get the most up to date rate limit (in case its expired and reset)
 		$rate_limit = $this->get_rate_limit();
 		$new_limit = $rate_limit - $batch_completed;
 		//updating the transient option directly to avoid resetting the expiry.
-		update_option( '_transient_' . $this->_get_rate_limit_key(), $new_limit );
+		update_option('_transient_'.$this->_get_rate_limit_key(), $new_limit);
 	}
 
 
@@ -417,7 +417,7 @@ 
 	 * @param string $task This indicates what type of request is going to be initiated.
 	 * @param int    $priority  This indicates the priority that triggers initiating the request.
 	 */
-	public function initiate_request_by_priority( $task = 'generate', $priority = EEM_Message::priority_high ) {
+	public function initiate_request_by_priority($task = 'generate', $priority = EEM_Message::priority_high) {
 		//determine what status is matched with the priority as part of the trigger conditions.
 		$status = $task == 'generate'
 			? EEM_Message::status_incomplete
@@ -437,19 +437,19 @@ 
 		 *   the same request.
 		 */
 		if (
-			apply_filters( 'FHEE__EE_Messages_Processor__initiate_request_by_priority__do_immediate_processing', false )
+			apply_filters('FHEE__EE_Messages_Processor__initiate_request_by_priority__do_immediate_processing', false)
 			|| EE_Registry::instance()->NET_CFG->core->do_messages_on_same_request
 		) {
-			$messages_processor = EE_Registry::instance()->load_lib( 'Messages_Processor' );
-			if ( $messages_processor instanceof EE_Messages_Processor ) {
-				return $messages_processor->process_immediately_from_queue( $this );
+			$messages_processor = EE_Registry::instance()->load_lib('Messages_Processor');
+			if ($messages_processor instanceof EE_Messages_Processor) {
+				return $messages_processor->process_immediately_from_queue($this);
 			}
 			//if we get here then that means the messages processor couldn't be loaded so messages will just remain
 			//queued for manual triggering by end user.
 		}
 
-		if ( $this->_message_repository->count_by_priority_and_status( $priority, $status ) ) {
-			EE_Messages_Scheduler::initiate_scheduled_non_blocking_request( $task );
+		if ($this->_message_repository->count_by_priority_and_status($priority, $status)) {
+			EE_Messages_Scheduler::initiate_scheduled_non_blocking_request($task);
 		}
 	}
 
@@ -474,53 +474,53 @@ 
 	 *                    Also, if the messenger is an request type messenger (or a preview),
 	 * 					  its entirely possible that the messenger will exit before
 	 */
-	public function execute( $save = true, $sending_messenger = null, $by_priority = false ) {
+	public function execute($save = true, $sending_messenger = null, $by_priority = false) {
 		$messages_sent = 0;
 		$this->_did_hook = array();
 		$this->_message_repository->rewind();
 
-		while ( $this->_message_repository->valid() ) {
+		while ($this->_message_repository->valid()) {
 			$error_messages = array();
 			/** @type EE_Message $message */
 			$message = $this->_message_repository->current();
 			//only process things that are queued for sending
-			if ( ! in_array( $message->STS_ID(), EEM_Message::instance()->stati_indicating_to_send() ) ) {
+			if ( ! in_array($message->STS_ID(), EEM_Message::instance()->stati_indicating_to_send())) {
 				$this->_message_repository->next();
 				continue;
 			}
 			//if $by_priority is set and does not match then continue;
-			if ( $by_priority && $by_priority != $message->priority() ) {
+			if ($by_priority && $by_priority != $message->priority()) {
 				$this->_message_repository->next();
 				continue;
 			}
 			//error checking
-			if ( ! $message->valid_messenger() ) {
+			if ( ! $message->valid_messenger()) {
 				$error_messages[] = sprintf(
-					__( 'The %s messenger is not active at time of sending.', 'event_espresso' ),
+					__('The %s messenger is not active at time of sending.', 'event_espresso'),
 					$message->messenger()
 				);
 			}
-			if ( ! $message->valid_message_type() ) {
+			if ( ! $message->valid_message_type()) {
 				$error_messages[] = sprintf(
-					__( 'The %s message type is not active at the time of sending.', 'event_espresso' ),
+					__('The %s message type is not active at the time of sending.', 'event_espresso'),
 					$message->message_type()
 				);
 			}
 			// if there was supposed to be a sending messenger for this message, but it was invalid/inactive,
 			// then it will instead be an EE_Error object, so let's check for that
-			if ( $sending_messenger instanceof EE_Error ) {
+			if ($sending_messenger instanceof EE_Error) {
 				$error_messages[] = $sending_messenger->getMessage();
 			}
 			// if there are no errors, then let's process the message
-			if ( empty( $error_messages ) && $this->_process_message( $message, $sending_messenger ) ) {
+			if (empty($error_messages) && $this->_process_message($message, $sending_messenger)) {
 				$messages_sent++;
 			}
-			$this->_set_error_message( $message, $error_messages );
+			$this->_set_error_message($message, $error_messages);
 			//add modified time
-			$message->set_modified( time() );
+			$message->set_modified(time());
 			$this->_message_repository->next();
 		}
-		if ( $save ) {
+		if ($save) {
 			$this->save();
 		}
 		return $messages_sent;
@@ -535,7 +535,7 @@ 
 	 * @param mixed 	 $sending_messenger (optional)
 	 * @return bool
 	 */
-	protected function _process_message( EE_Message $message, $sending_messenger = null ) {
+	protected function _process_message(EE_Message $message, $sending_messenger = null) {
 		// these *should* have been validated in the execute() method above
 		$messenger = $message->messenger_object();
 		$message_type = $message->message_type_object();
@@ -545,20 +545,20 @@ 
 			&& $messenger instanceof EE_messenger
 			&& $sending_messenger->name != $messenger->name
 		) {
-			$messenger->do_secondary_messenger_hooks( $sending_messenger->name );
+			$messenger->do_secondary_messenger_hooks($sending_messenger->name);
 			$messenger = $sending_messenger;
 		}
 		// send using messenger, but double check objects
-		if ( $messenger instanceof EE_messenger && $message_type instanceof EE_message_type ) {
+		if ($messenger instanceof EE_messenger && $message_type instanceof EE_message_type) {
 			//set hook for message type (but only if not using another messenger to send).
-			if ( ! isset( $this->_did_hook[ $message_type->name ] ) ) {
-				$message_type->do_messenger_hooks( $messenger );
-				$this->_did_hook[ $message_type->name ] = 1;
+			if ( ! isset($this->_did_hook[$message_type->name])) {
+				$message_type->do_messenger_hooks($messenger);
+				$this->_did_hook[$message_type->name] = 1;
 			}
 			//if preview then use preview method
 			return $this->_message_repository->is_preview()
-				? $this->_do_preview( $message, $messenger, $message_type, $this->_message_repository->is_test_send() )
-				: $this->_do_send( $message, $messenger, $message_type );
+				? $this->_do_preview($message, $messenger, $message_type, $this->_message_repository->is_test_send())
+				: $this->_do_send($message, $messenger, $message_type);
 		}
 		return false;
 	}
@@ -576,12 +576,12 @@ 
 	 * @param array $status  Stati to check for in queue
 	 * @return int  Count of EE_Message's matching the given status.
 	 */
-	public function count_STS_in_queue( $status ) {
+	public function count_STS_in_queue($status) {
 		$count = 0;
-		$status = is_array( $status ) ? $status : array( $status );
+		$status = is_array($status) ? $status : array($status);
 		$this->_message_repository->rewind();
-		foreach( $this->_message_repository as $message ) {
-			if ( in_array( $message->STS_ID(), $status ) ) {
+		foreach ($this->_message_repository as $message) {
+			if (in_array($message->STS_ID(), $status)) {
 				$count++;
 			}
 		}
@@ -598,15 +598,15 @@ 
 	 * @param $test_send
 	 * @return bool   true means all went well, false means, not so much.
 	 */
-	protected function _do_preview( EE_Message $message, EE_messenger $messenger, EE_message_type $message_type, $test_send ) {
-		if ( $preview = $messenger->get_preview( $message, $message_type, $test_send ) ) {
-			if ( ! $test_send ) {
-				$message->set_content( $preview );
+	protected function _do_preview(EE_Message $message, EE_messenger $messenger, EE_message_type $message_type, $test_send) {
+		if ($preview = $messenger->get_preview($message, $message_type, $test_send)) {
+			if ( ! $test_send) {
+				$message->set_content($preview);
 			}
-			$message->set_STS_ID( EEM_Message::status_sent );
+			$message->set_STS_ID(EEM_Message::status_sent);
 			return true;
 		} else {
-			$message->set_STS_ID( EEM_Message::status_failed );
+			$message->set_STS_ID(EEM_Message::status_failed);
 			return false;
 		}
 	}
@@ -622,12 +622,12 @@ 
 	 * @param EE_message_type $message_type
 	 * @return bool true means all went well, false means, not so much.
 	 */
-	protected function _do_send( EE_Message $message, EE_messenger $messenger, EE_message_type $message_type ) {
-		if ( $messenger->send_message( $message, $message_type ) ) {
-			$message->set_STS_ID( EEM_Message::status_sent );
+	protected function _do_send(EE_Message $message, EE_messenger $messenger, EE_message_type $message_type) {
+		if ($messenger->send_message($message, $message_type)) {
+			$message->set_STS_ID(EEM_Message::status_sent);
 			return true;
 		} else {
-			$message->set_STS_ID( EEM_Message::status_retry );
+			$message->set_STS_ID(EEM_Message::status_retry);
 			return false;
 		}
 	}
@@ -641,21 +641,21 @@ 
 	 * @param EE_Message $message
 	 * @param array      $error_messages the response from the messenger.
 	 */
-	protected function _set_error_message( EE_Message $message, $error_messages ) {
+	protected function _set_error_message(EE_Message $message, $error_messages) {
 		$error_messages = (array) $error_messages;
-		if ( in_array( $message->STS_ID(), EEM_Message::instance()->stati_indicating_failed_sending() ) ) {
+		if (in_array($message->STS_ID(), EEM_Message::instance()->stati_indicating_failed_sending())) {
 			$notices = EE_Error::has_notices();
-			$error_messages[] = __( 'Messenger and Message Type were valid and active, but the messenger send method failed.', 'event_espresso' );
-			if ( $notices === 1 ) {
+			$error_messages[] = __('Messenger and Message Type were valid and active, but the messenger send method failed.', 'event_espresso');
+			if ($notices === 1) {
 				$notices = EE_Error::get_vanilla_notices();
-				$notices['errors'] = isset( $notices['errors'] ) ? $notices['errors'] : array();
-				$error_messages[] = implode( "\n", $notices['errors'] );
+				$notices['errors'] = isset($notices['errors']) ? $notices['errors'] : array();
+				$error_messages[] = implode("\n", $notices['errors']);
 			}
 		}
-		if ( count( $error_messages ) > 0 ) {
-			$msg = __( 'Message was not executed successfully.', 'event_espresso' );
-			$msg = $msg . "\n" . implode( "\n", $error_messages );
-			$message->set_error_message( $msg );
+		if (count($error_messages) > 0) {
+			$msg = __('Message was not executed successfully.', 'event_espresso');
+			$msg = $msg."\n".implode("\n", $error_messages);
+			$message->set_error_message($msg);
 		}
 	}
 

core/libraries/plugin_api/EE_Register_Message_Type.lib.php

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.

Spacing +51 added lines, -51 removed lines

@@ -50,79 +50,79 @@ 
 	 * @throws \EE_Error
 	 * }
 	 */
-	public static function register( $mt_name = NULL, $setup_args = array() ) {
+	public static function register($mt_name = NULL, $setup_args = array()) {
 		//required fields MUST be present, so let's make sure they are.
 		if (
-			! isset( $mt_name )
-			|| ! is_array( $setup_args )
-			|| empty( $setup_args['mtfilename'] ) || empty( $setup_args['autoloadpaths'] )
-		){
+			! isset($mt_name)
+			|| ! is_array($setup_args)
+			|| empty($setup_args['mtfilename']) || empty($setup_args['autoloadpaths'])
+		) {
 			throw new EE_Error(
-				__( 'In order to register a message type with EE_Register_Message_Type::register, you must include a unique name for the message type, plus an array containing the following keys: "mtfilename", "autoloadpaths"', 'event_espresso' )
+				__('In order to register a message type with EE_Register_Message_Type::register, you must include a unique name for the message type, plus an array containing the following keys: "mtfilename", "autoloadpaths"', 'event_espresso')
 			);
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_ee_message_type_registry[ $mt_name ] ) ){
+		if (isset(self::$_ee_message_type_registry[$mt_name])) {
 			return;
 		}
 
 		//make sure this was called in the right place!
 		if (
-			! did_action( 'EE_Brewing_Regular___messages_caf' )
-			|| did_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations' )
+			! did_action('EE_Brewing_Regular___messages_caf')
+			|| did_action('AHEE__EE_System__perform_activations_upgrades_and_migrations')
 		) {
 			EE_Error::doing_it_wrong(
 				__METHOD__,
 				sprintf(
-					__('A message type named "%s" has been attempted to be registered with the EE Messages System.  It may or may not work because it should be only called on the "EE_Brewing_Regular___messages_caf" hook.','event_espresso'),
+					__('A message type named "%s" has been attempted to be registered with the EE Messages System.  It may or may not work because it should be only called on the "EE_Brewing_Regular___messages_caf" hook.', 'event_espresso'),
 					$mt_name
 				),
 				'4.3.0'
 			);
 		}
 		//setup $__ee_message_type_registry array from incoming values.
-		self::$_ee_message_type_registry[ $mt_name ] = array(
+		self::$_ee_message_type_registry[$mt_name] = array(
 			'mtfilename' => (string) $setup_args['mtfilename'],
 			'autoloadpaths' => (array) $setup_args['autoloadpaths'],
-			'messengers_to_activate_with' => ! empty( $setup_args['messengers_to_activate_with'] )
+			'messengers_to_activate_with' => ! empty($setup_args['messengers_to_activate_with'])
 				? (array) $setup_args['messengers_to_activate_with']
 				: array(),
-			'messengers_to_validate_with' => ! empty( $setup_args['messengers_to_validate_with'] )
+			'messengers_to_validate_with' => ! empty($setup_args['messengers_to_validate_with'])
 				? (array) $setup_args['messengers_to_validate_with']
 				: array(),
-			'force_activation' => ! empty( $setup_args['force_activation'] )
+			'force_activation' => ! empty($setup_args['force_activation'])
 				? (bool) $setup_args['force_activation']
 				: array()
 		);
 		//add filters
 		add_filter(
 			'FHEE__EED_Messages___set_messages_paths___MSG_PATHS',
-			array( 'EE_Register_Message_Type', 'register_msgs_autoload_paths' ),
+			array('EE_Register_Message_Type', 'register_msgs_autoload_paths'),
 			10
 		);
 		add_filter(
 			'FHEE__EE_messages__get_installed__messagetype_files',
-			array( 'EE_Register_Message_Type', 'register_messagetype_files' ),
+			array('EE_Register_Message_Type', 'register_messagetype_files'),
 			10,
 			1
 		);
 		add_filter(
 			'FHEE__EE_messenger__get_default_message_types__default_types',
-			array( 'EE_Register_Message_Type', 'register_messengers_to_activate_mt_with' ),
+			array('EE_Register_Message_Type', 'register_messengers_to_activate_mt_with'),
 			10,
 			2
 		);
 		add_filter(
 			'FHEE__EE_messenger__get_valid_message_types__valid_types',
-			array( 'EE_Register_Message_Type', 'register_messengers_to_validate_mt_with' ),
+			array('EE_Register_Message_Type', 'register_messengers_to_validate_mt_with'),
 			10,
 			2
 		);
 		//actions
 		add_action(
 			'AHEE__EE_Addon__initialize_default_data__begin',
-			array( 'EE_Register_Message_Type', 'set_defaults' )
+			array('EE_Register_Message_Type', 'set_defaults')
 		);
 	}
 
@@ -133,15 +133,15 @@ 
 	 */
 	public static function set_defaults() {
 		/** @type 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');
 
 		//for any message types with force activation, let's ensure they are activated
-		foreach ( self::$_ee_message_type_registry as $message_type_name => $settings ) {
-			if ( $settings['force_activation'] ) {
-				foreach ( $settings['messengers_to_activate_with'] as $messenger ) {
+		foreach (self::$_ee_message_type_registry as $message_type_name => $settings) {
+			if ($settings['force_activation']) {
+				foreach ($settings['messengers_to_activate_with'] as $messenger) {
 					//DO not force activation if this message type has already been activated in the system
-					if ( ! $message_resource_manager->has_message_type_been_activated_for_messenger( $message_type_name, $messenger ) ) {
-						$message_resource_manager->ensure_message_type_is_active( $message_type_name, $messenger );
+					if ( ! $message_resource_manager->has_message_type_been_activated_for_messenger($message_type_name, $messenger)) {
+						$message_resource_manager->ensure_message_type_is_active($message_type_name, $messenger);
 					}
 				}
 			}
@@ -158,13 +158,13 @@ 
 	 * @param string  $message_type_name the name for the message type that was previously registered
 	 * @return void
 	 */
-	public static function deregister( $message_type_name = null ) {
-		if ( ! empty( self::$_ee_message_type_registry[ $message_type_name ] ) ) {
+	public static function deregister($message_type_name = null) {
+		if ( ! empty(self::$_ee_message_type_registry[$message_type_name])) {
 			//let's make sure that we remove any place this message type was made active
 			/** @var EE_Message_Resource_Manager $Message_Resource_Manager */
-			$Message_Resource_Manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
-			$Message_Resource_Manager->deactivate_message_type( $message_type_name );
-			unset( self::$_ee_message_type_registry[ $message_type_name ] );
+			$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+			$Message_Resource_Manager->deactivate_message_type($message_type_name);
+			unset(self::$_ee_message_type_registry[$message_type_name]);
 		}
 	}
 
@@ -178,12 +178,12 @@ 
 	 * @param  array  $messagetype_files The current array of message type file names
 	 * @return  array                                 Array of message type file names
 	 */
-	public static function register_messagetype_files( $messagetype_files ) {
-		if ( empty( self::$_ee_message_type_registry ) ) {
+	public static function register_messagetype_files($messagetype_files) {
+		if (empty(self::$_ee_message_type_registry)) {
 			return $messagetype_files;
 		}
-		foreach ( self::$_ee_message_type_registry as $mt_reg ) {
-			if ( empty( $mt_reg['mtfilename' ] ) ) {
+		foreach (self::$_ee_message_type_registry as $mt_reg) {
+			if (empty($mt_reg['mtfilename'])) {
 				continue;
 			}
 			$messagetype_files[] = $mt_reg['mtfilename'];
@@ -203,13 +203,13 @@ 
 	 * @param array $paths array of paths to be checked by EE_messages autoloader.
 	 * @return array
 	 */
-	public static function register_msgs_autoload_paths( $paths  ) {
-		if ( ! empty( self::$_ee_message_type_registry ) ) {
-			foreach ( self::$_ee_message_type_registry as $mt_reg ) {
-				if ( empty( $mt_reg['autoloadpaths'] ) ) {
+	public static function register_msgs_autoload_paths($paths) {
+		if ( ! empty(self::$_ee_message_type_registry)) {
+			foreach (self::$_ee_message_type_registry as $mt_reg) {
+				if (empty($mt_reg['autoloadpaths'])) {
 					continue;
 				}
-				$paths = array_merge( $paths, $mt_reg['autoloadpaths'] );
+				$paths = array_merge($paths, $mt_reg['autoloadpaths']);
 			}
 		}
 		return $paths;
@@ -228,18 +228,18 @@ 
 	 * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
 	 * @return array
 	 */
-	public static function register_messengers_to_activate_mt_with( $default_types, EE_messenger $messenger ) {
-		if ( empty( self::$_ee_message_type_registry ) ) {
+	public static function register_messengers_to_activate_mt_with($default_types, EE_messenger $messenger) {
+		if (empty(self::$_ee_message_type_registry)) {
 			return $default_types;
 		}
-		foreach ( self::$_ee_message_type_registry as $message_type_name => $mt_reg ) {
-			if ( empty( $mt_reg['messengers_to_activate_with'] ) || empty( $mt_reg['mtfilename'] ) ) {
+		foreach (self::$_ee_message_type_registry as $message_type_name => $mt_reg) {
+			if (empty($mt_reg['messengers_to_activate_with']) || empty($mt_reg['mtfilename'])) {
 				continue;
 			}
 			// loop through each of the messengers and if it matches the loaded class
 			// then we add this message type to the
-			foreach ( $mt_reg['messengers_to_activate_with'] as $msgr ) {
-				if ( $messenger->name == $msgr ) {
+			foreach ($mt_reg['messengers_to_activate_with'] as $msgr) {
+				if ($messenger->name == $msgr) {
 					$default_types[] = $message_type_name;
 				}
 			}
@@ -259,18 +259,18 @@ 
 	 * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
 	 * @return  array
 	 */
-	public static function register_messengers_to_validate_mt_with( $valid_types, EE_messenger $messenger ) {
-		if ( empty( self::$_ee_message_type_registry ) ) {
+	public static function register_messengers_to_validate_mt_with($valid_types, EE_messenger $messenger) {
+		if (empty(self::$_ee_message_type_registry)) {
 			return $valid_types;
 		}
-		foreach ( self::$_ee_message_type_registry as $message_type_name => $mt_reg ) {
-			if ( empty( $mt_reg['messengers_to_validate_with'] ) || empty( $mt_reg['mtfilename'] ) ) {
+		foreach (self::$_ee_message_type_registry as $message_type_name => $mt_reg) {
+			if (empty($mt_reg['messengers_to_validate_with']) || empty($mt_reg['mtfilename'])) {
 				continue;
 			}
 			// loop through each of the messengers and if it matches the loaded class
 			// then we add this message type to the
-			foreach ( $mt_reg['messengers_to_validate_with'] as $msgr ) {
-				if ( $messenger->name == $msgr ) {
+			foreach ($mt_reg['messengers_to_validate_with'] as $msgr) {
+				if ($messenger->name == $msgr) {
 					$valid_types[] = $message_type_name;
 				}
 			}

Indentation +8 added lines, -8 removed lines

@@ -251,14 +251,14 @@
 
 
 	 /**
-	 * callback for FHEE__EE_messenger__get_valid_message_types__default_types filter.
-	 *
-	 * @since   4.3.0
-	 * @param  array        $valid_types 	array of message types valid with messenger (
-	 *                                      corresponds to the $name property of message type)
-	 * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
-	 * @return  array
-	 */
+	  * callback for FHEE__EE_messenger__get_valid_message_types__default_types filter.
+	  *
+	  * @since   4.3.0
+	  * @param  array        $valid_types 	array of message types valid with messenger (
+	  *                                      corresponds to the $name property of message type)
+	  * @param  EE_messenger $messenger      The EE_messenger the filter is called from.
+	  * @return  array
+	  */
 	public static function register_messengers_to_validate_mt_with( $valid_types, EE_messenger $messenger ) {
 		if ( empty( self::$_ee_message_type_registry ) ) {
 			return $valid_types;

core/libraries/messages/defaults/default/html_receipt_content.template.php

Spacing +29 added lines, -29 removed lines

@@ -23,15 +23,15 @@ 
 			</td>
 			<td>
 				<div id="invoice-info">
-					<h2 id="invoice-hdr"><?php _e( 'Order Confirmation', 'event_espresso' ) ?></h2>
+					<h2 id="invoice-hdr"><?php _e('Order Confirmation', 'event_espresso') ?></h2>
 
-					<h3 id="invoice-date"><?php _e( 'Date:', 'event_espresso' ) ?>
+					<h3 id="invoice-date"><?php _e('Date:', 'event_espresso') ?>
 						<span class="plain-text">[PRIMARY_REGISTRANT_REGISTRATION_DATE]</span></h3>
 
-					<h3 id="invoice-txn-id"><?php _e( 'Transaction ID:', 'event_espresso' ) ?>
+					<h3 id="invoice-txn-id"><?php _e('Transaction ID:', 'event_espresso') ?>
 						<span class="plain-text">[TXN_ID]</span></h3>
 
-					<h3 id="invoice-txn-status"><?php _e( 'Status:', 'event_espresso' ) ?>
+					<h3 id="invoice-txn-status"><?php _e('Status:', 'event_espresso') ?>
 						<span class="[TXN_STATUS_ID] plain-text">[TXN_STATUS]</span></h3>
 				</div>
 			</td>
@@ -41,15 +41,15 @@ 
 		[EVENT_LIST]
 	</div>
 	<div class="taxes">
-		<h3 class="section-title"><?php _e( "Additional Charges/Discounts", 'event_espresso' ) ?></h3>
+		<h3 class="section-title"><?php _e("Additional Charges/Discounts", 'event_espresso') ?></h3>
 		<table class="invoice-amount">
 			<thead>
 				<tr class="header_row">
-					<th class="left ticket_th"><?php _e( "Name", "event_espresso" ); ?></th>
-					<th class="left"><?php _e( 'Description', 'event_espresso' ); ?></th>
-					<th class="event_th item_c"><?php _e( 'Quantity', 'event_espresso' ); ?></th>
-					<th class="event_th item_c"><?php _e( 'Unit Price', 'event_espresso' ); ?></th>
-					<th class="subtotal_th"><?php _e( 'Total', 'event_espresso' ); ?></th>
+					<th class="left ticket_th"><?php _e("Name", "event_espresso"); ?></th>
+					<th class="left"><?php _e('Description', 'event_espresso'); ?></th>
+					<th class="event_th item_c"><?php _e('Quantity', 'event_espresso'); ?></th>
+					<th class="event_th item_c"><?php _e('Unit Price', 'event_espresso'); ?></th>
+					<th class="subtotal_th"><?php _e('Total', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -60,15 +60,15 @@ 
 		</table>
 	</div>
 	<div class="taxes">
-		<h3 class="section-title"><?php _e( "Taxes", 'event_espresso' ) ?></h3>
-		<p><?php printf( __( '%s*%s Taxable items. The total amount collected for taxes is reflected in the total(s) below.', 'event_espresso' ), '<strong>', '</strong>' ); ?></p>
+		<h3 class="section-title"><?php _e("Taxes", 'event_espresso') ?></h3>
+		<p><?php printf(__('%s*%s Taxable items. The total amount collected for taxes is reflected in the total(s) below.', 'event_espresso'), '<strong>', '</strong>'); ?></p>
 		<table class="invoice-amount">
 			<thead>
 				<tr class="header_row">
-					<th class="left ticket_th"><?php _e( "Tax Name", "event_espresso" ); ?></th>
-					<th class="left"><?php _e( 'Description', 'event_espresso' ); ?></th>
-					<th class="event_th item_c"><?php _e( 'Rate', 'event_espresso' ); ?></th>
-					<th class="subtotal_th"><?php _e( 'Tax Amount', 'event_espresso' ); ?></th>
+					<th class="left ticket_th"><?php _e("Tax Name", "event_espresso"); ?></th>
+					<th class="left"><?php _e('Description', 'event_espresso'); ?></th>
+					<th class="event_th item_c"><?php _e('Rate', 'event_espresso'); ?></th>
+					<th class="subtotal_th"><?php _e('Tax Amount', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -79,19 +79,19 @@ 
 		</table>
 	</div>
 	<div class="grand-total-dv">
-		<h2 class="grand-total"><?php printf( __( "Grand Total: %s", "event_espresso" ), '[TOTAL_COST]' ); ?></h2>
+		<h2 class="grand-total"><?php printf(__("Grand Total: %s", "event_espresso"), '[TOTAL_COST]'); ?></h2>
 	</div>
 	<div class="payment-dv">
-		<h3 class="section-title"><?php _e( "Payments", 'event_espresso' ) ?></h3>
+		<h3 class="section-title"><?php _e("Payments", 'event_espresso') ?></h3>
 		<table class="invoice-amount">
 			<thead>
 				<tr class="header_row">
-					<th><span class=""><?php _e( 'Payment Method', 'event_espresso' ); ?></span></th>
-					<th class='left datetime_th'><?php _e( "Date", 'event_espresso' ) ?></th>
-					<th><span class=""><?php _e( 'Transaction Id / Cheque #', 'event_espresso' ); ?></span></th>
-					<th><span class=""><?php _e( 'P.O. / S.O.#', 'event_espresso' ); ?></span></th>
-					<th><span class=""><?php _e( 'Status', 'event_espresso' ); ?></span></th>
-					<th><?php _e( 'Amount', 'event_espresso' ); ?></th>
+					<th><span class=""><?php _e('Payment Method', 'event_espresso'); ?></span></th>
+					<th class='left datetime_th'><?php _e("Date", 'event_espresso') ?></th>
+					<th><span class=""><?php _e('Transaction Id / Cheque #', 'event_espresso'); ?></span></th>
+					<th><span class=""><?php _e('P.O. / S.O.#', 'event_espresso'); ?></span></th>
+					<th><span class=""><?php _e('Status', 'event_espresso'); ?></span></th>
+					<th><?php _e('Amount', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -105,21 +105,21 @@ 
 			<tfoot>
 				<tr class='total_tr'>
 					<td colspan="4">&nbsp;</td>
-					<td class="item_r"><?php _e( 'Total Paid', 'event_espresso' ) ?></td>
+					<td class="item_r"><?php _e('Total Paid', 'event_espresso') ?></td>
 					<td class="item_r">[TOTAL_AMOUNT_PAID]</td>
 				</tr>
 				<tr class="total_tr odd">
 					<td colspan="4">&nbsp;</td>
-					<td class="total" id="total_currency"><?php _e( 'Amount Owed:', 'event_espresso' ); ?></td>
+					<td class="total" id="total_currency"><?php _e('Amount Owed:', 'event_espresso'); ?></td>
 					<td class="total">[TOTAL_OWING]</td>
 				</tr>
 			</tfoot>
 		</table>
 	</div>
 	<div class="additional-info-dv">
-		<h3 class="section-title"><?php _e( "Additional Information:", "event_espresso" ); ?></h3>
+		<h3 class="section-title"><?php _e("Additional Information:", "event_espresso"); ?></h3>
 		<div class="additional-info">
-			<h2><?php _e( "Venue Details:", "event_espresso" ); ?></h2>
+			<h2><?php _e("Venue Details:", "event_espresso"); ?></h2>
 			<table class="venue-list">
 				<tr class="venue-details">
 					<td class="venue-details-part venue-address-dv">
@@ -131,7 +131,7 @@ 
 					<td class="venue-details-part venue-image-dv">[GOOGLE_MAP_IMAGE]</td>
 				</tr>
 			</table>
-			<div class='aln-cntr'><?php printf( __( "Powered by %sEvent Espresso %s", "event_espresso" ), "<a href='https://eventespresso.com'>", "</a>" ); ?></div>
+			<div class='aln-cntr'><?php printf(__("Powered by %sEvent Espresso %s", "event_espresso"), "<a href='https://eventespresso.com'>", "</a>"); ?></div>
 		</div>
 	</div>
 </div>

core/db_models/EEM_Payment_Method.model.php

Doc Comments +3 added lines, -3 removed lines

@@ -201,7 +201,7 @@ 
 	/**
 	 * Overrides parent ot also check by the slug
 	 * @see EEM_Base::ensure_is_obj()
-	 * @param string|int|EE_Payment_Method $base_class_obj_or_id
+	 * @param EE_Payment_Method $base_class_obj_or_id
 	 * @param boolean                      $ensure_is_in_db
 	 * @return EE_Payment_Method
 	 * @throws EE_Error
@@ -363,8 +363,8 @@ 
 	 * Note: if an offline payment method was selected on the related transaction then this will have no payment methods returned.
 	 * It will ONLY return a payment method for a PAYMENT recorded against the registration.
 	 *
-	 * @param EE_Registration|int $registration_or_reg_id  Either the EE_Registration object or the id for the registration.
-	 * @return EE_Payment|null
+	 * @param EE_Registration $registration_or_reg_id  Either the EE_Registration object or the id for the registration.
+	 * @return EE_Base_Class|null
 	 */
 	public function get_last_used_for_registration( $registration_or_reg_id ) {
 		$registration_id = EEM_Registration::instance()->ensure_is_ID( $registration_or_reg_id );

Braces +2 added lines, -4 removed lines

@@ -217,8 +217,7 @@ 
 		//ok so it wasn't a slug we were passed. try the usual then (ie, it's an object or an ID)
 		try {
 			return parent::ensure_is_obj( $base_class_obj_or_id, $ensure_is_in_db );
-		}
-		catch ( EE_Error $e ) {
+		} catch ( EE_Error $e ) {
 			//handle it outside the catch
 		}
 		throw new EE_Error( sprintf( __( "'%s' is neither a Payment Method ID, slug, nor object.", "event_espresso" ), $base_class_obj_or_id ) );
@@ -283,8 +282,7 @@ 
 						break;
 					}
 				}
-			}
-			catch ( EE_Error $e ) {
+			} catch ( EE_Error $e ) {
 				$payment_method->set_active( FALSE );
 			}
 		}

Spacing +93 added lines, -93 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  *
@@ -37,33 +37,33 @@ 
 	 * @access   protected
 	 * @return EEM_Payment_Method
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singlular_item = __( 'Payment Method', 'event_espresso' );
-		$this->plural_item = __( 'Payment Methods', 'event_espresso' );
-		$this->_tables = array( 'Payment_Method' => new EE_Primary_Table( 'esp_payment_method', 'PMD_ID' ) );
+	protected function __construct($timezone = NULL) {
+		$this->singlular_item = __('Payment Method', 'event_espresso');
+		$this->plural_item = __('Payment Methods', 'event_espresso');
+		$this->_tables = array('Payment_Method' => new EE_Primary_Table('esp_payment_method', 'PMD_ID'));
 		$this->_fields = array(
 			'Payment_Method' => array(
-				'PMD_ID' => new EE_Primary_Key_Int_Field( 'PMD_ID', __( "ID", 'event_espresso' ) ),
-				'PMD_type' => new EE_Plain_Text_Field( 'PMD_type', __( "Payment Method Type", 'event_espresso' ), FALSE, 'Admin_Only' ),
-				'PMD_name' => new EE_Plain_Text_Field( 'PMD_name', __( "Name", 'event_espresso' ), FALSE ),
-				'PMD_desc' => new EE_Post_Content_Field( 'PMD_desc', __( "Description", 'event_espresso' ), FALSE, '' ),
-				'PMD_admin_name' => new EE_Plain_Text_Field( 'PMD_admin_name', __( "Admin-Only Name", 'event_espresso' ), TRUE ),
-				'PMD_admin_desc' => new EE_Post_Content_Field( 'PMD_admin_desc', __( "Admin-Only Description", 'event_espresso' ), TRUE ),
-				'PMD_slug' => new EE_Slug_Field( 'PMD_slug', __( "Slug", 'event_espresso' ), FALSE ),
-				'PMD_order' => new EE_Integer_Field( 'PMD_order', __( "Order", 'event_espresso' ), FALSE, 0 ),
-				'PMD_debug_mode' => new EE_Boolean_Field( 'PMD_debug_mode', __( "Debug Mode On?", 'event_espresso' ), FALSE, FALSE ),
-				'PMD_wp_user' => new EE_WP_User_Field( 'PMD_wp_user', __( "Payment Method Creator ID", 'event_espresso' ), FALSE ),
-				'PMD_open_by_default' => new EE_Boolean_Field( 'PMD_open_by_default', __( "Open by Default?", 'event_espresso' ), FALSE, FALSE ), 'PMD_button_url' => new EE_Plain_Text_Field( 'PMD_button_url', __( "Button URL", 'event_espresso' ), TRUE, '' ),
-				'PMD_scope' => new EE_Serialized_Text_Field( 'PMD_scope', __( "Usable From?", 'event_espresso' ), FALSE, array() ), //possible values currently are 'CART','ADMIN','API'
+				'PMD_ID' => new EE_Primary_Key_Int_Field('PMD_ID', __("ID", 'event_espresso')),
+				'PMD_type' => new EE_Plain_Text_Field('PMD_type', __("Payment Method Type", 'event_espresso'), FALSE, 'Admin_Only'),
+				'PMD_name' => new EE_Plain_Text_Field('PMD_name', __("Name", 'event_espresso'), FALSE),
+				'PMD_desc' => new EE_Post_Content_Field('PMD_desc', __("Description", 'event_espresso'), FALSE, ''),
+				'PMD_admin_name' => new EE_Plain_Text_Field('PMD_admin_name', __("Admin-Only Name", 'event_espresso'), TRUE),
+				'PMD_admin_desc' => new EE_Post_Content_Field('PMD_admin_desc', __("Admin-Only Description", 'event_espresso'), TRUE),
+				'PMD_slug' => new EE_Slug_Field('PMD_slug', __("Slug", 'event_espresso'), FALSE),
+				'PMD_order' => new EE_Integer_Field('PMD_order', __("Order", 'event_espresso'), FALSE, 0),
+				'PMD_debug_mode' => new EE_Boolean_Field('PMD_debug_mode', __("Debug Mode On?", 'event_espresso'), FALSE, FALSE),
+				'PMD_wp_user' => new EE_WP_User_Field('PMD_wp_user', __("Payment Method Creator ID", 'event_espresso'), FALSE),
+				'PMD_open_by_default' => new EE_Boolean_Field('PMD_open_by_default', __("Open by Default?", 'event_espresso'), FALSE, FALSE), 'PMD_button_url' => new EE_Plain_Text_Field('PMD_button_url', __("Button URL", 'event_espresso'), TRUE, ''),
+				'PMD_scope' => new EE_Serialized_Text_Field('PMD_scope', __("Usable From?", 'event_espresso'), FALSE, array()), //possible values currently are 'CART','ADMIN','API'
 		) );
 		$this->_model_relations = array(
  //			'Event'=>new EE_HABTM_Relation('Event_Payment_Method'),
 			'Payment' => new EE_Has_Many_Relation(),
-			'Currency' => new EE_HABTM_Relation( 'Currency_Payment_Method' ),
+			'Currency' => new EE_HABTM_Relation('Currency_Payment_Method'),
 			'Transaction' => new EE_Has_Many_Relation(),
 			'WP_User' => new EE_Belongs_To_Relation(),
 		);
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -73,8 +73,8 @@ 
 	 * @param string $slug
 	 * @return EE_Payment_Method
 	 */
-	public function get_one_by_slug( $slug ) {
-		return $this->get_one( array( array( 'PMD_slug' => $slug ) ) );
+	public function get_one_by_slug($slug) {
+		return $this->get_one(array(array('PMD_slug' => $slug)));
 	}
 
 
@@ -88,8 +88,8 @@ 
 		return apply_filters(
 			'FHEE__EEM_Payment_Method__scopes',
 			array(
-				self::scope_cart 		=> __( "Front-end Registration Page", 'event_espresso' ),
-				self::scope_admin 	=> __( "Admin Registration Page (no online processing)", 'event_espresso' )
+				self::scope_cart 		=> __("Front-end Registration Page", 'event_espresso'),
+				self::scope_admin 	=> __("Admin Registration Page (no online processing)", 'event_espresso')
 			)
 		);
 	}
@@ -101,9 +101,9 @@ 
 	 * @param string $scope like one of EEM_Payment_Method::instance()->scopes()
 	 * @return boolean
 	 */
-	public function is_valid_scope( $scope ) {
+	public function is_valid_scope($scope) {
 		$scopes = $this->scopes();
-		if ( isset( $scopes[ $scope ] ) ) {
+		if (isset($scopes[$scope])) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -119,11 +119,11 @@ 
 	 * @throws EE_Error
 	 * @return EE_Payment_Method[]
 	 */
-	public function get_all_active( $scope = NULL, $query_params = array() ) {
-		if( ! isset( $query_params[ 'order_by' ] ) && ! isset( $query_params[ 'order' ] ) ) {
-			$query_params = array( 'order_by' => array( 'PMD_order' => 'ASC', 'PMD_ID' => 'ASC' ) );
+	public function get_all_active($scope = NULL, $query_params = array()) {
+		if ( ! isset($query_params['order_by']) && ! isset($query_params['order'])) {
+			$query_params = array('order_by' => array('PMD_order' => 'ASC', 'PMD_ID' => 'ASC'));
 		}
-		return $this->get_all( $this->_get_query_params_for_all_active( $scope, $query_params ) );
+		return $this->get_all($this->_get_query_params_for_all_active($scope, $query_params));
 	}
 
 	/**
@@ -132,8 +132,8 @@ 
 	 * @param array $query_params
 	 * @return int
 	 */
-	public function count_active( $scope = NULL, $query_params = array() ){
-		return $this->count( $this->_get_query_params_for_all_active( $scope, $query_params ) );
+	public function count_active($scope = NULL, $query_params = array()) {
+		return $this->count($this->_get_query_params_for_all_active($scope, $query_params));
 	}
 
 	/**
@@ -144,21 +144,21 @@ 
 	 * @return array like param of EEM_Base::get_all()
 	 * @throws EE_Error
 	 */
-	protected function _get_query_params_for_all_active( $scope = NULL, $query_params = array() ){
-		if ( $scope ) {
-			if ( $this->is_valid_scope( $scope ) ) {
-				return array_replace_recursive( array( array( 'PMD_scope' => array( 'LIKE', "%$scope%" ) ) ), $query_params );
+	protected function _get_query_params_for_all_active($scope = NULL, $query_params = array()) {
+		if ($scope) {
+			if ($this->is_valid_scope($scope)) {
+				return array_replace_recursive(array(array('PMD_scope' => array('LIKE', "%$scope%"))), $query_params);
 			} else {
-				throw new EE_Error( sprintf( __( "'%s' is not a valid scope for a payment method", "event_espresso" ), $scope ) );
+				throw new EE_Error(sprintf(__("'%s' is not a valid scope for a payment method", "event_espresso"), $scope));
 			}
 		} else {
 			$acceptable_scopes = array();
 			$count = 0;
-			foreach ( $this->scopes() as $scope_name => $desc ) {
+			foreach ($this->scopes() as $scope_name => $desc) {
 				$count++;
-				$acceptable_scopes[ 'PMD_scope*' . $count ] = array( 'LIKE', '%' . $scope_name . '%' );
+				$acceptable_scopes['PMD_scope*'.$count] = array('LIKE', '%'.$scope_name.'%');
 			}
-			return array_replace_recursive( array( array( 'OR*active_scope' => $acceptable_scopes ) ), $query_params );
+			return array_replace_recursive(array(array('OR*active_scope' => $acceptable_scopes)), $query_params);
 		}
 	}
 
@@ -170,8 +170,8 @@ 
 	 * @return array like param of EEM_Base::get_all()
 	 * @throws EE_Error
 	 */
-	public function get_query_params_for_all_active( $scope = NULL, $query_params = array() ) {
-		return $this->_get_query_params_for_all_active( $scope, $query_params );
+	public function get_query_params_for_all_active($scope = NULL, $query_params = array()) {
+		return $this->_get_query_params_for_all_active($scope, $query_params);
 	}
 
 
@@ -181,8 +181,8 @@ 
 	 * @param array  $query_params
 	 * @return EE_Payment_Method
 	 */
-	public function get_one_active( $scope = NULL, $query_params = array() ) {
-		return $this->get_one( $this->_get_query_params_for_all_active( $scope, $query_params ) );
+	public function get_one_active($scope = NULL, $query_params = array()) {
+		return $this->get_one($this->_get_query_params_for_all_active($scope, $query_params));
 	}
 
 
@@ -192,8 +192,8 @@ 
 	 * @param string $type
 	 * @return EE_Payment_Method
 	 */
-	public function get_one_of_type( $type ) {
-		return $this->get_one( array( array( 'PMD_type' => $type ) ) );
+	public function get_one_of_type($type) {
+		return $this->get_one(array(array('PMD_type' => $type)));
 	}
 
 
@@ -206,22 +206,22 @@ 
 	 * @return EE_Payment_Method
 	 * @throws EE_Error
 	 */
-	public function ensure_is_obj( $base_class_obj_or_id, $ensure_is_in_db = FALSE ) {
+	public function ensure_is_obj($base_class_obj_or_id, $ensure_is_in_db = FALSE) {
 		//first: check if it's a slug
-		if( is_string( $base_class_obj_or_id ) ) {
-			$obj = $this->get_one_by_slug( $base_class_obj_or_id );
-			if( $obj ) {
+		if (is_string($base_class_obj_or_id)) {
+			$obj = $this->get_one_by_slug($base_class_obj_or_id);
+			if ($obj) {
 				return $obj;
 			}
 		}
 		//ok so it wasn't a slug we were passed. try the usual then (ie, it's an object or an ID)
 		try {
-			return parent::ensure_is_obj( $base_class_obj_or_id, $ensure_is_in_db );
+			return parent::ensure_is_obj($base_class_obj_or_id, $ensure_is_in_db);
 		}
-		catch ( EE_Error $e ) {
+		catch (EE_Error $e) {
 			//handle it outside the catch
 		}
-		throw new EE_Error( sprintf( __( "'%s' is neither a Payment Method ID, slug, nor object.", "event_espresso" ), $base_class_obj_or_id ) );
+		throw new EE_Error(sprintf(__("'%s' is neither a Payment Method ID, slug, nor object.", "event_espresso"), $base_class_obj_or_id));
 	}
 
 
@@ -232,12 +232,12 @@ 
 	 * @param mixed $base_obj_or_id_or_slug
 	 * @return int
 	 */
-	function ensure_is_ID( $base_obj_or_id_or_slug ) {
-		if ( is_string( $base_obj_or_id_or_slug ) ) {
+	function ensure_is_ID($base_obj_or_id_or_slug) {
+		if (is_string($base_obj_or_id_or_slug)) {
 			//assume it's a slug
-			$base_obj_or_id_or_slug = $this->get_one_by_slug( $base_obj_or_id_or_slug );
+			$base_obj_or_id_or_slug = $this->get_one_by_slug($base_obj_or_id_or_slug);
 		}
-		return parent::ensure_is_ID( $base_obj_or_id_or_slug );
+		return parent::ensure_is_ID($base_obj_or_id_or_slug);
 	}
 
 
@@ -246,36 +246,36 @@ 
 	 * Verifies the button urls on all the passed payment methods have a valid button url. If not, resets them to their default.
 	 * @param EE_Payment_Method[] $payment_methods. If NULL is provided defaults to all payment methods active in the cart
 	 */
-	function verify_button_urls( $payment_methods = NULL ) {
-		$payment_methods = is_array( $payment_methods ) ? $payment_methods : $this->get_all_active(EEM_Payment_Method::scope_cart);
-		foreach ( $payment_methods as $payment_method ) {
+	function verify_button_urls($payment_methods = NULL) {
+		$payment_methods = is_array($payment_methods) ? $payment_methods : $this->get_all_active(EEM_Payment_Method::scope_cart);
+		foreach ($payment_methods as $payment_method) {
 			try {
 				$current_button_url = $payment_method->button_url();
-				$buttons_urls_to_try = apply_filters( 'FHEE__EEM_Payment_Method__verify_button_urls__button_urls_to_try', array(
-					'current_ssl' => str_replace( "http://", "https://", $current_button_url ),
-					'current' => str_replace( "https://", "http://", $current_button_url ),
-					'default_ssl' => str_replace( "http://", "https://", $payment_method->type_obj()->default_button_url() ),
-					'default' => str_replace( "https://", "http://", $payment_method->type_obj()->default_button_url() ),
-				) );
-				foreach( $buttons_urls_to_try as $button_url_to_try ) {
-					if(
+				$buttons_urls_to_try = apply_filters('FHEE__EEM_Payment_Method__verify_button_urls__button_urls_to_try', array(
+					'current_ssl' => str_replace("http://", "https://", $current_button_url),
+					'current' => str_replace("https://", "http://", $current_button_url),
+					'default_ssl' => str_replace("http://", "https://", $payment_method->type_obj()->default_button_url()),
+					'default' => str_replace("https://", "http://", $payment_method->type_obj()->default_button_url()),
+				));
+				foreach ($buttons_urls_to_try as $button_url_to_try) {
+					if (
 							(//this is the current url and it exists, regardless of SSL issues
 								$button_url_to_try == $current_button_url &&
 								EEH_URL::remote_file_exists(
 										$button_url_to_try,
 										array(
 											'sslverify' => false,
-											'limit_response_size' => 4095,//we don't really care for a full response, but we do want headers at least. Lets just ask for a one block
+											'limit_response_size' => 4095, //we don't really care for a full response, but we do want headers at least. Lets just ask for a one block
 											) )
 							)
 							||
 							(//this is NOT the current url and it exists with a working SSL cert
 								$button_url_to_try != $current_button_url &&
-								EEH_URL::remote_file_exists( $button_url_to_try )
+								EEH_URL::remote_file_exists($button_url_to_try)
 							) ) {
-						if( $current_button_url != $button_url_to_try ){
-							$payment_method->save( array( 'PMD_button_url' => $button_url_to_try ) );
-							EE_Error::add_attention( sprintf( __( "Payment Method %s's button url was set to %s, because the old image either didnt exist or SSL was recently enabled.", "event_espresso" ), $payment_method->name(), $button_url_to_try ) );
+						if ($current_button_url != $button_url_to_try) {
+							$payment_method->save(array('PMD_button_url' => $button_url_to_try));
+							EE_Error::add_attention(sprintf(__("Payment Method %s's button url was set to %s, because the old image either didnt exist or SSL was recently enabled.", "event_espresso"), $payment_method->name(), $button_url_to_try));
 						}
 						//this image exists. So if wasn't set before, now it is;
 						//or if it was already set, we have nothing to do
@@ -283,8 +283,8 @@ 
 					}
 				}
 			}
-			catch ( EE_Error $e ) {
-				$payment_method->set_active( FALSE );
+			catch (EE_Error $e) {
+				$payment_method->set_active(FALSE);
 			}
 		}
 	}
@@ -298,29 +298,29 @@ 
 	 * @param array $rows
 	 * @return EE_Payment_Method[]
 	 */
-	protected function _create_objects( $rows = array() ) {
-		EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-		$payment_methods = parent::_create_objects( $rows );
+	protected function _create_objects($rows = array()) {
+		EE_Registry::instance()->load_lib('Payment_Method_Manager');
+		$payment_methods = parent::_create_objects($rows);
 		/* @var $payment_methods EE_Payment_Method[] */
 		$usable_payment_methods = array();
-		foreach ( $payment_methods as $key => $payment_method ) {
-			if ( EE_Payment_Method_Manager::instance()->payment_method_type_exists( $payment_method->type() ) ) {
-				$usable_payment_methods[ $key ] = $payment_method;
+		foreach ($payment_methods as $key => $payment_method) {
+			if (EE_Payment_Method_Manager::instance()->payment_method_type_exists($payment_method->type())) {
+				$usable_payment_methods[$key] = $payment_method;
 				//some payment methods enqueue their scripts in EE_PMT_*::__construct
 				//which is kinda a no-no (just because it's being constructed doesn't mean we need to enqueue
 				//its scripts). but for backwards-compat we should continue to do that
 				$payment_method->type_obj();
-			} elseif( $payment_method->active() ) {				
+			} elseif ($payment_method->active()) {				
 				//only deactivate and notify the admin if the payment is active somewhere
 				$payment_method->deactivate();
 				$payment_method->save();
 				EE_Error::add_persistent_admin_notice(
-					'auto-deactivated-' . $payment_method->type(),
+					'auto-deactivated-'.$payment_method->type(),
 					sprintf(
-						__( 'The payment method %1$s was automatically deactivated because it appears its associated Event Espresso Addon was recently deactivated.%2$sIt can be reactivated on the %3$sPlugins admin page%4$s, then you can reactivate the payment method.', 'event_espresso' ),
+						__('The payment method %1$s was automatically deactivated because it appears its associated Event Espresso Addon was recently deactivated.%2$sIt can be reactivated on the %3$sPlugins admin page%4$s, then you can reactivate the payment method.', 'event_espresso'),
 						$payment_method->admin_name(),
 						'<br />',
-						'<a href="' . admin_url('plugins.php') . '">',
+						'<a href="'.admin_url('plugins.php').'">',
 						'</a>'
 					),
 					true
@@ -340,16 +340,16 @@ 
 	 * @param string 	$scope @see EEM_Payment_Method::get_all_for_events
 	 * @return EE_Payment_Method[]
 	 */
-	public function get_all_for_transaction( $transaction, $scope ) {
+	public function get_all_for_transaction($transaction, $scope) {
 		//@todo take relations between events and payment methods into account, once that relation exists
-		if ( $transaction instanceof EE_Transaction ) {
+		if ($transaction instanceof EE_Transaction) {
 			//@todo take the relation between transaction and currencies into account
 		}
-		$currencies_for_events = array( EE_Config::instance()->currency->code );
+		$currencies_for_events = array(EE_Config::instance()->currency->code);
 		//give addons a chance to override what payment methods are chosen based on the transaction
 		return apply_filters(
 			'FHEE__EEM_Payment_Method__get_all_for_transaction__payment_methods',
-			$this->get_all_active( $scope, array( array( 'Currency.CUR_code' => array( 'IN', $currencies_for_events ) ) ) ),
+			$this->get_all_active($scope, array(array('Currency.CUR_code' => array('IN', $currencies_for_events)))),
 			$transaction,
 			$scope
 		);
@@ -365,16 +365,16 @@ 
 	 * @param EE_Registration|int $registration_or_reg_id  Either the EE_Registration object or the id for the registration.
 	 * @return EE_Payment|null
 	 */
-	public function get_last_used_for_registration( $registration_or_reg_id ) {
-		$registration_id = EEM_Registration::instance()->ensure_is_ID( $registration_or_reg_id );
+	public function get_last_used_for_registration($registration_or_reg_id) {
+		$registration_id = EEM_Registration::instance()->ensure_is_ID($registration_or_reg_id);
 
 		$query_params = array(
 			0 => array(
 				'Payment.Registration.REG_ID' => $registration_id,
 			),
-			'order_by' => array( 'Payment.PAY_ID' => 'DESC' )
+			'order_by' => array('Payment.PAY_ID' => 'DESC')
 		);
-		return $this->get_one( $query_params );
+		return $this->get_one($query_params);
 	}
 
 }

modules/single_page_checkout/reg_steps/attendee_information/attendee_info_main.template.php

Spacing +15 added lines, -15 removed lines

@@ -1,5 +1,5 @@ 
 	<p id="spco-attendee_information-pg" class="spco-steps-pg small-text drk-grey-text">
-		<?php echo apply_filters( 'FHEE__registration_page_attendee_information__attendee_information_pg', sprintf( __('In order to process your registration, we ask you to provide the following information.%1$sPlease note that all fields marked with an asterisk (%2$s) are required.', 'event_espresso'), '<br />', '<span class="asterisk">*</span>' )); ?>
+		<?php echo apply_filters('FHEE__registration_page_attendee_information__attendee_information_pg', sprintf(__('In order to process your registration, we ask you to provide the following information.%1$sPlease note that all fields marked with an asterisk (%2$s) are required.', 'event_espresso'), '<br />', '<span class="asterisk">*</span>')); ?>
 	</p>
 
 <?php
@@ -7,34 +7,34 @@ 
 $prev_event = '';
 $prev_ticket = '';
 
-if ( count( $registrations ) > 0 ) {
-	foreach ( $registrations as $registration ) {
-		if ( $registration instanceof EE_Registration ) {
+if (count($registrations) > 0) {
+	foreach ($registrations as $registration) {
+		if ($registration instanceof EE_Registration) {
 			$att_nmbr++;
 ?>
 
-		<div id="spco-attendee-panel-dv-<?php echo $registration->reg_url_link();?>" class="spco-attendee-panel-dv spco-attendee-ticket-<?php echo $registration->ticket()->ID();?>">
+		<div id="spco-attendee-panel-dv-<?php echo $registration->reg_url_link(); ?>" class="spco-attendee-panel-dv spco-attendee-ticket-<?php echo $registration->ticket()->ID(); ?>">
 
-			<?php if ( $registration->event()->ID() != $prev_event ) { ?>
+			<?php if ($registration->event()->ID() != $prev_event) { ?>
 			<h4 id="event_title-<?php echo $registration->event()->ID() ?>" class="big-event-title-hdr">
 				<?php echo $registration->event()->name(); ?>
 			</h4>
 			<?php } ?>
-			<?php if ( $registration->ticket()->ID() != $prev_ticket ) { ?>
-				<?php if ( ! $revisit ) { ?>
+			<?php if ($registration->ticket()->ID() != $prev_ticket) { ?>
+				<?php if ( ! $revisit) { ?>
 			<div class="spco-ticket-info-dv small-text">
-				<h5><?php _e('Details', 'event_espresso');?></h5>
+				<h5><?php _e('Details', 'event_espresso'); ?></h5>
 				<table>
 					<thead>
 						<tr>
-							<th scope="col" width=""><?php _e('Name and Description', 'event_espresso');?></th>
-							<th scope="col" width="7.5%" class="jst-rght"><?php _e('Qty', 'event_espresso');?></th>
-							<th scope="col" width="17.5%" class="jst-rght"><?php _e('Price', 'event_espresso');?></th>
-							<th scope="col" width="17.5%" class="jst-rght"><?php _e('Total', 'event_espresso');?></th>
+							<th scope="col" width=""><?php _e('Name and Description', 'event_espresso'); ?></th>
+							<th scope="col" width="7.5%" class="jst-rght"><?php _e('Qty', 'event_espresso'); ?></th>
+							<th scope="col" width="17.5%" class="jst-rght"><?php _e('Price', 'event_espresso'); ?></th>
+							<th scope="col" width="17.5%" class="jst-rght"><?php _e('Total', 'event_espresso'); ?></th>
 						</tr>
 					</thead>
 					<tbody>
-					<?php echo $ticket_line_item[ $registration->ticket()->ID() ]; ?>
+					<?php echo $ticket_line_item[$registration->ticket()->ID()]; ?>
 					</tbody>
 				</table>
 			</div>
@@ -43,7 +43,7 @@ 
 
 			<?php
 			// ATTENDEE QUESTIONS
-			$reg_form = EE_Template_Layout::get_subform_name( $registration->reg_url_link() );
+			$reg_form = EE_Template_Layout::get_subform_name($registration->reg_url_link());
 			echo ${$reg_form};
 			?>
 

core/db_classes/EE_Soft_Delete_Base_Class.class.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
-<?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
@@ -43,23 +43,23 @@ 
 	 * @param bool $delete true=>delete, false=>restore
 	 * @return bool|int
 	 */
-	public function delete_or_restore( $delete = true ) {
+	public function delete_or_restore($delete = true) {
 		/**
 		 * Called just before trashing (soft delete) or restoring a trashed item.
 		 *
 		 * @param EE_Base_Class $model_object about to be trashed or restored
 		 * @param bool          $delete       true the item is being trashed, false the item is being restored.
 		 */
-		do_action( 'AHEE__EE_Soft_Delete_Base_Class__delete_or_restore__before', $this, $delete );
+		do_action('AHEE__EE_Soft_Delete_Base_Class__delete_or_restore__before', $this, $delete);
 		$model = $this->get_model();
-		$result = $model->delete_or_restore_by_ID( $delete, $this->ID() );
+		$result = $model->delete_or_restore_by_ID($delete, $this->ID());
 		/**
 		 * Called just after trashing (soft delete) or restoring a trashed item.
 		 * @param EE_Base_Class $model_object that was just trashed or restored.
 		 * @param bool          $delete       true the item is being trashed, false the item is being restored.
 		 * @param bool|int $result
 		 */
-		do_action( 'AHEE__EE_Soft_Delete_Base_Class__delete_or_restore__after', $this, $delete, $result );
+		do_action('AHEE__EE_Soft_Delete_Base_Class__delete_or_restore__after', $this, $delete, $result);
 		return $result;
 	}
 
@@ -70,6 +70,6 @@ 
 	 * @return bool|int
 	 */
 	public function restore() {
-		return $this->delete_or_restore( false );
+		return $this->delete_or_restore(false);
 	}
 }
\ No newline at end of file

admin_pages/registrations/form_sections/EE_Registration_Custom_Questions_Form.form.php

Braces +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 			if( $subsection->form_data_present_in( $req_data ) ) {
 				try{
 					$subsection->_normalize($req_data);
-				}catch( EE_Validation_Error $e ){
+				} catch( EE_Validation_Error $e ){
 					$subsection->add_validation_error( $e );
 				}
 			}

Spacing +37 added lines, -37 removed lines

@@ -13,11 +13,11 @@ 
  * @since		 	   4.8.30.rc.009
  *
  */
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
-class EE_Registration_Custom_Questions_Form extends EE_Form_Section_Proper{
+class EE_Registration_Custom_Questions_Form extends EE_Form_Section_Proper {
 	/**
 	 *
 	 * @var EE_Registration
@@ -29,16 +29,16 @@ 
 	 * @param EE_Registration $reg
 	 * @param array $options
 	 */
-	public function __construct( EE_Registration $reg, $options = array() ) {
+	public function __construct(EE_Registration $reg, $options = array()) {
 		$this->_registration = $reg;
-		if( ! isset( $options[ 'layout_strategy' ] ) ) {
-			$options[ 'layout_strategy' ] = new EE_Admin_Two_Column_Layout();
+		if ( ! isset($options['layout_strategy'])) {
+			$options['layout_strategy'] = new EE_Admin_Two_Column_Layout();
 		}
-		if( ! isset( $options[ 'html_id' ] ) ) {
-			$options[ 'html_id' ] = 'reg-admin-attendee-questions-frm';
+		if ( ! isset($options['html_id'])) {
+			$options['html_id'] = 'reg-admin-attendee-questions-frm';
 		}
 		$this->build_form_from_registration();
-		parent::__construct( $options );
+		parent::__construct($options);
 	}
 
 
@@ -52,8 +52,8 @@ 
 
 	public function build_form_from_registration() {
 		$reg = $this->get_registration();
-		if( ! $reg instanceof EE_Registration ) {
-			throw new EE_Error( __( 'We cannot build the registration custom questions form because there is no registration set on it yet', 'event_espresso') );
+		if ( ! $reg instanceof EE_Registration) {
+			throw new EE_Error(__('We cannot build the registration custom questions form because there is no registration set on it yet', 'event_espresso'));
 		}
 		//we want to get all their question groups
 		$question_groups = EEM_Question_Group::instance()->get_all(
@@ -63,16 +63,16 @@ 
 					'Event_Question_Group.EQG_primary' => $reg->count() == 1 ? TRUE : FALSE,
 					'OR' => array(
 						'Question.QST_system*blank' =>  '',
-						'Question.QST_system*null' => array( 'IS_NULL' ) 
+						'Question.QST_system*null' => array('IS_NULL') 
 					)
 				),
-				'order_by' => array( 'QSG_order' => 'ASC' )
+				'order_by' => array('QSG_order' => 'ASC')
 			)
 		);
 		//get each question groups questions
-		foreach( $question_groups as $question_group ) {
-			if ( $question_group instanceof EE_Question_Group ) {
-				$this->_subsections[ $question_group->ID() ] = $this->build_subform_from_question_group(
+		foreach ($question_groups as $question_group) {
+			if ($question_group instanceof EE_Question_Group) {
+				$this->_subsections[$question_group->ID()] = $this->build_subform_from_question_group(
 					$question_group,
 					$reg
 				);
@@ -89,16 +89,16 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	public function build_subform_from_question_group( $question_group, $registration ) {
-		if( ! $question_group instanceof EE_Question_Group ||
+	public function build_subform_from_question_group($question_group, $registration) {
+		if ( ! $question_group instanceof EE_Question_Group ||
 			! $registration instanceof EE_Registration) {
-			throw new EE_Error( __( 'A valid question group and registration must be passed to EE_Registration_Custom_Question_Form', 'event_espresso' ) );
+			throw new EE_Error(__('A valid question group and registration must be passed to EE_Registration_Custom_Question_Form', 'event_espresso'));
 		}
 		$parts_of_subsection = array(
 			'title' => new EE_Form_Section_HTML(
-					EEH_HTML::h5( $question_group->name(),
+					EEH_HTML::h5($question_group->name(),
 					$question_group->identifier(),
-					'espresso-question-group-title-h5 section-title' )
+					'espresso-question-group-title-h5 section-title')
 				)
 		);
 		$questions = $question_group->questions( 
@@ -106,17 +106,17 @@ 
 				array( 
 					'OR' => array(
 						'QST_system*blank' => '',
-						'QST_system*null' => array( 'IS_NULL' )
+						'QST_system*null' => array('IS_NULL')
 					)
 				)
 			)
 		);
-		foreach( $questions as $question ) {
-			$parts_of_subsection[ $question->ID() ] = $question->generate_form_input( $registration );
+		foreach ($questions as $question) {
+			$parts_of_subsection[$question->ID()] = $question->generate_form_input($registration);
 		}
-		$parts_of_subsection[ 'edit_link' ] = new EE_Form_Section_HTML(
-				'<tr><th/><td class="reg-admin-edit-attendee-question-td"><a class="reg-admin-edit-attendee-question-lnk" href="#" title="' . esc_attr__( 'click to edit question', 'event_espresso' ) . '">
-					<span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __( 'edit the above question group', 'event_espresso' ) . '</span>
+		$parts_of_subsection['edit_link'] = new EE_Form_Section_HTML(
+				'<tr><th/><td class="reg-admin-edit-attendee-question-td"><a class="reg-admin-edit-attendee-question-lnk" href="#" title="'.esc_attr__('click to edit question', 'event_espresso').'">
+					<span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __('edit the above question group', 'event_espresso').'</span>
 					<div class="dashicons dashicons-edit"></div>
 				</a></td></tr>'
 			);
@@ -136,12 +136,12 @@ 
 	protected function _normalize($req_data) {
 		$this->_received_submission = TRUE;
 		$this->_validation_errors = array();
-		foreach($this->get_validatable_subsections() as $subsection){
-			if( $subsection->form_data_present_in( $req_data ) ) {
-				try{
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			if ($subsection->form_data_present_in($req_data)) {
+				try {
 					$subsection->_normalize($req_data);
-				}catch( EE_Validation_Error $e ){
-					$subsection->add_validation_error( $e );
+				} catch (EE_Validation_Error $e) {
+					$subsection->add_validation_error($e);
 				}
 			}
 		}
@@ -156,13 +156,13 @@ 
 	 * calling parent::_validate() first.
 	 */
 	protected function _validate() {
-		foreach($this->get_validatable_subsections() as $subsection_name => $subsection){
-			if( $subsection->form_data_present_in( array_merge( $_GET, $_POST ) ) ) {
-				if(method_exists($this,'_validate_'.$subsection_name)){
-					call_user_func_array(array($this,'_validate_'.$subsection_name), array($subsection));
+		foreach ($this->get_validatable_subsections() as $subsection_name => $subsection) {
+			if ($subsection->form_data_present_in(array_merge($_GET, $_POST))) {
+				if (method_exists($this, '_validate_'.$subsection_name)) {
+					call_user_func_array(array($this, '_validate_'.$subsection_name), array($subsection));
 				}
 				$subsection->_validate();
-			} elseif( $subsection instanceof EE_Form_Section_Proper ) {
+			} elseif ($subsection instanceof EE_Form_Section_Proper) {
 				$subsection->_received_submission = true;
 			}
 		}

core/admin/templates/admin_wrapper.template.php

Spacing +3 added lines, -3 removed lines

@@ -1,17 +1,17 @@
 <div class="wrap espresso-admin">
 
-	<h1><?php esc_attr_e( 'Event Espresso', 'event_espresso' ); ?>&nbsp;-&nbsp;<?php echo $admin_page_title; ?></h1>
+	<h1><?php esc_attr_e('Event Espresso', 'event_espresso'); ?>&nbsp;-&nbsp;<?php echo $admin_page_title; ?></h1>
 
 	<div id="ajax-notices-container"></div>
 
 	<?php echo $nav_tabs; ?>
 
 	<?php
-	do_action( 'AHEE__admin_wrapper__template__before_admin_page_content' );
+	do_action('AHEE__admin_wrapper__template__before_admin_page_content');
 	echo $before_admin_page_content;
 	echo $admin_page_content;
 	echo $after_admin_page_content;
-	do_action( 'AHEE__admin_wrapper__template__after_admin_page_content' );
+	do_action('AHEE__admin_wrapper__template__after_admin_page_content');
 	?>
 
 </div>

core/admin/templates/admin_wrapper_ajax.template.php

Spacing +4 added lines, -4 removed lines

@@ -1,13 +1,13 @@
 <div class="wrap espresso-admin">
-	<h1><?php esc_attr_e( 'Event Espresso', 'event_espresso' ); ?>&nbsp;-&nbsp;<?php echo $admin_page_title; ?></h1>
+	<h1><?php esc_attr_e('Event Espresso', 'event_espresso'); ?>&nbsp;-&nbsp;<?php echo $admin_page_title; ?></h1>
 
-	<div class="ee-notices"><?php echo isset( $ajax_notices ) ? $ajax_notices : ''; ?></div>
+	<div class="ee-notices"><?php echo isset($ajax_notices) ? $ajax_notices : ''; ?></div>
 	<?php
-	do_action( 'AHEE__admin_wrapper__template__before_admin_page_content' );
+	do_action('AHEE__admin_wrapper__template__before_admin_page_content');
 	echo $before_admin_page_content;
 	echo $admin_page_content;
 	echo $after_admin_page_content;
-	do_action( 'AHEE__admin_wrapper__template__after_admin_page_content' );
+	do_action('AHEE__admin_wrapper__template__after_admin_page_content');
 	?>
 </div>
 <!-- espresso-admin -->
\ No newline at end of file