Completed
Push — develop ( 11014e...0eafe4 )
by Gennady
29:54 queued 15:29
created
future/includes/class-gv-template-view-list.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -72,13 +72,13 @@
 block discarded – undo
72 72
 		$hide_empty = apply_filters( 'gravityview/render/hide-empty-zone', Utils::get( $extras, 'hide_empty', $this->view->settings->get( 'hide_empty', false ) ), $context );
73 73
 
74 74
 		if ( is_numeric( $field->ID ) ) {
75
-			$extras['field'] = $field->as_configuration();
75
+			$extras[ 'field' ] = $field->as_configuration();
76 76
 		}
77 77
 
78
-		$extras['entry'] = $entry->as_entry();
79
-		$extras['hide_empty'] = $hide_empty;
80
-		$extras['label'] = $label;
81
-		$extras['value'] = $value;
78
+		$extras[ 'entry' ] = $entry->as_entry();
79
+		$extras[ 'hide_empty' ] = $hide_empty;
80
+		$extras[ 'label' ] = $label;
81
+		$extras[ 'value' ] = $value;
82 82
 
83 83
 		return \gravityview_field_output( $extras, $context );
84 84
 	}
Please login to merge, or discard this patch.
future/includes/class-gv-template-entry-list.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -57,13 +57,13 @@
 block discarded – undo
57 57
 		$hide_empty = apply_filters( 'gravityview/render/hide-empty-zone', Utils::get( $extras, 'hide_empty', $this->view->settings->get( 'hide_empty', false ) ), $context );
58 58
 
59 59
 		if ( is_numeric( $field->ID ) ) {
60
-			$extras['field'] = $field->as_configuration();
60
+			$extras[ 'field' ] = $field->as_configuration();
61 61
 		}
62 62
 
63
-		$extras['entry'] = $this->entry->as_entry();
64
-		$extras['hide_empty'] = $hide_empty;
65
-		$extras['label'] = $label;
66
-		$extras['value'] = $value;
63
+		$extras[ 'entry' ] = $this->entry->as_entry();
64
+		$extras[ 'hide_empty' ] = $hide_empty;
65
+		$extras[ 'label' ] = $label;
66
+		$extras[ 'value' ] = $value;
67 67
 
68 68
 		return \gravityview_field_output( $extras, $context );
69 69
 	}
Please login to merge, or discard this patch.
includes/class-gravityview-entry-approval.php 1 patch
Spacing   +43 added lines, -43 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
 
@@ -261,10 +261,10 @@  discard block
 block discarded – undo
261 261
 		}
262 262
 
263 263
 		// Set default
264
-		self::update_approved_meta( $entry['id'], $default_status, $entry['form_id'] );
264
+		self::update_approved_meta( $entry[ 'id' ], $default_status, $entry[ 'form_id' ] );
265 265
 
266 266
 		// Then check for if there is an approval column, and use that value instead
267
-		$this->after_update_entry_update_approved_meta( $form , $entry['id'] );
267
+		$this->after_update_entry_update_approved_meta( $form, $entry[ 'id' ] );
268 268
 	}
269 269
 
270 270
 	/**
@@ -278,12 +278,12 @@  discard block
 block discarded – undo
278 278
 	 */
279 279
 	public function after_update_entry_update_approved_meta( $form, $entry_id = NULL ) {
280 280
 
281
-		$approved_column = self::get_approved_column( $form['id'] );
281
+		$approved_column = self::get_approved_column( $form[ 'id' ] );
282 282
 
283 283
 		/**
284 284
 		 * If the form doesn't contain the approve field, don't assume anything.
285 285
 		 */
286
-		if( empty( $approved_column ) ) {
286
+		if ( empty( $approved_column ) ) {
287 287
 			return;
288 288
 		}
289 289
 
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
 			$value = GravityView_Entry_Approval_Status::APPROVED;
298 298
 		}
299 299
 
300
-		self::update_approved_meta( $entry_id, $value, $form['id'] );
300
+		self::update_approved_meta( $entry_id, $value, $form[ 'id' ] );
301 301
 	}
302 302
 
303 303
 	/**
@@ -315,12 +315,12 @@  discard block
 block discarded – undo
315 315
 	 */
316 316
 	public static function update_bulk( $entries = array(), $approved, $form_id ) {
317 317
 
318
-		if( empty($entries) || ( $entries !== true && !is_array($entries) ) ) {
318
+		if ( empty( $entries ) || ( $entries !== true && ! is_array( $entries ) ) ) {
319 319
 			gravityview()->log->error( 'Entries were empty or malformed.', array( 'data' => $entries ) );
320 320
 			return NULL;
321 321
 		}
322 322
 
323
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
323
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
324 324
 			gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' );
325 325
 			return NULL;
326 326
 		}
@@ -335,10 +335,10 @@  discard block
 block discarded – undo
335 335
 		$approved_column_id = self::get_approved_column( $form_id );
336 336
 
337 337
 		$success = true;
338
-		foreach( $entries as $entry_id ) {
338
+		foreach ( $entries as $entry_id ) {
339 339
 			$update_success = self::update_approved( (int)$entry_id, $approved, $form_id, $approved_column_id );
340 340
 
341
-			if( ! $update_success ) {
341
+			if ( ! $update_success ) {
342 342
 				$success = false;
343 343
 			}
344 344
 		}
@@ -362,12 +362,12 @@  discard block
 block discarded – undo
362 362
 	 */
363 363
 	public static function update_approved( $entry_id = 0, $approved = 2, $form_id = 0, $approvedcolumn = 0 ) {
364 364
 
365
-		if( !class_exists( 'GFAPI' ) ) {
365
+		if ( ! class_exists( 'GFAPI' ) ) {
366 366
 			gravityview()->log->error( 'GFAPI does not exist' );
367 367
 			return false;
368 368
 		}
369 369
 
370
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
370
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
371 371
 			gravityview()->log->error( 'Not a valid approval value.' );
372 372
 			return false;
373 373
 		}
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
 		// If the form has an Approve/Reject field, update that value
385 385
 		$result = self::update_approved_column( $entry_id, $approved, $form_id, $approvedcolumn );
386 386
 
387
-		if( is_wp_error( $result ) ) {
387
+		if ( is_wp_error( $result ) ) {
388 388
 			gravityview()->log->error( 'Entry approval not updated: {error}', array( 'error' => $result->get_error_message() ) );
389 389
 			return false;
390 390
 		}
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
 
397 397
 		// add note to entry if approval field updating worked or there was no approved field
398 398
 		// There's no validation for the meta
399
-		if( true === $result ) {
399
+		if ( true === $result ) {
400 400
 
401 401
 			// Add an entry note
402 402
 			self::add_approval_status_updated_note( $entry_id, $approved );
@@ -449,7 +449,7 @@  discard block
 block discarded – undo
449 449
 
450 450
 		$note_id = false;
451 451
 
452
-		if( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
452
+		if ( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
453 453
 
454 454
 			$current_user = wp_get_current_user();
455 455
 
@@ -471,7 +471,7 @@  discard block
 block discarded – undo
471 471
 	 */
472 472
 	private static function update_approved_column( $entry_id = 0, $status = '0', $form_id = 0, $approvedcolumn = 0 ) {
473 473
 
474
-		if( empty( $approvedcolumn ) ) {
474
+		if ( empty( $approvedcolumn ) ) {
475 475
 			$approvedcolumn = self::get_approved_column( $form_id );
476 476
 		}
477 477
 
@@ -494,12 +494,12 @@  discard block
 block discarded – undo
494 494
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
495 495
 
496 496
 		$new_value = '';
497
-		if( GravityView_Entry_Approval_Status::APPROVED === $status ) {
497
+		if ( GravityView_Entry_Approval_Status::APPROVED === $status ) {
498 498
 			$new_value = self::get_approved_column_input_label( $form_id, $approvedcolumn );
499 499
 		}
500 500
 
501 501
 		//update entry
502
-		$entry["{$approvedcolumn}"] = $new_value;
502
+		$entry[ "{$approvedcolumn}" ] = $new_value;
503 503
 
504 504
 		/**
505 505
 		 * Note: GFAPI::update_entry() doesn't trigger `gform_after_update_entry`, so we trigger updating the meta ourselves
@@ -530,12 +530,12 @@  discard block
 block discarded – undo
530 530
 		// If the user has enabled a different value than the label (for some reason), use it.
531 531
 		// This is highly unlikely
532 532
 		if ( is_array( $field->choices ) && ! empty( $field->choices ) ) {
533
-			return isset( $field->choices[0]['value'] ) ? $field->choices[0]['value'] : $field->choices[0]['text'];
533
+			return isset( $field->choices[ 0 ][ 'value' ] ) ? $field->choices[ 0 ][ 'value' ] : $field->choices[ 0 ][ 'text' ];
534 534
 		}
535 535
 
536 536
 		// Otherwise, fall back on the inputs array
537 537
 		if ( is_array( $field->inputs ) && ! empty( $field->inputs ) ) {
538
-			return $field->inputs[0]['label'];
538
+			return $field->inputs[ 0 ][ 'label' ];
539 539
 		}
540 540
 
541 541
 		return null;
@@ -587,7 +587,7 @@  discard block
 block discarded – undo
587 587
 		 * @since 1.18 Added "unapproved"
588 588
 		 * @param  int $entry_id ID of the Gravity Forms entry
589 589
 		 */
590
-		do_action( 'gravityview/approve_entries/' . $action , $entry_id );
590
+		do_action( 'gravityview/approve_entries/' . $action, $entry_id );
591 591
 	}
592 592
 
593 593
 	/**
@@ -600,11 +600,11 @@  discard block
 block discarded – undo
600 600
 	 */
601 601
 	static public function get_approved_column( $form ) {
602 602
 
603
-		if( empty( $form ) ) {
603
+		if ( empty( $form ) ) {
604 604
 			return null;
605 605
 		}
606 606
 
607
-		if( !is_array( $form ) ) {
607
+		if ( ! is_array( $form ) ) {
608 608
 			$form = GVCommon::get_form( $form );
609 609
 		}
610 610
 
@@ -614,22 +614,22 @@  discard block
 block discarded – undo
614 614
 		 * @var string $key
615 615
 		 * @var GF_Field $field
616 616
 		 */
617
-		foreach( $form['fields'] as $key => $field ) {
617
+		foreach ( $form[ 'fields' ] as $key => $field ) {
618 618
 
619 619
 			$inputs = $field->get_entry_inputs();
620 620
 
621
-			if( !empty( $field->gravityview_approved ) ) {
622
-				if ( ! empty( $inputs ) && !empty( $inputs[0]['id'] ) ) {
623
-					$approved_column_id = $inputs[0]['id'];
621
+			if ( ! empty( $field->gravityview_approved ) ) {
622
+				if ( ! empty( $inputs ) && ! empty( $inputs[ 0 ][ 'id' ] ) ) {
623
+					$approved_column_id = $inputs[ 0 ][ 'id' ];
624 624
 					break;
625 625
 				}
626 626
 			}
627 627
 
628 628
 			// Note: This is just for backward compatibility from GF Directory plugin and old GV versions - when using i18n it may not work..
629
-			if( 'checkbox' === $field->type && ! empty( $inputs ) ) {
629
+			if ( 'checkbox' === $field->type && ! empty( $inputs ) ) {
630 630
 				foreach ( $inputs as $input ) {
631
-					if ( 'approved' === strtolower( $input['label'] ) ) {
632
-						$approved_column_id = $input['id'];
631
+					if ( 'approved' === strtolower( $input[ 'label' ] ) ) {
632
+						$approved_column_id = $input[ 'id' ];
633 633
 						break;
634 634
 					}
635 635
 				}
@@ -655,7 +655,7 @@  discard block
 block discarded – undo
655 655
 
656 656
 		$view_keys = array_keys( $gv_data->get_views() );
657 657
 
658
-		$view = \GV\View::by_id( $view_keys[0] );
658
+		$view = \GV\View::by_id( $view_keys[ 0 ] );
659 659
 
660 660
 		if ( ! $view->settings->get( 'unapprove_edit' ) ) {
661 661
 			return;
@@ -665,7 +665,7 @@  discard block
 block discarded – undo
665 665
 			return;
666 666
 		}
667 667
 
668
-		self::update_approved_meta( $entry_id, GravityView_Entry_Approval_Status::UNAPPROVED, $form['id'] );
668
+		self::update_approved_meta( $entry_id, GravityView_Entry_Approval_Status::UNAPPROVED, $form[ 'id' ] );
669 669
 	}
670 670
 
671 671
 }
Please login to merge, or discard this patch.
includes/class-gravityview-extension.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
  */
15 15
 abstract class GravityView_Extension extends \GV\Extension {
16 16
 	public function __construct() {
17
-		if( ! in_array( $this->_author, array( 'GravityView', 'Katz Web Services, Inc.', true ) ) ) {
17
+		if ( ! in_array( $this->_author, array( 'GravityView', 'Katz Web Services, Inc.', true ) ) ) {
18 18
 			gravityview()->log->warning( '\GravityView_Extension is deprecated. Inherit from \GV\Extension instead', array( 'data' => $this ) );
19 19
 		}
20 20
 		parent::__construct();
Please login to merge, or discard this patch.
future/includes/rest/class-gv-rest-views-route.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 			'total' => wp_count_posts( 'gravityview' )->publish,
64 64
 		);
65 65
 		foreach ( $items as $item ) {
66
-			$data['views'][] = $this->prepare_view_for_response( $item, $request );
66
+			$data[ 'views' ][ ] = $this->prepare_view_for_response( $item, $request );
67 67
 		}
68 68
 
69 69
 		return new \WP_REST_Response( $data, 200 );
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 
83 83
 		$url = $request->get_url_params();
84 84
 
85
-		$view_id = intval( $url['id'] );
85
+		$view_id = intval( $url[ 'id' ] );
86 86
 
87 87
 		$item = get_post( $view_id );
88 88
 
@@ -166,10 +166,10 @@  discard block
 block discarded – undo
166 166
 	public function get_sub_items( $request ) {
167 167
 
168 168
 		$url     = $request->get_url_params();
169
-		$view_id = intval( $url['id'] );
169
+		$view_id = intval( $url[ 'id' ] );
170 170
 		$format  = \GV\Utils::get( $url, 'format', 'json' );
171 171
 
172
-		if( $post_id = $request->get_param('post_id') ) {
172
+		if ( $post_id = $request->get_param( 'post_id' ) ) {
173 173
 			global $post;
174 174
 
175 175
 			$post = get_post( $post_id );
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 
261 261
 		$data = array( 'entries' => $entries->all(), 'total' => $entries->total() );
262 262
 
263
-		foreach ( $data['entries'] as &$entry ) {
263
+		foreach ( $data[ 'entries' ] as &$entry ) {
264 264
 			$entry = $this->prepare_entry_for_response( $view, $entry, $request, 'directory' );
265 265
 		}
266 266
 
@@ -279,8 +279,8 @@  discard block
 block discarded – undo
279 279
 	 */
280 280
 	public function get_sub_item( $request ) {
281 281
 		$url      = $request->get_url_params();
282
-		$view_id  = intval( $url['id'] );
283
-		$entry_id = intval( $url['s_id'] );
282
+		$view_id  = intval( $url[ 'id' ] );
283
+		$entry_id = intval( $url[ 's_id' ] );
284 284
 		$format   = \GV\Utils::get( $url, 'format', 'json' );
285 285
 
286 286
 		$view  = \GV\View::by_id( $view_id );
@@ -315,32 +315,32 @@  discard block
 block discarded – undo
315 315
 		// Add all the WP_Post data
316 316
 		$view_post = $view_post->to_array();
317 317
 
318
-		unset( $view_post['to_ping'], $view_post['ping_status'], $view_post['pinged'], $view_post['post_type'], $view_post['filter'], $view_post['post_category'], $view_post['tags_input'], $view_post['post_content'], $view_post['post_content_filtered'] );
318
+		unset( $view_post[ 'to_ping' ], $view_post[ 'ping_status' ], $view_post[ 'pinged' ], $view_post[ 'post_type' ], $view_post[ 'filter' ], $view_post[ 'post_category' ], $view_post[ 'tags_input' ], $view_post[ 'post_content' ], $view_post[ 'post_content_filtered' ] );
319 319
 
320 320
 		$return = wp_parse_args( $item, $view_post );
321 321
 
322
-		$return['title'] = $return['post_title'];
322
+		$return[ 'title' ] = $return[ 'post_title' ];
323 323
 
324
-		$return['settings'] = isset( $return['atts'] ) ? $return['atts'] : array();
325
-		unset( $return['atts'], $return['view_id'] );
324
+		$return[ 'settings' ] = isset( $return[ 'atts' ] ) ? $return[ 'atts' ] : array();
325
+		unset( $return[ 'atts' ], $return[ 'view_id' ] );
326 326
 
327
-		$return['search_criteria'] = array(
327
+		$return[ 'search_criteria' ] = array(
328 328
 			'page_size' => rgars( $return, 'settings/page_size' ),
329 329
 			'sort_field' => rgars( $return, 'settings/sort_field' ),
330 330
 			'sort_direction' => rgars( $return, 'settings/sort_direction' ),
331 331
 			'offset' => rgars( $return, 'settings/offset' ),
332 332
 		);
333 333
 
334
-		unset( $return['settings']['page_size'], $return['settings']['sort_field'], $return['settings']['sort_direction'] );
334
+		unset( $return[ 'settings' ][ 'page_size' ], $return[ 'settings' ][ 'sort_field' ], $return[ 'settings' ][ 'sort_direction' ] );
335 335
 
336 336
 		// Redact for non-logged ins
337 337
 		if ( ! \GVCommon::has_cap( 'edit_others_gravityviews' ) ) {
338
-			unset( $return['settings'] );
339
-			unset( $return['search_criteria'] );
338
+			unset( $return[ 'settings' ] );
339
+			unset( $return[ 'search_criteria' ] );
340 340
 		}
341 341
 		
342 342
 		if ( ! \GFCommon::current_user_can_any( 'gravityforms_edit_forms' ) ) {
343
-			unset( $return['form'] );
343
+			unset( $return[ 'form' ] );
344 344
 		}
345 345
 
346 346
 		return $return;
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
 			$view_id = func_get_arg( 1 ); // $view_id override
357 357
 		} else {
358 358
 			$url     = $request->get_url_params();
359
-			$view_id = intval( $url['id'] );
359
+			$view_id = intval( $url[ 'id' ] );
360 360
 		}
361 361
 
362 362
 		if ( ! $view = \GV\View::by_id( $view_id ) ) {
@@ -400,8 +400,8 @@  discard block
 block discarded – undo
400 400
 		}
401 401
 
402 402
 		$url     = $request->get_url_params();
403
-		$view_id = intval( $url['id'] );
404
-		$entry_id = intval( $url['s_id'] );
403
+		$view_id = intval( $url[ 'id' ] );
404
+		$entry_id = intval( $url[ 's_id' ] );
405 405
 
406 406
 		$view = \GV\View::by_id( $view_id );
407 407
 
@@ -409,11 +409,11 @@  discard block
 block discarded – undo
409 409
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
410 410
 		}
411 411
 
412
-		if ( $entry['form_id'] != $view->form->ID ) {
412
+		if ( $entry[ 'form_id' ] != $view->form->ID ) {
413 413
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
414 414
 		}
415 415
 
416
-		if ( $entry['status'] != 'active' ) {
416
+		if ( $entry[ 'status' ] != 'active' ) {
417 417
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
418 418
 		}
419 419
 
@@ -421,10 +421,10 @@  discard block
 block discarded – undo
421 421
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
422 422
 		}
423 423
 
424
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
424
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
425 425
 
426 426
 		if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
427
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
427
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
428 428
 				return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
429 429
 			}
430 430
 		}
Please login to merge, or discard this patch.
includes/widgets/register-gravityview-widgets.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -20,16 +20,16 @@
 block discarded – undo
20 20
  */
21 21
 function gravityview_register_gravityview_widgets() {
22 22
 
23
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
23
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' );
24 24
 
25
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-pagination-info.php' );
26
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-page-links.php' );
27
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-page-size.php' );
28
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-custom-content.php' );
29
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/search-widget/class-search-widget.php' );
25
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-pagination-info.php' );
26
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-page-links.php' );
27
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-page-size.php' );
28
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-custom-content.php' );
29
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/search-widget/class-search-widget.php' );
30 30
 
31
-	if( class_exists('GFPolls') ) {
32
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/poll/class-gravityview-widget-poll.php' );
31
+	if ( class_exists( 'GFPolls' ) ) {
32
+		include_once( GRAVITYVIEW_DIR . 'includes/widgets/poll/class-gravityview-widget-poll.php' );
33 33
 	}
34 34
 
35 35
 }
Please login to merge, or discard this patch.
includes/widgets/class-gravityview-widget-page-size.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 		$default_size = 25;
46 46
 
47 47
 		if ( $context instanceof \GV\Template_Context ) {
48
-			$default_size = (int) $context->view->settings->get( 'page_size' );
48
+			$default_size = (int)$context->view->settings->get( 'page_size' );
49 49
 		}
50 50
 
51 51
 		$sizes = array( 10, 25, $default_size, 50, 100 );
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 
57 57
 		$page_sizes = array();
58 58
 		foreach ( $sizes as $size ) {
59
-			$page_sizes [] = array(
59
+			$page_sizes [ ] = array(
60 60
 				'value' => $size,
61 61
 				'text'  => $size
62 62
 			);
@@ -81,11 +81,11 @@  discard block
 block discarded – undo
81 81
 	 */
82 82
 	public function render_frontend( $widget_args, $content = '', $context = null ) {
83 83
 
84
-		if( ! $this->pre_render_frontend() ) {
84
+		if ( ! $this->pre_render_frontend() ) {
85 85
 			return;
86 86
 		}
87 87
 
88
-		$page_size = (int) \GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) );
88
+		$page_size = (int)\GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) );
89 89
 
90 90
 		$settings = shortcode_atts( array(
91 91
 			'label'   => __( 'Page Size', 'gravityview' ),
@@ -104,20 +104,20 @@  discard block
 block discarded – undo
104 104
         <div class="gv-widget-page-size">
105 105
             <form method="get" action="<?php echo esc_url( add_query_arg( array() ) ); ?>" onchange="this.submit();">
106 106
                 <div>
107
-                    <?php if( ! empty( $settings['label'] ) ) { ?>
108
-                    <label for="gv-page_size"><?php echo esc_html( $settings['label'] ); ?></label>
107
+                    <?php if ( ! empty( $settings[ 'label' ] ) ) { ?>
108
+                    <label for="gv-page_size"><?php echo esc_html( $settings[ 'label' ] ); ?></label>
109 109
                     <?php } ?>
110 110
                     <select name="page_size" id="gv-page_size">
111
-                        <option value=""><?php echo esc_html( $settings['default_choice_text'] ); ?></option>
111
+                        <option value=""><?php echo esc_html( $settings[ 'default_choice_text' ] ); ?></option>
112 112
 						<?php
113
-						foreach ( $settings['choices'] as $choice ) { ?>
114
-                            <option value='<?php echo esc_attr( $choice['value'] ); ?>'<?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $page_size ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
113
+						foreach ( $settings[ 'choices' ] as $choice ) { ?>
114
+                            <option value='<?php echo esc_attr( $choice[ 'value' ] ); ?>'<?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $page_size ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
115 115
 						<?php } ?>
116 116
                     </select>
117 117
                     <input type="submit" value="Submit" style="visibility: hidden; position: absolute;" /><?php
118
-                    if( ! empty( $_GET ) ) {
118
+                    if ( ! empty( $_GET ) ) {
119 119
                         $get = $_GET;
120
-                        unset( $get['page_size'] );
120
+                        unset( $get[ 'page_size' ] );
121 121
 	                    foreach ( $get as $key => $value ) {
122 122
 		                    printf( '<input type="hidden" name="%s" value="%s" />', esc_attr( $key ), esc_attr( $value ) );
123 123
 	                    }
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 		}
151 151
 
152 152
 		// Already overridden
153
-		if ( (int) $page_size === (int) $view->settings->get( 'page_size' ) ) {
153
+		if ( (int)$page_size === (int)$view->settings->get( 'page_size' ) ) {
154 154
 			return;
155 155
 		}
156 156
 
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 			'view' => $view,
159 159
 		) );
160 160
 
161
-		if ( ! in_array( (int) $page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) {
161
+		if ( ! in_array( (int)$page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) {
162 162
 			gravityview()->log->warning( 'The passed page size is not allowed: {page_size}. Not modifying result.', array( 'page_size' => $page_size ) );
163 163
 			return;
164 164
 		}
Please login to merge, or discard this patch.
includes/admin/class-gravityview-support-port.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -108,9 +108,9 @@  discard block
 block discarded – undo
108 108
 		) );
109 109
 
110 110
 		// This is just HTML we don't need.
111
-		unset( $response['message'] );
111
+		unset( $response[ 'message' ] );
112 112
 
113
-		switch ( intval( $response['price_id'] ) ) {
113
+		switch ( intval( $response[ 'price_id' ] ) ) {
114 114
 			default:
115 115
 			case 1:
116 116
 				$package = 'Core';
@@ -128,19 +128,19 @@  discard block
 block discarded – undo
128 128
 
129 129
 		$data = array(
130 130
 			'email'                 => gravityview()->plugin->settings->get( 'support-email' ),
131
-			'name'                  => $response['customer_name'],
132
-			'Valid License?'        => ucwords( $response['license'] ),
133
-			'License Key'           => $response['license_key'],
131
+			'name'                  => $response[ 'customer_name' ],
132
+			'Valid License?'        => ucwords( $response[ 'license' ] ),
133
+			'License Key'           => $response[ 'license_key' ],
134 134
 			'License Level'         => $package,
135 135
 			'Site Admin Email'      => get_bloginfo( 'admin_email' ),
136 136
 			'Support Email'         => gravityview()->plugin->settings->get( 'support-email' ),
137
-			'License Limit'         => $response['license_limit'],
138
-			'Site Count'            => $response['site_count'],
139
-			'License Expires'       => $response['expires'],
140
-			'Activations Left'      => $response['activations_left'],
141
-			'Payment ID'            => $response['payment_id'],
142
-			'Payment Name'          => $response['customer_name'],
143
-			'Payment Email'         => $response['customer_email'],
137
+			'License Limit'         => $response[ 'license_limit' ],
138
+			'Site Count'            => $response[ 'site_count' ],
139
+			'License Expires'       => $response[ 'expires' ],
140
+			'Activations Left'      => $response[ 'activations_left' ],
141
+			'Payment ID'            => $response[ 'payment_id' ],
142
+			'Payment Name'          => $response[ 'customer_name' ],
143
+			'Payment Email'         => $response[ 'customer_email' ],
144 144
 			'WordPress Version'     => get_bloginfo( 'version', 'display' ),
145 145
 			'PHP Version'           => phpversion(),
146 146
 			'GravityView Version'   => \GV\Plugin::$version,
Please login to merge, or discard this patch.
includes/class-api.php 1 patch
Spacing   +102 added lines, -102 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 
32 32
 		$form = $gravityview_view->getForm();
33 33
 
34
-		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS['GravityView_API_field_label_override'] ) ) {
34
+		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS[ 'GravityView_API_field_label_override' ] ) ) {
35 35
 			/** Allow to fall through for back compatibility testing purposes. */
36 36
 		} else {
37 37
 			return \GV\Mocks\GravityView_API_field_label( $form, $field, $entry, $force_show_label );
@@ -39,29 +39,29 @@  discard block
 block discarded – undo
39 39
 
40 40
 		$label = '';
41 41
 
42
-		if( !empty( $field['show_label'] ) || $force_show_label ) {
42
+		if ( ! empty( $field[ 'show_label' ] ) || $force_show_label ) {
43 43
 
44
-			$label = $field['label'];
44
+			$label = $field[ 'label' ];
45 45
 
46 46
 			// Support Gravity Forms 1.9+
47
-			if( class_exists( 'GF_Field' ) ) {
47
+			if ( class_exists( 'GF_Field' ) ) {
48 48
 
49
-				$field_object = RGFormsModel::get_field( $form, $field['id'] );
49
+				$field_object = RGFormsModel::get_field( $form, $field[ 'id' ] );
50 50
 
51
-				if( $field_object ) {
51
+				if ( $field_object ) {
52 52
 
53
-					$input = GFFormsModel::get_input( $field_object, $field['id'] );
53
+					$input = GFFormsModel::get_input( $field_object, $field[ 'id' ] );
54 54
 
55 55
 					// This is a complex field, with labels on a per-input basis
56
-					if( $input ) {
56
+					if ( $input ) {
57 57
 
58 58
 						// Does the input have a custom label on a per-input basis? Otherwise, default label.
59
-						$label = ! empty( $input['customLabel'] ) ? $input['customLabel'] : $input['label'];
59
+						$label = ! empty( $input[ 'customLabel' ] ) ? $input[ 'customLabel' ] : $input[ 'label' ];
60 60
 
61 61
 					} else {
62 62
 
63 63
 						// This is a field with one label
64
-						$label = $field_object->get_field_label( true, $field['label'] );
64
+						$label = $field_object->get_field_label( true, $field[ 'label' ] );
65 65
 
66 66
 					}
67 67
 
@@ -70,9 +70,9 @@  discard block
 block discarded – undo
70 70
 			}
71 71
 
72 72
 			// Use Gravity Forms label by default, but if a custom label is defined in GV, use it.
73
-			if ( !empty( $field['custom_label'] ) ) {
73
+			if ( ! empty( $field[ 'custom_label' ] ) ) {
74 74
 
75
-				$label = self::replace_variables( $field['custom_label'], $form, $entry );
75
+				$label = self::replace_variables( $field[ 'custom_label' ], $form, $entry );
76 76
 
77 77
 			}
78 78
 
@@ -134,11 +134,11 @@  discard block
 block discarded – undo
134 134
 
135 135
 		$width = NULL;
136 136
 
137
-		if( !empty( $field['width'] ) ) {
138
-			$width = absint( $field['width'] );
137
+		if ( ! empty( $field[ 'width' ] ) ) {
138
+			$width = absint( $field[ 'width' ] );
139 139
 
140 140
 			// If using percentages, limit to 100%
141
-			if( '%d%%' === $format && $width > 100 ) {
141
+			if ( '%d%%' === $format && $width > 100 ) {
142 142
 				$width = 100;
143 143
 			}
144 144
 
@@ -159,42 +159,42 @@  discard block
 block discarded – undo
159 159
 	public static function field_class( $field, $form = NULL, $entry = NULL ) {
160 160
 		$classes = array();
161 161
 
162
-		if( !empty( $field['custom_class'] ) ) {
162
+		if ( ! empty( $field[ 'custom_class' ] ) ) {
163 163
 
164
-            $custom_class = $field['custom_class'];
164
+            $custom_class = $field[ 'custom_class' ];
165 165
 
166
-            if( !empty( $entry ) ) {
166
+            if ( ! empty( $entry ) ) {
167 167
 
168 168
                 // We want the merge tag to be formatted as a class. The merge tag may be
169 169
                 // replaced by a multiple-word value that should be output as a single class.
170 170
                 // "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
171
-                add_filter('gform_merge_tag_filter', 'sanitize_html_class');
171
+                add_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
172 172
 
173
-                $custom_class = self::replace_variables( $custom_class, $form, $entry);
173
+                $custom_class = self::replace_variables( $custom_class, $form, $entry );
174 174
 
175 175
                 // And then we want life to return to normal
176
-                remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
176
+                remove_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
177 177
             }
178 178
 
179 179
 			// And now we want the spaces to be handled nicely.
180
-			$classes[] = gravityview_sanitize_html_class( $custom_class );
180
+			$classes[ ] = gravityview_sanitize_html_class( $custom_class );
181 181
 
182 182
 		}
183 183
 
184
-		if(!empty($field['id'])) {
185
-			if( !empty( $form ) && !empty( $form['id'] ) ) {
186
-				$form_id = '-'.$form['id'];
184
+		if ( ! empty( $field[ 'id' ] ) ) {
185
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
186
+				$form_id = '-' . $form[ 'id' ];
187 187
 			} else {
188 188
 				// @deprecated path. Form should always be given.
189 189
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
190 190
 				$gravityview_view = GravityView_View::getInstance();
191
-				$form_id = $gravityview_view->getFormId() ? '-'. $gravityview_view->getFormId() : '';
191
+				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
192 192
 			}
193 193
 
194
-			$classes[] = 'gv-field'.$form_id.'-'.$field['id'];
194
+			$classes[ ] = 'gv-field' . $form_id . '-' . $field[ 'id' ];
195 195
 		}
196 196
 
197
-		return esc_attr(implode(' ', $classes));
197
+		return esc_attr( implode( ' ', $classes ) );
198 198
 	}
199 199
 
200 200
 	/**
@@ -210,11 +210,11 @@  discard block
 block discarded – undo
210 210
 	 * @return string Sanitized unique HTML `id` attribute for the field
211 211
 	 */
212 212
 	public static function field_html_attr_id( $field, $form = array(), $entry = array() ) {
213
-		$id = $field['id'];
213
+		$id = $field[ 'id' ];
214 214
 
215 215
 		if ( ! empty( $id ) ) {
216
-			if ( ! empty( $form ) && ! empty( $form['id'] ) ) {
217
-				$form_id = '-' . $form['id'];
216
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
217
+				$form_id = '-' . $form[ 'id' ];
218 218
 			} else {
219 219
 				// @deprecated path. Form should always be given.
220 220
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
223 223
 			}
224 224
 
225
-			$id = 'gv-field' . $form_id . '-' . $field['id'];
225
+			$id = 'gv-field' . $form_id . '-' . $field[ 'id' ];
226 226
 		}
227 227
 
228 228
 		return esc_attr( $id );
@@ -262,14 +262,14 @@  discard block
 block discarded – undo
262 262
 	 */
263 263
 	public static function entry_link_html( $entry = array(), $anchor_text = '', $passed_tag_atts = array(), $field_settings = array(), $base_id = null ) {
264 264
 
265
-		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry['id'] ) ) {
265
+		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry[ 'id' ] ) ) {
266 266
 			gravityview()->log->debug( 'Entry not defined; returning null', array( 'data' => $entry ) );
267 267
 			return NULL;
268 268
 		}
269 269
 
270 270
 		$href = self::entry_link( $entry, $base_id );
271 271
 
272
-		if( '' === $href ) {
272
+		if ( '' === $href ) {
273 273
 			return NULL;
274 274
 		}
275 275
 
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 		} else {
307 307
 			$gravityview_view = GravityView_View::getInstance();
308 308
 
309
-			if( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
309
+			if ( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
310 310
 				$is_search = true;
311 311
 			}
312 312
 		}
@@ -403,9 +403,9 @@  discard block
 block discarded – undo
403 403
 
404 404
 		// If we've saved the permalink in memory, use it
405 405
 		// @since 1.3
406
-		$link = wp_cache_get( 'gv_directory_link_'.$post_id );
406
+		$link = wp_cache_get( 'gv_directory_link_' . $post_id );
407 407
 
408
-		if ( (int) $post_id === (int) get_option( 'page_on_front' ) ) {
408
+		if ( (int)$post_id === (int)get_option( 'page_on_front' ) ) {
409 409
 			$link = home_url();
410 410
 		}
411 411
 
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
 
415 415
 			// If not yet saved, cache the permalink.
416 416
 			// @since 1.3
417
-			wp_cache_set( 'gv_directory_link_'.$post_id, $link );
417
+			wp_cache_set( 'gv_directory_link_' . $post_id, $link );
418 418
 		}
419 419
 
420 420
 		// Deal with returning to proper pagination for embedded views
@@ -422,13 +422,13 @@  discard block
 block discarded – undo
422 422
 
423 423
 			$args = array();
424 424
 
425
-			if( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
426
-				$args['pagenum'] = intval( $pagenum );
425
+			if ( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
426
+				$args[ 'pagenum' ] = intval( $pagenum );
427 427
 			}
428 428
 
429
-			if( $sort = \GV\Utils::_GET( 'sort' ) ) {
430
-				$args['sort'] = $sort;
431
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
429
+			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
430
+				$args[ 'sort' ] = $sort;
431
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
432 432
 			}
433 433
 
434 434
 			$link = add_query_arg( $args, $link );
@@ -465,7 +465,7 @@  discard block
 block discarded – undo
465 465
 	private static function get_custom_entry_slug( $id, $entry = array() ) {
466 466
 
467 467
 		// Generate an unique hash to use as the default value
468
-		$slug = substr( wp_hash( $id, 'gravityview'.$id ), 0, 8 );
468
+		$slug = substr( wp_hash( $id, 'gravityview' . $id ), 0, 8 );
469 469
 
470 470
 		/**
471 471
 		 * @filter `gravityview_entry_slug` Modify the unique hash ID generated, if you want to improve usability or change the format. This will allow for custom URLs, such as `{entryid}-{first-name}` or even, if unique, `{first-name}-{last-name}`
@@ -476,7 +476,7 @@  discard block
 block discarded – undo
476 476
 		$slug = apply_filters( 'gravityview_entry_slug', $slug, $id, $entry );
477 477
 
478 478
 		// Make sure we have something - use the original ID as backup.
479
-		if( empty( $slug ) ) {
479
+		if ( empty( $slug ) ) {
480 480
 			$slug = $id;
481 481
 		}
482 482
 
@@ -570,15 +570,15 @@  discard block
 block discarded – undo
570 570
          * @param boolean $custom Should we process the custom entry slug?
571 571
          */
572 572
         $custom = apply_filters( 'gravityview_custom_entry_slug', false );
573
-        if( $custom ) {
573
+        if ( $custom ) {
574 574
             // create the gravityview_unique_id and save it
575 575
 
576 576
             // Get the entry hash
577
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
577
+            $hash = self::get_custom_entry_slug( $entry[ 'id' ], $entry );
578 578
 
579
-	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry['id'], 'hash' => $hash ) );
579
+	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry[ 'id' ], 'hash' => $hash ) );
580 580
 
581
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
581
+            gform_update_meta( $entry[ 'id' ], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
582 582
 
583 583
         }
584 584
     }
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
 
598 598
 		if ( ! empty( $entry ) && ! is_array( $entry ) ) {
599 599
 			$entry = GVCommon::get_entry( $entry );
600
-		} else if( empty( $entry ) ) {
600
+		} else if ( empty( $entry ) ) {
601 601
 			// @deprecated path
602 602
 			$entry = GravityView_frontend::getInstance()->getEntry();
603 603
 		}
@@ -617,9 +617,9 @@  discard block
 block discarded – undo
617 617
 
618 618
 		$query_arg_name = \GV\Entry::get_endpoint_name();
619 619
 
620
-		$entry_slug = self::get_entry_slug( $entry['id'], $entry );
620
+		$entry_slug = self::get_entry_slug( $entry[ 'id' ], $entry );
621 621
 
622
-		if ( get_option('permalink_structure') && !is_preview() ) {
622
+		if ( get_option( 'permalink_structure' ) && ! is_preview() ) {
623 623
 
624 624
 			$args = array();
625 625
 
@@ -629,9 +629,9 @@  discard block
 block discarded – undo
629 629
 			 */
630 630
 			$link_parts = explode( '?', $directory_link );
631 631
 
632
-			$query = !empty( $link_parts[1] ) ? '?'.$link_parts[1] : '';
632
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
633 633
 
634
-			$directory_link = trailingslashit( $link_parts[0] ) . $query_arg_name . '/'. $entry_slug .'/' . $query;
634
+			$directory_link = trailingslashit( $link_parts[ 0 ] ) . $query_arg_name . '/' . $entry_slug . '/' . $query;
635 635
 
636 636
 		} else {
637 637
 
@@ -643,22 +643,22 @@  discard block
 block discarded – undo
643 643
 		 */
644 644
 		if ( $add_directory_args ) {
645 645
 
646
-			if ( ! empty( $_GET['pagenum'] ) ) {
647
-				$args['pagenum'] = intval( $_GET['pagenum'] );
646
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
647
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
648 648
 			}
649 649
 
650 650
 			/**
651 651
 			 * @since 1.7
652 652
 			 */
653 653
 			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
654
-				$args['sort'] = $sort;
655
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
654
+				$args[ 'sort' ] = $sort;
655
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
656 656
 			}
657 657
 
658 658
 		}
659 659
 
660 660
 		if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance()->has_multiple_views() ) {
661
-			$args['gvid'] = gravityview_get_view_id();
661
+			$args[ 'gvid' ] = gravityview_get_view_id();
662 662
 		}
663 663
 
664 664
 		return add_query_arg( $args, $directory_link );
@@ -679,7 +679,7 @@  discard block
 block discarded – undo
679 679
 }
680 680
 
681 681
 function gv_class( $field, $form = NULL, $entry = array() ) {
682
-	return GravityView_API::field_class( $field, $form, $entry  );
682
+	return GravityView_API::field_class( $field, $form, $entry );
683 683
 }
684 684
 
685 685
 /**
@@ -702,7 +702,7 @@  discard block
 block discarded – undo
702 702
 		$view_id = 0;
703 703
 		if ( $context->view ) {
704 704
 			$view_id = $context->view->ID;
705
-			if( $context->view->settings->get( 'hide_until_searched' ) ) {
705
+			if ( $context->view->settings->get( 'hide_until_searched' ) ) {
706 706
 				$hide_until_searched = ( empty( $context->entry ) && ! $context->request->is_search() );
707 707
 			}
708 708
 		}
@@ -730,7 +730,7 @@  discard block
 block discarded – undo
730 730
 		$default_css_class .= ' gv-container-no-results';
731 731
 	}
732 732
 
733
-	$css_class = trim( $passed_css_class . ' '. $default_css_class );
733
+	$css_class = trim( $passed_css_class . ' ' . $default_css_class );
734 734
 
735 735
 	/**
736 736
 	 * @filter `gravityview/render/container/class` Modify the CSS class to be added to the wrapper <div> of a View
@@ -757,7 +757,7 @@  discard block
 block discarded – undo
757 757
 
758 758
 	$value = GravityView_API::field_value( $entry, $field );
759 759
 
760
-	if( $value === '' ) {
760
+	if ( $value === '' ) {
761 761
 		/**
762 762
 		 * @filter `gravityview_empty_value` What to display when a field is empty
763 763
 		 * @param string $value (empty string)
@@ -870,7 +870,7 @@  discard block
 block discarded – undo
870 870
  */
871 871
 function gravityview_get_field_value( $entry, $field_id, $display_value ) {
872 872
 
873
-	if( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
873
+	if ( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
874 874
 
875 875
 		// For the complete field value as generated by Gravity Forms
876 876
 		return $display_value;
@@ -904,16 +904,16 @@  discard block
 block discarded – undo
904 904
 		$terms = explode( ', ', $value );
905 905
 	}
906 906
 
907
-	foreach ($terms as $term_name ) {
907
+	foreach ( $terms as $term_name ) {
908 908
 
909 909
 		// If we're processing a category,
910
-		if( $taxonomy === 'category' ) {
910
+		if ( $taxonomy === 'category' ) {
911 911
 
912 912
 			// Use rgexplode to prevent errors if : doesn't exist
913 913
 			list( $term_name, $term_id ) = rgexplode( ':', $term_name, 2 );
914 914
 
915 915
 			// The explode was succesful; we have the category ID
916
-			if( !empty( $term_id )) {
916
+			if ( ! empty( $term_id ) ) {
917 917
 				$term = get_term_by( 'id', $term_id, $taxonomy );
918 918
 			} else {
919 919
 			// We have to fall back to the name
@@ -926,7 +926,7 @@  discard block
 block discarded – undo
926 926
 		}
927 927
 
928 928
 		// There's still a tag/category here.
929
-		if( $term ) {
929
+		if ( $term ) {
930 930
 
931 931
 			$term_link = get_term_link( $term, $taxonomy );
932 932
 
@@ -935,11 +935,11 @@  discard block
 block discarded – undo
935 935
 			    continue;
936 936
 			}
937 937
 
938
-			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
938
+			$output[ ] = gravityview_get_link( $term_link, esc_html( $term->name ) );
939 939
 		}
940 940
 	}
941 941
 
942
-	return implode(', ', $output );
942
+	return implode( ', ', $output );
943 943
 }
944 944
 
945 945
 /**
@@ -953,8 +953,8 @@  discard block
 block discarded – undo
953 953
 
954 954
 	$output = get_the_term_list( $post_id, $taxonomy, NULL, ', ' );
955 955
 
956
-	if( empty( $link ) ) {
957
-		return strip_tags( $output);
956
+	if ( empty( $link ) ) {
957
+		return strip_tags( $output );
958 958
 	}
959 959
 
960 960
 	return $output;
@@ -973,7 +973,7 @@  discard block
 block discarded – undo
973 973
 	$fe = GravityView_frontend::getInstance();
974 974
 
975 975
 	// Solve problem when loading content via admin-ajax.php
976
-	if( ! $fe->getGvOutputData() ) {
976
+	if ( ! $fe->getGvOutputData() ) {
977 977
 
978 978
 		gravityview()->log->debug( 'gv_output_data not defined; parsing content.' );
979 979
 
@@ -981,7 +981,7 @@  discard block
 block discarded – undo
981 981
 	}
982 982
 
983 983
 	// Make 100% sure that we're dealing with a properly called situation
984
-	if( !is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
984
+	if ( ! is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
985 985
 
986 986
 		gravityview()->log->debug( 'gv_output_data not an object or get_view not callable.', array( 'data' => $fe->getGvOutputData() ) );
987 987
 
@@ -1203,12 +1203,12 @@  discard block
 block discarded – undo
1203 1203
 function gravityview_get_files_array( $value, $gv_class = '', $context = null ) {
1204 1204
 	/** @define "GRAVITYVIEW_DIR" "../" */
1205 1205
 
1206
-	if( !class_exists( 'GravityView_Field' ) ) {
1207
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field.php' );
1206
+	if ( ! class_exists( 'GravityView_Field' ) ) {
1207
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field.php' );
1208 1208
 	}
1209 1209
 
1210
-	if( !class_exists( 'GravityView_Field_FileUpload' ) ) {
1211
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field-fileupload.php' );
1210
+	if ( ! class_exists( 'GravityView_Field_FileUpload' ) ) {
1211
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field-fileupload.php' );
1212 1212
 	}
1213 1213
 
1214 1214
 	if ( is_null( $context ) ) {
@@ -1311,21 +1311,21 @@  discard block
 block discarded – undo
1311 1311
 	} else {
1312 1312
 		// @deprecated path
1313 1313
 		// Required fields.
1314
-		if ( empty( $args['field'] ) || empty( $args['form'] ) ) {
1314
+		if ( empty( $args[ 'field' ] ) || empty( $args[ 'form' ] ) ) {
1315 1315
 			gravityview()->log->error( 'Field or form are empty.', array( 'data' => $args ) );
1316 1316
 			return '';
1317 1317
 		}
1318 1318
 	}
1319 1319
 
1320 1320
 	if ( $context instanceof \GV\Template_Context ) {
1321
-		$entry = $args['entry'] ? : ( $context->entry ? $context->entry->as_entry() : array() );
1322
-		$field = $args['field'] ? : ( $context->field ? $context->field->as_configuration() : array() );
1323
-		$form = $args['form'] ? : ( $context->view->form ? $context->view->form->form : array() );
1321
+		$entry = $args[ 'entry' ] ?: ( $context->entry ? $context->entry->as_entry() : array() );
1322
+		$field = $args[ 'field' ] ?: ( $context->field ? $context->field->as_configuration() : array() );
1323
+		$form = $args[ 'form' ] ?: ( $context->view->form ? $context->view->form->form : array() );
1324 1324
 	} else {
1325 1325
 		// @deprecated path
1326
-		$entry = empty( $args['entry'] ) ? array() : $args['entry'];
1327
-		$field = $args['field'];
1328
-		$form = $args['form'];
1326
+		$entry = empty( $args[ 'entry' ] ) ? array() : $args[ 'entry' ];
1327
+		$field = $args[ 'field' ];
1328
+		$form = $args[ 'form' ];
1329 1329
 	}
1330 1330
 
1331 1331
 	/**
@@ -1345,43 +1345,43 @@  discard block
 block discarded – undo
1345 1345
 	);
1346 1346
 
1347 1347
 	if ( $context instanceof \GV\Template_Context ) {
1348
-		$placeholders['value'] = \GV\Utils::get( $args, 'value', '' );
1348
+		$placeholders[ 'value' ] = \GV\Utils::get( $args, 'value', '' );
1349 1349
 	} else {
1350 1350
 		// @deprecated path
1351
-		$placeholders['value'] = gv_value( $entry, $field );
1351
+		$placeholders[ 'value' ] = gv_value( $entry, $field );
1352 1352
 	}
1353 1353
 
1354 1354
 	// If the value is empty and we're hiding empty, return empty.
1355
-	if ( $placeholders['value'] === '' && ! empty( $args['hide_empty'] ) ) {
1355
+	if ( $placeholders[ 'value' ] === '' && ! empty( $args[ 'hide_empty' ] ) ) {
1356 1356
 		return '';
1357 1357
 	}
1358 1358
 
1359
-	if ( $placeholders['value'] !== '' && ! empty( $args['wpautop'] ) ) {
1360
-		$placeholders['value'] = wpautop( $placeholders['value'] );
1359
+	if ( $placeholders[ 'value' ] !== '' && ! empty( $args[ 'wpautop' ] ) ) {
1360
+		$placeholders[ 'value' ] = wpautop( $placeholders[ 'value' ] );
1361 1361
 	}
1362 1362
 
1363 1363
 	// Get width setting, if exists
1364
-	$placeholders['width'] = GravityView_API::field_width( $field );
1364
+	$placeholders[ 'width' ] = GravityView_API::field_width( $field );
1365 1365
 
1366 1366
 	// If replacing with CSS inline formatting, let's do it.
1367
-	$placeholders['width:style'] = GravityView_API::field_width( $field, 'width:' . $placeholders['width'] . '%;' );
1367
+	$placeholders[ 'width:style' ] = GravityView_API::field_width( $field, 'width:' . $placeholders[ 'width' ] . '%;' );
1368 1368
 
1369 1369
 	// Grab the Class using `gv_class`
1370
-	$placeholders['class'] = gv_class( $field, $form, $entry );
1371
-	$placeholders['field_id'] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1370
+	$placeholders[ 'class' ] = gv_class( $field, $form, $entry );
1371
+	$placeholders[ 'field_id' ] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1372 1372
 
1373 1373
 	if ( $context instanceof \GV\Template_Context ) {
1374
-		$placeholders['label_value'] = \GV\Utils::get( $args, 'label' );
1374
+		$placeholders[ 'label_value' ] = \GV\Utils::get( $args, 'label' );
1375 1375
 	} else {
1376 1376
 		// Default Label value
1377
-		$placeholders['label_value'] = gv_label( $field, $entry );
1377
+		$placeholders[ 'label_value' ] = gv_label( $field, $entry );
1378 1378
 	}
1379 1379
 
1380
-	$placeholders['label_value:data-label'] = trim( esc_attr( strip_tags( str_replace( '>&nbsp;', '>', $placeholders['label_value'] ) ) ) );
1381
-	$placeholders['label_value:esc_attr'] = esc_attr( $placeholders['label_value'] );
1380
+	$placeholders[ 'label_value:data-label' ] = trim( esc_attr( strip_tags( str_replace( '>&nbsp;', '>', $placeholders[ 'label_value' ] ) ) ) );
1381
+	$placeholders[ 'label_value:esc_attr' ] = esc_attr( $placeholders[ 'label_value' ] );
1382 1382
 
1383
-	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ){
1384
-		$placeholders['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
1383
+	if ( empty( $placeholders[ 'label' ] ) && ! empty( $placeholders[ 'label_value' ] ) ) {
1384
+		$placeholders[ 'label' ] = '<span class="gv-field-label">{{ label_value }}</span>';
1385 1385
 	}
1386 1386
 
1387 1387
 	/**
@@ -1392,7 +1392,7 @@  discard block
 block discarded – undo
1392 1392
 	 * @since 2.0
1393 1393
 	 * @param \GV\Template_Context $context The context.
1394 1394
 	 */
1395
-	$html = apply_filters( 'gravityview/field_output/pre_html', $args['markup'], $args, $context );
1395
+	$html = apply_filters( 'gravityview/field_output/pre_html', $args[ 'markup' ], $args, $context );
1396 1396
 
1397 1397
 	/**
1398 1398
 	 * @filter `gravityview/field_output/open_tag` Modify the opening tags for the template content placeholders
@@ -1419,7 +1419,7 @@  discard block
 block discarded – undo
1419 1419
 	foreach ( $placeholders as $tag => $value ) {
1420 1420
 
1421 1421
 		// If the tag doesn't exist just skip it
1422
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
1422
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
1423 1423
 			continue;
1424 1424
 		}
1425 1425
 
Please login to merge, or discard this patch.