Completed
Pull Request — master (#1147)
by Zack
138:10 queued 69:57
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.
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/admin/metaboxes/views/view-configuration.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -26,11 +26,11 @@  discard block
 block discarded – undo
26 26
 
27 27
 			<?php
28 28
 
29
-                do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
29
+				do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
30 30
 
31
-    			do_action('gravityview_render_field_pickers', 'directory' );
31
+				do_action('gravityview_render_field_pickers', 'directory' );
32 32
 
33
-            ?>
33
+			?>
34 34
 
35 35
 			<?php // list of available widgets to be shown in the popup ?>
36 36
             <div id="directory-available-widgets" class="hide-if-js gv-tooltip">
@@ -55,13 +55,13 @@  discard block
 block discarded – undo
55 55
 
56 56
 			<div id="single-active-fields" class="gv-grid gv-grid-pad gv-grid-border">
57 57
 				<?php
58
-                if(!empty( $curr_template ) ) {
59
-				    do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
60
-                }
61
-			    ?>
58
+				if(!empty( $curr_template ) ) {
59
+					do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
60
+				}
61
+				?>
62 62
 			</div>
63 63
             <?php
64
-                do_action('gravityview_render_field_pickers', 'single' );
64
+				do_action('gravityview_render_field_pickers', 'single' );
65 65
 			?>
66 66
 		</div>
67 67
 
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 			</div>
81 81
 
82 82
 			<?php
83
-			    do_action('gravityview_render_field_pickers', 'edit' );
83
+				do_action('gravityview_render_field_pickers', 'edit' );
84 84
 			?>
85 85
 
86 86
 		</div>
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/class-admin-views.php 1 patch
Indentation   +83 added lines, -83 removed lines patch added patch discarded remove patch
@@ -63,28 +63,28 @@  discard block
 block discarded – undo
63 63
 	}
64 64
 
65 65
 	/**
66
-     * When on the Add/Edit View screen, suggest most popular articles related to that
67
-     *
66
+	 * When on the Add/Edit View screen, suggest most popular articles related to that
67
+	 *
68 68
 	 * @param array $localization_data Data to be passed to the Support Port JS
69 69
 	 *
70 70
 	 * @return array
71 71
 	 */
72 72
 	function suggest_support_articles( $localization_data = array() ) {
73 73
 
74
-	    if( ! gravityview()->request->is_view() ) {
75
-	        return $localization_data;
76
-        }
74
+		if( ! gravityview()->request->is_view() ) {
75
+			return $localization_data;
76
+		}
77 77
 
78 78
 		$localization_data['suggest'] = array(
79
-            '57ef23539033602e61d4a560',
80
-            '54c67bb9e4b0512429885513',
81
-            '54c67bb9e4b0512429885512',
82
-            '54c67bbbe4b07997ea3f3f6b',
83
-            '54d1a33ae4b086c0c0964ce9',
84
-            '57ef253c9033602e61d4a563',
85
-            '552355bfe4b0221aadf2572b',
86
-            '54c67bcde4b051242988553e',
87
-        );
79
+			'57ef23539033602e61d4a560',
80
+			'54c67bb9e4b0512429885513',
81
+			'54c67bb9e4b0512429885512',
82
+			'54c67bbbe4b07997ea3f3f6b',
83
+			'54d1a33ae4b086c0c0964ce9',
84
+			'57ef253c9033602e61d4a563',
85
+			'552355bfe4b0221aadf2572b',
86
+			'54c67bcde4b051242988553e',
87
+		);
88 88
 
89 89
 		return $localization_data;
90 90
 	}
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
 
169 169
 		if( empty( $connected_views ) ) {
170 170
 
171
-		    $menu_items['gravityview'] = array(
171
+			$menu_items['gravityview'] = array(
172 172
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
173 173
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
174 174
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -199,13 +199,13 @@  discard block
 block discarded – undo
199 199
 		// If there were no items added, then let's create the parent menu
200 200
 		if( $sub_menu_items ) {
201 201
 
202
-		    $sub_menu_items[] = array(
203
-			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
204
-                'link_class' => 'gv-create-view',
205
-			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
206
-			    'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
207
-			    'capabilities'   => array( 'edit_gravityviews' ),
208
-            );
202
+			$sub_menu_items[] = array(
203
+				'label' => esc_attr__( 'Create a View', 'gravityview' ),
204
+				'link_class' => 'gv-create-view',
205
+				'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
206
+				'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
207
+				'capabilities'   => array( 'edit_gravityviews' ),
208
+			);
209 209
 
210 210
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
211 211
 			$sub_menu_items[] = array(
@@ -588,12 +588,12 @@  discard block
 block discarded – undo
588 588
 	 * Render html for displaying available fields based on a Form ID
589 589
 	 * $blacklist_field_types - contains the field types which are not proper to be shown in a directory.
590 590
 	 *
591
-     * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
591
+	 * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
592 592
 	 * @access public
593
-     *
593
+	 *
594 594
 	 * @param int $form Gravity Forms Form ID (default: '')
595 595
 	 * @param string $context (default: 'single')
596
-     *
596
+	 *
597 597
 	 * @return void
598 598
 	 */
599 599
 	function render_available_fields( $form = 0, $context = 'single' ) {
@@ -607,7 +607,7 @@  discard block
 block discarded – undo
607 607
 
608 608
 		if ( ! is_array( $blacklist_field_types ) ) {
609 609
 
610
-		    gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
610
+			gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
611 611
 
612 612
 			$blacklist_field_types = array();
613 613
 		}
@@ -739,12 +739,12 @@  discard block
 block discarded – undo
739 739
 				/**
740 740
 				 * @since 1.7.2
741 741
 				 */
742
-			    'other_entries' => array(
743
-				    'label'	=> __('Other Entries', 'gravityview'),
744
-				    'type'	=> 'other_entries',
745
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
746
-			    ),
747
-	        );
742
+				'other_entries' => array(
743
+					'label'	=> __('Other Entries', 'gravityview'),
744
+					'type'	=> 'other_entries',
745
+					'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
746
+				),
747
+			);
748 748
 
749 749
 			if( 'single' !== $zone) {
750 750
 
@@ -877,9 +877,9 @@  discard block
 block discarded – undo
877 877
 
878 878
 				$joined_forms = gravityview_get_joined_forms( $post->ID );
879 879
 
880
-                foreach ( $joined_forms as $form ) {
881
-                    $available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
882
-                }
880
+				foreach ( $joined_forms as $form ) {
881
+					$available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
882
+				}
883 883
 			} else {
884 884
 				$available_items[ $form ] = $this->get_registered_widgets();
885 885
 			}
@@ -909,9 +909,9 @@  discard block
 block discarded – undo
909 909
 
910 910
 										if ( $form_id ) {
911 911
 											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
912
-                                        } else {
912
+										} else {
913 913
 											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
914
-                                        }
914
+										}
915 915
 
916 916
 										if ( !$original_item ) {
917 917
 											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) );
@@ -993,13 +993,13 @@  discard block
 block discarded – undo
993 993
 	}
994 994
 
995 995
 	/**
996
-     * Renders "Add Field" tooltips
997
-     *
998
-     * @since 2.0.11
999
-     *
996
+	 * Renders "Add Field" tooltips
997
+	 *
998
+	 * @since 2.0.11
999
+	 *
1000 1000
 	 * @param string $context "directory", "single", or "edit"
1001
-     *
1002
-     * @return void
1001
+	 *
1002
+	 * @return void
1003 1003
 	 */
1004 1004
 	function render_field_pickers( $context = 'directory' ) {
1005 1005
 
@@ -1026,7 +1026,7 @@  discard block
 block discarded – undo
1026 1026
             </div>
1027 1027
 			<?php
1028 1028
 		}
1029
-    }
1029
+	}
1030 1030
 
1031 1031
 	/**
1032 1032
 	 * Render the Template Active Areas and configured active fields for a given template id and post id
@@ -1098,59 +1098,59 @@  discard block
 block discarded – undo
1098 1098
 
1099 1099
 		// Don't process any scripts below here if it's not a GravityView page.
1100 1100
 		if( ! gravityview_is_admin_page( $hook, 'single' ) && ! $is_widgets_page ) {
1101
-		    return;
1101
+			return;
1102 1102
 		}
1103 1103
 
1104
-        wp_enqueue_script( 'jquery-ui-datepicker' );
1105
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), GravityView_Plugin::version );
1106
-
1107
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1108
-
1109
-        //enqueue scripts
1110
-        wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), GravityView_Plugin::version );
1111
-
1112
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1113
-            'cookiepath' => COOKIEPATH,
1114
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1115
-            'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1116
-            'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1117
-            'label_close' => __( 'Close', 'gravityview' ),
1118
-            'label_cancel' => __( 'Cancel', 'gravityview' ),
1119
-            'label_continue' => __( 'Continue', 'gravityview' ),
1120
-            'label_ok' => __( 'Ok', 'gravityview' ),
1121
-            'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1122
-            'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1123
-            'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1124
-            'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1125
-            'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
1126
-        ));
1127
-
1128
-        wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array('dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
1129
-
1130
-        // Enqueue scripts needed for merge tags
1131
-        self::enqueue_gravity_forms_scripts();
1104
+		wp_enqueue_script( 'jquery-ui-datepicker' );
1105
+		wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), GravityView_Plugin::version );
1106
+
1107
+		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1108
+
1109
+		//enqueue scripts
1110
+		wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), GravityView_Plugin::version );
1111
+
1112
+		wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1113
+			'cookiepath' => COOKIEPATH,
1114
+			'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1115
+			'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1116
+			'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1117
+			'label_close' => __( 'Close', 'gravityview' ),
1118
+			'label_cancel' => __( 'Cancel', 'gravityview' ),
1119
+			'label_continue' => __( 'Continue', 'gravityview' ),
1120
+			'label_ok' => __( 'Ok', 'gravityview' ),
1121
+			'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
1122
+			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
1123
+			'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1124
+			'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1125
+			'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
1126
+		));
1127
+
1128
+		wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array('dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
1129
+
1130
+		// Enqueue scripts needed for merge tags
1131
+		self::enqueue_gravity_forms_scripts();
1132 1132
 	}
1133 1133
 
1134 1134
 	/**
1135 1135
 	 * Enqueue Gravity Forms scripts, needed for Merge Tags
1136
-     *
1137
-     * @since 1.0.5-beta
1138
-     *
1139
-     * @return void
1136
+	 *
1137
+	 * @since 1.0.5-beta
1138
+	 *
1139
+	 * @return void
1140 1140
 	 */
1141 1141
 	static function enqueue_gravity_forms_scripts() {
1142 1142
 		GFForms::register_scripts();
1143 1143
 
1144 1144
 		$scripts = array(
1145
-		    'sack',
1146
-		    'gform_gravityforms',
1147
-		    'gform_forms',
1148
-		    'gform_form_admin',
1149
-		    'jquery-ui-autocomplete'
1145
+			'sack',
1146
+			'gform_gravityforms',
1147
+			'gform_forms',
1148
+			'gform_form_admin',
1149
+			'jquery-ui-autocomplete'
1150 1150
 		);
1151 1151
 
1152 1152
 		if ( wp_is_mobile() ) {
1153
-		    $scripts[] = 'jquery-touch-punch';
1153
+			$scripts[] = 'jquery-touch-punch';
1154 1154
 		}
1155 1155
 
1156 1156
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.