Completed
Pull Request — master (#1388)
by Zack
48:44 queued 28:27
created
includes/extensions/delete-entry/class-delete-entry.php 1 patch
Spacing   +72 added lines, -72 removed lines patch added patch discarded remove patch
@@ -42,12 +42,12 @@  discard block
 block discarded – undo
42 42
 
43 43
 		add_action( 'wp', array( $this, 'process_delete' ), 10000 );
44 44
 
45
-		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field'), 10, 3 );
45
+		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
46 46
 
47 47
 		add_action( 'gravityview_before', array( $this, 'display_message' ) );
48 48
 
49 49
 		// For the Delete Entry Link, you don't want visible to all users.
50
-		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps'), 10, 5 );
50
+		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 );
51 51
 
52 52
 		// Modify the field options based on the name of the field type
53 53
 		add_filter( 'gravityview_template_delete_link_options', array( $this, 'delete_link_field_options' ), 10, 5 );
@@ -55,10 +55,10 @@  discard block
 block discarded – undo
55 55
 		// add template path to check for field
56 56
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
57 57
 
58
-		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button'), 10, 4 );
58
+		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button' ), 10, 4 );
59 59
 
60
-		add_action ( 'gravityview/delete-entry/deleted', array( $this, 'process_connected_posts' ), 10, 2 );
61
-		add_action ( 'gravityview/delete-entry/trashed', array( $this, 'process_connected_posts' ), 10, 2 );
60
+		add_action( 'gravityview/delete-entry/deleted', array( $this, 'process_connected_posts' ), 10, 2 );
61
+		add_action( 'gravityview/delete-entry/trashed', array( $this, 'process_connected_posts' ), 10, 2 );
62 62
 
63 63
 		add_filter( 'gravityview/field/is_visible', array( $this, 'maybe_not_visible' ), 10, 3 );
64 64
 	}
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	 */
72 72
 	static function getInstance() {
73 73
 
74
-		if( empty( self::$instance ) ) {
74
+		if ( empty( self::$instance ) ) {
75 75
 			self::$instance = new self;
76 76
 		}
77 77
 
@@ -151,20 +151,20 @@  discard block
 block discarded – undo
151 151
 	function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
152 152
 
153 153
 		// Always a link, never a filter
154
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
154
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
155 155
 
156 156
 		// Delete Entry link should only appear to visitors capable of editing entries
157
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
157
+		unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
158 158
 
159
-		$add_option['delete_link'] = array(
159
+		$add_option[ 'delete_link' ] = array(
160 160
 			'type' => 'text',
161 161
 			'label' => __( 'Delete Link Text', 'gravityview' ),
162 162
 			'desc' => NULL,
163
-			'value' => __('Delete Entry', 'gravityview'),
163
+			'value' => __( 'Delete Entry', 'gravityview' ),
164 164
 			'merge_tags' => true,
165 165
 		);
166 166
 
167
-		$field_options['allow_edit_cap'] = array(
167
+		$field_options[ 'allow_edit_cap' ] = array(
168 168
 			'type' => 'select',
169 169
 			'label' => __( 'Allow the following users to delete the entry:', 'gravityview' ),
170 170
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -188,8 +188,8 @@  discard block
 block discarded – undo
188 188
 	 */
189 189
 	function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
190 190
 
191
-		if( 'edit' !== $zone ) {
192
-			$entry_default_fields['delete_link'] = array(
191
+		if ( 'edit' !== $zone ) {
192
+			$entry_default_fields[ 'delete_link' ] = array(
193 193
 				'label' => __( 'Delete Entry', 'gravityview' ),
194 194
 				'type'  => 'delete_link',
195 195
 				'desc'  => __( 'A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview' ),
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
 	 */
207 207
 	function add_available_field( $available_fields = array() ) {
208 208
 
209
-		$available_fields['delete_link'] = array(
209
+		$available_fields[ 'delete_link' ] = array(
210 210
 			'label_text' => __( 'Delete Entry', 'gravityview' ),
211 211
 			'field_id' => 'delete_link',
212 212
 			'label_type' => 'field',
@@ -234,12 +234,12 @@  discard block
 block discarded – undo
234 234
 		$caps = $visibility_caps;
235 235
 
236 236
 		// If we're configuring fields in the edit context, we want a limited selection
237
-		if( $field_id === 'delete_link' ) {
237
+		if ( $field_id === 'delete_link' ) {
238 238
 
239 239
 			// Remove other built-in caps.
240
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
240
+			unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] );
241 241
 
242
-			$caps['read'] = _x('Entry Creator', 'User capability', 'gravityview');
242
+			$caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
243 243
 		}
244 244
 
245 245
 		return $caps;
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
 	 * @param [type] $entry [description]
253 253
 	 */
254 254
 	function set_entry( $entry = null ) {
255
-		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[0] : $entry;
255
+		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[ 0 ] : $entry;
256 256
 	}
257 257
 
258 258
 	/**
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
 
286 286
 		self::getInstance()->set_entry( $entry );
287 287
 
288
-        $base = GravityView_API::directory_link( $post_id ? : $view_id, true );
288
+        $base = GravityView_API::directory_link( $post_id ?: $view_id, true );
289 289
 
290 290
 		if ( empty( $base ) ) {
291 291
 			gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) );
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
 		}
294 294
 
295 295
 		// Use the slug instead of the ID for consistent security
296
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
296
+		$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
297 297
 
298 298
 		$actionurl = add_query_arg( array(
299 299
 			'action'	=> 'delete',
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
             'view_id' => $view_id,
303 303
 		), $base );
304 304
 
305
-		$url = wp_nonce_url( $actionurl, 'delete_'.$entry_slug, 'delete' );
305
+		$url = wp_nonce_url( $actionurl, 'delete_' . $entry_slug, 'delete' );
306 306
 
307 307
 		return $url;
308 308
 	}
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 	public function add_delete_button( $form = array(), $entry = array(), $view_id = null, $post_id = null ) {
325 325
 
326 326
 		// Only show the link to those who are allowed to see it.
327
-		if( !self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
327
+		if ( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
328 328
 			return;
329 329
 		}
330 330
 
@@ -335,13 +335,13 @@  discard block
 block discarded – undo
335 335
 		$show_delete_button = apply_filters( 'gravityview/delete-entry/show-delete-button', true );
336 336
 
337 337
 		// If the button is hidden by the filter, don't show.
338
-		if( !$show_delete_button ) {
338
+		if ( ! $show_delete_button ) {
339 339
 			return;
340 340
 		}
341 341
 
342 342
 		$attributes = array(
343 343
 			'class' => 'btn btn-sm button button-small alignright pull-right btn-danger gv-button-delete',
344
-			'tabindex' => ( GFCommon::$tab_index ++ ),
344
+			'tabindex' => ( GFCommon::$tab_index++ ),
345 345
 			'onclick' => self::get_confirm_dialog(),
346 346
 		);
347 347
 
@@ -365,27 +365,27 @@  discard block
 block discarded – undo
365 365
 	function process_delete() {
366 366
 
367 367
 		// If the form is submitted
368
-		if( isset( $_GET['action'] ) && 'delete' === $_GET['action'] && isset( $_GET['entry_id'] ) ) {
368
+		if ( isset( $_GET[ 'action' ] ) && 'delete' === $_GET[ 'action' ] && isset( $_GET[ 'entry_id' ] ) ) {
369 369
 
370 370
 			// Make sure it's a GravityView request
371
-			$valid_nonce_key = wp_verify_nonce( $_GET['delete'], self::get_nonce_key( $_GET['entry_id'] ) );
371
+			$valid_nonce_key = wp_verify_nonce( $_GET[ 'delete' ], self::get_nonce_key( $_GET[ 'entry_id' ] ) );
372 372
 
373
-			if( ! $valid_nonce_key ) {
373
+			if ( ! $valid_nonce_key ) {
374 374
 				gravityview()->log->debug( 'Delete entry not processed: nonce validation failed.' );
375 375
 				return;
376 376
 			}
377 377
 
378 378
 			// Get the entry slug
379
-			$entry_slug = esc_attr( $_GET['entry_id'] );
379
+			$entry_slug = esc_attr( $_GET[ 'entry_id' ] );
380 380
 
381 381
 			// See if there's an entry there
382 382
 			$entry = gravityview_get_entry( $entry_slug, true, false );
383 383
 
384
-			if( $entry ) {
384
+			if ( $entry ) {
385 385
 
386 386
 				$has_permission = $this->user_can_delete_entry( $entry );
387 387
 
388
-				if( is_wp_error( $has_permission ) ) {
388
+				if ( is_wp_error( $has_permission ) ) {
389 389
 
390 390
 					$messages = array(
391 391
 						'message' => urlencode( $has_permission->get_error_message() ),
@@ -397,7 +397,7 @@  discard block
 block discarded – undo
397 397
 					// Delete the entry
398 398
 					$delete_response = $this->delete_or_trash_entry( $entry );
399 399
 
400
-					if( is_wp_error( $delete_response ) ) {
400
+					if ( is_wp_error( $delete_response ) ) {
401 401
 
402 402
 						$messages = array(
403 403
 							'message' => urlencode( $delete_response->get_error_message() ),
@@ -419,7 +419,7 @@  discard block
 block discarded – undo
419 419
 				gravityview()->log->debug( 'Delete entry failed: there was no entry with the entry slug {entry_slug}', array( 'entry_slug' => $entry_slug ) );
420 420
 
421 421
 				$messages = array(
422
-					'message' => urlencode( __('The entry does not exist.', 'gravityview') ),
422
+					'message' => urlencode( __( 'The entry does not exist.', 'gravityview' ) ),
423 423
 					'status' => 'error',
424 424
 				);
425 425
 			}
@@ -459,18 +459,18 @@  discard block
 block discarded – undo
459 459
 	 */
460 460
 	private function delete_or_trash_entry( $entry ) {
461 461
 
462
-		$entry_id = $entry['id'];
462
+		$entry_id = $entry[ 'id' ];
463 463
 		
464 464
 		$mode = $this->get_delete_mode();
465 465
 
466
-		if( 'delete' === $mode ) {
466
+		if ( 'delete' === $mode ) {
467 467
 
468 468
 			gravityview()->log->debug( 'Starting delete entry: {entry_id}', array( 'entry_id' => $entry_id ) );
469 469
 
470 470
 			// Delete the entry
471 471
 			$delete_response = GFAPI::delete_entry( $entry_id );
472 472
 
473
-			if( ! is_wp_error( $delete_response ) ) {
473
+			if ( ! is_wp_error( $delete_response ) ) {
474 474
 				$delete_response = 'deleted';
475 475
 
476 476
 				/**
@@ -491,8 +491,8 @@  discard block
 block discarded – undo
491 491
 			$trashed = GFAPI::update_entry_property( $entry_id, 'status', 'trash' );
492 492
 			new GravityView_Cache;
493 493
 
494
-			if( ! $trashed ) {
495
-				$delete_response = new WP_Error( 'trash_entry_failed', __('Moving the entry to the trash failed.', 'gravityview' ) );
494
+			if ( ! $trashed ) {
495
+				$delete_response = new WP_Error( 'trash_entry_failed', __( 'Moving the entry to the trash failed.', 'gravityview' ) );
496 496
 			} else {
497 497
 
498 498
 				/**
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
523 523
 	public function process_connected_posts( $entry_id = 0, $entry = array() ) {
524 524
 
525 525
 		// The entry had no connected post
526
-		if( empty( $entry['post_id'] ) ) {
526
+		if ( empty( $entry[ 'post_id' ] ) ) {
527 527
 			return;
528 528
 		}
529 529
 
@@ -534,19 +534,19 @@  discard block
 block discarded – undo
534 534
 		 */
535 535
 		$delete_post = apply_filters( 'gravityview/delete-entry/delete-connected-post', true );
536 536
 		
537
-		if( false === $delete_post ) {
537
+		if ( false === $delete_post ) {
538 538
 			return;
539 539
 		}
540 540
 
541 541
 		$action = current_action();
542 542
 
543
-		if( 'gravityview/delete-entry/deleted' === $action ) {
544
-			$result = wp_delete_post( $entry['post_id'], true );
543
+		if ( 'gravityview/delete-entry/deleted' === $action ) {
544
+			$result = wp_delete_post( $entry[ 'post_id' ], true );
545 545
 		} else {
546
-			$result = wp_trash_post( $entry['post_id'] );
546
+			$result = wp_trash_post( $entry[ 'post_id' ] );
547 547
 		}
548 548
 
549
-		if( false === $result ) {
549
+		if ( false === $result ) {
550 550
 			gravityview()->log->error( '(called by {action}): Error processing the Post connected to the entry.', array( 'action' => $action, 'data' => $entry ) );
551 551
 		} else {
552 552
 			gravityview()->log->debug( '(called by {action}): Successfully processed Post connected to the entry.', array( 'action' => $action, 'data' => $entry ) );
@@ -562,13 +562,13 @@  discard block
 block discarded – undo
562 562
 	public function verify_nonce() {
563 563
 
564 564
 		// No delete entry request was made
565
-		if( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) {
565
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) {
566 566
 			return false;
567 567
 		}
568 568
 
569
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
569
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
570 570
 
571
-		$valid = wp_verify_nonce( $_GET['delete'], $nonce_key );
571
+		$valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key );
572 572
 
573 573
 		/**
574 574
 		 * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid.
@@ -590,7 +590,7 @@  discard block
 block discarded – undo
590 590
 	 */
591 591
 	public static function get_confirm_dialog() {
592 592
 
593
-		$confirm = __('Are you sure you want to delete this entry? This cannot be undone.', 'gravityview');
593
+		$confirm = __( 'Are you sure you want to delete this entry? This cannot be undone.', 'gravityview' );
594 594
 
595 595
 		/**
596 596
 		 * @filter `gravityview/delete-entry/confirm-text` Modify the Delete Entry Javascript confirmation text
@@ -598,7 +598,7 @@  discard block
 block discarded – undo
598 598
 		 */
599 599
 		$confirm = apply_filters( 'gravityview/delete-entry/confirm-text', $confirm );
600 600
 
601
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
601
+		return 'return window.confirm(\'' . esc_js( $confirm ) . '\');';
602 602
 	}
603 603
 
604 604
 	/**
@@ -616,16 +616,16 @@  discard block
 block discarded – undo
616 616
 
617 617
 		$error = NULL;
618 618
 
619
-		if( ! $this->verify_nonce() ) {
620
-			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview');
619
+		if ( ! $this->verify_nonce() ) {
620
+			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview' );
621 621
 		}
622 622
 
623
-		if( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
624
-			$error = __( 'You do not have permission to delete this entry.', 'gravityview');
623
+		if ( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
624
+			$error = __( 'You do not have permission to delete this entry.', 'gravityview' );
625 625
 		}
626 626
 
627
-		if( $entry['status'] === 'trash' ) {
628
-			if( 'trash' === $this->get_delete_mode() ) {
627
+		if ( $entry[ 'status' ] === 'trash' ) {
628
+			if ( 'trash' === $this->get_delete_mode() ) {
629 629
 				$error = __( 'The entry is already in the trash.', 'gravityview' );
630 630
 			} else {
631 631
 				$error = __( 'You cannot delete the entry; it is already in the trash.', 'gravityview' );
@@ -633,7 +633,7 @@  discard block
 block discarded – undo
633 633
 		}
634 634
 
635 635
 		// No errors; everything's fine here!
636
-		if( empty( $error ) ) {
636
+		if ( empty( $error ) ) {
637 637
 			return true;
638 638
 		}
639 639
 
@@ -661,17 +661,17 @@  discard block
 block discarded – undo
661 661
 			$view = \GV\View::by_id( $view_id );
662 662
 		} else {
663 663
 			if ( ! $view instanceof \GV\View ) {
664
-				$view = \GV\View::by_id ( $view );
664
+				$view = \GV\View::by_id( $view );
665 665
 			}
666 666
 			$view_id = $view->ID;
667 667
 		}
668 668
 
669 669
 		$current_user = wp_get_current_user();
670 670
 
671
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL;
671
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : NULL;
672 672
 
673 673
 		// Or if they can delete any entries (as defined in Gravity Forms), we're good.
674
-		if( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
674
+		if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
675 675
 
676 676
 			gravityview()->log->debug( 'Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' );
677 677
 
@@ -680,20 +680,20 @@  discard block
 block discarded – undo
680 680
 
681 681
 
682 682
 		// If field options are passed, check if current user can view the link
683
-		if( !empty( $field ) ) {
683
+		if ( ! empty( $field ) ) {
684 684
 
685 685
 			// If capability is not defined, something is not right!
686
-			if( empty( $field['allow_edit_cap'] ) ) {
686
+			if ( empty( $field[ 'allow_edit_cap' ] ) ) {
687 687
 
688 688
 				gravityview()->log->error( 'Cannot read delete entry field caps', array( 'data' => $field ) );
689 689
 
690 690
 				return false;
691 691
 			}
692 692
 
693
-			if( GVCommon::has_cap( $field['allow_edit_cap'] ) ) {
693
+			if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) {
694 694
 
695 695
 				// Do not return true if cap is read, as we need to check if the current user created the entry
696
-				if( $field['allow_edit_cap'] !== 'read' ) {
696
+				if ( $field[ 'allow_edit_cap' ] !== 'read' ) {
697 697
 					return true;
698 698
 				}
699 699
 
@@ -706,9 +706,9 @@  discard block
 block discarded – undo
706 706
 
707 707
 		}
708 708
 
709
-		if( !isset( $entry['created_by'] ) ) {
709
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
710 710
 
711
-			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
711
+			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
712 712
 
713 713
 			return false;
714 714
 		}
@@ -725,7 +725,7 @@  discard block
 block discarded – undo
725 725
 		}
726 726
 
727 727
 		// If the logged-in user is the same as the user who created the entry, we're good.
728
-		if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
728
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
729 729
 
730 730
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
731 731
 
@@ -750,16 +750,16 @@  discard block
 block discarded – undo
750 750
 	 */
751 751
 	public function display_message( $current_view_id = 0 ) {
752 752
 
753
-		if( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
753
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
754 754
 			return;
755 755
 		}
756 756
 
757 757
 		// Entry wasn't deleted from current View
758
-		if( isset( $_GET['view_id'] ) && intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) {
758
+		if ( isset( $_GET[ 'view_id' ] ) && intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) {
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 = '';
@@ -767,14 +767,14 @@  discard block
 block discarded – undo
767 767
 		switch ( $status ) {
768 768
 			case 'error':
769 769
 				$class = ' gv-error error';
770
-				$error_message = __('There was an error deleting the entry: %s', 'gravityview');
770
+				$error_message = __( 'There was an error deleting the entry: %s', 'gravityview' );
771 771
 				$message = sprintf( $error_message, $message_from_url );
772 772
 				break;
773 773
 			case 'trashed':
774
-				$message = __('The entry was successfully moved to the trash.', 'gravityview');
774
+				$message = __( 'The entry was successfully moved to the trash.', 'gravityview' );
775 775
 				break;
776 776
 			default:
777
-				$message = __('The entry was successfully deleted.', 'gravityview');
777
+				$message = __( 'The entry was successfully deleted.', 'gravityview' );
778 778
 				break;
779 779
 		}
780 780
 
@@ -788,7 +788,7 @@  discard block
 block discarded – undo
788 788
 		$message = apply_filters( 'gravityview/delete-entry/message', esc_attr( $message ), $status, $message_from_url );
789 789
 
790 790
 		// DISPLAY ERROR/SUCCESS MESSAGE
791
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
791
+		echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>';
792 792
 	}
793 793
 
794 794
 
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 
37 37
         self::$file = plugin_dir_path( __FILE__ );
38 38
 
39
-        if( is_admin() ) {
39
+        if ( is_admin() ) {
40 40
             $this->load_components( 'admin' );
41 41
         }
42 42
 
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 
58 58
     static function getInstance() {
59 59
 
60
-        if( empty( self::$instance ) ) {
60
+        if ( empty( self::$instance ) ) {
61 61
             self::$instance = new GravityView_Edit_Entry;
62 62
         }
63 63
 
@@ -83,10 +83,10 @@  discard block
 block discarded – undo
83 83
     private function add_hooks() {
84 84
 
85 85
         // Add front-end access to Gravity Forms delete file action
86
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') );
86
+        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file' ) );
87 87
 
88 88
         // Make sure this hook is run for non-admins
89
-        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
89
+        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file' ) );
90 90
 
91 91
         add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
92 92
 
@@ -103,8 +103,8 @@  discard block
 block discarded – undo
103 103
 	 */
104 104
 	private function addon_specific_hooks() {
105 105
 
106
-		if( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
107
-			add_filter('gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script'));
106
+		if ( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
107
+			add_filter( 'gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script' ) );
108 108
 		}
109 109
 
110 110
 	}
@@ -194,15 +194,15 @@  discard block
 block discarded – undo
194 194
      */
195 195
     public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
196 196
 
197
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
197
+        $nonce_key = self::get_nonce_key( $view_id, $entry[ 'form_id' ], $entry[ 'id' ] );
198 198
 
199
-        $base = gv_entry_link( $entry, $post_id ? : $view_id  );
199
+        $base = gv_entry_link( $entry, $post_id ?: $view_id );
200 200
 
201 201
         $url = add_query_arg( array(
202 202
             'edit' => wp_create_nonce( $nonce_key )
203 203
         ), $base );
204 204
 
205
-        if( $post_id ) {
205
+        if ( $post_id ) {
206 206
 	        $url = add_query_arg( array( 'gvid' => $view_id ), $url );
207 207
         }
208 208
 
@@ -210,9 +210,9 @@  discard block
 block discarded – undo
210 210
 	     * Allow passing params to dynamically populate entry with values
211 211
 	     * @since 1.9.2
212 212
 	     */
213
-	    if( !empty( $field_values ) ) {
213
+	    if ( ! empty( $field_values ) ) {
214 214
 
215
-		    if( is_array( $field_values ) ) {
215
+		    if ( is_array( $field_values ) ) {
216 216
 			    // If already an array, no parse_str() needed
217 217
 			    $params = $field_values;
218 218
 		    } else {
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 	 */
234 234
 	public function modify_field_blacklist( $fields = array(), $context = NULL ) {
235 235
 
236
-		if( empty( $context ) || $context !== 'edit' ) {
236
+		if ( empty( $context ) || $context !== 'edit' ) {
237 237
 			return $fields;
238 238
 		}
239 239
 
@@ -311,15 +311,15 @@  discard block
 block discarded – undo
311 311
         // If they can edit any entries (as defined in Gravity Forms)
312 312
         // Or if they can edit other people's entries
313 313
         // Then we're good.
314
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
314
+        if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry[ 'id' ] ) ) {
315 315
 
316 316
             gravityview()->log->debug( 'User has ability to edit all entries.' );
317 317
 
318 318
             $user_can_edit = true;
319 319
 
320
-        } else if( !isset( $entry['created_by'] ) ) {
320
+        } else if ( ! isset( $entry[ 'created_by' ] ) ) {
321 321
 
322
-            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
322
+            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
323 323
 
324 324
             $user_can_edit = false;
325 325
 
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
             $current_user = wp_get_current_user();
330 330
 
331 331
             // User edit is disabled
332
-            if( empty( $user_edit ) ) {
332
+            if ( empty( $user_edit ) ) {
333 333
 
334 334
                 gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
335 335
 
@@ -337,13 +337,13 @@  discard block
 block discarded – undo
337 337
             }
338 338
 
339 339
             // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
340
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
340
+            else if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
341 341
 
342 342
                 gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
343 343
 
344 344
                 $user_can_edit = true;
345 345
 
346
-            } else if( ! is_user_logged_in() ) {
346
+            } else if ( ! is_user_logged_in() ) {
347 347
 
348 348
                 gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
349 349
             }
Please login to merge, or discard this patch.
future/includes/class-gv-shortcode-gvlogic.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -58,13 +58,13 @@  discard block
 block discarded – undo
58 58
 		$value    = $this->get_value( $atts );
59 59
 
60 60
 		if ( false === $operator && is_null( $value ) ) {
61
-			if ( false !== $atts['if'] ) { // Only-if test
62
-				$match = $authed && ! in_array( strtolower( $atts['if'] ), array( '', '0', 'false', 'no' ) );
61
+			if ( false !== $atts[ 'if' ] ) { // Only-if test
62
+				$match = $authed && ! in_array( strtolower( $atts[ 'if' ] ), array( '', '0', 'false', 'no' ) );
63 63
 			} else {
64 64
 				$match = $authed; // Just login test
65 65
 			}
66 66
 		} else { // Regular test
67
-			$match = $authed && \GVCommon::matches_operation( $atts['if'], $value, $operator );
67
+			$match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $value, $operator );
68 68
 		}
69 69
 
70 70
 		$output = $this->get_output( $match, $atts, $content );
@@ -150,8 +150,8 @@  discard block
 block discarded – undo
150 150
 	 * @return string The output.
151 151
 	 */
152 152
 	private function get_output( $match, $atts, $content ) {
153
-		if ( ! $match && ! empty( $atts['else'] ) ) {
154
-			return $atts['else']; // Attributized else is easy :)
153
+		if ( ! $match && ! empty( $atts[ 'else' ] ) ) {
154
+			return $atts[ 'else' ]; // Attributized else is easy :)
155 155
 		}
156 156
 
157 157
 		$if = '';
@@ -278,18 +278,18 @@  discard block
 block discarded – undo
278 278
 		$atts = array_intersect_key( $supplied_atts, $atts );
279 279
 
280 280
 		// Strip whitespace if it's not default false
281
-		if ( isset( $atts['if'] ) && is_string( $atts['if'] ) ) {
282
-			$atts['if'] = trim( $atts['if'] );
281
+		if ( isset( $atts[ 'if' ] ) && is_string( $atts[ 'if' ] ) ) {
282
+			$atts[ 'if' ] = trim( $atts[ 'if' ] );
283 283
 		} else {
284
-			$atts['if'] = false;
284
+			$atts[ 'if' ] = false;
285 285
 		}
286 286
 
287
-		if ( isset( $atts['logged_in'] ) ) {
287
+		if ( isset( $atts[ 'logged_in' ] ) ) {
288 288
 			// Truthy
289
-			if ( in_array( strtolower( $atts['logged_in'] ), array( '0', 'false', 'no' ) ) ) {
290
-				$atts['logged_in'] = false;
289
+			if ( in_array( strtolower( $atts[ 'logged_in' ] ), array( '0', 'false', 'no' ) ) ) {
290
+				$atts[ 'logged_in' ] = false;
291 291
 			} else {
292
-				$atts['logged_in'] = true;
292
+				$atts[ 'logged_in' ] = true;
293 293
 			}
294 294
 		}
295 295
 
Please login to merge, or discard this patch.
includes/class-gravityview-entry-approval.php 1 patch
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -39,13 +39,13 @@  discard block
 block discarded – undo
39 39
 	private function add_hooks() {
40 40
 
41 41
 		// in case entry is edited (on admin or frontend)
42
-		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2);
42
+		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2 );
43 43
 
44 44
 		// when using the User opt-in field, check on entry submission
45 45
 		add_action( 'gform_after_submission', array( $this, 'after_submission' ), 10, 2 );
46 46
 
47 47
 		// process ajax approve entry requests
48
-		add_action('wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved'));
48
+		add_action( 'wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved' ) );
49 49
 
50 50
 		// autounapprove
51 51
 		add_action( 'gravityview/edit_entry/after_update', array( __CLASS__, 'autounapprove' ), 10, 4 );
@@ -94,10 +94,10 @@  discard block
 block discarded – undo
94 94
 			return;
95 95
 		}
96 96
 
97
-		$form = GFAPI::get_form( $entry['form_id'] );
97
+		$form = GFAPI::get_form( $entry[ 'form_id' ] );
98 98
 
99 99
 		if ( ! $form ) {
100
-			gravityview()->log->error( 'Form not found at ID #{form_id} for entry #{entry_id}', array( 'form_id' => $entry['form_id'], 'entry_id' => $entry_id ) );
100
+			gravityview()->log->error( 'Form not found at ID #{form_id} for entry #{entry_id}', array( 'form_id' => $entry[ 'form_id' ], 'entry_id' => $entry_id ) );
101 101
 			return;
102 102
 		}
103 103
 
@@ -114,10 +114,10 @@  discard block
 block discarded – undo
114 114
 	 */
115 115
 	public static function add_approval_notification_events( $notification_events = array(), $form = array() ) {
116 116
 
117
-		$notification_events['gravityview/approve_entries/approved'] = 'GravityView - ' . esc_html_x( 'Entry is approved', 'The title for an event in a notifications drop down list.', 'gravityview' );
118
-		$notification_events['gravityview/approve_entries/disapproved'] = 'GravityView - ' . esc_html_x( 'Entry is disapproved', 'The title for an event in a notifications drop down list.', 'gravityview' );
119
-		$notification_events['gravityview/approve_entries/unapproved'] = 'GravityView - ' . esc_html_x( 'Entry approval is reset', 'The title for an event in a notifications drop down list.', 'gravityview' );
120
-		$notification_events['gravityview/approve_entries/updated'] = 'GravityView - ' . esc_html_x( 'Entry approval is changed', 'The title for an event in a notifications drop down list.', 'gravityview' );
117
+		$notification_events[ 'gravityview/approve_entries/approved' ] = 'GravityView - ' . esc_html_x( 'Entry is approved', 'The title for an event in a notifications drop down list.', 'gravityview' );
118
+		$notification_events[ 'gravityview/approve_entries/disapproved' ] = 'GravityView - ' . esc_html_x( 'Entry is disapproved', 'The title for an event in a notifications drop down list.', 'gravityview' );
119
+		$notification_events[ 'gravityview/approve_entries/unapproved' ] = 'GravityView - ' . esc_html_x( 'Entry approval is reset', 'The title for an event in a notifications drop down list.', 'gravityview' );
120
+		$notification_events[ 'gravityview/approve_entries/updated' ] = 'GravityView - ' . esc_html_x( 'Entry approval is changed', 'The title for an event in a notifications drop down list.', 'gravityview' );
121 121
 
122 122
 		return $notification_events;
123 123
 	}
@@ -135,13 +135,13 @@  discard block
 block discarded – undo
135 135
 	 */
136 136
 	public static function get_entry_status( $entry, $value_or_label = 'label' ) {
137 137
 
138
-		$entry_id = is_array( $entry ) ? $entry['id'] : GVCommon::get_entry_id( $entry, true );
138
+		$entry_id = is_array( $entry ) ? $entry[ 'id' ] : GVCommon::get_entry_id( $entry, true );
139 139
 
140 140
 		$status = gform_get_meta( $entry_id, self::meta_key );
141 141
 
142 142
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
143 143
 
144
-		if( 'value' === $value_or_label ) {
144
+		if ( 'value' === $value_or_label ) {
145 145
 			return $status;
146 146
 		}
147 147
 
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 		$nonce = \GV\Utils::_POST( 'nonce' );
180 180
 
181 181
 		// Valid status
182
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
182
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
183 183
 
184 184
 			gravityview()->log->error( 'Invalid approval status', array( 'data' => $_POST ) );
185 185
 
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
 
211 211
 			gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' );
212 212
 
213
-			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview') );
213
+			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview' ) );
214 214
 
215 215
 		}
216 216
 
@@ -272,10 +272,10 @@  discard block
 block discarded – undo
272 272
 		}
273 273
 
274 274
 		// Set default
275
-		self::update_approved_meta( $entry['id'], $default_status, $entry['form_id'] );
275
+		self::update_approved_meta( $entry[ 'id' ], $default_status, $entry[ 'form_id' ] );
276 276
 
277 277
 		// Then check for if there is an approval column, and use that value instead
278
-		$this->after_update_entry_update_approved_meta( $form , $entry['id'] );
278
+		$this->after_update_entry_update_approved_meta( $form, $entry[ 'id' ] );
279 279
 	}
280 280
 
281 281
 	/**
@@ -289,12 +289,12 @@  discard block
 block discarded – undo
289 289
 	 */
290 290
 	public function after_update_entry_update_approved_meta( $form, $entry_id = NULL ) {
291 291
 
292
-		$approved_column = self::get_approved_column( $form['id'] );
292
+		$approved_column = self::get_approved_column( $form[ 'id' ] );
293 293
 
294 294
 		/**
295 295
 		 * If the form doesn't contain the approve field, don't assume anything.
296 296
 		 */
297
-		if( empty( $approved_column ) ) {
297
+		if ( empty( $approved_column ) ) {
298 298
 			return;
299 299
 		}
300 300
 
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 		 */
317 317
 		$value = apply_filters( 'gravityview/approve_entries/update_unapproved_meta', $value, $form, $entry );
318 318
 
319
-		self::update_approved_meta( $entry_id, $value, $form['id'] );
319
+		self::update_approved_meta( $entry_id, $value, $form[ 'id' ] );
320 320
 	}
321 321
 
322 322
 	/**
@@ -334,12 +334,12 @@  discard block
 block discarded – undo
334 334
 	 */
335 335
 	public static function update_bulk( $entries = array(), $approved = 0, $form_id = 0 ) {
336 336
 
337
-		if( empty($entries) || ( $entries !== true && !is_array($entries) ) ) {
337
+		if ( empty( $entries ) || ( $entries !== true && ! is_array( $entries ) ) ) {
338 338
 			gravityview()->log->error( 'Entries were empty or malformed.', array( 'data' => $entries ) );
339 339
 			return NULL;
340 340
 		}
341 341
 
342
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
342
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
343 343
 			gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' );
344 344
 			return NULL;
345 345
 		}
@@ -354,10 +354,10 @@  discard block
 block discarded – undo
354 354
 		$approved_column_id = self::get_approved_column( $form_id );
355 355
 
356 356
 		$success = true;
357
-		foreach( $entries as $entry_id ) {
357
+		foreach ( $entries as $entry_id ) {
358 358
 			$update_success = self::update_approved( (int)$entry_id, $approved, $form_id, $approved_column_id );
359 359
 
360
-			if( ! $update_success ) {
360
+			if ( ! $update_success ) {
361 361
 				$success = false;
362 362
 			}
363 363
 		}
@@ -381,12 +381,12 @@  discard block
 block discarded – undo
381 381
 	 */
382 382
 	public static function update_approved( $entry_id = 0, $approved = 2, $form_id = 0, $approvedcolumn = 0 ) {
383 383
 
384
-		if( !class_exists( 'GFAPI' ) ) {
384
+		if ( ! class_exists( 'GFAPI' ) ) {
385 385
 			gravityview()->log->error( 'GFAPI does not exist' );
386 386
 			return false;
387 387
 		}
388 388
 
389
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
389
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
390 390
 			gravityview()->log->error( 'Not a valid approval value.' );
391 391
 			return false;
392 392
 		}
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
403 403
 		// If the form has an Approve/Reject field, update that value
404 404
 		$result = self::update_approved_column( $entry_id, $approved, $form_id, $approvedcolumn );
405 405
 
406
-		if( is_wp_error( $result ) ) {
406
+		if ( is_wp_error( $result ) ) {
407 407
 			gravityview()->log->error( 'Entry approval not updated: {error}', array( 'error' => $result->get_error_message() ) );
408 408
 			return false;
409 409
 		}
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
 
416 416
 		// add note to entry if approval field updating worked or there was no approved field
417 417
 		// There's no validation for the meta
418
-		if( true === $result ) {
418
+		if ( true === $result ) {
419 419
 
420 420
 			// Add an entry note
421 421
 			self::add_approval_status_updated_note( $entry_id, $approved );
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
 
469 469
 		$note_id = false;
470 470
 
471
-		if( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
471
+		if ( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
472 472
 
473 473
 			$current_user = wp_get_current_user();
474 474
 
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
490 490
 	 */
491 491
 	private static function update_approved_column( $entry_id = 0, $status = '0', $form_id = 0, $approvedcolumn = 0 ) {
492 492
 
493
-		if( empty( $approvedcolumn ) ) {
493
+		if ( empty( $approvedcolumn ) ) {
494 494
 			$approvedcolumn = self::get_approved_column( $form_id );
495 495
 		}
496 496
 
@@ -513,12 +513,12 @@  discard block
 block discarded – undo
513 513
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
514 514
 
515 515
 		$new_value = '';
516
-		if( GravityView_Entry_Approval_Status::APPROVED === $status ) {
516
+		if ( GravityView_Entry_Approval_Status::APPROVED === $status ) {
517 517
 			$new_value = self::get_approved_column_input_label( $form_id, $approvedcolumn );
518 518
 		}
519 519
 
520 520
 		//update entry
521
-		$entry["{$approvedcolumn}"] = $new_value;
521
+		$entry[ "{$approvedcolumn}" ] = $new_value;
522 522
 
523 523
 		/**
524 524
 		 * Note: GFAPI::update_entry() doesn't trigger `gform_after_update_entry`, so we trigger updating the meta ourselves
@@ -549,12 +549,12 @@  discard block
 block discarded – undo
549 549
 		// If the user has enabled a different value than the label (for some reason), use it.
550 550
 		// This is highly unlikely
551 551
 		if ( is_array( $field->choices ) && ! empty( $field->choices ) ) {
552
-			return isset( $field->choices[0]['value'] ) ? $field->choices[0]['value'] : $field->choices[0]['text'];
552
+			return isset( $field->choices[ 0 ][ 'value' ] ) ? $field->choices[ 0 ][ 'value' ] : $field->choices[ 0 ][ 'text' ];
553 553
 		}
554 554
 
555 555
 		// Otherwise, fall back on the inputs array
556 556
 		if ( is_array( $field->inputs ) && ! empty( $field->inputs ) ) {
557
-			return $field->inputs[0]['label'];
557
+			return $field->inputs[ 0 ][ 'label' ];
558 558
 		}
559 559
 
560 560
 		return null;
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
606 606
 		 * @since 1.18 Added "unapproved"
607 607
 		 * @param  int $entry_id ID of the Gravity Forms entry
608 608
 		 */
609
-		do_action( 'gravityview/approve_entries/' . $action , $entry_id );
609
+		do_action( 'gravityview/approve_entries/' . $action, $entry_id );
610 610
 	}
611 611
 
612 612
 	/**
@@ -619,11 +619,11 @@  discard block
 block discarded – undo
619 619
 	 */
620 620
 	static public function get_approved_column( $form ) {
621 621
 
622
-		if( empty( $form ) ) {
622
+		if ( empty( $form ) ) {
623 623
 			return null;
624 624
 		}
625 625
 
626
-		if( !is_array( $form ) ) {
626
+		if ( ! is_array( $form ) ) {
627 627
 			$form = GVCommon::get_form( $form );
628 628
 		}
629 629
 
@@ -633,22 +633,22 @@  discard block
 block discarded – undo
633 633
 		 * @var string $key
634 634
 		 * @var GF_Field $field
635 635
 		 */
636
-		foreach( $form['fields'] as $key => $field ) {
636
+		foreach ( $form[ 'fields' ] as $key => $field ) {
637 637
 
638 638
 			$inputs = $field->get_entry_inputs();
639 639
 
640
-			if( !empty( $field->gravityview_approved ) ) {
641
-				if ( ! empty( $inputs ) && !empty( $inputs[0]['id'] ) ) {
642
-					$approved_column_id = $inputs[0]['id'];
640
+			if ( ! empty( $field->gravityview_approved ) ) {
641
+				if ( ! empty( $inputs ) && ! empty( $inputs[ 0 ][ 'id' ] ) ) {
642
+					$approved_column_id = $inputs[ 0 ][ 'id' ];
643 643
 					break;
644 644
 				}
645 645
 			}
646 646
 
647 647
 			// Note: This is just for backward compatibility from GF Directory plugin and old GV versions - when using i18n it may not work..
648
-			if( 'checkbox' === $field->type && ! empty( $inputs ) ) {
648
+			if ( 'checkbox' === $field->type && ! empty( $inputs ) ) {
649 649
 				foreach ( $inputs as $input ) {
650
-					if ( 'approved' === strtolower( $input['label'] ) ) {
651
-						$approved_column_id = $input['id'];
650
+					if ( 'approved' === strtolower( $input[ 'label' ] ) ) {
651
+						$approved_column_id = $input[ 'id' ];
652 652
 						break;
653 653
 					}
654 654
 				}
@@ -674,7 +674,7 @@  discard block
 block discarded – undo
674 674
 
675 675
 		$view_keys = array_keys( $gv_data->get_views() );
676 676
 
677
-		$view = \GV\View::by_id( $view_keys[0] );
677
+		$view = \GV\View::by_id( $view_keys[ 0 ] );
678 678
 
679 679
 		if ( ! $view->settings->get( 'unapprove_edit' ) ) {
680 680
 			return;
@@ -699,11 +699,11 @@  discard block
 block discarded – undo
699 699
 			return;
700 700
 		}
701 701
 
702
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
702
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
703 703
 			$approval_status = GravityView_Entry_Approval_Status::UNAPPROVED;
704 704
 		}
705 705
 
706
-		self::update_approved_meta( $entry_id, $approval_status, $form['id'] );
706
+		self::update_approved_meta( $entry_id, $approval_status, $form[ 'id' ] );
707 707
 	}
708 708
 
709 709
 	/**
@@ -741,9 +741,9 @@  discard block
 block discarded – undo
741 741
 		$choices = GravityView_Entry_Approval_Status::get_all();
742 742
 
743 743
 		return <<<TEMPLATE
744
-<a href="#" data-approved="{$choices['approved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-approved popover" title="{$choices['approved']['action']}"><span class="screen-reader-text">{$choices['approved']['action']}</span></a>
745
-<a href="#" data-approved="{$choices['disapproved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-disapproved popover" title="{$choices['disapproved']['action']}"><span class="screen-reader-text">{$choices['disapproved']['action']}</span></a>
746
-<a href="#" data-approved="{$choices['unapproved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-unapproved popover" title="{$choices['unapproved']['action']}"><span class="screen-reader-text">{$choices['unapproved']['action']}</span></a>
744
+<a href="#" data-approved="{$choices[ 'approved' ][ 'value' ]}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-approved popover" title="{$choices[ 'approved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'approved' ][ 'action' ]}</span></a>
745
+<a href="#" data-approved="{$choices[ 'disapproved' ][ 'value' ]}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-disapproved popover" title="{$choices[ 'disapproved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'disapproved' ][ 'action' ]}</span></a>
746
+<a href="#" data-approved="{$choices[ 'unapproved' ][ 'value' ]}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-unapproved popover" title="{$choices[ 'unapproved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'unapproved' ][ 'action' ]}</span></a>
747 747
 TEMPLATE;
748 748
 	}
749 749
 }
Please login to merge, or discard this patch.
includes/extensions/duplicate-entry/class-duplicate-entry.php 1 patch
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -114,13 +114,13 @@  discard block
 block discarded – undo
114 114
 	public function duplicate_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
115 115
 
116 116
 		// Always a link, never a filter, always same window
117
-		unset( $field_options['show_as_link'], $field_options['search_filter'], $field_options['new_window'] );
117
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ], $field_options[ 'new_window' ] );
118 118
 
119 119
 
120 120
 		// Duplicate Entry link should only appear to visitors capable of editing entries
121
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
121
+		unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
122 122
 
123
-		$add_option['duplicate_link'] = array(
123
+		$add_option[ 'duplicate_link' ] = array(
124 124
 			'type' => 'text',
125 125
 			'label' => __( 'Duplicate Link Text', 'gravityview' ),
126 126
 			'desc' => NULL,
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 			'merge_tags' => true,
129 129
 		);
130 130
 
131
-		$field_options['allow_duplicate_cap'] = array(
131
+		$field_options[ 'allow_duplicate_cap' ] = array(
132 132
 			'type' => 'select',
133 133
 			'label' => __( 'Allow the following users to duplicate the entry:', 'gravityview' ),
134 134
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 	public function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
156 156
 
157 157
 		if ( 'edit' !== $zone ) {
158
-			$entry_default_fields['duplicate_link'] = array(
158
+			$entry_default_fields[ 'duplicate_link' ] = array(
159 159
 				'label' => __( 'Duplicate Entry', 'gravityview' ),
160 160
 				'type'  => 'duplicate_link',
161 161
 				'desc'  => __( 'A link to duplicate the entry. Respects the Duplicate Entry permissions.', 'gravityview' ),
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
 	 */
177 177
 	public function add_available_field( $available_fields = array() ) {
178 178
 
179
-		$available_fields['duplicate_link'] = array(
179
+		$available_fields[ 'duplicate_link' ] = array(
180 180
 			'label_text' => __( 'Duplicate Entry', 'gravityview' ),
181 181
 			'field_id' => 'duplicate_link',
182 182
 			'label_type' => 'field',
@@ -209,9 +209,9 @@  discard block
 block discarded – undo
209 209
 		if ( 'duplicate_link' === $field_id ) {
210 210
 
211 211
 			// Remove other built-in caps.
212
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['duplicate_others_posts'] );
212
+			unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'duplicate_others_posts' ] );
213 213
 
214
-			$caps['read'] = _x( 'Entry Creator', 'User capability', 'gravityview' );
214
+			$caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
215 215
 		}
216 216
 
217 217
 		return $caps;
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 	public static function get_duplicate_link( $entry, $view_id, $post_id = null ) {
261 261
 		self::getInstance()->set_entry( $entry );
262 262
 
263
-        $base = GravityView_API::directory_link( $post_id ? : $view_id, true );
263
+        $base = GravityView_API::directory_link( $post_id ?: $view_id, true );
264 264
 
265 265
 		if ( empty( $base ) ) {
266 266
 			gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) );
@@ -269,12 +269,12 @@  discard block
 block discarded – undo
269 269
 
270 270
 		$actionurl = add_query_arg( array(
271 271
 			'action'	=> 'duplicate',
272
-			'entry_id'	=> $entry['id'],
272
+			'entry_id'	=> $entry[ 'id' ],
273 273
 			'gvid' => $view_id,
274 274
             'view_id' => $view_id,
275 275
 		), $base );
276 276
 
277
-		return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry['id'] ) ), $actionurl );
277
+		return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry[ 'id' ] ) ), $actionurl );
278 278
 	}
279 279
 
280 280
 	/**
@@ -295,12 +295,12 @@  discard block
 block discarded – undo
295 295
 	public function process_duplicate() {
296 296
 
297 297
 		// If the form is submitted
298
-		if ( ! isset( $_GET['action'] ) || 'duplicate' !== $_GET['action'] || ! isset( $_GET['entry_id'] ) ) {
298
+		if ( ! isset( $_GET[ 'action' ] ) || 'duplicate' !== $_GET[ 'action' ] || ! isset( $_GET[ 'entry_id' ] ) ) {
299 299
 			return;
300 300
 		}
301 301
 
302 302
 		// Make sure it's a GravityView request
303
-		$valid_nonce_key = wp_verify_nonce( \GV\Utils::_GET( 'duplicate' ), self::get_nonce_key( $_GET['entry_id'] ) );
303
+		$valid_nonce_key = wp_verify_nonce( \GV\Utils::_GET( 'duplicate' ), self::get_nonce_key( $_GET[ 'entry_id' ] ) );
304 304
 
305 305
 		if ( ! $valid_nonce_key ) {
306 306
 			gravityview()->log->debug( 'Duplicate entry not processed: nonce validation failed.' );
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
 		}
309 309
 
310 310
 		// Get the entry slug
311
-		$entry_slug = esc_attr( $_GET['entry_id'] );
311
+		$entry_slug = esc_attr( $_GET[ 'entry_id' ] );
312 312
 
313 313
 		// See if there's an entry there
314 314
 		$entry = gravityview_get_entry( $entry_slug, true, false );
@@ -402,15 +402,15 @@  discard block
 block discarded – undo
402 402
 			return new WP_Error( 'gravityview-duplicate-entry-missing', __( 'The entry does not exist.', 'gravityview' ) );
403 403
 		}
404 404
 
405
-		$row['id'] = null;
406
-		$row['date_created'] = date( 'Y-m-d H:i:s', time() );
407
-		$row['date_updated'] = $row['date_created'];
408
-		$row['is_starred'] = false;
409
-		$row['is_read'] = false;
410
-		$row['ip'] = GFFormsModel::get_ip();
411
-		$row['source_url'] = esc_url_raw( remove_query_arg( array( 'action', 'gvid' ) ) );
412
-		$row['user_agent'] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' );
413
-		$row['created_by'] = wp_get_current_user()->ID;
405
+		$row[ 'id' ] = null;
406
+		$row[ 'date_created' ] = date( 'Y-m-d H:i:s', time() );
407
+		$row[ 'date_updated' ] = $row[ 'date_created' ];
408
+		$row[ 'is_starred' ] = false;
409
+		$row[ 'is_read' ] = false;
410
+		$row[ 'ip' ] = GFFormsModel::get_ip();
411
+		$row[ 'source_url' ] = esc_url_raw( remove_query_arg( array( 'action', 'gvid' ) ) );
412
+		$row[ 'user_agent' ] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' );
413
+		$row[ 'created_by' ] = wp_get_current_user()->ID;
414 414
 
415 415
 		/**
416 416
 		 * @filter `gravityview/entry/duplicate/details` Modify the new entry details before it's created.
@@ -438,15 +438,15 @@  discard block
 block discarded – undo
438 438
 
439 439
 		$save_this_meta = array();
440 440
 		foreach ( $duplicate_meta->get_output() as $m ) {
441
-			$save_this_meta[] = array(
442
-				'meta_key' => $m['meta_key'],
443
-				'meta_value' => $m['meta_value'],
444
-				'item_index' => $m['item_index'],
441
+			$save_this_meta[ ] = array(
442
+				'meta_key' => $m[ 'meta_key' ],
443
+				'meta_value' => $m[ 'meta_value' ],
444
+				'item_index' => $m[ 'item_index' ],
445 445
 			);
446 446
 		}
447 447
 
448 448
 		// Update the row ID for later usage
449
-		$row['id'] = $duplicated_id;
449
+		$row[ 'id' ] = $duplicated_id;
450 450
 
451 451
 		/**
452 452
 		 * @filter `gravityview/entry/duplicate/meta` Modify the new entry meta details.
@@ -457,8 +457,8 @@  discard block
 block discarded – undo
457 457
 		$save_this_meta = apply_filters( 'gravityview/entry/duplicate/meta', $save_this_meta, $row, $entry );
458 458
 
459 459
 		foreach ( $save_this_meta as $data ) {
460
-			$data['form_id'] = $entry['form_id'];
461
-			$data['entry_id'] = $duplicated_id;
460
+			$data[ 'form_id' ] = $entry[ 'form_id' ];
461
+			$data[ 'entry_id' ] = $duplicated_id;
462 462
 
463 463
 			if ( ! $wpdb->insert( $entry_meta_table, $data ) ) {
464 464
 				return new WP_Error( 'gravityview-duplicate-entry-db-meta', __( 'There was an error duplicating the entry.', 'gravityview' ) );
@@ -492,13 +492,13 @@  discard block
 block discarded – undo
492 492
 	public function verify_nonce() {
493 493
 
494 494
 		// No duplicate entry request was made
495
-		if ( empty( $_GET['entry_id'] ) || empty( $_GET['duplicate'] ) ) {
495
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'duplicate' ] ) ) {
496 496
 			return false;
497 497
 		}
498 498
 
499
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
499
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
500 500
 
501
-		$valid = wp_verify_nonce( $_GET['duplicate'], $nonce_key );
501
+		$valid = wp_verify_nonce( $_GET[ 'duplicate' ], $nonce_key );
502 502
 
503 503
 		/**
504 504
 		 * @filter `gravityview/duplicate-entry/verify_nonce` Override Duplicate Entry nonce validation. Return true to declare nonce valid.
@@ -534,7 +534,7 @@  discard block
 block discarded – undo
534 534
 			return '';
535 535
 		}
536 536
 
537
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
537
+		return 'return window.confirm(\'' . esc_js( $confirm ) . '\');';
538 538
 	}
539 539
 
540 540
 	/**
@@ -588,7 +588,7 @@  discard block
 block discarded – undo
588 588
 	public static function check_user_cap_duplicate_entry( $entry, $field = array(), $view_id = 0 ) {
589 589
 		$current_user = wp_get_current_user();
590 590
 
591
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL;
591
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : NULL;
592 592
 
593 593
 		// Or if they can duplicate any entries (as defined in Gravity Forms), we're good.
594 594
 		if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gform_full_access', 'gravityview_full_access' ), $entry_id ) ) {
@@ -603,17 +603,17 @@  discard block
 block discarded – undo
603 603
 		if ( ! empty( $field ) ) {
604 604
 
605 605
 			// If capability is not defined, something is not right!
606
-			if ( empty( $field['allow_duplicate_cap'] ) ) {
606
+			if ( empty( $field[ 'allow_duplicate_cap' ] ) ) {
607 607
 
608 608
 				gravityview()->log->error( 'Cannot read duplicate entry field caps', array( 'data' => $field ) );
609 609
 
610 610
 				return false;
611 611
 			}
612 612
 
613
-			if ( GVCommon::has_cap( $field['allow_duplicate_cap'] ) ) {
613
+			if ( GVCommon::has_cap( $field[ 'allow_duplicate_cap' ] ) ) {
614 614
 
615 615
 				// Do not return true if cap is read, as we need to check if the current user created the entry
616
-				if ( 'read' !== $field['allow_duplicate_cap'] ) {
616
+				if ( 'read' !== $field[ 'allow_duplicate_cap' ] ) {
617 617
 					return true;
618 618
 				}
619 619
 
@@ -626,7 +626,7 @@  discard block
 block discarded – undo
626 626
 
627 627
 		}
628 628
 
629
-		if ( ! isset( $entry['created_by'] ) ) {
629
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
630 630
 
631 631
 			gravityview()->log->error( 'Cannot duplicate entry; entry `created_by` doesn\'t exist.' );
632 632
 
@@ -651,7 +651,7 @@  discard block
 block discarded – undo
651 651
 		}
652 652
 
653 653
 		// If the logged-in user is the same as the user who created the entry, we're good.
654
-		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
654
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
655 655
 
656 656
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
657 657
 
@@ -676,16 +676,16 @@  discard block
 block discarded – undo
676 676
 	 */
677 677
 	public function display_message( $current_view_id = 0 ) {
678 678
 
679
-		if ( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
679
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
680 680
 			return;
681 681
 		}
682 682
 
683 683
 		// Entry wasn't duplicated from current View
684
-		if ( isset( $_GET['view_id'] ) && ( intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) ) {
684
+		if ( isset( $_GET[ 'view_id' ] ) && ( intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) ) {
685 685
 			return;
686 686
 		}
687 687
 
688
-		$status = esc_attr( $_GET['status'] );
688
+		$status = esc_attr( $_GET[ 'status' ] );
689 689
 		$message_from_url = \GV\Utils::_GET( 'message' );
690 690
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
691 691
 		$class = '';
@@ -711,7 +711,7 @@  discard block
 block discarded – undo
711 711
 		$message = apply_filters( 'gravityview/duplicate-entry/message', esc_attr( $message ), $status, $message_from_url );
712 712
 
713 713
 		// DISPLAY ERROR/SUCCESS MESSAGE
714
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
714
+		echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>';
715 715
 	}
716 716
 
717 717
 
Please login to merge, or discard this patch.
includes/extensions/entry-notes/fields/notes.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -9,9 +9,9 @@  discard block
 block discarded – undo
9 9
 $gravityview_view = GravityView_View::getInstance();
10 10
 
11 11
 $visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' );
12
-$show_notes_logged_out = ( ! empty( $visibility_settings['view'] ) && ! empty( $visibility_settings['view_loggedout'] ) );
12
+$show_notes_logged_out = ( ! empty( $visibility_settings[ 'view' ] ) && ! empty( $visibility_settings[ 'view_loggedout' ] ) );
13 13
 
14
-if(	! GVCommon::has_cap( array( 'gravityview_view_entry_notes', 'gravityview_add_entry_notes', 'gravityview_delete_entry_notes' ) ) && ! $show_notes_logged_out ) {
14
+if ( ! GVCommon::has_cap( array( 'gravityview_view_entry_notes', 'gravityview_add_entry_notes', 'gravityview_delete_entry_notes' ) ) && ! $show_notes_logged_out ) {
15 15
 	return;
16 16
 }
17 17
 
@@ -25,20 +25,20 @@  discard block
 block discarded – undo
25 25
 do_action( 'gravityview/field/notes/scripts' );
26 26
 
27 27
 $entry      = $gravityview_view->getCurrentEntry();
28
-$notes      = (array) GravityView_Entry_Notes::get_notes( $entry['id'] );
28
+$notes      = (array)GravityView_Entry_Notes::get_notes( $entry[ 'id' ] );
29 29
 $strings    = GravityView_Field_Notes::strings();
30
-$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
30
+$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
31 31
 
32
-$show_add = ! empty( $visibility_settings['add'] );
33
-$show_delete = ( ! empty( $visibility_settings['delete'] ) && GVCommon::has_cap( 'gravityview_delete_entry_notes' ) );
34
-$show_notes = $show_notes_logged_out || ( ! empty( $visibility_settings['view'] ) && GVCommon::has_cap( 'gravityview_view_entry_notes' ) );
32
+$show_add = ! empty( $visibility_settings[ 'add' ] );
33
+$show_delete = ( ! empty( $visibility_settings[ 'delete' ] ) && GVCommon::has_cap( 'gravityview_delete_entry_notes' ) );
34
+$show_notes = $show_notes_logged_out || ( ! empty( $visibility_settings[ 'view' ] ) && GVCommon::has_cap( 'gravityview_view_entry_notes' ) );
35 35
 
36 36
 $container_class = ( sizeof( $notes ) > 0 ? 'gv-has-notes' : 'gv-no-notes' );
37 37
 $container_class .= $show_notes ? ' gv-show-notes' : ' gv-hide-notes';
38 38
 ?>
39 39
 <div class="gv-notes <?php echo $container_class; ?>">
40 40
 <?php
41
-	if( $show_notes ) {
41
+	if ( $show_notes ) {
42 42
 ?>
43 43
 	<form method="post" class="gv-notes-list">
44 44
 		<?php if ( $show_delete ) { wp_nonce_field( 'gv_delete_notes_' . $entry_slug, 'gv_delete_notes' ); } ?>
@@ -46,21 +46,21 @@  discard block
 block discarded – undo
46 46
 			<input type="hidden" name="action" value="gv_delete_notes" />
47 47
 			<input type="hidden" name="entry-slug" value="<?php echo esc_attr( $entry_slug ); ?>" />
48 48
 			<table>
49
-				<caption><?php echo $strings['caption']; ?></caption>
49
+				<caption><?php echo $strings[ 'caption' ]; ?></caption>
50 50
 				<?php
51 51
 				if ( $show_delete ) {
52 52
 				?>
53 53
 				<thead>
54 54
 					<tr>
55 55
 						<th colspan="2">
56
-							<label><input type="checkbox" value="" class="gv-notes-toggle" title="<?php echo $strings['toggle-notes']; ?>"><span class="screen-reader-text"><?php echo $strings['toggle-notes']; ?></span></label>
57
-							<button type="submit" class="button button-small gv-notes-delete"><?php echo $strings['delete']; ?></button>
56
+							<label><input type="checkbox" value="" class="gv-notes-toggle" title="<?php echo $strings[ 'toggle-notes' ]; ?>"><span class="screen-reader-text"><?php echo $strings[ 'toggle-notes' ]; ?></span></label>
57
+							<button type="submit" class="button button-small gv-notes-delete"><?php echo $strings[ 'delete' ]; ?></button>
58 58
 						</th>
59 59
 					</tr>
60 60
 				</thead>
61 61
 				<?php } ?>
62 62
 				<tbody>
63
-					<tr class="gv-notes-no-notes"><td colspan="2"><?php echo $strings['no-notes']; ?></td></tr>
63
+					<tr class="gv-notes-no-notes"><td colspan="2"><?php echo $strings[ 'no-notes' ]; ?></td></tr>
64 64
 					<?php
65 65
 						foreach ( $notes as $note ) {
66 66
 							echo GravityView_Field_Notes::display_note( $note, $show_delete );
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 <?php
74 74
 	} // End if can view notes
75 75
 
76
-	if( $show_add ) {
76
+	if ( $show_add ) {
77 77
 		echo do_shortcode( '[gv_note_add]' );
78 78
 	}
79 79
 ?>
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry-render.php 1 patch
Spacing   +242 added lines, -242 removed lines patch added patch discarded remove patch
@@ -135,16 +135,16 @@  discard block
 block discarded – undo
135 135
 	function load() {
136 136
 
137 137
 		/** @define "GRAVITYVIEW_DIR" "../../../" */
138
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
138
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' );
139 139
 
140 140
 		// Don't display an embedded form when editing an entry
141 141
 		add_action( 'wp_head', array( $this, 'prevent_render_form' ) );
142 142
 		add_action( 'wp_footer', array( $this, 'prevent_render_form' ) );
143 143
 
144 144
 		// Stop Gravity Forms processing what is ours!
145
-		add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 );
145
+		add_filter( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 );
146 146
 
147
-		add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') );
147
+		add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) );
148 148
 
149 149
 		add_action( 'gravityview_edit_entry', array( $this, 'init' ), 10, 4 );
150 150
 
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 		add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 );
156 156
 
157 157
 		// Add fields expected by GFFormDisplay::validate()
158
-		add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') );
158
+		add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) );
159 159
 
160 160
 		// Fix multiselect value for GF 2.2
161 161
 		add_filter( 'gravityview/edit_entry/field_value_multiselect', array( $this, 'fix_multiselect_value_serialization' ), 10, 3 );
@@ -172,8 +172,8 @@  discard block
 block discarded – undo
172 172
 	 * @return void
173 173
 	 */
174 174
 	public function prevent_render_form() {
175
-		if( $this->is_edit_entry() ) {
176
-			if( 'wp_head' === current_filter() ) {
175
+		if ( $this->is_edit_entry() ) {
176
+			if ( 'wp_head' === current_filter() ) {
177 177
 				add_filter( 'gform_shortcode_form', '__return_empty_string' );
178 178
 			} else {
179 179
 				remove_filter( 'gform_shortcode_form', '__return_empty_string' );
@@ -188,14 +188,14 @@  discard block
 block discarded – undo
188 188
 	 */
189 189
 	public function prevent_maybe_process_form() {
190 190
 
191
-	    if( ! $this->is_edit_entry_submission() ) {
191
+	    if ( ! $this->is_edit_entry_submission() ) {
192 192
 			return;
193 193
 		}
194 194
 
195 195
 		gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] Removing GFForms::maybe_process_form() action.' );
196 196
 
197
-		remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
198
-		remove_action( 'wp',  array( 'GFForms', 'maybe_process_form'), 9 );
197
+		remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 );
198
+		remove_action( 'wp', array( 'GFForms', 'maybe_process_form' ), 9 );
199 199
 	}
200 200
 
201 201
 	/**
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
 	 */
205 205
 	public function is_edit_entry() {
206 206
 
207
-		$is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET['edit'] );
207
+		$is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET[ 'edit' ] );
208 208
 
209 209
 		return ( $is_edit_entry || $this->is_edit_entry_submission() );
210 210
 	}
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 	 * @return boolean
216 216
 	 */
217 217
 	public function is_edit_entry_submission() {
218
-		return !empty( $_POST[ self::$nonce_field ] );
218
+		return ! empty( $_POST[ self::$nonce_field ] );
219 219
 	}
220 220
 
221 221
 	/**
@@ -228,16 +228,16 @@  discard block
 block discarded – undo
228 228
 
229 229
 
230 230
 		$entries = $gravityview_view->getEntries();
231
-	    self::$original_entry = $entries[0];
232
-	    $this->entry = $entries[0];
231
+	    self::$original_entry = $entries[ 0 ];
232
+	    $this->entry = $entries[ 0 ];
233 233
 
234 234
 		self::$original_form = $gravityview_view->getForm();
235 235
 		$this->form = $gravityview_view->getForm();
236
-		$this->form_id = $this->entry['form_id'];
236
+		$this->form_id = $this->entry[ 'form_id' ];
237 237
 		$this->view_id = $gravityview_view->getViewId();
238 238
 		$this->post_id = \GV\Utils::get( $post, 'ID', null );
239 239
 
240
-		self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] );
240
+		self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] );
241 241
 	}
242 242
 
243 243
 
@@ -296,9 +296,9 @@  discard block
 block discarded – undo
296 296
 	private function print_scripts() {
297 297
 		$gravityview_view = GravityView_View::getInstance();
298 298
 
299
-		wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
299
+		wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
300 300
 
301
-		GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false);
301
+		GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false );
302 302
 
303 303
 		wp_localize_script( 'gravityview-fe-view', 'gvGlobals', array( 'cookiepath' => COOKIEPATH ) );
304 304
 
@@ -314,19 +314,19 @@  discard block
 block discarded – undo
314 314
 	 */
315 315
 	private function process_save( $gv_data ) {
316 316
 
317
-		if ( empty( $_POST ) || ! isset( $_POST['lid'] ) ) {
317
+		if ( empty( $_POST ) || ! isset( $_POST[ 'lid' ] ) ) {
318 318
 			return;
319 319
 		}
320 320
 
321 321
 		// Make sure the entry, view, and form IDs are all correct
322 322
 		$valid = $this->verify_nonce();
323 323
 
324
-		if ( !$valid ) {
324
+		if ( ! $valid ) {
325 325
 			gravityview()->log->error( 'Nonce validation failed.' );
326 326
 			return;
327 327
 		}
328 328
 
329
-		if ( $this->entry['id'] !== $_POST['lid'] ) {
329
+		if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) {
330 330
 			gravityview()->log->error( 'Entry ID did not match posted entry ID.' );
331 331
 			return;
332 332
 		}
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
 
338 338
 		$this->validate();
339 339
 
340
-		if( $this->is_valid ) {
340
+		if ( $this->is_valid ) {
341 341
 
342 342
 			gravityview()->log->debug( 'Submission is valid.' );
343 343
 
@@ -349,15 +349,15 @@  discard block
 block discarded – undo
349 349
 			/**
350 350
 			 * @hack to avoid the capability validation of the method save_lead for GF 1.9+
351 351
 			 */
352
-			unset( $_GET['page'] );
352
+			unset( $_GET[ 'page' ] );
353 353
 
354
-			$date_created = $this->entry['date_created'];
354
+			$date_created = $this->entry[ 'date_created' ];
355 355
 
356 356
 			/**
357 357
 			 * @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead()
358 358
 			 * @since 1.17.2
359 359
 			 */
360
-			unset( $this->entry['date_created'] );
360
+			unset( $this->entry[ 'date_created' ] );
361 361
 
362 362
 			/**
363 363
 			 * @action `gravityview/edit_entry/before_update` Perform an action after the entry has been updated using Edit Entry
@@ -367,14 +367,14 @@  discard block
 block discarded – undo
367 367
 			 * @param GravityView_Edit_Entry_Render $this This object
368 368
 			 * @param GravityView_View_Data $gv_data The View data
369 369
 			 */
370
-			do_action( 'gravityview/edit_entry/before_update', $form, $this->entry['id'], $this, $gv_data );
370
+			do_action( 'gravityview/edit_entry/before_update', $form, $this->entry[ 'id' ], $this, $gv_data );
371 371
 
372 372
 			GFFormsModel::save_lead( $form, $this->entry );
373 373
 
374 374
 	        // Delete the values for hidden inputs
375 375
 	        $this->unset_hidden_field_values();
376 376
 
377
-			$this->entry['date_created'] = $date_created;
377
+			$this->entry[ 'date_created' ] = $date_created;
378 378
 
379 379
 			// Process calculation fields
380 380
 			$this->update_calculation_fields();
@@ -399,7 +399,7 @@  discard block
 block discarded – undo
399 399
 			 * @param GravityView_Edit_Entry_Render $this This object
400 400
 			 * @param GravityView_View_Data $gv_data The View data
401 401
 			 */
402
-			do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this, $gv_data );
402
+			do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this, $gv_data );
403 403
 
404 404
 		} else {
405 405
 			gravityview()->log->error( 'Submission is NOT valid.', array( 'entry' => $this->entry ) );
@@ -435,10 +435,10 @@  discard block
 block discarded – undo
435 435
 
436 436
 		if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) {
437 437
 			$entry_meta_table = GFFormsModel::get_entry_meta_table_name();
438
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) );
438
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry[ 'id' ] ) );
439 439
 		} else {
440 440
 			$lead_detail_table = GFFormsModel::get_lead_details_table_name();
441
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) );
441
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) );
442 442
 		}
443 443
 
444 444
 	    foreach ( $this->entry as $input_id => $field_value ) {
@@ -456,11 +456,11 @@  discard block
 block discarded – undo
456 456
 
457 457
 				$empty_value = $field->get_value_save_entry(
458 458
 					is_array( $field->get_entry_inputs() ) ? array() : '',
459
-					$this->form, '', $this->entry['id'], $this->entry
459
+					$this->form, '', $this->entry[ 'id' ], $this->entry
460 460
 				);
461 461
 
462 462
 				if ( $field->has_calculation() ) {
463
-					$this->unset_hidden_calculations[] = $field->id; // Unset
463
+					$this->unset_hidden_calculations[ ] = $field->id; // Unset
464 464
 					$empty_value = '';
465 465
 				}
466 466
 
@@ -489,7 +489,7 @@  discard block
 block discarded – undo
489 489
 	private function preset_approval_fields() {
490 490
 		$has_approved_field = false;
491 491
 
492
-		foreach ( self::$original_form['fields'] as $field ) {
492
+		foreach ( self::$original_form[ 'fields' ] as $field ) {
493 493
 			if ( $field->gravityview_approved ) {
494 494
 				$has_approved_field = true;
495 495
 				break;
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
 
503 503
 		$is_field_hidden = true;
504 504
 
505
-		foreach ( $this->form['fields'] as $field ) {
505
+		foreach ( $this->form[ 'fields' ] as $field ) {
506 506
 			if ( $field->gravityview_approved ) {
507 507
 				$is_field_hidden = false;
508 508
 				break;
@@ -527,7 +527,7 @@  discard block
 block discarded – undo
527 527
 
528 528
 		remove_filter( 'gravityview/approve_entries/update_unapproved_meta', array( $this, 'prevent_update_unapproved_meta' ), 9 );
529 529
 
530
-		if ( ! $value = gform_get_meta( $entry['id'], 'is_approved' ) ) {
530
+		if ( ! $value = gform_get_meta( $entry[ 'id' ], 'is_approved' ) ) {
531 531
 
532 532
 			$value = GravityView_Entry_Approval_Status::UNAPPROVED;
533 533
 
@@ -592,7 +592,7 @@  discard block
 block discarded – undo
592 592
 		}
593 593
 
594 594
 		/** No file is being uploaded. */
595
-		if ( empty( $_FILES[ $input_name ]['name'] ) ) {
595
+		if ( empty( $_FILES[ $input_name ][ 'name' ] ) ) {
596 596
 			/** So return the original upload, with $value as backup (it can be empty during edit form rendering) */
597 597
 			return rgar( $entry, $input_id, $value );
598 598
 		}
@@ -610,11 +610,11 @@  discard block
 block discarded – undo
610 610
 	 * @return mixed
611 611
 	 */
612 612
 	public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) {
613
-		if( ! $this->is_edit_entry() ) {
613
+		if ( ! $this->is_edit_entry() ) {
614 614
 			return $plupload_init;
615 615
 		}
616 616
 
617
-		$plupload_init['gf_vars']['max_files'] = 0;
617
+		$plupload_init[ 'gf_vars' ][ 'max_files' ] = 0;
618 618
 
619 619
 		return $plupload_init;
620 620
 	}
@@ -629,27 +629,27 @@  discard block
 block discarded – undo
629 629
 		$form = $this->filter_conditional_logic( $this->form );
630 630
 
631 631
 	    /** @var GF_Field $field */
632
-		foreach( $form['fields'] as $k => &$field ) {
632
+		foreach ( $form[ 'fields' ] as $k => &$field ) {
633 633
 
634 634
 			/**
635 635
 			 * Remove the fields with calculation formulas before save to avoid conflicts with GF logic
636 636
 			 * @since 1.16.3
637 637
 			 * @var GF_Field $field
638 638
 			 */
639
-			if( $field->has_calculation() ) {
640
-				unset( $form['fields'][ $k ] );
639
+			if ( $field->has_calculation() ) {
640
+				unset( $form[ 'fields' ][ $k ] );
641 641
 			}
642 642
 
643 643
 			$field->adminOnly = false;
644 644
 
645
-			if( isset( $field->inputs ) && is_array( $field->inputs ) ) {
646
-				foreach( $field->inputs as $key => $input ) {
647
-				    $field->inputs[ $key ][ 'id' ] = (string)$input['id'];
645
+			if ( isset( $field->inputs ) && is_array( $field->inputs ) ) {
646
+				foreach ( $field->inputs as $key => $input ) {
647
+				    $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ];
648 648
 				}
649 649
 			}
650 650
 		}
651 651
 
652
-		$form['fields'] = array_values( $form['fields'] );
652
+		$form[ 'fields' ] = array_values( $form[ 'fields' ] );
653 653
 
654 654
 		return $form;
655 655
 	}
@@ -661,14 +661,14 @@  discard block
 block discarded – undo
661 661
 		$update = false;
662 662
 
663 663
 		// get the most up to date entry values
664
-		$entry = GFAPI::get_entry( $this->entry['id'] );
664
+		$entry = GFAPI::get_entry( $this->entry[ 'id' ] );
665 665
 
666 666
 		if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) {
667 667
 			$entry_meta_table = GFFormsModel::get_entry_meta_table_name();
668
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry['id'] ) );
668
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry[ 'id' ] ) );
669 669
 		} else {
670 670
 			$lead_detail_table = GFFormsModel::get_lead_details_table_name();
671
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry['id'] ) );
671
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry[ 'id' ] ) );
672 672
 		}
673 673
 
674 674
 
@@ -685,24 +685,24 @@  discard block
 block discarded – undo
685 685
 				$inputs = $field->get_entry_inputs();
686 686
 				if ( is_array( $inputs ) ) {
687 687
 				    foreach ( $inputs as $input ) {
688
-						list( $field_id, $input_id ) = rgexplode( '.', $input['id'], 2 );
688
+						list( $field_id, $input_id ) = rgexplode( '.', $input[ 'id' ], 2 );
689 689
 
690 690
 						if ( 'product' === $field->type ) {
691
-							$input_name = 'input_' . str_replace( '.', '_', $input['id'] );
691
+							$input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] );
692 692
 
693 693
 							// Only allow quantity to be set if it's allowed to be edited
694 694
 							if ( in_array( $field_id, $allowed_fields ) && $input_id == 3 ) {
695 695
 							} else { // otherwise set to what it previously was
696
-								$_POST[ $input_name ] = $entry[ $input['id'] ];
696
+								$_POST[ $input_name ] = $entry[ $input[ 'id' ] ];
697 697
 							}
698 698
 						} else {
699 699
 							// Set to what it previously was if it's not editable
700 700
 							if ( ! in_array( $field_id, $allowed_fields ) ) {
701
-								$_POST[ $input_name ] = $entry[ $input['id'] ];
701
+								$_POST[ $input_name ] = $entry[ $input[ 'id' ] ];
702 702
 							}
703 703
 						}
704 704
 
705
-						GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] );
705
+						GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input[ 'id' ] );
706 706
 				    }
707 707
 				} else {
708 708
 					// Set to what it previously was if it's not editable
@@ -742,19 +742,19 @@  discard block
 block discarded – undo
742 742
 
743 743
 		$input_name = 'input_' . $field_id;
744 744
 
745
-		if ( !empty( $_FILES[ $input_name ]['name'] ) ) {
745
+		if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) {
746 746
 
747 747
 			// We have a new image
748 748
 
749
-			$value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] );
749
+			$value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] );
750 750
 
751 751
 			$ary = ! empty( $value ) ? explode( '|:|', $value ) : array();
752 752
 	        $ary = stripslashes_deep( $ary );
753 753
 			$img_url = \GV\Utils::get( $ary, 0 );
754 754
 
755
-			$img_title       = count( $ary ) > 1 ? $ary[1] : '';
756
-			$img_caption     = count( $ary ) > 2 ? $ary[2] : '';
757
-			$img_description = count( $ary ) > 3 ? $ary[3] : '';
755
+			$img_title       = count( $ary ) > 1 ? $ary[ 1 ] : '';
756
+			$img_caption     = count( $ary ) > 2 ? $ary[ 2 ] : '';
757
+			$img_description = count( $ary ) > 3 ? $ary[ 3 ] : '';
758 758
 
759 759
 			$image_meta = array(
760 760
 				'post_excerpt' => $img_caption,
@@ -763,7 +763,7 @@  discard block
 block discarded – undo
763 763
 
764 764
 			//adding title only if it is not empty. It will default to the file name if it is not in the array
765 765
 			if ( ! empty( $img_title ) ) {
766
-				$image_meta['post_title'] = $img_title;
766
+				$image_meta[ 'post_title' ] = $img_title;
767 767
 			}
768 768
 
769 769
 			/**
@@ -821,15 +821,15 @@  discard block
 block discarded – undo
821 821
 	 */
822 822
 	private function maybe_update_post_fields( $form ) {
823 823
 
824
-		if( empty( $this->entry['post_id'] ) ) {
824
+		if ( empty( $this->entry[ 'post_id' ] ) ) {
825 825
 	        gravityview()->log->debug( 'This entry has no post fields. Continuing...' );
826 826
 			return;
827 827
 		}
828 828
 
829
-		$post_id = $this->entry['post_id'];
829
+		$post_id = $this->entry[ 'post_id' ];
830 830
 
831 831
 		// Security check
832
-		if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
832
+		if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
833 833
 			gravityview()->log->error( 'The current user does not have the ability to edit Post #{post_id}', array( 'post_id' => $post_id ) );
834 834
 			return;
835 835
 		}
@@ -842,25 +842,25 @@  discard block
 block discarded – undo
842 842
 
843 843
 			$field = RGFormsModel::get_field( $form, $field_id );
844 844
 
845
-			if( ! $field ) {
845
+			if ( ! $field ) {
846 846
 				continue;
847 847
 			}
848 848
 
849
-			if( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) {
849
+			if ( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) {
850 850
 
851 851
 				// Get the value of the field, including $_POSTed value
852 852
 				$value = RGFormsModel::get_field_value( $field );
853 853
 
854 854
 				// Use temporary entry variable, to make values available to fill_post_template() and update_post_image()
855 855
 				$entry_tmp = $this->entry;
856
-				$entry_tmp["{$field_id}"] = $value;
856
+				$entry_tmp[ "{$field_id}" ] = $value;
857 857
 
858
-				switch( $field->type ) {
858
+				switch ( $field->type ) {
859 859
 
860 860
 				    case 'post_title':
861 861
 				        $post_title = $value;
862 862
 				        if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) {
863
-				            $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
863
+				            $post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp );
864 864
 				        }
865 865
 				        $updated_post->post_title = $post_title;
866 866
 				        $updated_post->post_name  = $post_title;
@@ -870,7 +870,7 @@  discard block
 block discarded – undo
870 870
 				    case 'post_content':
871 871
 				        $post_content = $value;
872 872
 				        if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) {
873
-				            $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
873
+				            $post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true );
874 874
 				        }
875 875
 				        $updated_post->post_content = $post_content;
876 876
 				        unset( $post_content );
@@ -888,11 +888,11 @@  discard block
 block discarded – undo
888 888
 							$value = $value[ $field_id ];
889 889
 						}
890 890
 
891
-				        if( ! empty( $field->customFieldTemplateEnabled ) ) {
891
+				        if ( ! empty( $field->customFieldTemplateEnabled ) ) {
892 892
 				            $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
893 893
 				        }
894 894
 
895
-						$value = $field->get_value_save_entry( $value, $form, '', $this->entry['id'], $this->entry );
895
+						$value = $field->get_value_save_entry( $value, $form, '', $this->entry[ 'id' ], $this->entry );
896 896
 
897 897
 				        update_post_meta( $post_id, $field->postCustomFieldName, $value );
898 898
 				        break;
@@ -904,7 +904,7 @@  discard block
 block discarded – undo
904 904
 				}
905 905
 
906 906
 				// update entry after
907
-				$this->entry["{$field_id}"] = $value;
907
+				$this->entry[ "{$field_id}" ] = $value;
908 908
 
909 909
 				$update_entry = true;
910 910
 
@@ -913,11 +913,11 @@  discard block
 block discarded – undo
913 913
 
914 914
 		}
915 915
 
916
-		if( $update_entry ) {
916
+		if ( $update_entry ) {
917 917
 
918 918
 			$return_entry = GFAPI::update_entry( $this->entry );
919 919
 
920
-			if( is_wp_error( $return_entry ) ) {
920
+			if ( is_wp_error( $return_entry ) ) {
921 921
 				gravityview()->log->error( 'Updating the entry post fields failed', array( 'data' => array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) ) );
922 922
 			} else {
923 923
 				gravityview()->log->debug( 'Updating the entry post fields for post #{post_id} succeeded', array( 'post_id' => $post_id ) );
@@ -927,7 +927,7 @@  discard block
 block discarded – undo
927 927
 
928 928
 		$return_post = wp_update_post( $updated_post, true );
929 929
 
930
-		if( is_wp_error( $return_post ) ) {
930
+		if ( is_wp_error( $return_post ) ) {
931 931
 			$return_post->add_data( $updated_post, '$updated_post' );
932 932
 			gravityview()->log->error( 'Updating the post content failed', array( 'data' => compact( 'updated_post', 'return_post' ) ) );
933 933
 		} else {
@@ -961,7 +961,7 @@  discard block
 block discarded – undo
961 961
 		$output = GFCommon::replace_variables( $output, $form, $entry, false, false, false );
962 962
 
963 963
 		// replace conditional shortcodes
964
-		if( $do_shortcode ) {
964
+		if ( $do_shortcode ) {
965 965
 			$output = do_shortcode( $output );
966 966
 		}
967 967
 
@@ -980,19 +980,19 @@  discard block
 block discarded – undo
980 980
 	 */
981 981
 	private function after_update() {
982 982
 
983
-		do_action( 'gform_after_update_entry', self::$original_form, $this->entry['id'], self::$original_entry );
984
-		do_action( "gform_after_update_entry_{$this->form['id']}", self::$original_form, $this->entry['id'], self::$original_entry );
983
+		do_action( 'gform_after_update_entry', self::$original_form, $this->entry[ 'id' ], self::$original_entry );
984
+		do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", self::$original_form, $this->entry[ 'id' ], self::$original_entry );
985 985
 
986 986
 		// Re-define the entry now that we've updated it.
987
-		$entry = RGFormsModel::get_lead( $this->entry['id'] );
987
+		$entry = RGFormsModel::get_lead( $this->entry[ 'id' ] );
988 988
 
989 989
 		$entry = GFFormsModel::set_entry_meta( $entry, self::$original_form );
990 990
 
991 991
 		if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '<' ) ) {
992 992
 			// We need to clear the cache because Gravity Forms caches the field values, which
993 993
 			// we have just updated.
994
-			foreach ($this->form['fields'] as $key => $field) {
995
-				GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id );
994
+			foreach ( $this->form[ 'fields' ] as $key => $field ) {
995
+				GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id );
996 996
 			}
997 997
 		}
998 998
 
@@ -1002,11 +1002,11 @@  discard block
 block discarded – undo
1002 1002
 		 * @since develop
1003 1003
 		 */
1004 1004
 		if ( $allowed_feeds = $this->view->settings->get( 'edit_feeds', array() ) ) {
1005
-			$feeds = GFAPI::get_feeds( null, $entry['form_id'] );
1005
+			$feeds = GFAPI::get_feeds( null, $entry[ 'form_id' ] );
1006 1006
 			if ( ! is_wp_error( $feeds ) ) {
1007 1007
 				$registered_feeds = array();
1008 1008
 				foreach ( GFAddOn::get_registered_addons() as $registered_feed ) {
1009
-					if ( is_subclass_of( $registered_feed,  'GFFeedAddOn' ) ) {
1009
+					if ( is_subclass_of( $registered_feed, 'GFFeedAddOn' ) ) {
1010 1010
 						if ( method_exists( $registered_feed, 'get_instance' ) ) {
1011 1011
 							$registered_feed = call_user_func( array( $registered_feed, 'get_instance' ) );
1012 1012
 							$registered_feeds[ $registered_feed->get_slug() ] = $registered_feed;
@@ -1014,8 +1014,8 @@  discard block
 block discarded – undo
1014 1014
 					}
1015 1015
 				}
1016 1016
 				foreach ( $feeds as $feed ) {
1017
-					if ( in_array( $feed['id'], $allowed_feeds ) ) {
1018
-						if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed['addon_slug'] ) ) {
1017
+					if ( in_array( $feed[ 'id' ], $allowed_feeds ) ) {
1018
+						if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed[ 'addon_slug' ] ) ) {
1019 1019
 							$returned_entry = $feed_object->process_feed( $feed, $entry, self::$original_form );
1020 1020
 							if ( is_array( $returned_entry ) && rgar( $returned_entry, 'id' ) ) {
1021 1021
 								$entry = $returned_entry;
@@ -1045,7 +1045,7 @@  discard block
 block discarded – undo
1045 1045
 
1046 1046
 		<div class="gv-edit-entry-wrapper"><?php
1047 1047
 
1048
-			$javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this );
1048
+			$javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this );
1049 1049
 
1050 1050
 			/**
1051 1051
 			 * Fixes weird wpautop() issue
@@ -1061,7 +1061,7 @@  discard block
 block discarded – undo
1061 1061
 				     * @param string $edit_entry_title Modify the "Edit Entry" title
1062 1062
 				     * @param GravityView_Edit_Entry_Render $this This object
1063 1063
 				     */
1064
-				    $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
1064
+				    $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this );
1065 1065
 
1066 1066
 				    echo esc_attr( $edit_entry_title );
1067 1067
 			?></span>
@@ -1127,18 +1127,18 @@  discard block
 block discarded – undo
1127 1127
 				*/
1128 1128
 				$labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id );
1129 1129
 
1130
-				$this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels['submit'];
1130
+				$this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels[ 'submit' ];
1131 1131
 			}
1132 1132
 
1133 1133
 			$back_link = remove_query_arg( array( 'page', 'view', 'edit' ) );
1134 1134
 
1135
-			if( ! $this->is_valid ){
1135
+			if ( ! $this->is_valid ) {
1136 1136
 
1137 1137
 				// Keeping this compatible with Gravity Forms.
1138
-				$validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>";
1139
-				$message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form);
1138
+				$validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>";
1139
+				$message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form );
1140 1140
 
1141
-				echo GVCommon::generate_notice( $message , 'gv-error' );
1141
+				echo GVCommon::generate_notice( $message, 'gv-error' );
1142 1142
 
1143 1143
 			} elseif ( false === $this->is_paged_submitted ) {
1144 1144
 				// Paged form that hasn't been submitted on the last page yet
@@ -1151,7 +1151,7 @@  discard block
 block discarded – undo
1151 1151
 				 * @param int $view_id View ID
1152 1152
 				 * @param array $entry Gravity Forms entry array
1153 1153
 				 */
1154
-				$message = apply_filters( 'gravityview/edit_entry/page/success', $entry_updated_message , $this->view_id, $this->entry );
1154
+				$message = apply_filters( 'gravityview/edit_entry/page/success', $entry_updated_message, $this->view_id, $this->entry );
1155 1155
 
1156 1156
 				echo GVCommon::generate_notice( $message );
1157 1157
 			} else {
@@ -1163,23 +1163,23 @@  discard block
 block discarded – undo
1163 1163
 
1164 1164
                     case '0':
1165 1165
 	                    $redirect_url = $back_link;
1166
-	                    $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' );
1166
+	                    $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', '</a>' );
1167 1167
                         break;
1168 1168
 
1169 1169
                     case '1':
1170 1170
 	                    $redirect_url = $directory_link = GravityView_API::directory_link();
1171
-	                    $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' );
1171
+	                    $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' );
1172 1172
 	                    break;
1173 1173
 
1174 1174
                     case '2':
1175 1175
 	                    $redirect_url = $edit_redirect_url;
1176 1176
 	                    $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' );
1177
-	                    $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' );
1177
+	                    $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' );
1178 1178
                         break;
1179 1179
 
1180 1180
                     case '':
1181 1181
                     default:
1182
-					    $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' );
1182
+					    $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . esc_url( $back_link ) . '">', '</a>' );
1183 1183
                         break;
1184 1184
 				}
1185 1185
 
@@ -1195,7 +1195,7 @@  discard block
 block discarded – undo
1195 1195
 				 * @param array $entry Gravity Forms entry array
1196 1196
 				 * @param string $back_link URL to return to the original entry. @since 1.6
1197 1197
 				 */
1198
-				$message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link );
1198
+				$message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link );
1199 1199
 
1200 1200
 				echo GVCommon::generate_notice( $message );
1201 1201
 			}
@@ -1219,8 +1219,8 @@  discard block
 block discarded – undo
1219 1219
 		 */
1220 1220
 		do_action( 'gravityview/edit-entry/render/before', $this );
1221 1221
 
1222
-		add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 );
1223
-		add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') );
1222
+		add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 );
1223
+		add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
1224 1224
 		add_filter( 'gform_next_button', array( $this, 'render_form_buttons' ) );
1225 1225
 		add_filter( 'gform_previous_button', array( $this, 'render_form_buttons' ) );
1226 1226
 		add_filter( 'gform_disable_view_counter', '__return_true' );
@@ -1229,14 +1229,14 @@  discard block
 block discarded – undo
1229 1229
 		add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 );
1230 1230
 
1231 1231
 		// We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
1232
-		unset( $_GET['page'] );
1232
+		unset( $_GET[ 'page' ] );
1233 1233
 
1234 1234
 		$this->show_next_button = false;
1235 1235
 		$this->show_previous_button = false;
1236 1236
 
1237 1237
 		// TODO: Verify multiple-page forms
1238 1238
 		if ( GFCommon::has_pages( $this->form ) && apply_filters( 'gravityview/features/paged-edit', false ) ) {
1239
-			if ( intval( $page_number = \GV\Utils::_POST( 'gform_source_page_number_' . $this->form['id'], 0 ) ) ) {
1239
+			if ( intval( $page_number = \GV\Utils::_POST( 'gform_source_page_number_' . $this->form[ 'id' ], 0 ) ) ) {
1240 1240
 
1241 1241
 				$labels = array(
1242 1242
 					'cancel'   => __( 'Cancel', 'gravityview' ),
@@ -1255,20 +1255,20 @@  discard block
 block discarded – undo
1255 1255
 				*/
1256 1256
 				$labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id );
1257 1257
 
1258
-				GFFormDisplay::$submission[ $this->form['id'] ][ 'form' ] = $this->form;
1259
-				GFFormDisplay::$submission[ $this->form['id'] ][ 'is_valid' ] = true;
1258
+				GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'form' ] = $this->form;
1259
+				GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'is_valid' ] = true;
1260 1260
 
1261
-				if ( \GV\Utils::_POST( 'save' ) === $labels['next'] ) {
1261
+				if ( \GV\Utils::_POST( 'save' ) === $labels[ 'next' ] ) {
1262 1262
 					$last_page = \GFFormDisplay::get_max_page_number( $this->form );
1263 1263
 
1264 1264
 					while ( ++$page_number < $last_page && RGFormsModel::is_page_hidden( $this->form, $page_number, \GV\Utils::_POST( 'gform_field_values' ) ) ) {
1265 1265
 					} // Advance to next visible page
1266
-				} elseif ( \GV\Utils::_POST( 'save' ) === $labels['previous'] ) {
1266
+				} elseif ( \GV\Utils::_POST( 'save' ) === $labels[ 'previous' ] ) {
1267 1267
 					while ( --$page_number > 1 && RGFormsModel::is_page_hidden( $this->form, $page_number, \GV\Utils::_POST( 'gform_field_values' ) ) ) {
1268 1268
 					} // Advance to next visible page
1269 1269
 				}
1270 1270
 
1271
-				GFFormDisplay::$submission[ $this->form['id'] ]['page_number'] = $page_number;
1271
+				GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'page_number' ] = $page_number;
1272 1272
 			}
1273 1273
 
1274 1274
 			if ( ( $page_number = intval( $page_number ) ) < 2 ) {
@@ -1294,7 +1294,7 @@  discard block
 block discarded – undo
1294 1294
 
1295 1295
 		ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic
1296 1296
 
1297
-		$html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
1297
+		$html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry );
1298 1298
 
1299 1299
 		ob_get_clean();
1300 1300
 
@@ -1322,7 +1322,7 @@  discard block
 block discarded – undo
1322 1322
 	 * @return string
1323 1323
 	 */
1324 1324
 	public function render_form_buttons() {
1325
-		return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this );
1325
+		return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this );
1326 1326
 	}
1327 1327
 
1328 1328
 
@@ -1341,15 +1341,15 @@  discard block
 block discarded – undo
1341 1341
 	 */
1342 1342
 	public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) {
1343 1343
 
1344
-		if( $form['id'] != $this->form_id ) {
1344
+		if ( $form[ 'id' ] != $this->form_id ) {
1345 1345
 			return $form;
1346 1346
 		}
1347 1347
 
1348 1348
 		// In case we have validated the form, use it to inject the validation results into the form render
1349
-		if( isset( $this->form_after_validation ) && $this->form_after_validation['id'] === $form['id'] ) {
1349
+		if ( isset( $this->form_after_validation ) && $this->form_after_validation[ 'id' ] === $form[ 'id' ] ) {
1350 1350
 			$form = $this->form_after_validation;
1351 1351
 		} else {
1352
-			$form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id );
1352
+			$form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id );
1353 1353
 		}
1354 1354
 
1355 1355
 		$form = $this->filter_conditional_logic( $form );
@@ -1357,8 +1357,8 @@  discard block
 block discarded – undo
1357 1357
 		$form = $this->prefill_conditional_logic( $form );
1358 1358
 
1359 1359
 		// for now we don't support Save and Continue feature.
1360
-		if( ! self::$supports_save_and_continue ) {
1361
-	        unset( $form['save'] );
1360
+		if ( ! self::$supports_save_and_continue ) {
1361
+	        unset( $form[ 'save' ] );
1362 1362
 		}
1363 1363
 
1364 1364
 		$form = $this->unselect_default_values( $form );
@@ -1381,31 +1381,31 @@  discard block
 block discarded – undo
1381 1381
 	 */
1382 1382
 	public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) {
1383 1383
 
1384
-		if( ! GFCommon::is_post_field( $field ) ) {
1384
+		if ( ! GFCommon::is_post_field( $field ) ) {
1385 1385
 			return $field_content;
1386 1386
 		}
1387 1387
 
1388 1388
         $message = null;
1389 1389
 
1390 1390
         // First, make sure they have the capability to edit the post.
1391
-        if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
1391
+        if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) {
1392 1392
 
1393 1393
             /**
1394 1394
              * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
1395 1395
              * @param string $message The existing "You don't have permission..." text
1396 1396
              */
1397
-            $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
1397
+            $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don&rsquo;t have permission to edit this post.', 'gravityview' ) );
1398 1398
 
1399
-        } elseif( null === get_post( $this->entry['post_id'] ) ) {
1399
+        } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) {
1400 1400
             /**
1401 1401
              * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
1402 1402
              * @param string $message The existing "This field is not editable; the post no longer exists." text
1403 1403
              */
1404
-            $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
1404
+            $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) );
1405 1405
         }
1406 1406
 
1407
-        if( $message ) {
1408
-            $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
1407
+        if ( $message ) {
1408
+            $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
1409 1409
         }
1410 1410
 
1411 1411
         return $field_content;
@@ -1429,8 +1429,8 @@  discard block
 block discarded – undo
1429 1429
 
1430 1430
 		// If the form has been submitted, then we don't need to pre-fill the values,
1431 1431
 		// Except for fileupload type and when a field input is overridden- run always!!
1432
-		if(
1433
-			( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) )
1432
+		if (
1433
+			( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) )
1434 1434
 			&& false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) )
1435 1435
 			&& ! GFCommon::is_product_field( $field->type )
1436 1436
 			|| ! empty( $field_content )
@@ -1450,7 +1450,7 @@  discard block
 block discarded – undo
1450 1450
 	    $return = null;
1451 1451
 
1452 1452
 		/** @var GravityView_Field $gv_field */
1453
-		if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
1453
+		if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
1454 1454
 			$return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
1455 1455
 		} else {
1456 1456
 	        $return = $field->get_field_input( $this->form, $field_value, $this->entry );
@@ -1459,7 +1459,7 @@  discard block
 block discarded – undo
1459 1459
 	    // If there was output, it's an error
1460 1460
 	    $warnings = ob_get_clean();
1461 1461
 
1462
-	    if( !empty( $warnings ) ) {
1462
+	    if ( ! empty( $warnings ) ) {
1463 1463
 		    gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) );
1464 1464
 	    }
1465 1465
 
@@ -1484,7 +1484,7 @@  discard block
 block discarded – undo
1484 1484
 		$override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field );
1485 1485
 
1486 1486
 		// We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs)
1487
-		if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) {
1487
+		if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) {
1488 1488
 
1489 1489
 			$field_value = array();
1490 1490
 
@@ -1493,10 +1493,10 @@  discard block
 block discarded – undo
1493 1493
 
1494 1494
 			foreach ( (array)$field->inputs as $input ) {
1495 1495
 
1496
-				$input_id = strval( $input['id'] );
1496
+				$input_id = strval( $input[ 'id' ] );
1497 1497
 
1498 1498
 				if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) {
1499
-				    $field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
1499
+				    $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
1500 1500
 				    $allow_pre_populated = false;
1501 1501
 				}
1502 1502
 
@@ -1504,7 +1504,7 @@  discard block
 block discarded – undo
1504 1504
 
1505 1505
 			$pre_value = $field->get_value_submission( array(), false );
1506 1506
 
1507
-			$field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value;
1507
+			$field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value;
1508 1508
 
1509 1509
 		} else {
1510 1510
 
@@ -1515,13 +1515,13 @@  discard block
 block discarded – undo
1515 1515
 
1516 1516
 			// saved field entry value (if empty, fallback to the pre-populated value, if exists)
1517 1517
 			// or pre-populated value if not empty and set to override saved value
1518
-			$field_value = isset( $this->entry[ $id ] ) && ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value;
1518
+			$field_value = isset( $this->entry[ $id ] ) && ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value;
1519 1519
 
1520 1520
 			// in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs.
1521
-			if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) {
1521
+			if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) {
1522 1522
 				$categories = array();
1523 1523
 				foreach ( explode( ',', $field_value ) as $cat_string ) {
1524
-				    $categories[] = GFCommon::format_post_category( $cat_string, true );
1524
+				    $categories[ ] = GFCommon::format_post_category( $cat_string, true );
1525 1525
 				}
1526 1526
 				$field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
1527 1527
 			}
@@ -1549,7 +1549,7 @@  discard block
 block discarded – undo
1549 1549
 	     * @param GF_Field $field Gravity Forms field object
1550 1550
 	     * @param GravityView_Edit_Entry_Render $this Current object
1551 1551
 	     */
1552
-	    $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
1552
+	    $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field, $this );
1553 1553
 
1554 1554
 		return $field_value;
1555 1555
 	}
@@ -1566,12 +1566,12 @@  discard block
 block discarded – undo
1566 1566
 	 */
1567 1567
 	public function gform_pre_validation( $form ) {
1568 1568
 
1569
-		if( ! $this->verify_nonce() ) {
1569
+		if ( ! $this->verify_nonce() ) {
1570 1570
 			return $form;
1571 1571
 		}
1572 1572
 
1573 1573
 		// Fix PHP warning regarding undefined index.
1574
-		foreach ( $form['fields'] as &$field) {
1574
+		foreach ( $form[ 'fields' ] as &$field ) {
1575 1575
 
1576 1576
 			// This is because we're doing admin form pretending to be front-end, so Gravity Forms
1577 1577
 			// expects certain field array items to be set.
@@ -1579,7 +1579,7 @@  discard block
 block discarded – undo
1579 1579
 	            $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
1580 1580
 			}
1581 1581
 
1582
-			switch( RGFormsModel::get_input_type( $field ) ) {
1582
+			switch ( RGFormsModel::get_input_type( $field ) ) {
1583 1583
 
1584 1584
 				/**
1585 1585
 				 * this whole fileupload hack is because in the admin, Gravity Forms simply doesn't update any fileupload field if it's empty, but it DOES in the frontend.
@@ -1593,26 +1593,26 @@  discard block
 block discarded – undo
1593 1593
 				    // Set the previous value
1594 1594
 				    $entry = $this->get_entry();
1595 1595
 
1596
-				    $input_name = 'input_'.$field->id;
1597
-				    $form_id = $form['id'];
1596
+				    $input_name = 'input_' . $field->id;
1597
+				    $form_id = $form[ 'id' ];
1598 1598
 
1599 1599
 				    $value = NULL;
1600 1600
 
1601 1601
 				    // Use the previous entry value as the default.
1602
-				    if( isset( $entry[ $field->id ] ) ) {
1602
+				    if ( isset( $entry[ $field->id ] ) ) {
1603 1603
 				        $value = $entry[ $field->id ];
1604 1604
 				    }
1605 1605
 
1606 1606
 				    // If this is a single upload file
1607
-				    if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
1608
-				        $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
1609
-				        $value = $file_path['url'];
1607
+				    if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) {
1608
+				        $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] );
1609
+				        $value = $file_path[ 'url' ];
1610 1610
 
1611 1611
 				    } else {
1612 1612
 
1613 1613
 				        // Fix PHP warning on line 1498 of form_display.php for post_image fields
1614 1614
 				        // Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
1615
-				        $_FILES[ $input_name ] = array('name' => '', 'size' => '' );
1615
+				        $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' );
1616 1616
 
1617 1617
 				    }
1618 1618
 
@@ -1620,10 +1620,10 @@  discard block
 block discarded – undo
1620 1620
 
1621 1621
 				        // If there are fresh uploads, process and merge them.
1622 1622
 				        // Otherwise, use the passed values, which should be json-encoded array of URLs
1623
-				        if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
1623
+				        if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) {
1624 1624
 				            $value = empty( $value ) ? '[]' : $value;
1625 1625
 				            $value = stripslashes_deep( $value );
1626
-				            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
1626
+				            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() );
1627 1627
 				        }
1628 1628
 
1629 1629
 				    } else {
@@ -1641,8 +1641,8 @@  discard block
 block discarded – undo
1641 1641
 
1642 1642
 				case 'number':
1643 1643
 				    // Fix "undefined index" issue at line 1286 in form_display.php
1644
-				    if( !isset( $_POST['input_'.$field->id ] ) ) {
1645
-				        $_POST['input_'.$field->id ] = NULL;
1644
+				    if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) {
1645
+				        $_POST[ 'input_' . $field->id ] = NULL;
1646 1646
 				    }
1647 1647
 				    break;
1648 1648
 			}
@@ -1679,7 +1679,7 @@  discard block
 block discarded – undo
1679 1679
 		 * You can enter whatever you want!
1680 1680
 		 * We try validating, and customize the results using `self::custom_validation()`
1681 1681
 		 */
1682
-		add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4);
1682
+		add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 );
1683 1683
 
1684 1684
 		// Needed by the validate funtion
1685 1685
 		$failed_validation_page = NULL;
@@ -1687,14 +1687,14 @@  discard block
 block discarded – undo
1687 1687
 
1688 1688
 		// Prevent entry limit from running when editing an entry, also
1689 1689
 		// prevent form scheduling from preventing editing
1690
-		unset( $this->form['limitEntries'], $this->form['scheduleForm'] );
1690
+		unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] );
1691 1691
 
1692 1692
 		// Hide fields depending on Edit Entry settings
1693
-		$this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id );
1693
+		$this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id );
1694 1694
 
1695 1695
 		$this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page );
1696 1696
 
1697
-		remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 );
1697
+		remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 );
1698 1698
 	}
1699 1699
 
1700 1700
 
@@ -1717,7 +1717,7 @@  discard block
 block discarded – undo
1717 1717
 
1718 1718
 		$gv_valid = true;
1719 1719
 
1720
-		foreach ( $validation_results['form']['fields'] as $key => &$field ) {
1720
+		foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) {
1721 1721
 
1722 1722
 			$value = RGFormsModel::get_field_value( $field );
1723 1723
 			$field_type = RGFormsModel::get_input_type( $field );
@@ -1730,22 +1730,22 @@  discard block
 block discarded – undo
1730 1730
 				case 'post_image':
1731 1731
 
1732 1732
 				    // in case nothing is uploaded but there are already files saved
1733
-				    if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
1733
+				    if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) {
1734 1734
 				        $field->failed_validation = false;
1735 1735
 				        unset( $field->validation_message );
1736 1736
 				    }
1737 1737
 
1738 1738
 				    // validate if multi file upload reached max number of files [maxFiles] => 2
1739
-				    if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) {
1739
+				    if ( \GV\Utils::get( $field, 'maxFiles' ) && \GV\Utils::get( $field, 'multipleFiles' ) ) {
1740 1740
 
1741 1741
 				        $input_name = 'input_' . $field->id;
1742 1742
 				        //uploaded
1743
-				        $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
1743
+				        $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array();
1744 1744
 
1745 1745
 				        //existent
1746 1746
 				        $entry = $this->get_entry();
1747 1747
 				        $value = NULL;
1748
-				        if( isset( $entry[ $field->id ] ) ) {
1748
+				        if ( isset( $entry[ $field->id ] ) ) {
1749 1749
 				            $value = json_decode( $entry[ $field->id ], true );
1750 1750
 				        }
1751 1751
 
@@ -1753,13 +1753,13 @@  discard block
 block discarded – undo
1753 1753
 				        $count_files = ( is_array( $file_names ) ? count( $file_names ) : 0 ) +
1754 1754
 						               ( is_array( $value ) ? count( $value ) : 0 );
1755 1755
 
1756
-				        if( $count_files > $field->maxFiles ) {
1756
+				        if ( $count_files > $field->maxFiles ) {
1757 1757
 				            $field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
1758 1758
 				            $field->failed_validation = 1;
1759 1759
 				            $gv_valid = false;
1760 1760
 
1761 1761
 				            // in case of error make sure the newest upload files are removed from the upload input
1762
-				            GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
1762
+				            GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null;
1763 1763
 				        }
1764 1764
 
1765 1765
 				    }
@@ -1770,7 +1770,7 @@  discard block
 block discarded – undo
1770 1770
 			}
1771 1771
 
1772 1772
 			// This field has failed validation.
1773
-			if( !empty( $field->failed_validation ) ) {
1773
+			if ( ! empty( $field->failed_validation ) ) {
1774 1774
 
1775 1775
 				gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'data' => array( 'field' => $field, 'value' => $value ) ) );
1776 1776
 
@@ -1788,19 +1788,19 @@  discard block
 block discarded – undo
1788 1788
 				}
1789 1789
 
1790 1790
 				// You can't continue inside a switch, so we do it after.
1791
-				if( empty( $field->failed_validation ) ) {
1791
+				if ( empty( $field->failed_validation ) ) {
1792 1792
 				    continue;
1793 1793
 				}
1794 1794
 
1795 1795
 				// checks if the No Duplicates option is not validating entry against itself, since
1796 1796
 				// we're editing a stored entry, it would also assume it's a duplicate.
1797
-				if( !empty( $field->noDuplicates ) ) {
1797
+				if ( ! empty( $field->noDuplicates ) ) {
1798 1798
 
1799 1799
 				    $entry = $this->get_entry();
1800 1800
 
1801 1801
 				    // If the value of the entry is the same as the stored value
1802 1802
 				    // Then we can assume it's not a duplicate, it's the same.
1803
-				    if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
1803
+				    if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) {
1804 1804
 				        //if value submitted was not changed, then don't validate
1805 1805
 				        $field->failed_validation = false;
1806 1806
 
@@ -1813,7 +1813,7 @@  discard block
 block discarded – undo
1813 1813
 				}
1814 1814
 
1815 1815
 				// if here then probably we are facing the validation 'At least one field must be filled out'
1816
-				if( GFFormDisplay::is_empty( $field, $this->form_id  ) && empty( $field->isRequired ) ) {
1816
+				if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) {
1817 1817
 				    unset( $field->validation_message );
1818 1818
 	                $field->validation_message = false;
1819 1819
 				    continue;
@@ -1825,12 +1825,12 @@  discard block
 block discarded – undo
1825 1825
 
1826 1826
 		}
1827 1827
 
1828
-		$validation_results['is_valid'] = $gv_valid;
1828
+		$validation_results[ 'is_valid' ] = $gv_valid;
1829 1829
 
1830 1830
 		gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Validation results.', array( 'data' => $validation_results ) );
1831 1831
 
1832 1832
 		// We'll need this result when rendering the form ( on GFFormDisplay::get_form )
1833
-		$this->form_after_validation = $validation_results['form'];
1833
+		$this->form_after_validation = $validation_results[ 'form' ];
1834 1834
 
1835 1835
 		return $validation_results;
1836 1836
 	}
@@ -1843,7 +1843,7 @@  discard block
 block discarded – undo
1843 1843
 	 */
1844 1844
 	public function get_entry() {
1845 1845
 
1846
-		if( empty( $this->entry ) ) {
1846
+		if ( empty( $this->entry ) ) {
1847 1847
 			// Get the database value of the entry that's being edited
1848 1848
 			$this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() );
1849 1849
 		}
@@ -1875,10 +1875,10 @@  discard block
 block discarded – undo
1875 1875
 		}
1876 1876
 
1877 1877
 		// If edit tab not yet configured, show all fields
1878
-		$edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL;
1878
+		$edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL;
1879 1879
 
1880 1880
 		// Hide fields depending on admin settings
1881
-		$fields = $this->filter_fields( $form['fields'], $edit_fields );
1881
+		$fields = $this->filter_fields( $form[ 'fields' ], $edit_fields );
1882 1882
 
1883 1883
 	    // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
1884 1884
 	    $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
@@ -1911,7 +1911,7 @@  discard block
 block discarded – undo
1911 1911
 	 */
1912 1912
 	private function filter_fields( $fields, $configured_fields ) {
1913 1913
 
1914
-		if( empty( $fields ) || !is_array( $fields ) ) {
1914
+		if ( empty( $fields ) || ! is_array( $fields ) ) {
1915 1915
 			return $fields;
1916 1916
 		}
1917 1917
 
@@ -1928,12 +1928,12 @@  discard block
 block discarded – undo
1928 1928
 
1929 1929
 			// Remove the fields that have calculation properties and keep them to be used later
1930 1930
 			// @since 1.16.2
1931
-			if( $field->has_calculation() ) {
1932
-				$this->fields_with_calculation[] = $field;
1931
+			if ( $field->has_calculation() ) {
1932
+				$this->fields_with_calculation[ ] = $field;
1933 1933
 				// don't remove the calculation fields on form render.
1934 1934
 			}
1935 1935
 
1936
-			if( in_array( $field->type, $field_type_blacklist ) ) {
1936
+			if ( in_array( $field->type, $field_type_blacklist ) ) {
1937 1937
 				unset( $fields[ $key ] );
1938 1938
 			}
1939 1939
 		}
@@ -1951,7 +1951,7 @@  discard block
 block discarded – undo
1951 1951
 					continue; // Same
1952 1952
 				}
1953 1953
 
1954
-				$out_fields[] = $field;
1954
+				$out_fields[ ] = $field;
1955 1955
 			}
1956 1956
 
1957 1957
 			return array_values( $out_fields );
@@ -1962,8 +1962,8 @@  discard block
 block discarded – undo
1962 1962
 
1963 1963
 	        /** @var GF_Field $field */
1964 1964
 	        foreach ( $fields as $field ) {
1965
-				if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
1966
-				    $edit_fields[] = $this->merge_field_properties( $field, $configured_field );
1965
+				if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
1966
+				    $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field );
1967 1967
 				    break;
1968 1968
 				}
1969 1969
 
@@ -1986,14 +1986,14 @@  discard block
 block discarded – undo
1986 1986
 
1987 1987
 		$return_field = $field;
1988 1988
 
1989
-		if( empty( $field_setting['show_label'] ) ) {
1989
+		if ( empty( $field_setting[ 'show_label' ] ) ) {
1990 1990
 			$return_field->label = '';
1991
-		} elseif ( !empty( $field_setting['custom_label'] ) ) {
1992
-			$return_field->label = $field_setting['custom_label'];
1991
+		} elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) {
1992
+			$return_field->label = $field_setting[ 'custom_label' ];
1993 1993
 		}
1994 1994
 
1995
-		if( !empty( $field_setting['custom_class'] ) ) {
1996
-			$return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] );
1995
+		if ( ! empty( $field_setting[ 'custom_class' ] ) ) {
1996
+			$return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] );
1997 1997
 		}
1998 1998
 
1999 1999
 		/**
@@ -2031,16 +2031,16 @@  discard block
 block discarded – undo
2031 2031
 	     */
2032 2032
 	    $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
2033 2033
 
2034
-	    if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
2035
-			foreach( $fields as $k => $field ) {
2036
-				if( $field->adminOnly ) {
2034
+	    if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) {
2035
+			foreach ( $fields as $k => $field ) {
2036
+				if ( $field->adminOnly ) {
2037 2037
 				    unset( $fields[ $k ] );
2038 2038
 				}
2039 2039
 			}
2040 2040
 			return array_values( $fields );
2041 2041
 		}
2042 2042
 
2043
-	    foreach( $fields as &$field ) {
2043
+	    foreach ( $fields as &$field ) {
2044 2044
 		    $field->adminOnly = false;
2045 2045
 		}
2046 2046
 
@@ -2061,7 +2061,7 @@  discard block
 block discarded – undo
2061 2061
 	 */
2062 2062
 	private function unselect_default_values( $form ) {
2063 2063
 
2064
-	    foreach ( $form['fields'] as &$field ) {
2064
+	    foreach ( $form[ 'fields' ] as &$field ) {
2065 2065
 
2066 2066
 			if ( empty( $field->choices ) ) {
2067 2067
                 continue;
@@ -2069,7 +2069,7 @@  discard block
 block discarded – undo
2069 2069
 
2070 2070
             foreach ( $field->choices as &$choice ) {
2071 2071
 				if ( \GV\Utils::get( $choice, 'isSelected' ) ) {
2072
-					$choice['isSelected'] = false;
2072
+					$choice[ 'isSelected' ] = false;
2073 2073
 				}
2074 2074
 			}
2075 2075
 		}
@@ -2094,22 +2094,22 @@  discard block
 block discarded – undo
2094 2094
 	 */
2095 2095
 	function prefill_conditional_logic( $form ) {
2096 2096
 
2097
-		if( ! GFFormDisplay::has_conditional_logic( $form ) ) {
2097
+		if ( ! GFFormDisplay::has_conditional_logic( $form ) ) {
2098 2098
 			return $form;
2099 2099
 		}
2100 2100
 
2101 2101
 		// Have Conditional Logic pre-fill fields as if the data were default values
2102 2102
 		/** @var GF_Field $field */
2103
-		foreach ( $form['fields'] as &$field ) {
2103
+		foreach ( $form[ 'fields' ] as &$field ) {
2104 2104
 
2105
-			if( 'checkbox' === $field->type ) {
2105
+			if ( 'checkbox' === $field->type ) {
2106 2106
 				foreach ( $field->get_entry_inputs() as $key => $input ) {
2107
-				    $input_id = $input['id'];
2107
+				    $input_id = $input[ 'id' ];
2108 2108
 				    $choice = $field->choices[ $key ];
2109 2109
 				    $value = \GV\Utils::get( $this->entry, $input_id );
2110 2110
 				    $match = RGFormsModel::choice_value_match( $field, $choice, $value );
2111
-				    if( $match ) {
2112
-				        $field->choices[ $key ]['isSelected'] = true;
2111
+				    if ( $match ) {
2112
+				        $field->choices[ $key ][ 'isSelected' ] = true;
2113 2113
 				    }
2114 2114
 				}
2115 2115
 			} else {
@@ -2117,15 +2117,15 @@  discard block
 block discarded – undo
2117 2117
 				// We need to run through each field to set the default values
2118 2118
 				foreach ( $this->entry as $field_id => $field_value ) {
2119 2119
 
2120
-				    if( floatval( $field_id ) === floatval( $field->id ) ) {
2120
+				    if ( floatval( $field_id ) === floatval( $field->id ) ) {
2121 2121
 
2122
-				        if( 'list' === $field->type ) {
2122
+				        if ( 'list' === $field->type ) {
2123 2123
 				            $list_rows = maybe_unserialize( $field_value );
2124 2124
 
2125 2125
 				            $list_field_value = array();
2126
-				            foreach ( (array) $list_rows as $row ) {
2127
-				                foreach ( (array) $row as $column ) {
2128
-				                    $list_field_value[] = $column;
2126
+				            foreach ( (array)$list_rows as $row ) {
2127
+				                foreach ( (array)$row as $column ) {
2128
+				                    $list_field_value[ ] = $column;
2129 2129
 				                }
2130 2130
 				            }
2131 2131
 
@@ -2158,32 +2158,32 @@  discard block
 block discarded – undo
2158 2158
 		 * @see https://github.com/gravityview/GravityView/issues/840
2159 2159
 		 * @since develop
2160 2160
 		 */
2161
-		$the_form = GFAPI::get_form( $form['id'] );
2161
+		$the_form = GFAPI::get_form( $form[ 'id' ] );
2162 2162
 		$editable_ids = array();
2163
-		foreach ( $form['fields'] as $field ) {
2164
-			$editable_ids[] = $field['id']; // wp_list_pluck is destructive in this context
2163
+		foreach ( $form[ 'fields' ] as $field ) {
2164
+			$editable_ids[ ] = $field[ 'id' ]; // wp_list_pluck is destructive in this context
2165 2165
 		}
2166 2166
 		$remove_conditions_rule = array();
2167
-		foreach ( $the_form['fields'] as $field ) {
2168
-			if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic['rules'] ) ) {
2169
-				foreach ( $field->conditionalLogic['rules'] as $i => $rule ) {
2170
-					if ( ! in_array( $rule['fieldId'], $editable_ids ) ) {
2167
+		foreach ( $the_form[ 'fields' ] as $field ) {
2168
+			if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic[ 'rules' ] ) ) {
2169
+				foreach ( $field->conditionalLogic[ 'rules' ] as $i => $rule ) {
2170
+					if ( ! in_array( $rule[ 'fieldId' ], $editable_ids ) ) {
2171 2171
 						/**
2172 2172
 						 * This conditional field is not editable in this View.
2173 2173
 						 * We need to remove the rule, but only if it matches.
2174 2174
 						 */
2175
-						if ( $_field = GFAPI::get_field( $the_form, $rule['fieldId'] ) ) {
2175
+						if ( $_field = GFAPI::get_field( $the_form, $rule[ 'fieldId' ] ) ) {
2176 2176
 							$value = $_field->get_value_export( $this->entry );
2177
-						} elseif ( isset( $this->entry[ $rule['fieldId'] ] ) ) {
2178
-							$value = $this->entry[ $rule['fieldId'] ];
2177
+						} elseif ( isset( $this->entry[ $rule[ 'fieldId' ] ] ) ) {
2178
+							$value = $this->entry[ $rule[ 'fieldId' ] ];
2179 2179
 						} else {
2180
-							$value = gform_get_meta( $this->entry['id'], $rule['fieldId'] );
2180
+							$value = gform_get_meta( $this->entry[ 'id' ], $rule[ 'fieldId' ] );
2181 2181
 						}
2182 2182
 
2183
-						$match = GFFormsModel::matches_operation( $value, $rule['value'], $rule['operator'] );
2183
+						$match = GFFormsModel::matches_operation( $value, $rule[ 'value' ], $rule[ 'operator' ] );
2184 2184
 
2185 2185
 						if ( $match ) {
2186
-							$remove_conditions_rule[] = array( $field['id'], $i );
2186
+							$remove_conditions_rule[ ] = array( $field[ 'id' ], $i );
2187 2187
 						}
2188 2188
 					}
2189 2189
 				}
@@ -2191,21 +2191,21 @@  discard block
 block discarded – undo
2191 2191
 		}
2192 2192
 
2193 2193
 		if ( $remove_conditions_rule ) {
2194
-			foreach ( $form['fields'] as &$field ) {
2194
+			foreach ( $form[ 'fields' ] as &$field ) {
2195 2195
 				foreach ( $remove_conditions_rule as $_remove_conditions_r ) {
2196 2196
 
2197 2197
 				    list( $rule_field_id, $rule_i ) = $_remove_conditions_r;
2198 2198
 
2199
-					if ( $field['id'] == $rule_field_id ) {
2200
-						unset( $field->conditionalLogic['rules'][ $rule_i ] );
2201
-						gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field['id'] ) );
2199
+					if ( $field[ 'id' ] == $rule_field_id ) {
2200
+						unset( $field->conditionalLogic[ 'rules' ][ $rule_i ] );
2201
+						gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field[ 'id' ] ) );
2202 2202
 					}
2203 2203
 				}
2204 2204
 			}
2205 2205
 		}
2206 2206
 
2207 2207
 		/** Normalize the indices... */
2208
-		$form['fields'] = array_values( $form['fields'] );
2208
+		$form[ 'fields' ] = array_values( $form[ 'fields' ] );
2209 2209
 
2210 2210
 		/**
2211 2211
 		 * @filter `gravityview/edit_entry/conditional_logic` Should the Edit Entry form use Gravity Forms conditional logic showing/hiding of fields?
@@ -2215,16 +2215,16 @@  discard block
 block discarded – undo
2215 2215
 		 */
2216 2216
 		$use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form );
2217 2217
 
2218
-		if( $use_conditional_logic ) {
2218
+		if ( $use_conditional_logic ) {
2219 2219
 			return $form;
2220 2220
 		}
2221 2221
 
2222
-		foreach( $form['fields'] as &$field ) {
2222
+		foreach ( $form[ 'fields' ] as &$field ) {
2223 2223
 			/* @var GF_Field $field */
2224 2224
 			$field->conditionalLogic = null;
2225 2225
 		}
2226 2226
 
2227
-		unset( $form['button']['conditionalLogic'] );
2227
+		unset( $form[ 'button' ][ 'conditionalLogic' ] );
2228 2228
 
2229 2229
 		return $form;
2230 2230
 
@@ -2241,7 +2241,7 @@  discard block
 block discarded – undo
2241 2241
 	 */
2242 2242
 	public function manage_conditional_logic( $has_conditional_logic, $form ) {
2243 2243
 
2244
-		if( ! $this->is_edit_entry() ) {
2244
+		if ( ! $this->is_edit_entry() ) {
2245 2245
 			return $has_conditional_logic;
2246 2246
 		}
2247 2247
 
@@ -2273,44 +2273,44 @@  discard block
 block discarded – undo
2273 2273
 		 *  2. There are two entries embedded using oEmbed
2274 2274
 		 *  3. One of the entries has just been saved
2275 2275
 		 */
2276
-		if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) {
2276
+		if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) {
2277 2277
 
2278 2278
 			$error = true;
2279 2279
 
2280 2280
 		}
2281 2281
 
2282
-		if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) {
2282
+		if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) {
2283 2283
 
2284 2284
 			$error = true;
2285 2285
 
2286
-		} elseif( ! $this->verify_nonce() ) {
2286
+		} elseif ( ! $this->verify_nonce() ) {
2287 2287
 
2288 2288
 			/**
2289 2289
 			 * If the Entry is embedded, there may be two entries on the same page.
2290 2290
 			 * If that's the case, and one is being edited, the other should fail gracefully and not display an error.
2291 2291
 			 */
2292
-			if( GravityView_oEmbed::getInstance()->get_entry_id() ) {
2292
+			if ( GravityView_oEmbed::getInstance()->get_entry_id() ) {
2293 2293
 				$error = true;
2294 2294
 			} else {
2295
-				$error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview');
2295
+				$error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' );
2296 2296
 			}
2297 2297
 
2298 2298
 		}
2299 2299
 
2300
-		if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
2301
-			$error = __( 'You do not have permission to edit this entry.', 'gravityview');
2300
+		if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
2301
+			$error = __( 'You do not have permission to edit this entry.', 'gravityview' );
2302 2302
 		}
2303 2303
 
2304
-		if( $this->entry['status'] === 'trash' ) {
2305
-			$error = __('You cannot edit the entry; it is in the trash.', 'gravityview' );
2304
+		if ( $this->entry[ 'status' ] === 'trash' ) {
2305
+			$error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' );
2306 2306
 		}
2307 2307
 
2308 2308
 		// No errors; everything's fine here!
2309
-		if( empty( $error ) ) {
2309
+		if ( empty( $error ) ) {
2310 2310
 			return true;
2311 2311
 		}
2312 2312
 
2313
-		if( $echo && $error !== true ) {
2313
+		if ( $echo && $error !== true ) {
2314 2314
 
2315 2315
 	        $error = esc_html( $error );
2316 2316
 
@@ -2318,10 +2318,10 @@  discard block
 block discarded – undo
2318 2318
 	         * @since 1.9
2319 2319
 	         */
2320 2320
 	        if ( ! empty( $this->entry ) ) {
2321
-		        $error .= ' ' . gravityview_get_link( '#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) );
2321
+		        $error .= ' ' . gravityview_get_link( '#', _x( 'Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) );
2322 2322
 	        }
2323 2323
 
2324
-			echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
2324
+			echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' );
2325 2325
 		}
2326 2326
 
2327 2327
 		gravityview()->log->error( '{error}', array( 'error' => $error ) );
@@ -2341,17 +2341,17 @@  discard block
 block discarded – undo
2341 2341
 
2342 2342
 		$error = NULL;
2343 2343
 
2344
-		if( ! $this->check_user_cap_edit_field( $field ) ) {
2345
-			$error = __( 'You do not have permission to edit this field.', 'gravityview');
2344
+		if ( ! $this->check_user_cap_edit_field( $field ) ) {
2345
+			$error = __( 'You do not have permission to edit this field.', 'gravityview' );
2346 2346
 		}
2347 2347
 
2348 2348
 		// No errors; everything's fine here!
2349
-		if( empty( $error ) ) {
2349
+		if ( empty( $error ) ) {
2350 2350
 			return true;
2351 2351
 		}
2352 2352
 
2353
-		if( $echo ) {
2354
-			echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error');
2353
+		if ( $echo ) {
2354
+			echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' );
2355 2355
 		}
2356 2356
 
2357 2357
 		gravityview()->log->error( '{error}', array( 'error' => $error ) );
@@ -2372,14 +2372,14 @@  discard block
 block discarded – undo
2372 2372
 	private function check_user_cap_edit_field( $field ) {
2373 2373
 
2374 2374
 		// If they can edit any entries (as defined in Gravity Forms), we're good.
2375
-		if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
2375
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
2376 2376
 			return true;
2377 2377
 		}
2378 2378
 
2379
-		$field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false;
2379
+		$field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false;
2380 2380
 
2381
-		if( $field_cap ) {
2382
-			return GVCommon::has_cap( $field['allow_edit_cap'] );
2381
+		if ( $field_cap ) {
2382
+			return GVCommon::has_cap( $field[ 'allow_edit_cap' ] );
2383 2383
 		}
2384 2384
 
2385 2385
 		return false;
@@ -2393,17 +2393,17 @@  discard block
 block discarded – undo
2393 2393
 	public function verify_nonce() {
2394 2394
 
2395 2395
 		// Verify form submitted for editing single
2396
-		if( $this->is_edit_entry_submission() ) {
2396
+		if ( $this->is_edit_entry_submission() ) {
2397 2397
 			$valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
2398 2398
 		}
2399 2399
 
2400 2400
 		// Verify
2401
-		else if( ! $this->is_edit_entry() ) {
2401
+		else if ( ! $this->is_edit_entry() ) {
2402 2402
 			$valid = false;
2403 2403
 		}
2404 2404
 
2405 2405
 		else {
2406
-			$valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
2406
+			$valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key );
2407 2407
 		}
2408 2408
 
2409 2409
 		/**
Please login to merge, or discard this patch.
future/includes/class-gv-renderer.php 1 patch
Spacing   +4 added lines, -5 removed lines patch added patch discarded remove patch
@@ -49,11 +49,11 @@  discard block
 block discarded – undo
49 49
 
50 50
 		$post_types = get_post_types();
51 51
 
52
-		foreach( $post_types as $post_type ) {
52
+		foreach ( $post_types as $post_type ) {
53 53
 			$post_type_rewrite = get_post_type_object( $post_type )->rewrite;
54 54
 
55 55
 			if ( $slug = \GV\Utils::get( $post_type_rewrite, 'slug' ) ) {
56
-				$reserved_slugs[] = $slug;
56
+				$reserved_slugs[ ] = $slug;
57 57
 			}
58 58
 		}
59 59
 
@@ -89,8 +89,7 @@  discard block
 block discarded – undo
89 89
 				$tab = __( 'Edit Entry', 'gravityview' );
90 90
 				$context = 'edit';
91 91
 				break;
92
-			case ( $gravityview->request->is_entry( $gravityview->view->form ? $gravityview->view->form->ID : 0 ) ):
93
-				$tab = __( 'Single Entry', 'gravityview' );
92
+			case ( $gravityview->request->is_entry( $gravityview->view->form ? $gravityview->view->form->ID : 0 ) ) : $tab = __( 'Single Entry', 'gravityview' );
94 93
 				$context = 'single';
95 94
 				break;
96 95
 			default:
@@ -110,7 +109,7 @@  discard block
 block discarded – undo
110 109
 		$action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab );
111 110
 		$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' );
112 111
 
113
-		$image =  sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
112
+		$image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
114 113
 		$output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message );
115 114
 
116 115
 		echo \GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $gravityview->view->ID );
Please login to merge, or discard this patch.