eventespresso / event-espresso-core

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

Spacing +6 added lines, -6 removed lines

@@ -1,4 +1,4 @@ 
-<?php  if ( ! defined( 'EVENT_ESPRESSO_VERSION' )) { exit( 'No direct script access allowed' ); }
+<?php  if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 /**
  * Class EE_Select_Input
  *
@@ -10,22 +10,22 @@ 
  * @since 				4.6
  *
  */
-class EE_Select_Input extends EE_Form_Input_With_Options_Base{
+class EE_Select_Input extends EE_Form_Input_With_Options_Base {
 
 	/**
 	 * @param array $answer_options
 	 * @param array $input_settings
 	 */
-	public function __construct( $answer_options, $input_settings = array() ) {
-		$this->_set_display_strategy( new EE_Select_Display_Strategy( $answer_options ) );
+	public function __construct($answer_options, $input_settings = array()) {
+		$this->_set_display_strategy(new EE_Select_Display_Strategy($answer_options));
 		$this->_add_validation_strategy(
 			new EE_Enum_Validation_Strategy(
-				isset( $input_settings['validation_error_message'] )
+				isset($input_settings['validation_error_message'])
 					? $input_settings['validation_error_message']
 					: null
 			)
 		);
-		parent::__construct( $answer_options, $input_settings );
+		parent::__construct($answer_options, $input_settings);
 	}
 
 }
\ No newline at end of file

core/libraries/form_sections/strategies/validation/EE_Required_Validation_Strategy.strategy.php

Spacing +8 added lines, -8 removed lines

@@ -8,18 +8,18 @@ 
  * @since 				4.6
  *
  */
-class EE_Required_Validation_Strategy extends EE_Validation_Strategy_Base{
+class EE_Required_Validation_Strategy extends EE_Validation_Strategy_Base {
 
 
 
 	/**
 	 * @param string $validation_error_message
 	 */
-	public function __construct( $validation_error_message = null ) {
-		if( ! $validation_error_message ){
+	public function __construct($validation_error_message = null) {
+		if ( ! $validation_error_message) {
 			$validation_error_message = __("This field is required.", "event_espresso");
 		}
-		parent::__construct( $validation_error_message );
+		parent::__construct($validation_error_message);
 	}
 
 
@@ -34,13 +34,13 @@ 
 	 * @throws \EE_Validation_Error
 	 */
 	public function validate($normalized_value) {
-		if(
+		if (
 			$normalized_value === ''
 			|| $normalized_value === null
 			|| $normalized_value === array()
 		) {
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'required');
-		}else{
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'required');
+		} else {
 			return true;
 		}
 	}
@@ -51,7 +51,7 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public function get_jquery_validation_rule_array(){
+	public function get_jquery_validation_rule_array() {
 		return array(
 			'required'=> true,
 			'messages' => array(

Braces +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 			|| $normalized_value === array()
 		) {
 			throw new EE_Validation_Error( $this->get_validation_error_message(), 'required');
-		}else{
+		} else{
 			return true;
 		}
 	}

caffeinated/admin/new/pricing/templates/event_tickets_datetime_edit_row.template.php

Spacing +2 added lines, -2 removed lines

@@ -41,8 +41,8 @@
 		</div>
 		<span data-context="datetime" data-datetime-row="<?php echo $dtt_row; ?>" class="<?php echo $clone_icon; ?> clickable"></span>
 		<span data-context="datetime" data-datetime-row="<?php echo $dtt_row; ?>" class="<?php echo $trash_icon; ?> clickable"<?php echo $show_trash; ?>></span>
-		<?php if ( $reg_list_url !== '' ) : ?>
-		<a href="<?php echo $reg_list_url; ?>" title="<?php _e( 'View registrations for this datetime.', 'event_espresso' );?>" style="text-decoration: none;">
+		<?php if ($reg_list_url !== '') : ?>
+		<a href="<?php echo $reg_list_url; ?>" title="<?php _e('View registrations for this datetime.', 'event_espresso'); ?>" style="text-decoration: none;">
 			<span data-context="datetime" data-datetime-row="<?php echo $dtt_row; ?>" class="dashicons dashicons-groups clickable"></span>
 		</a>
 		<?php endif; ?>

core/libraries/form_sections/strategies/validation/EE_Simple_HTML_Validation_Strategy.strategy.php

Spacing +11 added lines, -11 removed lines

@@ -10,17 +10,17 @@ 
  * @since 				4.6
  *
  */
-class EE_Simple_HTML_Validation_Strategy extends EE_Validation_Strategy_Base{
+class EE_Simple_HTML_Validation_Strategy extends EE_Validation_Strategy_Base {
 
 	/**
 	 * @param null $validation_error_message
 	 */
-	public function __construct( $validation_error_message = NULL ) {
-		if( ! $validation_error_message ){
+	public function __construct($validation_error_message = NULL) {
+		if ( ! $validation_error_message) {
 			$allowedtags = $this->_get_allowed_tags();
-			$validation_error_message = sprintf( __( "Only simple HTML tags are allowed. Eg, %s", "event_espresso" ), implode( ",", array_keys( $allowedtags ) ) );
+			$validation_error_message = sprintf(__("Only simple HTML tags are allowed. Eg, %s", "event_espresso"), implode(",", array_keys($allowedtags)));
 		}
-		parent::__construct( $validation_error_message );
+		parent::__construct($validation_error_message);
 	}
 
 
@@ -43,8 +43,8 @@ 
 	 */
 	public function get_list_of_allowed_tags() {
 		$allowed_tags = $this->_get_allowed_tags();
-		ksort( $allowed_tags );
-		return implode( ', ', array_keys( $allowed_tags ) );
+		ksort($allowed_tags);
+		return implode(', ', array_keys($allowed_tags));
 	}
 
 
@@ -55,10 +55,10 @@ 
 	 */
 	public function validate($normalized_value) {
 		$allowedtags = $this->_get_allowed_tags();
-		parent::validate( $normalized_value );
-		$normalized_value_sans_tags =  wp_kses( "$normalized_value",$allowedtags );
-		if ( strlen( $normalized_value ) > strlen( $normalized_value_sans_tags ) ) {
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'complex_html_tags' );
+		parent::validate($normalized_value);
+		$normalized_value_sans_tags = wp_kses("$normalized_value", $allowedtags);
+		if (strlen($normalized_value) > strlen($normalized_value_sans_tags)) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'complex_html_tags');
 		}
 	}
 }
\ No newline at end of file

core/libraries/form_sections/payment_methods/EE_Billing_Attendee_Info_Form.form.php

Spacing +51 added lines, -51 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');
 }
 
 /**
@@ -14,31 +14,31 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_Billing_Attendee_Info_Form extends EE_Billing_Info_Form{
+class EE_Billing_Attendee_Info_Form extends EE_Billing_Info_Form {
 
 	/**
 	 *
 	 * @param EE_Payment_Method $payment_method
 	 * @param array $options_array @see EE_Form_Section_Proper::__construct()
 	 */
-	public function __construct( EE_Payment_Method $payment_method, $options_array= array()){
+	public function __construct(EE_Payment_Method $payment_method, $options_array = array()) {
 		$options_array['subsections'] = array_merge(
 			array(
-				'first_name' 	=> new EE_Text_Input( array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-fname', 'html_label_text' => __( 'First Name', 'event_espresso' ) ) ),
-				'last_name'		=> new EE_Text_Input( array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-lname', 'html_label_text' => __( 'Last Name', 'event_espresso' ) ) ),
-				'email'				=> new EE_Email_Input( array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-email', 'html_label_text' => __( 'Email', 'event_espresso' ) ) ),
-				'address'			=> new EE_Text_Input( array( 'html_label_text'=>  __( 'Address', 'event_espresso'), 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-address' )),
-				'address2'		=> new EE_Text_Input( array( 'html_label_text'=> __( 'Address 2', 'event_espresso'), 'html_class' => 'ee-billing-qstn ee-billing-qstn-address2' )),
-				'city'					=> new EE_Text_Input( array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-city', 'html_label_text' => __( 'City', 'event_espresso' ) ) ),
-				'state' 				=> apply_filters( 'FHEE__EE_Billing_Attendee_Info_Form__state_field', new EE_State_Select_Input( NULL, array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-state', 'html_label_text' => __( 'State', 'event_espresso' ) ) ) ),
-				'country' 			=> apply_filters( 'FHEE__EE_Billing_Attendee_Info_Form__country_field', new EE_Country_Select_Input( NULL, array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-country', 'html_label_text' => __( 'Country', 'event_espresso' ) ) ) ),
-				'zip'					=> new EE_Text_Input( array( 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-zip', 'html_label_text' => __( 'Zip', 'event_espresso' ) ) ),
-				'phone'			=> new EE_Text_Input( array( 'html_class' => 'ee-billing-qstn ee-billing-qstn-phone', 'html_label_text' => __( 'Phone', 'event_espresso' ) )),
+				'first_name' 	=> new EE_Text_Input(array('required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-fname', 'html_label_text' => __('First Name', 'event_espresso'))),
+				'last_name'		=> new EE_Text_Input(array('required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-lname', 'html_label_text' => __('Last Name', 'event_espresso'))),
+				'email'				=> new EE_Email_Input(array('required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-email', 'html_label_text' => __('Email', 'event_espresso'))),
+				'address'			=> new EE_Text_Input(array('html_label_text'=>  __('Address', 'event_espresso'), 'required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-address')),
+				'address2'		=> new EE_Text_Input(array('html_label_text'=> __('Address 2', 'event_espresso'), 'html_class' => 'ee-billing-qstn ee-billing-qstn-address2')),
+				'city'					=> new EE_Text_Input(array('required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-city', 'html_label_text' => __('City', 'event_espresso'))),
+				'state' 				=> apply_filters('FHEE__EE_Billing_Attendee_Info_Form__state_field', new EE_State_Select_Input(NULL, array('required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-state', 'html_label_text' => __('State', 'event_espresso')))),
+				'country' 			=> apply_filters('FHEE__EE_Billing_Attendee_Info_Form__country_field', new EE_Country_Select_Input(NULL, array('required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-country', 'html_label_text' => __('Country', 'event_espresso')))),
+				'zip'					=> new EE_Text_Input(array('required'=>TRUE, 'html_class' => 'ee-billing-qstn ee-billing-qstn-zip', 'html_label_text' => __('Zip', 'event_espresso'))),
+				'phone'			=> new EE_Text_Input(array('html_class' => 'ee-billing-qstn ee-billing-qstn-phone', 'html_label_text' => __('Phone', 'event_espresso'))),
 			),
-			isset( $options_array['subsections'] ) ? $options_array['subsections'] : array()
+			isset($options_array['subsections']) ? $options_array['subsections'] : array()
 		);
 
-		parent::__construct( $payment_method, $options_array );
+		parent::__construct($payment_method, $options_array);
 
 	}
 
@@ -46,11 +46,11 @@ 
 	 * Sets the defaults for the billing form according to the attendee's details
 	 * @param EE_Attendee $attendee
 	 */
-	public function populate_from_attendee( $attendee ){
+	public function populate_from_attendee($attendee) {
 		$attendee = EEM_Attendee::instance()->ensure_is_obj($attendee);
 		/** @var $attendee EE_Attendee */
 		$this->populate_defaults( 
-			apply_filters( 'FHEE__EE_Billing_Attendee_Info_Form__populate_from_attendee',
+			apply_filters('FHEE__EE_Billing_Attendee_Info_Form__populate_from_attendee',
 				array(
 					'first_name'=>$attendee->fname(),
 					'last_name'=>$attendee->lname(),
@@ -78,48 +78,48 @@ 
 	 * @param \EE_Attendee $attendee - the attendee object to copy details to
 	 * @return \EE_Attendee
 	 */
-	public function copy_billing_form_data_to_attendee( EE_Attendee $attendee ){
+	public function copy_billing_form_data_to_attendee(EE_Attendee $attendee) {
 		// grab billing form data
 		$data = $this->valid_data();
 		// copy first_name
-		if ( ! empty( $data['first_name'] )) {
-			$attendee->set_fname( $data['first_name'] );
+		if ( ! empty($data['first_name'])) {
+			$attendee->set_fname($data['first_name']);
 		}
 		// copy last_name
-		if ( ! empty( $data['last_name'] )) {
-			$attendee->set_lname( $data['last_name'] );
+		if ( ! empty($data['last_name'])) {
+			$attendee->set_lname($data['last_name']);
 		}
 		// copy email
-		if ( ! empty( $data['email'] )) {
-			$attendee->set_email( $data['email'] );
+		if ( ! empty($data['email'])) {
+			$attendee->set_email($data['email']);
 		}
 		// copy address
-		if ( ! empty( $data['address'] )) {
-			$attendee->set_address( $data['address'] );
+		if ( ! empty($data['address'])) {
+			$attendee->set_address($data['address']);
 		}
 		// copy address2
-		if ( ! empty( $data['address2'] )) {
-			$attendee->set_address2( $data['address2'] );
+		if ( ! empty($data['address2'])) {
+			$attendee->set_address2($data['address2']);
 		}
 		// copy city
-		if ( ! empty( $data['city'] )) {
-			$attendee->set_city( $data['city'] );
+		if ( ! empty($data['city'])) {
+			$attendee->set_city($data['city']);
 		}
 		// copy state
-		if ( ! empty( $data['state'] )) {
-			$attendee->set_state( $data['state'] );
+		if ( ! empty($data['state'])) {
+			$attendee->set_state($data['state']);
 		}
 		// copy country
-		if ( ! empty( $data['country'] )) {
-			$attendee->set_country( $data['country'] );
+		if ( ! empty($data['country'])) {
+			$attendee->set_country($data['country']);
 		}
 		// copy zip
-		if ( ! empty( $data['zip'] )) {
-			$attendee->set_zip( $data['zip'] );
+		if ( ! empty($data['zip'])) {
+			$attendee->set_zip($data['zip']);
 		}
 		// copy phone
-		if ( ! empty( $data['phone'] )) {
-			$attendee->set_phone( $data['phone'] );
+		if ( ! empty($data['phone'])) {
+			$attendee->set_phone($data['phone']);
 		}
 		return $attendee;
 	}
@@ -130,20 +130,20 @@ 
 	 * uses info from the billing form to create a new attendee
 	 * @return \EE_Attendee
 	 */
-	public function create_attendee_from_billing_form_data(){
+	public function create_attendee_from_billing_form_data() {
 		// grab billing form data
 		$data = $this->valid_data();
-		return EE_Attendee::new_instance( array(
-			'ATT_fname' 		=> ! empty( $data['first_name'] ) ? $data['first_name'] : '',
-			'ATT_lname' 		=> ! empty( $data['last_name'] ) ? $data['last_name'] : '',
-			'ATT_email' 		=> ! empty( $data['email'] ) ? $data['email'] : '',
-			'ATT_address' 		=> ! empty( $data['address'] ) ? $data['address'] : '',
-			'ATT_address2' 	=> ! empty( $data['address2'] ) ? $data['address2'] : '',
-			'ATT_city' 			=> ! empty( $data['city'] ) ? $data['city'] : '',
-			'STA_ID' 				=> ! empty( $data['state'] ) ? $data['state'] : '',
-			'CNT_ISO' 			=> ! empty( $data['country'] ) ? $data['country'] : '',
-			'ATT_zip' 				=> ! empty( $data['zip'] ) ? $data['zip'] : '',
-			'ATT_phone' 		=> ! empty( $data['phone'] ) ? $data['phone'] : '',
+		return EE_Attendee::new_instance(array(
+			'ATT_fname' 		=> ! empty($data['first_name']) ? $data['first_name'] : '',
+			'ATT_lname' 		=> ! empty($data['last_name']) ? $data['last_name'] : '',
+			'ATT_email' 		=> ! empty($data['email']) ? $data['email'] : '',
+			'ATT_address' 		=> ! empty($data['address']) ? $data['address'] : '',
+			'ATT_address2' 	=> ! empty($data['address2']) ? $data['address2'] : '',
+			'ATT_city' 			=> ! empty($data['city']) ? $data['city'] : '',
+			'STA_ID' 				=> ! empty($data['state']) ? $data['state'] : '',
+			'CNT_ISO' 			=> ! empty($data['country']) ? $data['country'] : '',
+			'ATT_zip' 				=> ! empty($data['zip']) ? $data['zip'] : '',
+			'ATT_phone' 		=> ! empty($data['phone']) ? $data['phone'] : '',
 		));
 	}
 }

core/libraries/form_sections/strategies/validation/EE_Conditionally_Required_Validation_Strategy.strategy.php

Spacing +38 added lines, -38 removed lines

@@ -8,7 +8,7 @@ 
  * @since 				4.6
  *
  */
-class EE_Conditionally_Required_Validation_Strategy extends EE_Validation_Strategy_Base{
+class EE_Conditionally_Required_Validation_Strategy extends EE_Validation_Strategy_Base {
 
 	/**
 	 * Array describing conditions necessary to make the input required.
@@ -24,12 +24,12 @@ 
 	 * @param string $validation_error_message
 	 * @param array $requirement_conditions
 	 */
-	public function __construct( $validation_error_message = null, $requirement_conditions = array() ) {
-		if( ! $validation_error_message ){
+	public function __construct($validation_error_message = null, $requirement_conditions = array()) {
+		if ( ! $validation_error_message) {
 			$validation_error_message = __("This field is required.", "event_espresso");
 		}
-		$this->set_requirement_conditions( $requirement_conditions );
-		parent::__construct( $validation_error_message );
+		$this->set_requirement_conditions($requirement_conditions);
+		parent::__construct($validation_error_message);
 	}
 
 
@@ -44,7 +44,7 @@ 
 	 * @throws \EE_Validation_Error
 	 */
 	public function validate($normalized_value) {
-		if(
+		if (
 			(
 				$normalized_value === ''
 				|| $normalized_value === null
@@ -52,8 +52,8 @@ 
 			)
 			&& $this->_input_is_required_server_side()
 		) {
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'required');
-		}else{
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'required');
+		} else {
 			return true;
 		}
 	}
@@ -64,7 +64,7 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public function get_jquery_validation_rule_array(){
+	public function get_jquery_validation_rule_array() {
 		return array(
 			'required'=> $this->_get_jquery_requirement_value(),
 			'messages' => array(
@@ -82,7 +82,7 @@ 
 	 *
 	 * @param array $requirement_conditions
 	 */
-	public function set_requirement_conditions( $requirement_conditions ) {
+	public function set_requirement_conditions($requirement_conditions) {
 		$this->requirement_conditions = (array) $requirement_conditions;
 	}
 
@@ -108,10 +108,10 @@ 
 	protected function _get_jquery_requirement_value() {
 		$requirement_value = '';
 		$conditions = $this->get_requirement_conditions();
-		if( ! is_array( $conditions ) ){
+		if ( ! is_array($conditions)) {
 			EE_Error::throw_exception_if_debugging(
 				sprintf(
-					__( 'Input requirement conditions must be an array. You provided %1$s', 'event_espresso' ),
+					__('Input requirement conditions must be an array. You provided %1$s', 'event_espresso'),
 					$this->_input->name()
 				),
 				__FILE__,
@@ -120,10 +120,10 @@ 
 			);
 			return true;
 		}
-		if( count( $conditions ) > 1 ) {
+		if (count($conditions) > 1) {
 			EE_Error::throw_exception_if_debugging(
 				sprintf(
-					__( 'Required Validation Strategy does not yet support multiple conditions. You should add it! The related input is %1$s', 'event_espresso' ),
+					__('Required Validation Strategy does not yet support multiple conditions. You should add it! The related input is %1$s', 'event_espresso'),
 					$this->_input->name()
 				),
 				__FILE__,
@@ -131,12 +131,12 @@ 
 				__LINE__
 			);
 		}
-		foreach( $conditions as $input_path => $op_and_value ) {
-			$input = $this->_input->find_section_from_path( $input_path );
-			if( ! $input instanceof EE_Form_Input_Base ) {
+		foreach ($conditions as $input_path => $op_and_value) {
+			$input = $this->_input->find_section_from_path($input_path);
+			if ( ! $input instanceof EE_Form_Input_Base) {
 				EE_Error::throw_exception_if_debugging(
 					sprintf(
-						__( 'Error encountered while setting requirement condition for input %1$s. The path %2$s does not correspond to a valid input'),
+						__('Error encountered while setting requirement condition for input %1$s. The path %2$s does not correspond to a valid input'),
 						$this->_input->name(),
 						$input_path
 					),
@@ -146,14 +146,14 @@ 
 				);
 				return false;
 			}
-			list( $op, $value ) = $this->_validate_op_and_value( $op_and_value );
+			list($op, $value) = $this->_validate_op_and_value($op_and_value);
 			//ok now the jquery dependency expression depends on the input's display strategy.
-			if( ! $input->get_display_strategy() instanceof EE_Select_Display_Strategy ) {
+			if ( ! $input->get_display_strategy() instanceof EE_Select_Display_Strategy) {
 				EE_Error::throw_exception_if_debugging(
 					sprintf(
-						__( 'Required Validation Strategy can only depend on another input which uses the EE_Select_Display_Strategy, but you specified a field "%1$s" that uses display strategy "%2$s". If you need others, please add support for it! The related input is %3$s', 'event_espresso' ),
+						__('Required Validation Strategy can only depend on another input which uses the EE_Select_Display_Strategy, but you specified a field "%1$s" that uses display strategy "%2$s". If you need others, please add support for it! The related input is %3$s', 'event_espresso'),
 						$input->name(),
-						get_class( $input->get_display_strategy() ),
+						get_class($input->get_display_strategy()),
 						$this->_input->name()
 					),
 					__FILE__,
@@ -161,7 +161,7 @@ 
 					__LINE__
 				);
 			}
-			$requirement_value = $input->html_id( true ) . ' option[value="' . $value . '"]:selected';
+			$requirement_value = $input->html_id(true).' option[value="'.$value.'"]:selected';
 		}
 		return $requirement_value;
 	}
@@ -179,12 +179,12 @@ 
 	protected function _input_is_required_server_side() {
 		$meets_all_requirements = true;
 		$conditions = $this->get_requirement_conditions();
-		foreach( $conditions as $input_path => $op_and_value ) {
-			$input = $this->_input->find_section_from_path( $input_path );
-			if( ! $input instanceof EE_Form_Input_Base ) {
+		foreach ($conditions as $input_path => $op_and_value) {
+			$input = $this->_input->find_section_from_path($input_path);
+			if ( ! $input instanceof EE_Form_Input_Base) {
 				EE_Error::throw_exception_if_debugging(
 					sprintf(
-						__( 'Error encountered while setting requirement condition for input %1$s. The path %2$s does not correspond to a valid input'),
+						__('Error encountered while setting requirement condition for input %1$s. The path %2$s does not correspond to a valid input'),
 						$this->_input->name(),
 						$input_path
 					),
@@ -194,13 +194,13 @@ 
 				);
 				return false;
 			}
-			list( $op, $value ) = $this->_validate_op_and_value( $op_and_value );
-			switch( $op ) {
+			list($op, $value) = $this->_validate_op_and_value($op_and_value);
+			switch ($op) {
 				case '=':
 				default:
 					$meets_all_requirements = $input->normalized_value() === $value;
 			}
-			if( ! $meets_all_requirements ) {
+			if ( ! $meets_all_requirements) {
 				break;
 			}
 		}
@@ -217,11 +217,11 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	protected function _validate_op_and_value( $op_and_value ) {
-		if( ! isset( $op_and_value[ 0 ], $op_and_value[ 1 ] ) ) {
+	protected function _validate_op_and_value($op_and_value) {
+		if ( ! isset($op_and_value[0], $op_and_value[1])) {
 				EE_Error::throw_exception_if_debugging(
 					sprintf(
-						__( 'Required Validation Strategy conditions array\'s value must be an array with two elements: an operator, and a value. It didn\'t. The related input is %1$s', 'event_espresso' ),
+						__('Required Validation Strategy conditions array\'s value must be an array with two elements: an operator, and a value. It didn\'t. The related input is %1$s', 'event_espresso'),
 						$this->_input->name()
 					),
 					__FILE__,
@@ -229,12 +229,12 @@ 
 					__LINE__
 				);
 			}
-			$operator = $op_and_value[ 0 ];
-			$value = (string) $op_and_value[ 1 ];
-			if( $operator !== '=' ) {
+			$operator = $op_and_value[0];
+			$value = (string) $op_and_value[1];
+			if ($operator !== '=') {
 				EE_Error::throw_exception_if_debugging(
 					sprintf(
-						__( 'Required Validation Strategy conditions can currently only use the equals operator. If you need others, please add support for it! The related input is %1$s', 'event_espresso' ),
+						__('Required Validation Strategy conditions can currently only use the equals operator. If you need others, please add support for it! The related input is %1$s', 'event_espresso'),
 						$this->_input->name()
 					),
 					__FILE__,
@@ -242,7 +242,7 @@ 
 					__LINE__
 				);
 			}
-			return array( $operator, $value );
+			return array($operator, $value);
 
 	}
 }

Braces +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 			&& $this->_input_is_required_server_side()
 		) {
 			throw new EE_Validation_Error( $this->get_validation_error_message(), 'required');
-		}else{
+		} else{
 			return true;
 		}
 	}

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

Indentation +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 			! isset( $input_settings['include_whats_this_link'] )
 			|| (
 				isset( $input_settings['include_whats_this_link'] )
-			     && $input_settings['include_whats_this_link'] === true
+				 && $input_settings['include_whats_this_link'] === true
 			)
 		) {
 			$this->_html_label_text = sprintf(

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_CVV_Input extends EE_Text_Input{
+class EE_CVV_Input extends EE_Text_Input {
 
 	/**
 	 * @param array $input_settings {
@@ -19,8 +19,8 @@ 
 		$this->set_sensitive_data_removal_strategy(new EE_CCV_Sensitive_Data_Removal());
 		$this->_add_validation_strategy(
 			new EE_Text_Validation_Strategy(
-				isset( $input_settings[ 'validation_error_message' ] )
-					?  $input_settings[ 'validation_error_message' ]
+				isset($input_settings['validation_error_message'])
+					? $input_settings['validation_error_message']
 					: __(
 						'The CVV is either a 3 digit number on the back of your card, or 4 digit number on the front',
 						'event_espresso'
@@ -29,10 +29,10 @@ 
 			)
 		);
 		parent::__construct($input_settings);
-		if(
-			! isset( $input_settings['include_whats_this_link'] )
+		if (
+			! isset($input_settings['include_whats_this_link'])
 			|| (
-				isset( $input_settings['include_whats_this_link'] )
+				isset($input_settings['include_whats_this_link'])
 			     && $input_settings['include_whats_this_link'] === true
 			)
 		) {

core/libraries/iframe_display/iframe_wrapper.template.php

Braces +5 added lines, -2 removed lines

@@ -21,9 +21,12 @@
 	<title><?php echo $title; ?></title>
 <?php if ( $enqueue_wp_assets ) : ?>
 	<?php wp_head(); ?>
-<?php else : ?>
+<?php else {
+	: ?>
 	<?php foreach ( $css as $url ) : ?>
-	<link rel="stylesheet" type="text/css" href="<?php echo $url;?>">
+	<link rel="stylesheet" type="text/css" href="<?php echo $url;
+}
+?>">
 	<?php endforeach; ?>
 	<script type="text/javascript">
 		<?php echo $eei18n; ?>

Spacing +6 added lines, -6 removed lines

@@ -19,16 +19,16 @@ 
 <html>
 <head>
 	<title><?php echo $title; ?></title>
-<?php if ( $enqueue_wp_assets ) : ?>
+<?php if ($enqueue_wp_assets) : ?>
 	<?php wp_head(); ?>
 <?php else : ?>
-	<?php foreach ( $css as $url ) : ?>
-	<link rel="stylesheet" type="text/css" href="<?php echo $url;?>">
+	<?php foreach ($css as $url) : ?>
+	<link rel="stylesheet" type="text/css" href="<?php echo $url; ?>">
 	<?php endforeach; ?>
 	<script type="text/javascript">
 		<?php echo $eei18n; ?>
 	</script>
-	<?php foreach ( $header_js as $url ) : ?>
+	<?php foreach ($header_js as $url) : ?>
 		<script type="text/javascript" src="<?php echo $url; ?>"></script>
 	<?php endforeach; ?>
 <?php endif; ?>
@@ -38,10 +38,10 @@ 
     <div style="padding: 1em;">
         <?php echo $content; ?>
     </div>
-    <?php foreach ( $footer_js as $url ) : ?>
+    <?php foreach ($footer_js as $url) : ?>
 		<script type="text/javascript" src="<?php echo $url; ?>"></script>
 	<?php endforeach; ?>
-<?php if ( $enqueue_wp_assets ) : ?>
+<?php if ($enqueue_wp_assets) : ?>
 	<?php wp_footer(); ?>
 <?php endif; ?>
 </body>

core/helpers/EEH_Venue_View.helper.php

Spacing +110 added lines, -110 removed lines

@@ -45,16 +45,16 @@ 
 	 * @param bool $password_check
 	 * @return \EE_Venue|null
 	 */
-	public static function get_venue( $VNU_ID = 0, $look_in_event = TRUE, $privacy_check = true, $password_check = true ) {
-		$VNU_ID = absint( $VNU_ID );
+	public static function get_venue($VNU_ID = 0, $look_in_event = TRUE, $privacy_check = true, $password_check = true) {
+		$VNU_ID = absint($VNU_ID);
 		// do we already have the Venue you are looking for?
-		if ( EEH_Venue_View::$_venue instanceof EE_Venue && EEH_Venue_View::$_venue->ID() == $VNU_ID ) {
-			return EEH_Venue_View::_get_venue( $privacy_check );
+		if (EEH_Venue_View::$_venue instanceof EE_Venue && EEH_Venue_View::$_venue->ID() == $VNU_ID) {
+			return EEH_Venue_View::_get_venue($privacy_check);
 		}
 		// international newspaper?
 		global $post;
-		if ( $post instanceof WP_Post ) {
-			switch ( $post->post_type ) {
+		if ($post instanceof WP_Post) {
+			switch ($post->post_type) {
 				// if this is being called from an EE_Venue post,
 				// and the EE_Venue post corresponds to the EE_Venue that is being asked for,
 				// then we can try to just grab the attached EE_Venue object
@@ -62,31 +62,31 @@ 
 					// the post already contains the related EE_Venue object AND one of the following is TRUE:
 					// the requested Venue ID matches the post ID OR...
 					// there was no specific Venue ID requested
-					if ( isset( $post->EE_Venue ) && ( $VNU_ID == $post->ID || ! $VNU_ID )) {
+					if (isset($post->EE_Venue) && ($VNU_ID == $post->ID || ! $VNU_ID)) {
 						// use existing related EE_Venue object
-						EEH_Venue_View::$_venue =  $post->EE_Venue;
-					} else if ( $VNU_ID ) {
+						EEH_Venue_View::$_venue = $post->EE_Venue;
+					} else if ($VNU_ID) {
 						// there WAS a specific Venue ID requested, but it's NOT the current post object
-						EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID( $VNU_ID );
+						EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
 					} else {
 						// no specific Venue ID requested, so use post ID to generate EE_Venue object
-						EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID( $post->ID );
+						EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID($post->ID);
 					}
 				break;
 
 				case 'espresso_events':
-					if ( $look_in_event ) {
+					if ($look_in_event) {
 						// grab the events related venues
 						$venues = EEH_Venue_View::get_event_venues();
 						// make sure the result is an array
-						$venues = is_array( $venues ) ? $venues : array();
+						$venues = is_array($venues) ? $venues : array();
 						// do we have an ID for a specific venue?
-						if ( $VNU_ID ) {
+						if ($VNU_ID) {
 							// loop thru the related venues
-							foreach( $venues as $venue ) {
-								if ( $venue instanceof EE_Venue ) {
+							foreach ($venues as $venue) {
+								if ($venue instanceof EE_Venue) {
 									// until we find the venue we're looking for
-									if ( $venue->ID() == $VNU_ID ) {
+									if ($venue->ID() == $VNU_ID) {
 										EEH_Venue_View::$_venue = $venue;
 										break;
 									}
@@ -98,7 +98,7 @@ 
 							// then the global post is an events post and this function was called with no argument
 						} else {
 							// just grab the first related event venue
-							EEH_Venue_View::$_venue = reset( $venues );
+							EEH_Venue_View::$_venue = reset($venues);
 						}
 					}
 				break;
@@ -106,11 +106,11 @@ 
 			}
 		}
 		// now if we STILL do NOT have an EE_Venue model object, BUT we have a Venue ID...
-		if ( ! EEH_Venue_View::$_venue instanceof EE_Venue && $VNU_ID ) {
+		if ( ! EEH_Venue_View::$_venue instanceof EE_Venue && $VNU_ID) {
 			// sigh... pull it from the db
-			EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID( $VNU_ID );
+			EEH_Venue_View::$_venue = EEM_Venue::instance()->get_one_by_ID($VNU_ID);
 		}
-		return EEH_Venue_View::_get_venue( $privacy_check, $password_check );
+		return EEH_Venue_View::_get_venue($privacy_check, $password_check);
 	}
 
 
@@ -123,13 +123,13 @@ 
 	 * @param bool $password_check
 	 * @return 	EE_Venue
 	 */
-	protected static function _get_venue( $privacy_check = true, $password_check = true ) {
+	protected static function _get_venue($privacy_check = true, $password_check = true) {
 		// check for private venues.
 		if (
 			EEH_Venue_View::$_venue instanceof EE_Venue
 			&& EEH_Venue_View::$_venue->status() == 'private'
 			&& $privacy_check
-			&& ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_private_venues', 'get_venues' )
+			&& ! EE_Registry::instance()->CAP->current_user_can('ee_read_private_venues', 'get_venues')
 		) {
 			return null;
 		}
@@ -137,7 +137,7 @@ 
 		if (
 			EEH_Venue_View::$_venue instanceof EE_Venue
 			&& $password_check
-			&& post_password_required( EEH_Venue_View::$_venue->ID() )
+			&& post_password_required(EEH_Venue_View::$_venue->ID())
 		) {
 			return null;
 		}
@@ -154,8 +154,8 @@ 
 	 */
 	public static function get_event_venues() {
 		global $post;
-		if ( $post->post_type == 'espresso_events' ) {
-			if ( isset( $post->EE_Event ) && $post->EE_Event instanceof EE_Event ) {
+		if ($post->post_type == 'espresso_events') {
+			if (isset($post->EE_Event) && $post->EE_Event instanceof EE_Event) {
 				return $post->EE_Event->venues();
 			}
 		}
@@ -175,9 +175,9 @@ 
 	 *
 	 * @return bool|null
 	 */
-	public static function is_venue_private( $VNU_ID = false ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID, true, true );
-		if ( ! $venue instanceof EE_Venue ) {
+	public static function is_venue_private($VNU_ID = false) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID, true, true);
+		if ( ! $venue instanceof EE_Venue) {
 			return null;
 		}
 
@@ -192,11 +192,11 @@ 
 	 * @param bool $VNU_ID venue to check (optional). If not included will use internally derived venue object.
 	 * @return bool
 	 */
-	public static function is_venue_password_protected( $VNU_ID = false ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID, true, true, false );
+	public static function is_venue_password_protected($VNU_ID = false) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID, true, true, false);
 		if (
 			$venue instanceof EE_Venue
-			&& post_password_required( $venue->ID() )
+			&& post_password_required($venue->ID())
 		) {
 			return true;
 		}
@@ -213,13 +213,13 @@ 
 	 *
 	 * @return string
 	 */
-	public static function password_protected_venue_form( $VNU_ID = false ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID, true, true, false );
+	public static function password_protected_venue_form($VNU_ID = false) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID, true, true, false);
 		if (
 			$venue instanceof EE_Venue
-			&& post_password_required( $venue->ID() )
+			&& post_password_required($venue->ID())
 		) {
-			return get_the_password_form( $venue->ID() );
+			return get_the_password_form($venue->ID());
 		}
 		return '';
 	}
@@ -233,9 +233,9 @@ 
 	 * @param int $VNU_ID
 	 * @return string
 	 */
-	public static function venue_description( $VNU_ID = 0 ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
+	public static function venue_description($VNU_ID = 0) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
 			return$venue->description();
 		}
 		return '';
@@ -250,12 +250,12 @@ 
 	 * @param int $VNU_ID
 	 * @return string
 	 */
-	public static function venue_excerpt( $VNU_ID = 0 ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
+	public static function venue_excerpt($VNU_ID = 0) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
 			$excerpt = $venue->excerpt() != NULL && $venue->excerpt() ? $venue->excerpt() : $venue->description();
-			$venue_link = ' ' . EEH_Venue_View::venue_details_link( $venue->ID(), __( 'more', 'event_espresso' ) . '…' );
-			return ! empty( $excerpt ) ? wp_trim_words( $excerpt, 25, '' ) . $venue_link : '';
+			$venue_link = ' '.EEH_Venue_View::venue_details_link($venue->ID(), __('more', 'event_espresso').'…');
+			return ! empty($excerpt) ? wp_trim_words($excerpt, 25, '').$venue_link : '';
 		}
 		return '';
 	}
@@ -270,22 +270,22 @@ 
 	 * @param bool $hide_uncategorized
 	 * @return string
 	 */
-	public static function venue_categories( $VNU_ID = 0, $hide_uncategorized = TRUE ) {
+	public static function venue_categories($VNU_ID = 0, $hide_uncategorized = TRUE) {
 		$category_links = array();
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
 			// get category terms
-			if ( $venue_categories = get_the_terms( $venue->ID(), 'espresso_venue_categories' )) {
+			if ($venue_categories = get_the_terms($venue->ID(), 'espresso_venue_categories')) {
 				// loop thru terms and create links
-				foreach ( $venue_categories as $term ) {
-					$url = get_term_link( $term, 'espresso_venue_categories' );
-					if ( ! is_wp_error( $url ) && (( $hide_uncategorized && strtolower( $term->name ) != __( 'uncategorized', 'event_espresso' )) || ! $hide_uncategorized )) {
-						$category_links[] = '<a href="' . esc_url( $url ) . '" rel="tag">' . $term->name . '</a> ';
+				foreach ($venue_categories as $term) {
+					$url = get_term_link($term, 'espresso_venue_categories');
+					if ( ! is_wp_error($url) && (($hide_uncategorized && strtolower($term->name) != __('uncategorized', 'event_espresso')) || ! $hide_uncategorized)) {
+						$category_links[] = '<a href="'.esc_url($url).'" rel="tag">'.$term->name.'</a> ';
 					}
 				}
 			}
 		}
-		return implode( ', ', $category_links );
+		return implode(', ', $category_links);
 	}
 
 
@@ -300,10 +300,10 @@ 
 	 * @param bool $add_wrapper
 	 * @return string
 	 */
-	public static function venue_address( $type = 'multiline', $VNU_ID = 0, $use_schema = true, $add_wrapper = true ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
-			return EEH_Address::format( $venue, $type, $use_schema, $add_wrapper );
+	public static function venue_address($type = 'multiline', $VNU_ID = 0, $use_schema = true, $add_wrapper = true) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			return EEH_Address::format($venue, $type, $use_schema, $add_wrapper);
 		}
 		return '';
 	}
@@ -317,10 +317,10 @@ 
 	 * @param int $VNU_ID
 	 * @return bool|string
 	 */
-	public static function venue_has_address( $VNU_ID = 0 ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
-			return EEH_Address::format( $venue, 'inline', FALSE, FALSE );
+	public static function venue_has_address($VNU_ID = 0) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			return EEH_Address::format($venue, 'inline', FALSE, FALSE);
 		}
 		return false;
 	}
@@ -335,30 +335,30 @@ 
 	 * @param int $VNU_ID
 	 * @return string
 	 */
-	public static function venue_name( $link_to = 'details', $VNU_ID = 0 ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
+	public static function venue_name($link_to = 'details', $VNU_ID = 0) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
 			$venue_name = apply_filters(
 				'FHEE__EEH_Venue__venue_name__append_private_venue_name',
 				EEH_Venue_View::is_venue_private()
-					? EEH_Venue_View::$_venue->name() . "&nbsp;" . __( '(Private)', 'event_espresso' )
+					? EEH_Venue_View::$_venue->name()."&nbsp;".__('(Private)', 'event_espresso')
 					: EEH_Venue_View::$_venue->name(),
 				EEH_Venue_View::$_venue
 			);
-			$venue_name = EEH_Schema::name( $venue_name );
+			$venue_name = EEH_Schema::name($venue_name);
 
 			//if venue is trashed then ignore the "link to" setting because the venue is trashed.
-			if ( $venue->get('status') == 'trash' ) {
+			if ($venue->get('status') == 'trash') {
 				$link_to = '';
 			}
-			switch( $link_to ) {
+			switch ($link_to) {
 
 				case 'details' :
-					return EEH_Venue_View::venue_details_link( $venue->ID(), $venue_name );
+					return EEH_Venue_View::venue_details_link($venue->ID(), $venue_name);
 				break;
 
 				case 'website' :
-					return EEH_Venue_View::venue_website_link( $venue->ID(), $venue_name );
+					return EEH_Venue_View::venue_website_link($venue->ID(), $venue_name);
 				break;
 
 				default :
@@ -378,10 +378,10 @@ 
 	 * @param    string $text
 	 * @return string
 	 */
-	public static function venue_details_link( $VNU_ID = 0, $text = '' ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
-			return EEH_Schema::url( get_permalink( $venue->ID() ), $text );
+	public static function venue_details_link($VNU_ID = 0, $text = '') {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			return EEH_Schema::url(get_permalink($venue->ID()), $text);
 		}
 		return '';
 	}
@@ -396,12 +396,12 @@ 
 	 * @param    string $text
 	 * @return string
 	 */
-	public static function venue_website_link( $VNU_ID = 0, $text = '' ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
+	public static function venue_website_link($VNU_ID = 0, $text = '') {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
 			$url = $venue->venue_url();
-			$text = ! empty( $text ) ? $text : $url;
-			return ! empty( $url ) ? EEH_Schema::url( $url, $text ) : '';
+			$text = ! empty($text) ? $text : $url;
+			return ! empty($url) ? EEH_Schema::url($url, $text) : '';
 		}
 		return '';
 	}
@@ -415,10 +415,10 @@ 
 	 * @param int $VNU_ID
 	 * @return string
 	 */
-	public static function venue_phone( $VNU_ID = 0) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
-			return EEH_Schema::telephone( $venue->phone() );
+	public static function venue_phone($VNU_ID = 0) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
+			return EEH_Schema::telephone($venue->phone());
 		}
 		return '';
 	}
@@ -434,48 +434,48 @@ 
 	 * @param    array $gmap map options
 	 * @return string
 	 */
-	public static function venue_gmap( $VNU_ID = 0, $map_ID = FALSE, $gmap = array() ) {
+	public static function venue_gmap($VNU_ID = 0, $map_ID = FALSE, $gmap = array()) {
 
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
 			// check for global espresso_events post and use it's ID if no map_ID is set
 			global $post;
-			$map_ID = empty( $map_ID ) && $post->post_type == 'espresso_events' ? $post->ID : $map_ID;
+			$map_ID = empty($map_ID) && $post->post_type == 'espresso_events' ? $post->ID : $map_ID;
 			// grab map settings
 			$map_cfg = EE_Registry::instance()->CFG->map_settings;
 			// are maps enabled ?
-			if ( $map_cfg->use_google_maps && $venue->enable_for_gmap() ) {
+			if ($map_cfg->use_google_maps && $venue->enable_for_gmap()) {
 
 				$details_page = is_single();
 				$options = array();
-				$options['map_ID'] = $map_ID && $map_ID != $venue->ID() ? $map_ID . '-' . $venue->ID()/* . '-' . $static_map_id*/ : $venue->ID()/* . '-' . $static_map_id*/;
+				$options['map_ID'] = $map_ID && $map_ID != $venue->ID() ? $map_ID.'-'.$venue->ID()/* . '-' . $static_map_id*/ : $venue->ID()/* . '-' . $static_map_id*/;
 
-				$options['location'] = EEH_Address::format( $venue, 'inline', FALSE, FALSE );
+				$options['location'] = EEH_Address::format($venue, 'inline', FALSE, FALSE);
 
 				$options['ee_map_width'] = $details_page ? $map_cfg->event_details_map_width : $map_cfg->event_list_map_width;
-				$options['ee_map_width'] = isset( $gmap['ee_map_width'] ) && ! empty( $gmap['ee_map_width'] ) ? $gmap['ee_map_width'] : $options['ee_map_width'];
+				$options['ee_map_width'] = isset($gmap['ee_map_width']) && ! empty($gmap['ee_map_width']) ? $gmap['ee_map_width'] : $options['ee_map_width'];
 
 				$options['ee_map_height'] = $details_page ? $map_cfg->event_details_map_height : $map_cfg->event_list_map_height;
-				$options['ee_map_height'] = isset( $gmap['ee_map_height'] ) && ! empty( $gmap['ee_map_height'] ) ? $gmap['ee_map_height'] : $options['ee_map_height'];
+				$options['ee_map_height'] = isset($gmap['ee_map_height']) && ! empty($gmap['ee_map_height']) ? $gmap['ee_map_height'] : $options['ee_map_height'];
 
 				$options['ee_map_zoom'] = $details_page ? $map_cfg->event_details_map_zoom : $map_cfg->event_list_map_zoom;
-				$options['ee_map_zoom'] = isset( $gmap['ee_map_zoom'] ) && ! empty( $gmap['ee_map_zoom'] ) ? $gmap['ee_map_zoom'] : $options['ee_map_zoom'];
+				$options['ee_map_zoom'] = isset($gmap['ee_map_zoom']) && ! empty($gmap['ee_map_zoom']) ? $gmap['ee_map_zoom'] : $options['ee_map_zoom'];
 
 				$options['ee_map_nav_display'] = $details_page ? $map_cfg->event_details_display_nav : $map_cfg->event_list_display_nav;
-				$options['ee_map_nav_display'] = isset( $gmap['ee_map_nav_display'] ) && ! empty( $gmap['ee_map_nav_display'] ) ? 'true' : $options['ee_map_nav_display'];;
+				$options['ee_map_nav_display'] = isset($gmap['ee_map_nav_display']) && ! empty($gmap['ee_map_nav_display']) ? 'true' : $options['ee_map_nav_display']; ;
 
 				$options['ee_map_nav_size'] = $details_page ? $map_cfg->event_details_nav_size : $map_cfg->event_list_nav_size;
-				$options['ee_map_nav_size'] =  isset( $gmap['ee_map_nav_size'] ) && ! empty( $gmap['ee_map_nav_size'] )? $gmap['ee_map_nav_size'] : $options['ee_map_nav_size'];
+				$options['ee_map_nav_size'] = isset($gmap['ee_map_nav_size']) && ! empty($gmap['ee_map_nav_size']) ? $gmap['ee_map_nav_size'] : $options['ee_map_nav_size'];
 
 				$options['ee_map_type_control'] = $details_page ? $map_cfg->event_details_control_type : $map_cfg->event_list_control_type;
-				$options['ee_map_type_control'] =  isset( $gmap['ee_map_type_control'] ) && ! empty( $gmap['ee_map_type_control'] )? $gmap['ee_map_type_control'] : $options['ee_map_type_control'];
+				$options['ee_map_type_control'] = isset($gmap['ee_map_type_control']) && ! empty($gmap['ee_map_type_control']) ? $gmap['ee_map_type_control'] : $options['ee_map_type_control'];
 
 				$options['ee_map_align'] = $details_page ? $map_cfg->event_details_map_align : $map_cfg->event_list_map_align;
-				$options['ee_map_align'] =  isset( $gmap['ee_map_align'] ) && ! empty( $gmap['ee_map_align'] )? $gmap['ee_map_align'] : $options['ee_map_align'];
+				$options['ee_map_align'] = isset($gmap['ee_map_align']) && ! empty($gmap['ee_map_align']) ? $gmap['ee_map_align'] : $options['ee_map_align'];
 
-				$options['ee_static_url'] =  isset( $gmap['ee_static_url'] ) && ! empty( $gmap['ee_static_url'] ) ? (bool)absint( $gmap['ee_static_url'] ) : $venue->google_map_link();
+				$options['ee_static_url'] = isset($gmap['ee_static_url']) && ! empty($gmap['ee_static_url']) ? (bool) absint($gmap['ee_static_url']) : $venue->google_map_link();
 
-				return EEH_Maps::google_map( $options );
+				return EEH_Maps::google_map($options);
 
 			}
 		}
@@ -490,7 +490,7 @@ 
 	 * @param array $atts like EEH_Maps::google_map_link
 	 * @return string
 	 */
-	public static function espresso_google_static_map( EE_Venue $venue, $atts = array() ){
+	public static function espresso_google_static_map(EE_Venue $venue, $atts = array()) {
 		$state = $venue->state_obj();
 		$country = $venue->country_obj();
 		$atts = shortcode_atts(
@@ -521,23 +521,23 @@ 
 	 * @param string $after
 	 * @return string
 	 */
-	public static function edit_venue_link( $VNU_ID = 0, $link = '', $before = '<p class="edit-venue-lnk small-txt">', $after = '</p>' ) {
-		$venue = EEH_Venue_View::get_venue( $VNU_ID );
-		if ( $venue instanceof EE_Venue ) {
+	public static function edit_venue_link($VNU_ID = 0, $link = '', $before = '<p class="edit-venue-lnk small-txt">', $after = '</p>') {
+		$venue = EEH_Venue_View::get_venue($VNU_ID);
+		if ($venue instanceof EE_Venue) {
 			// can the user edit this post ?
-			if ( current_user_can( 'edit_post', $venue->ID() )) {
+			if (current_user_can('edit_post', $venue->ID())) {
 				// set link text
-				$link = ! empty( $link ) ? $link : __('edit this venue');
+				$link = ! empty($link) ? $link : __('edit this venue');
 				// generate nonce
-				$nonce = wp_create_nonce( 'edit_nonce' );
+				$nonce = wp_create_nonce('edit_nonce');
 				// generate url to venue editor for this venue
-				$url = add_query_arg( array( 'page' => 'espresso_venues', 'action' => 'edit', 'post' => $venue->ID(), 'edit_nonce' => $nonce ), admin_url( 'admin.php' ) );
+				$url = add_query_arg(array('page' => 'espresso_venues', 'action' => 'edit', 'post' => $venue->ID(), 'edit_nonce' => $nonce), admin_url('admin.php'));
 				// get edit CPT text
-				$post_type_obj = get_post_type_object( 'espresso_venues' );
+				$post_type_obj = get_post_type_object('espresso_venues');
 				// build final link html
-				$link = '<a class="post-edit-link" href="' . $url . '" title="' . esc_attr( $post_type_obj->labels->edit_item ) . '">' . $link . '</a>';
+				$link = '<a class="post-edit-link" href="'.$url.'" title="'.esc_attr($post_type_obj->labels->edit_item).'">'.$link.'</a>';
 				// put it all together
-				return $before . apply_filters( 'edit_post_link', $link, $venue->ID() ) . $after;
+				return $before.apply_filters('edit_post_link', $link, $venue->ID()).$after;
 			}
 		}
 		return '';

Indentation -1 removed lines

@@ -208,7 +208,6 @@
 	/**
 	 * If a venue is password protected, this will return the password form for gaining access
 	 * returns an empty string otherwise
-
 	 * @param bool $VNU_ID venue to check (optional). If not included will use internally derived venue object.
 	 *
 	 * @return string

Braces +3 added lines, -1 removed lines

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