gravityview / GravityView

includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-ultimate-member.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 	function parse_um_profile_post_content( $args = array() ) {
 		global $ultimatemember;
 
-		if( ! $ultimatemember || ! is_object( $ultimatemember ) || ! class_exists( 'GravityView_View_Data' ) ) {
+		if ( ! $ultimatemember || ! is_object( $ultimatemember ) || ! class_exists( 'GravityView_View_Data' ) ) {
 			return;
 		}
 
@@ -59,7 +59,7 @@ 
 			return;
 		}
 
-		GravityView_View_Data::getInstance()->parse_post_content( $active_tab[0]->post_content );
+		GravityView_View_Data::getInstance()->parse_post_content( $active_tab[ 0 ]->post_content );
 
 		wp_reset_postdata();
 	}

includes/plugin-and-theme-hooks/abstract-gravityview-plugin-and-theme-hooks.php

Spacing +6 added lines, -6 removed lines

@@ -91,9 +91,9 @@ 
 	private function maybe_add_hooks() {
 		$class_exists = $this->class_name && class_exists( $this->class_name );
 		$function_exists = $this->function_name && function_exists( $this->function_name );
-		$constant_defined = $this->constant_name && defined("{$this->constant_name}");
+		$constant_defined = $this->constant_name && defined( "{$this->constant_name}" );
 
-		if( $class_exists || $function_exists || $constant_defined ) {
+		if ( $class_exists || $function_exists || $constant_defined ) {
 			$this->add_hooks();
 		}
 	}
@@ -104,19 +104,19 @@ 
 	 * @return void
 	 */
 	protected function add_hooks() {
-		if( $this->content_meta_keys ) {
+		if ( $this->content_meta_keys ) {
 			add_filter( 'gravityview/data/parse/meta_keys', array( $this, 'merge_content_meta_keys' ), 10, 2 );
 		}
 
-		if( $this->script_handles ) {
+		if ( $this->script_handles ) {
 			add_filter( 'gravityview_noconflict_scripts', array( $this, 'merge_noconflict_scripts' ) );
 		}
 
-		if( $this->style_handles ) {
+		if ( $this->style_handles ) {
 			add_filter( 'gravityview_noconflict_styles', array( $this, 'merge_noconflict_styles' ) );
 		}
 
-		if( $this->post_type_support ) {
+		if ( $this->post_type_support ) {
 			add_filter( 'gravityview_post_type_support', array( $this, 'merge_post_type_support' ), 10, 2 );
 		}
 	}

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

Spacing +12 added lines, -12 removed lines

@@ -49,17 +49,17 @@ 
 	 *
 	 * @return string If a custom field label isn't set, return the field label for the password field
 	 */
-	function field_label( $label = '', $field = array(), $form = array(), $entry = array() ){
+	function field_label( $label = '', $field = array(), $form = array(), $entry = array() ) {
 
 		// If using a custom label, no need to fetch the parent label
-		if( ! is_numeric( $field['id'] ) || ! empty( $field['custom_label'] ) ) {
+		if ( ! is_numeric( $field[ 'id' ] ) || ! empty( $field[ 'custom_label' ] ) ) {
 			return $label;
 		}
 
-		$field_object = GFFormsModel::get_field( $form, $field['id'] );
+		$field_object = GFFormsModel::get_field( $form, $field[ 'id' ] );
 
-		if( $field_object && 'password' === $field_object->type ) {
-			$label = $field['label'];
+		if ( $field_object && 'password' === $field_object->type ) {
+			$label = $field[ 'label' ];
 		}
 
 		return $label;
@@ -79,17 +79,17 @@ 
 	function add_form_fields( $fields = array(), $form = array(), $include_parent_field = true ) {
 
 		foreach ( $fields as $key => $field ) {
-			if( 'password' === $field['type'] ) {
+			if ( 'password' === $field[ 'type' ] ) {
 
 				// The Enter Password input
-				if( floor( $key ) === floatval( $key ) ) {
+				if ( floor( $key ) === floatval( $key ) ) {
 
-					if( ! empty( $field['parent'] ) ) {
-						$field['label']      = $field['parent']->label;
-						$field['adminOnly']  = $field['parent']->adminOnly;
-						$field['adminLabel'] = $field['parent']->adminLabel;
+					if ( ! empty( $field[ 'parent' ] ) ) {
+						$field[ 'label' ]      = $field[ 'parent' ]->label;
+						$field[ 'adminOnly' ]  = $field[ 'parent' ]->adminOnly;
+						$field[ 'adminLabel' ] = $field[ 'parent' ]->adminLabel;
 						// Don't show as a child input
-						unset( $field['parent'] );
+						unset( $field[ 'parent' ] );
 					}
 
 					$fields[ $key ] = $field;

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

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	 * Prevent Divi from adding their stuff to GV pages
 	 */
 	public function add_hooks_admin_init() {
-		if( GravityView_Admin::is_admin_page() ) {
+		if ( GravityView_Admin::is_admin_page() ) {
 			// Prevent Divi from adding import/export modal dialog
 			remove_action( 'admin_init', 'et_pb_register_builder_portabilities' );
 

includes/class-oembed.php

Spacing +29 added lines, -29 removed lines

@@ -42,7 +42,7 @@ 
 	 */
 	static function getInstance() {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self;
 
 			self::$instance->initialize();
@@ -94,7 +94,7 @@ 
 		// Catch either
 		$match_regex = "(?:{$using_permalinks}|{$not_using_permalinks})";
 
-		return '#'.$match_regex.'#i';
+		return '#' . $match_regex . '#i';
 	}
 
 	/**
@@ -113,18 +113,18 @@ 
 
 		$post_id = url_to_postid( $url );
 
-		if( empty( $post_id ) ) {
+		if ( empty( $post_id ) ) {
 
 			$args = array(
 				'post_status' => 'publish',
 				'name' => $slug,
-				'post_type' => array('any', 'gravityview'),
+				'post_type' => array( 'any', 'gravityview' ),
 			);
 
 			$posts = get_posts( $args );
 
-			if( !empty( $posts ) ) {
-				$post_id = $posts[0]->ID;
+			if ( ! empty( $posts ) ) {
+				$post_id = $posts[ 0 ]->ID;
 			}
 		}
 
@@ -157,17 +157,17 @@ 
 	public function render_handler( $matches, $attr, $url, $rawattr ) {
 
 		// If not using permalinks, re-assign values for matching groups
-		if( !empty( $matches['entry_slug2'] ) ) {
-			$matches['is_cpt'] = $matches['is_cpt2'];
-			$matches['slug'] = $matches['slug2'];
-			$matches['entry_slug'] = $matches['entry_slug2'];
-			unset( $matches['is_cpt2'], $matches['slug2'], $matches['entry_slug2'] );
+		if ( ! empty( $matches[ 'entry_slug2' ] ) ) {
+			$matches[ 'is_cpt' ] = $matches[ 'is_cpt2' ];
+			$matches[ 'slug' ] = $matches[ 'slug2' ];
+			$matches[ 'entry_slug' ] = $matches[ 'entry_slug2' ];
+			unset( $matches[ 'is_cpt2' ], $matches[ 'slug2' ], $matches[ 'entry_slug2' ] );
 		}
 
 		// No Entry was found
-		if( empty( $matches['entry_slug'] ) ) {
+		if ( empty( $matches[ 'entry_slug' ] ) ) {
 
-			do_action('gravityview_log_error', 'GravityView_oEmbed[render_handler] $entry_slug not parsed by regex.', $matches );
+			do_action( 'gravityview_log_error', 'GravityView_oEmbed[render_handler] $entry_slug not parsed by regex.', $matches );
 
 			return '';
 		}
@@ -177,11 +177,11 @@ 
 		// Setup the data used
 		$this->set_vars( $matches, $attr, $url, $rawattr );
 
-		if( is_admin() && !$this->is_full_oembed_preview ) {
+		if ( is_admin() && ! $this->is_full_oembed_preview ) {
 			$return = $this->render_admin( $matches, $attr, $url, $rawattr );
 		} else {
 
-			if( $this->is_full_oembed_preview ) {
+			if ( $this->is_full_oembed_preview ) {
 				$return .= $this->generate_preview_notice();
 			}
 
@@ -200,8 +200,8 @@ 
 	private function generate_preview_notice() {
 		$floaty = GravityView_Admin::get_floaty();
 		$title = esc_html__( 'This will look better when it is embedded.', 'gravityview' );
-		$message = esc_html__('Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview');
-		return '<div class="updated notice">'. $floaty. '<h3>'.$title.'</h3><p>'.$message.'</p><br style="clear:both;" /></div>';
+		$message = esc_html__( 'Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview' );
+		return '<div class="updated notice">' . $floaty . '<h3>' . $title . '</h3><p>' . $message . '</p><br style="clear:both;" /></div>';
 	}
 
 	/**
@@ -214,14 +214,14 @@ 
 	 */
 	private function set_vars( $matches, $attr, $url, $rawattr ) {
 
-		$this->entry_id = $matches['entry_slug'];
+		$this->entry_id = $matches[ 'entry_slug' ];
 
-		$post_id = $this->get_postid_from_url_and_slug( $url, $matches['slug'] );
+		$post_id = $this->get_postid_from_url_and_slug( $url, $matches[ 'slug' ] );
 
 		// The URL didn't have the View Custom Post Type structure.
-		if( empty( $matches['is_cpt'] ) || $matches['is_cpt'] !== 'gravityview' ) {
+		if ( empty( $matches[ 'is_cpt' ] ) || $matches[ 'is_cpt' ] !== 'gravityview' ) {
 
-			do_action('gravityview_log_debug', 'GravityView_oEmbed[render_handler] Embedding an entry inside a post or page', $matches );
+			do_action( 'gravityview_log_debug', 'GravityView_oEmbed[render_handler] Embedding an entry inside a post or page', $matches );
 
 			$this->view_id = GravityView_View_Data::getInstance()->maybe_get_view_id( $post_id );
 
@@ -232,7 +232,7 @@ 
 		}
 
 		// The inline content has $_POST['type'] set to "embed", while the "Add Media" modal doesn't set that.
-		$this->is_full_oembed_preview = ( isset( $_POST['action'] ) && $_POST['action'] === 'parse-embed' && !isset( $_POST['type'] ) );
+		$this->is_full_oembed_preview = ( isset( $_POST[ 'action' ] ) && $_POST[ 'action' ] === 'parse-embed' && ! isset( $_POST[ 'type' ] ) );
 	}
 
 	/**
@@ -250,15 +250,15 @@ 
 		// Floaty the astronaut
 		$image = GravityView_Admin::get_floaty();
 
-		$embed_heading = sprintf( esc_html__('Embed Entry %d', 'gravityview'), $this->entry_id );
+		$embed_heading = sprintf( esc_html__( 'Embed Entry %d', 'gravityview' ), $this->entry_id );
 
-		$embed_text = sprintf( esc_html__('This entry will be displayed as it is configured in View %d', 'gravityview'), $this->view_id );
+		$embed_text = sprintf( esc_html__( 'This entry will be displayed as it is configured in View %d', 'gravityview' ), $this->view_id );
 
 		return '
 		<div class="loading-placeholder" style="background-color:#e6f0f5;">
-			<h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image.$embed_heading.'</h3>
+			<h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image . $embed_heading . '</h3>
 			<p style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">
-				'.$embed_text.'
+				'.$embed_text . '
 			</p>
 			<br style="clear: both;">
 		</div>';
@@ -313,14 +313,14 @@ 
 	private function render_frontend( $matches, $attr, $url, $rawattr ) {
 
 		// If it's already been parsed, don't re-output it.
-		if( !empty( $this->output[ $this->entry_id ] ) ) {
+		if ( ! empty( $this->output[ $this->entry_id ] ) ) {
 			return $this->output[ $this->entry_id ];
 		}
 
 		$entry_output = $this->generate_entry_output();
 
 		// Wrap a container div around the output to allow for custom styling
-		$output = sprintf('<div class="gravityview-oembed gravityview-oembed-entry gravityview-oembed-entry-'.$this->entry_id.'">%s</div>', $entry_output );
+		$output = sprintf( '<div class="gravityview-oembed gravityview-oembed-entry gravityview-oembed-entry-' . $this->entry_id . '">%s</div>', $entry_output );
 
 		/**
 		 * @filter `gravityview/oembed/entry` Filter the output of the oEmbed entry embed
@@ -333,7 +333,7 @@ 
 		 *  @var string $url The original URL that was matched by the regex. \n
 		 *  @var array $rawattr The original unmodified attributes.
 		 */
-		$output = apply_filters('gravityview/oembed/entry', $output, $this, compact( $entry_output, $matches, $attr, $url, $rawattr ) );
+		$output = apply_filters( 'gravityview/oembed/entry', $output, $this, compact( $entry_output, $matches, $attr, $url, $rawattr ) );
 
 		unset( $entry_output );
 

includes/class-admin-views.php

Spacing +172 added lines, -172 removed lines

@@ -28,30 +28,30 @@ 
 		add_filter( 'gravityview_blacklist_field_types', array( $this, 'default_field_blacklist' ), 10, 2 );
 
 		// Tooltips
-		add_filter( 'gform_tooltips', array( $this, 'tooltips') );
+		add_filter( 'gform_tooltips', array( $this, 'tooltips' ) );
 
 		// adding styles and scripts
-		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles'), 999 );
-		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict') );
-		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict') );
-		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict') );
-		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict') );
-
-		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas'), 10, 4 );
-		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas'), 10, 3 );
-		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields'), 10, 2 );
-		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets') );
-		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas'), 10, 5 );
+		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles' ), 999 );
+		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict' ) );
+		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict' ) );
+		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict' ) );
+		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
+
+		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas' ), 10, 4 );
+		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas' ), 10, 3 );
+		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields' ), 10, 2 );
+		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets' ) );
+		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas' ), 10, 5 );
 
 		// @todo check if this hook is needed..
 		//add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 );
 
 		// Add Connected Form column
-		add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) );
+		add_filter( 'manage_gravityview_posts_columns', array( $this, 'add_post_type_columns' ) );
 
 		add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
 
-		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 );
+		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 );
 
 		add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) );
 
@@ -66,11 +66,11 @@ 
 	public function filter_pre_get_posts_by_gravityview_form_id( &$query ) {
 		global $pagenow;
 
-		if ( !is_admin() ) {
+		if ( ! is_admin() ) {
 			return;
 		}
 
-		if( 'edit.php' !== $pagenow || ! rgget( 'gravityview_form_id' ) || ! isset( $query->query_vars[ 'post_type' ] ) ) {
+		if ( 'edit.php' !== $pagenow || ! rgget( 'gravityview_form_id' ) || ! isset( $query->query_vars[ 'post_type' ] ) ) {
 			return;
 		}
 
@@ -87,18 +87,18 @@ 
 	function add_view_dropdown() {
 		$current_screen = get_current_screen();
 
-		if( 'gravityview' !== $current_screen->post_type ) {
+		if ( 'gravityview' !== $current_screen->post_type ) {
 			return;
 		}
 
 		$forms = gravityview_get_forms();
 		$current_form = rgget( 'gravityview_form_id' );
 		// If there are no forms to select, show no forms.
-		if( !empty( $forms ) ) { ?>
+		if ( ! empty( $forms ) ) { ?>
 			<select name="gravityview_form_id" id="gravityview_form_id">
 				<option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option>
-				<?php foreach( $forms as $form ) { ?>
-					<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
+				<?php foreach ( $forms as $form ) { ?>
+					<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
 				<?php } ?>
 			</select>
 		<?php }
@@ -111,7 +111,7 @@ 
 	 */
 	public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) {
 		_deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' );
-		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id );
+		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id );
 	}
 
 	/**
@@ -134,37 +134,37 @@ 
 
 		$connected_views = gravityview_get_connected_views( $id );
 
-		if( empty( $connected_views ) ) {
+		if ( empty( $connected_views ) ) {
 			return $menu_items;
 		}
 
 		$sub_menu_items = array();
 		foreach ( (array)$connected_views as $view ) {
 
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
+			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
 				continue;
 			}
 
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
+			$label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
 
-			$sub_menu_items[] = array(
+			$sub_menu_items[ ] = array(
 				'label' => esc_attr( $label ),
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
+				'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ),
 			);
 		}
 
 		// If there were no items added, then let's create the parent menu
-		if( $sub_menu_items ) {
+		if ( $sub_menu_items ) {
 
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
-			$sub_menu_items[] = array(
+			$sub_menu_items[ ] = array(
 				'url' => '#',
 				'label' => '',
 				'menu_class' => 'hidden',
 				'capabilities' => '',
 			);
 
-			$menu_items['gravityview'] = array(
+			$menu_items[ 'gravityview' ] = array(
 				'label'          => __( 'Connected Views', 'gravityview' ),
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
 				'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
@@ -194,8 +194,8 @@ 
 		$add = array( 'captcha', 'page' );
 
 		// Don't allowing editing the following values:
-		if( $context === 'edit' ) {
-			$add[] = 'post_id';
+		if ( $context === 'edit' ) {
+			$add[ ] = 'post_id';
 		}
 
 		$return = array_merge( $array, $add );
@@ -218,32 +218,32 @@ 
 		foreach ( $default_args as $key => $arg ) {
 
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
+			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; }
 
 			// By default, use `tooltip` if defined.
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
+			$tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ];
 
 			// Otherwise, use the description as a tooltip.
-			if( empty( $tooltip ) && !empty( $arg['desc'] ) ) {
-				$tooltip = $arg['desc'];
+			if ( empty( $tooltip ) && ! empty( $arg[ 'desc' ] ) ) {
+				$tooltip = $arg[ 'desc' ];
 			}
 
 			// If there's no tooltip set, continue
-			if( empty( $tooltip ) ) {
+			if ( empty( $tooltip ) ) {
 				continue;
 			}
 
 			// Add the tooltip
-			$gv_tooltips[ 'gv_'.$key ] = array(
-				'title'	=> $arg['label'],
+			$gv_tooltips[ 'gv_' . $key ] = array(
+				'title'	=> $arg[ 'label' ],
 				'value'	=> $tooltip,
 			);
 
 		}
 
-		$gv_tooltips['gv_css_merge_tags'] = array(
-			'title' => __('CSS Merge Tags', 'gravityview'),
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
+		$gv_tooltips[ 'gv_css_merge_tags' ] = array(
+			'title' => __( 'CSS Merge Tags', 'gravityview' ),
+			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' )
 		);
 
 		/**
@@ -254,9 +254,9 @@ 
 
 		foreach ( $gv_tooltips as $key => $tooltip ) {
 
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
+			$title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>';
 
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
+			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) );
 		}
 
 		return $tooltips;
@@ -270,7 +270,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
 
 		$output = '';
 
@@ -292,7 +292,7 @@ 
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
 				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
 
-				$output = $template ? $template['label'] : $template_id_pretty;
+				$output = $template ? $template[ 'label' ] : $template_id_pretty;
 
 				break;
 
@@ -333,44 +333,44 @@ 
 	static public function get_connected_form_links( $form, $include_form_link = true ) {
 
 		// Either the form is empty or the form ID is 0, not yet set.
-		if( empty( $form ) ) {
+		if ( empty( $form ) ) {
 			return '';
 		}
 
 		// The $form is passed as the form ID
-		if( !is_array( $form ) ) {
+		if ( ! is_array( $form ) ) {
 			$form = gravityview_get_form( $form );
 		}
 
-		$form_id = $form['id'];
+		$form_id = $form[ 'id' ];
 		$links = array();
 
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
+		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
 			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
+			$form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>';
+			$links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>';
 		} else {
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
+			$form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>';
 		}
 
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
+		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
 			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
+			$links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>';
 		}
 
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
 			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
+			$links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>';
 		}
 
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
+		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) {
 			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
+			$links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>';
 		}
 
 		$output = '';
 
-		if( !empty( $include_form_link ) ) {
+		if ( ! empty( $include_form_link ) ) {
 			$output .= $form_link;
 		}
 
@@ -382,7 +382,7 @@ 
 		 */
 		$links = apply_filters( 'gravityview_connected_form_links', $links, $form );
 
-		$output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>';
+		$output .= '<div class="row-actions">' . implode( ' | ', $links ) . '</div>';
 
 		return $output;
 	}
@@ -396,8 +396,8 @@ 
 		// Get the date column and save it for later to add back in.
 		// This adds it after the Data Source column.
 		// This way, we don't need to do array_slice, array_merge, etc.
-		$date = $columns['date'];
-		unset( $columns['date'] );
+		$date = $columns[ 'date' ];
+		unset( $columns[ 'date' ] );
 
 		$data_source_required_caps = array(
 			'gravityforms_edit_forms',
@@ -408,14 +408,14 @@ 
 			'gravityforms_preview_forms',
 		);
 
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
+		if ( GVCommon::has_cap( $data_source_required_caps ) ) {
+			$columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' );
 		}
 
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
+		$columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
 
 		// Add the date back in.
-		$columns['date'] = $date;
+		$columns[ 'date' ] = $date;
 
 		return $columns;
 	}
@@ -429,12 +429,12 @@ 
 	 */
 	function save_postdata( $post_id ) {
 
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
 			return;
 		}
 
 		// validate post_type
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
+		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) {
 			return;
 		}
 
@@ -449,63 +449,63 @@ 
 		$statii = array();
 
 		// check if this is a start fresh View
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
+		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) {
 
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
+			$form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : '';
 			// save form id
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
+			$statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
 
 		}
 
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
+		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ' - Current user does not have the capability to create a new Form.', wp_get_current_user() );
 			return;
 		}
 
 		// Was this a start fresh?
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
+		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) {
+			$statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
 		} else {
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
+			$statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
 		}
 
 		// Check if we have a template id
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
+		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) {
 
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
+			$template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : '';
 
 			// now save template id
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
+			$statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
 		}
 
 
 		// save View Configuration metabox
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
+		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) {
 
 			// template settings
-			if( empty( $_POST['template_settings'] ) ) {
-				$_POST['template_settings'] = array();
+			if ( empty( $_POST[ 'template_settings' ] ) ) {
+				$_POST[ 'template_settings' ] = array();
 			}
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
+			$statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] );
 
 			$fields = array();
 
 			// Directory&single Visible Fields
-			if( !empty( $preset_fields ) ) {
+			if ( ! empty( $preset_fields ) ) {
 
 				$fields = $preset_fields;
 
-			} elseif( !empty( $_POST['fields'] ) ) {
+			} elseif ( ! empty( $_POST[ 'fields' ] ) ) {
 				$fields = _gravityview_process_posted_fields();
 			}
 
-			$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
+			$statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
 
 			// Directory Visible Widgets
-			if( empty( $_POST['widgets'] ) ) {
-				$_POST['widgets'] = array();
+			if ( empty( $_POST[ 'widgets' ] ) ) {
+				$_POST[ 'widgets' ] = array();
 			}
-			$statii['directory_widgets'] = update_post_meta( $post_id, '_gravityview_directory_widgets', $_POST['widgets'] );
+			$statii[ 'directory_widgets' ] = update_post_meta( $post_id, '_gravityview_directory_widgets', $_POST[ 'widgets' ] );
 
 		} // end save view configuration
 
@@ -515,9 +515,9 @@ 
 		 * @param array $statii Array of statuses of the post meta saving processes. If saving worked, each key should be mapped to a value of the post ID (`directory_widgets` => `124`). If failed (or didn't change), the value will be false.
 		 * @since 1.17.2
 		 */
-		do_action('gravityview_view_saved', $post_id, $statii );
+		do_action( 'gravityview_view_saved', $post_id, $statii );
 
-		do_action('gravityview_log_debug', '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array_map( 'intval', $statii ) );
+		do_action( 'gravityview_log_debug', '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array_map( 'intval', $statii ) );
 	}
 
 	/**
@@ -549,20 +549,20 @@ 
 
 		$output = '';
 
-		if( !empty( $fields ) ) {
+		if ( ! empty( $fields ) ) {
 
-			foreach( $fields as $id => $details ) {
+			foreach ( $fields as $id => $details ) {
 
-				if( in_array( $details['type'], $blacklist_field_types ) ) {
+				if ( in_array( $details[ 'type' ], $blacklist_field_types ) ) {
 					continue;
 				}
 
 				// Edit mode only allows editing the parent fields, not single inputs.
-				if( $context === 'edit' && !empty( $details['parent'] ) ) {
+				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) {
 					continue;
 				}
 
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details );
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details );
 
 			} // End foreach
 		}
@@ -570,7 +570,7 @@ 
 		echo $output;
 
 		// For the EDIT view we only want to allow the form fields.
-		if( $context === 'edit' ) {
+		if ( $context === 'edit' ) {
 			return;
 		}
 
@@ -594,16 +594,16 @@ 
 		$additional_fields = apply_filters( 'gravityview_additional_fields', array(
 			array(
 				'label_text' => __( '+ Add All Fields', 'gravityview' ),
-				'desc' => __('Add all the available fields at once.', 'gravityview'),
+				'desc' => __( 'Add all the available fields at once.', 'gravityview' ),
 				'field_id' => 'all-fields',
 				'label_type' => 'field',
 				'input_type' => NULL,
 				'field_options' => NULL,
 				'settings_html'	=> NULL,
 			)
-		));
+		) );
 
-		if( !empty( $additional_fields )) {
+		if ( ! empty( $additional_fields ) ) {
 			foreach ( (array)$additional_fields as $item ) {
 
 				// Prevent items from not having index set
@@ -614,16 +614,16 @@ 
 					'input_type' => NULL,
 					'field_options' => NULL,
 					'settings_html'	=> NULL,
-				));
+				) );
 
 				// Backward compat.
-				if( !empty( $item['field_options'] ) ) {
+				if ( ! empty( $item[ 'field_options' ] ) ) {
 					// Use settings_html from now on.
-					$item['settings_html'] = $item['field_options'];
+					$item[ 'settings_html' ] = $item[ 'field_options' ];
 				}
 
 				// Render a label for each of them
-				echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item );
+				echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item );
 
 			}
 		}
@@ -636,63 +636,63 @@ 
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
 	 * @return array
 	 */
-	function get_entry_default_fields($form, $zone) {
+	function get_entry_default_fields( $form, $zone ) {
 
 		$entry_default_fields = array();
 
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
 
 			$entry_default_fields = array(
 				'id' => array(
-					'label' => __('Entry ID', 'gravityview'),
+					'label' => __( 'Entry ID', 'gravityview' ),
 					'type' => 'id',
-					'desc'	=> __('The unique ID of the entry.', 'gravityview'),
+					'desc'	=> __( 'The unique ID of the entry.', 'gravityview' ),
 				),
 				'date_created' => array(
-					'label' => __('Entry Date', 'gravityview'),
-					'desc'	=> __('The date the entry was created.', 'gravityview'),
+					'label' => __( 'Entry Date', 'gravityview' ),
+					'desc'	=> __( 'The date the entry was created.', 'gravityview' ),
 					'type' => 'date_created',
 				),
 				'source_url' => array(
-					'label' => __('Source URL', 'gravityview'),
+					'label' => __( 'Source URL', 'gravityview' ),
 					'type' => 'source_url',
-					'desc'	=> __('The URL of the page where the form was submitted.', 'gravityview'),
+					'desc'	=> __( 'The URL of the page where the form was submitted.', 'gravityview' ),
 				),
 				'ip' => array(
-					'label' => __('User IP', 'gravityview'),
+					'label' => __( 'User IP', 'gravityview' ),
 					'type' => 'ip',
-					'desc'	=> __('The IP Address of the user who created the entry.', 'gravityview'),
+					'desc'	=> __( 'The IP Address of the user who created the entry.', 'gravityview' ),
 				),
 				'created_by' => array(
-					'label' => __('User', 'gravityview'),
+					'label' => __( 'User', 'gravityview' ),
 					'type' => 'created_by',
-					'desc'	=> __('Details of the logged-in user who created the entry (if any).', 'gravityview'),
+					'desc'	=> __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' ),
 				),
 
 				/**
 				 * @since  1.2
 				 */
 				'custom'	=> array(
-					'label'	=> __('Custom Content', 'gravityview'),
+					'label'	=> __( 'Custom Content', 'gravityview' ),
 					'type'	=> 'custom',
-					'desc'	=> __('Insert custom text or HTML.', 'gravityview'),
+					'desc'	=> __( 'Insert custom text or HTML.', 'gravityview' ),
 				),
 
 				/**
 				 * @since 1.7.2
 				 */
 			    'other_entries' => array(
-				    'label'	=> __('Other Entries', 'gravityview'),
+				    'label'	=> __( 'Other Entries', 'gravityview' ),
 				    'type'	=> 'other_entries',
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
+				    'desc'	=> __( 'Display other entries created by the entry creator.', 'gravityview' ),
 			    ),
 	        );
 
-			if( 'single' !== $zone) {
+			if ( 'single' !== $zone ) {
 
-				$entry_default_fields['entry_link'] = array(
-					'label' => __('Link to Entry', 'gravityview'),
-					'desc'	=> __('A dedicated link to the single entry with customizable text.', 'gravityview'),
+				$entry_default_fields[ 'entry_link' ] = array(
+					'label' => __( 'Link to Entry', 'gravityview' ),
+					'desc'	=> __( 'A dedicated link to the single entry with customizable text.', 'gravityview' ),
 					'type' => 'entry_link',
 				);
 			}
@@ -706,7 +706,7 @@ 
 		 * @param  string|array $form form_ID or form object
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
 		 */
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
+		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone );
 	}
 
 	/**
@@ -717,7 +717,7 @@ 
 	 */
 	function get_available_fields( $form = '', $zone = NULL ) {
 
-		if( empty( $form ) ) {
+		if ( empty( $form ) ) {
 			do_action( 'gravityview_log_error', '[get_available_fields] $form is empty' );
 			return array();
 		}
@@ -726,7 +726,7 @@ 
 		$fields = gravityview_get_form_fields( $form, true );
 
 		// get meta fields ( only if form was already created )
-		if( !is_array( $form ) ) {
+		if ( ! is_array( $form ) ) {
 			$meta_fields = gravityview_get_entry_meta( $form );
 		} else {
 			$meta_fields = array();
@@ -750,11 +750,11 @@ 
 
 		$widgets = $this->get_registered_widgets();
 
-		if( !empty( $widgets ) ) {
+		if ( ! empty( $widgets ) ) {
 
-			foreach( $widgets as $id => $details ) {
+			foreach ( $widgets as $id => $details ) {
 
-				echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
+				echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details );
 
 			}
 		}
@@ -788,7 +788,7 @@ 
 	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
 		global $post;
 
-		if( $type === 'widget' ) {
+		if ( $type === 'widget' ) {
 			$button_label = __( 'Add Widget', 'gravityview' );
 		} else {
 			$button_label = __( 'Add Field', 'gravityview' );
@@ -797,15 +797,15 @@ 
 		$available_items = array();
 
 		// if saved values, get available fields to label everyone
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
+		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) {
 
-			if( !empty( $_POST['template_id'] ) ) {
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+			if ( ! empty( $_POST[ 'template_id' ] ) ) {
+				$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
 			} else {
 				$form = gravityview_get_form_id( $post->ID );
 			}
 
-			if( 'field' === $type ) {
+			if ( 'field' === $type ) {
 				$available_items = $this->get_available_fields( $form, $zone );
 			} else {
 				$available_items = $this->get_registered_widgets();
@@ -813,39 +813,39 @@ 
 
 		}
 
-		foreach( $rows as $row ) :
-			foreach( $row as $col => $areas ) :
-				$column = ($col == '2-2') ? '1-2' : $col; ?>
+		foreach ( $rows as $row ) :
+			foreach ( $row as $col => $areas ) :
+				$column = ( $col == '2-2' ) ? '1-2' : $col; ?>
 
 				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
 
-					<?php foreach( $areas as $area ) : 	?>
+					<?php foreach ( $areas as $area ) : 	?>
 
 						<div class="gv-droppable-area">
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>">
+							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>">
 
 								<?php // render saved fields
 
-								if( !empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
+								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
 
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
 
 										$input_type = NULL;
-										$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
+										$original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false;
 
-										if( !$original_item ) {
+										if ( ! $original_item ) {
 
-											do_action('gravityview_log_error', 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array('available_items' => $available_items, 'field' => $field ));
+											do_action( 'gravityview_log_error', 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array( 'available_items' => $available_items, 'field' => $field ) );
 
 											$original_item = $field;
 										} else {
 
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
+											$input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL;
 
 										}
 
 										// Field options dialog box
-										$field_options = GravityView_Render_Settings::render_field_options( $type, $template_id, $field['id'], $original_item['label'], $zone .'_'. $area['areaid'], $input_type, $uniqid, $field, $zone, $original_item );
+										$field_options = GravityView_Render_Settings::render_field_options( $type, $template_id, $field[ 'id' ], $original_item[ 'label' ], $zone . '_' . $area[ 'areaid' ], $input_type, $uniqid, $field, $zone, $original_item );
 
 										$item = array(
 											'input_type' => $input_type,
@@ -854,16 +854,16 @@ 
 										);
 
 										// Merge the values with the current item to pass things like widget descriptions and original field names
-										if( $original_item ) {
+										if ( $original_item ) {
 											$item = wp_parse_args( $item, $original_item );
 										}
 
-										switch( $type ) {
+										switch ( $type ) {
 											case 'widget':
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
+												echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field );
 												break;
 											default:
-												echo new GravityView_Admin_View_Field( $item['label'], $field['id'], $item, $field );
+												echo new GravityView_Admin_View_Field( $item[ 'label' ], $field[ 'id' ], $item, $field );
 										}
 
 
@@ -873,11 +873,11 @@ 
 
 								} // End if zone is not empty ?>
 
-								<span class="drop-message"><?php echo sprintf(esc_attr__('"+ %s" or drag existing %ss here.', 'gravityview'), $button_label, $type ); ?></span>
+								<span class="drop-message"><?php echo sprintf( esc_attr__( '"+ %s" or drag existing %ss here.', 'gravityview' ), $button_label, $type ); ?></span>
 							</div>
 							<div class="gv-droppable-area-action">
-								<a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>"><?php echo '+ '.esc_html( $button_label ); ?></a>
-								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area['title'] ); ?></strong><?php if( !empty( $area['subtitle'] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area['subtitle'] ); ?></span><?php } ?></p>
+								<a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>"><?php echo '+ ' . esc_html( $button_label ); ?></a>
+								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area[ 'title' ] ); ?></strong><?php if ( ! empty( $area[ 'subtitle' ] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area[ 'subtitle' ] ); ?></span><?php } ?></p>
 							</div>
 						</div>
 
@@ -899,7 +899,7 @@ 
 		$default_widget_areas = GravityView_Plugin::get_default_widget_areas();
 
 		$widgets = array();
-		if( !empty( $post_id ) ) {
+		if ( ! empty( $post_id ) ) {
 			$widgets = get_post_meta( $post_id, '_gravityview_directory_widgets', true );
 
 		}
@@ -930,19 +930,19 @@ 
 	 */
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
 
-		if( empty( $template_id ) ) {
+		if ( empty( $template_id ) ) {
 			do_action( 'gravityview_log_debug', '[render_directory_active_areas] $template_id is empty' );
 			return;
 		}
 
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
 
-		if( empty( $template_areas ) ) {
+		if ( empty( $template_areas ) ) {
 
 			do_action( 'gravityview_log_debug', '[render_directory_active_areas] No areas defined. Maybe template %s is disabled.', $template_id );
 			$output = '<div>';
-			$output .= '<h2 class="description" style="font-size: 16px; margin:0">'. sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>'.$template_id.'</em>' ) .'</h2>';
-			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">'.esc_html__('The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview').'</p>';
+			$output .= '<h2 class="description" style="font-size: 16px; margin:0">' . sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>' . $template_id . '</em>' ) . '</h2>';
+			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">' . esc_html__( 'The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview' ) . '</p>';
 			$output .= '</div>';
 		} else {
 
@@ -957,7 +957,7 @@ 
 
 		}
 
-		if( $echo ) {
+		if ( $echo ) {
 			echo $output;
 		}
 
@@ -977,25 +977,25 @@ 
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
 
 		// Add the GV font (with the Astronaut)
-		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
+		wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
 
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version, true );
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
 
 		// Don't process any scripts below here if it's not a GravityView page.
-		if( !gravityview_is_admin_page($hook) && !$is_widgets_page ) { return; }
+		if ( ! gravityview_is_admin_page( $hook ) && ! $is_widgets_page ) { return; }
 
 		// Only enqueue the following on single pages
-		if( gravityview_is_admin_page($hook, 'single') || $is_widgets_page ) {
+		if ( gravityview_is_admin_page( $hook, 'single' ) || $is_widgets_page ) {
 
 			wp_enqueue_script( 'jquery-ui-datepicker' );
-			wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), GravityView_Plugin::version );
+			wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), GravityView_Plugin::version );
 
-			$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+			$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
 			//enqueue scripts
 			wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), GravityView_Plugin::version );
 
-			wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
+			wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
 				'cookiepath' => COOKIEPATH,
 				'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
 				'label_viewname' => __( 'Enter View name here', 'gravityview' ),
@@ -1008,9 +1008,9 @@ 
 				'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
 				'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
 				'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
-			));
+			) );
 
-			wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array('dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
+			wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
 
 			self::enqueue_gravity_forms_scripts();
 
@@ -1029,10 +1029,10 @@ 
 		);
 
 		if ( wp_is_mobile() ) {
-				    $scripts[] = 'jquery-touch-punch';
+				    $scripts[ ] = 'jquery-touch-punch';
 		}
 
-		foreach ($scripts as $script) {
+		foreach ( $scripts as $script ) {
 			wp_enqueue_script( $script );
 		}
 	}
@@ -1041,11 +1041,11 @@ 
 
 		$filter = current_filter();
 
-		if( preg_match('/script/ism', $filter ) ) {
+		if ( preg_match( '/script/ism', $filter ) ) {
 			$allow_scripts = array( 'jquery-ui-core', 'jquery-ui-dialog', 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'gravityview_views_scripts', 'gravityview-support', 'gravityview-jquery-cookie', 'gravityview_views_datepicker',
 			'sack', 'gform_gravityforms', 'gform_forms', 'gform_form_admin', 'jquery-ui-autocomplete' );
 			$registered = array_merge( $registered, $allow_scripts );
-		} elseif( preg_match('/style/ism', $filter ) ) {
+		} elseif ( preg_match( '/style/ism', $filter ) ) {
 			$allow_styles = array( 'dashicons', 'wp-jquery-ui-dialog', 'gravityview_views_styles', 'gravityview_global', 'gravityview_views_datepicker' );
 			$registered = array_merge( $registered, $allow_styles );
 		}

includes/class-admin-approve-entries.php

Spacing +89 added lines, -89 removed lines

@@ -43,25 +43,25 @@ 
 		/** gf_entries page - entries table screen */
 
 		// capture bulk actions
-		add_action( 'gform_loaded', array( $this, 'process_bulk_action') );
+		add_action( 'gform_loaded', array( $this, 'process_bulk_action' ) );
 
 		// add hidden field with approve status
 		add_action( 'gform_entries_first_column_actions', array( $this, 'add_entry_approved_hidden_input' ), 1, 5 );
 
 		// process ajax approve entry requests
-		add_action('wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved'));
+		add_action( 'wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved' ) );
 
 		// when using the User opt-in field, check on entry submission
 		add_action( 'gform_after_submission', array( $this, 'after_submission' ), 10, 2 );
 
 		// in case entry is edited (on admin or frontend)
-		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2);
+		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2 );
 
 
 		add_filter( 'gravityview_tooltips', array( $this, 'tooltips' ) );
 
 		// adding styles and scripts
-		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles') );
+		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ) );
 		// bypass Gravity Forms no-conflict mode
 		add_filter( 'gform_noconflict_scripts', array( $this, 'register_gform_noconflict_script' ) );
 		add_filter( 'gform_noconflict_styles', array( $this, 'register_gform_noconflict_style' ) );
@@ -90,7 +90,7 @@ 
 		 * @param bool $show_filter_links True: show the "approved"/"disapproved" filter links. False: hide them.
 		 * @param array $form GF Form object of current form
 		 */
-		if( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) {
+		if ( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) {
 			return $filter_links;
 		}
 
@@ -111,19 +111,19 @@ 
 		$approved_count = $disapproved_count = 0;
 
 		// Only count if necessary
-		if( $include_counts ) {
-			$approved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );
-			$disapproved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );
+		if ( $include_counts ) {
+			$approved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );
+			$disapproved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );
 		}
 
-		$filter_links[] = array(
+		$filter_links[ ] = array(
 			'id'            => 'gv_approved',
 			'field_filters' => $field_filters_approved,
 			'count'         => $approved_count,
 			'label'         => esc_html__( 'Approved', 'gravityview' ),
 		);
 
-		$filter_links[] = array(
+		$filter_links[ ] = array(
 			'id'            => 'gv_disapproved',
 			'field_filters' => $field_filters_disapproved,
 			'count'         => $disapproved_count,
@@ -142,9 +142,9 @@ 
 	 */
 	function tooltips( $tooltips ) {
 
-		$tooltips['form_gravityview_fields'] = array(
-			'title' => __('GravityView Fields', 'gravityview'),
-			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview'),
+		$tooltips[ 'form_gravityview_fields' ] = array(
+			'title' => __( 'GravityView Fields', 'gravityview' ),
+			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview' ),
 		);
 
 		return $tooltips;
@@ -255,15 +255,15 @@ 
 
 		$gv_bulk_action = false;
 
-		if( version_compare( GFForms::$version, '2.0', '>=' ) ) {
-			$bulk_action = ( '-1' !== rgpost('action') ) ? rgpost('action') : rgpost('action2');
+		if ( version_compare( GFForms::$version, '2.0', '>=' ) ) {
+			$bulk_action = ( '-1' !== rgpost( 'action' ) ) ? rgpost( 'action' ) : rgpost( 'action2' );
 		} else {
 			// GF 1.9.x - Bulk action 2 is the bottom bulk action select form.
-			$bulk_action = rgpost('bulk_action') ? rgpost('bulk_action') : rgpost('bulk_action2');
+			$bulk_action = rgpost( 'bulk_action' ) ? rgpost( 'bulk_action' ) : rgpost( 'bulk_action2' );
 		}
 
 		// Check the $bulk_action value against GV actions, see if they're the same. I hate strpos().
-		if( ! empty( $bulk_action ) && preg_match( '/^('. implode( '|', $this->bulk_action_prefixes ) .')/ism', $bulk_action ) ) {
+		if ( ! empty( $bulk_action ) && preg_match( '/^(' . implode( '|', $this->bulk_action_prefixes ) . ')/ism', $bulk_action ) ) {
 			$gv_bulk_action = $bulk_action;
 		}
 
@@ -288,7 +288,7 @@ 
 		
 		// gforms_entry_list is the nonce that confirms we're on the right page
 		// gforms_update_note is sent when bulk editing entry notes. We don't want to process then.
-		if ( $bulk_action && rgpost('gforms_entry_list') && empty( $_POST['gforms_update_note'] ) ) {
+		if ( $bulk_action && rgpost( 'gforms_entry_list' ) && empty( $_POST[ 'gforms_update_note' ] ) ) {
 
 			check_admin_referer( 'gforms_entry_list', 'gforms_entry_list' );
 
@@ -306,13 +306,13 @@ 
 			}
 
 			// All entries are set to be updated, not just the visible ones
-			if ( ! empty( $_POST['all_entries'] ) ) {
+			if ( ! empty( $_POST[ 'all_entries' ] ) ) {
 
 				// Convert the current entry search into GF-formatted search criteria
 				$search = array(
-					'search_field' => isset( $_POST['f'] ) ? $_POST['f'][0] : 0,
-					'search_value' => isset( $_POST['v'][0] ) ? $_POST['v'][0] : '',
-					'search_operator' => isset( $_POST['o'][0] ) ? $_POST['o'][0] : 'contains',
+					'search_field' => isset( $_POST[ 'f' ] ) ? $_POST[ 'f' ][ 0 ] : 0,
+					'search_value' => isset( $_POST[ 'v' ][ 0 ] ) ? $_POST[ 'v' ][ 0 ] : '',
+					'search_operator' => isset( $_POST[ 'o' ][ 0 ] ) ? $_POST[ 'o' ][ 0 ] : 'contains',
 				);
 
 				$search_criteria = GravityView_frontend::get_search_criteria( $search, $form_id );
@@ -323,7 +323,7 @@ 
 			} else {
 
 				// Changed from 'lead' to 'entry' in 2.0
-				$entries = isset( $_POST['lead'] ) ? $_POST['lead'] : $_POST['entry'];
+				$entries = isset( $_POST[ 'lead' ] ) ? $_POST[ 'lead' ] : $_POST[ 'entry' ];
 
 			}
 
@@ -335,12 +335,12 @@ 
 			$entry_count = count( $entries ) > 1 ? sprintf( __( '%d entries', 'gravityview' ), count( $entries ) ) : __( '1 entry', 'gravityview' );
 
 			switch ( $approved_status ) {
-				case $this->bulk_action_prefixes['approve']:
+				case $this->bulk_action_prefixes[ 'approve' ]:
 					self::update_bulk( $entries, 1, $form_id );
 					$this->bulk_update_message = sprintf( __( '%s approved.', 'gravityview' ), $entry_count );
 					break;
 
-				case $this->bulk_action_prefixes['unapprove']:
+				case $this->bulk_action_prefixes[ 'unapprove' ]:
 					self::update_bulk( $entries, 0, $form_id );
 					$this->bulk_update_message = sprintf( __( '%s disapproved.', 'gravityview' ), $entry_count );
 					break;
@@ -364,12 +364,12 @@ 
 	 */
 	private static function update_bulk( $entries, $approved, $form_id ) {
 
-		if( empty($entries) || ( $entries !== true && !is_array($entries) ) ) {
+		if ( empty( $entries ) || ( $entries !== true && ! is_array( $entries ) ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ' Entries were empty or malformed.', $entries );
 			return false;
 		}
 
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ' User does not have the `gravityview_moderate_entries` capability.' );
 			return false;
 		}
@@ -379,7 +379,7 @@ 
 		// calculate approved field id once instead of looping through in the update_approved() method
 		$approved_column_id = self::get_approved_column( $form_id );
 
-		foreach( $entries as $entry_id ) {
+		foreach ( $entries as $entry_id ) {
 			self::update_approved( (int)$entry_id, $approved, $form_id, $approved_column_id );
 		}
 	}
@@ -398,14 +398,14 @@ 
 	 * @param int $approvedcolumn (default: 0)
 	 * @return boolean True: It worked; False: it failed
 	 */
-	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) {
+	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0 ) {
 
-		if( !class_exists( 'GFAPI' ) ) {
+		if ( ! class_exists( 'GFAPI' ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . 'GFAPI does not exist' );
 			return false;
 		}
 
-		if( empty( $approvedcolumn ) ) {
+		if ( empty( $approvedcolumn ) ) {
 			$approvedcolumn = self::get_approved_column( $form_id );
 		}
 
@@ -424,7 +424,7 @@ 
 		self::update_approved_meta( $entry_id, $approved, $form_id );
 
 		// add note to entry
-		if( $result === true ) {
+		if ( $result === true ) {
 
 			$note = empty( $approved ) ? __( 'Disapproved the Entry for GravityView', 'gravityview' ) : __( 'Approved the Entry for GravityView', 'gravityview' );
 
@@ -435,7 +435,7 @@ 
 			 */
 			$add_note = apply_filters( 'gravityview/approve_entries/add-note', true );
 
-			if( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
+			if ( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
 				$current_user = wp_get_current_user();
 				GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $current_user->display_name, $note );
 			}
@@ -447,7 +447,7 @@ 
 			 */
 			do_action( 'gravityview_clear_form_cache', $form_id );
 
-		} else if( is_wp_error( $result ) ) {
+		} else if ( is_wp_error( $result ) ) {
 
 			do_action( 'gravityview_log_error', __METHOD__ . sprintf( ' - Entry approval not updated: %s', $result->get_error_message() ) );
 
@@ -468,7 +468,7 @@ 
 	 * @param $form array Gravity Forms form object
 	 */
 	public function after_submission( $entry, $form ) {
-		$this->after_update_entry_update_approved_meta( $form , $entry['id'] );
+		$this->after_update_entry_update_approved_meta( $form, $entry[ 'id' ] );
 	}
 
 
@@ -484,18 +484,18 @@ 
 	 */
 	public function after_update_entry_update_approved_meta( $form, $entry_id = NULL ) {
 
-		$approvedcolumn = self::get_approved_column( $form['id'] );
+		$approvedcolumn = self::get_approved_column( $form[ 'id' ] );
 
         /**
          * If the form doesn't contain the approve field, don't assume anything.
          */
-        if( empty( $approvedcolumn ) ) {
+        if ( empty( $approvedcolumn ) ) {
             return;
         }
 
 		$entry = GFAPI::get_entry( $entry_id );
 
-		self::update_approved_meta( $entry_id, $entry[ (string)$approvedcolumn ], $form['id'] );
+		self::update_approved_meta( $entry_id, $entry[ (string)$approvedcolumn ], $form[ 'id' ] );
 
 	}
 
@@ -520,7 +520,7 @@ 
 		$is_approved = empty( $is_approved ) ? 0 : 'Approved';
 
 		// update entry meta
-		if( function_exists('gform_update_meta') ) {
+		if ( function_exists( 'gform_update_meta' ) ) {
 
 			gform_update_meta( $entry_id, 'is_approved', $is_approved, $form_id );
 
@@ -532,7 +532,7 @@ 
 			 */
 			do_action( 'gravityview/approve_entries/updated', $entry_id, $is_approved );
 
-			if( empty( $is_approved ) ) {
+			if ( empty( $is_approved ) ) {
 
 				/**
 				 * @action `gravityview/approve_entries/disapproved` Triggered when an entry is rejected
@@ -554,7 +554,7 @@ 
 
 		} else {
 
-			do_action('gravityview_log_error', __METHOD__ . ' - `gform_update_meta` does not exist.' );
+			do_action( 'gravityview_log_error', __METHOD__ . ' - `gform_update_meta` does not exist.' );
 
 		}
 	}
@@ -566,21 +566,21 @@ 
 	 */
 	public function ajax_update_approved() {
 
-		if( empty( $_POST['entry_id'] ) || empty( $_POST['form_id'] ) ) {
+		if ( empty( $_POST[ 'entry_id' ] ) || empty( $_POST[ 'form_id' ] ) ) {
 
 			do_action( 'gravityview_log_error', __METHOD__ . ' entry_id or form_id are empty.', $_POST );
 
 			$result = false;
 		}
 
-		else if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxgfentries' ) ) {
+		else if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxgfentries' ) ) {
 
 			do_action( 'gravityview_log_error', __METHOD__ . ' Security check failed.', $_POST );
 
 			$result = false;
 		}
 
-		else if( ! GVCommon::has_cap( 'gravityview_moderate_entries', $_POST['entry_id'] ) ) {
+		else if ( ! GVCommon::has_cap( 'gravityview_moderate_entries', $_POST[ 'entry_id' ] ) ) {
 
 			do_action( 'gravityview_log_error', __METHOD__ . ' User does not have the `gravityview_moderate_entries` capability.' );
 
@@ -589,11 +589,11 @@ 
 
 		else {
 
-			$result = self::update_approved( $_POST['entry_id'], $_POST['approved'], $_POST['form_id'] );
+			$result = self::update_approved( $_POST[ 'entry_id' ], $_POST[ 'approved' ], $_POST[ 'form_id' ] );
 
-			if( is_wp_error( $result ) ) {
+			if ( is_wp_error( $result ) ) {
 				/** @var WP_Error $result */
-				do_action( 'gravityview_log_error', __METHOD__ .' Error updating approval: ' . $result->get_error_message() );
+				do_action( 'gravityview_log_error', __METHOD__ . ' Error updating approval: ' . $result->get_error_message() );
 				$result = false;
 			}
 
@@ -613,29 +613,29 @@ 
 	 */
 	static public function get_approved_column( $form ) {
 
-        if( empty( $form ) ) {
+        if ( empty( $form ) ) {
             return null;
         }
 
-        if( !is_array( $form ) ) {
+        if ( ! is_array( $form ) ) {
             $form = GVCommon::get_form( $form );
         }
 
-		foreach( $form['fields'] as $key => $field ) {
+		foreach ( $form[ 'fields' ] as $key => $field ) {
 
-            $field = (array) $field;
+            $field = (array)$field;
 
-			if( !empty( $field['gravityview_approved'] ) ) {
-				if( !empty($field['inputs'][0]['id']) ) {
-					return $field['inputs'][0]['id'];
+			if ( ! empty( $field[ 'gravityview_approved' ] ) ) {
+				if ( ! empty( $field[ 'inputs' ][ 0 ][ 'id' ] ) ) {
+					return $field[ 'inputs' ][ 0 ][ 'id' ];
 				}
 			}
 
             // Note: This is just for backward compatibility from GF Directory plugin and old GV versions - when using i18n it may not work..
-            if( 'checkbox' == $field['type'] && isset( $field['inputs'] ) && is_array( $field['inputs'] ) ) {
-                foreach ( $field['inputs'] as $key2 => $input ) {
-                    if ( strtolower( $input['label'] ) == 'approved' ) {
-                        return $input['id'];
+            if ( 'checkbox' == $field[ 'type' ] && isset( $field[ 'inputs' ] ) && is_array( $field[ 'inputs' ] ) ) {
+                foreach ( $field[ 'inputs' ] as $key2 => $input ) {
+                    if ( strtolower( $input[ 'label' ] ) == 'approved' ) {
+                        return $input[ 'id' ];
                     }
                 }
             }
@@ -657,18 +657,18 @@ 
 	 *
 	 * @return void
 	 */
-	static public function add_entry_approved_hidden_input(  $form_id, $field_id, $value, $entry, $query_string ) {
+	static public function add_entry_approved_hidden_input( $form_id, $field_id, $value, $entry, $query_string ) {
 
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry['id'] ) ) {
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry[ 'id' ] ) ) {
 			return;
 		}
 
-		if( empty( $entry['id'] ) ) {
+		if ( empty( $entry[ 'id' ] ) ) {
 			return;
 		}
 
-		if( gform_get_meta( $entry['id'], 'is_approved' ) ) {
-			echo '<input type="hidden" class="entry_approved" id="entry_approved_'. $entry['id'] .'" value="true" />';
+		if ( gform_get_meta( $entry[ 'id' ], 'is_approved' ) ) {
+			echo '<input type="hidden" class="entry_approved" id="entry_approved_' . $entry[ 'id' ] . '" value="true" />';
 		}
 	}
 
@@ -681,10 +681,10 @@ 
 	 */
 	private function get_form_id() {
 
-		$form_id = GFForms::get('id');
+		$form_id = GFForms::get( 'id' );
 
 		// If there are no forms identified, use the first form. That's how GF does it.
-		if( empty( $form_id ) && class_exists('RGFormsModel') ) {
+		if ( empty( $form_id ) && class_exists( 'RGFormsModel' ) ) {
 			$form_id = $this->get_first_form_id();
 		}
 
@@ -704,14 +704,14 @@ 
 
 		$forms = RGFormsModel::get_forms( null, 'title' );
 
-		if( ! isset( $forms[0] ) ) {
+		if ( ! isset( $forms[ 0 ] ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ': No forms were found' );
 			return 0;
 		}
 
-		$first_form = $forms[0];
+		$first_form = $forms[ 0 ];
 
-		$form_id = is_object( $forms[0] ) ? $first_form->id : $first_form['id'];
+		$form_id = is_object( $forms[ 0 ] ) ? $first_form->id : $first_form[ 'id' ];
 
 		return intval( $form_id );
 	}
@@ -719,7 +719,7 @@ 
 
 	function add_scripts_and_styles( $hook ) {
 
-		if( ! class_exists( 'RGForms' ) ) {
+		if ( ! class_exists( 'RGForms' ) ) {
 
 			do_action( 'gravityview_log_error', 'GravityView_Admin_ApproveEntries[add_scripts_and_styles] RGForms does not exist.' );
 
@@ -728,34 +728,34 @@ 
 
 		// enqueue styles & scripts gf_entries
 		// But only if we're on the main Entries page, not on reports pages
-		if( GFForms::get_page() !== 'entry_list' ) {
+		if ( GFForms::get_page() !== 'entry_list' ) {
 			return;
 		}
 
 		$form_id = $this->get_form_id();
 
 		// Things are broken; no forms were found
-		if( empty( $form_id ) ) {
+		if ( empty( $form_id ) ) {
 			return;
 		}
 
-		wp_enqueue_style( 'gravityview_entries_list', plugins_url('assets/css/admin-entries-list.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
+		wp_enqueue_style( 'gravityview_entries_list', plugins_url( 'assets/css/admin-entries-list.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
 
-		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
-		wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url('assets/js/admin-entries-list'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version );
+		wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url( 'assets/js/admin-entries-list' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version );
 
 		wp_localize_script( 'gravityview_gf_entries_scripts', 'gvGlobals', array(
-			'nonce' => wp_create_nonce( 'gravityview_ajaxgfentries'),
+			'nonce' => wp_create_nonce( 'gravityview_ajaxgfentries' ),
 			'form_id' => $form_id,
 			'show_column' => (int)$this->show_approve_entry_column( $form_id ),
 			'add_bulk_action' => (int)GVCommon::has_cap( 'gravityview_moderate_entries' ),
 			'bulk_actions' => $this->get_bulk_actions( $form_id ),
 			'bulk_message' => $this->bulk_update_message,
-			'approve_title' => __( 'Entry not approved for directory viewing. Click to approve this entry.', 'gravityview'),
-			'unapprove_title' => __( 'Entry approved for directory viewing. Click to disapprove this entry.', 'gravityview'),
-			'column_title' => __( 'Show entry in directory view?', 'gravityview'),
-			'column_link' => esc_url( add_query_arg( array('sort' => self::get_approved_column( $form_id ) ) ) ),
+			'approve_title' => __( 'Entry not approved for directory viewing. Click to approve this entry.', 'gravityview' ),
+			'unapprove_title' => __( 'Entry approved for directory viewing. Click to disapprove this entry.', 'gravityview' ),
+			'column_title' => __( 'Show entry in directory view?', 'gravityview' ),
+			'column_link' => esc_url( add_query_arg( array( 'sort' => self::get_approved_column( $form_id ) ) ) ),
 		) );
 
 	}
@@ -775,11 +775,11 @@ 
 			'GravityView' => array(
 				array(
 					'label' => __( 'Approve', 'gravityview' ),
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['approve'], $form_id ),
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'approve' ], $form_id ),
 				),
 				array(
 					'label' => __( 'Disapprove', 'gravityview' ),
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['unapprove'], $form_id ),
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'unapprove' ], $form_id ),
 				),
 			),
 		);
@@ -796,8 +796,8 @@ 
 		// Sanitize the values, just to be sure.
 		foreach ( $bulk_actions as $key => $group ) {
 			foreach ( $group as $i => $action ) {
-				$bulk_actions[ $key ][ $i ]['label'] = esc_html( $bulk_actions[ $key ][ $i ]['label'] );
-				$bulk_actions[ $key ][ $i ]['value'] = esc_attr( $bulk_actions[ $key ][ $i ]['value'] );
+				$bulk_actions[ $key ][ $i ][ 'label' ] = esc_html( $bulk_actions[ $key ][ $i ][ 'label' ] );
+				$bulk_actions[ $key ][ $i ][ 'value' ] = esc_attr( $bulk_actions[ $key ][ $i ][ 'value' ] );
 			}
 		}
 
@@ -822,13 +822,13 @@ 
 		 * @since 1.7.2
 		 * @param boolean $hide_if_no_connections
 		 */
-		$hide_if_no_connections = apply_filters('gravityview/approve_entries/hide-if-no-connections', false );
+		$hide_if_no_connections = apply_filters( 'gravityview/approve_entries/hide-if-no-connections', false );
 
-		if( $hide_if_no_connections ) {
+		if ( $hide_if_no_connections ) {
 
 			$connected_views = gravityview_get_connected_views( $form_id );
 
-			if( empty( $connected_views ) ) {
+			if ( empty( $connected_views ) ) {
 				$show_approve_column = false;
 			}
 		}
@@ -838,18 +838,18 @@ 
 		 * @param boolean $show_approve_column Whether the column will be shown
 		 * @param int $form_id The ID of the Gravity Forms form for which entries are being shown
 		 */
-		$show_approve_column = apply_filters('gravityview/approve_entries/show-column', $show_approve_column, $form_id );
+		$show_approve_column = apply_filters( 'gravityview/approve_entries/show-column', $show_approve_column, $form_id );
 
 		return $show_approve_column;
 	}
 
 	function register_gform_noconflict_script( $scripts ) {
-		$scripts[] = 'gravityview_gf_entries_scripts';
+		$scripts[ ] = 'gravityview_gf_entries_scripts';
 		return $scripts;
 	}
 
 	function register_gform_noconflict_style( $styles ) {
-		$styles[] = 'gravityview_entries_list';
+		$styles[ ] = 'gravityview_entries_list';
 		return $styles;
 	}
 

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

Indentation +1648 added lines, -1648 removed lines

@@ -10,21 +10,21 @@ 
  */
 
 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
@@ -44,12 +44,12 @@ 
 	 */
 	private static $supports_product_fields = false;
 
-    /**
-     * Gravity Forms entry array
-     *
-     * @var array
-     */
-    var $entry;
+	/**
+	 * Gravity Forms entry array
+	 *
+	 * @var array
+	 */
+	var $entry;
 
 	/**
 	 * Gravity Forms entry array (it won't get changed during this class lifecycle)
@@ -58,135 +58,135 @@ 
 	 */
 	private static $original_entry = array();
 
-    /**
-     * Gravity Forms form array (GravityView modifies the content through this class lifecycle)
-     *
-     * @var array
-     */
-    var $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
-     */
-    var $form_after_validation = null;
-
-    /**
-     * Hold an array of GF field objects that have calculation rules
-     * @var array
-     */
-    var $fields_with_calculation = array();
-
-    /**
-     * Hold an array of GF field objects with type 'total'
-     * @var array
-     */
-    var $total_fields = array();
-
-    /**
-     * Gravity Forms form id
-     *
-     * @var int
-     */
-    var $form_id;
-
-    /**
-     * ID of the current view
-     *
-     * @var int
-     */
-    var $view_id;
-
-    /**
-     * Updated entry is valid (GF Validation object)
-     *
-     * @var array
-     */
-    var $is_valid = NULL;
-
-    function __construct( GravityView_Edit_Entry $loader ) {
-        $this->loader = $loader;
-    }
-
-    function load() {
-
-        /** @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' ) );
-
-        // 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_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 );
-
-        // 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') );
-
-    }
-
-    /**
-     * 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
-     */
-    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
-     */
-    function prevent_maybe_process_form() {
-
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
-
-        if( $this->is_edit_entry_submission() && $this->verify_nonce() ) {
-            remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
-        }
-    }
-
-    /**
-     * Is the current page an Edit Entry page?
-     * @return boolean
-     */
-    public function is_edit_entry() {
-
-        $gf_page = function_exists('rgpost') && ( 'entry' === rgget( 'view' ) && isset( $_GET['edit'] ) || rgpost( 'action' ) === 'update' );
-
-        return $gf_page;
-    }
+	/**
+	 * Gravity Forms form array (GravityView modifies the content through this class lifecycle)
+	 *
+	 * @var array
+	 */
+	var $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
+	 */
+	var $form_after_validation = null;
+
+	/**
+	 * Hold an array of GF field objects that have calculation rules
+	 * @var array
+	 */
+	var $fields_with_calculation = array();
+
+	/**
+	 * Hold an array of GF field objects with type 'total'
+	 * @var array
+	 */
+	var $total_fields = array();
+
+	/**
+	 * Gravity Forms form id
+	 *
+	 * @var int
+	 */
+	var $form_id;
+
+	/**
+	 * ID of the current view
+	 *
+	 * @var int
+	 */
+	var $view_id;
+
+	/**
+	 * Updated entry is valid (GF Validation object)
+	 *
+	 * @var array
+	 */
+	var $is_valid = NULL;
+
+	function __construct( GravityView_Edit_Entry $loader ) {
+		$this->loader = $loader;
+	}
+
+	function load() {
+
+		/** @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' ) );
+
+		// 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_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 );
+
+		// 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') );
+
+	}
+
+	/**
+	 * 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
+	 */
+	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
+	 */
+	function prevent_maybe_process_form() {
+
+		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+
+		if( $this->is_edit_entry_submission() && $this->verify_nonce() ) {
+			remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
+		}
+	}
+
+	/**
+	 * Is the current page an Edit Entry page?
+	 * @return boolean
+	 */
+	public function is_edit_entry() {
+
+		$gf_page = function_exists('rgpost') && ( 'entry' === rgget( 'view' ) && isset( $_GET['edit'] ) || rgpost( 'action' ) === 'update' );
+
+		return $gf_page;
+	}
 
 	/**
 	 * Is the current page an Edit Entry page?
@@ -197,578 +197,578 @@ 
 		return !empty( $_POST[ self::$nonce_field ] );
 	}
 
-    /**
-     * When Edit entry view is requested setup the vars
-     */
-    function setup_vars() {
-        $gravityview_view = GravityView_View::getInstance();
+	/**
+	 * When Edit entry view is requested setup the vars
+	 */
+	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
+	 */
+	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
-     */
-    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
+		if( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) {
+			return;
+		}
 
-        // Multiple Views embedded, don't proceed if nonce fails
-        if( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) {
-            return;
-        }
+		// Sorry, you're not allowed here.
+		if( false === $this->user_can_edit_entry( true ) ) {
+			return;
+		}
 
-        // Sorry, you're not allowed here.
-        if( false === $this->user_can_edit_entry( true ) ) {
-            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
+	 */
+	function print_scripts() {
+		$gravityview_view = GravityView_View::getInstance();
 
-    /**
-     * Force Gravity Forms to output scripts as if it were in the admin
-     * @return void
-     */
-    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
+	 */
+	function process_save() {
 
-    /**
-     * Process edit entry form save
-     */
-    function process_save() {
+		if( empty( $_POST ) ) {
+			return;
+		}
 
-        if( empty( $_POST ) ) {
-            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', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+		$this->process_save_process_files( $this->form_id );
 
-        $this->process_save_process_files( $this->form_id );
+		$this->validate();
 
-        $this->validate();
+		if( $this->is_valid ) {
 
-        if( $this->is_valid ) {
+			do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.' );
 
-            do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.' );
+			/**
+			 * @hack This step is needed to unset the adminOnly from form fields, to add the calculation fields
+			 */
+			$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'] );
+			GFFormsModel::save_lead( $form, $this->entry );
 
-            GFFormsModel::save_lead( $form, $this->entry );
+			// If there's a post associated with the entry, process post fields
+			if( !empty( $this->entry['post_id'] ) ) {
+				$this->maybe_update_post_fields( $form );
+			}
 
-            // If there's a post associated with the entry, process post fields
-            if( !empty( $this->entry['post_id'] ) ) {
-                $this->maybe_update_post_fields( $form );
-            }
+			// 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();
+			/**
+			 * @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
+			 */
+			do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'] );
+		}
 
-            /**
-             * @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
-             */
-            do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'] );
-        }
+	} // process_save
 
-    } // process_save
 
+	/**
+	 * Have GF handle file uploads
+	 *
+	 * Copy of code from GFFormDisplay::process_form()
+	 *
+	 * @param int $form_id
+	 */
+	function process_save_process_files( $form_id ) {
 
-    /**
-     * Have GF handle file uploads
-     *
-     * Copy of code from GFFormDisplay::process_form()
-     *
-     * @param int $form_id
-     */
-    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();
-        }
+		RGFormsModel::$uploaded_files[ $form_id ] = $files;
+	}
 
-        RGFormsModel::$uploaded_files[ $form_id ] = $files;
-    }
-
-    /**
-     * 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;
-
-        foreach( $form['fields'] as $k => &$field ) {
-
-            // Remove the fields with calculation formulas before save to avoid conflicts with GF logic
-            // @since 1.16.3
-            if( $field->has_calculation() ) {
-                unset( $form['fields'][ $k ] );
-            }
-
-            $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 );
-                }
-            }
-
-        }
-
-        //saving total field as the last field of the form.
-        if ( ! empty( $this->total_fields ) ) {
-            $update = true;
-            foreach ( $this->total_fields as $total_field ) {
-                $input_name = 'input_' . str_replace( '.', '_', $total_field->id);
-                $entry[ strval( $total_field->id ) ] = RGFormsModel::prepare_value( $form, $total_field, '', $input_name, $entry['id'], $entry );
-            }
-        }
-
-        if( $update ) {
-
-            $return_entry = GFAPI::update_entry( $entry );
-
-            if( is_wp_error( $return_entry ) ) {
-                do_action( 'gravityview_log_error', 'Updating the entry calculation and total fields failed', $return_entry );
-            } else {
-                do_action( 'gravityview_log_debug', 'Updating the entry calculation and total fields succeeded' );
-            }
-        }
-    }
-
-    /**
-     * 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 ) ) {
-
-            // Same image although the image title, caption or description might have changed
-
-            $ary = array();
-            if( ! empty( $entry[ $field_id ] ) ) {
-                $ary = is_array( $entry[ $field_id ] ) ? $entry[ $field_id ] : explode( '|:|', $entry[ $field_id ] );
-            }
-            $img_url = rgar( $ary, 0 );
-
-            // is this really the same image or something went wrong ?
-            if( $img_url === $_POST[ $input_name ] ) {
-
-                $img_title       = rgar( $value, $field_id .'.1' );
-                $img_caption     = rgar( $value, $field_id .'.4' );
-                $img_description = rgar( $value, $field_id .'.7' );
-
-                $value = ! empty( $img_url ) ? $img_url . "|:|" . $img_title . "|:|" . $img_caption . "|:|" . $img_description : '';
-
-                if ( $field->postFeaturedImage ) {
-
-                    $image_meta = array(
-                        'ID' => get_post_thumbnail_id( $post_id ),
-                        'post_title' => $img_title,
-                        'post_excerpt' => $img_caption,
-                        'post_content' => $img_description,
-                    );
-
-                    // 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 ) {
-
-        $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;
-        }
+	/**
+	 * 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;
+		}
 
-        $update_entry = false;
+		$plupload_init['gf_vars']['max_files'] = 0;
 
-        $updated_post = $original_post = get_post( $post_id );
+		return $plupload_init;
+	}
 
-        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( ! empty( $field->customFieldTemplateEnabled ) ) {
-                            $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
-                        }
-
-                        $input_type = RGFormsModel::get_input_type( $field );
-
-                        // Only certain custom field types are supported
-                        switch( $input_type ) {
-                            case 'fileupload':
-                            case 'list':
-                            case 'multiselect':
-                                if( ! is_string( $value ) ) {
-                                    $value = function_exists('wp_json_encode') ? wp_json_encode( $value ) : json_encode( $value );
-                                }
-                            // break; left intentionally out
-                            default:
-                                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;
-
-                }
-
-                // update entry after
-                $this->entry["{$field_id}"] = $value;
-
-                $update_entry = true;
-
-                unset( $entry_tmp );
-            }
-
-        }
-
-        if( $update_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' );
-            }
-
-        }
-
-        $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 );
-        }
-    }
-
-    /**
-     * 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 mixed|string|void
-     */
-    function fill_post_template( $template, $form, $entry, $do_shortcode = false ) {
-
-        require_once GRAVITYVIEW_DIR . 'includes/class-gravityview-gfformsmodel.php';
-
-        $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 all other variables
-        $output = GFCommon::replace_variables( $output, $form, $entry, false, false, false );
-
-        // replace conditional shortcodes
-        if( $do_shortcode ) {
-            $output = do_shortcode( $output );
-        }
-
-        return $output;
-    }
-
-
-    /**
-     * Perform actions normally performed after updating a lead
-     *
-     * @since 1.8
-     *
-     * @see GFEntryDetail::lead_detail_page()
-     *
-     * @return void
-     */
-    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'] );
+	/**
+	 * Unset adminOnly and convert field input key to string
+	 * @return array $form
+	 */
+	private function form_prepare_for_save() {
 
-        // Re-define the entry now that we've updated it.
-        $entry = RGFormsModel::get_lead( $this->entry['id'] );
+		$form = $this->form;
 
-        $entry = GFFormsModel::set_entry_meta( $entry, $this->form );
+		foreach( $form['fields'] as $k => &$field ) {
 
-        // 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 );
-        }
+			// Remove the fields with calculation formulas before save to avoid conflicts with GF logic
+			// @since 1.16.3
+			if( $field->has_calculation() ) {
+				unset( $form['fields'][ $k ] );
+			}
 
-        $this->entry = $entry;
-    }
+			$field->adminOnly = false;
 
+			if( isset( $field->inputs ) && is_array( $field->inputs ) ) {
+				foreach( $field->inputs as $key => $input ) {
+					$field->inputs[ $key ][ 'id' ] = (string)$input['id'];
+				}
+			}
+		}
 
-    /**
-     * Display the Edit Entry form
-     *
-     * @return [type] [description]
-     */
-    public function edit_entry_form() {
+		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 );
+				}
+			}
 
-        ?>
+		}
+
+		//saving total field as the last field of the form.
+		if ( ! empty( $this->total_fields ) ) {
+			$update = true;
+			foreach ( $this->total_fields as $total_field ) {
+				$input_name = 'input_' . str_replace( '.', '_', $total_field->id);
+				$entry[ strval( $total_field->id ) ] = RGFormsModel::prepare_value( $form, $total_field, '', $input_name, $entry['id'], $entry );
+			}
+		}
+
+		if( $update ) {
+
+			$return_entry = GFAPI::update_entry( $entry );
+
+			if( is_wp_error( $return_entry ) ) {
+				do_action( 'gravityview_log_error', 'Updating the entry calculation and total fields failed', $return_entry );
+			} else {
+				do_action( 'gravityview_log_debug', 'Updating the entry calculation and total fields succeeded' );
+			}
+		}
+	}
+
+	/**
+	 * 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 ) ) {
+
+			// Same image although the image title, caption or description might have changed
+
+			$ary = array();
+			if( ! empty( $entry[ $field_id ] ) ) {
+				$ary = is_array( $entry[ $field_id ] ) ? $entry[ $field_id ] : explode( '|:|', $entry[ $field_id ] );
+			}
+			$img_url = rgar( $ary, 0 );
+
+			// is this really the same image or something went wrong ?
+			if( $img_url === $_POST[ $input_name ] ) {
+
+				$img_title       = rgar( $value, $field_id .'.1' );
+				$img_caption     = rgar( $value, $field_id .'.4' );
+				$img_description = rgar( $value, $field_id .'.7' );
+
+				$value = ! empty( $img_url ) ? $img_url . "|:|" . $img_title . "|:|" . $img_caption . "|:|" . $img_description : '';
+
+				if ( $field->postFeaturedImage ) {
+
+					$image_meta = array(
+						'ID' => get_post_thumbnail_id( $post_id ),
+						'post_title' => $img_title,
+						'post_excerpt' => $img_caption,
+						'post_content' => $img_description,
+					);
+
+					// 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 ) {
+
+		$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( ! empty( $field->customFieldTemplateEnabled ) ) {
+							$value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
+						}
+
+						$input_type = RGFormsModel::get_input_type( $field );
+
+						// Only certain custom field types are supported
+						switch( $input_type ) {
+							case 'fileupload':
+							case 'list':
+							case 'multiselect':
+								if( ! is_string( $value ) ) {
+									$value = function_exists('wp_json_encode') ? wp_json_encode( $value ) : json_encode( $value );
+								}
+							// break; left intentionally out
+							default:
+								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;
+
+				}
+
+				// update entry after
+				$this->entry["{$field_id}"] = $value;
+
+				$update_entry = true;
+
+				unset( $entry_tmp );
+			}
+
+		}
+
+		if( $update_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' );
+			}
+
+		}
+
+		$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 );
+		}
+	}
+
+	/**
+	 * 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 mixed|string|void
+	 */
+	function fill_post_template( $template, $form, $entry, $do_shortcode = false ) {
+
+		require_once GRAVITYVIEW_DIR . 'includes/class-gravityview-gfformsmodel.php';
+
+		$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 all other variables
+		$output = GFCommon::replace_variables( $output, $form, $entry, false, false, false );
+
+		// replace conditional shortcodes
+		if( $do_shortcode ) {
+			$output = do_shortcode( $output );
+		}
+
+		return $output;
+	}
+
+
+	/**
+	 * Perform actions normally performed after updating a lead
+	 *
+	 * @since 1.8
+	 *
+	 * @see GFEntryDetail::lead_detail_page()
+	 *
+	 * @return void
+	 */
+	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'] );
+
+		// 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 );
+
+		// 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 );
+		}
+
+		$this->entry = $entry;
+	}
+
+
+	/**
+	 * Display the Edit Entry form
+	 *
+	 * @return [type] [description]
+	 */
+	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(); ?>
@@ -779,1144 +779,1144 @@ 
 
                 <?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>
 
         </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 );
-
-        add_filter( 'gform_field_value', array( $this, 'fix_survey_fields_value'), 10, 3 );
-
-        // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
-        unset( $_GET['page'] );
-
-        // TODO: Verify multiple-page forms
-        // TODO: Product fields are not editable
-
-        $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
-
-        remove_filter( 'gform_field_value', array( $this, 'fix_survey_fields_value'), 10 );
-	    remove_filter( 'gform_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 );
-    }
-
-    /**
-     * Survey fields inject their output using `gform_field_input` filter, but in Edit Entry, the values were empty.
-     * We filter the values here because it was the easiest access point: tell the survey field the correct value, GF outputs it.
-     *
-     * @TODO: REMOVE; now added in class-gravityview-plugin-hooks-gravity-forms-survey.php
-     * 
-     * @since 1.16.4
-     *
-     * @param string $value Existing value
-     * @param GF_Field $field
-     * @param string $name Field custom parameter name, normally blank.
-     *
-     * @return mixed
-     */
-    function fix_survey_fields_value( $value, $field, $name ) {
+	}
+
+	/**
+	 * 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 );
+
+		add_filter( 'gform_field_value', array( $this, 'fix_survey_fields_value'), 10, 3 );
+
+		// We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
+		unset( $_GET['page'] );
+
+		// TODO: Verify multiple-page forms
+		// TODO: Product fields are not editable
+
+		$html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
+
+		remove_filter( 'gform_field_value', array( $this, 'fix_survey_fields_value'), 10 );
+		remove_filter( 'gform_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 );
+	}
+
+	/**
+	 * Survey fields inject their output using `gform_field_input` filter, but in Edit Entry, the values were empty.
+	 * We filter the values here because it was the easiest access point: tell the survey field the correct value, GF outputs it.
+	 *
+	 * @TODO: REMOVE; now added in class-gravityview-plugin-hooks-gravity-forms-survey.php
+	 * 
+	 * @since 1.16.4
+	 *
+	 * @param string $value Existing value
+	 * @param GF_Field $field
+	 * @param string $name Field custom parameter name, normally blank.
+	 *
+	 * @return mixed
+	 */
+	function fix_survey_fields_value( $value, $field, $name ) {
         
-        if( 'survey' === $field->type ) {
-
-	        // We need to run through each survey row until we find a match for expected values
-	        foreach ( $this->entry as $field_id => $field_value ) {
-
-		        if ( floor( $field_id ) !== floor( $field->id ) ) {
-			        continue;
-		        }
-
-		        if( rgar( $field, 'gsurveyLikertEnableMultipleRows' ) ) {
-			        list( $row_val, $col_val ) = explode( ':', $field_value, 2 );
-
-		            // If the $name matches the $row_val, we are processing the correct row
-			        if( $row_val === $name ) {
-				        $value = $field_value;
-				        break;
-			        }
-		        } else {
-			        // When not processing multiple rows, the value is the $entry[ $field_id ] value.
-			        $value = $field_value;
-				    break;
-		        }
+		if( 'survey' === $field->type ) {
+
+			// We need to run through each survey row until we find a match for expected values
+			foreach ( $this->entry as $field_id => $field_value ) {
+
+				if ( floor( $field_id ) !== floor( $field->id ) ) {
+					continue;
+				}
+
+				if( rgar( $field, 'gsurveyLikertEnableMultipleRows' ) ) {
+					list( $row_val, $col_val ) = explode( ':', $field_value, 2 );
+
+					// If the $name matches the $row_val, we are processing the correct row
+					if( $row_val === $name ) {
+						$value = $field_value;
+						break;
+					}
+				} else {
+					// When not processing multiple rows, the value is the $entry[ $field_id ] value.
+					$value = $field_value;
+					break;
+				}
 			}
-        }
-
-        return $value;
-    }
-
-    /**
-     * 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 );
-
-        // 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)
-     */
-    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
-     */
-    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' ) ) )
-            || ! empty( $field_content )
-            || in_array( $field->type, array( 'honeypot' ) )
-            || GFCommon::is_product_field( $field->type ) // Prevent product fields from appearing editable
-        ) {
-	        return $field_content;
-        }
-
-        // Turn on Admin-style display for file upload fields only
-        if( 'fileupload' === $field->type ) {
-            $_GET['page'] = 'gf_entries';
-        }
-
-        // SET SOME FIELD DEFAULTS TO PREVENT ISSUES
-        $field->adminOnly = false; /** @see GFFormDisplay::get_counter_init_script() need to prevent adminOnly */
-
-        // add categories as choices for Post Category field
-        if ( 'post_category' === $field->type ) {
-            $field = GFCommon::add_categories_as_choices( $field, $value );
-        }
-
-        $field_value = $this->get_field_value( $field );
-
-        /**
-         * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
-         * @since 1.11
-         * @param mixed $field_value field value used to populate the input
-         * @param object $field Gravity Forms field object ( Class GF_Field )
-         */
-        $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field );
-
-        /**
-         * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type
-         * @since 1.17
-         * @param mixed $field_value field value used to populate the input
-         * @param GF_Field $field Gravity Forms field object
-         */
-        $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field );
-
-	    // Prevent any PHP warnings, like undefined index
-	    ob_start();
-
-        if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
-            /** @var GF_Field $gv_field */
-            $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
-        } else {
-	        $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 );
-	    }
-
-        /**
-         * Unset hack $_GET['page'] = 'gf_entries'
-         * We need the fileupload html field to render with the proper id
-         *  ( <li id="field_80_16" ... > )
-         */
-        unset( $_GET['page'] );
-
-        return $return;
-    }
-
-    /**
-     * Modify the value for the current field input
-     *
-     * @param GF_Field $field
-     *
-     * @return array|mixed|string|void
-     */
-    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'] );
+		}
+
+		return $value;
+	}
+
+	/**
+	 * 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 );
+
+		// 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)
+	 */
+	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
+	 */
+	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' ) ) )
+			|| ! empty( $field_content )
+			|| in_array( $field->type, array( 'honeypot' ) )
+			|| GFCommon::is_product_field( $field->type ) // Prevent product fields from appearing editable
+		) {
+			return $field_content;
+		}
+
+		// Turn on Admin-style display for file upload fields only
+		if( 'fileupload' === $field->type ) {
+			$_GET['page'] = 'gf_entries';
+		}
+
+		// SET SOME FIELD DEFAULTS TO PREVENT ISSUES
+		$field->adminOnly = false; /** @see GFFormDisplay::get_counter_init_script() need to prevent adminOnly */
+
+		// add categories as choices for Post Category field
+		if ( 'post_category' === $field->type ) {
+			$field = GFCommon::add_categories_as_choices( $field, $value );
+		}
+
+		$field_value = $this->get_field_value( $field );
+
+		/**
+		 * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
+		 * @since 1.11
+		 * @param mixed $field_value field value used to populate the input
+		 * @param object $field Gravity Forms field object ( Class GF_Field )
+		 */
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field );
+
+		/**
+		 * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type
+		 * @since 1.17
+		 * @param mixed $field_value field value used to populate the input
+		 * @param GF_Field $field Gravity Forms field object
+		 */
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field );
+
+		// Prevent any PHP warnings, like undefined index
+		ob_start();
+
+		if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
+			/** @var GF_Field $gv_field */
+			$return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
+		} else {
+			$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 );
+		}
+
+		/**
+		 * Unset hack $_GET['page'] = 'gf_entries'
+		 * We need the fileupload html field to render with the proper id
+		 *  ( <li id="field_80_16" ... > )
+		 */
+		unset( $_GET['page'] );
+
+		return $return;
+	}
+
+	/**
+	 * Modify the value for the current field input
+	 *
+	 * @param GF_Field $field
+	 *
+	 * @return array|mixed|string|void
+	 */
+	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;
-                }
+				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 );
+			$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 {
+		} else {
 
-            $id = intval( $field->id );
+			$id = intval( $field->id );
 
-            // get pre-populated value if exists
-            $pre_value = $field->allowsPrepopulate ? GFFormsModel::get_parameter_value( $field->inputName, array(), $field ) : '';
+			// 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;
+			// 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 );
-            }
+			// 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 );
+		// if value is empty get the default value if defined
+		$field_value = $field->get_value_default_if_empty( $field_value );
 
-        return $field_value;
-    }
+		return $field_value;
+	}
 
 
-    // ---- Entry validation
+	// ---- Entry validation
 
-    /**
-     * Add field keys that Gravity Forms expects.
-     *
-     * @see GFFormDisplay::validate()
-     * @param  array $form GF Form
-     * @return array       Modified GF Form
-     */
-    function gform_pre_validation( $form ) {
+	/**
+	 * Add field keys that Gravity Forms expects.
+	 *
+	 * @see GFFormDisplay::validate()
+	 * @param  array $form GF Form
+	 * @return array       Modified GF Form
+	 */
+	function gform_pre_validation( $form ) {
 
-        if( ! $this->verify_nonce() ) {
-            return $form;
-        }
+		if( ! $this->verify_nonce() ) {
+			return $form;
+		}
 
-        // Fix PHP warning regarding undefined index.
-        foreach ( $form['fields'] as &$field) {
+		// 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;
-            }
+			// 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;
+			}
 
-            // unset emailConfirmEnabled for email type fields
-           /* if( 'email' === $field['type'] && !empty( $field['emailConfirmEnabled'] ) ) {
+			// unset emailConfirmEnabled for email type fields
+		   /* if( 'email' === $field['type'] && !empty( $field['emailConfirmEnabled'] ) ) {
                 $field['emailConfirmEnabled'] = '';
             }*/
 
-            switch( RGFormsModel::get_input_type( $field ) ) {
+			switch( RGFormsModel::get_input_type( $field ) ) {
+
+				/**
+				 * this whole fileupload hack is because in the admin, Gravity Forms simply doesn't update any fileupload field if it's empty, but it DOES in the frontend.
+				 *
+				 * 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;
 
-                /**
-                 * 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 ];
-                    }
+					// 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'];
+					// 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 {
 
-                    } 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' => '' );
 
-                        // 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;
+					}
 
-                    }
+					if( rgar($field, "multipleFiles") ) {
 
-                    $this->entry[ $input_name ] = $value;
-                    $_POST[ $input_name ] = $value;
+						// 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());
+						}
 
-                    break;
+					} else {
 
-                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;
-                case 'captcha':
-                    // Fix issue with recaptcha_check_answer() on line 1458 in form_display.php
-                    $_POST['recaptcha_challenge_field'] = NULL;
-                    $_POST['recaptcha_response_field'] = NULL;
-                    break;
-            }
+						// 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;
 
-        }
+					}
 
-        return $form;
-    }
+					$this->entry[ $input_name ] = $value;
+					$_POST[ $input_name ] = $value;
 
+					break;
 
-    /**
-     * Process validation for a edit entry submission
-     *
-     * Sets the `is_valid` object var
-     *
-     * @return void
-     */
-    function validate() {
+				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;
+				case 'captcha':
+					// Fix issue with recaptcha_check_answer() on line 1458 in form_display.php
+					$_POST['recaptcha_challenge_field'] = NULL;
+					$_POST['recaptcha_response_field'] = NULL;
+					break;
+			}
+
+		}
+
+		return $form;
+	}
 
-        /**
-         * 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' ) );
-        }
 
+	/**
+	 * Process validation for a edit entry submission
+	 *
+	 * Sets the `is_valid` object var
+	 *
+	 * @return void
+	 */
+	function validate() {
 
-        /**
-         * 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);
+		/**
+		 * 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' ) );
+		}
 
-        // 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'] );
+		/**
+		 * 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);
 
-        // Hide fields depending on Edit Entry settings
-        $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id );
+		// Needed by the validate funtion
+		$failed_validation_page = NULL;
+		$field_values = RGForms::post( 'gform_field_values' );
 
-        $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page );
+		// Prevent entry limit from running when editing an entry, also
+		// prevent form scheduling from preventing editing
+		unset( $this->form['limitEntries'], $this->form['scheduleForm'] );
 
-        remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 );
-    }
+		// 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 );
 
-    /**
-     * 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]
-     */
-    function custom_validation( $validation_results ) {
+		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]
+	 */
+	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;
+		$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 );
+			$value = RGFormsModel::get_field_value( $field );
+			$field_type = RGFormsModel::get_input_type( $field );
 
-            // Validate always
-            switch ( $field_type ) {
+			// Validate always
+			switch ( $field_type ) {
 
 
-                case 'fileupload' :
-                case 'post_image':
+				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 );
-                    }
+					// 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 );
+					}
 
-                    // validate if multi file upload reached max number of files [maxFiles] => 2
-                    if( rgobj( $field, 'maxFiles') && rgobj( $field, 'multipleFiles') ) {
+					// validate if multi file upload reached max number of files [maxFiles] => 2
+					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();
+						$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();
 
-                        //existent
-                        $entry = $this->get_entry();
-                        $value = NULL;
-                        if( isset( $entry[ $field->id ] ) ) {
-                            $value = json_decode( $entry[ $field->id ], true );
-                        }
+						//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 );
+						// 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;
+						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;
-                        }
+							// in case of error make sure the newest upload files are removed from the upload input
+							GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
+						}
 
-                    }
+					}
 
 
-                    break;
+					break;
 
-            }
+			}
 
-            // This field has failed validation.
-            if( !empty( $field->failed_validation ) ) {
+			// This field has 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 ) );
+				do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'field' => $field, 'value' => $value ) );
 
-                switch ( $field_type ) {
+				switch ( $field_type ) {
 
-                    // Captchas don't need to be re-entered.
-                    case 'captcha':
+					// 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;
+						// Post Image fields aren't editable, so we un-fail them.
+					case 'post_image':
+						$field->failed_validation = false;
+						unset( $field->validation_message );
+						break;
 
-                }
+				}
 
-                // You can't continue inside a switch, so we do it after.
-                if( empty( $field->failed_validation ) ) {
-                    continue;
-                }
+				// You can't continue inside a switch, so we do it after.
+				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 ) ) {
+				// 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 ) ) {
 
-                    $entry = $this->get_entry();
+					$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;
+					// 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 );
+						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;
-                    }
-                }
+						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;
-                }
+				// 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;
+				}
 
-                $gv_valid = false;
+				$gv_valid = false;
 
-            }
+			}
 
-        }
+		}
 
-        $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'];
+		// We'll need this result when rendering the form ( on GFFormDisplay::get_form )
+		$this->form_after_validation = $validation_results['form'];
 
-        return $validation_results;
-    }
+		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() {
+	/**
+	 * 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() );
-        }
+		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;
-    }
+		return $this->entry;
+	}
 
 
 
-    // --- Filters
+	// --- 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 ) {
+	/**
+	 * 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
-        $properties = GravityView_View_Data::getInstance()->get_fields( $view_id );
+		// Get all fields for form
+		$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;
 
-        // Show hidden fields as text fields
-        $form = $this->fix_survey_fields( $form );
+		// Show hidden fields as text fields
+		$form = $this->fix_survey_fields( $form );
 
-        // Hide fields depending on admin settings
-        $fields = $this->filter_fields( $form['fields'], $edit_fields );
+		// 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;
-    }
+		return $fields;
+	}
 
-    /**
-     * Make sure Survey fields accept pre-populating values; otherwise existing values won't be filled-in
-     *
-     * @since 1.16.4
-     *
-     * @param array $form
-     *
-     * @return array Form, with all fields set to `allowsPrepopulate => true`
-     */
-    private function fix_survey_fields( $form ) {
+	/**
+	 * Make sure Survey fields accept pre-populating values; otherwise existing values won't be filled-in
+	 *
+	 * @since 1.16.4
+	 *
+	 * @param array $form
+	 *
+	 * @return array Form, with all fields set to `allowsPrepopulate => true`
+	 */
+	private function fix_survey_fields( $form ) {
 
-        /** @var GF_Field $field */
-        foreach( $form['fields'] as &$field ) {
-            $field->allowsPrepopulate = true;
-        }
+		/** @var GF_Field $field */
+		foreach( $form['fields'] as &$field ) {
+			$field->allowsPrepopulate = true;
+		}
 
-        return $form;
-    }
+		return $form;
+	}
     
 
-    /**
-     * 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 = array(
-            'page',
-        );
-
-	    /**
-	     * @filter `gravityview/edit_entry/hide-product-fields` Hide product fields from being editable.
-	     * @since 1.9.1
-         * @param boolean $hide_product_fields Whether to hide product fields in the editor.  Default: false
-	     */
-	    $hide_product_fields = apply_filters( 'gravityview/edit_entry/hide-product-fields', empty( self::$supports_product_fields ) );
-
-	    if( $hide_product_fields ) {
-		    $field_type_blacklist[] = 'option';
-		    $field_type_blacklist[] = 'quantity';
-            $field_type_blacklist[] = 'product';
-            $field_type_blacklist[] = 'total';
-            $field_type_blacklist[] = 'shipping';
-            $field_type_blacklist[] = 'calculation';
-	    }
-
-        // 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.
-            }
-
-            // process total field after all fields have been saved
-            if ( $field->type == 'total' ) {
-                $this->total_fields[] = $field;
-                unset( $fields[ $key ] );
-            }
-
-            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 $setting  GV field options
-     * @since  1.5
-     * @return array
-     */
-    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
-     */
-    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
-
-    /**
-     * Remove the conditional logic rules from the form button and the form fields, if needed.
-     *
-     * @since 1.9
-     *
-     * @param array $form Gravity Forms form
-     * @return array Modified form, if not using Conditional Logic
-     */
-    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|void
-     */
-    function manage_conditional_logic( $has_conditional_logic, $form ) {
-
-        if( ! $this->is_edit_entry() ) {
-            return $has_conditional_logic;
-        }
-
-        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.
-     */
-    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');
-            }
+	/**
+	 * 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 = array(
+			'page',
+		);
+
+		/**
+		 * @filter `gravityview/edit_entry/hide-product-fields` Hide product fields from being editable.
+		 * @since 1.9.1
+		 * @param boolean $hide_product_fields Whether to hide product fields in the editor.  Default: false
+		 */
+		$hide_product_fields = apply_filters( 'gravityview/edit_entry/hide-product-fields', empty( self::$supports_product_fields ) );
+
+		if( $hide_product_fields ) {
+			$field_type_blacklist[] = 'option';
+			$field_type_blacklist[] = 'quantity';
+			$field_type_blacklist[] = 'product';
+			$field_type_blacklist[] = 'total';
+			$field_type_blacklist[] = 'shipping';
+			$field_type_blacklist[] = 'calculation';
+		}
+
+		// 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.
+			}
+
+			// process total field after all fields have been saved
+			if ( $field->type == 'total' ) {
+				$this->total_fields[] = $field;
+				unset( $fields[ $key ] );
+			}
+
+			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;
+				}
 
-        }
-
-        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 ) {
+		return $edit_fields;
 
-	        $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;" ) );
-	        }
+	/**
+	 * Override GF Form field properties with the ones defined on the View
+	 * @param  GF_Field $field GF Form field object
+	 * @param  array $setting  GV field options
+	 * @since  1.5
+	 * @return array
+	 */
+	private function merge_field_properties( $field, $field_setting ) {
 
-            echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
-        }
+		$return_field = $field;
 
-        do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error );
+		if( empty( $field_setting['show_label'] ) ) {
+			$return_field->label = '';
+		} elseif ( !empty( $field_setting['custom_label'] ) ) {
+			$return_field->label = $field_setting['custom_label'];
+		}
 
-        return false;
-    }
+		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;
 
-    /**
-     * 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;
+		return $return_field;
 
-        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;
-        }
+	/**
+	 * 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
+	 */
+	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;
+		}
 
-        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 );
+		foreach( $fields as &$field ) {
+			$field->adminOnly = false;
+		}
 
-        return false;
+		return $fields;
+	}
 
-    }
+	// --- Conditional Logic
 
+	/**
+	 * Remove the conditional logic rules from the form button and the form fields, if needed.
+	 *
+	 * @since 1.9
+	 *
+	 * @param array $form Gravity Forms form
+	 * @return array Modified form, if not using Conditional Logic
+	 */
+	function filter_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 ) {
+		/**
+		 * @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 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;
-        }
+		if( $use_conditional_logic ) {
+			return $form;
+		}
 
-        $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false;
+		foreach( $form['fields'] as &$field ) {
+			/* @var GF_Field $field */
+			$field->conditionalLogic = null;
+		}
 
-        // If the field has custom editing capaibilities set, check those
-        if( $field_cap ) {
-            return GVCommon::has_cap( $field['allow_edit_cap'] );
-        }
-
-        return false;
-    }
+		unset( $form['button']['conditionalLogic'] );
 
+		return $form;
 
-    /**
-     * Is the current nonce valid for editing the entry?
-     * @return boolean
-     */
-    public function verify_nonce() {
+	}
+
+	/**
+	 * 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|void
+	 */
+	function manage_conditional_logic( $has_conditional_logic, $form ) {
 
-        // Verify form submitted for editing single
-        if( $this->is_edit_entry_submission() ) {
-            $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
-        }
+		if( ! $this->is_edit_entry() ) {
+			return $has_conditional_logic;
+		}
 
-        // Verify
-        else if( ! $this->is_edit_entry() ) {
-            $valid = false;
-        }
+		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.
+	 */
+	function user_can_edit_entry( $echo = false ) {
 
-        else {
-            $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
-        }
+		$error = NULL;
 
-        /**
-         * @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 );
+		/**
+		 *  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'] ) ) {
 
-        return $valid;
-    }
+			$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 +229 added lines, -229 removed lines

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

includes/widgets/search-widget/templates/search-field-select.php

Spacing +9 added lines, -9 removed lines

@@ -10,8 +10,8 @@ 
 $search_field = $gravityview_view->search_field;
 
 // Make sure that there are choices to display
-if( empty( $search_field['choices'] ) ) {
-	do_action('gravityview_log_debug', 'search-field-select.php - No choices for field' );
+if ( empty( $search_field[ 'choices' ] ) ) {
+	do_action( 'gravityview_log_debug', 'search-field-select.php - No choices for field' );
 	return;
 }
 
@@ -21,19 +21,19 @@ 
  * @param string $default_option Default: `—` (—)
  * @param string $field_type Field type: "select" or "multiselect"
  */
-$default_option = apply_filters('gravityview/extension/search/select_default', '—', 'select' );
+$default_option = apply_filters( 'gravityview/extension/search/select_default', '—', 'select' );
 
 ?>
 <div class="gv-search-box gv-search-field-select">
-	<?php if( ! gv_empty( $search_field['label'], false ) ) { ?>
-		<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label>
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false ) ) { ?>
+		<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
 	<?php } ?>
 	<p>
-		<select name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>">
-			<option value="" <?php gv_selected( '', $search_field['value'], true ); ?>><?php echo esc_html( $default_option ); ?></option>
+		<select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>">
+			<option value="" <?php gv_selected( '', $search_field[ 'value' ], true ); ?>><?php echo esc_html( $default_option ); ?></option>
 			<?php
-			foreach( $search_field['choices'] as $choice ) : ?>
-				<option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $search_field['value'] ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
+			foreach ( $search_field[ 'choices' ] as $choice ) : ?>
+				<option value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" <?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $search_field[ 'value' ] ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
 			<?php endforeach; ?>
 		</select>
 	</p>