Completed
Pull Request — develop (#1687)
by
unknown
16:12
created
includes/admin/metaboxes/class-gravityview-admin-metaboxes.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
52 52
 	function update_priority() {
53 53
 		global $wp_meta_boxes;
54 54
 
55
-		if ( ! empty( $wp_meta_boxes['gravityview'] ) ) {
55
+		if ( ! empty( $wp_meta_boxes[ 'gravityview' ] ) ) {
56 56
 			foreach ( array( 'high', 'core', 'low' ) as $position ) {
57
-				if ( isset( $wp_meta_boxes['gravityview']['normal'][ $position ] ) ) {
58
-					foreach ( $wp_meta_boxes['gravityview']['normal'][ $position ] as $key => $meta_box ) {
57
+				if ( isset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] ) ) {
58
+					foreach ( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] as $key => $meta_box ) {
59 59
 						if ( ! preg_match( '/^gravityview_/ism', $key ) ) {
60
-							$wp_meta_boxes['gravityview']['advanced'][ $position ][ $key ] = $meta_box;
61
-							unset( $wp_meta_boxes['gravityview']['normal'][ $position ][ $key ] );
60
+							$wp_meta_boxes[ 'gravityview' ][ 'advanced' ][ $position ][ $key ] = $meta_box;
61
+							unset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ][ $key ] );
62 62
 						}
63 63
 					}
64 64
 				}
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 
192 192
 		foreach ( $metaboxes as $m ) {
193 193
 
194
-			$tab = new GravityView_Metabox_Tab( $m['id'], $m['title'], $m['file'], $m['icon-class'], $m['callback'], $m['callback_args'] );
194
+			$tab = new GravityView_Metabox_Tab( $m[ 'id' ], $m[ 'title' ], $m[ 'file' ], $m[ 'icon-class' ], $m[ 'callback' ], $m[ 'callback_args' ] );
195 195
 
196 196
 			GravityView_Metabox_Tabs::add( $tab );
197 197
 
@@ -261,13 +261,13 @@  discard block
 block discarded – undo
261 261
 
262 262
 		$form = gravityview_get_form( $curr_form );
263 263
 
264
-		$get_id_backup = isset( $_GET['id'] ) ? $_GET['id'] : null;
264
+		$get_id_backup = isset( $_GET[ 'id' ] ) ? $_GET[ 'id' ] : null;
265 265
 
266
-		if ( isset( $form['id'] ) ) {
266
+		if ( isset( $form[ 'id' ] ) ) {
267 267
 			$form_script = 'var form = ' . GFCommon::json_encode( $form ) . ';';
268 268
 
269 269
 			// The `gf_vars()` method needs a $_GET[id] variable set with the form ID.
270
-			$_GET['id'] = $form['id'];
270
+			$_GET[ 'id' ] = $form[ 'id' ];
271 271
 
272 272
 		} else {
273 273
 			$form_script = 'var form = new Form();';
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
 		$output = '<script type="text/javascript" data-gv-merge-tags="1">' . $form_script . "\n" . GFCommon::gf_vars( false ) . '</script>';
277 277
 
278 278
 		// Restore previous $_GET setting
279
-		$_GET['id'] = $get_id_backup;
279
+		$_GET[ 'id' ] = $get_id_backup;
280 280
 
281 281
 		return $output;
282 282
 	}
Please login to merge, or discard this patch.
includes/extensions/delete-entry/class-delete-entry.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -532,7 +532,7 @@
 block discarded – undo
532 532
 				 * @since 1.16.4
533 533
 				 * @param  int $entry_id ID of the Gravity Forms entry
534 534
 				 * @param  array $entry Deleted entry array
535
-				*/
535
+				 */
536 536
 				do_action( 'gravityview/delete-entry/deleted', $entry_id, $entry );
537 537
 			}
538 538
 
Please login to merge, or discard this patch.
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 	 */
113 113
 	public function add_reserved_arg( $args ) {
114 114
 
115
-		$args[] = 'delete';
115
+		$args[ ] = 'delete';
116 116
 
117 117
 		return $args;
118 118
 	}
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 
183 183
 		// Index 100 is the default GravityView template path.
184 184
 		// Index 110 is Edit Entry link
185
-		$file_paths[115] = self::$file;
185
+		$file_paths[ 115 ] = self::$file;
186 186
 
187 187
 		return $file_paths;
188 188
 	}
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
 
287 287
 		$attributes = array(
288 288
 			'class' => 'btn btn-sm button button-small alignright pull-right btn-danger gv-button-delete',
289
-			'tabindex' => ( GFCommon::$tab_index ++ ),
289
+			'tabindex' => ( GFCommon::$tab_index++ ),
290 290
 			'onclick' => self::get_confirm_dialog(),
291 291
 		);
292 292
 
@@ -322,12 +322,12 @@  discard block
 block discarded – undo
322 322
 		);
323 323
 
324 324
 		// If the form is not submitted, return early
325
-		if ( 'delete' !== $get_fields['action'] || empty( $get_fields['entry_id'] ) ) {
325
+		if ( 'delete' !== $get_fields[ 'action' ] || empty( $get_fields[ 'entry_id' ] ) ) {
326 326
 			return;
327 327
 		}
328 328
 
329 329
 		// Make sure it's a GravityView request
330
-		$valid_nonce_key = wp_verify_nonce( $get_fields['delete'], self::get_nonce_key( $get_fields['entry_id'] ) );
330
+		$valid_nonce_key = wp_verify_nonce( $get_fields[ 'delete' ], self::get_nonce_key( $get_fields[ 'entry_id' ] ) );
331 331
 
332 332
 		if ( ! $valid_nonce_key ) {
333 333
 			gravityview()->log->debug( 'Delete entry not processed: nonce validation failed.' );
@@ -336,10 +336,10 @@  discard block
 block discarded – undo
336 336
 		}
337 337
 
338 338
 		// Get the entry slug
339
-		$entry_slug = esc_attr( $get_fields['entry_id'] );
339
+		$entry_slug = esc_attr( $get_fields[ 'entry_id' ] );
340 340
 
341 341
 		// Redirect after deleting the entry.
342
-		$view = \GV\View::by_id( $get_fields['view_id'] );
342
+		$view = \GV\View::by_id( $get_fields[ 'view_id' ] );
343 343
 
344 344
 		// See if there's an entry there
345 345
 		$entry = gravityview_get_entry( $entry_slug, true, false, $view );
@@ -366,9 +366,9 @@  discard block
 block discarded – undo
366 366
 			$this->_redirect_and_exit( $delete_redirect_base, $delete_response->get_error_message(), 'error' );
367 367
 		}
368 368
 
369
-		if ( (int) $view->settings->get( 'delete_redirect' ) === self::REDIRECT_TO_URL_VALUE ) {
369
+		if ( (int)$view->settings->get( 'delete_redirect' ) === self::REDIRECT_TO_URL_VALUE ) {
370 370
 
371
-			$form                 = GFAPI::get_form( $entry['form_id'] );
371
+			$form                 = GFAPI::get_form( $entry[ 'form_id' ] );
372 372
 			$redirect_url_setting = $view->settings->get( 'delete_redirect_url' );
373 373
 			$redirect_url         = GFCommon::replace_variables( $redirect_url_setting, $form, $entry, false, false, false, 'text' );
374 374
 
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
 	 */
445 445
 	private function delete_or_trash_entry( $entry ) {
446 446
 
447
-		$entry_id = $entry['id'];
447
+		$entry_id = $entry[ 'id' ];
448 448
 
449 449
 		$mode = $this->get_delete_mode();
450 450
 
@@ -508,7 +508,7 @@  discard block
 block discarded – undo
508 508
 	public function process_connected_posts( $entry_id = 0, $entry = array() ) {
509 509
 
510 510
 		// The entry had no connected post
511
-		if ( empty( $entry['post_id'] ) ) {
511
+		if ( empty( $entry[ 'post_id' ] ) ) {
512 512
 			return;
513 513
 		}
514 514
 
@@ -526,9 +526,9 @@  discard block
 block discarded – undo
526 526
 		$action = current_action();
527 527
 
528 528
 		if ( 'gravityview/delete-entry/deleted' === $action ) {
529
-			$result = wp_delete_post( $entry['post_id'], true );
529
+			$result = wp_delete_post( $entry[ 'post_id' ], true );
530 530
 		} else {
531
-			$result = wp_trash_post( $entry['post_id'] );
531
+			$result = wp_trash_post( $entry[ 'post_id' ] );
532 532
 		}
533 533
 
534 534
 		if ( false === $result ) {
@@ -559,13 +559,13 @@  discard block
 block discarded – undo
559 559
 	public function verify_nonce() {
560 560
 
561 561
 		// No delete entry request was made
562
-		if ( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) {
562
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) {
563 563
 			return false;
564 564
 		}
565 565
 
566
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
566
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
567 567
 
568
-		$valid = wp_verify_nonce( $_GET['delete'], $nonce_key );
568
+		$valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key );
569 569
 
570 570
 		/**
571 571
 		 * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid.
@@ -621,7 +621,7 @@  discard block
 block discarded – undo
621 621
 			$error = __( 'You do not have permission to delete this entry.', 'gravityview' );
622 622
 		}
623 623
 
624
-		if ( $entry['status'] === 'trash' ) {
624
+		if ( $entry[ 'status' ] === 'trash' ) {
625 625
 			if ( 'trash' === $this->get_delete_mode() ) {
626 626
 				$error = __( 'The entry is already in the trash.', 'gravityview' );
627 627
 			} else {
@@ -665,7 +665,7 @@  discard block
 block discarded – undo
665 665
 
666 666
 		$current_user = wp_get_current_user();
667 667
 
668
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : null;
668
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : null;
669 669
 
670 670
 		// Or if they can delete any entries (as defined in Gravity Forms), we're good.
671 671
 		if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
@@ -679,17 +679,17 @@  discard block
 block discarded – undo
679 679
 		if ( ! empty( $field ) ) {
680 680
 
681 681
 			// If capability is not defined, something is not right!
682
-			if ( empty( $field['allow_edit_cap'] ) ) {
682
+			if ( empty( $field[ 'allow_edit_cap' ] ) ) {
683 683
 
684 684
 				gravityview()->log->error( 'Cannot read delete entry field caps', array( 'data' => $field ) );
685 685
 
686 686
 				return false;
687 687
 			}
688 688
 
689
-			if ( GVCommon::has_cap( $field['allow_edit_cap'] ) ) {
689
+			if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) {
690 690
 
691 691
 				// Do not return true if cap is read, as we need to check if the current user created the entry
692
-				if ( $field['allow_edit_cap'] !== 'read' ) {
692
+				if ( $field[ 'allow_edit_cap' ] !== 'read' ) {
693 693
 					return true;
694 694
 				}
695 695
 			} else {
@@ -700,7 +700,7 @@  discard block
 block discarded – undo
700 700
 			}
701 701
 		}
702 702
 
703
-		if ( ! isset( $entry['created_by'] ) ) {
703
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
704 704
 
705 705
 			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
706 706
 
@@ -716,7 +716,7 @@  discard block
 block discarded – undo
716 716
 		}
717 717
 
718 718
 		// If the logged-in user is the same as the user who created the entry, we're good.
719
-		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
719
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
720 720
 
721 721
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
722 722
 
@@ -741,12 +741,12 @@  discard block
 block discarded – undo
741 741
 	 */
742 742
 	public function maybe_display_message( $current_view_id = 0 ) {
743 743
 
744
-		if ( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
744
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
745 745
 			return;
746 746
 		}
747 747
 
748 748
 		// Entry wasn't deleted from current View
749
-		if ( isset( $_GET['view_id'] ) && intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) {
749
+		if ( isset( $_GET[ 'view_id' ] ) && intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) {
750 750
 			return;
751 751
 		}
752 752
 
@@ -755,11 +755,11 @@  discard block
 block discarded – undo
755 755
 
756 756
 	public function display_message() {
757 757
 
758
-		if ( empty( $_GET['status'] ) || empty( $_GET['delete'] ) ) {
758
+		if ( empty( $_GET[ 'status' ] ) || empty( $_GET[ 'delete' ] ) ) {
759 759
 			return;
760 760
 		}
761 761
 
762
-		$status = esc_attr( $_GET['status'] );
762
+		$status = esc_attr( $_GET[ 'status' ] );
763 763
 		$message_from_url = \GV\Utils::_GET( 'message' );
764 764
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
765 765
 		$class = '';
Please login to merge, or discard this patch.
includes/extensions/delete-entry/fields/delete_link.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,11 +12,11 @@
 block discarded – undo
12 12
 extract( $gravityview_view->getCurrentField() );
13 13
 
14 14
 // Only show the link to logged-in users with the right caps.
15
-if( !GravityView_Delete_Entry::check_user_cap_delete_entry( $entry, $field_settings ) ) {
15
+if ( ! GravityView_Delete_Entry::check_user_cap_delete_entry( $entry, $field_settings ) ) {
16 16
 	return;
17 17
 }
18 18
 
19
-$link_text = empty( $field_settings['delete_link'] ) ? __('Delete Entry', 'gravityview') : $field_settings['delete_link'];
19
+$link_text = empty( $field_settings[ 'delete_link' ] ) ? __( 'Delete Entry', 'gravityview' ) : $field_settings[ 'delete_link' ];
20 20
 
21 21
 $link_text = apply_filters( 'gravityview_entry_link', GravityView_API::replace_variables( $link_text, $form, $entry ) );
22 22
 
Please login to merge, or discard this patch.
includes/extensions/delete-entry/class-delete-entry-admin.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -83,9 +83,9 @@  discard block
 block discarded – undo
83 83
 		if ( $field_id === 'delete_link' ) {
84 84
 
85 85
 			// Remove other built-in caps.
86
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
86
+			unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] );
87 87
 
88
-			$caps['read'] = _x( 'Entry Creator', 'User capability', 'gravityview' );
88
+			$caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
89 89
 		}
90 90
 
91 91
 		return $caps;
@@ -108,12 +108,12 @@  discard block
 block discarded – undo
108 108
 	public function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
109 109
 
110 110
 		// Always a link, never a filter
111
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
111
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
112 112
 
113 113
 		// Delete Entry link should only appear to visitors capable of editing entries
114
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
114
+		unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
115 115
 
116
-		$add_option['delete_link'] = array(
116
+		$add_option[ 'delete_link' ] = array(
117 117
 			'type'       => 'text',
118 118
 			'label'      => __( 'Delete Link Text', 'gravityview' ),
119 119
 			'desc'       => null,
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 			'merge_tags' => true,
122 122
 		);
123 123
 
124
-		$field_options['allow_edit_cap'] = array(
124
+		$field_options[ 'allow_edit_cap' ] = array(
125 125
 			'type'    => 'select',
126 126
 			'label'   => __( 'Allow the following users to delete the entry:', 'gravityview' ),
127 127
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 	 */
147 147
 	public function add_available_field( $available_fields = array() ) {
148 148
 
149
-		$available_fields['delete_link'] = array(
149
+		$available_fields[ 'delete_link' ] = array(
150 150
 			'label_text'    => __( 'Delete Entry', 'gravityview' ),
151 151
 			'field_id'      => 'delete_link',
152 152
 			'label_type'    => 'field',
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 	public function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
189 189
 
190 190
 		if ( 'edit' !== $zone ) {
191
-			$entry_default_fields['delete_link'] = array(
191
+			$entry_default_fields[ 'delete_link' ] = array(
192 192
 				'label' => __( 'Delete Entry', 'gravityview' ),
193 193
 				'type'  => 'delete_link',
194 194
 				'desc'  => __( 'A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview' ),
Please login to merge, or discard this patch.
class-gravityview-plugin-hooks-gravityformspartialentries.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 
54 54
 		$partial_entries_addon = GF_Partial_Entries::get_instance();
55 55
 
56
-		$feed_settings = $partial_entries_addon->get_feed_settings( $form['id'] );
56
+		$feed_settings = $partial_entries_addon->get_feed_settings( $form[ 'id' ] );
57 57
 
58 58
 		$is_enabled = \GV\Utils::get( $feed_settings, 'enable', 0 );
59 59
 
@@ -70,14 +70,14 @@  discard block
 block discarded – undo
70 70
 		}
71 71
 
72 72
 		// Set the expected $_POST key for the Add-On to use
73
-		$_POST['partial_entry_id'] = $partial_entry_id;
73
+		$_POST[ 'partial_entry_id' ] = $partial_entry_id;
74 74
 
75 75
 		gravityview()->log->debug( 'Saving partial entry (ID #{partial_entry_id}) for Entry #{entry_id}', array(
76 76
 			'partial_entry_id' => $partial_entry_id,
77 77
 			'entry_id'         => $entry_id
78 78
 		) );
79 79
 
80
-		$partial_entries_addon->maybe_save_partial_entry( $form['id'] );
80
+		$partial_entries_addon->maybe_save_partial_entry( $form[ 'id' ] );
81 81
 	}
82 82
 }
83 83
 
Please login to merge, or discard this patch.
includes/extensions/entry-notes/class-gravityview-field-notes.php 2 patches
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 	 *
271 271
 	 * Verify permissions. Check expected $_POST. Parse args, then send to process_delete_notes
272 272
 	 *
273
-  	 * @since 1.17
273
+	 * @since 1.17
274 274
 	 *
275 275
 	 * @see process_delete_notes
276 276
 	 *
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
 			'subject-label' => __( 'Subject', 'gravityview' ),
424 424
 			'subject' => __( 'Email subject', 'gravityview' ),
425 425
 			'default-email-subject' => __( 'New entry note', 'gravityview' ),
426
-            'email-footer' => __( 'This note was sent from {url}', 'gravityview' ),
426
+			'email-footer' => __( 'This note was sent from {url}', 'gravityview' ),
427 427
 			'also-email' => __( 'Also email this note to', 'gravityview' ),
428 428
 			'error-add-note' => __( 'There was an error adding the note.', 'gravityview' ),
429 429
 			'error-invalid' => __( 'The request was invalid. Refresh the page and try again.', 'gravityview' ),
@@ -493,11 +493,11 @@  discard block
 block discarded – undo
493 493
 
494 494
 		if ( $context instanceof \GV\Template_Context ) {
495 495
 
496
-		    ob_start();
497
-		    $context->template->get_template_part( 'note', 'detail', true );
498
-            $note_detail_html = ob_get_clean();
496
+			ob_start();
497
+			$context->template->get_template_part( 'note', 'detail', true );
498
+			$note_detail_html = ob_get_clean();
499 499
 
500
-            ob_start();
500
+			ob_start();
501 501
 			$context->template->get_template_part( 'note', $note_row_template, true );
502 502
 			$note_row = ob_get_clean();
503 503
 		} else {
@@ -756,7 +756,7 @@  discard block
 block discarded – undo
756 756
 				'gv-note-to-custom' => '',
757 757
 				'gv-note-subject' => '',
758 758
 				'gv-note-content' => '',
759
-                'current-url' => '',
759
+				'current-url' => '',
760 760
 			);
761 761
 
762 762
 			$current_user  = wp_get_current_user();
@@ -808,9 +808,9 @@  discard block
 block discarded – undo
808 808
 			$message .= $this->get_email_footer( $email_footer, $is_html, $email_data );
809 809
 
810 810
 			/**
811
-             * @filter `gravityview/field/notes/wpautop_email` Should the message content have paragraphs added automatically, if using HTML message format
811
+			 * @filter `gravityview/field/notes/wpautop_email` Should the message content have paragraphs added automatically, if using HTML message format
812 812
 			 * @since 1.18
813
-             * @param bool $wpautop_email True: Apply wpautop() to the email message if using; False: Leave as entered (Default: true)
813
+			 * @param bool $wpautop_email True: Apply wpautop() to the email message if using; False: Leave as entered (Default: true)
814 814
 			 */
815 815
 			$wpautop_email = apply_filters( 'gravityview/field/notes/wpautop_email', true );
816 816
 
@@ -830,12 +830,12 @@  discard block
 block discarded – undo
830 830
 	}
831 831
 
832 832
 	/**
833
-     * Get the footer for Entry Note emails
834
-     *
835
-     * `{url}` is replaced by the URL of the page where the note form was embedded
836
-     *
837
-     * @since 1.18
838
-     * @see GravityView_Field_Notes::strings The default value of $message_footer is set here, with the key 'email-footer'
833
+	 * Get the footer for Entry Note emails
834
+	 *
835
+	 * `{url}` is replaced by the URL of the page where the note form was embedded
836
+	 *
837
+	 * @since 1.18
838
+	 * @see GravityView_Field_Notes::strings The default value of $message_footer is set here, with the key 'email-footer'
839 839
 	 *
840 840
 	 * @param string $email_footer The message footer value
841 841
 	 * @param bool $is_html True: Email is being sent as HTML; False: sent as text
@@ -844,10 +844,10 @@  discard block
 block discarded – undo
844 844
 	 */
845 845
 	private function get_email_footer( $email_footer = '', $is_html = true, $email_data = array() ) {
846 846
 
847
-	    $output = '';
847
+		$output = '';
848 848
 
849 849
 		if( ! empty( $email_footer ) ) {
850
-		    $url = \GV\Utils::get( $email_data, 'current-url' );
850
+			$url = \GV\Utils::get( $email_data, 'current-url' );
851 851
 			$url = html_entity_decode( $url );
852 852
 			$url = site_url( $url );
853 853
 
Please login to merge, or discard this patch.
Spacing   +76 added lines, -76 removed lines patch added patch discarded remove patch
@@ -63,19 +63,19 @@  discard block
 block discarded – undo
63 63
 
64 64
 		add_shortcode( 'gv_note_add', array( 'GravityView_Field_Notes', 'get_add_note_part' ) );
65 65
 
66
-		add_action( 'wp', array( $this, 'maybe_delete_notes'), 1000 );
67
-		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes') );
68
-		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes') );
66
+		add_action( 'wp', array( $this, 'maybe_delete_notes' ), 1000 );
67
+		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
68
+		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
69 69
 
70
-		add_action( 'wp', array( $this, 'maybe_add_note'), 1000 );
71
-		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note') );
72
-		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note') );
70
+		add_action( 'wp', array( $this, 'maybe_add_note' ), 1000 );
71
+		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note' ) );
72
+		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note' ) );
73 73
 
74 74
 		// add template path to check for field
75 75
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
76 76
 		add_filter( 'gravityview/template/fields_template_paths', array( $this, 'add_template_path' ) );
77 77
 
78
-		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') );
78
+		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) );
79 79
 		add_action( 'gravityview/field/notes/scripts', array( $this, 'enqueue_scripts' ) );
80 80
 
81 81
 		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_entry_default_field' ), 10, 3 );
@@ -97,8 +97,8 @@  discard block
 block discarded – undo
97 97
 	 */
98 98
 	public function add_entry_default_field( $entry_default_fields, $form, $zone ) {
99 99
 
100
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
101
-			$entry_default_fields['notes'] = array(
100
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
101
+			$entry_default_fields[ 'notes' ] = array(
102 102
 				'label' => __( 'Entry Notes', 'gravityview' ),
103 103
 				'type'  => 'notes',
104 104
 				'desc'  => __( 'Display, add, and delete notes for an entry.', 'gravityview' ),
@@ -131,23 +131,23 @@  discard block
 block discarded – undo
131 131
 	public function enqueue_scripts() {
132 132
 		global $wp_actions;
133 133
 
134
-		if( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
134
+		if ( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
135 135
 			wp_enqueue_style( 'gravityview-notes' );
136 136
 			wp_enqueue_script( 'gravityview-notes' );
137 137
 		}
138 138
 
139
-		if( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
139
+		if ( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
140 140
 
141 141
 			$strings = self::strings();
142 142
 
143 143
 			wp_localize_script( 'gravityview-notes', 'GVNotes', array(
144 144
 				'ajaxurl' => admin_url( 'admin-ajax.php' ),
145 145
 				'text' => array(
146
-					'processing' => $strings['processing'],
147
-					'delete_confirm' => $strings['delete-confirm'],
148
-					'note_added' => $strings['added-note'],
149
-					'error_invalid' => $strings['error-invalid'],
150
-					'error_empty_note' => $strings['error-empty-note'],
146
+					'processing' => $strings[ 'processing' ],
147
+					'delete_confirm' => $strings[ 'delete-confirm' ],
148
+					'note_added' => $strings[ 'added-note' ],
149
+					'error_invalid' => $strings[ 'error-invalid' ],
150
+					'error_empty_note' => $strings[ 'error-empty-note' ],
151 151
 				),
152 152
 			) );
153 153
 		}
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 	 * @return void
164 164
 	 */
165 165
 	function maybe_add_note() {
166
-		if ( ! isset( $_POST['action'] ) || 'gv_note_add' !== $_POST['action'] ) {
166
+		if ( ! isset( $_POST[ 'action' ] ) || 'gv_note_add' !== $_POST[ 'action' ] ) {
167 167
 			return;
168 168
 		}
169 169
 
@@ -176,12 +176,12 @@  discard block
 block discarded – undo
176 176
 		$post = wp_unslash( $_POST );
177 177
 
178 178
 		if ( $this->doing_ajax ) {
179
-			parse_str( $post['data'], $data );
179
+			parse_str( $post[ 'data' ], $data );
180 180
 		} else {
181 181
 			$data = $post;
182 182
 		}
183 183
 
184
-		$this->process_add_note( (array) $data );
184
+		$this->process_add_note( (array)$data );
185 185
 	}
186 186
 
187 187
 	/**
@@ -207,23 +207,23 @@  discard block
 block discarded – undo
207 207
 		$error = false;
208 208
 		$success = false;
209 209
 
210
-		if( empty( $data['entry-slug'] ) ) {
210
+		if ( empty( $data[ 'entry-slug' ] ) ) {
211 211
 
212
-			$error = self::strings('error-invalid');
212
+			$error = self::strings( 'error-invalid' );
213 213
 			gravityview()->log->error( 'The note is missing an Entry ID.' );
214 214
 
215 215
 		} else {
216 216
 
217
-			$valid = wp_verify_nonce( $data['gv_note_add'], 'gv_note_add_' . $data['entry-slug'] );
217
+			$valid = wp_verify_nonce( $data[ 'gv_note_add' ], 'gv_note_add_' . $data[ 'entry-slug' ] );
218 218
 
219 219
 			$has_cap = GVCommon::has_cap( 'gravityview_add_entry_notes' );
220 220
 
221
-			if( ! $has_cap ) {
221
+			if ( ! $has_cap ) {
222 222
 				$error = self::strings( 'error-cap-add' );
223 223
 				gravityview()->log->error( 'Adding a note failed: the user does not have the "gravityview_add_entry_notes" capability.' );
224 224
 			} elseif ( $valid ) {
225 225
 
226
-				$entry = gravityview_get_entry( $data['entry-slug'], true, false );
226
+				$entry = gravityview_get_entry( $data[ 'entry-slug' ], true, false );
227 227
 
228 228
 				$added = $this->add_note( $entry, $data );
229 229
 
@@ -241,22 +241,22 @@  discard block
 block discarded – undo
241 241
 					$this->maybe_send_entry_notes( $note, $entry, $data );
242 242
 
243 243
 					if ( $note ) {
244
-						$success = self::display_note( $note, ! empty( $data['show-delete'] ) );
244
+						$success = self::display_note( $note, ! empty( $data[ 'show-delete' ] ) );
245 245
 						gravityview()->log->debug( 'The note was successfully created', array( 'data' => compact( 'note', 'data' ) ) );
246 246
 					} else {
247
-						$error = self::strings('error-add-note');
247
+						$error = self::strings( 'error-add-note' );
248 248
 						gravityview()->log->error( 'The note was not successfully created', array( 'data' => compact( 'note', 'data' ) ) );
249 249
 					}
250 250
 				}
251 251
 			} else {
252
-				$error = self::strings('error-invalid');
252
+				$error = self::strings( 'error-invalid' );
253 253
 				gravityview()->log->error( 'Nonce validation failed; the note was not created' );
254 254
 			}
255 255
 		}
256 256
 
257 257
 
258
-		if( $this->doing_ajax ) {
259
-			if( $success ) {
258
+		if ( $this->doing_ajax ) {
259
+			if ( $success ) {
260 260
 				wp_send_json_success( array( 'html' => $success ) );
261 261
 			} else {
262 262
 				$error = $error ? $error : self::strings( 'error-invalid' );
@@ -282,11 +282,11 @@  discard block
 block discarded – undo
282 282
 			return;
283 283
 		}
284 284
 
285
-		if ( isset( $_POST['action'] ) && 'gv_delete_notes' === $_POST['action'] ) {
285
+		if ( isset( $_POST[ 'action' ] ) && 'gv_delete_notes' === $_POST[ 'action' ] ) {
286 286
 
287 287
 			$post = wp_unslash( $_POST );
288 288
 			if ( $this->doing_ajax ) {
289
-				parse_str( $post['data'], $data );
289
+				parse_str( $post[ 'data' ], $data );
290 290
 			} else {
291 291
 				$data = $post;
292 292
 			}
@@ -317,18 +317,18 @@  discard block
 block discarded – undo
317 317
 	 */
318 318
 	function process_delete_notes( $data ) {
319 319
 
320
-		$valid = wp_verify_nonce( $data['gv_delete_notes'], 'gv_delete_notes_' . $data['entry-slug'] );
320
+		$valid = wp_verify_nonce( $data[ 'gv_delete_notes' ], 'gv_delete_notes_' . $data[ 'entry-slug' ] );
321 321
 		$has_cap = GVCommon::has_cap( 'gravityview_delete_entry_notes' );
322 322
 		$success = false;
323 323
 
324 324
 		if ( $valid && $has_cap ) {
325
-			GravityView_Entry_Notes::delete_notes( $data['note'] );
325
+			GravityView_Entry_Notes::delete_notes( $data[ 'note' ] );
326 326
 			$success = true;
327 327
 		}
328 328
 
329
-		if( $this->doing_ajax ) {
329
+		if ( $this->doing_ajax ) {
330 330
 
331
-			if( $success ) {
331
+			if ( $success ) {
332 332
 				wp_send_json_success();
333 333
 			} else {
334 334
 				if ( ! $valid ) {
@@ -361,13 +361,13 @@  discard block
 block discarded – undo
361 361
 
362 362
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
363 363
 
364
-		unset( $field_options['show_as_link'] );
364
+		unset( $field_options[ 'show_as_link' ] );
365 365
 
366 366
 		$notes_options = array(
367 367
 			'notes' => array(
368 368
 				'type' => 'checkboxes',
369
-				'label' => __('Note Settings', 'gravityview'),
370
-				'desc' => sprintf( _x('Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ),
369
+				'label' => __( 'Note Settings', 'gravityview' ),
370
+				'desc' => sprintf( _x( 'Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ),
371 371
 				'options' => array(
372 372
 					'view' => array(
373 373
 						'label' => __( 'Display notes?', 'gravityview' ),
@@ -419,7 +419,7 @@  discard block
 block discarded – undo
419 419
 			'processing' => __( 'Processing&hellip;', 'gravityview' ),
420 420
 			'other-email' => __( 'Other email address', 'gravityview' ),
421 421
 			'email-label' => __( 'Email address', 'gravityview' ),
422
-			'email-placeholder' => _x('[email protected]', 'Example email address used as a placeholder', 'gravityview'),
422
+			'email-placeholder' => _x( '[email protected]', 'Example email address used as a placeholder', 'gravityview' ),
423 423
 			'subject-label' => __( 'Subject', 'gravityview' ),
424 424
 			'subject' => __( 'Email subject', 'gravityview' ),
425 425
 			'default-email-subject' => __( 'New entry note', 'gravityview' ),
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
439 439
 		 */
440 440
 		$strings = gv_map_deep( apply_filters( 'gravityview/field/notes/strings', $strings ), 'esc_html' );
441 441
 
442
-		if( $key ) {
442
+		if ( $key ) {
443 443
 			return isset( $strings[ $key ] ) ? $strings[ $key ] : '';
444 444
 		}
445 445
 
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
 	 */
462 462
 	static public function display_note( $note, $show_delete = false, $context = null ) {
463 463
 
464
-		if( ! is_object( $note ) ) {
464
+		if ( ! is_object( $note ) ) {
465 465
 			return '';
466 466
 		}
467 467
 
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
516 516
 		}
517 517
 
518 518
 		$replacements = array(
519
-			'{note_id}' => $note_content['note_id'],
519
+			'{note_id}' => $note_content[ 'note_id' ],
520 520
 			'{row_class}' => 'gv-note',
521 521
 			'{note_detail}' => $note_detail_html
522 522
 		);
@@ -548,13 +548,13 @@  discard block
 block discarded – undo
548 548
 
549 549
 		$user_data = get_userdata( $current_user->ID );
550 550
 
551
-		$note_content = trim( $data['gv-note-content'] );
551
+		$note_content = trim( $data[ 'gv-note-content' ] );
552 552
 
553
-		if( empty( $note_content ) ) {
553
+		if ( empty( $note_content ) ) {
554 554
 			return new WP_Error( 'gv-add-note-empty', __( 'The note is empty.', 'gravityview' ) );
555 555
 		}
556 556
 
557
-		$return = GravityView_Entry_Notes::add_note( $entry['id'], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
557
+		$return = GravityView_Entry_Notes::add_note( $entry[ 'id' ], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
558 558
 
559 559
 		return $return;
560 560
 	}
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
574 574
 
575 575
 		$atts = shortcode_atts( array( 'entry' => null ), $atts );
576 576
 
577
-		if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
577
+		if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
578 578
 			gravityview()->log->error( 'User does not have permission to add entry notes ("gravityview_add_entry_notes").' );
579 579
 			return '';
580 580
 		}
@@ -596,8 +596,8 @@  discard block
 block discarded – undo
596 596
 
597 597
 			$visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' );
598 598
 
599
-			if ( $atts['entry'] ) {
600
-				$entry = GFAPI::get_entry( $atts['entry'] );
599
+			if ( $atts[ 'entry' ] ) {
600
+				$entry = GFAPI::get_entry( $atts[ 'entry' ] );
601 601
 			}
602 602
 
603 603
 			if ( ! isset( $entry ) || ! $entry ) {
@@ -615,14 +615,14 @@  discard block
 block discarded – undo
615 615
 
616 616
 		// Only generate the dropdown if the field settings allow it
617 617
 		$email_fields = '';
618
-		if( ! empty( $visibility_settings['email'] ) ) {
618
+		if ( ! empty( $visibility_settings[ 'email' ] ) ) {
619 619
 			$email_fields = self::get_note_email_fields( $entry_slug );
620 620
 		}
621 621
 
622 622
 		$add_note_html = str_replace( '{entry_slug}', $entry_slug, $add_note_html );
623 623
 		$add_note_html = str_replace( '{nonce_field}', $nonce_field, $add_note_html );
624
-		$add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings['delete'] ) ? 0 : $visibility_settings['delete'] ), $add_note_html );
625
-		$add_note_html   = str_replace( '{email_fields}', $email_fields, $add_note_html );
624
+		$add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings[ 'delete' ] ) ? 0 : $visibility_settings[ 'delete' ] ), $add_note_html );
625
+		$add_note_html = str_replace( '{email_fields}', $email_fields, $add_note_html );
626 626
 		$add_note_html = str_replace( '{url}', esc_url_raw( add_query_arg( array() ) ), $add_note_html );
627 627
 
628 628
 		return $add_note_html;
@@ -647,8 +647,8 @@  discard block
 block discarded – undo
647 647
 		$note_emails = array();
648 648
 
649 649
 		foreach ( $email_fields as $email_field ) {
650
-			if ( ! empty( $entry["{$email_field->id}"] ) && is_email( $entry["{$email_field->id}"] ) ) {
651
-				$note_emails[] = $entry["{$email_field->id}"];
650
+			if ( ! empty( $entry[ "{$email_field->id}" ] ) && is_email( $entry[ "{$email_field->id}" ] ) ) {
651
+				$note_emails[ ] = $entry[ "{$email_field->id}" ];
652 652
 			}
653 653
 		}
654 654
 
@@ -660,7 +660,7 @@  discard block
 block discarded – undo
660 660
 		 */
661 661
 		$note_emails = apply_filters( 'gravityview/field/notes/emails', $note_emails, $entry );
662 662
 
663
-		return (array) $note_emails;
663
+		return (array)$note_emails;
664 664
 	}
665 665
 
666 666
 	/**
@@ -676,7 +676,7 @@  discard block
 block discarded – undo
676 676
 	 */
677 677
 	private static function get_note_email_fields( $entry_slug = '' ) {
678 678
 
679
-		if( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
679
+		if ( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
680 680
 			gravityview()->log->error( 'User does not have permission to email entry notes ("gravityview_email_entry_notes").' );
681 681
 			return '';
682 682
 		}
@@ -698,27 +698,27 @@  discard block
 block discarded – undo
698 698
 
699 699
 		if ( ! empty( $note_emails ) || $include_custom ) { ?>
700 700
 			<div class="gv-note-email-container">
701
-				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings['also-email'];  ?></label>
701
+				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings[ 'also-email' ]; ?></label>
702 702
 				<select class="gv-note-email-to" name="gv-note-to" id="gv-note-email-to-<?php echo $entry_slug_esc; ?>">
703
-					<option value=""><?php echo $strings['also-email'];  ?></option>
703
+					<option value=""><?php echo $strings[ 'also-email' ]; ?></option>
704 704
 					<?php foreach ( $note_emails as  $email ) {
705 705
 						?>
706 706
 						<option value="<?php echo esc_attr( $email ); ?>"><?php echo esc_html( $email ); ?></option>
707 707
 					<?php }
708
-					if( $include_custom ) { ?>
709
-					<option value="custom"><?php echo self::strings('other-email'); ?></option>
708
+					if ( $include_custom ) { ?>
709
+					<option value="custom"><?php echo self::strings( 'other-email' ); ?></option>
710 710
 					<?php } ?>
711 711
 				</select>
712 712
 				<fieldset class="gv-note-to-container">
713
-					<?php if( $include_custom ) { ?>
713
+					<?php if ( $include_custom ) { ?>
714 714
 					<div class='gv-note-to-custom-container'>
715
-						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings['email-label']; ?></label>
716
-						<input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings['email-placeholder']; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" />
715
+						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'email-label' ]; ?></label>
716
+						<input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings[ 'email-placeholder' ]; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" />
717 717
 					</div>
718 718
 					<?php } ?>
719 719
 		            <div class='gv-note-subject-container'>
720
-		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings['subject-label']; ?></label>
721
-		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings['subject']; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
720
+		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'subject-label' ]; ?></label>
721
+		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings[ 'subject' ]; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
722 722
 		            </div>
723 723
 				</fieldset>
724 724
 			</div>
@@ -741,7 +741,7 @@  discard block
 block discarded – undo
741 741
 	 */
742 742
 	private function maybe_send_entry_notes( $note = false, $entry, $data ) {
743 743
 
744
-		if( ! $note || ! GVCommon::has_cap('gravityview_email_entry_notes') ) {
744
+		if ( ! $note || ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
745 745
 			gravityview()->log->debug( 'User doesn\'t have "gravityview_email_entry_notes" cap, or $note is empty', array( 'data' => $note ) );
746 746
 			return;
747 747
 		}
@@ -749,7 +749,7 @@  discard block
 block discarded – undo
749 749
 		gravityview()->log->debug( '$data', array( 'data' => $data ) );
750 750
 
751 751
 		//emailing notes if configured
752
-		if ( ! empty( $data['gv-note-to'] ) ) {
752
+		if ( ! empty( $data[ 'gv-note-to' ] ) ) {
753 753
 
754 754
 			$default_data = array(
755 755
 				'gv-note-to' => '',
@@ -759,11 +759,11 @@  discard block
 block discarded – undo
759 759
                 'current-url' => '',
760 760
 			);
761 761
 
762
-			$current_user  = wp_get_current_user();
762
+			$current_user = wp_get_current_user();
763 763
 			$email_data = wp_parse_args( $data, $default_data );
764 764
 
765
-			$from    = $current_user->user_email;
766
-			$to = $email_data['gv-note-to'];
765
+			$from = $current_user->user_email;
766
+			$to = $email_data[ 'gv-note-to' ];
767 767
 
768 768
 			/**
769 769
 			 * Documented in get_note_email_fields
@@ -771,8 +771,8 @@  discard block
 block discarded – undo
771 771
 			 */
772 772
 			$include_custom = apply_filters( 'gravityview/field/notes/custom-email', true );
773 773
 
774
-			if( 'custom' === $to && $include_custom ) {
775
-				$to = $email_data['gv-note-to-custom'];
774
+			if ( 'custom' === $to && $include_custom ) {
775
+				$to = $email_data[ 'gv-note-to-custom' ];
776 776
 				gravityview()->log->debug( 'Sending note to a custom email address: {to}' . array( 'to' => $to ) );
777 777
 			}
778 778
 
@@ -783,13 +783,13 @@  discard block
 block discarded – undo
783 783
 
784 784
 			$bcc = false;
785 785
 			$reply_to = $from;
786
-			$subject = trim( $email_data['gv-note-subject'] );
786
+			$subject = trim( $email_data[ 'gv-note-subject' ] );
787 787
 
788 788
 			// We use empty() here because GF uses empty to check against, too. `0` isn't a valid subject to GF
789 789
 			$subject = empty( $subject ) ? self::strings( 'default-email-subject' ) : $subject;
790
-			$message = $email_data['gv-note-content'];
790
+			$message = $email_data[ 'gv-note-content' ];
791 791
 			$email_footer = self::strings( 'email-footer' );
792
-			$from_name     = $current_user->display_name;
792
+			$from_name = $current_user->display_name;
793 793
 			$message_format = 'html';
794 794
 
795 795
 			/**
@@ -820,7 +820,7 @@  discard block
 block discarded – undo
820 820
 
821 821
 			GVCommon::send_email( $from, $to, $bcc, $reply_to, $subject, $message, $from_name, $message_format, '', $entry, false );
822 822
 
823
-			$form  = isset( $entry['form_id'] ) ? GFAPI::get_form( $entry['form_id'] ) : array();
823
+			$form = isset( $entry[ 'form_id' ] ) ? GFAPI::get_form( $entry[ 'form_id' ] ) : array();
824 824
 
825 825
 			/**
826 826
 			 * @see https://www.gravityhelp.com/documentation/article/10146-2/ It's here for compatibility with Gravity Forms
@@ -846,7 +846,7 @@  discard block
 block discarded – undo
846 846
 
847 847
 	    $output = '';
848 848
 
849
-		if( ! empty( $email_footer ) ) {
849
+		if ( ! empty( $email_footer ) ) {
850 850
 		    $url = \GV\Utils::get( $email_data, 'current-url' );
851 851
 			$url = html_entity_decode( $url );
852 852
 			$url = site_url( $url );
Please login to merge, or discard this patch.
includes/class-gravityview-compatibility.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -240,7 +240,7 @@
 block discarded – undo
240 240
 			self::$notices['wp_version'] = array(
241 241
 				'class' => 'error',
242 242
 				'message' => sprintf( __( "%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview' ), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . $wp_version . '</span>' ),
243
-			    'cap' => 'update_core',
243
+				'cap' => 'update_core',
244 244
 				'dismiss' => 'wp_version',
245 245
 			);
246 246
 
Please login to merge, or discard this patch.
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	 * @return GravityView_Compatibility
77 77
 	 */
78 78
 	public static function getInstance() {
79
-		if( self::$instance ) {
79
+		if ( self::$instance ) {
80 80
 			return self::$instance;
81 81
 		}
82 82
 		return new self;
@@ -138,10 +138,10 @@  discard block
 block discarded – undo
138 138
 		// If Gravity Forms doesn't exist or is outdated, load the admin view class to
139 139
 		// show the notice, but not load any post types or process shortcodes.
140 140
 		// Without Gravity Forms, there is no GravityView. Beautiful, really.
141
-		if( ! self::is_valid() ) {
141
+		if ( ! self::is_valid() ) {
142 142
 
143 143
 			// If the plugin's not loaded, might as well hide the shortcode for people.
144
-			add_shortcode( 'gravityview', array( $this, '_shortcode_gf_notice') );
144
+			add_shortcode( 'gravityview', array( $this, '_shortcode_gf_notice' ) );
145 145
 
146 146
 		}
147 147
 	}
@@ -167,15 +167,15 @@  discard block
 block discarded – undo
167 167
 	 */
168 168
 	public function _shortcode_gf_notice( $atts = array(), $content = null, $shortcode = 'gravityview' ) {
169 169
 
170
-		if( ! GVCommon::has_cap( 'activate_plugins' ) ) {
170
+		if ( ! GVCommon::has_cap( 'activate_plugins' ) ) {
171 171
 			return null;
172 172
 		}
173 173
 
174 174
 		$notices = self::get_notices();
175 175
 
176
-		$message = '<div style="border:1px solid red; padding: 15px;"><p style="text-align:center;"><em>' . esc_html__( 'You are seeing this notice because you are an administrator. Other users of the site will see nothing.', 'gravityview') . '</em></p>';
177
-		foreach( (array)$notices as $notice ) {
178
-			$message .= wpautop( $notice['message'] );
176
+		$message = '<div style="border:1px solid red; padding: 15px;"><p style="text-align:center;"><em>' . esc_html__( 'You are seeing this notice because you are an administrator. Other users of the site will see nothing.', 'gravityview' ) . '</em></p>';
177
+		foreach ( (array)$notices as $notice ) {
178
+			$message .= wpautop( $notice[ 'message' ] );
179 179
 		}
180 180
 		$message .= '</div>';
181 181
 
@@ -195,9 +195,9 @@  discard block
 block discarded – undo
195 195
 
196 196
 		if ( ! gravityview()->plugin->is_compatible_php() ) {
197 197
 
198
-			self::$notices['php_version'] = array(
198
+			self::$notices[ 'php_version' ] = array(
199 199
 				'class' => 'error',
200
-				'message' => sprintf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.phpversion().'</span>' ),
200
+				'message' => sprintf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . phpversion() . '</span>' ),
201 201
 				'cap' => 'manage_options',
202 202
 				'dismiss' => 'php_version',
203 203
 			);
@@ -208,11 +208,11 @@  discard block
 block discarded – undo
208 208
 		if ( ! gravityview()->plugin->is_compatible_future_php() ) {
209 209
 
210 210
 			// Show the notice on every update. Yes, annoying, but not as annoying as a plugin breaking.
211
-			$key = sprintf('php_%s_%s', GV_FUTURE_MIN_PHP_VERSION, GravityView_Plugin::version );
211
+			$key = sprintf( 'php_%s_%s', GV_FUTURE_MIN_PHP_VERSION, GravityView_Plugin::version );
212 212
 
213 213
 			self::$notices[ $key ] = array(
214 214
 				'class' => 'error',
215
-				'message' => sprintf( __( "%sGravityView will soon require PHP Version %s.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_FUTURE_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.phpversion().'</span>' ),
215
+				'message' => sprintf( __( "%sGravityView will soon require PHP Version %s.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_FUTURE_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . phpversion() . '</span>' ),
216 216
 				'cap' => 'manage_options',
217 217
 				'dismiss' => $key,
218 218
 			);
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
 
238 238
 		if ( ! gravityview()->plugin->is_compatible_wordpress() ) {
239 239
 
240
-			self::$notices['wp_version'] = array(
240
+			self::$notices[ 'wp_version' ] = array(
241 241
 				'class' => 'error',
242 242
 				'message' => sprintf( __( "%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview' ), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . $wp_version . '</span>' ),
243 243
 			    'cap' => 'update_core',
@@ -271,17 +271,17 @@  discard block
 block discarded – undo
271 271
 	public static function check_gravityforms() {
272 272
 
273 273
 		// Bypass other checks: if the class exists
274
-		if( class_exists( 'GFCommon' ) ) {
274
+		if ( class_exists( 'GFCommon' ) ) {
275 275
 
276 276
 			// Does the version meet future requirements?
277
-			if( true === gravityview()->plugin->is_compatible_future_gravityforms() ) {
277
+			if ( true === gravityview()->plugin->is_compatible_future_gravityforms() ) {
278 278
 				return true;
279 279
 			}
280 280
 
281 281
 			// Does it meet minimum requirements?
282 282
 			$meets_minimum = gravityview()->plugin->is_compatible_gravityforms();
283 283
 
284
-			if( $meets_minimum ) {
284
+			if ( $meets_minimum ) {
285 285
 				/* translators: first placeholder is the future required version of Gravity Forms. The second placeholder is the current version of Gravity Forms. */
286 286
 				$title = __( 'In the future, GravityView will require Gravity Forms Version %s or newer.', 'gravityview' );
287 287
 				$version = GV_FUTURE_MIN_GF_VERSION;
@@ -296,14 +296,14 @@  discard block
 block discarded – undo
296 296
 			$message = '<h3>' . esc_html( sprintf( $title, $version ) ) . '</h3>';
297 297
 
298 298
 			/* translators: the placeholder is the current version of Gravity Forms. */
299
-			$message .= '<p>' . sprintf( esc_html__( "You're using Version %s. Please update your Gravity Forms or purchase a license.", 'gravityview' ), '<span style="font-family: Consolas, Courier, monospace;">'.GFCommon::$version.'</span>' ) . '</p>';
299
+			$message .= '<p>' . sprintf( esc_html__( "You're using Version %s. Please update your Gravity Forms or purchase a license.", 'gravityview' ), '<span style="font-family: Consolas, Courier, monospace;">' . GFCommon::$version . '</span>' ) . '</p>';
300 300
 
301 301
 			/* translators: In this context, "get" means purchase */
302 302
 			$message .= '<p><a href="https://gravityview.co/gravityforms/" class="button button-secondary button-large button-hero">' . esc_html__( 'Get the Latest Gravity Forms', 'gravityview' ) . '</a></p>';
303 303
 
304 304
 
305 305
 			// Show the notice even if the future version requirements aren't met
306
-			self::$notices['gf_version'] = array(
306
+			self::$notices[ 'gf_version' ] = array(
307 307
 				'class' => $class,
308 308
 				'message' => $message,
309 309
 				'cap' => 'update_plugins',
@@ -321,42 +321,42 @@  discard block
 block discarded – undo
321 321
 		 * OR
322 322
 		 * It's the Network Admin and we just don't know whether the sites have GF activated themselves.
323 323
 		 */
324
-		if( true === $gf_status || is_network_admin() ) {
324
+		if ( true === $gf_status || is_network_admin() ) {
325 325
 			return true;
326 326
 		}
327 327
 
328 328
 		// If GFCommon doesn't exist, assume GF not active
329 329
 		$return = false;
330 330
 
331
-		switch( $gf_status ) {
331
+		switch ( $gf_status ) {
332 332
 			case 'inactive':
333 333
 
334 334
 				// Required for multisite
335
-				if( ! function_exists('wp_create_nonce') ) {
335
+				if ( ! function_exists( 'wp_create_nonce' ) ) {
336 336
 					require_once ABSPATH . WPINC . '/pluggable.php';
337 337
 				}
338 338
 
339 339
 				// Otherwise, throws an error on activation & deactivation "Use of undefined constant LOGGED_IN_COOKIE"
340
-				if( is_multisite() ) {
340
+				if ( is_multisite() ) {
341 341
 					wp_cookie_constants();
342 342
 				}
343 343
 
344 344
 				$return = false;
345 345
 
346
-				$button = function_exists('is_network_admin') && is_network_admin() ? '<strong><a href="#gravity-forms">' : '<strong><a href="'. wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=gravityforms/gravityforms.php' ), 'activate-plugin_gravityforms/gravityforms.php') . '" class="button button-large">';
346
+				$button = function_exists( 'is_network_admin' ) && is_network_admin() ? '<strong><a href="#gravity-forms">' : '<strong><a href="' . wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=gravityforms/gravityforms.php' ), 'activate-plugin_gravityforms/gravityforms.php' ) . '" class="button button-large">';
347 347
 
348
-				self::$notices['gf_inactive'] = array(
348
+				self::$notices[ 'gf_inactive' ] = array(
349 349
 					'class' => 'error',
350
-					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be active. %sActivate Gravity Forms%s to use the GravityView plugin.', 'gravityview' ), '<h3>', "</h3>\n\n". $button, '</a></strong>' ),
350
+					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be active. %sActivate Gravity Forms%s to use the GravityView plugin.', 'gravityview' ), '<h3>', "</h3>\n\n" . $button, '</a></strong>' ),
351 351
 					'cap' => 'activate_plugins',
352 352
 					'dismiss' => 'gf_inactive',
353 353
 				);
354 354
 
355 355
 				break;
356 356
 			default:
357
-				self::$notices['gf_installed'] = array(
357
+				self::$notices[ 'gf_installed' ] = array(
358 358
 					'class' => 'error',
359
-					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $59%s%s', 'gravityview' ), '<h3>', "</h3>\n\n".'<a href="https://gravityview.co/gravityforms/" class="button button-secondary button-large button-hero">' , '<em>', '</em>', '</a>'),
359
+					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $59%s%s', 'gravityview' ), '<h3>', "</h3>\n\n" . '<a href="https://gravityview.co/gravityforms/" class="button button-secondary button-large button-hero">', '<em>', '</em>', '</a>' ),
360 360
 					'cap' => 'install_plugins',
361 361
 					'dismiss' => 'gf_installed',
362 362
 				);
@@ -373,10 +373,10 @@  discard block
 block discarded – undo
373 373
 	 */
374 374
 	private static function check_gf_directory() {
375 375
 
376
-		if( class_exists( 'GFDirectory' ) ) {
377
-			self::$notices['gf_directory'] = array(
376
+		if ( class_exists( 'GFDirectory' ) ) {
377
+			self::$notices[ 'gf_directory' ] = array(
378 378
 				'class' => 'error is-dismissible',
379
-				'title' => __('Potential Conflict', 'gravityview' ),
379
+				'title' => __( 'Potential Conflict', 'gravityview' ),
380 380
 				'message' => __( 'GravityView and Gravity Forms Directory are both active. This may cause problems. If you experience issues, disable the Gravity Forms Directory plugin.', 'gravityview' ),
381 381
 				'dismiss' => 'gf_directory',
382 382
 				'cap' => 'activate_plugins',
@@ -394,21 +394,21 @@  discard block
 block discarded – undo
394 394
 	 */
395 395
 	public static function get_plugin_status( $location = '' ) {
396 396
 
397
-		if( ! function_exists('is_plugin_active') ) {
397
+		if ( ! function_exists( 'is_plugin_active' ) ) {
398 398
 			include_once( ABSPATH . '/wp-admin/includes/plugin.php' );
399 399
 		}
400 400
 
401
-		if( is_network_admin() && is_plugin_active_for_network( $location ) ) {
401
+		if ( is_network_admin() && is_plugin_active_for_network( $location ) ) {
402 402
 			return true;
403 403
 		}
404 404
 
405
-		if( ! is_network_admin() && is_plugin_active( $location ) ) {
405
+		if ( ! is_network_admin() && is_plugin_active( $location ) ) {
406 406
 			return true;
407 407
 		}
408 408
 
409
-		if(
410
-			!file_exists( trailingslashit( WP_PLUGIN_DIR ) . $location ) &&
411
-			!file_exists( trailingslashit( WPMU_PLUGIN_DIR ) . $location )
409
+		if (
410
+			! file_exists( trailingslashit( WP_PLUGIN_DIR ) . $location ) &&
411
+			! file_exists( trailingslashit( WPMU_PLUGIN_DIR ) . $location )
412 412
 		) {
413 413
 			return false;
414 414
 		}
Please login to merge, or discard this patch.
includes/admin/class.render.settings.php 3 patches
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -308,7 +308,7 @@
 block discarded – undo
308 308
 			{{field_settings}}
309 309
 			{{hidden_fields}}
310 310
 		</div>
311
-EOD;
311
+eod;
312 312
 
313 313
 		$output = $template;
314 314
 
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -284,7 +284,7 @@
 block discarded – undo
284 284
 					<div class="gv-field-detail gv-field-detail--field">
285 285
 						<span class="gv-field-detail--label">' . esc_html__( 'Field ID', 'gravityview' ) .'</span><span class="gv-field-detail--value">#{{field_id}}</span>
286 286
 					</div>';
287
-			    }
287
+				}
288 288
 
289 289
 				$item_details .= '
290 290
 					<div class="gv-field-detail gv-field-detail--type">
Please login to merge, or discard this patch.
Spacing   +87 added lines, -87 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 
54 54
 		$is_table_layout = preg_match( '/table/ism', $template_id );
55 55
 
56
-		if( 'field' === $field_type ) {
56
+		if ( 'field' === $field_type ) {
57 57
 
58 58
 			// Default options - fields
59 59
 			$field_options = array(
@@ -105,11 +105,11 @@  discard block
 block discarded – undo
105 105
 			);
106 106
 
107 107
 			// Match Table as well as DataTables
108
-			if( $is_table_layout && 'directory' === $context ) {
109
-				$field_options['width'] = array(
108
+			if ( $is_table_layout && 'directory' === $context ) {
109
+				$field_options[ 'width' ] = array(
110 110
 					'type' => 'number',
111
-					'label' => __('Percent Width', 'gravityview'),
112
-					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview'),
111
+					'label' => __( 'Percent Width', 'gravityview' ),
112
+					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview' ),
113 113
 					'class' => 'code widefat',
114 114
 					'value' => '',
115 115
 					'priority' => 200,
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 
122 122
 		// Remove suffix ":" from the labels to standardize style. Using trim() instead of rtrim() for i18n.
123 123
 		foreach ( $field_options as $key => $field_option ) {
124
-			$field_options[ $key ]['label'] = trim( $field_options[ $key ]['label'], ':' );
124
+			$field_options[ $key ][ 'label' ] = trim( $field_options[ $key ][ 'label' ], ':' );
125 125
 		}
126 126
 
127 127
 		/**
@@ -146,8 +146,8 @@  discard block
 block discarded – undo
146 146
 		 */
147 147
 		$field_options = apply_filters( "gravityview_template_{$input_type}_options", $field_options, $template_id, $field_id, $context, $input_type, $form_id );
148 148
 
149
-		if ( 'directory' === $context && isset( $field_options['show_as_link'] ) && ! isset( $field_options['new_window'] ) ) {
150
-			$field_options['new_window'] = array(
149
+		if ( 'directory' === $context && isset( $field_options[ 'show_as_link' ] ) && ! isset( $field_options[ 'new_window' ] ) ) {
150
+			$field_options[ 'new_window' ] = array(
151 151
 				'type'     => 'checkbox',
152 152
 				'label'    => __( 'Open link in a new tab or window?', 'gravityview' ),
153 153
 				'value'    => false,
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
 				switch ( $key ) {
169 169
 					case 'show_as_link':
170 170
 						$_group = 'display';
171
-						$field_option['priority'] = 100;
171
+						$field_option[ 'priority' ] = 100;
172 172
 						break;
173 173
 					default:
174 174
 						$_group = \GV\Utils::get( $field_option, 'group', 'display' );
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
 			}
184 184
 
185 185
 			$field_options = array();
186
-			foreach ( self::get_field_groups() as $group_key => $group_name  ) {
186
+			foreach ( self::get_field_groups() as $group_key => $group_name ) {
187 187
 				$field_options[ $group_key ] = \GV\Utils::get( $option_groups, $group_key, array() );
188 188
 			}
189 189
 
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 			return 0;
215 215
 		}
216 216
 
217
-		return ( $a_priority < $b_priority ) ? - 1 : 1;
217
+		return ( $a_priority < $b_priority ) ? -1 : 1;
218 218
 	}
219 219
 
220 220
 	/**
@@ -239,8 +239,8 @@  discard block
 block discarded – undo
239 239
 			'manage_options' => __( 'Administrator', 'gravityview' ),
240 240
 		);
241 241
 
242
-		if( is_multisite() ) {
243
-			$select_cap_choices['manage_network'] = __('Multisite Super Admin', 'gravityview' );
242
+		if ( is_multisite() ) {
243
+			$select_cap_choices[ 'manage_network' ] = __( 'Multisite Super Admin', 'gravityview' );
244 244
 		}
245 245
 
246 246
 		/**
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
 		 * @param  string $context     Optional. What context are we in? Example: `single` or `directory`
254 254
 		 * @param  string $input_type  Optional. (textarea, list, select, etc.)
255 255
 		 */
256
-		$select_cap_choices = apply_filters('gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
256
+		$select_cap_choices = apply_filters( 'gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
257 257
 
258 258
 		return $select_cap_choices;
259 259
 	}
@@ -280,9 +280,9 @@  discard block
 block discarded – undo
280 280
 	 */
281 281
 	public static function render_field_options( $form_id, $field_type, $template_id, $field_id, $field_label, $area, $input_type = NULL, $uniqid = '', $current = '', $context = 'single', $item = array() ) {
282 282
 
283
-		if( empty( $uniqid ) ) {
283
+		if ( empty( $uniqid ) ) {
284 284
 			//generate a unique field id
285
-			$uniqid = uniqid('', false);
285
+			$uniqid = uniqid( '', false );
286 286
 		}
287 287
 
288 288
 		$grouped = ( 'field' === $field_type );
@@ -290,24 +290,24 @@  discard block
 block discarded – undo
290 290
 		// get field/widget options
291 291
 		$option_groups = self::get_default_field_options( $field_type, $template_id, $field_id, $context, $input_type, $form_id, $grouped );
292 292
 
293
-		if( ! $grouped ) {
293
+		if ( ! $grouped ) {
294 294
 			$option_groups = array( $option_groups );
295 295
 		}
296 296
 
297 297
 		$option_groups = array_filter( $option_groups );
298 298
 
299 299
 		// two different post arrays, depending of the field type
300
-		$name_prefix = $field_type .'s' .'['. $area .']['. $uniqid .']';
300
+		$name_prefix = $field_type . 's' . '[' . $area . '][' . $uniqid . ']';
301 301
 
302 302
 		// build output
303
-		$hidden_fields  = '<input type="hidden" class="field-key" name="'. $name_prefix .'[id]" value="'. esc_attr( $field_id ) .'">';
304
-		$hidden_fields .= '<input type="hidden" class="field-label" name="'. $name_prefix .'[label]" value="'. esc_attr( $field_label ) .'">';
303
+		$hidden_fields  = '<input type="hidden" class="field-key" name="' . $name_prefix . '[id]" value="' . esc_attr( $field_id ) . '">';
304
+		$hidden_fields .= '<input type="hidden" class="field-label" name="' . $name_prefix . '[label]" value="' . esc_attr( $field_label ) . '">';
305 305
 
306 306
 		$form_title = '';
307 307
 		if ( $form_id ) {
308
-			$hidden_fields .= '<input type="hidden" class="field-form-id" name="'. $name_prefix .'[form_id]" value="'. esc_attr( $form_id ) .'">';
308
+			$hidden_fields .= '<input type="hidden" class="field-form-id" name="' . $name_prefix . '[form_id]" value="' . esc_attr( $form_id ) . '">';
309 309
 			$form = GVCommon::get_form( $form_id );
310
-			$form_title = $form['title'];
310
+			$form_title = $form[ 'title' ];
311 311
 		}
312 312
 
313 313
 		// If there are no options, return what we got.
@@ -315,14 +315,14 @@  discard block
 block discarded – undo
315 315
 			return $hidden_fields . '<!-- No Options -->'; // The HTML comment is here for checking if the output is empty in render_label()
316 316
 		}
317 317
 
318
-		$settings_title = esc_attr( sprintf( __( '%s Settings', 'gravityview' ) , strip_tags( html_entity_decode( $field_label ) ) ) );
318
+		$settings_title = esc_attr( sprintf( __( '%s Settings', 'gravityview' ), strip_tags( html_entity_decode( $field_label ) ) ) );
319 319
 
320 320
 		$field_details = '';
321 321
 
322 322
 		// Get the pretty name for the input type
323 323
 		$gv_field = GravityView_Fields::get( $input_type );
324 324
 
325
-		if( $gv_field ) {
325
+		if ( $gv_field ) {
326 326
 			$input_type_label = $gv_field->label;
327 327
 		} else {
328 328
 			$input_type_label = $input_type;
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
 			}
337 337
 
338 338
 			if ( $grouped ) {
339
-				$group_name     = rgar( self::get_field_groups(), $group_key, '' );
339
+				$group_name = rgar( self::get_field_groups(), $group_key, '' );
340 340
 				$field_settings .= '<fieldset class="item-settings-group item-settings-group-' . esc_attr( $group_key ) . '">';
341 341
 				$field_settings .= '<legend>' . esc_attr( $group_name ) . '</legend>';
342 342
 			}
@@ -353,15 +353,15 @@  discard block
 block discarded – undo
353 353
 				}
354 354
 
355 355
 				$show_if = '';
356
-				if ( ! empty( $option['requires'] ) ) {
357
-					$show_if .= sprintf( ' data-requires="%s"', $option['requires'] );
356
+				if ( ! empty( $option[ 'requires' ] ) ) {
357
+					$show_if .= sprintf( ' data-requires="%s"', $option[ 'requires' ] );
358 358
 				}
359 359
 
360
-				if ( ! empty( $option['requires_not'] ) ) {
361
-					$show_if .= sprintf( ' data-requires-not="%s"', $option['requires_not'] );
360
+				if ( ! empty( $option[ 'requires_not' ] ) ) {
361
+					$show_if .= sprintf( ' data-requires-not="%s"', $option[ 'requires_not' ] );
362 362
 				}
363 363
 
364
-				switch ( $option['type'] ) {
364
+				switch ( $option[ 'type' ] ) {
365 365
 					// Hide hidden fields
366 366
 					case 'hidden':
367 367
 						$field_settings .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . ' screen-reader-text">' . $field_output . '</div>';
@@ -379,30 +379,30 @@  discard block
 block discarded – undo
379 379
 		$item_details = '';
380 380
 		$subtitle = '';
381 381
 
382
-		if( 'field' === $field_type ) {
383
-			$subtitle = ! empty( $item['subtitle'] ) ? '<div class="subtitle">' . $item['subtitle'] . '</div>' : '';
382
+		if ( 'field' === $field_type ) {
383
+			$subtitle = ! empty( $item[ 'subtitle' ] ) ? '<div class="subtitle">' . $item[ 'subtitle' ] . '</div>' : '';
384 384
 
385 385
 			$item_details .= '
386 386
 			<div class="gv-field-details--container">
387
-				<label class="gv-field-details--toggle">' . esc_html__( 'Field Details', 'gravityview' ) .' <i class="dashicons dashicons-arrow-right"></i></label>
387
+				<label class="gv-field-details--toggle">' . esc_html__( 'Field Details', 'gravityview' ) . ' <i class="dashicons dashicons-arrow-right"></i></label>
388 388
 				<section class="gv-field-details gv-field-details--closed">';
389 389
 
390 390
 				if ( $field_id && is_numeric( $field_id ) ) {
391 391
 				$item_details .= '
392 392
 					<div class="gv-field-detail gv-field-detail--field">
393
-						<span class="gv-field-detail--label">' . esc_html__( 'Field ID', 'gravityview' ) .'</span><span class="gv-field-detail--value">#{{field_id}}</span>
393
+						<span class="gv-field-detail--label">' . esc_html__( 'Field ID', 'gravityview' ) . '</span><span class="gv-field-detail--value">#{{field_id}}</span>
394 394
 					</div>';
395 395
 			    }
396 396
 
397 397
 				$item_details .= '
398 398
 					<div class="gv-field-detail gv-field-detail--type">
399
-						<span class="gv-field-detail--label">' . esc_html_x( 'Type', 'The type of field being configured (eg: "Single Line Text")', 'gravityview' ) .'</span><span class="gv-field-detail--value">{{input_type_label}}</span>
399
+						<span class="gv-field-detail--label">' . esc_html_x( 'Type', 'The type of field being configured (eg: "Single Line Text")', 'gravityview' ) . '</span><span class="gv-field-detail--value">{{input_type_label}}</span>
400 400
 					</div>';
401 401
 
402
-				if( $form_id ) {
402
+				if ( $form_id ) {
403 403
 					$item_details .= '
404 404
 					<div class="gv-field-detail gv-field-detail--form">
405
-						<span class="gv-field-detail--label">' . esc_html__( 'Form', 'gravityview' ) .'</span><span class="gv-field-detail--value">{{form_title}} (#{{form_id}})</span>
405
+						<span class="gv-field-detail--label">' . esc_html__( 'Form', 'gravityview' ) . '</span><span class="gv-field-detail--value">{{form_title}} (#{{form_id}})</span>
406 406
 					</div>';
407 407
 				}
408 408
 				$item_details .= '
@@ -410,8 +410,8 @@  discard block
 block discarded – undo
410 410
 			</div>';
411 411
 		} else {
412 412
 			$widget_details_content = rgar( $item, 'description', '' );
413
-			if ( ! empty( $item['subtitle'] ) ) {
414
-				$widget_details_content .= ( '' !== $widget_details_content ) ? "\n\n" . $item['subtitle'] : $item['subtitle'];
413
+			if ( ! empty( $item[ 'subtitle' ] ) ) {
414
+				$widget_details_content .= ( '' !== $widget_details_content ) ? "\n\n" . $item[ 'subtitle' ] : $item[ 'subtitle' ];
415 415
 			}
416 416
 
417 417
 			// Intentionally not escaping to allow HTML.
@@ -467,17 +467,17 @@  discard block
 block discarded – undo
467 467
 		 * @deprecated setting index 'default' was replaced by 'value'
468 468
 		 * @see GravityView_FieldType::get_field_defaults
469 469
 		 */
470
-		if( !empty( $option['default'] ) && empty( $option['value'] ) ) {
471
-			$option['value'] = $option['default'];
472
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting '. $name .' details' );
470
+		if ( ! empty( $option[ 'default' ] ) && empty( $option[ 'value' ] ) ) {
471
+			$option[ 'value' ] = $option[ 'default' ];
472
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting ' . $name . ' details' );
473 473
 		}
474 474
 
475 475
 		// prepare to render option field type
476
-		if( isset( $option['type'] ) ) {
476
+		if ( isset( $option[ 'type' ] ) ) {
477 477
 
478 478
 			$type_class = self::load_type_class( $option );
479 479
 
480
-			if( class_exists( $type_class ) ) {
480
+			if ( class_exists( $type_class ) ) {
481 481
 
482 482
 				/** @type GravityView_FieldType $render_type */
483 483
 				$render_type = new $type_class( $name, $option, $curr_value );
@@ -494,7 +494,7 @@  discard block
 block discarded – undo
494 494
 				 * @param[in,out] string $output field class name
495 495
 				 * @param[in] array $option  option field data
496 496
 				 */
497
-				$output = apply_filters( "gravityview/option/output/{$option['type']}" , $output, $option );
497
+				$output = apply_filters( "gravityview/option/output/{$option[ 'type' ]}", $output, $option );
498 498
 			}
499 499
 
500 500
 		} // isset option[type]
@@ -529,27 +529,27 @@  discard block
 block discarded – undo
529 529
 		 * @deprecated setting index 'name' was replaced by 'label'
530 530
 		 * @see GravityView_FieldType::get_field_defaults
531 531
 		 */
532
-		if( isset( $setting['name'] ) && empty( $setting['label'] ) ) {
533
-			$setting['label'] = $setting['name'];
534
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting '. $key .' details' );
532
+		if ( isset( $setting[ 'name' ] ) && empty( $setting[ 'label' ] ) ) {
533
+			$setting[ 'label' ] = $setting[ 'name' ];
534
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting ' . $key . ' details' );
535 535
 		}
536 536
 
537 537
 		$name = esc_attr( sprintf( $name, $key ) );
538
-		$setting['id'] = esc_attr( sprintf( $id, $key ) );
539
-		$setting['tooltip'] = 'gv_' . $key;
538
+		$setting[ 'id' ] = esc_attr( sprintf( $id, $key ) );
539
+		$setting[ 'tooltip' ] = 'gv_' . $key;
540 540
 
541 541
 		// Use default if current setting isn't set.
542
-		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting['value'];
542
+		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting[ 'value' ];
543 543
 
544 544
 		// default setting type = text
545
-		$setting['type'] = empty( $setting['type'] ) ? 'text' : $setting['type'];
545
+		$setting[ 'type' ] = empty( $setting[ 'type' ] ) ? 'text' : $setting[ 'type' ];
546 546
 
547 547
 		// merge tags
548
-		if( !isset( $setting['merge_tags'] ) ) {
549
-			if( $setting['type'] === 'text' ) {
550
-				$setting['merge_tags'] = true;
548
+		if ( ! isset( $setting[ 'merge_tags' ] ) ) {
549
+			if ( $setting[ 'type' ] === 'text' ) {
550
+				$setting[ 'merge_tags' ] = true;
551 551
 			} else {
552
-				$setting['merge_tags'] = false;
552
+				$setting[ 'merge_tags' ] = false;
553 553
 			}
554 554
 		}
555 555
 
@@ -557,7 +557,7 @@  discard block
 block discarded – undo
557 557
 
558 558
 		// render the setting
559 559
 		$type_class = self::load_type_class( $setting );
560
-		if( class_exists( $type_class ) ) {
560
+		if ( class_exists( $type_class ) ) {
561 561
 			/** @type GravityView_FieldType $render_type */
562 562
 			$render_type = new $type_class( $name, $setting, $curr_value );
563 563
 			ob_start();
@@ -566,25 +566,25 @@  discard block
 block discarded – undo
566 566
 		}
567 567
 
568 568
 		// Check if setting is specific for a template
569
-		if( !empty( $setting['show_in_template'] ) ) {
570
-			if( !is_array( $setting['show_in_template'] ) ) {
571
-				$setting['show_in_template'] = array( $setting['show_in_template'] );
569
+		if ( ! empty( $setting[ 'show_in_template' ] ) ) {
570
+			if ( ! is_array( $setting[ 'show_in_template' ] ) ) {
571
+				$setting[ 'show_in_template' ] = array( $setting[ 'show_in_template' ] );
572 572
 			}
573
-			$show_if = ' data-show-if="'. implode( ' ', $setting['show_in_template'] ).'"';
573
+			$show_if = ' data-show-if="' . implode( ' ', $setting[ 'show_in_template' ] ) . '"';
574 574
 		} else {
575 575
 			$show_if = '';
576 576
 		}
577 577
 
578
-		if( ! empty( $setting['requires'] ) ) {
579
-			$show_if .= sprintf( ' data-requires="%s"', $setting['requires'] );
578
+		if ( ! empty( $setting[ 'requires' ] ) ) {
579
+			$show_if .= sprintf( ' data-requires="%s"', $setting[ 'requires' ] );
580 580
 		}
581 581
 
582
-		if( ! empty( $setting['requires_not'] ) ) {
583
-			$show_if .= sprintf( ' data-requires-not="%s"', $setting['requires_not'] );
582
+		if ( ! empty( $setting[ 'requires_not' ] ) ) {
583
+			$show_if .= sprintf( ' data-requires-not="%s"', $setting[ 'requires_not' ] );
584 584
 		}
585 585
 
586 586
 		// output
587
-		echo '<tr style="vertical-align: top;" '. $show_if .'>' . $output . '</tr>';
587
+		echo '<tr style="vertical-align: top;" ' . $show_if . '>' . $output . '</tr>';
588 588
 
589 589
 	}
590 590
 
@@ -596,7 +596,7 @@  discard block
 block discarded – undo
596 596
 	 */
597 597
 	public static function load_type_class( $field = NULL ) {
598 598
 
599
-		if( empty( $field['type'] ) ) {
599
+		if ( empty( $field[ 'type' ] ) ) {
600 600
 			return NULL;
601 601
 		}
602 602
 
@@ -605,9 +605,9 @@  discard block
 block discarded – undo
605 605
 		 * @param string $class_suffix  field class suffix; `GravityView_FieldType_{$class_suffix}`
606 606
 		 * @param array $field   field data
607 607
 		 */
608
-		$type_class = apply_filters( "gravityview/setting/class/{$field['type']}", 'GravityView_FieldType_' . $field['type'], $field );
608
+		$type_class = apply_filters( "gravityview/setting/class/{$field[ 'type' ]}", 'GravityView_FieldType_' . $field[ 'type' ], $field );
609 609
 
610
-		if( class_exists( $type_class ) ) {
610
+		if ( class_exists( $type_class ) ) {
611 611
 			return $type_class;
612 612
 		}
613 613
 
@@ -616,9 +616,9 @@  discard block
 block discarded – undo
616 616
 		 * @param string  $field_type_include_path field class file path
617 617
 		 * @param array $field  field data
618 618
 		 */
619
-		$class_file = apply_filters( "gravityview/setting/class_file/{$field['type']}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field['type']}.php", $field );
619
+		$class_file = apply_filters( "gravityview/setting/class_file/{$field[ 'type' ]}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field[ 'type' ]}.php", $field );
620 620
 
621
-		if( $class_file && file_exists( $class_file ) ) {
621
+		if ( $class_file && file_exists( $class_file ) ) {
622 622
 			require_once( $class_file );
623 623
 		}
624 624
 
@@ -640,8 +640,8 @@  discard block
 block discarded – undo
640 640
 
641 641
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_checkbox::render_input' );
642 642
 
643
-		$output  = '<input name="'. esc_attr( $name ) .'" type="hidden" value="0">';
644
-		$output .= '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="checkbox" value="1" '. checked( $current, '1', false ) .' >';
643
+		$output  = '<input name="' . esc_attr( $name ) . '" type="hidden" value="0">';
644
+		$output .= '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="checkbox" value="1" ' . checked( $current, '1', false ) . ' >';
645 645
 
646 646
 		return $output;
647 647
 	}
@@ -661,22 +661,22 @@  discard block
 block discarded – undo
661 661
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_text::render_input' );
662 662
 
663 663
 		// Show the merge tags if the field is a list view
664
-		$is_list = ( preg_match( '/_list-/ism', $name ));
664
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
665 665
 
666 666
 		// Or is a single entry view
667
-		$is_single = ( preg_match( '/single_/ism', $name ));
667
+		$is_single = ( preg_match( '/single_/ism', $name ) );
668 668
 		$show = ( $is_single || $is_list );
669 669
 
670 670
 		$class = '';
671 671
 		// and $add_merge_tags is not false
672
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
672
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
673 673
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
674 674
 		}
675 675
 
676
-		$class .= !empty( $args['class'] ) ? $args['class'] : 'widefat';
677
-		$type = !empty( $args['type'] ) ? $args['type'] : 'text';
676
+		$class .= ! empty( $args[ 'class' ] ) ? $args[ 'class' ] : 'widefat';
677
+		$type = ! empty( $args[ 'type' ] ) ? $args[ 'type' ] : 'text';
678 678
 
679
-		return '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="'.esc_attr($type).'" value="'. esc_attr( $current ) .'" class="'.esc_attr( $class ).'">';
679
+		return '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="' . esc_attr( $type ) . '" value="' . esc_attr( $current ) . '" class="' . esc_attr( $class ) . '">';
680 680
 	}
681 681
 
682 682
 	/**
@@ -693,21 +693,21 @@  discard block
 block discarded – undo
693 693
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_textarea::render_input' );
694 694
 
695 695
 		// Show the merge tags if the field is a list view
696
-		$is_list = ( preg_match( '/_list-/ism', $name ));
696
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
697 697
 
698 698
 		// Or is a single entry view
699
-		$is_single = ( preg_match( '/single_/ism', $name ));
699
+		$is_single = ( preg_match( '/single_/ism', $name ) );
700 700
 		$show = ( $is_single || $is_list );
701 701
 
702 702
 		$class = '';
703 703
 		// and $add_merge_tags is not false
704
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
704
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
705 705
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
706 706
 		}
707 707
 
708
-		$class .= !empty( $args['class'] ) ? 'widefat '.$args['class'] : 'widefat';
708
+		$class .= ! empty( $args[ 'class' ] ) ? 'widefat ' . $args[ 'class' ] : 'widefat';
709 709
 
710
-		return '<textarea name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" class="'.esc_attr( $class ).'">'. esc_textarea( $current ) .'</textarea>';
710
+		return '<textarea name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class ) . '">' . esc_textarea( $current ) . '</textarea>';
711 711
 	}
712 712
 
713 713
 	/**
@@ -723,9 +723,9 @@  discard block
 block discarded – undo
723 723
 
724 724
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_select::render_input' );
725 725
 
726
-		$output = '<select name="'. $name .'" id="'. $id .'">';
727
-		foreach( $choices as $value => $label ) {
728
-			$output .= '<option value="'. esc_attr( $value ) .'" '. selected( $value, $current, false ) .'>'. esc_html( $label ) .'</option>';
726
+		$output = '<select name="' . $name . '" id="' . $id . '">';
727
+		foreach ( $choices as $value => $label ) {
728
+			$output .= '<option value="' . esc_attr( $value ) . '" ' . selected( $value, $current, false ) . '>' . esc_html( $label ) . '</option>';
729 729
 		}
730 730
 		$output .= '</select>';
731 731
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-fields.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
 	 * @return GravityView_Field | bool
43 43
 	 */
44 44
 	public static function create( $properties ) {
45
-		$type = isset( $properties['type'] ) ? $properties['type'] : '';
46
-		$type = empty( $properties['inputType'] ) ? $type : $properties['inputType'];
45
+		$type = isset( $properties[ 'type' ] ) ? $properties[ 'type' ] : '';
46
+		$type = empty( $properties[ 'inputType' ] ) ? $type : $properties[ 'inputType' ];
47 47
 		if ( empty( $type ) || ! isset( self::$_fields[ $type ] ) ) {
48 48
 			return new GravityView_Field( $properties );
49 49
 		}
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 	 * @return bool True: yes, it exists; False: nope
63 63
 	 */
64 64
 	public static function exists( $field_name ) {
65
-		return isset( self::$_fields["{$field_name}"] );
65
+		return isset( self::$_fields[ "{$field_name}" ] );
66 66
 	}
67 67
 
68 68
 	/**
@@ -96,8 +96,8 @@  discard block
 block discarded – undo
96 96
 
97 97
 		$field_type = is_a( $gf_field, 'GF_Field' ) ? get_class( $gf_field ) : $gf_field;
98 98
 
99
-		foreach( self::$_fields as $field ) {
100
-			if( $field_type === $field->_gf_field_class_name ) {
99
+		foreach ( self::$_fields as $field ) {
100
+			if ( $field_type === $field->_gf_field_class_name ) {
101 101
 				return $field;
102 102
 			}
103 103
 		}
@@ -116,13 +116,13 @@  discard block
 block discarded – undo
116 116
 	 */
117 117
 	public static function get_all( $groups = '' ) {
118 118
 
119
-		if( '' !== $groups ) {
119
+		if ( '' !== $groups ) {
120 120
 			$return_fields = self::$_fields;
121 121
 
122
-			$groups = (array) $groups;
122
+			$groups = (array)$groups;
123 123
 
124 124
 			foreach ( $return_fields as $key => $field ) {
125
-				if( ! in_array( $field->group, $groups, true ) ) {
125
+				if ( ! in_array( $field->group, $groups, true ) ) {
126 126
 					unset( $return_fields[ $key ] );
127 127
 				}
128 128
 			}
Please login to merge, or discard this patch.