eventespresso / event-espresso-core

core/db_models/EEM_Payment_Method.model.php

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 );
 			}
 		}

Indentation +21 added lines, -21 removed lines

@@ -294,15 +294,15 @@ 
 
 
 
-    /**
-     * Overrides parent to not only turn wpdb results into EE_Payment_Method objects,
-     * but also verifies the payment method type of each is a usable object. If not,
-     * deactivate it, sets a notification, and deactivates it
-     *
-     * @param array $rows
-     * @return EE_Payment_Method[]
-     * @throws InvalidDataTypeException
-     */
+	/**
+	 * Overrides parent to not only turn wpdb results into EE_Payment_Method objects,
+	 * but also verifies the payment method type of each is a usable object. If not,
+	 * deactivate it, sets a notification, and deactivates it
+	 *
+	 * @param array $rows
+	 * @return EE_Payment_Method[]
+	 * @throws InvalidDataTypeException
+	 */
 	protected function _create_objects( $rows = array() ) {
 		EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
 		$payment_methods = parent::_create_objects( $rows );
@@ -319,18 +319,18 @@ 
 				//only deactivate and notify the admin if the payment is active somewhere
 				$payment_method->deactivate();
 				$payment_method->save();
-                new PersistentAdminNotice(
-                    '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'),
-                        $payment_method->admin_name(),
-                        '<br />',
-                        '<a href="' . admin_url('plugins.php') . '">',
-                        '</a>'
-                    ),
-                    true
-                );
+				new PersistentAdminNotice(
+					'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'),
+						$payment_method->admin_name(),
+						'<br />',
+						'<a href="' . admin_url('plugins.php') . '">',
+						'</a>'
+					),
+					true
+				);
 			}
 		}
 		return $usable_payment_methods;

Spacing +90 added lines, -90 removed lines

@@ -1,8 +1,8 @@ 
 <?php use EventEspresso\core\domain\entities\notifications\PersistentAdminNotice;
 use EventEspresso\core\exceptions\InvalidDataTypeException;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  *
@@ -40,33 +40,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);
 	}
 
 
@@ -76,8 +76,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)));
 	}
 
 
@@ -91,8 +91,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')
 			)
 		);
 	}
@@ -104,9 +104,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;
@@ -122,11 +122,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['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['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));
 	}
 
 	/**
@@ -135,8 +135,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));
 	}
 
 	/**
@@ -147,21 +147,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);
 		}
 	}
 
@@ -173,8 +173,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);
 	}
 
 
@@ -184,8 +184,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));
 	}
 
 
@@ -195,8 +195,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)));
 	}
 
 
@@ -209,22 +209,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));
 	}
 
 
@@ -235,12 +235,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);
 	}
 
 
@@ -249,36 +249,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
@@ -286,8 +286,8 @@ 
 					}
 				}
 			}
-			catch ( EE_Error $e ) {
-				$payment_method->set_active( FALSE );
+			catch (EE_Error $e) {
+				$payment_method->set_active(FALSE);
 			}
 		}
 	}
@@ -303,30 +303,30 @@ 
      * @return EE_Payment_Method[]
      * @throws InvalidDataTypeException
      */
-	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();
                 new PersistentAdminNotice(
-                    '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'),
                         $payment_method->admin_name(),
                         '<br />',
-                        '<a href="' . admin_url('plugins.php') . '">',
+                        '<a href="'.admin_url('plugins.php').'">',
                         '</a>'
                     ),
                     true
@@ -346,11 +346,11 @@ 
 	 * @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) {
 		//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( 'group_by' => 'PMD_type' ) ),
+			$this->get_all_active($scope, array('group_by' => 'PMD_type')),
 			$transaction,
 			$scope
 		);
@@ -366,16 +366,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);
 	}
 
 }

core/libraries/messages/EE_Message_Type_Collection.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');
 }
 
 
@@ -39,9 +39,9 @@ 
 	 * @param mixed  $info
 	 * @return bool
 	 */
-	public function add( $object, $info = null ) {
-		$info = empty( $info ) && $object instanceof $this->interface ? $object->name : $info;
-		return parent::add( $object, $info );
+	public function add($object, $info = null) {
+		$info = empty($info) && $object instanceof $this->interface ? $object->name : $info;
+		return parent::add($object, $info);
 	}
 
 
@@ -57,9 +57,9 @@ 
 	 * @param mixed  $info
 	 * @return bool
 	 */
-	public function set_info( $object, $info = null ) {
-		$info = empty( $info ) && $object instanceof $this->interface ? $object->name : $info;
-		return parent::set_info( $object, $info );
+	public function set_info($object, $info = null) {
+		$info = empty($info) && $object instanceof $this->interface ? $object->name : $info;
+		return parent::set_info($object, $info);
 	}
 
 
@@ -74,8 +74,8 @@ 
 	 * @param mixed
 	 * @return null | object
 	 */
-	public function get_by_info( $info ) {
-		return parent::get_by_info( str_replace( ' ', '_', strtolower( $info ) ) );
+	public function get_by_info($info) {
+		return parent::get_by_info(str_replace(' ', '_', strtolower($info)));
 	}
 
 
@@ -89,8 +89,8 @@ 
 	 * @param object $object
 	 * @return bool
 	 */
-	public function has( $object ) {
-		return parent::has( $object );
+	public function has($object) {
+		return parent::has($object);
 	}
 
 
@@ -104,8 +104,8 @@ 
 	 * @param string $message_type_name
 	 * @return bool
 	 */
-	public function has_by_name( $message_type_name ) {
-		return $this->get_by_info( $message_type_name ) instanceof $this->interface ? true : false;
+	public function has_by_name($message_type_name) {
+		return $this->get_by_info($message_type_name) instanceof $this->interface ? true : false;
 	}
 
 
@@ -119,8 +119,8 @@ 
 	 * @param $object
 	 * @return bool
 	 */
-	public function remove( $object ) {
-		return parent::remove( $object );
+	public function remove($object) {
+		return parent::remove($object);
 	}
 
 
@@ -134,8 +134,8 @@ 
 	 * @param $object
 	 * @return void
 	 */
-	public function set_current( $object ) {
-		parent::set_current( $object );
+	public function set_current($object) {
+		parent::set_current($object);
 	}
 
 
@@ -149,8 +149,8 @@ 
 	 * @param $info
 	 * @return void
 	 */
-	public function set_current_by_info( $info ) {
-		parent::set_current_by_info( $info );
+	public function set_current_by_info($info) {
+		parent::set_current_by_info($info);
 	}
 
 
@@ -164,10 +164,10 @@ 
 	 * @return void
 	 */
 	public function show_collection_classes() {
-		if ( WP_DEBUG ) {
+		if (WP_DEBUG) {
 			$this->rewind();
-			while ( $this->valid() ) {
-				echo '<h5 style="color:#2EA2CC;">' . __CLASS__ . ' class : <span style="color:#E76700">' . $this->getInfo() . '</span></h5>';
+			while ($this->valid()) {
+				echo '<h5 style="color:#2EA2CC;">'.__CLASS__.' class : <span style="color:#E76700">'.$this->getInfo().'</span></h5>';
 				$this->next();
 			}
 		}

core/libraries/messages/EE_Messenger_Collection.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');
 }
 
 
@@ -39,9 +39,9 @@ 
 	 * @param mixed  $info
 	 * @return bool
 	 */
-	public function add( $object, $info = null ) {
-		$info = empty( $info ) && $object instanceof $this->interface ? $object->name : $info;
-		return parent::add( $object, $info );
+	public function add($object, $info = null) {
+		$info = empty($info) && $object instanceof $this->interface ? $object->name : $info;
+		return parent::add($object, $info);
 	}
 
 
@@ -57,9 +57,9 @@ 
 	 * @param mixed  $info
 	 * @return bool
 	 */
-	public function set_info( $object, $info = null ) {
-		$info = empty( $info ) && $object instanceof $this->interface ? $object->name : $info;
-		return parent::set_info( $object, $info );
+	public function set_info($object, $info = null) {
+		$info = empty($info) && $object instanceof $this->interface ? $object->name : $info;
+		return parent::set_info($object, $info);
 	}
 
 
@@ -74,8 +74,8 @@ 
 	 * @param mixed
 	 * @return null | object
 	 */
-	public function get_by_info( $info ) {
-		return parent::get_by_info( str_replace( ' ', '_', strtolower( $info ) ) );
+	public function get_by_info($info) {
+		return parent::get_by_info(str_replace(' ', '_', strtolower($info)));
 	}
 
 
@@ -89,8 +89,8 @@ 
 	 * @param object $object
 	 * @return bool
 	 */
-	public function has( $object ) {
-		return parent::has( $object );
+	public function has($object) {
+		return parent::has($object);
 	}
 
 
@@ -104,8 +104,8 @@ 
 	 * @param string $messenger_name
 	 * @return bool
 	 */
-	public function has_by_name( $messenger_name ) {
-		return $this->get_by_info( $messenger_name ) instanceof $this->interface ? true : false;
+	public function has_by_name($messenger_name) {
+		return $this->get_by_info($messenger_name) instanceof $this->interface ? true : false;
 	}
 
 
@@ -119,8 +119,8 @@ 
 	 * @param $object
 	 * @return bool
 	 */
-	public function remove( $object ) {
-		return parent::remove( $object );
+	public function remove($object) {
+		return parent::remove($object);
 	}
 
 
@@ -148,8 +148,8 @@ 
 	 * @param $object
 	 * @return void
 	 */
-	public function set_current( $object ) {
-		parent::set_current( $object );
+	public function set_current($object) {
+		parent::set_current($object);
 	}
 
 
@@ -163,8 +163,8 @@ 
 	 * @param $info
 	 * @return void
 	 */
-	public function set_current_by_info( $info ) {
-		parent::set_current_by_info( $info );
+	public function set_current_by_info($info) {
+		parent::set_current_by_info($info);
 	}
 
 
@@ -178,10 +178,10 @@ 
 	 * @return void
 	 */
 	public function show_collection_classes() {
-		if ( WP_DEBUG ) {
+		if (WP_DEBUG) {
 			$this->rewind();
-			while ( $this->valid() ) {
-				echo '<h5 style="color:#2EA2CC;">' . __CLASS__ . ' class : . <span style="color:#E76700">' . $this->getInfo() . '</span></h5>';
+			while ($this->valid()) {
+				echo '<h5 style="color:#2EA2CC;">'.__CLASS__.' class : . <span style="color:#E76700">'.$this->getInfo().'</span></h5>';
 				$this->next();
 			}
 		}

public/Espresso_Arabica_2014/content-espresso_events-venues.php

Braces +10 added lines, -4 removed lines

@@ -40,8 +40,11 @@ 
 		<?php echo do_shortcode( $venue_description ); ?>
 	</p>
 		<?php endif;  ?>
-	<?php else : ?>
-		<?php $venue_excerpt = espresso_venue_excerpt( $VNU_ID, FALSE ); ?>
+	<?php else {
+	: ?>
+		<?php $venue_excerpt = espresso_venue_excerpt( $VNU_ID, FALSE );
+}
+?>
 		<?php if ( $venue_excerpt ) : ?>
 	<p>
 		<strong><?php _e( 'Description:', 'event_espresso' ); ?></strong><br/>
@@ -53,12 +56,15 @@ 
 <!-- .espresso-venue-dv -->
 <?php
 do_action( 'AHEE_event_details_after_venue_details', $post );
-else :
+else {
+	:
 	if ( espresso_venue_is_password_protected() ) :
 ?>
 	<div class="espresso-venue-dv  espresso-password-protected-venue-dv" >
 		<h3 class="event-venues-h3 ee-event-h3">
-			<?php _e( 'Location', 'event_espresso' );?>
+			<?php _e( 'Location', 'event_espresso' );
+}
+?>
 		</h3>
 		<?php echo espresso_password_protected_venue_form(); ?>
 	</div>

Spacing +33 added lines, -33 removed lines

@@ -1,69 +1,69 @@
 <?php
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
 if (
-	( is_single() && espresso_display_venue_in_event_details() )
-	|| ( is_archive() && espresso_display_venue_in_event_list() )
+	(is_single() && espresso_display_venue_in_event_details())
+	|| (is_archive() && espresso_display_venue_in_event_list())
 ) :
 	global $post;
-	do_action( 'AHEE_event_details_before_venue_details', $post );
-	$venue_name = espresso_venue_name( 0, 'details', FALSE );
-	if ( empty( $venue_name ) && espresso_is_venue_private() ) {
-		do_action( 'AHEE_event_details_after_venue_details', $post );
+	do_action('AHEE_event_details_before_venue_details', $post);
+	$venue_name = espresso_venue_name(0, 'details', FALSE);
+	if (empty($venue_name) && espresso_is_venue_private()) {
+		do_action('AHEE_event_details_after_venue_details', $post);
 		return '';
 	}
 ?>
 
 <div class="espresso-venue-dv<?php echo espresso_is_venue_private() ? ' espresso-private-venue-dv' : ''; ?>">
 	<h3 class="event-venues-h3 ee-event-h3">
-		<?php _e( 'Location', 'event_espresso' ); ?>
+		<?php _e('Location', 'event_espresso'); ?>
 	</h3>
-	<h4><strong><?php _e( 'Venue:', 'event_espresso' ); ?></strong>&nbsp;&nbsp; <strong> <?php echo $venue_name; ?></strong></h4>
+	<h4><strong><?php _e('Venue:', 'event_espresso'); ?></strong>&nbsp;&nbsp; <strong> <?php echo $venue_name; ?></strong></h4>
 	<p><span class="smaller-text tags-links"><?php echo espresso_venue_categories(); ?></span></p>
-<?php  if ( $venue_phone = espresso_venue_phone( $post->ID, FALSE )) : ?>
+<?php  if ($venue_phone = espresso_venue_phone($post->ID, FALSE)) : ?>
 	<p>
-		<span class="small-text"><strong><?php _e( 'Venue Phone:', 'event_espresso' ); ?></strong></span> <?php echo $venue_phone; ?>
+		<span class="small-text"><strong><?php _e('Venue Phone:', 'event_espresso'); ?></strong></span> <?php echo $venue_phone; ?>
 	</p>
-<?php endif;  ?>
-<?php if ( $venue_website = espresso_venue_website( $post->ID, FALSE )) : ?>
+<?php endif; ?>
+<?php if ($venue_website = espresso_venue_website($post->ID, FALSE)) : ?>
 	<p>
-		<span class="small-text"><strong><?php _e( 'Venue Website:', 'event_espresso' ); ?></strong></span> <?php echo $venue_website; ?>
+		<span class="small-text"><strong><?php _e('Venue Website:', 'event_espresso'); ?></strong></span> <?php echo $venue_website; ?>
 	</p>
 <?php endif; ?>
-<?php  if ( espresso_venue_has_address( $post->ID )) : ?>
-	<strong><span class="dashicons dashicons-location-alt"></span><?php _e( 'Address:', 'event_espresso' ); ?></strong>
-	<?php espresso_venue_address( 'inline' ); ?>
-	<?php espresso_venue_gmap( $post->ID ); ?>
+<?php  if (espresso_venue_has_address($post->ID)) : ?>
+	<strong><span class="dashicons dashicons-location-alt"></span><?php _e('Address:', 'event_espresso'); ?></strong>
+	<?php espresso_venue_address('inline'); ?>
+	<?php espresso_venue_gmap($post->ID); ?>
 	<div class="clear"><br/></div>
-<?php endif;  ?>
+<?php endif; ?>
 
-	<?php $VNU_ID = espresso_venue_id( $post->ID ); ?>
-	<?php if ( is_single() ) : ?>
-		<?php $venue_description = espresso_venue_description( $VNU_ID, FALSE ); ?>
-		<?php if ( $venue_description ) : ?>
+	<?php $VNU_ID = espresso_venue_id($post->ID); ?>
+	<?php if (is_single()) : ?>
+		<?php $venue_description = espresso_venue_description($VNU_ID, FALSE); ?>
+		<?php if ($venue_description) : ?>
 	<p>
-		<strong><?php _e( 'Description:', 'event_espresso' ); ?></strong><br/>
-		<?php echo do_shortcode( $venue_description ); ?>
+		<strong><?php _e('Description:', 'event_espresso'); ?></strong><br/>
+		<?php echo do_shortcode($venue_description); ?>
 	</p>
-		<?php endif;  ?>
+		<?php endif; ?>
 	<?php else : ?>
-		<?php $venue_excerpt = espresso_venue_excerpt( $VNU_ID, FALSE ); ?>
-		<?php if ( $venue_excerpt ) : ?>
+		<?php $venue_excerpt = espresso_venue_excerpt($VNU_ID, FALSE); ?>
+		<?php if ($venue_excerpt) : ?>
 	<p>
-		<strong><?php _e( 'Description:', 'event_espresso' ); ?></strong><br/>
+		<strong><?php _e('Description:', 'event_espresso'); ?></strong><br/>
 		<?php echo $venue_excerpt; ?>
 	</p>
-			<?php endif;  ?>
-		<?php endif;  ?>
+			<?php endif; ?>
+		<?php endif; ?>
 </div>
 <!-- .espresso-venue-dv -->
 <?php
-do_action( 'AHEE_event_details_after_venue_details', $post );
+do_action('AHEE_event_details_after_venue_details', $post);
 else :
-	if ( espresso_venue_is_password_protected() ) :
+	if (espresso_venue_is_password_protected()) :
 ?>
 	<div class="espresso-venue-dv  espresso-password-protected-venue-dv" >
 		<h3 class="event-venues-h3 ee-event-h3">
-			<?php _e( 'Location', 'event_espresso' );?>
+			<?php _e('Location', 'event_espresso'); ?>
 		</h3>
 		<?php echo espresso_password_protected_venue_form(); ?>
 	</div>

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

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -24,18 +24,18 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Year_Input extends EE_Select_Input{
+class EE_Year_Input extends EE_Select_Input {
 
-	function __construct( $input_settings = array(), $four_digit_year = true, $years_behind = 100, $years_ahead = 0 ){
-		if($four_digit_year){
+	function __construct($input_settings = array(), $four_digit_year = true, $years_behind = 100, $years_ahead = 0) {
+		if ($four_digit_year) {
 			$current_year_int = intval(date('Y'));
-		}else{
+		} else {
 			$current_year_int = intval(date('y'));
 		}
 		$answer_options = array();
-		for( $start = $current_year_int - $years_behind; $start <= ($current_year_int + $years_ahead); $start++){
+		for ($start = $current_year_int - $years_behind; $start <= ($current_year_int + $years_ahead); $start++) {
 			$answer_options[$start] = $start;
 		}
-		parent::__construct( $answer_options, $input_settings );
+		parent::__construct($answer_options, $input_settings);
 	}
 }

Braces +3 added lines, -2 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -29,7 +30,7 @@ 
 	function __construct( $input_settings = array(), $four_digit_year = true, $years_behind = 100, $years_ahead = 0 ){
 		if($four_digit_year){
 			$current_year_int = intval(date('Y'));
-		}else{
+		} else{
 			$current_year_int = intval(date('y'));
 		}
 		$answer_options = array();

admin_pages/messages/qtips/EE_Message_List_Table_Tips.lib.php

Spacing +24 added lines, -24 removed lines

@@ -18,9 +18,9 @@ 
 	protected function _set_tips_array() {
 		$this->_qtipsa = array(
 			0 => array(
-				'content_id' => 'message_status-' . EEM_Message::status_sent,
-				'target' => '.msg-status-' . EEM_Message::status_sent,
-				'content' => $this->_message_status_legend( EEM_Message::status_sent ),
+				'content_id' => 'message_status-'.EEM_Message::status_sent,
+				'target' => '.msg-status-'.EEM_Message::status_sent,
+				'content' => $this->_message_status_legend(EEM_Message::status_sent),
 				'options' => array(
 					'position' => array(
 						'target' => 'mouse',
@@ -28,9 +28,9 @@ 
 					)
 				),
 			1 => array(
-				'content_id' => 'message_status-' . EEM_Message::status_idle,
-				'target' => '.msg-status-' . EEM_Message::status_idle,
-				'content' => $this->_message_status_legend( EEM_Message::status_idle ),
+				'content_id' => 'message_status-'.EEM_Message::status_idle,
+				'target' => '.msg-status-'.EEM_Message::status_idle,
+				'content' => $this->_message_status_legend(EEM_Message::status_idle),
 				'options' => array(
 					'position' => array(
 						'target' => 'mouse',
@@ -38,9 +38,9 @@ 
 					)
 				),
 			2 => array(
-				'content_id' => 'message_status-' . EEM_Message::status_failed,
-				'target' => '.msg-status-' . EEM_Message::status_failed,
-				'content' => $this->_message_status_legend( EEM_Message::status_failed ),
+				'content_id' => 'message_status-'.EEM_Message::status_failed,
+				'target' => '.msg-status-'.EEM_Message::status_failed,
+				'content' => $this->_message_status_legend(EEM_Message::status_failed),
 				'options' => array(
 					'position' => array(
 						'target' => 'mouse',
@@ -48,9 +48,9 @@ 
 					)
 				),
 			3 => array(
-				'content_id' => 'message_status-' . EEM_Message::status_resend,
-				'target' => '.msg-status-' . EEM_Message::status_resend,
-				'content' => $this->_message_status_legend( EEM_Message::status_resend ),
+				'content_id' => 'message_status-'.EEM_Message::status_resend,
+				'target' => '.msg-status-'.EEM_Message::status_resend,
+				'content' => $this->_message_status_legend(EEM_Message::status_resend),
 				'options' => array(
 					'position' => array(
 						'target' => 'mouse',
@@ -58,9 +58,9 @@ 
 					)
 				),
 			4 => array(
-				'content_id' => 'message_status-' . EEM_Message::status_incomplete,
-				'target' => '.msg-status-' . EEM_Message::status_incomplete,
-				'content' => $this->_message_status_legend( EEM_Message::status_incomplete ),
+				'content_id' => 'message_status-'.EEM_Message::status_incomplete,
+				'target' => '.msg-status-'.EEM_Message::status_incomplete,
+				'content' => $this->_message_status_legend(EEM_Message::status_incomplete),
 				'options' => array(
 					'position' => array(
 						'target' => 'mouse',
@@ -68,9 +68,9 @@ 
 					)
 				),
 			5 => array(
-				'content_id' => 'message_status-' . EEM_Message::status_retry,
-				'target' => '.msg-status-' . EEM_Message::status_retry,
-				'content' => $this->_message_status_legend( EEM_Message::status_retry ),
+				'content_id' => 'message_status-'.EEM_Message::status_retry,
+				'target' => '.msg-status-'.EEM_Message::status_retry,
+				'content' => $this->_message_status_legend(EEM_Message::status_retry),
 				'options' => array(
 					'position' => array(
 						'target' => 'mouse',
@@ -78,9 +78,9 @@ 
 					)
 				),
 			6 => array(
-				'content_id' => 'message_status-' . EEM_Message::status_debug_only,
-				'target' => '.msg-status-' . EEM_Message::status_debug_only,
-				'content' => $this->_message_status_legend( EEM_Message::status_debug_only ),
+				'content_id' => 'message_status-'.EEM_Message::status_debug_only,
+				'target' => '.msg-status-'.EEM_Message::status_debug_only,
+				'content' => $this->_message_status_legend(EEM_Message::status_debug_only),
 				'options' => array(
 					'position' => array(
 						'target' => 'mouse',
@@ -99,7 +99,7 @@ 
 	 * @param  EEM_Message constant $status What status is set (by class)
 	 * @return string         The status legend with the related status highlighted
 	 */
-	private function _message_status_legend( $status ) {
+	private function _message_status_legend($status) {
 
 		$status_array = array(
 			'sent_status' => EEM_Message::status_sent,
@@ -110,10 +110,10 @@ 
 			'retry_status' => EEM_Message::status_retry,
 			);
 
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+		if (defined('WP_DEBUG') && WP_DEBUG) {
 			$status_array['debug_only_status'] = EEM_Message::status_debug_only;
 		}
 
-		return EEH_Template::status_legend( $status_array, $status );
+		return EEH_Template::status_legend($status_array, $status);
 	}
 }
\ No newline at end of file

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

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
  *
  * This input has a default validation strategy of plaintext (which can be removed after construction)
  */
-class EE_Text_Area_Input extends EE_Form_Input_Base{
+class EE_Text_Area_Input extends EE_Form_Input_Base {
 
 
 	protected $_rows = 2;
@@ -18,28 +18,28 @@ 
 	 * sets the rows property on this input
 	 * @param int $rows
 	 */
-	public function set_rows( $rows ) {
+	public function set_rows($rows) {
 		$this->_rows = $rows;
 	}
 	/**
 	 * sets the cols html property on this input
 	 * @param int $cols
 	 */
-	public function set_cols( $cols ) {
+	public function set_cols($cols) {
 		$this->_cols = $cols;
 	}
 	/**
 	 *
 	 * @return int
 	 */
-	public function get_rows(){
+	public function get_rows() {
 		return $this->_rows;
 	}
 	/**
 	 *
 	 * @return int
 	 */
-	public function get_cols(){
+	public function get_cols() {
 		return $this->_cols;
 	}
 
@@ -57,7 +57,7 @@ 
 		
 		//if the input hasn't specifically mentioned a more lenient validation strategy, 
 		//apply plaintext validation strategy
-		if( ! $this->has_validation_strategy( 
+		if ( ! $this->has_validation_strategy( 
 				array(
 					'EE_Full_HTML_Validation_Strategy',
 					'EE_Simple_HTML_Validation_Strategy'
@@ -66,7 +66,7 @@ 
 		) {
 			//by default we use the plaintext validation. If you want something else,
 			//just remove it after the input is constructed :P using EE_Form_Input_Base::remove_validation_strategy()
-			$this->_add_validation_strategy( new EE_Plaintext_Validation_Strategy() );
+			$this->_add_validation_strategy(new EE_Plaintext_Validation_Strategy());
 		}
 	}
 }

admin_pages/registration_form/help_tabs/registration_form_reg_form_settings.help_tab.php

Spacing +3 added lines, -3 removed lines

@@ -3,15 +3,15 @@
 <?php _e('This page shows options for Email Validation, the EE "Bot Trap" and reCAPTCHA which can help prevent SPAM registrations on your site.', 'event_espresso'); ?>
 </p>
 <div id="email_validation_info">
-<p><strong><?php _e('Email Validation', 'event_espresso');?></strong></p>
+<p><strong><?php _e('Email Validation', 'event_espresso'); ?></strong></p>
 <p><?php _e("Validating an email address is extremely difficult to do correctly. Your server's configuration, as well as your own tolerances and needs, can affect the type of validation needed. We offer different types of validation so that you can control how strict your registration form responds to entered email addresses. If you are receiving too many bogus email addresses, then you can try the WordPress Default validation setting. If you find that the form validation is blocking a valid email address you can try the Basic setting, or if available, the International validation settings.", 'event_espresso'); ?>
 </p>
-<p><strong><?php _e('Validation Options:', 'event_espresso' );?></strong></p>
+<p><strong><?php _e('Validation Options:', 'event_espresso'); ?></strong></p>
 <ul>
 <li>
 	<?php _e('"Basic" - only checks that an email address follows the most basic structure guidelines ( ie: text@text.text ). Will work with the widest range of email addresses but will also allow the most garbage through.', 'event_espresso'); ?></li>
 <li>
-	<?php _e('"WordPress Default" - uses built in WordPress email validation, but does not support unicode characters (ie: international characters from non-latin based languages).','event_espresso'); ?></li>
+	<?php _e('"WordPress Default" - uses built in WordPress email validation, but does not support unicode characters (ie: international characters from non-latin based languages).', 'event_espresso'); ?></li>
 <li>
 	<?php _e('"International" - supports unicode characters but may not be supported by all server configurations. Try this first if you need to international language support, but drop back down to "Basic" if your server configuration conflicts.', 'event_espresso'); ?>
 </li>

core/middleware/EE_Middleware.core.php

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
 	 * @access 	public
 	 * @param 	\EEI_Request_Decorator $request_stack
 	 */
-	public function __construct( EEI_Request_Decorator $request_stack ) {
+	public function __construct(EEI_Request_Decorator $request_stack) {
 		$this->_request_stack = $request_stack;
 	}
 
@@ -57,11 +57,11 @@ 
 	 * @param 	EE_Response $response
 	 * @return 	EE_Response
 	 */
-	protected function process_request_stack( EE_Request $request, EE_Response $response ) {
+	protected function process_request_stack(EE_Request $request, EE_Response $response) {
 		$this->_request = $request;
 		$this->_response = $response;
-		if ( ! $this->_response->request_terminated() ) {
-			$this->_response = $this->_request_stack->handle_request( $this->_request, $this->_response );
+		if ( ! $this->_response->request_terminated()) {
+			$this->_response = $this->_request_stack->handle_request($this->_request, $this->_response);
 		}
 		return $this->_response;
 	}