View GitHub Repository GravityView

Schedule Inspection
Subscribe
Completed
Pull Request — master (#643)
by Zack
24:30 queued 07:58
created
Status
Category
Toggle Patches
includes/extensions/edit-entry/class-edit-entry-render.php 2 patches
Indentation   +1436 added lines, -1436 removed lines patch added patch discarded remove patch 
@@ -10,21 +10,21 @@  discard block
 
 block discarded – undo
10 10 
  */
11 11
12 12 
 if ( ! defined( 'WPINC' ) ) {
13 
-    die;
13 
+	die;
14 14 
 }
15 15
16 16
17 17 
 class GravityView_Edit_Entry_Render {
18 18
19 
-    /**
20 
-     * @var GravityView_Edit_Entry
21 
-     */
22 
-    protected $loader;
19 
+	/**
20 
+	 * @var GravityView_Edit_Entry
21 
+	 */
22 
+	protected $loader;
23 23
24 24 
 	/**
25 25 
 	 * @var string String used to generate unique nonce for the entry/form/view combination. Allows access to edit page.
26 26 
 	 */
27 
-    static $nonce_key;
27 
+	static $nonce_key;
28 28
29 29 
 	/**
30 30 
 	 * @since 1.9
 
@@ -44,142 +44,142 @@  discard block
 
 block discarded – undo
44 44 
 	 */
45 45 
 	private static $supports_product_fields = false;
46 46
47 
-    /**
48 
-     * Gravity Forms entry array
49 
-     *
50 
-     * @var array
51 
-     */
52 
-    var $entry;
53 
-
54 
-    /**
55 
-     * Gravity Forms form array (GravityView modifies the content through this class lifecycle)
56 
-     *
57 
-     * @var array
58 
-     */
59 
-    var $form;
60 
-
61 
-    /**
62 
-     * Gravity Forms form array (it won't get changed during this class lifecycle)
63 
-     * @since 1.16.2.1
64 
-     * @var array
65 
-     */
66 
-    var $original_form;
67 
-
68 
-    /**
69 
-     * Gravity Forms form array after the form validation process
70 
-     * @since 1.13
71 
-     * @var array
72 
-     */
73 
-    var $form_after_validation = null;
74 
-
75 
-    /**
76 
-     * Hold an array of GF field objects that have calculation rules
77 
-     * @var array
78 
-     */
79 
-    var $fields_with_calculation = array();
80 
-
81 
-    /**
82 
-     * Hold an array of GF field objects with type 'total'
83 
-     * @var array
84 
-     */
85 
-    var $total_fields = array();
86 
-
87 
-    /**
88 
-     * Gravity Forms form id
89 
-     *
90 
-     * @var int
91 
-     */
92 
-    var $form_id;
93 
-
94 
-    /**
95 
-     * ID of the current view
96 
-     *
97 
-     * @var int
98 
-     */
99 
-    var $view_id;
100 
-
101 
-    /**
102 
-     * Updated entry is valid (GF Validation object)
103 
-     *
104 
-     * @var array
105 
-     */
106 
-    var $is_valid = NULL;
107 
-
108 
-    function __construct( GravityView_Edit_Entry $loader ) {
109 
-        $this->loader = $loader;
110 
-    }
111 
-
112 
-    function load() {
113 
-
114 
-        /** @define "GRAVITYVIEW_DIR" "../../../" */
115 
-        include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
116 
-
117 
-        // Don't display an embedded form when editing an entry
118 
-        add_action( 'wp_head', array( $this, 'prevent_render_form' ) );
119 
-        add_action( 'wp_footer', array( $this, 'prevent_render_form' ) );
120 
-
121 
-        // Stop Gravity Forms processing what is ours!
122 
-        add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 );
123 
-
124 
-        add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') );
125 
-
126 
-        add_action( 'gravityview_edit_entry', array( $this, 'init' ) );
127 
-
128 
-        // Disable conditional logic if needed (since 1.9)
129 
-        add_filter( 'gform_has_conditional_logic', array( $this, 'manage_conditional_logic' ), 10, 2 );
130 
-
131 
-        // Make sure GF doesn't validate max files (since 1.9)
132 
-        add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 );
133 
-
134 
-        // Add fields expected by GFFormDisplay::validate()
135 
-        add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') );
136 
-
137 
-    }
138 
-
139 
-    /**
140 
-     * Don't show any forms embedded on a page when GravityView is in Edit Entry mode
141 
-     *
142 
-     * Adds a `__return_empty_string` filter on the Gravity Forms shortcode on the `wp_head` action
143 
-     * And then removes it on the `wp_footer` action
144 
-     *
145 
-     * @since 1.16.1
146 
-     *
147 
-     * @return void
148 
-     */
149 
-    function prevent_render_form() {
150 
-        if( $this->is_edit_entry() ) {
151 
-            if( 'wp_head' === current_filter() ) {
152 
-                add_filter( 'gform_shortcode_form', '__return_empty_string' );
153 
-            } else {
154 
-                remove_filter( 'gform_shortcode_form', '__return_empty_string' );
155 
-            }
156 
-        }
157 
-    }
158 
-
159 
-    /**
160 
-     * Because we're mimicking being a front-end Gravity Forms form while using a Gravity Forms
161 
-     * backend form, we need to prevent them from saving twice.
162 
-     * @return void
163 
-     */
164 
-    function prevent_maybe_process_form() {
165 
-
166 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
167 
-
168 
-        if( $this->is_edit_entry_submission() && $this->verify_nonce() ) {
169 
-            remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
170 
-        }
171 
-    }
172 
-
173 
-    /**
174 
-     * Is the current page an Edit Entry page?
175 
-     * @return boolean
176 
-     */
177 
-    public function is_edit_entry() {
178 
-
179 
-        $gf_page = ( 'entry' === RGForms::get( 'view' ) );
180 
-
181 
-        return ( $gf_page && isset( $_GET['edit'] ) || RGForms::post( 'action' ) === 'update' );
182 
-    }
47 
+	/**
48 
+	 * Gravity Forms entry array
49 
+	 *
50 
+	 * @var array
51 
+	 */
52 
+	var $entry;
53 
+
54 
+	/**
55 
+	 * Gravity Forms form array (GravityView modifies the content through this class lifecycle)
56 
+	 *
57 
+	 * @var array
58 
+	 */
59 
+	var $form;
60 
+
61 
+	/**
62 
+	 * Gravity Forms form array (it won't get changed during this class lifecycle)
63 
+	 * @since 1.16.2.1
64 
+	 * @var array
65 
+	 */
66 
+	var $original_form;
67 
+
68 
+	/**
69 
+	 * Gravity Forms form array after the form validation process
70 
+	 * @since 1.13
71 
+	 * @var array
72 
+	 */
73 
+	var $form_after_validation = null;
74 
+
75 
+	/**
76 
+	 * Hold an array of GF field objects that have calculation rules
77 
+	 * @var array
78 
+	 */
79 
+	var $fields_with_calculation = array();
80 
+
81 
+	/**
82 
+	 * Hold an array of GF field objects with type 'total'
83 
+	 * @var array
84 
+	 */
85 
+	var $total_fields = array();
86 
+
87 
+	/**
88 
+	 * Gravity Forms form id
89 
+	 *
90 
+	 * @var int
91 
+	 */
92 
+	var $form_id;
93 
+
94 
+	/**
95 
+	 * ID of the current view
96 
+	 *
97 
+	 * @var int
98 
+	 */
99 
+	var $view_id;
100 
+
101 
+	/**
102 
+	 * Updated entry is valid (GF Validation object)
103 
+	 *
104 
+	 * @var array
105 
+	 */
106 
+	var $is_valid = NULL;
107 
+
108 
+	function __construct( GravityView_Edit_Entry $loader ) {
109 
+		$this->loader = $loader;
110 
+	}
111 
+
112 
+	function load() {
113 
+
114 
+		/** @define "GRAVITYVIEW_DIR" "../../../" */
115 
+		include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
116 
+
117 
+		// Don't display an embedded form when editing an entry
118 
+		add_action( 'wp_head', array( $this, 'prevent_render_form' ) );
119 
+		add_action( 'wp_footer', array( $this, 'prevent_render_form' ) );
120 
+
121 
+		// Stop Gravity Forms processing what is ours!
122 
+		add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 );
123 
+
124 
+		add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') );
125 
+
126 
+		add_action( 'gravityview_edit_entry', array( $this, 'init' ) );
127 
+
128 
+		// Disable conditional logic if needed (since 1.9)
129 
+		add_filter( 'gform_has_conditional_logic', array( $this, 'manage_conditional_logic' ), 10, 2 );
130 
+
131 
+		// Make sure GF doesn't validate max files (since 1.9)
132 
+		add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 );
133 
+
134 
+		// Add fields expected by GFFormDisplay::validate()
135 
+		add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') );
136 
+
137 
+	}
138 
+
139 
+	/**
140 
+	 * Don't show any forms embedded on a page when GravityView is in Edit Entry mode
141 
+	 *
142 
+	 * Adds a `__return_empty_string` filter on the Gravity Forms shortcode on the `wp_head` action
143 
+	 * And then removes it on the `wp_footer` action
144 
+	 *
145 
+	 * @since 1.16.1
146 
+	 *
147 
+	 * @return void
148 
+	 */
149 
+	function prevent_render_form() {
150 
+		if( $this->is_edit_entry() ) {
151 
+			if( 'wp_head' === current_filter() ) {
152 
+				add_filter( 'gform_shortcode_form', '__return_empty_string' );
153 
+			} else {
154 
+				remove_filter( 'gform_shortcode_form', '__return_empty_string' );
155 
+			}
156 
+		}
157 
+	}
158 
+
159 
+	/**
160 
+	 * Because we're mimicking being a front-end Gravity Forms form while using a Gravity Forms
161 
+	 * backend form, we need to prevent them from saving twice.
162 
+	 * @return void
163 
+	 */
164 
+	function prevent_maybe_process_form() {
165 
+
166 
+		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
167 
+
168 
+		if( $this->is_edit_entry_submission() && $this->verify_nonce() ) {
169 
+			remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
170 
+		}
171 
+	}
172 
+
173 
+	/**
174 
+	 * Is the current page an Edit Entry page?
175 
+	 * @return boolean
176 
+	 */
177 
+	public function is_edit_entry() {
178 
+
179 
+		$gf_page = ( 'entry' === RGForms::get( 'view' ) );
180 
+
181 
+		return ( $gf_page && isset( $_GET['edit'] ) || RGForms::post( 'action' ) === 'update' );
182 
+	}
183 183
184 184 
 	/**
185 185 
 	 * Is the current page an Edit Entry page?
 
@@ -190,522 +190,522 @@  discard block
 
 block discarded – undo
190 190 
 		return !empty( $_POST[ self::$nonce_field ] );
191 191 
 	}
192 192
193 
-    /**
194 
-     * When Edit entry view is requested setup the vars
195 
-     */
196 
-    function setup_vars() {
197 
-        $gravityview_view = GravityView_View::getInstance();
193 
+	/**
194 
+	 * When Edit entry view is requested setup the vars
195 
+	 */
196 
+	function setup_vars() {
197 
+		$gravityview_view = GravityView_View::getInstance();
198 198
199 199
200 
-        $entries = $gravityview_view->getEntries();
201 
-        $this->entry = $entries[0];
200 
+		$entries = $gravityview_view->getEntries();
201 
+		$this->entry = $entries[0];
202 202
203 
-        $this->original_form = $this->form = $gravityview_view->getForm();
204 
-        $this->form_id = $gravityview_view->getFormId();
205 
-        $this->view_id = $gravityview_view->getViewId();
203 
+		$this->original_form = $this->form = $gravityview_view->getForm();
204 
+		$this->form_id = $gravityview_view->getFormId();
205 
+		$this->view_id = $gravityview_view->getViewId();
206 206
207 
-        self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] );
208 
-    }
207 
+		self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] );
208 
+	}
209 209
210 210
211 
-    /**
212 
-     * Load required files and trigger edit flow
213 
-     *
214 
-     * Run when the is_edit_entry returns true.
215 
-     *
216 
-     * @param GravityView_View_Data $gv_data GravityView Data object
217 
-     * @return void
218 
-     */
219 
-    function init( $gv_data ) {
211 
+	/**
212 
+	 * Load required files and trigger edit flow
213 
+	 *
214 
+	 * Run when the is_edit_entry returns true.
215 
+	 *
216 
+	 * @param GravityView_View_Data $gv_data GravityView Data object
217 
+	 * @return void
218 
+	 */
219 
+	function init( $gv_data ) {
220 220
221 
-        require_once( GFCommon::get_base_path() . '/form_display.php' );
222 
-        require_once( GFCommon::get_base_path() . '/entry_detail.php' );
221 
+		require_once( GFCommon::get_base_path() . '/form_display.php' );
222 
+		require_once( GFCommon::get_base_path() . '/entry_detail.php' );
223 223
224 
-        $this->setup_vars();
224 
+		$this->setup_vars();
225 225
226 
-        // Multiple Views embedded, don't proceed if nonce fails
227 
-        if( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) {
228 
-            return;
229 
-        }
226 
+		// Multiple Views embedded, don't proceed if nonce fails
227 
+		if( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) {
228 
+			return;
229 
+		}
230 230
231 
-        // Sorry, you're not allowed here.
232 
-        if( false === $this->user_can_edit_entry( true ) ) {
233 
-            return;
234 
-        }
231 
+		// Sorry, you're not allowed here.
232 
+		if( false === $this->user_can_edit_entry( true ) ) {
233 
+			return;
234 
+		}
235 235
236 
-        $this->print_scripts();
236 
+		$this->print_scripts();
237 237
238 
-        $this->process_save();
238 
+		$this->process_save();
239 239
240 
-        $this->edit_entry_form();
240 
+		$this->edit_entry_form();
241 241
242 
-    }
242 
+	}
243 243
244 244
245 
-    /**
246 
-     * Force Gravity Forms to output scripts as if it were in the admin
247 
-     * @return void
248 
-     */
249 
-    function print_scripts() {
250 
-        $gravityview_view = GravityView_View::getInstance();
245 
+	/**
246 
+	 * Force Gravity Forms to output scripts as if it were in the admin
247 
+	 * @return void
248 
+	 */
249 
+	function print_scripts() {
250 
+		$gravityview_view = GravityView_View::getInstance();
251 251
252 
-        wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
252 
+		wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
253 253
254 
-        GFFormDisplay::enqueue_form_scripts($gravityview_view->getForm(), false);
254 
+		GFFormDisplay::enqueue_form_scripts($gravityview_view->getForm(), false);
255 255
256 
-        // Sack is required for images
257 
-        wp_print_scripts( array( 'sack', 'gform_gravityforms' ) );
258 
-    }
256 
+		// Sack is required for images
257 
+		wp_print_scripts( array( 'sack', 'gform_gravityforms' ) );
258 
+	}
259 259
260 260
261 
-    /**
262 
-     * Process edit entry form save
263 
-     */
264 
-    function process_save() {
261 
+	/**
262 
+	 * Process edit entry form save
263 
+	 */
264 
+	function process_save() {
265 265
266 
-        if( empty( $_POST ) ) {
267 
-            return;
268 
-        }
266 
+		if( empty( $_POST ) ) {
267 
+			return;
268 
+		}
269 269
270 
-        // Make sure the entry, view, and form IDs are all correct
271 
-        $valid = $this->verify_nonce();
270 
+		// Make sure the entry, view, and form IDs are all correct
271 
+		$valid = $this->verify_nonce();
272 272
273 
-        if( !$valid ) {
274 
-            do_action('gravityview_log_error', __METHOD__ . ' Nonce validation failed.' );
275 
-            return;
276 
-        }
273 
+		if( !$valid ) {
274 
+			do_action('gravityview_log_error', __METHOD__ . ' Nonce validation failed.' );
275 
+			return;
276 
+		}
277 277
278 
-        if( $this->entry['id'] !== $_POST['lid'] ) {
279 
-            do_action('gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' );
280 
-            return;
281 
-        }
278 
+		if( $this->entry['id'] !== $_POST['lid'] ) {
279 
+			do_action('gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' );
280 
+			return;
281 
+		}
282 282
283 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
283 
+		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
284 284
285 
-        $this->process_save_process_files( $this->form_id );
285 
+		$this->process_save_process_files( $this->form_id );
286 286
287 
-        $this->validate();
287 
+		$this->validate();
288 288
289 
-        if( $this->is_valid ) {
289 
+		if( $this->is_valid ) {
290 290
291 
-            do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.' );
291 
+			do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.' );
292 292
293 
-            /**
294 
-             * @hack This step is needed to unset the adminOnly from form fields, to add the calculation fields
295 
-             */
296 
-            $form = $this->form_prepare_for_save();
293 
+			/**
294 
+			 * @hack This step is needed to unset the adminOnly from form fields, to add the calculation fields
295 
+			 */
296 
+			$form = $this->form_prepare_for_save();
297 297
298 
-            /**
299 
-             * @hack to avoid the capability validation of the method save_lead for GF 1.9+
300 
-             */
301 
-            unset( $_GET['page'] );
298 
+			/**
299 
+			 * @hack to avoid the capability validation of the method save_lead for GF 1.9+
300 
+			 */
301 
+			unset( $_GET['page'] );
302 302
303 
-            GFFormsModel::save_lead( $form, $this->entry );
303 
+			GFFormsModel::save_lead( $form, $this->entry );
304 304
305 
-            // If there's a post associated with the entry, process post fields
306 
-            if( !empty( $this->entry['post_id'] ) ) {
307 
-                $this->maybe_update_post_fields( $form );
308 
-            }
305 
+			// If there's a post associated with the entry, process post fields
306 
+			if( !empty( $this->entry['post_id'] ) ) {
307 
+				$this->maybe_update_post_fields( $form );
308 
+			}
309 309
310 
-            // Process calculation fields
311 
-            $this->update_calculation_fields();
310 
+			// Process calculation fields
311 
+			$this->update_calculation_fields();
312 312
313 
-            // Perform actions normally performed after updating a lead
314 
-            $this->after_update();
313 
+			// Perform actions normally performed after updating a lead
314 
+			$this->after_update();
315 315
316 
-            /**
317 
-             * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry
318 
-             * @param array $form Gravity Forms form array
319 
-             * @param string $entry_id Numeric ID of the entry that was updated
320 
-             */
321 
-            do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'] );
322 
-        }
316 
+			/**
317 
+			 * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry
318 
+			 * @param array $form Gravity Forms form array
319 
+			 * @param string $entry_id Numeric ID of the entry that was updated
320 
+			 */
321 
+			do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'] );
322 
+		}
323 323
324 
-    } // process_save
324 
+	} // process_save
325 325
326 326
327 
-    /**
328 
-     * Have GF handle file uploads
329 
-     *
330 
-     * Copy of code from GFFormDisplay::process_form()
331 
-     *
332 
-     * @param int $form_id
333 
-     */
334 
-    function process_save_process_files( $form_id ) {
327 
+	/**
328 
+	 * Have GF handle file uploads
329 
+	 *
330 
+	 * Copy of code from GFFormDisplay::process_form()
331 
+	 *
332 
+	 * @param int $form_id
333 
+	 */
334 
+	function process_save_process_files( $form_id ) {
335 335
336 
-        //Loading files that have been uploaded to temp folder
337 
-        $files = GFCommon::json_decode( stripslashes( RGForms::post( 'gform_uploaded_files' ) ) );
338 
-        if ( ! is_array( $files ) ) {
339 
-            $files = array();
340 
-        }
336 
+		//Loading files that have been uploaded to temp folder
337 
+		$files = GFCommon::json_decode( stripslashes( RGForms::post( 'gform_uploaded_files' ) ) );
338 
+		if ( ! is_array( $files ) ) {
339 
+			$files = array();
340 
+		}
341 341
342 
-        RGFormsModel::$uploaded_files[ $form_id ] = $files;
343 
-    }
342 
+		RGFormsModel::$uploaded_files[ $form_id ] = $files;
343 
+	}
344 344
345 
-    /**
346 
-     * Remove max_files validation (done on gravityforms.js) to avoid conflicts with GravityView
347 
-     * Late validation done on self::custom_validation
348 
-     *
349 
-     * @param $plupload_init array Plupload settings
350 
-     * @param $form_id
351 
-     * @param $instance
352 
-     * @return mixed
353 
-     */
354 
-    public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) {
355 
-        if( ! $this->is_edit_entry() ) {
356 
-            return $plupload_init;
357 
-        }
345 
+	/**
346 
+	 * Remove max_files validation (done on gravityforms.js) to avoid conflicts with GravityView
347 
+	 * Late validation done on self::custom_validation
348 
+	 *
349 
+	 * @param $plupload_init array Plupload settings
350 
+	 * @param $form_id
351 
+	 * @param $instance
352 
+	 * @return mixed
353 
+	 */
354 
+	public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) {
355 
+		if( ! $this->is_edit_entry() ) {
356 
+			return $plupload_init;
357 
+		}
358 358
359 
-        $plupload_init['gf_vars']['max_files'] = 0;
359 
+		$plupload_init['gf_vars']['max_files'] = 0;
360 360
361 
-        return $plupload_init;
362 
-    }
361 
+		return $plupload_init;
362 
+	}
363 363
364 364
365 
-    /**
366 
-     * Unset adminOnly and convert field input key to string
367 
-     * @return array $form
368 
-     */
369 
-    private function form_prepare_for_save() {
365 
+	/**
366 
+	 * Unset adminOnly and convert field input key to string
367 
+	 * @return array $form
368 
+	 */
369 
+	private function form_prepare_for_save() {
370 370
371 
-        $form = $this->form;
371 
+		$form = $this->form;
372 372
373 
-        foreach( $form['fields'] as &$field ) {
373 
+		foreach( $form['fields'] as &$field ) {
374 374
375 
-            $field->adminOnly = false;
375 
+			$field->adminOnly = false;
376 376
377 
-            if( isset( $field->inputs ) && is_array( $field->inputs ) ) {
378 
-                foreach( $field->inputs as $key => $input ) {
379 
-                    $field->inputs[ $key ][ 'id' ] = (string)$input['id'];
380 
-                }
381 
-            }
382 
-        }
377 
+			if( isset( $field->inputs ) && is_array( $field->inputs ) ) {
378 
+				foreach( $field->inputs as $key => $input ) {
379 
+					$field->inputs[ $key ][ 'id' ] = (string)$input['id'];
380 
+				}
381 
+			}
382 
+		}
383 383
384 
-        return $form;
385 
-    }
384 
+		return $form;
385 
+	}
386 386
387 
-    private function update_calculation_fields() {
387 
+	private function update_calculation_fields() {
388 
+
389 
+		$form = $this->original_form;
390 
+		$update = false;
391 
+
392 
+		// get the most up to date entry values
393 
+		$entry = GFAPI::get_entry( $this->entry['id'] );
394 
+
395 
+		if( !empty( $this->fields_with_calculation ) ) {
396 
+			$update = true;
397 
+			foreach ( $this->fields_with_calculation as $calc_field ) {
398 
+				$inputs = $calc_field->get_entry_inputs();
399 
+				if ( is_array( $inputs ) ) {
400 
+					foreach ( $inputs as $input ) {
401 
+						$input_name = 'input_' . str_replace( '.', '_', $input['id'] );
402 
+						$entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry );
403 
+					}
404 
+				} else {
405 
+					$input_name = 'input_' . str_replace( '.', '_', $calc_field->id);
406 
+					$entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry );
407 
+				}
408 
+			}
388 409
389 
-        $form = $this->original_form;
390 
-        $update = false;
391 
-
392 
-        // get the most up to date entry values
393 
-        $entry = GFAPI::get_entry( $this->entry['id'] );
394 
-
395 
-        if( !empty( $this->fields_with_calculation ) ) {
396 
-            $update = true;
397 
-            foreach ( $this->fields_with_calculation as $calc_field ) {
398 
-                $inputs = $calc_field->get_entry_inputs();
399 
-                if ( is_array( $inputs ) ) {
400 
-                    foreach ( $inputs as $input ) {
401 
-                        $input_name = 'input_' . str_replace( '.', '_', $input['id'] );
402 
-                        $entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry );
403 
-                    }
404 
-                } else {
405 
-                    $input_name = 'input_' . str_replace( '.', '_', $calc_field->id);
406 
-                    $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry );
407 
-                }
408 
-            }
409 
-
410 
-        }
411 
-
412 
-        //saving total field as the last field of the form.
413 
-        if ( ! empty( $this->total_fields ) ) {
414 
-            $update = true;
415 
-            foreach ( $this->total_fields as $total_field ) {
416 
-                $input_name = 'input_' . str_replace( '.', '_', $total_field->id);
417 
-                $entry[ strval( $total_field->id ) ] = RGFormsModel::prepare_value( $form, $total_field, '', $input_name, $entry['id'], $entry );
418 
-            }
419 
-        }
420 
-
421 
-        if( $update ) {
422 
-
423 
-            $return_entry = GFAPI::update_entry( $entry );
424 
-
425 
-            if( is_wp_error( $return_entry ) ) {
426 
-                do_action( 'gravityview_log_error', 'Updating the entry calculation and total fields failed', $return_entry );
427 
-            } else {
428 
-                do_action( 'gravityview_log_debug', 'Updating the entry calculation and total fields succeeded' );
429 
-            }
430 
-        }
431 
-    }
432 
-
433 
-
434 
-    /**
435 
-     * Loop through the fields being edited and if they include Post fields, update the Entry's post object
436 
-     *
437 
-     * @param array $form Gravity Forms form
438 
-     *
439 
-     * @return void
440 
-     */
441 
-    function maybe_update_post_fields( $form ) {
442 
-
443 
-        $post_id = $this->entry['post_id'];
410 
+		}
444 411
445 
-        // Security check
446 
-        if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
447 
-            do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #'.$post_id );
448 
-            return;
449 
-        }
412 
+		//saving total field as the last field of the form.
413 
+		if ( ! empty( $this->total_fields ) ) {
414 
+			$update = true;
415 
+			foreach ( $this->total_fields as $total_field ) {
416 
+				$input_name = 'input_' . str_replace( '.', '_', $total_field->id);
417 
+				$entry[ strval( $total_field->id ) ] = RGFormsModel::prepare_value( $form, $total_field, '', $input_name, $entry['id'], $entry );
418 
+			}
419 
+		}
450 420
451 
-        $update_entry = false;
421 
+		if( $update ) {
452 422
453 
-        $updated_post = $original_post = get_post( $post_id );
423 
+			$return_entry = GFAPI::update_entry( $entry );
454 424
455 
-        // get the most up to date entry values
456 
-        $entry = GFAPI::get_entry( $this->entry['id'] );
425 
+			if( is_wp_error( $return_entry ) ) {
426 
+				do_action( 'gravityview_log_error', 'Updating the entry calculation and total fields failed', $return_entry );
427 
+			} else {
428 
+				do_action( 'gravityview_log_debug', 'Updating the entry calculation and total fields succeeded' );
429 
+			}
430 
+		}
431 
+	}
457 432
458 
-        foreach ( $entry as $field_id => $value ) {
459 433
460 
-            //todo: only run through the edit entry configured fields
434 
+	/**
435 
+	 * Loop through the fields being edited and if they include Post fields, update the Entry's post object
436 
+	 *
437 
+	 * @param array $form Gravity Forms form
438 
+	 *
439 
+	 * @return void
440 
+	 */
441 
+	function maybe_update_post_fields( $form ) {
461 442
462 
-            $field = RGFormsModel::get_field( $form, $field_id );
443 
+		$post_id = $this->entry['post_id'];
463 444
464 
-            if( class_exists('GF_Fields') ) {
465 
-                $field = GF_Fields::create( $field );
466 
-            }
445 
+		// Security check
446 
+		if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
447 
+			do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #'.$post_id );
448 
+			return;
449 
+		}
467 450
468 
-            if( GFCommon::is_post_field( $field ) ) {
451 
+		$update_entry = false;
469 452
470 
-                // Get the value of the field, including $_POSTed value
471 
-                $value = RGFormsModel::get_field_value( $field );
453 
+		$updated_post = $original_post = get_post( $post_id );
472 454
473 
-                switch( $field->type ) {
455 
+		// get the most up to date entry values
456 
+		$entry = GFAPI::get_entry( $this->entry['id'] );
474 457
475 
-                    case 'post_title':
476 
-                    case 'post_content':
477 
-                    case 'post_excerpt':
478 
-                        $updated_post->{$field->type} = $value;
479 
-                        break;
480 
-                    case 'post_tags':
481 
-                        wp_set_post_tags( $post_id, $value, false );
482 
-                        break;
483 
-                    case 'post_category':
458 
+		foreach ( $entry as $field_id => $value ) {
484 459
485 
-                        $categories = is_array( $value ) ? array_values( $value ) : (array)$value;
486 
-                        $categories = array_filter( $categories );
460 
+			//todo: only run through the edit entry configured fields
487 461
488 
-                        wp_set_post_categories( $post_id, $categories, false );
462 
+			$field = RGFormsModel::get_field( $form, $field_id );
489 463
490 
-                        // if post_category is type checkbox, then value is an array of inputs
491 
-                        if( isset( $value[ strval( $field_id ) ] ) ) {
492 
-                            foreach( $value as $input_id => $val ) {
493 
-                                $input_name = 'input_' . str_replace( '.', '_', $input_id );
494 
-                                $entry[ strval( $input_id ) ] = RGFormsModel::prepare_value( $form, $field, $val, $input_name, $entry['id'], $entry );
495 
-                            }
496 
-                        } else {
497 
-                            $input_name = 'input_' . str_replace( '.', '_', $field_id );
498 
-                            $entry[ strval( $field_id ) ] = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], $entry );
499 
-                        }
464 
+			if( class_exists('GF_Fields') ) {
465 
+				$field = GF_Fields::create( $field );
466 
+			}
500 467
501 
-                        break;
502 
-                    case 'post_custom_field':
468 
+			if( GFCommon::is_post_field( $field ) ) {
503 469
504 
-                        $input_type = RGFormsModel::get_input_type( $field );
505 
-                        $custom_field_name = $field->postCustomFieldName;
470 
+				// Get the value of the field, including $_POSTed value
471 
+				$value = RGFormsModel::get_field_value( $field );
506 472
507 
-                        // Only certain custom field types are supported
508 
-                        switch( $input_type ) {
509 
-                            case 'fileupload':
510 
-                            /** @noinspection PhpMissingBreakStatementInspection */
511 
-                            case 'list':
512 
-                                if( ! is_string( $value ) ) {
513 
-                                    $value = function_exists('wp_json_encode') ? wp_json_encode( $value ) : json_encode( $value );
514 
-                                }
515 
-                            // break; left intentionally out
516 
-                            default:
517 
-                                update_post_meta( $post_id, $custom_field_name, $value );
518 
-                        }
473 
+				switch( $field->type ) {
519 474
520 
-                        break;
475 
+					case 'post_title':
476 
+					case 'post_content':
477 
+					case 'post_excerpt':
478 
+						$updated_post->{$field->type} = $value;
479 
+						break;
480 
+					case 'post_tags':
481 
+						wp_set_post_tags( $post_id, $value, false );
482 
+						break;
483 
+					case 'post_category':
521 484
522 
-                    case 'post_image':
485 
+						$categories = is_array( $value ) ? array_values( $value ) : (array)$value;
486 
+						$categories = array_filter( $categories );
523 487
524 
-                        $input_name = 'input_' . $field_id;
488 
+						wp_set_post_categories( $post_id, $categories, false );
525 489
526 
-                        if ( !empty( $_FILES[ $input_name ]['name'] ) ) {
490 
+						// if post_category is type checkbox, then value is an array of inputs
491 
+						if( isset( $value[ strval( $field_id ) ] ) ) {
492 
+							foreach( $value as $input_id => $val ) {
493 
+								$input_name = 'input_' . str_replace( '.', '_', $input_id );
494 
+								$entry[ strval( $input_id ) ] = RGFormsModel::prepare_value( $form, $field, $val, $input_name, $entry['id'], $entry );
495 
+							}
496 
+						} else {
497 
+							$input_name = 'input_' . str_replace( '.', '_', $field_id );
498 
+							$entry[ strval( $field_id ) ] = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], $entry );
499 
+						}
527 500
528 
-                            // We have a new image
501 
+						break;
502 
+					case 'post_custom_field':
529 503
530 
-                            $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] );
504 
+						$input_type = RGFormsModel::get_input_type( $field );
505 
+						$custom_field_name = $field->postCustomFieldName;
531 506
532 
-                            // is this field set as featured image, if not, leave
533 
-                            if ( ! $field->postFeaturedImage ) {
534 
-                                break;
535 
-                            }
507 
+						// Only certain custom field types are supported
508 
+						switch( $input_type ) {
509 
+							case 'fileupload':
510 
+							/** @noinspection PhpMissingBreakStatementInspection */
511 
+							case 'list':
512 
+								if( ! is_string( $value ) ) {
513 
+									$value = function_exists('wp_json_encode') ? wp_json_encode( $value ) : json_encode( $value );
514 
+								}
515 
+							// break; left intentionally out
516 
+							default:
517 
+								update_post_meta( $post_id, $custom_field_name, $value );
518 
+						}
536 519
537 
-                            $ary = ! empty( $value ) ? explode( '|:|', $value ) : array();
538 
-                            $img_url = rgar( $ary, 0 );
520 
+						break;
539 521
540 
-                            $img_title       = count( $ary ) > 1 ? $ary[1] : '';
541 
-                            $img_caption     = count( $ary ) > 2 ? $ary[2] : '';
542 
-                            $img_description = count( $ary ) > 3 ? $ary[3] : '';
522 
+					case 'post_image':
543 523
544 
-                            $image_meta = array(
545 
-                                'post_excerpt' => $img_caption,
546 
-                                'post_content' => $img_description,
547 
-                            );
524 
+						$input_name = 'input_' . $field_id;
548 525
549 
-                            //adding title only if it is not empty. It will default to the file name if it is not in the array
550 
-                            if ( ! empty( $img_title ) ) {
551 
-                                $image_meta['post_title'] = $img_title;
552 
-                            }
526 
+						if ( !empty( $_FILES[ $input_name ]['name'] ) ) {
553 527
554 
-                            //todo: As soon as \GFFormsModel::media_handle_upload becomes a public method, move this call to \GFFormsModel::media_handle_upload and remove the hack from this class.
555 
-                            require_once GRAVITYVIEW_DIR . 'includes/class-gravityview-gfformsmodel.php';
556 
-                            $media_id = GravityView_GFFormsModel::media_handle_upload( $img_url, $post_id, $image_meta );
528 
+							// We have a new image
557 529
558 
-                            if ( $media_id ) {
559 
-                                set_post_thumbnail( $post_id, $media_id );
560 
-                            }
530 
+							$value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] );
561 531
562 
-                            break;
532 
+							// is this field set as featured image, if not, leave
533 
+							if ( ! $field->postFeaturedImage ) {
534 
+								break;
535 
+							}
563 536
564 
-                        } elseif ( !empty( $_POST[ $input_name ] ) && is_array( $value ) ) {
537 
+							$ary = ! empty( $value ) ? explode( '|:|', $value ) : array();
538 
+							$img_url = rgar( $ary, 0 );
565 539
566 
-                            // Same image although the image title, caption or description might have changed
540 
+							$img_title       = count( $ary ) > 1 ? $ary[1] : '';
541 
+							$img_caption     = count( $ary ) > 2 ? $ary[2] : '';
542 
+							$img_description = count( $ary ) > 3 ? $ary[3] : '';
567 543
568 
-                            $ary = ! empty( $entry[ $field_id ] ) ? explode( '|:|', $entry[ $field_id ] ) : array();
569 
-                            $img_url = rgar( $ary, 0 );
544 
+							$image_meta = array(
545 
+								'post_excerpt' => $img_caption,
546 
+								'post_content' => $img_description,
547 
+							);
570 548
571 
-                            // is this really the same image or something went wrong ?
572 
-                            if( $img_url === $_POST[ $input_name ] ) {
549 
+							//adding title only if it is not empty. It will default to the file name if it is not in the array
550 
+							if ( ! empty( $img_title ) ) {
551 
+								$image_meta['post_title'] = $img_title;
552 
+							}
573 553
574 
-                                $img_title       = isset( $value[ $field_id .'.1' ] ) ? $value[ $field_id .'.1' ] : '';
575 
-                                $img_caption     = isset( $value[ $field_id .'.4' ] ) ? $value[ $field_id .'.4' ] : '';
576 
-                                $img_description = isset( $value[ $field_id .'.7' ] ) ? $value[ $field_id .'.7' ] : '';
554 
+							//todo: As soon as \GFFormsModel::media_handle_upload becomes a public method, move this call to \GFFormsModel::media_handle_upload and remove the hack from this class.
555 
+							require_once GRAVITYVIEW_DIR . 'includes/class-gravityview-gfformsmodel.php';
556 
+							$media_id = GravityView_GFFormsModel::media_handle_upload( $img_url, $post_id, $image_meta );
577 557
578 
-                                $value = ! empty( $img_url ) ? $img_url . "|:|" . $img_title . "|:|" . $img_caption . "|:|" . $img_description : '';
558 
+							if ( $media_id ) {
559 
+								set_post_thumbnail( $post_id, $media_id );
560 
+							}
579 561
580 
-                                if ( $field->postFeaturedImage ) {
562 
+							break;
581 563
582 
-                                    $image_meta = array(
583 
-                                        'ID' => get_post_thumbnail_id( $post_id ),
584 
-                                        'post_title' => $img_title,
585 
-                                        'post_excerpt' => $img_caption,
586 
-                                        'post_content' => $img_description,
587 
-                                    );
564 
+						} elseif ( !empty( $_POST[ $input_name ] ) && is_array( $value ) ) {
588 565
589 
-                                    // update image title, caption or description
590 
-                                    wp_update_post( $image_meta );
591 
-                                }
566 
+							// Same image although the image title, caption or description might have changed
592 567
593 
-                                break;
594 
-                            }
568 
+							$ary = ! empty( $entry[ $field_id ] ) ? explode( '|:|', $entry[ $field_id ] ) : array();
569 
+							$img_url = rgar( $ary, 0 );
595 570
596 
-                        }
571 
+							// is this really the same image or something went wrong ?
572 
+							if( $img_url === $_POST[ $input_name ] ) {
597 573
598 
-                        // if we get here, image was removed or not set.
574 
+								$img_title       = isset( $value[ $field_id .'.1' ] ) ? $value[ $field_id .'.1' ] : '';
575 
+								$img_caption     = isset( $value[ $field_id .'.4' ] ) ? $value[ $field_id .'.4' ] : '';
576 
+								$img_description = isset( $value[ $field_id .'.7' ] ) ? $value[ $field_id .'.7' ] : '';
599 577
600 
-                        $value = '';
601 
-                        if ( $field->postFeaturedImage ) {
602 
-                            delete_post_thumbnail( $post_id );
603 
-                        }
578 
+								$value = ! empty( $img_url ) ? $img_url . "|:|" . $img_title . "|:|" . $img_caption . "|:|" . $img_description : '';
604 579
605 
-                        break;
580 
+								if ( $field->postFeaturedImage ) {
606 581
607 
-                }
582 
+									$image_meta = array(
583 
+										'ID' => get_post_thumbnail_id( $post_id ),
584 
+										'post_title' => $img_title,
585 
+										'post_excerpt' => $img_caption,
586 
+										'post_content' => $img_description,
587 
+									);
608 588
609 
-                //ignore fields that have not changed
610 
-                if ( $value === rgget( (string) $field_id, $entry ) ) {
611 
-                    continue;
612 
-                }
589 
+									// update image title, caption or description
590 
+									wp_update_post( $image_meta );
591 
+								}
613 592
614 
-                // update entry
615 
-                if( 'post_category' !== $field->type ) {
616 
-                    $entry[ strval( $field_id ) ] = $value;
617 
-                }
593 
+								break;
594 
+							}
618 595
619 
-                $update_entry = true;
596 
+						}
620 597
621 
-            }
598 
+						// if we get here, image was removed or not set.
622 599
623 
-        }
600 
+						$value = '';
601 
+						if ( $field->postFeaturedImage ) {
602 
+							delete_post_thumbnail( $post_id );
603 
+						}
624 604
625 
-        if( $update_entry ) {
605 
+						break;
626 606
627 
-            $return_entry = GFAPI::update_entry( $entry );
607 
+				}
628 608
629 
-            if( is_wp_error( $return_entry ) ) {
630 
-                do_action( 'gravityview_log_error', 'Updating the entry post fields failed', $return_entry );
631 
-            } else {
632 
-                do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #'.$post_id.' succeeded' );
633 
-            }
609 
+				//ignore fields that have not changed
610 
+				if ( $value === rgget( (string) $field_id, $entry ) ) {
611 
+					continue;
612 
+				}
634 613
635 
-        }
614 
+				// update entry
615 
+				if( 'post_category' !== $field->type ) {
616 
+					$entry[ strval( $field_id ) ] = $value;
617 
+				}
636 618
637 
-        $return_post = wp_update_post( $updated_post, true );
619 
+				$update_entry = true;
638 620
639 
-        if( is_wp_error( $return_post ) ) {
640 
-            $return_post->add_data( $updated_post, '$updated_post' );
641 
-            do_action( 'gravityview_log_error', 'Updating the post content failed', $return_post );
642 
-        } else {
643 
-            do_action( 'gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded', $updated_post );
644 
-        }
621 
+			}
645 622
646 
-    }
623 
+		}
647 624
625 
+		if( $update_entry ) {
648 626
649 
-    /**
650 
-     * Perform actions normally performed after updating a lead
651 
-     *
652 
-     * @since 1.8
653 
-     *
654 
-     * @see GFEntryDetail::lead_detail_page()
655 
-     *
656 
-     * @return void
657 
-     */
658 
-    function after_update() {
627 
+			$return_entry = GFAPI::update_entry( $entry );
659 628
660 
-        do_action( 'gform_after_update_entry', $this->form, $this->entry['id'] );
661 
-        do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'] );
629 
+			if( is_wp_error( $return_entry ) ) {
630 
+				do_action( 'gravityview_log_error', 'Updating the entry post fields failed', $return_entry );
631 
+			} else {
632 
+				do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #'.$post_id.' succeeded' );
633 
+			}
662 634
663 
-        // Re-define the entry now that we've updated it.
664 
-        $entry = RGFormsModel::get_lead( $this->entry['id'] );
635 
+		}
665 636
666 
-        $entry = GFFormsModel::set_entry_meta( $entry, $this->form );
637 
+		$return_post = wp_update_post( $updated_post, true );
667 638
668 
-        // We need to clear the cache because Gravity Forms caches the field values, which
669 
-        // we have just updated.
670 
-        foreach ($this->form['fields'] as $key => $field) {
671 
-            GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id );
672 
-        }
639 
+		if( is_wp_error( $return_post ) ) {
640 
+			$return_post->add_data( $updated_post, '$updated_post' );
641 
+			do_action( 'gravityview_log_error', 'Updating the post content failed', $return_post );
642 
+		} else {
643 
+			do_action( 'gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded', $updated_post );
644 
+		}
673 645
674 
-        $this->entry = $entry;
675 
-    }
646 
+	}
676 647
677 648
678 
-    /**
679 
-     * Display the Edit Entry form
680 
-     *
681 
-     * @return [type] [description]
682 
-     */
683 
-    public function edit_entry_form() {
649 
+	/**
650 
+	 * Perform actions normally performed after updating a lead
651 
+	 *
652 
+	 * @since 1.8
653 
+	 *
654 
+	 * @see GFEntryDetail::lead_detail_page()
655 
+	 *
656 
+	 * @return void
657 
+	 */
658 
+	function after_update() {
659 
+
660 
+		do_action( 'gform_after_update_entry', $this->form, $this->entry['id'] );
661 
+		do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'] );
684 662
685 
-        ?>
663 
+		// Re-define the entry now that we've updated it.
664 
+		$entry = RGFormsModel::get_lead( $this->entry['id'] );
665 
+
666 
+		$entry = GFFormsModel::set_entry_meta( $entry, $this->form );
667 
+
668 
+		// We need to clear the cache because Gravity Forms caches the field values, which
669 
+		// we have just updated.
670 
+		foreach ($this->form['fields'] as $key => $field) {
671 
+			GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id );
672 
+		}
673 
+
674 
+		$this->entry = $entry;
675 
+	}
676 
+
677 
+
678 
+	/**
679 
+	 * Display the Edit Entry form
680 
+	 *
681 
+	 * @return [type] [description]
682 
+	 */
683 
+	public function edit_entry_form() {
684 
+
685 
+		?>
686 686
687 687 
         <div class="gv-edit-entry-wrapper"><?php
688 688
689 
-            $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this );
689 
+			$javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this );
690 690
691 
-            /**
692 
-             * Fixes weird wpautop() issue
693 
-             * @see https://github.com/katzwebservices/GravityView/issues/451
694 
-             */
695 
-            echo gravityview_strip_whitespace( $javascript );
691 
+			/**
692 
+			 * Fixes weird wpautop() issue
693 
+			 * @see https://github.com/katzwebservices/GravityView/issues/451
694 
+			 */
695 
+			echo gravityview_strip_whitespace( $javascript );
696 696
697 
-            ?><h2 class="gv-edit-entry-title">
697 
+			?><h2 class="gv-edit-entry-title">
698 698 
                 <span><?php
699 699
700 
-                    /**
701 
-                     * @filter `gravityview_edit_entry_title` Modify the edit entry title
702 
-                     * @param string $edit_entry_title Modify the "Edit Entry" title
703 
-                     * @param GravityView_Edit_Entry_Render $this This object
704 
-                     */
705 
-                    $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
700 
+					/**
701 
+					 * @filter `gravityview_edit_entry_title` Modify the edit entry title
702 
+					 * @param string $edit_entry_title Modify the "Edit Entry" title
703 
+					 * @param GravityView_Edit_Entry_Render $this This object
704 
+					 */
705 
+					$edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
706 706
707 
-                    echo esc_attr( $edit_entry_title );
708 
-            ?></span>
707 
+					echo esc_attr( $edit_entry_title );
708 
+			?></span>
709 709 
             </h2>
710 710
711 711 
             <?php $this->maybe_print_message(); ?>
 
@@ -716,672 +716,672 @@  discard block
 
 block discarded – undo
716 716
717 717 
                 <?php
718 718
719 
-                wp_nonce_field( self::$nonce_key, self::$nonce_key );
719 
+				wp_nonce_field( self::$nonce_key, self::$nonce_key );
720 720
721 
-                wp_nonce_field( self::$nonce_field, self::$nonce_field, false );
721 
+				wp_nonce_field( self::$nonce_field, self::$nonce_field, false );
722 722
723 
-                // Print the actual form HTML
724 
-                $this->render_edit_form();
723 
+				// Print the actual form HTML
724 
+				$this->render_edit_form();
725 725
726 
-                ?>
726 
+				?>
727 727 
             </form>
728 728
729 729 
         </div>
730 730
731 731 
     <?php
732 
-    }
733 
-
734 
-    /**
735 
-     * Display success or error message if the form has been submitted
736 
-     *
737 
-     * @uses GVCommon::generate_notice
738 
-     *
739 
-     * @since TODO
740 
-     *
741 
-     * @return void
742 
-     */
743 
-    private function maybe_print_message() {
744 
-
745 
-        if( rgpost('action') === 'update' ) {
746 
-
747 
-            $back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) );
748 
-
749 
-            if( ! $this->is_valid ){
750 
-
751 
-                // Keeping this compatible with Gravity Forms.
752 
-                $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>";
753 
-                $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form);
754 
-
755 
-                echo GVCommon::generate_notice( $message , 'gv-error' );
756 
-
757 
-            } else {
758 
-                $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. $back_link .'">', '</a>' );
759 
-
760 
-                /**
761 
-                 * @filter `gravityview/edit_entry/success` Modify the edit entry success message (including the anchor link)
762 
-                 * @since 1.5.4
763 
-                 * @param string $entry_updated_message Existing message
764 
-                 * @param int $view_id View ID
765 
-                 * @param array $entry Gravity Forms entry array
766 
-                 * @param string $back_link URL to return to the original entry. @since 1.6
767 
-                 */
768 
-                $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link );
769 
-
770 
-                echo GVCommon::generate_notice( $message );
771 
-            }
772 
-
773 
-        }
774 
-    }
775 
-
776 
-    /**
777 
-     * Display the Edit Entry form in the original Gravity Forms format
778 
-     *
779 
-     * @since 1.9
780 
-     *
781 
-     * @param $form
782 
-     * @param $lead
783 
-     * @param $view_id
784 
-     *
785 
-     * @return void
786 
-     */
787 
-    private function render_edit_form() {
788 
-
789 
-        add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 );
790 
-        add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') );
791 
-        add_filter( 'gform_disable_view_counter', '__return_true' );
792 
-
793 
-        add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 );
794 
-        add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 );
795 
-
796 
-        // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
797 
-        unset( $_GET['page'] );
798 
-
799 
-        // TODO: Make sure validation isn't handled by GF
800 
-        // TODO: Include CSS for file upload fields
801 
-        // TODO: Verify multiple-page forms
802 
-        // TODO: Product fields are not editable
803 
-        // TODO: Check Updated and Error messages
804 
-
805 
-        $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
806 
-
807 
-	    remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
808 
-        remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
809 
-        remove_filter( 'gform_disable_view_counter', '__return_true' );
810 
-        remove_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5 );
811 
-        remove_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10 );
812 
-
813 
-        echo $html;
814 
-    }
815 
-
816 
-    /**
817 
-     * Display the Update/Cancel/Delete buttons for the Edit Entry form
818 
-     * @since 1.8
819 
-     * @return string
820 
-     */
821 
-    public function render_form_buttons() {
822 
-        return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this );
823 
-    }
824 
-
825 
-
826 
-    /**
827 
-     * Modify the form fields that are shown when using GFFormDisplay::get_form()
828 
-     *
829 
-     * By default, all fields will be shown. We only want the Edit Tab configured fields to be shown.
830 
-     *
831 
-     * @param array $form
832 
-     * @param boolean $ajax Whether in AJAX mode
833 
-     * @param array|string $field_values Passed parameters to the form
834 
-     *
835 
-     * @since 1.9
836 
-     *
837 
-     * @return array Modified form array
838 
-     */
839 
-    public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) {
840 
-
841 
-        // In case we have validated the form, use it to inject the validation results into the form render
842 
-        if( isset( $this->form_after_validation ) ) {
843 
-            $form = $this->form_after_validation;
844 
-        } else {
845 
-            $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id );
846 
-        }
847 
-
848 
-        $form = $this->filter_conditional_logic( $form );
849 
-
850 
-        // for now we don't support Save and Continue feature.
851 
-        if( ! self::$supports_save_and_continue ) {
852 
-	        unset( $form['save'] );
853 
-        }
854 
-
855 
-        return $form;
856 
-    }
857 
-
858 
-    /**
859 
-     * When displaying a field, check if it's a Post Field, and if so, make sure the post exists and current user has edit rights.
860 
-     *
861 
-     * @since TODO
862 
-     *
863 
-     * @param string $field_content Always empty. Returning not-empty overrides the input.
864 
-     * @param GF_Field $field
865 
-     * @param string|array $value If array, it's a field with multiple inputs. If string, single input.
866 
-     * @param int $lead_id Lead ID. Always 0 for the `gform_field_input` filter.
867 
-     * @param int $form_id Form ID
868 
-     *
869 
-     * @return string If error, the error message. If no error, blank string (modify_edit_field_input() runs next)
870 
-     */
871 
-    function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) {
872 
-
873 
-        if( GFCommon::is_post_field( $field ) ) {
874 
-
875 
-            $message = null;
876 
-
877 
-            // First, make sure they have the capability to edit the post.
878 
-            if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
879 
-
880 
-                /**
881 
-                 * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
882 
-                 * @param string $message The existing "You don't have permission..." text
883 
-                 */
884 
-                $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
885 
-
886 
-            } elseif( null === get_post( $this->entry['post_id'] ) ) {
887 
-                /**
888 
-                 * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
889 
-                 * @param string $message The existing "This field is not editable; the post no longer exists." text
890 
-                 */
891 
-                $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
892 
-            }
893 
-
894 
-            if( $message ) {
895 
-                $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
896 
-            }
897 
-        }
898 
-
899 
-        return $field_content;
900 
-    }
901 
-
902 
-    /**
903 
-     *
904 
-     * Fill-in the saved values into the form inputs
905 
-     *
906 
-     * @param string $field_content Always empty. Returning not-empty overrides the input.
907 
-     * @param GF_Field $field
908 
-     * @param string|array $value If array, it's a field with multiple inputs. If string, single input.
909 
-     * @param int $lead_id Lead ID. Always 0 for the `gform_field_input` filter.
910 
-     * @param int $form_id Form ID
911 
-     *
912 
-     * @return mixed
913 
-     */
914 
-    function modify_edit_field_input( $field_content = '', $field, $value, $lead_id = 0, $form_id ) {
915 
-
916 
-        $gv_field = GravityView_Fields::get_associated_field( $field );
917 
-
918 
-        // If the form has been submitted, then we don't need to pre-fill the values,
919 
-        // Except for fileupload type and when a field input is overridden- run always!!
920 
-        if(
921 
-            ( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) )
922 
-            && false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) )
923 
-            || ! empty( $field_content )
924 
-            || GFCommon::is_product_field( $field->type ) // Prevent product fields from appearing editable
925 
-        ) {
926 
-	        return $field_content;
927 
-        }
928 
-
929 
-        // Turn on Admin-style display for file upload fields only
930 
-        if( 'fileupload' === $field->type ) {
931 
-            $_GET['page'] = 'gf_entries';
932 
-        }
933 
-
934 
-        // SET SOME FIELD DEFAULTS TO PREVENT ISSUES
935 
-        $field->adminOnly = false; /** @see GFFormDisplay::get_counter_init_script() need to prevent adminOnly */
936 
-
937 
-        // add categories as choices for Post Category field
938 
-        if ( 'post_category' === $field->type ) {
939 
-            $field = GFCommon::add_categories_as_choices( $field, $value );
940 
-        }
941 
-
942 
-        $field_value = $this->get_field_value( $field );
943 
-
944 
-        /**
945 
-         * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
946 
-         * @since 1.11
947 
-         * @param mixed $field_value field value used to populate the input
948 
-         * @param object $field Gravity Forms field object ( Class GF_Field )
949 
-         */
950 
-        $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field );
951 
-
952 
-	    // Prevent any PHP warnings, like undefined index
953 
-	    ob_start();
954 
-
955 
-        if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
956 
-            $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
957 
-        } else {
958 
-	        $return = $field->get_field_input( $this->form, $field_value, $this->entry );
959 
-        }
960 
-
961 
-
962 
-	    // If there was output, it's an error
963 
-	    $warnings = ob_get_clean();
964 
-
965 
-	    if( !empty( $warnings ) ) {
966 
-		    do_action( 'gravityview_log_error', __METHOD__ . $warnings, $field_value );
967 
-	    }
968 
-
969 
-        /**
970 
-         * Unset hack $_GET['page'] = 'gf_entries'
971 
-         * We need the fileupload html field to render with the proper id
972 
-         *  ( <li id="field_80_16" ... > )
973 
-         */
974 
-        unset( $_GET['page'] );
975 
-
976 
-        return $return;
977 
-    }
978 
-
979 
-    /**
980 
-     * Modify the value for the current field input
981 
-     *
982 
-     * @param GF_Field $field
983 
-     *
984 
-     * @return array|mixed|string|void
985 
-     */
986 
-    private function get_field_value( $field ) {
987 
-
988 
-        /**
989 
-         * @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.
990 
-         * @param boolean True: override saved values; False: don't override (default)
991 
-         * @param $field GF_Field object Gravity Forms field object
992 
-         * @since 1.13
993 
-         */
994 
-        $override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field );
995 
-
996 
-        // We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs)
997 
-        if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) {
998 
-
999 
-            $field_value = array();
1000 
-
1001 
-            // only accept pre-populated values if the field doesn't have any choice selected.
1002 
-            $allow_pre_populated = $field->allowsPrepopulate;
1003 
-
1004 
-            foreach ( (array)$field->inputs as $input ) {
1005 
-
1006 
-                $input_id = strval( $input['id'] );
732 
+	}
733 
+
734 
+	/**
735 
+	 * Display success or error message if the form has been submitted
736 
+	 *
737 
+	 * @uses GVCommon::generate_notice
738 
+	 *
739 
+	 * @since TODO
740 
+	 *
741 
+	 * @return void
742 
+	 */
743 
+	private function maybe_print_message() {
744 
+
745 
+		if( rgpost('action') === 'update' ) {
746 
+
747 
+			$back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) );
748 
+
749 
+			if( ! $this->is_valid ){
750 
+
751 
+				// Keeping this compatible with Gravity Forms.
752 
+				$validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>";
753 
+				$message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form);
754 
+
755 
+				echo GVCommon::generate_notice( $message , 'gv-error' );
756 
+
757 
+			} else {
758 
+				$entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. $back_link .'">', '</a>' );
759 
+
760 
+				/**
761 
+				 * @filter `gravityview/edit_entry/success` Modify the edit entry success message (including the anchor link)
762 
+				 * @since 1.5.4
763 
+				 * @param string $entry_updated_message Existing message
764 
+				 * @param int $view_id View ID
765 
+				 * @param array $entry Gravity Forms entry array
766 
+				 * @param string $back_link URL to return to the original entry. @since 1.6
767 
+				 */
768 
+				$message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link );
769 
+
770 
+				echo GVCommon::generate_notice( $message );
771 
+			}
772 
+
773 
+		}
774 
+	}
775 
+
776 
+	/**
777 
+	 * Display the Edit Entry form in the original Gravity Forms format
778 
+	 *
779 
+	 * @since 1.9
780 
+	 *
781 
+	 * @param $form
782 
+	 * @param $lead
783 
+	 * @param $view_id
784 
+	 *
785 
+	 * @return void
786 
+	 */
787 
+	private function render_edit_form() {
788 
+
789 
+		add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 );
790 
+		add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') );
791 
+		add_filter( 'gform_disable_view_counter', '__return_true' );
792 
+
793 
+		add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 );
794 
+		add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 );
795 
+
796 
+		// We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
797 
+		unset( $_GET['page'] );
798 
+
799 
+		// TODO: Make sure validation isn't handled by GF
800 
+		// TODO: Include CSS for file upload fields
801 
+		// TODO: Verify multiple-page forms
802 
+		// TODO: Product fields are not editable
803 
+		// TODO: Check Updated and Error messages
804 
+
805 
+		$html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
806 
+
807 
+		remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
808 
+		remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
809 
+		remove_filter( 'gform_disable_view_counter', '__return_true' );
810 
+		remove_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5 );
811 
+		remove_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10 );
812 
+
813 
+		echo $html;
814 
+	}
815 
+
816 
+	/**
817 
+	 * Display the Update/Cancel/Delete buttons for the Edit Entry form
818 
+	 * @since 1.8
819 
+	 * @return string
820 
+	 */
821 
+	public function render_form_buttons() {
822 
+		return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this );
823 
+	}
824 
+
825 
+
826 
+	/**
827 
+	 * Modify the form fields that are shown when using GFFormDisplay::get_form()
828 
+	 *
829 
+	 * By default, all fields will be shown. We only want the Edit Tab configured fields to be shown.
830 
+	 *
831 
+	 * @param array $form
832 
+	 * @param boolean $ajax Whether in AJAX mode
833 
+	 * @param array|string $field_values Passed parameters to the form
834 
+	 *
835 
+	 * @since 1.9
836 
+	 *
837 
+	 * @return array Modified form array
838 
+	 */
839 
+	public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) {
840 
+
841 
+		// In case we have validated the form, use it to inject the validation results into the form render
842 
+		if( isset( $this->form_after_validation ) ) {
843 
+			$form = $this->form_after_validation;
844 
+		} else {
845 
+			$form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id );
846 
+		}
847 
+
848 
+		$form = $this->filter_conditional_logic( $form );
849 
+
850 
+		// for now we don't support Save and Continue feature.
851 
+		if( ! self::$supports_save_and_continue ) {
852 
+			unset( $form['save'] );
853 
+		}
854 
+
855 
+		return $form;
856 
+	}
857 
+
858 
+	/**
859 
+	 * When displaying a field, check if it's a Post Field, and if so, make sure the post exists and current user has edit rights.
860 
+	 *
861 
+	 * @since TODO
862 
+	 *
863 
+	 * @param string $field_content Always empty. Returning not-empty overrides the input.
864 
+	 * @param GF_Field $field
865 
+	 * @param string|array $value If array, it's a field with multiple inputs. If string, single input.
866 
+	 * @param int $lead_id Lead ID. Always 0 for the `gform_field_input` filter.
867 
+	 * @param int $form_id Form ID
868 
+	 *
869 
+	 * @return string If error, the error message. If no error, blank string (modify_edit_field_input() runs next)
870 
+	 */
871 
+	function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) {
872 
+
873 
+		if( GFCommon::is_post_field( $field ) ) {
874 
+
875 
+			$message = null;
876 
+
877 
+			// First, make sure they have the capability to edit the post.
878 
+			if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
879 
+
880 
+				/**
881 
+				 * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
882 
+				 * @param string $message The existing "You don't have permission..." text
883 
+				 */
884 
+				$message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
885 
+
886 
+			} elseif( null === get_post( $this->entry['post_id'] ) ) {
887 
+				/**
888 
+				 * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
889 
+				 * @param string $message The existing "This field is not editable; the post no longer exists." text
890 
+				 */
891 
+				$message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
892 
+			}
893 
+
894 
+			if( $message ) {
895 
+				$field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
896 
+			}
897 
+		}
898 
+
899 
+		return $field_content;
900 
+	}
901 
+
902 
+	/**
903 
+	 *
904 
+	 * Fill-in the saved values into the form inputs
905 
+	 *
906 
+	 * @param string $field_content Always empty. Returning not-empty overrides the input.
907 
+	 * @param GF_Field $field
908 
+	 * @param string|array $value If array, it's a field with multiple inputs. If string, single input.
909 
+	 * @param int $lead_id Lead ID. Always 0 for the `gform_field_input` filter.
910 
+	 * @param int $form_id Form ID
911 
+	 *
912 
+	 * @return mixed
913 
+	 */
914 
+	function modify_edit_field_input( $field_content = '', $field, $value, $lead_id = 0, $form_id ) {
915 
+
916 
+		$gv_field = GravityView_Fields::get_associated_field( $field );
917 
+
918 
+		// If the form has been submitted, then we don't need to pre-fill the values,
919 
+		// Except for fileupload type and when a field input is overridden- run always!!
920 
+		if(
921 
+			( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) )
922 
+			&& false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) )
923 
+			|| ! empty( $field_content )
924 
+			|| GFCommon::is_product_field( $field->type ) // Prevent product fields from appearing editable
925 
+		) {
926 
+			return $field_content;
927 
+		}
928 
+
929 
+		// Turn on Admin-style display for file upload fields only
930 
+		if( 'fileupload' === $field->type ) {
931 
+			$_GET['page'] = 'gf_entries';
932 
+		}
933 
+
934 
+		// SET SOME FIELD DEFAULTS TO PREVENT ISSUES
935 
+		$field->adminOnly = false; /** @see GFFormDisplay::get_counter_init_script() need to prevent adminOnly */
936 
+
937 
+		// add categories as choices for Post Category field
938 
+		if ( 'post_category' === $field->type ) {
939 
+			$field = GFCommon::add_categories_as_choices( $field, $value );
940 
+		}
941 
+
942 
+		$field_value = $this->get_field_value( $field );
943 
+
944 
+		/**
945 
+		 * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
946 
+		 * @since 1.11
947 
+		 * @param mixed $field_value field value used to populate the input
948 
+		 * @param object $field Gravity Forms field object ( Class GF_Field )
949 
+		 */
950 
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field );
951 
+
952 
+		// Prevent any PHP warnings, like undefined index
953 
+		ob_start();
954 
+
955 
+		if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
956 
+			$return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
957 
+		} else {
958 
+			$return = $field->get_field_input( $this->form, $field_value, $this->entry );
959 
+		}
960 
+
961 
+
962 
+		// If there was output, it's an error
963 
+		$warnings = ob_get_clean();
964 
+
965 
+		if( !empty( $warnings ) ) {
966 
+			do_action( 'gravityview_log_error', __METHOD__ . $warnings, $field_value );
967 
+		}
968 
+
969 
+		/**
970 
+		 * Unset hack $_GET['page'] = 'gf_entries'
971 
+		 * We need the fileupload html field to render with the proper id
972 
+		 *  ( <li id="field_80_16" ... > )
973 
+		 */
974 
+		unset( $_GET['page'] );
975 
+
976 
+		return $return;
977 
+	}
978 
+
979 
+	/**
980 
+	 * Modify the value for the current field input
981 
+	 *
982 
+	 * @param GF_Field $field
983 
+	 *
984 
+	 * @return array|mixed|string|void
985 
+	 */
986 
+	private function get_field_value( $field ) {
987 
+
988 
+		/**
989 
+		 * @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.
990 
+		 * @param boolean True: override saved values; False: don't override (default)
991 
+		 * @param $field GF_Field object Gravity Forms field object
992 
+		 * @since 1.13
993 
+		 */
994 
+		$override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field );
995 
+
996 
+		// We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs)
997 
+		if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) {
998 
+
999 
+			$field_value = array();
1000 
+
1001 
+			// only accept pre-populated values if the field doesn't have any choice selected.
1002 
+			$allow_pre_populated = $field->allowsPrepopulate;
1003 
+
1004 
+			foreach ( (array)$field->inputs as $input ) {
1005 
+
1006 
+				$input_id = strval( $input['id'] );
1007 1007
1008 
-                if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) {
1009 
-                    $field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
1010 
-                    $allow_pre_populated = false;
1011 
-                }
1008 
+				if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) {
1009 
+					$field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
1010 
+					$allow_pre_populated = false;
1011 
+				}
1012 1012
1013 
-            }
1013 
+			}
1014 1014
1015 
-            $pre_value = $field->get_value_submission( array(), false );
1015 
+			$pre_value = $field->get_value_submission( array(), false );
1016 1016
1017 
-            $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value;
1017 
+			$field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value;
1018 1018
1019 
-        } else {
1019 
+		} else {
1020 1020
1021 
-            $id = intval( $field->id );
1021 
+			$id = intval( $field->id );
1022 1022
1023 
-            // get pre-populated value if exists
1024 
-            $pre_value = $field->allowsPrepopulate ? GFFormsModel::get_parameter_value( $field->inputName, array(), $field ) : '';
1023 
+			// get pre-populated value if exists
1024 
+			$pre_value = $field->allowsPrepopulate ? GFFormsModel::get_parameter_value( $field->inputName, array(), $field ) : '';
1025 1025
1026 
-            // saved field entry value (if empty, fallback to the pre-populated value, if exists)
1027 
-            // or pre-populated value if not empty and set to override saved value
1028 
-            $field_value = !gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value;
1026 
+			// saved field entry value (if empty, fallback to the pre-populated value, if exists)
1027 
+			// or pre-populated value if not empty and set to override saved value
1028 
+			$field_value = !gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value;
1029 1029
1030 
-            // in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs.
1031 
-            if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) {
1032 
-                $categories = array();
1033 
-                foreach ( explode( ',', $field_value ) as $cat_string ) {
1034 
-                    $categories[] = GFCommon::format_post_category( $cat_string, true );
1035 
-                }
1036 
-                $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
1037 
-            }
1030 
+			// in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs.
1031 
+			if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) {
1032 
+				$categories = array();
1033 
+				foreach ( explode( ',', $field_value ) as $cat_string ) {
1034 
+					$categories[] = GFCommon::format_post_category( $cat_string, true );
1035 
+				}
1036 
+				$field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
1037 
+			}
1038 1038
1039 
-        }
1039 
+		}
1040 1040
1041 
-        // if value is empty get the default value if defined
1042 
-        $field_value = $field->get_value_default_if_empty( $field_value );
1041 
+		// if value is empty get the default value if defined
1042 
+		$field_value = $field->get_value_default_if_empty( $field_value );
1043 1043
1044 
-        return $field_value;
1045 
-    }
1044 
+		return $field_value;
1045 
+	}
1046 1046
1047 1047
1048 
-    // ---- Entry validation
1048 
+	// ---- Entry validation
1049 1049
1050 
-    /**
1051 
-     * Add field keys that Gravity Forms expects.
1052 
-     *
1053 
-     * @see GFFormDisplay::validate()
1054 
-     * @param  array $form GF Form
1055 
-     * @return array       Modified GF Form
1056 
-     */
1057 
-    function gform_pre_validation( $form ) {
1050 
+	/**
1051 
+	 * Add field keys that Gravity Forms expects.
1052 
+	 *
1053 
+	 * @see GFFormDisplay::validate()
1054 
+	 * @param  array $form GF Form
1055 
+	 * @return array       Modified GF Form
1056 
+	 */
1057 
+	function gform_pre_validation( $form ) {
1058 1058
1059 
-        if( ! $this->verify_nonce() ) {
1060 
-            return $form;
1061 
-        }
1059 
+		if( ! $this->verify_nonce() ) {
1060 
+			return $form;
1061 
+		}
1062 1062
1063 
-        // Fix PHP warning regarding undefined index.
1064 
-        foreach ( $form['fields'] as &$field) {
1063 
+		// Fix PHP warning regarding undefined index.
1064 
+		foreach ( $form['fields'] as &$field) {
1065 1065
1066 
-            // This is because we're doing admin form pretending to be front-end, so Gravity Forms
1067 
-            // expects certain field array items to be set.
1068 
-            foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) {
1069 
-	            $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
1070 
-            }
1066 
+			// This is because we're doing admin form pretending to be front-end, so Gravity Forms
1067 
+			// expects certain field array items to be set.
1068 
+			foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) {
1069 
+				$field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
1070 
+			}
1071 1071
1072 
-            // unset emailConfirmEnabled for email type fields
1073 
-           /* if( 'email' === $field['type'] && !empty( $field['emailConfirmEnabled'] ) ) {
1072 
+			// unset emailConfirmEnabled for email type fields
1073 
+		   /* if( 'email' === $field['type'] && !empty( $field['emailConfirmEnabled'] ) ) {
1074 1074 
                 $field['emailConfirmEnabled'] = '';
1075 1075 
             }*/
1076 1076
1077 
-            switch( RGFormsModel::get_input_type( $field ) ) {
1077 
+			switch( RGFormsModel::get_input_type( $field ) ) {
1078 
+
1079 
+				/**
1080 
+				 * 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.
1081 
+				 *
1082 
+				 * 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.
1083 
+				 *
1084 
+				 * @hack
1085 
+				 */
1086 
+				case 'fileupload':
1087 
+
1088 
+					// Set the previous value
1089 
+					$entry = $this->get_entry();
1090 
+
1091 
+					$input_name = 'input_'.$field->id;
1092 
+					$form_id = $form['id'];
1078 1093
1079 
-                /**
1080 
-                 * 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.
1081 
-                 *
1082 
-                 * 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.
1083 
-                 *
1084 
-                 * @hack
1085 
-                 */
1086 
-                case 'fileupload':
1087 
-
1088 
-                    // Set the previous value
1089 
-                    $entry = $this->get_entry();
1090 
-
1091 
-                    $input_name = 'input_'.$field->id;
1092 
-                    $form_id = $form['id'];
1093 
-
1094 
-                    $value = NULL;
1095 
-
1096 
-                    // Use the previous entry value as the default.
1097 
-                    if( isset( $entry[ $field->id ] ) ) {
1098 
-                        $value = $entry[ $field->id ];
1099 
-                    }
1094 
+					$value = NULL;
1100 1095
1101 
-                    // If this is a single upload file
1102 
-                    if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
1103 
-                        $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
1104 
-                        $value = $file_path['url'];
1096 
+					// Use the previous entry value as the default.
1097 
+					if( isset( $entry[ $field->id ] ) ) {
1098 
+						$value = $entry[ $field->id ];
1099 
+					}
1105 1100
1106 
-                    } else {
1107 
-
1108 
-                        // Fix PHP warning on line 1498 of form_display.php for post_image fields
1109 
-                        // Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
1110 
-                        $_FILES[ $input_name ] = array('name' => '', 'size' => '' );
1111 
-
1112 
-                    }
1113 
-
1114 
-                    if( rgar($field, "multipleFiles") ) {
1115 
-
1116 
-                        // If there are fresh uploads, process and merge them.
1117 
-                        // Otherwise, use the passed values, which should be json-encoded array of URLs
1118 
-                        if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
1119 
-                            $value = empty( $value ) ? '[]' : $value;
1120 
-                            $value = stripslashes_deep( $value );
1121 
-                            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
1122 
-                        }
1101 
+					// If this is a single upload file
1102 
+					if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
1103 
+						$file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
1104 
+						$value = $file_path['url'];
1123 1105
1124 
-                    } else {
1106 
+					} else {
1125 1107
1126 
-                        // A file already exists when editing an entry
1127 
-                        // We set this to solve issue when file upload fields are required.
1128 
-                        GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
1108 
+						// Fix PHP warning on line 1498 of form_display.php for post_image fields
1109 
+						// Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
1110 
+						$_FILES[ $input_name ] = array('name' => '', 'size' => '' );
1129 1111
1130 
-                    }
1112 
+					}
1131 1113
1132 
-                    $this->entry[ $input_name ] = $value;
1133 
-                    $_POST[ $input_name ] = $value;
1114 
+					if( rgar($field, "multipleFiles") ) {
1134 1115
1135 
-                    break;
1116 
+						// If there are fresh uploads, process and merge them.
1117 
+						// Otherwise, use the passed values, which should be json-encoded array of URLs
1118 
+						if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
1119 
+							$value = empty( $value ) ? '[]' : $value;
1120 
+							$value = stripslashes_deep( $value );
1121 
+							$value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
1122 
+						}
1136 1123
1137 
-                case 'number':
1138 
-                    // Fix "undefined index" issue at line 1286 in form_display.php
1139 
-                    if( !isset( $_POST['input_'.$field->id ] ) ) {
1140 
-                        $_POST['input_'.$field->id ] = NULL;
1141 
-                    }
1142 
-                    break;
1143 
-                case 'captcha':
1144 
-                    // Fix issue with recaptcha_check_answer() on line 1458 in form_display.php
1145 
-                    $_POST['recaptcha_challenge_field'] = NULL;
1146 
-                    $_POST['recaptcha_response_field'] = NULL;
1147 
-                    break;
1148 
-            }
1124 
+					} else {
1149 1125
1150 
-        }
1126 
+						// A file already exists when editing an entry
1127 
+						// We set this to solve issue when file upload fields are required.
1128 
+						GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
1151 1129
1152 
-        return $form;
1153 
-    }
1130 
+					}
1154 1131
1132 
+					$this->entry[ $input_name ] = $value;
1133 
+					$_POST[ $input_name ] = $value;
1155 1134
1156 
-    /**
1157 
-     * Process validation for a edit entry submission
1158 
-     *
1159 
-     * Sets the `is_valid` object var
1160 
-     *
1161 
-     * @return void
1162 
-     */
1163 
-    function validate() {
1135 
+					break;
1164 1136
1165 
-        /**
1166 
-         * If using GF User Registration Add-on, remove the validation step, otherwise generates error when updating the entry
1167 
-         * GF User Registration Add-on version > 3.x has a different class name
1168 
-         * @since 1.16.2
1169 
-         */
1170 
-        if ( class_exists( 'GF_User_Registration' ) ) {
1171 
-            remove_filter( 'gform_validation', array( GF_User_Registration::get_instance(), 'validate' ) );
1172 
-        } else  if ( class_exists( 'GFUser' ) ) {
1173 
-            remove_filter( 'gform_validation', array( 'GFUser', 'user_registration_validation' ) );
1174 
-        }
1137 
+				case 'number':
1138 
+					// Fix "undefined index" issue at line 1286 in form_display.php
1139 
+					if( !isset( $_POST['input_'.$field->id ] ) ) {
1140 
+						$_POST['input_'.$field->id ] = NULL;
1141 
+					}
1142 
+					break;
1143 
+				case 'captcha':
1144 
+					// Fix issue with recaptcha_check_answer() on line 1458 in form_display.php
1145 
+					$_POST['recaptcha_challenge_field'] = NULL;
1146 
+					$_POST['recaptcha_response_field'] = NULL;
1147 
+					break;
1148 
+			}
1175 1149
1150 
+		}
1176 1151
1177 
-        /**
1178 
-         * For some crazy reason, Gravity Forms doesn't validate Edit Entry form submissions.
1179 
-         * You can enter whatever you want!
1180 
-         * We try validating, and customize the results using `self::custom_validation()`
1181 
-         */
1182 
-        add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4);
1152 
+		return $form;
1153 
+	}
1183 1154
1184 
-        // Needed by the validate funtion
1185 
-        $failed_validation_page = NULL;
1186 
-        $field_values = RGForms::post( 'gform_field_values' );
1187 1155
1188 
-        // Prevent entry limit from running when editing an entry, also
1189 
-        // prevent form scheduling from preventing editing
1190 
-        unset( $this->form['limitEntries'], $this->form['scheduleForm'] );
1156 
+	/**
1157 
+	 * Process validation for a edit entry submission
1158 
+	 *
1159 
+	 * Sets the `is_valid` object var
1160 
+	 *
1161 
+	 * @return void
1162 
+	 */
1163 
+	function validate() {
1164 
+
1165 
+		/**
1166 
+		 * If using GF User Registration Add-on, remove the validation step, otherwise generates error when updating the entry
1167 
+		 * GF User Registration Add-on version > 3.x has a different class name
1168 
+		 * @since 1.16.2
1169 
+		 */
1170 
+		if ( class_exists( 'GF_User_Registration' ) ) {
1171 
+			remove_filter( 'gform_validation', array( GF_User_Registration::get_instance(), 'validate' ) );
1172 
+		} else  if ( class_exists( 'GFUser' ) ) {
1173 
+			remove_filter( 'gform_validation', array( 'GFUser', 'user_registration_validation' ) );
1174 
+		}
1191 1175
1192 
-        // Hide fields depending on Edit Entry settings
1193 
-        $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id );
1194 1176
1195 
-        $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page );
1177 
+		/**
1178 
+		 * For some crazy reason, Gravity Forms doesn't validate Edit Entry form submissions.
1179 
+		 * You can enter whatever you want!
1180 
+		 * We try validating, and customize the results using `self::custom_validation()`
1181 
+		 */
1182 
+		add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4);
1196 1183
1197 
-        remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 );
1198 
-    }
1184 
+		// Needed by the validate funtion
1185 
+		$failed_validation_page = NULL;
1186 
+		$field_values = RGForms::post( 'gform_field_values' );
1199 1187
1188 
+		// Prevent entry limit from running when editing an entry, also
1189 
+		// prevent form scheduling from preventing editing
1190 
+		unset( $this->form['limitEntries'], $this->form['scheduleForm'] );
1200 1191
1201 
-    /**
1202 
-     * Make validation work for Edit Entry
1203 
-     *
1204 
-     * Because we're calling the GFFormDisplay::validate() in an unusual way (as a front-end
1205 
-     * form pretending to be a back-end form), validate() doesn't know we _can't_ edit post
1206 
-     * fields. This goes through all the fields and if they're an invalid post field, we
1207 
-     * set them as valid. If there are still issues, we'll return false.
1208 
-     *
1209 
-     * @param  [type] $validation_results [description]
1210 
-     * @return [type]                     [description]
1211 
-     */
1212 
-    function custom_validation( $validation_results ) {
1192 
+		// Hide fields depending on Edit Entry settings
1193 
+		$this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id );
1213 1194
1214 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results );
1195 
+		$this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page );
1215 1196
1216 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
1197 
+		remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 );
1198 
+	}
1217 1199
1218 
-        $gv_valid = true;
1219 1200
1220 
-        foreach ( $validation_results['form']['fields'] as $key => &$field ) {
1201 
+	/**
1202 
+	 * Make validation work for Edit Entry
1203 
+	 *
1204 
+	 * Because we're calling the GFFormDisplay::validate() in an unusual way (as a front-end
1205 
+	 * form pretending to be a back-end form), validate() doesn't know we _can't_ edit post
1206 
+	 * fields. This goes through all the fields and if they're an invalid post field, we
1207 
+	 * set them as valid. If there are still issues, we'll return false.
1208 
+	 *
1209 
+	 * @param  [type] $validation_results [description]
1210 
+	 * @return [type]                     [description]
1211 
+	 */
1212 
+	function custom_validation( $validation_results ) {
1221 1213
1222 
-            $value = RGFormsModel::get_field_value( $field );
1223 
-            $field_type = RGFormsModel::get_input_type( $field );
1214 
+		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results );
1224 1215
1225 
-            // Validate always
1226 
-            switch ( $field_type ) {
1216 
+		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
1227 1217
1218 
+		$gv_valid = true;
1228 1219
1229 
-                case 'fileupload' :
1230 
-                case 'post_image':
1220 
+		foreach ( $validation_results['form']['fields'] as $key => &$field ) {
1231 1221
1232 
-                    // in case nothing is uploaded but there are already files saved
1233 
-                    if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
1234 
-                        $field->failed_validation = false;
1235 
-                        unset( $field->validation_message );
1236 
-                    }
1222 
+			$value = RGFormsModel::get_field_value( $field );
1223 
+			$field_type = RGFormsModel::get_input_type( $field );
1237 1224
1238 
-                    // validate if multi file upload reached max number of files [maxFiles] => 2
1239 
-                    if( rgobj( $field, 'maxFiles') && rgobj( $field, 'multipleFiles') ) {
1225 
+			// Validate always
1226 
+			switch ( $field_type ) {
1240 1227
1241 
-                        $input_name = 'input_' . $field->id;
1242 
-                        //uploaded
1243 
-                        $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
1244 1228
1245 
-                        //existent
1246 
-                        $entry = $this->get_entry();
1247 
-                        $value = NULL;
1248 
-                        if( isset( $entry[ $field->id ] ) ) {
1249 
-                            $value = json_decode( $entry[ $field->id ], true );
1250 
-                        }
1229 
+				case 'fileupload' :
1230 
+				case 'post_image':
1251 1231
1252 
-                        // count uploaded files and existent entry files
1253 
-                        $count_files = count( $file_names ) + count( $value );
1232 
+					// in case nothing is uploaded but there are already files saved
1233 
+					if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
1234 
+						$field->failed_validation = false;
1235 
+						unset( $field->validation_message );
1236 
+					}
1254 1237
1255 
-                        if( $count_files > $field->maxFiles ) {
1256 
-                            $field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
1257 
-                            $field->failed_validation = 1;
1258 
-                            $gv_valid = false;
1238 
+					// validate if multi file upload reached max number of files [maxFiles] => 2
1239 
+					if( rgobj( $field, 'maxFiles') && rgobj( $field, 'multipleFiles') ) {
1259 1240
1260 
-                            // in case of error make sure the newest upload files are removed from the upload input
1261 
-                            GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
1262 
-                        }
1241 
+						$input_name = 'input_' . $field->id;
1242 
+						//uploaded
1243 
+						$file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
1263 1244
1264 
-                    }
1245 
+						//existent
1246 
+						$entry = $this->get_entry();
1247 
+						$value = NULL;
1248 
+						if( isset( $entry[ $field->id ] ) ) {
1249 
+							$value = json_decode( $entry[ $field->id ], true );
1250 
+						}
1265 1251
1252 
+						// count uploaded files and existent entry files
1253 
+						$count_files = count( $file_names ) + count( $value );
1266 1254
1267 
-                    break;
1255 
+						if( $count_files > $field->maxFiles ) {
1256 
+							$field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
1257 
+							$field->failed_validation = 1;
1258 
+							$gv_valid = false;
1268 1259
1269 
-            }
1260 
+							// in case of error make sure the newest upload files are removed from the upload input
1261 
+							GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
1262 
+						}
1270 1263
1271 
-            // This field has failed validation.
1272 
-            if( !empty( $field->failed_validation ) ) {
1264 
+					}
1273 1265
1274 
-                do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'field' => $field, 'value' => $value ) );
1275 1266
1276 
-                switch ( $field_type ) {
1267 
+					break;
1277 1268
1278 
-                    // Captchas don't need to be re-entered.
1279 
-                    case 'captcha':
1269 
+			}
1280 1270
1281 
-                        // Post Image fields aren't editable, so we un-fail them.
1282 
-                    case 'post_image':
1283 
-                        $field->failed_validation = false;
1284 
-                        unset( $field->validation_message );
1285 
-                        break;
1271 
+			// This field has failed validation.
1272 
+			if( !empty( $field->failed_validation ) ) {
1286 1273
1287 
-                }
1274 
+				do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'field' => $field, 'value' => $value ) );
1288 1275
1289 
-                // You can't continue inside a switch, so we do it after.
1290 
-                if( empty( $field->failed_validation ) ) {
1291 
-                    continue;
1292 
-                }
1276 
+				switch ( $field_type ) {
1293 1277
1294 
-                // checks if the No Duplicates option is not validating entry against itself, since
1295 
-                // we're editing a stored entry, it would also assume it's a duplicate.
1296 
-                if( !empty( $field->noDuplicates ) ) {
1278 
+					// Captchas don't need to be re-entered.
1279 
+					case 'captcha':
1297 1280
1298 
-                    $entry = $this->get_entry();
1281 
+						// Post Image fields aren't editable, so we un-fail them.
1282 
+					case 'post_image':
1283 
+						$field->failed_validation = false;
1284 
+						unset( $field->validation_message );
1285 
+						break;
1299 1286
1300 
-                    // If the value of the entry is the same as the stored value
1301 
-                    // Then we can assume it's not a duplicate, it's the same.
1302 
-                    if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
1303 
-                        //if value submitted was not changed, then don't validate
1304 
-                        $field->failed_validation = false;
1287 
+				}
1305 1288
1306 
-                        unset( $field->validation_message );
1289 
+				// You can't continue inside a switch, so we do it after.
1290 
+				if( empty( $field->failed_validation ) ) {
1291 
+					continue;
1292 
+				}
1307 1293
1308 
-                        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry );
1294 
+				// checks if the No Duplicates option is not validating entry against itself, since
1295 
+				// we're editing a stored entry, it would also assume it's a duplicate.
1296 
+				if( !empty( $field->noDuplicates ) ) {
1309 1297
1310 
-                        continue;
1311 
-                    }
1312 
-                }
1298 
+					$entry = $this->get_entry();
1313 1299
1314 
-                // if here then probably we are facing the validation 'At least one field must be filled out'
1315 
-                if( GFFormDisplay::is_empty( $field, $this->form_id  ) && empty( $field->isRequired ) ) {
1316 
-                    unset( $field->validation_message );
1317 
-	                $field->validation_message = false;
1318 
-                    continue;
1319 
-                }
1300 
+					// If the value of the entry is the same as the stored value
1301 
+					// Then we can assume it's not a duplicate, it's the same.
1302 
+					if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
1303 
+						//if value submitted was not changed, then don't validate
1304 
+						$field->failed_validation = false;
1320 1305
1321 
-                $gv_valid = false;
1306 
+						unset( $field->validation_message );
1322 1307
1323 
-            }
1308 
+						do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry );
1324 1309
1325 
-        }
1310 
+						continue;
1311 
+					}
1312 
+				}
1326 1313
1327 
-        $validation_results['is_valid'] = $gv_valid;
1314 
+				// if here then probably we are facing the validation 'At least one field must be filled out'
1315 
+				if( GFFormDisplay::is_empty( $field, $this->form_id  ) && empty( $field->isRequired ) ) {
1316 
+					unset( $field->validation_message );
1317 
+					$field->validation_message = false;
1318 
+					continue;
1319 
+				}
1328 1320
1329 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results );
1321 
+				$gv_valid = false;
1330 1322
1331 
-        // We'll need this result when rendering the form ( on GFFormDisplay::get_form )
1332 
-        $this->form_after_validation = $validation_results['form'];
1323 
+			}
1333 1324
1334 
-        return $validation_results;
1335 
-    }
1325 
+		}
1336 1326
1327 
+		$validation_results['is_valid'] = $gv_valid;
1337 1328
1338 
-    /**
1339 
-     * TODO: This seems to be hacky... we should remove it. Entry is set when updating the form using setup_vars()!
1340 
-     * Get the current entry and set it if it's not yet set.
1341 
-     * @return array Gravity Forms entry array
1342 
-     */
1343 
-    private function get_entry() {
1329 
+		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results );
1344 1330
1345 
-        if( empty( $this->entry ) ) {
1346 
-            // Get the database value of the entry that's being edited
1347 
-            $this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() );
1348 
-        }
1331 
+		// We'll need this result when rendering the form ( on GFFormDisplay::get_form )
1332 
+		$this->form_after_validation = $validation_results['form'];
1349 1333
1350 
-        return $this->entry;
1351 
-    }
1334 
+		return $validation_results;
1335 
+	}
1352 1336
1353 1337
1338 
+	/**
1339 
+	 * TODO: This seems to be hacky... we should remove it. Entry is set when updating the form using setup_vars()!
1340 
+	 * Get the current entry and set it if it's not yet set.
1341 
+	 * @return array Gravity Forms entry array
1342 
+	 */
1343 
+	private function get_entry() {
1354 1344
1355 
-    // --- Filters
1345 
+		if( empty( $this->entry ) ) {
1346 
+			// Get the database value of the entry that's being edited
1347 
+			$this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() );
1348 
+		}
1356 1349
1357 
-    /**
1358 
-     * Get the Edit Entry fields as configured in the View
1359 
-     *
1360 
-     * @since 1.8
1361 
-     *
1362 
-     * @param int $view_id
1363 
-     *
1364 
-     * @return array Array of fields that are configured in the Edit tab in the Admin
1365 
-     */
1366 
-    private function get_configured_edit_fields( $form, $view_id ) {
1350 
+		return $this->entry;
1351 
+	}
1367 1352
1368 
-        // Get all fields for form
1369 
-        $properties = GravityView_View_Data::getInstance()->get_fields( $view_id );
1370 1353
1371 
-        // If edit tab not yet configured, show all fields
1372 
-        $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL;
1373 1354
1374 
-	    // Show hidden fields as text fields
1375 
-	    $form = $this->fix_hidden_fields( $form );
1355 
+	// --- Filters
1376 1356
1377 
-        // Hide fields depending on admin settings
1378 
-        $fields = $this->filter_fields( $form['fields'], $edit_fields );
1357 
+	/**
1358 
+	 * Get the Edit Entry fields as configured in the View
1359 
+	 *
1360 
+	 * @since 1.8
1361 
+	 *
1362 
+	 * @param int $view_id
1363 
+	 *
1364 
+	 * @return array Array of fields that are configured in the Edit tab in the Admin
1365 
+	 */
1366 
+	private function get_configured_edit_fields( $form, $view_id ) {
1379 1367
1380 
-	    // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
1381 
-	    $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
1368 
+		// Get all fields for form
1369 
+		$properties = GravityView_View_Data::getInstance()->get_fields( $view_id );
1382 1370
1383 
-        return $fields;
1384 
-    }
1371 
+		// If edit tab not yet configured, show all fields
1372 
+		$edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL;
1373 
+
1374 
+		// Show hidden fields as text fields
1375 
+		$form = $this->fix_hidden_fields( $form );
1376 
+
1377 
+		// Hide fields depending on admin settings
1378 
+		$fields = $this->filter_fields( $form['fields'], $edit_fields );
1379 
+
1380 
+		// If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
1381 
+		$fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
1382 
+
1383 
+		return $fields;
1384 
+	}
1385 1385
1386 1386 
 	/**
1387 1387 
 	 * @since 1.9.2
 
@@ -1405,383 +1405,383 @@  discard block
 
 block discarded – undo
1405 1405 
 	}
1406 1406
1407 1407
1408 
-    /**
1409 
-     * Filter area fields based on specified conditions
1410 
-     *  - This filter removes the fields that have calculation configured
1411 
-     *
1412 
-     * @uses GravityView_Edit_Entry::user_can_edit_field() Check caps
1413 
-     * @access private
1414 
-     * @param GF_Field[] $fields
1415 
-     * @param array $configured_fields
1416 
-     * @since  1.5
1417 
-     * @return array $fields
1418 
-     */
1419 
-    private function filter_fields( $fields, $configured_fields ) {
1420 
-
1421 
-        if( empty( $fields ) || !is_array( $fields ) ) {
1422 
-            return $fields;
1423 
-        }
1424 
-
1425 
-        $edit_fields = array();
1426 
-
1427 
-        $field_type_blacklist = array(
1428 
-            'page',
1429 
-        );
1430 
-
1431 
-	    /**
1432 
-	     * @filter `gravityview/edit_entry/hide-product-fields` Hide product fields from being editable.
1433 
-	     * @since 1.9.1
1434 
-         * @param boolean $hide_product_fields Whether to hide product fields in the editor.  Default: false
1435 
-	     */
1436 
-	    $hide_product_fields = apply_filters( 'gravityview/edit_entry/hide-product-fields', empty( self::$supports_product_fields ) );
1437 
-
1438 
-	    if( $hide_product_fields ) {
1439 
-		    $field_type_blacklist[] = 'option';
1440 
-		    $field_type_blacklist[] = 'quantity';
1441 
-            $field_type_blacklist[] = 'product';
1442 
-            $field_type_blacklist[] = 'total';
1443 
-            $field_type_blacklist[] = 'shipping';
1444 
-            $field_type_blacklist[] = 'calculation';
1445 
-	    }
1446 
-
1447 
-        // First, remove blacklist or calculation fields
1448 
-        foreach ( $fields as $key => $field ) {
1449 
-
1450 
-            // Remove the fields that have calculation properties and keep them to be used later
1451 
-            // @since 1.16.2
1452 
-            if( $field->has_calculation() ) {
1453 
-                $this->fields_with_calculation[] = $field;
1454 
-                unset( $fields[ $key ] );
1455 
-            }
1456 
-
1457 
-            // process total field after all fields have been saved
1458 
-            if ( $field->type == 'total' ) {
1459 
-                $this->total_fields[] = $field;
1460 
-                unset( $fields[ $key ] );
1461 
-            }
1462 
-
1463 
-            if( in_array( $field->type, $field_type_blacklist ) ) {
1464 
-                unset( $fields[ $key ] );
1465 
-            }
1466 
-        }
1467 
-
1468 
-        // The Edit tab has not been configured, so we return all fields by default.
1469 
-        if( empty( $configured_fields ) ) {
1470 
-            return $fields;
1471 
-        }
1472 
-
1473 
-        // The edit tab has been configured, so we loop through to configured settings
1474 
-        foreach ( $configured_fields as $configured_field ) {
1475 
-
1476 
-	        /** @var GF_Field $field */
1477 
-	        foreach ( $fields as $field ) {
1478 
-
1479 
-                if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
1480 
-                    $edit_fields[] = $this->merge_field_properties( $field, $configured_field );
1481 
-                    break;
1482 
-                }
1483 
-
1484 
-            }
1485 
-
1486 
-        }
1487 
-
1488 
-        return $edit_fields;
1489 
-
1490 
-    }
1491 
-
1492 
-    /**
1493 
-     * Override GF Form field properties with the ones defined on the View
1494 
-     * @param  GF_Field $field GF Form field object
1495 
-     * @param  array $setting  GV field options
1496 
-     * @since  1.5
1497 
-     * @return array
1498 
-     */
1499 
-    private function merge_field_properties( $field, $field_setting ) {
1500 
-
1501 
-        $return_field = $field;
1502 
-
1503 
-        if( empty( $field_setting['show_label'] ) ) {
1504 
-            $return_field->label = '';
1505 
-        } elseif ( !empty( $field_setting['custom_label'] ) ) {
1506 
-            $return_field->label = $field_setting['custom_label'];
1507 
-        }
1508 
-
1509 
-        if( !empty( $field_setting['custom_class'] ) ) {
1510 
-            $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] );
1511 
-        }
1512 
-
1513 
-        /**
1514 
-         * Normalize page numbers - avoid conflicts with page validation
1515 
-         * @since 1.6
1516 
-         */
1517 
-        $return_field->pageNumber = 1;
1518 
-
1519 
-        return $return_field;
1520 
-
1521 
-    }
1522 
-
1523 
-    /**
1524 
-     * Remove fields that shouldn't be visible based on the Gravity Forms adminOnly field property
1525 
-     *
1526 
-     * @since 1.9.1
1527 
-     *
1528 
-     * @param array|GF_Field[] $fields Gravity Forms form fields
1529 
-     * @param array|null $edit_fields Fields for the Edit Entry tab configured in the View Configuration
1530 
-     * @param array $form GF Form array
1531 
-     * @param int $view_id View ID
1532 
-     *
1533 
-     * @return array Possibly modified form array
1534 
-     */
1535 
-    function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) {
1536 
-
1537 
-	    /**
1538 
-         * @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
1539 
-	     * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators.
1540 
-	     * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions
1541 
-	     * @since 1.9.1
1542 
-	     * @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.
1543 
-	     * @param array $form GF Form array
1544 
-	     * @param int $view_id View ID
1545 
-	     */
1546 
-	    $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
1547 
-
1548 
-	    if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
1549 
-            foreach( $fields as $k => $field ) {
1550 
-                if( $field->adminOnly ) {
1551 
-                    unset( $fields[ $k ] );
1552 
-                }
1553 
-            }
1554 
-            return $fields;
1555 
-        }
1556 
-
1557 
-	    foreach( $fields as &$field ) {
1558 
-		    $field->adminOnly = false;
1559 
-        }
1560 
-
1561 
-        return $fields;
1562 
-    }
1563 
-
1564 
-    // --- Conditional Logic
1565 
-
1566 
-    /**
1567 
-     * Remove the conditional logic rules from the form button and the form fields, if needed.
1568 
-     *
1569 
-     * @since 1.9
1570 
-     *
1571 
-     * @param array $form Gravity Forms form
1572 
-     * @return array Modified form, if not using Conditional Logic
1573 
-     */
1574 
-    function filter_conditional_logic( $form ) {
1575 
-
1576 
-        /**
1577 
-         * @filter `gravityview/edit_entry/conditional_logic` Should the Edit Entry form use Gravity Forms conditional logic showing/hiding of fields?
1578 
-         * @since 1.9
1579 
-         * @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
1580 
-         * @param array $form Gravity Forms form
1581 
-         */
1582 
-        $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form );
1583 
-
1584 
-        if( $use_conditional_logic ) {
1585 
-            return $form;
1586 
-        }
1587 
-
1588 
-        foreach( $form['fields'] as &$field ) {
1589 
-            /* @var GF_Field $field */
1590 
-            $field->conditionalLogic = null;
1591 
-        }
1592 
-
1593 
-        unset( $form['button']['conditionalLogic'] );
1594 
-
1595 
-        return $form;
1596 
-
1597 
-    }
1598 
-
1599 
-    /**
1600 
-     * Disable the Gravity Forms conditional logic script and features on the Edit Entry screen
1601 
-     *
1602 
-     * @since 1.9
1603 
-     *
1604 
-     * @param $has_conditional_logic
1605 
-     * @param $form
1606 
-     * @return mixed|void
1607 
-     */
1608 
-    function manage_conditional_logic( $has_conditional_logic, $form ) {
1609 
-
1610 
-        if( ! $this->is_edit_entry() ) {
1611 
-            return $has_conditional_logic;
1612 
-        }
1613 
-
1614 
-        return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form );
1615 
-    }
1616 
-
1617 
-
1618 
-    // --- User checks and nonces
1619 
-
1620 
-    /**
1621 
-     * Check if the user can edit the entry
1622 
-     *
1623 
-     * - Is the nonce valid?
1624 
-     * - Does the user have the right caps for the entry
1625 
-     * - Is the entry in the trash?
1626 
-     *
1627 
-     * @todo Move to GVCommon
1628 
-     *
1629 
-     * @param  boolean $echo Show error messages in the form?
1630 
-     * @return boolean        True: can edit form. False: nope.
1631 
-     */
1632 
-    function user_can_edit_entry( $echo = false ) {
1633 
-
1634 
-        $error = NULL;
1635 
-
1636 
-        /**
1637 
-         *  1. Permalinks are turned off
1638 
-         *  2. There are two entries embedded using oEmbed
1639 
-         *  3. One of the entries has just been saved
1640 
-         */
1641 
-        if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) {
1642 
-
1643 
-            $error = true;
1644 
-
1645 
-        }
1646 
-
1647 
-        if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) {
1648 
-
1649 
-            $error = true;
1650 
-
1651 
-        } elseif( ! $this->verify_nonce() ) {
1652 
-
1653 
-            /**
1654 
-             * If the Entry is embedded, there may be two entries on the same page.
1655 
-             * If that's the case, and one is being edited, the other should fail gracefully and not display an error.
1656 
-             */
1657 
-            if( GravityView_oEmbed::getInstance()->get_entry_id() ) {
1658 
-                $error = true;
1659 
-            } else {
1660 
-                $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview');
1661 
-            }
1408 
+	/**
1409 
+	 * Filter area fields based on specified conditions
1410 
+	 *  - This filter removes the fields that have calculation configured
1411 
+	 *
1412 
+	 * @uses GravityView_Edit_Entry::user_can_edit_field() Check caps
1413 
+	 * @access private
1414 
+	 * @param GF_Field[] $fields
1415 
+	 * @param array $configured_fields
1416 
+	 * @since  1.5
1417 
+	 * @return array $fields
1418 
+	 */
1419 
+	private function filter_fields( $fields, $configured_fields ) {
1662 1420
1663 
-        }
1664 
-
1665 
-        if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
1666 
-            $error = __( 'You do not have permission to edit this entry.', 'gravityview');
1667 
-        }
1668 
-
1669 
-        if( $this->entry['status'] === 'trash' ) {
1670 
-            $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' );
1671 
-        }
1421 
+		if( empty( $fields ) || !is_array( $fields ) ) {
1422 
+			return $fields;
1423 
+		}
1672 1424
1673 
-        // No errors; everything's fine here!
1674 
-        if( empty( $error ) ) {
1675 
-            return true;
1676 
-        }
1425 
+		$edit_fields = array();
1426 
+
1427 
+		$field_type_blacklist = array(
1428 
+			'page',
1429 
+		);
1430 
+
1431 
+		/**
1432 
+		 * @filter `gravityview/edit_entry/hide-product-fields` Hide product fields from being editable.
1433 
+		 * @since 1.9.1
1434 
+		 * @param boolean $hide_product_fields Whether to hide product fields in the editor.  Default: false
1435 
+		 */
1436 
+		$hide_product_fields = apply_filters( 'gravityview/edit_entry/hide-product-fields', empty( self::$supports_product_fields ) );
1437 
+
1438 
+		if( $hide_product_fields ) {
1439 
+			$field_type_blacklist[] = 'option';
1440 
+			$field_type_blacklist[] = 'quantity';
1441 
+			$field_type_blacklist[] = 'product';
1442 
+			$field_type_blacklist[] = 'total';
1443 
+			$field_type_blacklist[] = 'shipping';
1444 
+			$field_type_blacklist[] = 'calculation';
1445 
+		}
1677 1446
1678 
-        if( $echo && $error !== true ) {
1447 
+		// First, remove blacklist or calculation fields
1448 
+		foreach ( $fields as $key => $field ) {
1679 1449
1680 
-	        $error = esc_html( $error );
1450 
+			// Remove the fields that have calculation properties and keep them to be used later
1451 
+			// @since 1.16.2
1452 
+			if( $field->has_calculation() ) {
1453 
+				$this->fields_with_calculation[] = $field;
1454 
+				unset( $fields[ $key ] );
1455 
+			}
1681 1456
1682 
-	        /**
1683 
-	         * @since 1.9
1684 
-	         */
1685 
-	        if ( ! empty( $this->entry ) ) {
1686 
-		        $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;" ) );
1687 
-	        }
1457 
+			// process total field after all fields have been saved
1458 
+			if ( $field->type == 'total' ) {
1459 
+				$this->total_fields[] = $field;
1460 
+				unset( $fields[ $key ] );
1461 
+			}
1688 1462
1689 
-            echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
1690 
-        }
1463 
+			if( in_array( $field->type, $field_type_blacklist ) ) {
1464 
+				unset( $fields[ $key ] );
1465 
+			}
1466 
+		}
1691 1467
1692 
-        do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error );
1468 
+		// The Edit tab has not been configured, so we return all fields by default.
1469 
+		if( empty( $configured_fields ) ) {
1470 
+			return $fields;
1471 
+		}
1693 1472
1694 
-        return false;
1695 
-    }
1473 
+		// The edit tab has been configured, so we loop through to configured settings
1474 
+		foreach ( $configured_fields as $configured_field ) {
1696 1475
1476 
+			/** @var GF_Field $field */
1477 
+			foreach ( $fields as $field ) {
1697 1478
1698 
-    /**
1699 
-     * Check whether a field is editable by the current user, and optionally display an error message
1700 
-     * @uses  GravityView_Edit_Entry->check_user_cap_edit_field() Check user capabilities
1701 
-     * @param  array  $field Field or field settings array
1702 
-     * @param  boolean $echo  Whether to show error message telling user they aren't allowed
1703 
-     * @return boolean         True: user can edit the current field; False: nope, they can't.
1704 
-     */
1705 
-    private function user_can_edit_field( $field, $echo = false ) {
1706 
-
1707 
-        $error = NULL;
1479 
+				if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
1480 
+					$edit_fields[] = $this->merge_field_properties( $field, $configured_field );
1481 
+					break;
1482 
+				}
1708 1483
1709 
-        if( ! $this->check_user_cap_edit_field( $field ) ) {
1710 
-            $error = __( 'You do not have permission to edit this field.', 'gravityview');
1711 
-        }
1484 
+			}
1712 1485
1713 
-        // No errors; everything's fine here!
1714 
-        if( empty( $error ) ) {
1715 
-            return true;
1716 
-        }
1486 
+		}
1717 1487
1718 
-        if( $echo ) {
1719 
-            echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error');
1720 
-        }
1721 
-
1722 
-        do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error );
1488 
+		return $edit_fields;
1723 1489
1724 
-        return false;
1490 
+	}
1725 1491
1726 
-    }
1492 
+	/**
1493 
+	 * Override GF Form field properties with the ones defined on the View
1494 
+	 * @param  GF_Field $field GF Form field object
1495 
+	 * @param  array $setting  GV field options
1496 
+	 * @since  1.5
1497 
+	 * @return array
1498 
+	 */
1499 
+	private function merge_field_properties( $field, $field_setting ) {
1727 1500
1501 
+		$return_field = $field;
1728 1502
1729 
-    /**
1730 
-     * checks if user has permissions to edit a specific field
1731 
-     *
1732 
-     * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_field for maximum security!!
1733 
-     *
1734 
-     * @param  [type] $field [description]
1735 
-     * @return bool
1736 
-     */
1737 
-    private function check_user_cap_edit_field( $field ) {
1503 
+		if( empty( $field_setting['show_label'] ) ) {
1504 
+			$return_field->label = '';
1505 
+		} elseif ( !empty( $field_setting['custom_label'] ) ) {
1506 
+			$return_field->label = $field_setting['custom_label'];
1507 
+		}
1738 1508
1739 
-        // If they can edit any entries (as defined in Gravity Forms), we're good.
1740 
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
1741 
-            return true;
1742 
-        }
1509 
+		if( !empty( $field_setting['custom_class'] ) ) {
1510 
+			$return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] );
1511 
+		}
1743 1512
1744 
-        $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false;
1513 
+		/**
1514 
+		 * Normalize page numbers - avoid conflicts with page validation
1515 
+		 * @since 1.6
1516 
+		 */
1517 
+		$return_field->pageNumber = 1;
1745 1518
1746 
-        // If the field has custom editing capaibilities set, check those
1747 
-        if( $field_cap ) {
1748 
-            return GVCommon::has_cap( $field['allow_edit_cap'] );
1749 
-        }
1750 
-
1751 
-        return false;
1752 
-    }
1519 
+		return $return_field;
1753 1520
1521 
+	}
1754 1522
1755 
-    /**
1756 
-     * Is the current nonce valid for editing the entry?
1757 
-     * @return boolean
1758 
-     */
1759 
-    public function verify_nonce() {
1523 
+	/**
1524 
+	 * Remove fields that shouldn't be visible based on the Gravity Forms adminOnly field property
1525 
+	 *
1526 
+	 * @since 1.9.1
1527 
+	 *
1528 
+	 * @param array|GF_Field[] $fields Gravity Forms form fields
1529 
+	 * @param array|null $edit_fields Fields for the Edit Entry tab configured in the View Configuration
1530 
+	 * @param array $form GF Form array
1531 
+	 * @param int $view_id View ID
1532 
+	 *
1533 
+	 * @return array Possibly modified form array
1534 
+	 */
1535 
+	function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) {
1536 
+
1537 
+		/**
1538 
+		 * @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
1539 
+		 * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators.
1540 
+		 * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions
1541 
+		 * @since 1.9.1
1542 
+		 * @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.
1543 
+		 * @param array $form GF Form array
1544 
+		 * @param int $view_id View ID
1545 
+		 */
1546 
+		$use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
1547 
+
1548 
+		if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
1549 
+			foreach( $fields as $k => $field ) {
1550 
+				if( $field->adminOnly ) {
1551 
+					unset( $fields[ $k ] );
1552 
+				}
1553 
+			}
1554 
+			return $fields;
1555 
+		}
1760 1556
1761 
-        // Verify form submitted for editing single
1762 
-        if( $this->is_edit_entry_submission() ) {
1763 
-            $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
1764 
-        }
1557 
+		foreach( $fields as &$field ) {
1558 
+			$field->adminOnly = false;
1559 
+		}
1560 
+
1561 
+		return $fields;
1562 
+	}
1765 1563
1766 
-        // Verify
1767 
-        else if( ! $this->is_edit_entry() ) {
1768 
-            $valid = false;
1769 
-        }
1564 
+	// --- Conditional Logic
1770 1565
1771 
-        else {
1772 
-            $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
1773 
-        }
1566 
+	/**
1567 
+	 * Remove the conditional logic rules from the form button and the form fields, if needed.
1568 
+	 *
1569 
+	 * @since 1.9
1570 
+	 *
1571 
+	 * @param array $form Gravity Forms form
1572 
+	 * @return array Modified form, if not using Conditional Logic
1573 
+	 */
1574 
+	function filter_conditional_logic( $form ) {
1575 
+
1576 
+		/**
1577 
+		 * @filter `gravityview/edit_entry/conditional_logic` Should the Edit Entry form use Gravity Forms conditional logic showing/hiding of fields?
1578 
+		 * @since 1.9
1579 
+		 * @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
1580 
+		 * @param array $form Gravity Forms form
1581 
+		 */
1582 
+		$use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form );
1583 
+
1584 
+		if( $use_conditional_logic ) {
1585 
+			return $form;
1586 
+		}
1774 1587
1775 
-        /**
1776 
-         * @filter `gravityview/edit_entry/verify_nonce` Override Edit Entry nonce validation. Return true to declare nonce valid.
1777 
-         * @since 1.13
1778 
-         * @param int|boolean $valid False if invalid; 1 or 2 when nonce was generated
1779 
-         * @param string $nonce_field Key used when validating submissions. Default: is_gv_edit_entry
1780 
-         */
1781 
-        $valid = apply_filters( 'gravityview/edit_entry/verify_nonce', $valid, self::$nonce_field );
1588 
+		foreach( $form['fields'] as &$field ) {
1589 
+			/* @var GF_Field $field */
1590 
+			$field->conditionalLogic = null;
1591 
+		}
1592 
+
1593 
+		unset( $form['button']['conditionalLogic'] );
1594 
+
1595 
+		return $form;
1596 
+
1597 
+	}
1598 
+
1599 
+	/**
1600 
+	 * Disable the Gravity Forms conditional logic script and features on the Edit Entry screen
1601 
+	 *
1602 
+	 * @since 1.9
1603 
+	 *
1604 
+	 * @param $has_conditional_logic
1605 
+	 * @param $form
1606 
+	 * @return mixed|void
1607 
+	 */
1608 
+	function manage_conditional_logic( $has_conditional_logic, $form ) {
1609 
+
1610 
+		if( ! $this->is_edit_entry() ) {
1611 
+			return $has_conditional_logic;
1612 
+		}
1613 
+
1614 
+		return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form );
1615 
+	}
1616 
+
1617 
+
1618 
+	// --- User checks and nonces
1619 
+
1620 
+	/**
1621 
+	 * Check if the user can edit the entry
1622 
+	 *
1623 
+	 * - Is the nonce valid?
1624 
+	 * - Does the user have the right caps for the entry
1625 
+	 * - Is the entry in the trash?
1626 
+	 *
1627 
+	 * @todo Move to GVCommon
1628 
+	 *
1629 
+	 * @param  boolean $echo Show error messages in the form?
1630 
+	 * @return boolean        True: can edit form. False: nope.
1631 
+	 */
1632 
+	function user_can_edit_entry( $echo = false ) {
1633 
+
1634 
+		$error = NULL;
1635 
+
1636 
+		/**
1637 
+		 *  1. Permalinks are turned off
1638 
+		 *  2. There are two entries embedded using oEmbed
1639 
+		 *  3. One of the entries has just been saved
1640 
+		 */
1641 
+		if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) {
1642 
+
1643 
+			$error = true;
1644 
+
1645 
+		}
1646 
+
1647 
+		if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) {
1648 
+
1649 
+			$error = true;
1650 
+
1651 
+		} elseif( ! $this->verify_nonce() ) {
1652 
+
1653 
+			/**
1654 
+			 * If the Entry is embedded, there may be two entries on the same page.
1655 
+			 * If that's the case, and one is being edited, the other should fail gracefully and not display an error.
1656 
+			 */
1657 
+			if( GravityView_oEmbed::getInstance()->get_entry_id() ) {
1658 
+				$error = true;
1659 
+			} else {
1660 
+				$error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview');
1661 
+			}
1662 
+
1663 
+		}
1664 
+
1665 
+		if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
1666 
+			$error = __( 'You do not have permission to edit this entry.', 'gravityview');
1667 
+		}
1668 
+
1669 
+		if( $this->entry['status'] === 'trash' ) {
1670 
+			$error = __('You cannot edit the entry; it is in the trash.', 'gravityview' );
1671 
+		}
1782 1672
1783 
-        return $valid;
1784 
-    }
1673 
+		// No errors; everything's fine here!
1674 
+		if( empty( $error ) ) {
1675 
+			return true;
1676 
+		}
1677 
+
1678 
+		if( $echo && $error !== true ) {
1679 
+
1680 
+			$error = esc_html( $error );
1681 
+
1682 
+			/**
1683 
+			 * @since 1.9
1684 
+			 */
1685 
+			if ( ! empty( $this->entry ) ) {
1686 
+				$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;" ) );
1687 
+			}
1688 
+
1689 
+			echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
1690 
+		}
1691 
+
1692 
+		do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error );
1693 
+
1694 
+		return false;
1695 
+	}
1696 
+
1697 
+
1698 
+	/**
1699 
+	 * Check whether a field is editable by the current user, and optionally display an error message
1700 
+	 * @uses  GravityView_Edit_Entry->check_user_cap_edit_field() Check user capabilities
1701 
+	 * @param  array  $field Field or field settings array
1702 
+	 * @param  boolean $echo  Whether to show error message telling user they aren't allowed
1703 
+	 * @return boolean         True: user can edit the current field; False: nope, they can't.
1704 
+	 */
1705 
+	private function user_can_edit_field( $field, $echo = false ) {
1706 
+
1707 
+		$error = NULL;
1708 
+
1709 
+		if( ! $this->check_user_cap_edit_field( $field ) ) {
1710 
+			$error = __( 'You do not have permission to edit this field.', 'gravityview');
1711 
+		}
1712 
+
1713 
+		// No errors; everything's fine here!
1714 
+		if( empty( $error ) ) {
1715 
+			return true;
1716 
+		}
1717 
+
1718 
+		if( $echo ) {
1719 
+			echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error');
1720 
+		}
1721 
+
1722 
+		do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error );
1723 
+
1724 
+		return false;
1725 
+
1726 
+	}
1727 
+
1728 
+
1729 
+	/**
1730 
+	 * checks if user has permissions to edit a specific field
1731 
+	 *
1732 
+	 * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_field for maximum security!!
1733 
+	 *
1734 
+	 * @param  [type] $field [description]
1735 
+	 * @return bool
1736 
+	 */
1737 
+	private function check_user_cap_edit_field( $field ) {
1738 
+
1739 
+		// If they can edit any entries (as defined in Gravity Forms), we're good.
1740 
+		if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
1741 
+			return true;
1742 
+		}
1743 
+
1744 
+		$field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false;
1745 
+
1746 
+		// If the field has custom editing capaibilities set, check those
1747 
+		if( $field_cap ) {
1748 
+			return GVCommon::has_cap( $field['allow_edit_cap'] );
1749 
+		}
1750 
+
1751 
+		return false;
1752 
+	}
1753 
+
1754 
+
1755 
+	/**
1756 
+	 * Is the current nonce valid for editing the entry?
1757 
+	 * @return boolean
1758 
+	 */
1759 
+	public function verify_nonce() {
1760 
+
1761 
+		// Verify form submitted for editing single
1762 
+		if( $this->is_edit_entry_submission() ) {
1763 
+			$valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
1764 
+		}
1765 
+
1766 
+		// Verify
1767 
+		else if( ! $this->is_edit_entry() ) {
1768 
+			$valid = false;
1769 
+		}
1770 
+
1771 
+		else {
1772 
+			$valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
1773 
+		}
1774 
+
1775 
+		/**
1776 
+		 * @filter `gravityview/edit_entry/verify_nonce` Override Edit Entry nonce validation. Return true to declare nonce valid.
1777 
+		 * @since 1.13
1778 
+		 * @param int|boolean $valid False if invalid; 1 or 2 when nonce was generated
1779 
+		 * @param string $nonce_field Key used when validating submissions. Default: is_gv_edit_entry
1780 
+		 */
1781 
+		$valid = apply_filters( 'gravityview/edit_entry/verify_nonce', $valid, self::$nonce_field );
1782 
+
1783 
+		return $valid;
1784 
+	}
1785 1785
1786 1786
1787 1787
Please login to merge, or discard this patch.
Spacing   +220 added lines, -220 removed lines patch added patch discarded remove patch 
@@ -112,16 +112,16 @@  discard block
 
 block discarded – undo
112 112 
     function load() {
113 113
114 114 
         /** @define "GRAVITYVIEW_DIR" "../../../" */
115 
-        include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
115 
+        include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' );
116 116
117 117 
         // Don't display an embedded form when editing an entry
118 118 
         add_action( 'wp_head', array( $this, 'prevent_render_form' ) );
119 119 
         add_action( 'wp_footer', array( $this, 'prevent_render_form' ) );
120 120
121 121 
         // Stop Gravity Forms processing what is ours!
122 
-        add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 );
122 
+        add_filter( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 );
123 123
124 
-        add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') );
124 
+        add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) );
125 125
126 126 
         add_action( 'gravityview_edit_entry', array( $this, 'init' ) );
127 127 
 
@@ -132,7 +132,7 @@  discard block
 
 block discarded – undo
132 132 
         add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 );
133 133
134 134 
         // Add fields expected by GFFormDisplay::validate()
135 
-        add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') );
135 
+        add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) );
136 136
137 137 
     }
138 138 
 
@@ -147,8 +147,8 @@  discard block
 
 block discarded – undo
147 147 
      * @return void
148 148 
      */
149 149 
     function prevent_render_form() {
150 
-        if( $this->is_edit_entry() ) {
151 
-            if( 'wp_head' === current_filter() ) {
150 
+        if ( $this->is_edit_entry() ) {
151 
+            if ( 'wp_head' === current_filter() ) {
152 152 
                 add_filter( 'gform_shortcode_form', '__return_empty_string' );
153 153 
             } else {
154 154 
                 remove_filter( 'gform_shortcode_form', '__return_empty_string' );
 
@@ -163,10 +163,10 @@  discard block
 
 block discarded – undo
163 163 
      */
164 164 
     function prevent_maybe_process_form() {
165 165
166 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
166 
+        do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
167 167
168 
-        if( $this->is_edit_entry_submission() && $this->verify_nonce() ) {
169 
-            remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
168 
+        if ( $this->is_edit_entry_submission() && $this->verify_nonce() ) {
169 
+            remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 );
170 170 
         }
171 171 
     }
172 172 
 
@@ -178,7 +178,7 @@  discard block
 
 block discarded – undo
178 178
179 179 
         $gf_page = ( 'entry' === RGForms::get( 'view' ) );
180 180
181 
-        return ( $gf_page && isset( $_GET['edit'] ) || RGForms::post( 'action' ) === 'update' );
181 
+        return ( $gf_page && isset( $_GET[ 'edit' ] ) || RGForms::post( 'action' ) === 'update' );
182 182 
     }
183 183
184 184 
 	/**
 
@@ -187,7 +187,7 @@  discard block
 
 block discarded – undo
187 187 
 	 * @return boolean
188 188 
 	 */
189 189 
 	public function is_edit_entry_submission() {
190 
-		return !empty( $_POST[ self::$nonce_field ] );
190 
+		return ! empty( $_POST[ self::$nonce_field ] );
191 191 
 	}
192 192
193 193 
     /**
 
@@ -198,13 +198,13 @@  discard block
 
 block discarded – undo
198 198
199 199
200 200 
         $entries = $gravityview_view->getEntries();
201 
-        $this->entry = $entries[0];
201 
+        $this->entry = $entries[ 0 ];
202 202
203 203 
         $this->original_form = $this->form = $gravityview_view->getForm();
204 204 
         $this->form_id = $gravityview_view->getFormId();
205 205 
         $this->view_id = $gravityview_view->getViewId();
206 206
207 
-        self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] );
207 
+        self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] );
208 208 
     }
209 209
210 210 
 
@@ -224,12 +224,12 @@  discard block
 
 block discarded – undo
224 224 
         $this->setup_vars();
225 225
226 226 
         // Multiple Views embedded, don't proceed if nonce fails
227 
-        if( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) {
227 
+        if ( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ) ) {
228 228 
             return;
229 229 
         }
230 230
231 231 
         // Sorry, you're not allowed here.
232 
-        if( false === $this->user_can_edit_entry( true ) ) {
232 
+        if ( false === $this->user_can_edit_entry( true ) ) {
233 233 
             return;
234 234 
         }
235 235 
 
@@ -249,9 +249,9 @@  discard block
 
 block discarded – undo
249 249 
     function print_scripts() {
250 250 
         $gravityview_view = GravityView_View::getInstance();
251 251
252 
-        wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
252 
+        wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
253 253
254 
-        GFFormDisplay::enqueue_form_scripts($gravityview_view->getForm(), false);
254 
+        GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false );
255 255
256 256 
         // Sack is required for images
257 257 
         wp_print_scripts( array( 'sack', 'gform_gravityforms' ) );
 
@@ -263,32 +263,32 @@  discard block
 
 block discarded – undo
263 263 
      */
264 264 
     function process_save() {
265 265
266 
-        if( empty( $_POST ) ) {
266 
+        if ( empty( $_POST ) ) {
267 267 
             return;
268 268 
         }
269 269
270 270 
         // Make sure the entry, view, and form IDs are all correct
271 271 
         $valid = $this->verify_nonce();
272 272
273 
-        if( !$valid ) {
274 
-            do_action('gravityview_log_error', __METHOD__ . ' Nonce validation failed.' );
273 
+        if ( ! $valid ) {
274 
+            do_action( 'gravityview_log_error', __METHOD__ . ' Nonce validation failed.' );
275 275 
             return;
276 276 
         }
277 277
278 
-        if( $this->entry['id'] !== $_POST['lid'] ) {
279 
-            do_action('gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' );
278 
+        if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) {
279 
+            do_action( 'gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' );
280 280 
             return;
281 281 
         }
282 282
283 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
283 
+        do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
284 284
285 285 
         $this->process_save_process_files( $this->form_id );
286 286
287 287 
         $this->validate();
288 288
289 
-        if( $this->is_valid ) {
289 
+        if ( $this->is_valid ) {
290 290
291 
-            do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.' );
291 
+            do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.' );
292 292
293 293 
             /**
294 294 
              * @hack This step is needed to unset the adminOnly from form fields, to add the calculation fields
 
@@ -298,12 +298,12 @@  discard block
 
 block discarded – undo
298 298 
             /**
299 299 
              * @hack to avoid the capability validation of the method save_lead for GF 1.9+
300 300 
              */
301 
-            unset( $_GET['page'] );
301 
+            unset( $_GET[ 'page' ] );
302 302
303 303 
             GFFormsModel::save_lead( $form, $this->entry );
304 304
305 305 
             // If there's a post associated with the entry, process post fields
306 
-            if( !empty( $this->entry['post_id'] ) ) {
306 
+            if ( ! empty( $this->entry[ 'post_id' ] ) ) {
307 307 
                 $this->maybe_update_post_fields( $form );
308 308 
             }
309 309 
 
@@ -318,7 +318,7 @@  discard block
 
 block discarded – undo
318 318 
              * @param array $form Gravity Forms form array
319 319 
              * @param string $entry_id Numeric ID of the entry that was updated
320 320 
              */
321 
-            do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'] );
321 
+            do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ] );
322 322 
         }
323 323
324 324 
     } // process_save
 
@@ -352,11 +352,11 @@  discard block
 
 block discarded – undo
352 352 
      * @return mixed
353 353 
      */
354 354 
     public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) {
355 
-        if( ! $this->is_edit_entry() ) {
355 
+        if ( ! $this->is_edit_entry() ) {
356 356 
             return $plupload_init;
357 357 
         }
358 358
359 
-        $plupload_init['gf_vars']['max_files'] = 0;
359 
+        $plupload_init[ 'gf_vars' ][ 'max_files' ] = 0;
360 360
361 361 
         return $plupload_init;
362 362 
     }
 
@@ -370,13 +370,13 @@  discard block
 
 block discarded – undo
370 370
371 371 
         $form = $this->form;
372 372
373 
-        foreach( $form['fields'] as &$field ) {
373 
+        foreach ( $form[ 'fields' ] as &$field ) {
374 374
375 375 
             $field->adminOnly = false;
376 376
377 
-            if( isset( $field->inputs ) && is_array( $field->inputs ) ) {
378 
-                foreach( $field->inputs as $key => $input ) {
379 
-                    $field->inputs[ $key ][ 'id' ] = (string)$input['id'];
377 
+            if ( isset( $field->inputs ) && is_array( $field->inputs ) ) {
378 
+                foreach ( $field->inputs as $key => $input ) {
379 
+                    $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ];
380 380 
                 }
381 381 
             }
382 382 
         }
 
@@ -390,20 +390,20 @@  discard block
 
 block discarded – undo
390 390 
         $update = false;
391 391
392 392 
         // get the most up to date entry values
393 
-        $entry = GFAPI::get_entry( $this->entry['id'] );
393 
+        $entry = GFAPI::get_entry( $this->entry[ 'id' ] );
394 394
395 
-        if( !empty( $this->fields_with_calculation ) ) {
395 
+        if ( ! empty( $this->fields_with_calculation ) ) {
396 396 
             $update = true;
397 397 
             foreach ( $this->fields_with_calculation as $calc_field ) {
398 398 
                 $inputs = $calc_field->get_entry_inputs();
399 399 
                 if ( is_array( $inputs ) ) {
400 400 
                     foreach ( $inputs as $input ) {
401 
-                        $input_name = 'input_' . str_replace( '.', '_', $input['id'] );
402 
-                        $entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry );
401 
+                        $input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] );
402 
+                        $entry[ strval( $input[ 'id' ] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry[ 'id' ], $entry );
403 403 
                     }
404 404 
                 } else {
405 
-                    $input_name = 'input_' . str_replace( '.', '_', $calc_field->id);
406 
-                    $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry );
405 
+                    $input_name = 'input_' . str_replace( '.', '_', $calc_field->id );
406 
+                    $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry[ 'id' ], $entry );
407 407 
                 }
408 408 
             }
409 409 
 
@@ -413,16 +413,16 @@  discard block
 
 block discarded – undo
413 413 
         if ( ! empty( $this->total_fields ) ) {
414 414 
             $update = true;
415 415 
             foreach ( $this->total_fields as $total_field ) {
416 
-                $input_name = 'input_' . str_replace( '.', '_', $total_field->id);
417 
-                $entry[ strval( $total_field->id ) ] = RGFormsModel::prepare_value( $form, $total_field, '', $input_name, $entry['id'], $entry );
416 
+                $input_name = 'input_' . str_replace( '.', '_', $total_field->id );
417 
+                $entry[ strval( $total_field->id ) ] = RGFormsModel::prepare_value( $form, $total_field, '', $input_name, $entry[ 'id' ], $entry );
418 418 
             }
419 419 
         }
420 420
421 
-        if( $update ) {
421 
+        if ( $update ) {
422 422
423 423 
             $return_entry = GFAPI::update_entry( $entry );
424 424
425 
-            if( is_wp_error( $return_entry ) ) {
425 
+            if ( is_wp_error( $return_entry ) ) {
426 426 
                 do_action( 'gravityview_log_error', 'Updating the entry calculation and total fields failed', $return_entry );
427 427 
             } else {
428 428 
                 do_action( 'gravityview_log_debug', 'Updating the entry calculation and total fields succeeded' );
 
@@ -440,11 +440,11 @@  discard block
 
 block discarded – undo
440 440 
      */
441 441 
     function maybe_update_post_fields( $form ) {
442 442
443 
-        $post_id = $this->entry['post_id'];
443 
+        $post_id = $this->entry[ 'post_id' ];
444 444
445 445 
         // Security check
446 
-        if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
447 
-            do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #'.$post_id );
446 
+        if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
447 
+            do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #' . $post_id );
448 448 
             return;
449 449 
         }
450 450 
 
@@ -453,7 +453,7 @@  discard block
 
 block discarded – undo
453 453 
         $updated_post = $original_post = get_post( $post_id );
454 454
455 455 
         // get the most up to date entry values
456 
-        $entry = GFAPI::get_entry( $this->entry['id'] );
456 
+        $entry = GFAPI::get_entry( $this->entry[ 'id' ] );
457 457
458 458 
         foreach ( $entry as $field_id => $value ) {
459 459 
 
@@ -461,16 +461,16 @@  discard block
 
 block discarded – undo
461 461
462 462 
             $field = RGFormsModel::get_field( $form, $field_id );
463 463
464 
-            if( class_exists('GF_Fields') ) {
464 
+            if ( class_exists( 'GF_Fields' ) ) {
465 465 
                 $field = GF_Fields::create( $field );
466 466 
             }
467 467
468 
-            if( GFCommon::is_post_field( $field ) ) {
468 
+            if ( GFCommon::is_post_field( $field ) ) {
469 469
470 470 
                 // Get the value of the field, including $_POSTed value
471 471 
                 $value = RGFormsModel::get_field_value( $field );
472 472
473 
-                switch( $field->type ) {
473 
+                switch ( $field->type ) {
474 474
475 475 
                     case 'post_title':
476 476 
                     case 'post_content':
 
@@ -488,14 +488,14 @@  discard block
 
 block discarded – undo
488 488 
                         wp_set_post_categories( $post_id, $categories, false );
489 489
490 490 
                         // if post_category is type checkbox, then value is an array of inputs
491 
-                        if( isset( $value[ strval( $field_id ) ] ) ) {
492 
-                            foreach( $value as $input_id => $val ) {
491 
+                        if ( isset( $value[ strval( $field_id ) ] ) ) {
492 
+                            foreach ( $value as $input_id => $val ) {
493 493 
                                 $input_name = 'input_' . str_replace( '.', '_', $input_id );
494 
-                                $entry[ strval( $input_id ) ] = RGFormsModel::prepare_value( $form, $field, $val, $input_name, $entry['id'], $entry );
494 
+                                $entry[ strval( $input_id ) ] = RGFormsModel::prepare_value( $form, $field, $val, $input_name, $entry[ 'id' ], $entry );
495 495 
                             }
496 496 
                         } else {
497 497 
                             $input_name = 'input_' . str_replace( '.', '_', $field_id );
498 
-                            $entry[ strval( $field_id ) ] = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], $entry );
498 
+                            $entry[ strval( $field_id ) ] = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], $entry );
499 499 
                         }
500 500
501 501 
                         break;
 
@@ -505,12 +505,12 @@  discard block
 
 block discarded – undo
505 505 
                         $custom_field_name = $field->postCustomFieldName;
506 506
507 507 
                         // Only certain custom field types are supported
508 
-                        switch( $input_type ) {
508 
+                        switch ( $input_type ) {
509 509 
                             case 'fileupload':
510 510 
                             /** @noinspection PhpMissingBreakStatementInspection */
511 511 
                             case 'list':
512 
-                                if( ! is_string( $value ) ) {
513 
-                                    $value = function_exists('wp_json_encode') ? wp_json_encode( $value ) : json_encode( $value );
512 
+                                if ( ! is_string( $value ) ) {
513 
+                                    $value = function_exists( 'wp_json_encode' ) ? wp_json_encode( $value ) : json_encode( $value );
514 514 
                                 }
515 515 
                             // break; left intentionally out
516 516 
                             default:
 
@@ -523,11 +523,11 @@  discard block
 
 block discarded – undo
523 523
524 524 
                         $input_name = 'input_' . $field_id;
525 525
526 
-                        if ( !empty( $_FILES[ $input_name ]['name'] ) ) {
526 
+                        if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) {
527 527
528 528 
                             // We have a new image
529 529
530 
-                            $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] );
530 
+                            $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] );
531 531
532 532 
                             // is this field set as featured image, if not, leave
533 533 
                             if ( ! $field->postFeaturedImage ) {
 
@@ -537,9 +537,9 @@  discard block
 
 block discarded – undo
537 537 
                             $ary = ! empty( $value ) ? explode( '|:|', $value ) : array();
538 538 
                             $img_url = rgar( $ary, 0 );
539 539
540 
-                            $img_title       = count( $ary ) > 1 ? $ary[1] : '';
541 
-                            $img_caption     = count( $ary ) > 2 ? $ary[2] : '';
542 
-                            $img_description = count( $ary ) > 3 ? $ary[3] : '';
540 
+                            $img_title       = count( $ary ) > 1 ? $ary[ 1 ] : '';
541 
+                            $img_caption     = count( $ary ) > 2 ? $ary[ 2 ] : '';
542 
+                            $img_description = count( $ary ) > 3 ? $ary[ 3 ] : '';
543 543
544 544 
                             $image_meta = array(
545 545 
                                 'post_excerpt' => $img_caption,
 
@@ -548,7 +548,7 @@  discard block
 
 block discarded – undo
548 548
549 549 
                             //adding title only if it is not empty. It will default to the file name if it is not in the array
550 550 
                             if ( ! empty( $img_title ) ) {
551 
-                                $image_meta['post_title'] = $img_title;
551 
+                                $image_meta[ 'post_title' ] = $img_title;
552 552 
                             }
553 553
554 554 
                             //todo: As soon as \GFFormsModel::media_handle_upload becomes a public method, move this call to \GFFormsModel::media_handle_upload and remove the hack from this class.
 
@@ -561,7 +561,7 @@  discard block
 
 block discarded – undo
561 561
562 562 
                             break;
563 563
564 
-                        } elseif ( !empty( $_POST[ $input_name ] ) && is_array( $value ) ) {
564 
+                        } elseif ( ! empty( $_POST[ $input_name ] ) && is_array( $value ) ) {
565 565
566 566 
                             // Same image although the image title, caption or description might have changed
567 567 
 
@@ -569,11 +569,11 @@  discard block
 
 block discarded – undo
569 569 
                             $img_url = rgar( $ary, 0 );
570 570
571 571 
                             // is this really the same image or something went wrong ?
572 
-                            if( $img_url === $_POST[ $input_name ] ) {
572 
+                            if ( $img_url === $_POST[ $input_name ] ) {
573 573
574 
-                                $img_title       = isset( $value[ $field_id .'.1' ] ) ? $value[ $field_id .'.1' ] : '';
575 
-                                $img_caption     = isset( $value[ $field_id .'.4' ] ) ? $value[ $field_id .'.4' ] : '';
576 
-                                $img_description = isset( $value[ $field_id .'.7' ] ) ? $value[ $field_id .'.7' ] : '';
574 
+                                $img_title       = isset( $value[ $field_id . '.1' ] ) ? $value[ $field_id . '.1' ] : '';
575 
+                                $img_caption     = isset( $value[ $field_id . '.4' ] ) ? $value[ $field_id . '.4' ] : '';
576 
+                                $img_description = isset( $value[ $field_id . '.7' ] ) ? $value[ $field_id . '.7' ] : '';
577 577
578 578 
                                 $value = ! empty( $img_url ) ? $img_url . "|:|" . $img_title . "|:|" . $img_caption . "|:|" . $img_description : '';
579 579 
 
@@ -607,12 +607,12 @@  discard block
 
 block discarded – undo
607 607 
                 }
608 608
609 609 
                 //ignore fields that have not changed
610 
-                if ( $value === rgget( (string) $field_id, $entry ) ) {
610 
+                if ( $value === rgget( (string)$field_id, $entry ) ) {
611 611 
                     continue;
612 612 
                 }
613 613
614 614 
                 // update entry
615 
-                if( 'post_category' !== $field->type ) {
615 
+                if ( 'post_category' !== $field->type ) {
616 616 
                     $entry[ strval( $field_id ) ] = $value;
617 617 
                 }
618 618 
 
@@ -622,25 +622,25 @@  discard block
 
 block discarded – undo
622 622
623 623 
         }
624 624
625 
-        if( $update_entry ) {
625 
+        if ( $update_entry ) {
626 626
627 627 
             $return_entry = GFAPI::update_entry( $entry );
628 628
629 
-            if( is_wp_error( $return_entry ) ) {
629 
+            if ( is_wp_error( $return_entry ) ) {
630 630 
                 do_action( 'gravityview_log_error', 'Updating the entry post fields failed', $return_entry );
631 631 
             } else {
632 
-                do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #'.$post_id.' succeeded' );
632 
+                do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #' . $post_id . ' succeeded' );
633 633 
             }
634 634
635 635 
         }
636 636
637 637 
         $return_post = wp_update_post( $updated_post, true );
638 638
639 
-        if( is_wp_error( $return_post ) ) {
639 
+        if ( is_wp_error( $return_post ) ) {
640 640 
             $return_post->add_data( $updated_post, '$updated_post' );
641 641 
             do_action( 'gravityview_log_error', 'Updating the post content failed', $return_post );
642 642 
         } else {
643 
-            do_action( 'gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded', $updated_post );
643 
+            do_action( 'gravityview_log_debug', 'Updating the post content for post #' . $post_id . ' succeeded', $updated_post );
644 644 
         }
645 645
646 646 
     }
 
@@ -657,18 +657,18 @@  discard block
 
 block discarded – undo
657 657 
      */
658 658 
     function after_update() {
659 659
660 
-        do_action( 'gform_after_update_entry', $this->form, $this->entry['id'] );
661 
-        do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'] );
660 
+        do_action( 'gform_after_update_entry', $this->form, $this->entry[ 'id' ] );
661 
+        do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", $this->form, $this->entry[ 'id' ] );
662 662
663 663 
         // Re-define the entry now that we've updated it.
664 
-        $entry = RGFormsModel::get_lead( $this->entry['id'] );
664 
+        $entry = RGFormsModel::get_lead( $this->entry[ 'id' ] );
665 665
666 666 
         $entry = GFFormsModel::set_entry_meta( $entry, $this->form );
667 667
668 668 
         // We need to clear the cache because Gravity Forms caches the field values, which
669 669 
         // we have just updated.
670 
-        foreach ($this->form['fields'] as $key => $field) {
671 
-            GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id );
670 
+        foreach ( $this->form[ 'fields' ] as $key => $field ) {
671 
+            GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id );
672 672 
         }
673 673
674 674 
         $this->entry = $entry;
 
@@ -686,7 +686,7 @@  discard block
 
 block discarded – undo
686 686
687 687 
         <div class="gv-edit-entry-wrapper"><?php
688 688
689 
-            $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this );
689 
+            $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this );
690 690
691 691 
             /**
692 692 
              * Fixes weird wpautop() issue
 
@@ -702,7 +702,7 @@  discard block
 
 block discarded – undo
702 702 
                      * @param string $edit_entry_title Modify the "Edit Entry" title
703 703 
                      * @param GravityView_Edit_Entry_Render $this This object
704 704 
                      */
705 
-                    $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
705 
+                    $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this );
706 706
707 707 
                     echo esc_attr( $edit_entry_title );
708 708 
             ?></span>
 
@@ -742,20 +742,20 @@  discard block
 
 block discarded – undo
742 742 
      */
743 743 
     private function maybe_print_message() {
744 744
745 
-        if( rgpost('action') === 'update' ) {
745 
+        if ( rgpost( 'action' ) === 'update' ) {
746 746
747 747 
             $back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) );
748 748
749 
-            if( ! $this->is_valid ){
749 
+            if ( ! $this->is_valid ) {
750 750
751 751 
                 // Keeping this compatible with Gravity Forms.
752 
-                $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>";
753 
-                $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form);
752 
+                $validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>";
753 
+                $message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form );
754 754
755 
-                echo GVCommon::generate_notice( $message , 'gv-error' );
755 
+                echo GVCommon::generate_notice( $message, 'gv-error' );
756 756
757 757 
             } else {
758 
-                $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. $back_link .'">', '</a>' );
758 
+                $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . $back_link . '">', '</a>' );
759 759
760 760 
                 /**
761 761 
                  * @filter `gravityview/edit_entry/success` Modify the edit entry success message (including the anchor link)
 
@@ -765,7 +765,7 @@  discard block
 
 block discarded – undo
765 765 
                  * @param array $entry Gravity Forms entry array
766 766 
                  * @param string $back_link URL to return to the original entry. @since 1.6
767 767 
                  */
768 
-                $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link );
768 
+                $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link );
769 769
770 770 
                 echo GVCommon::generate_notice( $message );
771 771 
             }
 
@@ -786,15 +786,15 @@  discard block
 
 block discarded – undo
786 786 
      */
787 787 
     private function render_edit_form() {
788 788
789 
-        add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 );
790 
-        add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') );
789 
+        add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 );
790 
+        add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
791 791 
         add_filter( 'gform_disable_view_counter', '__return_true' );
792 792
793 793 
         add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 );
794 794 
         add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 );
795 795
796 796 
         // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
797 
-        unset( $_GET['page'] );
797 
+        unset( $_GET[ 'page' ] );
798 798
799 799 
         // TODO: Make sure validation isn't handled by GF
800 800 
         // TODO: Include CSS for file upload fields
 
@@ -802,7 +802,7 @@  discard block
 
 block discarded – undo
802 802 
         // TODO: Product fields are not editable
803 803 
         // TODO: Check Updated and Error messages
804 804
805 
-        $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
805 
+        $html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry );
806 806
807 807 
 	    remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
808 808 
         remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
 
@@ -819,7 +819,7 @@  discard block
 
 block discarded – undo
819 819 
      * @return string
820 820 
      */
821 821 
     public function render_form_buttons() {
822 
-        return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this );
822 
+        return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this );
823 823 
     }
824 824
825 825 
 
@@ -839,17 +839,17 @@  discard block
 
 block discarded – undo
839 839 
     public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) {
840 840
841 841 
         // In case we have validated the form, use it to inject the validation results into the form render
842 
-        if( isset( $this->form_after_validation ) ) {
842 
+        if ( isset( $this->form_after_validation ) ) {
843 843 
             $form = $this->form_after_validation;
844 844 
         } else {
845 
-            $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id );
845 
+            $form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id );
846 846 
         }
847 847
848 848 
         $form = $this->filter_conditional_logic( $form );
849 849
850 850 
         // for now we don't support Save and Continue feature.
851 
-        if( ! self::$supports_save_and_continue ) {
852 
-	        unset( $form['save'] );
851 
+        if ( ! self::$supports_save_and_continue ) {
852 
+	        unset( $form[ 'save' ] );
853 853 
         }
854 854
855 855 
         return $form;
 
@@ -870,29 +870,29 @@  discard block
 
 block discarded – undo
870 870 
      */
871 871 
     function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) {
872 872
873 
-        if( GFCommon::is_post_field( $field ) ) {
873 
+        if ( GFCommon::is_post_field( $field ) ) {
874 874
875 875 
             $message = null;
876 876
877 877 
             // First, make sure they have the capability to edit the post.
878 
-            if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
878 
+            if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) {
879 879
880 880 
                 /**
881 881 
                  * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
882 882 
                  * @param string $message The existing "You don't have permission..." text
883 883 
                  */
884 
-                $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
884 
+                $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don&rsquo;t have permission to edit this post.', 'gravityview' ) );
885 885
886 
-            } elseif( null === get_post( $this->entry['post_id'] ) ) {
886 
+            } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) {
887 887 
                 /**
888 888 
                  * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
889 889 
                  * @param string $message The existing "This field is not editable; the post no longer exists." text
890 890 
                  */
891 
-                $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
891 
+                $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) );
892 892 
             }
893 893
894 
-            if( $message ) {
895 
-                $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
894 
+            if ( $message ) {
895 
+                $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
896 896 
             }
897 897 
         }
898 898 
 
@@ -917,8 +917,8 @@  discard block
 
 block discarded – undo
917 917
918 918 
         // If the form has been submitted, then we don't need to pre-fill the values,
919 919 
         // Except for fileupload type and when a field input is overridden- run always!!
920 
-        if(
921 
-            ( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) )
920 
+        if (
921 
+            ( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) )
922 922 
             && false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) )
923 923 
             || ! empty( $field_content )
924 924 
             || GFCommon::is_product_field( $field->type ) // Prevent product fields from appearing editable
 
@@ -927,8 +927,8 @@  discard block
 
 block discarded – undo
927 927 
         }
928 928
929 929 
         // Turn on Admin-style display for file upload fields only
930 
-        if( 'fileupload' === $field->type ) {
931 
-            $_GET['page'] = 'gf_entries';
930 
+        if ( 'fileupload' === $field->type ) {
931 
+            $_GET[ 'page' ] = 'gf_entries';
932 932 
         }
933 933
934 934 
         // SET SOME FIELD DEFAULTS TO PREVENT ISSUES
 
@@ -952,7 +952,7 @@  discard block
 
 block discarded – undo
952 952 
 	    // Prevent any PHP warnings, like undefined index
953 953 
 	    ob_start();
954 954
955 
-        if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
955 
+        if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
956 956 
             $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
957 957 
         } else {
958 958 
 	        $return = $field->get_field_input( $this->form, $field_value, $this->entry );
 
@@ -962,7 +962,7 @@  discard block
 
 block discarded – undo
962 962 
 	    // If there was output, it's an error
963 963 
 	    $warnings = ob_get_clean();
964 964
965 
-	    if( !empty( $warnings ) ) {
965 
+	    if ( ! empty( $warnings ) ) {
966 966 
 		    do_action( 'gravityview_log_error', __METHOD__ . $warnings, $field_value );
967 967 
 	    }
968 968 
 
@@ -971,7 +971,7 @@  discard block
 
 block discarded – undo
971 971 
          * We need the fileupload html field to render with the proper id
972 972 
          *  ( <li id="field_80_16" ... > )
973 973 
          */
974 
-        unset( $_GET['page'] );
974 
+        unset( $_GET[ 'page' ] );
975 975
976 976 
         return $return;
977 977 
     }
 
@@ -994,7 +994,7 @@  discard block
 
 block discarded – undo
994 994 
         $override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field );
995 995
996 996 
         // We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs)
997 
-        if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) {
997 
+        if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) {
998 998
999 999 
             $field_value = array();
1000 1000 
 
@@ -1003,10 +1003,10 @@  discard block
 
 block discarded – undo
1003 1003
1004 1004 
             foreach ( (array)$field->inputs as $input ) {
1005 1005
1006 
-                $input_id = strval( $input['id'] );
1006 
+                $input_id = strval( $input[ 'id' ] );
1007 1007
1008 1008 
                 if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) {
1009 
-                    $field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
1009 
+                    $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
1010 1010 
                     $allow_pre_populated = false;
1011 1011 
                 }
1012 1012 
 
@@ -1014,7 +1014,7 @@  discard block
 
 block discarded – undo
1014 1014
1015 1015 
             $pre_value = $field->get_value_submission( array(), false );
1016 1016
1017 
-            $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value;
1017 
+            $field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value;
1018 1018
1019 1019 
         } else {
1020 1020 
 
@@ -1025,13 +1025,13 @@  discard block
 
 block discarded – undo
1025 1025
1026 1026 
             // saved field entry value (if empty, fallback to the pre-populated value, if exists)
1027 1027 
             // or pre-populated value if not empty and set to override saved value
1028 
-            $field_value = !gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value;
1028 
+            $field_value = ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value;
1029 1029
1030 1030 
             // in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs.
1031 
-            if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) {
1031 
+            if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) {
1032 1032 
                 $categories = array();
1033 1033 
                 foreach ( explode( ',', $field_value ) as $cat_string ) {
1034 
-                    $categories[] = GFCommon::format_post_category( $cat_string, true );
1034 
+                    $categories[ ] = GFCommon::format_post_category( $cat_string, true );
1035 1035 
                 }
1036 1036 
                 $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
1037 1037 
             }
 
@@ -1056,12 +1056,12 @@  discard block
 
 block discarded – undo
1056 1056 
      */
1057 1057 
     function gform_pre_validation( $form ) {
1058 1058
1059 
-        if( ! $this->verify_nonce() ) {
1059 
+        if ( ! $this->verify_nonce() ) {
1060 1060 
             return $form;
1061 1061 
         }
1062 1062
1063 1063 
         // Fix PHP warning regarding undefined index.
1064 
-        foreach ( $form['fields'] as &$field) {
1064 
+        foreach ( $form[ 'fields' ] as &$field ) {
1065 1065
1066 1066 
             // This is because we're doing admin form pretending to be front-end, so Gravity Forms
1067 1067 
             // expects certain field array items to be set.
 
@@ -1074,7 +1074,7 @@  discard block
 
 block discarded – undo
1074 1074 
                 $field['emailConfirmEnabled'] = '';
1075 1075 
             }*/
1076 1076
1077 
-            switch( RGFormsModel::get_input_type( $field ) ) {
1077 
+            switch ( RGFormsModel::get_input_type( $field ) ) {
1078 1078
1079 1079 
                 /**
1080 1080 
                  * 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.
 
@@ -1088,37 +1088,37 @@  discard block
 
 block discarded – undo
1088 1088 
                     // Set the previous value
1089 1089 
                     $entry = $this->get_entry();
1090 1090
1091 
-                    $input_name = 'input_'.$field->id;
1092 
-                    $form_id = $form['id'];
1091 
+                    $input_name = 'input_' . $field->id;
1092 
+                    $form_id = $form[ 'id' ];
1093 1093
1094 1094 
                     $value = NULL;
1095 1095
1096 1096 
                     // Use the previous entry value as the default.
1097 
-                    if( isset( $entry[ $field->id ] ) ) {
1097 
+                    if ( isset( $entry[ $field->id ] ) ) {
1098 1098 
                         $value = $entry[ $field->id ];
1099 1099 
                     }
1100 1100
1101 1101 
                     // If this is a single upload file
1102 
-                    if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
1103 
-                        $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
1104 
-                        $value = $file_path['url'];
1102 
+                    if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) {
1103 
+                        $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] );
1104 
+                        $value = $file_path[ 'url' ];
1105 1105
1106 1106 
                     } else {
1107 1107
1108 1108 
                         // Fix PHP warning on line 1498 of form_display.php for post_image fields
1109 1109 
                         // Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
1110 
-                        $_FILES[ $input_name ] = array('name' => '', 'size' => '' );
1110 
+                        $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' );
1111 1111
1112 1112 
                     }
1113 1113
1114 
-                    if( rgar($field, "multipleFiles") ) {
1114 
+                    if ( rgar( $field, "multipleFiles" ) ) {
1115 1115
1116 1116 
                         // If there are fresh uploads, process and merge them.
1117 1117 
                         // Otherwise, use the passed values, which should be json-encoded array of URLs
1118 
-                        if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
1118 
+                        if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) {
1119 1119 
                             $value = empty( $value ) ? '[]' : $value;
1120 1120 
                             $value = stripslashes_deep( $value );
1121 
-                            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
1121 
+                            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() );
1122 1122 
                         }
1123 1123
1124 1124 
                     } else {
 
@@ -1136,14 +1136,14 @@  discard block
 
 block discarded – undo
1136 1136
1137 1137 
                 case 'number':
1138 1138 
                     // Fix "undefined index" issue at line 1286 in form_display.php
1139 
-                    if( !isset( $_POST['input_'.$field->id ] ) ) {
1140 
-                        $_POST['input_'.$field->id ] = NULL;
1139 
+                    if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) {
1140 
+                        $_POST[ 'input_' . $field->id ] = NULL;
1141 1141 
                     }
1142 1142 
                     break;
1143 1143 
                 case 'captcha':
1144 1144 
                     // Fix issue with recaptcha_check_answer() on line 1458 in form_display.php
1145 
-                    $_POST['recaptcha_challenge_field'] = NULL;
1146 
-                    $_POST['recaptcha_response_field'] = NULL;
1145 
+                    $_POST[ 'recaptcha_challenge_field' ] = NULL;
1146 
+                    $_POST[ 'recaptcha_response_field' ] = NULL;
1147 1147 
                     break;
1148 1148 
             }
1149 1149 
 
@@ -1179,7 +1179,7 @@  discard block
 
 block discarded – undo
1179 1179 
          * You can enter whatever you want!
1180 1180 
          * We try validating, and customize the results using `self::custom_validation()`
1181 1181 
          */
1182 
-        add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4);
1182 
+        add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 );
1183 1183
1184 1184 
         // Needed by the validate funtion
1185 1185 
         $failed_validation_page = NULL;
 
@@ -1187,14 +1187,14 @@  discard block
 
 block discarded – undo
1187 1187
1188 1188 
         // Prevent entry limit from running when editing an entry, also
1189 1189 
         // prevent form scheduling from preventing editing
1190 
-        unset( $this->form['limitEntries'], $this->form['scheduleForm'] );
1190 
+        unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] );
1191 1191
1192 1192 
         // Hide fields depending on Edit Entry settings
1193 
-        $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id );
1193 
+        $this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id );
1194 1194
1195 1195 
         $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page );
1196 1196
1197 
-        remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 );
1197 
+        remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 );
1198 1198 
     }
1199 1199
1200 1200 
 
@@ -1211,13 +1211,13 @@  discard block
 
 block discarded – undo
1211 1211 
      */
1212 1212 
     function custom_validation( $validation_results ) {
1213 1213
1214 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results );
1214 
+        do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results );
1215 1215
1216 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
1216 
+        do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
1217 1217
1218 1218 
         $gv_valid = true;
1219 1219
1220 
-        foreach ( $validation_results['form']['fields'] as $key => &$field ) {
1220 
+        foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) {
1221 1221
1222 1222 
             $value = RGFormsModel::get_field_value( $field );
1223 1223 
             $field_type = RGFormsModel::get_input_type( $field );
 
@@ -1230,35 +1230,35 @@  discard block
 
 block discarded – undo
1230 1230 
                 case 'post_image':
1231 1231
1232 1232 
                     // in case nothing is uploaded but there are already files saved
1233 
-                    if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
1233 
+                    if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) {
1234 1234 
                         $field->failed_validation = false;
1235 1235 
                         unset( $field->validation_message );
1236 1236 
                     }
1237 1237
1238 1238 
                     // validate if multi file upload reached max number of files [maxFiles] => 2
1239 
-                    if( rgobj( $field, 'maxFiles') && rgobj( $field, 'multipleFiles') ) {
1239 
+                    if ( rgobj( $field, 'maxFiles' ) && rgobj( $field, 'multipleFiles' ) ) {
1240 1240
1241 1241 
                         $input_name = 'input_' . $field->id;
1242 1242 
                         //uploaded
1243 
-                        $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
1243 
+                        $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array();
1244 1244
1245 1245 
                         //existent
1246 1246 
                         $entry = $this->get_entry();
1247 1247 
                         $value = NULL;
1248 
-                        if( isset( $entry[ $field->id ] ) ) {
1248 
+                        if ( isset( $entry[ $field->id ] ) ) {
1249 1249 
                             $value = json_decode( $entry[ $field->id ], true );
1250 1250 
                         }
1251 1251
1252 1252 
                         // count uploaded files and existent entry files
1253 1253 
                         $count_files = count( $file_names ) + count( $value );
1254 1254
1255 
-                        if( $count_files > $field->maxFiles ) {
1255 
+                        if ( $count_files > $field->maxFiles ) {
1256 1256 
                             $field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
1257 1257 
                             $field->failed_validation = 1;
1258 1258 
                             $gv_valid = false;
1259 1259
1260 1260 
                             // in case of error make sure the newest upload files are removed from the upload input
1261 
-                            GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
1261 
+                            GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null;
1262 1262 
                         }
1263 1263
1264 1264 
                     }
 
@@ -1269,7 +1269,7 @@  discard block
 
 block discarded – undo
1269 1269 
             }
1270 1270
1271 1271 
             // This field has failed validation.
1272 
-            if( !empty( $field->failed_validation ) ) {
1272 
+            if ( ! empty( $field->failed_validation ) ) {
1273 1273
1274 1274 
                 do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'field' => $field, 'value' => $value ) );
1275 1275 
 
@@ -1287,32 +1287,32 @@  discard block
 
 block discarded – undo
1287 1287 
                 }
1288 1288
1289 1289 
                 // You can't continue inside a switch, so we do it after.
1290 
-                if( empty( $field->failed_validation ) ) {
1290 
+                if ( empty( $field->failed_validation ) ) {
1291 1291 
                     continue;
1292 1292 
                 }
1293 1293
1294 1294 
                 // checks if the No Duplicates option is not validating entry against itself, since
1295 1295 
                 // we're editing a stored entry, it would also assume it's a duplicate.
1296 
-                if( !empty( $field->noDuplicates ) ) {
1296 
+                if ( ! empty( $field->noDuplicates ) ) {
1297 1297
1298 1298 
                     $entry = $this->get_entry();
1299 1299
1300 1300 
                     // If the value of the entry is the same as the stored value
1301 1301 
                     // Then we can assume it's not a duplicate, it's the same.
1302 
-                    if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
1302 
+                    if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) {
1303 1303 
                         //if value submitted was not changed, then don't validate
1304 1304 
                         $field->failed_validation = false;
1305 1305
1306 1306 
                         unset( $field->validation_message );
1307 1307
1308 
-                        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry );
1308 
+                        do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry );
1309 1309
1310 1310 
                         continue;
1311 1311 
                     }
1312 1312 
                 }
1313 1313
1314 1314 
                 // if here then probably we are facing the validation 'At least one field must be filled out'
1315 
-                if( GFFormDisplay::is_empty( $field, $this->form_id  ) && empty( $field->isRequired ) ) {
1315 
+                if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) {
1316 1316 
                     unset( $field->validation_message );
1317 1317 
 	                $field->validation_message = false;
1318 1318 
                     continue;
 
@@ -1324,12 +1324,12 @@  discard block
 
 block discarded – undo
1324 1324
1325 1325 
         }
1326 1326
1327 
-        $validation_results['is_valid'] = $gv_valid;
1327 
+        $validation_results[ 'is_valid' ] = $gv_valid;
1328 1328
1329 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results );
1329 
+        do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results );
1330 1330
1331 1331 
         // We'll need this result when rendering the form ( on GFFormDisplay::get_form )
1332 
-        $this->form_after_validation = $validation_results['form'];
1332 
+        $this->form_after_validation = $validation_results[ 'form' ];
1333 1333
1334 1334 
         return $validation_results;
1335 1335 
     }
 
@@ -1342,7 +1342,7 @@  discard block
 
 block discarded – undo
1342 1342 
      */
1343 1343 
     private function get_entry() {
1344 1344
1345 
-        if( empty( $this->entry ) ) {
1345 
+        if ( empty( $this->entry ) ) {
1346 1346 
             // Get the database value of the entry that's being edited
1347 1347 
             $this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() );
1348 1348 
         }
 
@@ -1369,13 +1369,13 @@  discard block
 
 block discarded – undo
1369 1369 
         $properties = GravityView_View_Data::getInstance()->get_fields( $view_id );
1370 1370
1371 1371 
         // If edit tab not yet configured, show all fields
1372 
-        $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL;
1372 
+        $edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL;
1373 1373
1374 1374 
 	    // Show hidden fields as text fields
1375 1375 
 	    $form = $this->fix_hidden_fields( $form );
1376 1376
1377 1377 
         // Hide fields depending on admin settings
1378 
-        $fields = $this->filter_fields( $form['fields'], $edit_fields );
1378 
+        $fields = $this->filter_fields( $form[ 'fields' ], $edit_fields );
1379 1379
1380 1380 
 	    // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
1381 1381 
 	    $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
 
@@ -1393,11 +1393,11 @@  discard block
 
 block discarded – undo
1393 1393 
 	private function fix_hidden_fields( $form ) {
1394 1394
1395 1395 
 		/** @var GF_Field $field */
1396 
-		foreach( $form['fields'] as $key => $field ) {
1397 
-			if( 'hidden' === $field->type ) {
1396 
+		foreach ( $form[ 'fields' ] as $key => $field ) {
1397 
+			if ( 'hidden' === $field->type ) {
1398 1398 
 				$text_field = new GF_Field_Text( $field );
1399 1399 
 				$text_field->type = 'text';
1400 
-				$form['fields'][ $key ] = $text_field;
1400 
+				$form[ 'fields' ][ $key ] = $text_field;
1401 1401 
 			}
1402 1402 
 		}
1403 1403 
 
@@ -1418,7 +1418,7 @@  discard block
 
 block discarded – undo
1418 1418 
      */
1419 1419 
     private function filter_fields( $fields, $configured_fields ) {
1420 1420
1421 
-        if( empty( $fields ) || !is_array( $fields ) ) {
1421 
+        if ( empty( $fields ) || ! is_array( $fields ) ) {
1422 1422 
             return $fields;
1423 1423 
         }
1424 1424 
 
@@ -1435,13 +1435,13 @@  discard block
 
 block discarded – undo
1435 1435 
 	     */
1436 1436 
 	    $hide_product_fields = apply_filters( 'gravityview/edit_entry/hide-product-fields', empty( self::$supports_product_fields ) );
1437 1437
1438 
-	    if( $hide_product_fields ) {
1439 
-		    $field_type_blacklist[] = 'option';
1440 
-		    $field_type_blacklist[] = 'quantity';
1441 
-            $field_type_blacklist[] = 'product';
1442 
-            $field_type_blacklist[] = 'total';
1443 
-            $field_type_blacklist[] = 'shipping';
1444 
-            $field_type_blacklist[] = 'calculation';
1438 
+	    if ( $hide_product_fields ) {
1439 
+		    $field_type_blacklist[ ] = 'option';
1440 
+		    $field_type_blacklist[ ] = 'quantity';
1441 
+            $field_type_blacklist[ ] = 'product';
1442 
+            $field_type_blacklist[ ] = 'total';
1443 
+            $field_type_blacklist[ ] = 'shipping';
1444 
+            $field_type_blacklist[ ] = 'calculation';
1445 1445 
 	    }
1446 1446
1447 1447 
         // First, remove blacklist or calculation fields
 
@@ -1449,24 +1449,24 @@  discard block
 
 block discarded – undo
1449 1449
1450 1450 
             // Remove the fields that have calculation properties and keep them to be used later
1451 1451 
             // @since 1.16.2
1452 
-            if( $field->has_calculation() ) {
1453 
-                $this->fields_with_calculation[] = $field;
1452 
+            if ( $field->has_calculation() ) {
1453 
+                $this->fields_with_calculation[ ] = $field;
1454 1454 
                 unset( $fields[ $key ] );
1455 1455 
             }
1456 1456
1457 1457 
             // process total field after all fields have been saved
1458 1458 
             if ( $field->type == 'total' ) {
1459 
-                $this->total_fields[] = $field;
1459 
+                $this->total_fields[ ] = $field;
1460 1460 
                 unset( $fields[ $key ] );
1461 1461 
             }
1462 1462
1463 
-            if( in_array( $field->type, $field_type_blacklist ) ) {
1463 
+            if ( in_array( $field->type, $field_type_blacklist ) ) {
1464 1464 
                 unset( $fields[ $key ] );
1465 1465 
             }
1466 1466 
         }
1467 1467
1468 1468 
         // The Edit tab has not been configured, so we return all fields by default.
1469 
-        if( empty( $configured_fields ) ) {
1469 
+        if ( empty( $configured_fields ) ) {
1470 1470 
             return $fields;
1471 1471 
         }
1472 1472 
 
@@ -1476,8 +1476,8 @@  discard block
 
 block discarded – undo
1476 1476 
 	        /** @var GF_Field $field */
1477 1477 
 	        foreach ( $fields as $field ) {
1478 1478
1479 
-                if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
1480 
-                    $edit_fields[] = $this->merge_field_properties( $field, $configured_field );
1479 
+                if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
1480 
+                    $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field );
1481 1481 
                     break;
1482 1482 
                 }
1483 1483 
 
@@ -1500,14 +1500,14 @@  discard block
 
 block discarded – undo
1500 1500
1501 1501 
         $return_field = $field;
1502 1502
1503 
-        if( empty( $field_setting['show_label'] ) ) {
1503 
+        if ( empty( $field_setting[ 'show_label' ] ) ) {
1504 1504 
             $return_field->label = '';
1505 
-        } elseif ( !empty( $field_setting['custom_label'] ) ) {
1506 
-            $return_field->label = $field_setting['custom_label'];
1505 
+        } elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) {
1506 
+            $return_field->label = $field_setting[ 'custom_label' ];
1507 1507 
         }
1508 1508
1509 
-        if( !empty( $field_setting['custom_class'] ) ) {
1510 
-            $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] );
1509 
+        if ( ! empty( $field_setting[ 'custom_class' ] ) ) {
1510 
+            $return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] );
1511 1511 
         }
1512 1512
1513 1513 
         /**
 
@@ -1545,16 +1545,16 @@  discard block
 
 block discarded – undo
1545 1545 
 	     */
1546 1546 
 	    $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
1547 1547
1548 
-	    if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
1549 
-            foreach( $fields as $k => $field ) {
1550 
-                if( $field->adminOnly ) {
1548 
+	    if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) {
1549 
+            foreach ( $fields as $k => $field ) {
1550 
+                if ( $field->adminOnly ) {
1551 1551 
                     unset( $fields[ $k ] );
1552 1552 
                 }
1553 1553 
             }
1554 1554 
             return $fields;
1555 1555 
         }
1556 1556
1557 
-	    foreach( $fields as &$field ) {
1557 
+	    foreach ( $fields as &$field ) {
1558 1558 
 		    $field->adminOnly = false;
1559 1559 
         }
1560 1560 
 
@@ -1581,16 +1581,16 @@  discard block
 
 block discarded – undo
1581 1581 
          */
1582 1582 
         $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form );
1583 1583
1584 
-        if( $use_conditional_logic ) {
1584 
+        if ( $use_conditional_logic ) {
1585 1585 
             return $form;
1586 1586 
         }
1587 1587
1588 
-        foreach( $form['fields'] as &$field ) {
1588 
+        foreach ( $form[ 'fields' ] as &$field ) {
1589 1589 
             /* @var GF_Field $field */
1590 1590 
             $field->conditionalLogic = null;
1591 1591 
         }
1592 1592
1593 
-        unset( $form['button']['conditionalLogic'] );
1593 
+        unset( $form[ 'button' ][ 'conditionalLogic' ] );
1594 1594
1595 1595 
         return $form;
1596 1596 
 
@@ -1607,7 +1607,7 @@  discard block
 
 block discarded – undo
1607 1607 
      */
1608 1608 
     function manage_conditional_logic( $has_conditional_logic, $form ) {
1609 1609
1610 
-        if( ! $this->is_edit_entry() ) {
1610 
+        if ( ! $this->is_edit_entry() ) {
1611 1611 
             return $has_conditional_logic;
1612 1612 
         }
1613 1613 
 
@@ -1638,44 +1638,44 @@  discard block
 
 block discarded – undo
1638 1638 
          *  2. There are two entries embedded using oEmbed
1639 1639 
          *  3. One of the entries has just been saved
1640 1640 
          */
1641 
-        if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) {
1641 
+        if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) {
1642 1642
1643 1643 
             $error = true;
1644 1644
1645 1645 
         }
1646 1646
1647 
-        if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) {
1647 
+        if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) {
1648 1648
1649 1649 
             $error = true;
1650 1650
1651 
-        } elseif( ! $this->verify_nonce() ) {
1651 
+        } elseif ( ! $this->verify_nonce() ) {
1652 1652
1653 1653 
             /**
1654 1654 
              * If the Entry is embedded, there may be two entries on the same page.
1655 1655 
              * If that's the case, and one is being edited, the other should fail gracefully and not display an error.
1656 1656 
              */
1657 
-            if( GravityView_oEmbed::getInstance()->get_entry_id() ) {
1657 
+            if ( GravityView_oEmbed::getInstance()->get_entry_id() ) {
1658 1658 
                 $error = true;
1659 1659 
             } else {
1660 
-                $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview');
1660 
+                $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' );
1661 1661 
             }
1662 1662
1663 1663 
         }
1664 1664
1665 
-        if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
1666 
-            $error = __( 'You do not have permission to edit this entry.', 'gravityview');
1665 
+        if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
1666 
+            $error = __( 'You do not have permission to edit this entry.', 'gravityview' );
1667 1667 
         }
1668 1668
1669 
-        if( $this->entry['status'] === 'trash' ) {
1670 
-            $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' );
1669 
+        if ( $this->entry[ 'status' ] === 'trash' ) {
1670 
+            $error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' );
1671 1671 
         }
1672 1672
1673 1673 
         // No errors; everything's fine here!
1674 
-        if( empty( $error ) ) {
1674 
+        if ( empty( $error ) ) {
1675 1675 
             return true;
1676 1676 
         }
1677 1677
1678 
-        if( $echo && $error !== true ) {
1678 
+        if ( $echo && $error !== true ) {
1679 1679
1680 1680 
 	        $error = esc_html( $error );
1681 1681 
 
@@ -1683,13 +1683,13 @@  discard block
 
 block discarded – undo
1683 1683 
 	         * @since 1.9
1684 1684 
 	         */
1685 1685 
 	        if ( ! empty( $this->entry ) ) {
1686 
-		        $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;" ) );
1686 
+		        $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;" ) );
1687 1687 
 	        }
1688 1688
1689 
-            echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
1689 
+            echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' );
1690 1690 
         }
1691 1691
1692 
-        do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error );
1692 
+        do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error );
1693 1693
1694 1694 
         return false;
1695 1695 
     }
 
@@ -1706,20 +1706,20 @@  discard block
 
 block discarded – undo
1706 1706
1707 1707 
         $error = NULL;
1708 1708
1709 
-        if( ! $this->check_user_cap_edit_field( $field ) ) {
1710 
-            $error = __( 'You do not have permission to edit this field.', 'gravityview');
1709 
+        if ( ! $this->check_user_cap_edit_field( $field ) ) {
1710 
+            $error = __( 'You do not have permission to edit this field.', 'gravityview' );
1711 1711 
         }
1712 1712
1713 1713 
         // No errors; everything's fine here!
1714 
-        if( empty( $error ) ) {
1714 
+        if ( empty( $error ) ) {
1715 1715 
             return true;
1716 1716 
         }
1717 1717
1718 
-        if( $echo ) {
1719 
-            echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error');
1718 
+        if ( $echo ) {
1719 
+            echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' );
1720 1720 
         }
1721 1721
1722 
-        do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error );
1722 
+        do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error );
1723 1723
1724 1724 
         return false;
1725 1725 
 
@@ -1737,15 +1737,15 @@  discard block
 
 block discarded – undo
1737 1737 
     private function check_user_cap_edit_field( $field ) {
1738 1738
1739 1739 
         // If they can edit any entries (as defined in Gravity Forms), we're good.
1740 
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
1740 
+        if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
1741 1741 
             return true;
1742 1742 
         }
1743 1743
1744 
-        $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false;
1744 
+        $field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false;
1745 1745
1746 1746 
         // If the field has custom editing capaibilities set, check those
1747 
-        if( $field_cap ) {
1748 
-            return GVCommon::has_cap( $field['allow_edit_cap'] );
1747 
+        if ( $field_cap ) {
1748 
+            return GVCommon::has_cap( $field[ 'allow_edit_cap' ] );
1749 1749 
         }
1750 1750
1751 1751 
         return false;
 
@@ -1759,17 +1759,17 @@  discard block
 
 block discarded – undo
1759 1759 
     public function verify_nonce() {
1760 1760
1761 1761 
         // Verify form submitted for editing single
1762 
-        if( $this->is_edit_entry_submission() ) {
1762 
+        if ( $this->is_edit_entry_submission() ) {
1763 1763 
             $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
1764 1764 
         }
1765 1765
1766 1766 
         // Verify
1767 
-        else if( ! $this->is_edit_entry() ) {
1767 
+        else if ( ! $this->is_edit_entry() ) {
1768 1768 
             $valid = false;
1769 1769 
         }
1770 1770
1771 1771 
         else {
1772 
-            $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
1772 
+            $valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key );
1773 1773 
         }
1774 1774
1775 1775 
         /**
Please login to merge, or discard this patch.