Completed
Pull Request — master (#822)
by Zack
23:55 queued 20:40
created
includes/class-post-types.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 		// Load even when invalid to allow for export
20 20
 		add_action( 'init', array( 'GravityView_Post_Types', 'init_post_types' ) );
21 21
 
22
-		if( GravityView_Compatibility::is_valid() ) {
22
+		if ( GravityView_Compatibility::is_valid() ) {
23 23
 			add_action( 'init', array( 'GravityView_Post_Types', 'init_rewrite' ) );
24 24
 		}
25 25
 	}
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
43 43
 
44 44
 		$supports = array( 'title', 'revisions' );
45 45
 
46
-		if( $is_hierarchical ) {
47
-			$supports[] = 'page-attributes';
46
+		if ( $is_hierarchical ) {
47
+			$supports[ ] = 'page-attributes';
48 48
 		}
49 49
 
50 50
 		/**
Please login to merge, or discard this patch.
includes/extensions/entry-notes/class-gravityview-field-notes.php 1 patch
Spacing   +79 added lines, -79 removed lines patch added patch discarded remove patch
@@ -63,18 +63,18 @@  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
 
77
-		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') );
77
+		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) );
78 78
 		add_action( 'gravityview/field/notes/scripts', array( $this, 'enqueue_scripts' ) );
79 79
 		
80 80
 		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_entry_default_field' ), 10, 3 );
@@ -96,8 +96,8 @@  discard block
 block discarded – undo
96 96
 	 */
97 97
 	public function add_entry_default_field( $entry_default_fields, $form, $zone ) {
98 98
 
99
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
100
-			$entry_default_fields['notes'] = array(
99
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
100
+			$entry_default_fields[ 'notes' ] = array(
101 101
 				'label' => __( 'Entry Notes', 'gravityview' ),
102 102
 				'type'  => 'notes',
103 103
 				'desc'  => __( 'Display, add, and delete notes for an entry.', 'gravityview' ),
@@ -130,23 +130,23 @@  discard block
 block discarded – undo
130 130
 	public function enqueue_scripts() {
131 131
 		global $wp_actions;
132 132
 
133
-		if( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
133
+		if ( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
134 134
 			wp_enqueue_style( 'gravityview-notes' );
135 135
 			wp_enqueue_script( 'gravityview-notes' );
136 136
 		}
137 137
 
138
-		if( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
138
+		if ( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
139 139
 
140 140
 			$strings = self::strings();
141 141
 
142 142
 			wp_localize_script( 'gravityview-notes', 'GVNotes', array(
143 143
 				'ajaxurl' => admin_url( 'admin-ajax.php' ),
144 144
 				'text' => array(
145
-					'processing' => $strings['processing'],
146
-					'delete_confirm' => $strings['delete-confirm'],
147
-					'note_added' => $strings['added-note'],
148
-					'error_invalid' => $strings['error-invalid'],
149
-					'error_empty_note' => $strings['error-empty-note'],
145
+					'processing' => $strings[ 'processing' ],
146
+					'delete_confirm' => $strings[ 'delete-confirm' ],
147
+					'note_added' => $strings[ 'added-note' ],
148
+					'error_invalid' => $strings[ 'error-invalid' ],
149
+					'error_empty_note' => $strings[ 'error-empty-note' ],
150 150
 				),
151 151
 			) );
152 152
 		}
@@ -163,22 +163,22 @@  discard block
 block discarded – undo
163 163
 	 */
164 164
 	function maybe_add_note() {
165 165
 
166
-		if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
166
+		if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
167 167
 			do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' );
168 168
 			return;
169 169
 		}
170 170
 
171
-		if( 'gv_note_add' === rgpost('action') ) {
171
+		if ( 'gv_note_add' === rgpost( 'action' ) ) {
172 172
 
173 173
 			$post = wp_unslash( $_POST );
174 174
 
175
-			if( $this->doing_ajax ) {
176
-				parse_str( $post['data'], $data );
175
+			if ( $this->doing_ajax ) {
176
+				parse_str( $post[ 'data' ], $data );
177 177
 			} else {
178 178
 				$data = $post;
179 179
 			}
180 180
 
181
-			$this->process_add_note( (array) $data );
181
+			$this->process_add_note( (array)$data );
182 182
 		}
183 183
 	}
184 184
 
@@ -205,23 +205,23 @@  discard block
 block discarded – undo
205 205
 		$error = false;
206 206
 		$success = false;
207 207
 
208
-		if( empty( $data['entry-slug'] ) ) {
208
+		if ( empty( $data[ 'entry-slug' ] ) ) {
209 209
 
210
-			$error = self::strings('error-invalid');
210
+			$error = self::strings( 'error-invalid' );
211 211
 			do_action( 'gravityview_log_error', __METHOD__ . ': The note is missing an Entry ID.' );
212 212
 
213 213
 		} else {
214 214
 
215
-			$valid = wp_verify_nonce( $data['gv_note_add'], 'gv_note_add_' . $data['entry-slug'] );
215
+			$valid = wp_verify_nonce( $data[ 'gv_note_add' ], 'gv_note_add_' . $data[ 'entry-slug' ] );
216 216
 			
217 217
 			$has_cap = GVCommon::has_cap( 'gravityview_add_entry_notes' );
218 218
 
219
-			if( ! $has_cap ) {
219
+			if ( ! $has_cap ) {
220 220
 				$error = self::strings( 'error-cap-add' );
221 221
 				do_action( 'gravityview_log_error', __METHOD__ . ': Adding a note failed: the user does not have the "gravityview_add_entry_notes" capability.' );
222 222
 			} elseif ( $valid ) {
223 223
 
224
-				$entry = gravityview_get_entry( $data['entry-slug'], true, false );
224
+				$entry = gravityview_get_entry( $data[ 'entry-slug' ], true, false );
225 225
 
226 226
 				$added = $this->add_note( $entry, $data );
227 227
 
@@ -239,22 +239,22 @@  discard block
 block discarded – undo
239 239
 					$this->maybe_send_entry_notes( $note, $entry, $data );
240 240
 
241 241
 					if ( $note ) {
242
-						$success = self::display_note( $note, ! empty( $data['show-delete'] ) );
243
-						do_action( 'gravityview_log_debug', __METHOD__ . ': The note was successfully created', compact('note', 'data') );
242
+						$success = self::display_note( $note, ! empty( $data[ 'show-delete' ] ) );
243
+						do_action( 'gravityview_log_debug', __METHOD__ . ': The note was successfully created', compact( 'note', 'data' ) );
244 244
 					} else {
245
-						$error = self::strings('error-add-note');
246
-						do_action( 'gravityview_log_error', __METHOD__ . ': The note was not successfully created', compact('note', 'data') );
245
+						$error = self::strings( 'error-add-note' );
246
+						do_action( 'gravityview_log_error', __METHOD__ . ': The note was not successfully created', compact( 'note', 'data' ) );
247 247
 					}
248 248
 				}
249 249
 			} else {
250
-				$error = self::strings('error-invalid');
250
+				$error = self::strings( 'error-invalid' );
251 251
 				do_action( 'gravityview_log_error', __METHOD__ . ': Nonce validation failed; the note was not created' );
252 252
 			}
253 253
 		}
254 254
 
255 255
 
256
-		if( $this->doing_ajax ) {
257
-			if( $success ) {
256
+		if ( $this->doing_ajax ) {
257
+			if ( $success ) {
258 258
 				wp_send_json_success( array( 'html' => $success ) );
259 259
 			} else {
260 260
 				$error = $error ? $error : self::strings( 'error-invalid' );
@@ -280,11 +280,11 @@  discard block
 block discarded – undo
280 280
 			return;
281 281
 		}
282 282
 
283
-		if ( isset( $_POST['action'] ) && 'gv_delete_notes' === $_POST['action'] ) {
283
+		if ( isset( $_POST[ 'action' ] ) && 'gv_delete_notes' === $_POST[ 'action' ] ) {
284 284
 
285 285
 			$post = wp_unslash( $_POST );
286 286
 			if ( $this->doing_ajax ) {
287
-				parse_str( $post['data'], $data );
287
+				parse_str( $post[ 'data' ], $data );
288 288
 			} else {
289 289
 				$data = $post;
290 290
 			}
@@ -315,18 +315,18 @@  discard block
 block discarded – undo
315 315
 	 */
316 316
 	function process_delete_notes( $data ) {
317 317
 
318
-		$valid = wp_verify_nonce( $data['gv_delete_notes'], 'gv_delete_notes_' . $data['entry-slug'] );
318
+		$valid = wp_verify_nonce( $data[ 'gv_delete_notes' ], 'gv_delete_notes_' . $data[ 'entry-slug' ] );
319 319
 		$has_cap = GVCommon::has_cap( 'gravityview_delete_entry_notes' );
320 320
 		$success = false;
321 321
 
322 322
 		if ( $valid && $has_cap ) {
323
-			GravityView_Entry_Notes::delete_notes( $data['note'] );
323
+			GravityView_Entry_Notes::delete_notes( $data[ 'note' ] );
324 324
 			$success = true;
325 325
 		}
326 326
 
327
-		if( $this->doing_ajax ) {
327
+		if ( $this->doing_ajax ) {
328 328
 
329
-			if( $success ) {
329
+			if ( $success ) {
330 330
 				wp_send_json_success();
331 331
 			} else {
332 332
 				if ( ! $valid ) {
@@ -359,13 +359,13 @@  discard block
 block discarded – undo
359 359
 
360 360
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
361 361
 
362
-		unset( $field_options['show_as_link'] );
362
+		unset( $field_options[ 'show_as_link' ] );
363 363
 
364 364
 		$notes_options = array(
365 365
 			'notes' => array(
366 366
 				'type' => 'checkboxes',
367
-				'label' => __('Note Settings', 'gravityview'),
368
-				'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>' ),
367
+				'label' => __( 'Note Settings', 'gravityview' ),
368
+				'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 369
 				'options' => array(
370 370
 					'view' => array(
371 371
 						'label' => __( 'Display notes?', 'gravityview' ),
@@ -417,7 +417,7 @@  discard block
 block discarded – undo
417 417
 			'processing' => __( 'Processing&hellip;', 'gravityview' ),
418 418
 			'other-email' => __( 'Other email address', 'gravityview' ),
419 419
 			'email-label' => __( 'Email address', 'gravityview' ),
420
-			'email-placeholder' => _x('[email protected]', 'Example email address used as a placeholder', 'gravityview'),
420
+			'email-placeholder' => _x( '[email protected]', 'Example email address used as a placeholder', 'gravityview' ),
421 421
 			'subject-label' => __( 'Subject', 'gravityview' ),
422 422
 			'subject' => __( 'Email subject', 'gravityview' ),
423 423
 			'default-email-subject' => __( 'New entry note', 'gravityview' ),
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
437 437
 		 */
438 438
 		$strings = gv_map_deep( apply_filters( 'gravityview/field/notes/strings', $strings ), 'esc_html' );
439 439
 
440
-		if( $key ) {
440
+		if ( $key ) {
441 441
 			return isset( $strings[ $key ] ) ? $strings[ $key ] : '';
442 442
 		}
443 443
 
@@ -456,7 +456,7 @@  discard block
 block discarded – undo
456 456
 	 */
457 457
 	static public function display_note( $note, $show_delete = false ) {
458 458
 
459
-		if( ! is_object( $note ) ) {
459
+		if ( ! is_object( $note ) ) {
460 460
 			return '';
461 461
 		}
462 462
 
@@ -497,7 +497,7 @@  discard block
 block discarded – undo
497 497
 		$note_row = ob_get_clean();
498 498
 
499 499
 		$replacements = array(
500
-			'{note_id}' => $note_content['note_id'],
500
+			'{note_id}' => $note_content[ 'note_id' ],
501 501
 			'{row_class}' => 'gv-note',
502 502
 			'{note_detail}' => $note_detail_html
503 503
 		);
@@ -529,13 +529,13 @@  discard block
 block discarded – undo
529 529
 
530 530
 		$user_data = get_userdata( $current_user->ID );
531 531
 
532
-		$note_content = trim( $data['gv-note-content'] );
532
+		$note_content = trim( $data[ 'gv-note-content' ] );
533 533
 
534
-		if( empty( $note_content ) ) {
534
+		if ( empty( $note_content ) ) {
535 535
 			return new WP_Error( 'gv-add-note-empty', __( 'The note is empty.', 'gravityview' ) );
536 536
 		}
537 537
 
538
-		$return = GravityView_Entry_Notes::add_note( $entry['id'], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
538
+		$return = GravityView_Entry_Notes::add_note( $entry[ 'id' ], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
539 539
 
540 540
 		return $return;
541 541
 	}
@@ -551,7 +551,7 @@  discard block
 block discarded – undo
551 551
 	 */
552 552
 	public static function get_add_note_part() {
553 553
 
554
-		if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
554
+		if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
555 555
 			do_action( 'gravityview_log_error', __METHOD__ . ': User does not have permission to add entry notes ("gravityview_add_entry_notes").' );
556 556
 			return '';
557 557
 		}
@@ -564,19 +564,19 @@  discard block
 block discarded – undo
564 564
 
565 565
 		$visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' );
566 566
 		$entry = $gravityview_view->getCurrentEntry();
567
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
567
+		$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
568 568
 		$nonce_field = wp_nonce_field( 'gv_note_add_' . $entry_slug, 'gv_note_add', false, false );
569 569
 
570 570
 		// Only generate the dropdown if the field settings allow it
571 571
 		$email_fields = '';
572
-		if( ! empty( $visibility_settings['email'] ) ) {
572
+		if ( ! empty( $visibility_settings[ 'email' ] ) ) {
573 573
 			$email_fields = self::get_note_email_fields( $entry_slug );
574 574
 		}
575 575
 
576 576
 		$add_note_html = str_replace( '{entry_slug}', $entry_slug, $add_note_html );
577 577
 		$add_note_html = str_replace( '{nonce_field}', $nonce_field, $add_note_html );
578
-		$add_note_html = str_replace( '{show_delete}', intval( $visibility_settings['delete'] ), $add_note_html );
579
-		$add_note_html   = str_replace( '{email_fields}', $email_fields, $add_note_html );
578
+		$add_note_html = str_replace( '{show_delete}', intval( $visibility_settings[ 'delete' ] ), $add_note_html );
579
+		$add_note_html = str_replace( '{email_fields}', $email_fields, $add_note_html );
580 580
 		$add_note_html = str_replace( '{url}', esc_url_raw( add_query_arg( array() ) ), $add_note_html );
581 581
 
582 582
 		return $add_note_html;
@@ -601,8 +601,8 @@  discard block
 block discarded – undo
601 601
 		$note_emails = array();
602 602
 
603 603
 		foreach ( $email_fields as $email_field ) {
604
-			if ( ! empty( $entry["{$email_field->id}"] ) && is_email( $entry["{$email_field->id}"] ) ) {
605
-				$note_emails[] = $entry["{$email_field->id}"];
604
+			if ( ! empty( $entry[ "{$email_field->id}" ] ) && is_email( $entry[ "{$email_field->id}" ] ) ) {
605
+				$note_emails[ ] = $entry[ "{$email_field->id}" ];
606 606
 			}
607 607
 		}
608 608
 
@@ -614,7 +614,7 @@  discard block
 block discarded – undo
614 614
 		 */
615 615
 		$note_emails = apply_filters( 'gravityview/field/notes/emails', $note_emails, $entry );
616 616
 
617
-		return (array) $note_emails;
617
+		return (array)$note_emails;
618 618
 	}
619 619
 
620 620
 	/**
@@ -630,7 +630,7 @@  discard block
 block discarded – undo
630 630
 	 */
631 631
 	private static function get_note_email_fields( $entry_slug = '' ) {
632 632
 
633
-		if( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
633
+		if ( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
634 634
 			do_action( 'gravityview_log_error', __METHOD__ . ': User does not have permission to email entry notes ("gravityview_email_entry_notes").' );
635 635
 			return '';
636 636
 		}
@@ -652,27 +652,27 @@  discard block
 block discarded – undo
652 652
 
653 653
 		if ( ! empty( $note_emails ) || $include_custom ) { ?>
654 654
 			<div class="gv-note-email-container">
655
-				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings['also-email'];  ?></label>
655
+				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings[ 'also-email' ]; ?></label>
656 656
 				<select class="gv-note-email-to" name="gv-note-to" id="gv-note-email-to-<?php echo $entry_slug_esc; ?>">
657
-					<option value=""><?php echo $strings['also-email'];  ?></option>
657
+					<option value=""><?php echo $strings[ 'also-email' ]; ?></option>
658 658
 					<?php foreach ( $note_emails as  $email ) {
659 659
 						?>
660 660
 						<option value="<?php echo esc_attr( $email ); ?>"><?php echo esc_html( $email ); ?></option>
661 661
 					<?php }
662
-					if( $include_custom ) { ?>
663
-					<option value="custom"><?php echo self::strings('other-email'); ?></option>
662
+					if ( $include_custom ) { ?>
663
+					<option value="custom"><?php echo self::strings( 'other-email' ); ?></option>
664 664
 					<?php } ?>
665 665
 				</select>
666 666
 				<fieldset class="gv-note-to-container">
667
-					<?php if( $include_custom ) { ?>
667
+					<?php if ( $include_custom ) { ?>
668 668
 					<div class='gv-note-to-custom-container'>
669
-						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings['email-label']; ?></label>
670
-						<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="" />
669
+						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'email-label' ]; ?></label>
670
+						<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="" />
671 671
 					</div>
672 672
 					<?php } ?>
673 673
 		            <div class='gv-note-subject-container'>
674
-		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings['subject-label']; ?></label>
675
-		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings['subject']; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
674
+		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'subject-label' ]; ?></label>
675
+		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings[ 'subject' ]; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
676 676
 		            </div>
677 677
 				</fieldset>
678 678
 			</div>
@@ -695,7 +695,7 @@  discard block
 block discarded – undo
695 695
 	 */
696 696
 	private function maybe_send_entry_notes( $note = false, $entry, $data ) {
697 697
 
698
-		if( ! $note || ! GVCommon::has_cap('gravityview_email_entry_notes') ) {
698
+		if ( ! $note || ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
699 699
 			do_action( 'gravityview_log_debug', __METHOD__ . ': User doesnt have "gravityview_email_entry_notes" cap, or $note is empty', $note );
700 700
 			return;
701 701
 		}
@@ -703,7 +703,7 @@  discard block
 block discarded – undo
703 703
 		do_action( 'gravityview_log_debug', __METHOD__ . ': $data', $data );
704 704
 
705 705
 		//emailing notes if configured
706
-		if ( ! empty( $data['gv-note-to'] ) ) {
706
+		if ( ! empty( $data[ 'gv-note-to' ] ) ) {
707 707
 
708 708
 			$default_data = array(
709 709
 				'gv-note-to' => '',
@@ -713,11 +713,11 @@  discard block
 block discarded – undo
713 713
                 'current-url' => '',
714 714
 			);
715 715
 
716
-			$current_user  = wp_get_current_user();
716
+			$current_user = wp_get_current_user();
717 717
 			$email_data = wp_parse_args( $data, $default_data );
718 718
 
719
-			$from    = $current_user->user_email;
720
-			$to = $email_data['gv-note-to'];
719
+			$from = $current_user->user_email;
720
+			$to = $email_data[ 'gv-note-to' ];
721 721
 
722 722
 			/**
723 723
 			 * Documented in get_note_email_fields
@@ -725,8 +725,8 @@  discard block
 block discarded – undo
725 725
 			 */
726 726
 			$include_custom = apply_filters( 'gravityview/field/notes/custom-email', true );
727 727
 
728
-			if( 'custom' === $to && $include_custom ) {
729
-				$to = $email_data['gv-note-to-custom'];
728
+			if ( 'custom' === $to && $include_custom ) {
729
+				$to = $email_data[ 'gv-note-to-custom' ];
730 730
 				do_action( 'gravityview_log_debug', __METHOD__ . ': Sending note to a custom email address: ' . $to );
731 731
 			}
732 732
 
@@ -737,13 +737,13 @@  discard block
 block discarded – undo
737 737
 
738 738
 			$bcc = false;
739 739
 			$reply_to = $from;
740
-			$subject = trim( $email_data['gv-note-subject'] );
740
+			$subject = trim( $email_data[ 'gv-note-subject' ] );
741 741
 
742 742
 			// We use empty() here because GF uses empty to check against, too. `0` isn't a valid subject to GF
743 743
 			$subject = empty( $subject ) ? self::strings( 'default-email-subject' ) : $subject;
744
-			$message = $email_data['gv-note-content'];
744
+			$message = $email_data[ 'gv-note-content' ];
745 745
 			$email_footer = self::strings( 'email-footer' );
746
-			$from_name     = $current_user->display_name;
746
+			$from_name = $current_user->display_name;
747 747
 			$message_format = 'html';
748 748
 
749 749
 			/**
@@ -774,7 +774,7 @@  discard block
 block discarded – undo
774 774
 
775 775
 			GVCommon::send_email( $from, $to, $bcc, $reply_to, $subject, $message, $from_name, $message_format, '', $entry, false );
776 776
 
777
-			$form  = isset( $entry['form_id'] ) ? GFAPI::get_form( $entry['form_id'] ) : array();
777
+			$form = isset( $entry[ 'form_id' ] ) ? GFAPI::get_form( $entry[ 'form_id' ] ) : array();
778 778
 
779 779
 			/**
780 780
 			 * @see https://www.gravityhelp.com/documentation/article/10146-2/ It's here for compatibility with Gravity Forms
@@ -800,7 +800,7 @@  discard block
 block discarded – undo
800 800
 
801 801
 	    $output = '';
802 802
 
803
-		if( ! empty( $email_footer ) ) {
803
+		if ( ! empty( $email_footer ) ) {
804 804
 		    $url = rgar( $email_data, 'current-url' );
805 805
 			$url = html_entity_decode( $url );
806 806
 			$url = site_url( $url );
Please login to merge, or discard this patch.
includes/class-cache.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 		/**
80 80
 		 * @see RGFormsModel::update_lead_property() Trigger when any entry property changes
81 81
 		 */
82
-		foreach( $this->lead_db_columns as $column ) {
82
+		foreach ( $this->lead_db_columns as $column ) {
83 83
 			add_action( 'gform_update_' . $column, array( $this, 'entry_status_changed' ), 10, 3 );
84 84
 		}
85 85
 
@@ -112,9 +112,9 @@  discard block
 block discarded – undo
112 112
 			return;
113 113
 		}
114 114
 
115
-		do_action( 'gravityview_log_debug', __METHOD__ . ' adding form ' . $entry['form_id'] . ' to blacklist because entry #' . $lead_id . ' was deleted', array( 'value' => $property_value, 'previous' => $previous_value ) );
115
+		do_action( 'gravityview_log_debug', __METHOD__ . ' adding form ' . $entry[ 'form_id' ] . ' to blacklist because entry #' . $lead_id . ' was deleted', array( 'value' => $property_value, 'previous' => $previous_value ) );
116 116
 		
117
-		$this->blacklist_add( $entry['form_id'] );
117
+		$this->blacklist_add( $entry[ 'form_id' ] );
118 118
 	}
119 119
 
120 120
 	/**
@@ -127,9 +127,9 @@  discard block
 block discarded – undo
127 127
 	 */
128 128
 	public function entry_updated( $form, $lead_id ) {
129 129
 
130
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form ' . $form['id'] . ' to blacklist because entry #' . $lead_id . ' was updated' );
130
+		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form ' . $form[ 'id' ] . ' to blacklist because entry #' . $lead_id . ' was updated' );
131 131
 
132
-		$this->blacklist_add( $form['id'] );
132
+		$this->blacklist_add( $form[ 'id' ] );
133 133
 	}
134 134
 
135 135
 	/**
@@ -144,9 +144,9 @@  discard block
 block discarded – undo
144 144
 	 */
145 145
 	public function entry_created( $entry, $form ) {
146 146
 
147
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_created] adding form ' . $form['id'] . ' to blacklist because entry #' . $entry['id'] . ' was created' );
147
+		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_created] adding form ' . $form[ 'id' ] . ' to blacklist because entry #' . $entry[ 'id' ] . ' was created' );
148 148
 
149
-		$this->blacklist_add( $form['id'] );
149
+		$this->blacklist_add( $form[ 'id' ] );
150 150
 	}
151 151
 
152 152
 	/**
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 		// Normally just one form, but supports multiple forms
166 166
 		//
167 167
 		// Array of IDs 12, 5, 14 would result in `f-12f-5f-14`
168
-		$forms = 'f:' . implode( '&f:', (array) $form_ids );
168
+		$forms = 'f:' . implode( '&f:', (array)$form_ids );
169 169
 
170 170
 		// Prefix for transient keys
171 171
 		// Now the prefix would be: `gv-cache-f-12f-5f-14`
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 		) );
223 223
 
224 224
 		// Add the passed form IDs
225
-		$blacklist = array_merge( (array) $blacklist, $form_ids );
225
+		$blacklist = array_merge( (array)$blacklist, $form_ids );
226 226
 
227 227
 		// Don't duplicate
228 228
 		$blacklist = array_unique( $blacklist );
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 
243 243
 		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
244 244
 
245
-		$updated_list = array_diff( $blacklist, (array) $form_ids );
245
+		$updated_list = array_diff( $blacklist, (array)$form_ids );
246 246
 
247 247
 		do_action( 'gravityview_log_debug', 'GravityView_Cache[blacklist_remove] Removing form IDs from cache blacklist', array(
248 248
 			'$form_ids'     => $form_ids,
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
 			return false;
276 276
 		}
277 277
 
278
-		foreach ( (array) $form_ids as $form_id ) {
278
+		foreach ( (array)$form_ids as $form_id ) {
279 279
 
280 280
 			if ( in_array( $form_id, $blacklist ) ) {
281 281
 
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
 			 * @filter `gravityview_cache_time_{$filter_name}` Modify the cache time for a type of cache
348 348
 			 * @param int $time_in_seconds Default: `DAY_IN_SECONDS`
349 349
 			 */
350
-			$cache_time = (int) apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
350
+			$cache_time = (int)apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
351 351
 
352 352
 			do_action( 'gravityview_log_debug', 'GravityView_Cache[set] Setting cache with transient key ' . $this->key . ' for ' . $cache_time . ' seconds' );
353 353
 
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
 			return;
384 384
 		}
385 385
 
386
-		foreach ( (array) $form_ids as $form_id ) {
386
+		foreach ( (array)$form_ids as $form_id ) {
387 387
 
388 388
 			$key = $this->get_cache_key_prefix( $form_id );
389 389
 
@@ -497,7 +497,7 @@  discard block
 block discarded – undo
497 497
 
498 498
 		if ( GVCommon::has_cap( 'edit_gravityviews' ) ) {
499 499
 
500
-			if ( isset( $_GET['cache'] ) || isset( $_GET['nocache'] ) ) {
500
+			if ( isset( $_GET[ 'cache' ] ) || isset( $_GET[ 'nocache' ] ) ) {
501 501
 
502 502
 				do_action( 'gravityview_log_debug', 'GravityView_Cache[use_cache] Not using cache: ?cache or ?nocache is in the URL' );
503 503
 
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
526 526
 		 */
527 527
 		$use_cache = apply_filters( 'gravityview_use_cache', $use_cache, $this );
528 528
 
529
-		return (boolean) $use_cache;
529
+		return (boolean)$use_cache;
530 530
 	}
531 531
 
532 532
 }
Please login to merge, or discard this patch.
includes/class-gravityview-shortcode.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -49,8 +49,8 @@  discard block
 block discarded – undo
49 49
 		do_action( 'gravityview_log_debug', __FUNCTION__ . ' $passed_atts: ', $passed_atts );
50 50
 
51 51
 		// Get details about the current View
52
-		if( !empty( $passed_atts['detail'] ) ) {
53
-			return $this->get_view_detail( $passed_atts['detail'] );
52
+		if ( ! empty( $passed_atts[ 'detail' ] ) ) {
53
+			return $this->get_view_detail( $passed_atts[ 'detail' ] );
54 54
 		}
55 55
 
56 56
 		$atts = $this->parse_and_sanitize_atts( $passed_atts );
@@ -86,16 +86,16 @@  discard block
 block discarded – undo
86 86
 		$filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' );
87 87
 
88 88
 		// Only keep the passed attributes after making sure that they're valid pairs
89
-		$filtered_atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( (array) $passed_atts, $filtered_atts ) : $filtered_atts;
89
+		$filtered_atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( (array)$passed_atts, $filtered_atts ) : $filtered_atts;
90 90
 
91 91
 		$atts = array();
92 92
 
93
-		foreach( $filtered_atts as $key => $passed_value ) {
93
+		foreach ( $filtered_atts as $key => $passed_value ) {
94 94
 
95 95
 			// Allow using GravityView merge tags in shortcode attributes, like {get} and {created_by}
96 96
 			$passed_value = GravityView_Merge_Tags::replace_variables( $passed_value );
97 97
 
98
-			switch( $defaults[ $key ]['type'] ) {
98
+			switch ( $defaults[ $key ][ 'type' ] ) {
99 99
 
100 100
 				/**
101 101
 				 * Make sure number fields are numeric.
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 				 * @see http://php.net/manual/en/function.is-numeric.php#107326
104 104
 				 */
105 105
 				case 'number':
106
-					if( is_numeric( $passed_value ) ) {
106
+					if ( is_numeric( $passed_value ) ) {
107 107
 						$atts[ $key ] = ( $passed_value + 0 );
108 108
 					}
109 109
 					break;
@@ -118,8 +118,8 @@  discard block
 block discarded – undo
118 118
 				 */
119 119
 				case 'select':
120 120
 				case 'radio':
121
-					$options = isset( $defaults[ $key ]['choices'] ) ? $defaults[ $key ]['choices'] : $defaults[ $key ]['options'];
122
-					if( in_array( $passed_value, array_keys( $options ) ) ) {
121
+					$options = isset( $defaults[ $key ][ 'choices' ] ) ? $defaults[ $key ][ 'choices' ] : $defaults[ $key ][ 'options' ];
122
+					if ( in_array( $passed_value, array_keys( $options ) ) ) {
123 123
 						$atts[ $key ] = $passed_value;
124 124
 					}
125 125
 					break;
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 		$gravityview_view = GravityView_View::getInstance();
149 149
 		$return = '';
150 150
 
151
-		switch( $detail ) {
151
+		switch ( $detail ) {
152 152
 			case 'total_entries':
153 153
 				$return = number_format_i18n( $gravityview_view->getTotalEntries() );
154 154
 				break;
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry-user-registration.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
52 52
 	     * @since 1.11
53 53
 	     * @param boolean $boolean Whether to trigger update on user registration (default: true)
54 54
 	     */
55
-	    if( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
55
+	    if ( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
56 56
 
57
-	    	add_action( 'gravityview/edit_entry/after_update' , array( $this, 'update_user' ), 10, 2 );
57
+	    	add_action( 'gravityview/edit_entry/after_update', array( $this, 'update_user' ), 10, 2 );
58 58
 
59 59
 		    // last resort in case the current user display name don't match any of the defaults
60 60
 		    add_action( 'gform_user_updated', array( $this, 'restore_display_name' ), 10, 4 );
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
      */
73 73
     public function update_user( $form = array(), $entry_id = 0 ) {
74 74
 
75
-        if( ! class_exists( 'GFAPI' ) || ! class_exists( 'GF_User_Registration' ) || empty( $entry_id ) ) {
75
+        if ( ! class_exists( 'GFAPI' ) || ! class_exists( 'GF_User_Registration' ) || empty( $entry_id ) ) {
76 76
             return;
77 77
         }
78 78
 
@@ -101,15 +101,15 @@  discard block
 block discarded – undo
101 101
          */
102 102
         $preserve_role = apply_filters( 'gravityview/edit_entry/user_registration/preserve_role', true, $config, $form, $entry );
103 103
 
104
-        if( $preserve_role ) {
105
-            $config['meta']['role'] = 'gfur_preserve_role';
104
+        if ( $preserve_role ) {
105
+            $config[ 'meta' ][ 'role' ] = 'gfur_preserve_role';
106 106
         }
107 107
 
108 108
         /**
109 109
          * Make sure the current display name is not changed with the update user method.
110 110
          * @since 1.15
111 111
          */
112
-        $config['meta']['displayname'] = $this->match_current_display_name( $entry['created_by'] );
112
+        $config[ 'meta' ][ 'displayname' ] = $this->match_current_display_name( $entry[ 'created_by' ] );
113 113
 
114 114
 
115 115
         /**
@@ -128,8 +128,8 @@  discard block
 block discarded – undo
128 128
 	    }
129 129
 
130 130
 	    // If an Update feed, make sure the conditions are met.
131
-	    if( rgars( $config, 'meta/feedType' ) === 'update' ) {
132
-	    	if( ! $gf_user_registration->is_feed_condition_met( $config, $form, $entry ) ) {
131
+	    if ( rgars( $config, 'meta/feedType' ) === 'update' ) {
132
+	    	if ( ! $gf_user_registration->is_feed_condition_met( $config, $form, $entry ) ) {
133 133
 			    return;
134 134
 		    }
135 135
 	    }
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 
165 165
         // In case we can't find the current display name format, or it is the 'nickname' format (which Gravity Forms doesn't support)
166 166
         //   trigger last resort method at the 'gform_user_updated' hook
167
-        if( false === $format || 'nickname' === $format ) {
167
+        if ( false === $format || 'nickname' === $format ) {
168 168
             $this->_user_before_update = $user;
169 169
             $format = 'nickname';
170 170
         }
@@ -184,18 +184,18 @@  discard block
 block discarded – undo
184 184
     public function generate_display_names( $profileuser ) {
185 185
 
186 186
         $public_display = array();
187
-        $public_display['nickname']  = $profileuser->nickname;
188
-        $public_display['username']  = $profileuser->user_login;
187
+        $public_display[ 'nickname' ]  = $profileuser->nickname;
188
+        $public_display[ 'username' ]  = $profileuser->user_login;
189 189
 
190
-        if ( !empty($profileuser->first_name) )
191
-            $public_display['firstname'] = $profileuser->first_name;
190
+        if ( ! empty( $profileuser->first_name ) )
191
+            $public_display[ 'firstname' ] = $profileuser->first_name;
192 192
 
193
-        if ( !empty($profileuser->last_name) )
194
-            $public_display['lastname'] = $profileuser->last_name;
193
+        if ( ! empty( $profileuser->last_name ) )
194
+            $public_display[ 'lastname' ] = $profileuser->last_name;
195 195
 
196
-        if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
197
-            $public_display['firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
198
-            $public_display['lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
196
+        if ( ! empty( $profileuser->first_name ) && ! empty( $profileuser->last_name ) ) {
197
+            $public_display[ 'firstlast' ] = $profileuser->first_name . ' ' . $profileuser->last_name;
198
+            $public_display[ 'lastfirst' ] = $profileuser->last_name . ' ' . $profileuser->first_name;
199 199
         }
200 200
 
201 201
         $public_display = array_map( 'trim', $public_display );
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
          */
226 226
         $restore_display_name = apply_filters( 'gravityview/edit_entry/restore_display_name', true );
227 227
 
228
-        $is_update_feed = ( $config && rgars( $config, 'meta/feed_type') === 'update' );
228
+        $is_update_feed = ( $config && rgars( $config, 'meta/feed_type' ) === 'update' );
229 229
 
230 230
         /**
231 231
          * Don't restore display name:
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
          *   - or we don't need as we found the correct format before updating user.
235 235
          * @since 1.14.4
236 236
          */
237
-        if( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
237
+        if ( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
238 238
             return;
239 239
         }
240 240
 
@@ -260,10 +260,10 @@  discard block
 block discarded – undo
260 260
 
261 261
         $updated = wp_update_user( $restored_user );
262 262
 
263
-        if( is_wp_error( $updated ) ) {
264
-            do_action('gravityview_log_error', __METHOD__ . sprintf( ' - There was an error updating user #%d details', $user_id ), $updated );
263
+        if ( is_wp_error( $updated ) ) {
264
+            do_action( 'gravityview_log_error', __METHOD__ . sprintf( ' - There was an error updating user #%d details', $user_id ), $updated );
265 265
         } else {
266
-            do_action('gravityview_log_debug', __METHOD__ . sprintf( ' - User #%d details restored', $user_id ) );
266
+            do_action( 'gravityview_log_debug', __METHOD__ . sprintf( ' - User #%d details restored', $user_id ) );
267 267
         }
268 268
 
269 269
         $this->_user_before_update = null;
Please login to merge, or discard this patch.
includes/admin/field-types/type_textarea.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 		?>
10 10
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
11 11
 
12
-			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
12
+			echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
13 13
 			echo $this->get_tooltip() . $this->get_field_desc();
14 14
 		?><div>
15 15
 				<?php $this->render_input(); ?>
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 	}
20 20
 
21 21
 	function render_input( $override_input = null ) {
22
-		if( isset( $override_input ) ) {
22
+		if ( isset( $override_input ) ) {
23 23
 			echo $override_input;
24 24
 			return;
25 25
 		}
@@ -28,17 +28,17 @@  discard block
 block discarded – undo
28 28
 
29 29
 		$show_mt = $this->show_merge_tags();
30 30
 
31
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
31
+        if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
32 32
             $class .= ' merge-tag-support mt-position-right ';
33 33
 
34
-            if( empty( $this->field['show_all_fields'] ) ) {
34
+            if ( empty( $this->field[ 'show_all_fields' ] ) ) {
35 35
             	$class .= ' mt-hide_all_fields ';
36 36
             }
37 37
         }
38 38
 		$class .= rgar( $this->field, 'class' );
39 39
 		$placeholder = rgar( $this->field, 'placeholder' );
40 40
 		?>
41
-		<textarea name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo gravityview_sanitize_html_class( $class ); ?>" rows="5"><?php echo esc_textarea(  $this->value ); ?></textarea>
41
+		<textarea name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo gravityview_sanitize_html_class( $class ); ?>" rows="5"><?php echo esc_textarea( $this->value ); ?></textarea>
42 42
        	<?php
43 43
 	}
44 44
 
Please login to merge, or discard this patch.
includes/admin/field-types/type_text.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 		?>
9 9
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
10 10
 
11
-			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
11
+			echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
12 12
 			echo $this->get_tooltip() . $this->get_field_desc();
13 13
 		?><div>
14 14
 				<?php $this->render_input(); ?>
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 
20 20
 	function render_input( $override_input = null ) {
21 21
 
22
-		if( isset( $override_input ) ) {
22
+		if ( isset( $override_input ) ) {
23 23
 			echo $override_input;
24 24
 			return;
25 25
 		}
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 
29 29
 		$show_mt = $this->show_merge_tags();
30 30
 
31
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
31
+        if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
32 32
             $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
33 33
         }
34 34
         $class .= rgar( $this->field, 'class', 'widefat' );
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -134,17 +134,17 @@  discard block
 block discarded – undo
134 134
 
135 135
 		add_filter( 'gravityview/sortable/field_blacklist', array( $this, '_filter_sortable_fields' ), 1 );
136 136
 
137
-		if( $this->entry_meta_key ) {
137
+		if ( $this->entry_meta_key ) {
138 138
 			add_filter( 'gform_entry_meta', array( $this, 'add_entry_meta' ) );
139 139
 			add_filter( 'gravityview/common/sortable_fields', array( $this, 'add_sortable_field' ), 10, 2 );
140 140
 		}
141 141
 
142
-		if( $this->_custom_merge_tag ) {
142
+		if ( $this->_custom_merge_tag ) {
143 143
 			add_filter( 'gform_custom_merge_tags', array( $this, '_filter_gform_custom_merge_tags' ), 10, 4 );
144 144
 			add_filter( 'gform_replace_merge_tags', array( $this, '_filter_gform_replace_merge_tags' ), 10, 7 );
145 145
 		}
146 146
 
147
-		if( 'meta' === $this->group || '' !== $this->default_search_label ) {
147
+		if ( 'meta' === $this->group || '' !== $this->default_search_label ) {
148 148
 			add_filter( 'gravityview_search_field_label', array( $this, 'set_default_search_label' ), 10, 3 );
149 149
 		}
150 150
 
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
 			'type'  => $this->name
168 168
 		);
169 169
 
170
-		$fields["{$this->entry_meta_key}"] = $added_field;
170
+		$fields[ "{$this->entry_meta_key}" ] = $added_field;
171 171
 
172 172
 		return $fields;
173 173
 	}
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 	 */
188 188
 	function set_default_search_label( $label = '', $gf_field = null, $field = array() ) {
189 189
 
190
-		if( $this->name === $field['field'] && '' === $label ) {
190
+		if ( $this->name === $field[ 'field' ] && '' === $label ) {
191 191
 			$label = esc_html( $this->default_search_label );
192 192
 		}
193 193
 
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 	 *
209 209
 	 * @return string Original text if {_custom_merge_tag} isn't found. Otherwise, replaced text.
210 210
 	 */
211
-	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false  ) {
211
+	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
212 212
 
213 213
 		/**
214 214
 		 * This prevents the gform_replace_merge_tags filter from being called twice, as defined in:
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 		 * @see GFCommon::replace_variables_prepopulate()
217 217
 		 * @todo Remove eventually: Gravity Forms fixed this issue in 1.9.14
218 218
 		 */
219
-		if( false === $form ) {
219
+		if ( false === $form ) {
220 220
 			return $text;
221 221
 		}
222 222
 
@@ -249,19 +249,19 @@  discard block
 block discarded – undo
249 249
 	 */
250 250
 	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
251 251
 
252
-		foreach( $matches as $match ) {
252
+		foreach ( $matches as $match ) {
253 253
 
254
-			$full_tag = $match[0];
254
+			$full_tag = $match[ 0 ];
255 255
 
256 256
 			// Strip the Merge Tags
257
-			$tag = str_replace( array( '{', '}'), '', $full_tag );
257
+			$tag = str_replace( array( '{', '}' ), '', $full_tag );
258 258
 
259 259
 			// Replace the value from the entry, if exists
260
-			if( isset( $entry[ $tag ] ) ) {
260
+			if ( isset( $entry[ $tag ] ) ) {
261 261
 
262 262
 				$value = $entry[ $tag ];
263 263
 
264
-				if( is_callable( array( $this, 'get_content') ) ) {
264
+				if ( is_callable( array( $this, 'get_content' ) ) ) {
265 265
 					$value = $this->get_content( $value );
266 266
 				}
267 267
 
@@ -334,8 +334,8 @@  discard block
 block discarded – undo
334 334
 	 */
335 335
 	public function _filter_sortable_fields( $not_sortable ) {
336 336
 
337
-		if( ! $this->is_sortable ) {
338
-			$not_sortable[] = $this->name;
337
+		if ( ! $this->is_sortable ) {
338
+			$not_sortable[ ] = $this->name;
339 339
 		}
340 340
 
341 341
 		return $not_sortable;
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
 	 */
353 353
 	function add_entry_meta( $entry_meta ) {
354 354
 
355
-		if( ! isset( $entry_meta["{$this->entry_meta_key}"] ) ) {
355
+		if ( ! isset( $entry_meta[ "{$this->entry_meta_key}" ] ) ) {
356 356
 
357 357
 			$added_meta = array(
358 358
 				'label'             => $this->label,
@@ -361,13 +361,13 @@  discard block
 block discarded – undo
361 361
 			);
362 362
 
363 363
 			if ( $this->entry_meta_update_callback && is_callable( $this->entry_meta_update_callback ) ) {
364
-				$added_meta['update_entry_meta_callback'] = $this->entry_meta_update_callback;
364
+				$added_meta[ 'update_entry_meta_callback' ] = $this->entry_meta_update_callback;
365 365
 			}
366 366
 
367
-			$entry_meta["{$this->entry_meta_key}"] = $added_meta;
367
+			$entry_meta[ "{$this->entry_meta_key}" ] = $added_meta;
368 368
 
369 369
 		} else {
370
-			do_action( 'gravityview_log_error', __METHOD__ . ' Entry meta already set: ' . $this->entry_meta_key, $entry_meta["{$this->entry_meta_key}"] );
370
+			do_action( 'gravityview_log_error', __METHOD__ . ' Entry meta already set: ' . $this->entry_meta_key, $entry_meta[ "{$this->entry_meta_key}" ] );
371 371
 		}
372 372
 
373 373
 		return $entry_meta;
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
 			'date_display' => array(
397 397
 				'type' => 'text',
398 398
 				'label' => __( 'Override Date Format', 'gravityview' ),
399
-				'desc' => sprintf( __( 'Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview'), '<a href="https://codex.wordpress.org/Formatting_Date_and_Time">', '</a>' ),
399
+				'desc' => sprintf( __( 'Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview' ), '<a href="https://codex.wordpress.org/Formatting_Date_and_Time">', '</a>' ),
400 400
 				/**
401 401
 				 * @filter `gravityview_date_format` Override the date format with a [PHP date format](https://codex.wordpress.org/Formatting_Date_and_Time)
402 402
 				 * @param[in,out] null|string $date_format Date Format (default: null)
@@ -421,7 +421,7 @@  discard block
 block discarded – undo
421 421
 
422 422
 		$options = $this->field_support_options();
423 423
 
424
-		if( isset( $options[ $key ] ) ) {
424
+		if ( isset( $options[ $key ] ) ) {
425 425
 			$field_options[ $key ] = $options[ $key ];
426 426
 		}
427 427
 
@@ -485,11 +485,11 @@  discard block
 block discarded – undo
485 485
 		$connected_form = rgpost( 'form_id' );
486 486
 
487 487
 		// Otherwise, get the Form ID from the Post page
488
-		if( empty( $connected_form ) ) {
488
+		if ( empty( $connected_form ) ) {
489 489
 			$connected_form = gravityview_get_form_id( get_the_ID() );
490 490
 		}
491 491
 
492
-		if( empty( $connected_form ) ) {
492
+		if ( empty( $connected_form ) ) {
493 493
 			do_action( 'gravityview_log_error', sprintf( '%s: Form not found for form ID "%s"', __METHOD__, $connected_form ) );
494 494
 			return false;
495 495
 		}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-is-approved.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	 */
93 93
 	function add_default_field( $entry_default_fields, $form, $zone ) {
94 94
 
95
-		if( 'edit' !== $zone ) {
95
+		if ( 'edit' !== $zone ) {
96 96
 			$entry_default_fields[ $this->name ] = array(
97 97
 				'label' => $this->label,
98 98
 				'desc'  => $this->description,
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 
118 118
 		$merge_tags = array(
119 119
 			array(
120
-				'label' => __('Approval Status', 'gravityview'),
120
+				'label' => __( 'Approval Status', 'gravityview' ),
121 121
 				'tag' => '{approval_status}'
122 122
 			),
123 123
 		);
@@ -157,10 +157,10 @@  discard block
 block discarded – undo
157 157
 				do_action( 'gravityview_log_error', __METHOD__ . ': No entry data available. Returning empty string.' );
158 158
 				$replacement = '';
159 159
 			} else {
160
-				$replacement = GravityView_Entry_Approval::get_entry_status( $entry, $match[1] );
160
+				$replacement = GravityView_Entry_Approval::get_entry_status( $entry, $match[ 1 ] );
161 161
 			}
162 162
 
163
-			$return = str_replace( $match[0], $replacement, $return );
163
+			$return = str_replace( $match[ 0 ], $replacement, $return );
164 164
 		}
165 165
 
166 166
 		return $return;
@@ -168,25 +168,25 @@  discard block
 block discarded – undo
168 168
 
169 169
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
170 170
 
171
-		$field_options['approved_label'] = array(
171
+		$field_options[ 'approved_label' ] = array(
172 172
 			'type' => 'text',
173 173
 			'label' => __( 'Approved Label', 'gravityview' ),
174 174
 			'desc' => __( 'If the entry is approved, display this value', 'gravityview' ),
175
-			'placeholder' => GravityView_Entry_Approval_Status::get_label('approved'),
175
+			'placeholder' => GravityView_Entry_Approval_Status::get_label( 'approved' ),
176 176
 		);
177 177
 
178
-		$field_options['disapproved_label'] = array(
178
+		$field_options[ 'disapproved_label' ] = array(
179 179
 			'type' => 'text',
180 180
 			'label' => __( 'Disapproved Label', 'gravityview' ),
181 181
 			'desc' => __( 'If the entry is not approved, display this value', 'gravityview' ),
182
-			'placeholder' => GravityView_Entry_Approval_Status::get_label('disapproved'),
182
+			'placeholder' => GravityView_Entry_Approval_Status::get_label( 'disapproved' ),
183 183
 		);
184 184
 
185
-		$field_options['unapproved_label'] = array(
185
+		$field_options[ 'unapproved_label' ] = array(
186 186
 			'type' => 'text',
187 187
 			'label' => __( 'Unapproved Label', 'gravityview' ),
188 188
 			'desc' => __( 'If the entry has not yet been approved or disapproved, display this value', 'gravityview' ),
189
-			'placeholder' => GravityView_Entry_Approval_Status::get_label('unapproved'),
189
+			'placeholder' => GravityView_Entry_Approval_Status::get_label( 'unapproved' ),
190 190
 		);
191 191
 
192 192
 		return $field_options;
Please login to merge, or discard this patch.