gravityview / GravityView

includes/admin/class.render.settings.php

Spacing +74 added lines, -74 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 valign="top" '. $show_if .'>' . $output . '</tr>';
+		echo '<tr valign="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,19 +392,19 @@ 
 		 * @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 ) ) {
 
 			/**
 			 * @filter `gravityview/setting/class_file/{field_type}`
 			 * @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 ) {
-				if( file_exists( $class_file ) ) {
+			if ( $class_file ) {
+				if ( file_exists( $class_file ) ) {
 					require_once( $class_file );
 				}
 			}
@@ -429,8 +429,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;
 	}
@@ -450,22 +450,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 ) . '">';
 	}
 
 	/**
@@ -482,21 +482,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>';
 	}
 
 	/**
@@ -512,9 +512,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/class-admin-views.php

Indentation +87 added lines, -87 removed lines

@@ -63,28 +63,28 @@ 
 	}
 
 	/**
-     * When on the Add/Edit View screen, suggest most popular articles related to that
-     *
+	 * When on the Add/Edit View screen, suggest most popular articles related to that
+	 *
 	 * @param array $localization_data Data to be passed to the Support Port JS
 	 *
 	 * @return array
 	 */
 	function suggest_support_articles( $localization_data = array() ) {
 
-	    if( ! gravityview()->request->is_view() ) {
-	        return $localization_data;
-        }
+		if( ! gravityview()->request->is_view() ) {
+			return $localization_data;
+		}
 
 		$localization_data['suggest'] = array(
-            '57ef23539033602e61d4a560',
-            '54c67bb9e4b0512429885513',
-            '54c67bb9e4b0512429885512',
-            '54c67bbbe4b07997ea3f3f6b',
-            '54d1a33ae4b086c0c0964ce9',
-            '57ef253c9033602e61d4a563',
-            '552355bfe4b0221aadf2572b',
-            '54c67bcde4b051242988553e',
-        );
+			'57ef23539033602e61d4a560',
+			'54c67bb9e4b0512429885513',
+			'54c67bb9e4b0512429885512',
+			'54c67bbbe4b07997ea3f3f6b',
+			'54d1a33ae4b086c0c0964ce9',
+			'57ef253c9033602e61d4a563',
+			'552355bfe4b0221aadf2572b',
+			'54c67bcde4b051242988553e',
+		);
 
 		return $localization_data;
 	}
@@ -175,11 +175,11 @@ 
 
 		if( 'form_list' === GFForms::get_page() ) {
 			$priority = 790;
-        }
+		}
 
 		if( empty( $connected_views ) ) {
 
-		    $menu_items['gravityview'] = array(
+			$menu_items['gravityview'] = array(
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -210,13 +210,13 @@ 
 		// If there were no items added, then let's create the parent menu
 		if( $sub_menu_items ) {
 
-		    $sub_menu_items[] = array(
-			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
-                'link_class' => 'gv-create-view',
-			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
-			    'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
-			    'capabilities'   => array( 'edit_gravityviews' ),
-            );
+			$sub_menu_items[] = array(
+				'label' => esc_attr__( 'Create a View', 'gravityview' ),
+				'link_class' => 'gv-create-view',
+				'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
+				'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
+				'capabilities'   => array( 'edit_gravityviews' ),
+			);
 
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
 			$sub_menu_items[] = array(
@@ -599,12 +599,12 @@ 
 	 * Render html for displaying available fields based on a Form ID
 	 * $blacklist_field_types - contains the field types which are not proper to be shown in a directory.
 	 *
-     * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
+	 * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
 	 * @access public
-     *
+	 *
 	 * @param int $form Gravity Forms Form ID (default: '')
 	 * @param string $context (default: 'single')
-     *
+	 *
 	 * @return void
 	 */
 	function render_available_fields( $form = 0, $context = 'single' ) {
@@ -618,7 +618,7 @@ 
 
 		if ( ! is_array( $blacklist_field_types ) ) {
 
-		    gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
+			gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
 
 			$blacklist_field_types = array();
 		}
@@ -750,12 +750,12 @@ 
 				/**
 				 * @since 1.7.2
 				 */
-			    'other_entries' => array(
-				    'label'	=> __('Other Entries', 'gravityview'),
-				    'type'	=> 'other_entries',
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
-			    ),
-	        );
+				'other_entries' => array(
+					'label'	=> __('Other Entries', 'gravityview'),
+					'type'	=> 'other_entries',
+					'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
+				),
+			);
 
 			if( 'single' !== $zone) {
 
@@ -903,9 +903,9 @@ 
 
 				$joined_forms = gravityview_get_joined_forms( $post->ID );
 
-                foreach ( $joined_forms as $form ) {
-                    $available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
-                }
+				foreach ( $joined_forms as $form ) {
+					$available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
+				}
 			} else {
 				$available_items[ $form ] = \GV\Widget::registered();
 			}
@@ -935,9 +935,9 @@ 
 
 										if ( $form_id ) {
 											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
-                                        } else {
+										} else {
 											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
-                                        }
+										}
 
 										if ( !$original_item ) {
 											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) );
@@ -990,7 +990,7 @@ 
 
 	/**
 	 * Render the widget active areas
-     * @param  string $template_id The current slug of the selected View template
+	 * @param  string $template_id The current slug of the selected View template
 	 * @param  string $zone    Either 'header' or 'footer'
 	 * @param  string $post_id Current Post ID (view)
 	 * @return string          html
@@ -1064,13 +1064,13 @@ 
 	}
 
 	/**
-     * Renders "Add Field" tooltips
-     *
-     * @since 2.0.11
-     *
+	 * Renders "Add Field" tooltips
+	 *
+	 * @since 2.0.11
+	 *
 	 * @param string $context "directory", "single", or "edit"
-     *
-     * @return void
+	 *
+	 * @return void
 	 */
 	function render_field_pickers( $context = 'directory' ) {
 
@@ -1097,7 +1097,7 @@ 
             </div>
 			<?php
 		}
-    }
+	}
 
 	/**
 	 * Render the Template Active Areas and configured active fields for a given template id and post id
@@ -1163,7 +1163,7 @@ 
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
 
 		// Add the GV font (with the Astronaut)
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
+		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
 
 		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
@@ -1171,66 +1171,66 @@ 
 		if( GFForms::get_page() === 'form_list' ) {
 			wp_enqueue_style( 'gravityview_views_styles' );
 			return;
-        }
+		}
 
 		// Don't process any scripts below here if it's not a GravityView page.
 		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
-		    return;
+			return;
 		}
 
-        wp_enqueue_script( 'jquery-ui-datepicker' );
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
-
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
-
-        //enqueue scripts
-        wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
-
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
-            'cookiepath' => COOKIEPATH,
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
-            'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
-            'label_viewname' => __( 'Enter View name here', 'gravityview' ),
-            'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
-            'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
-            'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
-            'label_close' => __( 'Close', 'gravityview' ),
-            'label_cancel' => __( 'Cancel', 'gravityview' ),
-            'label_continue' => __( 'Continue', 'gravityview' ),
-            'label_ok' => __( 'Ok', 'gravityview' ),
-            'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
-            'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
-            'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
-            'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
-            'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
-        ));
+		wp_enqueue_script( 'jquery-ui-datepicker' );
+		wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
+
+		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+
+		//enqueue scripts
+		wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
+
+		wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
+			'cookiepath' => COOKIEPATH,
+			'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
+			'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
+			'label_viewname' => __( 'Enter View name here', 'gravityview' ),
+			'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
+			'label_add_search_field' => __( 'Add Search Field', 'gravityview' ),
+			'label_remove_search_field' => __( 'Remove Search Field', 'gravityview' ),
+			'label_close' => __( 'Close', 'gravityview' ),
+			'label_cancel' => __( 'Cancel', 'gravityview' ),
+			'label_continue' => __( 'Continue', 'gravityview' ),
+			'label_ok' => __( 'Ok', 'gravityview' ),
+			'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
+			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
+			'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
+			'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
+			'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
+		));
 
 		wp_enqueue_style( 'gravityview_views_styles' );
 
-        // Enqueue scripts needed for merge tags
-        self::enqueue_gravity_forms_scripts();
+		// Enqueue scripts needed for merge tags
+		self::enqueue_gravity_forms_scripts();
 	}
 
 	/**
 	 * Enqueue Gravity Forms scripts, needed for Merge Tags
-     *
-     * @since 1.0.5-beta
-     *
-     * @return void
+	 *
+	 * @since 1.0.5-beta
+	 *
+	 * @return void
 	 */
 	static function enqueue_gravity_forms_scripts() {
 		GFForms::register_scripts();
 
 		$scripts = array(
-		    'sack',
-		    'gform_gravityforms',
-		    'gform_forms',
-		    'gform_form_admin',
-		    'jquery-ui-autocomplete'
+			'sack',
+			'gform_gravityforms',
+			'gform_forms',
+			'gform_form_admin',
+			'jquery-ui-autocomplete'
 		);
 
 		if ( wp_is_mobile() ) {
-		    $scripts[] = 'jquery-touch-punch';
+			$scripts[] = 'jquery-touch-punch';
 		}
 
 		wp_enqueue_script( $scripts );

Spacing +184 added lines, -184 removed lines

@@ -27,32 +27,32 @@ 
 		add_filter( 'gravityview_blacklist_field_types', array( $this, 'default_field_blacklist' ), 10, 2 );
 
 		// Tooltips
-		add_filter( 'gform_tooltips', array( $this, 'tooltips') );
+		add_filter( 'gform_tooltips', array( $this, 'tooltips' ) );
 
 		// adding styles and scripts
-		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles'), 999 );
-		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict') );
-		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict') );
-		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict') );
-		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict') );
-
-		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas'), 10, 4 );
-		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas'), 10, 3 );
-		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers') );
-		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields'), 10, 2 );
-		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets') );
-		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas'), 10, 5 );
+		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles' ), 999 );
+		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict' ) );
+		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict' ) );
+		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict' ) );
+		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
+
+		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas' ), 10, 4 );
+		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas' ), 10, 3 );
+		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers' ) );
+		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields' ), 10, 2 );
+		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets' ) );
+		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas' ), 10, 5 );
 
 		// @todo check if this hook is needed..
 		//add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 );
 
 		// Add Connected Form column
-		add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) );
+		add_filter( 'manage_gravityview_posts_columns', array( $this, 'add_post_type_columns' ) );
 
 		add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
 		add_action( 'gform_form_actions', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
 
-		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 );
+		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 );
 
 		add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) );
 
@@ -71,11 +71,11 @@ 
 	 */
 	function suggest_support_articles( $localization_data = array() ) {
 
-	    if( ! gravityview()->request->is_view() ) {
+	    if ( ! gravityview()->request->is_view() ) {
 	        return $localization_data;
         }
 
-		$localization_data['suggest'] = array(
+		$localization_data[ 'suggest' ] = array(
             '57ef23539033602e61d4a560',
             '54c67bb9e4b0512429885513',
             '54c67bb9e4b0512429885512',
@@ -96,13 +96,13 @@ 
 	public function filter_pre_get_posts_by_gravityview_form_id( &$query ) {
 		global $pagenow;
 
-		if ( !is_admin() ) {
+		if ( ! is_admin() ) {
 			return;
 		}
 
-		$form_id = isset( $_GET['gravityview_form_id'] ) ? (int) $_GET['gravityview_form_id'] : false;
+		$form_id = isset( $_GET[ 'gravityview_form_id' ] ) ? (int)$_GET[ 'gravityview_form_id' ] : false;
 
-		if( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
+		if ( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
 			return;
 		}
 
@@ -119,18 +119,18 @@ 
 	function add_view_dropdown() {
 		$current_screen = get_current_screen();
 
-		if( 'gravityview' !== $current_screen->post_type ) {
+		if ( 'gravityview' !== $current_screen->post_type ) {
 			return;
 		}
 
 		$forms = gravityview_get_forms();
 		$current_form = \GV\Utils::_GET( 'gravityview_form_id' );
 		// If there are no forms to select, show no forms.
-		if( !empty( $forms ) ) { ?>
+		if ( ! empty( $forms ) ) { ?>
 			<select name="gravityview_form_id" id="gravityview_form_id">
 				<option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option>
-				<?php foreach( $forms as $form ) { ?>
-					<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
+				<?php foreach ( $forms as $form ) { ?>
+					<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
 				<?php } ?>
 			</select>
 		<?php }
@@ -143,7 +143,7 @@ 
 	 */
 	public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) {
 		_deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' );
-		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id );
+		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id );
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 	public static function gform_toolbar_menu( $menu_items = array(), $id = NULL ) {
 
 		// Don't show on Trashed forms
-		if( 'trash' === rgget( 'filter') ) {
+		if ( 'trash' === rgget( 'filter' ) ) {
 			return $menu_items;
 		}
 
@@ -173,13 +173,13 @@ 
 
 		$priority = 0;
 
-		if( 'form_list' === GFForms::get_page() ) {
+		if ( 'form_list' === GFForms::get_page() ) {
 			$priority = 790;
         }
 
-		if( empty( $connected_views ) ) {
+		if ( empty( $connected_views ) ) {
 
-		    $menu_items['gravityview'] = array(
+		    $menu_items[ 'gravityview' ] = array(
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -195,22 +195,22 @@ 
 		$sub_menu_items = array();
 		foreach ( (array)$connected_views as $view ) {
 
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
+			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
 				continue;
 			}
 
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
+			$label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
 
-			$sub_menu_items[] = array(
+			$sub_menu_items[ ] = array(
 				'label' => esc_attr( $label ),
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
+				'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ),
 			);
 		}
 
 		// If there were no items added, then let's create the parent menu
-		if( $sub_menu_items ) {
+		if ( $sub_menu_items ) {
 
-		    $sub_menu_items[] = array(
+		    $sub_menu_items[ ] = array(
 			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
                 'link_class' => 'gv-create-view',
 			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -219,14 +219,14 @@ 
             );
 
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
-			$sub_menu_items[] = array(
+			$sub_menu_items[ ] = array(
 				'url' => '#',
 				'label' => '',
 				'menu_class' => 'hidden',
 				'capabilities' => '',
 			);
 
-			$menu_items['gravityview'] = array(
+			$menu_items[ 'gravityview' ] = array(
 				'label'          => __( 'Connected Views', 'gravityview' ),
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
 				'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
@@ -255,8 +255,8 @@ 
 		$add = array( 'captcha', 'page' );
 
 		// Don't allowing editing the following values:
-		if( $context === 'edit' ) {
-			$add[] = 'post_id';
+		if ( $context === 'edit' ) {
+			$add[ ] = 'post_id';
 		}
 
 		$return = array_merge( $array, $add );
@@ -279,32 +279,32 @@ 
 		foreach ( $default_args as $key => $arg ) {
 
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
+			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; }
 
 			// By default, use `tooltip` if defined.
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
+			$tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ];
 
 			// Otherwise, use the description as a tooltip.
-			if( empty( $tooltip ) && !empty( $arg['desc'] ) ) {
-				$tooltip = $arg['desc'];
+			if ( empty( $tooltip ) && ! empty( $arg[ 'desc' ] ) ) {
+				$tooltip = $arg[ 'desc' ];
 			}
 
 			// If there's no tooltip set, continue
-			if( empty( $tooltip ) ) {
+			if ( empty( $tooltip ) ) {
 				continue;
 			}
 
 			// Add the tooltip
-			$gv_tooltips[ 'gv_'.$key ] = array(
-				'title'	=> $arg['label'],
+			$gv_tooltips[ 'gv_' . $key ] = array(
+				'title'	=> $arg[ 'label' ],
 				'value'	=> $tooltip,
 			);
 
 		}
 
-		$gv_tooltips['gv_css_merge_tags'] = array(
-			'title' => __('CSS Merge Tags', 'gravityview'),
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
+		$gv_tooltips[ 'gv_css_merge_tags' ] = array(
+			'title' => __( 'CSS Merge Tags', 'gravityview' ),
+			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' )
 		);
 
 		/**
@@ -322,9 +322,9 @@ 
 
 		foreach ( $gv_tooltips as $key => $tooltip ) {
 
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
+			$title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>';
 
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
+			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) );
 		}
 
 		return $tooltips;
@@ -338,7 +338,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
 
 		$output = '';
 
@@ -360,7 +360,7 @@ 
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
 				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
 
-				$output = $template ? $template['label'] : $template_id_pretty;
+				$output = $template ? $template[ 'label' ] : $template_id_pretty;
 
 				break;
 
@@ -401,44 +401,44 @@ 
 	static public function get_connected_form_links( $form, $include_form_link = true ) {
 
 		// Either the form is empty or the form ID is 0, not yet set.
-		if( empty( $form ) ) {
+		if ( empty( $form ) ) {
 			return '';
 		}
 
 		// The $form is passed as the form ID
-		if( !is_array( $form ) ) {
+		if ( ! is_array( $form ) ) {
 			$form = gravityview_get_form( $form );
 		}
 
-		$form_id = $form['id'];
+		$form_id = $form[ 'id' ];
 		$links = array();
 
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
+		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
 			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
+			$form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>';
+			$links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>';
 		} else {
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
+			$form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>';
 		}
 
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
+		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
 			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
+			$links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>';
 		}
 
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
 			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
+			$links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>';
 		}
 
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
+		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) {
 			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
+			$links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>';
 		}
 
 		$output = '';
 
-		if( !empty( $include_form_link ) ) {
+		if ( ! empty( $include_form_link ) ) {
 			$output .= $form_link;
 		}
 
@@ -450,7 +450,7 @@ 
 		 */
 		$links = apply_filters( 'gravityview_connected_form_links', $links, $form );
 
-		$output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>';
+		$output .= '<div class="row-actions">' . implode( ' | ', $links ) . '</div>';
 
 		return $output;
 	}
@@ -464,8 +464,8 @@ 
 		// Get the date column and save it for later to add back in.
 		// This adds it after the Data Source column.
 		// This way, we don't need to do array_slice, array_merge, etc.
-		$date = $columns['date'];
-		unset( $columns['date'] );
+		$date = $columns[ 'date' ];
+		unset( $columns[ 'date' ] );
 
 		$data_source_required_caps = array(
 			'gravityforms_edit_forms',
@@ -476,14 +476,14 @@ 
 			'gravityforms_preview_forms',
 		);
 
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
+		if ( GVCommon::has_cap( $data_source_required_caps ) ) {
+			$columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' );
 		}
 
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
+		$columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
 
 		// Add the date back in.
-		$columns['date'] = $date;
+		$columns[ 'date' ] = $date;
 
 		return $columns;
 	}
@@ -497,12 +497,12 @@ 
 	 */
 	function save_postdata( $post_id ) {
 
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
 			return;
 		}
 
 		// validate post_type
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
+		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) {
 			return;
 		}
 
@@ -517,63 +517,63 @@ 
 		$statii = array();
 
 		// check if this is a start fresh View
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
+		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) {
 
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
+			$form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : '';
 			// save form id
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
+			$statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
 
 		}
 
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
+		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) {
 			gravityview()->log->error( 'Current user does not have the capability to create a new Form.', array( 'data' => wp_get_current_user() ) );
 			return;
 		}
 
 		// Was this a start fresh?
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
+		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) {
+			$statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
 		} else {
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
+			$statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
 		}
 
 		// Check if we have a template id
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
+		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) {
 
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
+			$template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : '';
 
 			// now save template id
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
+			$statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
 		}
 
 
 		// save View Configuration metabox
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
+		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) {
 
 			// template settings
-			if( empty( $_POST['template_settings'] ) ) {
-				$_POST['template_settings'] = array();
+			if ( empty( $_POST[ 'template_settings' ] ) ) {
+				$_POST[ 'template_settings' ] = array();
 			}
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
+			$statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] );
 
 			// guard against unloaded View configuration page
-			if ( isset( $_POST['gv_fields'] ) && isset( $_POST['gv_fields_done'] ) ) {
+			if ( isset( $_POST[ 'gv_fields' ] ) && isset( $_POST[ 'gv_fields_done' ] ) ) {
 				$fields = array();
 
-				if ( ! empty( $_POST['gv_fields'] ) ) {
+				if ( ! empty( $_POST[ 'gv_fields' ] ) ) {
 					$fields = _gravityview_process_posted_fields();
 				}
 
 				$fields = wp_slash( $fields );
 
-				$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
+				$statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
 			}
 
 			// Directory Visible Widgets
-			if( empty( $_POST['widgets'] ) ) {
-				$_POST['widgets'] = array();
+			if ( empty( $_POST[ 'widgets' ] ) ) {
+				$_POST[ 'widgets' ] = array();
 			}
-			$statii['directory_widgets'] = gravityview_set_directory_widgets( $post_id, $_POST['widgets'] );
+			$statii[ 'directory_widgets' ] = gravityview_set_directory_widgets( $post_id, $_POST[ 'widgets' ] );
 
 		} // end save view configuration
 
@@ -583,7 +583,7 @@ 
 		 * @param array $statii Array of statuses of the post meta saving processes. If saving worked, each key should be mapped to a value of the post ID (`directory_widgets` => `124`). If failed (or didn't change), the value will be false.
 		 * @since 1.17.2
 		 */
-		do_action('gravityview_view_saved', $post_id, $statii );
+		do_action( 'gravityview_view_saved', $post_id, $statii );
 
 		gravityview()->log->debug( '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array( 'data' => array_map( 'intval', $statii ) ) );
 	}
@@ -627,20 +627,20 @@ 
 
 		$output = '';
 
-		if( !empty( $fields ) ) {
+		if ( ! empty( $fields ) ) {
 
-			foreach( $fields as $id => $details ) {
+			foreach ( $fields as $id => $details ) {
 
-				if( in_array( $details['type'], (array) $blacklist_field_types ) ) {
+				if ( in_array( $details[ 'type' ], (array)$blacklist_field_types ) ) {
 					continue;
 				}
 
 				// Edit mode only allows editing the parent fields, not single inputs.
-				if( $context === 'edit' && !empty( $details['parent'] ) ) {
+				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) {
 					continue;
 				}
 
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details, $settings = array(), $form );
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details, $settings = array(), $form );
 
 			} // End foreach
 		}
@@ -648,7 +648,7 @@ 
 		echo $output;
 
 		// For the EDIT view we only want to allow the form fields.
-		if( $context === 'edit' ) {
+		if ( $context === 'edit' ) {
 			return;
 		}
 
@@ -672,16 +672,16 @@ 
 		$additional_fields = apply_filters( 'gravityview_additional_fields', array(
 			array(
 				'label_text' => __( '+ Add All Fields', 'gravityview' ),
-				'desc' => __('Add all the available fields at once.', 'gravityview'),
+				'desc' => __( 'Add all the available fields at once.', 'gravityview' ),
 				'field_id' => 'all-fields',
 				'label_type' => 'field',
 				'input_type' => NULL,
 				'field_options' => NULL,
 				'settings_html'	=> NULL,
 			)
-		));
+		) );
 
-		if( !empty( $additional_fields )) {
+		if ( ! empty( $additional_fields ) ) {
 			foreach ( (array)$additional_fields as $item ) {
 
 				// Prevent items from not having index set
@@ -692,16 +692,16 @@ 
 					'input_type' => NULL,
 					'field_options' => NULL,
 					'settings_html'	=> NULL,
-				));
+				) );
 
 				// Backward compat.
-				if( !empty( $item['field_options'] ) ) {
+				if ( ! empty( $item[ 'field_options' ] ) ) {
 					// Use settings_html from now on.
-					$item['settings_html'] = $item['field_options'];
+					$item[ 'settings_html' ] = $item[ 'field_options' ];
 				}
 
 				// Render a label for each of them
-				echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item, $settings = array(), $form );
+				echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item, $settings = array(), $form );
 
 			}
 		}
@@ -714,54 +714,54 @@ 
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
 	 * @return array
 	 */
-	function get_entry_default_fields($form, $zone) {
+	function get_entry_default_fields( $form, $zone ) {
 
 		$entry_default_fields = array();
 
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
 
 			$entry_default_fields = array(
 				'id' => array(
-					'label' => __('Entry ID', 'gravityview'),
+					'label' => __( 'Entry ID', 'gravityview' ),
 					'type' => 'id',
-					'desc'	=> __('The unique ID of the entry.', 'gravityview'),
+					'desc'	=> __( 'The unique ID of the entry.', 'gravityview' ),
 				),
 				'date_created' => array(
-					'label' => __('Entry Date', 'gravityview'),
-					'desc'	=> __('The date the entry was created.', 'gravityview'),
+					'label' => __( 'Entry Date', 'gravityview' ),
+					'desc'	=> __( 'The date the entry was created.', 'gravityview' ),
 					'type' => 'date_created',
 				),
 				'source_url' => array(
-					'label' => __('Source URL', 'gravityview'),
+					'label' => __( 'Source URL', 'gravityview' ),
 					'type' => 'source_url',
-					'desc'	=> __('The URL of the page where the form was submitted.', 'gravityview'),
+					'desc'	=> __( 'The URL of the page where the form was submitted.', 'gravityview' ),
 				),
 				'ip' => array(
-					'label' => __('User IP', 'gravityview'),
+					'label' => __( 'User IP', 'gravityview' ),
 					'type' => 'ip',
-					'desc'	=> __('The IP Address of the user who created the entry.', 'gravityview'),
+					'desc'	=> __( 'The IP Address of the user who created the entry.', 'gravityview' ),
 				),
 				'created_by' => array(
-					'label' => __('User', 'gravityview'),
+					'label' => __( 'User', 'gravityview' ),
 					'type' => 'created_by',
-					'desc'	=> __('Details of the logged-in user who created the entry (if any).', 'gravityview'),
+					'desc'	=> __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' ),
 				),
 
 				/**
 				 * @since 1.7.2
 				 */
 			    'other_entries' => array(
-				    'label'	=> __('Other Entries', 'gravityview'),
+				    'label'	=> __( 'Other Entries', 'gravityview' ),
 				    'type'	=> 'other_entries',
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
+				    'desc'	=> __( 'Display other entries created by the entry creator.', 'gravityview' ),
 			    ),
 	        );
 
-			if( 'single' !== $zone) {
+			if ( 'single' !== $zone ) {
 
-				$entry_default_fields['entry_link'] = array(
-					'label' => __('Link to Entry', 'gravityview'),
-					'desc'	=> __('A dedicated link to the single entry with customizable text.', 'gravityview'),
+				$entry_default_fields[ 'entry_link' ] = array(
+					'label' => __( 'Link to Entry', 'gravityview' ),
+					'desc'	=> __( 'A dedicated link to the single entry with customizable text.', 'gravityview' ),
 					'type' => 'entry_link',
 				);
 			}
@@ -771,19 +771,19 @@ 
 		/**
 		 * @since  1.2
 		 */
-		$entry_default_fields['custom']	= array(
-			'label'	=> __('Custom Content', 'gravityview'),
+		$entry_default_fields[ 'custom' ] = array(
+			'label'	=> __( 'Custom Content', 'gravityview' ),
 			'type'	=> 'custom',
-			'desc'	=> __('Insert custom text or HTML.', 'gravityview'),
+			'desc'	=> __( 'Insert custom text or HTML.', 'gravityview' ),
 		);
 
 		/**
 		 * @since develop
 		 */
-		$entry_default_fields['sequence'] = array(
-			'label'	=> __('Result Number', 'gravityview'),
+		$entry_default_fields[ 'sequence' ] = array(
+			'label'	=> __( 'Result Number', 'gravityview' ),
 			'type'	=> 'sequence',
-			'desc'	=> __('Display a sequential result number for each entry.', 'gravityview'),
+			'desc'	=> __( 'Display a sequential result number for each entry.', 'gravityview' ),
 		);
 
 		/**
@@ -792,7 +792,7 @@ 
 		 * @param  string|array $form form_ID or form object
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
 		 */
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
+		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone );
 	}
 
 	/**
@@ -803,7 +803,7 @@ 
 	 */
 	function get_available_fields( $form = '', $zone = NULL ) {
 
-		if( empty( $form ) ) {
+		if ( empty( $form ) ) {
 			gravityview()->log->error( '$form is empty' );
 			return array();
 		}
@@ -812,7 +812,7 @@ 
 		$fields = gravityview_get_form_fields( $form, true );
 
 		// get meta fields ( only if form was already created )
-		if( !is_array( $form ) ) {
+		if ( ! is_array( $form ) ) {
 			$meta_fields = gravityview_get_entry_meta( $form );
 		} else {
 			$meta_fields = array();
@@ -825,7 +825,7 @@ 
 		$fields = $fields + $meta_fields + $default_fields;
 
 		// Move Custom Content to top
-		$fields = array( 'custom' => $fields['custom'] ) + $fields;
+		$fields = array( 'custom' => $fields[ 'custom' ] ) + $fields;
 
 		/**
 		 * @filter `gravityview/admin/available_fields` Modify the available fields that can be used in a View.
@@ -845,11 +845,11 @@ 
 
 		$widgets = $this->get_registered_widgets();
 
-		if( !empty( $widgets ) ) {
+		if ( ! empty( $widgets ) ) {
 
-			foreach( $widgets as $id => $details ) {
+			foreach ( $widgets as $id => $details ) {
 
-				echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
+				echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details );
 
 			}
 		}
@@ -878,7 +878,7 @@ 
 	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
 		global $post;
 
-		if( $type === 'widget' ) {
+		if ( $type === 'widget' ) {
 			$button_label = __( 'Add Widget', 'gravityview' );
 		} else {
 			$button_label = __( 'Add Field', 'gravityview' );
@@ -890,10 +890,10 @@ 
 		$form_id = null;
 
 		// if saved values, get available fields to label everyone
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
+		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) {
 
-			if( !empty( $_POST['template_id'] ) ) {
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+			if ( ! empty( $_POST[ 'template_id' ] ) ) {
+				$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
 			} else {
 				$form_id = $form = gravityview_get_form_id( $post->ID );
 			}
@@ -911,42 +911,42 @@ 
 			}
 		}
 
-		foreach( $rows as $row ) :
-			foreach( $row as $col => $areas ) :
-				$column = ($col == '2-2') ? '1-2' : $col; ?>
+		foreach ( $rows as $row ) :
+			foreach ( $row as $col => $areas ) :
+				$column = ( $col == '2-2' ) ? '1-2' : $col; ?>
 
 				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
 
-					<?php foreach( $areas as $area ) : 	?>
+					<?php foreach ( $areas as $area ) : 	?>
 
-						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>">
+						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
+							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>">
 								<?php // render saved fields
-								if( ! empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
+								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
 
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
 
 										// Maybe has a form ID
-										$form_id = empty( $field['form_id'] ) ? $form_id : $field['form_id'];
+										$form_id = empty( $field[ 'form_id' ] ) ? $form_id : $field[ 'form_id' ];
 
 										$input_type = NULL;
 
 										if ( $form_id ) {
-											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
+											$original_item = isset( $available_items[ $form_id ] [ $field[ 'id' ] ] ) ? $available_items[ $form_id ] [ $field[ 'id' ] ] : false;
                                         } else {
-											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
+											$original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false;
                                         }
 
-										if ( !$original_item ) {
-											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) );
+										if ( ! $original_item ) {
+											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array( ' data' => array( 'available_items' => $available_items, 'field' => $field ) ) );
 
 											$original_item = $field;
 										} else {
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
+											$input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL;
 										}
 
 										// Field options dialog box
-										$field_options = GravityView_Render_Settings::render_field_options( $form_id, $type, $template_id, $field['id'], $original_item['label'], $zone .'_'. $area['areaid'], $input_type, $uniqid, $field, $zone, $original_item );
+										$field_options = GravityView_Render_Settings::render_field_options( $form_id, $type, $template_id, $field[ 'id' ], $original_item[ 'label' ], $zone . '_' . $area[ 'areaid' ], $input_type, $uniqid, $field, $zone, $original_item );
 
 										$item = array(
 											'input_type' => $input_type,
@@ -959,22 +959,22 @@ 
 											$item = wp_parse_args( $item, $original_item );
 										}
 
-										switch( $type ) {
+										switch ( $type ) {
 											case 'widget':
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
+												echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field );
 												break;
 											default:
-												echo new GravityView_Admin_View_Field( $field['label'], $field['id'], $item, $field, $form_id );
+												echo new GravityView_Admin_View_Field( $field[ 'label' ], $field[ 'id' ], $item, $field, $form_id );
 										}
 									}
 
 								} // End if zone is not empty ?>
 
-								<span class="drop-message"><?php echo sprintf(esc_attr__('"+ %s" or drag existing %ss here.', 'gravityview'), $button_label, $type ); ?></span>
+								<span class="drop-message"><?php echo sprintf( esc_attr__( '"+ %s" or drag existing %ss here.', 'gravityview' ), $button_label, $type ); ?></span>
 							</div>
 							<div class="gv-droppable-area-action">
-								<button class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ '.esc_html( $button_label ); ?></button>
-								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area['title'] ); ?></strong><?php if( !empty( $area['subtitle'] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area['subtitle'] ); ?></span><?php } ?></p>
+								<button class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ ' . esc_html( $button_label ); ?></button>
+								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area[ 'title' ] ); ?></strong><?php if ( ! empty( $area[ 'subtitle' ] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area[ 'subtitle' ] ); ?></span><?php } ?></p>
 							</div>
 						</div>
 
@@ -1002,7 +1002,7 @@ 
 				// This is a new View, prefill the widgets
 				$widgets = array(
 					'header_top' => array(
-						substr( md5( microtime( true ) ), 0, 13 ) => array (
+						substr( md5( microtime( true ) ), 0, 13 ) => array(
 							'id' => 'search_bar',
 							'label' => __( 'Search Bar', 'gravityview' ),
 							'search_layout' => 'horizontal',
@@ -1074,7 +1074,7 @@ 
 		// list of available fields to be shown in the popup
 		$forms = gravityview_get_forms( 'any' );
 
-		$form_ids = array_map( function ($form) { return $form['id']; }, $forms);
+		$form_ids = array_map( function( $form ) { return $form[ 'id' ]; }, $forms );
 
 		foreach ( $form_ids as $form_id ) {
 			$filter_field_id = sprintf( 'gv-field-filter-%s-%d', $context, $form_id );
@@ -1087,7 +1087,7 @@ 
                 </div>
 
                 <div id="available-fields-<?php echo $filter_field_id; ?>" aria-live="polite" role="listbox">
-                <?php do_action('gravityview_render_available_fields', $form_id, $context ); ?>
+                <?php do_action( 'gravityview_render_available_fields', $form_id, $context ); ?>
                 </div>
 
                 <div class="gv-no-results hidden description"><?php esc_html_e( 'No fields were found matching the search.', 'gravityview' ); ?></div>
@@ -1106,7 +1106,7 @@ 
 	 * @return string HTML of the active areas
 	 */
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
-		if( empty( $template_id ) ) {
+		if ( empty( $template_id ) ) {
 			gravityview()->log->debug( '[render_directory_active_areas] {template_id} is empty', array( 'template_id' => $template_id ) );
 			return '';
 		}
@@ -1120,12 +1120,12 @@ 
 		 */
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
 
-		if( empty( $template_areas ) ) {
+		if ( empty( $template_areas ) ) {
 
 			gravityview()->log->debug( '[render_directory_active_areas] No areas defined. Maybe template {template_id} is disabled.', array( 'data' => $template_id ) );
 			$output = '<div>';
-			$output .= '<h2 class="description" style="font-size: 16px; margin:0">'. sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>'.$template_id.'</em>' ) .'</h2>';
-			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">'.esc_html__('The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview').'</p>';
+			$output .= '<h2 class="description" style="font-size: 16px; margin:0">' . sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>' . $template_id . '</em>' ) . '</h2>';
+			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">' . esc_html__( 'The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview' ) . '</p>';
 			$output .= '</div>';
 		} else {
 
@@ -1140,7 +1140,7 @@ 
 
 		}
 
-		if( $echo ) {
+		if ( $echo ) {
 			echo $output;
 		}
 
@@ -1160,32 +1160,32 @@ 
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
 
 		// Add the GV font (with the Astronaut)
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
+        wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), \GV\Plugin::$version );
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
 
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), \GV\Plugin::$version, true );
 
-		if( GFForms::get_page() === 'form_list' ) {
+		if ( GFForms::get_page() === 'form_list' ) {
 			wp_enqueue_style( 'gravityview_views_styles' );
 			return;
         }
 
 		// Don't process any scripts below here if it's not a GravityView page.
-		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
+		if ( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
 		    return;
 		}
 
         wp_enqueue_script( 'jquery-ui-datepicker' );
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
+        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), \GV\Plugin::$version );
 
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+        $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
         //enqueue scripts
         wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
 
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
+        wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
             'cookiepath' => COOKIEPATH,
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
+            'passed_form_id' => (bool)\GV\Utils::_GET( 'form_id' ),
             'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
             'label_viewname' => __( 'Enter View name here', 'gravityview' ),
             'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ),
@@ -1200,7 +1200,7 @@ 
             'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
             'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
             'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
-        ));
+        ) );
 
 		wp_enqueue_style( 'gravityview_views_styles' );
 
@@ -1227,7 +1227,7 @@ 
 		);
 
 		if ( wp_is_mobile() ) {
-		    $scripts[] = 'jquery-touch-punch';
+		    $scripts[ ] = 'jquery-touch-punch';
 		}
 
 		wp_enqueue_script( $scripts );

includes/widgets/search-widget/class-search-widget.php

Spacing +175 added lines, -175 removed lines

@@ -64,7 +64,7 @@ 
 				'type' => 'radio',
 				'full_width' => true,
 				'label' => esc_html__( 'Search Mode', 'gravityview' ),
-				'desc' => __('Should search results match all search fields, or any?', 'gravityview'),
+				'desc' => __( 'Should search results match all search fields, or any?', 'gravityview' ),
 				'value' => 'any',
 				'class' => 'hide-if-js',
 				'options' => array(
@@ -83,7 +83,7 @@ 
 
 			// admin - add scripts - run at 1100 to make sure GravityView_Admin_Views::add_scripts_and_styles() runs first at 999
 			add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 1100 );
-			add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') );
+			add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) );
 			add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
 
 			// ajax - get the searchable fields
@@ -227,7 +227,7 @@ 
 		$script_min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 		$script_source = empty( $script_min ) ? '/source' : '';
 
-		wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js'.$script_source.'/admin-search-widget'.$script_min.'.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), \GV\Plugin::$version );
+		wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js' . $script_source . '/admin-search-widget' . $script_min . '.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), \GV\Plugin::$version );
 
 		wp_localize_script( 'gravityview_searchwidget_admin', 'gvSearchVar', array(
 			'nonce' => wp_create_nonce( 'gravityview_ajaxsearchwidget' ),
@@ -249,7 +249,7 @@ 
 	 * @return array Scripts allowed in no-conflict mode, plus the search widget script
 	 */
 	public function register_no_conflict( $allowed ) {
-		$allowed[] = 'gravityview_searchwidget_admin';
+		$allowed[ ] = 'gravityview_searchwidget_admin';
 		return $allowed;
 	}
 
@@ -262,24 +262,24 @@ 
 	 */
 	public static function get_searchable_fields() {
 
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxsearchwidget' ) ) {
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxsearchwidget' ) ) {
 			exit( '0' );
 		}
 
 		$form = '';
 
 		// Fetch the form for the current View
-		if ( ! empty( $_POST['view_id'] ) ) {
+		if ( ! empty( $_POST[ 'view_id' ] ) ) {
 
-			$form = gravityview_get_form_id( $_POST['view_id'] );
+			$form = gravityview_get_form_id( $_POST[ 'view_id' ] );
 
-		} elseif ( ! empty( $_POST['formid'] ) ) {
+		} elseif ( ! empty( $_POST[ 'formid' ] ) ) {
 
-			$form = (int) $_POST['formid'];
+			$form = (int)$_POST[ 'formid' ];
 
-		} elseif ( ! empty( $_POST['template_id'] ) && class_exists( 'GravityView_Ajax' ) ) {
+		} elseif ( ! empty( $_POST[ 'template_id' ] ) && class_exists( 'GravityView_Ajax' ) ) {
 
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
 
 		}
 
@@ -329,14 +329,14 @@ 
 		);
 
 		if ( gravityview()->plugin->supports( \GV\Plugin::FEATURE_GFQUERY ) ) {
-			$custom_fields['is_approved'] = array(
+			$custom_fields[ 'is_approved' ] = array(
 				'text' => esc_html__( 'Approval Status', 'gravityview' ),
 				'type' => 'multi',
 			);
 		}
 
-		foreach( $custom_fields as $custom_field_key => $custom_field ) {
-			$output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field['type'], self::get_field_label( array('field' => $custom_field_key ) ), $custom_field['text'] );
+		foreach ( $custom_fields as $custom_field_key => $custom_field ) {
+			$output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field[ 'type' ], self::get_field_label( array( 'field' => $custom_field_key ) ), $custom_field[ 'text' ] );
 		}
 
 		// Get fields with sub-inputs and no parent
@@ -358,13 +358,13 @@ 
 
 			foreach ( $fields as $id => $field ) {
 
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
 					continue;
 				}
 
-				$types = self::get_search_input_types( $id, $field['type'] );
+				$types = self::get_search_input_types( $id, $field[ 'type' ] );
 
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'data-inputtypes="'. esc_attr( $types ) .'">'. esc_html( $field['label'] ) .'</option>';
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . 'data-inputtypes="' . esc_attr( $types ) . '">' . esc_html( $field[ 'label' ] ) . '</option>';
 			}
 		}
 
@@ -387,7 +387,7 @@ 
 	public static function get_search_input_types( $field_id = '', $field_type = null ) {
 
 		// @todo - This needs to be improved - many fields have . including products and addresses
-		if ( false !== strpos( (string) $field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) {
+		if ( false !== strpos( (string)$field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) {
 			$input_type = 'boolean'; // on/off checkbox
 		} elseif ( in_array( $field_type, array( 'checkbox', 'post_category', 'multiselect' ) ) ) {
 			$input_type = 'multi'; //multiselect
@@ -433,19 +433,19 @@ 
 			$post_id = 0;
 
 			// We're in the WordPress Widget context, and an overriding post ID has been set.
-			if ( ! empty( $widget_args['post_id'] ) ) {
-				$post_id = absint( $widget_args['post_id'] );
+			if ( ! empty( $widget_args[ 'post_id' ] ) ) {
+				$post_id = absint( $widget_args[ 'post_id' ] );
 			}
 			// We're in the WordPress Widget context, and the base View ID should be used
-			else if ( ! empty( $widget_args['view_id'] ) ) {
-				$post_id = absint( $widget_args['view_id'] );
+			else if ( ! empty( $widget_args[ 'view_id' ] ) ) {
+				$post_id = absint( $widget_args[ 'view_id' ] );
 			}
 
 			$args = gravityview_get_permalink_query_args( $post_id );
 
 			// Add hidden fields to the search form
 			foreach ( $args as $key => $value ) {
-				$search_fields[] = array(
+				$search_fields[ ] = array(
 					'name'  => $key,
 					'input' => 'hidden',
 					'value' => $value,
@@ -484,28 +484,28 @@ 
 		/**
 		 * Include the sidebar Widgets.
 		 */
-		$widgets = (array) get_option( 'widget_gravityview_search', array() );
+		$widgets = (array)get_option( 'widget_gravityview_search', array() );
 
 		foreach ( $widgets as $widget ) {
-			if ( ! empty( $widget['view_id'] ) && $widget['view_id'] == $view->ID ) {
-				if( $_fields = json_decode( $widget['search_fields'], true ) ) {
+			if ( ! empty( $widget[ 'view_id' ] ) && $widget[ 'view_id' ] == $view->ID ) {
+				if ( $_fields = json_decode( $widget[ 'search_fields' ], true ) ) {
 					foreach ( $_fields as $field ) {
-						if ( empty( $field['form_id'] ) ) {
-							$field['form_id'] = $view->form ? $view->form->ID : 0;
+						if ( empty( $field[ 'form_id' ] ) ) {
+							$field[ 'form_id' ] = $view->form ? $view->form->ID : 0;
 						}
-						$searchable_fields[] = $with_full_field ? $field : $field['field'];
+						$searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ];
 					}
 				}
 			}
 		}
 
 		foreach ( $view->widgets->by_id( $this->get_widget_id() )->all() as $widget ) {
-			if( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) {
+			if ( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) {
 				foreach ( $_fields as $field ) {
-					if ( empty( $field['form_id'] ) ) {
-						$field['form_id'] = $view->form ? $view->form->ID : 0;
+					if ( empty( $field[ 'form_id' ] ) ) {
+						$field[ 'form_id' ] = $view->form ? $view->form->ID : 0;
 					}
-					$searchable_fields[] = $with_full_field ? $field : $field['field'];
+					$searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ];
 				}
 			}
 		}
@@ -543,7 +543,7 @@ 
 			return $search_criteria; // Return the original criteria, GF_Query modification kicks in later
 		}
 
-		if( 'post' === $this->search_method ) {
+		if ( 'post' === $this->search_method ) {
 			$get = $_POST;
 		} else {
 			$get = $_GET;
@@ -562,15 +562,15 @@ 
 		$get = gv_map_deep( $get, 'rawurldecode' );
 
 		// Make sure array key is set up
-		$search_criteria['field_filters'] = \GV\Utils::get( $search_criteria, 'field_filters', array() );
+		$search_criteria[ 'field_filters' ] = \GV\Utils::get( $search_criteria, 'field_filters', array() );
 
 		$searchable_fields = $this->get_view_searchable_fields( $view );
 		$searchable_field_objects = $this->get_view_searchable_fields( $view, true );
 
 		// add free search
-		if ( isset( $get['gv_search'] ) && '' !== $get['gv_search'] && in_array( 'search_all', $searchable_fields ) ) {
+		if ( isset( $get[ 'gv_search' ] ) && '' !== $get[ 'gv_search' ] && in_array( 'search_all', $searchable_fields ) ) {
 
-			$search_all_value = trim( $get['gv_search'] );
+			$search_all_value = trim( $get[ 'gv_search' ] );
 
 			/**
 			 * @filter `gravityview/search-all-split-words` Search for each word separately or the whole phrase?
@@ -595,7 +595,7 @@ 
 			}
 
 			foreach ( $words as $word ) {
-				$search_criteria['field_filters'][] = array(
+				$search_criteria[ 'field_filters' ][ ] = array(
 					'key' => null, // The field ID to search
 					'value' => $word, // The value to search
 					'operator' => 'contains', // What to search in. Options: `is` or `contains`
@@ -608,14 +608,14 @@ 
 			/**
 			 * Get and normalize the dates according to the input format.
 			 */
-			if ( $curr_start = ! empty( $get['gv_start'] ) ? $get['gv_start'] : '' ) {
-				if( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) {
+			if ( $curr_start = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_start' ] : '' ) {
+				if ( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) {
 					$curr_start = $curr_start_date->format( 'Y-m-d' );
 				}
 			}
 
-			if ( $curr_end = ! empty( $get['gv_start'] ) ? ( ! empty( $get['gv_end'] ) ? $get['gv_end'] : '' ) : '' ) {
-				if( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) {
+			if ( $curr_end = ! empty( $get[ 'gv_start' ] ) ? ( ! empty( $get[ 'gv_end' ] ) ? $get[ 'gv_end' ] : '' ) : '' ) {
+				if ( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) {
 					$curr_end = $curr_end_date->format( 'Y-m-d' );
 				}
 			}
@@ -650,22 +650,22 @@ 
 			 */
 			if ( ! empty( $curr_start ) ) {
 				$curr_start = date( 'Y-m-d H:i:s', strtotime( $curr_start ) );
-				$search_criteria['start_date'] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
+				$search_criteria[ 'start_date' ] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
 			}
 
 			if ( ! empty( $curr_end ) ) {
 				// Fast-forward 24 hour on the end time
 				$curr_end = date( 'Y-m-d H:i:s', strtotime( $curr_end ) + DAY_IN_SECONDS );
-				$search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
-				if ( strpos( $search_criteria['end_date'], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056
-					$search_criteria['end_date'] = date( 'Y-m-d H:i:s', strtotime( $search_criteria['end_date'] ) - 1 );
+				$search_criteria[ 'end_date' ] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
+				if ( strpos( $search_criteria[ 'end_date' ], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056
+					$search_criteria[ 'end_date' ] = date( 'Y-m-d H:i:s', strtotime( $search_criteria[ 'end_date' ] ) - 1 );
 				}
 			}
 		}
 
 		// search for a specific entry ID
 		if ( ! empty( $get[ 'gv_id' ] ) && in_array( 'entry_id', $searchable_fields ) ) {
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => 'id',
 				'value' => absint( $get[ 'gv_id' ] ),
 				'operator' => $this->get_operator( $get, 'gv_id', array( '=' ), '=' ),
@@ -674,20 +674,20 @@ 
 
 		// search for a specific Created_by ID
 		if ( ! empty( $get[ 'gv_by' ] ) && in_array( 'created_by', $searchable_fields ) ) {
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => 'created_by',
-				'value' => $get['gv_by'],
+				'value' => $get[ 'gv_by' ],
 				'operator' => $this->get_operator( $get, 'gv_by', array( '=' ), '=' ),
 			);
 		}
 
 		// Get search mode passed in URL
-		$mode = isset( $get['mode'] ) && in_array( $get['mode'], array( 'any', 'all' ) ) ?  $get['mode'] : 'any';
+		$mode = isset( $get[ 'mode' ] ) && in_array( $get[ 'mode' ], array( 'any', 'all' ) ) ? $get[ 'mode' ] : 'any';
 
 		// get the other search filters
 		foreach ( $get as $key => $value ) {
 
-			if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[0], false, false ) ) ) {
+			if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[ 0 ], false, false ) ) ) {
 				continue; // Not a filter, or empty
 			}
 
@@ -701,19 +701,19 @@ 
 				continue;
 			}
 
-			if ( ! isset( $filter['operator'] ) ) {
-				$filter['operator'] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' );
+			if ( ! isset( $filter[ 'operator' ] ) ) {
+				$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' );
 			}
 
-			if ( isset( $filter[0]['value'] ) ) {
-				$search_criteria['field_filters'] = array_merge( $search_criteria['field_filters'], $filter );
+			if ( isset( $filter[ 0 ][ 'value' ] ) ) {
+				$search_criteria[ 'field_filters' ] = array_merge( $search_criteria[ 'field_filters' ], $filter );
 
 				// if date range type, set search mode to ALL
-				if ( ! empty( $filter[0]['operator'] ) && in_array( $filter[0]['operator'], array( '>=', '<=', '>', '<' ) ) ) {
+				if ( ! empty( $filter[ 0 ][ 'operator' ] ) && in_array( $filter[ 0 ][ 'operator' ], array( '>=', '<=', '>', '<' ) ) ) {
 					$mode = 'all';
 				}
-			} elseif( !empty( $filter ) ) {
-				$search_criteria['field_filters'][] = $filter;
+			} elseif ( ! empty( $filter ) ) {
+				$search_criteria[ 'field_filters' ][ ] = $filter;
 			}
 		}
 
@@ -722,7 +722,7 @@ 
 		 * @since 1.5.1
 		 * @param[out,in] string $mode Search mode (`any` vs `all`)
 		 */
-		$search_criteria['field_filters']['mode'] = apply_filters( 'gravityview/search/mode', $mode );
+		$search_criteria[ 'field_filters' ][ 'mode' ] = apply_filters( 'gravityview/search/mode', $mode );
 
 		gravityview()->log->debug( 'Returned Search Criteria: ', array( 'data' => $search_criteria ) );
 
@@ -756,19 +756,19 @@ 
 
 		$query_class = $view->get_query_class();
 
-		if ( empty( $search_criteria['field_filters'] ) ) {
+		if ( empty( $search_criteria[ 'field_filters' ] ) ) {
 			return;
 		}
 
 		$widgets = $view->widgets->by_id( $this->widget_id );
 		if ( $widgets->count() ) {
 			$widgets = $widgets->all();
-			$widget  = $widgets[0];
+			$widget  = $widgets[ 0 ];
 
 			$search_fields = json_decode( $widget->configuration->get( 'search_fields' ), true );
 
-			foreach ( (array) $search_fields as $search_field ) {
-				if ( 'created_by' === $search_field['field'] && 'input_text' === $search_field['input'] ) {
+			foreach ( (array)$search_fields as $search_field ) {
+				if ( 'created_by' === $search_field[ 'field' ] && 'input_text' === $search_field[ 'input' ] ) {
 					$created_by_text_mode = true;
 				}
 			}
@@ -777,7 +777,7 @@ 
 		$extra_conditions = array();
 		$mode = 'any';
 
-		foreach ( $search_criteria['field_filters'] as &$filter ) {
+		foreach ( $search_criteria[ 'field_filters' ] as &$filter ) {
 			if ( ! is_array( $filter ) ) {
 				if ( in_array( strtolower( $filter ), array( 'any', 'all' ) ) ) {
 					$mode = $filter;
@@ -786,13 +786,13 @@ 
 			}
 
 			// Construct a manual query for unapproved statuses
-			if ( 'is_approved' === $filter['key'] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array) $filter['value'] ) ) {
-				$_tmp_query       = new $query_class( $view->form->ID, array(
+			if ( 'is_approved' === $filter[ 'key' ] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array)$filter[ 'value' ] ) ) {
+				$_tmp_query = new $query_class( $view->form->ID, array(
 					'field_filters' => array(
 						array(
 							'operator' => 'in',
 							'key'      => 'is_approved',
-							'value'    => (array) $filter['value'],
+							'value'    => (array)$filter[ 'value' ],
 						),
 						array(
 							'operator' => 'is',
@@ -804,30 +804,30 @@ 
 				) );
 				$_tmp_query_parts = $_tmp_query->_introspect();
 
-				$extra_conditions[] = $_tmp_query_parts['where'];
+				$extra_conditions[ ] = $_tmp_query_parts[ 'where' ];
 
 				$filter = false;
 				continue;
 			}
 
 			// Construct manual query for text mode creator search
-			if ( 'created_by' === $filter['key'] && ! empty( $created_by_text_mode ) ) {
-				$extra_conditions[] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view );
+			if ( 'created_by' === $filter[ 'key' ] && ! empty( $created_by_text_mode ) ) {
+				$extra_conditions[ ] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view );
 				$filter = false;
 				continue;
 			}
 
 			// By default, we want searches to be wildcard for each field.
-			$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
+			$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
 
 			// For multichoice, let's have an in (OR) search.
-			if ( is_array( $filter['value'] ) ) {
-				$filter['operator'] = 'in'; // @todo what about in contains (OR LIKE chains)?
+			if ( is_array( $filter[ 'value' ] ) ) {
+				$filter[ 'operator' ] = 'in'; // @todo what about in contains (OR LIKE chains)?
 			}
 
 			// Default form with joins functionality
-			if ( empty( $filter['form_id'] ) ) {
-				$filter['form_id'] = $view->form ? $view->form->ID : 0;
+			if ( empty( $filter[ 'form_id' ] ) ) {
+				$filter[ 'form_id' ] = $view->form ? $view->form->ID : 0;
 			}
 
 			/**
@@ -837,28 +837,28 @@ 
 			 * @since develop
 			 * @param \GV\View $view The View we're operating on.
 			 */
-			$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter, $view );
+			$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter, $view );
 		}
 
-		if ( ! empty( $search_criteria['start_date'] ) || ! empty( $search_criteria['end_date'] ) ) {
+		if ( ! empty( $search_criteria[ 'start_date' ] ) || ! empty( $search_criteria[ 'end_date' ] ) ) {
 			$date_criteria = array();
 
-			if ( isset( $search_criteria['start_date'] ) ) {
-				$date_criteria['start_date'] = $search_criteria['start_date'];
+			if ( isset( $search_criteria[ 'start_date' ] ) ) {
+				$date_criteria[ 'start_date' ] = $search_criteria[ 'start_date' ];
 			}
 
-			if ( isset( $search_criteria['end_date'] ) ) {
-				$date_criteria['end_date'] = $search_criteria['end_date'];
+			if ( isset( $search_criteria[ 'end_date' ] ) ) {
+				$date_criteria[ 'end_date' ] = $search_criteria[ 'end_date' ];
 			}
 
 			$_tmp_query         = new $query_class( $view->form->ID, $date_criteria );
 			$_tmp_query_parts   = $_tmp_query->_introspect();
-			$extra_conditions[] = $_tmp_query_parts['where'];
+			$extra_conditions[ ] = $_tmp_query_parts[ 'where' ];
 		}
 
 		$search_conditions = array();
 
-		if ( $filters = array_filter( $search_criteria['field_filters'] ) ) {
+		if ( $filters = array_filter( $search_criteria[ 'field_filters' ] ) ) {
 			foreach ( $filters as &$filter ) {
 				if ( ! is_array( $filter ) ) {
 					continue;
@@ -870,12 +870,12 @@ 
 				 * code by reusing what's inside GF_Query already as they
 				 * take care of many small things like forcing numeric, etc.
 				 */
-				$_tmp_query       = new $query_class( $filter['form_id'], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) );
+				$_tmp_query       = new $query_class( $filter[ 'form_id' ], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) );
 				$_tmp_query_parts = $_tmp_query->_introspect();
-				$search_condition = $_tmp_query_parts['where'];
+				$search_condition = $_tmp_query_parts[ 'where' ];
 
-				if ( empty( $filter['key'] ) && $search_condition->expressions ) {
-					$search_conditions[] = $search_condition;
+				if ( empty( $filter[ 'key' ] ) && $search_condition->expressions ) {
+					$search_conditions[ ] = $search_condition;
 				} else {
 					$left = $search_condition->left;
 					$alias = $query->_alias( $left->field_id, $left->source, $left->is_entry_column() ? 't' : 'm' );
@@ -885,7 +885,7 @@ 
 							$on = $_join->join_on;
 							$join = $_join->join;
 
-							$search_conditions[] = GF_Query_Condition::_or(
+							$search_conditions[ ] = GF_Query_Condition::_or(
 								// Join
 								new GF_Query_Condition(
 									new GF_Query_Column( GF_Query_Column::META, $join->ID, $query->_alias( GF_Query_Column::META, $join->ID, 'm' ) ),
@@ -901,7 +901,7 @@ 
 							);
 						}
 					} else {
-						$search_conditions[] = new GF_Query_Condition(
+						$search_conditions[ ] = new GF_Query_Condition(
 							new GF_Query_Column( $left->field_id, $left->source, $alias ),
 							$search_condition->operator,
 							$search_condition->right
@@ -923,7 +923,7 @@ 
 		/**
 		 * Combine the parts as a new WHERE clause.
 		 */
-		$where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts['where'] ), $search_conditions, $extra_conditions ) );
+		$where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts[ 'where' ] ), $search_conditions, $extra_conditions ) );
 		$query->where( $where );
 	}
 
@@ -946,7 +946,7 @@ 
 		$field_id = str_replace( 'filter_', '', $key );
 
 		// calculates field_id, removing 'filter_' and for '_' for advanced fields ( like name or checkbox )
-		if ( preg_match('/^[0-9_]+$/ism', $field_id ) ) {
+		if ( preg_match( '/^[0-9_]+$/ism', $field_id ) ) {
 			$field_id = str_replace( '_', '.', $field_id );
 		}
 
@@ -1003,7 +1003,7 @@ 
 			// form is in searchable fields
 			$found = false;
 			foreach ( $searchable_fields as $field ) {
-				if ( $field_id == $field['field'] && $form->ID == $field['form_id'] ) {
+				if ( $field_id == $field[ 'field' ] && $form->ID == $field[ 'form_id' ] ) {
 					$found = true;
 					break;
 				}
@@ -1043,7 +1043,7 @@ 
 
 			case 'select':
 			case 'radio':
-				$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
+				$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
 				break;
 
 			case 'post_category':
@@ -1057,7 +1057,7 @@ 
 
 				foreach ( $value as $val ) {
 					$cat = get_term( $val, 'category' );
-					$filter[] = array(
+					$filter[ ] = array(
 						'key'      => $field_id,
 						'value'    => esc_attr( $cat->name ) . ':' . $val,
 						'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ),
@@ -1076,7 +1076,7 @@ 
 				$filter = array();
 
 				foreach ( $value as $val ) {
-					$filter[] = array( 'key' => $field_id, 'value' => $val );
+					$filter[ ] = array( 'key' => $field_id, 'value' => $val );
 				}
 
 				break;
@@ -1085,9 +1085,9 @@ 
 				// convert checkbox on/off into the correct search filter
 				if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field->inputs ) && ! empty( $form_field->choices ) ) {
 					foreach ( $form_field->inputs as $k => $input ) {
-						if ( $input['id'] == $field_id ) {
-							$filter['value'] = $form_field->choices[ $k ]['value'];
-							$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
+						if ( $input[ 'id' ] == $field_id ) {
+							$filter[ 'value' ] = $form_field->choices[ $k ][ 'value' ];
+							$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
 							break;
 						}
 					}
@@ -1097,7 +1097,7 @@ 
 					$filter = array();
 
 					foreach ( $value as $val ) {
-						$filter[] = array(
+						$filter[ ] = array(
 							'key'      => $field_id,
 							'value'    => $val,
 							'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ),
@@ -1118,9 +1118,9 @@ 
 					foreach ( $words as $word ) {
 						if ( ! empty( $word ) && strlen( $word ) > 1 ) {
 							// Keep the same key for each filter
-							$filter['value'] = $word;
+							$filter[ 'value' ] = $word;
 							// Add a search for the value
-							$filters[] = $filter;
+							$filters[ ] = $filter;
 						}
 					}
 
@@ -1134,19 +1134,19 @@ 
 
 					foreach ( $searchable_fields as $searchable_field ) {
 
-						if( $form_field->ID !== $searchable_field['field'] ) {
+						if ( $form_field->ID !== $searchable_field[ 'field' ] ) {
 							continue;
 						}
 
 						// Only exact-match dropdowns, not text search
-						if( in_array( $searchable_field['input'], array( 'text', 'search' ), true ) ) {
+						if ( in_array( $searchable_field[ 'input' ], array( 'text', 'search' ), true ) ) {
 							continue;
 						}
 
 						$input_id = gravityview_get_input_id_from_id( $form_field->ID );
 
 						if ( 4 === $input_id ) {
-							$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
+							$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
 						};
 					}
 				}
@@ -1173,12 +1173,12 @@ 
 						 * @since 1.16.3
 						 * Safeguard until GF implements '<=' operator
 						 */
-						if( !GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) {
+						if ( ! GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) {
 							$operator = '<';
 							$date = date( 'Y-m-d', strtotime( self::get_formatted_date( $date, 'Y-m-d', $date_format ) . ' +1 day' ) );
 						}
 
-						$filter[] = array(
+						$filter[ ] = array(
 							'key'      => $field_id,
 							'value'    => self::get_formatted_date( $date, 'Y-m-d', $date_format ),
 							'operator' => $this->get_operator( $get, $key, array( $operator ), $operator ),
@@ -1186,8 +1186,8 @@ 
 					}
 				} else {
 					$date = $value;
-					$filter['value'] = self::get_formatted_date( $date, 'Y-m-d', $date_format );
-					$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
+					$filter[ 'value' ] = self::get_formatted_date( $date, 'Y-m-d', $date_format );
+					$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
 				}
 
 				break;
@@ -1218,7 +1218,7 @@ 
 			'ymd_dot' => 'Y.m.d',
 		);
 
-		if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ){
+		if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ) {
 			$format = $datepicker[ $field->dateFormat ];
 		}
 
@@ -1255,7 +1255,7 @@ 
 	public function add_template_path( $file_paths ) {
 
 		// Index 100 is the default GravityView template path.
-		$file_paths[102] = self::$file . 'templates/';
+		$file_paths[ 102 ] = self::$file . 'templates/';
 
 		return $file_paths;
 	}
@@ -1274,7 +1274,7 @@ 
 		$has_date = false;
 
 		foreach ( $search_fields as $k => $field ) {
-			if ( in_array( $field['input'], array( 'date', 'date_range', 'entry_date' ) ) ) {
+			if ( in_array( $field[ 'input' ], array( 'date', 'date_range', 'entry_date' ) ) ) {
 				$has_date = true;
 				break;
 			}
@@ -1301,7 +1301,7 @@ 
 		}
 
 		// get configured search fields
-		$search_fields = ! empty( $widget_args['search_fields'] ) ? json_decode( $widget_args['search_fields'], true ) : '';
+		$search_fields = ! empty( $widget_args[ 'search_fields' ] ) ? json_decode( $widget_args[ 'search_fields' ], true ) : '';
 
 		if ( empty( $search_fields ) || ! is_array( $search_fields ) ) {
 			gravityview()->log->debug( 'No search fields configured for widget:', array( 'data' => $widget_args ) );
@@ -1317,40 +1317,40 @@ 
 
 			$updated_field = $this->get_search_filter_details( $updated_field, $context );
 
-			switch ( $field['field'] ) {
+			switch ( $field[ 'field' ] ) {
 
 				case 'search_all':
-					$updated_field['key'] = 'search_all';
-					$updated_field['input'] = 'search_all';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_search' );
+					$updated_field[ 'key' ] = 'search_all';
+					$updated_field[ 'input' ] = 'search_all';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_search' );
 					break;
 
 				case 'entry_date':
-					$updated_field['key'] = 'entry_date';
-					$updated_field['input'] = 'entry_date';
-					$updated_field['value'] = array(
+					$updated_field[ 'key' ] = 'entry_date';
+					$updated_field[ 'input' ] = 'entry_date';
+					$updated_field[ 'value' ] = array(
 						'start' => $this->rgget_or_rgpost( 'gv_start' ),
 						'end' => $this->rgget_or_rgpost( 'gv_end' ),
 					);
 					break;
 
 				case 'entry_id':
-					$updated_field['key'] = 'entry_id';
-					$updated_field['input'] = 'entry_id';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_id' );
+					$updated_field[ 'key' ] = 'entry_id';
+					$updated_field[ 'input' ] = 'entry_id';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_id' );
 					break;
 
 				case 'created_by':
-					$updated_field['key'] = 'created_by';
-					$updated_field['name'] = 'gv_by';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_by' );
-					$updated_field['choices'] = self::get_created_by_choices( $view );
+					$updated_field[ 'key' ] = 'created_by';
+					$updated_field[ 'name' ] = 'gv_by';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_by' );
+					$updated_field[ 'choices' ] = self::get_created_by_choices( $view );
 					break;
 
 				case 'is_approved':
-					$updated_field['key'] = 'is_approved';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'filter_is_approved' );
-					$updated_field['choices'] = self::get_is_approved_choices();
+					$updated_field[ 'key' ] = 'is_approved';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'filter_is_approved' );
+					$updated_field[ 'choices' ] = self::get_is_approved_choices();
 					break;
 			}
 
@@ -1371,16 +1371,16 @@ 
 
 		$gravityview_view->permalink_fields = $this->add_no_permalink_fields( array(), $this, $widget_args );
 
-		$gravityview_view->search_layout = ! empty( $widget_args['search_layout'] ) ? $widget_args['search_layout'] : 'horizontal';
+		$gravityview_view->search_layout = ! empty( $widget_args[ 'search_layout' ] ) ? $widget_args[ 'search_layout' ] : 'horizontal';
 
 		/** @since 1.14 */
-		$gravityview_view->search_mode = ! empty( $widget_args['search_mode'] ) ? $widget_args['search_mode'] : 'any';
+		$gravityview_view->search_mode = ! empty( $widget_args[ 'search_mode' ] ) ? $widget_args[ 'search_mode' ] : 'any';
 
-		$custom_class = ! empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
+		$custom_class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
 
 		$gravityview_view->search_class = self::get_search_class( $custom_class );
 
-		$gravityview_view->search_clear = ! empty( $widget_args['search_clear'] ) ? $widget_args['search_clear'] : false;
+		$gravityview_view->search_clear = ! empty( $widget_args[ 'search_clear' ] ) ? $widget_args[ 'search_clear' ] : false;
 
 		if ( $this->has_date_field( $search_fields ) ) {
 			// enqueue datepicker stuff only if needed!
@@ -1402,10 +1402,10 @@ 
 	public static function get_search_class( $custom_class = '' ) {
 		$gravityview_view = GravityView_View::getInstance();
 
-		$search_class = 'gv-search-'.$gravityview_view->search_layout;
+		$search_class = 'gv-search-' . $gravityview_view->search_layout;
 
-		if ( ! empty( $custom_class )  ) {
-			$search_class .= ' '.$custom_class;
+		if ( ! empty( $custom_class ) ) {
+			$search_class .= ' ' . $custom_class;
 		}
 
 		/**
@@ -1449,9 +1449,9 @@ 
 
 		if ( ! $label ) {
 
-			$label = isset( $form_field['label'] ) ? $form_field['label'] : '';
+			$label = isset( $form_field[ 'label' ] ) ? $form_field[ 'label' ] : '';
 
-			switch( $field['field'] ) {
+			switch ( $field[ 'field' ] ) {
 				case 'search_all':
 					$label = __( 'Search Entries:', 'gravityview' );
 					break;
@@ -1463,10 +1463,10 @@ 
 					break;
 				default:
 					// If this is a field input, not a field
-					if ( strpos( $field['field'], '.' ) > 0 && ! empty( $form_field['inputs'] ) ) {
+					if ( strpos( $field[ 'field' ], '.' ) > 0 && ! empty( $form_field[ 'inputs' ] ) ) {
 
 						// Get the label for the field in question, which returns an array
-						$items = wp_list_filter( $form_field['inputs'], array( 'id' => $field['field'] ) );
+						$items = wp_list_filter( $form_field[ 'inputs' ], array( 'id' => $field[ 'field' ] ) );
 
 						// Get the item with the `label` key
 						$values = wp_list_pluck( $items, 'label' );
@@ -1507,35 +1507,35 @@ 
 		$form = $gravityview_view->getForm();
 
 		// for advanced field ids (eg, first name / last name )
-		$name = 'filter_' . str_replace( '.', '_', $field['field'] );
+		$name = 'filter_' . str_replace( '.', '_', $field[ 'field' ] );
 
 		// get searched value from $_GET/$_POST (string or array)
 		$value = $this->rgget_or_rgpost( $name );
 
 		// get form field details
-		$form_field = gravityview_get_field( $form, $field['field'] );
+		$form_field = gravityview_get_field( $form, $field[ 'field' ] );
 
 		$filter = array(
-			'key' => $field['field'],
+			'key' => $field[ 'field' ],
 			'name' => $name,
 			'label' => self::get_field_label( $field, $form_field ),
-			'input' => $field['input'],
+			'input' => $field[ 'input' ],
 			'value' => $value,
-			'type' => $form_field['type'],
+			'type' => $form_field[ 'type' ],
 		);
 
 		// collect choices
-		if ( 'post_category' === $form_field['type'] && ! empty( $form_field['displayAllCategories'] ) && empty( $form_field['choices'] ) ) {
-			$filter['choices'] = gravityview_get_terms_choices();
-		} elseif ( ! empty( $form_field['choices'] ) ) {
-			$filter['choices'] = $form_field['choices'];
+		if ( 'post_category' === $form_field[ 'type' ] && ! empty( $form_field[ 'displayAllCategories' ] ) && empty( $form_field[ 'choices' ] ) ) {
+			$filter[ 'choices' ] = gravityview_get_terms_choices();
+		} elseif ( ! empty( $form_field[ 'choices' ] ) ) {
+			$filter[ 'choices' ] = $form_field[ 'choices' ];
 		}
 
-		if ( 'date_range' === $field['input'] && empty( $value ) ) {
-			$filter['value'] = array( 'start' => '', 'end' => '' );
+		if ( 'date_range' === $field[ 'input' ] && empty( $value ) ) {
+			$filter[ 'value' ] = array( 'start' => '', 'end' => '' );
 		}
 
-		if ( ! empty( $filter['choices'] ) ) {
+		if ( ! empty( $filter[ 'choices' ] ) ) {
 			/**
 			 * @filter `gravityview/search/sieve_choices` Only output used choices for this field.
 			 * @param[in,out] bool Yes or no.
@@ -1543,7 +1543,7 @@ 
 			 * @param \GV\Context The context.
 			 */
 			if ( apply_filters( 'gravityview/search/sieve_choices', false, $field, $context ) ) {
-				$filter['choices'] = $this->sieve_filter_choices( $filter, $context );
+				$filter[ 'choices' ] = $this->sieve_filter_choices( $filter, $context );
 			}
 		}
 
@@ -1572,11 +1572,11 @@ 
 	 * @return array The filter choices.
 	 */
 	private function sieve_filter_choices( $filter, $context ) {
-		if ( empty( $filter['key'] ) || empty( $filter['choices'] ) ) {
+		if ( empty( $filter[ 'key' ] ) || empty( $filter[ 'choices' ] ) ) {
 			return $filter; // @todo Populate plugins might give us empty choices
 		}
 
-		if ( ! is_numeric( $filter['key'] ) ) {
+		if ( ! is_numeric( $filter[ 'key' ] ) ) {
 			return $filter;
 		}
 
@@ -1586,29 +1586,29 @@ 
 
 		$table = GFFormsModel::get_entry_meta_table_name();
 
-		$key_like = $wpdb->esc_like( $filter['key'] ) . '.%';
+		$key_like = $wpdb->esc_like( $filter[ 'key' ] ) . '.%';
 
 		switch ( \GV\Utils::get( $filter, 'type' ) ):
 			case 'post_category':
 				$choices = $wpdb->get_col( $wpdb->prepare(
 					"SELECT DISTINCT SUBSTRING_INDEX(meta_value, ':', 1) FROM $table WHERE (meta_key LIKE %s OR meta_key = %d) AND form_id = %d",
-					$key_like, $filter['key'], $form_id
+					$key_like, $filter[ 'key' ], $form_id
 				) );
 				break;
 			default:
 				$choices = $wpdb->get_col( $wpdb->prepare(
 					"SELECT DISTINCT meta_value FROM $table WHERE (meta_key LIKE %s OR meta_key = %d) AND form_id = %d",
-					$key_like, $filter['key'], $form_id
+					$key_like, $filter[ 'key' ], $form_id
 				) );
 
-				if ( ( $field = gravityview_get_field( $form_id, $filter['key'] ) ) && 'json' === $field->storageType ) {
+				if ( ( $field = gravityview_get_field( $form_id, $filter[ 'key' ] ) ) && 'json' === $field->storageType ) {
 					$choices = array_map( 'json_decode', $choices );
 					$_choices_array = array();
 					foreach ( $choices as $choice ) {
 						if ( is_array( $choice ) ) {
 							$_choices_array = array_merge( $_choices_array, $choice );
 						} else {
-							$_choices_array []= $choice;
+							$_choices_array [ ] = $choice;
 						}
 					}
 					$choices = array_unique( $_choices_array );
@@ -1618,9 +1618,9 @@ 
 		endswitch;
 
 		$filter_choices = array();
-		foreach ( $filter['choices'] as $choice ) {
-			if ( in_array( $choice['text'], $choices, true ) || in_array( $choice['value'], $choices, true ) ) {
-				$filter_choices[] = $choice;
+		foreach ( $filter[ 'choices' ] as $choice ) {
+			if ( in_array( $choice[ 'text' ], $choices, true ) || in_array( $choice[ 'value' ], $choices, true ) ) {
+				$filter_choices[ ] = $choice;
 			}
 		}
 
@@ -1655,7 +1655,7 @@ 
 			 * @param \GV\View $view The view.
 			 */
 			$text = apply_filters( 'gravityview/search/created_by/text', $user->display_name, $user, $view );
-			$choices[] = array(
+			$choices[ ] = array(
 				'value' => $user->ID,
 				'text' => $text,
 			);
@@ -1675,9 +1675,9 @@ 
 
 		$choices = array();
 		foreach ( GravityView_Entry_Approval_Status::get_all() as $status ) {
-			$choices[] = array(
-				'value' => $status['value'],
-				'text' => $status['label'],
+			$choices[ ] = array(
+				'value' => $status[ 'value' ],
+				'text' => $status[ 'label' ],
 			);
 		}
 
@@ -1729,7 +1729,7 @@ 
 	 */
 	public function add_datepicker_js_dependency( $js_dependencies ) {
 
-		$js_dependencies[] = 'jquery-ui-datepicker';
+		$js_dependencies[ ] = 'jquery-ui-datepicker';
 
 		return $js_dependencies;
 	}
@@ -1773,7 +1773,7 @@ 
 			'isRTL'             => is_rtl(),
 		), $view_data );
 
-		$localizations['datepicker'] = $datepicker_settings;
+		$localizations[ 'datepicker' ] = $datepicker_settings;
 
 		return $localizations;
 
@@ -1800,7 +1800,7 @@ 
 	 * @return void
 	 */
 	private function maybe_enqueue_flexibility() {
-		if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/MSIE [8-9]/', $_SERVER['HTTP_USER_AGENT'] ) ) {
+		if ( isset( $_SERVER[ 'HTTP_USER_AGENT' ] ) && preg_match( '/MSIE [8-9]/', $_SERVER[ 'HTTP_USER_AGENT' ] ) ) {
 			wp_enqueue_script( 'gv-flexibility' );
 		}
 	}
@@ -1822,7 +1822,7 @@ 
 		add_filter( 'gravityview_js_localization', array( $this, 'add_datepicker_localization' ), 10, 2 );
 
 		$scheme = is_ssl() ? 'https://' : 'http://';
-		wp_enqueue_style( 'jquery-ui-datepicker', $scheme.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
+		wp_enqueue_style( 'jquery-ui-datepicker', $scheme . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
 
 		/**
 		 * @filter `gravityview_search_datepicker_class`
@@ -1901,7 +1901,7 @@ 
 	public function add_preview_inputs() {
 		global $wp;
 
-		if ( ! is_preview() || ! current_user_can( 'publish_gravityviews') ) {
+		if ( ! is_preview() || ! current_user_can( 'publish_gravityviews' ) ) {
 			return;
 		}
 
@@ -1953,7 +1953,7 @@ 
  */
 class GravityView_Widget_Search_Author_GF_Query_Condition extends \GF_Query_Condition {
 	public function __construct( $filter, $view ) {
-		$this->value = $filter['value'];
+		$this->value = $filter[ 'value' ];
 		$this->view = $view;
 	}
 
@@ -1985,11 +1985,11 @@ 
 		$conditions = array();
 
 		foreach ( $user_fields as $user_field ) {
-			$conditions[] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) .  '%' );
+			$conditions[ ] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) . '%' );
 		}
 
 		foreach ( $user_meta_fields as $meta_field ) {
-			$conditions[] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) .  '%' );
+			$conditions[ ] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) . '%' );
 		}
 
 		$conditions = '(' . implode( ' OR ', $conditions ) . ')';

includes/class-frontend-views.php

Spacing +92 added lines, -92 removed lines

@@ -85,9 +85,9 @@ 
 	private function __construct() {}
 
 	private function initialize() {
-		add_action( 'wp', array( $this, 'parse_content'), 11 );
+		add_action( 'wp', array( $this, 'parse_content' ), 11 );
 		add_filter( 'parse_query', array( $this, 'parse_query_fix_frontpage' ), 10 );
-		add_action( 'template_redirect', array( $this, 'set_entry_data'), 1 );
+		add_action( 'template_redirect', array( $this, 'set_entry_data' ), 1 );
 
 		// Enqueue scripts and styles after GravityView_Template::register_styles()
 		add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 20 );
@@ -236,12 +236,12 @@ 
 
 			$this->context_view_id = $view_id;
 
-		} elseif ( isset( $_GET['gvid'] ) && $multiple_views ) {
+		} elseif ( isset( $_GET[ 'gvid' ] ) && $multiple_views ) {
 			/**
 			 * used on a has_multiple_views context
 			 * @see GravityView_API::entry_link
 			 */
-			$this->context_view_id = $_GET['gvid'];
+			$this->context_view_id = $_GET[ 'gvid' ];
 
 		} elseif ( ! $multiple_views ) {
 			$array_keys = array_keys( $this->getGvOutputData()->get_views() );
@@ -278,25 +278,25 @@ 
 		global $wp_rewrite;
 
 		$is_front_page = ( $query->is_home || $query->is_page );
-		$show_on_front = ( 'page' === get_option('show_on_front') );
-		$front_page_id = get_option('page_on_front');
+		$show_on_front = ( 'page' === get_option( 'show_on_front' ) );
+		$front_page_id = get_option( 'page_on_front' );
 
-		if (  $is_front_page && $show_on_front && $front_page_id ) {
+		if ( $is_front_page && $show_on_front && $front_page_id ) {
 
 			// Force to be an array, potentially a query string ( entry=16 )
 			$_query = wp_parse_args( $query->query );
 
 			// pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename.
-			if ( isset( $_query['pagename'] ) && '' === $_query['pagename'] ) {
-				unset( $_query['pagename'] );
+			if ( isset( $_query[ 'pagename' ] ) && '' === $_query[ 'pagename' ] ) {
+				unset( $_query[ 'pagename' ] );
 			}
 
 			// this is where will break from core wordpress
 			/** @internal Don't use this filter; it will be unnecessary soon - it's just a patch for specific use case */
 			$ignore = apply_filters( 'gravityview/internal/ignored_endpoints', array( 'preview', 'page', 'paged', 'cpage' ), $query );
 			$endpoints = \GV\Utils::get( $wp_rewrite, 'endpoints' );
-			foreach ( (array) $endpoints as $endpoint ) {
-				$ignore[] = $endpoint[1];
+			foreach ( (array)$endpoints as $endpoint ) {
+				$ignore[ ] = $endpoint[ 1 ];
 			}
 			unset( $endpoints );
 
@@ -306,21 +306,21 @@ 
 			// - The query includes keys that are associated with registered endpoints. `entry`, for example.
 			if ( empty( $_query ) || ! array_diff( array_keys( $_query ), $ignore ) ) {
 
-				$qv =& $query->query_vars;
+				$qv = & $query->query_vars;
 
 				// Prevent redirect when on the single entry endpoint
-				if( self::is_single_entry() ) {
+				if ( self::is_single_entry() ) {
 					add_filter( 'redirect_canonical', '__return_false' );
 				}
 
 				$query->is_page = true;
 				$query->is_home = false;
-				$qv['page_id']  = $front_page_id;
+				$qv[ 'page_id' ]  = $front_page_id;
 
 				// Correct <!--nextpage--> for page_on_front
-				if ( ! empty( $qv['paged'] ) ) {
-					$qv['page'] = $qv['paged'];
-					unset( $qv['paged'] );
+				if ( ! empty( $qv[ 'paged' ] ) ) {
+					$qv[ 'page' ] = $qv[ 'paged' ];
+					unset( $qv[ 'paged' ] );
 				}
 			}
 
@@ -350,7 +350,7 @@ 
 
 		$this->setIsGravityviewPostType( get_post_type( $post ) === 'gravityview' );
 
-		$post_id = $this->getPostId() ? $this->getPostId() : (isset( $post ) ? $post->ID : null );
+		$post_id = $this->getPostId() ? $this->getPostId() : ( isset( $post ) ? $post->ID : null );
 		$this->setPostId( $post_id );
 		$post_has_shortcode = ! empty( $post->post_content ) ? gravityview_has_shortcode_r( $post->post_content, 'gravityview' ) : false;
 		$this->setPostHasShortcode( $this->isGravityviewPostType() ? null : ! empty( $post_has_shortcode ) );
@@ -386,7 +386,7 @@ 
 
 		$search_method = GravityView_Widget_Search::getInstance()->get_search_method();
 
-		if( 'post' === $search_method ) {
+		if ( 'post' === $search_method ) {
 			$get = $_POST;
 		} else {
 			$get = $_GET;
@@ -443,20 +443,20 @@ 
 		 * @param boolean $in_the_loop Whether to apply the filter to the menu title and the meta tag <title> - outside the loop
 		 * @param array $entry Current entry
 		 */
-		$apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop' , in_the_loop(), $entry );
+		$apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop', in_the_loop(), $entry );
 
 		if ( ! $apply_outside_loop ) {
 			return $title;
 		}
 
 		// User reported WooCommerce doesn't pass two args.
-		if ( empty( $passed_post_id ) )  {
+		if ( empty( $passed_post_id ) ) {
 			return $title;
 		}
 
 		// Don't modify the title for anything other than the current view/post.
 		// This is true for embedded shortcodes and Views.
-		if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) {
+		if ( is_object( $post ) && (int)$post->ID !== (int)$passed_post_id ) {
 			return $title;
 		}
 
@@ -468,7 +468,7 @@ 
 			$view_meta = $this->getGvOutputData()->get_view( $context_view_id );
 		} else {
 			foreach ( $this->getGvOutputData()->get_views() as $view_id => $view_data ) {
-				if ( intval( $view_data['form_id'] ) === intval( $entry['form_id'] ) ) {
+				if ( intval( $view_data[ 'form_id' ] ) === intval( $entry[ 'form_id' ] ) ) {
 					$view_meta = $view_data;
 					break;
 				}
@@ -476,12 +476,12 @@ 
 		}
 
 		/** Deprecated stuff in the future. See the branch above. */
-		if ( ! empty( $view_meta['atts']['single_title'] ) ) {
+		if ( ! empty( $view_meta[ 'atts' ][ 'single_title' ] ) ) {
 
-			$title = $view_meta['atts']['single_title'];
+			$title = $view_meta[ 'atts' ][ 'single_title' ];
 
 			// We are allowing HTML in the fields, so no escaping the output
-			$title = GravityView_API::replace_variables( $title, $view_meta['form'], $entry );
+			$title = GravityView_API::replace_variables( $title, $view_meta[ 'form' ], $entry );
 
 			$title = do_shortcode( $title );
 		}
@@ -552,7 +552,7 @@ 
 
 		$context = GravityView_View::getInstance()->getContext();
 
-		switch( $context ) {
+		switch ( $context ) {
 			case 'directory':
 				$tab = __( 'Multiple Entries', 'gravityview' );
 				break;
@@ -566,12 +566,12 @@ 
 		}
 
 
-		$title = sprintf( esc_html_x('The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab );
+		$title = sprintf( esc_html_x( 'The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab );
 		$edit_link = admin_url( sprintf( 'post.php?post=%d&action=edit#%s-view', $view_id, $context ) );
-		$action_text = sprintf( esc_html__('Add fields to %s', 'gravityview' ), $tab );
+		$action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab );
 		$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;" />', $tab, esc_url(plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
+		$image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
 		$output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message );
 
 		echo GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $view_id );
@@ -619,7 +619,7 @@ 
 		$direct_access = apply_filters( 'gravityview_direct_access', true, $view->ID );
 		$embed_only = $view->settings->get( 'embed_only' );
 
-		if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
+		if ( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
 			return __( 'You are not allowed to view this content.', 'gravityview' );
 		}
 
@@ -666,7 +666,7 @@ 
 				$datetime_format = 'Y-m-d H:i:s';
 				$search_is_outside_view_bounds = false;
 
-				if( ! empty( $search_criteria[ $key ] ) ) {
+				if ( ! empty( $search_criteria[ $key ] ) ) {
 
 					$search_date = strtotime( $search_criteria[ $key ] );
 
@@ -694,14 +694,14 @@ 
 				if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) {
 
 					// Then we override the search and re-set the start date
-					$return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true );
+					$return_search_criteria[ $key ] = date_i18n( $datetime_format, $date, true );
 				}
 			}
 		}
 
-		if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) {
+		if ( isset( $return_search_criteria[ 'start_date' ] ) && isset( $return_search_criteria[ 'end_date' ] ) ) {
 			// The start date is AFTER the end date. This will result in no results, but let's not force the issue.
-			if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) {
+			if ( strtotime( $return_search_criteria[ 'start_date' ] ) > strtotime( $return_search_criteria[ 'end_date' ] ) ) {
 				gravityview()->log->error( 'Invalid search: the start date is after the end date.', array( 'data' => $return_search_criteria ) );
 			}
 		}
@@ -720,19 +720,19 @@ 
 	public static function process_search_only_approved( $args, $search_criteria ) {
 
 		/** @since 1.19 */
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
 			gravityview()->log->debug( 'User can moderate entries; showing all approval statuses' );
 			return $search_criteria;
 		}
 
-		if ( ! empty( $args['show_only_approved'] ) ) {
+		if ( ! empty( $args[ 'show_only_approved' ] ) ) {
 
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => GravityView_Entry_Approval::meta_key,
 				'value' => GravityView_Entry_Approval_Status::APPROVED
 			);
 
-			$search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; // force all the criterias to be met
 
 			gravityview()->log->debug( '[process_search_only_approved] Search Criteria if show only approved: ', array( 'data' => $search_criteria ) );
 		}
@@ -759,18 +759,18 @@ 
 	 */
 	public static function is_entry_approved( $entry, $args = array() ) {
 
-		if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) {
+		if ( empty( $entry[ 'id' ] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args[ 'show_only_approved' ] ) ) {
 			// is implicitly approved if entry is null or View settings doesn't require to check for approval
 			return true;
 		}
 
 		/** @since 1.19 */
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
 			gravityview()->log->debug( 'User can moderate entries, so entry is approved for viewing' );
 			return true;
 		}
 
-		$is_approved = gform_get_meta( $entry['id'], GravityView_Entry_Approval::meta_key );
+		$is_approved = gform_get_meta( $entry[ 'id' ], GravityView_Entry_Approval::meta_key );
 
 		return GravityView_Entry_Approval_Status::is_approved( $is_approved );
 	}
@@ -794,7 +794,7 @@ 
 		 * Compatibility with filters hooking in `gravityview_search_criteria` instead of `gravityview_fe_search_criteria`.
 		 */
 		$criteria = apply_filters( 'gravityview_search_criteria', array(), array( $form_id ), \GV\Utils::get( $args, 'id' ) );
-		$search_criteria = isset( $criteria['search_criteria'] ) ? $criteria['search_criteria'] : array( 'field_filters' => array() );
+		$search_criteria = isset( $criteria[ 'search_criteria' ] ) ? $criteria[ 'search_criteria' ] : array( 'field_filters' => array() );
 
 		/**
 		 * @filter `gravityview_fe_search_criteria` Modify the search criteria
@@ -810,29 +810,29 @@ 
 		gravityview()->log->debug( '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', array( 'data' =>$search_criteria ) );
 
 		// implicity search
-		if ( ! empty( $args['search_value'] ) ) {
+		if ( ! empty( $args[ 'search_value' ] ) ) {
 
 			// Search operator options. Options: `is` or `contains`
-			$operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains';
+			$operator = ! empty( $args[ 'search_operator' ] ) && in_array( $args[ 'search_operator' ], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args[ 'search_operator' ] : 'contains';
 
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => \GV\Utils::_GET( 'search_field', \GV\Utils::get( $args, 'search_field' ) ), // The field ID to search
-				'value' => _wp_specialchars( $args['search_value'] ), // The value to search. Encode ampersands but not quotes.
+				'value' => _wp_specialchars( $args[ 'search_value' ] ), // The value to search. Encode ampersands but not quotes.
 				'operator' => $operator,
 			);
 
 			// Lock search mode to "all" with implicit presearch filter.
-			$search_criteria['field_filters']['mode'] = 'all';
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all';
 		}
 
-		if( $search_criteria !== $original_search_criteria ) {
+		if ( $search_criteria !== $original_search_criteria ) {
 			gravityview()->log->debug( '[get_search_criteria] Search Criteria after implicity search: ', array( 'data' => $search_criteria ) );
 		}
 
 		// Handle setting date range
 		$search_criteria = self::process_search_dates( $args, $search_criteria );
 
-		if( $search_criteria !== $original_search_criteria ) {
+		if ( $search_criteria !== $original_search_criteria ) {
 			gravityview()->log->debug( '[get_search_criteria] Search Criteria after date params: ', array( 'data' => $search_criteria ) );
 		}
 
@@ -843,7 +843,7 @@ 
 		 * @filter `gravityview_status` Modify entry status requirements to be included in search results.
 		 * @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash`
 		 */
-		$search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args );
+		$search_criteria[ 'status' ] = apply_filters( 'gravityview_status', 'active', $args );
 
 		return $search_criteria;
 	}
@@ -956,7 +956,7 @@ 
 			'search_criteria' => $search_criteria,
 			'sorting' => self::updateViewSorting( $args, $form_id ),
 			'paging' => $paging,
-			'cache' => isset( $args['cache'] ) ? $args['cache'] : true,
+			'cache' => isset( $args[ 'cache' ] ) ? $args[ 'cache' ] : true,
 		);
 
 		/**
@@ -981,7 +981,7 @@ 
 		 * @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys.
 		 * @param array $args View configuration args.
 		 */
-		$parameters = apply_filters( 'gravityview_get_entries_'.\GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id );
+		$parameters = apply_filters( 'gravityview_get_entries_' . \GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id );
 
 		gravityview()->log->debug( '$parameters passed to gravityview_get_entries(): ', array( 'data' => $parameters ) );
 
@@ -1006,17 +1006,17 @@ 
 		$default_page_size = apply_filters( 'gravityview_default_page_size', 25 );
 
 		// Paging & offset
-		$page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : $default_page_size;
+		$page_size = ! empty( $args[ 'page_size' ] ) ? intval( $args[ 'page_size' ] ) : $default_page_size;
 
 		if ( -1 === $page_size ) {
 			$page_size = PHP_INT_MAX;
 		}
 
-		$curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] );
+		$curr_page = empty( $_GET[ 'pagenum' ] ) ? 1 : intval( $_GET[ 'pagenum' ] );
 		$offset = ( $curr_page - 1 ) * $page_size;
 
-		if ( ! empty( $args['offset'] ) ) {
-			$offset += intval( $args['offset'] );
+		if ( ! empty( $args[ 'offset' ] ) ) {
+			$offset += intval( $args[ 'offset' ] );
 		}
 
 		$paging = array(
@@ -1041,11 +1041,11 @@ 
 	public static function updateViewSorting( $args, $form_id ) {
 		$sorting = array();
 
-		$has_values = isset( $_GET['sort'] );
+		$has_values = isset( $_GET[ 'sort' ] );
 
-		if ( $has_values && is_array( $_GET['sort'] ) ) {
-			$sorts = array_keys( $_GET['sort'] );
-			$dirs  = array_values( $_GET['sort'] );
+		if ( $has_values && is_array( $_GET[ 'sort' ] ) ) {
+			$sorts = array_keys( $_GET[ 'sort' ] );
+			$dirs  = array_values( $_GET[ 'sort' ] );
 
 			if ( $has_values = array_filter( $dirs ) ) {
 				$sort_field_id = end( $sorts );
@@ -1054,11 +1054,11 @@ 
 		}
 
 		if ( ! isset( $sort_field_id ) ) {
-			$sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : \GV\Utils::get( $args, 'sort_field' );
+			$sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : \GV\Utils::get( $args, 'sort_field' );
 		}
 
 		if ( ! isset( $sort_direction ) ) {
-			$sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : \GV\Utils::get( $args, 'sort_direction' );
+			$sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : \GV\Utils::get( $args, 'sort_direction' );
 		}
 
 		if ( is_array( $sort_field_id ) ) {
@@ -1090,10 +1090,10 @@ 
 				$form = GFAPI::get_form( $form_id );
 
 				// Get the first GF_Field field ID, set as the key for entry randomization
-				if ( ! empty( $form['fields'] ) ) {
+				if ( ! empty( $form[ 'fields' ] ) ) {
 
 					/** @var GF_Field $field */
-					foreach ( $form['fields'] as $field ) {
+					foreach ( $form[ 'fields' ] as $field ) {
 						if ( ! is_a( $field, 'GF_Field' ) ) {
 							continue;
 						}
@@ -1138,7 +1138,7 @@ 
 		if ( is_array( $sort_field_id ) ) {
 			$modified_ids = array();
 			foreach ( $sort_field_id as $_sort_field_id ) {
-				$modified_ids []= self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id );
+				$modified_ids [ ] = self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id );
 			}
 			return $modified_ids;
 		}
@@ -1147,11 +1147,11 @@ 
 
 		$sort_field = GFFormsModel::get_field( $form, $sort_field_id );
 
-		if( ! $sort_field ) {
+		if ( ! $sort_field ) {
 			return $sort_field_id;
 		}
 
-		switch ( $sort_field['type'] ) {
+		switch ( $sort_field[ 'type' ] ) {
 
 			case 'address':
 				// Sorting by full address
@@ -1168,7 +1168,7 @@ 
 					 */
 					$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id );
 
-					switch( strtolower( $address_part ) ){
+					switch ( strtolower( $address_part ) ) {
 						case 'street':
 							$sort_field_id .= '.1';
 							break;
@@ -1241,7 +1241,7 @@ 
 		if ( ! class_exists( '\GV\Entry' ) ) {
 
 			// Not using gravityview()->log->error(), since that may not exist yet either!
-			do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary()  );
+			do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary() );
 
 			return null;
 		}
@@ -1258,7 +1258,7 @@ 
 		 */
 		$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry );
 
-		if ( empty( $single_entry ) ){
+		if ( empty( $single_entry ) ) {
 			return false;
 		} else {
 			return $single_entry;
@@ -1280,7 +1280,7 @@ 
 			$views = $this->getGvOutputData()->get_views();
 
 			foreach ( $views as $view_id => $data ) {
-				$view = \GV\View::by_id( $data['id'] );
+				$view = \GV\View::by_id( $data[ 'id' ] );
 				$view_id = $view->ID;
 				$template_id = gravityview_get_template_id( $view->ID );
 				$data = $view->as_data();
@@ -1289,7 +1289,7 @@ 
 				 * Don't enqueue the scripts or styles if it's not going to be displayed.
 				 * @since 1.15
 				 */
-				if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
+				if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
 					continue;
 				}
 
@@ -1321,7 +1321,7 @@ 
 					 * @param \GV\View The View.
 					 */
 					apply_filters( 'gravityview_lightbox_script', $js_dependency, $view );
-					$js_dependencies[] = $js_dependency;
+					$js_dependencies[ ] = $js_dependency;
 
 					if ( ! empty( $wp_filter[ 'gravity_view_lightbox_style' ] ) ) {
 						gravityview()->log->warning( 'gravity_view_lightbox_style filter is deprecated use gravityview_lightbox_style instead' );
@@ -1340,7 +1340,7 @@ 
 					 * @param \GV\View The View.
 					 */
 					$css_dependency = apply_filters( 'gravityview_lightbox_style', $css_dependency, $view );
-					$css_dependencies[] = $css_dependency;
+					$css_dependencies[ ] = $css_dependency;
 				}
 
 				/**
@@ -1348,19 +1348,19 @@ 
 				 * @see https://github.com/katzwebservices/GravityView/issues/536
 				 * @since 1.15
 				 */
-				if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) {
-					$css_dependencies[] = 'dashicons';
+				if ( gravityview_view_has_single_checkbox_or_radio( $data[ 'form' ], $data[ 'fields' ] ) ) {
+					$css_dependencies[ ] = 'dashicons';
 				}
 
 				wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
 
 				$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
-				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ) , GravityView_Plugin::version, true );
+				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ), GravityView_Plugin::version, true );
 
 				wp_enqueue_script( 'gravityview-fe-view' );
 
-				if ( ! empty( $data['atts']['sort_columns'] ) ) {
+				if ( ! empty( $data[ 'atts' ][ 'sort_columns' ] ) ) {
 					wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' );
 				}
 
@@ -1423,7 +1423,7 @@ 
 	public static function add_style( $template_id ) {
 
 		if ( ! empty( $template_id ) && wp_style_is( 'gravityview_style_' . $template_id, 'registered' ) ) {
-			gravityview()->log->debug(  'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) );
+			gravityview()->log->debug( 'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) );
 			wp_enqueue_style( 'gravityview_style_' . $template_id );
 		} elseif ( empty( $template_id ) ) {
 			gravityview()->log->error( 'Cannot add template style; template_id is empty' );
@@ -1454,11 +1454,11 @@ 
 		 * Not a table-based template; don't add sort icons
 		 * @since 1.12
 		 */
-		if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
+		if ( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
 			return $label;
 		}
 
-		if ( ! $this->is_field_sortable( $field['id'], $form ) ) {
+		if ( ! $this->is_field_sortable( $field[ 'id' ], $form ) ) {
 			return $label;
 		}
 
@@ -1466,29 +1466,29 @@ 
 
 		$class = 'gv-sort';
 
-		$sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] );
+		$sort_field_id = self::_override_sorting_id_by_field_type( $field[ 'id' ], $form[ 'id' ] );
 
 		$sort_args = array(
-			'sort' => $field['id'],
+			'sort' => $field[ 'id' ],
 			'dir' => 'asc',
 		);
 
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
+		if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) {
 			//toggle sorting direction.
-			if ( 'asc' === $sorting['direction'] ) {
-				$sort_args['dir'] = 'desc';
+			if ( 'asc' === $sorting[ 'direction' ] ) {
+				$sort_args[ 'dir' ] = 'desc';
 				$class .= ' gv-icon-sort-desc';
 			} else {
-				$sort_args['dir'] = 'asc';
+				$sort_args[ 'dir' ] = 'asc';
 				$class .= ' gv-icon-sort-asc';
 			}
 		} else {
 			$class .= ' gv-icon-caret-up-down';
 		}
 
-		$url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) );
+		$url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) );
 
-		return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a>&nbsp;'. $label;
+		return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a>&nbsp;' . $label;
 
 	}
 
@@ -1506,7 +1506,7 @@ 
 
 		$field_type = $field_id;
 
-		if( is_numeric( $field_id ) ) {
+		if ( is_numeric( $field_id ) ) {
 			$field = GFFormsModel::get_field( $form, $field_id );
 			$field_type = $field ? $field->type : $field_id;
 		}
@@ -1529,7 +1529,7 @@ 
 			return false;
 		}
 
-		return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
+		return apply_filters( "gravityview/sortable/formfield_{$form[ 'id' ]}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
 
 	}
 

includes/admin/metaboxes/views/view-configuration.php

Indentation +9 added lines, -9 removed lines

@@ -31,11 +31,11 @@ 
 
 			<?php
 
-                do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
+				do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
 
-    			do_action('gravityview_render_field_pickers', 'directory' );
+				do_action('gravityview_render_field_pickers', 'directory' );
 
-            ?>
+			?>
 
 			<?php // list of available widgets to be shown in the popup ?>
             <div id="directory-available-widgets" class="hide-if-js gv-tooltip">
@@ -60,13 +60,13 @@ 
 
 			<div id="single-active-fields" class="gv-grid">
 				<?php
-                if(!empty( $curr_template ) ) {
-				    do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
-                }
-			    ?>
+				if(!empty( $curr_template ) ) {
+					do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
+				}
+				?>
 			</div>
             <?php
-                do_action('gravityview_render_field_pickers', 'single' );
+				do_action('gravityview_render_field_pickers', 'single' );
 			?>
 		</div>
 
@@ -85,7 +85,7 @@ 
 			</div>
 
 			<?php
-			    do_action('gravityview_render_field_pickers', 'edit' );
+				do_action('gravityview_render_field_pickers', 'edit' );
 			?>
 
 		</div>

Spacing +16 added lines, -16 removed lines

@@ -15,32 +15,32 @@ 
 
 		<div id="directory-fields" class="gv-section">
 
-			<h4><?php esc_html_e( 'Above Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview'); ?></span></h4>
+			<h4><?php esc_html_e( 'Above Entries Widgets', 'gravityview' ); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview' ); ?></span></h4>
 
-			<?php do_action('gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?>
+			<?php do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?>
 
-			<h4><?php esc_html_e( 'Entries Fields', 'gravityview'); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview'); ?></span></h4>
+			<h4><?php esc_html_e( 'Entries Fields', 'gravityview' ); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview' ); ?></span></h4>
 
 			<div id="directory-active-fields" class="gv-grid">
-				<?php if(!empty( $curr_template ) ) {
-					do_action('gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true );
+				<?php if ( ! empty( $curr_template ) ) {
+					do_action( 'gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true );
 				} ?>
 			</div>
 
-			<h4><?php esc_html_e( 'Below Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown below entries.', 'gravityview'); ?></span></h4>
+			<h4><?php esc_html_e( 'Below Entries Widgets', 'gravityview' ); ?> <span><?php esc_html_e( 'These widgets will be shown below entries.', 'gravityview' ); ?></span></h4>
 
 			<?php
 
-                do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
+                do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
 
-    			do_action('gravityview_render_field_pickers', 'directory' );
+    			do_action( 'gravityview_render_field_pickers', 'directory' );
 
             ?>
 
 			<?php // list of available widgets to be shown in the popup ?>
             <div id="directory-available-widgets" class="hide-if-js gv-tooltip">
                 <span class="close" role="button" aria-label="<?php esc_html_e( 'Close', 'gravityview' ); ?>"><i class="dashicons dashicons-dismiss"></i></span>
-				<?php do_action('gravityview_render_available_widgets' ); ?>
+				<?php do_action( 'gravityview_render_available_widgets' ); ?>
             </div>
 
 		</div>
@@ -56,17 +56,17 @@ 
 
 		<div id="single-fields" class="gv-section">
 
-			<h4><?php esc_html_e( 'These fields will be shown in Single Entry view.', 'gravityview'); ?></h4>
+			<h4><?php esc_html_e( 'These fields will be shown in Single Entry view.', 'gravityview' ); ?></h4>
 
 			<div id="single-active-fields" class="gv-grid">
 				<?php
-                if(!empty( $curr_template ) ) {
-				    do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
+                if ( ! empty( $curr_template ) ) {
+				    do_action( 'gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
                 }
 			    ?>
 			</div>
             <?php
-                do_action('gravityview_render_field_pickers', 'single' );
+                do_action( 'gravityview_render_field_pickers', 'single' );
 			?>
 		</div>
 
@@ -76,16 +76,16 @@ 
 
 		<div id="edit-fields" class="gv-section">
 
-			<h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview'); ?> <span><?php esc_html_e('If not configured, all form fields will be displayed.', 'gravityview'); ?></span></h4>
+			<h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview' ); ?> <span><?php esc_html_e( 'If not configured, all form fields will be displayed.', 'gravityview' ); ?></span></h4>
 
 			<div id="edit-active-fields" class="gv-grid">
 				<?php
-				do_action('gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true );
+				do_action( 'gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true );
 				?>
 			</div>
 
 			<?php
-			    do_action('gravityview_render_field_pickers', 'edit' );
+			    do_action( 'gravityview_render_field_pickers', 'edit' );
 			?>
 
 		</div>

includes/admin/class-gravityview-admin-view-item.php

Spacing +19 added lines, -19 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 = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
+		$hide_settings_link = ( 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="%s" aria-label="%s"><span class="dashicons-admin-generic dashicons %s"></span></button>', $hide_settings_link, $hide_settings_link, esc_attr( $settings_title ) );
 
 		// 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/metaboxes/views/select-template.php

Spacing +10 added lines, -10 removed lines

@@ -22,27 +22,27 @@
 
 <?php // list all the available templates (type= fresh or custom ) ?>
 <div class="gv-grid">
-	<?php foreach( $templates as $id => $template ) {
+	<?php foreach ( $templates as $id => $template ) {
 		$selected = ( $id == $current_template ) ? ' gv-selected' : ''; ?>
 
 		<div class="gv-grid-col-1-3">
-			<div class="gv-view-types-module<?php echo $selected; ?>" data-filter="<?php echo esc_attr( $template['type'] ); ?>">
+			<div class="gv-view-types-module<?php echo $selected; ?>" data-filter="<?php echo esc_attr( $template[ 'type' ] ); ?>">
 				<div class="gv-view-types-hover">
 					<div>
-						<?php if( !empty( $template['buy_source'] ) ) { ?>
-							<p><a href="<?php echo esc_url( $template['buy_source'] ); ?>" class="button-primary button-buy-now"><?php esc_html_e( 'Buy Now', 'gravityview'); ?></a></p>
+						<?php if ( ! empty( $template[ 'buy_source' ] ) ) { ?>
+							<p><a href="<?php echo esc_url( $template[ 'buy_source' ] ); ?>" class="button-primary button-buy-now"><?php esc_html_e( 'Buy Now', 'gravityview' ); ?></a></p>
 						<?php } else { ?>
-							<p><button href="#gv_select_template" class="gv_select_template button button-hero button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview'); ?></button></p>
-							<?php if( !empty( $template['preview'] ) ) { ?>
-								<a href="<?php echo esc_url( $template['preview'] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-admin-links" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview'); ?>"></i></a>
+							<p><button href="#gv_select_template" class="gv_select_template button button-hero button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview' ); ?></button></p>
+							<?php if ( ! empty( $template[ 'preview' ] ) ) { ?>
+								<a href="<?php echo esc_url( $template[ 'preview' ] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-admin-links" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview' ); ?>"></i></a>
 							<?php } ?>
 						<?php } ?>
 					</div>
 				</div>
 				<div class="gv-view-types-normal">
-					<img src="<?php echo esc_url( $template['logo'] ); ?>" alt="<?php echo esc_attr( $template['label'] ); ?>">
-					<h5><?php echo esc_html( $template['label'] ); ?></h5>
-					<p class="description"><?php echo esc_html( $template['description'] ); ?></p>
+					<img src="<?php echo esc_url( $template[ 'logo' ] ); ?>" alt="<?php echo esc_attr( $template[ 'label' ] ); ?>">
+					<h5><?php echo esc_html( $template[ 'label' ] ); ?></h5>
+					<p class="description"><?php echo esc_html( $template[ 'description' ] ); ?></p>
 				</div>
 			</div>
 		</div>

includes/admin/metaboxes/views/data-source.php

Spacing +7 added lines, -7 removed lines

@@ -10,13 +10,13 @@ 
 wp_nonce_field( 'gravityview_select_form', 'gravityview_select_form_nonce' );
 
 //current value
-$current_form = (int) \GV\Utils::_GET( 'form_id', gravityview_get_form_id( $post->ID ) );
+$current_form = (int)\GV\Utils::_GET( 'form_id', gravityview_get_form_id( $post->ID ) );
 
 // If form is in trash or not existing, show error
 GravityView_Admin::connected_form_warning( $current_form );
 
 // check for available gravity forms
-$forms = gravityview_get_forms('any');
+$forms = gravityview_get_forms( 'any' );
 
 /**
  * @param int $current_form Form currently selected in the View (0 if none selected)
@@ -35,24 +35,24 @@ 
 		?>
 		<a class="button button-primary" href="#gv_start_fresh" title="<?php esc_attr_e( 'Use a Form Preset', 'gravityview' ); ?>"><?php esc_html_e( 'Use a Form Preset', 'gravityview' ); ?></a>
 
-		<?php if( !empty( $forms ) ) { ?>
+		<?php if ( ! empty( $forms ) ) { ?>
 			<span>&nbsp;<?php esc_html_e( 'or use an existing form', 'gravityview' ); ?>&nbsp;</span>
 		<?php }
 	}
 
 	// If there are no forms to select, show no forms.
-	if( !empty( $forms ) ) { ?>
+	if ( ! empty( $forms ) ) { ?>
 		<select name="gravityview_form_id" id="gravityview_form_id">
 			<option value="" <?php selected( '', $current_form, true ); ?>>&mdash; <?php esc_html_e( 'list of forms', 'gravityview' ); ?> &mdash;</option>
-			<?php foreach( $forms as $form ) { ?>
-				<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
+			<?php foreach ( $forms as $form ) { ?>
+				<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
 			<?php } ?>
 		</select>
 	<?php } else { ?>
 		<select name="gravityview_form_id" id="gravityview_form_id" class="hidden"><option selected="selected" value=""></option></select>
 	<?php } ?>
 
-	&nbsp;<button class="button button-primary" <?php if( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></button>
+	&nbsp;<button class="button button-primary" <?php if ( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></button>
 </p>
 
 <?php // confirm dialog box ?>