gravityview / GravityView

includes/class-cache.php

Spacing +17 added lines, -17 removed lines

@@ -81,7 +81,7 @@ 
 		/**
 		 * @see RGFormsModel::update_lead_property() Trigger when any entry property changes
 		 */
-		foreach( $this->lead_db_columns as $column ) {
+		foreach ( $this->lead_db_columns as $column ) {
 			add_action( 'gform_update_' . $column, array( $this, 'entry_status_changed' ), 10, 3 );
 		}
 
@@ -114,9 +114,9 @@ 
 			return;
 		}
 
-		do_action( 'gravityview_log_debug', __METHOD__ . ' adding form ' . $entry['form_id'] . ' to blacklist because entry #' . $lead_id . ' was deleted', array( 'value' => $property_value, 'previous' => $previous_value ) );
+		do_action( 'gravityview_log_debug', __METHOD__ . ' adding form ' . $entry[ 'form_id' ] . ' to blacklist because entry #' . $lead_id . ' was deleted', array( 'value' => $property_value, 'previous' => $previous_value ) );
 
-		$this->blacklist_add( $entry['form_id'] );
+		$this->blacklist_add( $entry[ 'form_id' ] );
 	}
 
 	/**
@@ -129,9 +129,9 @@ 
 	 */
 	public function entry_updated( $form, $lead_id ) {
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form ' . $form['id'] . ' to blacklist because entry #' . $lead_id . ' was updated' );
+		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form ' . $form[ 'id' ] . ' to blacklist because entry #' . $lead_id . ' was updated' );
 
-		$this->blacklist_add( $form['id'] );
+		$this->blacklist_add( $form[ 'id' ] );
 	}
 
 	/**
@@ -146,9 +146,9 @@ 
 	 */
 	public function entry_created( $entry, $form ) {
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_created] adding form ' . $form['id'] . ' to blacklist because entry #' . $entry['id'] . ' was created' );
+		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_created] adding form ' . $form[ 'id' ] . ' to blacklist because entry #' . $entry[ 'id' ] . ' was created' );
 
-		$this->blacklist_add( $form['id'] );
+		$this->blacklist_add( $form[ 'id' ] );
 	}
 
 	/**
@@ -164,9 +164,9 @@ 
 			return;
 		}
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_added] adding form ' . $form['id'] . ' to blacklist because entry #' . $entry['id'] . ' was added' );
+		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_added] adding form ' . $form[ 'id' ] . ' to blacklist because entry #' . $entry[ 'id' ] . ' was added' );
 
-		$this->blacklist_add( $form['id'] );
+		$this->blacklist_add( $form[ 'id' ] );
 	}
 
 	/**
@@ -185,7 +185,7 @@ 
 		// Normally just one form, but supports multiple forms
 		//
 		// Array of IDs 12, 5, 14 would result in `f:12-f:5-f:14`
-		$forms = 'f:' . implode( '-f:', (array) $form_ids );
+		$forms = 'f:' . implode( '-f:', (array)$form_ids );
 
 		// Prefix for transient keys
 		// Now the prefix would be: `gv-cache-f:12-f:5-f:14-`
@@ -242,7 +242,7 @@ 
 		) );
 
 		// Add the passed form IDs
-		$blacklist = array_merge( (array) $blacklist, $form_ids );
+		$blacklist = array_merge( (array)$blacklist, $form_ids );
 
 		// Don't duplicate
 		$blacklist = array_unique( $blacklist );
@@ -265,7 +265,7 @@ 
 
 		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
 
-		$updated_list = array_diff( $blacklist, (array) $form_ids );
+		$updated_list = array_diff( $blacklist, (array)$form_ids );
 
 		do_action( 'gravityview_log_debug', 'GravityView_Cache[blacklist_remove] Removing form IDs from cache blacklist', array(
 			'$form_ids'     => $form_ids,
@@ -298,7 +298,7 @@ 
 			return false;
 		}
 
-		foreach ( (array) $form_ids as $form_id ) {
+		foreach ( (array)$form_ids as $form_id ) {
 
 			if ( in_array( $form_id, $blacklist ) ) {
 
@@ -370,7 +370,7 @@ 
 			 * @filter `gravityview_cache_time_{$filter_name}` Modify the cache time for a type of cache
 			 * @param int $time_in_seconds Default: `DAY_IN_SECONDS`
 			 */
-			$cache_time = (int) apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
+			$cache_time = (int)apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
 
 			do_action( 'gravityview_log_debug', 'GravityView_Cache[set] Setting cache with transient key ' . $this->key . ' for ' . $cache_time . ' seconds' );
 
@@ -406,7 +406,7 @@ 
 			return;
 		}
 
-		foreach ( (array) $form_ids as $form_id ) {
+		foreach ( (array)$form_ids as $form_id ) {
 
 			$key = '_transient_gv-cache-';
 
@@ -525,7 +525,7 @@ 
 
 		if ( GVCommon::has_cap( 'edit_gravityviews' ) ) {
 
-			if ( isset( $_GET['cache'] ) || isset( $_GET['nocache'] ) ) {
+			if ( isset( $_GET[ 'cache' ] ) || isset( $_GET[ 'nocache' ] ) ) {
 
 				do_action( 'gravityview_log_debug', 'GravityView_Cache[use_cache] Not using cache: ?cache or ?nocache is in the URL' );
 
@@ -552,7 +552,7 @@ 
 		 */
 		$use_cache = apply_filters( 'gravityview_use_cache', $use_cache, $this );
 
-		return (boolean) $use_cache;
+		return (boolean)$use_cache;
 	}
 
 }

includes/helper-functions.php

Spacing +48 added lines, -48 removed lines

@@ -32,19 +32,19 @@ 
 	// If there's an overriding CSS file in the current template folder, use it.
 	$template_css_path = trailingslashit( get_stylesheet_directory() ) . 'gravityview/css/' . $css_file;
 
-	if( file_exists( $template_css_path ) ) {
+	if ( file_exists( $template_css_path ) ) {
 		$path = trailingslashit( get_stylesheet_directory_uri() ) . 'gravityview/css/' . $css_file;
-		do_action( 'gravityview_log_debug', __FUNCTION__ . ': Stylesheet override ('. esc_attr( $css_file ) .')' );
+		do_action( 'gravityview_log_debug', __FUNCTION__ . ': Stylesheet override (' . esc_attr( $css_file ) . ')' );
 	} else {
 		// Default: use GravityView CSS file
 
 		// If no path is provided, assume default plugin templates CSS folder
-		if( '' === $dir_path ) {
+		if ( '' === $dir_path ) {
 			$dir_path = GRAVITYVIEW_DIR . 'templates/css/';
 		}
 		
 		// plugins_url() expects a path to a file, not directory. We append a file to be stripped.
-		$path = plugins_url( $css_file, trailingslashit( $dir_path )  . 'stripped-by-plugin_basename.php' );
+		$path = plugins_url( $css_file, trailingslashit( $dir_path ) . 'stripped-by-plugin_basename.php' );
 	}
 
 	return $path;
@@ -82,9 +82,9 @@ 
 
 	$parsed_permalink = parse_url( get_permalink( $id ) );
 
-	$permalink_args =  isset( $parsed_permalink['query'] ) ? $parsed_permalink['query'] : false;
+	$permalink_args = isset( $parsed_permalink[ 'query' ] ) ? $parsed_permalink[ 'query' ] : false;
 
-	if( empty( $permalink_args ) ) {
+	if ( empty( $permalink_args ) ) {
 		return array();
 	}
 
@@ -109,15 +109,15 @@ 
 function gv_selected( $value, $current, $echo = true, $type = 'selected' ) {
 
 	$output = '';
-	if( is_array( $current ) ) {
-		if( in_array( $value, $current ) ) {
+	if ( is_array( $current ) ) {
+		if ( in_array( $value, $current ) ) {
 			$output = __checked_selected_helper( true, true, false, $type );
 		}
 	} else {
 		$output = __checked_selected_helper( $value, $current, false, $type );
 	}
 
-	if( $echo ) {
+	if ( $echo ) {
 		echo $output;
 	}
 
@@ -125,7 +125,7 @@ 
 }
 
 
-if( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
+if ( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
 
 	/**
 	 * sanitize_html_class doesn't handle spaces (multiple classes). We remedy that.
@@ -171,7 +171,7 @@ 
  */
 function gravityview_strip_whitespace( $string ) {
 	$string = normalize_whitespace( $string );
-	return preg_replace('/[\r\n\t ]+/', ' ', $string );
+	return preg_replace( '/[\r\n\t ]+/', ' ', $string );
 }
 
 /**
@@ -185,7 +185,7 @@ 
  * @return string Included file contents
  */
 function gravityview_ob_include( $file_path, $object = NULL ) {
-	if( ! file_exists( $file_path ) ) {
+	if ( ! file_exists( $file_path ) ) {
 		do_action( 'gravityview_log_error', __FUNCTION__ . ': File path does not exist. ', $file_path );
 		return '';
 	}
@@ -203,7 +203,7 @@ 
 
 	$width = $height * 0.7586206897;
 
-	if( function_exists('is_rtl') && is_rtl() ) {
+	if ( function_exists( 'is_rtl' ) && is_rtl() ) {
 		$style = 'margin:10px 10px 10px 0;';
 		$class = 'alignright';
 	} else {
@@ -211,7 +211,7 @@ 
 		$class = 'alignleft';
 	}
 
-	return '<img src="'.plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ).'" class="'.$class.'" height="'.intval( $height ).'" width="'.round( $width, 2 ).'" alt="The GravityView Astronaut Says:" style="'.$style.'" />';
+	return '<img src="' . plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) . '" class="' . $class . '" height="' . intval( $height ) . '" width="' . round( $width, 2 ) . '" alt="The GravityView Astronaut Says:" style="' . $style . '" />';
 }
 
 /**
@@ -234,9 +234,9 @@ 
 function gravityview_number_format( $number, $decimals = '' ) {
 	global $wp_locale;
 
-	if( '' === $decimals ) {
+	if ( '' === $decimals ) {
 
-		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format['decimal_point'] : '.';
+		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format[ 'decimal_point' ] : '.';
 
 		/**
 		 * Calculate the position of the decimal point in the number
@@ -265,7 +265,7 @@ 
 	$parts = parse_url( $value );
 
 	// No domain? Strange...show the original text.
-	if( empty( $parts['host'] ) ) {
+	if ( empty( $parts[ 'host' ] ) ) {
 		return $value;
 	}
 
@@ -278,16 +278,16 @@ 
 	 * @param boolean $enable Whether to strip the scheme. Return false to show scheme. (default: true)\n
 	 * If true: `http://example.com => example.com`
 	 */
-	if( false === apply_filters('gravityview_anchor_text_striphttp', true) ) {
+	if ( false === apply_filters( 'gravityview_anchor_text_striphttp', true ) ) {
 
-		if( isset( $parts['scheme'] ) ) {
-			$return .= $parts['scheme'];
+		if ( isset( $parts[ 'scheme' ] ) ) {
+			$return .= $parts[ 'scheme' ];
 		}
 
 	}
 
 	// The domain, which may contain a subdomain
-	$domain = $parts['host'];
+	$domain = $parts[ 'host' ];
 
 	/**
 	 * @filter `gravityview_anchor_text_stripwww` Strip www from the domain?
@@ -295,10 +295,10 @@ 
 	 * @param boolean $enable Whether to strip www. Return false to show www. (default: true)\n
 	 * If true: `www.example.com => example.com`
 	 */
-	$strip_www = apply_filters('gravityview_anchor_text_stripwww', true );
+	$strip_www = apply_filters( 'gravityview_anchor_text_stripwww', true );
 
-	if( $strip_www ) {
-		$domain = str_replace('www.', '', $domain );
+	if ( $strip_www ) {
+		$domain = str_replace( 'www.', '', $domain );
 	}
 
 	/**
@@ -308,11 +308,11 @@ 
 	 * If true: `http://demo.example.com => example.com` \n
 	 * If false: `http://demo.example.com => demo.example.com`
 	 */
-	$strip_subdomains = apply_filters('gravityview_anchor_text_nosubdomain', true);
+	$strip_subdomains = apply_filters( 'gravityview_anchor_text_nosubdomain', true );
 
-	if( $strip_subdomains ) {
+	if ( $strip_subdomains ) {
 
-		$domain = _gravityview_strip_subdomain( $parts['host'] );
+		$domain = _gravityview_strip_subdomain( $parts[ 'host' ] );
 
 	}
 
@@ -326,12 +326,12 @@ 
 	 * If true: `http://example.com/sub/directory/page.html => example.com`  \n
 	 * If false: `http://example.com/sub/directory/page.html => example.com/sub/directory/page.html`
 	 */
-	$root_only = apply_filters('gravityview_anchor_text_rootonly', true);
+	$root_only = apply_filters( 'gravityview_anchor_text_rootonly', true );
 
-	if( empty( $root_only ) ) {
+	if ( empty( $root_only ) ) {
 
-		if( isset( $parts['path'] ) ) {
-			$return .= $parts['path'];
+		if ( isset( $parts[ 'path' ] ) ) {
+			$return .= $parts[ 'path' ];
 		}
 	}
 
@@ -341,12 +341,12 @@ 
 	 * @param boolean $enable Whether to enable "root only". Return false to show full path. (default: true)\n
 	 * If true: `http://example.com/?query=example => example.com`
 	 */
-	$strip_query_string = apply_filters('gravityview_anchor_text_noquerystring', true );
+	$strip_query_string = apply_filters( 'gravityview_anchor_text_noquerystring', true );
 
-	if( empty( $strip_query_string ) ) {
+	if ( empty( $strip_query_string ) ) {
 
-		if( isset( $parts['query'] ) ) {
-			$return .= '?'.$parts['query'];
+		if ( isset( $parts[ 'query' ] ) ) {
+			$return .= '?' . $parts[ 'query' ];
 		}
 
 	}
@@ -363,8 +363,8 @@ 
  */
 function _gravityview_strip_subdomain( $string_maybe_has_subdomain ) {
 
-	if( preg_match("/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) {
-		return $matches['domain'];
+	if ( preg_match( "/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) {
+		return $matches[ 'domain' ];
 	} else {
 		return $string_maybe_has_subdomain;
 	}
@@ -418,7 +418,7 @@ 
 
 		if ( in_array( $value, array( 'yes', 'true' ), true ) ) {
 			$value = true;
-		} else if( in_array( $value, array( 'no', 'false' ), true ) ) {
+		} else if ( in_array( $value, array( 'no', 'false' ), true ) ) {
 			$value = false;
 		}
 	}
@@ -447,7 +447,7 @@ 
 
 	// Use the original function, if exists.
 	// Requires WP 4.4+
-	if( function_exists( 'map_deep') ) {
+	if ( function_exists( 'map_deep' ) ) {
 		return map_deep( $value, $callback );
 	}
 
@@ -512,7 +512,7 @@ 
 
 	$exploded = explode( '.', "{$field_id}" );
 
-	return isset( $exploded[1] ) ? intval( $exploded[1] ) : false;
+	return isset( $exploded[ 1 ] ) ? intval( $exploded[ 1 ] ) : false;
 }
 
 /**
@@ -553,13 +553,13 @@ 
 	 */
 	$args = apply_filters( 'gravityview_get_terms_choices_args', $args );
 
-	$terms = get_terms( $args['taxonomy'], $args );
+	$terms = get_terms( $args[ 'taxonomy' ], $args );
 
 	$choices = array();
 
 	if ( is_array( $terms ) ) {
 		foreach ( $terms as $term_id => $term_name ) {
-			$choices[] = array(
+			$choices[ ] = array(
 				'text'  => $term_name,
 				'value' => $term_id
 			);
@@ -583,21 +583,21 @@ 
 function _gravityview_process_posted_fields() {
 	$fields = array();
 
-	if( !empty( $_POST['gv_fields'] ) ) {
-		if ( ! is_array( $_POST['gv_fields'] ) ) {
+	if ( ! empty( $_POST[ 'gv_fields' ] ) ) {
+		if ( ! is_array( $_POST[ 'gv_fields' ] ) ) {
 
 			// We are not using parse_str() due to max_input_vars limitation with large View configurations
 			$fields_holder = array();
-			GVCommon::gv_parse_str( $_POST['gv_fields'], $fields_holder );
+			GVCommon::gv_parse_str( $_POST[ 'gv_fields' ], $fields_holder );
 
-			if ( isset( $fields_holder['fields'] ) ) {
-				$fields = $fields_holder['fields'];
+			if ( isset( $fields_holder[ 'fields' ] ) ) {
+				$fields = $fields_holder[ 'fields' ];
 			} else {
 				do_action( 'gravityview_log_error', '[save_postdata] No `fields` key was found after parsing $fields string', $fields_holder );
 			}
 
 		} else {
-			$fields = $_POST['gv_fields'];
+			$fields = $_POST[ 'gv_fields' ];
 		}
 	}
 

future/_mocks.php

Spacing +12 added lines, -12 removed lines

@@ -96,19 +96,19 @@ 
 		$paging = rgar( $parameters, 'paging' );
 	} else {
 		$entries = $form->entries
-			->filter( \GV\GF_Entry_Filter::from_search_criteria( $criteria['search_criteria'] ) )
-			->offset( $args['offset'] )
-			->limit( $criteria['paging']['page_size'] );
+			->filter( \GV\GF_Entry_Filter::from_search_criteria( $criteria[ 'search_criteria' ] ) )
+			->offset( $args[ 'offset' ] )
+			->limit( $criteria[ 'paging' ][ 'page_size' ] );
 
-		if ( $criteria['paging']['page_size'] ) {
-			$entries = $entries->page( ( ( $criteria['paging']['offset'] - $args['offset'] ) / $criteria['paging']['page_size'] ) + 1 );
+		if ( $criteria[ 'paging' ][ 'page_size' ] ) {
+			$entries = $entries->page( ( ( $criteria[ 'paging' ][ 'offset' ] - $args[ 'offset' ] ) / $criteria[ 'paging' ][ 'page_size' ] ) + 1 );
 		}
 
-		if ( ! empty( $criteria['sorting'] ) ) {
+		if ( ! empty( $criteria[ 'sorting' ] ) ) {
 			$field = new \GV\Field();
-			$field->ID = $criteria['sorting']['key'];
-			$direction = strtolower( $criteria['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
-			$mode = $criteria['sorting']['is_numeric'] ? \GV\Entry_Sort::NUMERIC : \GV\Entry_Sort::ALPHA;
+			$field->ID = $criteria[ 'sorting' ][ 'key' ];
+			$direction = strtolower( $criteria[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
+			$mode = $criteria[ 'sorting' ][ 'is_numeric' ] ? \GV\Entry_Sort::NUMERIC : \GV\Entry_Sort::ALPHA;
 			$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction, $mode ) );
 		}
 
@@ -134,7 +134,7 @@ 
 
 /** Add some global fix for field capability discrepancies. */
 add_filter( 'gravityview/configuration/fields', function( $fields ) {
-	if ( empty( $fields  ) ) {
+	if ( empty( $fields ) ) {
 		return $fields;
 	}
 
@@ -161,11 +161,11 @@ 
 		}
 
 		foreach ( $_fields as $uid => &$_field ) {
-			if ( ! isset( $_field['only_loggedin'] ) ) {
+			if ( ! isset( $_field[ 'only_loggedin' ] ) ) {
 				continue;
 			}
 			/** If we do not require login, we don't require a cap. */
-			$_field['only_loggedin'] != '1' && ( $_field['only_loggedin_cap'] = '' );
+			$_field[ 'only_loggedin' ] != '1' && ( $_field[ 'only_loggedin_cap' ] = '' );
 		}
 	}
 	return $fields;

includes/class-api.php

Spacing +143 added lines, -143 removed lines

@@ -30,29 +30,29 @@ 
 
 		$label = '';
 
-		if( !empty( $field['show_label'] ) || $force_show_label ) {
+		if ( ! empty( $field[ 'show_label' ] ) || $force_show_label ) {
 
-			$label = $field['label'];
+			$label = $field[ 'label' ];
 
 			// Support Gravity Forms 1.9+
-			if( class_exists( 'GF_Field' ) ) {
+			if ( class_exists( 'GF_Field' ) ) {
 
-				$field_object = RGFormsModel::get_field( $form, $field['id'] );
+				$field_object = RGFormsModel::get_field( $form, $field[ 'id' ] );
 
-				if( $field_object ) {
+				if ( $field_object ) {
 
-					$input = GFFormsModel::get_input( $field_object, $field['id'] );
+					$input = GFFormsModel::get_input( $field_object, $field[ 'id' ] );
 
 					// This is a complex field, with labels on a per-input basis
-					if( $input ) {
+					if ( $input ) {
 
 						// Does the input have a custom label on a per-input basis? Otherwise, default label.
-						$label = ! empty( $input['customLabel'] ) ? $input['customLabel'] : $input['label'];
+						$label = ! empty( $input[ 'customLabel' ] ) ? $input[ 'customLabel' ] : $input[ 'label' ];
 
 					} else {
 
 						// This is a field with one label
-						$label = $field_object->get_field_label( true, $field['label'] );
+						$label = $field_object->get_field_label( true, $field[ 'label' ] );
 
 					}
 
@@ -61,9 +61,9 @@ 
 			}
 
 			// Use Gravity Forms label by default, but if a custom label is defined in GV, use it.
-			if ( !empty( $field['custom_label'] ) ) {
+			if ( ! empty( $field[ 'custom_label' ] ) ) {
 
-				$label = self::replace_variables( $field['custom_label'], $form, $entry );
+				$label = self::replace_variables( $field[ 'custom_label' ], $form, $entry );
 
 			}
 
@@ -117,11 +117,11 @@ 
 
 		$width = NULL;
 
-		if( !empty( $field['width'] ) ) {
-			$width = absint( $field['width'] );
+		if ( ! empty( $field[ 'width' ] ) ) {
+			$width = absint( $field[ 'width' ] );
 
 			// If using percentages, limit to 100%
-			if( '%d%%' === $format && $width > 100 ) {
+			if ( '%d%%' === $format && $width > 100 ) {
 				$width = 100;
 			}
 
@@ -144,39 +144,39 @@ 
 
 		$classes = array();
 
-		if( !empty( $field['custom_class'] ) ) {
+		if ( ! empty( $field[ 'custom_class' ] ) ) {
 
-            $custom_class = $field['custom_class'];
+            $custom_class = $field[ 'custom_class' ];
 
-            if( !empty( $entry ) ) {
+            if ( ! empty( $entry ) ) {
 
                 // We want the merge tag to be formatted as a class. The merge tag may be
                 // replaced by a multiple-word value that should be output as a single class.
                 // "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
-                add_filter('gform_merge_tag_filter', 'sanitize_html_class');
+                add_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
 
-                $custom_class = self::replace_variables( $custom_class, $form, $entry);
+                $custom_class = self::replace_variables( $custom_class, $form, $entry );
 
                 // And then we want life to return to normal
-                remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
+                remove_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
             }
 
 			// And now we want the spaces to be handled nicely.
-			$classes[] = gravityview_sanitize_html_class( $custom_class );
+			$classes[ ] = gravityview_sanitize_html_class( $custom_class );
 
 		}
 
-		if(!empty($field['id'])) {
-			if( !empty( $form ) && !empty( $form['id'] ) ) {
-				$form_id = '-'.$form['id'];
+		if ( ! empty( $field[ 'id' ] ) ) {
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
+				$form_id = '-' . $form[ 'id' ];
 			} else {
-				$form_id = $gravityview_view->getFormId() ? '-'. $gravityview_view->getFormId() : '';
+				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
 			}
 
-			$classes[] = 'gv-field'.$form_id.'-'.$field['id'];
+			$classes[ ] = 'gv-field' . $form_id . '-' . $field[ 'id' ];
 		}
 
-		return esc_attr(implode(' ', $classes));
+		return esc_attr( implode( ' ', $classes ) );
 	}
 
 	/**
@@ -193,16 +193,16 @@ 
 	 */
 	public static function field_html_attr_id( $field, $form = array(), $entry = array() ) {
 		$gravityview_view = GravityView_View::getInstance();
-		$id = $field['id'];
+		$id = $field[ 'id' ];
 
 		if ( ! empty( $id ) ) {
-			if ( ! empty( $form ) && ! empty( $form['id'] ) ) {
-				$form_id = '-' . $form['id'];
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
+				$form_id = '-' . $form[ 'id' ];
 			} else {
 				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
 			}
 
-			$id = 'gv-field' . $form_id . '-' . $field['id'];
+			$id = 'gv-field' . $form_id . '-' . $field[ 'id' ];
 		}
 
 		return esc_attr( $id );
@@ -219,17 +219,17 @@ 
 	 */
 	public static function field_value( $entry, $field_settings, $format = 'html' ) {
 
-		if( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) {
+		if ( empty( $entry[ 'form_id' ] ) || empty( $field_settings[ 'id' ] ) ) {
 			return NULL;
 		}
 
 		$gravityview_view = GravityView_View::getInstance();
 
-		$field_id = $field_settings['id'];
+		$field_id = $field_settings[ 'id' ];
 		$form = $gravityview_view->getForm();
 		$field = gravityview_get_field( $form, $field_id );
 
-		if( $field && is_numeric( $field_id ) ) {
+		if ( $field && is_numeric( $field_id ) ) {
 			// Used as file name of field template in GV.
 			// Don't use RGFormsModel::get_input_type( $field ); we don't care if it's a radio input; we want to know it's a 'quiz' field
 			$field_type = $field->type;
@@ -240,12 +240,12 @@ 
 		}
 
 		// If a Gravity Forms Field is found, get the field display
-		if( $field ) {
+		if ( $field ) {
 
 			// Prevent any PHP warnings that may be generated
 			ob_start();
 
-			$display_value = GFCommon::get_lead_field_display( $field, $value, $entry["currency"], false, $format );
+			$display_value = GFCommon::get_lead_field_display( $field, $value, $entry[ "currency" ], false, $format );
 
 			if ( $errors = ob_get_clean() ) {
 				do_action( 'gravityview_log_error', 'GravityView_API[field_value] Errors when calling GFCommon::get_lead_field_display()', $errors );
@@ -254,7 +254,7 @@ 
 			$display_value = apply_filters( "gform_entry_field_value", $display_value, $field, $entry, $form );
 
 			// prevent the use of merge_tags for non-admin fields
-			if( !empty( $field->adminOnly ) ) {
+			if ( ! empty( $field->adminOnly ) ) {
 				$display_value = self::replace_variables( $display_value, $form, $entry );
 			}
 		} else {
@@ -264,7 +264,7 @@ 
 
 		// Check whether the field exists in /includes/fields/{$field_type}.php
 		// This can be overridden by user template files.
-		$field_path = $gravityview_view->locate_template("fields/{$field_type}.php");
+		$field_path = $gravityview_view->locate_template( "fields/{$field_type}.php" );
 
 		// Set the field data to be available in the templates
 		$gravityview_view->setCurrentField( array(
@@ -278,11 +278,11 @@ 
 			'entry' => $entry,
 			'field_type' => $field_type, /** {@since 1.6} */
 		    'field_path' => $field_path, /** {@since 1.16} */
-		));
+		) );
 
-		if( ! empty( $field_path ) ) {
+		if ( ! empty( $field_path ) ) {
 
-			do_action( 'gravityview_log_debug', sprintf('[field_value] Rendering %s', $field_path ) );
+			do_action( 'gravityview_log_debug', sprintf( '[field_value] Rendering %s', $field_path ) );
 
 			ob_start();
 
@@ -298,7 +298,7 @@ 
 		}
 
 		// Get the field settings again so that the field template can override the settings
-		$field_settings = $gravityview_view->getCurrentField('field_settings');
+		$field_settings = $gravityview_view->getCurrentField( 'field_settings' );
 
 		/**
 		 * @filter `gravityview_field_entry_value_{$field_type}_pre_link` Modify the field value output for a field type before Show As Link setting is applied. Example: `gravityview_field_entry_value_number_pre_link`
@@ -327,9 +327,9 @@ 
 		 * Fields can override this by modifying the field data variable inside the field. See /templates/fields/post_image.php for an example.
 		 *
 		 */
-		if( !empty( $field_settings['show_as_link'] ) && ! gv_empty( $output, false, false ) ) {
+		if ( ! empty( $field_settings[ 'show_as_link' ] ) && ! gv_empty( $output, false, false ) ) {
 
-			$link_atts = empty( $field_settings['new_window'] ) ? array() : array( 'target' => '_blank' );
+			$link_atts = empty( $field_settings[ 'new_window' ] ) ? array() : array( 'target' => '_blank' );
 
 			$output = self::entry_link_html( $entry, $output, $link_atts, $field_settings );
 
@@ -343,7 +343,7 @@ 
 		 * @param  array $field_settings Settings for the particular GV field
 		 * @param array $field Current field being displayed
 		 */
-		$output = apply_filters( 'gravityview_field_entry_value_'.$field_type, $output, $entry, $field_settings, $gravityview_view->getCurrentField() );
+		$output = apply_filters( 'gravityview_field_entry_value_' . $field_type, $output, $entry, $field_settings, $gravityview_view->getCurrentField() );
 
 		/**
 		 * @filter `gravityview_field_entry_value` Modify the field value output for all field types
@@ -372,14 +372,14 @@ 
 	 */
 	public static function entry_link_html( $entry = array(), $anchor_text = '', $passed_tag_atts = array(), $field_settings = array() ) {
 
-		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry['id'] ) ) {
+		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry[ 'id' ] ) ) {
 			do_action( 'gravityview_log_debug', 'GravityView_API[entry_link_tag] Entry not defined; returning null', $entry );
 			return NULL;
 		}
 
 		$href = self::entry_link( $entry );
 
-		if( '' === $href ) {
+		if ( '' === $href ) {
 			return NULL;
 		}
 
@@ -402,19 +402,19 @@ 
 	 * @param  boolean     $wpautop Apply wpautop() to the output?
 	 * @return string               HTML of "no results" text
 	 */
-	public static function no_results($wpautop = true) {
+	public static function no_results( $wpautop = true ) {
 		$gravityview_view = GravityView_View::getInstance();
 
 		$is_search = false;
 
-		if( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
+		if ( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
 			$is_search = true;
 		}
 
-		if($is_search) {
-			$output = __('This search returned no results.', 'gravityview');
+		if ( $is_search ) {
+			$output = __( 'This search returned no results.', 'gravityview' );
 		} else {
-			$output = __('No entries match your request.', 'gravityview');
+			$output = __( 'No entries match your request.', 'gravityview' );
 		}
 
 		/**
@@ -422,9 +422,9 @@ 
 		 * @param string $output The existing "No Entries" text
 		 * @param boolean $is_search Is the current page a search result, or just a multiple entries screen?
 		 */
-		$output = apply_filters( 'gravitview_no_entries_text', $output, $is_search);
+		$output = apply_filters( 'gravitview_no_entries_text', $output, $is_search );
 
-		return $wpautop ? wpautop($output) : $output;
+		return $wpautop ? wpautop( $output ) : $output;
 	}
 
 	/**
@@ -441,37 +441,37 @@ 
 
 		$gravityview_view = GravityView_View::getInstance();
 
-		if( empty( $post_id ) ) {
+		if ( empty( $post_id ) ) {
 
 			$post_id = false;
 
 			// DataTables passes the Post ID
-			if( defined('DOING_AJAX') && DOING_AJAX ) {
+			if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
 
-				$post_id = isset( $_POST['post_id'] ) ? (int)$_POST['post_id'] : false;
+				$post_id = isset( $_POST[ 'post_id' ] ) ? (int)$_POST[ 'post_id' ] : false;
 
 			} else {
 
 				// The Post ID has been passed via the shortcode
-				if( !empty( $gravityview_view ) && $gravityview_view->getPostId() ) {
+				if ( ! empty( $gravityview_view ) && $gravityview_view->getPostId() ) {
 
 					$post_id = $gravityview_view->getPostId();
 
 				} else {
 
 					// This is a GravityView post type
-					if( GravityView_frontend::getInstance()->isGravityviewPostType() ) {
+					if ( GravityView_frontend::getInstance()->isGravityviewPostType() ) {
 
 						$post_id = isset( $gravityview_view ) ? $gravityview_view->getViewId() : $post->ID;
 
 					} else {
 
 						// This is an embedded GravityView; use the embedded post's ID as the base.
-						if( GravityView_frontend::getInstance()->isPostHasShortcode() && is_a( $post, 'WP_Post' ) ) {
+						if ( GravityView_frontend::getInstance()->isPostHasShortcode() && is_a( $post, 'WP_Post' ) ) {
 
 							$post_id = $post->ID;
 
-						} elseif( $gravityview_view->getViewId() ) {
+						} elseif ( $gravityview_view->getViewId() ) {
 
 							// The GravityView has been embedded in a widget or in a template, and
 							// is not in the current content. Thus, we defer to the View's own ID.
@@ -486,40 +486,40 @@ 
 		}
 
 		// No post ID, get outta here.
-		if( empty( $post_id ) ) {
+		if ( empty( $post_id ) ) {
 			return NULL;
 		}
 
 		// If we've saved the permalink in memory, use it
 		// @since 1.3
-		$link = wp_cache_get( 'gv_directory_link_'.$post_id );
+		$link = wp_cache_get( 'gv_directory_link_' . $post_id );
 
-		if( (int) $post_id === (int) get_option( 'page_on_front' ) ) {
+		if ( (int)$post_id === (int)get_option( 'page_on_front' ) ) {
 			$link = home_url();
 		}
 
-		if( empty( $link ) ) {
+		if ( empty( $link ) ) {
 
 			$link = get_permalink( $post_id );
 
 			// If not yet saved, cache the permalink.
 			// @since 1.3
-			wp_cache_set( 'gv_directory_link_'.$post_id, $link );
+			wp_cache_set( 'gv_directory_link_' . $post_id, $link );
 
 		}
 
 		// Deal with returning to proper pagination for embedded views
-		if( $link && $add_query_args ) {
+		if ( $link && $add_query_args ) {
 
 			$args = array();
 
-			if( $pagenum = rgget('pagenum') ) {
-				$args['pagenum'] = intval( $pagenum );
+			if ( $pagenum = rgget( 'pagenum' ) ) {
+				$args[ 'pagenum' ] = intval( $pagenum );
 			}
 
-			if( $sort = rgget('sort') ) {
-				$args['sort'] = $sort;
-				$args['dir'] = rgget('dir');
+			if ( $sort = rgget( 'sort' ) ) {
+				$args[ 'sort' ] = $sort;
+				$args[ 'dir' ] = rgget( 'dir' );
 			}
 
 			$link = add_query_arg( $args, $link );
@@ -550,7 +550,7 @@ 
 	private static function get_custom_entry_slug( $id, $entry = array() ) {
 
 		// Generate an unique hash to use as the default value
-		$slug = substr( wp_hash( $id, 'gravityview'.$id ), 0, 8 );
+		$slug = substr( wp_hash( $id, 'gravityview' . $id ), 0, 8 );
 
 		/**
 		 * @filter `gravityview_entry_slug` Modify the unique hash ID generated, if you want to improve usability or change the format. This will allow for custom URLs, such as `{entryid}-{first-name}` or even, if unique, `{first-name}-{last-name}`
@@ -561,7 +561,7 @@ 
 		$slug = apply_filters( 'gravityview_entry_slug', $slug, $id, $entry );
 
 		// Make sure we have something - use the original ID as backup.
-		if( empty( $slug ) ) {
+		if ( empty( $slug ) ) {
 			$slug = $id;
 		}
 
@@ -590,7 +590,7 @@ 
 		 * @filter `gravityview_custom_entry_slug` Whether to enable and use custom entry slugs.
 		 * @param boolean True: Allow for slugs based on entry values. False: always use entry IDs (default)
 		 */
-		$custom = apply_filters('gravityview_custom_entry_slug', false );
+		$custom = apply_filters( 'gravityview_custom_entry_slug', false );
 
 		// If we're using custom slug...
 		if ( $custom ) {
@@ -604,8 +604,8 @@ 
 			// If it does have a hash set, and the hash is expected, use it.
 			// This check allows users to change the hash structure using the
 			// gravityview_entry_hash filter and have the old hashes expire.
-			if( empty( $value ) || $value !== $hash ) {
-				do_action( 'gravityview_log_debug', __METHOD__ . ' - Setting hash for entry "'.$id_or_string.'": ' . $hash );
+			if ( empty( $value ) || $value !== $hash ) {
+				do_action( 'gravityview_log_debug', __METHOD__ . ' - Setting hash for entry "' . $id_or_string . '": ' . $hash );
 				gform_update_meta( $id_or_string, 'gravityview_unique_id', $hash, rgar( $entry, 'form_id' ) );
 			}
 
@@ -631,15 +631,15 @@ 
          * @param boolean $custom Should we process the custom entry slug?
          */
         $custom = apply_filters( 'gravityview_custom_entry_slug', false );
-        if( $custom ) {
+        if ( $custom ) {
             // create the gravityview_unique_id and save it
 
             // Get the entry hash
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
+            $hash = self::get_custom_entry_slug( $entry[ 'id' ], $entry );
 
-	        do_action( 'gravityview_log_debug', __METHOD__ . ' - Setting hash for entry "'.$entry['id'].'": ' . $hash );
+	        do_action( 'gravityview_log_debug', __METHOD__ . ' - Setting hash for entry "' . $entry[ 'id' ] . '": ' . $hash );
 
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, rgar( $entry, 'form_id' ) );
+            gform_update_meta( $entry[ 'id' ], 'gravityview_unique_id', $hash, rgar( $entry, 'form_id' ) );
 
         }
     }
@@ -656,14 +656,14 @@ 
 	 */
 	public static function entry_link( $entry, $post_id = NULL, $add_directory_args = true ) {
 
-		if( ! empty( $entry ) && ! is_array( $entry ) ) {
+		if ( ! empty( $entry ) && ! is_array( $entry ) ) {
 			$entry = GVCommon::get_entry( $entry );
-		} else if( empty( $entry ) ) {
+		} else if ( empty( $entry ) ) {
 			$entry = GravityView_frontend::getInstance()->getEntry();
 		}
 
 		// Second parameter used to be passed as $field; this makes sure it's not an array
-		if( !is_numeric( $post_id ) ) {
+		if ( ! is_numeric( $post_id ) ) {
 			$post_id = NULL;
 		}
 
@@ -671,7 +671,7 @@ 
 		$directory_link = self::directory_link( $post_id, false );
 
 		// No post ID? Get outta here.
-		if( empty( $directory_link ) ) {
+		if ( empty( $directory_link ) ) {
 			return '';
 		}
 
@@ -682,9 +682,9 @@ 
 			$query_arg_name = GravityView_Post_Types::get_entry_var_name();
 		}
 
-		$entry_slug = self::get_entry_slug( $entry['id'], $entry );
+		$entry_slug = self::get_entry_slug( $entry[ 'id' ], $entry );
 
-		if( get_option('permalink_structure') && !is_preview() ) {
+		if ( get_option( 'permalink_structure' ) && ! is_preview() ) {
 
 			$args = array();
 
@@ -694,9 +694,9 @@ 
 			 */
 			$link_parts = explode( '?', $directory_link );
 
-			$query = !empty( $link_parts[1] ) ? '?'.$link_parts[1] : '';
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
 
-			$directory_link = trailingslashit( $link_parts[0] ) . $query_arg_name . '/'. $entry_slug .'/' . $query;
+			$directory_link = trailingslashit( $link_parts[ 0 ] ) . $query_arg_name . '/' . $entry_slug . '/' . $query;
 
 		} else {
 
@@ -706,18 +706,18 @@ 
 		/**
 		 * @since 1.7.3
 		 */
-		if( $add_directory_args ) {
+		if ( $add_directory_args ) {
 
-			if( !empty( $_GET['pagenum'] ) ) {
-				$args['pagenum'] = intval( $_GET['pagenum'] );
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
 			}
 
 			/**
 			 * @since 1.7
 			 */
-			if( $sort = rgget('sort') ) {
-				$args['sort'] = $sort;
-				$args['dir'] = rgget('dir');
+			if ( $sort = rgget( 'sort' ) ) {
+				$args[ 'sort' ] = $sort;
+				$args[ 'dir' ] = rgget( 'dir' );
 			}
 
 		}
@@ -729,12 +729,12 @@ 
 		 */
 		if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) {
 			if ( gravityview()->views->count() > 1 ) {
-				$args['gvid'] = gravityview_get_view_id();
+				$args[ 'gvid' ] = gravityview_get_view_id();
 			}
 		} else {
 			/** Deprecated, do not use has_multiple_views(), please. */
 			if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance()->has_multiple_views() ) {
-				$args['gvid'] = gravityview_get_view_id();
+				$args[ 'gvid' ] = gravityview_get_view_id();
 			}
 		}
 
@@ -753,7 +753,7 @@ 
 }
 
 function gv_class( $field, $form = NULL, $entry = array() ) {
-	return GravityView_API::field_class( $field, $form, $entry  );
+	return GravityView_API::field_class( $field, $form, $entry );
 }
 
 /**
@@ -775,15 +775,15 @@ 
 
 	$default_css_class = ! empty( $view_id ) ? sprintf( 'gv-container gv-container-%d', $view_id ) : 'gv-container';
 
-	if( GravityView_View::getInstance()->isHideUntilSearched() ) {
+	if ( GravityView_View::getInstance()->isHideUntilSearched() ) {
 		$default_css_class .= ' hidden';
 	}
 
-	if( 0 === GravityView_View::getInstance()->getTotalEntries() ) {
+	if ( 0 === GravityView_View::getInstance()->getTotalEntries() ) {
 		$default_css_class .= ' gv-container-no-results';
 	}
 
-	$css_class = trim( $passed_css_class . ' '. $default_css_class );
+	$css_class = trim( $passed_css_class . ' ' . $default_css_class );
 
 	/**
 	 * @filter `gravityview/render/container/class` Modify the CSS class to be added to the wrapper <div> of a View
@@ -794,7 +794,7 @@ 
 
 	$css_class = gravityview_sanitize_html_class( $css_class );
 
-	if( $echo ) {
+	if ( $echo ) {
 		echo $css_class;
 	}
 
@@ -805,7 +805,7 @@ 
 
 	$value = GravityView_API::field_value( $entry, $field );
 
-	if( $value === '' ) {
+	if ( $value === '' ) {
 		/**
 		 * @filter `gravityview_empty_value` What to display when a field is empty
 		 * @param string $value (empty string)
@@ -824,7 +824,7 @@ 
 	return GravityView_API::entry_link( $entry, $post_id );
 }
 
-function gv_no_results($wpautop = true) {
+function gv_no_results( $wpautop = true ) {
 	return GravityView_API::no_results( $wpautop );
 }
 
@@ -845,7 +845,7 @@ 
 	 */
 	$href = apply_filters( 'gravityview_go_back_url', $href );
 
-	if( empty( $href ) ) { return NULL; }
+	if ( empty( $href ) ) { return NULL; }
 
 	// calculate link label
 	$gravityview_view = GravityView_View::getInstance();
@@ -861,7 +861,7 @@ 
 
 	$link = gravityview_get_link( $href, esc_html( $label ), array(
 		'data-viewid' => $gravityview_view->getViewId()
-	));
+	) );
 
 	return $link;
 }
@@ -880,7 +880,7 @@ 
  */
 function gravityview_get_field_value( $entry, $field_id, $display_value ) {
 
-	if( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
+	if ( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
 
 		// For the complete field value as generated by Gravity Forms
 		return $display_value;
@@ -914,16 +914,16 @@ 
 		$terms = explode( ', ', $value );
 	}
 
-	foreach ($terms as $term_name ) {
+	foreach ( $terms as $term_name ) {
 
 		// If we're processing a category,
-		if( $taxonomy === 'category' ) {
+		if ( $taxonomy === 'category' ) {
 
 			// Use rgexplode to prevent errors if : doesn't exist
 			list( $term_name, $term_id ) = rgexplode( ':', $term_name, 2 );
 
 			// The explode was succesful; we have the category ID
-			if( !empty( $term_id )) {
+			if ( ! empty( $term_id ) ) {
 				$term = get_term_by( 'id', $term_id, $taxonomy );
 			} else {
 			// We have to fall back to the name
@@ -936,7 +936,7 @@ 
 		}
 
 		// There's still a tag/category here.
-		if( $term ) {
+		if ( $term ) {
 
 			$term_link = get_term_link( $term, $taxonomy );
 
@@ -945,11 +945,11 @@ 
 			    continue;
 			}
 
-			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
+			$output[ ] = gravityview_get_link( $term_link, esc_html( $term->name ) );
 		}
 	}
 
-	return implode(', ', $output );
+	return implode( ', ', $output );
 }
 
 /**
@@ -963,8 +963,8 @@ 
 
 	$output = get_the_term_list( $post_id, $taxonomy, NULL, ', ' );
 
-	if( empty( $link ) ) {
-		return strip_tags( $output);
+	if ( empty( $link ) ) {
+		return strip_tags( $output );
 	}
 
 	return $output;
@@ -983,7 +983,7 @@ 
 	$fe = GravityView_frontend::getInstance();
 
 	// Solve problem when loading content via admin-ajax.php
-	if( ! $fe->getGvOutputData() ) {
+	if ( ! $fe->getGvOutputData() ) {
 
 		do_action( 'gravityview_log_debug', '[gravityview_get_current_views] gv_output_data not defined; parsing content.' );
 
@@ -991,7 +991,7 @@ 
 	}
 
 	// Make 100% sure that we're dealing with a properly called situation
-	if( !is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
+	if ( ! is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
 
 		do_action( 'gravityview_log_debug', '[gravityview_get_current_views] gv_output_data not an object or get_view not callable.', $fe->getGvOutputData() );
 
@@ -1003,8 +1003,8 @@ 
 			return array();
 		}
 		return array_combine(
-			array_map( function ( $view ) { return $view->ID; }, gravityview()->views->all() ),
-			array_map( function ( $view ) { return $view->as_data(); }, gravityview()->views->all() )
+			array_map( function( $view ) { return $view->ID; }, gravityview()->views->all() ),
+			array_map( function( $view ) { return $view->as_data(); }, gravityview()->views->all() )
 		);
 	}
 	/** \GravityView_View_Data::get_views is deprecated. */
@@ -1099,11 +1099,11 @@ 
 	 */
 	$is_edit_entry = apply_filters( 'gravityview_is_edit_entry', false );
 
-	if( $is_edit_entry ) {
+	if ( $is_edit_entry ) {
 		$context = 'edit';
-	} else if( class_exists( 'GravityView_frontend' ) && $single = GravityView_frontend::is_single_entry() ) {
+	} else if ( class_exists( 'GravityView_frontend' ) && $single = GravityView_frontend::is_single_entry() ) {
 		$context = 'single';
-	} else if( class_exists( 'GravityView_View' ) ) {
+	} else if ( class_exists( 'GravityView_View' ) ) {
 		$context = GravityView_View::getInstance()->getContext();
 	}
 
@@ -1131,12 +1131,12 @@ 
 function gravityview_get_files_array( $value, $gv_class = '' ) {
 	/** @define "GRAVITYVIEW_DIR" "../" */
 
-	if( !class_exists( 'GravityView_Field' ) ) {
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field.php' );
+	if ( ! class_exists( 'GravityView_Field' ) ) {
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field.php' );
 	}
 
-	if( !class_exists( 'GravityView_Field_FileUpload' ) ) {
-		include_once( GRAVITYVIEW_DIR .'includes/fields/fileupload.php' );
+	if ( ! class_exists( 'GravityView_Field_FileUpload' ) ) {
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/fileupload.php' );
 	}
 
 	return GravityView_Field_FileUpload::get_files_array( $value, $gv_class );
@@ -1214,12 +1214,12 @@ 
 	$args = apply_filters( 'gravityview/field_output/args', $args, $passed_args );
 
 	// Required fields.
-	if ( empty( $args['field'] ) || empty( $args['form'] ) ) {
+	if ( empty( $args[ 'field' ] ) || empty( $args[ 'form' ] ) ) {
 		do_action( 'gravityview_log_error', '[gravityview_field_output] Field or form are empty.', $args );
 		return '';
 	}
 
-	$entry = empty( $args['entry'] ) ? array() : $args['entry'];
+	$entry = empty( $args[ 'entry' ] ) ? array() : $args[ 'entry' ];
 
 	/**
 	 * Create the content variables for replacing.
@@ -1235,37 +1235,37 @@ 
 		'field_id' => '',
 	);
 
-	$context['value'] = gv_value( $entry, $args['field'] );
+	$context[ 'value' ] = gv_value( $entry, $args[ 'field' ] );
 
 	// If the value is empty and we're hiding empty, return empty.
-	if ( $context['value'] === '' && ! empty( $args['hide_empty'] ) ) {
+	if ( $context[ 'value' ] === '' && ! empty( $args[ 'hide_empty' ] ) ) {
 		return '';
 	}
 
-	if ( $context['value'] !== '' && ! empty( $args['wpautop'] ) ) {
-		$context['value'] = wpautop( $context['value'] );
+	if ( $context[ 'value' ] !== '' && ! empty( $args[ 'wpautop' ] ) ) {
+		$context[ 'value' ] = wpautop( $context[ 'value' ] );
 	}
 
 	// Get width setting, if exists
-	$context['width'] = GravityView_API::field_width( $args['field'] );
+	$context[ 'width' ] = GravityView_API::field_width( $args[ 'field' ] );
 
 	// If replacing with CSS inline formatting, let's do it.
-	$context['width:style'] = GravityView_API::field_width( $args['field'], 'width:' . $context['width'] . '%;' );
+	$context[ 'width:style' ] = GravityView_API::field_width( $args[ 'field' ], 'width:' . $context[ 'width' ] . '%;' );
 
 	// Grab the Class using `gv_class`
-	$context['class'] = gv_class( $args['field'], $args['form'], $entry );
-	$context['field_id'] = GravityView_API::field_html_attr_id( $args['field'], $args['form'], $entry );
+	$context[ 'class' ] = gv_class( $args[ 'field' ], $args[ 'form' ], $entry );
+	$context[ 'field_id' ] = GravityView_API::field_html_attr_id( $args[ 'field' ], $args[ 'form' ], $entry );
 
 	// Get field label if needed
-	if ( ! empty( $args['label_markup'] ) && ! empty( $args['field']['show_label'] ) ) {
-		$context['label'] = str_replace( array( '{{label}}', '{{ label }}' ), '<span class="gv-field-label">{{ label_value }}</span>', $args['label_markup'] );
+	if ( ! empty( $args[ 'label_markup' ] ) && ! empty( $args[ 'field' ][ 'show_label' ] ) ) {
+		$context[ 'label' ] = str_replace( array( '{{label}}', '{{ label }}' ), '<span class="gv-field-label">{{ label_value }}</span>', $args[ 'label_markup' ] );
 	}
 
 	// Default Label value
-	$context['label_value'] = gv_label( $args['field'], $entry );
+	$context[ 'label_value' ] = gv_label( $args[ 'field' ], $entry );
 
-	if ( empty( $context['label'] ) && ! empty( $context['label_value'] ) ){
-		$context['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
+	if ( empty( $context[ 'label' ] ) && ! empty( $context[ 'label_value' ] ) ) {
+		$context[ 'label' ] = '<span class="gv-field-label">{{ label_value }}</span>';
 	}
 
 	/**
@@ -1274,7 +1274,7 @@ 
 	 * @param string $markup The HTML for the markup
 	 * @param array $args All args for the field output
 	 */
-	$html = apply_filters( 'gravityview/field_output/pre_html', $args['markup'], $args );
+	$html = apply_filters( 'gravityview/field_output/pre_html', $args[ 'markup' ], $args );
 
 	/**
 	 * @filter `gravityview/field_output/open_tag` Modify the opening tags for the template content placeholders
@@ -1297,7 +1297,7 @@ 
 	foreach ( $context as $tag => $value ) {
 
 		// If the tag doesn't exist just skip it
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
 			continue;
 		}
 

includes/class-gravityview-entry-list.php

Spacing +13 added lines, -13 removed lines

@@ -83,7 +83,7 @@ 
 		$this->link_format = $link_format;
 		$this->after_link = $after_link;
 		$this->context = $context;
-		$this->empty_message = function_exists( 'gv_no_results' ) ? gv_no_results() : __('No entries match your request.', 'gravityview');
+		$this->empty_message = function_exists( 'gv_no_results' ) ? gv_no_results() : __( 'No entries match your request.', 'gravityview' );
 	}
 
 	/**
@@ -169,25 +169,25 @@ 
 	public function get_output() {
 
 		// No Entries
-		if( empty( $this->entries ) ) {
-			return '<div class="gv-no-results">'.$this->empty_message.'</div>';
+		if ( empty( $this->entries ) ) {
+			return '<div class="gv-no-results">' . $this->empty_message . '</div>';
 		}
 
 		$output = '';
 		$current_entry = GravityView_View::getInstance()->getCurrentEntry();
 
-		$output .= '<'. $this->wrapper_tag .'>';
+		$output .= '<' . $this->wrapper_tag . '>';
 
-		foreach( $this->entries as $entry ) {
+		foreach ( $this->entries as $entry ) {
 
-			if( $this->skip_entry( $entry, $current_entry ) ) {
+			if ( $this->skip_entry( $entry, $current_entry ) ) {
 				continue;
 			}
 
 			$output .= $this->get_item_output( $entry );
 		}
 
-		$output .= '</'. $this->wrapper_tag .'>';
+		$output .= '</' . $this->wrapper_tag . '>';
 
 		/**
 		 * @filter `gravityview/widget/recent-entries/output` Modify the HTML of the Recent Entries widget output
@@ -210,15 +210,15 @@ 
 	private function skip_entry( $entry, $current_entry ) {
 
 		// If skip entry is off, or there's no current entry, return false
-		if( empty( $this->skip_current_entry ) || empty( $current_entry ) ) {
+		if ( empty( $this->skip_current_entry ) || empty( $current_entry ) ) {
 			return false;
 		}
 
 		// If in Single or Edit mode, $current_entry will be an array.
-		$current_entry_id = is_array( $current_entry ) ? $current_entry['id'] : $current_entry;
+		$current_entry_id = is_array( $current_entry ) ? $current_entry[ 'id' ] : $current_entry;
 
 		// If the entry ID matches the current entry, yes: skip
-		if( $entry['id'] === $current_entry_id ) {
+		if ( $entry[ 'id' ] === $current_entry_id ) {
 			return true;
 		}
 
@@ -245,7 +245,7 @@ 
 
 		$item_output = gravityview_get_link( $link, $this->link_format );
 
-		if( !empty( $this->after_link ) ) {
+		if ( ! empty( $this->after_link ) ) {
 
 			/**
 			 * @filter `gravityview/entry-list/after-link` Modify the content displayed after the entry link in an entry list
@@ -254,14 +254,14 @@ 
 			 * @param array $entry Gravity Forms entry array
 			 * @param GravityView_Entry_List $this The current class instance
 			 */
-			$after_link = apply_filters( 'gravityview/entry-list/after-link', '<div>'.$this->after_link.'</div>', $entry, $this );
+			$after_link = apply_filters( 'gravityview/entry-list/after-link', '<div>' . $this->after_link . '</div>', $entry, $this );
 
 			$item_output .= $after_link;
 		}
 
 		$item_output = GravityView_API::replace_variables( $item_output, $this->form, $entry );
 
-		$item_output = '<'. $this->item_tag .'>'. $item_output .'</'. $this->item_tag .'>';
+		$item_output = '<' . $this->item_tag . '>' . $item_output . '</' . $this->item_tag . '>';
 
 		/**
 		 * @filter `gravityview/entry-list/item` Modify each item's output in an entry list

includes/extensions/edit-entry/class-edit-entry-render.php

Indentation +1593 added lines, -1593 removed lines

@@ -10,20 +10,20 @@ 
  */
 
 if ( ! defined( 'WPINC' ) ) {
-    die;
+	die;
 }
 
 class GravityView_Edit_Entry_Render {
 
-    /**
-     * @var GravityView_Edit_Entry
-     */
-    protected $loader;
+	/**
+	 * @var GravityView_Edit_Entry
+	 */
+	protected $loader;
 
 	/**
 	 * @var string String used to generate unique nonce for the entry/form/view combination. Allows access to edit page.
 	 */
-    static $nonce_key;
+	static $nonce_key;
 
 	/**
 	 * @since 1.9
@@ -37,12 +37,12 @@ 
 	 */
 	private static $supports_save_and_continue = false;
 
-    /**
-     * Gravity Forms entry array
-     *
-     * @var array
-     */
-    public $entry;
+	/**
+	 * Gravity Forms entry array
+	 *
+	 * @var array
+	 */
+	public $entry;
 
 	/**
 	 * Gravity Forms entry array (it won't get changed during this class lifecycle)
@@ -51,134 +51,134 @@ 
 	 */
 	private static $original_entry = array();
 
-    /**
-     * Gravity Forms form array (GravityView modifies the content through this class lifecycle)
-     *
-     * @var array
-     */
+	/**
+	 * Gravity Forms form array (GravityView modifies the content through this class lifecycle)
+	 *
+	 * @var array
+	 */
 	public $form;
 
-    /**
-     * Gravity Forms form array (it won't get changed during this class lifecycle)
-     * @since 1.16.2.1
-     * @var array
-     */
-    private static $original_form;
-
-    /**
-     * Gravity Forms form array after the form validation process
-     * @since 1.13
-     * @var array
-     */
+	/**
+	 * Gravity Forms form array (it won't get changed during this class lifecycle)
+	 * @since 1.16.2.1
+	 * @var array
+	 */
+	private static $original_form;
+
+	/**
+	 * Gravity Forms form array after the form validation process
+	 * @since 1.13
+	 * @var array
+	 */
 	public $form_after_validation = null;
 
-    /**
-     * Hold an array of GF field objects that have calculation rules
-     * @var array
-     */
+	/**
+	 * Hold an array of GF field objects that have calculation rules
+	 * @var array
+	 */
 	public $fields_with_calculation = array();
 
-    /**
-     * Gravity Forms form id
-     *
-     * @var int
-     */
+	/**
+	 * Gravity Forms form id
+	 *
+	 * @var int
+	 */
 	public $form_id;
 
-    /**
-     * ID of the current view
-     *
-     * @var int
-     */
+	/**
+	 * ID of the current view
+	 *
+	 * @var int
+	 */
 	public $view_id;
 
-    /**
-     * Updated entry is valid (GF Validation object)
-     *
-     * @var array
-     */
+	/**
+	 * Updated entry is valid (GF Validation object)
+	 *
+	 * @var array
+	 */
 	public $is_valid = NULL;
 
-    function __construct( GravityView_Edit_Entry $loader ) {
-        $this->loader = $loader;
-    }
+	function __construct( GravityView_Edit_Entry $loader ) {
+		$this->loader = $loader;
+	}
 
-    function load() {
+	function load() {
 
-        /** @define "GRAVITYVIEW_DIR" "../../../" */
-        include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
+		/** @define "GRAVITYVIEW_DIR" "../../../" */
+		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' ) );
+		// 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 );
+		// Stop Gravity Forms processing what is ours!
+		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' ) );
+		add_action( 'gravityview_edit_entry', array( $this, 'init' ) );
 
-        // Disable conditional logic if needed (since 1.9)
-        add_filter( 'gform_has_conditional_logic', array( $this, 'manage_conditional_logic' ), 10, 2 );
+		// Disable conditional logic if needed (since 1.9)
+		add_filter( 'gform_has_conditional_logic', array( $this, 'manage_conditional_logic' ), 10, 2 );
 
-        // Make sure GF doesn't validate max files (since 1.9)
-        add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 );
+		// Make sure GF doesn't validate max files (since 1.9)
+		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 fields expected by GFFormDisplay::validate()
+		add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') );
 
 		// Fix multiselect value for GF 2.2
 		add_filter( 'gravityview/edit_entry/field_value_multiselect', array( $this, 'fix_multiselect_value_serialization' ), 10, 3 );
-    }
-
-    /**
-     * Don't show any forms embedded on a page when GravityView is in Edit Entry mode
-     *
-     * Adds a `__return_empty_string` filter on the Gravity Forms shortcode on the `wp_head` action
-     * And then removes it on the `wp_footer` action
-     *
-     * @since 1.16.1
-     *
-     * @return void
-     */
-    public function prevent_render_form() {
-        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' );
-            }
-        }
-    }
-
-    /**
-     * Because we're mimicking being a front-end Gravity Forms form while using a Gravity Forms
-     * backend form, we need to prevent them from saving twice.
-     * @return void
-     */
-    public function prevent_maybe_process_form() {
-
-        if( ! empty( $_POST ) ) {
-	        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() ) {
-            remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
-	        remove_action( 'wp',  array( 'GFForms', 'maybe_process_form'), 9 );
-        }
-    }
-
-    /**
-     * Is the current page an Edit Entry page?
-     * @return boolean
-     */
-    public function is_edit_entry() {
-
-        $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET['edit'] );
-
-        return ( $is_edit_entry || $this->is_edit_entry_submission() );
-    }
+	}
+
+	/**
+	 * Don't show any forms embedded on a page when GravityView is in Edit Entry mode
+	 *
+	 * Adds a `__return_empty_string` filter on the Gravity Forms shortcode on the `wp_head` action
+	 * And then removes it on the `wp_footer` action
+	 *
+	 * @since 1.16.1
+	 *
+	 * @return void
+	 */
+	public function prevent_render_form() {
+		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' );
+			}
+		}
+	}
+
+	/**
+	 * Because we're mimicking being a front-end Gravity Forms form while using a Gravity Forms
+	 * backend form, we need to prevent them from saving twice.
+	 * @return void
+	 */
+	public function prevent_maybe_process_form() {
+
+		if( ! empty( $_POST ) ) {
+			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() ) {
+			remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
+			remove_action( 'wp',  array( 'GFForms', 'maybe_process_form'), 9 );
+		}
+	}
+
+	/**
+	 * Is the current page an Edit Entry page?
+	 * @return boolean
+	 */
+	public function is_edit_entry() {
+
+		$is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET['edit'] );
+
+		return ( $is_edit_entry || $this->is_edit_entry_submission() );
+	}
 
 	/**
 	 * Is the current page an Edit Entry page?
@@ -189,173 +189,173 @@ 
 		return !empty( $_POST[ self::$nonce_field ] );
 	}
 
-    /**
-     * When Edit entry view is requested setup the vars
-     */
-    private function setup_vars() {
-        $gravityview_view = GravityView_View::getInstance();
+	/**
+	 * When Edit entry view is requested setup the vars
+	 */
+	private function setup_vars() {
+		$gravityview_view = GravityView_View::getInstance();
 
 
-        $entries = $gravityview_view->getEntries();
-	    self::$original_entry = $entries[0];
-	    $this->entry = $entries[0];
+		$entries = $gravityview_view->getEntries();
+		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::$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'] );
+	}
 
 
-    /**
-     * Load required files and trigger edit flow
-     *
-     * Run when the is_edit_entry returns true.
-     *
-     * @param GravityView_View_Data $gv_data GravityView Data object
-     * @return void
-     */
-    public function init( $gv_data ) {
+	/**
+	 * Load required files and trigger edit flow
+	 *
+	 * Run when the is_edit_entry returns true.
+	 *
+	 * @param GravityView_View_Data $gv_data GravityView Data object
+	 * @return void
+	 */
+	public function init( $gv_data ) {
 
-        require_once( GFCommon::get_base_path() . '/form_display.php' );
-        require_once( GFCommon::get_base_path() . '/entry_detail.php' );
+		require_once( GFCommon::get_base_path() . '/form_display.php' );
+		require_once( GFCommon::get_base_path() . '/entry_detail.php' );
 
-        $this->setup_vars();
+		$this->setup_vars();
 
-        // Multiple Views embedded, don't proceed if nonce fails
+		// Multiple Views embedded, don't proceed if nonce fails
 		$multiple_views = defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? gravityview()->views->count() > 1 : $gv_data->has_multiple_views();
-        if( $multiple_views && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) {
-            do_action('gravityview_log_error', __METHOD__ . ': Nonce validation failed for the Edit Entry request; returning' );
-            return;
-        }
+		if( $multiple_views && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) {
+			do_action('gravityview_log_error', __METHOD__ . ': Nonce validation failed for the Edit Entry request; returning' );
+			return;
+		}
 
-        // Sorry, you're not allowed here.
-        if( false === $this->user_can_edit_entry( true ) ) {
-            do_action('gravityview_log_error', __METHOD__ . ': User is not allowed to edit this entry; returning', $this->entry );
-            return;
-        }
+		// Sorry, you're not allowed here.
+		if( false === $this->user_can_edit_entry( true ) ) {
+			do_action('gravityview_log_error', __METHOD__ . ': User is not allowed to edit this entry; returning', $this->entry );
+			return;
+		}
 
-        $this->print_scripts();
+		$this->print_scripts();
 
-        $this->process_save();
+		$this->process_save();
 
-        $this->edit_entry_form();
+		$this->edit_entry_form();
 
-    }
+	}
 
 
-    /**
-     * Force Gravity Forms to output scripts as if it were in the admin
-     * @return void
-     */
-    private function print_scripts() {
-        $gravityview_view = GravityView_View::getInstance();
+	/**
+	 * Force Gravity Forms to output scripts as if it were in the admin
+	 * @return void
+	 */
+	private 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' ) );
-    }
+		// Sack is required for images
+		wp_print_scripts( array( 'sack', 'gform_gravityforms' ) );
+	}
 
 
-    /**
-     * Process edit entry form save
-     */
-    private function process_save() {
+	/**
+	 * Process edit entry form save
+	 */
+	private function process_save() {
 
-        if( empty( $_POST ) || ! isset( $_POST['lid'] ) ) {
-            return;
-        }
+		if( empty( $_POST ) || ! isset( $_POST['lid'] ) ) {
+			return;
+		}
 
-        // Make sure the entry, view, and form IDs are all correct
-        $valid = $this->verify_nonce();
+		// 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.' );
-            return;
-        }
+		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.' );
-            return;
-        }
+		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', __METHOD__ . ': $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+		do_action('gravityview_log_debug', __METHOD__ . ': $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
 
-        $this->process_save_process_files( $this->form_id );
+		$this->process_save_process_files( $this->form_id );
 
-        $this->validate();
+		$this->validate();
 
-        if( $this->is_valid ) {
+		if( $this->is_valid ) {
 
-            do_action('gravityview_log_debug', __METHOD__ . ': Submission is valid.' );
+			do_action('gravityview_log_debug', __METHOD__ . ': Submission is valid.' );
 
-            /**
-             * @hack This step is needed to unset the adminOnly from form fields, to add the calculation fields
-             */
-            $form = $this->form_prepare_for_save();
+			/**
+			 * @hack This step is needed to unset the adminOnly from form fields, to add the calculation fields
+			 */
+			$form = $this->form_prepare_for_save();
 
-            /**
-             * @hack to avoid the capability validation of the method save_lead for GF 1.9+
-             */
-            unset( $_GET['page'] );
+			/**
+			 * @hack to avoid the capability validation of the method save_lead for GF 1.9+
+			 */
+			unset( $_GET['page'] );
 
-            $date_created = $this->entry['date_created'];
+			$date_created = $this->entry['date_created'];
 
-            /**
-             * @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead()
-             * @since 1.17.2
-             */
-            unset( $this->entry['date_created'] );
+			/**
+			 * @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead()
+			 * @since 1.17.2
+			 */
+			unset( $this->entry['date_created'] );
 
-            GFFormsModel::save_lead( $form, $this->entry );
+			GFFormsModel::save_lead( $form, $this->entry );
 
-	        // Delete the values for hidden inputs
-	        $this->unset_hidden_field_values();
+			// Delete the values for hidden inputs
+			$this->unset_hidden_field_values();
             
-            $this->entry['date_created'] = $date_created;
+			$this->entry['date_created'] = $date_created;
 
-            // Process calculation fields
-            $this->update_calculation_fields();
+			// Process calculation fields
+			$this->update_calculation_fields();
 
-            // Perform actions normally performed after updating a lead
-            $this->after_update();
+			// Perform actions normally performed after updating a lead
+			$this->after_update();
 
-	        /**
-             * Must be AFTER after_update()!
-             * @see https://github.com/gravityview/GravityView/issues/764
-             */
-            $this->maybe_update_post_fields( $form );
+			/**
+			 * Must be AFTER after_update()!
+			 * @see https://github.com/gravityview/GravityView/issues/764
+			 */
+			$this->maybe_update_post_fields( $form );
 
-            /**
-             * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry
-             * @param array $form Gravity Forms form array
-             * @param string $entry_id Numeric ID of the entry that was updated
-             * @param GravityView_Edit_Entry_Render $this This object
-             */
-            do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this );
+			/**
+			 * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry
+			 * @param array $form Gravity Forms form array
+			 * @param string $entry_id Numeric ID of the entry that was updated
+			 * @param GravityView_Edit_Entry_Render $this This object
+			 */
+			do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this );
 
-        } else {
-            do_action('gravityview_log_error', __METHOD__ . ': Submission is NOT valid.', $this->entry );
-        }
+		} else {
+			do_action('gravityview_log_error', __METHOD__ . ': Submission is NOT valid.', $this->entry );
+		}
 
-    } // process_save
+	} // process_save
 
 	/**
 	 * Delete the value of fields hidden by conditional logic when the entry is edited
-     *
-     * @uses GFFormsModel::update_lead_field_value()
-     *
-     * @since 1.17.4
-     *
-     * @return void
+	 *
+	 * @uses GFFormsModel::update_lead_field_value()
+	 *
+	 * @since 1.17.4
+	 *
+	 * @return void
 	 */
-    private function unset_hidden_field_values() {
-	    global $wpdb;
+	private function unset_hidden_field_values() {
+		global $wpdb;
 
 		if ( method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) {
 			$entry_meta_table = GFFormsModel::get_entry_meta_table_name();
@@ -365,58 +365,58 @@ 
 			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) );
 		}
 
-	    foreach ( $this->entry as $input_id => $field_value ) {
+		foreach ( $this->entry as $input_id => $field_value ) {
 
-		    $field = RGFormsModel::get_field( $this->form, $input_id );
+			$field = RGFormsModel::get_field( $this->form, $input_id );
 
-		    // Reset fields that are hidden
-		    // Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic
-		    if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) {
+			// Reset fields that are hidden
+			// Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic
+			if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) {
 
-		        // List fields are stored as empty arrays when empty
-			    $empty_value = $this->is_field_json_encoded( $field ) ? '[]' : '';
+				// List fields are stored as empty arrays when empty
+				$empty_value = $this->is_field_json_encoded( $field ) ? '[]' : '';
 
-			    $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id );
+				$lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id );
 
-			    GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value );
+				GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value );
 
-			    // Prevent the $_POST values of hidden fields from being used as default values when rendering the form
-                // after submission
-			    $post_input_id = 'input_' . str_replace( '.', '_', $input_id );
-			    $_POST[ $post_input_id ] = '';
-		    }
-	    }
-    }
+				// Prevent the $_POST values of hidden fields from being used as default values when rendering the form
+				// after submission
+				$post_input_id = 'input_' . str_replace( '.', '_', $input_id );
+				$_POST[ $post_input_id ] = '';
+			}
+		}
+	}
 
-    /**
-     * Have GF handle file uploads
-     *
-     * Copy of code from GFFormDisplay::process_form()
-     *
-     * @param int $form_id
-     */
-    private function process_save_process_files( $form_id ) {
+	/**
+	 * Have GF handle file uploads
+	 *
+	 * Copy of code from GFFormDisplay::process_form()
+	 *
+	 * @param int $form_id
+	 */
+	private function process_save_process_files( $form_id ) {
 
-        //Loading files that have been uploaded to temp folder
-        $files = GFCommon::json_decode( stripslashes( RGForms::post( 'gform_uploaded_files' ) ) );
-        if ( ! is_array( $files ) ) {
-            $files = array();
-        }
+		//Loading files that have been uploaded to temp folder
+		$files = GFCommon::json_decode( stripslashes( RGForms::post( 'gform_uploaded_files' ) ) );
+		if ( ! is_array( $files ) ) {
+			$files = array();
+		}
 
 		/**
 		 * Make sure the fileuploads are not overwritten if no such request was done.
-         * @since 1.20.1
+		 * @since 1.20.1
 		 */
 		add_filter( "gform_save_field_value_$form_id", array( $this, 'save_field_value' ), 99, 5 );
 
-        RGFormsModel::$uploaded_files[ $form_id ] = $files;
-    }
+		RGFormsModel::$uploaded_files[ $form_id ] = $files;
+	}
 
 	/**
 	 * Make sure the fileuploads are not overwritten if no such request was done.
 	 *
-     * TO ONLY BE USED INTERNALLY; DO NOT DEVELOP ON; MAY BE REMOVED AT ANY TIME.
-     *
+	 * TO ONLY BE USED INTERNALLY; DO NOT DEVELOP ON; MAY BE REMOVED AT ANY TIME.
+	 *
 	 * @since 1.20.1
 	 *
 	 * @param string $value Field value
@@ -451,156 +451,156 @@ 
 		return $value;
 	}
 
-    /**
-     * Remove max_files validation (done on gravityforms.js) to avoid conflicts with GravityView
-     * Late validation done on self::custom_validation
-     *
-     * @param $plupload_init array Plupload settings
-     * @param $form_id
-     * @param $instance
-     * @return mixed
-     */
-    public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) {
-        if( ! $this->is_edit_entry() ) {
-            return $plupload_init;
-        }
-
-        $plupload_init['gf_vars']['max_files'] = 0;
-
-        return $plupload_init;
-    }
-
-
-    /**
-     * Unset adminOnly and convert field input key to string
-     * @return array $form
-     */
-    private function form_prepare_for_save() {
-
-        $form = $this->form;
-
-	    /** @var GF_Field $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
-             * @var GF_Field $field
-             */
-            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'];
-                }
-            }
-        }
-
-        return $form;
-    }
-
-    private function update_calculation_fields() {
-
-        $form = self::$original_form;
-        $update = false;
-
-        // get the most up to date entry values
-        $entry = GFAPI::get_entry( $this->entry['id'] );
-
-        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 );
-                    }
-                } 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 );
-                }
-            }
-
-        }
-
-        if( $update ) {
-
-            $return_entry = GFAPI::update_entry( $entry );
-
-            if( is_wp_error( $return_entry ) ) {
-                do_action( 'gravityview_log_error', 'Updating the entry calculation fields failed', $return_entry );
-            } else {
-                do_action( 'gravityview_log_debug', 'Updating the entry calculation fields succeeded' );
-            }
-        }
-    }
-
-    /**
-     * Handle updating the Post Image field
-     *
-     * Sets a new Featured Image if configured in Gravity Forms; otherwise uploads/updates media
-     *
-     * @since 1.17
-     *
-     * @uses GFFormsModel::media_handle_upload
-     * @uses set_post_thumbnail
-     * 
-     * @param array $form GF Form array
-     * @param GF_Field $field GF Field
-     * @param string $field_id Numeric ID of the field
-     * @param string $value
-     * @param array $entry GF Entry currently being edited
-     * @param int $post_id ID of the Post being edited
-     *
-     * @return mixed|string
-     */
-    private function update_post_image( $form, $field, $field_id, $value, $entry, $post_id ) {
-
-        $input_name = 'input_' . $field_id;
-
-        if ( !empty( $_FILES[ $input_name ]['name'] ) ) {
-
-            // We have a new image
-
-            $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] : '';
-
-            $image_meta = array(
-                'post_excerpt' => $img_caption,
-                'post_content' => $img_description,
-            );
-
-            //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;
-            }
-
-            /**
-             * todo: As soon as \GFFormsModel::media_handle_upload becomes a public method, move this call to \GFFormsModel::media_handle_upload and remove the hack from this class.
-             * Note: the method became public in GF 1.9.17.7, but we don't require that version yet.
-             */
-            require_once GRAVITYVIEW_DIR . 'includes/class-gravityview-gfformsmodel.php';
-            $media_id = GravityView_GFFormsModel::media_handle_upload( $img_url, $post_id, $image_meta );
-
-            // is this field set as featured image?
-            if ( $media_id && $field->postFeaturedImage ) {
-                set_post_thumbnail( $post_id, $media_id );
-            }
-
-        } elseif ( !empty( $_POST[ $input_name ] ) && is_array( $value ) ) {
-
-            $img_url = $_POST[ $input_name ];
+	/**
+	 * Remove max_files validation (done on gravityforms.js) to avoid conflicts with GravityView
+	 * Late validation done on self::custom_validation
+	 *
+	 * @param $plupload_init array Plupload settings
+	 * @param $form_id
+	 * @param $instance
+	 * @return mixed
+	 */
+	public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) {
+		if( ! $this->is_edit_entry() ) {
+			return $plupload_init;
+		}
+
+		$plupload_init['gf_vars']['max_files'] = 0;
+
+		return $plupload_init;
+	}
+
+
+	/**
+	 * Unset adminOnly and convert field input key to string
+	 * @return array $form
+	 */
+	private function form_prepare_for_save() {
+
+		$form = $this->form;
+
+		/** @var GF_Field $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
+			 * @var GF_Field $field
+			 */
+			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'];
+				}
+			}
+		}
+
+		return $form;
+	}
+
+	private function update_calculation_fields() {
+
+		$form = self::$original_form;
+		$update = false;
+
+		// get the most up to date entry values
+		$entry = GFAPI::get_entry( $this->entry['id'] );
+
+		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 );
+					}
+				} 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 );
+				}
+			}
+
+		}
+
+		if( $update ) {
+
+			$return_entry = GFAPI::update_entry( $entry );
+
+			if( is_wp_error( $return_entry ) ) {
+				do_action( 'gravityview_log_error', 'Updating the entry calculation fields failed', $return_entry );
+			} else {
+				do_action( 'gravityview_log_debug', 'Updating the entry calculation fields succeeded' );
+			}
+		}
+	}
+
+	/**
+	 * Handle updating the Post Image field
+	 *
+	 * Sets a new Featured Image if configured in Gravity Forms; otherwise uploads/updates media
+	 *
+	 * @since 1.17
+	 *
+	 * @uses GFFormsModel::media_handle_upload
+	 * @uses set_post_thumbnail
+	 * 
+	 * @param array $form GF Form array
+	 * @param GF_Field $field GF Field
+	 * @param string $field_id Numeric ID of the field
+	 * @param string $value
+	 * @param array $entry GF Entry currently being edited
+	 * @param int $post_id ID of the Post being edited
+	 *
+	 * @return mixed|string
+	 */
+	private function update_post_image( $form, $field, $field_id, $value, $entry, $post_id ) {
+
+		$input_name = 'input_' . $field_id;
+
+		if ( !empty( $_FILES[ $input_name ]['name'] ) ) {
+
+			// We have a new image
+
+			$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] : '';
+
+			$image_meta = array(
+				'post_excerpt' => $img_caption,
+				'post_content' => $img_description,
+			);
+
+			//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;
+			}
+
+			/**
+			 * todo: As soon as \GFFormsModel::media_handle_upload becomes a public method, move this call to \GFFormsModel::media_handle_upload and remove the hack from this class.
+			 * Note: the method became public in GF 1.9.17.7, but we don't require that version yet.
+			 */
+			require_once GRAVITYVIEW_DIR . 'includes/class-gravityview-gfformsmodel.php';
+			$media_id = GravityView_GFFormsModel::media_handle_upload( $img_url, $post_id, $image_meta );
+
+			// is this field set as featured image?
+			if ( $media_id && $field->postFeaturedImage ) {
+				set_post_thumbnail( $post_id, $media_id );
+			}
+
+		} elseif ( !empty( $_POST[ $input_name ] ) && is_array( $value ) ) {
+
+			$img_url = $_POST[ $input_name ];
 
 			$img_title       = rgar( $_POST, $input_name.'_1' );
 			$img_caption     = rgar( $_POST, $input_name .'_4' );
@@ -620,221 +620,221 @@ 
 				// update image title, caption or description
 				wp_update_post( $image_meta );
 			}
-        } else {
-
-            // if we get here, image was removed or not set.
-            $value = '';
-
-            if ( $field->postFeaturedImage ) {
-                delete_post_thumbnail( $post_id );
-            }
-        }
-
-        return $value;
-    }
-
-    /**
-     * Loop through the fields being edited and if they include Post fields, update the Entry's post object
-     *
-     * @param array $form Gravity Forms form
-     *
-     * @return void
-     */
-    private function maybe_update_post_fields( $form ) {
-
-        if( empty( $this->entry['post_id'] ) ) {
-	        do_action( 'gravityview_log_debug', __METHOD__ . ': This entry has no post fields. Continuing...' );
-            return;
-        }
-
-        $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 );
-            return;
-        }
-
-        $update_entry = false;
-
-        $updated_post = $original_post = get_post( $post_id );
-
-        foreach ( $this->entry as $field_id => $value ) {
-
-            $field = RGFormsModel::get_field( $form, $field_id );
-
-            if( ! $field ) {
-                continue;
-            }
-
-            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;
-
-                switch( $field->type ) {
-
-                    case 'post_title':
-                        $post_title = $value;
-                        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;
-                        unset( $post_title );
-                        break;
-
-                    case 'post_content':
-                        $post_content = $value;
-                        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 );
-                        break;
-                    case 'post_excerpt':
-                        $updated_post->post_excerpt = $value;
-                        break;
-                    case 'post_tags':
-                        wp_set_post_tags( $post_id, $value, false );
-                        break;
-                    case 'post_category':
-                        break;
-                    case 'post_custom_field':
+		} else {
+
+			// if we get here, image was removed or not set.
+			$value = '';
+
+			if ( $field->postFeaturedImage ) {
+				delete_post_thumbnail( $post_id );
+			}
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Loop through the fields being edited and if they include Post fields, update the Entry's post object
+	 *
+	 * @param array $form Gravity Forms form
+	 *
+	 * @return void
+	 */
+	private function maybe_update_post_fields( $form ) {
+
+		if( empty( $this->entry['post_id'] ) ) {
+			do_action( 'gravityview_log_debug', __METHOD__ . ': This entry has no post fields. Continuing...' );
+			return;
+		}
+
+		$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 );
+			return;
+		}
+
+		$update_entry = false;
+
+		$updated_post = $original_post = get_post( $post_id );
+
+		foreach ( $this->entry as $field_id => $value ) {
+
+			$field = RGFormsModel::get_field( $form, $field_id );
+
+			if( ! $field ) {
+				continue;
+			}
+
+			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;
+
+				switch( $field->type ) {
+
+					case 'post_title':
+						$post_title = $value;
+						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;
+						unset( $post_title );
+						break;
+
+					case 'post_content':
+						$post_content = $value;
+						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 );
+						break;
+					case 'post_excerpt':
+						$updated_post->post_excerpt = $value;
+						break;
+					case 'post_tags':
+						wp_set_post_tags( $post_id, $value, false );
+						break;
+					case 'post_category':
+						break;
+					case 'post_custom_field':
 						if ( is_array( $value ) && ( floatval( $field_id ) !== floatval( $field->id ) ) ) {
 							$value = $value[ $field_id ];
 						}
 
-                        if( ! empty( $field->customFieldTemplateEnabled ) ) {
-                            $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
-                        }
+						if( ! empty( $field->customFieldTemplateEnabled ) ) {
+							$value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
+						}
 
-	                    if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) {
-		                    $value = function_exists('wp_json_encode') ? wp_json_encode( $value ) : json_encode( $value );
-	                    }
+						if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) {
+							$value = function_exists('wp_json_encode') ? wp_json_encode( $value ) : json_encode( $value );
+						}
 
-                        update_post_meta( $post_id, $field->postCustomFieldName, $value );
-                        break;
+						update_post_meta( $post_id, $field->postCustomFieldName, $value );
+						break;
 
-                    case 'post_image':
-                        $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id );
-                        break;
+					case 'post_image':
+						$value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id );
+						break;
 
-                }
+				}
 
-                // update entry after
-                $this->entry["{$field_id}"] = $value;
+				// update entry after
+				$this->entry["{$field_id}"] = $value;
 
-                $update_entry = true;
+				$update_entry = true;
 
-                unset( $entry_tmp );
-            }
+				unset( $entry_tmp );
+			}
 
-        }
+		}
 
-        if( $update_entry ) {
+		if( $update_entry ) {
 
-            $return_entry = GFAPI::update_entry( $this->entry );
+			$return_entry = GFAPI::update_entry( $this->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' );
-            }
+			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' );
+			}
 
-        }
+		}
 
-        $return_post = wp_update_post( $updated_post, true );
+		$return_post = wp_update_post( $updated_post, true );
 
-        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 );
-        }
-    }
+		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 );
+		}
+	}
 
 	/**
-     * Is the field stored in a JSON-encoded manner?
-     *
+	 * Is the field stored in a JSON-encoded manner?
+	 *
 	 * @param GF_Field $field
 	 *
 	 * @return bool True: stored in DB json_encode()'d; False: not encoded
 	 */
-    private function is_field_json_encoded( $field ) {
+	private function is_field_json_encoded( $field ) {
 
-	    $json_encoded = false;
+		$json_encoded = false;
 
-        $input_type = RGFormsModel::get_input_type( $field );
+		$input_type = RGFormsModel::get_input_type( $field );
 
-	    // Only certain custom field types are supported
-	    switch( $input_type ) {
-		    case 'fileupload':
-		    case 'list':
-		    case 'multiselect':
-			    $json_encoded = true;
-			    break;
-	    }
+		// Only certain custom field types are supported
+		switch( $input_type ) {
+			case 'fileupload':
+			case 'list':
+			case 'multiselect':
+				$json_encoded = true;
+				break;
+		}
 
-	    return $json_encoded;
-    }
+		return $json_encoded;
+	}
 
-    /**
-     * Convert a field content template into prepared output
-     *
-     * @uses GravityView_GFFormsModel::get_post_field_images()
-     *
-     * @since 1.17
-     *
-     * @param string $template The content template for the field
-     * @param array $form Gravity Forms form
-     * @param bool $do_shortcode Whether to process shortcode inside content. In GF, only run on Custom Field and Post Content fields
-     *
-     * @return string
-     */
-    private function fill_post_template( $template, $form, $entry, $do_shortcode = false ) {
+	/**
+	 * Convert a field content template into prepared output
+	 *
+	 * @uses GravityView_GFFormsModel::get_post_field_images()
+	 *
+	 * @since 1.17
+	 *
+	 * @param string $template The content template for the field
+	 * @param array $form Gravity Forms form
+	 * @param bool $do_shortcode Whether to process shortcode inside content. In GF, only run on Custom Field and Post Content fields
+	 *
+	 * @return string
+	 */
+	private function fill_post_template( $template, $form, $entry, $do_shortcode = false ) {
 
-        require_once GRAVITYVIEW_DIR . 'includes/class-gravityview-gfformsmodel.php';
+		require_once GRAVITYVIEW_DIR . 'includes/class-gravityview-gfformsmodel.php';
 
-        $post_images = GravityView_GFFormsModel::get_post_field_images( $form, $entry );
+		$post_images = GravityView_GFFormsModel::get_post_field_images( $form, $entry );
 
-        //replacing post image variables
-        $output = GFCommon::replace_variables_post_image( $template, $post_images, $entry );
+		//replacing post image variables
+		$output = GFCommon::replace_variables_post_image( $template, $post_images, $entry );
 
-        //replacing all other variables
-        $output = GFCommon::replace_variables( $output, $form, $entry, false, false, false );
+		//replacing all other variables
+		$output = GFCommon::replace_variables( $output, $form, $entry, false, false, false );
 
-        // replace conditional shortcodes
-        if( $do_shortcode ) {
-            $output = do_shortcode( $output );
-        }
+		// replace conditional shortcodes
+		if( $do_shortcode ) {
+			$output = do_shortcode( $output );
+		}
 
-        return $output;
-    }
+		return $output;
+	}
 
 
-    /**
-     * Perform actions normally performed after updating a lead
-     *
-     * @since 1.8
-     *
-     * @see GFEntryDetail::lead_detail_page()
-     *
-     * @return void
-     */
-    private function after_update() {
+	/**
+	 * Perform actions normally performed after updating a lead
+	 *
+	 * @since 1.8
+	 *
+	 * @see GFEntryDetail::lead_detail_page()
+	 *
+	 * @return void
+	 */
+	private 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'], self::$original_entry );
+		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'], self::$original_entry );
 
-        // Re-define the entry now that we've updated it.
-        $entry = RGFormsModel::get_lead( $this->entry['id'] );
+		// Re-define the entry now that we've updated it.
+		$entry = RGFormsModel::get_lead( $this->entry['id'] );
 
-        $entry = GFFormsModel::set_entry_meta( $entry, $this->form );
+		$entry = GFFormsModel::set_entry_meta( $entry, $this->form );
 
 		if ( ! method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) {
 			// We need to clear the cache because Gravity Forms caches the field values, which
@@ -844,41 +844,41 @@ 
 			}
 		}
 
-        $this->entry = $entry;
-    }
+		$this->entry = $entry;
+	}
 
 
-    /**
-     * Display the Edit Entry form
-     *
-     * @return void
-     */
-    public function edit_entry_form() {
+	/**
+	 * Display the Edit Entry form
+	 *
+	 * @return void
+	 */
+	public function edit_entry_form() {
 
-        ?>
+		?>
 
         <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
-             * @see https://github.com/katzwebservices/GravityView/issues/451
-             */
-            echo gravityview_strip_whitespace( $javascript );
+			/**
+			 * Fixes weird wpautop() issue
+			 * @see https://github.com/katzwebservices/GravityView/issues/451
+			 */
+			echo gravityview_strip_whitespace( $javascript );
 
-            ?><h2 class="gv-edit-entry-title">
+			?><h2 class="gv-edit-entry-title">
                 <span><?php
 
-                    /**
-                     * @filter `gravityview_edit_entry_title` Modify the edit entry title
-                     * @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 );
+					/**
+					 * @filter `gravityview_edit_entry_title` Modify the edit entry title
+					 * @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 );
 
-                    echo esc_attr( $edit_entry_title );
-            ?></span>
+					echo esc_attr( $edit_entry_title );
+			?></span>
             </h2>
 
             <?php $this->maybe_print_message(); ?>
@@ -889,14 +889,14 @@ 
 
                 <?php
 
-                wp_nonce_field( self::$nonce_key, self::$nonce_key );
+				wp_nonce_field( self::$nonce_key, self::$nonce_key );
 
-                wp_nonce_field( self::$nonce_field, self::$nonce_field, false );
+				wp_nonce_field( self::$nonce_field, self::$nonce_field, false );
 
-                // Print the actual form HTML
-                $this->render_edit_form();
+				// Print the actual form HTML
+				$this->render_edit_form();
 
-                ?>
+				?>
             </form>
 
             <script>
@@ -908,643 +908,643 @@ 
         </div>
 
     <?php
-    }
-
-    /**
-     * Display success or error message if the form has been submitted
-     *
-     * @uses GVCommon::generate_notice
-     *
-     * @since 1.16.2.2
-     *
-     * @return void
-     */
-    private function maybe_print_message() {
-
-        if( rgpost('action') === 'update' ) {
-
-            $back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) );
-
-            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);
-
-                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>' );
-
-                /**
-                 * @filter `gravityview/edit_entry/success` Modify the edit entry success message (including the anchor link)
-                 * @since 1.5.4
-                 * @param string $entry_updated_message Existing message
-                 * @param int $view_id View ID
-                 * @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 );
-
-                echo GVCommon::generate_notice( $message );
-            }
-
-        }
-    }
-
-    /**
-     * Display the Edit Entry form in the original Gravity Forms format
-     *
-     * @since 1.9
-     *
-     * @return void
-     */
-    private function render_edit_form() {
-
-        /**
-         * @action `gravityview/edit-entry/render/before` Before rendering the Edit Entry form
-         * @since 1.17
-         * @param GravityView_Edit_Entry_Render $this
-         */
-        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_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 );
-
-        // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
-        unset( $_GET['page'] );
-
-        // TODO: Verify multiple-page forms
-
-        ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic
-
-        $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
-
-        ob_get_clean();
-
-	    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' );
-        remove_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5 );
-        remove_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10 );
-
-        echo $html;
-
-        /**
-         * @action `gravityview/edit-entry/render/after` After rendering the Edit Entry form
-         * @since 1.17
-         * @param GravityView_Edit_Entry_Render $this
-         */
-        do_action( 'gravityview/edit-entry/render/after', $this );
-    }
-
-    /**
-     * Display the Update/Cancel/Delete buttons for the Edit Entry form
-     * @since 1.8
-     * @return string
-     */
-    public function render_form_buttons() {
-        return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this );
-    }
-
-
-    /**
-     * Modify the form fields that are shown when using GFFormDisplay::get_form()
-     *
-     * By default, all fields will be shown. We only want the Edit Tab configured fields to be shown.
-     *
-     * @param array $form
-     * @param boolean $ajax Whether in AJAX mode
-     * @param array|string $field_values Passed parameters to the form
-     *
-     * @since 1.9
-     *
-     * @return array Modified form array
-     */
-    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 ) ) {
-            $form = $this->form_after_validation;
-        } else {
-            $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id );
-        }
-
-        $form = $this->filter_conditional_logic( $form );
-
-        $form = $this->prefill_conditional_logic( $form );
-
-        // for now we don't support Save and Continue feature.
-        if( ! self::$supports_save_and_continue ) {
-	        unset( $form['save'] );
-        }
-
-        return $form;
-    }
-
-    /**
-     * When displaying a field, check if it's a Post Field, and if so, make sure the post exists and current user has edit rights.
-     *
-     * @since 1.16.2.2
-     *
-     * @param string $field_content Always empty. Returning not-empty overrides the input.
-     * @param GF_Field $field
-     * @param string|array $value If array, it's a field with multiple inputs. If string, single input.
-     * @param int $lead_id Lead ID. Always 0 for the `gform_field_input` filter.
-     * @param int $form_id Form ID
-     *
-     * @return string If error, the error message. If no error, blank string (modify_edit_field_input() runs next)
-     */
-    public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) {
-
-        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'] ) ) {
-
-                /**
-                 * @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') );
-
-            } 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' ) );
-            }
-
-            if( $message ) {
-                $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
-            }
-        }
-
-        return $field_content;
-    }
-
-    /**
-     *
-     * Fill-in the saved values into the form inputs
-     *
-     * @param string $field_content Always empty. Returning not-empty overrides the input.
-     * @param GF_Field $field
-     * @param string|array $value If array, it's a field with multiple inputs. If string, single input.
-     * @param int $lead_id Lead ID. Always 0 for the `gform_field_input` filter.
-     * @param int $form_id Form ID
-     *
-     * @return mixed
-     */
-    public function modify_edit_field_input( $field_content = '', $field, $value, $lead_id = 0, $form_id ) {
-
-        $gv_field = GravityView_Fields::get_associated_field( $field );
-
-        // 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' ) ) )
-            && false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) )
-            && ! GFCommon::is_product_field( $field->type )
-            || ! empty( $field_content )
-            || in_array( $field->type, array( 'honeypot' ) )
-        ) {
-	        return $field_content;
-        }
-
-        // SET SOME FIELD DEFAULTS TO PREVENT ISSUES
-        $field->adminOnly = false; /** @see GFFormDisplay::get_counter_init_script() need to prevent adminOnly */
-
-        $field_value = $this->get_field_value( $field );
-
-	    // Prevent any PHP warnings, like undefined index
-	    ob_start();
-
-	    $return = null;
-
-        /** @var GravityView_Field $gv_field */
-        if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
-            $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
-        } else {
-	        $return = $field->get_field_input( $this->form, $field_value, $this->entry );
-	    }
-
-	    // If there was output, it's an error
-	    $warnings = ob_get_clean();
-
-	    if( !empty( $warnings ) ) {
-		    do_action( 'gravityview_log_error', __METHOD__ . $warnings, $field_value );
-	    }
-
-        return $return;
-    }
-
-    /**
-     * Modify the value for the current field input
-     *
-     * @param GF_Field $field
-     *
-     * @return array|mixed|string
-     */
-    private function get_field_value( $field ) {
-
-        /**
-         * @filter `gravityview/edit_entry/pre_populate/override` Allow the pre-populated value to override saved value in Edit Entry form. By default, pre-populate mechanism only kicks on empty fields.
-         * @param boolean True: override saved values; False: don't override (default)
-         * @param $field GF_Field object Gravity Forms field object
-         * @since 1.13
-         */
-        $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' ) ) ) {
-
-            $field_value = array();
-
-            // only accept pre-populated values if the field doesn't have any choice selected.
-            $allow_pre_populated = $field->allowsPrepopulate;
-
-            foreach ( (array)$field->inputs as $input ) {
-
-                $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 ];
-                    $allow_pre_populated = false;
-                }
-
-            }
-
-            $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;
-
-        } else {
-
-            $id = intval( $field->id );
+	}
 
-            // get pre-populated value if exists
-            $pre_value = $field->allowsPrepopulate ? GFFormsModel::get_parameter_value( $field->inputName, array(), $field ) : '';
-
-            // 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;
+	/**
+	 * Display success or error message if the form has been submitted
+	 *
+	 * @uses GVCommon::generate_notice
+	 *
+	 * @since 1.16.2.2
+	 *
+	 * @return void
+	 */
+	private function maybe_print_message() {
 
-            // 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 ) ) {
-                $categories = array();
-                foreach ( explode( ',', $field_value ) as $cat_string ) {
-                    $categories[] = GFCommon::format_post_category( $cat_string, true );
-                }
-                $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
-            }
+		if( rgpost('action') === 'update' ) {
 
-        }
+			$back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) );
 
-        // if value is empty get the default value if defined
-        $field_value = $field->get_value_default_if_empty( $field_value );
-
-	    /**
-	     * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
-	     * @since 1.11
-	     * @since 1.20 Added third param
-	     * @param mixed $field_value field value used to populate the input
-	     * @param object $field Gravity Forms field object ( Class GF_Field )
-	     * @param GravityView_Edit_Entry_Render $this Current object
-	     */
-	    $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this );
+			if( ! $this->is_valid ){
 
-	    /**
-	     * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type
-	     * @since 1.17
-	     * @since 1.20 Added third param
-	     * @param mixed $field_value field value used to populate the input
-	     * @param GF_Field $field Gravity Forms field object
-	     * @param GravityView_Edit_Entry_Render $this Current object
-	     */
-	    $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
+				// 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);
 
-        return $field_value;
-    }
+				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 validation
+				/**
+				 * @filter `gravityview/edit_entry/success` Modify the edit entry success message (including the anchor link)
+				 * @since 1.5.4
+				 * @param string $entry_updated_message Existing message
+				 * @param int $view_id View ID
+				 * @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 );
 
-    /**
-     * Add field keys that Gravity Forms expects.
-     *
-     * @see GFFormDisplay::validate()
-     * @param  array $form GF Form
-     * @return array       Modified GF Form
-     */
-    public function gform_pre_validation( $form ) {
+				echo GVCommon::generate_notice( $message );
+			}
 
-        if( ! $this->verify_nonce() ) {
-            return $form;
-        }
-
-        // Fix PHP warning regarding undefined index.
-        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.
-            foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) {
-	            $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
-            }
-
-            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.
-                 *
-                 * What we have to do is set the value so that it doesn't get overwritten as empty on save and appears immediately in the Edit Entry screen again.
-                 *
-                 * @hack
-                 */
-                case 'fileupload':
-
-                    // Set the previous value
-                    $entry = $this->get_entry();
-
-                    $input_name = 'input_'.$field->id;
-                    $form_id = $form['id'];
-
-                    $value = NULL;
+		}
+	}
 
-                    // Use the previous entry value as the default.
-                    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'];
-
-                    } 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' => '' );
-
-                    }
-
-                    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] ) ) {
-                            $value = empty( $value ) ? '[]' : $value;
-                            $value = stripslashes_deep( $value );
-                            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
-                        }
+	/**
+	 * Display the Edit Entry form in the original Gravity Forms format
+	 *
+	 * @since 1.9
+	 *
+	 * @return void
+	 */
+	private function render_edit_form() {
 
-                    } else {
+		/**
+		 * @action `gravityview/edit-entry/render/before` Before rendering the Edit Entry form
+		 * @since 1.17
+		 * @param GravityView_Edit_Entry_Render $this
+		 */
+		do_action( 'gravityview/edit-entry/render/before', $this );
 
-                        // A file already exists when editing an entry
-                        // We set this to solve issue when file upload fields are required.
-                        GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
-
-                    }
-
-                    $this->entry[ $input_name ] = $value;
-                    $_POST[ $input_name ] = $value;
+		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' );
 
-                    break;
+		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 );
 
-                case 'number':
-                    // Fix "undefined index" issue at line 1286 in form_display.php
-                    if( !isset( $_POST['input_'.$field->id ] ) ) {
-                        $_POST['input_'.$field->id ] = NULL;
-                    }
-                    break;
-            }
+		// We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
+		unset( $_GET['page'] );
 
-        }
+		// TODO: Verify multiple-page forms
 
-        return $form;
-    }
+		ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic
 
+		$html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
 
-    /**
-     * Process validation for a edit entry submission
-     *
-     * Sets the `is_valid` object var
-     *
-     * @return void
-     */
-    private function validate() {
+		ob_get_clean();
 
-        /**
-         * If using GF User Registration Add-on, remove the validation step, otherwise generates error when updating the entry
-         * GF User Registration Add-on version > 3.x has a different class name
-         * @since 1.16.2
-         */
-        if ( class_exists( 'GF_User_Registration' ) ) {
-            remove_filter( 'gform_validation', array( GF_User_Registration::get_instance(), 'validate' ) );
-        } else  if ( class_exists( 'GFUser' ) ) {
-            remove_filter( 'gform_validation', array( 'GFUser', 'user_registration_validation' ) );
-        }
+		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' );
+		remove_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5 );
+		remove_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10 );
 
+		echo $html;
 
-        /**
-         * For some crazy reason, Gravity Forms doesn't validate Edit Entry form submissions.
-         * 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);
+		/**
+		 * @action `gravityview/edit-entry/render/after` After rendering the Edit Entry form
+		 * @since 1.17
+		 * @param GravityView_Edit_Entry_Render $this
+		 */
+		do_action( 'gravityview/edit-entry/render/after', $this );
+	}
 
-        // Needed by the validate funtion
-        $failed_validation_page = NULL;
-        $field_values = RGForms::post( 'gform_field_values' );
+	/**
+	 * Display the Update/Cancel/Delete buttons for the Edit Entry form
+	 * @since 1.8
+	 * @return string
+	 */
+	public function render_form_buttons() {
+		return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this );
+	}
 
-        // Prevent entry limit from running when editing an entry, also
-        // prevent form scheduling from preventing editing
-        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 );
+	/**
+	 * Modify the form fields that are shown when using GFFormDisplay::get_form()
+	 *
+	 * By default, all fields will be shown. We only want the Edit Tab configured fields to be shown.
+	 *
+	 * @param array $form
+	 * @param boolean $ajax Whether in AJAX mode
+	 * @param array|string $field_values Passed parameters to the form
+	 *
+	 * @since 1.9
+	 *
+	 * @return array Modified form array
+	 */
+	public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) {
 
-        $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page );
+		// In case we have validated the form, use it to inject the validation results into the form render
+		if( isset( $this->form_after_validation ) ) {
+			$form = $this->form_after_validation;
+		} else {
+			$form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id );
+		}
 
-        remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 );
-    }
+		$form = $this->filter_conditional_logic( $form );
 
+		$form = $this->prefill_conditional_logic( $form );
 
-    /**
-     * Make validation work for Edit Entry
-     *
-     * Because we're calling the GFFormDisplay::validate() in an unusual way (as a front-end
-     * form pretending to be a back-end form), validate() doesn't know we _can't_ edit post
-     * fields. This goes through all the fields and if they're an invalid post field, we
-     * set them as valid. If there are still issues, we'll return false.
-     *
-     * @param  [type] $validation_results [description]
-     * @return [type]                     [description]
-     */
-    public function custom_validation( $validation_results ) {
+		// for now we don't support Save and Continue feature.
+		if( ! self::$supports_save_and_continue ) {
+			unset( $form['save'] );
+		}
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results );
+		return $form;
+	}
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+	/**
+	 * When displaying a field, check if it's a Post Field, and if so, make sure the post exists and current user has edit rights.
+	 *
+	 * @since 1.16.2.2
+	 *
+	 * @param string $field_content Always empty. Returning not-empty overrides the input.
+	 * @param GF_Field $field
+	 * @param string|array $value If array, it's a field with multiple inputs. If string, single input.
+	 * @param int $lead_id Lead ID. Always 0 for the `gform_field_input` filter.
+	 * @param int $form_id Form ID
+	 *
+	 * @return string If error, the error message. If no error, blank string (modify_edit_field_input() runs next)
+	 */
+	public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) {
 
-        $gv_valid = true;
+		if( GFCommon::is_post_field( $field ) ) {
 
-        foreach ( $validation_results['form']['fields'] as $key => &$field ) {
+			$message = null;
 
-            $value = RGFormsModel::get_field_value( $field );
-            $field_type = RGFormsModel::get_input_type( $field );
+			// First, make sure they have the capability to edit the post.
+			if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
 
-            // Validate always
-            switch ( $field_type ) {
+				/**
+				 * @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') );
 
+			} 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' ) );
+			}
 
-                case 'fileupload' :
-                case 'post_image':
+			if( $message ) {
+				$field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
+			}
+		}
 
-                    // in case nothing is uploaded but there are already files saved
-                    if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
-                        $field->failed_validation = false;
-                        unset( $field->validation_message );
-                    }
+		return $field_content;
+	}
 
-                    // validate if multi file upload reached max number of files [maxFiles] => 2
-                    if( rgobj( $field, 'maxFiles') && rgobj( $field, 'multipleFiles') ) {
+	/**
+	 *
+	 * Fill-in the saved values into the form inputs
+	 *
+	 * @param string $field_content Always empty. Returning not-empty overrides the input.
+	 * @param GF_Field $field
+	 * @param string|array $value If array, it's a field with multiple inputs. If string, single input.
+	 * @param int $lead_id Lead ID. Always 0 for the `gform_field_input` filter.
+	 * @param int $form_id Form ID
+	 *
+	 * @return mixed
+	 */
+	public function modify_edit_field_input( $field_content = '', $field, $value, $lead_id = 0, $form_id ) {
+
+		$gv_field = GravityView_Fields::get_associated_field( $field );
+
+		// 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' ) ) )
+			&& false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) )
+			&& ! GFCommon::is_product_field( $field->type )
+			|| ! empty( $field_content )
+			|| in_array( $field->type, array( 'honeypot' ) )
+		) {
+			return $field_content;
+		}
 
-                        $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();
+		// SET SOME FIELD DEFAULTS TO PREVENT ISSUES
+		$field->adminOnly = false; /** @see GFFormDisplay::get_counter_init_script() need to prevent adminOnly */
 
-                        //existent
-                        $entry = $this->get_entry();
-                        $value = NULL;
-                        if( isset( $entry[ $field->id ] ) ) {
-                            $value = json_decode( $entry[ $field->id ], true );
-                        }
+		$field_value = $this->get_field_value( $field );
 
-                        // count uploaded files and existent entry files
-                        $count_files = count( $file_names ) + count( $value );
+		// Prevent any PHP warnings, like undefined index
+		ob_start();
 
-                        if( $count_files > $field->maxFiles ) {
-                            $field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
-                            $field->failed_validation = 1;
-                            $gv_valid = false;
+		$return = null;
 
-                            // in case of error make sure the newest upload files are removed from the upload input
-                            GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
-                        }
+		/** @var GravityView_Field $gv_field */
+		if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
+			$return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
+		} else {
+			$return = $field->get_field_input( $this->form, $field_value, $this->entry );
+		}
+
+		// If there was output, it's an error
+		$warnings = ob_get_clean();
+
+		if( !empty( $warnings ) ) {
+			do_action( 'gravityview_log_error', __METHOD__ . $warnings, $field_value );
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Modify the value for the current field input
+	 *
+	 * @param GF_Field $field
+	 *
+	 * @return array|mixed|string
+	 */
+	private function get_field_value( $field ) {
+
+		/**
+		 * @filter `gravityview/edit_entry/pre_populate/override` Allow the pre-populated value to override saved value in Edit Entry form. By default, pre-populate mechanism only kicks on empty fields.
+		 * @param boolean True: override saved values; False: don't override (default)
+		 * @param $field GF_Field object Gravity Forms field object
+		 * @since 1.13
+		 */
+		$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' ) ) ) {
+
+			$field_value = array();
+
+			// only accept pre-populated values if the field doesn't have any choice selected.
+			$allow_pre_populated = $field->allowsPrepopulate;
+
+			foreach ( (array)$field->inputs as $input ) {
+
+				$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 ];
+					$allow_pre_populated = false;
+				}
+
+			}
+
+			$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;
+
+		} else {
+
+			$id = intval( $field->id );
+
+			// get pre-populated value if exists
+			$pre_value = $field->allowsPrepopulate ? GFFormsModel::get_parameter_value( $field->inputName, array(), $field ) : '';
+
+			// 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;
+
+			// 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 ) ) {
+				$categories = array();
+				foreach ( explode( ',', $field_value ) as $cat_string ) {
+					$categories[] = GFCommon::format_post_category( $cat_string, true );
+				}
+				$field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
+			}
+
+		}
+
+		// if value is empty get the default value if defined
+		$field_value = $field->get_value_default_if_empty( $field_value );
+
+		/**
+		 * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
+		 * @since 1.11
+		 * @since 1.20 Added third param
+		 * @param mixed $field_value field value used to populate the input
+		 * @param object $field Gravity Forms field object ( Class GF_Field )
+		 * @param GravityView_Edit_Entry_Render $this Current object
+		 */
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this );
+
+		/**
+		 * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type
+		 * @since 1.17
+		 * @since 1.20 Added third param
+		 * @param mixed $field_value field value used to populate the input
+		 * @param GF_Field $field Gravity Forms field object
+		 * @param GravityView_Edit_Entry_Render $this Current object
+		 */
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
+
+		return $field_value;
+	}
+
+
+	// ---- Entry validation
+
+	/**
+	 * Add field keys that Gravity Forms expects.
+	 *
+	 * @see GFFormDisplay::validate()
+	 * @param  array $form GF Form
+	 * @return array       Modified GF Form
+	 */
+	public function gform_pre_validation( $form ) {
+
+		if( ! $this->verify_nonce() ) {
+			return $form;
+		}
+
+		// Fix PHP warning regarding undefined index.
+		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.
+			foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) {
+				$field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
+			}
+
+			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.
+				 *
+				 * What we have to do is set the value so that it doesn't get overwritten as empty on save and appears immediately in the Edit Entry screen again.
+				 *
+				 * @hack
+				 */
+				case 'fileupload':
+
+					// Set the previous value
+					$entry = $this->get_entry();
+
+					$input_name = 'input_'.$field->id;
+					$form_id = $form['id'];
+
+					$value = NULL;
+
+					// Use the previous entry value as the default.
+					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'];
+
+					} 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' => '' );
+
+					}
+
+					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] ) ) {
+							$value = empty( $value ) ? '[]' : $value;
+							$value = stripslashes_deep( $value );
+							$value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
+						}
+
+					} else {
+
+						// A file already exists when editing an entry
+						// We set this to solve issue when file upload fields are required.
+						GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
+
+					}
+
+					$this->entry[ $input_name ] = $value;
+					$_POST[ $input_name ] = $value;
+
+					break;
 
-                    }
+				case 'number':
+					// Fix "undefined index" issue at line 1286 in form_display.php
+					if( !isset( $_POST['input_'.$field->id ] ) ) {
+						$_POST['input_'.$field->id ] = NULL;
+					}
+					break;
+			}
+
+		}
+
+		return $form;
+	}
+
+
+	/**
+	 * Process validation for a edit entry submission
+	 *
+	 * Sets the `is_valid` object var
+	 *
+	 * @return void
+	 */
+	private function validate() {
+
+		/**
+		 * If using GF User Registration Add-on, remove the validation step, otherwise generates error when updating the entry
+		 * GF User Registration Add-on version > 3.x has a different class name
+		 * @since 1.16.2
+		 */
+		if ( class_exists( 'GF_User_Registration' ) ) {
+			remove_filter( 'gform_validation', array( GF_User_Registration::get_instance(), 'validate' ) );
+		} else  if ( class_exists( 'GFUser' ) ) {
+			remove_filter( 'gform_validation', array( 'GFUser', 'user_registration_validation' ) );
+		}
+
+
+		/**
+		 * For some crazy reason, Gravity Forms doesn't validate Edit Entry form submissions.
+		 * 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);
+
+		// Needed by the validate funtion
+		$failed_validation_page = NULL;
+		$field_values = RGForms::post( 'gform_field_values' );
+
+		// Prevent entry limit from running when editing an entry, also
+		// prevent form scheduling from preventing editing
+		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->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page );
+
+		remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 );
+	}
+
+
+	/**
+	 * Make validation work for Edit Entry
+	 *
+	 * Because we're calling the GFFormDisplay::validate() in an unusual way (as a front-end
+	 * form pretending to be a back-end form), validate() doesn't know we _can't_ edit post
+	 * fields. This goes through all the fields and if they're an invalid post field, we
+	 * set them as valid. If there are still issues, we'll return false.
+	 *
+	 * @param  [type] $validation_results [description]
+	 * @return [type]                     [description]
+	 */
+	public 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] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+
+		$gv_valid = true;
+
+		foreach ( $validation_results['form']['fields'] as $key => &$field ) {
+
+			$value = RGFormsModel::get_field_value( $field );
+			$field_type = RGFormsModel::get_input_type( $field );
+
+			// Validate always
+			switch ( $field_type ) {
 
 
-                    break;
+				case 'fileupload' :
+				case 'post_image':
 
-            }
+					// in case nothing is uploaded but there are already files saved
+					if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
+						$field->failed_validation = false;
+						unset( $field->validation_message );
+					}
 
-            // This field has failed validation.
-            if( !empty( $field->failed_validation ) ) {
+					// validate if multi file upload reached max number of files [maxFiles] => 2
+					if( rgobj( $field, 'maxFiles') && rgobj( $field, 'multipleFiles') ) {
 
-                do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'field' => $field, 'value' => $value ) );
+						$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();
 
-                switch ( $field_type ) {
+						//existent
+						$entry = $this->get_entry();
+						$value = NULL;
+						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 ) {
+							$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;
+						}
 
-                    // Captchas don't need to be re-entered.
-                    case 'captcha':
+					}
 
-                        // Post Image fields aren't editable, so we un-fail them.
-                    case 'post_image':
-                        $field->failed_validation = false;
-                        unset( $field->validation_message );
-                        break;
 
-                }
+					break;
 
-                // You can't continue inside a switch, so we do it after.
-                if( empty( $field->failed_validation ) ) {
-                    continue;
-                }
+			}
+
+			// This field has failed validation.
+			if( !empty( $field->failed_validation ) ) {
 
-                // 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 ) ) {
+				do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'field' => $field, 'value' => $value ) );
 
-                    $entry = $this->get_entry();
+				switch ( $field_type ) {
 
-                    // 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 value submitted was not changed, then don't validate
-                        $field->failed_validation = false;
+					// Captchas don't need to be re-entered.
+					case 'captcha':
 
-                        unset( $field->validation_message );
+						// Post Image fields aren't editable, so we un-fail them.
+					case 'post_image':
+						$field->failed_validation = false;
+						unset( $field->validation_message );
+						break;
 
-                        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry );
+				}
 
-                        continue;
-                    }
-                }
+				// You can't continue inside a switch, so we do it after.
+				if( empty( $field->failed_validation ) ) {
+					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 ) ) {
-                    unset( $field->validation_message );
-	                $field->validation_message = false;
-                    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 ) ) {
 
-                $gv_valid = false;
+					$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 value submitted was not changed, then don't validate
+						$field->failed_validation = false;
 
-        }
+						unset( $field->validation_message );
 
-        $validation_results['is_valid'] = $gv_valid;
+						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] Validation results.', $validation_results );
+						continue;
+					}
+				}
 
-        // We'll need this result when rendering the form ( on GFFormDisplay::get_form )
-        $this->form_after_validation = $validation_results['form'];
+				// 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 ) ) {
+					unset( $field->validation_message );
+					$field->validation_message = false;
+					continue;
+				}
 
-        return $validation_results;
-    }
+				$gv_valid = false;
 
+			}
+
+		}
 
-    /**
-     * TODO: This seems to be hacky... we should remove it. Entry is set when updating the form using setup_vars()!
-     * Get the current entry and set it if it's not yet set.
-     * @return array Gravity Forms entry array
-     */
-    public function get_entry() {
+		$validation_results['is_valid'] = $gv_valid;
 
-        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() );
-        }
+		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results );
 
-        return $this->entry;
-    }
+		// We'll need this result when rendering the form ( on GFFormDisplay::get_form )
+		$this->form_after_validation = $validation_results['form'];
 
+		return $validation_results;
+	}
+
+
+	/**
+	 * TODO: This seems to be hacky... we should remove it. Entry is set when updating the form using setup_vars()!
+	 * Get the current entry and set it if it's not yet set.
+	 * @return array Gravity Forms entry array
+	 */
+	public function get_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() );
+		}
+
+		return $this->entry;
+	}
 
 
-    // --- Filters
 
-    /**
-     * Get the Edit Entry fields as configured in the View
-     *
-     * @since 1.8
-     *
-     * @param int $view_id
-     *
-     * @return array Array of fields that are configured in the Edit tab in the Admin
-     */
-    private function get_configured_edit_fields( $form, $view_id ) {
+	// --- Filters
 
-        // Get all fields for form
+	/**
+	 * Get the Edit Entry fields as configured in the View
+	 *
+	 * @since 1.8
+	 *
+	 * @param int $view_id
+	 *
+	 * @return array Array of fields that are configured in the Edit tab in the Admin
+	 */
+	private function get_configured_edit_fields( $form, $view_id ) {
+
+		// Get all fields for form
 		if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) {
 			if ( \GV\View::exists( $view_id ) ) {
 				$view = \GV\View::by_id( $view_id );
@@ -1555,446 +1555,446 @@ 
 			$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;
+		// If edit tab not yet configured, show all fields
+		$edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL;
 
-        // Hide fields depending on admin settings
-        $fields = $this->filter_fields( $form['fields'], $edit_fields );
+		// Hide fields depending on admin settings
+		$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 );
+		// 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 );
 
-        /**
-         * @filter `gravityview/edit_entry/form_fields` Modify the fields displayed in Edit Entry form
-         * @since 1.17
-         * @param GF_Field[] $fields Gravity Forms form fields
-         * @param array|null $edit_fields Fields for the Edit Entry tab configured in the View Configuration
-         * @param array $form GF Form array (`fields` key modified to have only fields configured to show in Edit Entry)
-         * @param int $view_id View ID
-         */
-        $fields = apply_filters( 'gravityview/edit_entry/form_fields', $fields, $edit_fields, $form, $view_id );
+		/**
+		 * @filter `gravityview/edit_entry/form_fields` Modify the fields displayed in Edit Entry form
+		 * @since 1.17
+		 * @param GF_Field[] $fields Gravity Forms form fields
+		 * @param array|null $edit_fields Fields for the Edit Entry tab configured in the View Configuration
+		 * @param array $form GF Form array (`fields` key modified to have only fields configured to show in Edit Entry)
+		 * @param int $view_id View ID
+		 */
+		$fields = apply_filters( 'gravityview/edit_entry/form_fields', $fields, $edit_fields, $form, $view_id );
 
-        return $fields;
-    }
-
-
-    /**
-     * Filter area fields based on specified conditions
-     *  - This filter removes the fields that have calculation configured
-     *
-     * @uses GravityView_Edit_Entry::user_can_edit_field() Check caps
-     * @access private
-     * @param GF_Field[] $fields
-     * @param array $configured_fields
-     * @since  1.5
-     * @return array $fields
-     */
-    private function filter_fields( $fields, $configured_fields ) {
-
-        if( empty( $fields ) || !is_array( $fields ) ) {
-            return $fields;
-        }
-
-        $edit_fields = array();
-
-        $field_type_blacklist = $this->loader->get_field_blacklist( $this->entry );
-
-        // First, remove blacklist or calculation fields
-        foreach ( $fields as $key => $field ) {
-
-            // 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;
-                // don't remove the calculation fields on form render.
-            }
-
-            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 ) ) {
-            return $fields;
-        }
-
-        // The edit tab has been configured, so we loop through to configured settings
-        foreach ( $configured_fields as $configured_field ) {
-
-	        /** @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 );
-                    break;
-                }
-
-            }
-
-        }
-
-        return $edit_fields;
-
-    }
-
-    /**
-     * Override GF Form field properties with the ones defined on the View
-     * @param  GF_Field $field GF Form field object
-     * @param  array $field_setting  GV field options
-     * @since  1.5
-     * @return array|GF_Field
-     */
-    private function merge_field_properties( $field, $field_setting ) {
-
-        $return_field = $field;
-
-        if( empty( $field_setting['show_label'] ) ) {
-            $return_field->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'] );
-        }
-
-        /**
-         * Normalize page numbers - avoid conflicts with page validation
-         * @since 1.6
-         */
-        $return_field->pageNumber = 1;
-
-        return $return_field;
-
-    }
-
-    /**
-     * Remove fields that shouldn't be visible based on the Gravity Forms adminOnly field property
-     *
-     * @since 1.9.1
-     *
-     * @param array|GF_Field[] $fields Gravity Forms form fields
-     * @param array|null $edit_fields Fields for the Edit Entry tab configured in the View Configuration
-     * @param array $form GF Form array
-     * @param int $view_id View ID
-     *
-     * @return array Possibly modified form array
-     */
-    private function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) {
-
-	    /**
-         * @filter `gravityview/edit_entry/use_gf_admin_only_setting` When Edit tab isn't configured, should the Gravity Forms "Admin Only" field settings be used to control field display to non-admins? Default: true
-	     * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators.
-	     * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions
-	     * @since 1.9.1
-	     * @param boolean $use_gf_adminonly_setting True: Hide field if set to Admin Only in GF and the user is not an admin. False: show field based on GV permissions, ignoring GF permissions.
-	     * @param array $form GF Form array
-	     * @param int $view_id View ID
-	     */
-	    $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 ) {
-                    unset( $fields[ $k ] );
-                }
-            }
-            return $fields;
-        }
-
-	    foreach( $fields as &$field ) {
-		    $field->adminOnly = false;
-        }
-
-        return $fields;
-    }
-
-    // --- Conditional Logic
-
-    /**
-     * Conditional logic isn't designed to work with forms that already have content. When switching input values,
-     * the dependent fields will be blank.
-     *
-     * Note: This is because GF populates a JavaScript variable with the input values. This is tough to filter at the input level;
-     * via the `gform_field_value` filter; it requires lots of legwork. Doing it at the form level is easier.
-     *
-     * @since 1.17.4
-     *
-     * @param array $form Gravity Forms array object
-     *
-     * @return array $form, modified to fix conditional
-     */
-    function prefill_conditional_logic( $form ) {
-
-        if( ! GFFormDisplay::has_conditional_logic( $form ) ) {
-            return $form;
-        }
-
-        // Have Conditional Logic pre-fill fields as if the data were default values
-        /** @var GF_Field $field */
-        foreach ( $form['fields'] as &$field ) {
-
-            if( 'checkbox' === $field->type ) {
-                foreach ( $field->get_entry_inputs() as $key => $input ) {
-                    $input_id = $input['id'];
-                    $choice = $field->choices[ $key ];
-                    $value = rgar( $this->entry, $input_id );
-                    $match = RGFormsModel::choice_value_match( $field, $choice, $value );
-                    if( $match ) {
-                        $field->choices[ $key ]['isSelected'] = true;
-                    }
-                }
-            } else {
-
-                // We need to run through each field to set the default values
-                foreach ( $this->entry as $field_id => $field_value ) {
-
-                    if( floatval( $field_id ) === floatval( $field->id ) ) {
-
-                        if( 'list' === $field->type ) {
-                            $list_rows = maybe_unserialize( $field_value );
-
-                            $list_field_value = array();
-                            foreach ( (array) $list_rows as $row ) {
-                                foreach ( (array) $row as $column ) {
-                                    $list_field_value[] = $column;
-                                }
-                            }
-
-                            $field->defaultValue = serialize( $list_field_value );
-                        } else {
-                            $field->defaultValue = $field_value;
-                        }
-                    }
-                }
-            }
-        }
-
-        return $form;
-    }
-
-    /**
-     * Remove the conditional logic rules from the form button and the form fields, if needed.
-     *
-     * @todo Merge with caller method
-     * @since 1.9
-     *
-     * @param array $form Gravity Forms form
-     * @return array Modified form, if not using Conditional Logic
-     */
-    private function filter_conditional_logic( $form ) {
-
-        /**
-         * @filter `gravityview/edit_entry/conditional_logic` Should the Edit Entry form use Gravity Forms conditional logic showing/hiding of fields?
-         * @since 1.9
-         * @param bool $use_conditional_logic True: Gravity Forms will show/hide fields just like in the original form; False: conditional logic will be disabled and fields will be shown based on configuration. Default: true
-         * @param array $form Gravity Forms form
-         */
-        $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form );
-
-        if( $use_conditional_logic ) {
-            return $form;
-        }
-
-        foreach( $form['fields'] as &$field ) {
-            /* @var GF_Field $field */
-            $field->conditionalLogic = null;
-        }
-
-        unset( $form['button']['conditionalLogic'] );
-
-        return $form;
-
-    }
-
-    /**
-     * Disable the Gravity Forms conditional logic script and features on the Edit Entry screen
-     *
-     * @since 1.9
-     *
-     * @param $has_conditional_logic
-     * @param $form
-     * @return mixed
-     */
-    public function manage_conditional_logic( $has_conditional_logic, $form ) {
-
-        if( ! $this->is_edit_entry() ) {
-            return $has_conditional_logic;
-        }
-
-	    /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */
-        return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form );
-    }
-
-
-    // --- User checks and nonces
-
-    /**
-     * Check if the user can edit the entry
-     *
-     * - Is the nonce valid?
-     * - Does the user have the right caps for the entry
-     * - Is the entry in the trash?
-     *
-     * @todo Move to GVCommon
-     *
-     * @param  boolean $echo Show error messages in the form?
-     * @return boolean        True: can edit form. False: nope.
-     */
-    private function user_can_edit_entry( $echo = false ) {
-
-        $error = NULL;
-
-        /**
-         *  1. Permalinks are turned off
-         *  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'] ) ) {
-
-            $error = true;
-
-        }
-
-        if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) {
-
-            $error = true;
-
-        } 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() ) {
-                $error = true;
-            } else {
-                $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( $this->entry['status'] === 'trash' ) {
-            $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' );
-        }
+		return $fields;
+	}
 
-        // No errors; everything's fine here!
-        if( empty( $error ) ) {
-            return true;
-        }
 
-        if( $echo && $error !== true ) {
+	/**
+	 * Filter area fields based on specified conditions
+	 *  - This filter removes the fields that have calculation configured
+	 *
+	 * @uses GravityView_Edit_Entry::user_can_edit_field() Check caps
+	 * @access private
+	 * @param GF_Field[] $fields
+	 * @param array $configured_fields
+	 * @since  1.5
+	 * @return array $fields
+	 */
+	private function filter_fields( $fields, $configured_fields ) {
 
-	        $error = esc_html( $error );
+		if( empty( $fields ) || !is_array( $fields ) ) {
+			return $fields;
+		}
 
-	        /**
-	         * @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;" ) );
-	        }
+		$edit_fields = array();
 
-            echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
-        }
+		$field_type_blacklist = $this->loader->get_field_blacklist( $this->entry );
 
-        do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error );
+		// First, remove blacklist or calculation fields
+		foreach ( $fields as $key => $field ) {
 
-        return false;
-    }
-
-
-    /**
-     * Check whether a field is editable by the current user, and optionally display an error message
-     * @uses  GravityView_Edit_Entry->check_user_cap_edit_field() Check user capabilities
-     * @param  array  $field Field or field settings array
-     * @param  boolean $echo  Whether to show error message telling user they aren't allowed
-     * @return boolean         True: user can edit the current field; False: nope, they can't.
-     */
-    private function user_can_edit_field( $field, $echo = false ) {
+			// 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;
+				// don't remove the calculation fields on form render.
+			}
 
-        $error = NULL;
+			if( in_array( $field->type, $field_type_blacklist ) ) {
+				unset( $fields[ $key ] );
+			}
+		}
 
-        if( ! $this->check_user_cap_edit_field( $field ) ) {
-            $error = __( 'You do not have permission to edit this field.', 'gravityview');
-        }
+		// The Edit tab has not been configured, so we return all fields by default.
+		if( empty( $configured_fields ) ) {
+			return $fields;
+		}
 
-        // No errors; everything's fine here!
-        if( empty( $error ) ) {
-            return true;
-        }
+		// The edit tab has been configured, so we loop through to configured settings
+		foreach ( $configured_fields as $configured_field ) {
 
-        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 );
+			/** @var GF_Field $field */
+			foreach ( $fields as $field ) {
 
-        return false;
+				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;
+				}
 
-    }
+			}
 
+		}
+
+		return $edit_fields;
+
+	}
+
+	/**
+	 * Override GF Form field properties with the ones defined on the View
+	 * @param  GF_Field $field GF Form field object
+	 * @param  array $field_setting  GV field options
+	 * @since  1.5
+	 * @return array|GF_Field
+	 */
+	private function merge_field_properties( $field, $field_setting ) {
+
+		$return_field = $field;
+
+		if( empty( $field_setting['show_label'] ) ) {
+			$return_field->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'] );
+		}
+
+		/**
+		 * Normalize page numbers - avoid conflicts with page validation
+		 * @since 1.6
+		 */
+		$return_field->pageNumber = 1;
+
+		return $return_field;
+
+	}
+
+	/**
+	 * Remove fields that shouldn't be visible based on the Gravity Forms adminOnly field property
+	 *
+	 * @since 1.9.1
+	 *
+	 * @param array|GF_Field[] $fields Gravity Forms form fields
+	 * @param array|null $edit_fields Fields for the Edit Entry tab configured in the View Configuration
+	 * @param array $form GF Form array
+	 * @param int $view_id View ID
+	 *
+	 * @return array Possibly modified form array
+	 */
+	private function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) {
+
+		/**
+		 * @filter `gravityview/edit_entry/use_gf_admin_only_setting` When Edit tab isn't configured, should the Gravity Forms "Admin Only" field settings be used to control field display to non-admins? Default: true
+		 * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators.
+		 * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions
+		 * @since 1.9.1
+		 * @param boolean $use_gf_adminonly_setting True: Hide field if set to Admin Only in GF and the user is not an admin. False: show field based on GV permissions, ignoring GF permissions.
+		 * @param array $form GF Form array
+		 * @param int $view_id View ID
+		 */
+		$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 ) {
+					unset( $fields[ $k ] );
+				}
+			}
+			return $fields;
+		}
+
+		foreach( $fields as &$field ) {
+			$field->adminOnly = false;
+		}
+
+		return $fields;
+	}
+
+	// --- Conditional Logic
+
+	/**
+	 * Conditional logic isn't designed to work with forms that already have content. When switching input values,
+	 * the dependent fields will be blank.
+	 *
+	 * Note: This is because GF populates a JavaScript variable with the input values. This is tough to filter at the input level;
+	 * via the `gform_field_value` filter; it requires lots of legwork. Doing it at the form level is easier.
+	 *
+	 * @since 1.17.4
+	 *
+	 * @param array $form Gravity Forms array object
+	 *
+	 * @return array $form, modified to fix conditional
+	 */
+	function prefill_conditional_logic( $form ) {
 
-    /**
-     * checks if user has permissions to edit a specific field
-     *
-     * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_field for maximum security!!
-     *
-     * @param  [type] $field [description]
-     * @return bool
-     */
-    private function check_user_cap_edit_field( $field ) {
+		if( ! GFFormDisplay::has_conditional_logic( $form ) ) {
+			return $form;
+		}
 
-        // 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' ) ) ) {
-            return true;
-        }
+		// Have Conditional Logic pre-fill fields as if the data were default values
+		/** @var GF_Field $field */
+		foreach ( $form['fields'] as &$field ) {
+
+			if( 'checkbox' === $field->type ) {
+				foreach ( $field->get_entry_inputs() as $key => $input ) {
+					$input_id = $input['id'];
+					$choice = $field->choices[ $key ];
+					$value = rgar( $this->entry, $input_id );
+					$match = RGFormsModel::choice_value_match( $field, $choice, $value );
+					if( $match ) {
+						$field->choices[ $key ]['isSelected'] = true;
+					}
+				}
+			} else {
+
+				// We need to run through each field to set the default values
+				foreach ( $this->entry as $field_id => $field_value ) {
+
+					if( floatval( $field_id ) === floatval( $field->id ) ) {
+
+						if( 'list' === $field->type ) {
+							$list_rows = maybe_unserialize( $field_value );
+
+							$list_field_value = array();
+							foreach ( (array) $list_rows as $row ) {
+								foreach ( (array) $row as $column ) {
+									$list_field_value[] = $column;
+								}
+							}
+
+							$field->defaultValue = serialize( $list_field_value );
+						} else {
+							$field->defaultValue = $field_value;
+						}
+					}
+				}
+			}
+		}
 
-        $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false;
+		return $form;
+	}
 
-        // If the field has custom editing capaibilities set, check those
-        if( $field_cap ) {
-            return GVCommon::has_cap( $field['allow_edit_cap'] );
-        }
-
-        return false;
-    }
+	/**
+	 * Remove the conditional logic rules from the form button and the form fields, if needed.
+	 *
+	 * @todo Merge with caller method
+	 * @since 1.9
+	 *
+	 * @param array $form Gravity Forms form
+	 * @return array Modified form, if not using Conditional Logic
+	 */
+	private function filter_conditional_logic( $form ) {
 
+		/**
+		 * @filter `gravityview/edit_entry/conditional_logic` Should the Edit Entry form use Gravity Forms conditional logic showing/hiding of fields?
+		 * @since 1.9
+		 * @param bool $use_conditional_logic True: Gravity Forms will show/hide fields just like in the original form; False: conditional logic will be disabled and fields will be shown based on configuration. Default: true
+		 * @param array $form Gravity Forms form
+		 */
+		$use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form );
 
-    /**
-     * Is the current nonce valid for editing the entry?
-     * @return boolean
-     */
-    public function verify_nonce() {
+		if( $use_conditional_logic ) {
+			return $form;
+		}
 
-        // Verify form submitted for editing single
-        if( $this->is_edit_entry_submission() ) {
-            $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
-        }
+		foreach( $form['fields'] as &$field ) {
+			/* @var GF_Field $field */
+			$field->conditionalLogic = null;
+		}
 
-        // Verify
-        else if( ! $this->is_edit_entry() ) {
-            $valid = false;
-        }
+		unset( $form['button']['conditionalLogic'] );
 
-        else {
-            $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
-        }
+		return $form;
 
-        /**
-         * @filter `gravityview/edit_entry/verify_nonce` Override Edit Entry nonce validation. Return true to declare nonce valid.
-         * @since 1.13
-         * @param int|boolean $valid False if invalid; 1 or 2 when nonce was generated
-         * @param string $nonce_field Key used when validating submissions. Default: is_gv_edit_entry
-         */
-        $valid = apply_filters( 'gravityview/edit_entry/verify_nonce', $valid, self::$nonce_field );
+	}
+
+	/**
+	 * Disable the Gravity Forms conditional logic script and features on the Edit Entry screen
+	 *
+	 * @since 1.9
+	 *
+	 * @param $has_conditional_logic
+	 * @param $form
+	 * @return mixed
+	 */
+	public function manage_conditional_logic( $has_conditional_logic, $form ) {
+
+		if( ! $this->is_edit_entry() ) {
+			return $has_conditional_logic;
+		}
 
-        return $valid;
-    }
+		/** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */
+		return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form );
+	}
+
+
+	// --- User checks and nonces
+
+	/**
+	 * Check if the user can edit the entry
+	 *
+	 * - Is the nonce valid?
+	 * - Does the user have the right caps for the entry
+	 * - Is the entry in the trash?
+	 *
+	 * @todo Move to GVCommon
+	 *
+	 * @param  boolean $echo Show error messages in the form?
+	 * @return boolean        True: can edit form. False: nope.
+	 */
+	private function user_can_edit_entry( $echo = false ) {
+
+		$error = NULL;
+
+		/**
+		 *  1. Permalinks are turned off
+		 *  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'] ) ) {
+
+			$error = true;
+
+		}
+
+		if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) {
+
+			$error = true;
+
+		} 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() ) {
+				$error = true;
+			} else {
+				$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( $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 ) ) {
+			return true;
+		}
+
+		if( $echo && $error !== true ) {
+
+			$error = esc_html( $error );
+
+			/**
+			 * @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;" ) );
+			}
+
+			echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
+		}
+
+		do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error );
+
+		return false;
+	}
+
+
+	/**
+	 * Check whether a field is editable by the current user, and optionally display an error message
+	 * @uses  GravityView_Edit_Entry->check_user_cap_edit_field() Check user capabilities
+	 * @param  array  $field Field or field settings array
+	 * @param  boolean $echo  Whether to show error message telling user they aren't allowed
+	 * @return boolean         True: user can edit the current field; False: nope, they can't.
+	 */
+	private function user_can_edit_field( $field, $echo = false ) {
+
+		$error = NULL;
+
+		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 ) ) {
+			return true;
+		}
+
+		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 );
+
+		return false;
+
+	}
+
+
+	/**
+	 * checks if user has permissions to edit a specific field
+	 *
+	 * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_field for maximum security!!
+	 *
+	 * @param  [type] $field [description]
+	 * @return bool
+	 */
+	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' ) ) ) {
+			return true;
+		}
+
+		$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'] );
+		}
+
+		return false;
+	}
+
+
+	/**
+	 * Is the current nonce valid for editing the entry?
+	 * @return boolean
+	 */
+	public function verify_nonce() {
+
+		// Verify form submitted for editing single
+		if( $this->is_edit_entry_submission() ) {
+			$valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
+		}
+
+		// Verify
+		else if( ! $this->is_edit_entry() ) {
+			$valid = false;
+		}
+
+		else {
+			$valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
+		}
+
+		/**
+		 * @filter `gravityview/edit_entry/verify_nonce` Override Edit Entry nonce validation. Return true to declare nonce valid.
+		 * @since 1.13
+		 * @param int|boolean $valid False if invalid; 1 or 2 when nonce was generated
+		 * @param string $nonce_field Key used when validating submissions. Default: is_gv_edit_entry
+		 */
+		$valid = apply_filters( 'gravityview/edit_entry/verify_nonce', $valid, self::$nonce_field );
+
+		return $valid;
+	}
 
 
 	/**

Spacing +226 added lines, -226 removed lines

@@ -106,16 +106,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' ) );
 
@@ -126,7 +126,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' ) );
 
 		// Fix multiselect value for GF 2.2
 		add_filter( 'gravityview/edit_entry/field_value_multiselect', array( $this, 'fix_multiselect_value_serialization' ), 10, 3 );
@@ -143,8 +143,8 @@ 
      * @return void
      */
     public 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' );
@@ -159,13 +159,13 @@ 
      */
     public function prevent_maybe_process_form() {
 
-        if( ! empty( $_POST ) ) {
+        if ( ! empty( $_POST ) ) {
 	        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() ) {
-            remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
-	        remove_action( 'wp',  array( 'GFForms', 'maybe_process_form'), 9 );
+        if ( $this->is_edit_entry_submission() ) {
+            remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 );
+	        remove_action( 'wp', array( 'GFForms', 'maybe_process_form' ), 9 );
         }
     }
 
@@ -175,7 +175,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() );
     }
@@ -186,7 +186,7 @@ 
 	 * @return boolean
 	 */
 	public function is_edit_entry_submission() {
-		return !empty( $_POST[ self::$nonce_field ] );
+		return ! empty( $_POST[ self::$nonce_field ] );
 	}
 
     /**
@@ -197,15 +197,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' ] );
     }
 
 
@@ -226,14 +226,14 @@ 
 
         // Multiple Views embedded, don't proceed if nonce fails
 		$multiple_views = defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? gravityview()->views->count() > 1 : $gv_data->has_multiple_views();
-        if( $multiple_views && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) {
-            do_action('gravityview_log_error', __METHOD__ . ': Nonce validation failed for the Edit Entry request; returning' );
+        if ( $multiple_views && ! wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ) ) {
+            do_action( 'gravityview_log_error', __METHOD__ . ': Nonce validation failed for the Edit Entry request; returning' );
             return;
         }
 
         // Sorry, you're not allowed here.
-        if( false === $this->user_can_edit_entry( true ) ) {
-            do_action('gravityview_log_error', __METHOD__ . ': User is not allowed to edit this entry; returning', $this->entry );
+        if ( false === $this->user_can_edit_entry( true ) ) {
+            do_action( 'gravityview_log_error', __METHOD__ . ': User is not allowed to edit this entry; returning', $this->entry );
             return;
         }
 
@@ -253,9 +253,9 @@ 
     private 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' ) );
@@ -267,32 +267,32 @@ 
      */
     private 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', __METHOD__ . ': $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+        do_action( 'gravityview_log_debug', __METHOD__ . ': $_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', __METHOD__ . ': Submission is valid.' );
+            do_action( 'gravityview_log_debug', __METHOD__ . ': Submission is valid.' );
 
             /**
              * @hack This step is needed to unset the adminOnly from form fields, to add the calculation fields
@@ -302,22 +302,22 @@ 
             /**
              * @hack to avoid the capability validation of the method save_lead for GF 1.9+
              */
-            unset( $_GET['page'] );
+            unset( $_GET[ 'page' ] );
 
-            $date_created = $this->entry['date_created'];
+            $date_created = $this->entry[ 'date_created' ];
 
             /**
              * @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead()
              * @since 1.17.2
              */
-            unset( $this->entry['date_created'] );
+            unset( $this->entry[ 'date_created' ] );
 
             GFFormsModel::save_lead( $form, $this->entry );
 
 	        // Delete the values for hidden inputs
 	        $this->unset_hidden_field_values();
             
-            $this->entry['date_created'] = $date_created;
+            $this->entry[ 'date_created' ] = $date_created;
 
             // Process calculation fields
             $this->update_calculation_fields();
@@ -337,10 +337,10 @@ 
              * @param string $entry_id Numeric ID of the entry that was updated
              * @param GravityView_Edit_Entry_Render $this This object
              */
-            do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this );
+            do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this );
 
         } else {
-            do_action('gravityview_log_error', __METHOD__ . ': Submission is NOT valid.', $this->entry );
+            do_action( 'gravityview_log_error', __METHOD__ . ': Submission is NOT valid.', $this->entry );
         }
 
     } // process_save
@@ -359,10 +359,10 @@ 
 
 		if ( method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) {
 			$entry_meta_table = GFFormsModel::get_entry_meta_table_name();
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) );
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $entry_meta_table WHERE entry_id=%d", $this->entry[ 'id' ] ) );
 		} else {
 			$lead_detail_table = GFFormsModel::get_lead_details_table_name();
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) );
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) );
 		}
 
 	    foreach ( $this->entry as $input_id => $field_value ) {
@@ -443,7 +443,7 @@ 
 		}
 
 		/** No file is being uploaded. */
-		if ( empty( $_FILES[ $input_name ]['name'] ) ) {
+		if ( empty( $_FILES[ $input_name ][ 'name' ] ) ) {
 			/** So return the original upload */
 			return $entry[ $input_id ];
 		}
@@ -461,11 +461,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;
     }
@@ -480,22 +480,22 @@ 
         $form = $this->form;
 
 	    /** @var GF_Field $field */
-        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
              * @var GF_Field $field
              */
-            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' ];
                 }
             }
         }
@@ -509,30 +509,30 @@ 
         $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 );
                 }
             }
 
         }
 
-        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 fields failed', $return_entry );
             } else {
                 do_action( 'gravityview_log_debug', 'Updating the entry calculation fields succeeded' );
@@ -563,18 +563,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,
@@ -583,7 +583,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;
             }
 
             /**
@@ -598,13 +598,13 @@ 
                 set_post_thumbnail( $post_id, $media_id );
             }
 
-        } elseif ( !empty( $_POST[ $input_name ] ) && is_array( $value ) ) {
+        } elseif ( ! empty( $_POST[ $input_name ] ) && is_array( $value ) ) {
 
             $img_url = $_POST[ $input_name ];
 
-			$img_title       = rgar( $_POST, $input_name.'_1' );
-			$img_caption     = rgar( $_POST, $input_name .'_4' );
-			$img_description = rgar( $_POST, $input_name .'_7' );
+			$img_title       = rgar( $_POST, $input_name . '_1' );
+			$img_caption     = rgar( $_POST, $input_name . '_4' );
+			$img_description = rgar( $_POST, $input_name . '_7' );
 
 			$value = ! empty( $img_url ) ? $img_url . "|:|" . $img_title . "|:|" . $img_caption . "|:|" . $img_description : '';
 
@@ -642,16 +642,16 @@ 
      */
     private function maybe_update_post_fields( $form ) {
 
-        if( empty( $this->entry['post_id'] ) ) {
+        if ( empty( $this->entry[ 'post_id' ] ) ) {
 	        do_action( 'gravityview_log_debug', __METHOD__ . ': This entry has no post fields. Continuing...' );
             return;
         }
 
-        $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;
         }
 
@@ -663,25 +663,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;
@@ -690,8 +690,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 );
@@ -709,12 +709,12 @@ 
 							$value = $value[ $field_id ];
 						}
 
-                        if( ! empty( $field->customFieldTemplateEnabled ) ) {
+                        if ( ! empty( $field->customFieldTemplateEnabled ) ) {
                             $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
                         }
 
 	                    if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) {
-		                    $value = function_exists('wp_json_encode') ? wp_json_encode( $value ) : json_encode( $value );
+		                    $value = function_exists( 'wp_json_encode' ) ? wp_json_encode( $value ) : json_encode( $value );
 	                    }
 
                         update_post_meta( $post_id, $field->postCustomFieldName, $value );
@@ -727,7 +727,7 @@ 
                 }
 
                 // update entry after
-                $this->entry["{$field_id}"] = $value;
+                $this->entry[ "{$field_id}" ] = $value;
 
                 $update_entry = true;
 
@@ -736,25 +736,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 );
         }
     }
 
@@ -772,7 +772,7 @@ 
         $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':
@@ -809,7 +809,7 @@ 
         $output = GFCommon::replace_variables( $output, $form, $entry, false, false, false );
 
         // replace conditional shortcodes
-        if( $do_shortcode ) {
+        if ( $do_shortcode ) {
             $output = do_shortcode( $output );
         }
 
@@ -828,19 +828,19 @@ 
      */
     private 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'], self::$original_entry );
+        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' ], self::$original_entry );
 
         // 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 );
 
 		if ( ! method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) {
 			// 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 );
 			}
 		}
 
@@ -859,7 +859,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
@@ -875,7 +875,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>
@@ -921,20 +921,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)
@@ -944,7 +944,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 );
             }
@@ -968,21 +968,21 @@ 
          */
         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 );
 
         // 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
 
         ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic
 
-        $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
+        $html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry );
 
         ob_get_clean();
 
@@ -1008,7 +1008,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 );
     }
 
 
@@ -1028,10 +1028,10 @@ 
     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 );
@@ -1039,8 +1039,8 @@ 
         $form = $this->prefill_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;
@@ -1061,29 +1061,29 @@ 
      */
     public 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 ) );
             }
         }
 
@@ -1108,8 +1108,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' ) ) )
             && ! GFCommon::is_product_field( $field->type )
             || ! empty( $field_content )
@@ -1129,7 +1129,7 @@ 
 	    $return = null;
 
         /** @var GravityView_Field $gv_field */
-        if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
+        if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
             $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
         } else {
 	        $return = $field->get_field_input( $this->form, $field_value, $this->entry );
@@ -1138,7 +1138,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 );
 	    }
 
@@ -1163,7 +1163,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();
 
@@ -1172,10 +1172,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;
                 }
 
@@ -1183,7 +1183,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 {
 
@@ -1194,13 +1194,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 );
             }
@@ -1228,7 +1228,7 @@ 
 	     * @param GF_Field $field Gravity Forms field object
 	     * @param GravityView_Edit_Entry_Render $this Current object
 	     */
-	    $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
+	    $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field, $this );
 
         return $field_value;
     }
@@ -1245,12 +1245,12 @@ 
      */
     public 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.
@@ -1258,7 +1258,7 @@ 
 	            $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
             }
 
-            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.
@@ -1272,37 +1272,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 {
@@ -1320,8 +1320,8 @@ 
 
                 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;
             }
@@ -1358,7 +1358,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;
@@ -1366,14 +1366,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 );
     }
 
 
@@ -1390,13 +1390,13 @@ 
      */
     public 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 );
@@ -1409,35 +1409,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;
                         }
 
                     }
@@ -1448,7 +1448,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 ) );
 
@@ -1466,32 +1466,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;
@@ -1503,12 +1503,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;
     }
@@ -1521,7 +1521,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() );
         }
@@ -1556,10 +1556,10 @@ 
 		}
 
         // 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;
 
         // 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 );
@@ -1591,7 +1591,7 @@ 
      */
     private function filter_fields( $fields, $configured_fields ) {
 
-        if( empty( $fields ) || !is_array( $fields ) ) {
+        if ( empty( $fields ) || ! is_array( $fields ) ) {
             return $fields;
         }
 
@@ -1604,18 +1604,18 @@ 
 
             // 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.
             }
 
-            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;
         }
 
@@ -1625,8 +1625,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;
                 }
 
@@ -1649,14 +1649,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' ] );
         }
 
         /**
@@ -1694,16 +1694,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;
         }
 
@@ -1727,22 +1727,22 @@ 
      */
     function prefill_conditional_logic( $form ) {
 
-        if( ! GFFormDisplay::has_conditional_logic( $form ) ) {
+        if ( ! GFFormDisplay::has_conditional_logic( $form ) ) {
             return $form;
         }
 
         // Have Conditional Logic pre-fill fields as if the data were default values
         /** @var GF_Field $field */
-        foreach ( $form['fields'] as &$field ) {
+        foreach ( $form[ 'fields' ] as &$field ) {
 
-            if( 'checkbox' === $field->type ) {
+            if ( 'checkbox' === $field->type ) {
                 foreach ( $field->get_entry_inputs() as $key => $input ) {
-                    $input_id = $input['id'];
+                    $input_id = $input[ 'id' ];
                     $choice = $field->choices[ $key ];
                     $value = rgar( $this->entry, $input_id );
                     $match = RGFormsModel::choice_value_match( $field, $choice, $value );
-                    if( $match ) {
-                        $field->choices[ $key ]['isSelected'] = true;
+                    if ( $match ) {
+                        $field->choices[ $key ][ 'isSelected' ] = true;
                     }
                 }
             } else {
@@ -1750,15 +1750,15 @@ 
                 // We need to run through each field to set the default values
                 foreach ( $this->entry as $field_id => $field_value ) {
 
-                    if( floatval( $field_id ) === floatval( $field->id ) ) {
+                    if ( floatval( $field_id ) === floatval( $field->id ) ) {
 
-                        if( 'list' === $field->type ) {
+                        if ( 'list' === $field->type ) {
                             $list_rows = maybe_unserialize( $field_value );
 
                             $list_field_value = array();
-                            foreach ( (array) $list_rows as $row ) {
-                                foreach ( (array) $row as $column ) {
-                                    $list_field_value[] = $column;
+                            foreach ( (array)$list_rows as $row ) {
+                                foreach ( (array)$row as $column ) {
+                                    $list_field_value[ ] = $column;
                                 }
                             }
 
@@ -1793,16 +1793,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;
 
@@ -1819,7 +1819,7 @@ 
      */
     public function manage_conditional_logic( $has_conditional_logic, $form ) {
 
-        if( ! $this->is_edit_entry() ) {
+        if ( ! $this->is_edit_entry() ) {
             return $has_conditional_logic;
         }
 
@@ -1851,44 +1851,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 );
 
@@ -1896,13 +1896,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;
     }
@@ -1919,20 +1919,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;
 
@@ -1950,15 +1950,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;
@@ -1972,17 +1972,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 );
         }
 
         /**

includes/class-gravityview-uninstall.php

Spacing +10 added lines, -10 removed lines

@@ -42,12 +42,12 @@ 
 		$tables = array();
 
 		if ( method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) {
-			$tables []= GFFormsModel::get_entry_meta_table_name();
+			$tables [ ] = GFFormsModel::get_entry_meta_table_name();
 		} else if ( method_exists( 'GFFormsModel', 'get_lead_meta_table_name' ) ) {
-			$tables []= GFFormsModel::get_lead_meta_table_name();
+			$tables [ ] = GFFormsModel::get_lead_meta_table_name();
 		} else {
-			$tables []= $wpdb->prefix . 'rg_lead_meta';
-			$tables []= $wpdb->prefix . 'gf_entry_meta';
+			$tables [ ] = $wpdb->prefix . 'rg_lead_meta';
+			$tables [ ] = $wpdb->prefix . 'gf_entry_meta';
 		}
 
 		$suppress = $wpdb->suppress_errors();
@@ -74,16 +74,16 @@ 
 		$tables = array();
 
 		if ( method_exists( 'GFFormsModel', 'get_entry_notes_table_name' ) ) {
-			$tables []= GFFormsModel::get_entry_notes_table_name();
+			$tables [ ] = GFFormsModel::get_entry_notes_table_name();
 		} else if ( method_exists( 'GFFormsModel', 'get_lead_notes_table_name' ) ) {
-			$tables []= GFFormsModel::get_lead_notes_table_name();
+			$tables [ ] = GFFormsModel::get_lead_notes_table_name();
 		} else {
-			$tables []= $wpdb->prefix . 'rg_lead_notes';
-			$tables []= $wpdb->prefix . 'gf_entry_notes';
+			$tables [ ] = $wpdb->prefix . 'rg_lead_notes';
+			$tables [ ] = $wpdb->prefix . 'gf_entry_notes';
 		}
 
-		$disapproved = __('Disapproved the Entry for GravityView', 'gravityview');
-		$approved = __('Approved the Entry for GravityView', 'gravityview');
+		$disapproved = __( 'Disapproved the Entry for GravityView', 'gravityview' );
+		$approved = __( 'Approved the Entry for GravityView', 'gravityview' );
 
 		$suppress = $wpdb->suppress_errors();
 		foreach ( $tables as $notes_table ) {

includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-elegant-themes.php

Spacing +3 added lines, -3 removed lines

@@ -79,11 +79,11 @@ 
 		}
 
 		$sidebars_widgets = wp_get_sidebars_widgets();
-		if ( empty( $sidebars_widgets[ $matches[1] ] ) ) {
+		if ( empty( $sidebars_widgets[ $matches[ 1 ] ] ) ) {
 			return $shortcodes;
 		}
 
-		foreach ( $sidebars_widgets[ $matches[1] ] as $widgets ) {
+		foreach ( $sidebars_widgets[ $matches[ 1 ] ] as $widgets ) {
 			if (
 				/**
 				 * Blacklisted widgets.
@@ -92,7 +92,7 @@ 
 				strpos( $widgets, 'gv_recent_entries' ) === 0
 			) {
 
-					$shortcodes []= 'et_pb_sidebar';
+					$shortcodes [ ] = 'et_pb_sidebar';
 					break;
 			}
 		}

includes/class-gravityview-settings.php

Indentation +95 added lines, -95 removed lines

@@ -122,10 +122,10 @@ 
 	}
 
 	/**
-     * Uninstall all traces of GravityView
-     *
-     * Note: method is public because parent method is public
-     *
+	 * Uninstall all traces of GravityView
+	 *
+	 * Note: method is public because parent method is public
+	 *
 	 * @return bool
 	 */
 	public function uninstall() {
@@ -137,53 +137,53 @@ 
 		$uninstaller->fire_everything();
 
 		/**
-         * Set the path so that Gravity Forms can de-activate GravityView
-         * @see GFAddOn::uninstall_addon
-         * @uses deactivate_plugins()
-         */
+		 * Set the path so that Gravity Forms can de-activate GravityView
+		 * @see GFAddOn::uninstall_addon
+		 * @uses deactivate_plugins()
+		 */
 		$this->_path = GRAVITYVIEW_FILE;
 
 		return true;
 	}
 
 	/**
-     * Get an array of reasons why the plugin might be uninstalled
-     *
-     * @since 1.17.5
-     *
+	 * Get an array of reasons why the plugin might be uninstalled
+	 *
+	 * @since 1.17.5
+	 *
 	 * @return array Array of reasons with the label and followup questions for each uninstall reason
 	 */
 	private function get_uninstall_reasons() {
 
 		$reasons = array(
 			'will-continue' => array(
-                'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ),
-            ),
+				'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ),
+			),
 			'no-longer-need' => array(
-                'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ),
-            ),
+				'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ),
+			),
 			'doesnt-work' => array(
-                'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ),
-            ),
+				'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ),
+			),
 			'found-other' => array(
-                'label' => esc_html__( 'I found a better plugin', 'gravityview' ),
-                'followup' => esc_attr__('What plugin you are using, and why?', 'gravityview'),
-            ),
+				'label' => esc_html__( 'I found a better plugin', 'gravityview' ),
+				'followup' => esc_attr__('What plugin you are using, and why?', 'gravityview'),
+			),
 			'other' => array(
-                'label' => esc_html__( 'Other', 'gravityview' ),
-            ),
+				'label' => esc_html__( 'Other', 'gravityview' ),
+			),
 		);
 
 		shuffle( $reasons );
 
 		return $reasons;
-    }
+	}
 
 	/**
-     * Display a feedback form when the plugin is uninstalled
-     *
-     * @since 1.17.5
-     *
+	 * Display a feedback form when the plugin is uninstalled
+	 *
+	 * @since 1.17.5
+	 *
 	 * @return string HTML of the uninstallation form
 	 */
 	public function uninstall_form() {
@@ -263,7 +263,7 @@ 
             <h2><?php esc_html_e( 'Why did you uninstall GravityView?', 'gravityview' ); ?></h2>
             <ul>
 				<?php
-                $reasons = $this->get_uninstall_reasons();
+				$reasons = $this->get_uninstall_reasons();
 				foreach ( $reasons as $reason ) {
 					printf( '<li><label><input name="reason" type="radio" value="other" data-followup="%s"> %s</label></li>', rgar( $reason, 'followup' ), rgar( $reason, 'label' ) );
 				}
@@ -426,7 +426,7 @@ 
 		$license_key = self::getSetting('license_key');
 		if( '' === $license_key ) {
 			$license_status = 'inactive';
-        }
+		}
 		$license_id = empty( $license_key ) ? 'license' : $license_key;
 
 		$message = esc_html__('Your GravityView license %s. This means you&rsquo;re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview');
@@ -441,7 +441,7 @@ 
 		$update_below = false;
 		$primary_button_link = admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' );
 
-        switch ( $license_status ) {
+		switch ( $license_status ) {
 			/** @since 1.17 */
 			case 'expired':
 				$title = __('Expired License', 'gravityview');
@@ -487,12 +487,12 @@ 
 	}
 
 	/**
-     * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason.
-     *
-     * @since 1.21.5
-     *
-     * @see GFAddOn::scripts()
-     *
+	 * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason.
+	 *
+	 * @since 1.21.5
+	 *
+	 * @see GFAddOn::scripts()
+	 *
 	 * @return array Array of scripts
 	 */
 	public function scripts() {
@@ -501,10 +501,10 @@ 
 		$scripts[] = array(
 			'handle'  => 'gform_tooltip_init',
 			'enqueue' => array(
-                array(
-			        'admin_page' => array( 'app_settings' )
-                )
-            )
+				array(
+					'admin_page' => array( 'app_settings' )
+				)
+			)
 		);
 
 		return $scripts;
@@ -523,10 +523,10 @@ 
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
 			'version' => GravityView_Plugin::version,
 			"deps" => array(
-                'gform_admin',
+				'gform_admin',
 				'gaddon_form_settings_css',
-                'gform_tooltip',
-                'gform_font_awesome',
+				'gform_tooltip',
+				'gform_font_awesome',
 			),
 			'enqueue' => array(
 				array( 'admin_page' => array(
@@ -592,12 +592,12 @@ 
 	}
 
 	public function app_settings_tab() {
-	    parent::app_settings_tab();
+		parent::app_settings_tab();
 
 		if ( $this->maybe_uninstall() ) {
-            echo $this->uninstall_form();
+			echo $this->uninstall_form();
 		}
-    }
+	}
 
 	/**
 	 * Make protected public
@@ -633,7 +633,7 @@ 
 	 */
 	public function get_app_settings() {
 
-	    $settings = get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', $this->get_default_settings() );
+		$settings = get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', $this->get_default_settings() );
 
 		if( defined( 'GRAVITYVIEW_LICENSE_KEY' ) ) {
 			$settings['license_key'] = GRAVITYVIEW_LICENSE_KEY;
@@ -674,9 +674,9 @@ 
 	 */
 	protected function settings_edd_license( $field, $echo = true ) {
 
-	    if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
-		    $field['input_type'] = 'password';
-        }
+		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
+			$field['input_type'] = 'password';
+		}
 
 		$text = $this->settings_text( $field, false );
 
@@ -731,8 +731,8 @@ 
                     type="' . $field['type'] . '"
                     name="' . esc_attr( $name ) . '"
                     value="' . $value . '" ' .
-		        implode( ' ', $attributes ) .
-		        ' />';
+				implode( ' ', $attributes ) .
+				' />';
 
 		if ( $echo ) {
 			echo $html;
@@ -773,19 +773,19 @@ 
 
 
 	/**
-     * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it
-     *
-     * Converts `$field['description']` to `$field['gv_description']`
-     * Converts `$field['subtitle']` to `$field['description']`
-     *
-     * @see GravityView_Settings::single_setting_label Converts `gv_description` back to `description`
-     * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description
-     *
-     * @since 1.21.5.2
-     *
+	 * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it
+	 *
+	 * Converts `$field['description']` to `$field['gv_description']`
+	 * Converts `$field['subtitle']` to `$field['description']`
+	 *
+	 * @see GravityView_Settings::single_setting_label Converts `gv_description` back to `description`
+	 * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description
+	 *
+	 * @since 1.21.5.2
+	 *
 	 * @param array $field
-     *
-     * @return void
+	 *
+	 * @return void
 	 */
 	public function single_setting_row( $field ) {
 
@@ -980,7 +980,7 @@ 
 					array(
 						'label' => _x('Show me beta versions if they are available.', 'gravityview'),
 						'value' => '1',
-                        'name'  => 'beta',
+						'name'  => 'beta',
 					),
 				),
 				'description'   => __( 'You will have early access to the latest GravityView features and improvements. There may be bugs! If you encounter an issue, help make GravityView better by reporting it!', 'gravityview'),
@@ -1005,39 +1005,39 @@ 
 
 			if( empty( $field['disabled'] ) ) {
 				unset( $field['disabled'] );
-            }
+			}
 		}
 
-        $sections = array(
-            array(
-                'description' =>      sprintf( '<span class="version-info description">%s</span>', sprintf( __('You are running GravityView version %s', 'gravityview'), GravityView_Plugin::version ) ),
-                'fields'      => $fields,
-            )
-        );
+		$sections = array(
+			array(
+				'description' =>      sprintf( '<span class="version-info description">%s</span>', sprintf( __('You are running GravityView version %s', 'gravityview'), GravityView_Plugin::version ) ),
+				'fields'      => $fields,
+			)
+		);
 
-        // custom 'update settings' button
-        $button = array(
-            'class' => 'button button-primary button-hero',
-            'type'     => 'save',
-        );
+		// custom 'update settings' button
+		$button = array(
+			'class' => 'button button-primary button-hero',
+			'type'     => 'save',
+		);
 
 		if( $disabled_attribute ) {
 			$button['disabled'] = $disabled_attribute;
 		}
 
 
-        /**
-         * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
-         * Extensions can tap in here to insert their own section and settings.
-         * <code>
-         *   $sections[] = array(
-         *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
-         *      'fields' => $settings,
-         *   );
-         * </code>
-         * @param array $extension_settings Empty array, ready for extension settings!
-         */
-        $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
+		/**
+		 * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
+		 * Extensions can tap in here to insert their own section and settings.
+		 * <code>
+		 *   $sections[] = array(
+		 *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
+		 *      'fields' => $settings,
+		 *   );
+		 * </code>
+		 * @param array $extension_settings Empty array, ready for extension settings!
+		 */
+		$extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
 
 		// If there are extensions, add a section for them
 		if ( ! empty( $extension_sections ) ) {
@@ -1050,13 +1050,13 @@ 
 				}
 			}
 
-            $k = count( $extension_sections ) - 1 ;
-            $extension_sections[ $k ]['fields'][] = $button;
+			$k = count( $extension_sections ) - 1 ;
+			$extension_sections[ $k ]['fields'][] = $button;
 			$sections = array_merge( $sections, $extension_sections );
 		} else {
-            // add the 'update settings' button to the general section
-            $sections[0]['fields'][] = $button;
-        }
+			// add the 'update settings' button to the general section
+			$sections[0]['fields'][] = $button;
+		}
 
 		return $sections;
 	}

Spacing +93 added lines, -93 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if( ! class_exists('GFAddOn') ) {
+if ( ! class_exists( 'GFAddOn' ) ) {
 	return;
 }
 
@@ -75,7 +75,7 @@ 
 	 */
 	public function __construct( $prevent_multiple_instances = '' ) {
 
-		if( $prevent_multiple_instances === 'get_instance' ) {
+		if ( $prevent_multiple_instances === 'get_instance' ) {
 			return parent::__construct();
 		}
 
@@ -87,7 +87,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self( 'get_instance' );
 		}
 
@@ -106,7 +106,7 @@ 
 	 */
 	public function current_user_can_any( $caps ) {
 
-		if( empty( $caps ) ) {
+		if ( empty( $caps ) ) {
 			$caps = array( 'gravityview_full_access' );
 		}
 
@@ -167,7 +167,7 @@ 
             ),
 			'found-other' => array(
                 'label' => esc_html__( 'I found a better plugin', 'gravityview' ),
-                'followup' => esc_attr__('What plugin you are using, and why?', 'gravityview'),
+                'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ),
             ),
 			'other' => array(
                 'label' => esc_html__( 'Other', 'gravityview' ),
@@ -254,7 +254,7 @@ 
                 });
 
                 function gv_feedback_append_error_message() {
-                    $('#gv-uninstall-thanks').append('<div class="notice error"><?php echo esc_js( __('There was an error sharing your feedback. Sorry! Please email us at support@gravityview.co', 'gravityview' ) ) ?></div>');
+                    $('#gv-uninstall-thanks').append('<div class="notice error"><?php echo esc_js( __( 'There was an error sharing your feedback. Sorry! Please email us at support@gravityview.co', 'gravityview' ) ) ?></div>');
                 }
             });
         </script>
@@ -271,15 +271,15 @@ 
             </ul>
             <div class="gv-followup widefat">
                 <p><strong><label for="gv-reason-details"><?php esc_html_e( 'Comments', 'gravityview' ); ?></label></strong></p>
-                <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview') ?>" placeholder="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview'); ?>" class="large-text"></textarea>
+                <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ) ?>" placeholder="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ); ?>" class="large-text"></textarea>
             </div>
             <div class="scale-description">
-                <p><strong><?php esc_html_e('How likely are you to recommend GravityView?', 'gravityview' ); ?></strong></p>
+                <p><strong><?php esc_html_e( 'How likely are you to recommend GravityView?', 'gravityview' ); ?></strong></p>
                 <ul class="inline">
 					<?php
 					$i = 0;
-					while( $i < 11 ) {
-						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_'.$i.'" value="'.$i.'" type="radio"> '.$i.'</label></li>';
+					while ( $i < 11 ) {
+						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>';
 						$i++;
 					}
 					?>
@@ -288,7 +288,7 @@ 
             </div>
 
             <div class="gv-form-field-wrapper">
-                <label><input type="checkbox" class="checkbox" name="follow_up_with_me" value="1" /> <?php esc_html_e('Please follow up with me about my feedback', 'gravityview'); ?></label>
+                <label><input type="checkbox" class="checkbox" name="follow_up_with_me" value="1" /> <?php esc_html_e( 'Please follow up with me about my feedback', 'gravityview' ); ?></label>
             </div>
 
             <div class="submit">
@@ -302,7 +302,7 @@ 
         <div id="gv-uninstall-thanks" class="notice notice-large notice-updated below-h2" style="display:none;">
             <h3 class="notice-title"><?php esc_html_e( 'Thank you for using GravityView!', 'gravityview' ); ?></h3>
             <p><?php echo gravityview_get_floaty(); ?>
-				<?php echo make_clickable( esc_html__('Your feedback helps us improve GravityView. If you have any questions or comments, email us: support@gravityview.co', 'gravityview' ) ); ?>
+				<?php echo make_clickable( esc_html__( 'Your feedback helps us improve GravityView. If you have any questions or comments, email us: support@gravityview.co', 'gravityview' ) ); ?>
             </p>
             <div class="wp-clearfix"></div>
         </div>
@@ -376,7 +376,7 @@ 
 		add_filter( 'gform_addon_app_settings_menu_gravityview', array( $this, 'modify_app_settings_menu_title' ) );
 
 		/** @since 1.7.6 */
-		add_action('network_admin_menu', array( $this, 'add_network_menu' ) );
+		add_action( 'network_admin_menu', array( $this, 'add_network_menu' ) );
 
 		parent::init_admin();
 	}
@@ -390,7 +390,7 @@ 
 	 */
 	public function modify_app_settings_menu_title( $setting_tabs ) {
 
-		$setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview');
+		$setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' );
 
 		return $setting_tabs;
 	}
@@ -407,11 +407,11 @@ 
 	 */
 	private function _load_license_handler() {
 
-		if( !empty( $this->License_Handler ) ) {
+		if ( ! empty( $this->License_Handler ) ) {
 			return;
 		}
 
-		require_once( GRAVITYVIEW_DIR . 'includes/class-gv-license-handler.php');
+		require_once( GRAVITYVIEW_DIR . 'includes/class-gv-license-handler.php' );
 
 		$this->License_Handler = GV_License_Handler::get_instance( $this );
 	}
@@ -422,21 +422,21 @@ 
 	 */
 	function license_key_notice() {
 
-		$license_status = self::getSetting('license_key_status');
-		$license_key = self::getSetting('license_key');
-		if( '' === $license_key ) {
+		$license_status = self::getSetting( 'license_key_status' );
+		$license_key = self::getSetting( 'license_key' );
+		if ( '' === $license_key ) {
 			$license_status = 'inactive';
         }
 		$license_id = empty( $license_key ) ? 'license' : $license_key;
 
-		$message = esc_html__('Your GravityView license %s. This means you&rsquo;re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview');
+		$message = esc_html__( 'Your GravityView license %s. This means you&rsquo;re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview' );
 
 		/**
 		 * I wanted to remove the period from after the buttons in the string,
 		 * but didn't want to mess up the translation strings for the translators.
 		 */
 		$message = mb_substr( $message, 0, mb_strlen( $message ) - 1 );
-		$title = __('Inactive License', 'gravityview');
+		$title = __( 'Inactive License', 'gravityview' );
 		$status = '';
 		$update_below = false;
 		$primary_button_link = admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' );
@@ -444,17 +444,17 @@ 
         switch ( $license_status ) {
 			/** @since 1.17 */
 			case 'expired':
-				$title = __('Expired License', 'gravityview');
+				$title = __( 'Expired License', 'gravityview' );
 				$status = 'expired';
-				$message = $this->get_license_handler()->strings( 'expired', self::getSetting('license_key_response') );
+				$message = $this->get_license_handler()->strings( 'expired', self::getSetting( 'license_key_response' ) );
 				break;
 			case 'invalid':
-				$title = __('Invalid License', 'gravityview');
-				$status = __('is invalid', 'gravityview');
+				$title = __( 'Invalid License', 'gravityview' );
+				$status = __( 'is invalid', 'gravityview' );
 				break;
 			case 'deactivated':
-				$status = __('is inactive', 'gravityview');
-				$update_below = __('Activate your license key below.', 'gravityview');
+				$status = __( 'is inactive', 'gravityview' );
+				$update_below = __( 'Activate your license key below.', 'gravityview' );
 				break;
 			/** @noinspection PhpMissingBreakStatementInspection */
 			case '':
@@ -462,20 +462,20 @@ 
 				// break intentionally left blank
 			case 'inactive':
 			case 'site_inactive':
-				$status = __('has not been activated', 'gravityview');
-				$update_below = __('Activate your license key below.', 'gravityview');
+				$status = __( 'has not been activated', 'gravityview' );
+				$update_below = __( 'Activate your license key below.', 'gravityview' );
 				break;
 		}
-		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice';
+		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content=' . $license_status . '&utm_campaign=Admin%20Notice';
 
 		// Show a different notice on settings page for inactive licenses (hide the buttons)
-		if( $update_below && gravityview_is_admin_page( '', 'settings' ) ) {
+		if ( $update_below && gravityview_is_admin_page( '', 'settings' ) ) {
 			$message = sprintf( $message, $status, '<div class="hidden">', '', '', '</div><a href="#" onclick="jQuery(\'#license_key\').focus(); return false;">' . $update_below . '</a>' );
 		} else {
 			$message = sprintf( $message, $status, "\n\n" . '<a href="' . esc_url( $primary_button_link ) . '" class="button button-primary">', '</a>', '<a href="' . esc_url( $url ) . '" class="button button-secondary">', '</a>' );
 		}
 
-		if( !empty( $status ) ) {
+		if ( ! empty( $status ) ) {
 			GravityView_Admin_Notices::add_notice( array(
 				'message' => $message,
 				'class'   => 'updated',
@@ -498,7 +498,7 @@ 
 	public function scripts() {
 		$scripts = parent::scripts();
 
-		$scripts[] = array(
+		$scripts[ ] = array(
 			'handle'  => 'gform_tooltip_init',
 			'enqueue' => array(
                 array(
@@ -518,7 +518,7 @@ 
 
 		$styles = parent::styles();
 
-		$styles[] = array(
+		$styles[ ] = array(
 			'handle'  => 'gravityview_settings',
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
 			'version' => GravityView_Plugin::version,
@@ -544,7 +544,7 @@ 
 	 * @return void
 	 */
 	public function add_network_menu() {
-		if( GravityView_Plugin::is_network_activated() ) {
+		if ( GravityView_Plugin::is_network_activated() ) {
 			add_menu_page( __( 'Settings', 'gravityview' ), __( 'GravityView', 'gravityview' ), $this->_capabilities_app_settings, "{$this->_slug}_settings", array( $this, 'app_tab_page' ), 'none' );
 		}
 	}
@@ -561,7 +561,7 @@ 
 		 * If multisite and not network admin, we don't want the settings to show.
 		 * @since 1.7.6
 		 */
-		$show_submenu = !is_multisite() ||  is_main_site() || !GravityView_Plugin::is_network_activated() || ( is_network_admin() && GravityView_Plugin::is_network_activated() );
+		$show_submenu = ! is_multisite() || is_main_site() || ! GravityView_Plugin::is_network_activated() || ( is_network_admin() && GravityView_Plugin::is_network_activated() );
 
 		/**
 		 * Override whether to show the Settings menu on a per-blog basis.
@@ -570,7 +570,7 @@ 
 		 */
 		$show_submenu = apply_filters( 'gravityview/show-settings-menu', $show_submenu );
 
-		if( $show_submenu ) {
+		if ( $show_submenu ) {
 			add_submenu_page( 'edit.php?post_type=gravityview', __( 'Settings', 'gravityview' ), __( 'Settings', 'gravityview' ), $this->_capabilities_app_settings, $this->_slug . '_settings', array( $this, 'app_tab_page' ) );
 		}
 	}
@@ -609,7 +609,7 @@ 
 		/**
 		 * Backward compatibility with Redux
 		 */
-		if( $setting_name === 'license' ) {
+		if ( $setting_name === 'license' ) {
 			return array(
 				'license' => parent::get_app_setting( 'license_key' ),
 				'status' => parent::get_app_setting( 'license_key_status' ),
@@ -635,8 +635,8 @@ 
 
 	    $settings = get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', $this->get_default_settings() );
 
-		if( defined( 'GRAVITYVIEW_LICENSE_KEY' ) ) {
-			$settings['license_key'] = GRAVITYVIEW_LICENSE_KEY;
+		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) ) {
+			$settings[ 'license_key' ] = GRAVITYVIEW_LICENSE_KEY;
 		}
 
 		return $settings;
@@ -675,7 +675,7 @@ 
 	protected function settings_edd_license( $field, $echo = true ) {
 
 	    if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
-		    $field['input_type'] = 'password';
+		    $field[ 'input_type' ] = 'password';
         }
 
 		$text = $this->settings_text( $field, false );
@@ -684,7 +684,7 @@ 
 
 		$return = $text . $activation;
 
-		if( $echo ) {
+		if ( $echo ) {
 			echo $return;
 		}
 
@@ -711,15 +711,15 @@ 
 	 */
 	public function settings_submit( $field, $echo = true ) {
 
-		$field['type']  = ( isset($field['type']) && in_array( $field['type'], array('submit','reset','button') ) ) ? $field['type'] : 'submit';
+		$field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit';
 
 		$attributes    = $this->get_field_attributes( $field );
 		$default_value = rgar( $field, 'value' ) ? rgar( $field, 'value' ) : rgar( $field, 'default_value' );
-		$value         = $this->get_setting( $field['name'], $default_value );
+		$value         = $this->get_setting( $field[ 'name' ], $default_value );
 
 
-		$attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary gfbutton';
-		$name    = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_'.$field['name'];
+		$attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary gfbutton';
+		$name = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ];
 
 		if ( empty( $value ) ) {
 			$value = __( 'Update Settings', 'gravityview' );
@@ -728,7 +728,7 @@ 
 		$attributes = $this->get_field_attributes( $field );
 
 		$html = '<input
-                    type="' . $field['type'] . '"
+                    type="' . $field[ 'type' ] . '"
                     name="' . esc_attr( $name ) . '"
                     value="' . $value . '" ' .
 		        implode( ' ', $attributes ) .
@@ -750,12 +750,12 @@ 
 	 * @return string
 	 */
 	public function settings_save( $field, $echo = true ) {
-		$field['type']  = 'submit';
-		$field['name']  = 'gform-settings-save';
-		$field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton';
+		$field[ 'type' ]  = 'submit';
+		$field[ 'name' ]  = 'gform-settings-save';
+		$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] : 'button-primary gfbutton';
 
 		if ( ! rgar( $field, 'value' ) ) {
-			$field['value'] = __( 'Update Settings', 'gravityview' );
+			$field[ 'value' ] = __( 'Update Settings', 'gravityview' );
 		}
 
 		$output = $this->settings_submit( $field, false );
@@ -764,7 +764,7 @@ 
 		$this->app_settings_uninstall_tab();
 		$output .= ob_get_clean();
 
-		if( $echo ) {
+		if ( $echo ) {
 			echo $output;
 		}
 
@@ -789,8 +789,8 @@ 
 	 */
 	public function single_setting_row( $field ) {
 
-		$field['gv_description'] = rgar( $field, 'description' );
-		$field['description']    = rgar( $field, 'subtitle' );
+		$field[ 'gv_description' ] = rgar( $field, 'description' );
+		$field[ 'description' ]    = rgar( $field, 'subtitle' );
 
 		parent::single_setting_row( $field );
 	}
@@ -805,7 +805,7 @@ 
 		parent::single_setting_label( $field );
 
 		if ( $description = rgar( $field, 'gv_description' ) ) {
-			echo '<span class="description">'. $description .'</span>';
+			echo '<span class="description">' . $description . '</span>';
 		}
 	}
 
@@ -867,11 +867,11 @@ 
 
 		// If the posted key doesn't match the activated/deactivated key (set using the Activate License button, AJAX response),
 		// then we assume it's changed. If it's changed, unset the status and the previous response.
-		if( $local_key !== $response_key ) {
+		if ( $local_key !== $response_key ) {
 
-			unset( $posted_settings['license_key_response'] );
-			unset( $posted_settings['license_key_status'] );
-			GFCommon::add_error_message( __('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
+			unset( $posted_settings[ 'license_key_response' ] );
+			unset( $posted_settings[ 'license_key_status' ] );
+			GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
 		}
 
 		return $posted_settings;
@@ -906,26 +906,26 @@ 
 				'label'             => __( 'License Key', 'gravityview' ),
 				'description'          => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview' ) . $this->get_license_handler()->license_details( $this->get_app_setting( 'license_key_response' ) ),
 				'type'              => 'edd_license',
-				'disabled'          => ( defined( 'GRAVITYVIEW_LICENSE_KEY' )  && GRAVITYVIEW_LICENSE_KEY ),
-				'data-pending-text' => __('Verifying license&hellip;', 'gravityview'),
-				'default_value'           => $default_settings['license_key'],
+				'disabled'          => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ),
+				'data-pending-text' => __( 'Verifying license&hellip;', 'gravityview' ),
+				'default_value'           => $default_settings[ 'license_key' ],
 				'class'             => ( '' == $this->get_app_setting( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
 			),
 			array(
 				'name'       => 'license_key_response',
-				'default_value'  => $default_settings['license_key_response'],
+				'default_value'  => $default_settings[ 'license_key_response' ],
 				'type'     => 'hidden',
 			),
 			array(
 				'name'       => 'license_key_status',
-				'default_value'  => $default_settings['license_key_status'],
+				'default_value'  => $default_settings[ 'license_key_status' ],
 				'type'     => 'hidden',
 			),
 			array(
 				'name'       => 'support-email',
 				'type'     => 'text',
 				'validate' => 'email',
-				'default_value'  => $default_settings['support-email'],
+				'default_value'  => $default_settings[ 'support-email' ],
 				'label'    => __( 'Support Email', 'gravityview' ),
 				'description' => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ),
 				'class'    => 'code regular-text',
@@ -937,53 +937,53 @@ 
 				'name'         => 'support_port',
 				'type'       => 'radio',
 				'label'      => __( 'Show Support Port?', 'gravityview' ),
-				'default_value'    => $default_settings['support_port'],
+				'default_value'    => $default_settings[ 'support_port' ],
 				'horizontal' => 1,
 				'choices'    => array(
 					array(
-						'label' => _x('Show', 'Setting: Show or Hide', 'gravityview'),
+						'label' => _x( 'Show', 'Setting: Show or Hide', 'gravityview' ),
 						'value' => '1',
 					),
 					array(
-						'label' => _x('Hide', 'Setting: Show or Hide', 'gravityview'),
+						'label' => _x( 'Hide', 'Setting: Show or Hide', 'gravityview' ),
 						'value' => '0',
 					),
 				),
-				'tooltip' => '<p><img src="' . esc_url_raw( plugins_url('assets/images/beacon.png', GRAVITYVIEW_FILE ) ) . '" alt="' . esc_attr__( 'The Support Port looks like this.', 'gravityview' ) . '" class="alignright" style="max-width:40px; margin:.5em;" />' . esc_html__('The Support Port provides quick access to how-to articles and tutorials. For administrators, it also makes it easy to contact support.', 'gravityview') . '</p>',
+				'tooltip' => '<p><img src="' . esc_url_raw( plugins_url( 'assets/images/beacon.png', GRAVITYVIEW_FILE ) ) . '" alt="' . esc_attr__( 'The Support Port looks like this.', 'gravityview' ) . '" class="alignright" style="max-width:40px; margin:.5em;" />' . esc_html__( 'The Support Port provides quick access to how-to articles and tutorials. For administrators, it also makes it easy to contact support.', 'gravityview' ) . '</p>',
 				'description'   => __( 'Show the Support Port on GravityView pages?', 'gravityview' ),
 			),
 			array(
 				'name'         => 'no-conflict-mode',
 				'type'       => 'radio',
 				'label'      => __( 'No-Conflict Mode', 'gravityview' ),
-				'default_value'    => $default_settings['no-conflict-mode'],
+				'default_value'    => $default_settings[ 'no-conflict-mode' ],
 				'horizontal' => 1,
 				'choices'    => array(
 					array(
-						'label' => _x('On', 'Setting: On or off', 'gravityview'),
+						'label' => _x( 'On', 'Setting: On or off', 'gravityview' ),
 						'value' => '1',
 					),
 					array(
-						'label' => _x('Off', 'Setting: On or off', 'gravityview'),
+						'label' => _x( 'Off', 'Setting: On or off', 'gravityview' ),
 						'value' => '0',
 					),
 				),
-				'description'   => __( 'Set this to ON to prevent extraneous scripts and styles from being printed on GravityView admin pages, reducing conflicts with other plugins and themes.', 'gravityview' ) . ' ' . __('If your Edit View tabs are ugly, enable this setting.', 'gravityview'),
+				'description'   => __( 'Set this to ON to prevent extraneous scripts and styles from being printed on GravityView admin pages, reducing conflicts with other plugins and themes.', 'gravityview' ) . ' ' . __( 'If your Edit View tabs are ugly, enable this setting.', 'gravityview' ),
 			),
 			array(
 				'name'       => 'beta',
 				'type'       => 'checkbox',
 				'label'      => __( 'Become a Beta Tester', 'gravityview' ),
-				'default_value'    => $default_settings['beta'],
+				'default_value'    => $default_settings[ 'beta' ],
 				'horizontal' => 1,
 				'choices'    => array(
 					array(
-						'label' => _x('Show me beta versions if they are available.', 'gravityview'),
+						'label' => _x( 'Show me beta versions if they are available.', 'gravityview' ),
 						'value' => '1',
                         'name'  => 'beta',
 					),
 				),
-				'description'   => __( 'You will have early access to the latest GravityView features and improvements. There may be bugs! If you encounter an issue, help make GravityView better by reporting it!', 'gravityview'),
+				'description'   => __( 'You will have early access to the latest GravityView features and improvements. There may be bugs! If you encounter an issue, help make GravityView better by reporting it!', 'gravityview' ),
 			),
 		) );
 
@@ -994,23 +994,23 @@ 
 		 * @since 1.7.4
 		 */
 		foreach ( $fields as &$field ) {
-			$field['name']          = isset( $field['name'] ) ? $field['name'] : rgget('id', $field );
-			$field['label']         = isset( $field['label'] ) ? $field['label'] : rgget('title', $field );
-			$field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : rgget('default', $field );
-			$field['description']   = isset( $field['description'] ) ? $field['description'] : rgget('subtitle', $field );
+			$field[ 'name' ]          = isset( $field[ 'name' ] ) ? $field[ 'name' ] : rgget( 'id', $field );
+			$field[ 'label' ]         = isset( $field[ 'label' ] ) ? $field[ 'label' ] : rgget( 'title', $field );
+			$field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : rgget( 'default', $field );
+			$field[ 'description' ]   = isset( $field[ 'description' ] ) ? $field[ 'description' ] : rgget( 'subtitle', $field );
 
-			if( $disabled_attribute ) {
-				$field['disabled']  = $disabled_attribute;
+			if ( $disabled_attribute ) {
+				$field[ 'disabled' ] = $disabled_attribute;
 			}
 
-			if( empty( $field['disabled'] ) ) {
-				unset( $field['disabled'] );
+			if ( empty( $field[ 'disabled' ] ) ) {
+				unset( $field[ 'disabled' ] );
             }
 		}
 
         $sections = array(
             array(
-                'description' =>      sprintf( '<span class="version-info description">%s</span>', sprintf( __('You are running GravityView version %s', 'gravityview'), GravityView_Plugin::version ) ),
+                'description' =>      sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), GravityView_Plugin::version ) ),
                 'fields'      => $fields,
             )
         );
@@ -1021,8 +1021,8 @@ 
             'type'     => 'save',
         );
 
-		if( $disabled_attribute ) {
-			$button['disabled'] = $disabled_attribute;
+		if ( $disabled_attribute ) {
+			$button[ 'disabled' ] = $disabled_attribute;
 		}
 
 
@@ -1042,20 +1042,20 @@ 
 		// If there are extensions, add a section for them
 		if ( ! empty( $extension_sections ) ) {
 
-			if( $disabled_attribute ) {
+			if ( $disabled_attribute ) {
 				foreach ( $extension_sections as &$section ) {
-					foreach ( $section['fields'] as &$field ) {
-						$field['disabled'] = $disabled_attribute;
+					foreach ( $section[ 'fields' ] as &$field ) {
+						$field[ 'disabled' ] = $disabled_attribute;
 					}
 				}
 			}
 
-            $k = count( $extension_sections ) - 1 ;
-            $extension_sections[ $k ]['fields'][] = $button;
+            $k = count( $extension_sections ) - 1;
+            $extension_sections[ $k ][ 'fields' ][ ] = $button;
 			$sections = array_merge( $sections, $extension_sections );
 		} else {
             // add the 'update settings' button to the general section
-            $sections[0]['fields'][] = $button;
+            $sections[ 0 ][ 'fields' ][ ] = $button;
         }
 
 		return $sections;