gravityview / GravityView

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

Braces +2 added lines, -4 removed lines

@@ -536,7 +536,7 @@ 
             // Display the success message
             if( rgpost('action') === 'update' ) {
 
-                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>";
@@ -1519,9 +1519,7 @@ 
         // Verify
         else if( ! $this->is_edit_entry() ) {
             $valid = false;
-        }
-
-        else {
+        } else {
             $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
         }
 

Indentation +1214 added lines, -1214 removed lines

@@ -1,27 +1,27 @@ 
 <?php
 /**
- * GravityView Edit Entry - render frontend
- *
- * @package   GravityView
- * @license   GPL2+
- * @author    Katz Web Services, Inc.
- * @link      http://gravityview.co
- * @copyright Copyright 2014, Katz Web Services, Inc.
- */
+	 * GravityView Edit Entry - render frontend
+	 *
+	 * @package   GravityView
+	 * @license   GPL2+
+	 * @author    Katz Web Services, Inc.
+	 * @link      http://gravityview.co
+	 * @copyright Copyright 2014, Katz Web Services, Inc.
+	 */
 
 if ( ! defined( 'WPINC' ) ) {
-    die;
+	die;
 }
 
 
 class GravityView_Edit_Entry_Render {
 
-    protected $loader;
+	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
@@ -41,124 +41,124 @@ 
 	 */
 	private static $supports_product_fields = false;
 
-    /**
-     * Gravity Forms entry array
-     *
-     * @var array
-     */
-    var $entry;
-
-    /**
-     * Gravity Forms form array
-     *
-     * @var array
-     */
-    var $form;
-
-    /**
-     * Gravity Forms form array after the form validation process
-     * @since 1.13
-     * @var array
-     */
-    var $form_after_validation = null;
-
-    /**
-     * Gravity Forms form id
-     *
-     * @var array
-     */
-    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
+	 *
+	 * @var array
+	 */
+	var $form;
+
+	/**
+	 * Gravity Forms form array after the form validation process
+	 * @since 1.13
+	 * @var array
+	 */
+	var $form_after_validation = null;
+
+	/**
+	 * Gravity Forms form id
+	 *
+	 * @var array
+	 */
+	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?
@@ -169,422 +169,422 @@ 
 		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];
+		$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();
+		$this->form = $gravityview_view->getForm();
+		$this->form_id = $gravityview_view->getFormId();
+		$this->view_id = $gravityview_view->getViewId();
 
-        self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] );
-    }
+		self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] );
+	}
 
 
-    /**
-     * Load required files and trigger edit flow
-     *
-     * Run when the is_edit_entry returns true.
-     *
-     * @param GravityView_View_Data $gv_data GravityView Data object
-     * @return void
-     */
-    function init( $gv_data ) {
+	/**
+	 * Load required files and trigger edit flow
+	 *
+	 * Run when the is_edit_entry returns true.
+	 *
+	 * @param GravityView_View_Data $gv_data GravityView Data object
+	 * @return void
+	 */
+	function init( $gv_data ) {
 
-        require_once( GFCommon::get_base_path() . '/form_display.php' );
-        require_once( GFCommon::get_base_path() . '/entry_detail.php' );
+		require_once( GFCommon::get_base_path() . '/form_display.php' );
+		require_once( GFCommon::get_base_path() . '/entry_detail.php' );
 
-        $this->setup_vars();
+		$this->setup_vars();
 
-        // Multiple Views embedded, don't proceed if nonce fails
-        if( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) {
-            return;
-        }
+		// Multiple Views embedded, don't proceed if nonce fails
+		if( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) {
+			return;
+		}
 
-        // Sorry, you're not allowed here.
-        if( false === $this->user_can_edit_entry( true ) ) {
-            return;
-        }
+		// Sorry, you're not allowed here.
+		if( false === $this->user_can_edit_entry( true ) ) {
+			return;
+		}
 
-        $this->print_scripts();
+		$this->print_scripts();
 
-        $this->process_save();
+		$this->process_save();
 
-        $this->edit_entry_form();
+		$this->edit_entry_form();
 
-    }
+	}
 
 
-    /**
-     * Force Gravity Forms to output scripts as if it were in the admin
-     * @return void
-     */
-    function print_scripts() {
-        $gravityview_view = GravityView_View::getInstance();
+	/**
+	 * Force Gravity Forms to output scripts as if it were in the admin
+	 * @return void
+	 */
+	function print_scripts() {
+		$gravityview_view = GravityView_View::getInstance();
 
-        wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
+		wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
 
-        GFFormDisplay::enqueue_form_scripts($gravityview_view->getForm(), false);
+		GFFormDisplay::enqueue_form_scripts($gravityview_view->getForm(), false);
 
-        // Sack is required for images
-        wp_print_scripts( array( 'sack', 'gform_gravityforms' ) );
-    }
+		// Sack is required for images
+		wp_print_scripts( array( 'sack', 'gform_gravityforms' ) );
+	}
 
 
-    /**
-     * Process edit entry form save
-     */
-    function process_save() {
+	/**
+	 * Process edit entry form save
+	 */
+	function process_save() {
 
-        if( empty( $_POST ) ) {
-            return;
-        }
+		if( empty( $_POST ) ) {
+			return;
+		}
 
-        // Make sure the entry, view, and form IDs are all correct
-        $valid = $this->verify_nonce();
+		// Make sure the entry, view, and form IDs are all correct
+		$valid = $this->verify_nonce();
 
-        if( !$valid ) {
-            do_action('gravityview_log_error', __METHOD__ . ' Nonce validation failed.' );
-            return;
-        }
+		if( !$valid ) {
+			do_action('gravityview_log_error', __METHOD__ . ' Nonce validation failed.' );
+			return;
+		}
 
-        if( $this->entry['id'] !== $_POST['lid'] ) {
-            do_action('gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' );
-            return;
-        }
+		if( $this->entry['id'] !== $_POST['lid'] ) {
+			do_action('gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' );
+			return;
+		}
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
 
-        $this->process_save_process_files( $this->form_id );
+		$this->process_save_process_files( $this->form_id );
 
-        $this->validate();
+		$this->validate();
 
-        if( $this->is_valid ) {
+		if( $this->is_valid ) {
 
-            do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.' );
+			do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.' );
 
-            /**
-             * @hack This step is needed to unset the adminOnly from form fields
-             */
-            $form = $this->form_prepare_for_save();
+			/**
+			 * @hack This step is needed to unset the adminOnly from form fields
+			 */
+			$form = $this->form_prepare_for_save();
 
-            /**
-             * @hack to avoid the capability validation of the method save_lead for GF 1.9+
-             */
-            unset( $_GET['page'] );
+			/**
+			 * @hack to avoid the capability validation of the method save_lead for GF 1.9+
+			 */
+			unset( $_GET['page'] );
 
-            GFFormsModel::save_lead( $form, $this->entry );
+			GFFormsModel::save_lead( $form, $this->entry );
 
-            // If there's a post associated with the entry, process post fields
-            if( !empty( $this->entry['post_id'] ) ) {
-                $this->maybe_update_post_fields( $form );
-            }
+			// If there's a post associated with the entry, process post fields
+			if( !empty( $this->entry['post_id'] ) ) {
+				$this->maybe_update_post_fields( $form );
+			}
 
-            // Perform actions normally performed after updating a lead
-            $this->after_update();
+			// Perform actions normally performed after updating a lead
+			$this->after_update();
 
-            /**
-             * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry
-             * @param array $form Gravity Forms form array
-             * @param string $entry_id Numeric ID of the entry that was updated
-             */
-            do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'] );
-        }
+			/**
+			 * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry
+			 * @param array $form Gravity Forms form array
+			 * @param string $entry_id Numeric ID of the entry that was updated
+			 */
+			do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'] );
+		}
 
-    } // process_save
+	} // process_save
 
 
-    /**
-     * Have GF handle file uploads
-     *
-     * Copy of code from GFFormDisplay::process_form()
-     *
-     * @param int $form_id
-     */
-    function process_save_process_files( $form_id ) {
+	/**
+	 * Have GF handle file uploads
+	 *
+	 * Copy of code from GFFormDisplay::process_form()
+	 *
+	 * @param int $form_id
+	 */
+	function process_save_process_files( $form_id ) {
 
-        //Loading files that have been uploaded to temp folder
-        $files = GFCommon::json_decode( stripslashes( RGForms::post( 'gform_uploaded_files' ) ) );
-        if ( ! is_array( $files ) ) {
-            $files = array();
-        }
+		//Loading files that have been uploaded to temp folder
+		$files = GFCommon::json_decode( stripslashes( RGForms::post( 'gform_uploaded_files' ) ) );
+		if ( ! is_array( $files ) ) {
+			$files = array();
+		}
 
-        RGFormsModel::$uploaded_files[ $form_id ] = $files;
-    }
+		RGFormsModel::$uploaded_files[ $form_id ] = $files;
+	}
 
-    /**
-     * Remove max_files validation (done on gravityforms.js) to avoid conflicts with GravityView
-     * Late validation done on self::custom_validation
-     *
-     * @param $plupload_init array Plupload settings
-     * @param $form_id
-     * @param $instance
-     * @return mixed
-     */
-    public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) {
-        if( ! $this->is_edit_entry() ) {
-            return $plupload_init;
-        }
+	/**
+	 * Remove max_files validation (done on gravityforms.js) to avoid conflicts with GravityView
+	 * Late validation done on self::custom_validation
+	 *
+	 * @param $plupload_init array Plupload settings
+	 * @param $form_id
+	 * @param $instance
+	 * @return mixed
+	 */
+	public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) {
+		if( ! $this->is_edit_entry() ) {
+			return $plupload_init;
+		}
 
-        $plupload_init['gf_vars']['max_files'] = 0;
+		$plupload_init['gf_vars']['max_files'] = 0;
 
-        return $plupload_init;
-    }
+		return $plupload_init;
+	}
 
 
-    /**
-     * Unset adminOnly and convert field input key to string
-     * @return array $form
-     */
-    private function form_prepare_for_save() {
-        $form = $this->form;
+	/**
+	 * Unset adminOnly and convert field input key to string
+	 * @return array $form
+	 */
+	private function form_prepare_for_save() {
+		$form = $this->form;
 
-        foreach( $form['fields'] as &$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 );
 
-                // Convert the field object in 1.9 to an array for backward compatibility
-                $field_array = GVCommon::get_field_array( $field );
+				// Convert the field object in 1.9 to an array for backward compatibility
+				$field_array = GVCommon::get_field_array( $field );
 
-                switch( $field_array['type'] ) {
+				switch( $field_array['type'] ) {
 
-                    case 'post_title':
-                    case 'post_content':
-                    case 'post_excerpt':
-                        $updated_post->{$field_array['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_array['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 );
 
-                        // prepare value to be saved in the entry
-                        $field = GFCommon::add_categories_as_choices( $field, '' );
+						// prepare value to be saved in the entry
+						$field = GFCommon::add_categories_as_choices( $field, '' );
 
-                        // 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_array['postCustomFieldName'];
+						$input_type = RGFormsModel::get_input_type( $field );
+						$custom_field_name = $field_array['postCustomFieldName'];
 
-                        // Only certain custom field types are supported
-                        if( !in_array( $input_type, array( 'list', 'fileupload' ) ) ) {
-                            update_post_meta( $post_id, $custom_field_name, $value );
-                        }
+						// Only certain custom field types are supported
+						if( !in_array( $input_type, array( 'list', 'fileupload' ) ) ) {
+							update_post_meta( $post_id, $custom_field_name, $value );
+						}
 
-                        break;
+						break;
 
-                    case 'post_image':
+					case 'post_image':
 
-                        $value = '';
-                        break;
+						$value = '';
+						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 ) ) {
-            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' );
-        }
+		if( is_wp_error( $return_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' );
+		}
 
-    }
+	}
 
-    /**
-     * 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() {
 
-        $back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) );
+		$back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) );
 
-        ?>
+		?>
 
         <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
 
-            // Display the success message
-            if( rgpost('action') === 'update' ) {
+			// Display the success message
+			if( rgpost('action') === 'update' ) {
 
-                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);
+					// 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' );
+					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>' );
+				} 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 );
+					/**
+					 * @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 );
-                }
+					echo GVCommon::generate_notice( $message );
+				}
 
-            }
+			}
 
-            ?>
+			?>
 
             <?php // The ID of the form needs to be `gform_{form_id}` for the pluploader ?>
 
@@ -592,590 +592,590 @@ 
 
                 <?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 );
 
-                // Most of this is needed for GFFormDisplay::validate(), but `gform_unique_id` is needed for file cleanup.
+				// Most of this is needed for GFFormDisplay::validate(), but `gform_unique_id` is needed for file cleanup.
 
-                ?>
+				?>
 
 
                 <?php
 
-                /**
-                 * By default, the lead_detail_edit method uses the `RGFormsModel::get_lead_field_value()` method, which doesn't fill in $_POST values when there is a validation error, because it was designed to work in the admin. We want to use the `RGFormsModel::get_field_value()` If the form has been submitted, use the values for the fields.
-                 */
-                //add_filter( 'gform_get_field_value', array( $this, 'get_field_value' ), 10, 3 );
+				/**
+				 * By default, the lead_detail_edit method uses the `RGFormsModel::get_lead_field_value()` method, which doesn't fill in $_POST values when there is a validation error, because it was designed to work in the admin. We want to use the `RGFormsModel::get_field_value()` If the form has been submitted, use the values for the fields.
+				 */
+				//add_filter( 'gform_get_field_value', array( $this, 'get_field_value' ), 10, 3 );
 
-                // Print the actual form HTML
-                $this->render_edit_form();
+				// Print the actual form HTML
+				$this->render_edit_form();
 
-                //echo $this->render_form_buttons();
+				//echo $this->render_form_buttons();
 
-                ?>
+				?>
             </form>
 
         </div>
 
     <?php
-    }
-
-    /**
-     * 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, '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, '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;
-    }
-
-
-    /**
-     *
-     * Fill-in the saved values into the form inputs
-     *
-     * @param string $field_content Always empty.
-     * @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 ) {
-
-        // If the form has been submitted, then we don't need to pre-fill the values,
-        // Except for fileupload type - run always!!
-        if(
-	        $this->is_edit_entry_submission() && 'fileupload' !== $field->type
-        ||  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 );
-        }
-
-        /**
-         * @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 ( ! empty( $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;
-                }
-
-            }
-
-            $pre_value = $field->get_value_submission( array(), false );
-
-            $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !empty( $pre_value ) ) ? $field_value : $pre_value;
-
-        } else {
-
-            $id = intval( $field->id );
-
-            // get pre-populated value if exists
-            $pre_value = $field->allowsPrepopulate ? GFFormsModel::get_parameter_value( $field->inputName, array(), $field ) : '';
-
-            // saved field entry value (if empty, fallback to the pre-populated value, if exists)
-            // or pre-populated value if not empty and set to override saved value
-            $field_value = !empty( $this->entry[ $id ] ) && ! ( $override_saved_value && !empty( $pre_value ) ) ? $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 && !empty( $field_value ) ) {
-                $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 );
-            }
+	}
 
-        }
+	/**
+	 * 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() {
 
-        // if value is empty get the default value if defined
-        $field_value = $field->get_value_default_if_empty( $field_value );
-
-        /**
-         * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
-         * @since 1.11
-         * @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();
-
-	    $return = $field->get_field_input( $this->form, $field_value, $this->entry );
-
-	    // If there was output, it's an error
-	    $warnings = ob_get_clean();
+		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, 'modify_edit_field_input' ), 10, 5 );
 
-	    if( !empty( $warnings ) ) {
-		    do_action( 'gravityview_log_error', __METHOD__ . $warnings, $field_value );
-	    }
+		// We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
+		unset( $_GET['page'] );
 
-        /**
-         * 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'] );
+		// 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
 
-        return $return;
-    }
+		$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, 'modify_edit_field_input' ), 10 );
 
-    /**
-     * Get the posted values from the edit form submission
-     *
-     * @hack
-     * @uses GFFormsModel::get_field_value()
-     * @param  mixed $value Existing field value, before edit
-     * @param  array $lead  Gravity Forms entry array
-     * @param  array $field Gravity Forms field array
-     * @return string        [description]
-     */
-    public function get_field_value( $value, $lead, $field ) {
+		echo $html;
+	}
 
-        // The form's not being edited; use the original value
-        if( ! $this->is_edit_entry_submission() ) {
-            return $value;
-        }
+	/**
+	 * Display the Update/Cancel/Delete buttons for the Edit Entry form
+	 * @since 1.8
+	 * @return string
+	 */
+	public function render_form_buttons() {
+		return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this );
+	}
 
-        return GFFormsModel::get_field_value( $field, $lead, true );
-    }
 
+	/**
+	 * 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'] );
+		}
 
-    // ---- Entry validation
+		return $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;
-        }
+	/**
+	 *
+	 * Fill-in the saved values into the form inputs
+	 *
+	 * @param string $field_content Always empty.
+	 * @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 ) {
+
+		// If the form has been submitted, then we don't need to pre-fill the values,
+		// Except for fileupload type - run always!!
+		if(
+			$this->is_edit_entry_submission() && 'fileupload' !== $field->type
+		||  GFCommon::is_product_field( $field->type ) // Prevent product fields from appearing editable
+		) {
+			return $field_content;
+		}
 
-        // Fix PHP warning regarding undefined index.
-        foreach ( $form['fields'] as &$field) {
+		// Turn on Admin-style display for file upload fields only
+		if( 'fileupload' === $field->type ) {
+			$_GET['page'] = 'gf_entries';
+		}
 
-            // 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;
-            }
+		// 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 );
+		}
+
+		/**
+		 * @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 ( ! empty( $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;
+				}
+
+			}
+
+			$pre_value = $field->get_value_submission( array(), false );
+
+			$field_value = ! $allow_pre_populated && ! ( $override_saved_value && !empty( $pre_value ) ) ? $field_value : $pre_value;
+
+		} else {
+
+			$id = intval( $field->id );
+
+			// get pre-populated value if exists
+			$pre_value = $field->allowsPrepopulate ? GFFormsModel::get_parameter_value( $field->inputName, array(), $field ) : '';
+
+			// saved field entry value (if empty, fallback to the pre-populated value, if exists)
+			// or pre-populated value if not empty and set to override saved value
+			$field_value = !empty( $this->entry[ $id ] ) && ! ( $override_saved_value && !empty( $pre_value ) ) ? $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 && !empty( $field_value ) ) {
+				$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 );
+			}
+
+		}
 
-            // unset emailConfirmEnabled for email type fields
-           /* if( 'email' === $field['type'] && !empty( $field['emailConfirmEnabled'] ) ) {
+		// if value is empty get the default value if defined
+		$field_value = $field->get_value_default_if_empty( $field_value );
+
+		/**
+		 * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
+		 * @since 1.11
+		 * @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();
+
+		$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;
+	}
+
+
+	/**
+	 * Get the posted values from the edit form submission
+	 *
+	 * @hack
+	 * @uses GFFormsModel::get_field_value()
+	 * @param  mixed $value Existing field value, before edit
+	 * @param  array $lead  Gravity Forms entry array
+	 * @param  array $field Gravity Forms field array
+	 * @return string        [description]
+	 */
+	public function get_field_value( $value, $lead, $field ) {
+
+		// The form's not being edited; use the original value
+		if( ! $this->is_edit_entry_submission() ) {
+			return $value;
+		}
+
+		return GFFormsModel::get_field_value( $field, $lead, true );
+	}
+
+
+
+
+	// ---- 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 ) {
+
+		if( ! $this->verify_nonce() ) {
+			return $form;
+		}
+
+		// Fix PHP warning regarding undefined index.
+		foreach ( $form['fields'] as &$field) {
+
+			// This is because we're doing admin form pretending to be front-end, so Gravity Forms
+			// expects certain field array items to be set.
+			foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) {
+				$field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
+			}
+
+			// 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':
-                case 'post_image':
+				/**
+				 * 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':
+				case 'post_image':
 
-                    // Set the previous value
-                    $entry = $this->get_entry();
+					// 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;
+					$value = NULL;
 
-                    // Use the previous entry value as the default.
-                    if( isset( $entry[ $field->id ] ) ) {
-                        $value = $entry[ $field->id ];
-                    }
+					// Use the previous entry value as the default.
+					if( isset( $entry[ $field->id ] ) ) {
+						$value = $entry[ $field->id ];
+					}
 
-                    // If this is a single upload file
-                    if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
-                        $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
-                        $value = $file_path['url'];
+					// If this is a single upload file
+					if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
+						$file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
+						$value = $file_path['url'];
 
-                    } else {
+					} 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' => '' );
+						// 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( 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 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());
-                        }
+							$value = empty( $value ) ? '[]' : $value;
+							$value = stripslashes_deep( $value );
+							$value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
+						}
 
-                    } else {
+					} else {
 
-                        // A file already exists when editing an entry
-                        // We set this to solve issue when file upload fields are required.
-                        GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
+						// 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;
 
-                    }
+					}
 
-                    $_POST[ $input_name ] = $value;
+					$_POST[ $input_name ] = $value;
 
-                    break;
-                case 'number':
-                    // Fix "undefined index" issue at line 1286 in form_display.php
-                    if( !isset( $_POST['input_'.$field->id ] ) ) {
-                        $_POST['input_'.$field->id ] = NULL;
-                    }
-                    break;
-                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;
-            }
+					break;
+				case 'number':
+					// Fix "undefined index" issue at line 1286 in form_display.php
+					if( !isset( $_POST['input_'.$field->id ] ) ) {
+						$_POST['input_'.$field->id ] = NULL;
+					}
+					break;
+				case 'captcha':
+					// Fix issue with recaptcha_check_answer() on line 1458 in form_display.php
+					$_POST['recaptcha_challenge_field'] = NULL;
+					$_POST['recaptcha_response_field'] = NULL;
+					break;
+			}
 
-        }
+		}
 
-        return $form;
-    }
+		return $form;
+	}
 
 
-    /**
-     * Process validation for a edit entry submission
-     *
-     * Sets the `is_valid` object var
-     *
-     * @return void
-     */
-    function validate() {
+	/**
+	 * 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
-        if ( class_exists( 'GFUser' ) ) {
-            remove_filter( 'gform_validation', array( 'GFUser', 'user_registration_validation' ) );
-        }
+		// If using GF User Registration Add-on, remove the validation step, otherwise generates error when updating the entry
+		if ( class_exists( 'GFUser' ) ) {
+			remove_filter( 'gform_validation', array( 'GFUser', 'user_registration_validation' ) );
+		}
 
-        /**
-         * For some crazy reason, Gravity Forms doesn't validate Edit Entry form submissions.
-         * You can enter whatever you want!
-         * We try validating, and customize the results using `self::custom_validation()`
-         */
-        add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4);
+		/**
+		 * For some crazy reason, Gravity Forms doesn't validate Edit Entry form submissions.
+		 * You can enter whatever you want!
+		 * We try validating, and customize the results using `self::custom_validation()`
+		 */
+		add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4);
 
-        // Needed by the validate funtion
-        $failed_validation_page = NULL;
-        $field_values = RGForms::post( 'gform_field_values' );
+		// Needed by the validate funtion
+		$failed_validation_page = NULL;
+		$field_values = RGForms::post( 'gform_field_values' );
 
-        // Prevent entry limit from running when editing an entry, also
-        // prevent form scheduling from preventing editing
-        unset( $this->form['limitEntries'], $this->form['scheduleForm'] );
+		// 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 );
+		// Hide fields depending on Edit Entry settings
+		$this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id );
 
-        $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page );
+		$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 );
+	}
 
 
-    /**
-     * 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 ) {
+	/**
+	 * Make validation work for Edit Entry
+	 *
+	 * Because we're calling the GFFormDisplay::validate() in an unusual way (as a front-end
+	 * form pretending to be a back-end form), validate() doesn't know we _can't_ edit post
+	 * fields. This goes through all the fields and if they're an invalid post field, we
+	 * set them as valid. If there are still issues, we'll return false.
+	 *
+	 * @param  [type] $validation_results [description]
+	 * @return [type]                     [description]
+	 */
+	function custom_validation( $validation_results ) {
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results );
+		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results );
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
 
-        $gv_valid = true;
+		$gv_valid = true;
 
-        foreach ( $validation_results['form']['fields'] as $key => &$field ) {
+		foreach ( $validation_results['form']['fields'] as $key => &$field ) {
 
-            $value = RGFormsModel::get_field_value( $field );
-            $field_type = RGFormsModel::get_input_type( $field );
+			$value = RGFormsModel::get_field_value( $field );
+			$field_type = RGFormsModel::get_input_type( $field );
 
-            // Validate always
-            switch ( $field_type ) {
+			// Validate always
+			switch ( $field_type ) {
 
 
-                case 'fileupload' :
+				case 'fileupload' :
 
-                    // in case nothing is uploaded but there are already files saved
-                    if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
-                        $field->failed_validation = false;
-                        unset( $field->validation_message );
-                    }
+					// in case nothing is uploaded but there are already files saved
+					if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
+						$field->failed_validation = false;
+						unset( $field->validation_message );
+					}
 
-                    // validate if multi file upload reached max number of files [maxFiles] => 2
-                    if( rgar( $field, 'maxFiles') && rgar( $field, 'multipleFiles') ) {
+					// validate if multi file upload reached max number of files [maxFiles] => 2
+					if( rgar( $field, 'maxFiles') && rgar( $field, 'multipleFiles') ) {
 
-                        $input_name = 'input_' . $field->id;
-                        //uploaded
-                        $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
+						$input_name = 'input_' . $field->id;
+						//uploaded
+						$file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
 
-                        //existent
-                        $entry = $this->get_entry();
-                        $value = NULL;
-                        if( isset( $entry[ $field->id ] ) ) {
-                            $value = json_decode( $entry[ $field->id ], true );
-                        }
+						//existent
+						$entry = $this->get_entry();
+						$value = NULL;
+						if( isset( $entry[ $field->id ] ) ) {
+							$value = json_decode( $entry[ $field->id ], true );
+						}
 
-                        // count uploaded files and existent entry files
-                        $count_files = count( $file_names ) + count( $value );
+						// count uploaded files and existent entry files
+						$count_files = count( $file_names ) + count( $value );
 
-                        if( $count_files > $field->maxFiles ) {
-                            $field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
-                            $field->failed_validation = 1;
-                            $gv_valid = false;
+						if( $count_files > $field->maxFiles ) {
+							$field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
+							$field->failed_validation = 1;
+							$gv_valid = false;
 
-                            // in case of error make sure the newest upload files are removed from the upload input
-                            GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
-                        }
+							// in case of error make sure the newest upload files are removed from the upload input
+							GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
+						}
 
-                    }
+					}
 
 
-                    break;
+					break;
 
-            }
+			}
 
-            // This field has failed validation.
-            if( !empty( $field->failed_validation ) ) {
+			// This field has failed validation.
+			if( !empty( $field->failed_validation ) ) {
 
-                do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'field' => $field, 'value' => $value ) );
+				do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'field' => $field, 'value' => $value ) );
 
-                switch ( $field_type ) {
+				switch ( $field_type ) {
 
-                    // Captchas don't need to be re-entered.
-                    case 'captcha':
+					// Captchas don't need to be re-entered.
+					case 'captcha':
 
-                        // Post Image fields aren't editable, so we un-fail them.
-                    case 'post_image':
-                        $field->failed_validation = false;
-                        unset( $field->validation_message );
-                        break;
+						// Post Image fields aren't editable, so we un-fail them.
+					case 'post_image':
+						$field->failed_validation = false;
+						unset( $field->validation_message );
+						break;
 
-                }
+				}
 
-                // You can't continue inside a switch, so we do it after.
-                if( empty( $field->failed_validation ) ) {
-                    continue;
-                }
+				// You can't continue inside a switch, so we do it after.
+				if( empty( $field->failed_validation ) ) {
+					continue;
+				}
 
-                // checks if the No Duplicates option is not validating entry against itself, since
-                // we're editing a stored entry, it would also assume it's a duplicate.
-                if( !empty( $field->noDuplicates ) ) {
+				// checks if the No Duplicates option is not validating entry against itself, since
+				// we're editing a stored entry, it would also assume it's a duplicate.
+				if( !empty( $field->noDuplicates ) ) {
 
-                    $entry = $this->get_entry();
+					$entry = $this->get_entry();
 
-                    // If the value of the entry is the same as the stored value
-                    // Then we can assume it's not a duplicate, it's the same.
-                    if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
-                        //if value submitted was not changed, then don't validate
-                        $field->failed_validation = false;
+					// If the value of the entry is the same as the stored value
+					// Then we can assume it's not a duplicate, it's the same.
+					if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
+						//if value submitted was not changed, then don't validate
+						$field->failed_validation = false;
 
-                        unset( $field->validation_message );
+						unset( $field->validation_message );
 
-                        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry );
+						do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry );
 
-                        continue;
-                    }
-                }
+						continue;
+					}
+				}
 
-                // if here then probably we are facing the validation 'At least one field must be filled out'
-                if( GFFormDisplay::is_empty( $field, $this->form_id  ) && empty( $field->isRequired ) ) {
-                    unset( $field->validation_message );
-	                $field->validation_message = false;
-                    continue;
-                }
+				// if here then probably we are facing the validation 'At least one field must be filled out'
+				if( GFFormDisplay::is_empty( $field, $this->form_id  ) && empty( $field->isRequired ) ) {
+					unset( $field->validation_message );
+					$field->validation_message = false;
+					continue;
+				}
 
-                $gv_valid = false;
+				$gv_valid = false;
 
-            }
+			}
 
-        }
+		}
 
-        $validation_results['is_valid'] = $gv_valid;
+		$validation_results['is_valid'] = $gv_valid;
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results );
+		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results );
 
-        // We'll need this result when rendering the form ( on GFFormDisplay::get_form )
-        $this->form_after_validation = $validation_results['form'];
+		// We'll need this result when rendering the form ( on GFFormDisplay::get_form )
+		$this->form_after_validation = $validation_results['form'];
 
-        return $validation_results;
-    }
+		return $validation_results;
+	}
 
 
-    /**
-     * TODO: This seems to be hacky... we should remove it. Entry is set when updating the form using setup_vars()!
-     * Get the current entry and set it if it's not yet set.
-     * @return array Gravity Forms entry array
-     */
-    private function get_entry() {
+	/**
+	 * TODO: This seems to be hacky... we should remove it. Entry is set when updating the form using setup_vars()!
+	 * Get the current entry and set it if it's not yet set.
+	 * @return array Gravity Forms entry array
+	 */
+	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() );
-        }
+		if( empty( $this->entry ) ) {
+			// Get the database value of the entry that's being edited
+			$this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() );
+		}
 
-        return $this->entry;
-    }
+		return $this->entry;
+	}
 
 
 
-    // --- Filters
+	// --- Filters
 
-    /**
-     * Get the Edit Entry fields as configured in the View
-     *
-     * @since 1.8
-     *
-     * @param int $view_id
-     *
-     * @return array Array of fields that are configured in the Edit tab in the Admin
-     */
-    private function get_configured_edit_fields( $form, $view_id ) {
+	/**
+	 * Get the Edit Entry fields as configured in the View
+	 *
+	 * @since 1.8
+	 *
+	 * @param int $view_id
+	 *
+	 * @return array Array of fields that are configured in the Edit tab in the Admin
+	 */
+	private function get_configured_edit_fields( $form, $view_id ) {
 
-        // Get all fields for form
-        $properties = GravityView_View_Data::getInstance()->get_fields( $view_id );
+		// Get all fields for form
+		$properties = GravityView_View_Data::getInstance()->get_fields( $view_id );
 
-        // If edit tab not yet configured, show all fields
-        $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL;
+		// If edit tab not yet configured, show all fields
+		$edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL;
 
-	    // Show hidden fields as text fields
-	    $form = $this->fix_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
@@ -1199,364 +1199,364 @@ 
 	}
 
 
-    /**
-     * Filter area fields based on specified conditions
-     *
-     * @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
-        foreach ( $fields as $key => $field ) {
-            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'] ) ) {
-            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;
-
-        }
+	/**
+	 * Filter area fields based on specified conditions
+	 *
+	 * @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
+		foreach ( $fields as $key => $field ) {
+			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'] ) ) {
+			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;
+		}
 
-        if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) {
+		return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form );
 
-            $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');
-            }
+	// --- 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 ) {
 
-        if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
-            $error = __( 'You do not have permission to edit this entry.', 'gravityview');
-        }
+		$error = NULL;
 
-        if( $this->entry['status'] === 'trash' ) {
-            $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' );
-        }
+		/**
+		 *  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'] ) ) {
 
-        // No errors; everything's fine here!
-        if( empty( $error ) ) {
-            return true;
-        }
+			$error = true;
 
-        if( $echo && $error !== true ) {
+		}
 
-	        $error = esc_html( $error );
+		if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) {
 
-	        /**
-	         * @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 = true;
 
-            echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
-        }
+		} elseif( ! $this->verify_nonce() ) {
 
-        do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error );
+			/**
+			 * 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');
+			}
 
-        return false;
-    }
+		}
 
+		if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
+			$error = __( 'You do not have permission to edit this entry.', 'gravityview');
+		}
 
-    /**
-     * 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 ) {
+		if( $this->entry['status'] === 'trash' ) {
+			$error = __('You cannot edit the entry; it is in the trash.', 'gravityview' );
+		}
 
-        $error = NULL;
+		// No errors; everything's fine here!
+		if( empty( $error ) ) {
+			return true;
+		}
 
-        if( ! $this->check_user_cap_edit_field( $field ) ) {
-            $error = __( 'You do not have permission to edit this field.', 'gravityview');
-        }
+		if( $echo && $error !== true ) {
 
-        // No errors; everything's fine here!
-        if( empty( $error ) ) {
-            return true;
-        }
+			$error = esc_html( $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 );
+			/**
+			 * @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;" ) );
+			}
 
-        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;
+	}
 
-    /**
-     * checks if user has permissions to edit a specific field
-     *
-     * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_field for maximum security!!
-     *
-     * @param  [type] $field [description]
-     * @return bool
-     */
-    private function check_user_cap_edit_field( $field ) {
 
-        // If they can edit any entries (as defined in Gravity Forms), we're good.
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
-            return true;
-        }
+	/**
+	 * 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 ) {
 
-        $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false;
+		$error = NULL;
 
-        // If the field has custom editing capaibilities set, check those
-        if( $field_cap ) {
-            return GVCommon::has_cap( $field['allow_edit_cap'] );
-        }
-
-        return false;
-    }
+		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;
+		}
 
-    /**
-     * Is the current nonce valid for editing the entry?
-     * @return boolean
-     */
-    public function verify_nonce() {
+		if( $echo ) {
+			echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error');
+		}
 
-        // Verify form submitted for editing single
-        if( $this->is_edit_entry_submission() ) {
-            $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
-        }
+		do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error );
 
-        // Verify
-        else if( ! $this->is_edit_entry() ) {
-            $valid = false;
-        }
+		return 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;
-    }
+	/**
+	 * checks if user has permissions to edit a specific field
+	 *
+	 * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_field for maximum security!!
+	 *
+	 * @param  [type] $field [description]
+	 * @return bool
+	 */
+	private function check_user_cap_edit_field( $field ) {
+
+		// If they can edit any entries (as defined in Gravity Forms), we're good.
+		if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
+			return true;
+		}
+
+		$field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false;
+
+		// If the field has custom editing capaibilities set, check those
+		if( $field_cap ) {
+			return GVCommon::has_cap( $field['allow_edit_cap'] );
+		}
+
+		return false;
+	}
+
+
+	/**
+	 * Is the current nonce valid for editing the entry?
+	 * @return boolean
+	 */
+	public function verify_nonce() {
+
+		// Verify form submitted for editing single
+		if( $this->is_edit_entry_submission() ) {
+			$valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
+		}
+
+		// Verify
+		else if( ! $this->is_edit_entry() ) {
+			$valid = false;
+		}
+
+		else {
+			$valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
+		}
+
+		/**
+		 * @filter `gravityview/edit_entry/verify_nonce` Override Edit Entry nonce validation. Return true to declare nonce valid.
+		 * @since 1.13
+		 * @param int|boolean $valid False if invalid; 1 or 2 when nonce was generated
+		 * @param string $nonce_field Key used when validating submissions. Default: is_gv_edit_entry
+		 */
+		$valid = apply_filters( 'gravityview/edit_entry/verify_nonce', $valid, self::$nonce_field );
+
+		return $valid;
+	}
 
 
 

Spacing +185 added lines, -185 removed lines

@@ -91,16 +91,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' ) );
 
@@ -111,7 +111,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' ) );
 
     }
 
@@ -126,8 +126,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' );
@@ -142,10 +142,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 );
         }
     }
 
@@ -157,7 +157,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' );
     }
 
 	/**
@@ -166,7 +166,7 @@ 
 	 * @return boolean
 	 */
 	public function is_edit_entry_submission() {
-		return !empty( $_POST[ self::$nonce_field ] );
+		return ! empty( $_POST[ self::$nonce_field ] );
 	}
 
     /**
@@ -177,14 +177,14 @@ 
 
 
         $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' ] );
     }
 
 
@@ -204,12 +204,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;
         }
 
@@ -229,9 +229,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' ) );
@@ -243,32 +243,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
@@ -278,12 +278,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 );
             }
 
@@ -295,7 +295,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
@@ -329,11 +329,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;
     }
@@ -346,13 +346,13 @@ 
     private function form_prepare_for_save() {
         $form = $this->form;
 
-        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' ];
                 }
             }
         }
@@ -370,11 +370,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;
         }
 
@@ -388,11 +388,11 @@ 
 
             $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 );
@@ -400,12 +400,12 @@ 
                 // Convert the field object in 1.9 to an array for backward compatibility
                 $field_array = GVCommon::get_field_array( $field );
 
-                switch( $field_array['type'] ) {
+                switch ( $field_array[ 'type' ] ) {
 
                     case 'post_title':
                     case 'post_content':
                     case 'post_excerpt':
-                        $updated_post->{$field_array['type']} = $value;
+                        $updated_post->{$field_array[ 'type' ]} = $value;
                         break;
                     case 'post_tags':
                         wp_set_post_tags( $post_id, $value, false );
@@ -421,24 +421,24 @@ 
                         $field = GFCommon::add_categories_as_choices( $field, '' );
 
                         // 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;
                     case 'post_custom_field':
 
                         $input_type = RGFormsModel::get_input_type( $field );
-                        $custom_field_name = $field_array['postCustomFieldName'];
+                        $custom_field_name = $field_array[ 'postCustomFieldName' ];
 
                         // Only certain custom field types are supported
-                        if( !in_array( $input_type, array( 'list', 'fileupload' ) ) ) {
+                        if ( ! in_array( $input_type, array( 'list', 'fileupload' ) ) ) {
                             update_post_meta( $post_id, $custom_field_name, $value );
                         }
 
@@ -452,12 +452,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;
                 }
 
@@ -467,24 +467,24 @@ 
 
         }
 
-        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 ) ) {
             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' );
+            do_action( 'gravityview_log_debug', 'Updating the post content for post #' . $post_id . ' succeeded' );
         }
 
     }
@@ -500,18 +500,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;
@@ -531,7 +531,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
@@ -547,7 +547,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>
@@ -556,18 +556,18 @@ 
             <?php
 
             // Display the success message
-            if( rgpost('action') === 'update' ) {
+            if ( rgpost( 'action' ) === 'update' ) {
 
-                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)
@@ -577,7 +577,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 );
                 }
@@ -634,13 +634,13 @@ 
      */
     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, '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
@@ -648,7 +648,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' ) );
@@ -664,7 +664,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 );
     }
 
 
@@ -684,17 +684,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;
@@ -717,7 +717,7 @@ 
 
         // If the form has been submitted, then we don't need to pre-fill the values,
         // Except for fileupload type - run always!!
-        if(
+        if (
 	        $this->is_edit_entry_submission() && 'fileupload' !== $field->type
         ||  GFCommon::is_product_field( $field->type ) // Prevent product fields from appearing editable
         ) {
@@ -725,8 +725,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
@@ -746,7 +746,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();
 
@@ -755,10 +755,10 @@ 
 
 	        foreach ( (array)$field->inputs as $input ) {
 
-	            $input_id = strval( $input['id'] );
+	            $input_id = strval( $input[ 'id' ] );
 
                 if ( ! empty( $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 ];
+                    $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;
                 }
 
@@ -766,7 +766,7 @@ 
 
             $pre_value = $field->get_value_submission( array(), false );
 
-            $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !empty( $pre_value ) ) ? $field_value : $pre_value;
+            $field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! empty( $pre_value ) ) ? $field_value : $pre_value;
 
         } else {
 
@@ -777,13 +777,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 = !empty( $this->entry[ $id ] ) && ! ( $override_saved_value && !empty( $pre_value ) ) ? $this->entry[ $id ] : $pre_value;
+            $field_value = ! empty( $this->entry[ $id ] ) && ! ( $override_saved_value && ! empty( $pre_value ) ) ? $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 && !empty( $field_value ) ) {
+            if ( 'post_category' === $field->type && ! empty( $field_value ) ) {
                 $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 );
             }
@@ -809,7 +809,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 );
 	    }
 
@@ -818,7 +818,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;
     }
@@ -837,7 +837,7 @@ 
     public function get_field_value( $value, $lead, $field ) {
 
         // The form's not being edited; use the original value
-        if( ! $this->is_edit_entry_submission() ) {
+        if ( ! $this->is_edit_entry_submission() ) {
             return $value;
         }
 
@@ -858,12 +858,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.
@@ -876,7 +876,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.
@@ -891,38 +891,38 @@ 
                     // 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 {
@@ -938,14 +938,14 @@ 
                     break;
                 case 'number':
                     // Fix "undefined index" issue at line 1286 in form_display.php
-                    if( !isset( $_POST['input_'.$field->id ] ) ) {
-                        $_POST['input_'.$field->id ] = NULL;
+                    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;
             }
 
@@ -974,7 +974,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;
@@ -982,14 +982,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 );
     }
 
 
@@ -1006,13 +1006,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 );
@@ -1024,35 +1024,35 @@ 
                 case 'fileupload' :
 
                     // 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( rgar( $field, 'maxFiles') && rgar( $field, 'multipleFiles') ) {
+                    if ( rgar( $field, 'maxFiles' ) && rgar( $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;
                         }
 
                     }
@@ -1063,7 +1063,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 ) );
 
@@ -1081,32 +1081,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;
@@ -1118,12 +1118,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;
     }
@@ -1136,7 +1136,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() );
         }
@@ -1163,13 +1163,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 );
@@ -1187,11 +1187,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;
 			}
 		}
 
@@ -1211,7 +1211,7 @@ 
      */
     private function filter_fields( $fields, $configured_fields ) {
 
-        if( empty( $fields ) || !is_array( $fields ) ) {
+        if ( empty( $fields ) || ! is_array( $fields ) ) {
             return $fields;
         }
 
@@ -1228,24 +1228,24 @@ 
 	     */
 	    $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
         foreach ( $fields as $key => $field ) {
-            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;
         }
 
@@ -1255,8 +1255,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;
                 }
 
@@ -1279,14 +1279,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' ] );
         }
 
         /**
@@ -1324,11 +1324,11 @@ 
 	     */
 	    $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'] ) ) {
+	    if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) {
             return $fields;
         }
 
-	    foreach( $fields as &$field ) {
+	    foreach ( $fields as &$field ) {
 		    $field->adminOnly = false;
         }
 
@@ -1355,16 +1355,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;
 
@@ -1381,7 +1381,7 @@ 
      */
     function manage_conditional_logic( $has_conditional_logic, $form ) {
 
-        if( ! $this->is_edit_entry() ) {
+        if ( ! $this->is_edit_entry() ) {
             return $has_conditional_logic;
         }
 
@@ -1413,44 +1413,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 );
 
@@ -1458,13 +1458,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;
     }
@@ -1481,20 +1481,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;
 
@@ -1512,15 +1512,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;
@@ -1534,17 +1534,17 @@ 
     public function verify_nonce() {
 
         // Verify form submitted for editing single
-        if( $this->is_edit_entry_submission() ) {
+        if ( $this->is_edit_entry_submission() ) {
             $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
         }
 
         // Verify
-        else if( ! $this->is_edit_entry() ) {
+        else if ( ! $this->is_edit_entry() ) {
             $valid = false;
         }
 
         else {
-            $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
+            $valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key );
         }
 
         /**

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

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
 
 	var $name = 'post_category';
 
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
 
 	var $_gf_field_class_name = 'GF_Field_Post_Category';
 
@@ -22,12 +22,12 @@ 
 
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
 
-		if( 'edit' === $context ) {
+		if ( 'edit' === $context ) {
 			return $field_options;
 		}
 
-		$this->add_field_support('dynamic_data', $field_options );
-		$this->add_field_support('link_to_term', $field_options );
+		$this->add_field_support( 'dynamic_data', $field_options );
+		$this->add_field_support( 'link_to_term', $field_options );
 
 		return $field_options;
 	}

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

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 
 	var $name = 'radio';
 
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
 
 	var $_gf_field_class_name = 'GF_Field_Radio';
 

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

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 
 	var $name = 'radio';
 
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
 
 	var $_gf_field_class_name = 'GF_Field_Radio';