Completed
Push — develop ( dd064f...98d1cd )
by Zack
35:55 queued 15:57
created
includes/admin/metaboxes/class-gravityview-admin-metaboxes.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
52 52
 	function update_priority() {
53 53
 		global $wp_meta_boxes;
54 54
 
55
-		if ( ! empty( $wp_meta_boxes['gravityview'] ) ) {
55
+		if ( ! empty( $wp_meta_boxes[ 'gravityview' ] ) ) {
56 56
 			foreach ( array( 'high', 'core', 'low' ) as $position ) {
57
-				if ( isset( $wp_meta_boxes['gravityview']['normal'][ $position ] ) ) {
58
-					foreach ( $wp_meta_boxes['gravityview']['normal'][ $position ] as $key => $meta_box ) {
57
+				if ( isset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] ) ) {
58
+					foreach ( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] as $key => $meta_box ) {
59 59
 						if ( ! preg_match( '/^gravityview_/ism', $key ) ) {
60
-							$wp_meta_boxes['gravityview']['advanced'][ $position ][ $key ] = $meta_box;
61
-							unset( $wp_meta_boxes['gravityview']['normal'][ $position ][ $key ] );
60
+							$wp_meta_boxes[ 'gravityview' ][ 'advanced' ][ $position ][ $key ] = $meta_box;
61
+							unset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ][ $key ] );
62 62
 						}
63 63
 					}
64 64
 				}
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 
192 192
 		foreach ( $metaboxes as $m ) {
193 193
 
194
-			$tab = new GravityView_Metabox_Tab( $m['id'], $m['title'], $m['file'], $m['icon-class'], $m['callback'], $m['callback_args'] );
194
+			$tab = new GravityView_Metabox_Tab( $m[ 'id' ], $m[ 'title' ], $m[ 'file' ], $m[ 'icon-class' ], $m[ 'callback' ], $m[ 'callback_args' ] );
195 195
 
196 196
 			GravityView_Metabox_Tabs::add( $tab );
197 197
 
@@ -261,13 +261,13 @@  discard block
 block discarded – undo
261 261
 
262 262
 		$form = gravityview_get_form( $curr_form );
263 263
 
264
-		$get_id_backup = isset( $_GET['id'] ) ? $_GET['id'] : null;
264
+		$get_id_backup = isset( $_GET[ 'id' ] ) ? $_GET[ 'id' ] : null;
265 265
 
266
-		if ( isset( $form['id'] ) ) {
266
+		if ( isset( $form[ 'id' ] ) ) {
267 267
 			$form_script = 'var form = ' . GFCommon::json_encode( $form ) . ';';
268 268
 
269 269
 			// The `gf_vars()` method needs a $_GET[id] variable set with the form ID.
270
-			$_GET['id'] = $form['id'];
270
+			$_GET[ 'id' ] = $form[ 'id' ];
271 271
 
272 272
 		} else {
273 273
 			$form_script = 'var form = new Form();';
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
 		$output = '<script type="text/javascript" data-gv-merge-tags="1">' . $form_script . "\n" . GFCommon::gf_vars( false ) . '</script>';
277 277
 
278 278
 		// Restore previous $_GET setting
279
-		$_GET['id'] = $get_id_backup;
279
+		$_GET[ 'id' ] = $get_id_backup;
280 280
 
281 281
 		return $output;
282 282
 	}
Please login to merge, or discard this patch.
includes/extensions/delete-entry/class-delete-entry.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -532,7 +532,7 @@
 block discarded – undo
532 532
 				 * @since 1.16.4
533 533
 				 * @param  int $entry_id ID of the Gravity Forms entry
534 534
 				 * @param  array $entry Deleted entry array
535
-				*/
535
+				 */
536 536
 				do_action( 'gravityview/delete-entry/deleted', $entry_id, $entry );
537 537
 			}
538 538
 
Please login to merge, or discard this patch.
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 	 *
64 64
 	 * @since 2.9.2
65 65
 	 *
66
-	 * @param $component
66
+	 * @param string $component
67 67
 	 */
68 68
 	private function load_components( $component ) {
69 69
 
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
 	 * @uses GFAPI::delete_entry()
424 424
 	 * @uses GFAPI::update_entry_property()
425 425
 	 *
426
-	 * @return WP_Error|string "deleted" or "trashed" if successful, WP_Error if GFAPI::delete_entry() or updating entry failed.
426
+	 * @return string "deleted" or "trashed" if successful, WP_Error if GFAPI::delete_entry() or updating entry failed.
427 427
 	 */
428 428
 	private function delete_or_trash_entry( $entry ) {
429 429
 
@@ -590,7 +590,7 @@  discard block
 block discarded – undo
590 590
 	 *
591 591
 	 * @since 1.5.1
592 592
 	 * @param  array $entry Gravity Forms entry array
593
-	 * @return boolean|WP_Error        True: can edit form. WP_Error: nope.
593
+	 * @return string        True: can edit form. WP_Error: nope.
594 594
 	 */
595 595
 	function user_can_delete_entry( $entry = array(), $view_id = null ) {
596 596
 
@@ -631,7 +631,7 @@  discard block
 block discarded – undo
631 631
 	 *
632 632
 	 * @param  array $entry Gravity Forms entry array
633 633
 	 * @param array $field Field settings (optional)
634
-	 * @param int|\GV\View $view Pass a View ID to check caps against. If not set, check against current View (@deprecated no longer optional)
634
+	 * @param integer $view Pass a View ID to check caps against. If not set, check against current View (@deprecated no longer optional)
635 635
 	 * @return bool
636 636
 	 */
637 637
 	public static function check_user_cap_delete_entry( $entry, $field = array(), $view = 0 ) {
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 
166 166
 		// Index 100 is the default GravityView template path.
167 167
 		// Index 110 is Edit Entry link
168
-		$file_paths[115] = self::$file;
168
+		$file_paths[ 115 ] = self::$file;
169 169
 
170 170
 		return $file_paths;
171 171
 	}
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
 
270 270
 		$attributes = array(
271 271
 			'class' => 'btn btn-sm button button-small alignright pull-right btn-danger gv-button-delete',
272
-			'tabindex' => ( GFCommon::$tab_index ++ ),
272
+			'tabindex' => ( GFCommon::$tab_index++ ),
273 273
 			'onclick' => self::get_confirm_dialog(),
274 274
 		);
275 275
 
@@ -305,12 +305,12 @@  discard block
 block discarded – undo
305 305
 		);
306 306
 
307 307
 		// If the form is not submitted, return early
308
-		if ( 'delete' !== $get_fields['action'] || empty( $get_fields['entry_id'] ) ) {
308
+		if ( 'delete' !== $get_fields[ 'action' ] || empty( $get_fields[ 'entry_id' ] ) ) {
309 309
 			return;
310 310
 		}
311 311
 
312 312
 		// Make sure it's a GravityView request
313
-		$valid_nonce_key = wp_verify_nonce( $get_fields['delete'], self::get_nonce_key( $get_fields['entry_id'] ) );
313
+		$valid_nonce_key = wp_verify_nonce( $get_fields[ 'delete' ], self::get_nonce_key( $get_fields[ 'entry_id' ] ) );
314 314
 
315 315
 		if ( ! $valid_nonce_key ) {
316 316
 			gravityview()->log->debug( 'Delete entry not processed: nonce validation failed.' );
@@ -319,10 +319,10 @@  discard block
 block discarded – undo
319 319
 		}
320 320
 
321 321
 		// Get the entry slug
322
-		$entry_slug = esc_attr( $get_fields['entry_id'] );
322
+		$entry_slug = esc_attr( $get_fields[ 'entry_id' ] );
323 323
 
324 324
 		// Redirect after deleting the entry.
325
-		$view = \GV\View::by_id( $get_fields['view_id'] );
325
+		$view = \GV\View::by_id( $get_fields[ 'view_id' ] );
326 326
 
327 327
 		// See if there's an entry there
328 328
 		$entry = gravityview_get_entry( $entry_slug, true, false, $view );
@@ -349,9 +349,9 @@  discard block
 block discarded – undo
349 349
 			$this->_redirect_and_exit( $delete_redirect_base, $delete_response->get_error_message(), 'error' );
350 350
 		}
351 351
 
352
-		if ( (int) $view->settings->get( 'delete_redirect' ) === self::REDIRECT_TO_URL_VALUE ) {
352
+		if ( (int)$view->settings->get( 'delete_redirect' ) === self::REDIRECT_TO_URL_VALUE ) {
353 353
 
354
-			$form                 = GFAPI::get_form( $entry['form_id'] );
354
+			$form                 = GFAPI::get_form( $entry[ 'form_id' ] );
355 355
 			$redirect_url_setting = $view->settings->get( 'delete_redirect_url' );
356 356
 			$redirect_url         = GFCommon::replace_variables( $redirect_url_setting, $form, $entry, false, false, false, 'text' );
357 357
 
@@ -427,7 +427,7 @@  discard block
 block discarded – undo
427 427
 	 */
428 428
 	private function delete_or_trash_entry( $entry ) {
429 429
 
430
-		$entry_id = $entry['id'];
430
+		$entry_id = $entry[ 'id' ];
431 431
 
432 432
 		$mode = $this->get_delete_mode();
433 433
 
@@ -491,7 +491,7 @@  discard block
 block discarded – undo
491 491
 	public function process_connected_posts( $entry_id = 0, $entry = array() ) {
492 492
 
493 493
 		// The entry had no connected post
494
-		if ( empty( $entry['post_id'] ) ) {
494
+		if ( empty( $entry[ 'post_id' ] ) ) {
495 495
 			return;
496 496
 		}
497 497
 
@@ -509,9 +509,9 @@  discard block
 block discarded – undo
509 509
 		$action = current_action();
510 510
 
511 511
 		if ( 'gravityview/delete-entry/deleted' === $action ) {
512
-			$result = wp_delete_post( $entry['post_id'], true );
512
+			$result = wp_delete_post( $entry[ 'post_id' ], true );
513 513
 		} else {
514
-			$result = wp_trash_post( $entry['post_id'] );
514
+			$result = wp_trash_post( $entry[ 'post_id' ] );
515 515
 		}
516 516
 
517 517
 		if ( false === $result ) {
@@ -542,13 +542,13 @@  discard block
 block discarded – undo
542 542
 	public function verify_nonce() {
543 543
 
544 544
 		// No delete entry request was made
545
-		if ( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) {
545
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) {
546 546
 			return false;
547 547
 		}
548 548
 
549
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
549
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
550 550
 
551
-		$valid = wp_verify_nonce( $_GET['delete'], $nonce_key );
551
+		$valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key );
552 552
 
553 553
 		/**
554 554
 		 * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid.
@@ -604,7 +604,7 @@  discard block
 block discarded – undo
604 604
 			$error = __( 'You do not have permission to delete this entry.', 'gravityview' );
605 605
 		}
606 606
 
607
-		if ( $entry['status'] === 'trash' ) {
607
+		if ( $entry[ 'status' ] === 'trash' ) {
608 608
 			if ( 'trash' === $this->get_delete_mode() ) {
609 609
 				$error = __( 'The entry is already in the trash.', 'gravityview' );
610 610
 			} else {
@@ -648,7 +648,7 @@  discard block
 block discarded – undo
648 648
 
649 649
 		$current_user = wp_get_current_user();
650 650
 
651
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : null;
651
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : null;
652 652
 
653 653
 		// Or if they can delete any entries (as defined in Gravity Forms), we're good.
654 654
 		if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
@@ -662,17 +662,17 @@  discard block
 block discarded – undo
662 662
 		if ( ! empty( $field ) ) {
663 663
 
664 664
 			// If capability is not defined, something is not right!
665
-			if ( empty( $field['allow_edit_cap'] ) ) {
665
+			if ( empty( $field[ 'allow_edit_cap' ] ) ) {
666 666
 
667 667
 				gravityview()->log->error( 'Cannot read delete entry field caps', array( 'data' => $field ) );
668 668
 
669 669
 				return false;
670 670
 			}
671 671
 
672
-			if ( GVCommon::has_cap( $field['allow_edit_cap'] ) ) {
672
+			if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) {
673 673
 
674 674
 				// Do not return true if cap is read, as we need to check if the current user created the entry
675
-				if ( $field['allow_edit_cap'] !== 'read' ) {
675
+				if ( $field[ 'allow_edit_cap' ] !== 'read' ) {
676 676
 					return true;
677 677
 				}
678 678
 			} else {
@@ -683,7 +683,7 @@  discard block
 block discarded – undo
683 683
 			}
684 684
 		}
685 685
 
686
-		if ( ! isset( $entry['created_by'] ) ) {
686
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
687 687
 
688 688
 			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
689 689
 
@@ -699,7 +699,7 @@  discard block
 block discarded – undo
699 699
 		}
700 700
 
701 701
 		// If the logged-in user is the same as the user who created the entry, we're good.
702
-		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
702
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
703 703
 
704 704
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
705 705
 
@@ -724,12 +724,12 @@  discard block
 block discarded – undo
724 724
 	 */
725 725
 	public function maybe_display_message( $current_view_id = 0 ) {
726 726
 
727
-		if ( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
727
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
728 728
 			return;
729 729
 		}
730 730
 
731 731
 		// Entry wasn't deleted from current View
732
-		if ( isset( $_GET['view_id'] ) && intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) {
732
+		if ( isset( $_GET[ 'view_id' ] ) && intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) {
733 733
 			return;
734 734
 		}
735 735
 
@@ -738,11 +738,11 @@  discard block
 block discarded – undo
738 738
 
739 739
 	public function display_message() {
740 740
 
741
-		if ( empty( $_GET['status'] ) || empty( $_GET['delete'] ) ) {
741
+		if ( empty( $_GET[ 'status' ] ) || empty( $_GET[ 'delete' ] ) ) {
742 742
 			return;
743 743
 		}
744 744
 
745
-		$status = esc_attr( $_GET['status'] );
745
+		$status = esc_attr( $_GET[ 'status' ] );
746 746
 		$message_from_url = \GV\Utils::_GET( 'message' );
747 747
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
748 748
 		$class = '';
Please login to merge, or discard this patch.
future/includes/class-gv-settings-view.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -531,7 +531,7 @@  discard block
 block discarded – undo
531 531
 		);
532 532
 
533 533
 		if ( version_compare( \GFCommon::$version, '2.3-beta-4', '>=' ) ) {
534
-			$default_settings['sort_direction']['options']['RAND'] = __( 'Random', 'gravityview' );
534
+			$default_settings[ 'sort_direction' ][ 'options' ][ 'RAND' ] = __( 'Random', 'gravityview' );
535 535
 		}
536 536
 
537 537
 		/**
@@ -552,7 +552,7 @@  discard block
 block discarded – undo
552 552
 		if ( ! $detailed ) {
553 553
 			$defaults = array();
554 554
 			foreach ( $default_settings as $key => $value ) {
555
-				$defaults[ $key ] = $value['value'];
555
+				$defaults[ $key ] = $value[ 'value' ];
556 556
 			}
557 557
 			return $defaults;
558 558
 
@@ -563,7 +563,7 @@  discard block
 block discarded – undo
563 563
 				// If the $group argument is set for the method,
564 564
 				// ignore any settings that aren't in that group.
565 565
 				if ( ! empty( $group ) && is_string( $group ) ) {
566
-					if ( empty( $value['group'] ) || $value['group'] !== $group ) {
566
+					if ( empty( $value[ 'group' ] ) || $value[ 'group' ] !== $group ) {
567 567
 						unset( $default_settings[ $key ] );
568 568
 					}
569 569
 				}
Please login to merge, or discard this patch.
includes/extensions/delete-entry/class-delete-entry-admin.php 2 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,6 @@
 block discarded – undo
67 67
 	 * @since 2.9.2 Moved here from GravityView_Delete_Entry
68 68
 	 *
69 69
 	 * @param array $visibility_caps Array of capabilities to display in field dropdown.
70
-	 * @param string $field_type Type of field options to render (`field` or `widget`)
71 70
 	 * @param string $template_id Table slug
72 71
 	 * @param float $field_id GF Field ID - Example: `3`, `5.2`, `entry_link`, `created_by`
73 72
 	 * @param string $context What context are we in? Example: `single` or `directory`
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -83,9 +83,9 @@  discard block
 block discarded – undo
83 83
 		if ( $field_id === 'delete_link' ) {
84 84
 
85 85
 			// Remove other built-in caps.
86
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
86
+			unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] );
87 87
 
88
-			$caps['read'] = _x( 'Entry Creator', 'User capability', 'gravityview' );
88
+			$caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
89 89
 		}
90 90
 
91 91
 		return $caps;
@@ -108,12 +108,12 @@  discard block
 block discarded – undo
108 108
 	public function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
109 109
 
110 110
 		// Always a link, never a filter
111
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
111
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
112 112
 
113 113
 		// Delete Entry link should only appear to visitors capable of editing entries
114
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
114
+		unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
115 115
 
116
-		$add_option['delete_link'] = array(
116
+		$add_option[ 'delete_link' ] = array(
117 117
 			'type'       => 'text',
118 118
 			'label'      => __( 'Delete Link Text', 'gravityview' ),
119 119
 			'desc'       => null,
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 			'merge_tags' => true,
122 122
 		);
123 123
 
124
-		$field_options['allow_edit_cap'] = array(
124
+		$field_options[ 'allow_edit_cap' ] = array(
125 125
 			'type'    => 'select',
126 126
 			'label'   => __( 'Allow the following users to delete the entry:', 'gravityview' ),
127 127
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 	 */
147 147
 	public function add_available_field( $available_fields = array() ) {
148 148
 
149
-		$available_fields['delete_link'] = array(
149
+		$available_fields[ 'delete_link' ] = array(
150 150
 			'label_text'    => __( 'Delete Entry', 'gravityview' ),
151 151
 			'field_id'      => 'delete_link',
152 152
 			'label_type'    => 'field',
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 	public function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
189 189
 
190 190
 		if ( 'edit' !== $zone ) {
191
-			$entry_default_fields['delete_link'] = array(
191
+			$entry_default_fields[ 'delete_link' ] = array(
192 192
 				'label' => __( 'Delete Entry', 'gravityview' ),
193 193
 				'type'  => 'delete_link',
194 194
 				'desc'  => __( 'A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview' ),
Please login to merge, or discard this patch.
includes/extensions/delete-entry/fields/delete_link.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,11 +12,11 @@
 block discarded – undo
12 12
 extract( $gravityview_view->getCurrentField() );
13 13
 
14 14
 // Only show the link to logged-in users with the right caps.
15
-if( !GravityView_Delete_Entry::check_user_cap_delete_entry( $entry, $field_settings ) ) {
15
+if ( ! GravityView_Delete_Entry::check_user_cap_delete_entry( $entry, $field_settings ) ) {
16 16
 	return;
17 17
 }
18 18
 
19
-$link_text = empty( $field_settings['delete_link'] ) ? __('Delete Entry', 'gravityview') : $field_settings['delete_link'];
19
+$link_text = empty( $field_settings[ 'delete_link' ] ) ? __( 'Delete Entry', 'gravityview' ) : $field_settings[ 'delete_link' ];
20 20
 
21 21
 $link_text = apply_filters( 'gravityview_entry_link', GravityView_API::replace_variables( $link_text, $form, $entry ) );
22 22
 
Please login to merge, or discard this patch.