eventespresso / event-espresso-core

core/libraries/messages/EE_Messages_Base.lib.php

Spacing +21 added lines, -21 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -184,9 +184,9 @@ 
 	 * @access protected
 	 * @param string $messenger
 	 */
-	protected function _set_existing_admin_settings( $messenger = '' ) {
+	protected function _set_existing_admin_settings($messenger = '') {
 		/** @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');
 		$active_messengers = $Message_Resource_Manager->get_active_messengers_option();
 		$settings_to_use = $active_messengers;
 
@@ -194,14 +194,14 @@ 
 		 * This determines what will be used for the getting the settings.
 		 */
 		if (
-			! empty( $messenger )
-			&& $Message_Resource_Manager->is_message_type_active_for_messenger( $messenger, $this->name )
+			! empty($messenger)
+			&& $Message_Resource_Manager->is_message_type_active_for_messenger($messenger, $this->name)
 		) {
-			$settings_to_use = $active_messengers[ $messenger ]['settings'][ $messenger . '-message_types' ];
+			$settings_to_use = $active_messengers[$messenger]['settings'][$messenger.'-message_types'];
 		}
 
-		$this->_existing_admin_settings = isset( $settings_to_use[ $this->name ]['settings'] )
-			? $settings_to_use[ $this->name ]['settings']
+		$this->_existing_admin_settings = isset($settings_to_use[$this->name]['settings'])
+			? $settings_to_use[$this->name]['settings']
 			: null;
 	}
 
@@ -218,12 +218,12 @@ 
 	 * @param string $messenger
 	 * @return array          settings
 	 */
-	public function get_existing_admin_settings( $messenger = '' ) {
+	public function get_existing_admin_settings($messenger = '') {
 		// if admin_settings property empty lets try setting it.
-		if ( method_exists($this, '_set_existing_admin_settings') && empty( $this->_existing_admin_settings ) ) {
-			$this->_set_existing_admin_settings( $messenger );
+		if (method_exists($this, '_set_existing_admin_settings') && empty($this->_existing_admin_settings)) {
+			$this->_set_existing_admin_settings($messenger);
 		}
-		return property_exists( $this, '_existing_admin_settings' )
+		return property_exists($this, '_existing_admin_settings')
 			? $this->_existing_admin_settings
 			: null;
 	}
@@ -239,12 +239,12 @@ 
 	 */
 	public function get_valid_shortcodes() {
 		$valid_shortcodes = apply_filters(
-			'FHEE__' . get_class( $this ) . '__get_valid_shortcodes',
+			'FHEE__'.get_class($this).'__get_valid_shortcodes',
 			$this->_valid_shortcodes,
 			$this
 		);
 		//The below filter applies to ALL messengers and message types so use with care!
-		$valid_shortcodes = apply_filters( 'FHEE__EE_Messages_Base__get_valid_shortcodes', $valid_shortcodes, $this );
+		$valid_shortcodes = apply_filters('FHEE__EE_Messages_Base__get_valid_shortcodes', $valid_shortcodes, $this);
 		return $valid_shortcodes;
 	}
 
@@ -278,23 +278,23 @@ 
 	 * @access protected
 	 * @return string $content for page.
 	 */
-	protected function _get_admin_page_content( $page, $action, $extra, $actives ) {
+	protected function _get_admin_page_content($page, $action, $extra, $actives) {
 		//we can also further refine the context by action (if present).
-		if ( !empty($action) ) {
-			$page = $page . '_' . $action;
+		if ( ! empty($action)) {
+			$page = $page.'_'.$action;
 		}
 
-		if ( !isset( $this->admin_registered_pages[$page]) ){
+		if ( ! isset($this->admin_registered_pages[$page])) {
 			// todo: a place to throw an exception?
 			// We need to indicate there is no registered page so this function is not being called correctly.
 			return false;
 		}
 		//k made it here so let's call the method
 		$content = call_user_func_array(
-			array( $this, '_get_admin_content_' . $page ),
-			array( $actives, $extra )
+			array($this, '_get_admin_content_'.$page),
+			array($actives, $extra)
 		);
-		if ( $content === false ) {
+		if ($content === false) {
 			// todo this needs to be an exception once we've got exceptions in place.
 			return false;
 		}

Braces +2 added lines, -1 removed lines

@@ -1,6 +1,7 @@
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * EE_Messages_Base class

core/libraries/messages/EE_Messages_Data_Handler_Collection.lib.php

Spacing +9 added lines, -9 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 
@@ -26,10 +26,10 @@ 
 	 *                                                   classname to create an alternative index for retrieving data_handlers.
 	 * @return bool
 	 */
-	public function add( $data_handler, $data = null) {
+	public function add($data_handler, $data = null) {
 		$data = $data === null ? array() : (array) $data;
-		$info['key'] = $this->get_key( get_class( $data_handler ), $data );
-		return parent::add( $data_handler, $info );
+		$info['key'] = $this->get_key(get_class($data_handler), $data);
+		return parent::add($data_handler, $info);
 	}
 	
 
@@ -44,8 +44,8 @@ 
 	 *
 	 * @return  string      md5 hash using provided info.
 	 */
-	public function get_key( $classname, $data ) {
-		return md5( $classname . print_r( $data, true ) );
+	public function get_key($classname, $data) {
+		return md5($classname.print_r($data, true));
 	}
 
 
@@ -61,11 +61,11 @@ 
 	 *
 	 * @return null|EE_Messages_incoming_data
 	 */
-	public function get_by_key( $key ) {
+	public function get_by_key($key) {
 		$this->rewind();
-		while( $this->valid() ) {
+		while ($this->valid()) {
 			$data = $this->getInfo();
-			if ( isset( $data['key'] ) && $data['key'] === $key ) {
+			if (isset($data['key']) && $data['key'] === $key) {
 				$handler = $this->current();
 				$this->rewind();
 				return $handler;

Braces +2 added lines, -1 removed lines

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

core/libraries/messages/EE_Messages_Template_Pack_Collection.lib.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 
@@ -17,10 +17,10 @@ 
 		$this->interface = 'EE_Messages_Template_Pack';
 	}
 
-	public function get_by_name( $template_pack_name ) {
+	public function get_by_name($template_pack_name) {
 		$this->rewind();
-		while ( $this->valid() ) {
-			if ( $this->current()->dbref == $template_pack_name ) {
+		while ($this->valid()) {
+			if ($this->current()->dbref == $template_pack_name) {
 				return $this->current();
 			}
 			$this->next();

Braces +2 added lines, -1 removed lines

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

core/libraries/messages/EE_Messenger_Collection_Loader.lib.php

Spacing +22 added lines, -22 removed lines

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

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

Spacing +23 added lines, -23 removed lines

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

Braces +2 added lines, -1 removed lines

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

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

Spacing +23 added lines, -23 removed lines

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

core/libraries/shortcodes/EE_Shortcodes.lib.php

Braces +9 added lines, -5 removed lines

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

Spacing +24 added lines, -24 removed lines

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

core/libraries/rest_api/changes/Changes_In_4_8_34.php

Doc Comments -1 removed lines

@@ -22,7 +22,6 @@
 	/**
 	 * Removes the checkin and checkout endpoints from the index for requests
 	 * to api versions lowers than 4.8.33
-	 * @param array $routes_on_this_version
 	 * @param EventEspresso\core\libraries\rest_api\controllers\Base $controller
 	 * @return array like $routes_on_this_version
 	 */

Spacing +4 added lines, -4 removed lines

@@ -13,7 +13,7 @@ 
 		//is for lower than 4.8.33
 		add_filter( 
 			'FHEE__EventEspresso\core\libraries\rest_api\controllers\Base___get_response_headers',
-			array( $this, 'remove_response_headers' ),
+			array($this, 'remove_response_headers'),
 			10,
 			3
 		);
@@ -26,9 +26,9 @@ 
 	 * @param EventEspresso\core\libraries\rest_api\controllers\Base $controller
 	 * @return array like $routes_on_this_version
 	 */
-	public function remove_response_headers( $response_headers, $controller, $requested_version ) {
-		if( $controller instanceof Base 
-			&& $this->applies_to_version(  $requested_version ) ) {
+	public function remove_response_headers($response_headers, $controller, $requested_version) {
+		if ($controller instanceof Base 
+			&& $this->applies_to_version($requested_version)) {
 			return array();
 		}
 		return $response_headers;

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

Spacing +8 added lines, -8 removed lines

@@ -6,22 +6,22 @@
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_Email_Input extends EE_Form_Input_Base{
+class EE_Email_Input extends EE_Form_Input_Base {
 
 	/**
 	 * @param array $input_settings
 	 */
-	function __construct( $input_settings = array() ){
-		$this->_set_display_strategy( new EE_Text_Input_Display_Strategy('email') );
-		$this->_set_normalization_strategy( new EE_Text_Normalization() );
+	function __construct($input_settings = array()) {
+		$this->_set_display_strategy(new EE_Text_Input_Display_Strategy('email'));
+		$this->_set_normalization_strategy(new EE_Text_Normalization());
 		$this->_add_validation_strategy(
 			new EE_Email_Validation_Strategy(
-				isset( $input_settings[ 'validation_error_message' ] )
-					? $input_settings[ 'validation_error_message' ]
+				isset($input_settings['validation_error_message'])
+					? $input_settings['validation_error_message']
 					: NULL
 			)
 		);
-		parent::__construct( $input_settings );
-		$this->set_html_class( $this->html_class() . ' email' );
+		parent::__construct($input_settings);
+		$this->set_html_class($this->html_class().' email');
 	}
 }
\ No newline at end of file