gravityview / GravityView

includes/fields/class-gravityview-field-address.php

Spacing +27 added lines, -27 removed lines

@@ -60,8 +60,8 @@ 
 
 			if ( 'address' === \GV\Utils::get( $search_field, 'type' ) ) {
 
-				$field_id = intval( floor( $search_field['key'] ) );
-				$input_id = gravityview_get_input_id_from_id( $search_field['key'] );
+				$field_id = intval( floor( $search_field[ 'key' ] ) );
+				$input_id = gravityview_get_input_id_from_id( $search_field[ 'key' ] );
 				$form = GravityView_View::getInstance()->getForm();
 
 				/** @var GF_Field_Address $address_field */
@@ -70,7 +70,7 @@ 
 				$choices = array();
 
 				$method_name = 'get_choices_' . self::get_input_type_from_input_id( $input_id );
-				if( method_exists( $this, $method_name ) ) {
+				if ( method_exists( $this, $method_name ) ) {
 					/**
 					 * @uses GravityView_Field_Address::get_choices_country()
 					 * @uses GravityView_Field_Address::get_choices_state()
@@ -78,12 +78,12 @@ 
 					$choices = $this->{$method_name}( $address_field, $form );
 				}
 
-				if( ! empty( $choices ) ) {
-					$search_field['choices'] = $choices;
-					$search_field['type'] = \GV\Utils::get( $search_field, 'input');
+				if ( ! empty( $choices ) ) {
+					$search_field[ 'choices' ] = $choices;
+					$search_field[ 'type' ] = \GV\Utils::get( $search_field, 'input' );
 				} else {
-					$search_field['type'] = 'text';
-					$search_field['input'] = 'input_text';
+					$search_field[ 'type' ] = 'text';
+					$search_field[ 'input' ] = 'input_text';
 				}
 			}
 		}
@@ -109,7 +109,7 @@ 
 		$country_choices = array();
 
 		foreach ( $countries as $key => $country ) {
-			$country_choices[] = array(
+			$country_choices[ ] = array(
 				'value' => $country,
 				'text' => $country,
 			);
@@ -134,7 +134,7 @@ 
 	 */
 	private function get_choices_state( $address_field, $form ) {
 
-		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form['id'] ) : $address_field->addressType;
+		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form[ 'id' ] ) : $address_field->addressType;
 
 		$state_choices = array();
 
@@ -146,8 +146,8 @@ 
 				$states = GFCommon::get_canadian_provinces();
 				break;
 			default:
-				$address_types = $address_field->get_address_types( $form['id'] );
-				$states = empty( $address_types[ $address_type ]['states'] ) ? array() : $address_types[ $address_type ]['states'];
+				$address_types = $address_field->get_address_types( $form[ 'id' ] );
+				$states = empty( $address_types[ $address_type ][ 'states' ] ) ? array() : $address_types[ $address_type ][ 'states' ];
 				break;
 		}
 
@@ -156,19 +156,19 @@ 
 				$state_subchoices = array();
 
 				foreach ( $state as $substate ) {
-					$state_subchoices[] = array(
+					$state_subchoices[ ] = array(
 						'value' => $substate,
 						'text' => $substate,
 					);
 				}
 
-				$state_choices[] = array(
+				$state_choices[ ] = array(
 					'text' => $key,
 					'value' => $state_subchoices,
 				);
 
 			} else {
-				$state_choices[] = array(
+				$state_choices[ ] = array(
 					'value' => $state,
 					'text' => $state,
 				);
@@ -192,13 +192,13 @@ 
 		// Use the same inputs as the "text" input type allows
 		$text_inputs = \GV\Utils::get( $input_types, 'text' );
 
-		$input_types['street'] = $text_inputs;
-		$input_types['street2'] = $text_inputs;
-		$input_types['city'] = $text_inputs;
+		$input_types[ 'street' ] = $text_inputs;
+		$input_types[ 'street2' ] = $text_inputs;
+		$input_types[ 'city' ] = $text_inputs;
 
-		$input_types['state'] = array( 'select', 'radio', 'link' ) + $text_inputs;
-		$input_types['zip'] = array( 'input_text' );
-		$input_types['country'] = array( 'select', 'radio', 'link' ) + $text_inputs;
+		$input_types[ 'state' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
+		$input_types[ 'zip' ] = array( 'input_text' );
+		$input_types[ 'country' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
 
 		return $input_types;
 	}
@@ -219,10 +219,10 @@ 
 		// Is this search field for an input (eg: 4.2) or the whole address field (eg: 4)?
 		$input_id = gravityview_get_input_id_from_id( $field_id );
 
-		if( 'address' === $field_type && $input_id ) {
+		if ( 'address' === $field_type && $input_id ) {
 
 			// If the input ID matches an expected address input, set to that. Otherwise, keep existing input type.
-			if( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
+			if ( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
 				$input_type = $address_field_name;
 			}
 		}
@@ -271,20 +271,20 @@ 
 	function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
 
 		// If this is NOT the full address field, return default options.
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
 			return $field_options;
 		}
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
 		$add_options = array();
 
-		$add_options['show_map_link'] = array(
+		$add_options[ 'show_map_link' ] = array(
 			'type' => 'checkbox',
 			'label' => __( 'Show Map Link:', 'gravityview' ),
-			'desc' => __('Display a "Map It" link below the address', 'gravityview'),
+			'desc' => __( 'Display a "Map It" link below the address', 'gravityview' ),
 			'value' => true,
 			'merge_tags' => false,
 		);

includes/widgets/search-widget/templates/search-field-select.php

Spacing +14 added lines, -14 removed lines

@@ -10,14 +10,14 @@ 
 $search_field = $gravityview_view->search_field;
 
 // Make sure that there are choices to display
-if( empty( $search_field['choices'] ) ) {
+if ( empty( $search_field[ 'choices' ] ) ) {
 	gravityview()->log->debug( 'search-field-select.php - No choices for field' );
 	return;
 }
 
-if( is_array( $search_field['value'] ) ) {
+if ( is_array( $search_field[ 'value' ] ) ) {
     gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' );
-	$search_field['value'] = reset( $search_field['value'] );
+	$search_field[ 'value' ] = reset( $search_field[ 'value' ] );
 }
 
 /**
@@ -26,26 +26,26 @@ 
  * @param string $default_option Default: `—` (—)
  * @param string $field_type Field type: "select" or "multiselect"
  */
-$default_option = apply_filters('gravityview/extension/search/select_default', '—', 'select' );
+$default_option = apply_filters( 'gravityview/extension/search/select_default', '—', 'select' );
 
 ?>
 <div class="gv-search-box gv-search-field-select">
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
-		<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label>
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
+		<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
 	<?php } ?>
 	<p>
-		<select name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>">
-			<option value="" <?php gv_selected( '', $search_field['value'], true ); ?>><?php echo esc_html( $default_option ); ?></option>
+		<select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>">
+			<option value="" <?php gv_selected( '', $search_field[ 'value' ], true ); ?>><?php echo esc_html( $default_option ); ?></option>
 			<?php
-			foreach( $search_field['choices'] as $choice ) : ?>
-				<?php if ( is_array( $choice['value'] ) ): ?>
-					<optgroup label="<?php echo esc_attr( $choice['text'] ); ?>">
-						<?php foreach ( $choice['value'] as $subchoice ): ?>
-							<option value="<?php echo esc_attr( $subchoice['value'] ); ?>"><?php echo esc_html( $subchoice['text'] ); ?></option>
+			foreach ( $search_field[ 'choices' ] as $choice ) : ?>
+				<?php if ( is_array( $choice[ 'value' ] ) ): ?>
+					<optgroup label="<?php echo esc_attr( $choice[ 'text' ] ); ?>">
+						<?php foreach ( $choice[ 'value' ] as $subchoice ): ?>
+							<option value="<?php echo esc_attr( $subchoice[ 'value' ] ); ?>"><?php echo esc_html( $subchoice[ 'text' ] ); ?></option>
 						<?php endforeach; ?>
 					</optgroup>
 				<?php else: ?>
-					<option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $search_field['value'] ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
+					<option value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" <?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $search_field[ 'value' ] ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
 				<?php endif; ?>
 			<?php endforeach; ?>
 		</select>

Braces +5 added lines, -2 removed lines

@@ -44,8 +44,11 @@
 							<option value="<?php echo esc_attr( $subchoice['value'] ); ?>"><?php echo esc_html( $subchoice['text'] ); ?></option>
 						<?php endforeach; ?>
 					</optgroup>
-				<?php else: ?>
-					<option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $search_field['value'] ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
+				<?php else {
+	: ?>
+					<option value="<?php echo esc_attr( $choice['value'] );
+}
+?>" <?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $search_field['value'] ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
 				<?php endif; ?>
 			<?php endforeach; ?>
 		</select>