gravityview / GravityView

includes/admin/class.render.settings.php

Spacing +87 added lines, -87 removed lines

@@ -53,7 +53,7 @@ 
 
 		$is_table_layout = preg_match( '/table/ism', $template_id );
 
-		if( 'field' === $field_type ) {
+		if ( 'field' === $field_type ) {
 
 			// Default options - fields
 			$field_options = array(
@@ -105,11 +105,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' => '',
 					'priority' => 200,
@@ -121,7 +121,7 @@ 
 
 		// Remove suffix ":" from the labels to standardize style. Using trim() instead of rtrim() for i18n.
 		foreach ( $field_options as $key => $field_option ) {
-			$field_options[ $key ]['label'] = trim( $field_options[ $key ]['label'], ':' );
+			$field_options[ $key ][ 'label' ] = trim( $field_options[ $key ][ 'label' ], ':' );
 		}
 
 		/**
@@ -146,8 +146,8 @@ 
 		 */
 		$field_options = apply_filters( "gravityview_template_{$input_type}_options", $field_options, $template_id, $field_id, $context, $input_type, $form_id );
 
-		if ( 'directory' === $context && isset( $field_options['show_as_link'] ) && ! isset( $field_options['new_window'] ) ) {
-			$field_options['new_window'] = array(
+		if ( 'directory' === $context && isset( $field_options[ 'show_as_link' ] ) && ! isset( $field_options[ 'new_window' ] ) ) {
+			$field_options[ 'new_window' ] = array(
 				'type'     => 'checkbox',
 				'label'    => __( 'Open link in a new tab or window?', 'gravityview' ),
 				'value'    => false,
@@ -168,7 +168,7 @@ 
 				switch ( $key ) {
 					case 'show_as_link':
 						$_group = 'display';
-						$field_option['priority'] = 100;
+						$field_option[ 'priority' ] = 100;
 						break;
 					default:
 						$_group = \GV\Utils::get( $field_option, 'group', 'display' );
@@ -183,7 +183,7 @@ 
 			}
 
 			$field_options = array();
-			foreach ( self::get_field_groups() as $group_key => $group_name  ) {
+			foreach ( self::get_field_groups() as $group_key => $group_name ) {
 				$field_options[ $group_key ] = \GV\Utils::get( $option_groups, $group_key, array() );
 			}
 
@@ -214,7 +214,7 @@ 
 			return 0;
 		}
 
-		return ( $a_priority < $b_priority ) ? - 1 : 1;
+		return ( $a_priority < $b_priority ) ? -1 : 1;
 	}
 
 	/**
@@ -239,8 +239,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' );
 		}
 
 		/**
@@ -253,7 +253,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;
 	}
@@ -280,9 +280,9 @@ 
 	 */
 	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 );
 		}
 
 		$grouped = ( 'field' === $field_type );
@@ -290,24 +290,24 @@ 
 		// get field/widget options
 		$option_groups = self::get_default_field_options( $field_type, $template_id, $field_id, $context, $input_type, $form_id, $grouped );
 
-		if( ! $grouped ) {
+		if ( ! $grouped ) {
 			$option_groups = array( $option_groups );
 		}
 
 		$option_groups = array_filter( $option_groups );
 
 		// 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
-		$hidden_fields  = '<input type="hidden" class="field-key" name="'. $name_prefix .'[id]" value="'. esc_attr( $field_id ) .'">';
-		$hidden_fields .= '<input type="hidden" class="field-label" name="'. $name_prefix .'[label]" value="'. esc_attr( $field_label ) .'">';
+		$hidden_fields  = '<input type="hidden" class="field-key" name="' . $name_prefix . '[id]" value="' . esc_attr( $field_id ) . '">';
+		$hidden_fields .= '<input type="hidden" class="field-label" name="' . $name_prefix . '[label]" value="' . esc_attr( $field_label ) . '">';
 
 		$form_title = '';
 		if ( $form_id ) {
-			$hidden_fields .= '<input type="hidden" class="field-form-id" name="'. $name_prefix .'[form_id]" value="'. esc_attr( $form_id ) .'">';
+			$hidden_fields .= '<input type="hidden" class="field-form-id" name="' . $name_prefix . '[form_id]" value="' . esc_attr( $form_id ) . '">';
 			$form = GVCommon::get_form( $form_id );
-			$form_title = $form['title'];
+			$form_title = $form[ 'title' ];
 		}
 
 		// If there are no options, return what we got.
@@ -315,14 +315,14 @@ 
 			return $hidden_fields . '<!-- No Options -->'; // The HTML comment is here for checking if the output is empty in render_label()
 		}
 
-		$settings_title = esc_attr( sprintf( __( '%s Settings', 'gravityview' ) , strip_tags( html_entity_decode( $field_label ) ) ) );
+		$settings_title = esc_attr( sprintf( __( '%s Settings', 'gravityview' ), strip_tags( html_entity_decode( $field_label ) ) ) );
 
 		$field_details = '';
 
 		// Get the pretty name for the input type
 		$gv_field = GravityView_Fields::get( $input_type );
 
-		if( $gv_field ) {
+		if ( $gv_field ) {
 			$input_type_label = $gv_field->label;
 		} else {
 			$input_type_label = $input_type;
@@ -336,7 +336,7 @@ 
 			}
 
 			if ( $grouped ) {
-				$group_name     = rgar( self::get_field_groups(), $group_key, '' );
+				$group_name = rgar( self::get_field_groups(), $group_key, '' );
 				$field_settings .= '<fieldset class="item-settings-group item-settings-group-' . esc_attr( $group_key ) . '">';
 				$field_settings .= '<legend>' . esc_attr( $group_name ) . '</legend>';
 			}
@@ -353,15 +353,15 @@ 
 				}
 
 				$show_if = '';
-				if ( ! empty( $option['requires'] ) ) {
-					$show_if .= sprintf( ' data-requires="%s"', $option['requires'] );
+				if ( ! empty( $option[ 'requires' ] ) ) {
+					$show_if .= sprintf( ' data-requires="%s"', $option[ 'requires' ] );
 				}
 
-				if ( ! empty( $option['requires_not'] ) ) {
-					$show_if .= sprintf( ' data-requires-not="%s"', $option['requires_not'] );
+				if ( ! empty( $option[ 'requires_not' ] ) ) {
+					$show_if .= sprintf( ' data-requires-not="%s"', $option[ 'requires_not' ] );
 				}
 
-				switch ( $option['type'] ) {
+				switch ( $option[ 'type' ] ) {
 					// Hide hidden fields
 					case 'hidden':
 						$field_settings .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . ' screen-reader-text">' . $field_output . '</div>';
@@ -379,30 +379,30 @@ 
 		$item_details = '';
 		$subtitle = '';
 
-		if( 'field' === $field_type ) {
-			$subtitle = ! empty( $item['subtitle'] ) ? '<div class="subtitle">' . $item['subtitle'] . '</div>' : '';
+		if ( 'field' === $field_type ) {
+			$subtitle = ! empty( $item[ 'subtitle' ] ) ? '<div class="subtitle">' . $item[ 'subtitle' ] . '</div>' : '';
 
 			$item_details .= '
 			<div class="gv-field-details--container">
-				<label class="gv-field-details--toggle">' . esc_html__( 'Field Details', 'gravityview' ) .' <i class="dashicons dashicons-arrow-right"></i></label>
+				<label class="gv-field-details--toggle">' . esc_html__( 'Field Details', 'gravityview' ) . ' <i class="dashicons dashicons-arrow-right"></i></label>
 				<section class="gv-field-details gv-field-details--closed">';
 
 				if ( $field_id && is_numeric( $field_id ) ) {
 				$item_details .= '
 					<div class="gv-field-detail gv-field-detail--field">
-						<span class="gv-field-detail--label">' . esc_html__( 'Field ID', 'gravityview' ) .'</span><span class="gv-field-detail--value">#{{field_id}}</span>
+						<span class="gv-field-detail--label">' . esc_html__( 'Field ID', 'gravityview' ) . '</span><span class="gv-field-detail--value">#{{field_id}}</span>
 					</div>';
 			    }
 
 				$item_details .= '
 					<div class="gv-field-detail gv-field-detail--type">
-						<span class="gv-field-detail--label">' . esc_html_x( 'Type', 'The type of field being configured (eg: "Single Line Text")', 'gravityview' ) .'</span><span class="gv-field-detail--value">{{input_type_label}}</span>
+						<span class="gv-field-detail--label">' . esc_html_x( 'Type', 'The type of field being configured (eg: "Single Line Text")', 'gravityview' ) . '</span><span class="gv-field-detail--value">{{input_type_label}}</span>
 					</div>';
 
-				if( $form_id ) {
+				if ( $form_id ) {
 					$item_details .= '
 					<div class="gv-field-detail gv-field-detail--form">
-						<span class="gv-field-detail--label">' . esc_html__( 'Form', 'gravityview' ) .'</span><span class="gv-field-detail--value">{{form_title}} (#{{form_id}})</span>
+						<span class="gv-field-detail--label">' . esc_html__( 'Form', 'gravityview' ) . '</span><span class="gv-field-detail--value">{{form_title}} (#{{form_id}})</span>
 					</div>';
 				}
 				$item_details .= '
@@ -410,8 +410,8 @@ 
 			</div>';
 		} else {
 			$widget_details_content = rgar( $item, 'description', '' );
-			if ( ! empty( $item['subtitle'] ) ) {
-				$widget_details_content .= ( '' !== $widget_details_content ) ? "\n\n" . $item['subtitle'] : $item['subtitle'];
+			if ( ! empty( $item[ 'subtitle' ] ) ) {
+				$widget_details_content .= ( '' !== $widget_details_content ) ? "\n\n" . $item[ 'subtitle' ] : $item[ 'subtitle' ];
 			}
 
 			// Intentionally not escaping to allow HTML.
@@ -467,17 +467,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 ) ) {
 
 				/** @type GravityView_FieldType $render_type */
 				$render_type = new $type_class( $name, $option, $curr_value );
@@ -494,7 +494,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]
@@ -529,27 +529,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;
 			}
 		}
 
@@ -557,7 +557,7 @@ 
 
 		// render the setting
 		$type_class = self::load_type_class( $setting );
-		if( class_exists( $type_class ) ) {
+		if ( class_exists( $type_class ) ) {
 			/** @type GravityView_FieldType $render_type */
 			$render_type = new $type_class( $name, $setting, $curr_value );
 			ob_start();
@@ -566,25 +566,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>';
 
 	}
 
@@ -596,7 +596,7 @@ 
 	 */
 	public static function load_type_class( $field = NULL ) {
 
-		if( empty( $field['type'] ) ) {
+		if ( empty( $field[ 'type' ] ) ) {
 			return NULL;
 		}
 
@@ -605,9 +605,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;
 		}
 
@@ -616,9 +616,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 );
 		}
 
@@ -640,8 +640,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;
 	}
@@ -661,22 +661,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 ) . '">';
 	}
 
 	/**
@@ -693,21 +693,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>';
 	}
 
 	/**
@@ -723,9 +723,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>';
 

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

Spacing +16 added lines, -16 removed lines

@@ -26,7 +26,7 @@ 
 
 		$this->label = esc_attr__( 'Approve Entries', 'gravityview' );
 
-		$this->description =  esc_attr__( 'Approve and reject entries from the View.', 'gravityview' );
+		$this->description = esc_attr__( 'Approve and reject entries from the View.', 'gravityview' );
 
 		$this->add_hooks();
 
@@ -48,11 +48,11 @@ 
 	 */
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
 
-		unset( $field_options['only_loggedin'] );
+		unset( $field_options[ 'only_loggedin' ] );
 
-		unset( $field_options['new_window'] );
+		unset( $field_options[ 'new_window' ] );
 
-		unset( $field_options['show_as_link'] );
+		unset( $field_options[ 'show_as_link' ] );
 
 		return $field_options;
 	}
@@ -75,7 +75,7 @@ 
 
 		add_action( 'gravityview/field/approval/load_scripts', array( $this, 'enqueue_and_localize_script' ) );
 
-		add_action( 'gravityview_datatables_scripts_styles',  array( $this, 'enqueue_and_localize_script' ) );
+		add_action( 'gravityview_datatables_scripts_styles', array( $this, 'enqueue_and_localize_script' ) );
 
 		add_filter( 'gravityview_get_entries', array( $this, 'modify_search_parameters' ), 1000 );
 
@@ -97,7 +97,7 @@ 
 	public function maybe_prevent_field_render( $html, $args ) {
 
 		// If the field is `entry_approval` type but the user doesn't have the moderate entries cap, don't render.
-		if( $this->name === \GV\Utils::get( $args['field'], 'id' ) && ! GVCommon::has_cap('gravityview_moderate_entries') ) {
+		if ( $this->name === \GV\Utils::get( $args[ 'field' ], 'id' ) && ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
 			return '';
 		}
 
@@ -127,7 +127,7 @@ 
 	public function modify_search_parameters( $parameters ) {
 
 		if ( $this->name === \GV\Utils::get( $parameters, 'sorting/key' ) ) {
-			$parameters['sorting']['key'] = 'is_approved';
+			$parameters[ 'sorting' ][ 'key' ] = 'is_approved';
 		}
 
 		return $parameters;
@@ -148,7 +148,7 @@ 
 
 		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
-		wp_register_script( 'gravityview-field-approval', GRAVITYVIEW_URL . 'assets/js/field-approval'.$script_debug.'.js', array( 'jquery' ), GravityView_Plugin::version, true );
+		wp_register_script( 'gravityview-field-approval', GRAVITYVIEW_URL . 'assets/js/field-approval' . $script_debug . '.js', array( 'jquery' ), GravityView_Plugin::version, true );
 
 		wp_register_script( 'gravityview-field-approval-popper', GRAVITYVIEW_URL . 'assets/lib/tippy/popper.min.js', array(), GravityView_Plugin::version, true );
 		wp_register_script( 'gravityview-field-approval-tippy', GRAVITYVIEW_URL . 'assets/lib/tippy/tippy.min.js', array(), GravityView_Plugin::version, true );
@@ -156,14 +156,14 @@ 
 
 		$style_path = GRAVITYVIEW_DIR . 'templates/css/field-approval.css';
 
-		if( class_exists( 'GravityView_View' ) ) {
+		if ( class_exists( 'GravityView_View' ) ) {
 			/**
 			 * Override CSS file by placing in your theme's /gravityview/css/ sub-directory.
 			 */
 			$style_path = GravityView_View::getInstance()->locate_template( 'css/field-approval.css', false );
 		}
 
-		$style_url = plugins_url( 'css/field-approval.css', trailingslashit( dirname( $style_path ) )  );
+		$style_url = plugins_url( 'css/field-approval.css', trailingslashit( dirname( $style_path ) ) );
 
 		/**
 		 * @filter `gravityview/field/approval/css_url` URL to the Approval field CSS file.
@@ -172,7 +172,7 @@ 
 		 */
 		$style_url = apply_filters( 'gravityview/field/approval/css_url', $style_url );
 
-		if( ! empty( $style_url ) ) {
+		if ( ! empty( $style_url ) ) {
 			wp_register_style( 'gravityview-field-approval', $style_url, array( 'dashicons' ), GravityView_Plugin::version, 'screen' );
 		}
 
@@ -187,7 +187,7 @@ 
 	public function enqueue_and_localize_script() {
 
 		// The script is already registered and enqueued
-		if( wp_script_is( 'gravityview-field-approval', 'enqueued' ) ) {
+		if ( wp_script_is( 'gravityview-field-approval', 'enqueued' ) ) {
 			return;
 		}
 
@@ -200,11 +200,11 @@ 
 
 		wp_localize_script( 'gravityview-field-approval', 'gvApproval', array(
 			'ajaxurl' => admin_url( 'admin-ajax.php' ),
-			'nonce' => wp_create_nonce('gravityview_entry_approval'),
+			'nonce' => wp_create_nonce( 'gravityview_entry_approval' ),
 			'status' => GravityView_Entry_Approval_Status::get_all(),
 			'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
 			'status_popover_placement' => GravityView_Entry_Approval::get_popover_placement(),
-		));
+		) );
 
 	}
 
@@ -221,8 +221,8 @@ 
 	 */
 	public function filter_gravityview_entry_default_field( $entry_default_fields, $form, $context ) {
 
-		if ( ! isset( $entry_default_fields["{$this->name}"] ) && 'edit' !== $context ) {
-			$entry_default_fields["{$this->name}"] = array(
+		if ( ! isset( $entry_default_fields[ "{$this->name}" ] ) && 'edit' !== $context ) {
+			$entry_default_fields[ "{$this->name}" ] = array(
 				'label' => $this->label,
 				'desc'  => $this->description,
 				'type'  => $this->name,

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

Spacing +27 added lines, -27 removed lines

@@ -74,8 +74,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();
 
 			/** @type GF_Field_Address $address_field */
@@ -84,7 +84,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()
@@ -92,12 +92,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';
 			}
 		}
 
@@ -122,7 +122,7 @@ 
 		$country_choices = array();
 
 		foreach ( $countries as $key => $country ) {
-			$country_choices[] = array(
+			$country_choices[ ] = array(
 				'value' => $country,
 				'text' => $country,
 			);
@@ -147,7 +147,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();
 
@@ -159,8 +159,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;
 		}
 
@@ -169,19 +169,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,
 				);
@@ -205,13 +205,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;
 	}
@@ -232,12 +232,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;
 		}
 
@@ -284,17 +284,17 @@ 
 	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' ),
@@ -304,7 +304,7 @@ 
 			'priority'   => 98,
 		);
 
-		$add_options['show_map_link_new_window'] = array(
+		$add_options[ 'show_map_link_new_window' ] = array(
 			'type'       => 'checkbox',
 			'label'      => __( 'Open map link in a new tab or window?', 'gravityview' ),
 			'value'      => false,

future/includes/class-gv-view.php

Spacing +81 added lines, -82 removed lines

@@ -125,7 +125,7 @@ 
 		$supports = array( 'title', 'revisions' );
 
 		if ( $is_hierarchical ) {
-			$supports[] = 'page-attributes';
+			$supports[ ] = 'page-attributes';
 		}
 
 		/**
@@ -229,12 +229,12 @@ 
 		$tsv_rule = array( sprintf( '%s/([^/]+)/tsv/?', $slug ), 'index.php?gravityview=$matches[1]&tsv=1', 'top' );
 
 		add_filter( 'query_vars', function( $query_vars ) {
-			$query_vars[] = 'csv';
-			$query_vars[] = 'tsv';
+			$query_vars[ ] = 'csv';
+			$query_vars[ ] = 'tsv';
 			return $query_vars;
 		} );
 
-		if ( ! isset( $wp_rewrite->extra_rules_top[ $csv_rule[0] ] ) ) {
+		if ( ! isset( $wp_rewrite->extra_rules_top[ $csv_rule[ 0 ] ] ) ) {
 			call_user_func_array( 'add_rewrite_rule', $csv_rule );
 			call_user_func_array( 'add_rewrite_rule', $tsv_rule );
 		}
@@ -295,7 +295,7 @@ 
 
 						$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' );
 
-						$image =  sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', esc_attr__( 'Data Source', 'gravityview' ), esc_url( plugins_url( 'assets/images/screenshots/data-source.png', GRAVITYVIEW_FILE ) ) );
+						$image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', esc_attr__( 'Data Source', 'gravityview' ), esc_url( plugins_url( 'assets/images/screenshots/data-source.png', GRAVITYVIEW_FILE ) ) );
 
 						return \GVCommon::generate_notice( '<h3>' . $title . '</h3>' . wpautop( $message . $image ), 'notice' );
 					}
@@ -321,13 +321,13 @@ 
 			return $content;
 		}
 
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
 
 		/**
 		 * Editing a single entry.
 		 */
 		if ( $entry = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ) ) {
-			if ( $entry['status'] != 'active' ) {
+			if ( $entry[ 'status' ] != 'active' ) {
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
@@ -338,7 +338,7 @@ 
 			}
 
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -361,7 +361,7 @@ 
 
 			foreach ( $entryset as $e ) {
 
-				if ( 'active' !== $e['status'] ) {
+				if ( 'active' !== $e[ 'status' ] ) {
 					gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -372,7 +372,7 @@ 
 				}
 
 				if ( $show_only_approved && ! $is_admin_and_can_view ) {
-					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 						gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) );
 						return __( 'You are not allowed to view this content.', 'gravityview' );
 					}
@@ -547,7 +547,7 @@ 
 			$join_column    = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field::by_id( $join_column );
 			$join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field::by_id( $join_on_column );
 
-			$joins [] = new Join( $join, $join_column, $join_on, $join_on_column );
+			$joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column );
 		}
 
 		return $joins;
@@ -637,13 +637,13 @@ 
 			}
 
 			foreach ( $_fields as $field ) {
-				if ( ! empty( $field['unions'] ) ) {
-					foreach ( $field['unions'] as $form_id => $field_id ) {
+				if ( ! empty( $field[ 'unions' ] ) ) {
+					foreach ( $field[ 'unions' ] as $form_id => $field_id ) {
 						if ( ! isset( $unions[ $form_id ] ) ) {
 							$unions[ $form_id ] = array();
 						}
 
-						$unions[ $form_id ][ $field['id'] ] =
+						$unions[ $form_id ][ $field[ 'id' ] ] =
 							is_numeric( $field_id ) ? \GV\GF_Field::by_id( \GV\GF_Form::by_id( $form_id ), $field_id ) : \GV\Internal_Field::by_id( $field_id );
 					}
 				}
@@ -698,7 +698,7 @@ 
 		if ( ! $view->form ) {
 			gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array(
 				'view_id' => $view->ID,
-				'form_id' => $view->_gravityview_form_id ? : 0,
+				'form_id' => $view->_gravityview_form_id ?: 0,
 			) );
 		}
 
@@ -942,11 +942,11 @@ 
 		 * Remove multiple sorting before calling legacy filters.
 		 * This allows us to fake it till we make it.
 		 */
-		if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) {
+		if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) {
 			$has_multisort = true;
-			$parameters['sort_field'] = reset( $parameters['sort_field'] );
-			if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) {
-				$parameters['sort_direction'] = reset( $parameters['sort_direction'] );
+			$parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] );
+			if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) {
+				$parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] );
 			}
 		}
 
@@ -955,31 +955,30 @@ 
 		 */
 		$parameters = \GravityView_frontend::get_view_entries_parameters( $parameters, $this->form->ID );
 
-		$parameters['context_view_id'] = $this->ID;
+		$parameters[ 'context_view_id' ] = $this->ID;
 		$parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID );
 
 		if ( ! is_array( $parameters ) ) {
 			$parameters = array();
 		}
 
-		if ( ! is_array( $parameters['search_criteria'] ) ) {
-			$parameters['search_criteria'] = array();
+		if ( ! is_array( $parameters[ 'search_criteria' ] ) ) {
+			$parameters[ 'search_criteria' ] = array();
 		}
 
-		if ( ( ! isset( $parameters['search_criteria']['field_filters'] ) ) || ( ! is_array( $parameters['search_criteria']['field_filters'] ) ) ) {
-			$parameters['search_criteria']['field_filters'] = array();
+		if ( ( ! isset( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) || ( ! is_array( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) ) {
+			$parameters[ 'search_criteria' ][ 'field_filters' ] = array();
 		}
 
 		if ( $request instanceof REST\Request ) {
 			$atts = $this->settings->as_atts();
 			$paging_parameters = wp_parse_args( $request->get_paging(), array(
-					'paging' => array( 'page_size' => $atts['page_size'] ),
+					'paging' => array( 'page_size' => $atts[ 'page_size' ] ),
 				) );
-			$parameters['paging'] = $paging_parameters['paging'];
+			$parameters[ 'paging' ] = $paging_parameters[ 'paging' ];
 		}
 
-		$page = Utils::get( $parameters['paging'], 'current_page' ) ?
-			: ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / \GV\Utils::get( $parameters, 'paging/page_size', 25 ) ) + 1 );
+		$page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / \GV\Utils::get( $parameters, 'paging/page_size', 25 ) ) + 1 );
 
 		/**
 		 * Cleanup duplicate field_filter parameters to simplify the query.
@@ -987,14 +986,14 @@ 
 		$unique_field_filters = array();
 		foreach ( Utils::get( $parameters, 'search_criteria/field_filters', array() ) as $key => $filter ) {
 			if ( 'mode' === $key ) {
-				$unique_field_filters['mode'] = $filter;
+				$unique_field_filters[ 'mode' ] = $filter;
 			} else if ( ! in_array( $filter, $unique_field_filters ) ) {
-				$unique_field_filters[] = $filter;
+				$unique_field_filters[ ] = $filter;
 			}
 		}
-		$parameters['search_criteria']['field_filters'] = $unique_field_filters;
+		$parameters[ 'search_criteria' ][ 'field_filters' ] = $unique_field_filters;
 
-		if ( ! empty( $parameters['search_criteria']['field_filters'] ) ) {
+		if ( ! empty( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) {
 			gravityview()->log->notice( 'search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.' );
 		}
 
@@ -1003,7 +1002,7 @@ 
 			$query_class = $this->get_query_class();
 
 			/** @type \GF_Query $query */
-			$query = new $query_class( $this->form->ID, $parameters['search_criteria'], Utils::get( $parameters, 'sorting' ) );
+			$query = new $query_class( $this->form->ID, $parameters[ 'search_criteria' ], Utils::get( $parameters, 'sorting' ) );
 
 			/**
 			 * Apply multisort.
@@ -1014,15 +1013,15 @@ 
 				$view_setting_sort_field_ids = \GV\Utils::get( $atts, 'sort_field', array() );
 				$view_setting_sort_directions = \GV\Utils::get( $atts, 'sort_direction', array() );
 
-				$has_sort_query_param = ! empty( $_GET['sort'] ) && is_array( $_GET['sort'] );
+				$has_sort_query_param = ! empty( $_GET[ 'sort' ] ) && is_array( $_GET[ 'sort' ] );
 
-				if( $has_sort_query_param ) {
-					$has_sort_query_param = array_filter( array_values( $_GET['sort'] ) );
+				if ( $has_sort_query_param ) {
+					$has_sort_query_param = array_filter( array_values( $_GET[ 'sort' ] ) );
 				}
 
 				if ( $this->settings->get( 'sort_columns' ) && $has_sort_query_param ) {
-					$sort_field_ids = array_keys( $_GET['sort'] );
-					$sort_directions = array_values( $_GET['sort'] );
+					$sort_field_ids = array_keys( $_GET[ 'sort' ] );
+					$sort_directions = array_values( $_GET[ 'sort' ] );
 				} else {
 					$sort_field_ids = $view_setting_sort_field_ids;
 					$sort_directions = $view_setting_sort_directions;
@@ -1030,7 +1029,7 @@ 
 
 				$skip_first = false;
 
-				foreach ( (array) $sort_field_ids as $key => $sort_field_id ) {
+				foreach ( (array)$sort_field_ids as $key => $sort_field_id ) {
 
 					if ( ! $skip_first && ! $has_sort_query_param ) {
 						$skip_first = true; // Skip the first one, it's already in the query
@@ -1060,18 +1059,18 @@ 
 
 				$merged_time = false;
 
-				foreach ( $q['order'] as $oid => $order ) {
+				foreach ( $q[ 'order' ] as $oid => $order ) {
 
 					$column = null;
 
-					if ( $order[0] instanceof \GF_Query_Column ) {
-						$column = $order[0];
-					} else if ( $order[0] instanceof \GF_Query_Call ) {
-						if ( count( $order[0]->columns ) != 1 || ! $order[0]->columns[0] instanceof \GF_Query_Column ) {
+					if ( $order[ 0 ] instanceof \GF_Query_Column ) {
+						$column = $order[ 0 ];
+					} else if ( $order[ 0 ] instanceof \GF_Query_Call ) {
+						if ( count( $order[ 0 ]->columns ) != 1 || ! $order[ 0 ]->columns[ 0 ] instanceof \GF_Query_Column ) {
 							$orders[ $oid ] = $order;
 							continue; // Need something that resembles a single sort
 						}
-						$column = $order[0]->columns[0];
+						$column = $order[ 0 ]->columns[ 0 ];
 					}
 
 					if ( ! $column || ( ! $field = \GFAPI::get_field( $column->source, $column->field_id ) ) || $field->type !== 'time' ) {
@@ -1085,7 +1084,7 @@ 
 
 					$orders[ $oid ] = array(
 						new \GV\Mocks\GF_Query_Call_TIMESORT( 'timesort', array( $column, $sql ) ),
-						$order[1] // Mock it!
+						$order[ 1 ] // Mock it!
 					);
 
 					$merged_time = true;
@@ -1096,15 +1095,15 @@ 
 					 * ORDER again.
 					 */
 					if ( ! empty( $orders ) && $_orders = $query->_order_generate( $orders ) ) {
-						$sql['order'] = 'ORDER BY ' . implode( ', ', $_orders );
+						$sql[ 'order' ] = 'ORDER BY ' . implode( ', ', $_orders );
 					}
 				}
 
 				return $sql;
 			} );
 
-			$query->limit( $parameters['paging']['page_size'] )
-				->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) );
+			$query->limit( $parameters[ 'paging' ][ 'page_size' ] )
+				->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) );
 
 			/**
 			 * Any joins?
@@ -1127,7 +1126,7 @@ 
 
 						$query_parameters = $query->_introspect();
 
-						$query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) );
+						$query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) );
 					}
 
 					/**
@@ -1161,7 +1160,7 @@ 
 					}
 
 					$q = $query->_introspect();
-					$query->where( \GF_Query_Condition::_and( $q['where'], $condition ) );
+					$query->where( \GF_Query_Condition::_and( $q[ 'where' ], $condition ) );
 
 					if ( $this->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
 
@@ -1186,7 +1185,7 @@ 
 
 						$query_parameters = $query->_introspect();
 
-						$query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) );
+						$query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) );
 					}
 				}
 
@@ -1210,7 +1209,7 @@ 
 						$conditions = array();
 
 						foreach ( $condition->expressions as $_condition ) {
-							$conditions[] = $recurse( $_condition, $fields, $recurse );
+							$conditions[ ] = $recurse( $_condition, $fields, $recurse );
 						}
 
 						return call_user_func_array(
@@ -1239,10 +1238,10 @@ 
 					$q = new $query_class( $form_id );
 
 					// Copy the WHERE clauses but substitute the field_ids to the respective ones
-					$q->where( $where_union_substitute( $query_parameters['where'], $fields, $where_union_substitute ) );
+					$q->where( $where_union_substitute( $query_parameters[ 'where' ], $fields, $where_union_substitute ) );
 
 					// Copy the ORDER clause and substitute the field_ids to the respective ones
-					foreach ( $query_parameters['order'] as $order ) {
+					foreach ( $query_parameters[ 'order' ] as $order ) {
 						list( $column, $_order ) = $order;
 
 						if ( $column && $column instanceof \GF_Query_Column ) {
@@ -1256,15 +1255,15 @@ 
 
 					add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( &$unions_sql ) {
 						// Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
-						$select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] );
+						$select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] );
 
 						// Record the SQL
-						$unions_sql[] = array(
+						$unions_sql[ ] = array(
 							// Remove columns, we'll rebuild them
 							'select'  => preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $select ),
-							'from'    => $sql['from'],
-							'join'    => $sql['join'],
-							'where'   => $sql['where'],
+							'from'    => $sql[ 'from' ],
+							'join'    => $sql[ 'join' ],
+							'where'   => $sql[ 'where' ],
 							// Remove order and limit
 						);
 
@@ -1281,11 +1280,11 @@ 
 
 				add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( $unions_sql ) {
 					// Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
-					$sql['select'] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] );
+					$sql[ 'select' ] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] );
 
 					// Remove columns, we'll rebuild them
-					preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql['select'], $select_match );
-					$sql['select'] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql['select'] );
+					preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql[ 'select' ], $select_match );
+					$sql[ 'select' ] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql[ 'select' ] );
 
 					$unions = array();
 
@@ -1296,30 +1295,30 @@ 
 					};
 
 					// Add all the order columns into the selects, so we can order by the whole union group
-					preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql['order'], $order_matches );
+					preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql[ 'order' ], $order_matches );
 
 					$columns = array(
-						sprintf( '%s AS %s', $select_match[1], $column_to_alias( $select_match[1] ) )
+						sprintf( '%s AS %s', $select_match[ 1 ], $column_to_alias( $select_match[ 1 ] ) )
 					);
 
 					foreach ( array_slice( $order_matches, 1 ) as $match ) {
-						$columns[] = sprintf( '%s AS %s', $match[0], $column_to_alias( $match[0] ) );
+						$columns[ ] = sprintf( '%s AS %s', $match[ 0 ], $column_to_alias( $match[ 0 ] ) );
 
 						// Rewrite the order columns to the shared aliases
-						$sql['order'] = str_replace( $match[0], $column_to_alias( $match[0] ), $sql['order'] );
+						$sql[ 'order' ] = str_replace( $match[ 0 ], $column_to_alias( $match[ 0 ] ), $sql[ 'order' ] );
 					}
 
 					$columns = array_unique( $columns );
 
 					// Add the columns to every UNION
 					foreach ( $unions_sql as $union_sql ) {
-						$union_sql['select'] .= implode( ', ', $columns );
-						$unions []= implode( ' ', $union_sql );
+						$union_sql[ 'select' ] .= implode( ', ', $columns );
+						$unions [ ] = implode( ' ', $union_sql );
 					}
 
 					// Add the columns to the main SELECT, but only grab the entry id column
-					$sql['select'] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql['select'] . implode( ', ', $columns );
-					$sql['order'] = implode( ' ', $unions ) . ') AS u ' . $sql['order'];
+					$sql[ 'select' ] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql[ 'select' ] . implode( ', ', $columns );
+					$sql[ 'order' ] = implode( ' ', $unions ) . ') AS u ' . $sql[ 'order' ];
 
 					return $sql;
 				} );
@@ -1364,20 +1363,20 @@ 
 			} );
 		} else {
 			$entries = $this->form->entries
-				->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) )
+				->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) )
 				->offset( $this->settings->get( 'offset' ) )
-				->limit( $parameters['paging']['page_size'] )
+				->limit( $parameters[ 'paging' ][ 'page_size' ] )
 				->page( $page );
 
-			if ( ! empty( $parameters['sorting'] ) && is_array( $parameters['sorting'] && ! isset( $parameters['sorting']['key'] ) ) ) {
+			if ( ! empty( $parameters[ 'sorting' ] ) && is_array( $parameters[ 'sorting' ] && ! isset( $parameters[ 'sorting' ][ 'key' ] ) ) ) {
 				// Pluck off multisort arrays
-				$parameters['sorting'] = $parameters['sorting'][0];
+				$parameters[ 'sorting' ] = $parameters[ 'sorting' ][ 0 ];
 			}
 
-			if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) {
+			if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) {
 				$field = new \GV\Field();
-				$field->ID = $parameters['sorting']['key'];
-				$direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
+				$field->ID = $parameters[ 'sorting' ][ 'key' ];
+				$direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
 				$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) );
 			}
 		}
@@ -1461,7 +1460,7 @@ 
 		$allowed = $headers = array();
 
 		foreach ( $view->fields->by_position( "directory_*" )->by_visible( $view )->all() as $id => $field ) {
-			$allowed[] = $field;
+			$allowed[ ] = $field;
 		}
 
 		$renderer = new Field_Renderer();
@@ -1483,17 +1482,17 @@ 
 			} );
 
 			foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) {
-				$allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
+				$allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
 			}
 
 			foreach ( $allowed as $field ) {
 				$source = is_numeric( $field->ID ) ? $view->form : new \GV\Internal_Source();
 
-				$return[] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' );
+				$return[ ] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' );
 
 				if ( ! $headers_done ) {
 					$label = $field->get_label( $view, $source, $entry );
-					$headers[] = $label ? $label : $field->ID;
+					$headers[ ] = $label ? $label : $field->ID;
 				}
 			}
 

future/includes/class-gv-widget.php

Spacing +7 added lines, -7 removed lines

@@ -165,7 +165,7 @@ 
 		$enable_custom_class = apply_filters( 'gravityview/widget/enable_custom_class', false, $this );
 
 		if ( $enable_custom_class ) {
-			$settings['custom_class'] = array(
+			$settings[ 'custom_class' ] = array(
 				'type'       => 'text',
 				'label'      => __( 'Custom CSS Class:', 'gravityview' ),
 				'desc'       => __( 'This class will be added to the widget container', 'gravityview' ),
@@ -223,7 +223,7 @@ 
 				'1-1' => array(
 					   array(
 						   'areaid' => 'top',
-						   'title' => __( 'Top', 'gravityview' ) ,
+						   'title' => __( 'Top', 'gravityview' ),
 						   'subtitle' => ''
 					   ),
 				   ),
@@ -232,14 +232,14 @@ 
 				'1-2' => array(
 					array(
 						'areaid' => 'left',
-						'title' => __( 'Left', 'gravityview' ) ,
+						'title' => __( 'Left', 'gravityview' ),
 						'subtitle' => ''
 					),
 				),
 				'2-2' => array(
 					array(
 						'areaid' => 'right',
-						'title' => __( 'Right', 'gravityview' ) ,
+						'title' => __( 'Right', 'gravityview' ),
 						'subtitle' => ''
 					),
 				),
@@ -274,7 +274,7 @@ 
 		}
 
 		$widgets[ $this->get_widget_id() ] = array(
-			'label' => $this->widget_label ,
+			'label' => $this->widget_label,
 			'description' => $this->widget_description,
 			'subtitle' => $this->widget_subtitle,
 			'icon' => $this->icon,
@@ -296,7 +296,7 @@ 
 	 */
 	public function assign_widget_options( $options = array(), $template = '', $widget = '' ) {
 		if ( $this->get_widget_id() === $widget ) {
-			if( $settings = $this->get_settings() ) {
+			if ( $settings = $this->get_settings() ) {
 				$options = array_merge( $options, $settings );
 			}
 		}
@@ -350,7 +350,7 @@ 
 			return;
 		}
 
-		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode') );
+		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode' ) );
 	}
 
 	/**