gravityview / GravityView

future/includes/rest/class-gv-rest-route.php

Spacing +2 added lines, -2 removed lines

@@ -132,7 +132,7 @@ 
 
 		$format = '(?:\.(?P<format>html|json))?';
 
-		register_rest_route( $namespace, sprintf( '/%s/(?P<id>[\d]+)/%s/(?P<s_id>[\w-]+)%s', $base, $sub_type, $format ) , array(
+		register_rest_route( $namespace, sprintf( '/%s/(?P<id>[\d]+)/%s/(?P<s_id>[\w-]+)%s', $base, $sub_type, $format ), array(
 			array(
 				'methods'         => \WP_REST_Server::READABLE,
 				'callback'        => array( $this, 'get_sub_item' ),
@@ -382,7 +382,7 @@ 
 	 * @return \WP_REST_Response
 	 */
 	protected function not_implemented() {
-		$error = new \WP_Error( 'not-implemented-yet', __( 'Endpoint Not Yet Implemented.', 'gravityview' )  );
+		$error = new \WP_Error( 'not-implemented-yet', __( 'Endpoint Not Yet Implemented.', 'gravityview' ) );
 		return new \WP_REST_Response( $error, 501 );
 	}
 

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

Indentation +7 added lines, -7 removed lines

@@ -39,13 +39,13 @@
 			'tooltip' => __( 'Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview' ),
 		);
 
-        $field_options['make_clickable'] = array(
-            'type' => 'checkbox',
-            'merge_tags' => false,
-            'value' => 0,
-            'label' => __( 'Convert text URLs to HTML links', 'gravityview' ),
-            'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
-        );
+		$field_options['make_clickable'] = array(
+			'type' => 'checkbox',
+			'merge_tags' => false,
+			'value' => 0,
+			'label' => __( 'Convert text URLs to HTML links', 'gravityview' ),
+			'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
+		);
 
 		$field_options['allow_html'] = array(
 			'type' => 'checkbox',

Spacing +4 added lines, -4 removed lines

@@ -27,11 +27,11 @@ 
 
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
-		$field_options['trim_words'] = array(
+		$field_options[ 'trim_words' ] = array(
 			'type' => 'number',
 			'merge_tags' => false,
 			'value' => null,
@@ -39,7 +39,7 @@ 
 			'tooltip' => __( 'Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview' ),
 		);
 
-        $field_options['make_clickable'] = array(
+        $field_options[ 'make_clickable' ] = array(
             'type' => 'checkbox',
             'merge_tags' => false,
             'value' => 0,
@@ -47,7 +47,7 @@ 
             'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
         );
 
-		$field_options['allow_html'] = array(
+		$field_options[ 'allow_html' ] = array(
 			'type' => 'checkbox',
 			'merge_tags' => false,
 			'value' => 1,

includes/admin/field-types/type_number.php

Spacing +5 added lines, -5 removed lines

@@ -3,7 +3,7 @@ 
  * number input type
  */
 
-if( !class_exists('GravityView_FieldType_text') ) {
+if ( ! class_exists( 'GravityView_FieldType_text' ) ) {
 	include_once( GRAVITYVIEW_DIR . 'includes/admin/field-types/type_text.php' );
 }
 
@@ -20,7 +20,7 @@ 
 
 		$show_mt = $this->show_merge_tags();
 
-		if ( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
+		if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
 		}
 
@@ -31,9 +31,9 @@ 
 		$step = \GV\Utils::get( $this->field, 'step', null );
 
 		$atts = '';
-		$atts .= $max ? ' max="' . (int) $max . '"' : '';
-		$atts .= $min ? ' min="' . (int) $min . '"' : '';
-		$atts .= $step ? ' step="' . (int) $step . '"' : '';
+		$atts .= $max ? ' max="' . (int)$max . '"' : '';
+		$atts .= $min ? ' min="' . (int)$min . '"' : '';
+		$atts .= $step ? ' step="' . (int)$step . '"' : '';
 		?>
 		<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="number"
 		       value="<?php echo esc_attr( $this->value ); ?>"

includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-gravityformspartialentries.php

Spacing +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
 
 		$partial_entries_addon = GF_Partial_Entries::get_instance();
 
-		$feed_settings = $partial_entries_addon->get_feed_settings( $form['id'] );
+		$feed_settings = $partial_entries_addon->get_feed_settings( $form[ 'id' ] );
 
 		$is_enabled = \GV\Utils::get( $feed_settings, 'enable', 0 );
 
@@ -66,14 +66,14 @@ 
 		$partial_entry_id = \GV\Utils::get( $entry, 'partial_entry_id' );
 
 		// Set the expected $_POST key for the Add-On to use
-		$_POST['partial_entry_id'] = $partial_entry_id;
+		$_POST[ 'partial_entry_id' ] = $partial_entry_id;
 
 		gravityview()->log->debug( 'Saving partial entry (ID #{partial_entry_id}) for Entry #{entry_id}', array(
 			'partial_entry_id' => $partial_entry_id,
 			'entry_id'         => $entry_id
 		) );
 
-		$partial_entries_addon->maybe_save_partial_entry( $form['id'] );
+		$partial_entries_addon->maybe_save_partial_entry( $form[ 'id' ] );
 	}
 }
 

includes/presets/default-table/class-gravityview-default-template-table.php

Spacing +3 added lines, -3 removed lines

@@ -88,15 +88,15 @@
 	 */
 	public function maybe_modify_button_label( $label = '', $atts = array() ) {
 
-		if( $this->template_id !== \GV\Utils::get( $atts, 'template_id' ) ) {
+		if ( $this->template_id !== \GV\Utils::get( $atts, 'template_id' ) ) {
 			return $label;
 		}
 
-		if( 'field' !== \GV\Utils::get( $atts, 'type' ) ) {
+		if ( 'field' !== \GV\Utils::get( $atts, 'type' ) ) {
 			return $label;
 		}
 
-		if( 'edit' === \GV\Utils::get( $atts, 'zone' ) ) {
+		if ( 'edit' === \GV\Utils::get( $atts, 'zone' ) ) {
 			return $label;
 		}
 

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

Spacing +27 added lines, -27 removed lines

@@ -62,8 +62,8 @@ 
 				continue;
 			}
 
-			$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 */
@@ -72,7 +72,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()
@@ -80,12 +80,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';
 			}
 		}
 
@@ -110,7 +110,7 @@ 
 		$country_choices = array();
 
 		foreach ( $countries as $key => $country ) {
-			$country_choices[] = array(
+			$country_choices[ ] = array(
 				'value' => $country,
 				'text' => $country,
 			);
@@ -135,7 +135,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();
 
@@ -147,8 +147,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;
 		}
 
@@ -157,19 +157,19 @@ 
 				$state_subchoices = array();
 
 				foreach ( $state as $key => $substate ) {
-					$state_subchoices[] = array(
+					$state_subchoices[ ] = array(
 						'value' => is_numeric( $key ) ? $substate : $key,
 						'text' => $substate,
 					);
 				}
 
-				$state_choices[] = array(
+				$state_choices[ ] = array(
 					'text' => $key,
 					'value' => $state_subchoices,
 				);
 
 			} else {
-				$state_choices[] = array(
+				$state_choices[ ] = array(
 					'value' => is_numeric( $key ) ? $state : $key,
 					'text' => $state,
 				);
@@ -193,13 +193,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;
 	}
@@ -220,12 +220,12 @@ 
 		// 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 ) {
 			return $input_type;
 		}
 
 		// 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;
 		}
 
@@ -273,20 +273,20 @@ 
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
 
 		// 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/admin/class-gravityview-admin-view-item.php

Spacing +20 added lines, -20 removed lines

@@ -44,12 +44,12 @@ 
 	 */
 	protected $form_id;
 
-	function __construct( $title = '', $item_id = '', $item = array(), $settings = array(), $form_id = null) {
+	function __construct( $title = '', $item_id = '', $item = array(), $settings = array(), $form_id = null ) {
 
 		// Backward compat
-		if ( ! empty( $item['type'] ) ) {
-			$item['input_type'] = $item['type'];
-			unset( $item['type'] );
+		if ( ! empty( $item[ 'type' ] ) ) {
+			$item[ 'input_type' ] = $item[ 'type' ];
+			unset( $item[ 'type' ] );
 		}
 
 		if ( $admin_label = \GV\Utils::get( $settings, 'admin_label' ) ) {
@@ -75,7 +75,7 @@ 
 		$this->id         = $item_id;
 		$this->form_id    = $form_id;
 		$this->settings   = $settings;
-		$this->label_type = $item['label_type'];
+		$this->label_type = $item[ 'label_type' ];
 	}
 
 	/**
@@ -119,14 +119,14 @@ 
 
 			foreach ( $field_info_items as $item ) {
 
-				if( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
+				if ( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
 					continue;
 				}
 
-				$class = isset( $item['class'] ) ? sanitize_html_class( $item['class'] ) . ' description' : 'description';
+				$class = isset( $item[ 'class' ] ) ? sanitize_html_class( $item[ 'class' ] ) . ' description' : 'description';
 				// Add the title in case the value's long, in which case, it'll be truncated by CSS.
 				$output .= '<span class="' . $class . '">';
-				$output .= esc_html( $item['value'] );
+				$output .= esc_html( $item[ 'value' ] );
 				$output .= '</span>';
 			}
 
@@ -154,21 +154,21 @@ 
 
 		// $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know.
 		// TODO: Un-hack this
-		$hide_settings_link_class = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
-		$settings_link      = sprintf( '<button class="gv-field-settings" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons %2$s"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class );
+		$hide_settings_link_class = ( empty( $this->item[ 'settings_html' ] ) || strpos( $this->item[ 'settings_html' ], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
+		$settings_link = sprintf( '<button class="gv-field-settings" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons %2$s"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class );
 
 		// Should we show the icon that the field is being used as a link to single entry?
-		$hide_show_as_link_class = empty( $this->settings['show_as_link'] ) ? 'hide-if-js' : '';
+		$hide_show_as_link_class = empty( $this->settings[ 'show_as_link' ] ) ? 'hide-if-js' : '';
 		$show_as_link            = '<span class="dashicons dashicons-admin-links ' . $hide_show_as_link_class . '" title="' . esc_attr( $single_link_title ) . '"></span>';
 
 		// When a field label is empty, use the Field ID
 		$label = empty( $this->title ) ? sprintf( _x( 'Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview' ), $this->id ) : $this->title;
 
 		// If there's a custom label, and show label is checked, use that as the field heading
-		if ( ! empty( $this->settings['custom_label'] ) && ! empty( $this->settings['show_label'] ) ) {
-			$label = $this->settings['custom_label'];
-		} else if ( ! empty( $this->item['customLabel'] ) ) {
-			$label = $this->item['customLabel'];
+		if ( ! empty( $this->settings[ 'custom_label' ] ) && ! empty( $this->settings[ 'show_label' ] ) ) {
+			$label = $this->settings[ 'custom_label' ];
+		} else if ( ! empty( $this->item[ 'customLabel' ] ) ) {
+			$label = $this->item[ 'customLabel' ];
 		}
 		$label = esc_attr( $label );
 
@@ -176,8 +176,8 @@ 
 
 		$output .= '<h5 class="selectable gfield field-id-' . esc_attr( $this->id ) . '">';
 
-		if ( ! empty( $this->item['parent'] ) ) {
-			$label .= ' <small>(' . esc_attr( $this->item['parent']['label'] ) . ')</small>';
+		if ( ! empty( $this->item[ 'parent' ] ) ) {
+			$label .= ' <small>(' . esc_attr( $this->item[ 'parent' ][ 'label' ] ) . ')</small>';
 		}
 
 		// Name of field / widget
@@ -193,10 +193,10 @@ 
 
 		$output .= '</h5>';
 
-		$container_class = ! empty( $this->item['parent'] ) ? ' gv-child-field' : '';
-		$data_form_id   = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
+		$container_class = ! empty( $this->item[ 'parent' ] ) ? ' gv-child-field' : '';
+		$data_form_id = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
 
-		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item['input_type'] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item['settings_html'] . '</div>';
+		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item[ 'input_type' ] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item[ 'settings_html' ] . '</div>';
 
 		return $output;
 	}

includes/admin/class.render.settings.php

Spacing +73 added lines, -73 removed lines

@@ -30,7 +30,7 @@ 
 
 		$is_table_layout = preg_match( '/table/ism', $template_id );
 
-		if( 'field' === $field_type ) {
+		if ( 'field' === $field_type ) {
 
 			// Default options - fields
 			$field_options = array(
@@ -49,7 +49,7 @@ 
 				'custom_class' => array(
 					'type' => 'text',
 					'label' => __( 'Custom CSS Class:', 'gravityview' ),
-					'desc' => __( 'This class will be added to the field container', 'gravityview'),
+					'desc' => __( 'This class will be added to the field container', 'gravityview' ),
 					'value' => '',
 					'merge_tags' => true,
 					'tooltip' => 'gv_css_merge_tags',
@@ -70,11 +70,11 @@ 
 			);
 
 			// Match Table as well as DataTables
-			if( $is_table_layout && 'directory' === $context ) {
-				$field_options['width'] = array(
+			if ( $is_table_layout && 'directory' === $context ) {
+				$field_options[ 'width' ] = array(
 					'type' => 'number',
-					'label' => __('Percent Width', 'gravityview'),
-					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview'),
+					'label' => __( 'Percent Width', 'gravityview' ),
+					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview' ),
 					'class' => 'code widefat',
 					'value' => '',
 				);
@@ -129,8 +129,8 @@ 
 			'manage_options' => __( 'Administrator', 'gravityview' ),
 		);
 
-		if( is_multisite() ) {
-			$select_cap_choices['manage_network'] = __('Multisite Super Admin', 'gravityview' );
+		if ( is_multisite() ) {
+			$select_cap_choices[ 'manage_network' ] = __( 'Multisite Super Admin', 'gravityview' );
 		}
 
 		/**
@@ -143,7 +143,7 @@ 
 		 * @param  string $context     Optional. What context are we in? Example: `single` or `directory`
 		 * @param  string $input_type  Optional. (textarea, list, select, etc.)
 		 */
-		$select_cap_choices = apply_filters('gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
+		$select_cap_choices = apply_filters( 'gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
 
 		return $select_cap_choices;
 	}
@@ -171,27 +171,27 @@ 
 	 */
 	public static function render_field_options( $form_id, $field_type, $template_id, $field_id, $field_label, $area, $input_type = NULL, $uniqid = '', $current = '', $context = 'single', $item = array() ) {
 
-		if( empty( $uniqid ) ) {
+		if ( empty( $uniqid ) ) {
 			//generate a unique field id
-			$uniqid = uniqid('', false);
+			$uniqid = uniqid( '', false );
 		}
 
 		// get field/widget options
 		$options = self::get_default_field_options( $field_type, $template_id, $field_id, $context, $input_type, $form_id );
 
 		// two different post arrays, depending of the field type
-		$name_prefix = $field_type .'s' .'['. $area .']['. $uniqid .']';
+		$name_prefix = $field_type . 's' . '[' . $area . '][' . $uniqid . ']';
 
 		// build output
 		$output = '';
-		$output .= '<input type="hidden" class="field-key" name="'. $name_prefix .'[id]" value="'. esc_attr( $field_id ) .'">';
-		$output .= '<input type="hidden" class="field-label" name="'. $name_prefix .'[label]" value="'. esc_attr( $field_label ) .'">';
+		$output .= '<input type="hidden" class="field-key" name="' . $name_prefix . '[id]" value="' . esc_attr( $field_id ) . '">';
+		$output .= '<input type="hidden" class="field-label" name="' . $name_prefix . '[label]" value="' . esc_attr( $field_label ) . '">';
 		if ( $form_id ) {
-			$output .= '<input type="hidden" class="field-form-id" name="'. $name_prefix .'[form_id]" value="'. esc_attr( $form_id ) .'">';
+			$output .= '<input type="hidden" class="field-form-id" name="' . $name_prefix . '[form_id]" value="' . esc_attr( $form_id ) . '">';
 		}
 
 		// If there are no options, return what we got.
-		if(empty($options)) {
+		if ( empty( $options ) ) {
 
 			// This is here for checking if the output is empty in render_label()
 			$output .= '<!-- No Options -->';
@@ -199,33 +199,33 @@ 
 			return $output;
 		}
 
-		$output .= '<div class="gv-dialog-options" title="'. esc_attr( sprintf( __( 'Options: %s', 'gravityview' ) , strip_tags( html_entity_decode( $field_label ) ) ) ) .'">';
+		$output .= '<div class="gv-dialog-options" title="' . esc_attr( sprintf( __( 'Options: %s', 'gravityview' ), strip_tags( html_entity_decode( $field_label ) ) ) ) . '">';
 
 		/**
 		 * @since 1.8
 		 */
-		if( !empty( $item['subtitle'] ) ) {
-			$output .= '<div class="subtitle">' . $item['subtitle'] . '</div>';
+		if ( ! empty( $item[ 'subtitle' ] ) ) {
+			$output .= '<div class="subtitle">' . $item[ 'subtitle' ] . '</div>';
 		}
 
-		foreach( $options as $key => $option ) {
+		foreach ( $options as $key => $option ) {
 
 			$value = isset( $current[ $key ] ) ? $current[ $key ] : NULL;
 
-			$field_output = self::render_field_option( $name_prefix . '['. $key .']' , $option, $value);
+			$field_output = self::render_field_option( $name_prefix . '[' . $key . ']', $option, $value );
 
 			// The setting is empty
-			if( empty( $field_output ) ) {
+			if ( empty( $field_output ) ) {
 				continue;
 			}
 
-			switch( $option['type'] ) {
+			switch ( $option[ 'type' ] ) {
 				// Hide hidden fields
 				case 'hidden':
-					$output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . ' screen-reader-text">'. $field_output . '</div>';
+					$output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . ' screen-reader-text">' . $field_output . '</div>';
 					break;
 				default:
-					$output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . '">'. $field_output .'</div>';
+					$output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . '">' . $field_output . '</div>';
 			}
 		}
 
@@ -254,17 +254,17 @@ 
 		 * @deprecated setting index 'default' was replaced by 'value'
 		 * @see GravityView_FieldType::get_field_defaults
 		 */
-		if( !empty( $option['default'] ) && empty( $option['value'] ) ) {
-			$option['value'] = $option['default'];
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting '. $name .' details' );
+		if ( ! empty( $option[ 'default' ] ) && empty( $option[ 'value' ] ) ) {
+			$option[ 'value' ] = $option[ 'default' ];
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting ' . $name . ' details' );
 		}
 
 		// prepare to render option field type
-		if( isset( $option['type'] ) ) {
+		if ( isset( $option[ 'type' ] ) ) {
 
 			$type_class = self::load_type_class( $option );
 
-			if( class_exists( $type_class ) ) {
+			if ( class_exists( $type_class ) ) {
 
 				/** @var GravityView_FieldType $render_type */
 				$render_type = new $type_class( $name, $option, $curr_value );
@@ -281,7 +281,7 @@ 
 				 * @param[in,out] string $output field class name
 				 * @param[in] array $option  option field data
 				 */
-				$output = apply_filters( "gravityview/option/output/{$option['type']}" , $output, $option );
+				$output = apply_filters( "gravityview/option/output/{$option[ 'type' ]}", $output, $option );
 			}
 
 		} // isset option[type]
@@ -316,27 +316,27 @@ 
 		 * @deprecated setting index 'name' was replaced by 'label'
 		 * @see GravityView_FieldType::get_field_defaults
 		 */
-		if( isset( $setting['name'] ) && empty( $setting['label'] ) ) {
-			$setting['label'] = $setting['name'];
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting '. $key .' details' );
+		if ( isset( $setting[ 'name' ] ) && empty( $setting[ 'label' ] ) ) {
+			$setting[ 'label' ] = $setting[ 'name' ];
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting ' . $key . ' details' );
 		}
 
 		$name = esc_attr( sprintf( $name, $key ) );
-		$setting['id'] = esc_attr( sprintf( $id, $key ) );
-		$setting['tooltip'] = 'gv_' . $key;
+		$setting[ 'id' ] = esc_attr( sprintf( $id, $key ) );
+		$setting[ 'tooltip' ] = 'gv_' . $key;
 
 		// Use default if current setting isn't set.
-		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting['value'];
+		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting[ 'value' ];
 
 		// default setting type = text
-		$setting['type'] = empty( $setting['type'] ) ? 'text' : $setting['type'];
+		$setting[ 'type' ] = empty( $setting[ 'type' ] ) ? 'text' : $setting[ 'type' ];
 
 		// merge tags
-		if( !isset( $setting['merge_tags'] ) ) {
-			if( $setting['type'] === 'text' ) {
-				$setting['merge_tags'] = true;
+		if ( ! isset( $setting[ 'merge_tags' ] ) ) {
+			if ( $setting[ 'type' ] === 'text' ) {
+				$setting[ 'merge_tags' ] = true;
 			} else {
-				$setting['merge_tags'] = false;
+				$setting[ 'merge_tags' ] = false;
 			}
 		}
 
@@ -344,7 +344,7 @@ 
 
 		// render the setting
 		$type_class = self::load_type_class( $setting );
-		if( class_exists( $type_class ) ) {
+		if ( class_exists( $type_class ) ) {
 			/** @var GravityView_FieldType $render_type */
 			$render_type = new $type_class( $name, $setting, $curr_value );
 			ob_start();
@@ -353,25 +353,25 @@ 
 		}
 
 		// Check if setting is specific for a template
-		if( !empty( $setting['show_in_template'] ) ) {
-			if( !is_array( $setting['show_in_template'] ) ) {
-				$setting['show_in_template'] = array( $setting['show_in_template'] );
+		if ( ! empty( $setting[ 'show_in_template' ] ) ) {
+			if ( ! is_array( $setting[ 'show_in_template' ] ) ) {
+				$setting[ 'show_in_template' ] = array( $setting[ 'show_in_template' ] );
 			}
-			$show_if = ' data-show-if="'. implode( ' ', $setting['show_in_template'] ).'"';
+			$show_if = ' data-show-if="' . implode( ' ', $setting[ 'show_in_template' ] ) . '"';
 		} else {
 			$show_if = '';
 		}
 
-		if( ! empty( $setting['requires'] ) ) {
-			$show_if .= sprintf( ' data-requires="%s"', $setting['requires'] );
+		if ( ! empty( $setting[ 'requires' ] ) ) {
+			$show_if .= sprintf( ' data-requires="%s"', $setting[ 'requires' ] );
 		}
 
-		if( ! empty( $setting['requires_not'] ) ) {
-			$show_if .= sprintf( ' data-requires-not="%s"', $setting['requires_not'] );
+		if ( ! empty( $setting[ 'requires_not' ] ) ) {
+			$show_if .= sprintf( ' data-requires-not="%s"', $setting[ 'requires_not' ] );
 		}
 
 		// output
-		echo '<tr style="vertical-align: top;" '. $show_if .'>' . $output . '</tr>';
+		echo '<tr style="vertical-align: top;" ' . $show_if . '>' . $output . '</tr>';
 
 	}
 
@@ -383,7 +383,7 @@ 
 	 */
 	public static function load_type_class( $field = NULL ) {
 
-		if( empty( $field['type'] ) ) {
+		if ( empty( $field[ 'type' ] ) ) {
 			return NULL;
 		}
 
@@ -392,9 +392,9 @@ 
 		 * @param string $class_suffix  field class suffix; `GravityView_FieldType_{$class_suffix}`
 		 * @param array $field   field data
 		 */
-		$type_class = apply_filters( "gravityview/setting/class/{$field['type']}", 'GravityView_FieldType_' . $field['type'], $field );
+		$type_class = apply_filters( "gravityview/setting/class/{$field[ 'type' ]}", 'GravityView_FieldType_' . $field[ 'type' ], $field );
 
-		if( class_exists( $type_class ) ) {
+		if ( class_exists( $type_class ) ) {
 			return $type_class;
 		}
 
@@ -403,9 +403,9 @@ 
 		 * @param string  $field_type_include_path field class file path
 		 * @param array $field  field data
 		 */
-		$class_file = apply_filters( "gravityview/setting/class_file/{$field['type']}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field['type']}.php", $field );
+		$class_file = apply_filters( "gravityview/setting/class_file/{$field[ 'type' ]}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field[ 'type' ]}.php", $field );
 
-		if( $class_file && file_exists( $class_file ) ) {
+		if ( $class_file && file_exists( $class_file ) ) {
 			require_once( $class_file );
 		}
 
@@ -427,8 +427,8 @@ 
 
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_checkbox::render_input' );
 
-		$output  = '<input name="'. esc_attr( $name ) .'" type="hidden" value="0">';
-		$output .= '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="checkbox" value="1" '. checked( $current, '1', false ) .' >';
+		$output  = '<input name="' . esc_attr( $name ) . '" type="hidden" value="0">';
+		$output .= '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="checkbox" value="1" ' . checked( $current, '1', false ) . ' >';
 
 		return $output;
 	}
@@ -448,22 +448,22 @@ 
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_text::render_input' );
 
 		// Show the merge tags if the field is a list view
-		$is_list = ( preg_match( '/_list-/ism', $name ));
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
 
 		// Or is a single entry view
-		$is_single = ( preg_match( '/single_/ism', $name ));
+		$is_single = ( preg_match( '/single_/ism', $name ) );
 		$show = ( $is_single || $is_list );
 
 		$class = '';
 		// and $add_merge_tags is not false
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
 		}
 
-		$class .= !empty( $args['class'] ) ? $args['class'] : 'widefat';
-		$type = !empty( $args['type'] ) ? $args['type'] : 'text';
+		$class .= ! empty( $args[ 'class' ] ) ? $args[ 'class' ] : 'widefat';
+		$type = ! empty( $args[ 'type' ] ) ? $args[ 'type' ] : 'text';
 
-		return '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="'.esc_attr($type).'" value="'. esc_attr( $current ) .'" class="'.esc_attr( $class ).'">';
+		return '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="' . esc_attr( $type ) . '" value="' . esc_attr( $current ) . '" class="' . esc_attr( $class ) . '">';
 	}
 
 	/**
@@ -480,21 +480,21 @@ 
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_textarea::render_input' );
 
 		// Show the merge tags if the field is a list view
-		$is_list = ( preg_match( '/_list-/ism', $name ));
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
 
 		// Or is a single entry view
-		$is_single = ( preg_match( '/single_/ism', $name ));
+		$is_single = ( preg_match( '/single_/ism', $name ) );
 		$show = ( $is_single || $is_list );
 
 		$class = '';
 		// and $add_merge_tags is not false
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
 		}
 
-		$class .= !empty( $args['class'] ) ? 'widefat '.$args['class'] : 'widefat';
+		$class .= ! empty( $args[ 'class' ] ) ? 'widefat ' . $args[ 'class' ] : 'widefat';
 
-		return '<textarea name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" class="'.esc_attr( $class ).'">'. esc_textarea( $current ) .'</textarea>';
+		return '<textarea name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class ) . '">' . esc_textarea( $current ) . '</textarea>';
 	}
 
 	/**
@@ -510,9 +510,9 @@ 
 
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_select::render_input' );
 
-		$output = '<select name="'. $name .'" id="'. $id .'">';
-		foreach( $choices as $value => $label ) {
-			$output .= '<option value="'. esc_attr( $value ) .'" '. selected( $value, $current, false ) .'>'. esc_html( $label ) .'</option>';
+		$output = '<select name="' . $name . '" id="' . $id . '">';
+		foreach ( $choices as $value => $label ) {
+			$output .= '<option value="' . esc_attr( $value ) . '" ' . selected( $value, $current, false ) . '>' . esc_html( $label ) . '</option>';
 		}
 		$output .= '</select>';
 

future/includes/class-gv-utils.php

Doc Comments +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
 	 * @param string $name The key name (will be prefixed).
 	 * @param mixed $default The default value if not found (Default: null)
 	 *
-	 * @return mixed The value or $default if not found.
+	 * @return string The value or $default if not found.
 	 */
 	public static function _SERVER( $name, $default = null ) {
 		return self::get( $_SERVER, $name, $default );
@@ -126,7 +126,7 @@ 
 	 *
 	 * @param mixed $value The value to return from the closure.
 	 *
-	 * @return Closure The closure with the $value bound.
+	 * @return \Closure The closure with the $value bound.
 	 */
 	public static function _return( $value ) {
 		return function() use ( $value ) { return $value; };

Spacing +3 added lines, -3 removed lines

@@ -91,7 +91,7 @@ 
 		 * Try subkeys after split.
 		 */
 		if ( count( $parts = explode( '/', $key, 2 ) ) > 1 ) {
-			return self::get( self::get( $array, $parts[0] ), $parts[1], $default );
+			return self::get( self::get( $array, $parts[ 0 ] ), $parts[ 1 ], $default );
 		}
 
 		return $default;
@@ -145,7 +145,7 @@ 
 	public static function gf_query_debug( $query ) {
 		$introspect = $query->_introspect();
 		return array(
-			'where' => $query->_where_unwrap( $introspect['where'] )
+			'where' => $query->_where_unwrap( $introspect[ 'where' ] )
 		);
 	}
 
@@ -158,7 +158,7 @@ 
 		if ( $condition->expressions ) {
 			$conditions = array();
 			foreach ( $condition->expressions as $expression ) {
-				$conditions[] = self::gf_query_strip_condition_column_aliases( $expression );
+				$conditions[ ] = self::gf_query_strip_condition_column_aliases( $expression );
 			}
 			return call_user_func_array(
 				array( '\GF_Query_Condition', $condition->operator == 'AND' ? '_and' : '_or' ),