gravityview / GravityView

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

Indentation +3 added lines, -3 removed lines

@@ -359,9 +359,9 @@
 
 		/**
 		 * @filter `gravityview/edit_entry/unset_hidden_field_values` Whether to delete values of fields hidden by conditional logic
-         * @since 1.22.2
-         * @param bool $unset_hidden_field_values Default: true
-         * @param GravityView_Edit_Entry_Render $this This object
+		 * @since 1.22.2
+		 * @param bool $unset_hidden_field_values Default: true
+		 * @param GravityView_Edit_Entry_Render $this This object
 		 */
 		$unset_hidden_field_values = apply_filters( 'gravityview/edit_entry/unset_hidden_field_values', true, $this );
 

Spacing +233 added lines, -233 removed lines

@@ -106,16 +106,16 @@ 
 	function load() {
 
 		/** @define "GRAVITYVIEW_DIR" "../../../" */
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' );
 
 		// Don't display an embedded form when editing an entry
 		add_action( 'wp_head', array( $this, 'prevent_render_form' ) );
 		add_action( 'wp_footer', array( $this, 'prevent_render_form' ) );
 
 		// Stop Gravity Forms processing what is ours!
-		add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 );
+		add_filter( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 );
 
-		add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') );
+		add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) );
 
 		add_action( 'gravityview_edit_entry', array( $this, 'init' ) );
 
@@ -126,7 +126,7 @@ 
 		add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 );
 
 		// Add fields expected by GFFormDisplay::validate()
-		add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') );
+		add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) );
 
 		// Fix multiselect value for GF 2.2
 		add_filter( 'gravityview/edit_entry/field_value_multiselect', array( $this, 'fix_multiselect_value_serialization' ), 10, 3 );
@@ -143,8 +143,8 @@ 
 	 * @return void
 	 */
 	public function prevent_render_form() {
-		if( $this->is_edit_entry() ) {
-			if( 'wp_head' === current_filter() ) {
+		if ( $this->is_edit_entry() ) {
+			if ( 'wp_head' === current_filter() ) {
 				add_filter( 'gform_shortcode_form', '__return_empty_string' );
 			} else {
 				remove_filter( 'gform_shortcode_form', '__return_empty_string' );
@@ -159,13 +159,13 @@ 
 	 */
 	public function prevent_maybe_process_form() {
 
-		if( ! empty( $_POST ) ) {
+		if ( ! empty( $_POST ) ) {
 			do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
 		}
 
-		if( $this->is_edit_entry_submission() ) {
-			remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
-			remove_action( 'wp',  array( 'GFForms', 'maybe_process_form'), 9 );
+		if ( $this->is_edit_entry_submission() ) {
+			remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 );
+			remove_action( 'wp', array( 'GFForms', 'maybe_process_form' ), 9 );
 		}
 	}
 
@@ -175,7 +175,7 @@ 
 	 */
 	public function is_edit_entry() {
 
-		$is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET['edit'] );
+		$is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET[ 'edit' ] );
 
 		return ( $is_edit_entry || $this->is_edit_entry_submission() );
 	}
@@ -186,7 +186,7 @@ 
 	 * @return boolean
 	 */
 	public function is_edit_entry_submission() {
-		return !empty( $_POST[ self::$nonce_field ] );
+		return ! empty( $_POST[ self::$nonce_field ] );
 	}
 
 	/**
@@ -197,15 +197,15 @@ 
 
 
 		$entries = $gravityview_view->getEntries();
-		self::$original_entry = $entries[0];
-		$this->entry = $entries[0];
+		self::$original_entry = $entries[ 0 ];
+		$this->entry = $entries[ 0 ];
 
 		self::$original_form = $gravityview_view->getForm();
 		$this->form = $gravityview_view->getForm();
 		$this->form_id = $gravityview_view->getFormId();
 		$this->view_id = $gravityview_view->getViewId();
 
-		self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] );
+		self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] );
 	}
 
 
@@ -226,14 +226,14 @@ 
 
 		// Multiple Views embedded, don't proceed if nonce fails
 		$multiple_views = defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? gravityview()->views->count() > 1 : $gv_data->has_multiple_views();
-		if( $multiple_views && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) {
-			do_action('gravityview_log_error', __METHOD__ . ': Nonce validation failed for the Edit Entry request; returning' );
+		if ( $multiple_views && ! wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ) ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ': Nonce validation failed for the Edit Entry request; returning' );
 			return;
 		}
 
 		// Sorry, you're not allowed here.
-		if( false === $this->user_can_edit_entry( true ) ) {
-			do_action('gravityview_log_error', __METHOD__ . ': User is not allowed to edit this entry; returning', $this->entry );
+		if ( false === $this->user_can_edit_entry( true ) ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ': User is not allowed to edit this entry; returning', $this->entry );
 			return;
 		}
 
@@ -253,9 +253,9 @@ 
 	private function print_scripts() {
 		$gravityview_view = GravityView_View::getInstance();
 
-		wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
+		wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
 
-		GFFormDisplay::enqueue_form_scripts($gravityview_view->getForm(), false);
+		GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false );
 
 		// Sack is required for images
 		wp_print_scripts( array( 'sack', 'gform_gravityforms' ) );
@@ -267,32 +267,32 @@ 
 	 */
 	private function process_save() {
 
-		if( empty( $_POST ) || ! isset( $_POST['lid'] ) ) {
+		if ( empty( $_POST ) || ! isset( $_POST[ 'lid' ] ) ) {
 			return;
 		}
 
 		// Make sure the entry, view, and form IDs are all correct
 		$valid = $this->verify_nonce();
 
-		if( !$valid ) {
-			do_action('gravityview_log_error', __METHOD__ . ' Nonce validation failed.' );
+		if ( ! $valid ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ' Nonce validation failed.' );
 			return;
 		}
 
-		if( $this->entry['id'] !== $_POST['lid'] ) {
-			do_action('gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' );
+		if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' );
 			return;
 		}
 
-		do_action('gravityview_log_debug', __METHOD__ . ': $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+		do_action( 'gravityview_log_debug', __METHOD__ . ': $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
 
 		$this->process_save_process_files( $this->form_id );
 
 		$this->validate();
 
-		if( $this->is_valid ) {
+		if ( $this->is_valid ) {
 
-			do_action('gravityview_log_debug', __METHOD__ . ': Submission is valid.' );
+			do_action( 'gravityview_log_debug', __METHOD__ . ': Submission is valid.' );
 
 			/**
 			 * @hack This step is needed to unset the adminOnly from form fields, to add the calculation fields
@@ -302,22 +302,22 @@ 
 			/**
 			 * @hack to avoid the capability validation of the method save_lead for GF 1.9+
 			 */
-			unset( $_GET['page'] );
+			unset( $_GET[ 'page' ] );
 
-			$date_created = $this->entry['date_created'];
+			$date_created = $this->entry[ 'date_created' ];
 
 			/**
 			 * @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead()
 			 * @since 1.17.2
 			 */
-			unset( $this->entry['date_created'] );
+			unset( $this->entry[ 'date_created' ] );
 
 			GFFormsModel::save_lead( $form, $this->entry );
 
 			// Delete the values for hidden inputs
 			$this->unset_hidden_field_values();
 			
-			$this->entry['date_created'] = $date_created;
+			$this->entry[ 'date_created' ] = $date_created;
 
 			// Process calculation fields
 			$this->update_calculation_fields();
@@ -337,10 +337,10 @@ 
 			 * @param string $entry_id Numeric ID of the entry that was updated
 			 * @param GravityView_Edit_Entry_Render $this This object
 			 */
-			do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this );
+			do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this );
 
 		} else {
-			do_action('gravityview_log_error', __METHOD__ . ': Submission is NOT valid.', $this->entry );
+			do_action( 'gravityview_log_error', __METHOD__ . ': Submission is NOT valid.', $this->entry );
 		}
 
 	} // process_save
@@ -365,16 +365,16 @@ 
 		 */
 		$unset_hidden_field_values = apply_filters( 'gravityview/edit_entry/unset_hidden_field_values', true, $this );
 
-		if( ! $unset_hidden_field_values ) {
+		if ( ! $unset_hidden_field_values ) {
 			return;
 		}
 
 		if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) {
 			$entry_meta_table = GFFormsModel::get_entry_meta_table_name();
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) );
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $entry_meta_table WHERE entry_id=%d", $this->entry[ 'id' ] ) );
 		} else {
 			$lead_detail_table = GFFormsModel::get_lead_details_table_name();
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) );
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) );
 		}
 
 		foreach ( $this->entry as $input_id => $field_value ) {
@@ -455,7 +455,7 @@ 
 		}
 
 		/** No file is being uploaded. */
-		if ( empty( $_FILES[ $input_name ]['name'] ) ) {
+		if ( empty( $_FILES[ $input_name ][ 'name' ] ) ) {
 			/** So return the original upload */
 			return $entry[ $input_id ];
 		}
@@ -473,11 +473,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;
 	}
@@ -492,22 +492,22 @@ 
 		$form = $this->form;
 
 		/** @var GF_Field $field */
-		foreach( $form['fields'] as $k => &$field ) {
+		foreach ( $form[ 'fields' ] as $k => &$field ) {
 
 			/**
 			 * Remove the fields with calculation formulas before save to avoid conflicts with GF logic
 			 * @since 1.16.3
 			 * @var GF_Field $field
 			 */
-			if( $field->has_calculation() ) {
-				unset( $form['fields'][ $k ] );
+			if ( $field->has_calculation() ) {
+				unset( $form[ 'fields' ][ $k ] );
 			}
 
 			$field->adminOnly = false;
 
-			if( isset( $field->inputs ) && is_array( $field->inputs ) ) {
-				foreach( $field->inputs as $key => $input ) {
-					$field->inputs[ $key ][ 'id' ] = (string)$input['id'];
+			if ( isset( $field->inputs ) && is_array( $field->inputs ) ) {
+				foreach ( $field->inputs as $key => $input ) {
+					$field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ];
 				}
 			}
 		}
@@ -521,21 +521,21 @@ 
 		$update = false;
 
 		// get the most up to date entry values
-		$entry = GFAPI::get_entry( $this->entry['id'] );
+		$entry = GFAPI::get_entry( $this->entry[ 'id' ] );
 
-		if( !empty( $this->fields_with_calculation ) ) {
+		if ( ! empty( $this->fields_with_calculation ) ) {
 			$update = true;
 			foreach ( $this->fields_with_calculation as $calc_field ) {
 				$inputs = $calc_field->get_entry_inputs();
 				if ( is_array( $inputs ) ) {
 					foreach ( $inputs as $input ) {
-						$input_name = 'input_' . str_replace( '.', '_', $input['id'] );
+						$input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] );
 						list( $prefix, $field_id, $input_id ) = rgexplode( '_', $input_name, 3 );
 
 						switch ( $input_id ) {
 							case 1:
 								/** Never void the labels. */
-								$value = $entry[ $input['id'] ];
+								$value = $entry[ $input[ 'id' ] ];
 								break;
 							case 2:
 								/** Always recalcualte the final price. */
@@ -543,25 +543,25 @@ 
 								break;
 							case 3:
 								/** Fetch the quantity form the request. */
-								$value = rgpost( $input_name, $entry[ $input['id'] ] );
+								$value = rgpost( $input_name, $entry[ $input[ 'id' ] ] );
 								break;
 						}
 
-						$entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, $value, $input_name, $entry['id'], $entry );
+						$entry[ strval( $input[ 'id' ] ) ] = RGFormsModel::prepare_value( $form, $calc_field, $value, $input_name, $entry[ 'id' ], $entry );
 					}
 				} else {
-					$input_name = 'input_' . str_replace( '.', '_', $calc_field->id);
-					$entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry );
+					$input_name = 'input_' . str_replace( '.', '_', $calc_field->id );
+					$entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry[ 'id' ], $entry );
 				}
 			}
 
 		}
 
-		if( $update ) {
+		if ( $update ) {
 
 			$return_entry = GFAPI::update_entry( $entry );
 
-			if( is_wp_error( $return_entry ) ) {
+			if ( is_wp_error( $return_entry ) ) {
 				do_action( 'gravityview_log_error', 'Updating the entry calculation fields failed', $return_entry );
 			} else {
 				do_action( 'gravityview_log_debug', 'Updating the entry calculation fields succeeded' );
@@ -592,18 +592,18 @@ 
 
 		$input_name = 'input_' . $field_id;
 
-		if ( !empty( $_FILES[ $input_name ]['name'] ) ) {
+		if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) {
 
 			// We have a new image
 
-			$value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] );
+			$value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] );
 
 			$ary = ! empty( $value ) ? explode( '|:|', $value ) : array();
 			$img_url = rgar( $ary, 0 );
 
-			$img_title	   = count( $ary ) > 1 ? $ary[1] : '';
-			$img_caption	 = count( $ary ) > 2 ? $ary[2] : '';
-			$img_description = count( $ary ) > 3 ? $ary[3] : '';
+			$img_title	   = count( $ary ) > 1 ? $ary[ 1 ] : '';
+			$img_caption	 = count( $ary ) > 2 ? $ary[ 2 ] : '';
+			$img_description = count( $ary ) > 3 ? $ary[ 3 ] : '';
 
 			$image_meta = array(
 				'post_excerpt' => $img_caption,
@@ -612,7 +612,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;
 			}
 
 			/**
@@ -627,13 +627,13 @@ 
 				set_post_thumbnail( $post_id, $media_id );
 			}
 
-		} elseif ( !empty( $_POST[ $input_name ] ) && is_array( $value ) ) {
+		} elseif ( ! empty( $_POST[ $input_name ] ) && is_array( $value ) ) {
 
 			$img_url = $_POST[ $input_name ];
 
-			$img_title	   = rgar( $_POST, $input_name.'_1' );
-			$img_caption	 = rgar( $_POST, $input_name .'_4' );
-			$img_description = rgar( $_POST, $input_name .'_7' );
+			$img_title	   = rgar( $_POST, $input_name . '_1' );
+			$img_caption	 = rgar( $_POST, $input_name . '_4' );
+			$img_description = rgar( $_POST, $input_name . '_7' );
 
 			$value = ! empty( $img_url ) ? $img_url . "|:|" . $img_title . "|:|" . $img_caption . "|:|" . $img_description : '';
 
@@ -671,16 +671,16 @@ 
 	 */
 	private function maybe_update_post_fields( $form ) {
 
-		if( empty( $this->entry['post_id'] ) ) {
+		if ( empty( $this->entry[ 'post_id' ] ) ) {
 			do_action( 'gravityview_log_debug', __METHOD__ . ': This entry has no post fields. Continuing...' );
 			return;
 		}
 
-		$post_id = $this->entry['post_id'];
+		$post_id = $this->entry[ 'post_id' ];
 
 		// Security check
-		if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
-			do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #'.$post_id );
+		if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
+			do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #' . $post_id );
 			return;
 		}
 
@@ -692,25 +692,25 @@ 
 
 			$field = RGFormsModel::get_field( $form, $field_id );
 
-			if( ! $field ) {
+			if ( ! $field ) {
 				continue;
 			}
 
-			if( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) {
+			if ( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) {
 
 				// Get the value of the field, including $_POSTed value
 				$value = RGFormsModel::get_field_value( $field );
 
 				// Use temporary entry variable, to make values available to fill_post_template() and update_post_image()
 				$entry_tmp = $this->entry;
-				$entry_tmp["{$field_id}"] = $value;
+				$entry_tmp[ "{$field_id}" ] = $value;
 
-				switch( $field->type ) {
+				switch ( $field->type ) {
 
 					case 'post_title':
 						$post_title = $value;
-						if( rgar( $form, 'postTitleTemplateEnabled' ) ) {
-							$post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
+						if ( rgar( $form, 'postTitleTemplateEnabled' ) ) {
+							$post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp );
 						}
 						$updated_post->post_title = $post_title;
 						$updated_post->post_name  = $post_title;
@@ -719,8 +719,8 @@ 
 
 					case 'post_content':
 						$post_content = $value;
-						if( rgar( $form, 'postContentTemplateEnabled' ) ) {
-							$post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
+						if ( rgar( $form, 'postContentTemplateEnabled' ) ) {
+							$post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true );
 						}
 						$updated_post->post_content = $post_content;
 						unset( $post_content );
@@ -738,12 +738,12 @@ 
 							$value = $value[ $field_id ];
 						}
 
-						if( ! empty( $field->customFieldTemplateEnabled ) ) {
+						if ( ! empty( $field->customFieldTemplateEnabled ) ) {
 							$value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
 						}
 
 						if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) {
-							$value = function_exists('wp_json_encode') ? wp_json_encode( $value ) : json_encode( $value );
+							$value = function_exists( 'wp_json_encode' ) ? wp_json_encode( $value ) : json_encode( $value );
 						}
 
 						update_post_meta( $post_id, $field->postCustomFieldName, $value );
@@ -756,7 +756,7 @@ 
 				}
 
 				// update entry after
-				$this->entry["{$field_id}"] = $value;
+				$this->entry[ "{$field_id}" ] = $value;
 
 				$update_entry = true;
 
@@ -765,25 +765,25 @@ 
 
 		}
 
-		if( $update_entry ) {
+		if ( $update_entry ) {
 
 			$return_entry = GFAPI::update_entry( $this->entry );
 
-			if( is_wp_error( $return_entry ) ) {
+			if ( is_wp_error( $return_entry ) ) {
 			   do_action( 'gravityview_log_error', 'Updating the entry post fields failed', array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) );
 			} else {
-				do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #'.$post_id.' succeeded' );
+				do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #' . $post_id . ' succeeded' );
 			}
 
 		}
 
 		$return_post = wp_update_post( $updated_post, true );
 
-		if( is_wp_error( $return_post ) ) {
+		if ( is_wp_error( $return_post ) ) {
 			$return_post->add_data( $updated_post, '$updated_post' );
 			do_action( 'gravityview_log_error', 'Updating the post content failed', compact( 'updated_post', 'return_post' ) );
 		} else {
-			do_action( 'gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded', $updated_post );
+			do_action( 'gravityview_log_debug', 'Updating the post content for post #' . $post_id . ' succeeded', $updated_post );
 		}
 	}
 
@@ -801,7 +801,7 @@ 
 		$input_type = RGFormsModel::get_input_type( $field );
 
 		// Only certain custom field types are supported
-		switch( $input_type ) {
+		switch ( $input_type ) {
 			case 'fileupload':
 			case 'list':
 			case 'multiselect':
@@ -838,7 +838,7 @@ 
 		$output = GFCommon::replace_variables( $output, $form, $entry, false, false, false );
 
 		// replace conditional shortcodes
-		if( $do_shortcode ) {
+		if ( $do_shortcode ) {
 			$output = do_shortcode( $output );
 		}
 
@@ -857,19 +857,19 @@ 
 	 */
 	private function after_update() {
 
-		do_action( 'gform_after_update_entry', $this->form, $this->entry['id'], self::$original_entry );
-		do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'], self::$original_entry );
+		do_action( 'gform_after_update_entry', $this->form, $this->entry[ 'id' ], self::$original_entry );
+		do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", $this->form, $this->entry[ 'id' ], self::$original_entry );
 
 		// Re-define the entry now that we've updated it.
-		$entry = RGFormsModel::get_lead( $this->entry['id'] );
+		$entry = RGFormsModel::get_lead( $this->entry[ 'id' ] );
 
 		$entry = GFFormsModel::set_entry_meta( $entry, $this->form );
 
 		if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '<' ) ) {
 			// 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 );
 			}
 		}
 
@@ -888,7 +888,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
@@ -904,7 +904,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>
@@ -950,20 +950,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)
@@ -973,7 +973,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 );
 			}
@@ -997,21 +997,21 @@ 
 		 */
 		do_action( 'gravityview/edit-entry/render/before', $this );
 
-		add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 );
-		add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') );
+		add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 );
+		add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
 		add_filter( 'gform_disable_view_counter', '__return_true' );
 
 		add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 );
 		add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 );
 
 		// We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
-		unset( $_GET['page'] );
+		unset( $_GET[ 'page' ] );
 
 		// TODO: Verify multiple-page forms
 
 		ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic
 
-		$html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
+		$html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry );
 
 		ob_get_clean();
 
@@ -1037,7 +1037,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 );
 	}
 
 
@@ -1057,10 +1057,10 @@ 
 	public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) {
 
 		// In case we have validated the form, use it to inject the validation results into the form render
-		if( isset( $this->form_after_validation ) ) {
+		if ( isset( $this->form_after_validation ) ) {
 			$form = $this->form_after_validation;
 		} else {
-			$form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id );
+			$form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id );
 		}
 
 		$form = $this->filter_conditional_logic( $form );
@@ -1068,8 +1068,8 @@ 
 		$form = $this->prefill_conditional_logic( $form );
 
 		// for now we don't support Save and Continue feature.
-		if( ! self::$supports_save_and_continue ) {
-			unset( $form['save'] );
+		if ( ! self::$supports_save_and_continue ) {
+			unset( $form[ 'save' ] );
 		}
 
 		return $form;
@@ -1090,29 +1090,29 @@ 
 	 */
 	public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) {
 
-		if( GFCommon::is_post_field( $field ) ) {
+		if ( GFCommon::is_post_field( $field ) ) {
 
 			$message = null;
 
 			// First, make sure they have the capability to edit the post.
-			if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
+			if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) {
 
 				/**
 				 * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
 				 * @param string $message The existing "You don't have permission..." text
 				 */
-				$message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
+				$message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don&rsquo;t have permission to edit this post.', 'gravityview' ) );
 
-			} elseif( null === get_post( $this->entry['post_id'] ) ) {
+			} elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) {
 				/**
 				 * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
 				 * @param string $message The existing "This field is not editable; the post no longer exists." text
 				 */
-				$message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
+				$message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) );
 			}
 
-			if( $message ) {
-				$field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
+			if ( $message ) {
+				$field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
 			}
 		}
 
@@ -1137,8 +1137,8 @@ 
 
 		// If the form has been submitted, then we don't need to pre-fill the values,
 		// Except for fileupload type and when a field input is overridden- run always!!
-		if(
-			( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) )
+		if (
+			( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) )
 			&& false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) )
 			&& ! GFCommon::is_product_field( $field->type )
 			|| ! empty( $field_content )
@@ -1158,7 +1158,7 @@ 
 		$return = null;
 
 		/** @var GravityView_Field $gv_field */
-		if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
+		if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
 			$return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
 		} else {
 			$return = $field->get_field_input( $this->form, $field_value, $this->entry );
@@ -1167,7 +1167,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 );
 		}
 
@@ -1192,7 +1192,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();
 
@@ -1201,10 +1201,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;
 				}
 
@@ -1212,7 +1212,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 {
 
@@ -1223,13 +1223,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 );
 			}
@@ -1257,7 +1257,7 @@ 
 		 * @param GF_Field $field Gravity Forms field object
 		 * @param GravityView_Edit_Entry_Render $this Current object
 		 */
-		$field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field, $this );
 
 		return $field_value;
 	}
@@ -1274,12 +1274,12 @@ 
 	 */
 	public function gform_pre_validation( $form ) {
 
-		if( ! $this->verify_nonce() ) {
+		if ( ! $this->verify_nonce() ) {
 			return $form;
 		}
 
 		// Fix PHP warning regarding undefined index.
-		foreach ( $form['fields'] as &$field) {
+		foreach ( $form[ 'fields' ] as &$field ) {
 
 			// This is because we're doing admin form pretending to be front-end, so Gravity Forms
 			// expects certain field array items to be set.
@@ -1287,7 +1287,7 @@ 
 				$field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
 			}
 
-			switch( RGFormsModel::get_input_type( $field ) ) {
+			switch ( RGFormsModel::get_input_type( $field ) ) {
 
 				/**
 				 * this whole fileupload hack is because in the admin, Gravity Forms simply doesn't update any fileupload field if it's empty, but it DOES in the frontend.
@@ -1301,37 +1301,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 {
@@ -1349,8 +1349,8 @@ 
 
 				case 'number':
 					// Fix "undefined index" issue at line 1286 in form_display.php
-					if( !isset( $_POST['input_'.$field->id ] ) ) {
-						$_POST['input_'.$field->id ] = NULL;
+					if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) {
+						$_POST[ 'input_' . $field->id ] = NULL;
 					}
 					break;
 			}
@@ -1392,7 +1392,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;
@@ -1400,14 +1400,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 );
 		remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'user_registration_validation' ), 10 );
 	}
 
@@ -1424,7 +1424,7 @@ 
 		$user_registration = GF_User_Registration::get_instance();
 
 		$entry = $this->get_entry();
-		$form = $validation_results['form'];
+		$form = $validation_results[ 'form' ];
 
 		if ( ! $feed = $user_registration->get_single_submission_feed( $entry, $form ) ) {
 			return $validation_results;
@@ -1440,18 +1440,18 @@ 
 		if ( $user_email != $value && email_exists( $value ) ) {
 			$email_field->failed_validation = 1;
 			$email_field->validation_message = __( 'This email is already in use', 'gravityview' );
-			$validation_results['is_valid'] = false;
+			$validation_results[ 'is_valid' ] = false;
 		}
 
 		$value = RGFormsModel::get_field_value( $username_field );
 		if ( $username != $value ) {
 			$username_field->failed_validation = 1;
 			$username_field->validation_message = __( 'Usernames cannot be changed', 'gravityview' );
-			$validation_results['is_valid'] = false;
+			$validation_results[ 'is_valid' ] = false;
 		}
 
 		// We'll need this result when rendering the form ( on GFFormDisplay::get_form )
-		$this->form_after_validation = $validation_results['form'];
+		$this->form_after_validation = $validation_results[ 'form' ];
 
 		return $validation_results;
 	}
@@ -1469,13 +1469,13 @@ 
 	 */
 	public function custom_validation( $validation_results ) {
 
-		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results );
+		do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results );
 
-		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+		do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
 
 		$gv_valid = true;
 
-		foreach ( $validation_results['form']['fields'] as $key => &$field ) {
+		foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) {
 
 			$value = RGFormsModel::get_field_value( $field );
 			$field_type = RGFormsModel::get_input_type( $field );
@@ -1488,35 +1488,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;
 						}
 
 					}
@@ -1527,7 +1527,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 ) );
 
@@ -1545,32 +1545,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;
@@ -1582,12 +1582,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;
 	}
@@ -1600,7 +1600,7 @@ 
 	 */
 	public function get_entry() {
 
-		if( empty( $this->entry ) ) {
+		if ( empty( $this->entry ) ) {
 			// Get the database value of the entry that's being edited
 			$this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() );
 		}
@@ -1635,10 +1635,10 @@ 
 		}
 
 		// If edit tab not yet configured, show all fields
-		$edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL;
+		$edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL;
 
 		// Hide fields depending on admin settings
-		$fields = $this->filter_fields( $form['fields'], $edit_fields );
+		$fields = $this->filter_fields( $form[ 'fields' ], $edit_fields );
 
 		// If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
 		$fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
@@ -1670,7 +1670,7 @@ 
 	 */
 	private function filter_fields( $fields, $configured_fields ) {
 
-		if( empty( $fields ) || !is_array( $fields ) ) {
+		if ( empty( $fields ) || ! is_array( $fields ) ) {
 			return $fields;
 		}
 
@@ -1683,18 +1683,18 @@ 
 
 			// Remove the fields that have calculation properties and keep them to be used later
 			// @since 1.16.2
-			if( $field->has_calculation() ) {
-				$this->fields_with_calculation[] = $field;
+			if ( $field->has_calculation() ) {
+				$this->fields_with_calculation[ ] = $field;
 				// don't remove the calculation fields on form render.
 			}
 
-			if( in_array( $field->type, $field_type_blacklist ) ) {
+			if ( in_array( $field->type, $field_type_blacklist ) ) {
 				unset( $fields[ $key ] );
 			}
 		}
 
 		// The Edit tab has not been configured, so we return all fields by default.
-		if( empty( $configured_fields ) ) {
+		if ( empty( $configured_fields ) ) {
 			return $fields;
 		}
 
@@ -1704,8 +1704,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;
 				}
 
@@ -1728,14 +1728,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' ] );
 		}
 
 		/**
@@ -1773,16 +1773,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;
 		}
 
@@ -1806,22 +1806,22 @@ 
 	 */
 	function prefill_conditional_logic( $form ) {
 
-		if( ! GFFormDisplay::has_conditional_logic( $form ) ) {
+		if ( ! GFFormDisplay::has_conditional_logic( $form ) ) {
 			return $form;
 		}
 
 		// Have Conditional Logic pre-fill fields as if the data were default values
 		/** @var GF_Field $field */
-		foreach ( $form['fields'] as &$field ) {
+		foreach ( $form[ 'fields' ] as &$field ) {
 
-			if( 'checkbox' === $field->type ) {
+			if ( 'checkbox' === $field->type ) {
 				foreach ( $field->get_entry_inputs() as $key => $input ) {
-					$input_id = $input['id'];
+					$input_id = $input[ 'id' ];
 					$choice = $field->choices[ $key ];
 					$value = rgar( $this->entry, $input_id );
 					$match = RGFormsModel::choice_value_match( $field, $choice, $value );
-					if( $match ) {
-						$field->choices[ $key ]['isSelected'] = true;
+					if ( $match ) {
+						$field->choices[ $key ][ 'isSelected' ] = true;
 					}
 				}
 			} else {
@@ -1829,15 +1829,15 @@ 
 				// We need to run through each field to set the default values
 				foreach ( $this->entry as $field_id => $field_value ) {
 
-					if( floatval( $field_id ) === floatval( $field->id ) ) {
+					if ( floatval( $field_id ) === floatval( $field->id ) ) {
 
-						if( 'list' === $field->type ) {
+						if ( 'list' === $field->type ) {
 							$list_rows = maybe_unserialize( $field_value );
 
 							$list_field_value = array();
-							foreach ( (array) $list_rows as $row ) {
-								foreach ( (array) $row as $column ) {
-									$list_field_value[] = $column;
+							foreach ( (array)$list_rows as $row ) {
+								foreach ( (array)$row as $column ) {
+									$list_field_value[ ] = $column;
 								}
 							}
 
@@ -1872,16 +1872,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;
 
@@ -1898,7 +1898,7 @@ 
 	 */
 	public function manage_conditional_logic( $has_conditional_logic, $form ) {
 
-		if( ! $this->is_edit_entry() ) {
+		if ( ! $this->is_edit_entry() ) {
 			return $has_conditional_logic;
 		}
 
@@ -1930,44 +1930,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 );
 
@@ -1975,13 +1975,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;
 	}
@@ -1998,20 +1998,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;
 
@@ -2029,15 +2029,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;
@@ -2051,17 +2051,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 );
 		}
 
 		/**