gravityview / GravityView

includes/fields/class-gravityview-field.php

Spacing +16 added lines, -16 removed lines

@@ -114,12 +114,12 @@ 
 
 		add_filter( 'gravityview/sortable/field_blacklist', array( $this, '_filter_sortable_fields' ), 1 );
 
-		if( $this->_custom_merge_tag ) {
+		if ( $this->_custom_merge_tag ) {
 			add_filter( 'gform_custom_merge_tags', array( $this, '_filter_gform_custom_merge_tags' ), 10, 4 );
 			add_filter( 'gform_replace_merge_tags', array( $this, '_filter_gform_replace_merge_tags' ), 10, 7 );
 		}
 
-		if( 'meta' === $this->group || '' !== $this->default_search_label ) {
+		if ( 'meta' === $this->group || '' !== $this->default_search_label ) {
 			add_filter( 'gravityview_search_field_label', array( $this, 'set_default_search_label' ), 10, 3 );
 		}
 
@@ -141,7 +141,7 @@ 
 	 */
 	function set_default_search_label( $label = '', $gf_field = null, $field = array() ) {
 
-		if( $this->name === $field['field'] && '' === $label ) {
+		if ( $this->name === $field[ 'field' ] && '' === $label ) {
 			$label = esc_html( $this->default_search_label );
 		}
 
@@ -162,7 +162,7 @@ 
 	 *
 	 * @return string Original text if {_custom_merge_tag} isn't found. Otherwise, replaced text.
 	 */
-	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false  ) {
+	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
 
 		/**
 		 * This prevents the gform_replace_merge_tags filter from being called twice, as defined in:
@@ -170,7 +170,7 @@ 
 		 * @see GFCommon::replace_variables_prepopulate()
 		 * @todo Remove eventually: Gravity Forms fixed this issue in 1.9.14
 		 */
-		if( false === $form ) {
+		if ( false === $form ) {
 			return $text;
 		}
 
@@ -203,19 +203,19 @@ 
 	 */
 	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
 
-		foreach( $matches as $match ) {
+		foreach ( $matches as $match ) {
 
-			$full_tag = $match[0];
+			$full_tag = $match[ 0 ];
 
 			// Strip the Merge Tags
-			$tag = str_replace( array( '{', '}'), '', $full_tag );
+			$tag = str_replace( array( '{', '}' ), '', $full_tag );
 
 			// Replace the value from the entry, if exists
-			if( isset( $entry[ $tag ] ) ) {
+			if ( isset( $entry[ $tag ] ) ) {
 
 				$value = $entry[ $tag ];
 
-				if( is_callable( array( $this, 'get_content') ) ) {
+				if ( is_callable( array( $this, 'get_content' ) ) ) {
 					$value = $this->get_content( $value );
 				}
 
@@ -288,8 +288,8 @@ 
 	 */
 	public function _filter_sortable_fields( $not_sortable ) {
 
-		if( ! $this->is_sortable ) {
-			$not_sortable[] = $this->name;
+		if ( ! $this->is_sortable ) {
+			$not_sortable[ ] = $this->name;
 		}
 
 		return $not_sortable;
@@ -318,7 +318,7 @@ 
 			'date_display' => array(
 				'type' => 'text',
 				'label' => __( 'Override Date Format', 'gravityview' ),
-				'desc' => sprintf( __( 'Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview'), '<a href="https://codex.wordpress.org/Formatting_Date_and_Time">', '</a>' ),
+				'desc' => sprintf( __( 'Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview' ), '<a href="https://codex.wordpress.org/Formatting_Date_and_Time">', '</a>' ),
 				/**
 				 * @filter `gravityview_date_format` Override the date format with a [PHP date format](https://codex.wordpress.org/Formatting_Date_and_Time)
 				 * @param[in,out] null|string $date_format Date Format (default: null)
@@ -343,7 +343,7 @@ 
 
 		$options = $this->field_support_options();
 
-		if( isset( $options[ $key ] ) ) {
+		if ( isset( $options[ $key ] ) ) {
 			$field_options[ $key ] = $options[ $key ];
 		}
 
@@ -407,11 +407,11 @@ 
 		$connected_form = rgpost( 'form_id' );
 
 		// Otherwise, get the Form ID from the Post page
-		if( empty( $connected_form ) ) {
+		if ( empty( $connected_form ) ) {
 			$connected_form = gravityview_get_form_id( get_the_ID() );
 		}
 
-		if( empty( $connected_form ) ) {
+		if ( empty( $connected_form ) ) {
 			do_action( 'gravityview_log_error', sprintf( '%s: Form not found for form ID "%s"', __METHOD__, $connected_form ) );
 			return false;
 		}

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

Spacing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	function modify_entry_value_workflow_final_status( $output, $entry, $field_settings, $field ) {
 
-		if( ! empty( $output ) ) {
+		if ( ! empty( $output ) ) {
 			$output = gravity_flow()->translate_status_label( $output );
 		}
 
@@ -59,8 +59,8 @@ 
 	function modify_search_filters( $search_fields = array(), GravityView_Widget_Search $widget, $widget_args = array() ) {
 
 		foreach ( $search_fields as & $search_field ) {
-			if ( $this->name === $search_field['key'] ) {
-				$search_field['choices'] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options();
+			if ( $this->name === $search_field[ 'key' ] ) {
+				$search_field[ 'choices' ] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options();
 			}
 		}
 

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

Spacing +105 added lines, -105 removed lines

@@ -63,7 +63,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(
@@ -85,7 +85,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
@@ -149,7 +149,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' ), GravityView_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' ), GravityView_Plugin::version );
 
 
 		/**
@@ -204,7 +204,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;
 	}
 
@@ -217,24 +217,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' ] );
 
 		}
 
@@ -279,8 +279,8 @@ 
 			)
 		);
 
-		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
@@ -302,13 +302,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>';
 			}
 		}
 
@@ -330,7 +330,7 @@ 
 	public static function get_search_input_types( $id = '', $field_type = null ) {
 
 		// @todo - This needs to be improved - many fields have . including products and addresses
-		if ( false !== strpos( (string) $id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $id, array( 'is_fulfilled' ) ) ) {
+		if ( false !== strpos( (string)$id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $id, array( 'is_fulfilled' ) ) ) {
 			$input_type = 'boolean'; // on/off checkbox
 		} elseif ( in_array( $field_type, array( 'checkbox', 'post_category', 'multiselect' ) ) ) {
 			$input_type = 'multi'; //multiselect
@@ -372,19 +372,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,
@@ -405,7 +405,7 @@ 
 	 */
 	public function filter_entries( $search_criteria ) {
 
-		if( 'post' === $this->search_method ) {
+		if ( 'post' === $this->search_method ) {
 			$get = $_POST;
 		} else {
 			$get = $_GET;
@@ -422,15 +422,15 @@ 
 		$get = gv_map_deep( $get, 'rawurldecode' );
 
 		// add free search
-		if ( ! empty( $get['gv_search'] ) ) {
+		if ( ! empty( $get[ 'gv_search' ] ) ) {
 
 			// Search for a piece
-			$words = explode( ' ', $get['gv_search'] );
+			$words = explode( ' ', $get[ 'gv_search' ] );
 
 			$words = array_filter( $words );
 
 			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`
@@ -439,8 +439,8 @@ 
 		}
 
 		//start date & end date
-		$curr_start = !empty( $get['gv_start'] ) ? $get['gv_start'] : '';
-		$curr_end = !empty( $get['gv_start'] ) ? $get['gv_end'] : '';
+		$curr_start = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_start' ] : '';
+		$curr_end = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_end' ] : '';
 
         /**
          * @filter `gravityview_date_created_adjust_timezone` Whether to adjust the timezone for entries. \n
@@ -455,16 +455,16 @@ 
 		/**
 		 * Don't set $search_criteria['start_date'] if start_date is empty as it may lead to bad query results (GFAPI::get_entries)
 		 */
-		if( !empty( $curr_start ) ) {
-			$search_criteria['start_date'] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
+		if ( ! empty( $curr_start ) ) {
+			$search_criteria[ 'start_date' ] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
 		}
-		if( !empty( $curr_end ) ) {
-			$search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
+		if ( ! empty( $curr_end ) ) {
+			$search_criteria[ 'end_date' ] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
 		}
 
 		// search for a specific entry ID
 		if ( ! empty( $get[ 'gv_id' ] ) ) {
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => 'id',
 				'value' => absint( $get[ 'gv_id' ] ),
 				'operator' => '=',
@@ -473,36 +473,36 @@ 
 
 		// search for a specific Created_by ID
 		if ( ! empty( $get[ 'gv_by' ] ) ) {
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => 'created_by',
-				'value' => absint( $get['gv_by'] ),
+				'value' => absint( $get[ 'gv_by' ] ),
 				'operator' => '=',
 			);
 		}
 
 
 		// 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_' ) || empty( $value ) || ( is_array( $value ) && count( $value ) === 1 && empty( $value[0] ) ) ) {
+			if ( 0 !== strpos( $key, 'filter_' ) || empty( $value ) || ( is_array( $value ) && count( $value ) === 1 && empty( $value[ 0 ] ) ) ) {
 				continue;
 			}
 
 			// could return simple filter or multiple filters
 			$filter = $this->prepare_field_filter( $key, $value );
 
-			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;
 			}
 		}
 
@@ -511,7 +511,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 );
 
 		do_action( 'gravityview_log_debug', sprintf( '%s[filter_entries] Returned Search Criteria: ', get_class( $this ) ), $search_criteria );
 
@@ -551,11 +551,11 @@ 
 			'value' => $value,
 		);
 
-		switch ( $form_field['type'] ) {
+		switch ( $form_field[ 'type' ] ) {
 
 			case 'select':
 			case 'radio':
-				$filter['operator'] = 'is';
+				$filter[ 'operator' ] = 'is';
 				break;
 
 			case 'post_category':
@@ -569,7 +569,7 @@ 
 
 				foreach ( $value as $val ) {
 					$cat = get_term( $val, 'category' );
-					$filter[] = array(
+					$filter[ ] = array(
 						'key' => $field_id,
 						'value' => esc_attr( $cat->name ) . ':' . $val,
 						'operator' => 'is',
@@ -588,18 +588,18 @@ 
 				$filter = array();
 
 				foreach ( $value as $val ) {
-					$filter[] = array( 'key' => $field_id, 'value' => $val );
+					$filter[ ] = array( 'key' => $field_id, 'value' => $val );
 				}
 
 				break;
 
 			case 'checkbox':
 				// 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'] = 'is';
+				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' ] = 'is';
 							break;
 						}
 					}
@@ -609,7 +609,7 @@ 
 					$filter = array();
 
 					foreach ( $value as $val ) {
-						$filter[] = array(
+						$filter[ ] = array(
 								'key'   => $field_id,
 								'value' => $val,
 								'operator' => 'is',
@@ -630,9 +630,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;
 						}
 					}
 
@@ -659,19 +659,19 @@ 
 						 * @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( $date . ' +1 day' ) );
 						}
 
-						$filter[] = array(
+						$filter[ ] = array(
 							'key' => $field_id,
 							'value' => self::get_formatted_date( $date, 'Y-m-d' ),
 							'operator' => $operator,
 						);
 					}
 				} else {
-					$filter['value'] = self::get_formatted_date( $value, 'Y-m-d' );
+					$filter[ 'value' ] = self::get_formatted_date( $value, 'Y-m-d' );
 				}
 
 				break;
@@ -702,7 +702,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 ];
 		}
 
@@ -733,7 +733,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;
 	}
@@ -756,7 +756,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 ) ) {
 			do_action( 'gravityview_log_debug', sprintf( '%s[render_frontend] No search fields configured for widget:', get_class( $this ) ), $widget_args );
@@ -770,26 +770,26 @@ 
 
 			$updated_field = $field;
 
-			if ( in_array( $field['input'], array( 'date', 'date_range' ) ) ) {
+			if ( in_array( $field[ 'input' ], array( 'date', 'date_range' ) ) ) {
 				$has_date = true;
 			}
 
 			$updated_field = $this->get_search_filter_details( $updated_field );
 
-			error_log("Field:Field = " . print_r($field['field'], true));
+			error_log( "Field:Field = " . print_r( $field[ 'field' ], true ) );
 
-			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' ),
 					);
@@ -797,16 +797,16 @@ 
 					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();
+					$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();
 					break;
 			}
 
@@ -824,16 +824,16 @@ 
 		 */
 		$gravityview_view->search_fields = apply_filters( 'gravityview_widget_search_filters', $search_fields, $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 ( $has_date ) {
 			// enqueue datepicker stuff only if needed!
@@ -855,10 +855,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;
 		}
 
 		/**
@@ -900,11 +900,11 @@ 
 
 		$label = rgget( 'label', $field );
 
-		if( '' === $label ) {
+		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;
@@ -916,10 +916,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' );
@@ -958,32 +958,32 @@ 
 		$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' => '' );
 		}
 
 		return $filter;
@@ -1007,7 +1007,7 @@ 
 
 		$choices = array();
 		foreach ( $users as $user ) {
-			$choices[] = array(
+			$choices[ ] = array(
 				'value' => $user->ID,
 				'text' => $user->display_name,
 			);
@@ -1062,7 +1062,7 @@ 
 	 */
 	public function add_datepicker_js_dependency( $js_dependencies ) {
 
-		$js_dependencies[] = 'jquery-ui-datepicker';
+		$js_dependencies[ ] = 'jquery-ui-datepicker';
 
 		return $js_dependencies;
 	}
@@ -1106,7 +1106,7 @@ 
 			'isRTL'             => is_rtl(),
 		), $view_data );
 
-		$localizations['datepicker'] = $datepicker_settings;
+		$localizations[ 'datepicker' ] = $datepicker_settings;
 
 		return $localizations;
 
@@ -1135,7 +1135,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' );
 		}
 	}
@@ -1157,7 +1157,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`

includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-gravity-flow.php

Spacing +6 added lines, -6 removed lines

@@ -33,7 +33,7 @@ 
 
 		parent::add_hooks();
 
-		add_filter( 'gravityview/search/searchable_fields', array( $this, 'modify_search_bar_fields_dropdown'), 10, 2 );
+		add_filter( 'gravityview/search/searchable_fields', array( $this, 'modify_search_bar_fields_dropdown' ), 10, 2 );
 
 	}
 	
@@ -52,13 +52,13 @@ 
 	 */
 	public static function get_status_options( $form_id = 0, $status_key = 'workflow_final_status' ) {
 
-		if( empty( $form_id ) ) {
+		if ( empty( $form_id ) ) {
 			$form_id = GravityView_View::getInstance()->getFormId();
 		}
 
 		$entry_meta = gravity_flow()->get_entry_meta( array(), $form_id );
 
-		return (array) rgars( $entry_meta, $status_key . '/filter/choices' );
+		return (array)rgars( $entry_meta, $status_key . '/filter/choices' );
 	}
 
 
@@ -80,7 +80,7 @@ 
 
 		$workflow_steps = $GFlow->get_steps();
 
-		if( $workflow_steps ) {
+		if ( $workflow_steps ) {
 
 			foreach ( $workflow_steps as $step ) {
 
@@ -92,12 +92,12 @@ 
 				);
 			}
 
-			$fields['workflow_step'] = array(
+			$fields[ 'workflow_step' ] = array(
 				'label' => esc_html__( 'Workflow Step', 'gravityview' ),
 				'type'  => 'select',
 			);
 
-			$fields['workflow_final_status'] = array(
+			$fields[ 'workflow_final_status' ] = array(
 				'label' => esc_html__( 'Workflow Status', 'gravityview' ),
 				'type'  => 'select',
 			);

includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-gravity-forms-survey.php

Spacing +9 added lines, -9 removed lines

@@ -45,7 +45,7 @@ 
 
 		$return = $input_type;
 
-		if( 'survey' === $field_type ) {
+		if ( 'survey' === $field_type ) {
 			$return = 'select';
 		}
 
@@ -65,8 +65,8 @@ 
 	public function fix_survey_fields( $fields ) {
 
 		/** @var GF_Field $field */
-		foreach( $fields as &$field ) {
-			if( 'survey' === $field->type ) {
+		foreach ( $fields as &$field ) {
+			if ( 'survey' === $field->type ) {
 				$field->allowsPrepopulate = true;
 			}
 		}
@@ -82,7 +82,7 @@ 
 	 * @return void
 	 */
 	function add_render_hooks() {
-		add_filter( 'gform_field_value', array( $this, 'fix_survey_field_value'), 10, 3 );
+		add_filter( 'gform_field_value', array( $this, 'fix_survey_field_value' ), 10, 3 );
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 * @return void
 	 */
 	function remove_render_hooks() {
-		remove_filter( 'gform_field_value', array( $this, 'fix_survey_field_value'), 10 );
+		remove_filter( 'gform_field_value', array( $this, 'fix_survey_field_value' ), 10 );
 	}
 
 	/**
@@ -113,9 +113,9 @@ 
 	 */
 	public function fix_survey_field_value( $value, $field, $name ) {
 
-		if( 'survey' === $field->type ) {
+		if ( 'survey' === $field->type ) {
 
-			$entry = GravityView_Edit_Entry::getInstance()->instances['render']->get_entry();
+			$entry = GravityView_Edit_Entry::getInstance()->instances[ 'render' ]->get_entry();
 
 			// We need to run through each survey row until we find a match for expected values
 			foreach ( $entry as $field_id => $field_value ) {
@@ -124,11 +124,11 @@ 
 					continue;
 				}
 
-				if( rgar( $field, 'gsurveyLikertEnableMultipleRows' ) ) {
+				if ( rgar( $field, 'gsurveyLikertEnableMultipleRows' ) ) {
 					list( $row_val, $col_val ) = explode( ':', $field_value, 2 );
 
 					// If the $name matches the $row_val, we are processing the correct row
-					if( $row_val === $name ) {
+					if ( $row_val === $name ) {
 						$value = $field_value;
 						break;
 					}

includes/class-frontend-views.php

Spacing +105 added lines, -105 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 );
@@ -234,15 +234,15 @@ 
 
 			$this->context_view_id = $view_id;
 
-		} elseif ( isset( $_GET['gvid'] ) && $this->getGvOutputData()->has_multiple_views() ) {
+		} elseif ( isset( $_GET[ 'gvid' ] ) && $this->getGvOutputData()->has_multiple_views() ) {
 			/**
 			 * used on a has_multiple_views context
 			 * @see GravityView_API::entry_link
 			 * @see GravityView_View_Data::getInstance()->has_multiple_views()
 			 */
-			$this->context_view_id = $_GET['gvid'];
+			$this->context_view_id = $_GET[ 'gvid' ];
 
-		} elseif ( ! $this->getGvOutputData()->has_multiple_views() )  {
+		} elseif ( ! $this->getGvOutputData()->has_multiple_views() ) {
 			$array_keys = array_keys( $this->getGvOutputData()->get_views() );
 			$this->context_view_id = array_pop( $array_keys );
 			unset( $array_keys );
@@ -277,23 +277,23 @@ 
 		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
 			$ignore = array( 'preview', 'page', 'paged', 'cpage' );
 			foreach ( $wp_rewrite->endpoints as $endpoint ) {
-				$ignore[] = $endpoint[1];
+				$ignore[ ] = $endpoint[ 1 ];
 			}
 
 			// Modify the query if:
@@ -302,21 +302,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' ] );
 				}
 			}
 
@@ -334,7 +334,7 @@ 
 		global $post;
 
 		// If in admin and NOT AJAX request, get outta here.
-		if ( GravityView_Plugin::is_admin() )  {
+		if ( GravityView_Plugin::is_admin() ) {
 			return;
 		}
 
@@ -346,7 +346,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 ) );
@@ -382,7 +382,7 @@ 
 
 		$search_method = GravityView_Widget_Search::getInstance()->get_search_method();
 
-		if( 'post' === $search_method ) {
+		if ( 'post' === $search_method ) {
 			$get = $_POST;
 		} else {
 			$get = $_GET;
@@ -438,20 +438,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;
 		}
 
@@ -461,19 +461,19 @@ 
 			$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;
 				}
 			}
 		}
 
-		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 );
 		}
@@ -574,7 +574,7 @@ 
 	public function render_view( $passed_args ) {
 
 		// validate attributes
-		if ( empty( $passed_args['id'] ) ) {
+		if ( empty( $passed_args[ 'id' ] ) ) {
 			do_action( 'gravityview_log_error', '[render_view] Returning; no ID defined.', $passed_args );
 			return null;
 		}
@@ -596,7 +596,7 @@ 
 			return null;
 		}
 
-		$view_id = $passed_args['id'];
+		$view_id = $passed_args[ 'id' ];
 
 		$view_data = $this->getGvOutputData()->get_view( $view_id, $passed_args );
 
@@ -609,7 +609,7 @@ 
 		$passed_args = array_filter( $passed_args, 'strlen' );
 
 		//Override shortcode args over View template settings
-		$atts = wp_parse_args( $passed_args, $view_data['atts'] );
+		$atts = wp_parse_args( $passed_args, $view_data[ 'atts' ] );
 
 		do_action( 'gravityview_log_debug', '[render_view] Arguments after merging with View settings: ', $atts );
 
@@ -632,14 +632,14 @@ 
 		 * @since 1.15
 		 * @since 1.17.2 Added check for if a user has no caps but is logged in (member of multisite, but not any site). Treat as if logged-out.
 		 */
-		if( is_user_logged_in() && ! ( empty( wp_get_current_user()->caps ) && empty( wp_get_current_user()->roles ) ) && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
+		if ( is_user_logged_in() && ! ( empty( wp_get_current_user()->caps ) && empty( wp_get_current_user()->roles ) ) && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
 
 			do_action( 'gravityview_log_debug', sprintf( '%s Returning: View %d is not visible by current user.', __METHOD__, $view_id ) );
 
 			return null;
 		}
 
-		if( $this->isGravityviewPostType() ) {
+		if ( $this->isGravityviewPostType() ) {
 
 			/**
 			 * @filter `gravityview_direct_access` Should Views be directly accessible, or only visible using the shortcode?
@@ -651,9 +651,9 @@ 
 			 */
 			$direct_access = apply_filters( 'gravityview_direct_access', true, $view_id );
 
-			$embed_only = ! empty( $atts['embed_only'] );
+			$embed_only = ! empty( $atts[ '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' );
 			}
 		}
@@ -668,7 +668,7 @@ 
 
 		$gravityview_view = new GravityView_View( $view_data );
 
-		$post_id = ! empty( $atts['post_id'] ) ? intval( $atts['post_id'] ) : $this->getPostId();
+		$post_id = ! empty( $atts[ 'post_id' ] ) ? intval( $atts[ 'post_id' ] ) : $this->getPostId();
 
 		$gravityview_view->setPostId( $post_id );
 
@@ -678,20 +678,20 @@ 
 			do_action( 'gravityview_log_debug', '[render_view] Executing Directory View' );
 
 			//fetch template and slug
-			$view_slug = apply_filters( 'gravityview_template_slug_'. $view_data['template_id'], 'table', 'directory' );
+			$view_slug = apply_filters( 'gravityview_template_slug_' . $view_data[ 'template_id' ], 'table', 'directory' );
 
 			do_action( 'gravityview_log_debug', '[render_view] View template slug: ', $view_slug );
 
 			/**
 			 * Disable fetching initial entries for views that don't need it (DataTables)
 			 */
-			$get_entries = apply_filters( 'gravityview_get_view_entries_'.$view_slug, true );
+			$get_entries = apply_filters( 'gravityview_get_view_entries_' . $view_slug, true );
 
 			/**
 			 * Hide View data until search is performed
 			 * @since 1.5.4
 			 */
-			if ( ! empty( $atts['hide_until_searched'] ) && ! $this->isSearch() ) {
+			if ( ! empty( $atts[ 'hide_until_searched' ] ) && ! $this->isSearch() ) {
 				$gravityview_view->setHideUntilSearched( true );
 				$get_entries = false;
 			}
@@ -699,23 +699,23 @@ 
 
 			if ( $get_entries ) {
 
-				if ( ! empty( $atts['sort_columns'] ) ) {
+				if ( ! empty( $atts[ 'sort_columns' ] ) ) {
 					// add filter to enable column sorting
-					add_filter( 'gravityview/template/field_label', array( $this, 'add_columns_sort_links' ) , 100, 3 );
+					add_filter( 'gravityview/template/field_label', array( $this, 'add_columns_sort_links' ), 100, 3 );
 				}
 
-				$view_entries = self::get_view_entries( $atts, $view_data['form_id'] );
+				$view_entries = self::get_view_entries( $atts, $view_data[ 'form_id' ] );
 
-				do_action( 'gravityview_log_debug', sprintf( '[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries['count'], sizeof( $view_entries['entries'] ) ) );
+				do_action( 'gravityview_log_debug', sprintf( '[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries[ 'count' ], sizeof( $view_entries[ 'entries' ] ) ) );
 
 			} else {
 
 				$view_entries = array( 'count' => null, 'entries' => null, 'paging' => null );
 
-				do_action( 'gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_'.$view_slug.'` is false' );
+				do_action( 'gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_' . $view_slug . '` is false' );
 			}
 
-			$gravityview_view->setPaging( $view_entries['paging'] );
+			$gravityview_view->setPaging( $view_entries[ 'paging' ] );
 			$gravityview_view->setContext( 'directory' );
 			$sections = array( 'header', 'body', 'footer' );
 
@@ -729,7 +729,7 @@ 
 			 * @action `gravityview_render_entry_{View ID}` Before rendering a single entry for a specific View ID
 			 * @since 1.17
 			 */
-			do_action( 'gravityview_render_entry_'.$view_data['id'] );
+			do_action( 'gravityview_render_entry_' . $view_data[ 'id' ] );
 
 			$entry = $this->getEntry();
 
@@ -756,20 +756,20 @@ 
 			// We're in single view, but the view being processed is not the same view the single entry belongs to.
 			// important: do not remove this as it prevents fake attempts of displaying entries from other views/forms
 			if ( $this->getGvOutputData()->has_multiple_views() && $view_id != $this->get_context_view_id() ) {
-				do_action( 'gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: '. $view_id );
+				do_action( 'gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: ' . $view_id );
 				return null;
 			}
 
 			//fetch template and slug
-			$view_slug = apply_filters( 'gravityview_template_slug_' . $view_data['template_id'], 'table', 'single' );
+			$view_slug = apply_filters( 'gravityview_template_slug_' . $view_data[ 'template_id' ], 'table', 'single' );
 			do_action( 'gravityview_log_debug', '[render_view] View single template slug: ', $view_slug );
 
 			//fetch entry detail
-			$view_entries['count'] = 1;
-			$view_entries['entries'][] = $entry;
-			do_action( 'gravityview_log_debug', '[render_view] Get single entry: ', $view_entries['entries'] );
+			$view_entries[ 'count' ] = 1;
+			$view_entries[ 'entries' ][ ] = $entry;
+			do_action( 'gravityview_log_debug', '[render_view] Get single entry: ', $view_entries[ 'entries' ] );
 
-			$back_link_label = isset( $atts['back_link_label'] ) ? $atts['back_link_label'] : null;
+			$back_link_label = isset( $atts[ 'back_link_label' ] ) ? $atts[ 'back_link_label' ] : null;
 
 			// set back link label
 			$gravityview_view->setBackLinkLabel( $back_link_label );
@@ -779,11 +779,11 @@ 
 		}
 
 		// add template style
-		self::add_style( $view_data['template_id'] );
+		self::add_style( $view_data[ 'template_id' ] );
 
 		// Prepare to render view and set vars
-		$gravityview_view->setEntries( $view_entries['entries'] );
-		$gravityview_view->setTotalEntries( $view_entries['count'] );
+		$gravityview_view->setEntries( $view_entries[ 'entries' ] );
+		$gravityview_view->setTotalEntries( $view_entries[ 'count' ] );
 
 		// If Edit
 		if ( 'edit' === gravityview_get_context() ) {
@@ -796,11 +796,11 @@ 
 
 		} else {
 			// finaly we'll render some html
-			$sections = apply_filters( 'gravityview_render_view_sections', $sections, $view_data['template_id'] );
+			$sections = apply_filters( 'gravityview_render_view_sections', $sections, $view_data[ 'template_id' ] );
 
 			do_action( 'gravityview_log_debug', '[render_view] Sections to render: ', $sections );
 			foreach ( $sections as $section ) {
-				do_action( 'gravityview_log_debug', '[render_view] Rendering '. $section . ' section.' );
+				do_action( 'gravityview_log_debug', '[render_view] Rendering ' . $section . ' section.' );
 				$gravityview_view->render( $view_slug, $section, false );
 			}
 		}
@@ -854,7 +854,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 ] );
 
@@ -882,14 +882,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' ] ) ) {
 				do_action( 'gravityview_log_error', __METHOD__ . ' Invalid search: the start date is after the end date.', $return_search_criteria );
 			}
 		}
@@ -907,9 +907,9 @@ 
 	 */
 	public static function process_search_only_approved( $args, $search_criteria ) {
 
-		if ( ! empty( $args['show_only_approved'] ) ) {
-			$search_criteria['field_filters'][] = array( 'key' => 'is_approved', 'value' => 'Approved' );
-			$search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met
+		if ( ! empty( $args[ 'show_only_approved' ] ) ) {
+			$search_criteria[ 'field_filters' ][ ] = array( 'key' => 'is_approved', 'value' => 'Approved' );
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; // force all the criterias to be met
 
 			do_action( 'gravityview_log_debug', '[process_search_only_approved] Search Criteria if show only approved: ', $search_criteria );
 		}
@@ -933,12 +933,12 @@ 
 	 */
 	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;
 		}
 
-		$is_approved = gform_get_meta( $entry['id'], 'is_approved' );
+		$is_approved = gform_get_meta( $entry[ 'id' ], 'is_approved' );
 
 		if ( $is_approved ) {
 			return true;
@@ -976,26 +976,26 @@ 
 		do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', $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' => rgget( 'search_field', $args ), // 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,
 			);
 		}
 
-		if( $search_criteria !== $original_search_criteria ) {
+		if ( $search_criteria !== $original_search_criteria ) {
 			do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after implicity search: ', $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 ) {
 			do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after date params: ', $search_criteria );
 		}
 
@@ -1006,7 +1006,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;
 	}
@@ -1052,16 +1052,16 @@ 
 		$search_criteria = self::get_search_criteria( $args, $form_id );
 
 		// Paging & offset
-		$page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : apply_filters( 'gravityview_default_page_size', 25 );
+		$page_size = ! empty( $args[ 'page_size' ] ) ? intval( $args[ 'page_size' ] ) : apply_filters( 'gravityview_default_page_size', 25 );
 
 		if ( -1 === $page_size ) {
 			$page_size = PHP_INT_MAX;
 		}
 
-		if ( isset( $args['offset'] ) ) {
-			$offset = intval( $args['offset'] );
+		if ( isset( $args[ 'offset' ] ) ) {
+			$offset = intval( $args[ 'offset' ] );
 		} else {
-			$curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] );
+			$curr_page = empty( $_GET[ 'pagenum' ] ) ? 1 : intval( $_GET[ 'pagenum' ] );
 			$offset = ( $curr_page - 1 ) * $page_size;
 		}
 
@@ -1079,7 +1079,7 @@ 
 			'search_criteria' => $search_criteria,
 			'sorting' => $sorting,
 			'paging' => $paging,
-			'cache' => isset( $args['cache'] ) ? $args['cache'] : true,
+			'cache' => isset( $args[ 'cache' ] ) ? $args[ 'cache' ] : true,
 		);
 
 		/**
@@ -1104,7 +1104,7 @@ 
 		 * @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys.
 		 * @param array $args View configuration args.
 		 */
-		$parameters = apply_filters( 'gravityview_get_entries_'.$args['id'], $parameters, $args, $form_id );
+		$parameters = apply_filters( 'gravityview_get_entries_' . $args[ 'id' ], $parameters, $args, $form_id );
 
 		do_action( 'gravityview_log_debug', __METHOD__ . ': $parameters passed to gravityview_get_entries(): ', $parameters );
 
@@ -1144,8 +1144,8 @@ 
 	 */
 	public static function updateViewSorting( $args, $form_id ) {
 		$sorting = array();
-		$sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : rgar( $args, 'sort_field' );
-		$sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : rgar( $args, 'sort_direction' );
+		$sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : rgar( $args, 'sort_field' );
+		$sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : rgar( $args, 'sort_direction' );
 
 		$sort_field_id = self::_override_sorting_id_by_field_type( $sort_field_id, $form_id );
 
@@ -1185,7 +1185,7 @@ 
 
 		$sort_field = GFFormsModel::get_field( $form, $sort_field_id );
 
-		switch ( $sort_field['type'] ) {
+		switch ( $sort_field[ 'type' ] ) {
 
 			case 'address':
 				// Sorting by full address
@@ -1202,7 +1202,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;
@@ -1282,7 +1282,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;
@@ -1309,7 +1309,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;
 				}
 
@@ -1318,19 +1318,19 @@ 
 				$css_dependencies = array();
 
 				// If the thickbox is enqueued, add dependencies
-				if ( ! empty( $data['atts']['lightbox'] ) ) {
+				if ( ! empty( $data[ 'atts' ][ 'lightbox' ] ) ) {
 
 					/**
 					 * @filter `gravity_view_lightbox_script` Override the lightbox script to enqueue. Default: `thickbox`
 					 * @param string $script_slug If you want to use a different lightbox script, return the name of it here.
 					 */
-					$js_dependencies[] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' );
+					$js_dependencies[ ] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' );
 
 					/**
 					 * @filter `gravity_view_lightbox_style` Modify the lightbox CSS slug. Default: `thickbox`
 					 * @param string $script_slug If you want to use a different lightbox script, return the name of its CSS file here.
 					 */
-					$css_dependencies[] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' );
+					$css_dependencies[ ] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' );
 				}
 
 				/**
@@ -1338,25 +1338,25 @@ 
 				 * @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' );
 				}
 
 				$this->enqueue_default_style( $css_dependencies );
 
-				self::add_style( $data['template_id'] );
+				self::add_style( $data[ 'template_id' ] );
 			}
 
 			if ( 'wp_print_footer_scripts' === current_filter() ) {
@@ -1418,7 +1418,7 @@ 
 		} elseif ( empty( $template_id ) ) {
 			do_action( 'gravityview_log_error', '[add_style] Cannot add template style; template_id is empty' );
 		} else {
-			do_action( 'gravityview_log_error', sprintf( '[add_style] Cannot add template style; %s is not registered', 'gravityview_style_'.$template_id ) );
+			do_action( 'gravityview_log_error', sprintf( '[add_style] Cannot add template style; %s is not registered', 'gravityview_style_' . $template_id ) );
 		}
 
 	}
@@ -1443,11 +1443,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;
 		}
 
@@ -1455,29 +1455,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;
 
 	}
 
@@ -1495,7 +1495,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->type;
 		}
@@ -1518,7 +1518,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/extensions/edit-entry/class-edit-entry-render.php

Spacing +229 added lines, -229 removed lines

@@ -119,16 +119,16 @@ 
     function load() {
 
         /** @define "GRAVITYVIEW_DIR" "../../../" */
-        include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
+        include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' );
 
         // Don't display an embedded form when editing an entry
         add_action( 'wp_head', array( $this, 'prevent_render_form' ) );
         add_action( 'wp_footer', array( $this, 'prevent_render_form' ) );
 
         // Stop Gravity Forms processing what is ours!
-        add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 );
+        add_filter( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 );
 
-        add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') );
+        add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) );
 
         add_action( 'gravityview_edit_entry', array( $this, 'init' ) );
 
@@ -139,7 +139,7 @@ 
         add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 );
 
         // Add fields expected by GFFormDisplay::validate()
-        add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') );
+        add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) );
 
     }
 
@@ -154,8 +154,8 @@ 
      * @return void
      */
     function prevent_render_form() {
-        if( $this->is_edit_entry() ) {
-            if( 'wp_head' === current_filter() ) {
+        if ( $this->is_edit_entry() ) {
+            if ( 'wp_head' === current_filter() ) {
                 add_filter( 'gform_shortcode_form', '__return_empty_string' );
             } else {
                 remove_filter( 'gform_shortcode_form', '__return_empty_string' );
@@ -170,10 +170,10 @@ 
      */
     function prevent_maybe_process_form() {
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+        do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
 
-        if( $this->is_edit_entry_submission() && $this->verify_nonce() ) {
-            remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
+        if ( $this->is_edit_entry_submission() && $this->verify_nonce() ) {
+            remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 );
         }
     }
 
@@ -183,7 +183,7 @@ 
      */
     public function is_edit_entry() {
 
-        $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET['edit'] );
+        $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET[ 'edit' ] );
 
         return ( $is_edit_entry || $this->is_edit_entry_submission() );
     }
@@ -194,7 +194,7 @@ 
 	 * @return boolean
 	 */
 	public function is_edit_entry_submission() {
-		return !empty( $_POST[ self::$nonce_field ] );
+		return ! empty( $_POST[ self::$nonce_field ] );
 	}
 
     /**
@@ -205,15 +205,15 @@ 
 
 
         $entries = $gravityview_view->getEntries();
-	    self::$original_entry = $entries[0];
-	    $this->entry = $entries[0];
+	    self::$original_entry = $entries[ 0 ];
+	    $this->entry = $entries[ 0 ];
 
         self::$original_form = $gravityview_view->getForm();
         $this->form = $gravityview_view->getForm();
         $this->form_id = $gravityview_view->getFormId();
         $this->view_id = $gravityview_view->getViewId();
 
-        self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] );
+        self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] );
     }
 
 
@@ -233,12 +233,12 @@ 
         $this->setup_vars();
 
         // Multiple Views embedded, don't proceed if nonce fails
-        if( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) {
+        if ( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ) ) {
             return;
         }
 
         // Sorry, you're not allowed here.
-        if( false === $this->user_can_edit_entry( true ) ) {
+        if ( false === $this->user_can_edit_entry( true ) ) {
             return;
         }
 
@@ -258,9 +258,9 @@ 
     function print_scripts() {
         $gravityview_view = GravityView_View::getInstance();
 
-        wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
+        wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
 
-        GFFormDisplay::enqueue_form_scripts($gravityview_view->getForm(), false);
+        GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false );
 
         // Sack is required for images
         wp_print_scripts( array( 'sack', 'gform_gravityforms' ) );
@@ -272,32 +272,32 @@ 
      */
     function process_save() {
 
-        if( empty( $_POST ) || ! isset( $_POST['lid'] ) ) {
+        if ( empty( $_POST ) || ! isset( $_POST[ 'lid' ] ) ) {
             return;
         }
 
         // Make sure the entry, view, and form IDs are all correct
         $valid = $this->verify_nonce();
 
-        if( !$valid ) {
-            do_action('gravityview_log_error', __METHOD__ . ' Nonce validation failed.' );
+        if ( ! $valid ) {
+            do_action( 'gravityview_log_error', __METHOD__ . ' Nonce validation failed.' );
             return;
         }
 
-        if( $this->entry['id'] !== $_POST['lid'] ) {
-            do_action('gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' );
+        if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) {
+            do_action( 'gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' );
             return;
         }
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+        do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
 
         $this->process_save_process_files( $this->form_id );
 
         $this->validate();
 
-        if( $this->is_valid ) {
+        if ( $this->is_valid ) {
 
-            do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.' );
+            do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.' );
 
             /**
              * @hack This step is needed to unset the adminOnly from form fields, to add the calculation fields
@@ -307,12 +307,12 @@ 
             /**
              * @hack to avoid the capability validation of the method save_lead for GF 1.9+
              */
-            unset( $_GET['page'] );
+            unset( $_GET[ 'page' ] );
 
             GFFormsModel::save_lead( $form, $this->entry );
 
             // If there's a post associated with the entry, process post fields
-            if( !empty( $this->entry['post_id'] ) ) {
+            if ( ! empty( $this->entry[ 'post_id' ] ) ) {
                 $this->maybe_update_post_fields( $form );
             }
 
@@ -327,7 +327,7 @@ 
              * @param array $form Gravity Forms form array
              * @param string $entry_id Numeric ID of the entry that was updated
              */
-            do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'] );
+            do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ] );
         }
 
     } // process_save
@@ -361,11 +361,11 @@ 
      * @return mixed
      */
     public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) {
-        if( ! $this->is_edit_entry() ) {
+        if ( ! $this->is_edit_entry() ) {
             return $plupload_init;
         }
 
-        $plupload_init['gf_vars']['max_files'] = 0;
+        $plupload_init[ 'gf_vars' ][ 'max_files' ] = 0;
 
         return $plupload_init;
     }
@@ -379,19 +379,19 @@ 
 
         $form = $this->form;
 
-        foreach( $form['fields'] as $k => &$field ) {
+        foreach ( $form[ 'fields' ] as $k => &$field ) {
 
             // Remove the fields with calculation formulas before save to avoid conflicts with GF logic
             // @since 1.16.3
-            if( $field->has_calculation() ) {
-                unset( $form['fields'][ $k ] );
+            if ( $field->has_calculation() ) {
+                unset( $form[ 'fields' ][ $k ] );
             }
 
             $field->adminOnly = false;
 
-            if( isset( $field->inputs ) && is_array( $field->inputs ) ) {
-                foreach( $field->inputs as $key => $input ) {
-                    $field->inputs[ $key ][ 'id' ] = (string)$input['id'];
+            if ( isset( $field->inputs ) && is_array( $field->inputs ) ) {
+                foreach ( $field->inputs as $key => $input ) {
+                    $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ];
                 }
             }
         }
@@ -405,20 +405,20 @@ 
         $update = false;
 
         // get the most up to date entry values
-        $entry = GFAPI::get_entry( $this->entry['id'] );
+        $entry = GFAPI::get_entry( $this->entry[ 'id' ] );
 
-        if( !empty( $this->fields_with_calculation ) ) {
+        if ( ! empty( $this->fields_with_calculation ) ) {
             $update = true;
             foreach ( $this->fields_with_calculation as $calc_field ) {
                 $inputs = $calc_field->get_entry_inputs();
                 if ( is_array( $inputs ) ) {
                     foreach ( $inputs as $input ) {
-                        $input_name = 'input_' . str_replace( '.', '_', $input['id'] );
-                        $entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry );
+                        $input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] );
+                        $entry[ strval( $input[ 'id' ] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry[ 'id' ], $entry );
                     }
                 } else {
-                    $input_name = 'input_' . str_replace( '.', '_', $calc_field->id);
-                    $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry );
+                    $input_name = 'input_' . str_replace( '.', '_', $calc_field->id );
+                    $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry[ 'id' ], $entry );
                 }
             }
 
@@ -428,16 +428,16 @@ 
         if ( ! empty( $this->total_fields ) ) {
             $update = true;
             foreach ( $this->total_fields as $total_field ) {
-                $input_name = 'input_' . str_replace( '.', '_', $total_field->id);
-                $entry[ strval( $total_field->id ) ] = RGFormsModel::prepare_value( $form, $total_field, '', $input_name, $entry['id'], $entry );
+                $input_name = 'input_' . str_replace( '.', '_', $total_field->id );
+                $entry[ strval( $total_field->id ) ] = RGFormsModel::prepare_value( $form, $total_field, '', $input_name, $entry[ 'id' ], $entry );
             }
         }
 
-        if( $update ) {
+        if ( $update ) {
 
             $return_entry = GFAPI::update_entry( $entry );
 
-            if( is_wp_error( $return_entry ) ) {
+            if ( is_wp_error( $return_entry ) ) {
                 do_action( 'gravityview_log_error', 'Updating the entry calculation and total fields failed', $return_entry );
             } else {
                 do_action( 'gravityview_log_debug', 'Updating the entry calculation and total fields succeeded' );
@@ -468,18 +468,18 @@ 
 
         $input_name = 'input_' . $field_id;
 
-        if ( !empty( $_FILES[ $input_name ]['name'] ) ) {
+        if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) {
 
             // We have a new image
 
-            $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] );
+            $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] );
 
             $ary = ! empty( $value ) ? explode( '|:|', $value ) : array();
             $img_url = rgar( $ary, 0 );
 
-            $img_title       = count( $ary ) > 1 ? $ary[1] : '';
-            $img_caption     = count( $ary ) > 2 ? $ary[2] : '';
-            $img_description = count( $ary ) > 3 ? $ary[3] : '';
+            $img_title       = count( $ary ) > 1 ? $ary[ 1 ] : '';
+            $img_caption     = count( $ary ) > 2 ? $ary[ 2 ] : '';
+            $img_description = count( $ary ) > 3 ? $ary[ 3 ] : '';
 
             $image_meta = array(
                 'post_excerpt' => $img_caption,
@@ -488,7 +488,7 @@ 
 
             //adding title only if it is not empty. It will default to the file name if it is not in the array
             if ( ! empty( $img_title ) ) {
-                $image_meta['post_title'] = $img_title;
+                $image_meta[ 'post_title' ] = $img_title;
             }
 
             /**
@@ -503,22 +503,22 @@ 
                 set_post_thumbnail( $post_id, $media_id );
             }
 
-        } elseif ( !empty( $_POST[ $input_name ] ) && is_array( $value ) ) {
+        } elseif ( ! empty( $_POST[ $input_name ] ) && is_array( $value ) ) {
 
             // Same image although the image title, caption or description might have changed
 
             $ary = array();
-            if( ! empty( $entry[ $field_id ] ) ) {
+            if ( ! empty( $entry[ $field_id ] ) ) {
                 $ary = is_array( $entry[ $field_id ] ) ? $entry[ $field_id ] : explode( '|:|', $entry[ $field_id ] );
             }
             $img_url = rgar( $ary, 0 );
 
             // is this really the same image or something went wrong ?
-            if( $img_url === $_POST[ $input_name ] ) {
+            if ( $img_url === $_POST[ $input_name ] ) {
 
-                $img_title       = rgar( $value, $field_id .'.1' );
-                $img_caption     = rgar( $value, $field_id .'.4' );
-                $img_description = rgar( $value, $field_id .'.7' );
+                $img_title       = rgar( $value, $field_id . '.1' );
+                $img_caption     = rgar( $value, $field_id . '.4' );
+                $img_description = rgar( $value, $field_id . '.7' );
 
                 $value = ! empty( $img_url ) ? $img_url . "|:|" . $img_title . "|:|" . $img_caption . "|:|" . $img_description : '';
 
@@ -558,11 +558,11 @@ 
      */
     private function maybe_update_post_fields( $form ) {
 
-        $post_id = $this->entry['post_id'];
+        $post_id = $this->entry[ 'post_id' ];
 
         // Security check
-        if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
-            do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #'.$post_id );
+        if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
+            do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #' . $post_id );
             return;
         }
 
@@ -574,25 +574,25 @@ 
 
             $field = RGFormsModel::get_field( $form, $field_id );
 
-            if( ! $field ) {
+            if ( ! $field ) {
                 continue;
             }
 
-            if( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) {
+            if ( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) {
 
                 // Get the value of the field, including $_POSTed value
                 $value = RGFormsModel::get_field_value( $field );
 
                 // Use temporary entry variable, to make values available to fill_post_template() and update_post_image()
                 $entry_tmp = $this->entry;
-                $entry_tmp["{$field_id}"] = $value;
+                $entry_tmp[ "{$field_id}" ] = $value;
 
-                switch( $field->type ) {
+                switch ( $field->type ) {
 
                     case 'post_title':
                         $post_title = $value;
-                        if( rgar( $form, 'postTitleTemplateEnabled' ) ) {
-                            $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
+                        if ( rgar( $form, 'postTitleTemplateEnabled' ) ) {
+                            $post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp );
                         }
                         $updated_post->post_title = $post_title;
                         $updated_post->post_name  = $post_title;
@@ -601,8 +601,8 @@ 
 
                     case 'post_content':
                         $post_content = $value;
-                        if( rgar( $form, 'postContentTemplateEnabled' ) ) {
-                            $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
+                        if ( rgar( $form, 'postContentTemplateEnabled' ) ) {
+                            $post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true );
                         }
                         $updated_post->post_content = $post_content;
                         unset( $post_content );
@@ -616,19 +616,19 @@ 
                     case 'post_category':
                         break;
                     case 'post_custom_field':
-                        if( ! empty( $field->customFieldTemplateEnabled ) ) {
+                        if ( ! empty( $field->customFieldTemplateEnabled ) ) {
                             $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
                         }
 
                         $input_type = RGFormsModel::get_input_type( $field );
 
                         // Only certain custom field types are supported
-                        switch( $input_type ) {
+                        switch ( $input_type ) {
                             case 'fileupload':
                             case 'list':
                             case 'multiselect':
-                                if( ! is_string( $value ) ) {
-                                    $value = function_exists('wp_json_encode') ? wp_json_encode( $value ) : json_encode( $value );
+                                if ( ! is_string( $value ) ) {
+                                    $value = function_exists( 'wp_json_encode' ) ? wp_json_encode( $value ) : json_encode( $value );
                                 }
                             // break; left intentionally out
                             default:
@@ -644,7 +644,7 @@ 
                 }
 
                 // update entry after
-                $this->entry["{$field_id}"] = $value;
+                $this->entry[ "{$field_id}" ] = $value;
 
                 $update_entry = true;
 
@@ -653,25 +653,25 @@ 
 
         }
 
-        if( $update_entry ) {
+        if ( $update_entry ) {
 
             $return_entry = GFAPI::update_entry( $this->entry );
 
-            if( is_wp_error( $return_entry ) ) {
+            if ( is_wp_error( $return_entry ) ) {
                do_action( 'gravityview_log_error', 'Updating the entry post fields failed', array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) );
             } else {
-                do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #'.$post_id.' succeeded' );
+                do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #' . $post_id . ' succeeded' );
             }
 
         }
 
         $return_post = wp_update_post( $updated_post, true );
 
-        if( is_wp_error( $return_post ) ) {
+        if ( is_wp_error( $return_post ) ) {
             $return_post->add_data( $updated_post, '$updated_post' );
             do_action( 'gravityview_log_error', 'Updating the post content failed', compact( 'updated_post', 'return_post' ) );
         } else {
-            do_action( 'gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded', $updated_post );
+            do_action( 'gravityview_log_debug', 'Updating the post content for post #' . $post_id . ' succeeded', $updated_post );
         }
     }
 
@@ -701,7 +701,7 @@ 
         $output = GFCommon::replace_variables( $output, $form, $entry, false, false, false );
 
         // replace conditional shortcodes
-        if( $do_shortcode ) {
+        if ( $do_shortcode ) {
             $output = do_shortcode( $output );
         }
 
@@ -720,18 +720,18 @@ 
      */
     function after_update() {
 
-        do_action( 'gform_after_update_entry', $this->form, $this->entry['id'], self::$original_entry );
-        do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'] );
+        do_action( 'gform_after_update_entry', $this->form, $this->entry[ 'id' ], self::$original_entry );
+        do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", $this->form, $this->entry[ 'id' ] );
 
         // Re-define the entry now that we've updated it.
-        $entry = RGFormsModel::get_lead( $this->entry['id'] );
+        $entry = RGFormsModel::get_lead( $this->entry[ 'id' ] );
 
         $entry = GFFormsModel::set_entry_meta( $entry, $this->form );
 
         // We need to clear the cache because Gravity Forms caches the field values, which
         // we have just updated.
-        foreach ($this->form['fields'] as $key => $field) {
-            GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id );
+        foreach ( $this->form[ 'fields' ] as $key => $field ) {
+            GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id );
         }
 
         $this->entry = $entry;
@@ -749,7 +749,7 @@ 
 
         <div class="gv-edit-entry-wrapper"><?php
 
-            $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this );
+            $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this );
 
             /**
              * Fixes weird wpautop() issue
@@ -765,7 +765,7 @@ 
                      * @param string $edit_entry_title Modify the "Edit Entry" title
                      * @param GravityView_Edit_Entry_Render $this This object
                      */
-                    $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
+                    $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this );
 
                     echo esc_attr( $edit_entry_title );
             ?></span>
@@ -805,20 +805,20 @@ 
      */
     private function maybe_print_message() {
 
-        if( rgpost('action') === 'update' ) {
+        if ( rgpost( 'action' ) === 'update' ) {
 
             $back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) );
 
-            if( ! $this->is_valid ){
+            if ( ! $this->is_valid ) {
 
                 // Keeping this compatible with Gravity Forms.
-                $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>";
-                $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form);
+                $validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>";
+                $message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form );
 
-                echo GVCommon::generate_notice( $message , 'gv-error' );
+                echo GVCommon::generate_notice( $message, 'gv-error' );
 
             } else {
-                $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. $back_link .'">', '</a>' );
+                $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . $back_link . '">', '</a>' );
 
                 /**
                  * @filter `gravityview/edit_entry/success` Modify the edit entry success message (including the anchor link)
@@ -828,7 +828,7 @@ 
                  * @param array $entry Gravity Forms entry array
                  * @param string $back_link URL to return to the original entry. @since 1.6
                  */
-                $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link );
+                $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link );
 
                 echo GVCommon::generate_notice( $message );
             }
@@ -852,24 +852,24 @@ 
          */
         do_action( 'gravityview/edit-entry/render/before', $this );
 
-        add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 );
-        add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') );
+        add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 );
+        add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
         add_filter( 'gform_disable_view_counter', '__return_true' );
 
         add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 );
         add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 );
 
-        add_filter( 'gform_field_value', array( $this, 'fix_survey_fields_value'), 10, 3 );
+        add_filter( 'gform_field_value', array( $this, 'fix_survey_fields_value' ), 10, 3 );
 
         // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
-        unset( $_GET['page'] );
+        unset( $_GET[ 'page' ] );
 
         // TODO: Verify multiple-page forms
         // TODO: Product fields are not editable
 
-        $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
+        $html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry );
 
-        remove_filter( 'gform_field_value', array( $this, 'fix_survey_fields_value'), 10 );
+        remove_filter( 'gform_field_value', array( $this, 'fix_survey_fields_value' ), 10 );
 	    remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
         remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
         remove_filter( 'gform_disable_view_counter', '__return_true' );
@@ -902,7 +902,7 @@ 
      */
     function fix_survey_fields_value( $value, $field, $name ) {
         
-        if( 'survey' === $field->type ) {
+        if ( 'survey' === $field->type ) {
 
 	        // We need to run through each survey row until we find a match for expected values
 	        foreach ( $this->entry as $field_id => $field_value ) {
@@ -911,11 +911,11 @@ 
 			        continue;
 		        }
 
-		        if( rgar( $field, 'gsurveyLikertEnableMultipleRows' ) ) {
+		        if ( rgar( $field, 'gsurveyLikertEnableMultipleRows' ) ) {
 			        list( $row_val, $col_val ) = explode( ':', $field_value, 2 );
 
 		            // If the $name matches the $row_val, we are processing the correct row
-			        if( $row_val === $name ) {
+			        if ( $row_val === $name ) {
 				        $value = $field_value;
 				        break;
 			        }
@@ -936,7 +936,7 @@ 
      * @return string
      */
     public function render_form_buttons() {
-        return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this );
+        return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this );
     }
 
 
@@ -956,17 +956,17 @@ 
     public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) {
 
         // In case we have validated the form, use it to inject the validation results into the form render
-        if( isset( $this->form_after_validation ) ) {
+        if ( isset( $this->form_after_validation ) ) {
             $form = $this->form_after_validation;
         } else {
-            $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id );
+            $form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id );
         }
 
         $form = $this->filter_conditional_logic( $form );
 
         // for now we don't support Save and Continue feature.
-        if( ! self::$supports_save_and_continue ) {
-	        unset( $form['save'] );
+        if ( ! self::$supports_save_and_continue ) {
+	        unset( $form[ 'save' ] );
         }
 
         return $form;
@@ -987,29 +987,29 @@ 
      */
     function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) {
 
-        if( GFCommon::is_post_field( $field ) ) {
+        if ( GFCommon::is_post_field( $field ) ) {
 
             $message = null;
 
             // First, make sure they have the capability to edit the post.
-            if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
+            if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) {
 
                 /**
                  * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
                  * @param string $message The existing "You don't have permission..." text
                  */
-                $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
+                $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don&rsquo;t have permission to edit this post.', 'gravityview' ) );
 
-            } elseif( null === get_post( $this->entry['post_id'] ) ) {
+            } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) {
                 /**
                  * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
                  * @param string $message The existing "This field is not editable; the post no longer exists." text
                  */
-                $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
+                $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) );
             }
 
-            if( $message ) {
-                $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
+            if ( $message ) {
+                $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
             }
         }
 
@@ -1034,8 +1034,8 @@ 
 
         // If the form has been submitted, then we don't need to pre-fill the values,
         // Except for fileupload type and when a field input is overridden- run always!!
-        if(
-            ( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) )
+        if (
+            ( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) )
             && false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) )
             || ! empty( $field_content )
             || in_array( $field->type, array( 'honeypot' ) )
@@ -1045,8 +1045,8 @@ 
         }
 
         // Turn on Admin-style display for file upload fields only
-        if( 'fileupload' === $field->type ) {
-            $_GET['page'] = 'gf_entries';
+        if ( 'fileupload' === $field->type ) {
+            $_GET[ 'page' ] = 'gf_entries';
         }
 
         // SET SOME FIELD DEFAULTS TO PREVENT ISSUES
@@ -1073,12 +1073,12 @@ 
          * @param mixed $field_value field value used to populate the input
          * @param GF_Field $field Gravity Forms field object
          */
-        $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field );
+        $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field );
 
 	    // Prevent any PHP warnings, like undefined index
 	    ob_start();
 
-        if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
+        if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
             /** @var GF_Field $gv_field */
             $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
         } else {
@@ -1089,7 +1089,7 @@ 
 	    // If there was output, it's an error
 	    $warnings = ob_get_clean();
 
-	    if( !empty( $warnings ) ) {
+	    if ( ! empty( $warnings ) ) {
 		    do_action( 'gravityview_log_error', __METHOD__ . $warnings, $field_value );
 	    }
 
@@ -1098,7 +1098,7 @@ 
          * We need the fileupload html field to render with the proper id
          *  ( <li id="field_80_16" ... > )
          */
-        unset( $_GET['page'] );
+        unset( $_GET[ 'page' ] );
 
         return $return;
     }
@@ -1121,7 +1121,7 @@ 
         $override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field );
 
         // We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs)
-        if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) {
+        if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) {
 
             $field_value = array();
 
@@ -1130,10 +1130,10 @@ 
 
             foreach ( (array)$field->inputs as $input ) {
 
-                $input_id = strval( $input['id'] );
+                $input_id = strval( $input[ 'id' ] );
                 
                 if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) {
-                    $field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
+                    $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
                     $allow_pre_populated = false;
                 }
 
@@ -1141,7 +1141,7 @@ 
 
             $pre_value = $field->get_value_submission( array(), false );
 
-            $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value;
+            $field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value;
 
         } else {
 
@@ -1152,13 +1152,13 @@ 
 
             // saved field entry value (if empty, fallback to the pre-populated value, if exists)
             // or pre-populated value if not empty and set to override saved value
-            $field_value = !gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value;
+            $field_value = ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value;
 
             // in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs.
-            if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) {
+            if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) {
                 $categories = array();
                 foreach ( explode( ',', $field_value ) as $cat_string ) {
-                    $categories[] = GFCommon::format_post_category( $cat_string, true );
+                    $categories[ ] = GFCommon::format_post_category( $cat_string, true );
                 }
                 $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
             }
@@ -1183,12 +1183,12 @@ 
      */
     function gform_pre_validation( $form ) {
 
-        if( ! $this->verify_nonce() ) {
+        if ( ! $this->verify_nonce() ) {
             return $form;
         }
 
         // Fix PHP warning regarding undefined index.
-        foreach ( $form['fields'] as &$field) {
+        foreach ( $form[ 'fields' ] as &$field ) {
 
             // This is because we're doing admin form pretending to be front-end, so Gravity Forms
             // expects certain field array items to be set.
@@ -1201,7 +1201,7 @@ 
                 $field['emailConfirmEnabled'] = '';
             }*/
 
-            switch( RGFormsModel::get_input_type( $field ) ) {
+            switch ( RGFormsModel::get_input_type( $field ) ) {
 
                 /**
                  * this whole fileupload hack is because in the admin, Gravity Forms simply doesn't update any fileupload field if it's empty, but it DOES in the frontend.
@@ -1215,37 +1215,37 @@ 
                     // Set the previous value
                     $entry = $this->get_entry();
 
-                    $input_name = 'input_'.$field->id;
-                    $form_id = $form['id'];
+                    $input_name = 'input_' . $field->id;
+                    $form_id = $form[ 'id' ];
 
                     $value = NULL;
 
                     // Use the previous entry value as the default.
-                    if( isset( $entry[ $field->id ] ) ) {
+                    if ( isset( $entry[ $field->id ] ) ) {
                         $value = $entry[ $field->id ];
                     }
 
                     // If this is a single upload file
-                    if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
-                        $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
-                        $value = $file_path['url'];
+                    if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) {
+                        $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] );
+                        $value = $file_path[ 'url' ];
 
                     } else {
 
                         // Fix PHP warning on line 1498 of form_display.php for post_image fields
                         // Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
-                        $_FILES[ $input_name ] = array('name' => '', 'size' => '' );
+                        $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' );
 
                     }
 
-                    if( rgar($field, "multipleFiles") ) {
+                    if ( rgar( $field, "multipleFiles" ) ) {
 
                         // If there are fresh uploads, process and merge them.
                         // Otherwise, use the passed values, which should be json-encoded array of URLs
-                        if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
+                        if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) {
                             $value = empty( $value ) ? '[]' : $value;
                             $value = stripslashes_deep( $value );
-                            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
+                            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() );
                         }
 
                     } else {
@@ -1263,14 +1263,14 @@ 
 
                 case 'number':
                     // Fix "undefined index" issue at line 1286 in form_display.php
-                    if( !isset( $_POST['input_'.$field->id ] ) ) {
-                        $_POST['input_'.$field->id ] = NULL;
+                    if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) {
+                        $_POST[ 'input_' . $field->id ] = NULL;
                     }
                     break;
                 case 'captcha':
                     // Fix issue with recaptcha_check_answer() on line 1458 in form_display.php
-                    $_POST['recaptcha_challenge_field'] = NULL;
-                    $_POST['recaptcha_response_field'] = NULL;
+                    $_POST[ 'recaptcha_challenge_field' ] = NULL;
+                    $_POST[ 'recaptcha_response_field' ] = NULL;
                     break;
             }
 
@@ -1306,7 +1306,7 @@ 
          * You can enter whatever you want!
          * We try validating, and customize the results using `self::custom_validation()`
          */
-        add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4);
+        add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 );
 
         // Needed by the validate funtion
         $failed_validation_page = NULL;
@@ -1314,14 +1314,14 @@ 
 
         // Prevent entry limit from running when editing an entry, also
         // prevent form scheduling from preventing editing
-        unset( $this->form['limitEntries'], $this->form['scheduleForm'] );
+        unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] );
 
         // Hide fields depending on Edit Entry settings
-        $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id );
+        $this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id );
 
         $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page );
 
-        remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 );
+        remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 );
     }
 
 
@@ -1338,13 +1338,13 @@ 
      */
     function custom_validation( $validation_results ) {
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results );
+        do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results );
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+        do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
 
         $gv_valid = true;
 
-        foreach ( $validation_results['form']['fields'] as $key => &$field ) {
+        foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) {
 
             $value = RGFormsModel::get_field_value( $field );
             $field_type = RGFormsModel::get_input_type( $field );
@@ -1357,35 +1357,35 @@ 
                 case 'post_image':
 
                     // in case nothing is uploaded but there are already files saved
-                    if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
+                    if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) {
                         $field->failed_validation = false;
                         unset( $field->validation_message );
                     }
 
                     // validate if multi file upload reached max number of files [maxFiles] => 2
-                    if( rgobj( $field, 'maxFiles') && rgobj( $field, 'multipleFiles') ) {
+                    if ( rgobj( $field, 'maxFiles' ) && rgobj( $field, 'multipleFiles' ) ) {
 
                         $input_name = 'input_' . $field->id;
                         //uploaded
-                        $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
+                        $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array();
 
                         //existent
                         $entry = $this->get_entry();
                         $value = NULL;
-                        if( isset( $entry[ $field->id ] ) ) {
+                        if ( isset( $entry[ $field->id ] ) ) {
                             $value = json_decode( $entry[ $field->id ], true );
                         }
 
                         // count uploaded files and existent entry files
                         $count_files = count( $file_names ) + count( $value );
 
-                        if( $count_files > $field->maxFiles ) {
+                        if ( $count_files > $field->maxFiles ) {
                             $field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
                             $field->failed_validation = 1;
                             $gv_valid = false;
 
                             // in case of error make sure the newest upload files are removed from the upload input
-                            GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
+                            GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null;
                         }
 
                     }
@@ -1396,7 +1396,7 @@ 
             }
 
             // This field has failed validation.
-            if( !empty( $field->failed_validation ) ) {
+            if ( ! empty( $field->failed_validation ) ) {
 
                 do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'field' => $field, 'value' => $value ) );
 
@@ -1414,32 +1414,32 @@ 
                 }
 
                 // You can't continue inside a switch, so we do it after.
-                if( empty( $field->failed_validation ) ) {
+                if ( empty( $field->failed_validation ) ) {
                     continue;
                 }
 
                 // checks if the No Duplicates option is not validating entry against itself, since
                 // we're editing a stored entry, it would also assume it's a duplicate.
-                if( !empty( $field->noDuplicates ) ) {
+                if ( ! empty( $field->noDuplicates ) ) {
 
                     $entry = $this->get_entry();
 
                     // If the value of the entry is the same as the stored value
                     // Then we can assume it's not a duplicate, it's the same.
-                    if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
+                    if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) {
                         //if value submitted was not changed, then don't validate
                         $field->failed_validation = false;
 
                         unset( $field->validation_message );
 
-                        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry );
+                        do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry );
 
                         continue;
                     }
                 }
 
                 // if here then probably we are facing the validation 'At least one field must be filled out'
-                if( GFFormDisplay::is_empty( $field, $this->form_id  ) && empty( $field->isRequired ) ) {
+                if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) {
                     unset( $field->validation_message );
 	                $field->validation_message = false;
                     continue;
@@ -1451,12 +1451,12 @@ 
 
         }
 
-        $validation_results['is_valid'] = $gv_valid;
+        $validation_results[ 'is_valid' ] = $gv_valid;
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results );
+        do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results );
 
         // We'll need this result when rendering the form ( on GFFormDisplay::get_form )
-        $this->form_after_validation = $validation_results['form'];
+        $this->form_after_validation = $validation_results[ 'form' ];
 
         return $validation_results;
     }
@@ -1469,7 +1469,7 @@ 
      */
     public function get_entry() {
 
-        if( empty( $this->entry ) ) {
+        if ( empty( $this->entry ) ) {
             // Get the database value of the entry that's being edited
             $this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() );
         }
@@ -1496,13 +1496,13 @@ 
         $properties = GravityView_View_Data::getInstance()->get_fields( $view_id );
 
         // If edit tab not yet configured, show all fields
-        $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL;
+        $edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL;
 
         // Show hidden fields as text fields
         $form = $this->fix_survey_fields( $form );
 
         // Hide fields depending on admin settings
-        $fields = $this->filter_fields( $form['fields'], $edit_fields );
+        $fields = $this->filter_fields( $form[ 'fields' ], $edit_fields );
 
 	    // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
 	    $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
@@ -1532,7 +1532,7 @@ 
     private function fix_survey_fields( $form ) {
 
         /** @var GF_Field $field */
-        foreach( $form['fields'] as &$field ) {
+        foreach ( $form[ 'fields' ] as &$field ) {
             $field->allowsPrepopulate = true;
         }
 
@@ -1553,7 +1553,7 @@ 
      */
     private function filter_fields( $fields, $configured_fields ) {
 
-        if( empty( $fields ) || !is_array( $fields ) ) {
+        if ( empty( $fields ) || ! is_array( $fields ) ) {
             return $fields;
         }
 
@@ -1570,13 +1570,13 @@ 
 	     */
 	    $hide_product_fields = apply_filters( 'gravityview/edit_entry/hide-product-fields', empty( self::$supports_product_fields ) );
 
-	    if( $hide_product_fields ) {
-		    $field_type_blacklist[] = 'option';
-		    $field_type_blacklist[] = 'quantity';
-            $field_type_blacklist[] = 'product';
-            $field_type_blacklist[] = 'total';
-            $field_type_blacklist[] = 'shipping';
-            $field_type_blacklist[] = 'calculation';
+	    if ( $hide_product_fields ) {
+		    $field_type_blacklist[ ] = 'option';
+		    $field_type_blacklist[ ] = 'quantity';
+            $field_type_blacklist[ ] = 'product';
+            $field_type_blacklist[ ] = 'total';
+            $field_type_blacklist[ ] = 'shipping';
+            $field_type_blacklist[ ] = 'calculation';
 	    }
 
         // First, remove blacklist or calculation fields
@@ -1584,24 +1584,24 @@ 
 
             // Remove the fields that have calculation properties and keep them to be used later
             // @since 1.16.2
-            if( $field->has_calculation() ) {
-                $this->fields_with_calculation[] = $field;
+            if ( $field->has_calculation() ) {
+                $this->fields_with_calculation[ ] = $field;
                 // don't remove the calculation fields on form render.
             }
 
             // process total field after all fields have been saved
             if ( $field->type == 'total' ) {
-                $this->total_fields[] = $field;
+                $this->total_fields[ ] = $field;
                 unset( $fields[ $key ] );
             }
 
-            if( in_array( $field->type, $field_type_blacklist ) ) {
+            if ( in_array( $field->type, $field_type_blacklist ) ) {
                 unset( $fields[ $key ] );
             }
         }
 
         // The Edit tab has not been configured, so we return all fields by default.
-        if( empty( $configured_fields ) ) {
+        if ( empty( $configured_fields ) ) {
             return $fields;
         }
 
@@ -1611,8 +1611,8 @@ 
 	        /** @var GF_Field $field */
 	        foreach ( $fields as $field ) {
 
-                if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
-                    $edit_fields[] = $this->merge_field_properties( $field, $configured_field );
+                if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
+                    $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field );
                     break;
                 }
 
@@ -1635,14 +1635,14 @@ 
 
         $return_field = $field;
 
-        if( empty( $field_setting['show_label'] ) ) {
+        if ( empty( $field_setting[ 'show_label' ] ) ) {
             $return_field->label = '';
-        } elseif ( !empty( $field_setting['custom_label'] ) ) {
-            $return_field->label = $field_setting['custom_label'];
+        } elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) {
+            $return_field->label = $field_setting[ 'custom_label' ];
         }
 
-        if( !empty( $field_setting['custom_class'] ) ) {
-            $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] );
+        if ( ! empty( $field_setting[ 'custom_class' ] ) ) {
+            $return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] );
         }
 
         /**
@@ -1680,16 +1680,16 @@ 
 	     */
 	    $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
 
-	    if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
-            foreach( $fields as $k => $field ) {
-                if( $field->adminOnly ) {
+	    if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) {
+            foreach ( $fields as $k => $field ) {
+                if ( $field->adminOnly ) {
                     unset( $fields[ $k ] );
                 }
             }
             return $fields;
         }
 
-	    foreach( $fields as &$field ) {
+	    foreach ( $fields as &$field ) {
 		    $field->adminOnly = false;
         }
 
@@ -1716,16 +1716,16 @@ 
          */
         $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form );
 
-        if( $use_conditional_logic ) {
+        if ( $use_conditional_logic ) {
             return $form;
         }
 
-        foreach( $form['fields'] as &$field ) {
+        foreach ( $form[ 'fields' ] as &$field ) {
             /* @var GF_Field $field */
             $field->conditionalLogic = null;
         }
 
-        unset( $form['button']['conditionalLogic'] );
+        unset( $form[ 'button' ][ 'conditionalLogic' ] );
 
         return $form;
 
@@ -1742,7 +1742,7 @@ 
      */
     function manage_conditional_logic( $has_conditional_logic, $form ) {
 
-        if( ! $this->is_edit_entry() ) {
+        if ( ! $this->is_edit_entry() ) {
             return $has_conditional_logic;
         }
 
@@ -1773,44 +1773,44 @@ 
          *  2. There are two entries embedded using oEmbed
          *  3. One of the entries has just been saved
          */
-        if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) {
+        if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) {
 
             $error = true;
 
         }
 
-        if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) {
+        if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) {
 
             $error = true;
 
-        } elseif( ! $this->verify_nonce() ) {
+        } elseif ( ! $this->verify_nonce() ) {
 
             /**
              * If the Entry is embedded, there may be two entries on the same page.
              * If that's the case, and one is being edited, the other should fail gracefully and not display an error.
              */
-            if( GravityView_oEmbed::getInstance()->get_entry_id() ) {
+            if ( GravityView_oEmbed::getInstance()->get_entry_id() ) {
                 $error = true;
             } else {
-                $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview');
+                $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' );
             }
 
         }
 
-        if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
-            $error = __( 'You do not have permission to edit this entry.', 'gravityview');
+        if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
+            $error = __( 'You do not have permission to edit this entry.', 'gravityview' );
         }
 
-        if( $this->entry['status'] === 'trash' ) {
-            $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' );
+        if ( $this->entry[ 'status' ] === 'trash' ) {
+            $error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' );
         }
 
         // No errors; everything's fine here!
-        if( empty( $error ) ) {
+        if ( empty( $error ) ) {
             return true;
         }
 
-        if( $echo && $error !== true ) {
+        if ( $echo && $error !== true ) {
 
 	        $error = esc_html( $error );
 
@@ -1818,13 +1818,13 @@ 
 	         * @since 1.9
 	         */
 	        if ( ! empty( $this->entry ) ) {
-		        $error .= ' ' . gravityview_get_link( '#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) );
+		        $error .= ' ' . gravityview_get_link( '#', _x( 'Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) );
 	        }
 
-            echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
+            echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' );
         }
 
-        do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error );
+        do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error );
 
         return false;
     }
@@ -1841,20 +1841,20 @@ 
 
         $error = NULL;
 
-        if( ! $this->check_user_cap_edit_field( $field ) ) {
-            $error = __( 'You do not have permission to edit this field.', 'gravityview');
+        if ( ! $this->check_user_cap_edit_field( $field ) ) {
+            $error = __( 'You do not have permission to edit this field.', 'gravityview' );
         }
 
         // No errors; everything's fine here!
-        if( empty( $error ) ) {
+        if ( empty( $error ) ) {
             return true;
         }
 
-        if( $echo ) {
-            echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error');
+        if ( $echo ) {
+            echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' );
         }
 
-        do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error );
+        do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error );
 
         return false;
 
@@ -1872,15 +1872,15 @@ 
     private function check_user_cap_edit_field( $field ) {
 
         // If they can edit any entries (as defined in Gravity Forms), we're good.
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
+        if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
             return true;
         }
 
-        $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false;
+        $field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false;
 
         // If the field has custom editing capaibilities set, check those
-        if( $field_cap ) {
-            return GVCommon::has_cap( $field['allow_edit_cap'] );
+        if ( $field_cap ) {
+            return GVCommon::has_cap( $field[ 'allow_edit_cap' ] );
         }
 
         return false;
@@ -1894,17 +1894,17 @@ 
     public function verify_nonce() {
 
         // Verify form submitted for editing single
-        if( $this->is_edit_entry_submission() ) {
+        if ( $this->is_edit_entry_submission() ) {
             $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
         }
 
         // Verify
-        else if( ! $this->is_edit_entry() ) {
+        else if ( ! $this->is_edit_entry() ) {
             $valid = false;
         }
 
         else {
-            $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
+            $valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key );
         }
 
         /**