Completed
Push — develop ( a4e86c...334ce8 )
by Zack
15:46
created
future/includes/class-gv-shortcode-gvlogic.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -58,13 +58,13 @@  discard block
 block discarded – undo
58 58
 		$value    = $this->get_value( $atts );
59 59
 
60 60
 		if ( false === $operator && is_null( $value ) ) {
61
-			if ( false !== $atts['if'] ) { // Only-if test
62
-				$match = $authed && ! in_array( strtolower( $atts['if'] ), array( '', '0', 'false', 'no' ) );
61
+			if ( false !== $atts[ 'if' ] ) { // Only-if test
62
+				$match = $authed && ! in_array( strtolower( $atts[ 'if' ] ), array( '', '0', 'false', 'no' ) );
63 63
 			} else {
64 64
 				$match = $authed; // Just login test
65 65
 			}
66 66
 		} else { // Regular test
67
-			$match = $authed && \GVCommon::matches_operation( $atts['if'], $value, $operator );
67
+			$match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $value, $operator );
68 68
 		}
69 69
 
70 70
 		$output = $this->get_output( $match, $atts, $content );
@@ -150,8 +150,8 @@  discard block
 block discarded – undo
150 150
 	 * @return string The output.
151 151
 	 */
152 152
 	private function get_output( $match, $atts, $content ) {
153
-		if ( ! $match && ! empty( $atts['else'] ) ) {
154
-			return $atts['else']; // Attributized else is easy :)
153
+		if ( ! $match && ! empty( $atts[ 'else' ] ) ) {
154
+			return $atts[ 'else' ]; // Attributized else is easy :)
155 155
 		}
156 156
 
157 157
 		$if = '';
@@ -278,18 +278,18 @@  discard block
 block discarded – undo
278 278
 		$atts = array_intersect_key( $supplied_atts, $atts );
279 279
 
280 280
 		// Strip whitespace if it's not default false
281
-		if ( isset( $atts['if'] ) && is_string( $atts['if'] ) ) {
282
-			$atts['if'] = trim( $atts['if'] );
281
+		if ( isset( $atts[ 'if' ] ) && is_string( $atts[ 'if' ] ) ) {
282
+			$atts[ 'if' ] = trim( $atts[ 'if' ] );
283 283
 		} else {
284
-			$atts['if'] = false;
284
+			$atts[ 'if' ] = false;
285 285
 		}
286 286
 
287
-		if ( isset( $atts['logged_in'] ) ) {
287
+		if ( isset( $atts[ 'logged_in' ] ) ) {
288 288
 			// Truthy
289
-			if ( in_array( strtolower( $atts['logged_in'] ), array( '0', 'false', 'no' ) ) ) {
290
-				$atts['logged_in'] = false;
289
+			if ( in_array( strtolower( $atts[ 'logged_in' ] ), array( '0', 'false', 'no' ) ) ) {
290
+				$atts[ 'logged_in' ] = false;
291 291
 			} else {
292
-				$atts['logged_in'] = true;
292
+				$atts[ 'logged_in' ] = true;
293 293
 			}
294 294
 		}
295 295
 
Please login to merge, or discard this patch.
includes/class-gravityview-entry-approval.php 1 patch
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -39,13 +39,13 @@  discard block
 block discarded – undo
39 39
 	private function add_hooks() {
40 40
 
41 41
 		// in case entry is edited (on admin or frontend)
42
-		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2);
42
+		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2 );
43 43
 
44 44
 		// when using the User opt-in field, check on entry submission
45 45
 		add_action( 'gform_after_submission', array( $this, 'after_submission' ), 10, 2 );
46 46
 
47 47
 		// process ajax approve entry requests
48
-		add_action('wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved'));
48
+		add_action( 'wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved' ) );
49 49
 
50 50
 		// autounapprove
51 51
 		add_action( 'gravityview/edit_entry/after_update', array( __CLASS__, 'autounapprove' ), 10, 4 );
@@ -94,10 +94,10 @@  discard block
 block discarded – undo
94 94
 			return;
95 95
 		}
96 96
 
97
-		$form = GFAPI::get_form( $entry['form_id'] );
97
+		$form = GFAPI::get_form( $entry[ 'form_id' ] );
98 98
 
99 99
 		if ( ! $form ) {
100
-			gravityview()->log->error( 'Form not found at ID #{form_id} for entry #{entry_id}', array( 'form_id' => $entry['form_id'], 'entry_id' => $entry_id ) );
100
+			gravityview()->log->error( 'Form not found at ID #{form_id} for entry #{entry_id}', array( 'form_id' => $entry[ 'form_id' ], 'entry_id' => $entry_id ) );
101 101
 			return;
102 102
 		}
103 103
 
@@ -114,10 +114,10 @@  discard block
 block discarded – undo
114 114
 	 */
115 115
 	public static function add_approval_notification_events( $notification_events = array(), $form = array() ) {
116 116
 
117
-		$notification_events['gravityview/approve_entries/approved'] = 'GravityView - ' . esc_html_x( 'Entry is approved', 'The title for an event in a notifications drop down list.', 'gravityview' );
118
-		$notification_events['gravityview/approve_entries/disapproved'] = 'GravityView - ' . esc_html_x( 'Entry is disapproved', 'The title for an event in a notifications drop down list.', 'gravityview' );
119
-		$notification_events['gravityview/approve_entries/unapproved'] = 'GravityView - ' . esc_html_x( 'Entry approval is reset', 'The title for an event in a notifications drop down list.', 'gravityview' );
120
-		$notification_events['gravityview/approve_entries/updated'] = 'GravityView - ' . esc_html_x( 'Entry approval is changed', 'The title for an event in a notifications drop down list.', 'gravityview' );
117
+		$notification_events[ 'gravityview/approve_entries/approved' ] = 'GravityView - ' . esc_html_x( 'Entry is approved', 'The title for an event in a notifications drop down list.', 'gravityview' );
118
+		$notification_events[ 'gravityview/approve_entries/disapproved' ] = 'GravityView - ' . esc_html_x( 'Entry is disapproved', 'The title for an event in a notifications drop down list.', 'gravityview' );
119
+		$notification_events[ 'gravityview/approve_entries/unapproved' ] = 'GravityView - ' . esc_html_x( 'Entry approval is reset', 'The title for an event in a notifications drop down list.', 'gravityview' );
120
+		$notification_events[ 'gravityview/approve_entries/updated' ] = 'GravityView - ' . esc_html_x( 'Entry approval is changed', 'The title for an event in a notifications drop down list.', 'gravityview' );
121 121
 
122 122
 		return $notification_events;
123 123
 	}
@@ -135,13 +135,13 @@  discard block
 block discarded – undo
135 135
 	 */
136 136
 	public static function get_entry_status( $entry, $value_or_label = 'label' ) {
137 137
 
138
-		$entry_id = is_array( $entry ) ? $entry['id'] : GVCommon::get_entry_id( $entry, true );
138
+		$entry_id = is_array( $entry ) ? $entry[ 'id' ] : GVCommon::get_entry_id( $entry, true );
139 139
 
140 140
 		$status = gform_get_meta( $entry_id, self::meta_key );
141 141
 
142 142
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
143 143
 
144
-		if( 'value' === $value_or_label ) {
144
+		if ( 'value' === $value_or_label ) {
145 145
 			return $status;
146 146
 		}
147 147
 
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 		$nonce = \GV\Utils::_POST( 'nonce' );
180 180
 
181 181
 		// Valid status
182
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
182
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
183 183
 
184 184
 			gravityview()->log->error( 'Invalid approval status', array( 'data' => $_POST ) );
185 185
 
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
 
211 211
 			gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' );
212 212
 
213
-			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview') );
213
+			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview' ) );
214 214
 
215 215
 		}
216 216
 
@@ -272,10 +272,10 @@  discard block
 block discarded – undo
272 272
 		}
273 273
 
274 274
 		// Set default
275
-		self::update_approved_meta( $entry['id'], $default_status, $entry['form_id'] );
275
+		self::update_approved_meta( $entry[ 'id' ], $default_status, $entry[ 'form_id' ] );
276 276
 
277 277
 		// Then check for if there is an approval column, and use that value instead
278
-		$this->after_update_entry_update_approved_meta( $form , $entry['id'] );
278
+		$this->after_update_entry_update_approved_meta( $form, $entry[ 'id' ] );
279 279
 	}
280 280
 
281 281
 	/**
@@ -289,12 +289,12 @@  discard block
 block discarded – undo
289 289
 	 */
290 290
 	public function after_update_entry_update_approved_meta( $form, $entry_id = NULL ) {
291 291
 
292
-		$approved_column = self::get_approved_column( $form['id'] );
292
+		$approved_column = self::get_approved_column( $form[ 'id' ] );
293 293
 
294 294
 		/**
295 295
 		 * If the form doesn't contain the approve field, don't assume anything.
296 296
 		 */
297
-		if( empty( $approved_column ) ) {
297
+		if ( empty( $approved_column ) ) {
298 298
 			return;
299 299
 		}
300 300
 
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 		 */
317 317
 		$value = apply_filters( 'gravityview/approve_entries/update_unapproved_meta', $value, $form, $entry );
318 318
 
319
-		self::update_approved_meta( $entry_id, $value, $form['id'] );
319
+		self::update_approved_meta( $entry_id, $value, $form[ 'id' ] );
320 320
 	}
321 321
 
322 322
 	/**
@@ -334,12 +334,12 @@  discard block
 block discarded – undo
334 334
 	 */
335 335
 	public static function update_bulk( $entries = array(), $approved = 0, $form_id = 0 ) {
336 336
 
337
-		if( empty($entries) || ( $entries !== true && !is_array($entries) ) ) {
337
+		if ( empty( $entries ) || ( $entries !== true && ! is_array( $entries ) ) ) {
338 338
 			gravityview()->log->error( 'Entries were empty or malformed.', array( 'data' => $entries ) );
339 339
 			return NULL;
340 340
 		}
341 341
 
342
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
342
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
343 343
 			gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' );
344 344
 			return NULL;
345 345
 		}
@@ -354,10 +354,10 @@  discard block
 block discarded – undo
354 354
 		$approved_column_id = self::get_approved_column( $form_id );
355 355
 
356 356
 		$success = true;
357
-		foreach( $entries as $entry_id ) {
357
+		foreach ( $entries as $entry_id ) {
358 358
 			$update_success = self::update_approved( (int)$entry_id, $approved, $form_id, $approved_column_id );
359 359
 
360
-			if( ! $update_success ) {
360
+			if ( ! $update_success ) {
361 361
 				$success = false;
362 362
 			}
363 363
 		}
@@ -381,12 +381,12 @@  discard block
 block discarded – undo
381 381
 	 */
382 382
 	public static function update_approved( $entry_id = 0, $approved = 2, $form_id = 0, $approvedcolumn = 0 ) {
383 383
 
384
-		if( !class_exists( 'GFAPI' ) ) {
384
+		if ( ! class_exists( 'GFAPI' ) ) {
385 385
 			gravityview()->log->error( 'GFAPI does not exist' );
386 386
 			return false;
387 387
 		}
388 388
 
389
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
389
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
390 390
 			gravityview()->log->error( 'Not a valid approval value.' );
391 391
 			return false;
392 392
 		}
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
403 403
 		// If the form has an Approve/Reject field, update that value
404 404
 		$result = self::update_approved_column( $entry_id, $approved, $form_id, $approvedcolumn );
405 405
 
406
-		if( is_wp_error( $result ) ) {
406
+		if ( is_wp_error( $result ) ) {
407 407
 			gravityview()->log->error( 'Entry approval not updated: {error}', array( 'error' => $result->get_error_message() ) );
408 408
 			return false;
409 409
 		}
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
 
416 416
 		// add note to entry if approval field updating worked or there was no approved field
417 417
 		// There's no validation for the meta
418
-		if( true === $result ) {
418
+		if ( true === $result ) {
419 419
 
420 420
 			// Add an entry note
421 421
 			self::add_approval_status_updated_note( $entry_id, $approved );
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
 
469 469
 		$note_id = false;
470 470
 
471
-		if( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
471
+		if ( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
472 472
 
473 473
 			$current_user = wp_get_current_user();
474 474
 
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
490 490
 	 */
491 491
 	private static function update_approved_column( $entry_id = 0, $status = '0', $form_id = 0, $approvedcolumn = 0 ) {
492 492
 
493
-		if( empty( $approvedcolumn ) ) {
493
+		if ( empty( $approvedcolumn ) ) {
494 494
 			$approvedcolumn = self::get_approved_column( $form_id );
495 495
 		}
496 496
 
@@ -513,12 +513,12 @@  discard block
 block discarded – undo
513 513
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
514 514
 
515 515
 		$new_value = '';
516
-		if( GravityView_Entry_Approval_Status::APPROVED === $status ) {
516
+		if ( GravityView_Entry_Approval_Status::APPROVED === $status ) {
517 517
 			$new_value = self::get_approved_column_input_label( $form_id, $approvedcolumn );
518 518
 		}
519 519
 
520 520
 		//update entry
521
-		$entry["{$approvedcolumn}"] = $new_value;
521
+		$entry[ "{$approvedcolumn}" ] = $new_value;
522 522
 
523 523
 		/**
524 524
 		 * Note: GFAPI::update_entry() doesn't trigger `gform_after_update_entry`, so we trigger updating the meta ourselves
@@ -549,12 +549,12 @@  discard block
 block discarded – undo
549 549
 		// If the user has enabled a different value than the label (for some reason), use it.
550 550
 		// This is highly unlikely
551 551
 		if ( is_array( $field->choices ) && ! empty( $field->choices ) ) {
552
-			return isset( $field->choices[0]['value'] ) ? $field->choices[0]['value'] : $field->choices[0]['text'];
552
+			return isset( $field->choices[ 0 ][ 'value' ] ) ? $field->choices[ 0 ][ 'value' ] : $field->choices[ 0 ][ 'text' ];
553 553
 		}
554 554
 
555 555
 		// Otherwise, fall back on the inputs array
556 556
 		if ( is_array( $field->inputs ) && ! empty( $field->inputs ) ) {
557
-			return $field->inputs[0]['label'];
557
+			return $field->inputs[ 0 ][ 'label' ];
558 558
 		}
559 559
 
560 560
 		return null;
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
606 606
 		 * @since 1.18 Added "unapproved"
607 607
 		 * @param  int $entry_id ID of the Gravity Forms entry
608 608
 		 */
609
-		do_action( 'gravityview/approve_entries/' . $action , $entry_id );
609
+		do_action( 'gravityview/approve_entries/' . $action, $entry_id );
610 610
 	}
611 611
 
612 612
 	/**
@@ -619,11 +619,11 @@  discard block
 block discarded – undo
619 619
 	 */
620 620
 	static public function get_approved_column( $form ) {
621 621
 
622
-		if( empty( $form ) ) {
622
+		if ( empty( $form ) ) {
623 623
 			return null;
624 624
 		}
625 625
 
626
-		if( !is_array( $form ) ) {
626
+		if ( ! is_array( $form ) ) {
627 627
 			$form = GVCommon::get_form( $form );
628 628
 		}
629 629
 
@@ -633,22 +633,22 @@  discard block
 block discarded – undo
633 633
 		 * @var string $key
634 634
 		 * @var GF_Field $field
635 635
 		 */
636
-		foreach( $form['fields'] as $key => $field ) {
636
+		foreach ( $form[ 'fields' ] as $key => $field ) {
637 637
 
638 638
 			$inputs = $field->get_entry_inputs();
639 639
 
640
-			if( !empty( $field->gravityview_approved ) ) {
641
-				if ( ! empty( $inputs ) && !empty( $inputs[0]['id'] ) ) {
642
-					$approved_column_id = $inputs[0]['id'];
640
+			if ( ! empty( $field->gravityview_approved ) ) {
641
+				if ( ! empty( $inputs ) && ! empty( $inputs[ 0 ][ 'id' ] ) ) {
642
+					$approved_column_id = $inputs[ 0 ][ 'id' ];
643 643
 					break;
644 644
 				}
645 645
 			}
646 646
 
647 647
 			// Note: This is just for backward compatibility from GF Directory plugin and old GV versions - when using i18n it may not work..
648
-			if( 'checkbox' === $field->type && ! empty( $inputs ) ) {
648
+			if ( 'checkbox' === $field->type && ! empty( $inputs ) ) {
649 649
 				foreach ( $inputs as $input ) {
650
-					if ( 'approved' === strtolower( $input['label'] ) ) {
651
-						$approved_column_id = $input['id'];
650
+					if ( 'approved' === strtolower( $input[ 'label' ] ) ) {
651
+						$approved_column_id = $input[ 'id' ];
652 652
 						break;
653 653
 					}
654 654
 				}
@@ -674,7 +674,7 @@  discard block
 block discarded – undo
674 674
 
675 675
 		$view_keys = array_keys( $gv_data->get_views() );
676 676
 
677
-		$view = \GV\View::by_id( $view_keys[0] );
677
+		$view = \GV\View::by_id( $view_keys[ 0 ] );
678 678
 
679 679
 		if ( ! $view->settings->get( 'unapprove_edit' ) ) {
680 680
 			return;
@@ -699,11 +699,11 @@  discard block
 block discarded – undo
699 699
 			return;
700 700
 		}
701 701
 
702
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
702
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
703 703
 			$approval_status = GravityView_Entry_Approval_Status::UNAPPROVED;
704 704
 		}
705 705
 
706
-		self::update_approved_meta( $entry_id, $approval_status, $form['id'] );
706
+		self::update_approved_meta( $entry_id, $approval_status, $form[ 'id' ] );
707 707
 	}
708 708
 
709 709
 	/**
@@ -741,9 +741,9 @@  discard block
 block discarded – undo
741 741
 		$choices = GravityView_Entry_Approval_Status::get_all();
742 742
 
743 743
 		return <<<TEMPLATE
744
-<a href="#" data-approved="{$choices['approved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-approved popover" title="{$choices['approved']['action']}"><span class="screen-reader-text">{$choices['approved']['action']}</span></a>
745
-<a href="#" data-approved="{$choices['disapproved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-disapproved popover" title="{$choices['disapproved']['action']}"><span class="screen-reader-text">{$choices['disapproved']['action']}</span></a>
746
-<a href="#" data-approved="{$choices['unapproved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-unapproved popover" title="{$choices['unapproved']['action']}"><span class="screen-reader-text">{$choices['unapproved']['action']}</span></a>
744
+<a href="#" data-approved="{$choices[ 'approved' ][ 'value' ]}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-approved popover" title="{$choices[ 'approved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'approved' ][ 'action' ]}</span></a>
745
+<a href="#" data-approved="{$choices[ 'disapproved' ][ 'value' ]}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-disapproved popover" title="{$choices[ 'disapproved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'disapproved' ][ 'action' ]}</span></a>
746
+<a href="#" data-approved="{$choices[ 'unapproved' ][ 'value' ]}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-unapproved popover" title="{$choices[ 'unapproved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'unapproved' ][ 'action' ]}</span></a>
747 747
 TEMPLATE;
748 748
 	}
749 749
 }
Please login to merge, or discard this patch.
includes/extensions/duplicate-entry/class-duplicate-entry.php 1 patch
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -114,13 +114,13 @@  discard block
 block discarded – undo
114 114
 	public function duplicate_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
115 115
 
116 116
 		// Always a link, never a filter, always same window
117
-		unset( $field_options['show_as_link'], $field_options['search_filter'], $field_options['new_window'] );
117
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ], $field_options[ 'new_window' ] );
118 118
 
119 119
 
120 120
 		// Duplicate Entry link should only appear to visitors capable of editing entries
121
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
121
+		unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
122 122
 
123
-		$add_option['duplicate_link'] = array(
123
+		$add_option[ 'duplicate_link' ] = array(
124 124
 			'type' => 'text',
125 125
 			'label' => __( 'Duplicate Link Text', 'gravityview' ),
126 126
 			'desc' => NULL,
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 			'merge_tags' => true,
129 129
 		);
130 130
 
131
-		$field_options['allow_duplicate_cap'] = array(
131
+		$field_options[ 'allow_duplicate_cap' ] = array(
132 132
 			'type' => 'select',
133 133
 			'label' => __( 'Allow the following users to duplicate the entry:', 'gravityview' ),
134 134
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 	public function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
156 156
 
157 157
 		if ( 'edit' !== $zone ) {
158
-			$entry_default_fields['duplicate_link'] = array(
158
+			$entry_default_fields[ 'duplicate_link' ] = array(
159 159
 				'label' => __( 'Duplicate Entry', 'gravityview' ),
160 160
 				'type'  => 'duplicate_link',
161 161
 				'desc'  => __( 'A link to duplicate the entry. Respects the Duplicate Entry permissions.', 'gravityview' ),
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
 	 */
177 177
 	public function add_available_field( $available_fields = array() ) {
178 178
 
179
-		$available_fields['duplicate_link'] = array(
179
+		$available_fields[ 'duplicate_link' ] = array(
180 180
 			'label_text' => __( 'Duplicate Entry', 'gravityview' ),
181 181
 			'field_id' => 'duplicate_link',
182 182
 			'label_type' => 'field',
@@ -209,9 +209,9 @@  discard block
 block discarded – undo
209 209
 		if ( 'duplicate_link' === $field_id ) {
210 210
 
211 211
 			// Remove other built-in caps.
212
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['duplicate_others_posts'] );
212
+			unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'duplicate_others_posts' ] );
213 213
 
214
-			$caps['read'] = _x( 'Entry Creator', 'User capability', 'gravityview' );
214
+			$caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
215 215
 		}
216 216
 
217 217
 		return $caps;
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 	public static function get_duplicate_link( $entry, $view_id, $post_id = null ) {
261 261
 		self::getInstance()->set_entry( $entry );
262 262
 
263
-        $base = GravityView_API::directory_link( $post_id ? : $view_id, true );
263
+        $base = GravityView_API::directory_link( $post_id ?: $view_id, true );
264 264
 
265 265
 		if ( empty( $base ) ) {
266 266
 			gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) );
@@ -269,12 +269,12 @@  discard block
 block discarded – undo
269 269
 
270 270
 		$actionurl = add_query_arg( array(
271 271
 			'action'	=> 'duplicate',
272
-			'entry_id'	=> $entry['id'],
272
+			'entry_id'	=> $entry[ 'id' ],
273 273
 			'gvid' => $view_id,
274 274
             'view_id' => $view_id,
275 275
 		), $base );
276 276
 
277
-		return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry['id'] ) ), $actionurl );
277
+		return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry[ 'id' ] ) ), $actionurl );
278 278
 	}
279 279
 
280 280
 	/**
@@ -295,12 +295,12 @@  discard block
 block discarded – undo
295 295
 	public function process_duplicate() {
296 296
 
297 297
 		// If the form is submitted
298
-		if ( ! isset( $_GET['action'] ) || 'duplicate' !== $_GET['action'] || ! isset( $_GET['entry_id'] ) ) {
298
+		if ( ! isset( $_GET[ 'action' ] ) || 'duplicate' !== $_GET[ 'action' ] || ! isset( $_GET[ 'entry_id' ] ) ) {
299 299
 			return;
300 300
 		}
301 301
 
302 302
 		// Make sure it's a GravityView request
303
-		$valid_nonce_key = wp_verify_nonce( \GV\Utils::_GET( 'duplicate' ), self::get_nonce_key( $_GET['entry_id'] ) );
303
+		$valid_nonce_key = wp_verify_nonce( \GV\Utils::_GET( 'duplicate' ), self::get_nonce_key( $_GET[ 'entry_id' ] ) );
304 304
 
305 305
 		if ( ! $valid_nonce_key ) {
306 306
 			gravityview()->log->debug( 'Duplicate entry not processed: nonce validation failed.' );
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
 		}
309 309
 
310 310
 		// Get the entry slug
311
-		$entry_slug = esc_attr( $_GET['entry_id'] );
311
+		$entry_slug = esc_attr( $_GET[ 'entry_id' ] );
312 312
 
313 313
 		// See if there's an entry there
314 314
 		$entry = gravityview_get_entry( $entry_slug, true, false );
@@ -402,15 +402,15 @@  discard block
 block discarded – undo
402 402
 			return new WP_Error( 'gravityview-duplicate-entry-missing', __( 'The entry does not exist.', 'gravityview' ) );
403 403
 		}
404 404
 
405
-		$row['id'] = null;
406
-		$row['date_created'] = date( 'Y-m-d H:i:s', time() );
407
-		$row['date_updated'] = $row['date_created'];
408
-		$row['is_starred'] = false;
409
-		$row['is_read'] = false;
410
-		$row['ip'] = GFFormsModel::get_ip();
411
-		$row['source_url'] = esc_url_raw( remove_query_arg( array( 'action', 'gvid' ) ) );
412
-		$row['user_agent'] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' );
413
-		$row['created_by'] = wp_get_current_user()->ID;
405
+		$row[ 'id' ] = null;
406
+		$row[ 'date_created' ] = date( 'Y-m-d H:i:s', time() );
407
+		$row[ 'date_updated' ] = $row[ 'date_created' ];
408
+		$row[ 'is_starred' ] = false;
409
+		$row[ 'is_read' ] = false;
410
+		$row[ 'ip' ] = GFFormsModel::get_ip();
411
+		$row[ 'source_url' ] = esc_url_raw( remove_query_arg( array( 'action', 'gvid' ) ) );
412
+		$row[ 'user_agent' ] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' );
413
+		$row[ 'created_by' ] = wp_get_current_user()->ID;
414 414
 
415 415
 		/**
416 416
 		 * @filter `gravityview/entry/duplicate/details` Modify the new entry details before it's created.
@@ -438,15 +438,15 @@  discard block
 block discarded – undo
438 438
 
439 439
 		$save_this_meta = array();
440 440
 		foreach ( $duplicate_meta->get_output() as $m ) {
441
-			$save_this_meta[] = array(
442
-				'meta_key' => $m['meta_key'],
443
-				'meta_value' => $m['meta_value'],
444
-				'item_index' => $m['item_index'],
441
+			$save_this_meta[ ] = array(
442
+				'meta_key' => $m[ 'meta_key' ],
443
+				'meta_value' => $m[ 'meta_value' ],
444
+				'item_index' => $m[ 'item_index' ],
445 445
 			);
446 446
 		}
447 447
 
448 448
 		// Update the row ID for later usage
449
-		$row['id'] = $duplicated_id;
449
+		$row[ 'id' ] = $duplicated_id;
450 450
 
451 451
 		/**
452 452
 		 * @filter `gravityview/entry/duplicate/meta` Modify the new entry meta details.
@@ -457,8 +457,8 @@  discard block
 block discarded – undo
457 457
 		$save_this_meta = apply_filters( 'gravityview/entry/duplicate/meta', $save_this_meta, $row, $entry );
458 458
 
459 459
 		foreach ( $save_this_meta as $data ) {
460
-			$data['form_id'] = $entry['form_id'];
461
-			$data['entry_id'] = $duplicated_id;
460
+			$data[ 'form_id' ] = $entry[ 'form_id' ];
461
+			$data[ 'entry_id' ] = $duplicated_id;
462 462
 
463 463
 			if ( ! $wpdb->insert( $entry_meta_table, $data ) ) {
464 464
 				return new WP_Error( 'gravityview-duplicate-entry-db-meta', __( 'There was an error duplicating the entry.', 'gravityview' ) );
@@ -492,13 +492,13 @@  discard block
 block discarded – undo
492 492
 	public function verify_nonce() {
493 493
 
494 494
 		// No duplicate entry request was made
495
-		if ( empty( $_GET['entry_id'] ) || empty( $_GET['duplicate'] ) ) {
495
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'duplicate' ] ) ) {
496 496
 			return false;
497 497
 		}
498 498
 
499
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
499
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
500 500
 
501
-		$valid = wp_verify_nonce( $_GET['duplicate'], $nonce_key );
501
+		$valid = wp_verify_nonce( $_GET[ 'duplicate' ], $nonce_key );
502 502
 
503 503
 		/**
504 504
 		 * @filter `gravityview/duplicate-entry/verify_nonce` Override Duplicate Entry nonce validation. Return true to declare nonce valid.
@@ -534,7 +534,7 @@  discard block
 block discarded – undo
534 534
 			return '';
535 535
 		}
536 536
 
537
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
537
+		return 'return window.confirm(\'' . esc_js( $confirm ) . '\');';
538 538
 	}
539 539
 
540 540
 	/**
@@ -588,7 +588,7 @@  discard block
 block discarded – undo
588 588
 	public static function check_user_cap_duplicate_entry( $entry, $field = array(), $view_id = 0 ) {
589 589
 		$current_user = wp_get_current_user();
590 590
 
591
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL;
591
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : NULL;
592 592
 
593 593
 		// Or if they can duplicate any entries (as defined in Gravity Forms), we're good.
594 594
 		if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gform_full_access', 'gravityview_full_access' ), $entry_id ) ) {
@@ -603,17 +603,17 @@  discard block
 block discarded – undo
603 603
 		if ( ! empty( $field ) ) {
604 604
 
605 605
 			// If capability is not defined, something is not right!
606
-			if ( empty( $field['allow_duplicate_cap'] ) ) {
606
+			if ( empty( $field[ 'allow_duplicate_cap' ] ) ) {
607 607
 
608 608
 				gravityview()->log->error( 'Cannot read duplicate entry field caps', array( 'data' => $field ) );
609 609
 
610 610
 				return false;
611 611
 			}
612 612
 
613
-			if ( GVCommon::has_cap( $field['allow_duplicate_cap'] ) ) {
613
+			if ( GVCommon::has_cap( $field[ 'allow_duplicate_cap' ] ) ) {
614 614
 
615 615
 				// Do not return true if cap is read, as we need to check if the current user created the entry
616
-				if ( 'read' !== $field['allow_duplicate_cap'] ) {
616
+				if ( 'read' !== $field[ 'allow_duplicate_cap' ] ) {
617 617
 					return true;
618 618
 				}
619 619
 
@@ -626,7 +626,7 @@  discard block
 block discarded – undo
626 626
 
627 627
 		}
628 628
 
629
-		if ( ! isset( $entry['created_by'] ) ) {
629
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
630 630
 
631 631
 			gravityview()->log->error( 'Cannot duplicate entry; entry `created_by` doesn\'t exist.' );
632 632
 
@@ -651,7 +651,7 @@  discard block
 block discarded – undo
651 651
 		}
652 652
 
653 653
 		// If the logged-in user is the same as the user who created the entry, we're good.
654
-		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
654
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
655 655
 
656 656
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
657 657
 
@@ -676,16 +676,16 @@  discard block
 block discarded – undo
676 676
 	 */
677 677
 	public function display_message( $current_view_id = 0 ) {
678 678
 
679
-		if ( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
679
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
680 680
 			return;
681 681
 		}
682 682
 
683 683
 		// Entry wasn't duplicated from current View
684
-		if ( isset( $_GET['view_id'] ) && ( intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) ) {
684
+		if ( isset( $_GET[ 'view_id' ] ) && ( intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) ) {
685 685
 			return;
686 686
 		}
687 687
 
688
-		$status = esc_attr( $_GET['status'] );
688
+		$status = esc_attr( $_GET[ 'status' ] );
689 689
 		$message_from_url = \GV\Utils::_GET( 'message' );
690 690
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
691 691
 		$class = '';
@@ -711,7 +711,7 @@  discard block
 block discarded – undo
711 711
 		$message = apply_filters( 'gravityview/duplicate-entry/message', esc_attr( $message ), $status, $message_from_url );
712 712
 
713 713
 		// DISPLAY ERROR/SUCCESS MESSAGE
714
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
714
+		echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>';
715 715
 	}
716 716
 
717 717
 
Please login to merge, or discard this patch.
includes/extensions/entry-notes/fields/notes.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -9,9 +9,9 @@  discard block
 block discarded – undo
9 9
 $gravityview_view = GravityView_View::getInstance();
10 10
 
11 11
 $visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' );
12
-$show_notes_logged_out = ( ! empty( $visibility_settings['view'] ) && ! empty( $visibility_settings['view_loggedout'] ) );
12
+$show_notes_logged_out = ( ! empty( $visibility_settings[ 'view' ] ) && ! empty( $visibility_settings[ 'view_loggedout' ] ) );
13 13
 
14
-if(	! GVCommon::has_cap( array( 'gravityview_view_entry_notes', 'gravityview_add_entry_notes', 'gravityview_delete_entry_notes' ) ) && ! $show_notes_logged_out ) {
14
+if ( ! GVCommon::has_cap( array( 'gravityview_view_entry_notes', 'gravityview_add_entry_notes', 'gravityview_delete_entry_notes' ) ) && ! $show_notes_logged_out ) {
15 15
 	return;
16 16
 }
17 17
 
@@ -25,20 +25,20 @@  discard block
 block discarded – undo
25 25
 do_action( 'gravityview/field/notes/scripts' );
26 26
 
27 27
 $entry      = $gravityview_view->getCurrentEntry();
28
-$notes      = (array) GravityView_Entry_Notes::get_notes( $entry['id'] );
28
+$notes      = (array)GravityView_Entry_Notes::get_notes( $entry[ 'id' ] );
29 29
 $strings    = GravityView_Field_Notes::strings();
30
-$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
30
+$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
31 31
 
32
-$show_add = ! empty( $visibility_settings['add'] );
33
-$show_delete = ( ! empty( $visibility_settings['delete'] ) && GVCommon::has_cap( 'gravityview_delete_entry_notes' ) );
34
-$show_notes = $show_notes_logged_out || ( ! empty( $visibility_settings['view'] ) && GVCommon::has_cap( 'gravityview_view_entry_notes' ) );
32
+$show_add = ! empty( $visibility_settings[ 'add' ] );
33
+$show_delete = ( ! empty( $visibility_settings[ 'delete' ] ) && GVCommon::has_cap( 'gravityview_delete_entry_notes' ) );
34
+$show_notes = $show_notes_logged_out || ( ! empty( $visibility_settings[ 'view' ] ) && GVCommon::has_cap( 'gravityview_view_entry_notes' ) );
35 35
 
36 36
 $container_class = ( sizeof( $notes ) > 0 ? 'gv-has-notes' : 'gv-no-notes' );
37 37
 $container_class .= $show_notes ? ' gv-show-notes' : ' gv-hide-notes';
38 38
 ?>
39 39
 <div class="gv-notes <?php echo $container_class; ?>">
40 40
 <?php
41
-	if( $show_notes ) {
41
+	if ( $show_notes ) {
42 42
 ?>
43 43
 	<form method="post" class="gv-notes-list">
44 44
 		<?php if ( $show_delete ) { wp_nonce_field( 'gv_delete_notes_' . $entry_slug, 'gv_delete_notes' ); } ?>
@@ -46,21 +46,21 @@  discard block
 block discarded – undo
46 46
 			<input type="hidden" name="action" value="gv_delete_notes" />
47 47
 			<input type="hidden" name="entry-slug" value="<?php echo esc_attr( $entry_slug ); ?>" />
48 48
 			<table>
49
-				<caption><?php echo $strings['caption']; ?></caption>
49
+				<caption><?php echo $strings[ 'caption' ]; ?></caption>
50 50
 				<?php
51 51
 				if ( $show_delete ) {
52 52
 				?>
53 53
 				<thead>
54 54
 					<tr>
55 55
 						<th colspan="2">
56
-							<label><input type="checkbox" value="" class="gv-notes-toggle" title="<?php echo $strings['toggle-notes']; ?>"><span class="screen-reader-text"><?php echo $strings['toggle-notes']; ?></span></label>
57
-							<button type="submit" class="button button-small gv-notes-delete"><?php echo $strings['delete']; ?></button>
56
+							<label><input type="checkbox" value="" class="gv-notes-toggle" title="<?php echo $strings[ 'toggle-notes' ]; ?>"><span class="screen-reader-text"><?php echo $strings[ 'toggle-notes' ]; ?></span></label>
57
+							<button type="submit" class="button button-small gv-notes-delete"><?php echo $strings[ 'delete' ]; ?></button>
58 58
 						</th>
59 59
 					</tr>
60 60
 				</thead>
61 61
 				<?php } ?>
62 62
 				<tbody>
63
-					<tr class="gv-notes-no-notes"><td colspan="2"><?php echo $strings['no-notes']; ?></td></tr>
63
+					<tr class="gv-notes-no-notes"><td colspan="2"><?php echo $strings[ 'no-notes' ]; ?></td></tr>
64 64
 					<?php
65 65
 						foreach ( $notes as $note ) {
66 66
 							echo GravityView_Field_Notes::display_note( $note, $show_delete );
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 <?php
74 74
 	} // End if can view notes
75 75
 
76
-	if( $show_add ) {
76
+	if ( $show_add ) {
77 77
 		echo do_shortcode( '[gv_note_add]' );
78 78
 	}
79 79
 ?>
Please login to merge, or discard this patch.