gravityview / GravityView

includes/class-frontend-views.php

Indentation +10 added lines, -10 removed lines

@@ -1,15 +1,15 @@
 <?php
 /**
- * GravityView Frontend functions
- *
- * @package   GravityView
- * @license   GPL2+
- * @author    Katz Web Services, Inc.
- * @link      http://gravityview.co
- * @copyright Copyright 2014, Katz Web Services, Inc.
- *
- * @since 1.0.0
- */
+	 * GravityView Frontend functions
+	 *
+	 * @package   GravityView
+	 * @license   GPL2+
+	 * @author    Katz Web Services, Inc.
+	 * @link      http://gravityview.co
+	 * @copyright Copyright 2014, Katz Web Services, Inc.
+	 *
+	 * @since 1.0.0
+	 */
 
 
 class GravityView_frontend {

Spacing +92 added lines, -92 removed lines

@@ -85,8 +85,8 @@ 
 	private function __construct() {}
 
 	private function initialize() {
-		add_action( 'wp', array( $this, 'parse_content'), 11 );
-		add_action( 'template_redirect', array( $this, 'set_entry_data'), 1 );
+		add_action( 'wp', array( $this, 'parse_content' ), 11 );
+		add_action( 'template_redirect', array( $this, 'set_entry_data' ), 1 );
 
 		// Enqueue scripts and styles after GravityView_Template::register_styles()
 		add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 20 );
@@ -233,15 +233,15 @@ 
 
 			$this->context_view_id = $view_id;
 
-		} elseif ( isset( $_GET['gvid'] ) && $this->getGvOutputData()->has_multiple_views() ) {
+		} elseif ( isset( $_GET[ 'gvid' ] ) && $this->getGvOutputData()->has_multiple_views() ) {
 			/**
 			 * used on a has_multiple_views context
 			 * @see GravityView_API::entry_link
 			 * @see GravityView_View_Data::getInstance()->has_multiple_views()
 			 */
-			$this->context_view_id = $_GET['gvid'];
+			$this->context_view_id = $_GET[ 'gvid' ];
 
-		} elseif ( ! $this->getGvOutputData()->has_multiple_views() )  {
+		} elseif ( ! $this->getGvOutputData()->has_multiple_views() ) {
 			$array_keys = array_keys( $this->getGvOutputData()->get_views() );
 			$this->context_view_id = array_pop( $array_keys );
 			unset( $array_keys );
@@ -269,7 +269,7 @@ 
 		global $post;
 
 		// If in admin and NOT AJAX request, get outta here.
-		if ( GravityView_Plugin::is_admin() )  {
+		if ( GravityView_Plugin::is_admin() ) {
 			return;
 		}
 
@@ -281,7 +281,7 @@ 
 
 		$this->setIsGravityviewPostType( get_post_type( $post ) === 'gravityview' );
 
-		$post_id = $this->getPostId() ? $this->getPostId() : (isset( $post ) ? $post->ID : null );
+		$post_id = $this->getPostId() ? $this->getPostId() : ( isset( $post ) ? $post->ID : null );
 		$this->setPostId( $post_id );
 		$post_has_shortcode = ! empty( $post->post_content ) ? gravityview_has_shortcode_r( $post->post_content, 'gravityview' ) : false;
 		$this->setPostHasShortcode( $this->isGravityviewPostType() ? null : ! empty( $post_has_shortcode ) );
@@ -365,20 +365,20 @@ 
 		 * @param boolean $in_the_loop Whether to apply the filter to the menu title and the meta tag <title> - outside the loop
 		 * @param array $entry Current entry
 		 */
-		$apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop' , in_the_loop(), $entry );
+		$apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop', in_the_loop(), $entry );
 
 		if ( ! $apply_outside_loop ) {
 			return $title;
 		}
 
 		// User reported WooCommerce doesn't pass two args.
-		if ( empty( $passed_post_id ) )  {
+		if ( empty( $passed_post_id ) ) {
 			return $title;
 		}
 
 		// Don't modify the title for anything other than the current view/post.
 		// This is true for embedded shortcodes and Views.
-		if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) {
+		if ( is_object( $post ) && (int)$post->ID !== (int)$passed_post_id ) {
 			return $title;
 		}
 
@@ -388,19 +388,19 @@ 
 			$view_meta = $this->getGvOutputData()->get_view( $context_view_id );
 		} else {
 			foreach ( $this->getGvOutputData()->get_views() as $view_id => $view_data ) {
-				if ( intval( $view_data['form_id'] ) === intval( $entry['form_id'] ) ) {
+				if ( intval( $view_data[ 'form_id' ] ) === intval( $entry[ 'form_id' ] ) ) {
 					$view_meta = $view_data;
 					break;
 				}
 			}
 		}
 
-		if ( ! empty( $view_meta['atts']['single_title'] ) ) {
+		if ( ! empty( $view_meta[ 'atts' ][ 'single_title' ] ) ) {
 
-			$title = $view_meta['atts']['single_title'];
+			$title = $view_meta[ 'atts' ][ 'single_title' ];
 
 			// We are allowing HTML in the fields, so no escaping the output
-			$title = GravityView_API::replace_variables( $title, $view_meta['form'], $entry );
+			$title = GravityView_API::replace_variables( $title, $view_meta[ 'form' ], $entry );
 
 			$title = do_shortcode( $title );
 		}
@@ -501,7 +501,7 @@ 
 	public function render_view( $passed_args ) {
 
 		// validate attributes
-		if ( empty( $passed_args['id'] ) ) {
+		if ( empty( $passed_args[ 'id' ] ) ) {
 			do_action( 'gravityview_log_error', '[render_view] Returning; no ID defined.', $passed_args );
 			return null;
 		}
@@ -523,7 +523,7 @@ 
 			return null;
 		}
 
-		$view_id = $passed_args['id'];
+		$view_id = $passed_args[ 'id' ];
 
 		$view_data = $this->getGvOutputData()->get_view( $view_id, $passed_args );
 
@@ -536,7 +536,7 @@ 
 		$passed_args = array_filter( $passed_args, 'strlen' );
 
 		//Override shortcode args over View template settings
-		$atts = wp_parse_args( $passed_args, $view_data['atts'] );
+		$atts = wp_parse_args( $passed_args, $view_data[ 'atts' ] );
 
 		do_action( 'gravityview_log_debug', '[render_view] Arguments after merging with View settings: ', $atts );
 
@@ -558,11 +558,11 @@ 
 		 * Don't render View if user isn't allowed to see it
 		 * @since 1.15
 		 */
-		if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
+		if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
 			return null;
 		}
 
-		if( $this->isGravityviewPostType() ) {
+		if ( $this->isGravityviewPostType() ) {
 
 			/**
 			 * @filter `gravityview_direct_access` Should Views be directly accessible, or only visible using the shortcode?
@@ -574,9 +574,9 @@ 
 			 */
 			$direct_access = apply_filters( 'gravityview_direct_access', true, $view_id );
 
-			$embed_only = ! empty( $atts['embed_only'] );
+			$embed_only = ! empty( $atts[ 'embed_only' ] );
 
-			if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
+			if ( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
 		}
@@ -591,7 +591,7 @@ 
 
 		$gravityview_view = new GravityView_View( $view_data );
 
-		$post_id = ! empty( $atts['post_id'] ) ? intval( $atts['post_id'] ) : $this->getPostId();
+		$post_id = ! empty( $atts[ 'post_id' ] ) ? intval( $atts[ 'post_id' ] ) : $this->getPostId();
 
 		$gravityview_view->setPostId( $post_id );
 
@@ -601,20 +601,20 @@ 
 			do_action( 'gravityview_log_debug', '[render_view] Executing Directory View' );
 
 			//fetch template and slug
-			$view_slug = apply_filters( 'gravityview_template_slug_'. $view_data['template_id'], 'table', 'directory' );
+			$view_slug = apply_filters( 'gravityview_template_slug_' . $view_data[ 'template_id' ], 'table', 'directory' );
 
 			do_action( 'gravityview_log_debug', '[render_view] View template slug: ', $view_slug );
 
 			/**
 			 * Disable fetching initial entries for views that don't need it (DataTables)
 			 */
-			$get_entries = apply_filters( 'gravityview_get_view_entries_'.$view_slug, true );
+			$get_entries = apply_filters( 'gravityview_get_view_entries_' . $view_slug, true );
 
 			/**
 			 * Hide View data until search is performed
 			 * @since 1.5.4
 			 */
-			if ( ! empty( $atts['hide_until_searched'] ) && ! $this->isSearch() ) {
+			if ( ! empty( $atts[ 'hide_until_searched' ] ) && ! $this->isSearch() ) {
 				$gravityview_view->setHideUntilSearched( true );
 				$get_entries = false;
 			}
@@ -622,23 +622,23 @@ 
 
 			if ( $get_entries ) {
 
-				if ( ! empty( $atts['sort_columns'] ) ) {
+				if ( ! empty( $atts[ 'sort_columns' ] ) ) {
 					// add filter to enable column sorting
-					add_filter( 'gravityview/template/field_label', array( $this, 'add_columns_sort_links' ) , 100, 3 );
+					add_filter( 'gravityview/template/field_label', array( $this, 'add_columns_sort_links' ), 100, 3 );
 				}
 
-				$view_entries = self::get_view_entries( $atts, $view_data['form_id'] );
+				$view_entries = self::get_view_entries( $atts, $view_data[ 'form_id' ] );
 
-				do_action( 'gravityview_log_debug', sprintf( '[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries['count'], sizeof( $view_entries['entries'] ) ) );
+				do_action( 'gravityview_log_debug', sprintf( '[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries[ 'count' ], sizeof( $view_entries[ 'entries' ] ) ) );
 
 			} else {
 
 				$view_entries = array( 'count' => null, 'entries' => null, 'paging' => null );
 
-				do_action( 'gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_'.$view_slug.'` is false' );
+				do_action( 'gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_' . $view_slug . '` is false' );
 			}
 
-			$gravityview_view->setPaging( $view_entries['paging'] );
+			$gravityview_view->setPaging( $view_entries[ 'paging' ] );
 			$gravityview_view->setContext( 'directory' );
 			$sections = array( 'header', 'body', 'footer' );
 
@@ -647,7 +647,7 @@ 
 			// user requested Single Entry View
 			do_action( 'gravityview_log_debug', '[render_view] Executing Single View' );
 
-			do_action( 'gravityview_render_entry_'.$view_data['id'] );
+			do_action( 'gravityview_render_entry_' . $view_data[ 'id' ] );
 
 			$entry = $this->getEntry();
 
@@ -674,20 +674,20 @@ 
 			// We're in single view, but the view being processed is not the same view the single entry belongs to.
 			// important: do not remove this as it prevents fake attempts of displaying entries from other views/forms
 			if ( $this->getGvOutputData()->has_multiple_views() && $view_id != $this->get_context_view_id() ) {
-				do_action( 'gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: '. $view_id );
+				do_action( 'gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: ' . $view_id );
 				return null;
 			}
 
 			//fetch template and slug
-			$view_slug = apply_filters( 'gravityview_template_slug_' . $view_data['template_id'], 'table', 'single' );
+			$view_slug = apply_filters( 'gravityview_template_slug_' . $view_data[ 'template_id' ], 'table', 'single' );
 			do_action( 'gravityview_log_debug', '[render_view] View single template slug: ', $view_slug );
 
 			//fetch entry detail
-			$view_entries['count'] = 1;
-			$view_entries['entries'][] = $entry;
-			do_action( 'gravityview_log_debug', '[render_view] Get single entry: ', $view_entries['entries'] );
+			$view_entries[ 'count' ] = 1;
+			$view_entries[ 'entries' ][ ] = $entry;
+			do_action( 'gravityview_log_debug', '[render_view] Get single entry: ', $view_entries[ 'entries' ] );
 
-			$back_link_label = isset( $atts['back_link_label'] ) ? $atts['back_link_label'] : null;
+			$back_link_label = isset( $atts[ 'back_link_label' ] ) ? $atts[ 'back_link_label' ] : null;
 
 			// set back link label
 			$gravityview_view->setBackLinkLabel( $back_link_label );
@@ -697,11 +697,11 @@ 
 		}
 
 		// add template style
-		self::add_style( $view_data['template_id'] );
+		self::add_style( $view_data[ 'template_id' ] );
 
 		// Prepare to render view and set vars
-		$gravityview_view->setEntries( $view_entries['entries'] );
-		$gravityview_view->setTotalEntries( $view_entries['count'] );
+		$gravityview_view->setEntries( $view_entries[ 'entries' ] );
+		$gravityview_view->setTotalEntries( $view_entries[ 'count' ] );
 
 		// If Edit
 		if ( 'edit' === gravityview_get_context() ) {
@@ -714,11 +714,11 @@ 
 
 		} else {
 			// finaly we'll render some html
-			$sections = apply_filters( 'gravityview_render_view_sections', $sections, $view_data['template_id'] );
+			$sections = apply_filters( 'gravityview_render_view_sections', $sections, $view_data[ 'template_id' ] );
 
 			do_action( 'gravityview_log_debug', '[render_view] Sections to render: ', $sections );
 			foreach ( $sections as $section ) {
-				do_action( 'gravityview_log_debug', '[render_view] Rendering '. $section . ' section.' );
+				do_action( 'gravityview_log_debug', '[render_view] Rendering ' . $section . ' section.' );
 				$gravityview_view->render( $view_slug, $section, false );
 			}
 		}
@@ -772,7 +772,7 @@ 
 				$datetime_format = 'Y-m-d H:i:s';
 				$search_is_outside_view_bounds = false;
 
-				if( ! empty( $search_criteria[ $key ] ) ) {
+				if ( ! empty( $search_criteria[ $key ] ) ) {
 
 					$search_date = strtotime( $search_criteria[ $key ] );
 
@@ -800,14 +800,14 @@ 
 				if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) {
 
 					// Then we override the search and re-set the start date
-					$return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true );
+					$return_search_criteria[ $key ] = date_i18n( $datetime_format, $date, true );
 				}
 			}
 		}
 
-		if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) {
+		if ( isset( $return_search_criteria[ 'start_date' ] ) && isset( $return_search_criteria[ 'end_date' ] ) ) {
 			// The start date is AFTER the end date. This will result in no results, but let's not force the issue.
-			if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) {
+			if ( strtotime( $return_search_criteria[ 'start_date' ] ) > strtotime( $return_search_criteria[ 'end_date' ] ) ) {
 				do_action( 'gravityview_log_error', __METHOD__ . ' Invalid search: the start date is after the end date.', $return_search_criteria );
 			}
 		}
@@ -825,9 +825,9 @@ 
 	 */
 	public static function process_search_only_approved( $args, $search_criteria ) {
 
-		if ( ! empty( $args['show_only_approved'] ) ) {
-			$search_criteria['field_filters'][] = array( 'key' => 'is_approved', 'value' => 'Approved' );
-			$search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met
+		if ( ! empty( $args[ 'show_only_approved' ] ) ) {
+			$search_criteria[ 'field_filters' ][ ] = array( 'key' => 'is_approved', 'value' => 'Approved' );
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; // force all the criterias to be met
 
 			do_action( 'gravityview_log_debug', '[process_search_only_approved] Search Criteria if show only approved: ', $search_criteria );
 		}
@@ -851,12 +851,12 @@ 
 	 */
 	public static function is_entry_approved( $entry, $args = array() ) {
 
-		if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) {
+		if ( empty( $entry[ 'id' ] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args[ 'show_only_approved' ] ) ) {
 			// is implicitly approved if entry is null or View settings doesn't require to check for approval
 			return true;
 		}
 
-		$is_approved = gform_get_meta( $entry['id'], 'is_approved' );
+		$is_approved = gform_get_meta( $entry[ 'id' ], 'is_approved' );
 
 		if ( $is_approved ) {
 			return true;
@@ -889,26 +889,26 @@ 
 		do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', $search_criteria );
 
 		// implicity search
-		if ( ! empty( $args['search_value'] ) ) {
+		if ( ! empty( $args[ 'search_value' ] ) ) {
 
 			// Search operator options. Options: `is` or `contains`
-			$operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains';
+			$operator = ! empty( $args[ 'search_operator' ] ) && in_array( $args[ 'search_operator' ], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args[ 'search_operator' ] : 'contains';
 
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => rgget( 'search_field', $args ), // The field ID to search
-				'value' => _wp_specialchars( $args['search_value'] ), // The value to search. Encode ampersands but not quotes.
+				'value' => _wp_specialchars( $args[ 'search_value' ] ), // The value to search. Encode ampersands but not quotes.
 				'operator' => $operator,
 			);
 		}
 
-		if( $search_criteria !== $original_search_criteria ) {
+		if ( $search_criteria !== $original_search_criteria ) {
 			do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after implicity search: ', $search_criteria );
 		}
 
 		// Handle setting date range
 		$search_criteria = self::process_search_dates( $args, $search_criteria );
 
-		if( $search_criteria !== $original_search_criteria ) {
+		if ( $search_criteria !== $original_search_criteria ) {
 			do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after date params: ', $search_criteria );
 		}
 
@@ -919,7 +919,7 @@ 
 		 * @filter `gravityview_status` Modify entry status requirements to be included in search results.
 		 * @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash`
 		 */
-		$search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args );
+		$search_criteria[ 'status' ] = apply_filters( 'gravityview_status', 'active', $args );
 
 		return $search_criteria;
 	}
@@ -965,16 +965,16 @@ 
 		$search_criteria = self::get_search_criteria( $args, $form_id );
 
 		// Paging & offset
-		$page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : apply_filters( 'gravityview_default_page_size', 25 );
+		$page_size = ! empty( $args[ 'page_size' ] ) ? intval( $args[ 'page_size' ] ) : apply_filters( 'gravityview_default_page_size', 25 );
 
 		if ( -1 === $page_size ) {
 			$page_size = PHP_INT_MAX;
 		}
 
-		if ( isset( $args['offset'] ) ) {
-			$offset = intval( $args['offset'] );
+		if ( isset( $args[ 'offset' ] ) ) {
+			$offset = intval( $args[ 'offset' ] );
 		} else {
-			$curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] );
+			$curr_page = empty( $_GET[ 'pagenum' ] ) ? 1 : intval( $_GET[ 'pagenum' ] );
 			$offset = ( $curr_page - 1 ) * $page_size;
 		}
 
@@ -992,7 +992,7 @@ 
 			'search_criteria' => $search_criteria,
 			'sorting' => $sorting,
 			'paging' => $paging,
-			'cache' => isset( $args['cache'] ) ? $args['cache'] : true,
+			'cache' => isset( $args[ 'cache' ] ) ? $args[ 'cache' ] : true,
 		);
 
 		/**
@@ -1017,7 +1017,7 @@ 
 		 * @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys.
 		 * @param array $args View configuration args.
 		 */
-		$parameters = apply_filters( 'gravityview_get_entries_'.$args['id'], $parameters, $args, $form_id );
+		$parameters = apply_filters( 'gravityview_get_entries_' . $args[ 'id' ], $parameters, $args, $form_id );
 
 		do_action( 'gravityview_log_debug', '[get_view_entries] $parameters passed to gravityview_get_entries(): ', $parameters );
 
@@ -1057,8 +1057,8 @@ 
 	 */
 	public static function updateViewSorting( $args, $form_id ) {
 		$sorting = array();
-		$sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : rgar( $args, 'sort_field' );
-		$sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : rgar( $args, 'sort_direction' );
+		$sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : rgar( $args, 'sort_field' );
+		$sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : rgar( $args, 'sort_direction' );
 
 		$sort_field_id = self::_override_sorting_id_by_field_type( $sort_field_id, $form_id );
 
@@ -1098,7 +1098,7 @@ 
 
 		$sort_field = GFFormsModel::get_field( $form, $sort_field_id );
 
-		switch ( $sort_field['type'] ) {
+		switch ( $sort_field[ 'type' ] ) {
 
 			case 'address':
 				// Sorting by full address
@@ -1115,7 +1115,7 @@ 
 					 */
 					$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id );
 
-					switch( strtolower( $address_part ) ){
+					switch ( strtolower( $address_part ) ) {
 						case 'street':
 							$sort_field_id .= '.1';
 							break;
@@ -1195,7 +1195,7 @@ 
 		 */
 		$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry );
 
-		if ( empty( $single_entry ) ){
+		if ( empty( $single_entry ) ) {
 			return false;
 		} else {
 			return $single_entry;
@@ -1222,7 +1222,7 @@ 
 				 * Don't enqueue the scripts or styles if it's not going to be displayed.
 				 * @since 1.15
 				 */
-				if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
+				if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
 					continue;
 				}
 
@@ -1231,19 +1231,19 @@ 
 				$css_dependencies = array();
 
 				// If the thickbox is enqueued, add dependencies
-				if ( ! empty( $data['atts']['lightbox'] ) ) {
+				if ( ! empty( $data[ 'atts' ][ 'lightbox' ] ) ) {
 
 					/**
 					 * @filter `gravity_view_lightbox_script` Override the lightbox script to enqueue. Default: `thickbox`
 					 * @param string $script_slug If you want to use a different lightbox script, return the name of it here.
 					 */
-					$js_dependencies[] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' );
+					$js_dependencies[ ] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' );
 
 					/**
 					 * @filter `gravity_view_lightbox_style` Modify the lightbox CSS slug. Default: `thickbox`
 					 * @param string $script_slug If you want to use a different lightbox script, return the name of its CSS file here.
 					 */
-					$css_dependencies[] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' );
+					$css_dependencies[ ] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' );
 				}
 
 				/**
@@ -1251,25 +1251,25 @@ 
 				 * @see https://github.com/katzwebservices/GravityView/issues/536
 				 * @since 1.15
 				 */
-				if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) {
-					$css_dependencies[] = 'dashicons';
+				if ( gravityview_view_has_single_checkbox_or_radio( $data[ 'form' ], $data[ 'fields' ] ) ) {
+					$css_dependencies[ ] = 'dashicons';
 				}
 
 				wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'includes/lib/jquery-cookie/jquery_cookie.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
 
 				$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
-				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ) , GravityView_Plugin::version, true );
+				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ), GravityView_Plugin::version, true );
 
 				wp_enqueue_script( 'gravityview-fe-view' );
 
-				if ( ! empty( $data['atts']['sort_columns'] ) ) {
+				if ( ! empty( $data[ 'atts' ][ 'sort_columns' ] ) ) {
 					wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' );
 				}
 
 				wp_enqueue_style( 'gravityview_default_style', plugins_url( 'templates/css/gv-default-styles.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' );
 
-				self::add_style( $data['template_id'] );
+				self::add_style( $data[ 'template_id' ] );
 
 			}
 
@@ -1305,7 +1305,7 @@ 
 		} elseif ( empty( $template_id ) ) {
 			do_action( 'gravityview_log_error', '[add_style] Cannot add template style; template_id is empty' );
 		} else {
-			do_action( 'gravityview_log_error', sprintf( '[add_style] Cannot add template style; %s is not registered', 'gravityview_style_'.$template_id ) );
+			do_action( 'gravityview_log_error', sprintf( '[add_style] Cannot add template style; %s is not registered', 'gravityview_style_' . $template_id ) );
 		}
 
 	}
@@ -1330,11 +1330,11 @@ 
 		 * Not a table-based template; don't add sort icons
 		 * @since 1.12
 		 */
-		if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
+		if ( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
 			return $label;
 		}
 
-		if ( ! $this->is_field_sortable( $field['id'], $form ) ) {
+		if ( ! $this->is_field_sortable( $field[ 'id' ], $form ) ) {
 			return $label;
 		}
 
@@ -1342,29 +1342,29 @@ 
 
 		$class = 'gv-sort';
 
-		$sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] );
+		$sort_field_id = self::_override_sorting_id_by_field_type( $field[ 'id' ], $form[ 'id' ] );
 
 		$sort_args = array(
-			'sort' => $field['id'],
+			'sort' => $field[ 'id' ],
 			'dir' => 'asc',
 		);
 
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
+		if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) {
 			//toggle sorting direction.
-			if ( 'asc' === $sorting['direction'] ) {
-				$sort_args['dir'] = 'desc';
+			if ( 'asc' === $sorting[ 'direction' ] ) {
+				$sort_args[ 'dir' ] = 'desc';
 				$class .= ' gv-icon-sort-desc';
 			} else {
-				$sort_args['dir'] = 'asc';
+				$sort_args[ 'dir' ] = 'asc';
 				$class .= ' gv-icon-sort-asc';
 			}
 		} else {
 			$class .= ' gv-icon-caret-up-down';
 		}
 
-		$url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) );
+		$url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) );
 
-		return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a>&nbsp;'. $label;
+		return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a>&nbsp;' . $label;
 
 	}
 
@@ -1382,7 +1382,7 @@ 
 
 		$field_type = $field_id;
 
-		if( is_numeric( $field_id ) ) {
+		if ( is_numeric( $field_id ) ) {
 			$field = GFFormsModel::get_field( $form, $field_id );
 			$field_type = $field->type;
 		}
@@ -1405,7 +1405,7 @@ 
 			return false;
 		}
 
-		return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
+		return apply_filters( "gravityview/sortable/formfield_{$form[ 'id' ]}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
 
 	}
 

includes/class-common.php

Spacing +107 added lines, -107 removed lines

@@ -124,7 +124,7 @@ 
 
 		$entry = self::get_entry( $entry_slug, true );
 
-		$form = self::get_form( $entry['form_id'] );
+		$form = self::get_form( $entry[ 'form_id' ] );
 
 		return $form;
 	}
@@ -175,7 +175,7 @@ 
 
 		$results = GFAPI::get_entries( 0, $search_criteria, null, $paging );
 
-		$result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null;
+		$result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null;
 
 		return $result;
 	}
@@ -193,9 +193,9 @@ 
 		if ( class_exists( 'GFAPI' ) ) {
 			$gf_forms = GFAPI::get_forms();
 			foreach ( $gf_forms as $form ) {
-				$forms[] = array(
-					'id' => $form['id'],
-					'title' => $form['title'],
+				$forms[ ] = array(
+					'id' => $form[ 'id' ],
+					'title' => $form[ 'title' ],
 				);
 			}
 		}
@@ -227,9 +227,9 @@ 
 		}
 
 		if ( $form ) {
-			foreach ( $form['fields'] as $field ) {
-				if ( $include_parent_field || empty( $field['inputs'] ) ) {
-					$fields[ $field['id'] ] = array(
+			foreach ( $form[ 'fields' ] as $field ) {
+				if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) {
+					$fields[ $field[ 'id' ] ] = array(
 						'label' => rgar( $field, 'label' ),
 						'parent' => null,
 						'type' => rgar( $field, 'type' ),
@@ -238,16 +238,16 @@ 
 					);
 				}
 
-				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
-					foreach ( $field['inputs'] as $input ) {
+				if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) {
+					foreach ( $field[ 'inputs' ] as $input ) {
                         /**
                          * @hack
                          * In case of email/email confirmation, the input for email has the same id as the parent field
                          */
-                        if( 'email' == rgar( $field, 'type' ) && false === strpos( $input['id'], '.' ) ) {
+                        if ( 'email' == rgar( $field, 'type' ) && false === strpos( $input[ 'id' ], '.' ) ) {
                             continue;
                         }
-						$fields[ (string)$input['id'] ] = array(
+						$fields[ (string)$input[ 'id' ] ] = array(
 							'label' => rgar( $input, 'label' ),
 							'customLabel' => rgar( $input, 'customLabel' ),
 							'parent' => $field,
@@ -259,11 +259,11 @@ 
 				}
 
 				/** @since 1.14 */
-				if( 'list' === $field['type'] && !empty( $field['enableColumns'] ) ) {
+				if ( 'list' === $field[ 'type' ] && ! empty( $field[ 'enableColumns' ] ) ) {
 
-					foreach ( (array)$field['choices'] as $key => $input ) {
+					foreach ( (array)$field[ 'choices' ] as $key => $input ) {
 
-						$input_id = sprintf( '%d.%d', $field['id'], $key ); // {field_id}.{column_key}
+						$input_id = sprintf( '%d.%d', $field[ 'id' ], $key ); // {field_id}.{column_key}
 
 						$fields[ $input_id ] = array(
 							'label'       => rgar( $input, 'text' ),
@@ -279,25 +279,25 @@ 
 				/**
 				 * @since 1.8
 				 */
-				if( 'quiz' === $field['type'] ) {
+				if ( 'quiz' === $field[ 'type' ] ) {
 					$has_quiz_fields = true;
 				}
 
 				/**
 				 * @since 1.8
 				 */
-				if( 'poll' === $field['type'] ) {
+				if ( 'poll' === $field[ 'type' ] ) {
 					$has_poll_fields = true;
 				}
 
-				if( GFCommon::is_product_field( $field['type'] ) ){
+				if ( GFCommon::is_product_field( $field[ 'type' ] ) ) {
 					$has_product_fields = true;
 				}
 
 				/**
 				 * @hack Version 1.9
 				 */
-				$field_for_is_post_field = class_exists( 'GF_Fields' ) ? (object) $field : (array) $field;
+				$field_for_is_post_field = class_exists( 'GF_Fields' ) ? (object)$field : (array)$field;
 
 				if ( GFCommon::is_post_field( $field_for_is_post_field ) ) {
 					$has_post_fields = true;
@@ -309,7 +309,7 @@ 
 		 * @since 1.7
 		 */
 		if ( $has_post_fields ) {
-			$fields['post_id'] = array(
+			$fields[ 'post_id' ] = array(
 				'label' => __( 'Post ID', 'gravityview' ),
 				'type' => 'post_id',
 			);
@@ -320,10 +320,10 @@ 
 			$payment_fields = GravityView_Fields::get_all( 'pricing' );
 
 			foreach ( $payment_fields as $payment_field ) {
-				if( isset( $fields["{$payment_field->name}"] ) ) {
+				if ( isset( $fields[ "{$payment_field->name}" ] ) ) {
 					continue;
 				}
-				$fields["{$payment_field->name}"] = array(
+				$fields[ "{$payment_field->name}" ] = array(
 					'label' => $payment_field->label,
 					'desc' => $payment_field->description,
 					'type' => $payment_field->name,
@@ -334,24 +334,24 @@ 
 		/**
 		 * @since 1.8
 		 */
-		if( $has_quiz_fields ) {
+		if ( $has_quiz_fields ) {
 
-			$fields['gquiz_score']   = array(
+			$fields[ 'gquiz_score' ] = array(
 				'label' => __( 'Quiz Score Total', 'gravityview' ),
 				'type'  => 'quiz_score',
 				'desc'  => __( 'Displays the number of correct Quiz answers the user submitted.', 'gravityview' ),
 			);
-			$fields['gquiz_percent'] = array(
+			$fields[ 'gquiz_percent' ] = array(
 				'label' => __( 'Quiz Percentage Grade', 'gravityview' ),
 				'type'  => 'quiz_percent',
 				'desc'  => __( 'Displays the percentage of correct Quiz answers the user submitted.', 'gravityview' ),
 			);
-			$fields['gquiz_grade']   = array(
+			$fields[ 'gquiz_grade' ] = array(
 				'label' => __( 'Quiz Letter Grade', 'gravityview' ),
 				'type'  => 'quiz_grade',
 				'desc'  => __( 'Displays the Grade the user achieved based on Letter Grading configured in the Quiz Settings.', 'gravityview' ),
 			);
-			$fields['gquiz_is_pass'] = array(
+			$fields[ 'gquiz_is_pass' ] = array(
 				'label' => __( 'Quiz Pass/Fail', 'gravityview' ),
 				'type'  => 'quiz_is_pass',
 				'desc'  => __( 'Displays either Passed or Failed based on the Pass/Fail settings configured in the Quiz Settings.', 'gravityview' ),
@@ -373,9 +373,9 @@ 
 
 		$fields = array();
 
-		foreach ( $extra_fields as $key => $field ){
-			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
-				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
+		foreach ( $extra_fields as $key => $field ) {
+			if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) {
+				$fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' );
 			}
 		}
 
@@ -415,32 +415,32 @@ 
 			'search_criteria' => null,
 			'sorting' => null,
 			'paging' => null,
-			'cache' => (isset( $passed_criteria['cache'] ) ? $passed_criteria['cache'] : true),
+			'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? $passed_criteria[ 'cache' ] : true ),
 		);
 
 		$criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults );
 
-		if ( ! empty( $criteria['search_criteria']['field_filters'] ) ) {
-			foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) {
+		if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
+			foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) {
 
 				if ( ! is_array( $filter ) ) {
 					continue;
 				}
 
 				// By default, we want searches to be wildcard for each field.
-				$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
+				$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
 
 				/**
 				 * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc)
 				 * @param string $operator Existing search operator
 				 * @param array $filter array with `key`, `value`, `operator`, `type` keys
 				 */
-				$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter );
+				$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter );
 			}
 
 			// don't send just the [mode] without any field filter.
-			if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) {
-				unset( $criteria['search_criteria']['field_filters']['mode'] );
+			if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
+				unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] );
 			}
 
 		}
@@ -451,21 +451,21 @@ 
 		 * Prepare date formats to be in Gravity Forms DB format;
 		 * $passed_criteria may include date formats incompatible with Gravity Forms.
 		 */
-		foreach ( array('start_date', 'end_date' ) as $key ) {
+		foreach ( array( 'start_date', 'end_date' ) as $key ) {
 
-			if ( ! empty( $criteria['search_criteria'][ $key ] ) ) {
+			if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) {
 
 				// Use date_create instead of new DateTime so it returns false if invalid date format.
-				$date = date_create( $criteria['search_criteria'][ $key ] );
+				$date = date_create( $criteria[ 'search_criteria' ][ $key ] );
 
 				if ( $date ) {
 					// Gravity Forms wants dates in the `Y-m-d H:i:s` format.
-					$criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' );
+					$criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' );
 				} else {
 					// If it's an invalid date, unset it. Gravity Forms freaks out otherwise.
-					unset( $criteria['search_criteria'][ $key ] );
+					unset( $criteria[ 'search_criteria' ][ $key ] );
 
-					do_action( 'gravityview_log_error', '[filter_get_entries_criteria] '.$key.' Date format not valid:', $criteria['search_criteria'][ $key ] );
+					do_action( 'gravityview_log_error', '[filter_get_entries_criteria] ' . $key . ' Date format not valid:', $criteria[ 'search_criteria' ][ $key ] );
 				}
 			}
 		}
@@ -473,12 +473,12 @@ 
 
 		// When multiple views are embedded, OR single entry, calculate the context view id and send it to the advanced filter
 		if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance()->has_multiple_views() || GravityView_frontend::getInstance()->getSingleEntry() ) {
-			$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
+			$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
 		} elseif ( 'delete' === RGForms::get( 'action' ) ) {
-			$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? $_GET['view_id'] : null;
-		} elseif( !isset( $criteria['context_view_id'] ) ) {
+			$criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? $_GET[ 'view_id' ] : null;
+		} elseif ( ! isset( $criteria[ 'context_view_id' ] ) ) {
             // Prevent overriding the Context View ID: Some widgets could set the context_view_id (e.g. Recent Entries widget)
-			$criteria['context_view_id'] = null;
+			$criteria[ 'context_view_id' ] = null;
 		}
 
 		/**
@@ -487,7 +487,7 @@ 
 		 * @param array $form_ids Forms to search
 		 * @param int $view_id ID of the view being used to search
 		 */
-		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] );
+		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] );
 
 		return (array)$criteria;
 
@@ -518,7 +518,7 @@ 
 		/** Reduce # of database calls */
 		add_filter( 'gform_is_encrypted_field', '__return_false' );
 
-		if ( ! empty( $criteria['cache'] ) ) {
+		if ( ! empty( $criteria[ 'cache' ] ) ) {
 
 			$Cache = new GravityView_Cache( $form_ids, $criteria );
 
@@ -526,7 +526,7 @@ 
 
 				// Still update the total count when using cached results
 				if ( ! is_null( $total ) ) {
-					$total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] );
+					$total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] );
 				}
 
 				$return = $entries;
@@ -546,9 +546,9 @@ 
 			$entries = apply_filters( 'gravityview_before_get_entries', null, $criteria, $passed_criteria, $total );
 
 			// No entries returned from gravityview_before_get_entries
-			if( is_null( $entries ) ) {
+			if ( is_null( $entries ) ) {
 
-				$entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total );
+				$entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total );
 
 				if ( is_wp_error( $entries ) ) {
 					do_action( 'gravityview_log_error', $entries->get_error_message(), $entries );
@@ -557,7 +557,7 @@ 
 				}
 			}
 
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
+			if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) {
 
 				// Cache results
 				$Cache->set( $entries, 'entries' );
@@ -636,7 +636,7 @@ 
 			// fetch the entry
 			$entry = GFAPI::get_entry( $entry_id );
 
-			if( $check_entry_display ) {
+			if ( $check_entry_display ) {
 				// Is the entry allowed
 				$entry = self::check_entry_display( $entry );
 			}
@@ -669,12 +669,12 @@ 
 
 		$value = false;
 
-		if( 'context' === $val1 ) {
+		if ( 'context' === $val1 ) {
 
 			$matching_contexts = array( $val2 );
 
 			// We allow for non-standard contexts.
-			switch( $val2 ) {
+			switch ( $val2 ) {
 				// Check for either single or edit
 				case 'singular':
 					$matching_contexts = array( 'single', 'edit' );
@@ -734,7 +734,7 @@ 
 			return false;
 		}
 
-		if ( empty( $entry['form_id'] ) ) {
+		if ( empty( $entry[ 'form_id' ] ) ) {
 			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry is empty! Entry:', $entry );
 			return false;
 		}
@@ -742,26 +742,26 @@ 
 		$criteria = self::calculate_get_entries_criteria();
 
 		// Make sure the current View is connected to the same form as the Entry
-		if( ! empty( $criteria['context_view_id'] ) ) {
-			$context_view_id = intval( $criteria['context_view_id'] );
+		if ( ! empty( $criteria[ 'context_view_id' ] ) ) {
+			$context_view_id = intval( $criteria[ 'context_view_id' ] );
 			$context_form_id = gravityview_get_form_id( $context_view_id );
-			if( intval( $context_form_id ) !== intval( $entry['form_id'] ) ) {
-				do_action( 'gravityview_log_debug', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry['form_id'] ), $criteria['context_view_id'] );
+			if ( intval( $context_form_id ) !== intval( $entry[ 'form_id' ] ) ) {
+				do_action( 'gravityview_log_debug', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry[ 'form_id' ] ), $criteria[ 'context_view_id' ] );
 				return false;
 			}
 		}
 
-		if ( empty( $criteria['search_criteria'] ) || ! is_array( $criteria['search_criteria'] ) ) {
+		if ( empty( $criteria[ 'search_criteria' ] ) || ! is_array( $criteria[ 'search_criteria' ] ) ) {
 			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No search criteria found:', $criteria );
 			return $entry;
 		}
 
-		$search_criteria = $criteria['search_criteria'];
+		$search_criteria = $criteria[ 'search_criteria' ];
 		unset( $criteria );
 
 		// check entry status
-		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria['status'] != $entry['status'] ) {
-			do_action( 'gravityview_log_debug', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry['status'] ), $search_criteria );
+		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria[ 'status' ] != $entry[ 'status' ] ) {
+			do_action( 'gravityview_log_debug', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry[ 'status' ] ), $search_criteria );
 			return false;
 		}
 
@@ -769,37 +769,37 @@ 
 		// @todo: Does it make sense to apply the Date create filters to the single entry?
 
 		// field_filters
-		if ( empty( $search_criteria['field_filters'] ) || ! is_array( $search_criteria['field_filters'] ) ) {
+		if ( empty( $search_criteria[ 'field_filters' ] ) || ! is_array( $search_criteria[ 'field_filters' ] ) ) {
 			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No field filters criteria found:', $search_criteria );
 			return $entry;
 		}
 
-		$filters = $search_criteria['field_filters'];
+		$filters = $search_criteria[ 'field_filters' ];
 		unset( $search_criteria );
 
-		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters['mode'] ) : 'all';
-		unset( $filters['mode'] );
+		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters[ 'mode' ] ) : 'all';
+		unset( $filters[ 'mode' ] );
 
-		$form = self::get_form( $entry['form_id'] );
+		$form = self::get_form( $entry[ 'form_id' ] );
 
 		foreach ( $filters as $filter ) {
 
-			if ( ! isset( $filter['key'] ) ) {
+			if ( ! isset( $filter[ 'key' ] ) ) {
 				continue;
 			}
 
-			$k = $filter['key'];
+			$k = $filter[ 'key' ];
 
 			if ( in_array( $k, array( 'created_by', 'payment_status' ) ) ) {
 				$field_value = $entry[ $k ];
 				$field = null;
 			} else {
 				$field = self::get_field( $form, $k );
-				$field_value  = GFFormsModel::get_lead_field_value( $entry, $field );
+				$field_value = GFFormsModel::get_lead_field_value( $entry, $field );
 			}
 
-			$operator = isset( $filter['operator'] ) ? strtolower( $filter['operator'] ) : 'is';
-			$is_value_match = GFFormsModel::is_value_match( $field_value, $filter['value'], $operator, $field );
+			$operator = isset( $filter[ 'operator' ] ) ? strtolower( $filter[ 'operator' ] ) : 'is';
+			$is_value_match = GFFormsModel::is_value_match( $field_value, $filter[ 'value' ], $operator, $field );
 
 			// verify if we are already free to go!
 			if ( ! $is_value_match && 'all' === $mode ) {
@@ -857,25 +857,25 @@ 
 		 * Gravity Forms code to adjust date to locally-configured Time Zone
 		 * @see GFCommon::format_date() for original code
 		 */
-		$date_gmt_time   = mysql2date( 'G', $date_string );
+		$date_gmt_time = mysql2date( 'G', $date_string );
 		$date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time );
 
-		$format  = rgar( $atts, 'format' );
-		$is_human  = ! empty( $atts['human'] );
-		$is_diff  = ! empty( $atts['diff'] );
-		$is_raw = ! empty( $atts['raw'] );
-		$is_timestamp = ! empty( $atts['timestamp'] );
-		$include_time = ! empty( $atts['time'] );
+		$format = rgar( $atts, 'format' );
+		$is_human = ! empty( $atts[ 'human' ] );
+		$is_diff = ! empty( $atts[ 'diff' ] );
+		$is_raw = ! empty( $atts[ 'raw' ] );
+		$is_timestamp = ! empty( $atts[ 'timestamp' ] );
+		$include_time = ! empty( $atts[ 'time' ] );
 
 		// If we're using time diff, we want to have a different default format
-		if( empty( $format ) ) {
+		if ( empty( $format ) ) {
 			$format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' );
 		}
 
 		// If raw was specified, don't modify the stored value
 		if ( $is_raw ) {
 			$formatted_date = $date_string;
-		} elseif( $is_timestamp ) {
+		} elseif ( $is_timestamp ) {
 			$formatted_date = $date_local_timestamp;
 		} elseif ( $is_diff ) {
 			$formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) );
@@ -903,7 +903,7 @@ 
 		}
 
 		$field = self::get_field( $form, $field_id );
-		return isset( $field['label'] ) ?  $field['label'] : '';
+		return isset( $field[ 'label' ] ) ? $field[ 'label' ] : '';
 
 	}
 
@@ -921,7 +921,7 @@ 
 	 * @return array|null Array: Gravity Forms field array; NULL: Gravity Forms GFFormsModel does not exist
 	 */
 	public static function get_field( $form, $field_id ) {
-		if ( class_exists( 'GFFormsModel' ) ){
+		if ( class_exists( 'GFFormsModel' ) ) {
 			return GFFormsModel::get_field( $form, $field_id );
 		} else {
 			return null;
@@ -968,17 +968,17 @@ 
 			$shortcodes = array();
 
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
-			if ( empty( $matches ) ){
+			if ( empty( $matches ) ) {
 				return false;
 			}
 
 			foreach ( $matches as $shortcode ) {
-				if ( $tag === $shortcode[2] ) {
+				if ( $tag === $shortcode[ 2 ] ) {
 
 					// Changed this to $shortcode instead of true so we get the parsed atts.
-					$shortcodes[] = $shortcode;
+					$shortcodes[ ] = $shortcode;
 
-				} else if ( isset( $shortcode[5] ) && $result = self::has_shortcode_r( $shortcode[5], $tag ) ) {
+				} else if ( isset( $shortcode[ 5 ] ) && $result = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) {
 					$shortcodes = $result;
 				}
 			}
@@ -1129,7 +1129,7 @@ 
 	 * @return string         html
 	 */
 	public static function get_sortable_fields( $formid, $current = '' ) {
-		$output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default', 'gravityview' ) .'</option>';
+		$output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default', 'gravityview' ) . '</option>';
 
 		if ( empty( $formid ) ) {
 			return $output;
@@ -1142,11 +1142,11 @@ 
 			$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null );
 
 			foreach ( $fields as $id => $field ) {
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
 					continue;
 				}
 
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>';
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . '>' . esc_attr( $field[ 'label' ] ) . '</option>';
 			}
 		}
 
@@ -1181,9 +1181,9 @@ 
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
 
 		// TODO: Convert to using array_filter
-		foreach( $fields as $id => $field ) {
+		foreach ( $fields as $id => $field ) {
 
-			if( in_array( $field['type'], $blacklist_field_types ) ) {
+			if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
 				unset( $fields[ $id ] );
 			}
 		}
@@ -1224,14 +1224,14 @@ 
 	 * @param  int|array  $field field key or field array
 	 * @return boolean
 	 */
-	public static function is_field_numeric(  $form = null, $field = '' ) {
+	public static function is_field_numeric( $form = null, $field = '' ) {
 
 		if ( ! is_array( $form ) && ! is_array( $field ) ) {
 			$form = self::get_form( $form );
 		}
 
 		// If entry meta, it's a string. Otherwise, numeric
-		if( ! is_numeric( $field ) && is_string( $field ) ) {
+		if ( ! is_numeric( $field ) && is_string( $field ) ) {
 			$type = $field;
 		} else {
 			$type = self::get_field_type( $form, $field );
@@ -1245,9 +1245,9 @@ 
 		$numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) );
 
 		// Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true
-		if( $gv_field = GravityView_Fields::get( $type ) ) {
-			if( true === $gv_field->is_numeric ) {
-				$numeric_types[] = $gv_field->is_numeric;
+		if ( $gv_field = GravityView_Fields::get( $type ) ) {
+			if ( true === $gv_field->is_numeric ) {
+				$numeric_types[ ] = $gv_field->is_numeric;
 			}
 		}
 
@@ -1397,11 +1397,11 @@ 
 		$final_atts = array_filter( $final_atts );
 
 		// If the href wasn't passed as an attribute, use the value passed to the function
-		if ( empty( $final_atts['href'] ) && ! empty( $href ) ) {
-			$final_atts['href'] = $href;
+		if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) {
+			$final_atts[ 'href' ] = $href;
 		}
 
-		$final_atts['href'] = esc_url_raw( $href );
+		$final_atts[ 'href' ] = esc_url_raw( $href );
 
 		// For each attribute, generate the code
 		$output = '';
@@ -1409,7 +1409,7 @@ 
 			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
 		}
 
-		$output = '<a'. $output .'>'. $anchor_text .'</a>';
+		$output = '<a' . $output . '>' . $anchor_text . '</a>';
 
 		return $output;
 	}
@@ -1431,7 +1431,7 @@ 
 	public static function array_merge_recursive_distinct( array &$array1, array &$array2 ) {
 		$merged = $array1;
 
-		foreach ( $array2 as $key => &$value )  {
+		foreach ( $array2 as $key => &$value ) {
 			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
 				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
 			} else {
@@ -1466,7 +1466,7 @@ 
 		 * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..)
 		 * @param array $settings Settings array, with `number` key defining the # of users to display
 		 */
-		$get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
+		$get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
 
 		return get_users( $get_users_settings );
 	}
@@ -1481,7 +1481,7 @@ 
      * @return string
      */
     public static function generate_notice( $notice, $class = '' ) {
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
+        return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>';
     }
 
 

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

Indentation +8 added lines, -8 removed lines

@@ -386,14 +386,14 @@
 		$curr_start = esc_attr( rgget( 'gv_start' ) );
 		$curr_end = esc_attr( rgget( 'gv_end' ) );
 
-        /**
-         * @filter `gravityview_date_created_adjust_timezone` Whether to adjust the timezone for entries. \n
-         * date_created is stored in UTC format. Convert search date into UTC (also used on templates/fields/date_created.php)
-         * @since 1.12
-         * @param[out,in] boolean $adjust_tz  Use timezone-adjusted datetime? If true, adjusts date based on blog's timezone setting. If false, uses UTC setting. Default: true
-         * @param[in] string $context Where the filter is being called from. `search` in this case.
-         */
-        $adjust_tz = apply_filters( 'gravityview_date_created_adjust_timezone', true, 'search' );
+		/**
+		 * @filter `gravityview_date_created_adjust_timezone` Whether to adjust the timezone for entries. \n
+		 * date_created is stored in UTC format. Convert search date into UTC (also used on templates/fields/date_created.php)
+		 * @since 1.12
+		 * @param[out,in] boolean $adjust_tz  Use timezone-adjusted datetime? If true, adjusts date based on blog's timezone setting. If false, uses UTC setting. Default: true
+		 * @param[in] string $context Where the filter is being called from. `search` in this case.
+		 */
+		$adjust_tz = apply_filters( 'gravityview_date_created_adjust_timezone', true, 'search' );
 
 
 		/**

Spacing +97 added lines, -97 removed lines

@@ -56,7 +56,7 @@ 
 				'type' => 'radio',
 				'full_width' => true,
 				'label' => esc_html__( 'Search Mode', 'gravityview' ),
-				'desc' => __('Should search results match all search fields, or any?', 'gravityview'),
+				'desc' => __( 'Should search results match all search fields, or any?', 'gravityview' ),
 				'value' => 'any',
 				'class' => 'hide-if-js',
 				'options' => array(
@@ -111,7 +111,7 @@ 
 		$script_min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 		$script_source = empty( $script_min ) ? '/source' : '';
 
-		wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js'.$script_source.'/admin-search-widget'.$script_min.'.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), GravityView_Plugin::version );
+		wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js' . $script_source . '/admin-search-widget' . $script_min . '.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), GravityView_Plugin::version );
 
 
 		/**
@@ -163,7 +163,7 @@ 
 	 * Add admin script to the whitelist
 	 */
 	public function register_no_conflict( $required ) {
-		$required[] = 'gravityview_searchwidget_admin';
+		$required[ ] = 'gravityview_searchwidget_admin';
 		return $required;
 	}
 
@@ -176,24 +176,24 @@ 
 	 */
 	public static function get_searchable_fields() {
 
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxsearchwidget' ) ) {
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxsearchwidget' ) ) {
 			exit( '0' );
 		}
 
 		$form = '';
 
 		// Fetch the form for the current View
-		if ( ! empty( $_POST['view_id'] ) ) {
+		if ( ! empty( $_POST[ 'view_id' ] ) ) {
 
-			$form = gravityview_get_form_id( $_POST['view_id'] );
+			$form = gravityview_get_form_id( $_POST[ 'view_id' ] );
 
-		} elseif ( ! empty( $_POST['formid'] ) ) {
+		} elseif ( ! empty( $_POST[ 'formid' ] ) ) {
 
-			$form = (int) $_POST['formid'];
+			$form = (int)$_POST[ 'formid' ];
 
-		} elseif ( ! empty( $_POST['template_id'] ) && class_exists( 'GravityView_Ajax' ) ) {
+		} elseif ( ! empty( $_POST[ 'template_id' ] ) && class_exists( 'GravityView_Ajax' ) ) {
 
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
 
 		}
 
@@ -241,8 +241,8 @@ 
 			)
 		);
 
-		foreach( $custom_fields as $custom_field_key => $custom_field ) {
-			$output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field['type'], self::get_field_label( array('field' => $custom_field_key ) ), $custom_field['text'] );
+		foreach ( $custom_fields as $custom_field_key => $custom_field ) {
+			$output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field[ 'type' ], self::get_field_label( array( 'field' => $custom_field_key ) ), $custom_field[ 'text' ] );
 		}
 
 		if ( ! empty( $fields ) ) {
@@ -251,13 +251,13 @@ 
 
 			foreach ( $fields as $id => $field ) {
 
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
 					continue;
 				}
 
-				$types = self::get_search_input_types( $id, $field['type'] );
+				$types = self::get_search_input_types( $id, $field[ 'type' ] );
 
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'data-inputtypes="'. esc_attr( $types ) .'">'. esc_html( $field['label'] ) .'</option>';
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . 'data-inputtypes="' . esc_attr( $types ) . '">' . esc_html( $field[ 'label' ] ) . '</option>';
 			}
 		}
 
@@ -279,7 +279,7 @@ 
 	public static function get_search_input_types( $id = '', $field_type = null ) {
 
 		// @todo - This needs to be improved - many fields have . including products and addresses
-		if ( false !== strpos( (string) $id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $id, array( 'is_fulfilled' ) ) ) {
+		if ( false !== strpos( (string)$id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $id, array( 'is_fulfilled' ) ) ) {
 			$input_type = 'boolean'; // on/off checkbox
 		} elseif ( in_array( $field_type, array( 'checkbox', 'post_category', 'multiselect' ) ) ) {
 			$input_type = 'multi'; //multiselect
@@ -321,19 +321,19 @@ 
 			$post_id = 0;
 
 			// We're in the WordPress Widget context, and an overriding post ID has been set.
-			if ( ! empty( $widget_args['post_id'] ) ) {
-				$post_id = absint( $widget_args['post_id'] );
+			if ( ! empty( $widget_args[ 'post_id' ] ) ) {
+				$post_id = absint( $widget_args[ 'post_id' ] );
 			}
 			// We're in the WordPress Widget context, and the base View ID should be used
-			else if ( ! empty( $widget_args['view_id'] ) ) {
-				$post_id = absint( $widget_args['view_id'] );
+			else if ( ! empty( $widget_args[ 'view_id' ] ) ) {
+				$post_id = absint( $widget_args[ 'view_id' ] );
 			}
 
 			$args = gravityview_get_permalink_query_args( $post_id );
 
 			// Add hidden fields to the search form
 			foreach ( $args as $key => $value ) {
-				$search_fields[] = array(
+				$search_fields[ ] = array(
 					'name'  => $key,
 					'input' => 'hidden',
 					'value' => $value,
@@ -365,15 +365,15 @@ 
 		$get = array_map( 'urldecode', $get );
 
 		// add free search
-		if ( ! empty( $get['gv_search'] ) ) {
+		if ( ! empty( $get[ 'gv_search' ] ) ) {
 
 			// Search for a piece
-			$words = explode( ' ', $get['gv_search'] );
+			$words = explode( ' ', $get[ 'gv_search' ] );
 
 			$words = array_filter( $words );
 
 			foreach ( $words as $word ) {
-				$search_criteria['field_filters'][] = array(
+				$search_criteria[ 'field_filters' ][ ] = array(
 					'key' => null, // The field ID to search
 					'value' => $word, // The value to search
 					'operator' => 'contains', // What to search in. Options: `is` or `contains`
@@ -398,16 +398,16 @@ 
 		/**
 		 * Don't set $search_criteria['start_date'] if start_date is empty as it may lead to bad query results (GFAPI::get_entries)
 		 */
-		if( !empty( $curr_start ) ) {
-			$search_criteria['start_date'] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
+		if ( ! empty( $curr_start ) ) {
+			$search_criteria[ 'start_date' ] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
 		}
-		if( !empty( $curr_end ) ) {
-			$search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
+		if ( ! empty( $curr_end ) ) {
+			$search_criteria[ 'end_date' ] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
 		}
 
 		// search for a specific entry ID
 		if ( ! empty( $get[ 'gv_id' ] ) ) {
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => 'id',
 				'value' => absint( $get[ 'gv_id' ] ),
 				'operator' => '=',
@@ -416,9 +416,9 @@ 
 
 		// search for a specific Created_by ID
 		if ( ! empty( $get[ 'gv_by' ] ) ) {
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => 'created_by',
-				'value' => absint( $get['gv_by'] ),
+				'value' => absint( $get[ 'gv_by' ] ),
 				'operator' => '=',
 			);
 		}
@@ -430,22 +430,22 @@ 
 		// get the other search filters
 		foreach ( $get as $key => $value ) {
 
-			if ( 0 !== strpos( $key, 'filter_' ) || empty( $value ) || ( is_array( $value ) && count( $value ) === 1 && empty( $value[0] ) ) ) {
+			if ( 0 !== strpos( $key, 'filter_' ) || empty( $value ) || ( is_array( $value ) && count( $value ) === 1 && empty( $value[ 0 ] ) ) ) {
 				continue;
 			}
 
 			// could return simple filter or multiple filters
 			$filter = $this->prepare_field_filter( $key, $value );
 
-			if ( isset( $filter[0]['value'] ) ) {
-				$search_criteria['field_filters'] = array_merge( $search_criteria['field_filters'], $filter );
+			if ( isset( $filter[ 0 ][ 'value' ] ) ) {
+				$search_criteria[ 'field_filters' ] = array_merge( $search_criteria[ 'field_filters' ], $filter );
 
 				// if date range type, set search mode to ALL
-				if ( ! empty( $filter[0]['operator'] ) && in_array( $filter[0]['operator'], array( '>', '<' ) ) ) {
+				if ( ! empty( $filter[ 0 ][ 'operator' ] ) && in_array( $filter[ 0 ][ 'operator' ], array( '>', '<' ) ) ) {
 					$mode = 'all';
 				}
-			} elseif( !empty( $filter ) ) {
-				$search_criteria['field_filters'][] = $filter;
+			} elseif ( ! empty( $filter ) ) {
+				$search_criteria[ 'field_filters' ][ ] = $filter;
 			}
 		}
 
@@ -454,7 +454,7 @@ 
 		 * @since 1.5.1
 		 * @param[out,in] string $mode Search mode (`any` vs `all`)
 		 */
-		$search_criteria['field_filters']['mode'] = apply_filters( 'gravityview/search/mode', $mode );
+		$search_criteria[ 'field_filters' ][ 'mode' ] = apply_filters( 'gravityview/search/mode', $mode );
 
 		do_action( 'gravityview_log_debug', sprintf( '%s[filter_entries] Returned Search Criteria: ', get_class( $this ) ), $search_criteria );
 
@@ -490,11 +490,11 @@ 
 			'value' => _wp_specialchars( $value ), // Gravity Forms encodes ampersands but not quotes
 		);
 
-		switch ( $form_field['type'] ) {
+		switch ( $form_field[ 'type' ] ) {
 
 			case 'select':
 			case 'radio':
-				$filter['operator'] = 'is';
+				$filter[ 'operator' ] = 'is';
 				break;
 
 			case 'post_category':
@@ -508,7 +508,7 @@ 
 
 				foreach ( $value as $val ) {
 					$cat = get_term( $val, 'category' );
-					$filter[] = array(
+					$filter[ ] = array(
 						'key' => $field_id,
 						'value' => esc_attr( $cat->name ) . ':' . $val,
 						'operator' => 'is',
@@ -527,18 +527,18 @@ 
 				$filter = array();
 
 				foreach ( $value as $val ) {
-					$filter[] = array( 'key' => $field_id, 'value' => $val );
+					$filter[ ] = array( 'key' => $field_id, 'value' => $val );
 				}
 
 				break;
 
 			case 'checkbox':
 				// convert checkbox on/off into the correct search filter
-				if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field['inputs'] ) && ! empty( $form_field['choices'] ) ) {
-					foreach ( $form_field['inputs'] as $k => $input ) {
-						if ( $input['id'] == $field_id ) {
-							$filter['value'] = $form_field['choices'][ $k ]['value'];
-							$filter['operator'] = 'is';
+				if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field[ 'inputs' ] ) && ! empty( $form_field[ 'choices' ] ) ) {
+					foreach ( $form_field[ 'inputs' ] as $k => $input ) {
+						if ( $input[ 'id' ] == $field_id ) {
+							$filter[ 'value' ] = $form_field[ 'choices' ][ $k ][ 'value' ];
+							$filter[ 'operator' ] = 'is';
 							break;
 						}
 					}
@@ -548,7 +548,7 @@ 
 					$filter = array();
 
 					foreach ( $value as $val ) {
-						$filter[] = array(
+						$filter[ ] = array(
 								'key'   => $field_id,
 								'value' => $val,
 								'operator' => 'is',
@@ -569,9 +569,9 @@ 
 					foreach ( $words as $word ) {
 						if ( ! empty( $word ) && strlen( $word ) > 1 ) {
 							// Keep the same key for each filter
-							$filter['value'] = $word;
+							$filter[ 'value' ] = $word;
 							// Add a search for the value
-							$filters[] = $filter;
+							$filters[ ] = $filter;
 						}
 					}
 
@@ -593,14 +593,14 @@ 
 						}
 						$operator = 'start' === $k ? '>' : '<';
 
-						$filter[] = array(
+						$filter[ ] = array(
 							'key' => $field_id,
 							'value' => self::get_formatted_date( $date, 'Y-m-d' ),
 							'operator' => $operator,
 						);
 					}
 				} else {
-					$filter['value'] = self::get_formatted_date( $value, 'Y-m-d' );
+					$filter[ 'value' ] = self::get_formatted_date( $value, 'Y-m-d' );
 				}
 
 				break;
@@ -631,7 +631,7 @@ 
 			'ymd_dot' => 'Y.m.d',
 		);
 
-		if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ){
+		if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ) {
 			$format = $datepicker[ $field->dateFormat ];
 		}
 
@@ -662,7 +662,7 @@ 
 	public function add_template_path( $file_paths ) {
 
 		// Index 100 is the default GravityView template path.
-		$file_paths[102] = self::$file . 'templates/';
+		$file_paths[ 102 ] = self::$file . 'templates/';
 
 		return $file_paths;
 	}
@@ -684,7 +684,7 @@ 
 		}
 
 		// get configured search fields
-		$search_fields = ! empty( $widget_args['search_fields'] ) ? json_decode( $widget_args['search_fields'], true ) : '';
+		$search_fields = ! empty( $widget_args[ 'search_fields' ] ) ? json_decode( $widget_args[ 'search_fields' ], true ) : '';
 
 		if ( empty( $search_fields ) || ! is_array( $search_fields ) ) {
 			do_action( 'gravityview_log_debug', sprintf( '%s[render_frontend] No search fields configured for widget:', get_class( $this ) ), $widget_args );
@@ -698,24 +698,24 @@ 
 
 			$updated_field = $field;
 
-			if ( in_array( $field['input'], array( 'date', 'date_range' ) ) ) {
+			if ( in_array( $field[ 'input' ], array( 'date', 'date_range' ) ) ) {
 				$has_date = true;
 			}
 
 			$updated_field = $this->get_search_filter_details( $updated_field );
 
-			switch ( $field['field'] ) {
+			switch ( $field[ 'field' ] ) {
 
 				case 'search_all':
-					$updated_field['key'] = 'search_all';
-					$updated_field['input'] = 'search_all';
-					$updated_field['value'] = esc_attr( stripslashes_deep( rgget( 'gv_search' ) ) );
+					$updated_field[ 'key' ] = 'search_all';
+					$updated_field[ 'input' ] = 'search_all';
+					$updated_field[ 'value' ] = esc_attr( stripslashes_deep( rgget( 'gv_search' ) ) );
 					break;
 
 				case 'entry_date':
-					$updated_field['key'] = 'entry_date';
-					$updated_field['input'] = 'entry_date';
-					$updated_field['value'] = array(
+					$updated_field[ 'key' ] = 'entry_date';
+					$updated_field[ 'input' ] = 'entry_date';
+					$updated_field[ 'value' ] = array(
 						'start' => esc_attr( stripslashes_deep( rgget( 'gv_start' ) ) ),
 						'end' => esc_attr( stripslashes_deep( rgget( 'gv_end' ) ) ),
 					);
@@ -723,16 +723,16 @@ 
 					break;
 
 				case 'entry_id':
-					$updated_field['key'] = 'entry_id';
-					$updated_field['input'] = 'entry_id';
-					$updated_field['value'] = esc_attr( stripslashes_deep( rgget( 'gv_id' ) ) );
+					$updated_field[ 'key' ] = 'entry_id';
+					$updated_field[ 'input' ] = 'entry_id';
+					$updated_field[ 'value' ] = esc_attr( stripslashes_deep( rgget( 'gv_id' ) ) );
 					break;
 
 				case 'created_by':
-					$updated_field['key'] = 'created_by';
-					$updated_field['name'] = 'gv_by';
-					$updated_field['value'] = esc_attr( stripslashes_deep( rgget( 'gv_by' ) ) );
-					$updated_field['choices'] = self::get_created_by_choices();
+					$updated_field[ 'key' ] = 'created_by';
+					$updated_field[ 'name' ] = 'gv_by';
+					$updated_field[ 'value' ] = esc_attr( stripslashes_deep( rgget( 'gv_by' ) ) );
+					$updated_field[ 'choices' ] = self::get_created_by_choices();
 					break;
 			}
 
@@ -750,16 +750,16 @@ 
 		 */
 		$gravityview_view->search_fields = apply_filters( 'gravityview_widget_search_filters', $search_fields, $this, $widget_args );
 
-		$gravityview_view->search_layout = ! empty( $widget_args['search_layout'] ) ? $widget_args['search_layout'] : 'horizontal';
+		$gravityview_view->search_layout = ! empty( $widget_args[ 'search_layout' ] ) ? $widget_args[ 'search_layout' ] : 'horizontal';
 
 		/** @since 1.14 */
-		$gravityview_view->search_mode = ! empty( $widget_args['search_mode'] ) ? $widget_args['search_mode'] : 'any';
+		$gravityview_view->search_mode = ! empty( $widget_args[ 'search_mode' ] ) ? $widget_args[ 'search_mode' ] : 'any';
 
-		$custom_class = ! empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
+		$custom_class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
 
 		$gravityview_view->search_class = self::get_search_class( $custom_class );
 
-		$gravityview_view->search_clear = ! empty( $widget_args['search_clear'] ) ? $widget_args['search_clear'] : false;
+		$gravityview_view->search_clear = ! empty( $widget_args[ 'search_clear' ] ) ? $widget_args[ 'search_clear' ] : false;
 
 		if ( $has_date ) {
 			// enqueue datepicker stuff only if needed!
@@ -779,10 +779,10 @@ 
 	public static function get_search_class( $custom_class = '' ) {
 		$gravityview_view = GravityView_View::getInstance();
 
-		$search_class = 'gv-search-'.$gravityview_view->search_layout;
+		$search_class = 'gv-search-' . $gravityview_view->search_layout;
 
-		if ( ! empty( $custom_class )  ) {
-			$search_class .= ' '.$custom_class;
+		if ( ! empty( $custom_class ) ) {
+			$search_class .= ' ' . $custom_class;
 		}
 
 		/**
@@ -825,11 +825,11 @@ 
 
 		$label = rgget( 'label', $field );
 
-		if( '' === $label ) {
+		if ( '' === $label ) {
 
-			$label = isset( $form_field['label'] ) ? $form_field['label'] : '';
+			$label = isset( $form_field[ 'label' ] ) ? $form_field[ 'label' ] : '';
 
-			switch( $field['field'] ) {
+			switch ( $field[ 'field' ] ) {
 				case 'search_all':
 					$label = __( 'Search Entries:', 'gravityview' );
 					break;
@@ -847,10 +847,10 @@ 
 					break;
 				default:
 					// If this is a field input, not a field
-					if ( strpos( $field['field'], '.' ) > 0 && ! empty( $form_field['inputs'] ) ) {
+					if ( strpos( $field[ 'field' ], '.' ) > 0 && ! empty( $form_field[ 'inputs' ] ) ) {
 
 						// Get the label for the field in question, which returns an array
-						$items = wp_list_filter( $form_field['inputs'], array( 'id' => $field['field'] ) );
+						$items = wp_list_filter( $form_field[ 'inputs' ], array( 'id' => $field[ 'field' ] ) );
 
 						// Get the item with the `label` key
 						$values = wp_list_pluck( $items, 'label' );
@@ -887,7 +887,7 @@ 
 		$form = $gravityview_view->getForm();
 
 		// for advanced field ids (eg, first name / last name )
-		$name = 'filter_' . str_replace( '.', '_', $field['field'] );
+		$name = 'filter_' . str_replace( '.', '_', $field[ 'field' ] );
 
 		// get searched value from $_GET (string or array)
 		$value = rgget( $name );
@@ -897,26 +897,26 @@ 
 		$value = is_array( $value ) ? array_map( 'urldecode', $value ) : urldecode( $value );
 
 		// get form field details
-		$form_field = gravityview_get_field( $form, $field['field'] );
+		$form_field = gravityview_get_field( $form, $field[ 'field' ] );
 
 		$filter = array(
-			'key' => $field['field'],
+			'key' => $field[ 'field' ],
 			'name' => $name,
 			'label' => self::get_field_label( $field, $form_field ),
-			'input' => $field['input'],
+			'input' => $field[ 'input' ],
 			'value' => _wp_specialchars( $value ),
-			'type' => $form_field['type'],
+			'type' => $form_field[ 'type' ],
 		);
 
 		// collect choices
-		if ( 'post_category' === $form_field['type'] && ! empty( $form_field['displayAllCategories'] ) && empty( $form_field['choices'] ) ) {
-			$filter['choices'] = gravityview_get_terms_choices();
-		} elseif ( ! empty( $form_field['choices'] ) ) {
-			$filter['choices'] = $form_field['choices'];
+		if ( 'post_category' === $form_field[ 'type' ] && ! empty( $form_field[ 'displayAllCategories' ] ) && empty( $form_field[ 'choices' ] ) ) {
+			$filter[ 'choices' ] = gravityview_get_terms_choices();
+		} elseif ( ! empty( $form_field[ 'choices' ] ) ) {
+			$filter[ 'choices' ] = $form_field[ 'choices' ];
 		}
 
-		if ( 'date_range' === $field['input'] && empty( $value ) ) {
-			$filter['value'] = array( 'start' => '', 'end' => '' );
+		if ( 'date_range' === $field[ 'input' ] && empty( $value ) ) {
+			$filter[ 'value' ] = array( 'start' => '', 'end' => '' );
 		}
 
 		return $filter;
@@ -940,7 +940,7 @@ 
 
 		$choices = array();
 		foreach ( $users as $user ) {
-			$choices[] = array(
+			$choices[ ] = array(
 				'value' => $user->ID,
 				'text' => $user->display_name,
 			);
@@ -974,7 +974,7 @@ 
 	 */
 	public function add_datepicker_js_dependency( $js_dependencies ) {
 
-		$js_dependencies[] = 'jquery-ui-datepicker';
+		$js_dependencies[ ] = 'jquery-ui-datepicker';
 
 		return $js_dependencies;
 	}
@@ -1018,7 +1018,7 @@ 
 			'isRTL'             => is_rtl(),
 		), $view_data );
 
-		$localizations['datepicker'] = $datepicker_settings;
+		$localizations[ 'datepicker' ] = $datepicker_settings;
 
 		return $localizations;
 
@@ -1041,7 +1041,7 @@ 
 		add_filter( 'gravityview_js_localization', array( $this, 'add_datepicker_localization' ), 10, 2 );
 
 		$scheme = is_ssl() ? 'https://' : 'http://';
-		wp_enqueue_style( 'jquery-ui-datepicker', $scheme.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
+		wp_enqueue_style( 'jquery-ui-datepicker', $scheme . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
 
 		/**
 		 * @filter `gravityview_search_datepicker_class`

gravityview.php

Spacing +27 added lines, -27 removed lines

@@ -66,20 +66,20 @@ 
 
 /** Load common & connector functions */
 require_once( GRAVITYVIEW_DIR . 'includes/helper-functions.php' );
-require_once( GRAVITYVIEW_DIR . 'includes/class-common.php');
-require_once( GRAVITYVIEW_DIR . 'includes/connector-functions.php');
+require_once( GRAVITYVIEW_DIR . 'includes/class-common.php' );
+require_once( GRAVITYVIEW_DIR . 'includes/connector-functions.php' );
 require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-compatibility.php' );
 require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-roles-capabilities.php' );
 require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-notices.php' );
 
 /** Register Post Types and Rewrite Rules */
-require_once( GRAVITYVIEW_DIR . 'includes/class-post-types.php');
+require_once( GRAVITYVIEW_DIR . 'includes/class-post-types.php' );
 
 /** Add Cache Class */
-require_once( GRAVITYVIEW_DIR . 'includes/class-cache.php');
+require_once( GRAVITYVIEW_DIR . 'includes/class-cache.php' );
 
 /** Register hooks that are fired when the plugin is activated and deactivated. */
-if( is_admin() ) {
+if ( is_admin() ) {
 	register_activation_hook( __FILE__, array( 'GravityView_Plugin', 'activate' ) );
 	register_deactivation_hook( __FILE__, array( 'GravityView_Plugin', 'deactivate' ) );
 }
@@ -100,7 +100,7 @@ 
 	 */
 	public static function getInstance() {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self;
 		}
 
@@ -110,7 +110,7 @@ 
 	private function __construct() {
 
 
-		if( ! GravityView_Compatibility::is_valid() ) {
+		if ( ! GravityView_Compatibility::is_valid() ) {
 			return;
 		}
 
@@ -139,7 +139,7 @@ 
 	 */
 	public function include_files() {
 
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin.php' );
 
 		// Load fields
 		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-fields.php' );
@@ -150,19 +150,19 @@ 
 			include_once( $gv_field_filename );
 		}
 
-		include_once( GRAVITYVIEW_DIR .'includes/class-gravityview-entry-notes.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/load-plugin-and-theme-hooks.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-notes.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/load-plugin-and-theme-hooks.php' );
 
 		// Load Extensions
 		// @todo: Convert to a scan of the directory or a method where this all lives
-		include_once( GRAVITYVIEW_DIR .'includes/extensions/edit-entry/class-edit-entry.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/extensions/delete-entry/class-delete-entry.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/extensions/edit-entry/class-edit-entry.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/extensions/delete-entry/class-delete-entry.php' );
 
 		// Load WordPress Widgets
-		include_once( GRAVITYVIEW_DIR .'includes/wordpress-widgets/register-wordpress-widgets.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/wordpress-widgets/register-wordpress-widgets.php' );
 
 		// Load GravityView Widgets
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/register-gravityview-widgets.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/widgets/register-gravityview-widgets.php' );
 
 		// Add oEmbed
 		include_once( GRAVITYVIEW_DIR . 'includes/class-oembed.php' );
@@ -175,7 +175,7 @@ 
 		include_once( GRAVITYVIEW_DIR . 'includes/class-frontend-views.php' );
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-bar.php' );
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-list.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-merge-tags.php'); /** @since 1.8.4 */
+		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-merge-tags.php' ); /** @since 1.8.4 */
 		include_once( GRAVITYVIEW_DIR . 'includes/class-data.php' );
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-shortcode.php' );
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-link-shortcode.php' );
@@ -190,7 +190,7 @@ 
 	 * @return bool
 	 */
 	public static function is_network_activated() {
-		return is_multisite() && ( function_exists('is_plugin_active_for_network') && is_plugin_active_for_network( 'gravityview/gravityview.php' ) );
+		return is_multisite() && ( function_exists( 'is_plugin_active_for_network' ) && is_plugin_active_for_network( 'gravityview/gravityview.php' ) );
 	}
 
 
@@ -255,7 +255,7 @@ 
 	 * @since 1.7.5.1
 	 */
 	public static function include_widget_class() {
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' );
 	}
 
 
@@ -276,7 +276,7 @@ 
 		}
 		if ( ! $loaded ) {
 			$locale = apply_filters( 'plugin_locale', get_locale(), 'gravityview' );
-			$mofile = dirname( __FILE__ ) . '/languages/gravityview-'. $locale .'.mo';
+			$mofile = dirname( __FILE__ ) . '/languages/gravityview-' . $locale . '.mo';
 			load_textdomain( 'gravityview', $mofile );
 		}
 
@@ -302,12 +302,12 @@ 
 	 */
 	public function frontend_actions() {
 
-		if( self::is_admin() ) { return; }
+		if ( self::is_admin() ) { return; }
 
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-image.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-template.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-api.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-frontend-views.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-template.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-api.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-frontend-views.php' );
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-change-entry-creator.php' );
 
 
@@ -332,8 +332,8 @@ 
 	 */
 	public static function get_default_widget_areas() {
 		$default_areas = array(
-			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __('Top', 'gravityview' ) , 'subtitle' => '' ) ) ),
-			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __('Left', 'gravityview') , 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __('Right', 'gravityview') , 'subtitle' => '' ) ) ),
+			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ), 'subtitle' => '' ) ) ),
+			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ), 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ), 'subtitle' => '' ) ) ),
 		);
 
 		/**
@@ -351,7 +351,7 @@ 
      * @param mixed $data Additional data to display
      * @return void
      */
-    public static function log_debug( $message, $data = null ){
+    public static function log_debug( $message, $data = null ) {
 	    /**
 	     * @action `gravityview_log_debug` Log a debug message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
 	     * @param string $message Message to display
@@ -365,7 +365,7 @@ 
      * @param  string $message log message
      * @return void
      */
-    public static function log_error( $message, $data = null ){
+    public static function log_error( $message, $data = null ) {
 	    /**
 	     * @action `gravityview_log_error` Log an error message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
 	     * @param string $message Error message to display
@@ -376,4 +376,4 @@ 
 
 } // end class GravityView_Plugin
 
-add_action('plugins_loaded', array('GravityView_Plugin', 'getInstance'), 1);
+add_action( 'plugins_loaded', array( 'GravityView_Plugin', 'getInstance' ), 1 );

includes/extensions/delete-entry/class-delete-entry.php

Spacing +74 added lines, -74 removed lines

@@ -41,12 +41,12 @@ 
 	private function add_hooks() {
 		add_action( 'wp', array( $this, 'process_delete' ), 10000 );
 
-		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field'), 10, 3 );
+		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
 
 		add_action( 'gravityview_before', array( $this, 'display_message' ) );
 
 		// For the Delete Entry Link, you don't want visible to all users.
-		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps'), 10, 5 );
+		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 );
 
 		// Modify the field options based on the name of the field type
 		add_filter( 'gravityview_template_delete_link_options', array( $this, 'delete_link_field_options' ), 10, 5 );
@@ -54,7 +54,7 @@ 
 		// add template path to check for field
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
 
-		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button'), 10, 3 );
+		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button' ), 10, 3 );
 	}
 
 	/**
@@ -65,7 +65,7 @@ 
 	 */
 	static function getInstance() {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self;
 		}
 
@@ -101,20 +101,20 @@ 
 	function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
 		// Always a link, never a filter
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
 
 		// Delete Entry link should only appear to visitors capable of editing entries
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
+		unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
 
-		$add_option['delete_link'] = array(
+		$add_option[ 'delete_link' ] = array(
 			'type' => 'text',
 			'label' => __( 'Delete Link Text', 'gravityview' ),
 			'desc' => NULL,
-			'value' => __('Delete Entry', 'gravityview'),
+			'value' => __( 'Delete Entry', 'gravityview' ),
 			'merge_tags' => true,
 		);
 
-		$field_options['allow_edit_cap'] = array(
+		$field_options[ 'allow_edit_cap' ] = array(
 			'type' => 'select',
 			'label' => __( 'Allow the following users to delete the entry:', 'gravityview' ),
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -138,10 +138,10 @@ 
 	 */
 	function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
 
-		$entry_default_fields['delete_link'] = array(
-			'label' => __('Delete Entry', 'gravityview'),
+		$entry_default_fields[ 'delete_link' ] = array(
+			'label' => __( 'Delete Entry', 'gravityview' ),
 			'type' => 'delete_link',
-			'desc'	=> __('A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview'),
+			'desc'	=> __( 'A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview' ),
 		);
 
 		return $entry_default_fields;
@@ -154,7 +154,7 @@ 
 	 */
 	function add_available_field( $available_fields = array() ) {
 
-		$available_fields['delete_link'] = array(
+		$available_fields[ 'delete_link' ] = array(
 			'label_text' => __( 'Delete Entry', 'gravityview' ),
 			'field_id' => 'delete_link',
 			'label_type' => 'field',
@@ -182,12 +182,12 @@ 
 		$caps = $visibility_caps;
 
 		// If we're configuring fields in the edit context, we want a limited selection
-		if( $field_id === 'delete_link' ) {
+		if ( $field_id === 'delete_link' ) {
 
 			// Remove other built-in caps.
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
+			unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] );
 
-			$caps['read'] = _x('Entry Creator', 'User capability', 'gravityview');
+			$caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
 		}
 
 		return $caps;
@@ -200,7 +200,7 @@ 
 	 * @param [type] $entry [description]
 	 */
 	function set_entry( $entry = null ) {
-		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[0] : $entry;
+		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[ 0 ] : $entry;
 	}
 
 	/**
@@ -230,13 +230,13 @@ 
 
         $base = GravityView_API::directory_link( $post_id, true );
 
-		if( empty( $base ) ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' - Post ID does not exist: '.$post_id );
+		if ( empty( $base ) ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ' - Post ID does not exist: ' . $post_id );
 			return NULL;
 		}
 
 		// Use the slug instead of the ID for consistent security
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
+		$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
 
         $view_id = empty( $view_id ) ? gravityview_get_view_id() : $view_id;
 
@@ -247,7 +247,7 @@ 
             'view_id' => $view_id,
 		), $base );
 
-		$url = wp_nonce_url( $actionurl, 'delete_'.$entry_slug, 'delete' );
+		$url = wp_nonce_url( $actionurl, 'delete_' . $entry_slug, 'delete' );
 
 		return $url;
 	}
@@ -264,7 +264,7 @@ 
 	function add_delete_button( $form = array(), $entry = array(), $view_id = NULL ) {
 
 		// Only show the link to those who are allowed to see it.
-		if( !self::check_user_cap_delete_entry( $entry ) ) {
+		if ( ! self::check_user_cap_delete_entry( $entry ) ) {
 			return;
 		}
 
@@ -275,7 +275,7 @@ 
 		$show_delete_button = apply_filters( 'gravityview/delete-entry/show-delete-button', true );
 
 		// If the button is hidden by the filter, don't show.
-		if( !$show_delete_button ) {
+		if ( ! $show_delete_button ) {
 			return;
 		}
 
@@ -305,27 +305,27 @@ 
 	function process_delete() {
 
 		// If the form is submitted
-		if( 'delete' === RGForms::get("action") && isset( $_GET['entry_id'] ) ) {
+		if ( 'delete' === RGForms::get( "action" ) && isset( $_GET[ 'entry_id' ] ) ) {
 
 			// Make sure it's a GravityView request
-			$valid_nonce_key = wp_verify_nonce( $_GET['delete'], self::get_nonce_key( $_GET['entry_id'] ) );
+			$valid_nonce_key = wp_verify_nonce( $_GET[ 'delete' ], self::get_nonce_key( $_GET[ 'entry_id' ] ) );
 
-			if( ! $valid_nonce_key ) {
-				do_action('gravityview_log_debug', __METHOD__ . ' Delete entry not processed: nonce validation failed.' );
+			if ( ! $valid_nonce_key ) {
+				do_action( 'gravityview_log_debug', __METHOD__ . ' Delete entry not processed: nonce validation failed.' );
 				return;
 			}
 
 			// Get the entry slug
-			$entry_slug = esc_attr( $_GET['entry_id'] );
+			$entry_slug = esc_attr( $_GET[ 'entry_id' ] );
 
 			// See if there's an entry there
 			$entry = gravityview_get_entry( $entry_slug );
 
-			if( $entry ) {
+			if ( $entry ) {
 
 				$has_permission = $this->user_can_delete_entry( $entry );
 
-				if( is_wp_error( $has_permission ) ) {
+				if ( is_wp_error( $has_permission ) ) {
 
 					$messages = array(
 						'message' => urlencode( $has_permission->get_error_message() ),
@@ -335,9 +335,9 @@ 
 				} else {
 
 					// Delete the entry
-					$delete_response = $this->delete_or_trash_entry( $entry['id'] );
+					$delete_response = $this->delete_or_trash_entry( $entry[ 'id' ] );
 
-					if( is_wp_error( $delete_response ) ) {
+					if ( is_wp_error( $delete_response ) ) {
 
 						$messages = array(
 							'message' => urlencode( $delete_response->get_error_message() ),
@@ -356,10 +356,10 @@ 
 
 			} else {
 
-				do_action('gravityview_log_debug', __METHOD__ . ' Delete entry failed: there was no entry with the entry slug '. $entry_slug );
+				do_action( 'gravityview_log_debug', __METHOD__ . ' Delete entry failed: there was no entry with the entry slug ' . $entry_slug );
 
 				$messages = array(
-					'message' => urlencode( __('The entry does not exist.', 'gravityview') ),
+					'message' => urlencode( __( 'The entry does not exist.', 'gravityview' ) ),
 					'status' => 'error',
 				);
 			}
@@ -401,14 +401,14 @@ 
 
 		$mode = $this->get_delete_mode();
 
-		if( 'delete' === $mode ) {
+		if ( 'delete' === $mode ) {
 
 			do_action( 'gravityview_log_debug', __METHOD__ . ' Starting delete entry: ', $entry_id );
 
 			// Delete the entry
 			$delete_response = GFAPI::delete_entry( $entry_id );
 
-			if( ! is_wp_error( $delete_response ) ) {
+			if ( ! is_wp_error( $delete_response ) ) {
 				$delete_response = 'deleted';
 			}
 
@@ -421,8 +421,8 @@ 
 			$trashed = GFAPI::update_entry_property( $entry_id, 'status', 'trash' );
 			new GravityView_Cache;
 
-			if( ! $trashed ) {
-				$delete_response = new WP_Error( 'trash_entry_failed', __('Moving the entry to the trash failed.', 'gravityview' ) );
+			if ( ! $trashed ) {
+				$delete_response = new WP_Error( 'trash_entry_failed', __( 'Moving the entry to the trash failed.', 'gravityview' ) );
 			} else {
 				$delete_response = 'trashed';
 			}
@@ -442,13 +442,13 @@ 
 	public function verify_nonce() {
 
 		// No delete entry request was made
-		if( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) {
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) {
 			return false;
 		}
 
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
 
-		$valid = wp_verify_nonce( $_GET['delete'], $nonce_key );
+		$valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key );
 
 		/**
 		 * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid.
@@ -470,7 +470,7 @@ 
 	 */
 	public static function get_confirm_dialog() {
 
-		$confirm = __('Are you sure you want to delete this entry? This cannot be undone.', 'gravityview');
+		$confirm = __( 'Are you sure you want to delete this entry? This cannot be undone.', 'gravityview' );
 
 		/**
 		 * @filter `gravityview/delete-entry/confirm-text` Modify the Delete Entry Javascript confirmation text
@@ -478,7 +478,7 @@ 
 		 */
 		$confirm = apply_filters( 'gravityview/delete-entry/confirm-text', $confirm );
 
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
+		return 'return window.confirm(\'' . esc_js( $confirm ) . '\');';
 	}
 
 	/**
@@ -496,16 +496,16 @@ 
 
 		$error = NULL;
 
-		if( ! $this->verify_nonce() ) {
-			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview');
+		if ( ! $this->verify_nonce() ) {
+			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview' );
 		}
 
-		if( ! self::check_user_cap_delete_entry( $entry ) ) {
-			$error = __( 'You do not have permission to delete this entry.', 'gravityview');
+		if ( ! self::check_user_cap_delete_entry( $entry ) ) {
+			$error = __( 'You do not have permission to delete this entry.', 'gravityview' );
 		}
 
-		if( $entry['status'] === 'trash' ) {
-			if( 'trash' === $this->get_delete_mode() ) {
+		if ( $entry[ 'status' ] === 'trash' ) {
+			if ( 'trash' === $this->get_delete_mode() ) {
 				$error = __( 'The entry is already in the trash.', 'gravityview' );
 			} else {
 				$error = __( 'You cannot delete the entry; it is already in the trash.', 'gravityview' );
@@ -513,11 +513,11 @@ 
 		}
 
 		// No errors; everything's fine here!
-		if( empty( $error ) ) {
+		if ( empty( $error ) ) {
 			return true;
 		}
 
-		do_action('gravityview_log_error', 'GravityView_Delete_Entry[user_can_delete_entry]' . $error );
+		do_action( 'gravityview_log_error', 'GravityView_Delete_Entry[user_can_delete_entry]' . $error );
 
 		return new WP_Error( 'gravityview-delete-entry-permissions', $error );
 	}
@@ -539,32 +539,32 @@ 
 
 		$current_user = wp_get_current_user();
 
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL;
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : NULL;
 
 		// Or if they can delete any entries (as defined in Gravity Forms), we're good.
-		if( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
+		if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
 
-			do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' );
+			do_action( 'gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' );
 
 			return true;
 		}
 
 
 		// If field options are passed, check if current user can view the link
-		if( !empty( $field ) ) {
+		if ( ! empty( $field ) ) {
 
 			// If capability is not defined, something is not right!
-			if( empty( $field['allow_edit_cap'] ) ) {
+			if ( empty( $field[ 'allow_edit_cap' ] ) ) {
 
 				do_action( 'gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Cannot read delete entry field caps', $field );
 
 				return false;
 			}
 
-			if( GVCommon::has_cap( $field['allow_edit_cap'] ) ) {
+			if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) {
 
 				// Do not return true if cap is read, as we need to check if the current user created the entry
-				if( $field['allow_edit_cap'] !== 'read' ) {
+				if ( $field[ 'allow_edit_cap' ] !== 'read' ) {
 					return true;
 				}
 
@@ -577,9 +577,9 @@ 
 
 		}
 
-		if( !isset( $entry['created_by'] ) ) {
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
 
-			do_action('gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Entry `created_by` doesn\'t exist.');
+			do_action( 'gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Entry `created_by` doesn\'t exist.' );
 
 			return false;
 		}
@@ -587,24 +587,24 @@ 
 		$view_id = empty( $view_id ) ? $gravityview_view->getViewId() : $view_id;
 
 		// Only checks user_delete view option if view is already set
-		if( $view_id ) {
+		if ( $view_id ) {
 
 			$current_view = gravityview_get_current_view_data( $view_id );
 
-			$user_delete = isset( $current_view['atts']['user_delete'] ) ? $current_view['atts']['user_delete'] : false;
+			$user_delete = isset( $current_view[ 'atts' ][ 'user_delete' ] ) ? $current_view[ 'atts' ][ 'user_delete' ] : false;
 
-			if( empty( $user_delete ) ) {
+			if ( empty( $user_delete ) ) {
 
-				do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] User Delete is disabled. Returning false.' );
+				do_action( 'gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] User Delete is disabled. Returning false.' );
 
 				return false;
 			}
 		}
 
 		// If the logged-in user is the same as the user who created the entry, we're good.
-		if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
 
-			do_action('gravityview_log_debug', sprintf( 'GravityView_Delete_Entry[check_user_cap_delete_entry] User %s created the entry.', $current_user->ID ) );
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_Delete_Entry[check_user_cap_delete_entry] User %s created the entry.', $current_user->ID ) );
 
 			return true;
 		}
@@ -627,31 +627,31 @@ 
 	 */
 	public function display_message( $current_view_id = 0 ) {
 
-		if( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
 			return;
 		}
 
 		// Entry wasn't deleted from current View
-		if( intval( $_GET['gvid'] ) !== intval( $current_view_id ) ) {
+		if ( intval( $_GET[ 'gvid' ] ) !== intval( $current_view_id ) ) {
 			return;
 		}
 
-		$status = esc_attr( $_GET['status'] );
-		$message_from_url = rgget('message');
+		$status = esc_attr( $_GET[ 'status' ] );
+		$message_from_url = rgget( 'message' );
 		$message_from_url = urldecode( stripslashes_deep( $message_from_url ) );
 		$class = '';
 
 		switch ( $status ) {
 			case 'error':
 				$class = ' gv-error error';
-				$error_message = __('There was an error deleting the entry: %s', 'gravityview');
+				$error_message = __( 'There was an error deleting the entry: %s', 'gravityview' );
 				$message = sprintf( $error_message, $message_from_url );
 				break;
 			case 'trashed':
-				$message = __('The entry was successfully moved to the trash.', 'gravityview');
+				$message = __( 'The entry was successfully moved to the trash.', 'gravityview' );
 				break;
 			default:
-				$message = __('The entry was successfully deleted.', 'gravityview');
+				$message = __( 'The entry was successfully deleted.', 'gravityview' );
 				break;
 		}
 
@@ -665,7 +665,7 @@ 
 		$message = apply_filters( 'gravityview/delete-entry/message', esc_attr( $message ), $status, $message_from_url );
 
 		// DISPLAY ERROR/SUCCESS MESSAGE
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
+		echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>';
 	}
 
 

includes/fields/class-gravityview-fields.php

Doc Comments +1 added lines, -2 removed lines

@@ -77,7 +77,7 @@ 
 	/**
 	 * Alias for get_instance()
 	 *
-	 * @param $field_name
+	 * @param string $field_name
 	 *
 	 * @return GravityView_Field|false
 	 */
@@ -88,7 +88,6 @@ 
 	/**
 	 * Alias for get_instance()
 	 *
-	 * @param string|GF_Field $field_name Gravity Forms field class or the class name type
 	 *
 	 * @return GravityView_Field
 	 */

Spacing +7 added lines, -7 removed lines

@@ -42,8 +42,8 @@ 
 	 * @return GravityView_Field | bool
 	 */
 	public static function create( $properties ) {
-		$type = isset( $properties['type'] ) ? $properties['type'] : '';
-		$type = empty( $properties['inputType'] ) ? $type : $properties['inputType'];
+		$type = isset( $properties[ 'type' ] ) ? $properties[ 'type' ] : '';
+		$type = empty( $properties[ 'inputType' ] ) ? $type : $properties[ 'inputType' ];
 		if ( empty( $type ) || ! isset( self::$_fields[ $type ] ) ) {
 			return new GravityView_Field( $properties );
 		}
@@ -62,7 +62,7 @@ 
 	 * @return bool True: yes, it exists; False: nope
 	 */
 	public static function exists( $field_name ) {
-		return isset( self::$_fields["{$field_name}"] );
+		return isset( self::$_fields[ "{$field_name}" ] );
 	}
 
 	/**
@@ -96,8 +96,8 @@ 
 
 		$field_type = is_a( $gf_field, 'GF_Field' ) ? get_class( $gf_field ) : $gf_field;
 
-		foreach( self::$_fields as $field ) {
-			if( $field_type === $field->_gf_field_class_name ) {
+		foreach ( self::$_fields as $field ) {
+			if ( $field_type === $field->_gf_field_class_name ) {
 				return $field;
 			}
 		}
@@ -116,10 +116,10 @@ 
 	 */
 	public static function get_all( $group = '' ) {
 
-		if( '' !== $group ) {
+		if ( '' !== $group ) {
 			$return_fields = self::$_fields;
 			foreach ( $return_fields as $key => $field ) {
-				if( $group !== $field->group ) {
+				if ( $group !== $field->group ) {
 					unset( $return_fields[ $key ] );
 				}
 			}

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

Braces +2 added lines, -4 removed lines

@@ -613,7 +613,7 @@ 
 
             $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>";
@@ -1620,9 +1620,7 @@ 
         // Verify
         else if( ! $this->is_edit_entry() ) {
             $valid = false;
-        }
-
-        else {
+        } else {
             $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
         }
 

Spacing +209 added lines, -209 removed lines

@@ -101,16 +101,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' ) );
 
@@ -121,7 +121,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' ) );
 
     }
 
@@ -136,8 +136,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' );
@@ -152,10 +152,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 );
         }
     }
 
@@ -167,7 +167,7 @@ 
 
         $gf_page = ( 'entry' === RGForms::get( 'view' ) );
 
-        return ( $gf_page && isset( $_GET['edit'] ) || RGForms::post( 'action' ) === 'update' );
+        return ( $gf_page && isset( $_GET[ 'edit' ] ) || RGForms::post( 'action' ) === 'update' );
     }
 
 	/**
@@ -176,7 +176,7 @@ 
 	 * @return boolean
 	 */
 	public function is_edit_entry_submission() {
-		return !empty( $_POST[ self::$nonce_field ] );
+		return ! empty( $_POST[ self::$nonce_field ] );
 	}
 
     /**
@@ -187,13 +187,13 @@ 
 
 
         $entries = $gravityview_view->getEntries();
-        $this->entry = $entries[0];
+        $this->entry = $entries[ 0 ];
 
         $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' ] );
     }
 
 
@@ -213,12 +213,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;
         }
 
@@ -238,9 +238,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' ) );
@@ -252,32 +252,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
@@ -287,12 +287,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 );
             }
 
@@ -304,7 +304,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
@@ -338,11 +338,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;
     }
@@ -356,15 +356,15 @@ 
         $form = $this->form;
 
         // add the fields with calculation properties so they could be recalculated
-        $form['fields'] = array_merge( $form['fields'], $this->fields_with_calculation );
+        $form[ 'fields' ] = array_merge( $form[ 'fields' ], $this->fields_with_calculation );
 
-        foreach( $form['fields'] as &$field ) {
+        foreach ( $form[ 'fields' ] as &$field ) {
 
             $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' ];
                 }
             }
         }
@@ -382,11 +382,11 @@ 
      */
     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;
         }
 
@@ -400,16 +400,16 @@ 
 
             $field = RGFormsModel::get_field( $form, $field_id );
 
-            if( class_exists('GF_Fields') ) {
+            if ( class_exists( 'GF_Fields' ) ) {
                 $field = GF_Fields::create( $field );
             }
 
-            if( GFCommon::is_post_field( $field ) ) {
+            if ( GFCommon::is_post_field( $field ) ) {
 
                 // Get the value of the field, including $_POSTed value
                 $value = RGFormsModel::get_field_value( $field );
 
-                switch( $field->type ) {
+                switch ( $field->type ) {
 
                     case 'post_title':
                     case 'post_content':
@@ -427,14 +427,14 @@ 
                         wp_set_post_categories( $post_id, $categories, false );
 
                         // if post_category is type checkbox, then value is an array of inputs
-                        if( isset( $value[ strval( $field_id ) ] ) ) {
-                            foreach( $value as $input_id => $val ) {
+                        if ( isset( $value[ strval( $field_id ) ] ) ) {
+                            foreach ( $value as $input_id => $val ) {
                                 $input_name = 'input_' . str_replace( '.', '_', $input_id );
-                                $this->entry[ strval( $input_id ) ] = RGFormsModel::prepare_value( $form, $field, $val, $input_name, $this->entry['id'] );
+                                $this->entry[ strval( $input_id ) ] = RGFormsModel::prepare_value( $form, $field, $val, $input_name, $this->entry[ 'id' ] );
                             }
                         } else {
                             $input_name = 'input_' . str_replace( '.', '_', $field_id );
-                            $this->entry[ strval( $field_id ) ] = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $this->entry['id'] );
+                            $this->entry[ strval( $field_id ) ] = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $this->entry[ 'id' ] );
                         }
 
                         break;
@@ -444,12 +444,12 @@ 
                         $custom_field_name = $field->postCustomFieldName;
 
                         // Only certain custom field types are supported
-                        switch( $input_type ) {
+                        switch ( $input_type ) {
                             case 'fileupload':
                             /** @noinspection PhpMissingBreakStatementInspection */
                             case 'list':
-                                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:
@@ -462,11 +462,11 @@ 
 
                         $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, $this->entry['id'] );
+                            $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $this->entry[ 'id' ] );
 
                             // is this field set as featured image, if not, leave
                             if ( ! $field->postFeaturedImage ) {
@@ -476,9 +476,9 @@ 
                             $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,
@@ -487,7 +487,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;
                             }
 
                             //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.
@@ -500,7 +500,7 @@ 
 
                             break;
 
-                        } 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
 
@@ -508,11 +508,11 @@ 
                             $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       = isset( $value[ $field_id .'.1' ] ) ? $value[ $field_id .'.1' ] : '';
-                                $img_caption     = isset( $value[ $field_id .'.4' ] ) ? $value[ $field_id .'.4' ] : '';
-                                $img_description = isset( $value[ $field_id .'.7' ] ) ? $value[ $field_id .'.7' ] : '';
+                                $img_title       = isset( $value[ $field_id . '.1' ] ) ? $value[ $field_id . '.1' ] : '';
+                                $img_caption     = isset( $value[ $field_id . '.4' ] ) ? $value[ $field_id . '.4' ] : '';
+                                $img_description = isset( $value[ $field_id . '.7' ] ) ? $value[ $field_id . '.7' ] : '';
 
                                 $value = ! empty( $img_url ) ? $img_url . "|:|" . $img_title . "|:|" . $img_caption . "|:|" . $img_description : '';
 
@@ -546,12 +546,12 @@ 
                 }
 
                 //ignore fields that have not changed
-                if ( $value === rgget( (string) $field_id, $this->entry ) ) {
+                if ( $value === rgget( (string)$field_id, $this->entry ) ) {
                     continue;
                 }
 
                 // update entry
-                if( 'post_category' !== $field->type ) {
+                if ( 'post_category' !== $field->type ) {
                     $this->entry[ strval( $field_id ) ] = $value;
                 }
 
@@ -561,25 +561,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', $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', $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 );
         }
 
     }
@@ -596,18 +596,18 @@ 
      */
     function after_update() {
 
-        do_action( 'gform_after_update_entry', $this->form, $this->entry['id'] );
-        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' ] );
+        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;
@@ -625,7 +625,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
@@ -641,7 +641,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>
@@ -681,20 +681,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)
@@ -704,7 +704,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 );
             }
@@ -725,15 +725,15 @@ 
      */
     private function render_edit_form() {
 
-        add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 );
-        add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') );
+        add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 );
+        add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
         add_filter( 'gform_disable_view_counter', '__return_true' );
 
         add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 );
         add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 );
 
         // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
-        unset( $_GET['page'] );
+        unset( $_GET[ 'page' ] );
 
         // TODO: Make sure validation isn't handled by GF
         // TODO: Include CSS for file upload fields
@@ -741,7 +741,7 @@ 
         // TODO: Product fields are not editable
         // TODO: Check Updated and Error messages
 
-        $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_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
         remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
@@ -758,7 +758,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 );
     }
 
 
@@ -778,17 +778,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;
@@ -809,29 +809,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 ) );
             }
         }
 
@@ -856,8 +856,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 )
             || GFCommon::is_product_field( $field->type ) // Prevent product fields from appearing editable
@@ -866,8 +866,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
@@ -891,7 +891,7 @@ 
 	    // 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' ) ) ) {
             $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 );
@@ -901,7 +901,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 );
 	    }
 
@@ -910,7 +910,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;
     }
@@ -933,7 +933,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();
 
@@ -942,10 +942,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;
                 }
 
@@ -953,7 +953,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 {
 
@@ -964,13 +964,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 );
             }
@@ -995,12 +995,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.
@@ -1013,7 +1013,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.
@@ -1027,37 +1027,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 {
@@ -1075,14 +1075,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;
             }
 
@@ -1111,7 +1111,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;
@@ -1119,14 +1119,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 );
     }
 
 
@@ -1143,13 +1143,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 );
@@ -1162,35 +1162,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;
                         }
 
                     }
@@ -1201,7 +1201,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 ) );
 
@@ -1219,32 +1219,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;
@@ -1256,12 +1256,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;
     }
@@ -1274,7 +1274,7 @@ 
      */
     private 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() );
         }
@@ -1301,13 +1301,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_hidden_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 );
@@ -1325,11 +1325,11 @@ 
 	private function fix_hidden_fields( $form ) {
 
 		/** @var GF_Field $field */
-		foreach( $form['fields'] as $key => $field ) {
-			if( 'hidden' === $field->type ) {
+		foreach ( $form[ 'fields' ] as $key => $field ) {
+			if ( 'hidden' === $field->type ) {
 				$text_field = new GF_Field_Text( $field );
 				$text_field->type = 'text';
-				$form['fields'][ $key ] = $text_field;
+				$form[ 'fields' ][ $key ] = $text_field;
 			}
 		}
 
@@ -1350,7 +1350,7 @@ 
      */
     private function filter_fields( $fields, $configured_fields ) {
 
-        if( empty( $fields ) || !is_array( $fields ) ) {
+        if ( empty( $fields ) || ! is_array( $fields ) ) {
             return $fields;
         }
 
@@ -1367,13 +1367,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
@@ -1381,18 +1381,18 @@ 
 
             // Remove the fields that have calculation properties and keep them to be used later
             // @since 1.16.2
-            if( $field->has_calculation() || 'number' === $field->type ) {
-                $this->fields_with_calculation[] = $field;
+            if ( $field->has_calculation() || 'number' === $field->type ) {
+                $this->fields_with_calculation[ ] = $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;
         }
 
@@ -1402,8 +1402,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;
                 }
 
@@ -1426,14 +1426,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' ] );
         }
 
         /**
@@ -1471,16 +1471,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;
         }
 
@@ -1507,16 +1507,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;
 
@@ -1533,7 +1533,7 @@ 
      */
     function manage_conditional_logic( $has_conditional_logic, $form ) {
 
-        if( ! $this->is_edit_entry() ) {
+        if ( ! $this->is_edit_entry() ) {
             return $has_conditional_logic;
         }
 
@@ -1564,44 +1564,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 );
 
@@ -1609,13 +1609,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;
     }
@@ -1632,20 +1632,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;
 
@@ -1663,15 +1663,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;
@@ -1685,17 +1685,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 );
         }
 
         /**

Indentation +1372 added lines, -1372 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,131 +44,131 @@ 
 	 */
 	private static $supports_product_fields = false;
 
-    /**
-     * Gravity Forms entry array
-     *
-     * @var array
-     */
-    var $entry;
-
-    /**
-     * Gravity Forms form array (GravityView change the content through this class lifecycle)
-     *
-     * @var array
-     */
-    var $form;
-
-    /**
-     * Gravity Forms form array (original form)
-     * @since 1.16.2
-     * @var array
-     */
-    var $fields_with_calculation = array();
-
-    /**
-     * Gravity Forms form array after the form validation process
-     * @since 1.13
-     * @var array
-     */
-    var $form_after_validation = null;
-
-    /**
-     * 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 = ( 'entry' === RGForms::get( 'view' ) );
-
-        return ( $gf_page && isset( $_GET['edit'] ) || RGForms::post( 'action' ) === 'update' );
-    }
+	/**
+	 * Gravity Forms entry array
+	 *
+	 * @var array
+	 */
+	var $entry;
+
+	/**
+	 * Gravity Forms form array (GravityView change the content through this class lifecycle)
+	 *
+	 * @var array
+	 */
+	var $form;
+
+	/**
+	 * Gravity Forms form array (original form)
+	 * @since 1.16.2
+	 * @var array
+	 */
+	var $fields_with_calculation = array();
+
+	/**
+	 * Gravity Forms form array after the form validation process
+	 * @since 1.13
+	 * @var array
+	 */
+	var $form_after_validation = null;
+
+	/**
+	 * 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 = ( 'entry' === RGForms::get( 'view' ) );
+
+		return ( $gf_page && isset( $_GET['edit'] ) || RGForms::post( 'action' ) === 'update' );
+	}
 
 	/**
 	 * Is the current page an Edit Entry page?
@@ -179,472 +179,472 @@ 
 		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();
+		$this->entry = $entries[0];
 
+		$this->form = $gravityview_view->getForm();
+		$this->form_id = $gravityview_view->getFormId();
+		$this->view_id = $gravityview_view->getViewId();
 
-        $entries = $gravityview_view->getEntries();
-        $this->entry = $entries[0];
+		self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] );
+	}
 
-        $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'] );
-    }
+	/**
+	 * 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' );
 
-    /**
-     * 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 ) {
+		$this->setup_vars();
 
-        require_once( GFCommon::get_base_path() . '/form_display.php' );
-        require_once( GFCommon::get_base_path() . '/entry_detail.php' );
+		// Multiple Views embedded, don't proceed if nonce fails
+		if( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) {
+			return;
+		}
 
-        $this->setup_vars();
+		// Sorry, you're not allowed here.
+		if( false === $this->user_can_edit_entry( true ) ) {
+			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;
-        }
+		$this->print_scripts();
 
-        // Sorry, you're not allowed here.
-        if( false === $this->user_can_edit_entry( true ) ) {
-            return;
-        }
+		$this->process_save();
 
-        $this->print_scripts();
+		$this->edit_entry_form();
 
-        $this->process_save();
+	}
 
-        $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();
 
+		wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
 
-    /**
-     * Force Gravity Forms to output scripts as if it were in the admin
-     * @return void
-     */
-    function print_scripts() {
-        $gravityview_view = GravityView_View::getInstance();
+		GFFormDisplay::enqueue_form_scripts($gravityview_view->getForm(), false);
 
-        wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
+		// Sack is required for images
+		wp_print_scripts( array( 'sack', 'gform_gravityforms' ) );
+	}
 
-        GFFormDisplay::enqueue_form_scripts($gravityview_view->getForm(), false);
 
-        // Sack is required for images
-        wp_print_scripts( array( 'sack', 'gform_gravityforms' ) );
-    }
+	/**
+	 * Process edit entry form save
+	 */
+	function process_save() {
 
+		if( empty( $_POST ) ) {
+			return;
+		}
 
-    /**
-     * Process edit entry form save
-     */
-    function process_save() {
+		// Make sure the entry, view, and form IDs are all correct
+		$valid = $this->verify_nonce();
 
-        if( empty( $_POST ) ) {
-            return;
-        }
+		if( !$valid ) {
+			do_action('gravityview_log_error', __METHOD__ . ' Nonce validation failed.' );
+			return;
+		}
 
-        // Make sure the entry, view, and form IDs are all correct
-        $valid = $this->verify_nonce();
+		if( $this->entry['id'] !== $_POST['lid'] ) {
+			do_action('gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' );
+			return;
+		}
 
-        if( !$valid ) {
-            do_action('gravityview_log_error', __METHOD__ . ' Nonce validation failed.' );
-            return;
-        }
+		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
 
-        if( $this->entry['id'] !== $_POST['lid'] ) {
-            do_action('gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' );
-            return;
-        }
+		$this->process_save_process_files( $this->form_id );
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+		$this->validate();
 
-        $this->process_save_process_files( $this->form_id );
+		if( $this->is_valid ) {
 
-        $this->validate();
+			do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.' );
 
-        if( $this->is_valid ) {
+			/**
+			 * @hack This step is needed to unset the adminOnly from form fields
+			 */
+			$form = $this->form_prepare_for_save();
 
-            do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.' );
+			/**
+			 * @hack to avoid the capability validation of the method save_lead for GF 1.9+
+			 */
+			unset( $_GET['page'] );
 
-            /**
-             * @hack This step is needed to unset the adminOnly from form fields
-             */
-            $form = $this->form_prepare_for_save();
+			GFFormsModel::save_lead( $form, $this->entry );
 
-            /**
-             * @hack to avoid the capability validation of the method save_lead for GF 1.9+
-             */
-            unset( $_GET['page'] );
+			// If there's a post associated with the entry, process post fields
+			if( !empty( $this->entry['post_id'] ) ) {
+				$this->maybe_update_post_fields( $form );
+			}
 
-            GFFormsModel::save_lead( $form, $this->entry );
+			// Perform actions normally performed after updating a lead
+			$this->after_update();
 
-            // If there's a post associated with the entry, process post fields
-            if( !empty( $this->entry['post_id'] ) ) {
-                $this->maybe_update_post_fields( $form );
-            }
+			/**
+			 * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry
+			 * @param array $form Gravity Forms form array
+			 * @param string $entry_id Numeric ID of the entry that was updated
+			 */
+			do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'] );
+		}
 
-            // Perform actions normally performed after updating a lead
-            $this->after_update();
+	} // process_save
 
-            /**
-             * @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
+	/**
+	 * 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();
+		}
 
-    /**
-     * Have GF handle file uploads
-     *
-     * Copy of code from GFFormDisplay::process_form()
-     *
-     * @param int $form_id
-     */
-    function process_save_process_files( $form_id ) {
+		RGFormsModel::$uploaded_files[ $form_id ] = $files;
+	}
 
-        //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();
-        }
+	/**
+	 * 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;
+		}
 
-        RGFormsModel::$uploaded_files[ $form_id ] = $files;
-    }
+		$plupload_init['gf_vars']['max_files'] = 0;
 
-    /**
-     * 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;
-        }
+		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;
 
+		// add the fields with calculation properties so they could be recalculated
+		$form['fields'] = array_merge( $form['fields'], $this->fields_with_calculation );
 
-    /**
-     * Unset adminOnly and convert field input key to string
-     * @return array $form
-     */
-    private function form_prepare_for_save() {
-        $form = $this->form;
-
-        // add the fields with calculation properties so they could be recalculated
-        $form['fields'] = array_merge( $form['fields'], $this->fields_with_calculation );
+		foreach( $form['fields'] as &$field ) {
 
-        foreach( $form['fields'] as &$field ) {
+			$field->adminOnly = false;
 
-            $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'];
-                }
-            }
-        }
+		return $form;
+	}
 
-        return $form;
-    }
 
+	/**
+	 * 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
+	 */
+	function maybe_update_post_fields( $form ) {
 
-    /**
-     * 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
-     */
-    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 );
+			return;
+		}
 
-        // 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;
 
-        $update_entry = false;
-
-        $updated_post = $original_post = get_post( $post_id );
+		$updated_post = $original_post = get_post( $post_id );
 
-        foreach ( $this->entry as $field_id => $value ) {
+		foreach ( $this->entry as $field_id => $value ) {
 
-            //todo: only run through the edit entry configured fields
+			//todo: only run through the edit entry configured fields
 
-            $field = RGFormsModel::get_field( $form, $field_id );
+			$field = RGFormsModel::get_field( $form, $field_id );
 
-            if( class_exists('GF_Fields') ) {
-                $field = GF_Fields::create( $field );
-            }
+			if( class_exists('GF_Fields') ) {
+				$field = GF_Fields::create( $field );
+			}
 
-            if( GFCommon::is_post_field( $field ) ) {
+			if( GFCommon::is_post_field( $field ) ) {
 
-                // Get the value of the field, including $_POSTed value
-                $value = RGFormsModel::get_field_value( $field );
+				// Get the value of the field, including $_POSTed value
+				$value = RGFormsModel::get_field_value( $field );
 
-                switch( $field->type ) {
+				switch( $field->type ) {
 
-                    case 'post_title':
-                    case 'post_content':
-                    case 'post_excerpt':
-                        $updated_post->{$field->type} = $value;
-                        break;
-                    case 'post_tags':
-                        wp_set_post_tags( $post_id, $value, false );
-                        break;
-                    case 'post_category':
+					case 'post_title':
+					case 'post_content':
+					case 'post_excerpt':
+						$updated_post->{$field->type} = $value;
+						break;
+					case 'post_tags':
+						wp_set_post_tags( $post_id, $value, false );
+						break;
+					case 'post_category':
 
-                        $categories = is_array( $value ) ? array_values( $value ) : (array)$value;
-                        $categories = array_filter( $categories );
+						$categories = is_array( $value ) ? array_values( $value ) : (array)$value;
+						$categories = array_filter( $categories );
 
-                        wp_set_post_categories( $post_id, $categories, false );
+						wp_set_post_categories( $post_id, $categories, false );
 
-                        // if post_category is type checkbox, then value is an array of inputs
-                        if( isset( $value[ strval( $field_id ) ] ) ) {
-                            foreach( $value as $input_id => $val ) {
-                                $input_name = 'input_' . str_replace( '.', '_', $input_id );
-                                $this->entry[ strval( $input_id ) ] = RGFormsModel::prepare_value( $form, $field, $val, $input_name, $this->entry['id'] );
-                            }
-                        } else {
-                            $input_name = 'input_' . str_replace( '.', '_', $field_id );
-                            $this->entry[ strval( $field_id ) ] = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $this->entry['id'] );
-                        }
+						// if post_category is type checkbox, then value is an array of inputs
+						if( isset( $value[ strval( $field_id ) ] ) ) {
+							foreach( $value as $input_id => $val ) {
+								$input_name = 'input_' . str_replace( '.', '_', $input_id );
+								$this->entry[ strval( $input_id ) ] = RGFormsModel::prepare_value( $form, $field, $val, $input_name, $this->entry['id'] );
+							}
+						} else {
+							$input_name = 'input_' . str_replace( '.', '_', $field_id );
+							$this->entry[ strval( $field_id ) ] = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $this->entry['id'] );
+						}
 
-                        break;
-                    case 'post_custom_field':
+						break;
+					case 'post_custom_field':
 
-                        $input_type = RGFormsModel::get_input_type( $field );
-                        $custom_field_name = $field->postCustomFieldName;
+						$input_type = RGFormsModel::get_input_type( $field );
+						$custom_field_name = $field->postCustomFieldName;
 
-                        // Only certain custom field types are supported
-                        switch( $input_type ) {
-                            case 'fileupload':
-                            /** @noinspection PhpMissingBreakStatementInspection */
-                            case 'list':
-                                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, $custom_field_name, $value );
-                        }
+						// Only certain custom field types are supported
+						switch( $input_type ) {
+							case 'fileupload':
+							/** @noinspection PhpMissingBreakStatementInspection */
+							case 'list':
+								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, $custom_field_name, $value );
+						}
 
-                        break;
+						break;
 
-                    case 'post_image':
+					case 'post_image':
 
-                        $input_name = 'input_' . $field_id;
+						$input_name = 'input_' . $field_id;
 
-                        if ( !empty( $_FILES[ $input_name ]['name'] ) ) {
+						if ( !empty( $_FILES[ $input_name ]['name'] ) ) {
 
-                            // We have a new image
+							// We have a new image
 
-                            $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $this->entry['id'] );
+							$value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $this->entry['id'] );
 
-                            // is this field set as featured image, if not, leave
-                            if ( ! $field->postFeaturedImage ) {
-                                break;
-                            }
+							// is this field set as featured image, if not, leave
+							if ( ! $field->postFeaturedImage ) {
+								break;
+							}
 
-                            $ary = ! empty( $value ) ? explode( '|:|', $value ) : array();
-                            $img_url = rgar( $ary, 0 );
+							$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,
-                                'post_content' => $img_description,
-                            );
+							$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;
-                            }
+							//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.
-                            require_once GRAVITYVIEW_DIR . 'includes/class-gravityview-gfformsmodel.php';
-                            $media_id = GravityView_GFFormsModel::media_handle_upload( $img_url, $post_id, $image_meta );
+							//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.
+							require_once GRAVITYVIEW_DIR . 'includes/class-gravityview-gfformsmodel.php';
+							$media_id = GravityView_GFFormsModel::media_handle_upload( $img_url, $post_id, $image_meta );
 
-                            if ( $media_id ) {
-                                set_post_thumbnail( $post_id, $media_id );
-                            }
+							if ( $media_id ) {
+								set_post_thumbnail( $post_id, $media_id );
+							}
 
-                            break;
+							break;
 
-                        } 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
+							// Same image although the image title, caption or description might have changed
 
-                            $ary = ! empty( $this->entry[ $field_id ] ) ? explode( '|:|', $this->entry[ $field_id ] ) : array();
-                            $img_url = rgar( $ary, 0 );
+							$ary = ! empty( $this->entry[ $field_id ] ) ? explode( '|:|', $this->entry[ $field_id ] ) : array();
+							$img_url = rgar( $ary, 0 );
 
-                            // is this really the same image or something went wrong ?
-                            if( $img_url === $_POST[ $input_name ] ) {
+							// is this really the same image or something went wrong ?
+							if( $img_url === $_POST[ $input_name ] ) {
 
-                                $img_title       = isset( $value[ $field_id .'.1' ] ) ? $value[ $field_id .'.1' ] : '';
-                                $img_caption     = isset( $value[ $field_id .'.4' ] ) ? $value[ $field_id .'.4' ] : '';
-                                $img_description = isset( $value[ $field_id .'.7' ] ) ? $value[ $field_id .'.7' ] : '';
+								$img_title       = isset( $value[ $field_id .'.1' ] ) ? $value[ $field_id .'.1' ] : '';
+								$img_caption     = isset( $value[ $field_id .'.4' ] ) ? $value[ $field_id .'.4' ] : '';
+								$img_description = isset( $value[ $field_id .'.7' ] ) ? $value[ $field_id .'.7' ] : '';
 
-                                $value = ! empty( $img_url ) ? $img_url . "|:|" . $img_title . "|:|" . $img_caption . "|:|" . $img_description : '';
+								$value = ! empty( $img_url ) ? $img_url . "|:|" . $img_title . "|:|" . $img_caption . "|:|" . $img_description : '';
 
-                                if ( $field->postFeaturedImage ) {
+								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,
-                                    );
+									$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 );
-                                }
+									// update image title, caption or description
+									wp_update_post( $image_meta );
+								}
 
-                                break;
-                            }
+								break;
+							}
 
-                        }
+						}
 
-                        // if we get here, image was removed or not set.
+						// if we get here, image was removed or not set.
 
-                        $value = '';
-                        if ( $field->postFeaturedImage ) {
-                            delete_post_thumbnail( $post_id );
-                        }
+						$value = '';
+						if ( $field->postFeaturedImage ) {
+							delete_post_thumbnail( $post_id );
+						}
 
-                        break;
+						break;
 
-                }
+				}
 
-                //ignore fields that have not changed
-                if ( $value === rgget( (string) $field_id, $this->entry ) ) {
-                    continue;
-                }
+				//ignore fields that have not changed
+				if ( $value === rgget( (string) $field_id, $this->entry ) ) {
+					continue;
+				}
 
-                // update entry
-                if( 'post_category' !== $field->type ) {
-                    $this->entry[ strval( $field_id ) ] = $value;
-                }
+				// update entry
+				if( 'post_category' !== $field->type ) {
+					$this->entry[ strval( $field_id ) ] = $value;
+				}
 
-                $update_entry = true;
+				$update_entry = true;
 
-            }
+			}
 
-        }
+		}
 
-        if( $update_entry ) {
+		if( $update_entry ) {
 
-            $return_entry = GFAPI::update_entry( $this->entry );
+			$return_entry = GFAPI::update_entry( $this->entry );
 
-            if( is_wp_error( $return_entry ) ) {
-                do_action( 'gravityview_log_error', 'Updating the entry post fields failed', $return_entry );
-            } else {
-                do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #'.$post_id.' succeeded' );
-            }
+			if( is_wp_error( $return_entry ) ) {
+				do_action( 'gravityview_log_error', 'Updating the entry post fields failed', $return_entry );
+			} else {
+				do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #'.$post_id.' succeeded' );
+			}
 
-        }
+		}
 
-        $return_post = wp_update_post( $updated_post, true );
+		$return_post = wp_update_post( $updated_post, true );
 
-        if( is_wp_error( $return_post ) ) {
-            $return_post->add_data( $updated_post, '$updated_post' );
-            do_action( 'gravityview_log_error', 'Updating the post content failed', $return_post );
-        } else {
-            do_action( 'gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded', $updated_post );
-        }
+		if( is_wp_error( $return_post ) ) {
+			$return_post->add_data( $updated_post, '$updated_post' );
+			do_action( 'gravityview_log_error', 'Updating the post content failed', $return_post );
+		} else {
+			do_action( 'gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded', $updated_post );
+		}
 
-    }
+	}
 
 
-    /**
-     * Perform actions normally performed after updating a lead
-     *
-     * @since 1.8
-     *
-     * @see GFEntryDetail::lead_detail_page()
-     *
-     * @return void
-     */
-    function after_update() {
+	/**
+	 * 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'] );
-        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'] );
+		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'] );
+		// Re-define the entry now that we've updated it.
+		$entry = RGFormsModel::get_lead( $this->entry['id'] );
 
-        $entry = GFFormsModel::set_entry_meta( $entry, $this->form );
+		$entry = GFFormsModel::set_entry_meta( $entry, $this->form );
 
-        // 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 );
-        }
+		// 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;
-    }
+		$this->entry = $entry;
+	}
 
 
-    /**
-     * Display the Edit Entry form
-     *
-     * @return [type] [description]
-     */
-    public function edit_entry_form() {
+	/**
+	 * 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(); ?>
@@ -655,672 +655,672 @@ 
 
                 <?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 TODO
-     *
-     * @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
-     *
-     * @param $form
-     * @param $lead
-     * @param $view_id
-     *
-     * @return void
-     */
-    private function render_edit_form() {
-
-        add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 );
-        add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') );
-        add_filter( 'gform_disable_view_counter', '__return_true' );
-
-        add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 );
-        add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 );
-
-        // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
-        unset( $_GET['page'] );
-
-        // TODO: Make sure validation isn't handled by GF
-        // TODO: Include CSS for file upload fields
-        // TODO: Verify multiple-page forms
-        // TODO: Product fields are not editable
-        // TODO: Check Updated and Error messages
-
-        $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
-
-	    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;
-    }
-
-    /**
-     * 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 TODO
-     *
-     * @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 )
-            || 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 );
-
-	    // Prevent any PHP warnings, like undefined index
-	    ob_start();
-
-        if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
-            $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
-        } else {
-	        $return = $field->get_field_input( $this->form, $field_value, $this->entry );
-        }
-
-
-	    // If there was output, it's an error
-	    $warnings = ob_get_clean();
-
-	    if( !empty( $warnings ) ) {
-		    do_action( 'gravityview_log_error', __METHOD__ . $warnings, $field_value );
-	    }
-
-        /**
-         * 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'] );
+	}
+
+	/**
+	 * Display success or error message if the form has been submitted
+	 *
+	 * @uses GVCommon::generate_notice
+	 *
+	 * @since TODO
+	 *
+	 * @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
+	 *
+	 * @param $form
+	 * @param $lead
+	 * @param $view_id
+	 *
+	 * @return void
+	 */
+	private function render_edit_form() {
+
+		add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 );
+		add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') );
+		add_filter( 'gform_disable_view_counter', '__return_true' );
+
+		add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 );
+		add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 );
+
+		// We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
+		unset( $_GET['page'] );
+
+		// TODO: Make sure validation isn't handled by GF
+		// TODO: Include CSS for file upload fields
+		// TODO: Verify multiple-page forms
+		// TODO: Product fields are not editable
+		// TODO: Check Updated and Error messages
+
+		$html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
+
+		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;
+	}
+
+	/**
+	 * 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 TODO
+	 *
+	 * @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 )
+			|| 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 );
+
+		// Prevent any PHP warnings, like undefined index
+		ob_start();
+
+		if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
+			$return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
+		} else {
+			$return = $field->get_field_input( $this->form, $field_value, $this->entry );
+		}
+
+
+		// If there was output, it's an error
+		$warnings = ob_get_clean();
+
+		if( !empty( $warnings ) ) {
+			do_action( 'gravityview_log_error', __METHOD__ . $warnings, $field_value );
+		}
+
+		/**
+		 * 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;
-
-                    // Use the previous entry value as the default.
-                    if( isset( $entry[ $field->id ] ) ) {
-                        $value = $entry[ $field->id ];
-                    }
+				/**
+				 * 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':
 
-                    // 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'];
+					// Set the previous value
+					$entry = $this->get_entry();
 
-                    } 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());
-                        }
+					$input_name = 'input_'.$field->id;
+					$form_id = $form['id'];
 
-                    } else {
+					$value = NULL;
 
-                        // 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;
+					// 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'];
 
-                    $this->entry[ $input_name ] = $value;
-                    $_POST[ $input_name ] = $value;
+					} else {
 
-                    break;
+						// 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' => '' );
 
-                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;
-            }
+					}
 
-        }
+					if( rgar($field, "multipleFiles") ) {
 
-        return $form;
-    }
+						// 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 {
 
-    /**
-     * Process validation for a edit entry submission
-     *
-     * Sets the `is_valid` object var
-     *
-     * @return void
-     */
-    function validate() {
+						// 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 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' ) );
-        }
+					}
 
+					$this->entry[ $input_name ] = $value;
+					$_POST[ $input_name ] = $value;
 
-        /**
-         * 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);
+					break;
 
-        // Needed by the validate funtion
-        $failed_validation_page = NULL;
-        $field_values = RGForms::post( 'gform_field_values' );
+				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;
+			}
 
-        // Prevent entry limit from running when editing an entry, also
-        // prevent form scheduling from preventing editing
-        unset( $this->form['limitEntries'], $this->form['scheduleForm'] );
+		}
 
-        // Hide fields depending on Edit Entry settings
-        $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id );
+		return $form;
+	}
 
-        $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 );
-    }
+	/**
+	 * Process validation for a edit entry submission
+	 *
+	 * Sets the `is_valid` object var
+	 *
+	 * @return void
+	 */
+	function validate() {
+
+		/**
+		 * If using GF User Registration Add-on, remove the validation step, otherwise generates error when updating the entry
+		 * GF User Registration Add-on version > 3.x has a different class name
+		 * @since 1.16.2
+		 */
+		if ( class_exists( 'GF_User_Registration' ) ) {
+			remove_filter( 'gform_validation', array( GF_User_Registration::get_instance(), 'validate' ) );
+		} else  if ( class_exists( 'GFUser' ) ) {
+			remove_filter( 'gform_validation', array( 'GFUser', 'user_registration_validation' ) );
+		}
 
 
-    /**
-     * 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 ) {
+		/**
+		 * 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);
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results );
+		// Needed by the validate funtion
+		$failed_validation_page = NULL;
+		$field_values = RGForms::post( 'gform_field_values' );
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+		// Prevent entry limit from running when editing an entry, also
+		// prevent form scheduling from preventing editing
+		unset( $this->form['limitEntries'], $this->form['scheduleForm'] );
 
-        $gv_valid = true;
+		// Hide fields depending on Edit Entry settings
+		$this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id );
 
-        foreach ( $validation_results['form']['fields'] as $key => &$field ) {
+		$this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page );
 
-            $value = RGFormsModel::get_field_value( $field );
-            $field_type = RGFormsModel::get_input_type( $field );
+		remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 );
+	}
 
-            // Validate always
-            switch ( $field_type ) {
 
+	/**
+	 * 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 ) {
 
-                case 'fileupload' :
-                case 'post_image':
+		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results );
 
-                    // 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 );
-                    }
+		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
 
-                    // validate if multi file upload reached max number of files [maxFiles] => 2
-                    if( rgobj( $field, 'maxFiles') && rgobj( $field, 'multipleFiles') ) {
+		$gv_valid = true;
 
-                        $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();
+		foreach ( $validation_results['form']['fields'] as $key => &$field ) {
 
-                        //existent
-                        $entry = $this->get_entry();
-                        $value = NULL;
-                        if( isset( $entry[ $field->id ] ) ) {
-                            $value = json_decode( $entry[ $field->id ], true );
-                        }
+			$value = RGFormsModel::get_field_value( $field );
+			$field_type = RGFormsModel::get_input_type( $field );
 
-                        // count uploaded files and existent entry files
-                        $count_files = count( $file_names ) + count( $value );
+			// Validate always
+			switch ( $field_type ) {
 
-                        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;
-                        }
+				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 );
+					}
 
+					// validate if multi file upload reached max number of files [maxFiles] => 2
+					if( rgobj( $field, 'maxFiles') && rgobj( $field, 'multipleFiles') ) {
 
-                    break;
+						$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 );
+						}
 
-            // This field has failed validation.
-            if( !empty( $field->failed_validation ) ) {
+						// count uploaded files and existent entry files
+						$count_files = count( $file_names ) + count( $value );
 
-                do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'field' => $field, 'value' => $value ) );
+						if( $count_files > $field->maxFiles ) {
+							$field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
+							$field->failed_validation = 1;
+							$gv_valid = false;
 
-                switch ( $field_type ) {
+							// in case of error make sure the newest upload files are removed from the upload input
+							GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
+						}
 
-                    // Captchas don't need to be re-entered.
-                    case 'captcha':
+					}
 
-                        // Post Image fields aren't editable, so we un-fail them.
-                    case 'post_image':
-                        $field->failed_validation = false;
-                        unset( $field->validation_message );
-                        break;
 
-                }
+					break;
 
-                // You can't continue inside a switch, so we do it after.
-                if( empty( $field->failed_validation ) ) {
-                    continue;
-                }
+			}
 
-                // 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 ) ) {
+			// This field has failed validation.
+			if( !empty( $field->failed_validation ) ) {
 
-                    $entry = $this->get_entry();
+				do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'field' => $field, 'value' => $value ) );
 
-                    // 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;
+				switch ( $field_type ) {
 
-                        unset( $field->validation_message );
+					// Captchas don't need to be re-entered.
+					case 'captcha':
 
-                        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry );
+						// Post Image fields aren't editable, so we un-fail them.
+					case 'post_image':
+						$field->failed_validation = false;
+						unset( $field->validation_message );
+						break;
 
-                        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;
-                }
+				// You can't continue inside a switch, so we do it after.
+				if( empty( $field->failed_validation ) ) {
+					continue;
+				}
 
-                $gv_valid = false;
+				// 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();
 
-        }
+					// 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;
 
-        $validation_results['is_valid'] = $gv_valid;
+						unset( $field->validation_message );
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results );
+						do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry );
 
-        // We'll need this result when rendering the form ( on GFFormDisplay::get_form )
-        $this->form_after_validation = $validation_results['form'];
+						continue;
+					}
+				}
 
-        return $validation_results;
-    }
+				// 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;
 
-    /**
-     * 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
-     */
-    private 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() );
-        }
+		}
+
+		$validation_results['is_valid'] = $gv_valid;
+
+		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results );
 
-        return $this->entry;
-    }
+		// We'll need this result when rendering the form ( on GFFormDisplay::get_form )
+		$this->form_after_validation = $validation_results['form'];
 
+		return $validation_results;
+	}
 
 
-    // --- Filters
+	/**
+	 * 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
+	 */
+	private function get_entry() {
 
-    /**
-     * 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 ) {
+		if( empty( $this->entry ) ) {
+			// Get the database value of the entry that's being edited
+			$this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() );
+		}
+
+		return $this->entry;
+	}
+
+
+
+	// --- Filters
+
+	/**
+	 * Get the Edit Entry fields as configured in the View
+	 *
+	 * @since 1.8
+	 *
+	 * @param int $view_id
+	 *
+	 * @return array Array of fields that are configured in the Edit tab in the Admin
+	 */
+	private function get_configured_edit_fields( $form, $view_id ) {
 
-        // 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_hidden_fields( $form );
+		// Show hidden fields as text fields
+		$form = $this->fix_hidden_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 );
 
-        return $fields;
-    }
+		return $fields;
+	}
 
 	/**
 	 * @since 1.9.2
@@ -1344,377 +1344,377 @@ 
 	}
 
 
-    /**
-     * 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() || 'number' === $field->type ) {
-                $this->fields_with_calculation[] = $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( ! 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( empty( $fields ) || !is_array( $fields ) ) {
+			return $fields;
+		}
 
-        // No errors; everything's fine here!
-        if( empty( $error ) ) {
-            return true;
-        }
+		$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';
+		}
 
-        if( $echo && $error !== true ) {
+		// First, remove blacklist or calculation fields
+		foreach ( $fields as $key => $field ) {
 
-	        $error = esc_html( $error );
+			// Remove the fields that have calculation properties and keep them to be used later
+			// @since 1.16.2
+			if( $field->has_calculation() || 'number' === $field->type ) {
+				$this->fields_with_calculation[] = $field;
+				unset( $fields[ $key ] );
+			}
 
-	        /**
-	         * @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;" ) );
-	        }
+			if( in_array( $field->type, $field_type_blacklist ) ) {
+				unset( $fields[ $key ] );
+			}
+		}
 
-            echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
-        }
+		// The Edit tab has not been configured, so we return all fields by default.
+		if( empty( $configured_fields ) ) {
+			return $fields;
+		}
 
-        do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error );
+		// The edit tab has been configured, so we loop through to configured settings
+		foreach ( $configured_fields as $configured_field ) {
 
-        return false;
-    }
+			/** @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;
+				}
 
-    /**
-     * 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;
-        }
+		return $edit_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 );
+	}
 
-        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 ) {
 
-    }
+		$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'];
+		}
 
-    /**
-     * 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( !empty( $field_setting['custom_class'] ) ) {
+			$return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] );
+		}
 
-        // 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;
-        }
+		/**
+		 * Normalize page numbers - avoid conflicts with page validation
+		 * @since 1.6
+		 */
+		$return_field->pageNumber = 1;
 
-        $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false;
+		return $return_field;
 
-        // If the field has custom editing capaibilities set, check those
-        if( $field_cap ) {
-            return GVCommon::has_cap( $field['allow_edit_cap'] );
-        }
-
-        return false;
-    }
+	}
 
+	/**
+	 * 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;
+		}
 
-    /**
-     * Is the current nonce valid for editing the entry?
-     * @return boolean
-     */
-    public function verify_nonce() {
+		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');
+			}
+
+		}
+
+		if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
+			$error = __( 'You do not have permission to edit this entry.', 'gravityview');
+		}
 
-        // 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->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;
 
-        // Verify
-        else if( ! $this->is_edit_entry() ) {
-            $valid = 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 ) {
 
-        else {
-            $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
-        }
+		// 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;
+	}
 
-        /**
-         * @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;
-    }
+	/**
+	 * 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;
+	}
 
 
 

includes/fields/class-gravityview-field-post-content.php

Spacing +4 added lines, -4 removed lines

@@ -22,13 +22,13 @@ 
 
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
-		unset( $field_options['show_as_link'] );
+		unset( $field_options[ 'show_as_link' ] );
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
-		$this->add_field_support('dynamic_data', $field_options );
+		$this->add_field_support( 'dynamic_data', $field_options );
 
 		return $field_options;
 	}
@@ -44,7 +44,7 @@ 
 	 */
 	public function get_field_input( $form, $value = '', $entry = null, GF_Field_Post_Content $field ) {
 
-		$id    = (int) $field->id;
+		$id    = (int)$field->id;
 		$input_name = "input_{$id}";
 		$class = esc_attr( $field->size );
 		$tabindex = $field->get_tabindex();

includes/class-gravityview-gfformsmodel.php

Indentation +175 added lines, -175 removed lines

@@ -7,181 +7,181 @@
 
 class GravityView_GFFormsModel extends GFFormsModel {
 
-    /**
-     * Copied function from Gravity Forms plugin \GFFormsModel::copy_post_image since the method is private.
-     *
-     * @since 1.16.2
-     *
-     * @param string $url URL of the post image to update
-     * @param int $post_id ID of the post image to update
-     * @return array|bool Array with `file`, `url` and `type` keys. False: failed to copy file to final directory path.
-     */
-    public static function copy_post_image( $url, $post_id ) {
-
-        $reflection = new ReflectionMethod( 'GFFormsModel', 'copy_post_image' );
-
-        /**
-         * If the method changes to public, use Gravity Forms' method
-         * @todo: If/when the method is public, remove the unneeded copied code.
-         */
-        if( $reflection->isPublic() ) {
-            return parent::copy_post_image( $url, $post_id );
-        }
-
-        /**
-         * Original Gravity Forms code below:
-         * ==================================
-         */
-
-        $time = current_time( 'mysql' );
-
-        if ( $post = get_post( $post_id ) ) {
-            if ( substr( $post->post_date, 0, 4 ) > 0 ) {
-                $time = $post->post_date;
-            }
-        }
-
-        //making sure there is a valid upload folder
-        if ( ! ( ( $upload_dir = wp_upload_dir( $time ) ) && false === $upload_dir['error'] ) ) {
-            return false;
-        }
-
-        $form_id = get_post_meta( $post_id, '_gform-form-id', true );
-
-        /**
-         * Filter the media upload location.
-         *
-         * @param array $upload_dir The current upload directory’s path and url.
-         * @param int $form_id The ID of the form currently being processed.
-         * @param int $post_id The ID of the post created from the entry currently being processed.
-         */
-        $upload_dir = gf_apply_filters( 'gform_media_upload_path', $form_id, $upload_dir, $form_id, $post_id );
-
-        if ( ! file_exists( $upload_dir['path'] ) ) {
-            if ( ! wp_mkdir_p( $upload_dir['path'] ) ) {
-                return false;
-            }
-        }
-
-        $name     = basename( $url );
-        $filename = wp_unique_filename( $upload_dir['path'], $name );
-
-        // the destination path
-        $new_file = $upload_dir['path'] . "/$filename";
-
-        // the source path
-        $y                = substr( $time, 0, 4 );
-        $m                = substr( $time, 5, 2 );
-        $target_root      = RGFormsModel::get_upload_path( $form_id ) . "/$y/$m/";
-        $target_root_url  = RGFormsModel::get_upload_url( $form_id ) . "/$y/$m/";
-        $upload_root_info = array( 'path' => $target_root, 'url' => $target_root_url );
-        $upload_root_info = gf_apply_filters( 'gform_upload_path', $form_id, $upload_root_info, $form_id );
-        $path             = str_replace( $upload_root_info['url'], $upload_root_info['path'], $url );
-
-        // copy the file to the destination path
-        if ( ! copy( $path, $new_file ) ) {
-            return false;
-        }
-
-        // Set correct file permissions
-        $stat  = stat( dirname( $new_file ) );
-        $perms = $stat['mode'] & 0000666;
-        @ chmod( $new_file, $perms );
-
-        // Compute the URL
-        $url = $upload_dir['url'] . "/$filename";
-
-        if ( is_multisite() ) {
-            delete_transient( 'dirsize_cache' );
-        }
-
-        $type = wp_check_filetype( $new_file );
-
-        return array( 'file' => $new_file, 'url' => $url, 'type' => $type['type'] );
-
-    }
-
-    /**
-     * Copied function from Gravity Forms plugin \GFFormsModel::media_handle_upload since the method is private.
-     *
-     * @see GFFormsModel::media_handle_upload
-     * @see GravityView_Edit_Entry_Render::maybe_update_post_fields
-     * 
-     * @uses copy_post_image
-     * @uses wp_insert_attachment
-     * @uses wp_update_attachment_metadata
-     *
-     * @param string $url URL of the post image to update
-     * @param int $post_id ID of the post image to update
-     * @param array $post_data Array of data for the eventual attachment post type that is created using {@see wp_insert_attachment}. Supports `post_mime_type`, `guid`, `post_parent`, `post_title`, `post_content` keys.
-     * @return bool|int ID of attachment Post created. Returns false if file not created by copy_post_image
-     */
-    public static function media_handle_upload( $url, $post_id, $post_data = array() ) {
-
-        $reflection = new ReflectionMethod( 'GFFormsModel', 'media_handle_upload' );
-
-        /**
-         * If the method changes to public, use Gravity Forms' method
-         * @todo: If/when the method is public, remove the unneeded copied code.
-         */
-        if( $reflection->isPublic() ) {
-            return parent::media_handle_upload( $url, $post_id, $post_data );
-        }
-
-        /**
-         * Original Gravity Forms code below:
-         * ==================================
-         */
-
-        //WordPress Administration API required for the media_handle_upload() function
-        require_once( ABSPATH . 'wp-admin/includes/image.php' );
-
-        $name = basename( $url );
-
-        $file = self::copy_post_image( $url, $post_id );
-
-        if ( ! $file ) {
-            return false;
-        }
-
-        $name_parts = pathinfo( $name );
-        $name       = trim( substr( $name, 0, - ( 1 + strlen( $name_parts['extension'] ) ) ) );
-
-        $url     = $file['url'];
-        $type    = $file['type'];
-        $file    = $file['file'];
-        $title   = $name;
-        $content = '';
-
-        // use image exif/iptc data for title and caption defaults if possible
-        if ( $image_meta = @wp_read_image_metadata( $file ) ) {
-            if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
-                $title = $image_meta['title'];
-            }
-            if ( trim( $image_meta['caption'] ) ) {
-                $content = $image_meta['caption'];
-            }
-        }
-
-        // Construct the attachment array
-        $attachment = array_merge(
-            array(
-                'post_mime_type' => $type,
-                'guid'           => $url,
-                'post_parent'    => $post_id,
-                'post_title'     => $title,
-                'post_content'   => $content,
-            ), $post_data
-        );
-
-        // Save the data
-        $id = wp_insert_attachment( $attachment, $file, $post_id );
-        if ( ! is_wp_error( $id ) ) {
-            wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-        }
-
-        return $id;
-    }
+	/**
+	 * Copied function from Gravity Forms plugin \GFFormsModel::copy_post_image since the method is private.
+	 *
+	 * @since 1.16.2
+	 *
+	 * @param string $url URL of the post image to update
+	 * @param int $post_id ID of the post image to update
+	 * @return array|bool Array with `file`, `url` and `type` keys. False: failed to copy file to final directory path.
+	 */
+	public static function copy_post_image( $url, $post_id ) {
+
+		$reflection = new ReflectionMethod( 'GFFormsModel', 'copy_post_image' );
+
+		/**
+		 * If the method changes to public, use Gravity Forms' method
+		 * @todo: If/when the method is public, remove the unneeded copied code.
+		 */
+		if( $reflection->isPublic() ) {
+			return parent::copy_post_image( $url, $post_id );
+		}
+
+		/**
+		 * Original Gravity Forms code below:
+		 * ==================================
+		 */
+
+		$time = current_time( 'mysql' );
+
+		if ( $post = get_post( $post_id ) ) {
+			if ( substr( $post->post_date, 0, 4 ) > 0 ) {
+				$time = $post->post_date;
+			}
+		}
+
+		//making sure there is a valid upload folder
+		if ( ! ( ( $upload_dir = wp_upload_dir( $time ) ) && false === $upload_dir['error'] ) ) {
+			return false;
+		}
+
+		$form_id = get_post_meta( $post_id, '_gform-form-id', true );
+
+		/**
+		 * Filter the media upload location.
+		 *
+		 * @param array $upload_dir The current upload directory’s path and url.
+		 * @param int $form_id The ID of the form currently being processed.
+		 * @param int $post_id The ID of the post created from the entry currently being processed.
+		 */
+		$upload_dir = gf_apply_filters( 'gform_media_upload_path', $form_id, $upload_dir, $form_id, $post_id );
+
+		if ( ! file_exists( $upload_dir['path'] ) ) {
+			if ( ! wp_mkdir_p( $upload_dir['path'] ) ) {
+				return false;
+			}
+		}
+
+		$name     = basename( $url );
+		$filename = wp_unique_filename( $upload_dir['path'], $name );
+
+		// the destination path
+		$new_file = $upload_dir['path'] . "/$filename";
+
+		// the source path
+		$y                = substr( $time, 0, 4 );
+		$m                = substr( $time, 5, 2 );
+		$target_root      = RGFormsModel::get_upload_path( $form_id ) . "/$y/$m/";
+		$target_root_url  = RGFormsModel::get_upload_url( $form_id ) . "/$y/$m/";
+		$upload_root_info = array( 'path' => $target_root, 'url' => $target_root_url );
+		$upload_root_info = gf_apply_filters( 'gform_upload_path', $form_id, $upload_root_info, $form_id );
+		$path             = str_replace( $upload_root_info['url'], $upload_root_info['path'], $url );
+
+		// copy the file to the destination path
+		if ( ! copy( $path, $new_file ) ) {
+			return false;
+		}
+
+		// Set correct file permissions
+		$stat  = stat( dirname( $new_file ) );
+		$perms = $stat['mode'] & 0000666;
+		@ chmod( $new_file, $perms );
+
+		// Compute the URL
+		$url = $upload_dir['url'] . "/$filename";
+
+		if ( is_multisite() ) {
+			delete_transient( 'dirsize_cache' );
+		}
+
+		$type = wp_check_filetype( $new_file );
+
+		return array( 'file' => $new_file, 'url' => $url, 'type' => $type['type'] );
+
+	}
+
+	/**
+	 * Copied function from Gravity Forms plugin \GFFormsModel::media_handle_upload since the method is private.
+	 *
+	 * @see GFFormsModel::media_handle_upload
+	 * @see GravityView_Edit_Entry_Render::maybe_update_post_fields
+	 * 
+	 * @uses copy_post_image
+	 * @uses wp_insert_attachment
+	 * @uses wp_update_attachment_metadata
+	 *
+	 * @param string $url URL of the post image to update
+	 * @param int $post_id ID of the post image to update
+	 * @param array $post_data Array of data for the eventual attachment post type that is created using {@see wp_insert_attachment}. Supports `post_mime_type`, `guid`, `post_parent`, `post_title`, `post_content` keys.
+	 * @return bool|int ID of attachment Post created. Returns false if file not created by copy_post_image
+	 */
+	public static function media_handle_upload( $url, $post_id, $post_data = array() ) {
+
+		$reflection = new ReflectionMethod( 'GFFormsModel', 'media_handle_upload' );
+
+		/**
+		 * If the method changes to public, use Gravity Forms' method
+		 * @todo: If/when the method is public, remove the unneeded copied code.
+		 */
+		if( $reflection->isPublic() ) {
+			return parent::media_handle_upload( $url, $post_id, $post_data );
+		}
+
+		/**
+		 * Original Gravity Forms code below:
+		 * ==================================
+		 */
+
+		//WordPress Administration API required for the media_handle_upload() function
+		require_once( ABSPATH . 'wp-admin/includes/image.php' );
+
+		$name = basename( $url );
+
+		$file = self::copy_post_image( $url, $post_id );
+
+		if ( ! $file ) {
+			return false;
+		}
+
+		$name_parts = pathinfo( $name );
+		$name       = trim( substr( $name, 0, - ( 1 + strlen( $name_parts['extension'] ) ) ) );
+
+		$url     = $file['url'];
+		$type    = $file['type'];
+		$file    = $file['file'];
+		$title   = $name;
+		$content = '';
+
+		// use image exif/iptc data for title and caption defaults if possible
+		if ( $image_meta = @wp_read_image_metadata( $file ) ) {
+			if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
+				$title = $image_meta['title'];
+			}
+			if ( trim( $image_meta['caption'] ) ) {
+				$content = $image_meta['caption'];
+			}
+		}
+
+		// Construct the attachment array
+		$attachment = array_merge(
+			array(
+				'post_mime_type' => $type,
+				'guid'           => $url,
+				'post_parent'    => $post_id,
+				'post_title'     => $title,
+				'post_content'   => $content,
+			), $post_data
+		);
+
+		// Save the data
+		$id = wp_insert_attachment( $attachment, $file, $post_id );
+		if ( ! is_wp_error( $id ) ) {
+			wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
+		}
+
+		return $id;
+	}
 
 
 }
\ No newline at end of file

Spacing +19 added lines, -19 removed lines

@@ -24,7 +24,7 @@ 
          * If the method changes to public, use Gravity Forms' method
          * @todo: If/when the method is public, remove the unneeded copied code.
          */
-        if( $reflection->isPublic() ) {
+        if ( $reflection->isPublic() ) {
             return parent::copy_post_image( $url, $post_id );
         }
 
@@ -42,7 +42,7 @@ 
         }
 
         //making sure there is a valid upload folder
-        if ( ! ( ( $upload_dir = wp_upload_dir( $time ) ) && false === $upload_dir['error'] ) ) {
+        if ( ! ( ( $upload_dir = wp_upload_dir( $time ) ) && false === $upload_dir[ 'error' ] ) ) {
             return false;
         }
 
@@ -57,17 +57,17 @@ 
          */
         $upload_dir = gf_apply_filters( 'gform_media_upload_path', $form_id, $upload_dir, $form_id, $post_id );
 
-        if ( ! file_exists( $upload_dir['path'] ) ) {
-            if ( ! wp_mkdir_p( $upload_dir['path'] ) ) {
+        if ( ! file_exists( $upload_dir[ 'path' ] ) ) {
+            if ( ! wp_mkdir_p( $upload_dir[ 'path' ] ) ) {
                 return false;
             }
         }
 
         $name     = basename( $url );
-        $filename = wp_unique_filename( $upload_dir['path'], $name );
+        $filename = wp_unique_filename( $upload_dir[ 'path' ], $name );
 
         // the destination path
-        $new_file = $upload_dir['path'] . "/$filename";
+        $new_file = $upload_dir[ 'path' ] . "/$filename";
 
         // the source path
         $y                = substr( $time, 0, 4 );
@@ -76,7 +76,7 @@ 
         $target_root_url  = RGFormsModel::get_upload_url( $form_id ) . "/$y/$m/";
         $upload_root_info = array( 'path' => $target_root, 'url' => $target_root_url );
         $upload_root_info = gf_apply_filters( 'gform_upload_path', $form_id, $upload_root_info, $form_id );
-        $path             = str_replace( $upload_root_info['url'], $upload_root_info['path'], $url );
+        $path             = str_replace( $upload_root_info[ 'url' ], $upload_root_info[ 'path' ], $url );
 
         // copy the file to the destination path
         if ( ! copy( $path, $new_file ) ) {
@@ -85,11 +85,11 @@ 
 
         // Set correct file permissions
         $stat  = stat( dirname( $new_file ) );
-        $perms = $stat['mode'] & 0000666;
+        $perms = $stat[ 'mode' ] & 0000666;
         @ chmod( $new_file, $perms );
 
         // Compute the URL
-        $url = $upload_dir['url'] . "/$filename";
+        $url = $upload_dir[ 'url' ] . "/$filename";
 
         if ( is_multisite() ) {
             delete_transient( 'dirsize_cache' );
@@ -97,7 +97,7 @@ 
 
         $type = wp_check_filetype( $new_file );
 
-        return array( 'file' => $new_file, 'url' => $url, 'type' => $type['type'] );
+        return array( 'file' => $new_file, 'url' => $url, 'type' => $type[ 'type' ] );
 
     }
 
@@ -124,7 +124,7 @@ 
          * If the method changes to public, use Gravity Forms' method
          * @todo: If/when the method is public, remove the unneeded copied code.
          */
-        if( $reflection->isPublic() ) {
+        if ( $reflection->isPublic() ) {
             return parent::media_handle_upload( $url, $post_id, $post_data );
         }
 
@@ -145,21 +145,21 @@ 
         }
 
         $name_parts = pathinfo( $name );
-        $name       = trim( substr( $name, 0, - ( 1 + strlen( $name_parts['extension'] ) ) ) );
+        $name       = trim( substr( $name, 0, - ( 1 + strlen( $name_parts[ 'extension' ] ) ) ) );
 
-        $url     = $file['url'];
-        $type    = $file['type'];
-        $file    = $file['file'];
+        $url     = $file[ 'url' ];
+        $type    = $file[ 'type' ];
+        $file    = $file[ 'file' ];
         $title   = $name;
         $content = '';
 
         // use image exif/iptc data for title and caption defaults if possible
         if ( $image_meta = @wp_read_image_metadata( $file ) ) {
-            if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
-                $title = $image_meta['title'];
+            if ( trim( $image_meta[ 'title' ] ) && ! is_numeric( sanitize_title( $image_meta[ 'title' ] ) ) ) {
+                $title = $image_meta[ 'title' ];
             }
-            if ( trim( $image_meta['caption'] ) ) {
-                $content = $image_meta['caption'];
+            if ( trim( $image_meta[ 'caption' ] ) ) {
+                $content = $image_meta[ 'caption' ];
             }
         }