Completed
Pull Request — master (#1141)
by
unknown
19:31 queued 15:17
created
includes/class-template.php 1 patch
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -328,34 +328,34 @@  discard block
 block discarded – undo
328 328
 	}
329 329
 
330 330
 	/**
331
-     * Get the fields for a specific context
332
-     *
333
-     * @since 1.19.2
334
-     *
331
+	 * Get the fields for a specific context
332
+	 *
333
+	 * @since 1.19.2
334
+	 *
335 335
 	 * @param string $context [Optional] "directory", "single", or "edit"
336 336
 	 *
337 337
 	 * @return array Array of GravityView field layout configurations
338 338
 	 */
339 339
 	public function getContextFields( $context = '' ) {
340 340
 
341
-	    if( '' === $context ) {
342
-	        $context = $this->getContext();
343
-        }
341
+		if( '' === $context ) {
342
+			$context = $this->getContext();
343
+		}
344 344
 
345 345
 		$fields = $this->getFields();
346 346
 
347
-        foreach ( (array) $fields as $key => $context_fields ) {
347
+		foreach ( (array) $fields as $key => $context_fields ) {
348 348
 
349
-            // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against
350
-            $matches = explode( '_', $key );
349
+			// Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against
350
+			$matches = explode( '_', $key );
351 351
 
352
-            if( isset( $matches[0] ) && $matches[0] === $context ) {
353
-                return $context_fields;
354
-            }
355
-        }
352
+			if( isset( $matches[0] ) && $matches[0] === $context ) {
353
+				return $context_fields;
354
+			}
355
+		}
356 356
 
357 357
 		return array();
358
-    }
358
+	}
359 359
 
360 360
 	/**
361 361
 	 * @param array $fields
@@ -448,10 +448,10 @@  discard block
 block discarded – undo
448 448
 	 */
449 449
 	public function getPaging() {
450 450
 
451
-	    $default_params = array(
452
-            'offset' => 0,
453
-            'page_size' => 20,
454
-        );
451
+		$default_params = array(
452
+			'offset' => 0,
453
+			'page_size' => 20,
454
+		);
455 455
 
456 456
 		return wp_parse_args( $this->paging, $default_params );
457 457
 	}
@@ -508,10 +508,10 @@  discard block
 block discarded – undo
508 508
 	public function getSorting() {
509 509
 
510 510
 		$defaults_params = array(
511
-            'sort_field' => 'date_created',
512
-            'sort_direction' => 'ASC',
513
-            'is_numeric' => false,
514
-        );
511
+			'sort_field' => 'date_created',
512
+			'sort_direction' => 'ASC',
513
+			'is_numeric' => false,
514
+		);
515 515
 
516 516
 		return wp_parse_args( $this->sorting, $defaults_params );
517 517
 	}
@@ -837,7 +837,7 @@  discard block
 block discarded – undo
837 837
 	 */
838 838
 	public function render_widget_hooks( $view_id_or_context ) {
839 839
 
840
-	    /**
840
+		/**
841 841
 		 * @deprecated Numeric argument is deprecated. Pass a \GV\Template_Context instead.
842 842
 		 */
843 843
 		if ( is_numeric( $view_id_or_context ) ) {
Please login to merge, or discard this patch.
includes/extensions/entry-notes/class-gravityview-field-notes.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -175,10 +175,10 @@  discard block
 block discarded – undo
175 175
 
176 176
 		if( 'gv_note_add' === $_POST['action'] ) {
177 177
 
178
-            if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
179
-                do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' );
180
-                return;
181
-            }
178
+			if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
179
+				do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' );
180
+				return;
181
+			}
182 182
 
183 183
 			$post = wp_unslash( $_POST );
184 184
 
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
 	 *
279 279
 	 * Verify permissions. Check expected $_POST. Parse args, then send to process_delete_notes
280 280
 	 *
281
-  	 * @since 1.17
281
+	 * @since 1.17
282 282
 	 *
283 283
 	 * @see process_delete_notes
284 284
 	 *
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
 			'subject-label' => __( 'Subject', 'gravityview' ),
432 432
 			'subject' => __( 'Email subject', 'gravityview' ),
433 433
 			'default-email-subject' => __( 'New entry note', 'gravityview' ),
434
-            'email-footer' => __( 'This note was sent from {url}', 'gravityview' ),
434
+			'email-footer' => __( 'This note was sent from {url}', 'gravityview' ),
435 435
 			'also-email' => __( 'Also email this note to', 'gravityview' ),
436 436
 			'error-add-note' => __( 'There was an error adding the note.', 'gravityview' ),
437 437
 			'error-invalid' => __( 'The request was invalid. Refresh the page and try again.', 'gravityview' ),
@@ -501,11 +501,11 @@  discard block
 block discarded – undo
501 501
 
502 502
 		if ( $context instanceof \GV\Template_Context ) {
503 503
 
504
-		    ob_start();
505
-		    $context->template->get_template_part( 'note', 'detail', true );
506
-            $note_detail_html = ob_get_clean();
504
+			ob_start();
505
+			$context->template->get_template_part( 'note', 'detail', true );
506
+			$note_detail_html = ob_get_clean();
507 507
 
508
-            ob_start();
508
+			ob_start();
509 509
 			$context->template->get_template_part( 'note', $note_row_template, true );
510 510
 			$note_row = ob_get_clean();
511 511
 		} else {
@@ -761,7 +761,7 @@  discard block
 block discarded – undo
761 761
 				'gv-note-to-custom' => '',
762 762
 				'gv-note-subject' => '',
763 763
 				'gv-note-content' => '',
764
-                'current-url' => '',
764
+				'current-url' => '',
765 765
 			);
766 766
 
767 767
 			$current_user  = wp_get_current_user();
@@ -813,9 +813,9 @@  discard block
 block discarded – undo
813 813
 			$message .= $this->get_email_footer( $email_footer, $is_html, $email_data );
814 814
 
815 815
 			/**
816
-             * @filter `gravityview/field/notes/wpautop_email` Should the message content have paragraphs added automatically, if using HTML message format
816
+			 * @filter `gravityview/field/notes/wpautop_email` Should the message content have paragraphs added automatically, if using HTML message format
817 817
 			 * @since 1.18
818
-             * @param bool $wpautop_email True: Apply wpautop() to the email message if using; False: Leave as entered (Default: true)
818
+			 * @param bool $wpautop_email True: Apply wpautop() to the email message if using; False: Leave as entered (Default: true)
819 819
 			 */
820 820
 			$wpautop_email = apply_filters( 'gravityview/field/notes/wpautop_email', true );
821 821
 
@@ -835,12 +835,12 @@  discard block
 block discarded – undo
835 835
 	}
836 836
 
837 837
 	/**
838
-     * Get the footer for Entry Note emails
839
-     *
840
-     * `{url}` is replaced by the URL of the page where the note form was embedded
841
-     *
842
-     * @since 1.18
843
-     * @see GravityView_Field_Notes::strings The default value of $message_footer is set here, with the key 'email-footer'
838
+	 * Get the footer for Entry Note emails
839
+	 *
840
+	 * `{url}` is replaced by the URL of the page where the note form was embedded
841
+	 *
842
+	 * @since 1.18
843
+	 * @see GravityView_Field_Notes::strings The default value of $message_footer is set here, with the key 'email-footer'
844 844
 	 *
845 845
 	 * @param string $email_footer The message footer value
846 846
 	 * @param bool $is_html True: Email is being sent as HTML; False: sent as text
@@ -849,10 +849,10 @@  discard block
 block discarded – undo
849 849
 	 */
850 850
 	private function get_email_footer( $email_footer = '', $is_html = true, $email_data = array() ) {
851 851
 
852
-	    $output = '';
852
+		$output = '';
853 853
 
854 854
 		if( ! empty( $email_footer ) ) {
855
-		    $url = \GV\Utils::get( $email_data, 'current-url' );
855
+			$url = \GV\Utils::get( $email_data, 'current-url' );
856 856
 			$url = html_entity_decode( $url );
857 857
 			$url = site_url( $url );
858 858
 
Please login to merge, or discard this patch.
includes/class-common.php 1 patch
Indentation   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -305,12 +305,12 @@  discard block
 block discarded – undo
305 305
 						}
306 306
 
307 307
 						/**
308
-                         * @hack
309
-                         * In case of email/email confirmation, the input for email has the same id as the parent field
310
-                         */
308
+						 * @hack
309
+						 * In case of email/email confirmation, the input for email has the same id as the parent field
310
+						 */
311 311
 						if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) {
312
-                            continue;
313
-                        }
312
+							continue;
313
+						}
314 314
 						$fields["{$input['id']}"] = array(
315 315
 							'label' => \GV\Utils::get( $input, 'label' ),
316 316
 							'customLabel' => \GV\Utils::get( $input, 'customLabel' ),
@@ -1349,7 +1349,7 @@  discard block
 block discarded – undo
1349 1349
 			),
1350 1350
 		);
1351 1351
 
1352
-        $fields = $date_created + $fields;
1352
+		$fields = $date_created + $fields;
1353 1353
 
1354 1354
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
1355 1355
 
@@ -1361,13 +1361,13 @@  discard block
 block discarded – undo
1361 1361
 			}
1362 1362
 		}
1363 1363
 
1364
-        /**
1365
-         * @filter `gravityview/common/sortable_fields` Filter the sortable fields
1366
-         * @since 1.12
1367
-         * @param array $fields Sub-set of GF form fields that are sortable
1368
-         * @param int $formid The Gravity Forms form ID that the fields are from
1369
-         */
1370
-        $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid );
1364
+		/**
1365
+		 * @filter `gravityview/common/sortable_fields` Filter the sortable fields
1366
+		 * @since 1.12
1367
+		 * @param array $fields Sub-set of GF form fields that are sortable
1368
+		 * @param int $formid The Gravity Forms form ID that the fields are from
1369
+		 */
1370
+		$fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid );
1371 1371
 
1372 1372
 		return $fields;
1373 1373
 	}
@@ -1659,26 +1659,26 @@  discard block
 block discarded – undo
1659 1659
 	}
1660 1660
 
1661 1661
 
1662
-    /**
1663
-     * Display updated/error notice
1664
-     *
1665
-     * @since 1.19.2 Added $cap and $object_id parameters
1666
-     *
1667
-     * @param string $notice text/HTML of notice
1668
-     * @param string $class CSS class for notice (`updated` or `error`)
1669
-     * @param string $cap [Optional] Define a capability required to show a notice. If not set, displays to all caps.
1670
-     *
1671
-     * @return string
1672
-     */
1673
-    public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
1674
-
1675
-    	// If $cap is defined, only show notice if user has capability
1676
-    	if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
1677
-    		return '';
1678
-	    }
1679
-
1680
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
1681
-    }
1662
+	/**
1663
+	 * Display updated/error notice
1664
+	 *
1665
+	 * @since 1.19.2 Added $cap and $object_id parameters
1666
+	 *
1667
+	 * @param string $notice text/HTML of notice
1668
+	 * @param string $class CSS class for notice (`updated` or `error`)
1669
+	 * @param string $cap [Optional] Define a capability required to show a notice. If not set, displays to all caps.
1670
+	 *
1671
+	 * @return string
1672
+	 */
1673
+	public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
1674
+
1675
+		// If $cap is defined, only show notice if user has capability
1676
+		if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
1677
+			return '';
1678
+		}
1679
+
1680
+		return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
1681
+	}
1682 1682
 
1683 1683
 	/**
1684 1684
 	 * Inspired on \GFCommon::encode_shortcodes, reverse the encoding by replacing the ascii characters by the shortcode brackets
Please login to merge, or discard this patch.
future/includes/class-gv-template-view-table.php 1 patch
Indentation   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -19,8 +19,8 @@  discard block
 block discarded – undo
19 19
 
20 20
 
21 21
 	/**
22
-     * Constructor. Add filters to modify output.
23
-     *
22
+	 * Constructor. Add filters to modify output.
23
+	 *
24 24
 	 * @since 2.0.4
25 25
 	 *
26 26
 	 * @param View $view
@@ -29,19 +29,19 @@  discard block
 block discarded – undo
29 29
 	 */
30 30
 	public function __construct( View $view, Entry_Collection $entries, Request $request ) {
31 31
 
32
-	    add_filter( 'gravityview/template/field/label', array( __CLASS__, 'add_columns_sort_links' ), 100, 2 );
32
+		add_filter( 'gravityview/template/field/label', array( __CLASS__, 'add_columns_sort_links' ), 100, 2 );
33 33
 
34 34
 		parent::__construct( $view, $entries, $request );
35 35
 	}
36 36
 
37 37
 	/**
38
-     * Add sorting links to HTML columns that support sorting
39
-     *
40
-     * @since 2.0.4
41
-     * @since 2.0.5 Made static
42
-     *
43
-     * @static
44
-     *
38
+	 * Add sorting links to HTML columns that support sorting
39
+	 *
40
+	 * @since 2.0.4
41
+	 * @since 2.0.5 Made static
42
+	 *
43
+	 * @static
44
+	 *
45 45
 	 * @param string $column_label Label for the table column
46 46
 	 * @param \GV\Template_Context $context
47 47
 	 *
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 		$sort_columns = $context->view->settings->get( 'sort_columns' );
53 53
 
54 54
 		if ( empty( $sort_columns ) ) {
55
-            return $column_label;
55
+			return $column_label;
56 56
 		}
57 57
 
58 58
 		if ( ! \GravityView_frontend::getInstance()->is_field_sortable( $context->field->ID, $context->view->form->form ) ) {
@@ -193,15 +193,15 @@  discard block
 block discarded – undo
193 193
 				 */
194 194
 				do_action( 'gravityview/template/table/cells/before', $context );
195 195
 
196
-                /**
197
-                 * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
198
-                 * @since 1.0.7
196
+				/**
197
+				 * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
198
+				 * @since 1.0.7
199 199
 				 * @param \GravityView_View $this Current GravityView_View object
200 200
 				 * @deprecated Use `gravityview/template/table/cells/before`
201
-                 */
202
-                do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() );
201
+				 */
202
+				do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() );
203 203
 
204
-                foreach ( $fields->all() as $field ) {
204
+				foreach ( $fields->all() as $field ) {
205 205
 					$this->the_field( $field, $entry );
206 206
 				}
207 207
 
@@ -212,13 +212,13 @@  discard block
 block discarded – undo
212 212
 				 */
213 213
 				do_action( 'gravityview/template/table/cells/after', $context );
214 214
 
215
-                /**
216
-                 * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
217
-                 * @since 1.0.7
215
+				/**
216
+				 * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
217
+				 * @since 1.0.7
218 218
 				 * @param \GravityView_View $this Current GravityView_View object
219 219
 				 * @deprecated Use `gravityview/template/table/cells/after`
220
-                 */
221
-                do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() );
220
+				 */
221
+				do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() );
222 222
 
223 223
 				?>
224 224
 			</tr>
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 			'hide_empty' => false,
256 256
 			'zone_id' => 'directory_table-columns',
257 257
 			'markup' => '<td id="{{ field_id }}" class="{{ class }}">{{ value }}</td>',
258
-            'form' => $form,
258
+			'form' => $form,
259 259
 		);
260 260
 
261 261
 		/** Output. */
@@ -280,11 +280,11 @@  discard block
 block discarded – undo
280 280
 		do_action( 'gravityview/template/table/body/before', $context );
281 281
 
282 282
 		/**
283
-		* @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
284
-		* @deprecated Use `gravityview/template/table/body/before`
285
-		* @since 1.0.7
286
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
287
-		*/
283
+		 * @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
284
+		 * @deprecated Use `gravityview/template/table/body/before`
285
+		 * @since 1.0.7
286
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
287
+		 */
288 288
 		do_action( 'gravityview_table_body_before', \GravityView_View::getInstance() /** ugh! */ );
289 289
 	}
290 290
 
@@ -306,11 +306,11 @@  discard block
 block discarded – undo
306 306
 		do_action( 'gravityview/template/table/body/after', $context );
307 307
 
308 308
 		/**
309
-		* @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
310
-		* @deprecated Use `gravityview/template/table/body/after`
311
-		* @since 1.0.7
312
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
313
-		*/
309
+		 * @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
310
+		 * @deprecated Use `gravityview/template/table/body/after`
311
+		 * @since 1.0.7
312
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
313
+		 */
314 314
 		do_action( 'gravityview_table_body_after', \GravityView_View::getInstance() /** ugh! */ );
315 315
 	}
316 316
 
Please login to merge, or discard this patch.
future/includes/class-gv-template-view-list.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -151,11 +151,11 @@  discard block
 block discarded – undo
151 151
 		do_action( 'gravityview/template/list/body/before', $context );
152 152
 
153 153
 		/**
154
-		* @action `gravityview_list_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
155
-		* @deprecated Use `gravityview/template/list/body/before`
156
-		* @since 1.0.7
157
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
158
-		*/
154
+		 * @action `gravityview_list_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
155
+		 * @deprecated Use `gravityview/template/list/body/before`
156
+		 * @since 1.0.7
157
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
158
+		 */
159 159
 		do_action( 'gravityview_list_body_before', \GravityView_View::getInstance() /** ugh! */ );
160 160
 	}
161 161
 
@@ -177,11 +177,11 @@  discard block
 block discarded – undo
177 177
 		do_action( 'gravityview/template/list/body/after', $context );
178 178
 
179 179
 		/**
180
-		* @action `gravityview_list_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
181
-		* @deprecated Use `gravityview/template/list/body/after`
182
-		* @since 1.0.7
183
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
184
-		*/
180
+		 * @action `gravityview_list_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
181
+		 * @deprecated Use `gravityview/template/list/body/after`
182
+		 * @since 1.0.7
183
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
184
+		 */
185 185
 		do_action( 'gravityview_list_body_after', \GravityView_View::getInstance() /** ugh! */ );
186 186
 	}
187 187
 
@@ -212,11 +212,11 @@  discard block
 block discarded – undo
212 212
 		$zone = str_replace( '/', '_', $zone );
213 213
 
214 214
 		/**
215
-		* @action `gravityview_list_entry_$zone_before` Inside the `entry`, before any rows are rendered. Can be used to insert additional rows.
216
-		* @deprecated Use `gravityview/template/list/entry/$zone/before`
217
-		* @since 1.0.7
218
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
219
-		*/
215
+		 * @action `gravityview_list_entry_$zone_before` Inside the `entry`, before any rows are rendered. Can be used to insert additional rows.
216
+		 * @deprecated Use `gravityview/template/list/entry/$zone/before`
217
+		 * @since 1.0.7
218
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
219
+		 */
220 220
 		do_action( sprintf( 'gravityview_list_entry%sbefore', $zone ), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */ );
221 221
 	}
222 222
 
@@ -247,11 +247,11 @@  discard block
 block discarded – undo
247 247
 		$zone = str_replace( '/', '_', $zone );
248 248
 
249 249
 		/**
250
-		* @action `gravityview_list_entry_$zone_after` Inside the `entry`, after any rows are rendered. Can be used to insert additional rows.
251
-		* @deprecated Use `gravityview/template/list/entry/after`
252
-		* @since 1.0.7
253
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
254
-		*/
250
+		 * @action `gravityview_list_entry_$zone_after` Inside the `entry`, after any rows are rendered. Can be used to insert additional rows.
251
+		 * @deprecated Use `gravityview/template/list/entry/after`
252
+		 * @since 1.0.7
253
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
254
+		 */
255 255
 		do_action( sprintf( 'gravityview_list_entry%safter', $zone ), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */ );
256 256
 	}
257 257
 }
Please login to merge, or discard this patch.
future/includes/class-gv-settings-addon.php 1 patch
Indentation   +112 added lines, -112 removed lines patch added patch discarded remove patch
@@ -138,20 +138,20 @@  discard block
 block discarded – undo
138 138
 	}
139 139
 
140 140
 	/**
141
-     * Uninstall all traces of GravityView
142
-     *
143
-     * Note: method is public because parent method is public
144
-     *
141
+	 * Uninstall all traces of GravityView
142
+	 *
143
+	 * Note: method is public because parent method is public
144
+	 *
145 145
 	 * @return bool
146 146
 	 */
147 147
 	public function uninstall() {
148 148
 		gravityview()->plugin->uninstall();
149 149
 
150 150
 		/**
151
-         * Set the path so that Gravity Forms can de-activate GravityView
152
-         * @see GFAddOn::uninstall_addon
153
-         * @uses deactivate_plugins()
154
-         */
151
+		 * Set the path so that Gravity Forms can de-activate GravityView
152
+		 * @see GFAddOn::uninstall_addon
153
+		 * @uses deactivate_plugins()
154
+		 */
155 155
 		$this->_path = GRAVITYVIEW_FILE;
156 156
 
157 157
 		return true;
@@ -181,42 +181,42 @@  discard block
 block discarded – undo
181 181
 	}
182 182
 
183 183
 	/**
184
-     * Get an array of reasons why the plugin might be uninstalled
185
-     *
186
-     * @since 1.17.5
187
-     *
184
+	 * Get an array of reasons why the plugin might be uninstalled
185
+	 *
186
+	 * @since 1.17.5
187
+	 *
188 188
 	 * @return array Array of reasons with the label and followup questions for each uninstall reason
189 189
 	 */
190 190
 	private function get_uninstall_reasons() {
191 191
 		$reasons = array(
192 192
 			'will-continue' => array(
193
-                'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ),
194
-            ),
193
+				'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ),
194
+			),
195 195
 			'no-longer-need' => array(
196
-                'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ),
197
-            ),
196
+				'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ),
197
+			),
198 198
 			'doesnt-work' => array(
199
-                'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ),
200
-            ),
199
+				'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ),
200
+			),
201 201
 			'found-other' => array(
202
-                'label' => esc_html__( 'I found a better plugin', 'gravityview' ),
203
-                'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ),
204
-            ),
202
+				'label' => esc_html__( 'I found a better plugin', 'gravityview' ),
203
+				'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ),
204
+			),
205 205
 			'other' => array(
206
-                'label' => esc_html__( 'Other', 'gravityview' ),
207
-            ),
206
+				'label' => esc_html__( 'Other', 'gravityview' ),
207
+			),
208 208
 		);
209 209
 
210 210
 		shuffle( $reasons );
211 211
 
212 212
 		return $reasons;
213
-    }
213
+	}
214 214
 
215 215
 	/**
216
-     * Display a feedback form when the plugin is uninstalled
217
-     *
218
-     * @since 1.17.5
219
-     *
216
+	 * Display a feedback form when the plugin is uninstalled
217
+	 *
218
+	 * @since 1.17.5
219
+	 *
220 220
 	 * @return string HTML of the uninstallation form
221 221
 	 */
222 222
 	public function uninstall_form() {
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
             <h2><?php esc_html_e( 'Why did you uninstall GravityView?', 'gravityview' ); ?></h2>
297 297
             <ul>
298 298
 				<?php
299
-                $reasons = $this->get_uninstall_reasons();
299
+				$reasons = $this->get_uninstall_reasons();
300 300
 				foreach ( $reasons as $reason ) {
301 301
 					printf( '<li><label><input name="reason" type="radio" value="other" data-followup="%s"> %s</label></li>', Utils::get( $reason, 'followup' ), Utils::get( $reason, 'label' ) );
302 302
 				}
@@ -390,12 +390,12 @@  discard block
 block discarded – undo
390 390
 	}
391 391
 
392 392
 	public function app_settings_tab() {
393
-	    parent::app_settings_tab();
393
+		parent::app_settings_tab();
394 394
 
395 395
 		if ( $this->maybe_uninstall() ) {
396
-            echo $this->uninstall_form();
396
+			echo $this->uninstall_form();
397 397
 		}
398
-    }
398
+	}
399 399
 
400 400
 	/**
401 401
 	 * The Settings title
@@ -480,7 +480,7 @@  discard block
 block discarded – undo
480 480
 	 * @return array The settings.
481 481
 	 */
482 482
 	public function all() {
483
-	    return wp_parse_args( get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', array() ), $this->defaults() );
483
+		return wp_parse_args( get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', array() ), $this->defaults() );
484 484
 	}
485 485
 
486 486
 	/**
@@ -549,8 +549,8 @@  discard block
 block discarded – undo
549 549
                     type="' . $field['type'] . '"
550 550
                     name="' . esc_attr( $name ) . '"
551 551
                     value="' . $value . '" ' .
552
-		        implode( ' ', $attributes ) .
553
-		        ' />';
552
+				implode( ' ', $attributes ) .
553
+				' />';
554 554
 
555 555
 		if ( $echo ) {
556 556
 			echo $html;
@@ -568,12 +568,12 @@  discard block
 block discarded – undo
568 568
 	}
569 569
 
570 570
 	/**
571
-     * Check whether GravityView is being saved
572
-     *
573
-     * The generic is_save_postback() is true for all addons
574
-     *
575
-     * @since 2.0.8
576
-     *
571
+	 * Check whether GravityView is being saved
572
+	 *
573
+	 * The generic is_save_postback() is true for all addons
574
+	 *
575
+	 * @since 2.0.8
576
+	 *
577 577
 	 * @return bool
578 578
 	 */
579 579
 	public function is_save_postback() {
@@ -587,16 +587,16 @@  discard block
 block discarded – undo
587 587
 	 */
588 588
 	public function license_key_notice() {
589 589
 
590
-	    if( $this->is_save_postback() ) {
591
-		    $settings = $this->get_posted_settings();
592
-		    $license_key = \GV\Utils::get( $settings, 'license_key' );
593
-		    $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' );
594
-        } else {
595
-		    $license_status = $this->get( 'license_key_status', 'inactive' );
596
-		    $license_key    = $this->get( 'license_key' );
597
-	    }
590
+		if( $this->is_save_postback() ) {
591
+			$settings = $this->get_posted_settings();
592
+			$license_key = \GV\Utils::get( $settings, 'license_key' );
593
+			$license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' );
594
+		} else {
595
+			$license_status = $this->get( 'license_key_status', 'inactive' );
596
+			$license_key    = $this->get( 'license_key' );
597
+		}
598 598
 
599
-	    $license_id = empty( $license_key ) ? 'license' : $license_key;
599
+		$license_id = empty( $license_key ) ? 'license' : $license_key;
600 600
 
601 601
 		$message = esc_html__( 'Your GravityView license %s. This means you&rsquo;re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview' );
602 602
 
@@ -610,7 +610,7 @@  discard block
 block discarded – undo
610 610
 		$update_below = false;
611 611
 		$primary_button_link = admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' );
612 612
 
613
-        switch ( $license_status ) {
613
+		switch ( $license_status ) {
614 614
 			/** @since 1.17 */
615 615
 			case 'expired':
616 616
 				$title = __( 'Expired License', 'gravityview' );
@@ -666,12 +666,12 @@  discard block
 block discarded – undo
666 666
 	}
667 667
 
668 668
 	/**
669
-     * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason.
670
-     *
671
-     * @since 1.21.5
672
-     *
673
-     * @see GFAddOn::scripts()
674
-     *
669
+	 * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason.
670
+	 *
671
+	 * @since 1.21.5
672
+	 *
673
+	 * @see GFAddOn::scripts()
674
+	 *
675 675
 	 * @return array Array of scripts
676 676
 	 */
677 677
 	public function scripts() {
@@ -680,10 +680,10 @@  discard block
 block discarded – undo
680 680
 		$scripts[] = array(
681 681
 			'handle'  => 'gform_tooltip_init',
682 682
 			'enqueue' => array(
683
-                array(
684
-			        'admin_page' => array( 'app_settings' )
685
-                )
686
-            )
683
+				array(
684
+					'admin_page' => array( 'app_settings' )
685
+				)
686
+			)
687 687
 		);
688 688
 
689 689
 		return $scripts;
@@ -701,10 +701,10 @@  discard block
 block discarded – undo
701 701
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
702 702
 			'version' => Plugin::$version,
703 703
 			'deps' => array(
704
-                'gform_admin',
704
+				'gform_admin',
705 705
 				'gaddon_form_settings_css',
706
-                'gform_tooltip',
707
-                'gform_font_awesome',
706
+				'gform_tooltip',
707
+				'gform_font_awesome',
708 708
 			),
709 709
 			'enqueue' => array(
710 710
 				array( 'admin_page' => array(
@@ -872,7 +872,7 @@  discard block
 block discarded – undo
872 872
 					array(
873 873
 						'label' => _x( 'Show me beta versions if they are available.', 'gravityview' ),
874 874
 						'value' => '1',
875
-                        'name'  => 'beta',
875
+						'name'  => 'beta',
876 876
 					),
877 877
 				),
878 878
 				'description'   => __( 'You will have early access to the latest GravityView features and improvements. There may be bugs! If you encounter an issue, help make GravityView better by reporting it!', 'gravityview' ),
@@ -910,38 +910,38 @@  discard block
 block discarded – undo
910 910
 
911 911
 			if ( empty( $field['disabled'] ) ) {
912 912
 				unset( $field['disabled'] );
913
-            }
913
+			}
914 914
 		}
915 915
 
916
-        $sections = array(
917
-            array(
918
-                'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ),
919
-                'fields'      => $fields,
920
-            )
921
-        );
916
+		$sections = array(
917
+			array(
918
+				'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ),
919
+				'fields'      => $fields,
920
+			)
921
+		);
922 922
 
923
-        // custom 'update settings' button
924
-        $button = array(
925
-            'class' => 'button button-primary button-hero',
926
-            'type' => 'save',
927
-        );
923
+		// custom 'update settings' button
924
+		$button = array(
925
+			'class' => 'button button-primary button-hero',
926
+			'type' => 'save',
927
+		);
928 928
 
929 929
 		if ( $disabled_attribute ) {
930 930
 			$button['disabled'] = $disabled_attribute;
931 931
 		}
932 932
 
933
-        /**
934
-         * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
935
-         * Extensions can tap in here to insert their own section and settings.
936
-         * <code>
937
-         *   $sections[] = array(
938
-         *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
939
-         *      'fields' => $settings,
940
-         *   );
941
-         * </code>
942
-         * @param array $extension_settings Empty array, ready for extension settings!
943
-         */
944
-        $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
933
+		/**
934
+		 * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
935
+		 * Extensions can tap in here to insert their own section and settings.
936
+		 * <code>
937
+		 *   $sections[] = array(
938
+		 *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
939
+		 *      'fields' => $settings,
940
+		 *   );
941
+		 * </code>
942
+		 * @param array $extension_settings Empty array, ready for extension settings!
943
+		 */
944
+		$extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
945 945
 
946 946
 		// If there are extensions, add a section for them
947 947
 		if ( ! empty( $extension_sections ) ) {
@@ -954,13 +954,13 @@  discard block
 block discarded – undo
954 954
 				}
955 955
 			}
956 956
 
957
-            $k = count( $extension_sections ) - 1 ;
958
-            $extension_sections[ $k ]['fields'][] = $button;
957
+			$k = count( $extension_sections ) - 1 ;
958
+			$extension_sections[ $k ]['fields'][] = $button;
959 959
 			$sections = array_merge( $sections, $extension_sections );
960 960
 		} else {
961
-            // add the 'update settings' button to the general section
962
-            $sections[0]['fields'][] = $button;
963
-        }
961
+			// add the 'update settings' button to the general section
962
+			$sections[0]['fields'][] = $button;
963
+		}
964 964
 
965 965
 		return $sections;
966 966
 	}
@@ -1014,9 +1014,9 @@  discard block
 block discarded – undo
1014 1014
 	 */
1015 1015
 	protected function settings_edd_license( $field, $echo = true ) {
1016 1016
 
1017
-	    if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
1018
-		    $field['input_type'] = 'password';
1019
-        }
1017
+		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
1018
+			$field['input_type'] = 'password';
1019
+		}
1020 1020
 
1021 1021
 		$text = $this->settings_text( $field, false );
1022 1022
 
@@ -1033,9 +1033,9 @@  discard block
 block discarded – undo
1033 1033
 
1034 1034
 	/**
1035 1035
 	 * Allow pure HTML settings row
1036
-     *
1037
-     * @since 2.0.6
1038
-     *
1036
+	 *
1037
+	 * @since 2.0.6
1038
+	 *
1039 1039
 	 * @param array $field
1040 1040
 	 * @param bool $echo Whether to echo the
1041 1041
 	 *
@@ -1101,19 +1101,19 @@  discard block
 block discarded – undo
1101 1101
 	}
1102 1102
 
1103 1103
 	/**
1104
-     * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it
1105
-     *
1106
-     * Converts `$field['description']` to `$field['gv_description']`
1107
-     * Converts `$field['subtitle']` to `$field['description']`
1108
-     *
1109
-     * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description`
1110
-     * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description
1111
-     *
1112
-     * @since 1.21.5.2
1113
-     *
1104
+	 * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it
1105
+	 *
1106
+	 * Converts `$field['description']` to `$field['gv_description']`
1107
+	 * Converts `$field['subtitle']` to `$field['description']`
1108
+	 *
1109
+	 * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description`
1110
+	 * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description
1111
+	 *
1112
+	 * @since 1.21.5.2
1113
+	 *
1114 1114
 	 * @param array $field
1115
-     *
1116
-     * @return void
1115
+	 *
1116
+	 * @return void
1117 1117
 	 */
1118 1118
 	public function single_setting_row( $field ) {
1119 1119
 		$field['gv_description'] = Utils::get( $field, 'description' );
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry.php 1 patch
Indentation   +166 added lines, -166 removed lines patch added patch discarded remove patch
@@ -18,80 +18,80 @@  discard block
 block discarded – undo
18 18
 
19 19
 class GravityView_Edit_Entry {
20 20
 
21
-    /**
22
-     * @var string
23
-     */
21
+	/**
22
+	 * @var string
23
+	 */
24 24
 	static $file;
25 25
 
26 26
 	static $instance;
27 27
 
28
-    /**
29
-     * Component instances.
30
-     * @var array
31
-     */
32
-    public $instances = array();
28
+	/**
29
+	 * Component instances.
30
+	 * @var array
31
+	 */
32
+	public $instances = array();
33 33
 
34 34
 
35 35
 	function __construct() {
36 36
 
37
-        self::$file = plugin_dir_path( __FILE__ );
37
+		self::$file = plugin_dir_path( __FILE__ );
38 38
 
39
-        if( is_admin() ) {
40
-            $this->load_components( 'admin' );
41
-        }
39
+		if( is_admin() ) {
40
+			$this->load_components( 'admin' );
41
+		}
42 42
 
43 43
 
44
-        $this->load_components( 'render' );
44
+		$this->load_components( 'render' );
45 45
 
46
-        // If GF User Registration Add-on exists
47
-        $this->load_components( 'user-registration' );
46
+		// If GF User Registration Add-on exists
47
+		$this->load_components( 'user-registration' );
48 48
 
49
-        $this->add_hooks();
49
+		$this->add_hooks();
50 50
 
51 51
 		// Process hooks for addons that may or may not be present
52 52
 		$this->addon_specific_hooks();
53 53
 	}
54 54
 
55 55
 
56
-    static function getInstance() {
56
+	static function getInstance() {
57 57
 
58
-        if( empty( self::$instance ) ) {
59
-            self::$instance = new GravityView_Edit_Entry;
60
-        }
58
+		if( empty( self::$instance ) ) {
59
+			self::$instance = new GravityView_Edit_Entry;
60
+		}
61 61
 
62
-        return self::$instance;
63
-    }
62
+		return self::$instance;
63
+	}
64 64
 
65 65
 
66
-    private function load_components( $component ) {
66
+	private function load_components( $component ) {
67 67
 
68
-        $dir = trailingslashit( self::$file );
68
+		$dir = trailingslashit( self::$file );
69 69
 
70
-        $filename  = $dir . 'class-edit-entry-' . $component . '.php';
71
-        $classname = 'GravityView_Edit_Entry_' . str_replace( ' ', '_', ucwords( str_replace( '-', ' ', $component ) ) );
70
+		$filename  = $dir . 'class-edit-entry-' . $component . '.php';
71
+		$classname = 'GravityView_Edit_Entry_' . str_replace( ' ', '_', ucwords( str_replace( '-', ' ', $component ) ) );
72 72
 
73
-        // Loads component and pass extension's instance so that component can
74
-        // talk each other.
75
-        require_once $filename;
76
-        $this->instances[ $component ] = new $classname( $this );
77
-        $this->instances[ $component ]->load();
73
+		// Loads component and pass extension's instance so that component can
74
+		// talk each other.
75
+		require_once $filename;
76
+		$this->instances[ $component ] = new $classname( $this );
77
+		$this->instances[ $component ]->load();
78 78
 
79
-    }
79
+	}
80 80
 
81
-    private function add_hooks() {
81
+	private function add_hooks() {
82 82
 
83
-        // Add front-end access to Gravity Forms delete file action
84
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') );
83
+		// Add front-end access to Gravity Forms delete file action
84
+		add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') );
85 85
 
86
-        // Make sure this hook is run for non-admins
87
-        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
86
+		// Make sure this hook is run for non-admins
87
+		add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
88 88
 
89
-        add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
89
+		add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
90 90
 
91
-        // add template path to check for field
92
-        add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
91
+		// add template path to check for field
92
+		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
93 93
 
94
-    }
94
+	}
95 95
 
96 96
 	/**
97 97
 	 * Trigger hooks that are normally run in the admin for Addons, but need to be triggered manually because we're not in the admin
@@ -105,77 +105,77 @@  discard block
 block discarded – undo
105 105
 
106 106
 	}
107 107
 
108
-    /**
109
-     * Include this extension templates path
110
-     * @param array $file_paths List of template paths ordered
111
-     */
112
-    public function add_template_path( $file_paths ) {
113
-
114
-        // Index 100 is the default GravityView template path.
115
-        $file_paths[ 110 ] = self::$file;
116
-
117
-        return $file_paths;
118
-    }
119
-
120
-    /**
121
-     *
122
-     * Return a well formatted nonce key according to GravityView Edit Entry protocol
123
-     *
124
-     * @param $view_id int GravityView view id
125
-     * @param $form_id int Gravity Forms form id
126
-     * @param $entry_id int Gravity Forms entry id
127
-     * @return string
128
-     */
129
-    public static function get_nonce_key( $view_id, $form_id, $entry_id ) {
130
-        return sprintf( 'edit_%d_%d_%d', $view_id, $form_id, $entry_id );
131
-    }
132
-
133
-
134
-    /**
135
-     * The edit entry link creates a secure link with a nonce
136
-     *
137
-     * It also mimics the URL structure Gravity Forms expects to have so that
138
-     * it formats the display of the edit form like it does in the backend, like
139
-     * "You can edit this post from the post page" fields, for example.
140
-     *
141
-     * @param $entry array Gravity Forms entry object
142
-     * @param $view_id int GravityView view id
143
-     * @param $post_id int GravityView Post ID where View may be embedded {@since 1.9.2}
144
-     * @param string|array $field_values Parameters to pass in to the Edit Entry form to prefill data. Uses the same format as Gravity Forms "Allow field to be populated dynamically" {@since 1.9.2} {@see https://www.gravityhelp.com/documentation/article/allow-field-to-be-populated-dynamically/ }
145
-     * @return string
146
-     */
147
-    public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
148
-
149
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
150
-
151
-        $base = gv_entry_link( $entry, $post_id ? : $view_id  );
152
-
153
-        $url = add_query_arg( array(
154
-            'edit' => wp_create_nonce( $nonce_key )
155
-        ), $base );
156
-
157
-        if( $post_id ) {
158
-	        $url = add_query_arg( array( 'gvid' => $view_id ), $url );
159
-        }
160
-
161
-	    /**
162
-	     * Allow passing params to dynamically populate entry with values
163
-	     * @since 1.9.2
164
-	     */
165
-	    if( !empty( $field_values ) ) {
166
-
167
-		    if( is_array( $field_values ) ) {
168
-			    // If already an array, no parse_str() needed
169
-			    $params = $field_values;
170
-		    } else {
171
-			    parse_str( $field_values, $params );
172
-		    }
173
-
174
-		    $url = add_query_arg( $params, $url );
175
-	    }
176
-
177
-        return $url;
178
-    }
108
+	/**
109
+	 * Include this extension templates path
110
+	 * @param array $file_paths List of template paths ordered
111
+	 */
112
+	public function add_template_path( $file_paths ) {
113
+
114
+		// Index 100 is the default GravityView template path.
115
+		$file_paths[ 110 ] = self::$file;
116
+
117
+		return $file_paths;
118
+	}
119
+
120
+	/**
121
+	 *
122
+	 * Return a well formatted nonce key according to GravityView Edit Entry protocol
123
+	 *
124
+	 * @param $view_id int GravityView view id
125
+	 * @param $form_id int Gravity Forms form id
126
+	 * @param $entry_id int Gravity Forms entry id
127
+	 * @return string
128
+	 */
129
+	public static function get_nonce_key( $view_id, $form_id, $entry_id ) {
130
+		return sprintf( 'edit_%d_%d_%d', $view_id, $form_id, $entry_id );
131
+	}
132
+
133
+
134
+	/**
135
+	 * The edit entry link creates a secure link with a nonce
136
+	 *
137
+	 * It also mimics the URL structure Gravity Forms expects to have so that
138
+	 * it formats the display of the edit form like it does in the backend, like
139
+	 * "You can edit this post from the post page" fields, for example.
140
+	 *
141
+	 * @param $entry array Gravity Forms entry object
142
+	 * @param $view_id int GravityView view id
143
+	 * @param $post_id int GravityView Post ID where View may be embedded {@since 1.9.2}
144
+	 * @param string|array $field_values Parameters to pass in to the Edit Entry form to prefill data. Uses the same format as Gravity Forms "Allow field to be populated dynamically" {@since 1.9.2} {@see https://www.gravityhelp.com/documentation/article/allow-field-to-be-populated-dynamically/ }
145
+	 * @return string
146
+	 */
147
+	public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
148
+
149
+		$nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
150
+
151
+		$base = gv_entry_link( $entry, $post_id ? : $view_id  );
152
+
153
+		$url = add_query_arg( array(
154
+			'edit' => wp_create_nonce( $nonce_key )
155
+		), $base );
156
+
157
+		if( $post_id ) {
158
+			$url = add_query_arg( array( 'gvid' => $view_id ), $url );
159
+		}
160
+
161
+		/**
162
+		 * Allow passing params to dynamically populate entry with values
163
+		 * @since 1.9.2
164
+		 */
165
+		if( !empty( $field_values ) ) {
166
+
167
+			if( is_array( $field_values ) ) {
168
+				// If already an array, no parse_str() needed
169
+				$params = $field_values;
170
+			} else {
171
+				parse_str( $field_values, $params );
172
+			}
173
+
174
+			$url = add_query_arg( $params, $url );
175
+		}
176
+
177
+		return $url;
178
+	}
179 179
 
180 180
 	/**
181 181
 	 * Edit mode doesn't allow certain field types.
@@ -229,82 +229,82 @@  discard block
 block discarded – undo
229 229
 	}
230 230
 
231 231
 
232
-    /**
233
-     * checks if user has permissions to edit a specific entry
234
-     *
235
-     * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_entry for maximum security!!
236
-     *
237
-     * @param  array $entry Gravity Forms entry array
238
-     * @param int $view_id ID of the view you want to check visibility against {@since 1.9.2}. Required since 2.0
239
-     * @return bool
240
-     */
241
-    public static function check_user_cap_edit_entry( $entry, $view_id = 0 ) {
232
+	/**
233
+	 * checks if user has permissions to edit a specific entry
234
+	 *
235
+	 * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_entry for maximum security!!
236
+	 *
237
+	 * @param  array $entry Gravity Forms entry array
238
+	 * @param int $view_id ID of the view you want to check visibility against {@since 1.9.2}. Required since 2.0
239
+	 * @return bool
240
+	 */
241
+	public static function check_user_cap_edit_entry( $entry, $view_id = 0 ) {
242 242
 
243
-        // No permission by default
244
-        $user_can_edit = false;
243
+		// No permission by default
244
+		$user_can_edit = false;
245 245
 
246
-        // If they can edit any entries (as defined in Gravity Forms)
247
-        // Or if they can edit other people's entries
248
-        // Then we're good.
249
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
246
+		// If they can edit any entries (as defined in Gravity Forms)
247
+		// Or if they can edit other people's entries
248
+		// Then we're good.
249
+		if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
250 250
 
251
-            gravityview()->log->debug( 'User has ability to edit all entries.' );
251
+			gravityview()->log->debug( 'User has ability to edit all entries.' );
252 252
 
253
-            $user_can_edit = true;
253
+			$user_can_edit = true;
254 254
 
255
-        } else if( !isset( $entry['created_by'] ) ) {
255
+		} else if( !isset( $entry['created_by'] ) ) {
256 256
 
257
-            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
257
+			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
258 258
 
259
-            $user_can_edit = false;
259
+			$user_can_edit = false;
260 260
 
261
-        } else {
261
+		} else {
262 262
 
263
-            // get user_edit setting
264
-            if( empty( $view_id ) || $view_id == GravityView_View::getInstance()->getViewId() ) {
265
-                // if View ID not specified or is the current view
263
+			// get user_edit setting
264
+			if( empty( $view_id ) || $view_id == GravityView_View::getInstance()->getViewId() ) {
265
+				// if View ID not specified or is the current view
266 266
 				// @deprecated path
267
-                $user_edit = GravityView_View::getInstance()->getAtts('user_edit');
268
-            } else {
269
-                // in case is specified and not the current view
270
-                $user_edit = GVCommon::get_template_setting( $view_id, 'user_edit' );
271
-            }
267
+				$user_edit = GravityView_View::getInstance()->getAtts('user_edit');
268
+			} else {
269
+				// in case is specified and not the current view
270
+				$user_edit = GVCommon::get_template_setting( $view_id, 'user_edit' );
271
+			}
272 272
 
273
-            $current_user = wp_get_current_user();
273
+			$current_user = wp_get_current_user();
274 274
 
275
-            // User edit is disabled
276
-            if( empty( $user_edit ) ) {
275
+			// User edit is disabled
276
+			if( empty( $user_edit ) ) {
277 277
 
278
-                gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
278
+				gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
279 279
 
280
-                $user_can_edit = false;
281
-            }
280
+				$user_can_edit = false;
281
+			}
282 282
 
283
-            // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
284
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
283
+			// User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
284
+			else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
285 285
 
286
-                gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
286
+				gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
287 287
 
288
-                $user_can_edit = true;
288
+				$user_can_edit = true;
289 289
 
290
-            } else if( ! is_user_logged_in() ) {
290
+			} else if( ! is_user_logged_in() ) {
291 291
 
292
-                gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
293
-            }
292
+				gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
293
+			}
294 294
 
295
-        }
295
+		}
296 296
 
297
-        /**
298
-         * @filter `gravityview/edit_entry/user_can_edit_entry` Modify whether user can edit an entry.
299
-         * @since 1.15 Added `$entry` and `$view_id` parameters
300
-         * @param[in,out] boolean $user_can_edit Can the current user edit the current entry? (Default: false)
301
-         * @param[in] array $entry Gravity Forms entry array {@since 1.15}
302
-         * @param[in] int $view_id ID of the view you want to check visibility against {@since 1.15}
303
-         */
304
-        $user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id );
297
+		/**
298
+		 * @filter `gravityview/edit_entry/user_can_edit_entry` Modify whether user can edit an entry.
299
+		 * @since 1.15 Added `$entry` and `$view_id` parameters
300
+		 * @param[in,out] boolean $user_can_edit Can the current user edit the current entry? (Default: false)
301
+		 * @param[in] array $entry Gravity Forms entry array {@since 1.15}
302
+		 * @param[in] int $view_id ID of the view you want to check visibility against {@since 1.15}
303
+		 */
304
+		$user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id );
305 305
 
306
-        return (bool)$user_can_edit;
307
-    }
306
+		return (bool)$user_can_edit;
307
+	}
308 308
 
309 309
 
310 310
 
Please login to merge, or discard this patch.
includes/extensions/edit-entry/partials/form-buttons.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -7,15 +7,15 @@  discard block
 block discarded – undo
7 7
 <div id="publishing-action">
8 8
 	<?php
9 9
 
10
-    /**
11
-     * @filter `gravityview/edit_entry/cancel_link` Modify the cancel button link URL
12
-     * @since 1.11.1
13
-     * @param string $back_link Existing URL of the Cancel link
14
-     * @param array $form The Gravity Forms form
15
-     * @param array $entry The Gravity Forms entry
16
-     * @param int $view_id The current View ID
17
-     */
18
-    $back_link = apply_filters( 'gravityview/edit_entry/cancel_link', remove_query_arg( array( 'page', 'view', 'edit' ) ), $object->form, $object->entry, $object->view_id );
10
+	/**
11
+	 * @filter `gravityview/edit_entry/cancel_link` Modify the cancel button link URL
12
+	 * @since 1.11.1
13
+	 * @param string $back_link Existing URL of the Cancel link
14
+	 * @param array $form The Gravity Forms form
15
+	 * @param array $entry The Gravity Forms entry
16
+	 * @param int $view_id The current View ID
17
+	 */
18
+	$back_link = apply_filters( 'gravityview/edit_entry/cancel_link', remove_query_arg( array( 'page', 'view', 'edit' ) ), $object->form, $object->entry, $object->view_id );
19 19
 
20 20
 	/**
21 21
 	 * @action `gravityview/edit-entry/publishing-action/before` Triggered before the submit buttons in the Edit Entry screen, inside the `<div id="publishing-action">` container.
@@ -53,11 +53,11 @@  discard block
 block discarded – undo
53 53
 	/**
54 54
 	 * @action `gravityview/edit-entry/publishing-action/after` Triggered after the submit buttons in the Edit Entry screen, inside the `<div id="publishing-action">` container.
55 55
 	 * @since 1.5.1
56
-     * @since 2.0.13 Added $post_id
56
+	 * @since 2.0.13 Added $post_id
57 57
 	 * @param array $form The Gravity Forms form
58 58
 	 * @param array $entry The Gravity Forms entry
59 59
 	 * @param int $view_id The current View ID
60
-     * @param int $post_id The current Post ID
60
+	 * @param int $post_id The current Post ID
61 61
 	 */
62 62
 	do_action( 'gravityview/edit-entry/publishing-action/after', $object->form, $object->entry, $object->view_id, $object->post_id );
63 63
 
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry-render.php 1 patch
Indentation   +264 added lines, -264 removed lines patch added patch discarded remove patch
@@ -94,10 +94,10 @@  discard block
 block discarded – undo
94 94
 
95 95
 	/**
96 96
 	 * ID of the current post. May also be ID of the current View.
97
-     *
98
-     * @since 2.0.13
99
-     * 
100
-     * @var int
97
+	 *
98
+	 * @since 2.0.13
99
+	 * 
100
+	 * @var int
101 101
 	 */
102 102
 	public $post_id;
103 103
 
@@ -169,12 +169,12 @@  discard block
 block discarded – undo
169 169
 	public function prevent_maybe_process_form() {
170 170
 
171 171
 		if( ! empty( $_POST ) ) {
172
-	        gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', array( 'data' => esc_html( print_r( $_POST, true ) ) ) );
172
+			gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', array( 'data' => esc_html( print_r( $_POST, true ) ) ) );
173 173
 		}
174 174
 
175 175
 		if( $this->is_edit_entry_submission() ) {
176 176
 			remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
177
-	        remove_action( 'wp',  array( 'GFForms', 'maybe_process_form'), 9 );
177
+			remove_action( 'wp',  array( 'GFForms', 'maybe_process_form'), 9 );
178 178
 		}
179 179
 	}
180 180
 
@@ -202,14 +202,14 @@  discard block
 block discarded – undo
202 202
 	 * When Edit entry view is requested setup the vars
203 203
 	 */
204 204
 	private function setup_vars() {
205
-        global $post;
205
+		global $post;
206 206
 
207 207
 		$gravityview_view = GravityView_View::getInstance();
208 208
 
209 209
 
210 210
 		$entries = $gravityview_view->getEntries();
211
-	    self::$original_entry = $entries[0];
212
-	    $this->entry = $entries[0];
211
+		self::$original_entry = $entries[0];
212
+		$this->entry = $entries[0];
213 213
 
214 214
 		self::$original_form = $gravityview_view->getForm();
215 215
 		$this->form = $gravityview_view->getForm();
@@ -331,8 +331,8 @@  discard block
 block discarded – undo
331 331
 
332 332
 			GFFormsModel::save_lead( $form, $this->entry );
333 333
 
334
-	        // Delete the values for hidden inputs
335
-	        $this->unset_hidden_field_values();
334
+			// Delete the values for hidden inputs
335
+			$this->unset_hidden_field_values();
336 336
 			
337 337
 			$this->entry['date_created'] = $date_created;
338 338
 
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
 			// Perform actions normally performed after updating a lead
343 343
 			$this->after_update();
344 344
 
345
-	        /**
345
+			/**
346 346
 			 * Must be AFTER after_update()!
347 347
 			 * @see https://github.com/gravityview/GravityView/issues/764
348 348
 			 */
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
 	 * @return void
373 373
 	 */
374 374
 	private function unset_hidden_field_values() {
375
-	    global $wpdb;
375
+		global $wpdb;
376 376
 
377 377
 		/**
378 378
 		 * @filter `gravityview/edit_entry/unset_hidden_field_values` Whether to delete values of fields hidden by conditional logic
@@ -394,27 +394,27 @@  discard block
 block discarded – undo
394 394
 			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) );
395 395
 		}
396 396
 
397
-	    foreach ( $this->entry as $input_id => $field_value ) {
397
+		foreach ( $this->entry as $input_id => $field_value ) {
398 398
 
399
-		    $field = RGFormsModel::get_field( $this->form, $input_id );
399
+			$field = RGFormsModel::get_field( $this->form, $input_id );
400 400
 
401
-		    // Reset fields that are hidden
402
-		    // Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic
403
-		    if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) {
401
+			// Reset fields that are hidden
402
+			// Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic
403
+			if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) {
404 404
 
405
-		        // List fields are stored as empty arrays when empty
406
-			    $empty_value = $this->is_field_json_encoded( $field ) ? '[]' : '';
405
+				// List fields are stored as empty arrays when empty
406
+				$empty_value = $this->is_field_json_encoded( $field ) ? '[]' : '';
407 407
 
408
-			    $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id );
408
+				$lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id );
409 409
 
410
-			    GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value );
410
+				GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value );
411 411
 
412
-			    // Prevent the $_POST values of hidden fields from being used as default values when rendering the form
412
+				// Prevent the $_POST values of hidden fields from being used as default values when rendering the form
413 413
 				// after submission
414
-			    $post_input_id = 'input_' . str_replace( '.', '_', $input_id );
415
-			    $_POST[ $post_input_id ] = '';
416
-		    }
417
-	    }
414
+				$post_input_id = 'input_' . str_replace( '.', '_', $input_id );
415
+				$_POST[ $post_input_id ] = '';
416
+			}
417
+		}
418 418
 	}
419 419
 
420 420
 	/**
@@ -508,7 +508,7 @@  discard block
 block discarded – undo
508 508
 
509 509
 		$form = $this->form;
510 510
 
511
-	    /** @var GF_Field $field */
511
+		/** @var GF_Field $field */
512 512
 		foreach( $form['fields'] as $k => &$field ) {
513 513
 
514 514
 			/**
@@ -524,7 +524,7 @@  discard block
 block discarded – undo
524 524
 
525 525
 			if( isset( $field->inputs ) && is_array( $field->inputs ) ) {
526 526
 				foreach( $field->inputs as $key => $input ) {
527
-				    $field->inputs[ $key ][ 'id' ] = (string)$input['id'];
527
+					$field->inputs[ $key ][ 'id' ] = (string)$input['id'];
528 528
 				}
529 529
 			}
530 530
 		}
@@ -545,13 +545,13 @@  discard block
 block discarded – undo
545 545
 			foreach ( $this->fields_with_calculation as $calc_field ) {
546 546
 				$inputs = $calc_field->get_entry_inputs();
547 547
 				if ( is_array( $inputs ) ) {
548
-				    foreach ( $inputs as $input ) {
549
-				        $input_name = 'input_' . str_replace( '.', '_', $input['id'] );
550
-				        $entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry );
551
-				    }
548
+					foreach ( $inputs as $input ) {
549
+						$input_name = 'input_' . str_replace( '.', '_', $input['id'] );
550
+						$entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry );
551
+					}
552 552
 				} else {
553
-				    $input_name = 'input_' . str_replace( '.', '_', $calc_field->id);
554
-				    $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry );
553
+					$input_name = 'input_' . str_replace( '.', '_', $calc_field->id);
554
+					$entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry );
555 555
 				}
556 556
 			}
557 557
 
@@ -599,7 +599,7 @@  discard block
 block discarded – undo
599 599
 			$value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] );
600 600
 
601 601
 			$ary = ! empty( $value ) ? explode( '|:|', $value ) : array();
602
-	        $ary = stripslashes_deep( $ary );
602
+			$ary = stripslashes_deep( $ary );
603 603
 			$img_url = \GV\Utils::get( $ary, 0 );
604 604
 
605 605
 			$img_title       = count( $ary ) > 1 ? $ary[1] : '';
@@ -672,7 +672,7 @@  discard block
 block discarded – undo
672 672
 	private function maybe_update_post_fields( $form ) {
673 673
 
674 674
 		if( empty( $this->entry['post_id'] ) ) {
675
-	        gravityview()->log->debug( 'This entry has no post fields. Continuing...' );
675
+			gravityview()->log->debug( 'This entry has no post fields. Continuing...' );
676 676
 			return;
677 677
 		}
678 678
 
@@ -707,51 +707,51 @@  discard block
 block discarded – undo
707 707
 
708 708
 				switch( $field->type ) {
709 709
 
710
-				    case 'post_title':
711
-				        $post_title = $value;
712
-				        if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) {
713
-				            $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
714
-				        }
715
-				        $updated_post->post_title = $post_title;
716
-				        $updated_post->post_name  = $post_title;
717
-				        unset( $post_title );
718
-				        break;
719
-
720
-				    case 'post_content':
721
-				        $post_content = $value;
722
-				        if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) {
723
-				            $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
724
-				        }
725
-				        $updated_post->post_content = $post_content;
726
-				        unset( $post_content );
727
-				        break;
728
-				    case 'post_excerpt':
729
-				        $updated_post->post_excerpt = $value;
730
-				        break;
731
-				    case 'post_tags':
732
-				        wp_set_post_tags( $post_id, $value, false );
733
-				        break;
734
-				    case 'post_category':
735
-				        break;
736
-				    case 'post_custom_field':
710
+					case 'post_title':
711
+						$post_title = $value;
712
+						if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) {
713
+							$post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
714
+						}
715
+						$updated_post->post_title = $post_title;
716
+						$updated_post->post_name  = $post_title;
717
+						unset( $post_title );
718
+						break;
719
+
720
+					case 'post_content':
721
+						$post_content = $value;
722
+						if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) {
723
+							$post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
724
+						}
725
+						$updated_post->post_content = $post_content;
726
+						unset( $post_content );
727
+						break;
728
+					case 'post_excerpt':
729
+						$updated_post->post_excerpt = $value;
730
+						break;
731
+					case 'post_tags':
732
+						wp_set_post_tags( $post_id, $value, false );
733
+						break;
734
+					case 'post_category':
735
+						break;
736
+					case 'post_custom_field':
737 737
 						if ( is_array( $value ) && ( floatval( $field_id ) !== floatval( $field->id ) ) ) {
738 738
 							$value = $value[ $field_id ];
739 739
 						}
740 740
 
741
-				        if( ! empty( $field->customFieldTemplateEnabled ) ) {
742
-				            $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
743
-				        }
741
+						if( ! empty( $field->customFieldTemplateEnabled ) ) {
742
+							$value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
743
+						}
744 744
 
745
-	                    if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) {
746
-		                    $value = wp_json_encode( $value );
747
-	                    }
745
+						if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) {
746
+							$value = wp_json_encode( $value );
747
+						}
748 748
 
749
-				        update_post_meta( $post_id, $field->postCustomFieldName, $value );
750
-				        break;
749
+						update_post_meta( $post_id, $field->postCustomFieldName, $value );
750
+						break;
751 751
 
752
-				    case 'post_image':
753
-				        $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id );
754
-				        break;
752
+					case 'post_image':
753
+						$value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id );
754
+						break;
755 755
 
756 756
 				}
757 757
 
@@ -796,20 +796,20 @@  discard block
 block discarded – undo
796 796
 	 */
797 797
 	private function is_field_json_encoded( $field ) {
798 798
 
799
-	    $json_encoded = false;
799
+		$json_encoded = false;
800 800
 
801 801
 		$input_type = RGFormsModel::get_input_type( $field );
802 802
 
803
-	    // Only certain custom field types are supported
804
-	    switch( $input_type ) {
805
-		    case 'fileupload':
806
-		    case 'list':
807
-		    case 'multiselect':
808
-			    $json_encoded = true;
809
-			    break;
810
-	    }
803
+		// Only certain custom field types are supported
804
+		switch( $input_type ) {
805
+			case 'fileupload':
806
+			case 'list':
807
+			case 'multiselect':
808
+				$json_encoded = true;
809
+				break;
810
+		}
811 811
 
812
-	    return $json_encoded;
812
+		return $json_encoded;
813 813
 	}
814 814
 
815 815
 	/**
@@ -899,14 +899,14 @@  discard block
 block discarded – undo
899 899
 			?><h2 class="gv-edit-entry-title">
900 900
 				<span><?php
901 901
 
902
-				    /**
903
-				     * @filter `gravityview_edit_entry_title` Modify the edit entry title
904
-				     * @param string $edit_entry_title Modify the "Edit Entry" title
905
-				     * @param GravityView_Edit_Entry_Render $this This object
906
-				     */
907
-				    $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
902
+					/**
903
+					 * @filter `gravityview_edit_entry_title` Modify the edit entry title
904
+					 * @param string $edit_entry_title Modify the "Edit Entry" title
905
+					 * @param GravityView_Edit_Entry_Render $this This object
906
+					 */
907
+					$edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
908 908
 
909
-				    echo esc_attr( $edit_entry_title );
909
+					echo esc_attr( $edit_entry_title );
910 910
 			?></span>
911 911
 			</h2>
912 912
 
@@ -1015,7 +1015,7 @@  discard block
 block discarded – undo
1015 1015
 
1016 1016
 		ob_get_clean();
1017 1017
 
1018
-	    remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
1018
+		remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
1019 1019
 		remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
1020 1020
 		remove_filter( 'gform_disable_view_counter', '__return_true' );
1021 1021
 		remove_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5 );
@@ -1069,7 +1069,7 @@  discard block
 block discarded – undo
1069 1069
 
1070 1070
 		// for now we don't support Save and Continue feature.
1071 1071
 		if( ! self::$supports_save_and_continue ) {
1072
-	        unset( $form['save'] );
1072
+			unset( $form['save'] );
1073 1073
 		}
1074 1074
 
1075 1075
 		return $form;
@@ -1144,7 +1144,7 @@  discard block
 block discarded – undo
1144 1144
 			|| ! empty( $field_content )
1145 1145
 			|| in_array( $field->type, array( 'honeypot' ) )
1146 1146
 		) {
1147
-	        return $field_content;
1147
+			return $field_content;
1148 1148
 		}
1149 1149
 
1150 1150
 		// SET SOME FIELD DEFAULTS TO PREVENT ISSUES
@@ -1152,24 +1152,24 @@  discard block
 block discarded – undo
1152 1152
 
1153 1153
 		$field_value = $this->get_field_value( $field );
1154 1154
 
1155
-	    // Prevent any PHP warnings, like undefined index
1156
-	    ob_start();
1155
+		// Prevent any PHP warnings, like undefined index
1156
+		ob_start();
1157 1157
 
1158
-	    $return = null;
1158
+		$return = null;
1159 1159
 
1160 1160
 		/** @var GravityView_Field $gv_field */
1161 1161
 		if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
1162 1162
 			$return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
1163 1163
 		} else {
1164
-	        $return = $field->get_field_input( $this->form, $field_value, $this->entry );
1165
-	    }
1164
+			$return = $field->get_field_input( $this->form, $field_value, $this->entry );
1165
+		}
1166 1166
 
1167
-	    // If there was output, it's an error
1168
-	    $warnings = ob_get_clean();
1167
+		// If there was output, it's an error
1168
+		$warnings = ob_get_clean();
1169 1169
 
1170
-	    if( !empty( $warnings ) ) {
1171
-		    gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) );
1172
-	    }
1170
+		if( !empty( $warnings ) ) {
1171
+			gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) );
1172
+		}
1173 1173
 
1174 1174
 		return $return;
1175 1175
 	}
@@ -1204,8 +1204,8 @@  discard block
 block discarded – undo
1204 1204
 				$input_id = strval( $input['id'] );
1205 1205
 				
1206 1206
 				if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) {
1207
-				    $field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
1208
-				    $allow_pre_populated = false;
1207
+					$field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
1208
+					$allow_pre_populated = false;
1209 1209
 				}
1210 1210
 
1211 1211
 			}
@@ -1229,7 +1229,7 @@  discard block
 block discarded – undo
1229 1229
 			if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) {
1230 1230
 				$categories = array();
1231 1231
 				foreach ( explode( ',', $field_value ) as $cat_string ) {
1232
-				    $categories[] = GFCommon::format_post_category( $cat_string, true );
1232
+					$categories[] = GFCommon::format_post_category( $cat_string, true );
1233 1233
 				}
1234 1234
 				$field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
1235 1235
 			}
@@ -1239,25 +1239,25 @@  discard block
 block discarded – undo
1239 1239
 		// if value is empty get the default value if defined
1240 1240
 		$field_value = $field->get_value_default_if_empty( $field_value );
1241 1241
 
1242
-	    /**
1243
-	     * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
1244
-	     * @since 1.11
1245
-	     * @since 1.20 Added third param
1246
-	     * @param mixed $field_value field value used to populate the input
1247
-	     * @param object $field Gravity Forms field object ( Class GF_Field )
1248
-	     * @param GravityView_Edit_Entry_Render $this Current object
1249
-	     */
1250
-	    $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this );
1251
-
1252
-	    /**
1253
-	     * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type
1254
-	     * @since 1.17
1255
-	     * @since 1.20 Added third param
1256
-	     * @param mixed $field_value field value used to populate the input
1257
-	     * @param GF_Field $field Gravity Forms field object
1258
-	     * @param GravityView_Edit_Entry_Render $this Current object
1259
-	     */
1260
-	    $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
1242
+		/**
1243
+		 * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
1244
+		 * @since 1.11
1245
+		 * @since 1.20 Added third param
1246
+		 * @param mixed $field_value field value used to populate the input
1247
+		 * @param object $field Gravity Forms field object ( Class GF_Field )
1248
+		 * @param GravityView_Edit_Entry_Render $this Current object
1249
+		 */
1250
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this );
1251
+
1252
+		/**
1253
+		 * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type
1254
+		 * @since 1.17
1255
+		 * @since 1.20 Added third param
1256
+		 * @param mixed $field_value field value used to populate the input
1257
+		 * @param GF_Field $field Gravity Forms field object
1258
+		 * @param GravityView_Edit_Entry_Render $this Current object
1259
+		 */
1260
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
1261 1261
 
1262 1262
 		return $field_value;
1263 1263
 	}
@@ -1284,7 +1284,7 @@  discard block
 block discarded – undo
1284 1284
 			// This is because we're doing admin form pretending to be front-end, so Gravity Forms
1285 1285
 			// expects certain field array items to be set.
1286 1286
 			foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) {
1287
-	            $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
1287
+				$field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
1288 1288
 			}
1289 1289
 
1290 1290
 			switch( RGFormsModel::get_input_type( $field ) ) {
@@ -1298,61 +1298,61 @@  discard block
 block discarded – undo
1298 1298
 				 */
1299 1299
 				case 'fileupload':
1300 1300
 
1301
-				    // Set the previous value
1302
-				    $entry = $this->get_entry();
1301
+					// Set the previous value
1302
+					$entry = $this->get_entry();
1303 1303
 
1304
-				    $input_name = 'input_'.$field->id;
1305
-				    $form_id = $form['id'];
1304
+					$input_name = 'input_'.$field->id;
1305
+					$form_id = $form['id'];
1306 1306
 
1307
-				    $value = NULL;
1307
+					$value = NULL;
1308 1308
 
1309
-				    // Use the previous entry value as the default.
1310
-				    if( isset( $entry[ $field->id ] ) ) {
1311
-				        $value = $entry[ $field->id ];
1312
-				    }
1309
+					// Use the previous entry value as the default.
1310
+					if( isset( $entry[ $field->id ] ) ) {
1311
+						$value = $entry[ $field->id ];
1312
+					}
1313 1313
 
1314
-				    // If this is a single upload file
1315
-				    if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
1316
-				        $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
1317
-				        $value = $file_path['url'];
1314
+					// If this is a single upload file
1315
+					if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
1316
+						$file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
1317
+						$value = $file_path['url'];
1318 1318
 
1319
-				    } else {
1319
+					} else {
1320 1320
 
1321
-				        // Fix PHP warning on line 1498 of form_display.php for post_image fields
1322
-				        // Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
1323
-				        $_FILES[ $input_name ] = array('name' => '', 'size' => '' );
1321
+						// Fix PHP warning on line 1498 of form_display.php for post_image fields
1322
+						// Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
1323
+						$_FILES[ $input_name ] = array('name' => '', 'size' => '' );
1324 1324
 
1325
-				    }
1325
+					}
1326 1326
 
1327
-				    if ( \GV\Utils::get( $field, "multipleFiles" ) ) {
1327
+					if ( \GV\Utils::get( $field, "multipleFiles" ) ) {
1328 1328
 
1329
-				        // If there are fresh uploads, process and merge them.
1330
-				        // Otherwise, use the passed values, which should be json-encoded array of URLs
1331
-				        if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
1332
-				            $value = empty( $value ) ? '[]' : $value;
1333
-				            $value = stripslashes_deep( $value );
1334
-				            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
1335
-				        }
1329
+						// If there are fresh uploads, process and merge them.
1330
+						// Otherwise, use the passed values, which should be json-encoded array of URLs
1331
+						if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
1332
+							$value = empty( $value ) ? '[]' : $value;
1333
+							$value = stripslashes_deep( $value );
1334
+							$value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
1335
+						}
1336 1336
 
1337
-				    } else {
1337
+					} else {
1338 1338
 
1339
-				        // A file already exists when editing an entry
1340
-				        // We set this to solve issue when file upload fields are required.
1341
-				        GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
1339
+						// A file already exists when editing an entry
1340
+						// We set this to solve issue when file upload fields are required.
1341
+						GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
1342 1342
 
1343
-				    }
1343
+					}
1344 1344
 
1345
-				    $this->entry[ $input_name ] = $value;
1346
-				    $_POST[ $input_name ] = $value;
1345
+					$this->entry[ $input_name ] = $value;
1346
+					$_POST[ $input_name ] = $value;
1347 1347
 
1348
-				    break;
1348
+					break;
1349 1349
 
1350 1350
 				case 'number':
1351
-				    // Fix "undefined index" issue at line 1286 in form_display.php
1352
-				    if( !isset( $_POST['input_'.$field->id ] ) ) {
1353
-				        $_POST['input_'.$field->id ] = NULL;
1354
-				    }
1355
-				    break;
1351
+					// Fix "undefined index" issue at line 1286 in form_display.php
1352
+					if( !isset( $_POST['input_'.$field->id ] ) ) {
1353
+						$_POST['input_'.$field->id ] = NULL;
1354
+					}
1355
+					break;
1356 1356
 			}
1357 1357
 
1358 1358
 		}
@@ -1437,42 +1437,42 @@  discard block
 block discarded – undo
1437 1437
 				case 'fileupload' :
1438 1438
 				case 'post_image':
1439 1439
 
1440
-				    // in case nothing is uploaded but there are already files saved
1441
-				    if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
1442
-				        $field->failed_validation = false;
1443
-				        unset( $field->validation_message );
1444
-				    }
1440
+					// in case nothing is uploaded but there are already files saved
1441
+					if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
1442
+						$field->failed_validation = false;
1443
+						unset( $field->validation_message );
1444
+					}
1445 1445
 
1446
-				    // validate if multi file upload reached max number of files [maxFiles] => 2
1447
-				    if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) {
1446
+					// validate if multi file upload reached max number of files [maxFiles] => 2
1447
+					if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) {
1448 1448
 
1449
-				        $input_name = 'input_' . $field->id;
1450
-				        //uploaded
1451
-				        $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
1449
+						$input_name = 'input_' . $field->id;
1450
+						//uploaded
1451
+						$file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
1452 1452
 
1453
-				        //existent
1454
-				        $entry = $this->get_entry();
1455
-				        $value = NULL;
1456
-				        if( isset( $entry[ $field->id ] ) ) {
1457
-				            $value = json_decode( $entry[ $field->id ], true );
1458
-				        }
1453
+						//existent
1454
+						$entry = $this->get_entry();
1455
+						$value = NULL;
1456
+						if( isset( $entry[ $field->id ] ) ) {
1457
+							$value = json_decode( $entry[ $field->id ], true );
1458
+						}
1459 1459
 
1460
-				        // count uploaded files and existent entry files
1461
-				        $count_files = count( $file_names ) + count( $value );
1460
+						// count uploaded files and existent entry files
1461
+						$count_files = count( $file_names ) + count( $value );
1462 1462
 
1463
-				        if( $count_files > $field->maxFiles ) {
1464
-				            $field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
1465
-				            $field->failed_validation = 1;
1466
-				            $gv_valid = false;
1463
+						if( $count_files > $field->maxFiles ) {
1464
+							$field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
1465
+							$field->failed_validation = 1;
1466
+							$gv_valid = false;
1467 1467
 
1468
-				            // in case of error make sure the newest upload files are removed from the upload input
1469
-				            GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
1470
-				        }
1468
+							// in case of error make sure the newest upload files are removed from the upload input
1469
+							GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
1470
+						}
1471 1471
 
1472
-				    }
1472
+					}
1473 1473
 
1474 1474
 
1475
-				    break;
1475
+					break;
1476 1476
 
1477 1477
 			}
1478 1478
 
@@ -1483,47 +1483,47 @@  discard block
 block discarded – undo
1483 1483
 
1484 1484
 				switch ( $field_type ) {
1485 1485
 
1486
-				    // Captchas don't need to be re-entered.
1487
-				    case 'captcha':
1486
+					// Captchas don't need to be re-entered.
1487
+					case 'captcha':
1488 1488
 
1489
-				        // Post Image fields aren't editable, so we un-fail them.
1490
-				    case 'post_image':
1491
-				        $field->failed_validation = false;
1492
-				        unset( $field->validation_message );
1493
-				        break;
1489
+						// Post Image fields aren't editable, so we un-fail them.
1490
+					case 'post_image':
1491
+						$field->failed_validation = false;
1492
+						unset( $field->validation_message );
1493
+						break;
1494 1494
 
1495 1495
 				}
1496 1496
 
1497 1497
 				// You can't continue inside a switch, so we do it after.
1498 1498
 				if( empty( $field->failed_validation ) ) {
1499
-				    continue;
1499
+					continue;
1500 1500
 				}
1501 1501
 
1502 1502
 				// checks if the No Duplicates option is not validating entry against itself, since
1503 1503
 				// we're editing a stored entry, it would also assume it's a duplicate.
1504 1504
 				if( !empty( $field->noDuplicates ) ) {
1505 1505
 
1506
-				    $entry = $this->get_entry();
1506
+					$entry = $this->get_entry();
1507 1507
 
1508
-				    // If the value of the entry is the same as the stored value
1509
-				    // Then we can assume it's not a duplicate, it's the same.
1510
-				    if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
1511
-				        //if value submitted was not changed, then don't validate
1512
-				        $field->failed_validation = false;
1508
+					// If the value of the entry is the same as the stored value
1509
+					// Then we can assume it's not a duplicate, it's the same.
1510
+					if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
1511
+						//if value submitted was not changed, then don't validate
1512
+						$field->failed_validation = false;
1513 1513
 
1514
-				        unset( $field->validation_message );
1514
+						unset( $field->validation_message );
1515 1515
 
1516
-				        gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) );
1516
+						gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) );
1517 1517
 
1518
-				        continue;
1519
-				    }
1518
+						continue;
1519
+					}
1520 1520
 				}
1521 1521
 
1522 1522
 				// if here then probably we are facing the validation 'At least one field must be filled out'
1523 1523
 				if( GFFormDisplay::is_empty( $field, $this->form_id  ) && empty( $field->isRequired ) ) {
1524
-				    unset( $field->validation_message );
1525
-	                $field->validation_message = false;
1526
-				    continue;
1524
+					unset( $field->validation_message );
1525
+					$field->validation_message = false;
1526
+					continue;
1527 1527
 				}
1528 1528
 
1529 1529
 				$gv_valid = false;
@@ -1587,8 +1587,8 @@  discard block
 block discarded – undo
1587 1587
 		// Hide fields depending on admin settings
1588 1588
 		$fields = $this->filter_fields( $form['fields'], $edit_fields );
1589 1589
 
1590
-	    // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
1591
-	    $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
1590
+		// If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
1591
+		$fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
1592 1592
 
1593 1593
 		/**
1594 1594
 		 * @filter `gravityview/edit_entry/form_fields` Modify the fields displayed in Edit Entry form
@@ -1648,11 +1648,11 @@  discard block
 block discarded – undo
1648 1648
 		// The edit tab has been configured, so we loop through to configured settings
1649 1649
 		foreach ( $configured_fields as $configured_field ) {
1650 1650
 
1651
-	        /** @var GF_Field $field */
1652
-	        foreach ( $fields as $field ) {
1651
+			/** @var GF_Field $field */
1652
+			foreach ( $fields as $field ) {
1653 1653
 				if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
1654
-				    $edit_fields[] = $this->merge_field_properties( $field, $configured_field );
1655
-				    break;
1654
+					$edit_fields[] = $this->merge_field_properties( $field, $configured_field );
1655
+					break;
1656 1656
 				}
1657 1657
 
1658 1658
 			}
@@ -1708,28 +1708,28 @@  discard block
 block discarded – undo
1708 1708
 	 */
1709 1709
 	private function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) {
1710 1710
 
1711
-	    /**
1711
+		/**
1712 1712
 		 * @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
1713
-	     * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators.
1714
-	     * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions
1715
-	     * @since 1.9.1
1716
-	     * @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.
1717
-	     * @param array $form GF Form array
1718
-	     * @param int $view_id View ID
1719
-	     */
1720
-	    $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
1721
-
1722
-	    if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
1713
+		 * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators.
1714
+		 * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions
1715
+		 * @since 1.9.1
1716
+		 * @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.
1717
+		 * @param array $form GF Form array
1718
+		 * @param int $view_id View ID
1719
+		 */
1720
+		$use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
1721
+
1722
+		if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
1723 1723
 			foreach( $fields as $k => $field ) {
1724 1724
 				if( $field->adminOnly ) {
1725
-				    unset( $fields[ $k ] );
1725
+					unset( $fields[ $k ] );
1726 1726
 				}
1727 1727
 			}
1728 1728
 			return $fields;
1729 1729
 		}
1730 1730
 
1731
-	    foreach( $fields as &$field ) {
1732
-		    $field->adminOnly = false;
1731
+		foreach( $fields as &$field ) {
1732
+			$field->adminOnly = false;
1733 1733
 		}
1734 1734
 
1735 1735
 		return $fields;
@@ -1762,36 +1762,36 @@  discard block
 block discarded – undo
1762 1762
 
1763 1763
 			if( 'checkbox' === $field->type ) {
1764 1764
 				foreach ( $field->get_entry_inputs() as $key => $input ) {
1765
-				    $input_id = $input['id'];
1766
-				    $choice = $field->choices[ $key ];
1767
-				    $value = \GV\Utils::get( $this->entry, $input_id );
1768
-				    $match = RGFormsModel::choice_value_match( $field, $choice, $value );
1769
-				    if( $match ) {
1770
-				        $field->choices[ $key ]['isSelected'] = true;
1771
-				    }
1765
+					$input_id = $input['id'];
1766
+					$choice = $field->choices[ $key ];
1767
+					$value = \GV\Utils::get( $this->entry, $input_id );
1768
+					$match = RGFormsModel::choice_value_match( $field, $choice, $value );
1769
+					if( $match ) {
1770
+						$field->choices[ $key ]['isSelected'] = true;
1771
+					}
1772 1772
 				}
1773 1773
 			} else {
1774 1774
 
1775 1775
 				// We need to run through each field to set the default values
1776 1776
 				foreach ( $this->entry as $field_id => $field_value ) {
1777 1777
 
1778
-				    if( floatval( $field_id ) === floatval( $field->id ) ) {
1778
+					if( floatval( $field_id ) === floatval( $field->id ) ) {
1779 1779
 
1780
-				        if( 'list' === $field->type ) {
1781
-				            $list_rows = maybe_unserialize( $field_value );
1780
+						if( 'list' === $field->type ) {
1781
+							$list_rows = maybe_unserialize( $field_value );
1782 1782
 
1783
-				            $list_field_value = array();
1784
-				            foreach ( (array) $list_rows as $row ) {
1785
-				                foreach ( (array) $row as $column ) {
1786
-				                    $list_field_value[] = $column;
1787
-				                }
1788
-				            }
1783
+							$list_field_value = array();
1784
+							foreach ( (array) $list_rows as $row ) {
1785
+								foreach ( (array) $row as $column ) {
1786
+									$list_field_value[] = $column;
1787
+								}
1788
+							}
1789 1789
 
1790
-				            $field->defaultValue = serialize( $list_field_value );
1791
-				        } else {
1792
-				            $field->defaultValue = $field_value;
1793
-				        }
1794
-				    }
1790
+							$field->defaultValue = serialize( $list_field_value );
1791
+						} else {
1792
+							$field->defaultValue = $field_value;
1793
+						}
1794
+					}
1795 1795
 				}
1796 1796
 			}
1797 1797
 		}
@@ -1848,7 +1848,7 @@  discard block
 block discarded – undo
1848 1848
 			return $has_conditional_logic;
1849 1849
 		}
1850 1850
 
1851
-	    /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */
1851
+		/** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */
1852 1852
 		return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form );
1853 1853
 	}
1854 1854
 
@@ -1915,14 +1915,14 @@  discard block
 block discarded – undo
1915 1915
 
1916 1916
 		if( $echo && $error !== true ) {
1917 1917
 
1918
-	        $error = esc_html( $error );
1918
+			$error = esc_html( $error );
1919 1919
 
1920
-	        /**
1921
-	         * @since 1.9
1922
-	         */
1923
-	        if ( ! empty( $this->entry ) ) {
1924
-		        $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;" ) );
1925
-	        }
1920
+			/**
1921
+			 * @since 1.9
1922
+			 */
1923
+			if ( ! empty( $this->entry ) ) {
1924
+				$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;" ) );
1925
+			}
1926 1926
 
1927 1927
 			echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
1928 1928
 		}
Please login to merge, or discard this patch.