Completed
Pull Request — develop (#1360)
by Zack
16:26
created
includes/extensions/duplicate-entry/class-duplicate-entry.php 3 patches
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	 *
88 88
 	 * @param array $file_paths List of template paths ordered
89 89
 	 *
90
-	 * @return array File paths, with duplicate field path added at index 117
90
+	 * @return string[] File paths, with duplicate field path added at index 117
91 91
 	 */
92 92
 	public function add_template_path( $file_paths ) {
93 93
 
@@ -193,7 +193,6 @@  discard block
 block discarded – undo
193 193
 	 * @since 2.5
194 194
 	 *
195 195
 	 * @param  array 	    $visibility_caps        Array of capabilities to display in field dropdown.
196
-	 * @param  string       $field_type  Type of field options to render (`field` or `widget`)
197 196
 	 * @param  string       $template_id Table slug
198 197
 	 * @param  float|string $field_id    GF Field ID - Example: `3`, `5.2`, `entry_link`, `created_by`
199 198
 	 * @param  string       $context     What context are we in? Example: `single` or `directory`
Please login to merge, or discard this patch.
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -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 ) );
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
 			'action'	=> 'duplicate',
275 275
 			'entry_id'	=> $entry_slug,
276 276
 			'gvid' => $view_id,
277
-            'view_id' => $view_id,
277
+			'view_id' => $view_id,
278 278
 		), $base );
279 279
 
280 280
 		$url = wp_nonce_url( $actionurl, 'duplicate_'.$entry_slug, 'duplicate' );
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
 		 * @since 2.5
470 470
 		 * @param  array $duplicated_entry The duplicated entry
471 471
 		 * @param  array $entry The original entry
472
-		*/
472
+		 */
473 473
 		do_action( 'gravityview/duplicate-entry/duplicated', $duplicated_entry, $entry );
474 474
 
475 475
 		gravityview()->log->debug( 'Duplicate response: {duplicate_response}', array( 'duplicate_response' => $duplicate_response ) );
Please login to merge, or discard this patch.
Spacing   +45 added lines, -45 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
117
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
117
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
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 ) );
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
 		}
269 269
 
270 270
 		// Use the slug instead of the ID for consistent security
271
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
271
+		$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
272 272
 
273 273
 		$actionurl = add_query_arg( array(
274 274
 			'action'	=> 'duplicate',
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
             'view_id' => $view_id,
278 278
 		), $base );
279 279
 
280
-		$url = wp_nonce_url( $actionurl, 'duplicate_'.$entry_slug, 'duplicate' );
280
+		$url = wp_nonce_url( $actionurl, 'duplicate_' . $entry_slug, 'duplicate' );
281 281
 
282 282
 		return $url;
283 283
 	}
@@ -300,12 +300,12 @@  discard block
 block discarded – undo
300 300
 	public function process_duplicate() {
301 301
 
302 302
 		// If the form is submitted
303
-		if ( ! isset( $_GET['action'] ) || 'duplicate' !== $_GET['action'] || ! isset( $_GET['entry_id'] ) ) {
303
+		if ( ! isset( $_GET[ 'action' ] ) || 'duplicate' !== $_GET[ 'action' ] || ! isset( $_GET[ 'entry_id' ] ) ) {
304 304
 			return;
305 305
 		}
306 306
 
307 307
 		// Make sure it's a GravityView request
308
-		$valid_nonce_key = wp_verify_nonce( $_GET['duplicate'], self::get_nonce_key( $_GET['entry_id'] ) );
308
+		$valid_nonce_key = wp_verify_nonce( $_GET[ 'duplicate' ], self::get_nonce_key( $_GET[ 'entry_id' ] ) );
309 309
 
310 310
 		if ( ! $valid_nonce_key ) {
311 311
 			gravityview()->log->debug( 'Duplicate entry not processed: nonce validation failed.' );
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
 		}
314 314
 
315 315
 		// Get the entry slug
316
-		$entry_slug = esc_attr( $_GET['entry_id'] );
316
+		$entry_slug = esc_attr( $_GET[ 'entry_id' ] );
317 317
 
318 318
 		// See if there's an entry there
319 319
 		$entry = gravityview_get_entry( $entry_slug, true, false );
@@ -397,15 +397,15 @@  discard block
 block discarded – undo
397 397
 			return new WP_Error( 'gravityview-duplicate-entry-missing', __( 'No such entry ID', 'gravityview' ) );
398 398
 		}
399 399
 
400
-		$row['id'] = null;
401
-		$row['date_created'] = date( 'Y-m-d H:i:s', time() );
402
-		$row['date_updated'] = $row['date_created'];
403
-		$row['is_starred'] = false;
404
-		$row['is_read'] = false;
405
-		$row['ip'] = GFFormsModel::get_ip();
406
-		$row['source_url'] = esc_url_raw( remove_query_arg( array( 'action', 'gvid' ) ) );
407
-		$row['user_agent'] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' );
408
-		$row['created_by'] = wp_get_current_user()->ID;
400
+		$row[ 'id' ] = null;
401
+		$row[ 'date_created' ] = date( 'Y-m-d H:i:s', time() );
402
+		$row[ 'date_updated' ] = $row[ 'date_created' ];
403
+		$row[ 'is_starred' ] = false;
404
+		$row[ 'is_read' ] = false;
405
+		$row[ 'ip' ] = GFFormsModel::get_ip();
406
+		$row[ 'source_url' ] = esc_url_raw( remove_query_arg( array( 'action', 'gvid' ) ) );
407
+		$row[ 'user_agent' ] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' );
408
+		$row[ 'created_by' ] = wp_get_current_user()->ID;
409 409
 
410 410
 		/**
411 411
 		 * @filter `gravityview/entry/duplicate/details` Modify the new entry details before it's created.
@@ -433,15 +433,15 @@  discard block
 block discarded – undo
433 433
 
434 434
 		$save_this_meta = array();
435 435
 		foreach ( $duplicate_meta->get_output() as $m ) {
436
-			$save_this_meta[] = array(
437
-				'meta_key' => $m['meta_key'],
438
-				'meta_value' => $m['meta_value'],
439
-				'item_index' => $m['item_index'],
436
+			$save_this_meta[ ] = array(
437
+				'meta_key' => $m[ 'meta_key' ],
438
+				'meta_value' => $m[ 'meta_value' ],
439
+				'item_index' => $m[ 'item_index' ],
440 440
 			);
441 441
 		}
442 442
 
443 443
 		// Update the row ID for later usage
444
-		$row['id'] = $duplicated_id;
444
+		$row[ 'id' ] = $duplicated_id;
445 445
 
446 446
 		/**
447 447
 		 * @filter `gravityview/entry/duplicate/meta` Modify the new entry meta details.
@@ -452,8 +452,8 @@  discard block
 block discarded – undo
452 452
 		$save_this_meta = apply_filters( 'gravityview/entry/duplicate/meta', $save_this_meta, $row, $entry );
453 453
 
454 454
 		foreach ( $save_this_meta as $data ) {
455
-			$data['form_id'] = $entry['form_id'];
456
-			$data['entry_id'] = $duplicated_id;
455
+			$data[ 'form_id' ] = $entry[ 'form_id' ];
456
+			$data[ 'entry_id' ] = $duplicated_id;
457 457
 
458 458
 			if ( ! $wpdb->insert( $entry_meta_table, $data ) ) {
459 459
 				return new WP_Error( 'gravityview-duplicate-entry-db', __( 'Database error', 'gravityview' ) );
@@ -487,13 +487,13 @@  discard block
 block discarded – undo
487 487
 	public function verify_nonce() {
488 488
 
489 489
 		// No duplicate entry request was made
490
-		if ( empty( $_GET['entry_id'] ) || empty( $_GET['duplicate'] ) ) {
490
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'duplicate' ] ) ) {
491 491
 			return false;
492 492
 		}
493 493
 
494
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
494
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
495 495
 
496
-		$valid = wp_verify_nonce( $_GET['duplicate'], $nonce_key );
496
+		$valid = wp_verify_nonce( $_GET[ 'duplicate' ], $nonce_key );
497 497
 
498 498
 		/**
499 499
 		 * @filter `gravityview/duplicate-entry/verify_nonce` Override Duplicate Entry nonce validation. Return true to declare nonce valid.
@@ -524,7 +524,7 @@  discard block
 block discarded – undo
524 524
 		 */
525 525
 		$confirm = apply_filters( 'gravityview/duplicate-entry/confirm-text', $confirm );
526 526
 
527
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
527
+		return 'return window.confirm(\'' . esc_js( $confirm ) . '\');';
528 528
 	}
529 529
 
530 530
 	/**
@@ -578,7 +578,7 @@  discard block
 block discarded – undo
578 578
 	public static function check_user_cap_duplicate_entry( $entry, $field, $view_id ) {
579 579
 		$current_user = wp_get_current_user();
580 580
 
581
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL;
581
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : NULL;
582 582
 
583 583
 		// Or if they can duplicate any entries (as defined in Gravity Forms), we're good.
584 584
 		if ( GVCommon::has_cap( array( 'gravityforms_edit_entries' ), $entry_id ) ) {
@@ -593,17 +593,17 @@  discard block
 block discarded – undo
593 593
 		if ( ! empty( $field ) ) {
594 594
 
595 595
 			// If capability is not defined, something is not right!
596
-			if ( empty( $field['allow_duplicate_cap'] ) ) {
596
+			if ( empty( $field[ 'allow_duplicate_cap' ] ) ) {
597 597
 
598 598
 				gravityview()->log->error( 'Cannot read duplicate entry field caps', array( 'data' => $field ) );
599 599
 
600 600
 				return false;
601 601
 			}
602 602
 
603
-			if ( GVCommon::has_cap( $field['allow_duplicate_cap'] ) ) {
603
+			if ( GVCommon::has_cap( $field[ 'allow_duplicate_cap' ] ) ) {
604 604
 
605 605
 				// Do not return true if cap is read, as we need to check if the current user created the entry
606
-				if ( 'read' !== $field['allow_duplicate_cap'] ) {
606
+				if ( 'read' !== $field[ 'allow_duplicate_cap' ] ) {
607 607
 					return true;
608 608
 				}
609 609
 
@@ -616,7 +616,7 @@  discard block
 block discarded – undo
616 616
 
617 617
 		}
618 618
 
619
-		if ( ! isset( $entry['created_by'] ) ) {
619
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
620 620
 
621 621
 			gravityview()->log->error( 'Cannot duplicate entry; entry `created_by` doesn\'t exist.' );
622 622
 
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
628 628
 
629 629
 			$current_view = gravityview_get_current_view_data( $view_id );
630 630
 
631
-			$user_duplicate = isset( $current_view['atts']['user_duplicate'] ) ? $current_view['atts']['user_duplicate'] : false;
631
+			$user_duplicate = isset( $current_view[ 'atts' ][ 'user_duplicate' ] ) ? $current_view[ 'atts' ][ 'user_duplicate' ] : false;
632 632
 
633 633
 			if ( empty( $user_duplicate ) ) {
634 634
 
@@ -639,7 +639,7 @@  discard block
 block discarded – undo
639 639
 		}
640 640
 
641 641
 		// If the logged-in user is the same as the user who created the entry, we're good.
642
-		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
642
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
643 643
 
644 644
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
645 645
 
@@ -664,16 +664,16 @@  discard block
 block discarded – undo
664 664
 	 */
665 665
 	public function display_message( $current_view_id = 0 ) {
666 666
 
667
-		if ( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
667
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
668 668
 			return;
669 669
 		}
670 670
 
671 671
 		// Entry wasn't duplicateded from current View
672
-		if ( isset( $_GET['view_id'] ) && ( intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) ) {
672
+		if ( isset( $_GET[ 'view_id' ] ) && ( intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) ) {
673 673
 			return;
674 674
 		}
675 675
 
676
-		$status = esc_attr( $_GET['status'] );
676
+		$status = esc_attr( $_GET[ 'status' ] );
677 677
 		$message_from_url = \GV\Utils::_GET( 'message' );
678 678
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
679 679
 		$class = '';
@@ -699,7 +699,7 @@  discard block
 block discarded – undo
699 699
 		$message = apply_filters( 'gravityview/duplicate-entry/message', esc_attr( $message ), $status, $message_from_url );
700 700
 
701 701
 		// DISPLAY ERROR/SUCCESS MESSAGE
702
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
702
+		echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>';
703 703
 	}
704 704
 
705 705
 
Please login to merge, or discard this patch.