Completed
Pull Request — develop (#1404)
by Gennady
06:29
created
includes/extensions/delete-entry/class-delete-entry.php 1 patch
Spacing   +73 added lines, -73 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, 'maybe_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, \GV\Utils::_GET( 'gvid', \GV\Utils::_GET( 'view_id' ) ) );
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
 		}
@@ -722,7 +722,7 @@  discard block
 block discarded – undo
722 722
 		}
723 723
 
724 724
 		// If the logged-in user is the same as the user who created the entry, we're good.
725
-		if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
725
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
726 726
 
727 727
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
728 728
 
@@ -746,12 +746,12 @@  discard block
 block discarded – undo
746 746
 	 * @return void
747 747
 	 */
748 748
 	public function maybe_display_message( $current_view_id = 0 ) {
749
-		if( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
749
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
750 750
 			return;
751 751
 		}
752 752
 
753 753
 		// Entry wasn't deleted from current View
754
-		if( isset( $_GET['view_id'] ) && intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) {
754
+		if ( isset( $_GET[ 'view_id' ] ) && intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) {
755 755
 			return;
756 756
 		}
757 757
 
@@ -760,11 +760,11 @@  discard block
 block discarded – undo
760 760
 
761 761
 	public function display_message() {
762 762
 
763
-		if ( empty( $_GET['status'] ) || empty( $_GET['delete'] ) ) {
763
+		if ( empty( $_GET[ 'status' ] ) || empty( $_GET[ 'delete' ] ) ) {
764 764
 			return;
765 765
 		}
766 766
 
767
-		$status = esc_attr( $_GET['status'] );
767
+		$status = esc_attr( $_GET[ 'status' ] );
768 768
 		$message_from_url = \GV\Utils::_GET( 'message' );
769 769
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
770 770
 		$class = '';
@@ -772,14 +772,14 @@  discard block
 block discarded – undo
772 772
 		switch ( $status ) {
773 773
 			case 'error':
774 774
 				$class = ' gv-error error';
775
-				$error_message = __('There was an error deleting the entry: %s', 'gravityview');
775
+				$error_message = __( 'There was an error deleting the entry: %s', 'gravityview' );
776 776
 				$message = sprintf( $error_message, $message_from_url );
777 777
 				break;
778 778
 			case 'trashed':
779
-				$message = __('The entry was successfully moved to the trash.', 'gravityview');
779
+				$message = __( 'The entry was successfully moved to the trash.', 'gravityview' );
780 780
 				break;
781 781
 			default:
782
-				$message = __('The entry was successfully deleted.', 'gravityview');
782
+				$message = __( 'The entry was successfully deleted.', 'gravityview' );
783 783
 				break;
784 784
 		}
785 785
 
@@ -793,7 +793,7 @@  discard block
 block discarded – undo
793 793
 		$message = apply_filters( 'gravityview/delete-entry/message', esc_attr( $message ), $status, $message_from_url );
794 794
 
795 795
 		// DISPLAY ERROR/SUCCESS MESSAGE
796
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
796
+		echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>';
797 797
 	}
798 798
 
799 799
 
Please login to merge, or discard this patch.
includes/extensions/duplicate-entry/class-duplicate-entry.php 1 patch
Spacing   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -115,12 +115,12 @@  discard block
 block discarded – undo
115 115
 	public function duplicate_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
116 116
 
117 117
 		// Always a link, never a filter, always same window
118
-		unset( $field_options['show_as_link'], $field_options['search_filter'], $field_options['new_window'] );
118
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ], $field_options[ 'new_window' ] );
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;
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
 	 */
247 247
 	public static function get_duplicate_link( $entry, $view_id, $post_id = null ) {
248 248
 
249
-        $base = GravityView_API::directory_link( $post_id ? : $view_id, true );
249
+        $base = GravityView_API::directory_link( $post_id ?: $view_id, true );
250 250
 
251 251
 		if ( empty( $base ) ) {
252 252
 			gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) );
@@ -255,12 +255,12 @@  discard block
 block discarded – undo
255 255
 
256 256
 		$actionurl = add_query_arg( array(
257 257
 			'action'	=> 'duplicate',
258
-			'entry_id'	=> $entry['id'],
258
+			'entry_id'	=> $entry[ 'id' ],
259 259
 			'gvid' => $view_id,
260 260
             'view_id' => $view_id,
261 261
 		), $base );
262 262
 
263
-		return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry['id'] ) ), $actionurl );
263
+		return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry[ 'id' ] ) ), $actionurl );
264 264
 	}
265 265
 
266 266
 	/**
@@ -281,12 +281,12 @@  discard block
 block discarded – undo
281 281
 	public function process_duplicate() {
282 282
 
283 283
 		// If the form is submitted
284
-		if ( ! isset( $_GET['action'] ) || 'duplicate' !== $_GET['action'] || ! isset( $_GET['entry_id'] ) ) {
284
+		if ( ! isset( $_GET[ 'action' ] ) || 'duplicate' !== $_GET[ 'action' ] || ! isset( $_GET[ 'entry_id' ] ) ) {
285 285
 			return;
286 286
 		}
287 287
 
288 288
 		// Make sure it's a GravityView request
289
-		$valid_nonce_key = wp_verify_nonce( \GV\Utils::_GET( 'duplicate' ), self::get_nonce_key( $_GET['entry_id'] ) );
289
+		$valid_nonce_key = wp_verify_nonce( \GV\Utils::_GET( 'duplicate' ), self::get_nonce_key( $_GET[ 'entry_id' ] ) );
290 290
 
291 291
 		if ( ! $valid_nonce_key ) {
292 292
 			gravityview()->log->debug( 'Duplicate entry not processed: nonce validation failed.' );
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
 		}
295 295
 
296 296
 		// Get the entry slug
297
-		$entry_slug = esc_attr( $_GET['entry_id'] );
297
+		$entry_slug = esc_attr( $_GET[ 'entry_id' ] );
298 298
 
299 299
 		// See if there's an entry there
300 300
 		$entry = gravityview_get_entry( $entry_slug, true, false );
@@ -388,15 +388,15 @@  discard block
 block discarded – undo
388 388
 			return new WP_Error( 'gravityview-duplicate-entry-missing', __( 'The entry does not exist.', 'gravityview' ) );
389 389
 		}
390 390
 
391
-		$row['id'] = null;
392
-		$row['date_created'] = date( 'Y-m-d H:i:s', time() );
393
-		$row['date_updated'] = $row['date_created'];
394
-		$row['is_starred'] = false;
395
-		$row['is_read'] = false;
396
-		$row['ip'] = GFFormsModel::get_ip();
397
-		$row['source_url'] = esc_url_raw( remove_query_arg( array( 'action', 'gvid' ) ) );
398
-		$row['user_agent'] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' );
399
-		$row['created_by'] = wp_get_current_user()->ID;
391
+		$row[ 'id' ] = null;
392
+		$row[ 'date_created' ] = date( 'Y-m-d H:i:s', time() );
393
+		$row[ 'date_updated' ] = $row[ 'date_created' ];
394
+		$row[ 'is_starred' ] = false;
395
+		$row[ 'is_read' ] = false;
396
+		$row[ 'ip' ] = GFFormsModel::get_ip();
397
+		$row[ 'source_url' ] = esc_url_raw( remove_query_arg( array( 'action', 'gvid' ) ) );
398
+		$row[ 'user_agent' ] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' );
399
+		$row[ 'created_by' ] = wp_get_current_user()->ID;
400 400
 
401 401
 		/**
402 402
 		 * @filter `gravityview/entry/duplicate/details` Modify the new entry details before it's created.
@@ -424,15 +424,15 @@  discard block
 block discarded – undo
424 424
 
425 425
 		$save_this_meta = array();
426 426
 		foreach ( $duplicate_meta->get_output() as $m ) {
427
-			$save_this_meta[] = array(
428
-				'meta_key' => $m['meta_key'],
429
-				'meta_value' => $m['meta_value'],
430
-				'item_index' => $m['item_index'],
427
+			$save_this_meta[ ] = array(
428
+				'meta_key' => $m[ 'meta_key' ],
429
+				'meta_value' => $m[ 'meta_value' ],
430
+				'item_index' => $m[ 'item_index' ],
431 431
 			);
432 432
 		}
433 433
 
434 434
 		// Update the row ID for later usage
435
-		$row['id'] = $duplicated_id;
435
+		$row[ 'id' ] = $duplicated_id;
436 436
 
437 437
 		/**
438 438
 		 * @filter `gravityview/entry/duplicate/meta` Modify the new entry meta details.
@@ -443,8 +443,8 @@  discard block
 block discarded – undo
443 443
 		$save_this_meta = apply_filters( 'gravityview/entry/duplicate/meta', $save_this_meta, $row, $entry );
444 444
 
445 445
 		foreach ( $save_this_meta as $data ) {
446
-			$data['form_id'] = $entry['form_id'];
447
-			$data['entry_id'] = $duplicated_id;
446
+			$data[ 'form_id' ] = $entry[ 'form_id' ];
447
+			$data[ 'entry_id' ] = $duplicated_id;
448 448
 
449 449
 			if ( ! $wpdb->insert( $entry_meta_table, $data ) ) {
450 450
 				return new WP_Error( 'gravityview-duplicate-entry-db-meta', __( 'There was an error duplicating the entry.', 'gravityview' ) );
@@ -478,13 +478,13 @@  discard block
 block discarded – undo
478 478
 	public function verify_nonce() {
479 479
 
480 480
 		// No duplicate entry request was made
481
-		if ( empty( $_GET['entry_id'] ) || empty( $_GET['duplicate'] ) ) {
481
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'duplicate' ] ) ) {
482 482
 			return false;
483 483
 		}
484 484
 
485
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
485
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
486 486
 
487
-		$valid = wp_verify_nonce( $_GET['duplicate'], $nonce_key );
487
+		$valid = wp_verify_nonce( $_GET[ 'duplicate' ], $nonce_key );
488 488
 
489 489
 		/**
490 490
 		 * @filter `gravityview/duplicate-entry/verify_nonce` Override Duplicate Entry nonce validation. Return true to declare nonce valid.
@@ -520,7 +520,7 @@  discard block
 block discarded – undo
520 520
 			return '';
521 521
 		}
522 522
 
523
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
523
+		return 'return window.confirm(\'' . esc_js( $confirm ) . '\');';
524 524
 	}
525 525
 
526 526
 	/**
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
574 574
 	public static function check_user_cap_duplicate_entry( $entry, $field = array(), $view_id = 0 ) {
575 575
 		$current_user = wp_get_current_user();
576 576
 
577
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : null;
577
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : null;
578 578
 
579 579
 		// Or if they can duplicate any entries (as defined in Gravity Forms), we're good.
580 580
 		if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gform_full_access', 'gravityview_full_access' ), $entry_id ) ) {
@@ -589,17 +589,17 @@  discard block
 block discarded – undo
589 589
 		if ( ! empty( $field ) ) {
590 590
 
591 591
 			// If capability is not defined, something is not right!
592
-			if ( empty( $field['allow_duplicate_cap'] ) ) {
592
+			if ( empty( $field[ 'allow_duplicate_cap' ] ) ) {
593 593
 
594 594
 				gravityview()->log->error( 'Cannot read duplicate entry field caps', array( 'data' => $field ) );
595 595
 
596 596
 				return false;
597 597
 			}
598 598
 
599
-			if ( GVCommon::has_cap( $field['allow_duplicate_cap'] ) ) {
599
+			if ( GVCommon::has_cap( $field[ 'allow_duplicate_cap' ] ) ) {
600 600
 
601 601
 				// Do not return true if cap is read, as we need to check if the current user created the entry
602
-				if ( 'read' !== $field['allow_duplicate_cap'] ) {
602
+				if ( 'read' !== $field[ 'allow_duplicate_cap' ] ) {
603 603
 					return true;
604 604
 				}
605 605
 
@@ -612,7 +612,7 @@  discard block
 block discarded – undo
612 612
 
613 613
 		}
614 614
 
615
-		if ( ! isset( $entry['created_by'] ) ) {
615
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
616 616
 
617 617
 			gravityview()->log->error( 'Cannot duplicate entry; entry `created_by` doesn\'t exist.' );
618 618
 
@@ -637,7 +637,7 @@  discard block
 block discarded – undo
637 637
 		}
638 638
 
639 639
 		// If the logged-in user is the same as the user who created the entry, we're good.
640
-		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
640
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
641 641
 
642 642
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
643 643
 
@@ -661,12 +661,12 @@  discard block
 block discarded – undo
661 661
 	 * @return void
662 662
 	 */
663 663
 	public function maybe_display_message( $current_view_id = 0 ) {
664
-		if ( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
664
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
665 665
 			return;
666 666
 		}
667 667
 
668 668
 		// Entry wasn't duplicated from current View
669
-		if ( isset( $_GET['view_id'] ) && ( intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) ) {
669
+		if ( isset( $_GET[ 'view_id' ] ) && ( intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) ) {
670 670
 			return;
671 671
 		}
672 672
 
@@ -674,11 +674,11 @@  discard block
 block discarded – undo
674 674
 	}
675 675
 
676 676
 	public function display_message() {
677
-		if ( empty( $_GET['status'] ) || empty( $_GET['duplicate'] ) ) {
677
+		if ( empty( $_GET[ 'status' ] ) || empty( $_GET[ 'duplicate' ] ) ) {
678 678
 			return;
679 679
 		}
680 680
 
681
-		$status = esc_attr( $_GET['status'] );
681
+		$status = esc_attr( $_GET[ 'status' ] );
682 682
 		$message_from_url = \GV\Utils::_GET( 'message' );
683 683
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
684 684
 		$class = '';
@@ -704,7 +704,7 @@  discard block
 block discarded – undo
704 704
 		$message = apply_filters( 'gravityview/duplicate-entry/message', esc_attr( $message ), $status, $message_from_url );
705 705
 
706 706
 		// DISPLAY ERROR/SUCCESS MESSAGE
707
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
707
+		echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>';
708 708
 	}
709 709
 
710 710
 	/**
@@ -735,7 +735,7 @@  discard block
 block discarded – undo
735 735
 		?>
736 736
 		<span class="duplicate">
737 737
 			|
738
-			<a href="<?php echo wp_nonce_url( add_query_arg( 'entry_id', $entry['id'] ), self::get_nonce_key( $entry['id'] ), 'duplicate' ); ?>"><?php esc_html_e( 'Duplicate', 'gravityview' ); ?></a>
738
+			<a href="<?php echo wp_nonce_url( add_query_arg( 'entry_id', $entry[ 'id' ] ), self::get_nonce_key( $entry[ 'id' ] ), 'duplicate' ); ?>"><?php esc_html_e( 'Duplicate', 'gravityview' ); ?></a>
739 739
 		</span>
740 740
 		<?php
741 741
 	}
@@ -757,9 +757,9 @@  discard block
 block discarded – undo
757 757
 
758 758
 		if ( 'success' === \GV\Utils::_GET( 'result' ) ) {
759 759
 			add_filter( 'gform_admin_messages', function( $messages ) {
760
-				$messages = (array) $messages;
760
+				$messages = (array)$messages;
761 761
 
762
-				$messages[] = esc_html__( 'Entry duplicated.', 'gravityview' );
762
+				$messages[ ] = esc_html__( 'Entry duplicated.', 'gravityview' );
763 763
 				return $messages;
764 764
 			} );
765 765
 		}
@@ -770,7 +770,7 @@  discard block
 block discarded – undo
770 770
 
771 771
 			$check_logs_message = '';
772 772
 
773
-			if( $is_logging_active ) {
773
+			if ( $is_logging_active ) {
774 774
 				$check_logs_message = sprintf( ' <a href="%s">%s</a>',
775 775
 					esc_url( admin_url( 'admin.php?page=gf_settings&subview=gravityformslogging' ) ),
776 776
 					esc_html_x( 'Check the GravityView logs for more information.', 'Error message links to logging page', 'gravityview' )
@@ -778,9 +778,9 @@  discard block
 block discarded – undo
778 778
 			}
779 779
 
780 780
 			add_filter( 'gform_admin_error_messages', function( $messages ) use ( $check_logs_message ) {
781
-				$messages = (array) $messages;
781
+				$messages = (array)$messages;
782 782
 
783
-				$messages[] = esc_html__( 'There was an error duplicating the entry.', 'gravityview' ) . $check_logs_message;
783
+				$messages[ ] = esc_html__( 'There was an error duplicating the entry.', 'gravityview' ) . $check_logs_message;
784 784
 
785 785
 				return $messages;
786 786
 			} );
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry.php 2 patches
Indentation   +156 added lines, -156 removed lines patch added patch discarded remove patch
@@ -18,82 +18,82 @@  discard block
 block discarded – undo
18 18
 
19 19
 class GravityView_Edit_Entry {
20 20
 
21
-    /**
22
-     * @var string
23
-     */
21
+	/**
22
+	 * @var string
23
+	 */
24 24
 	static $file;
25 25
 
26 26
 	static $instance;
27 27
 
28
-    /**
29
-     * Component instances.
30
-     * @var array
31
-     */
32
-    public $instances = array();
28
+	/**
29
+	 * Component instances.
30
+	 * @var array
31
+	 */
32
+	public $instances = array();
33 33
 
34 34
 
35 35
 	function __construct() {
36 36
 
37
-        self::$file = plugin_dir_path( __FILE__ );
37
+		self::$file = plugin_dir_path( __FILE__ );
38 38
 
39
-        if( is_admin() ) {
40
-            $this->load_components( 'admin' );
41
-        }
39
+		if( is_admin() ) {
40
+			$this->load_components( 'admin' );
41
+		}
42 42
 
43 43
 
44
-        $this->load_components( 'render' );
44
+		$this->load_components( 'render' );
45 45
 
46
-        // If GF User Registration Add-on exists
47
-        $this->load_components( 'user-registration' );
46
+		// If GF User Registration Add-on exists
47
+		$this->load_components( 'user-registration' );
48 48
 
49
-        $this->add_hooks();
49
+		$this->add_hooks();
50 50
 
51 51
 		// Process hooks for addons that may or may not be present
52 52
 		$this->addon_specific_hooks();
53 53
 	}
54 54
 
55 55
 
56
-    static function getInstance() {
56
+	static function getInstance() {
57 57
 
58
-        if( empty( self::$instance ) ) {
59
-            self::$instance = new GravityView_Edit_Entry;
60
-        }
58
+		if( empty( self::$instance ) ) {
59
+			self::$instance = new GravityView_Edit_Entry;
60
+		}
61 61
 
62
-        return self::$instance;
63
-    }
62
+		return self::$instance;
63
+	}
64 64
 
65 65
 
66
-    private function load_components( $component ) {
66
+	private function load_components( $component ) {
67 67
 
68
-        $dir = trailingslashit( self::$file );
68
+		$dir = trailingslashit( self::$file );
69 69
 
70
-        $filename  = $dir . 'class-edit-entry-' . $component . '.php';
71
-        $classname = 'GravityView_Edit_Entry_' . str_replace( ' ', '_', ucwords( str_replace( '-', ' ', $component ) ) );
70
+		$filename  = $dir . 'class-edit-entry-' . $component . '.php';
71
+		$classname = 'GravityView_Edit_Entry_' . str_replace( ' ', '_', ucwords( str_replace( '-', ' ', $component ) ) );
72 72
 
73
-        // Loads component and pass extension's instance so that component can
74
-        // talk each other.
75
-        require_once $filename;
76
-        $this->instances[ $component ] = new $classname( $this );
77
-        $this->instances[ $component ]->load();
73
+		// Loads component and pass extension's instance so that component can
74
+		// talk each other.
75
+		require_once $filename;
76
+		$this->instances[ $component ] = new $classname( $this );
77
+		$this->instances[ $component ]->load();
78 78
 
79
-    }
79
+	}
80 80
 
81
-    private function add_hooks() {
81
+	private function add_hooks() {
82 82
 
83
-        // Add front-end access to Gravity Forms delete file action
84
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') );
83
+		// Add front-end access to Gravity Forms delete file action
84
+		add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') );
85 85
 
86
-        // Make sure this hook is run for non-admins
87
-        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
86
+		// Make sure this hook is run for non-admins
87
+		add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
88 88
 
89
-        add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
89
+		add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
90 90
 
91
-        // add template path to check for field
92
-        add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
91
+		// add template path to check for field
92
+		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
93 93
 
94 94
 		add_filter( 'gravityview/field/is_visible', array( $this, 'maybe_not_visible' ), 10, 3 );
95 95
 
96
-    }
96
+	}
97 97
 
98 98
 	/**
99 99
 	 * Trigger hooks that are normally run in the admin for Addons, but need to be triggered manually because we're not in the admin
@@ -151,74 +151,74 @@  discard block
 block discarded – undo
151 151
 		return false;
152 152
 	}
153 153
 
154
-    /**
155
-     * Include this extension templates path
156
-     * @param array $file_paths List of template paths ordered
157
-     */
158
-    public function add_template_path( $file_paths ) {
159
-
160
-        // Index 100 is the default GravityView template path.
161
-        $file_paths[ 110 ] = self::$file;
162
-
163
-        return $file_paths;
164
-    }
165
-
166
-    /**
167
-     *
168
-     * Return a well formatted nonce key according to GravityView Edit Entry protocol
169
-     *
170
-     * @param $view_id int GravityView view id
171
-     * @param $form_id int Gravity Forms form id
172
-     * @param $entry_id int Gravity Forms entry id
173
-     * @return string
174
-     */
175
-    public static function get_nonce_key( $view_id, $form_id, $entry_id ) {
176
-        return sprintf( 'edit_%d_%d_%d', $view_id, $form_id, $entry_id );
177
-    }
178
-
179
-
180
-    /**
181
-     * The edit entry link creates a secure link with a nonce
182
-     *
183
-     * It also mimics the URL structure Gravity Forms expects to have so that
184
-     * it formats the display of the edit form like it does in the backend, like
185
-     * "You can edit this post from the post page" fields, for example.
186
-     *
187
-     * @param $entry array Gravity Forms entry object
188
-     * @param $view_id int GravityView view id
189
-     * @param $post_id int GravityView Post ID where View may be embedded {@since 1.9.2}
190
-     * @param string|array $field_values Parameters to pass in to the Edit Entry form to prefill data. Uses the same format as Gravity Forms "Allow field to be populated dynamically" {@since 1.9.2} {@see https://www.gravityhelp.com/documentation/article/allow-field-to-be-populated-dynamically/ }
191
-     * @return string
192
-     */
193
-    public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
194
-
195
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
196
-
197
-        $base = gv_entry_link( $entry, $post_id ? : $view_id  );
198
-
199
-        $url = add_query_arg( array(
200
-            'edit' => wp_create_nonce( $nonce_key )
201
-        ), $base );
202
-
203
-        if( $post_id ) {
204
-	        $url = add_query_arg( array( 'gvid' => $view_id ), $url );
205
-        }
206
-
207
-	    /**
208
-	     * Allow passing params to dynamically populate entry with values
209
-	     * @since 1.9.2
210
-	     */
211
-	    if( !empty( $field_values ) ) {
212
-
213
-		    if( is_array( $field_values ) ) {
214
-			    // If already an array, no parse_str() needed
215
-			    $params = $field_values;
216
-		    } else {
217
-			    parse_str( $field_values, $params );
218
-		    }
219
-
220
-		    $url = add_query_arg( $params, $url );
221
-	    }
154
+	/**
155
+	 * Include this extension templates path
156
+	 * @param array $file_paths List of template paths ordered
157
+	 */
158
+	public function add_template_path( $file_paths ) {
159
+
160
+		// Index 100 is the default GravityView template path.
161
+		$file_paths[ 110 ] = self::$file;
162
+
163
+		return $file_paths;
164
+	}
165
+
166
+	/**
167
+	 *
168
+	 * Return a well formatted nonce key according to GravityView Edit Entry protocol
169
+	 *
170
+	 * @param $view_id int GravityView view id
171
+	 * @param $form_id int Gravity Forms form id
172
+	 * @param $entry_id int Gravity Forms entry id
173
+	 * @return string
174
+	 */
175
+	public static function get_nonce_key( $view_id, $form_id, $entry_id ) {
176
+		return sprintf( 'edit_%d_%d_%d', $view_id, $form_id, $entry_id );
177
+	}
178
+
179
+
180
+	/**
181
+	 * The edit entry link creates a secure link with a nonce
182
+	 *
183
+	 * It also mimics the URL structure Gravity Forms expects to have so that
184
+	 * it formats the display of the edit form like it does in the backend, like
185
+	 * "You can edit this post from the post page" fields, for example.
186
+	 *
187
+	 * @param $entry array Gravity Forms entry object
188
+	 * @param $view_id int GravityView view id
189
+	 * @param $post_id int GravityView Post ID where View may be embedded {@since 1.9.2}
190
+	 * @param string|array $field_values Parameters to pass in to the Edit Entry form to prefill data. Uses the same format as Gravity Forms "Allow field to be populated dynamically" {@since 1.9.2} {@see https://www.gravityhelp.com/documentation/article/allow-field-to-be-populated-dynamically/ }
191
+	 * @return string
192
+	 */
193
+	public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
194
+
195
+		$nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
196
+
197
+		$base = gv_entry_link( $entry, $post_id ? : $view_id  );
198
+
199
+		$url = add_query_arg( array(
200
+			'edit' => wp_create_nonce( $nonce_key )
201
+		), $base );
202
+
203
+		if( $post_id ) {
204
+			$url = add_query_arg( array( 'gvid' => $view_id ), $url );
205
+		}
206
+
207
+		/**
208
+		 * Allow passing params to dynamically populate entry with values
209
+		 * @since 1.9.2
210
+		 */
211
+		if( !empty( $field_values ) ) {
212
+
213
+			if( is_array( $field_values ) ) {
214
+				// If already an array, no parse_str() needed
215
+				$params = $field_values;
216
+			} else {
217
+				parse_str( $field_values, $params );
218
+			}
219
+
220
+			$url = add_query_arg( $params, $url );
221
+		}
222 222
 
223 223
 		/**
224 224
 		 * @filter `gravityview/edit/link` Filter the edit URL link.
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
 		 * @param \GV\View $view The View.
228 228
 		 */
229 229
 		return apply_filters( 'gravityview/edit/link', $url, $entry, \GV\View::by_id( $view_id  ) );
230
-    }
230
+	}
231 231
 
232 232
 	/**
233 233
 	 * Edit mode doesn't allow certain field types.
@@ -282,19 +282,19 @@  discard block
 block discarded – undo
282 282
 	}
283 283
 
284 284
 
285
-    /**
286
-     * checks if user has permissions to edit a specific entry
287
-     *
288
-     * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_entry for maximum security!!
289
-     *
290
-     * @param  array $entry Gravity Forms entry array
291
-     * @param \GV\View int $view_id ID of the view you want to check visibility against {@since 1.9.2}. Required since 2.0
292
-     * @return bool
293
-     */
294
-    public static function check_user_cap_edit_entry( $entry, $view = 0 ) {
285
+	/**
286
+	 * checks if user has permissions to edit a specific entry
287
+	 *
288
+	 * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_entry for maximum security!!
289
+	 *
290
+	 * @param  array $entry Gravity Forms entry array
291
+	 * @param \GV\View int $view_id ID of the view you want to check visibility against {@since 1.9.2}. Required since 2.0
292
+	 * @return bool
293
+	 */
294
+	public static function check_user_cap_edit_entry( $entry, $view = 0 ) {
295 295
 
296
-        // No permission by default
297
-        $user_can_edit = false;
296
+		// No permission by default
297
+		$user_can_edit = false;
298 298
 
299 299
 		// get user_edit setting
300 300
 		if ( empty( $view ) ) {
@@ -312,59 +312,59 @@  discard block
 block discarded – undo
312 312
 			$user_edit = GVCommon::get_template_setting( $view_id, 'user_edit' );
313 313
 		}
314 314
 
315
-        // If they can edit any entries (as defined in Gravity Forms)
316
-        // Or if they can edit other people's entries
317
-        // Then we're good.
318
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
315
+		// If they can edit any entries (as defined in Gravity Forms)
316
+		// Or if they can edit other people's entries
317
+		// Then we're good.
318
+		if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
319 319
 
320
-            gravityview()->log->debug( 'User has ability to edit all entries.' );
320
+			gravityview()->log->debug( 'User has ability to edit all entries.' );
321 321
 
322
-            $user_can_edit = true;
322
+			$user_can_edit = true;
323 323
 
324
-        } else if( !isset( $entry['created_by'] ) ) {
324
+		} else if( !isset( $entry['created_by'] ) ) {
325 325
 
326
-            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
326
+			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
327 327
 
328
-            $user_can_edit = false;
328
+			$user_can_edit = false;
329 329
 
330
-        } else {
330
+		} else {
331 331
 
332 332
 
333
-            $current_user = wp_get_current_user();
333
+			$current_user = wp_get_current_user();
334 334
 
335
-            // User edit is disabled
336
-            if( empty( $user_edit ) ) {
335
+			// User edit is disabled
336
+			if( empty( $user_edit ) ) {
337 337
 
338
-                gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
338
+				gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
339 339
 
340
-                $user_can_edit = false;
341
-            }
340
+				$user_can_edit = false;
341
+			}
342 342
 
343
-            // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
344
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
343
+			// User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
344
+			else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
345 345
 
346
-                gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
346
+				gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
347 347
 
348
-                $user_can_edit = true;
348
+				$user_can_edit = true;
349 349
 
350
-            } else if( ! is_user_logged_in() ) {
350
+			} else if( ! is_user_logged_in() ) {
351 351
 
352
-                gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
353
-            }
352
+				gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
353
+			}
354 354
 
355
-        }
355
+		}
356 356
 
357
-        /**
358
-         * @filter `gravityview/edit_entry/user_can_edit_entry` Modify whether user can edit an entry.
359
-         * @since 1.15 Added `$entry` and `$view_id` parameters
360
-         * @param[in,out] boolean $user_can_edit Can the current user edit the current entry? (Default: false)
361
-         * @param[in] array $entry Gravity Forms entry array {@since 1.15}
362
-         * @param[in] int $view_id ID of the view you want to check visibility against {@since 1.15}
363
-         */
364
-        $user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id );
357
+		/**
358
+		 * @filter `gravityview/edit_entry/user_can_edit_entry` Modify whether user can edit an entry.
359
+		 * @since 1.15 Added `$entry` and `$view_id` parameters
360
+		 * @param[in,out] boolean $user_can_edit Can the current user edit the current entry? (Default: false)
361
+		 * @param[in] array $entry Gravity Forms entry array {@since 1.15}
362
+		 * @param[in] int $view_id ID of the view you want to check visibility against {@since 1.15}
363
+		 */
364
+		$user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id );
365 365
 
366
-        return (bool)$user_can_edit;
367
-    }
366
+		return (bool)$user_can_edit;
367
+	}
368 368
 
369 369
 
370 370
 
Please login to merge, or discard this patch.
Spacing   +19 added lines, -19 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
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
     static function getInstance() {
57 57
 
58
-        if( empty( self::$instance ) ) {
58
+        if ( empty( self::$instance ) ) {
59 59
             self::$instance = new GravityView_Edit_Entry;
60 60
         }
61 61
 
@@ -81,10 +81,10 @@  discard block
 block discarded – undo
81 81
     private function add_hooks() {
82 82
 
83 83
         // Add front-end access to Gravity Forms delete file action
84
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') );
84
+        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file' ) );
85 85
 
86 86
         // Make sure this hook is run for non-admins
87
-        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
87
+        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file' ) );
88 88
 
89 89
         add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
90 90
 
@@ -101,8 +101,8 @@  discard block
 block discarded – undo
101 101
 	 */
102 102
 	private function addon_specific_hooks() {
103 103
 
104
-		if( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
105
-			add_filter('gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script'));
104
+		if ( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
105
+			add_filter( 'gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script' ) );
106 106
 		}
107 107
 
108 108
 	}
@@ -192,15 +192,15 @@  discard block
 block discarded – undo
192 192
      */
193 193
     public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
194 194
 
195
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
195
+        $nonce_key = self::get_nonce_key( $view_id, $entry[ 'form_id' ], $entry[ 'id' ] );
196 196
 
197
-        $base = gv_entry_link( $entry, $post_id ? : $view_id  );
197
+        $base = gv_entry_link( $entry, $post_id ?: $view_id );
198 198
 
199 199
         $url = add_query_arg( array(
200 200
             'edit' => wp_create_nonce( $nonce_key )
201 201
         ), $base );
202 202
 
203
-        if( $post_id ) {
203
+        if ( $post_id ) {
204 204
 	        $url = add_query_arg( array( 'gvid' => $view_id ), $url );
205 205
         }
206 206
 
@@ -208,9 +208,9 @@  discard block
 block discarded – undo
208 208
 	     * Allow passing params to dynamically populate entry with values
209 209
 	     * @since 1.9.2
210 210
 	     */
211
-	    if( !empty( $field_values ) ) {
211
+	    if ( ! empty( $field_values ) ) {
212 212
 
213
-		    if( is_array( $field_values ) ) {
213
+		    if ( is_array( $field_values ) ) {
214 214
 			    // If already an array, no parse_str() needed
215 215
 			    $params = $field_values;
216 216
 		    } else {
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 		 * @param array $entry The entry.
227 227
 		 * @param \GV\View $view The View.
228 228
 		 */
229
-		return apply_filters( 'gravityview/edit/link', $url, $entry, \GV\View::by_id( $view_id  ) );
229
+		return apply_filters( 'gravityview/edit/link', $url, $entry, \GV\View::by_id( $view_id ) );
230 230
     }
231 231
 
232 232
 	/**
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
 	 */
238 238
 	public function modify_field_blacklist( $fields = array(), $context = NULL ) {
239 239
 
240
-		if( empty( $context ) || $context !== 'edit' ) {
240
+		if ( empty( $context ) || $context !== 'edit' ) {
241 241
 			return $fields;
242 242
 		}
243 243
 
@@ -315,15 +315,15 @@  discard block
 block discarded – undo
315 315
         // If they can edit any entries (as defined in Gravity Forms)
316 316
         // Or if they can edit other people's entries
317 317
         // Then we're good.
318
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
318
+        if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry[ 'id' ] ) ) {
319 319
 
320 320
             gravityview()->log->debug( 'User has ability to edit all entries.' );
321 321
 
322 322
             $user_can_edit = true;
323 323
 
324
-        } else if( !isset( $entry['created_by'] ) ) {
324
+        } else if ( ! isset( $entry[ 'created_by' ] ) ) {
325 325
 
326
-            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
326
+            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
327 327
 
328 328
             $user_can_edit = false;
329 329
 
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
             $current_user = wp_get_current_user();
334 334
 
335 335
             // User edit is disabled
336
-            if( empty( $user_edit ) ) {
336
+            if ( empty( $user_edit ) ) {
337 337
 
338 338
                 gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
339 339
 
@@ -341,13 +341,13 @@  discard block
 block discarded – undo
341 341
             }
342 342
 
343 343
             // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
344
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
344
+            else if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
345 345
 
346 346
                 gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
347 347
 
348 348
                 $user_can_edit = true;
349 349
 
350
-            } else if( ! is_user_logged_in() ) {
350
+            } else if ( ! is_user_logged_in() ) {
351 351
 
352 352
                 gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
353 353
             }
Please login to merge, or discard this patch.