Completed
Pull Request — develop (#1504)
by Zack
16:09
created
includes/extensions/delete-entry/class-delete-entry.php 3 patches
Doc Comments   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,6 +39,9 @@  discard block
 block discarded – undo
39 39
 		$this->add_hooks();
40 40
 	}
41 41
 
42
+	/**
43
+	 * @param string $component
44
+	 */
42 45
 	private function load_components( $component ) {
43 46
 
44 47
 		$dir = trailingslashit( self::$file );
@@ -255,7 +258,6 @@  discard block
 block discarded – undo
255 258
 	 *
256 259
 	 * @since 1.5.1
257 260
 	 * @param  array       $visibility_caps        Array of capabilities to display in field dropdown.
258
-	 * @param  string      $field_type  Type of field options to render (`field` or `widget`)
259 261
 	 * @param  string      $template_id Table slug
260 262
 	 * @param  float       $field_id    GF Field ID - Example: `3`, `5.2`, `entry_link`, `created_by`
261 263
 	 * @param  string      $context     What context are we in? Example: `single` or `directory`
@@ -717,7 +719,7 @@  discard block
 block discarded – undo
717 719
 	 *
718 720
 	 * @param  array $entry Gravity Forms entry array
719 721
 	 * @param array $field Field settings (optional)
720
-	 * @param int|\GV\View $view Pass a View ID to check caps against. If not set, check against current View (@deprecated no longer optional)
722
+	 * @param integer $view Pass a View ID to check caps against. If not set, check against current View (@deprecated no longer optional)
721 723
 	 * @return bool
722 724
 	 */
723 725
 	public static function check_user_cap_delete_entry( $entry, $field = array(), $view = 0 ) {
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -532,7 +532,7 @@
 block discarded – undo
532 532
 				 * @since 1.16.4
533 533
 				 * @param  int $entry_id ID of the Gravity Forms entry
534 534
 				 * @param  array $entry Deleted entry array
535
-				*/
535
+				 */
536 536
 				do_action( 'gravityview/delete-entry/deleted', $entry_id, $entry );
537 537
 			}
538 538
 
Please login to merge, or discard this patch.
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 
150 150
 		// Index 100 is the default GravityView template path.
151 151
 		// Index 110 is Edit Entry link
152
-		$file_paths[115] = self::$file;
152
+		$file_paths[ 115 ] = self::$file;
153 153
 
154 154
 		return $file_paths;
155 155
 	}
@@ -170,12 +170,12 @@  discard block
 block discarded – undo
170 170
 	function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
171 171
 
172 172
 		// Always a link, never a filter
173
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
173
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
174 174
 
175 175
 		// Delete Entry link should only appear to visitors capable of editing entries
176
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
176
+		unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
177 177
 
178
-		$add_option['delete_link'] = array(
178
+		$add_option[ 'delete_link' ] = array(
179 179
 			'type' => 'text',
180 180
 			'label' => __( 'Delete Link Text', 'gravityview' ),
181 181
 			'desc' => null,
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
 			'merge_tags' => true,
184 184
 		);
185 185
 
186
-		$field_options['allow_edit_cap'] = array(
186
+		$field_options[ 'allow_edit_cap' ] = array(
187 187
 			'type' => 'select',
188 188
 			'label' => __( 'Allow the following users to delete the entry:', 'gravityview' ),
189 189
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
 	function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
208 208
 
209 209
 		if ( 'edit' !== $zone ) {
210
-			$entry_default_fields['delete_link'] = array(
210
+			$entry_default_fields[ 'delete_link' ] = array(
211 211
 				'label' => __( 'Delete Entry', 'gravityview' ),
212 212
 				'type'  => 'delete_link',
213 213
 				'desc'  => __( 'A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview' ),
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
 	 */
225 225
 	function add_available_field( $available_fields = array() ) {
226 226
 
227
-		$available_fields['delete_link'] = array(
227
+		$available_fields[ 'delete_link' ] = array(
228 228
 			'label_text' => __( 'Delete Entry', 'gravityview' ),
229 229
 			'field_id' => 'delete_link',
230 230
 			'label_type' => 'field',
@@ -270,9 +270,9 @@  discard block
 block discarded – undo
270 270
 		if ( $field_id === 'delete_link' ) {
271 271
 
272 272
 			// Remove other built-in caps.
273
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
273
+			unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] );
274 274
 
275
-			$caps['read'] = _x( 'Entry Creator', 'User capability', 'gravityview' );
275
+			$caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
276 276
 		}
277 277
 
278 278
 		return $caps;
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
 	 * @param [type] $entry [description]
286 286
 	 */
287 287
 	function set_entry( $entry = null ) {
288
-		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[0] : $entry;
288
+		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[ 0 ] : $entry;
289 289
 	}
290 290
 
291 291
 	/**
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
 
319 319
 		self::getInstance()->set_entry( $entry );
320 320
 
321
-		$base = GravityView_API::directory_link( $post_id ? : $view_id, true );
321
+		$base = GravityView_API::directory_link( $post_id ?: $view_id, true );
322 322
 
323 323
 		if ( empty( $base ) ) {
324 324
 			gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) );
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
 
380 380
 		$attributes = array(
381 381
 			'class' => 'btn btn-sm button button-small alignright pull-right btn-danger gv-button-delete',
382
-			'tabindex' => ( GFCommon::$tab_index ++ ),
382
+			'tabindex' => ( GFCommon::$tab_index++ ),
383 383
 			'onclick' => self::get_confirm_dialog(),
384 384
 		);
385 385
 
@@ -415,10 +415,10 @@  discard block
 block discarded – undo
415 415
 		);
416 416
 
417 417
 		// If the form is submitted
418
-		if ( 'delete' === $get_fields['action'] && ! empty( $get_fields['entry_id'] ) ) {
418
+		if ( 'delete' === $get_fields[ 'action' ] && ! empty( $get_fields[ 'entry_id' ] ) ) {
419 419
 
420 420
 			// Make sure it's a GravityView request
421
-			$valid_nonce_key = wp_verify_nonce( $get_fields['delete'], self::get_nonce_key( $get_fields['entry_id'] ) );
421
+			$valid_nonce_key = wp_verify_nonce( $get_fields[ 'delete' ], self::get_nonce_key( $get_fields[ 'entry_id' ] ) );
422 422
 
423 423
 			if ( ! $valid_nonce_key ) {
424 424
 				gravityview()->log->debug( 'Delete entry not processed: nonce validation failed.' );
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
 			}
427 427
 
428 428
 			// Get the entry slug
429
-			$entry_slug = esc_attr( $get_fields['entry_id'] );
429
+			$entry_slug = esc_attr( $get_fields[ 'entry_id' ] );
430 430
 
431 431
 			// See if there's an entry there
432 432
 			$entry = gravityview_get_entry( $entry_slug, true, false );
@@ -473,12 +473,12 @@  discard block
 block discarded – undo
473 473
 			}
474 474
 
475 475
 			// Redirect after deleting the entry.
476
-			$view                = \GV\View::by_id( $get_fields['view_id'] );
476
+			$view                = \GV\View::by_id( $get_fields[ 'view_id' ] );
477 477
 			$delete_redirect     = $view->settings->get( 'delete_redirect' );
478 478
 			$delete_redirect_url = $view->settings->get( 'delete_redirect_url' );
479 479
 
480 480
 			if ( '1' !== $delete_redirect ) {
481
-				$delete_redirect_url = get_post_permalink( $get_fields['view_id'] );
481
+				$delete_redirect_url = get_post_permalink( $get_fields[ 'view_id' ] );
482 482
 			}
483 483
 
484 484
 			wp_safe_redirect( $delete_redirect_url );
@@ -513,7 +513,7 @@  discard block
 block discarded – undo
513 513
 	 */
514 514
 	private function delete_or_trash_entry( $entry ) {
515 515
 
516
-		$entry_id = $entry['id'];
516
+		$entry_id = $entry[ 'id' ];
517 517
 
518 518
 		$mode = $this->get_delete_mode();
519 519
 
@@ -577,7 +577,7 @@  discard block
 block discarded – undo
577 577
 	public function process_connected_posts( $entry_id = 0, $entry = array() ) {
578 578
 
579 579
 		// The entry had no connected post
580
-		if ( empty( $entry['post_id'] ) ) {
580
+		if ( empty( $entry[ 'post_id' ] ) ) {
581 581
 			return;
582 582
 		}
583 583
 
@@ -595,9 +595,9 @@  discard block
 block discarded – undo
595 595
 		$action = current_action();
596 596
 
597 597
 		if ( 'gravityview/delete-entry/deleted' === $action ) {
598
-			$result = wp_delete_post( $entry['post_id'], true );
598
+			$result = wp_delete_post( $entry[ 'post_id' ], true );
599 599
 		} else {
600
-			$result = wp_trash_post( $entry['post_id'] );
600
+			$result = wp_trash_post( $entry[ 'post_id' ] );
601 601
 		}
602 602
 
603 603
 		if ( false === $result ) {
@@ -628,13 +628,13 @@  discard block
 block discarded – undo
628 628
 	public function verify_nonce() {
629 629
 
630 630
 		// No delete entry request was made
631
-		if ( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) {
631
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) {
632 632
 			return false;
633 633
 		}
634 634
 
635
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
635
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
636 636
 
637
-		$valid = wp_verify_nonce( $_GET['delete'], $nonce_key );
637
+		$valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key );
638 638
 
639 639
 		/**
640 640
 		 * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid.
@@ -690,7 +690,7 @@  discard block
 block discarded – undo
690 690
 			$error = __( 'You do not have permission to delete this entry.', 'gravityview' );
691 691
 		}
692 692
 
693
-		if ( $entry['status'] === 'trash' ) {
693
+		if ( $entry[ 'status' ] === 'trash' ) {
694 694
 			if ( 'trash' === $this->get_delete_mode() ) {
695 695
 				$error = __( 'The entry is already in the trash.', 'gravityview' );
696 696
 			} else {
@@ -734,7 +734,7 @@  discard block
 block discarded – undo
734 734
 
735 735
 		$current_user = wp_get_current_user();
736 736
 
737
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : null;
737
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : null;
738 738
 
739 739
 		// Or if they can delete any entries (as defined in Gravity Forms), we're good.
740 740
 		if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
@@ -748,17 +748,17 @@  discard block
 block discarded – undo
748 748
 		if ( ! empty( $field ) ) {
749 749
 
750 750
 			// If capability is not defined, something is not right!
751
-			if ( empty( $field['allow_edit_cap'] ) ) {
751
+			if ( empty( $field[ 'allow_edit_cap' ] ) ) {
752 752
 
753 753
 				gravityview()->log->error( 'Cannot read delete entry field caps', array( 'data' => $field ) );
754 754
 
755 755
 				return false;
756 756
 			}
757 757
 
758
-			if ( GVCommon::has_cap( $field['allow_edit_cap'] ) ) {
758
+			if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) {
759 759
 
760 760
 				// Do not return true if cap is read, as we need to check if the current user created the entry
761
-				if ( $field['allow_edit_cap'] !== 'read' ) {
761
+				if ( $field[ 'allow_edit_cap' ] !== 'read' ) {
762 762
 					return true;
763 763
 				}
764 764
 			} else {
@@ -769,7 +769,7 @@  discard block
 block discarded – undo
769 769
 			}
770 770
 		}
771 771
 
772
-		if ( ! isset( $entry['created_by'] ) ) {
772
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
773 773
 
774 774
 			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
775 775
 
@@ -785,7 +785,7 @@  discard block
 block discarded – undo
785 785
 		}
786 786
 
787 787
 		// If the logged-in user is the same as the user who created the entry, we're good.
788
-		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
788
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
789 789
 
790 790
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
791 791
 
@@ -809,12 +809,12 @@  discard block
 block discarded – undo
809 809
 	 * @return void
810 810
 	 */
811 811
 	public function maybe_display_message( $current_view_id = 0 ) {
812
-		if ( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
812
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
813 813
 			return;
814 814
 		}
815 815
 
816 816
 		// Entry wasn't deleted from current View
817
-		if ( isset( $_GET['view_id'] ) && intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) {
817
+		if ( isset( $_GET[ 'view_id' ] ) && intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) {
818 818
 			return;
819 819
 		}
820 820
 
@@ -823,11 +823,11 @@  discard block
 block discarded – undo
823 823
 
824 824
 	public function display_message() {
825 825
 
826
-		if ( empty( $_GET['status'] ) || empty( $_GET['delete'] ) ) {
826
+		if ( empty( $_GET[ 'status' ] ) || empty( $_GET[ 'delete' ] ) ) {
827 827
 			return;
828 828
 		}
829 829
 
830
-		$status = esc_attr( $_GET['status'] );
830
+		$status = esc_attr( $_GET[ 'status' ] );
831 831
 		$message_from_url = \GV\Utils::_GET( 'message' );
832 832
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
833 833
 		$class = '';
Please login to merge, or discard this patch.
includes/admin/metaboxes/class-gravityview-admin-metaboxes.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
52 52
 	function update_priority() {
53 53
 		global $wp_meta_boxes;
54 54
 
55
-		if ( ! empty( $wp_meta_boxes['gravityview'] ) ) {
55
+		if ( ! empty( $wp_meta_boxes[ 'gravityview' ] ) ) {
56 56
 			foreach ( array( 'high', 'core', 'low' ) as $position ) {
57
-				if ( isset( $wp_meta_boxes['gravityview']['normal'][ $position ] ) ) {
58
-					foreach ( $wp_meta_boxes['gravityview']['normal'][ $position ] as $key => $meta_box ) {
57
+				if ( isset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] ) ) {
58
+					foreach ( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] as $key => $meta_box ) {
59 59
 						if ( ! preg_match( '/^gravityview_/ism', $key ) ) {
60
-							$wp_meta_boxes['gravityview']['advanced'][ $position ][ $key ] = $meta_box;
61
-							unset( $wp_meta_boxes['gravityview']['normal'][ $position ][ $key ] );
60
+							$wp_meta_boxes[ 'gravityview' ][ 'advanced' ][ $position ][ $key ] = $meta_box;
61
+							unset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ][ $key ] );
62 62
 						}
63 63
 					}
64 64
 				}
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 
192 192
 		foreach ( $metaboxes as $m ) {
193 193
 
194
-			$tab = new GravityView_Metabox_Tab( $m['id'], $m['title'], $m['file'], $m['icon-class'], $m['callback'], $m['callback_args'] );
194
+			$tab = new GravityView_Metabox_Tab( $m[ 'id' ], $m[ 'title' ], $m[ 'file' ], $m[ 'icon-class' ], $m[ 'callback' ], $m[ 'callback_args' ] );
195 195
 
196 196
 			GravityView_Metabox_Tabs::add( $tab );
197 197
 
@@ -261,13 +261,13 @@  discard block
 block discarded – undo
261 261
 
262 262
 		$form = gravityview_get_form( $curr_form );
263 263
 
264
-		$get_id_backup = isset( $_GET['id'] ) ? $_GET['id'] : null;
264
+		$get_id_backup = isset( $_GET[ 'id' ] ) ? $_GET[ 'id' ] : null;
265 265
 
266
-		if ( isset( $form['id'] ) ) {
266
+		if ( isset( $form[ 'id' ] ) ) {
267 267
 			$form_script = 'var form = ' . GFCommon::json_encode( $form ) . ';';
268 268
 
269 269
 			// The `gf_vars()` method needs a $_GET[id] variable set with the form ID.
270
-			$_GET['id'] = $form['id'];
270
+			$_GET[ 'id' ] = $form[ 'id' ];
271 271
 
272 272
 		} else {
273 273
 			$form_script = 'var form = new Form();';
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
 		$output = '<script type="text/javascript" data-gv-merge-tags="1">' . $form_script . "\n" . GFCommon::gf_vars( false ) . '</script>';
277 277
 
278 278
 		// Restore previous $_GET setting
279
-		$_GET['id'] = $get_id_backup;
279
+		$_GET[ 'id' ] = $get_id_backup;
280 280
 
281 281
 		return $output;
282 282
 	}
Please login to merge, or discard this patch.
future/includes/class-gv-settings-view.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -531,7 +531,7 @@  discard block
 block discarded – undo
531 531
 		);
532 532
 
533 533
 		if ( version_compare( \GFCommon::$version, '2.3-beta-4', '>=' ) ) {
534
-			$default_settings['sort_direction']['options']['RAND'] = __( 'Random', 'gravityview' );
534
+			$default_settings[ 'sort_direction' ][ 'options' ][ 'RAND' ] = __( 'Random', 'gravityview' );
535 535
 		}
536 536
 
537 537
 		/**
@@ -552,7 +552,7 @@  discard block
 block discarded – undo
552 552
 		if ( ! $detailed ) {
553 553
 			$defaults = array();
554 554
 			foreach ( $default_settings as $key => $value ) {
555
-				$defaults[ $key ] = $value['value'];
555
+				$defaults[ $key ] = $value[ 'value' ];
556 556
 			}
557 557
 			return $defaults;
558 558
 
@@ -563,7 +563,7 @@  discard block
 block discarded – undo
563 563
 				// If the $group argument is set for the method,
564 564
 				// ignore any settings that aren't in that group.
565 565
 				if ( ! empty( $group ) && is_string( $group ) ) {
566
-					if ( empty( $value['group'] ) || $value['group'] !== $group ) {
566
+					if ( empty( $value[ 'group' ] ) || $value[ 'group' ] !== $group ) {
567 567
 						unset( $default_settings[ $key ] );
568 568
 					}
569 569
 				}
Please login to merge, or discard this patch.
includes/class-frontend-views.php 1 patch
Spacing   +96 added lines, -96 removed lines patch added patch discarded remove patch
@@ -85,9 +85,9 @@  discard block
 block discarded – undo
85 85
 	private function __construct() {}
86 86
 
87 87
 	private function initialize() {
88
-		add_action( 'wp', array( $this, 'parse_content'), 11 );
88
+		add_action( 'wp', array( $this, 'parse_content' ), 11 );
89 89
 		add_filter( 'parse_query', array( $this, 'parse_query_fix_frontpage' ), 10 );
90
-		add_action( 'template_redirect', array( $this, 'set_entry_data'), 1 );
90
+		add_action( 'template_redirect', array( $this, 'set_entry_data' ), 1 );
91 91
 
92 92
 		// Enqueue scripts and styles after GravityView_Template::register_styles()
93 93
 		add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 20 );
@@ -234,18 +234,18 @@  discard block
 block discarded – undo
234 234
 
235 235
 		if ( ! empty( $view_id ) ) {
236 236
 
237
-			$this->context_view_id = (int) $view_id;
237
+			$this->context_view_id = (int)$view_id;
238 238
 
239
-		} elseif ( isset( $_GET['gvid'] ) && $multiple_views ) {
239
+		} elseif ( isset( $_GET[ 'gvid' ] ) && $multiple_views ) {
240 240
 			/**
241 241
 			 * used on a has_multiple_views context
242 242
 			 * @see GravityView_API::entry_link
243 243
 			 */
244
-			$this->context_view_id = (int) $_GET['gvid'];
244
+			$this->context_view_id = (int)$_GET[ 'gvid' ];
245 245
 
246 246
 		} elseif ( ! $multiple_views ) {
247 247
 			$array_keys = array_keys( $this->getGvOutputData()->get_views() );
248
-			$this->context_view_id = (int) array_pop( $array_keys );
248
+			$this->context_view_id = (int)array_pop( $array_keys );
249 249
 			unset( $array_keys );
250 250
 		}
251 251
 
@@ -278,25 +278,25 @@  discard block
 block discarded – undo
278 278
 		global $wp_rewrite;
279 279
 
280 280
 		$is_front_page = ( $query->is_home || $query->is_page );
281
-		$show_on_front = ( 'page' === get_option('show_on_front') );
282
-		$front_page_id = get_option('page_on_front');
281
+		$show_on_front = ( 'page' === get_option( 'show_on_front' ) );
282
+		$front_page_id = get_option( 'page_on_front' );
283 283
 
284
-		if (  $is_front_page && $show_on_front && $front_page_id ) {
284
+		if ( $is_front_page && $show_on_front && $front_page_id ) {
285 285
 
286 286
 			// Force to be an array, potentially a query string ( entry=16 )
287 287
 			$_query = wp_parse_args( $query->query );
288 288
 
289 289
 			// pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename.
290
-			if ( isset( $_query['pagename'] ) && '' === $_query['pagename'] ) {
291
-				unset( $_query['pagename'] );
290
+			if ( isset( $_query[ 'pagename' ] ) && '' === $_query[ 'pagename' ] ) {
291
+				unset( $_query[ 'pagename' ] );
292 292
 			}
293 293
 
294 294
 			// this is where will break from core wordpress
295 295
 			/** @internal Don't use this filter; it will be unnecessary soon - it's just a patch for specific use case */
296 296
 			$ignore = apply_filters( 'gravityview/internal/ignored_endpoints', array( 'preview', 'page', 'paged', 'cpage' ), $query );
297 297
 			$endpoints = \GV\Utils::get( $wp_rewrite, 'endpoints' );
298
-			foreach ( (array) $endpoints as $endpoint ) {
299
-				$ignore[] = $endpoint[1];
298
+			foreach ( (array)$endpoints as $endpoint ) {
299
+				$ignore[ ] = $endpoint[ 1 ];
300 300
 			}
301 301
 			unset( $endpoints );
302 302
 
@@ -306,21 +306,21 @@  discard block
 block discarded – undo
306 306
 			// - The query includes keys that are associated with registered endpoints. `entry`, for example.
307 307
 			if ( empty( $_query ) || ! array_diff( array_keys( $_query ), $ignore ) ) {
308 308
 
309
-				$qv =& $query->query_vars;
309
+				$qv = & $query->query_vars;
310 310
 
311 311
 				// Prevent redirect when on the single entry endpoint
312
-				if( self::is_single_entry() ) {
312
+				if ( self::is_single_entry() ) {
313 313
 					add_filter( 'redirect_canonical', '__return_false' );
314 314
 				}
315 315
 
316 316
 				$query->is_page = true;
317 317
 				$query->is_home = false;
318
-				$qv['page_id']  = $front_page_id;
318
+				$qv[ 'page_id' ]  = $front_page_id;
319 319
 
320 320
 				// Correct <!--nextpage--> for page_on_front
321
-				if ( ! empty( $qv['paged'] ) ) {
322
-					$qv['page'] = $qv['paged'];
323
-					unset( $qv['paged'] );
321
+				if ( ! empty( $qv[ 'paged' ] ) ) {
322
+					$qv[ 'page' ] = $qv[ 'paged' ];
323
+					unset( $qv[ 'paged' ] );
324 324
 				}
325 325
 			}
326 326
 
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
 
351 351
 		$this->setIsGravityviewPostType( get_post_type( $post ) === 'gravityview' );
352 352
 
353
-		$post_id = $this->getPostId() ? $this->getPostId() : (isset( $post ) ? $post->ID : null );
353
+		$post_id = $this->getPostId() ? $this->getPostId() : ( isset( $post ) ? $post->ID : null );
354 354
 		$this->setPostId( $post_id );
355 355
 		$post_has_shortcode = ! empty( $post->post_content ) ? gravityview_has_shortcode_r( $post->post_content, 'gravityview' ) : false;
356 356
 		$this->setPostHasShortcode( $this->isGravityviewPostType() ? null : ! empty( $post_has_shortcode ) );
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
 
387 387
 		$search_method = GravityView_Widget_Search::getInstance()->get_search_method();
388 388
 
389
-		if( 'post' === $search_method ) {
389
+		if ( 'post' === $search_method ) {
390 390
 			$get = $_POST;
391 391
 		} else {
392 392
 			$get = $_GET;
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
 		$gventry = gravityview()->request->is_entry();
439 439
 
440 440
 		// If this is the directory view, return.
441
-		if( ! $gventry ) {
441
+		if ( ! $gventry ) {
442 442
 			return $passed_title;
443 443
 		}
444 444
 
@@ -456,19 +456,19 @@  discard block
 block discarded – undo
456 456
 		}
457 457
 
458 458
 		// WooCommerce doesn't $post_id
459
-		if ( empty( $passed_post_id ) )  {
459
+		if ( empty( $passed_post_id ) ) {
460 460
 			return $passed_title;
461 461
 		}
462 462
 
463 463
 		// Don't modify the title for anything other than the current view/post.
464 464
 		// This is true for embedded shortcodes and Views.
465
-		if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) {
465
+		if ( is_object( $post ) && (int)$post->ID !== (int)$passed_post_id ) {
466 466
 			return $passed_title;
467 467
 		}
468 468
 
469 469
 		$view = gravityview()->request->is_view();
470 470
 
471
-		if( $view ) {
471
+		if ( $view ) {
472 472
 			return $this->_get_single_entry_title( $view, $entry, $passed_title );
473 473
 		}
474 474
 
@@ -491,7 +491,7 @@  discard block
 block discarded – undo
491 491
 		$view_collection = \GV\View_Collection::from_post( $post );
492 492
 
493 493
 		// We have multiple Views, but no gvid...this isn't valid security
494
-		if( 1 < $view_collection->count() ) {
494
+		if ( 1 < $view_collection->count() ) {
495 495
 			return $passed_title;
496 496
 		}
497 497
 
@@ -525,18 +525,18 @@  discard block
 block discarded – undo
525 525
 		 */
526 526
 		$check_entry_display = apply_filters( 'gravityview/single/title/check_entry_display', true, $entry, $view );
527 527
 
528
-		if( $check_entry_display ) {
528
+		if ( $check_entry_display ) {
529 529
 
530 530
 			$check_display = GVCommon::check_entry_display( $entry, $view );
531 531
 
532
-			if( is_wp_error( $check_display ) ) {
532
+			if ( is_wp_error( $check_display ) ) {
533 533
 				return $passed_title;
534 534
 			}
535 535
 		}
536 536
 
537 537
 		$title = $view->settings->get( 'single_title', $passed_title );
538 538
 
539
-		$form = GVCommon::get_form( $entry['form_id'] );
539
+		$form = GVCommon::get_form( $entry[ 'form_id' ] );
540 540
 
541 541
 		// We are allowing HTML in the fields, so no escaping the output
542 542
 		$title = GravityView_API::replace_variables( $title, $form, $entry );
@@ -607,7 +607,7 @@  discard block
 block discarded – undo
607 607
 
608 608
 		$context = GravityView_View::getInstance()->getContext();
609 609
 
610
-		switch( $context ) {
610
+		switch ( $context ) {
611 611
 			case 'directory':
612 612
 				$tab = __( 'Multiple Entries', 'gravityview' );
613 613
 				break;
@@ -621,12 +621,12 @@  discard block
 block discarded – undo
621 621
 		}
622 622
 
623 623
 
624
-		$title = sprintf( esc_html_x('The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab );
624
+		$title = sprintf( esc_html_x( 'The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab );
625 625
 		$edit_link = admin_url( sprintf( 'post.php?post=%d&action=edit#%s-view', $view_id, $context ) );
626
-		$action_text = sprintf( esc_html__('Add fields to %s', 'gravityview' ), $tab );
626
+		$action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab );
627 627
 		$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' );
628 628
 
629
-		$image =  sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url(plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
629
+		$image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
630 630
 		$output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message );
631 631
 
632 632
 		echo GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $view_id );
@@ -673,7 +673,7 @@  discard block
 block discarded – undo
673 673
 		$direct_access = apply_filters( 'gravityview_direct_access', true, $view->ID );
674 674
 		$embed_only = $view->settings->get( 'embed_only' );
675 675
 
676
-		if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
676
+		if ( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
677 677
 			return __( 'You are not allowed to view this content.', 'gravityview' );
678 678
 		}
679 679
 
@@ -708,7 +708,7 @@  discard block
 block discarded – undo
708 708
 			if ( ! empty( $args[ $key ] ) ) {
709 709
 
710 710
 				// Get a timestamp and see if it's a valid date format
711
-				$date = new DateTimeImmutable( $args[$key], new DateTimeZone( wp_timezone_string() ) );
711
+				$date = new DateTimeImmutable( $args[ $key ], new DateTimeZone( wp_timezone_string() ) );
712 712
 				$date = $date->getTimestamp();
713 713
 
714 714
 				// The date was invalid
@@ -721,7 +721,7 @@  discard block
 block discarded – undo
721 721
 				$datetime_format = 'Y-m-d H:i:s';
722 722
 				$search_is_outside_view_bounds = false;
723 723
 
724
-				if( ! empty( $search_criteria[ $key ] ) ) {
724
+				if ( ! empty( $search_criteria[ $key ] ) ) {
725 725
 
726 726
 					$search_date = strtotime( $search_criteria[ $key ] );
727 727
 
@@ -749,14 +749,14 @@  discard block
 block discarded – undo
749 749
 				if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) {
750 750
 
751 751
 					// Then we override the search and re-set the start date
752
-					$return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true );
752
+					$return_search_criteria[ $key ] = date_i18n( $datetime_format, $date, true );
753 753
 				}
754 754
 			}
755 755
 		}
756 756
 
757
-		if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) {
757
+		if ( isset( $return_search_criteria[ 'start_date' ] ) && isset( $return_search_criteria[ 'end_date' ] ) ) {
758 758
 			// The start date is AFTER the end date. This will result in no results, but let's not force the issue.
759
-			if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) {
759
+			if ( strtotime( $return_search_criteria[ 'start_date' ] ) > strtotime( $return_search_criteria[ 'end_date' ] ) ) {
760 760
 				gravityview()->log->error( 'Invalid search: the start date is after the end date.', array( 'data' => $return_search_criteria ) );
761 761
 			}
762 762
 		}
@@ -775,19 +775,19 @@  discard block
 block discarded – undo
775 775
 	public static function process_search_only_approved( $args, $search_criteria ) {
776 776
 
777 777
 		/** @since 1.19 */
778
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
778
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
779 779
 			gravityview()->log->debug( 'User can moderate entries; showing all approval statuses' );
780 780
 			return $search_criteria;
781 781
 		}
782 782
 
783
-		if ( ! empty( $args['show_only_approved'] ) ) {
783
+		if ( ! empty( $args[ 'show_only_approved' ] ) ) {
784 784
 
785
-			$search_criteria['field_filters'][] = array(
785
+			$search_criteria[ 'field_filters' ][ ] = array(
786 786
 				'key' => GravityView_Entry_Approval::meta_key,
787 787
 				'value' => GravityView_Entry_Approval_Status::APPROVED
788 788
 			);
789 789
 
790
-			$search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met
790
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; // force all the criterias to be met
791 791
 
792 792
 			gravityview()->log->debug( '[process_search_only_approved] Search Criteria if show only approved: ', array( 'data' => $search_criteria ) );
793 793
 		}
@@ -814,18 +814,18 @@  discard block
 block discarded – undo
814 814
 	 */
815 815
 	public static function is_entry_approved( $entry, $args = array() ) {
816 816
 
817
-		if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) {
817
+		if ( empty( $entry[ 'id' ] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args[ 'show_only_approved' ] ) ) {
818 818
 			// is implicitly approved if entry is null or View settings doesn't require to check for approval
819 819
 			return true;
820 820
 		}
821 821
 
822 822
 		/** @since 1.19 */
823
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
823
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
824 824
 			gravityview()->log->debug( 'User can moderate entries, so entry is approved for viewing' );
825 825
 			return true;
826 826
 		}
827 827
 
828
-		$is_approved = gform_get_meta( $entry['id'], GravityView_Entry_Approval::meta_key );
828
+		$is_approved = gform_get_meta( $entry[ 'id' ], GravityView_Entry_Approval::meta_key );
829 829
 
830 830
 		return GravityView_Entry_Approval_Status::is_approved( $is_approved );
831 831
 	}
@@ -849,7 +849,7 @@  discard block
 block discarded – undo
849 849
 		 * Compatibility with filters hooking in `gravityview_search_criteria` instead of `gravityview_fe_search_criteria`.
850 850
 		 */
851 851
 		$criteria = apply_filters( 'gravityview_search_criteria', array(), array( $form_id ), \GV\Utils::get( $args, 'id' ) );
852
-		$search_criteria = isset( $criteria['search_criteria'] ) ? $criteria['search_criteria'] : array( 'field_filters' => array() );
852
+		$search_criteria = isset( $criteria[ 'search_criteria' ] ) ? $criteria[ 'search_criteria' ] : array( 'field_filters' => array() );
853 853
 
854 854
 		/**
855 855
 		 * @filter `gravityview_fe_search_criteria` Modify the search criteria
@@ -869,29 +869,29 @@  discard block
 block discarded – undo
869 869
 		gravityview()->log->debug( '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', array( 'data' =>$search_criteria ) );
870 870
 
871 871
 		// implicity search
872
-		if ( ! empty( $args['search_value'] ) ) {
872
+		if ( ! empty( $args[ 'search_value' ] ) ) {
873 873
 
874 874
 			// Search operator options. Options: `is` or `contains`
875
-			$operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains';
875
+			$operator = ! empty( $args[ 'search_operator' ] ) && in_array( $args[ 'search_operator' ], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args[ 'search_operator' ] : 'contains';
876 876
 
877
-			$search_criteria['field_filters'][] = array(
877
+			$search_criteria[ 'field_filters' ][ ] = array(
878 878
 				'key' => \GV\Utils::_GET( 'search_field', \GV\Utils::get( $args, 'search_field' ) ), // The field ID to search
879
-				'value' => _wp_specialchars( $args['search_value'] ), // The value to search. Encode ampersands but not quotes.
879
+				'value' => _wp_specialchars( $args[ 'search_value' ] ), // The value to search. Encode ampersands but not quotes.
880 880
 				'operator' => $operator,
881 881
 			);
882 882
 
883 883
 			// Lock search mode to "all" with implicit presearch filter.
884
-			$search_criteria['field_filters']['mode'] = 'all';
884
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all';
885 885
 		}
886 886
 
887
-		if( $search_criteria !== $original_search_criteria ) {
887
+		if ( $search_criteria !== $original_search_criteria ) {
888 888
 			gravityview()->log->debug( '[get_search_criteria] Search Criteria after implicity search: ', array( 'data' => $search_criteria ) );
889 889
 		}
890 890
 
891 891
 		// Handle setting date range
892 892
 		$search_criteria = self::process_search_dates( $args, $search_criteria );
893 893
 
894
-		if( $search_criteria !== $original_search_criteria ) {
894
+		if ( $search_criteria !== $original_search_criteria ) {
895 895
 			gravityview()->log->debug( '[get_search_criteria] Search Criteria after date params: ', array( 'data' => $search_criteria ) );
896 896
 		}
897 897
 
@@ -902,7 +902,7 @@  discard block
 block discarded – undo
902 902
 		 * @filter `gravityview_status` Modify entry status requirements to be included in search results.
903 903
 		 * @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash`
904 904
 		 */
905
-		$search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args );
905
+		$search_criteria[ 'status' ] = apply_filters( 'gravityview_status', 'active', $args );
906 906
 
907 907
 		return $search_criteria;
908 908
 	}
@@ -1014,7 +1014,7 @@  discard block
 block discarded – undo
1014 1014
 			'search_criteria' => $search_criteria,
1015 1015
 			'sorting' => self::updateViewSorting( $args, $form_id ),
1016 1016
 			'paging' => $paging,
1017
-			'cache' => isset( $args['cache'] ) ? $args['cache'] : true,
1017
+			'cache' => isset( $args[ 'cache' ] ) ? $args[ 'cache' ] : true,
1018 1018
 		);
1019 1019
 
1020 1020
 		/**
@@ -1039,7 +1039,7 @@  discard block
 block discarded – undo
1039 1039
 		 * @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys.
1040 1040
 		 * @param array $args View configuration args.
1041 1041
 		 */
1042
-		$parameters = apply_filters( 'gravityview_get_entries_'.\GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id );
1042
+		$parameters = apply_filters( 'gravityview_get_entries_' . \GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id );
1043 1043
 
1044 1044
 		gravityview()->log->debug( '$parameters passed to gravityview_get_entries(): ', array( 'data' => $parameters ) );
1045 1045
 
@@ -1064,17 +1064,17 @@  discard block
 block discarded – undo
1064 1064
 		$default_page_size = apply_filters( 'gravityview_default_page_size', 25 );
1065 1065
 
1066 1066
 		// Paging & offset
1067
-		$page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : $default_page_size;
1067
+		$page_size = ! empty( $args[ 'page_size' ] ) ? intval( $args[ 'page_size' ] ) : $default_page_size;
1068 1068
 
1069 1069
 		if ( -1 === $page_size ) {
1070 1070
 			$page_size = PHP_INT_MAX;
1071 1071
 		}
1072 1072
 
1073
-		$curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] );
1073
+		$curr_page = empty( $_GET[ 'pagenum' ] ) ? 1 : intval( $_GET[ 'pagenum' ] );
1074 1074
 		$offset = ( $curr_page - 1 ) * $page_size;
1075 1075
 
1076
-		if ( ! empty( $args['offset'] ) ) {
1077
-			$offset += intval( $args['offset'] );
1076
+		if ( ! empty( $args[ 'offset' ] ) ) {
1077
+			$offset += intval( $args[ 'offset' ] );
1078 1078
 		}
1079 1079
 
1080 1080
 		$paging = array(
@@ -1099,11 +1099,11 @@  discard block
 block discarded – undo
1099 1099
 	public static function updateViewSorting( $args, $form_id ) {
1100 1100
 		$sorting = array();
1101 1101
 
1102
-		$has_values = isset( $_GET['sort'] );
1102
+		$has_values = isset( $_GET[ 'sort' ] );
1103 1103
 
1104
-		if ( $has_values && is_array( $_GET['sort'] ) ) {
1105
-			$sorts = array_keys( $_GET['sort'] );
1106
-			$dirs  = array_values( $_GET['sort'] );
1104
+		if ( $has_values && is_array( $_GET[ 'sort' ] ) ) {
1105
+			$sorts = array_keys( $_GET[ 'sort' ] );
1106
+			$dirs  = array_values( $_GET[ 'sort' ] );
1107 1107
 
1108 1108
 			if ( $has_values = array_filter( $dirs ) ) {
1109 1109
 				$sort_field_id = end( $sorts );
@@ -1112,11 +1112,11 @@  discard block
 block discarded – undo
1112 1112
 		}
1113 1113
 
1114 1114
 		if ( ! isset( $sort_field_id ) ) {
1115
-			$sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : \GV\Utils::get( $args, 'sort_field' );
1115
+			$sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : \GV\Utils::get( $args, 'sort_field' );
1116 1116
 		}
1117 1117
 
1118 1118
 		if ( ! isset( $sort_direction ) ) {
1119
-			$sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : \GV\Utils::get( $args, 'sort_direction' );
1119
+			$sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : \GV\Utils::get( $args, 'sort_direction' );
1120 1120
 		}
1121 1121
 
1122 1122
 		if ( is_array( $sort_field_id ) ) {
@@ -1148,10 +1148,10 @@  discard block
 block discarded – undo
1148 1148
 				$form = GFAPI::get_form( $form_id );
1149 1149
 
1150 1150
 				// Get the first GF_Field field ID, set as the key for entry randomization
1151
-				if ( ! empty( $form['fields'] ) ) {
1151
+				if ( ! empty( $form[ 'fields' ] ) ) {
1152 1152
 
1153 1153
 					/** @var GF_Field $field */
1154
-					foreach ( $form['fields'] as $field ) {
1154
+					foreach ( $form[ 'fields' ] as $field ) {
1155 1155
 						if ( ! is_a( $field, 'GF_Field' ) ) {
1156 1156
 							continue;
1157 1157
 						}
@@ -1196,7 +1196,7 @@  discard block
 block discarded – undo
1196 1196
 		if ( is_array( $sort_field_id ) ) {
1197 1197
 			$modified_ids = array();
1198 1198
 			foreach ( $sort_field_id as $_sort_field_id ) {
1199
-				$modified_ids []= self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id );
1199
+				$modified_ids [ ] = self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id );
1200 1200
 			}
1201 1201
 			return $modified_ids;
1202 1202
 		}
@@ -1205,11 +1205,11 @@  discard block
 block discarded – undo
1205 1205
 
1206 1206
 		$sort_field = GFFormsModel::get_field( $form, $sort_field_id );
1207 1207
 
1208
-		if( ! $sort_field ) {
1208
+		if ( ! $sort_field ) {
1209 1209
 			return $sort_field_id;
1210 1210
 		}
1211 1211
 
1212
-		switch ( $sort_field['type'] ) {
1212
+		switch ( $sort_field[ 'type' ] ) {
1213 1213
 
1214 1214
 			case 'address':
1215 1215
 				// Sorting by full address
@@ -1226,7 +1226,7 @@  discard block
 block discarded – undo
1226 1226
 					 */
1227 1227
 					$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id );
1228 1228
 
1229
-					switch( strtolower( $address_part ) ){
1229
+					switch ( strtolower( $address_part ) ) {
1230 1230
 						case 'street':
1231 1231
 							$sort_field_id .= '.1';
1232 1232
 							break;
@@ -1299,7 +1299,7 @@  discard block
 block discarded – undo
1299 1299
 		if ( ! class_exists( '\GV\Entry' ) ) {
1300 1300
 
1301 1301
 			// Not using gravityview()->log->error(), since that may not exist yet either!
1302
-			do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary()  );
1302
+			do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary() );
1303 1303
 
1304 1304
 			return null;
1305 1305
 		}
@@ -1316,7 +1316,7 @@  discard block
 block discarded – undo
1316 1316
 		 */
1317 1317
 		$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry );
1318 1318
 
1319
-		if ( empty( $single_entry ) ){
1319
+		if ( empty( $single_entry ) ) {
1320 1320
 			return false;
1321 1321
 		} else {
1322 1322
 			return $single_entry;
@@ -1337,7 +1337,7 @@  discard block
 block discarded – undo
1337 1337
 			$views = $this->getGvOutputData()->get_views();
1338 1338
 
1339 1339
 			foreach ( $views as $view_id => $data ) {
1340
-				$view = \GV\View::by_id( $data['id'] );
1340
+				$view = \GV\View::by_id( $data[ 'id' ] );
1341 1341
 				$view_id = $view->ID;
1342 1342
 				$template_id = gravityview_get_template_id( $view->ID );
1343 1343
 				$data = $view->as_data();
@@ -1346,7 +1346,7 @@  discard block
 block discarded – undo
1346 1346
 				 * Don't enqueue the scripts or styles if it's not going to be displayed.
1347 1347
 				 * @since 1.15
1348 1348
 				 */
1349
-				if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
1349
+				if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
1350 1350
 					continue;
1351 1351
 				}
1352 1352
 
@@ -1379,7 +1379,7 @@  discard block
 block discarded – undo
1379 1379
 					 * @param \GV\View The View.
1380 1380
 					 */
1381 1381
 					apply_filters( 'gravityview_lightbox_script', $js_dependency, $view );
1382
-					$js_dependencies[] = $js_dependency;
1382
+					$js_dependencies[ ] = $js_dependency;
1383 1383
 
1384 1384
 					if ( ! empty( $wp_filter[ 'gravity_view_lightbox_style' ] ) ) {
1385 1385
 						gravityview()->log->warning( 'gravity_view_lightbox_style filter is deprecated use gravityview_lightbox_style instead' );
@@ -1399,7 +1399,7 @@  discard block
 block discarded – undo
1399 1399
 					 * @param \GV\View The View.
1400 1400
 					 */
1401 1401
 					$css_dependency = apply_filters( 'gravityview_lightbox_style', $css_dependency, $view );
1402
-					$css_dependencies[] = $css_dependency;
1402
+					$css_dependencies[ ] = $css_dependency;
1403 1403
 				}
1404 1404
 
1405 1405
 				/**
@@ -1407,19 +1407,19 @@  discard block
 block discarded – undo
1407 1407
 				 * @see https://github.com/katzwebservices/GravityView/issues/536
1408 1408
 				 * @since 1.15
1409 1409
 				 */
1410
-				if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) {
1411
-					$css_dependencies[] = 'dashicons';
1410
+				if ( gravityview_view_has_single_checkbox_or_radio( $data[ 'form' ], $data[ 'fields' ] ) ) {
1411
+					$css_dependencies[ ] = 'dashicons';
1412 1412
 				}
1413 1413
 
1414 1414
 				wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
1415 1415
 
1416 1416
 				$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
1417 1417
 
1418
-				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ) , GravityView_Plugin::version, true );
1418
+				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ), GravityView_Plugin::version, true );
1419 1419
 
1420 1420
 				wp_enqueue_script( 'gravityview-fe-view' );
1421 1421
 
1422
-				if ( ! empty( $data['atts']['sort_columns'] ) ) {
1422
+				if ( ! empty( $data[ 'atts' ][ 'sort_columns' ] ) ) {
1423 1423
 					wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' );
1424 1424
 				}
1425 1425
 
@@ -1482,7 +1482,7 @@  discard block
 block discarded – undo
1482 1482
 	public static function add_style( $template_id ) {
1483 1483
 
1484 1484
 		if ( ! empty( $template_id ) && wp_style_is( 'gravityview_style_' . $template_id, 'registered' ) ) {
1485
-			gravityview()->log->debug(  'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) );
1485
+			gravityview()->log->debug( 'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) );
1486 1486
 			wp_enqueue_style( 'gravityview_style_' . $template_id );
1487 1487
 		} elseif ( empty( $template_id ) ) {
1488 1488
 			gravityview()->log->error( 'Cannot add template style; template_id is empty' );
@@ -1513,11 +1513,11 @@  discard block
 block discarded – undo
1513 1513
 		 * Not a table-based template; don't add sort icons
1514 1514
 		 * @since 1.12
1515 1515
 		 */
1516
-		if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
1516
+		if ( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
1517 1517
 			return $label;
1518 1518
 		}
1519 1519
 
1520
-		if ( ! $this->is_field_sortable( $field['id'], $form ) ) {
1520
+		if ( ! $this->is_field_sortable( $field[ 'id' ], $form ) ) {
1521 1521
 			return $label;
1522 1522
 		}
1523 1523
 
@@ -1525,29 +1525,29 @@  discard block
 block discarded – undo
1525 1525
 
1526 1526
 		$class = 'gv-sort';
1527 1527
 
1528
-		$sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] );
1528
+		$sort_field_id = self::_override_sorting_id_by_field_type( $field[ 'id' ], $form[ 'id' ] );
1529 1529
 
1530 1530
 		$sort_args = array(
1531
-			'sort' => $field['id'],
1531
+			'sort' => $field[ 'id' ],
1532 1532
 			'dir' => 'asc',
1533 1533
 		);
1534 1534
 
1535
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
1535
+		if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) {
1536 1536
 			//toggle sorting direction.
1537
-			if ( 'asc' === $sorting['direction'] ) {
1538
-				$sort_args['dir'] = 'desc';
1537
+			if ( 'asc' === $sorting[ 'direction' ] ) {
1538
+				$sort_args[ 'dir' ] = 'desc';
1539 1539
 				$class .= ' gv-icon-sort-desc';
1540 1540
 			} else {
1541
-				$sort_args['dir'] = 'asc';
1541
+				$sort_args[ 'dir' ] = 'asc';
1542 1542
 				$class .= ' gv-icon-sort-asc';
1543 1543
 			}
1544 1544
 		} else {
1545 1545
 			$class .= ' gv-icon-caret-up-down';
1546 1546
 		}
1547 1547
 
1548
-		$url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) );
1548
+		$url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) );
1549 1549
 
1550
-		return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a>&nbsp;'. $label;
1550
+		return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a>&nbsp;' . $label;
1551 1551
 
1552 1552
 	}
1553 1553
 
@@ -1565,7 +1565,7 @@  discard block
 block discarded – undo
1565 1565
 
1566 1566
 		$field_type = $field_id;
1567 1567
 
1568
-		if( is_numeric( $field_id ) ) {
1568
+		if ( is_numeric( $field_id ) ) {
1569 1569
 			$field = GFFormsModel::get_field( $form, $field_id );
1570 1570
 			$field_type = $field ? $field->type : $field_id;
1571 1571
 		}
@@ -1588,7 +1588,7 @@  discard block
 block discarded – undo
1588 1588
 			return false;
1589 1589
 		}
1590 1590
 
1591
-		return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
1591
+		return apply_filters( "gravityview/sortable/formfield_{$form[ 'id' ]}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
1592 1592
 
1593 1593
 	}
1594 1594
 
Please login to merge, or discard this patch.
future/includes/class-gv-view.php 1 patch
Spacing   +79 added lines, -80 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 		$supports = array( 'title', 'revisions' );
126 126
 
127 127
 		if ( $is_hierarchical ) {
128
-			$supports[] = 'page-attributes';
128
+			$supports[ ] = 'page-attributes';
129 129
 		}
130 130
 
131 131
 		/**
@@ -228,11 +228,11 @@  discard block
 block discarded – undo
228 228
 		$rule = array( sprintf( '%s/([^/]+)/csv/?', $slug ), 'index.php?gravityview=$matches[1]&csv=1', 'top' );
229 229
 
230 230
 		add_filter( 'query_vars', function( $query_vars ) {
231
-			$query_vars[] = 'csv';
231
+			$query_vars[ ] = 'csv';
232 232
 			return $query_vars;
233 233
 		} );
234 234
 
235
-		if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[0] ] ) ) {
235
+		if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[ 0 ] ] ) ) {
236 236
 			call_user_func_array( 'add_rewrite_rule', $rule );
237 237
 		}
238 238
 	}
@@ -309,13 +309,13 @@  discard block
 block discarded – undo
309 309
 			return $content;
310 310
 		}
311 311
 
312
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
312
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
313 313
 
314 314
 		/**
315 315
 		 * Editing a single entry.
316 316
 		 */
317 317
 		if ( $entry = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ) ) {
318
-			if ( $entry['status'] != 'active' ) {
318
+			if ( $entry[ 'status' ] != 'active' ) {
319 319
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
320 320
 				return __( 'You are not allowed to view this content.', 'gravityview' );
321 321
 			}
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
 			}
327 327
 
328 328
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
329
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
329
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
330 330
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
331 331
 					return __( 'You are not allowed to view this content.', 'gravityview' );
332 332
 				}
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
 
350 350
 			foreach ( $entryset as $e ) {
351 351
 
352
-				if ( 'active' !== $e['status'] ) {
352
+				if ( 'active' !== $e[ 'status' ] ) {
353 353
 					gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) );
354 354
 					return __( 'You are not allowed to view this content.', 'gravityview' );
355 355
 				}
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
 				}
361 361
 
362 362
 				if ( $show_only_approved && ! $is_admin_and_can_view ) {
363
-					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
363
+					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
364 364
 						gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) );
365 365
 						return __( 'You are not allowed to view this content.', 'gravityview' );
366 366
 					}
@@ -535,7 +535,7 @@  discard block
 block discarded – undo
535 535
 			$join_column    = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field::by_id( $join_column );
536 536
 			$join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field::by_id( $join_on_column );
537 537
 
538
-			$joins [] = new Join( $join, $join_column, $join_on, $join_on_column );
538
+			$joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column );
539 539
 		}
540 540
 
541 541
 		return $joins;
@@ -625,13 +625,13 @@  discard block
 block discarded – undo
625 625
 			}
626 626
 
627 627
 			foreach ( $_fields as $field ) {
628
-				if ( ! empty( $field['unions'] ) ) {
629
-					foreach ( $field['unions'] as $form_id => $field_id ) {
628
+				if ( ! empty( $field[ 'unions' ] ) ) {
629
+					foreach ( $field[ 'unions' ] as $form_id => $field_id ) {
630 630
 						if ( ! isset( $unions[ $form_id ] ) ) {
631 631
 							$unions[ $form_id ] = array();
632 632
 						}
633 633
 
634
-						$unions[ $form_id ][ $field['id'] ] =
634
+						$unions[ $form_id ][ $field[ 'id' ] ] =
635 635
 							is_numeric( $field_id ) ? \GV\GF_Field::by_id( \GV\GF_Form::by_id( $form_id ), $field_id ) : \GV\Internal_Field::by_id( $field_id );
636 636
 					}
637 637
 				}
@@ -686,7 +686,7 @@  discard block
 block discarded – undo
686 686
 		if ( ! $view->form ) {
687 687
 			gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array(
688 688
 				'view_id' => $view->ID,
689
-				'form_id' => $view->_gravityview_form_id ? : 0,
689
+				'form_id' => $view->_gravityview_form_id ?: 0,
690 690
 			) );
691 691
 		}
692 692
 
@@ -925,11 +925,11 @@  discard block
 block discarded – undo
925 925
 			 * Remove multiple sorting before calling legacy filters.
926 926
 			 * This allows us to fake it till we make it.
927 927
 			 */
928
-			if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) {
928
+			if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) {
929 929
 				$has_multisort = true;
930
-				$parameters['sort_field'] = reset( $parameters['sort_field'] );
931
-				if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) {
932
-					$parameters['sort_direction'] = reset( $parameters['sort_direction'] );
930
+				$parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] );
931
+				if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) {
932
+					$parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] );
933 933
 				}
934 934
 			}
935 935
 
@@ -938,31 +938,30 @@  discard block
 block discarded – undo
938 938
 			 */
939 939
 			$parameters = \GravityView_frontend::get_view_entries_parameters( $parameters, $this->form->ID );
940 940
 
941
-			$parameters['context_view_id'] = $this->ID;
941
+			$parameters[ 'context_view_id' ] = $this->ID;
942 942
 			$parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID );
943 943
 
944 944
 			if ( ! is_array( $parameters ) ) {
945 945
 				$parameters = array();
946 946
 			}
947 947
 
948
-			if ( ! is_array( $parameters['search_criteria'] ) ) {
949
-				$parameters['search_criteria'] = array();
948
+			if ( ! is_array( $parameters[ 'search_criteria' ] ) ) {
949
+				$parameters[ 'search_criteria' ] = array();
950 950
 			}
951 951
 
952
-			if ( ( ! isset( $parameters['search_criteria']['field_filters'] ) ) || ( ! is_array( $parameters['search_criteria']['field_filters'] ) ) ) {
953
-				$parameters['search_criteria']['field_filters'] = array();
952
+			if ( ( ! isset( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) || ( ! is_array( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) ) {
953
+				$parameters[ 'search_criteria' ][ 'field_filters' ] = array();
954 954
 			}
955 955
 
956 956
 			if ( $request instanceof REST\Request ) {
957 957
 				$atts = $this->settings->as_atts();
958 958
 				$paging_parameters = wp_parse_args( $request->get_paging(), array(
959
-						'paging' => array( 'page_size' => $atts['page_size'] ),
959
+						'paging' => array( 'page_size' => $atts[ 'page_size' ] ),
960 960
 					) );
961
-				$parameters['paging'] = $paging_parameters['paging'];
961
+				$parameters[ 'paging' ] = $paging_parameters[ 'paging' ];
962 962
 			}
963 963
 
964
-			$page = Utils::get( $parameters['paging'], 'current_page' ) ?
965
-				: ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / \GV\Utils::get( $parameters, 'paging/page_size', 25 ) ) + 1 );
964
+			$page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / \GV\Utils::get( $parameters, 'paging/page_size', 25 ) ) + 1 );
966 965
 
967 966
 			/**
968 967
 			 * Cleanup duplicate field_filter parameters to simplify the query.
@@ -970,14 +969,14 @@  discard block
 block discarded – undo
970 969
 			$unique_field_filters = array();
971 970
 			foreach ( Utils::get( $parameters, 'search_criteria/field_filters', array() ) as $key => $filter ) {
972 971
 				if ( 'mode' === $key ) {
973
-					$unique_field_filters['mode'] = $filter;
972
+					$unique_field_filters[ 'mode' ] = $filter;
974 973
 				} else if ( ! in_array( $filter, $unique_field_filters ) ) {
975
-					$unique_field_filters[] = $filter;
974
+					$unique_field_filters[ ] = $filter;
976 975
 				}
977 976
 			}
978
-			$parameters['search_criteria']['field_filters'] = $unique_field_filters;
977
+			$parameters[ 'search_criteria' ][ 'field_filters' ] = $unique_field_filters;
979 978
 
980
-			if ( ! empty( $parameters['search_criteria']['field_filters'] ) ) {
979
+			if ( ! empty( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) {
981 980
 				gravityview()->log->notice( 'search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.' );
982 981
 			}
983 982
 
@@ -986,7 +985,7 @@  discard block
 block discarded – undo
986 985
 				$query_class = $this->get_query_class();
987 986
 
988 987
 				/** @type \GF_Query $query */
989
-				$query = new $query_class( $this->form->ID, $parameters['search_criteria'], Utils::get( $parameters, 'sorting' ) );
988
+				$query = new $query_class( $this->form->ID, $parameters[ 'search_criteria' ], Utils::get( $parameters, 'sorting' ) );
990 989
 
991 990
 				/**
992 991
 				 * Apply multisort.
@@ -997,15 +996,15 @@  discard block
 block discarded – undo
997 996
 					$view_setting_sort_field_ids = \GV\Utils::get( $atts, 'sort_field', array() );
998 997
 					$view_setting_sort_directions = \GV\Utils::get( $atts, 'sort_direction', array() );
999 998
 
1000
-					$has_sort_query_param = ! empty( $_GET['sort'] ) && is_array( $_GET['sort'] );
999
+					$has_sort_query_param = ! empty( $_GET[ 'sort' ] ) && is_array( $_GET[ 'sort' ] );
1001 1000
 
1002
-					if( $has_sort_query_param ) {
1003
-						$has_sort_query_param = array_filter( array_values( $_GET['sort'] ) );
1001
+					if ( $has_sort_query_param ) {
1002
+						$has_sort_query_param = array_filter( array_values( $_GET[ 'sort' ] ) );
1004 1003
 					}
1005 1004
 
1006 1005
 					if ( $this->settings->get( 'sort_columns' ) && $has_sort_query_param ) {
1007
-						$sort_field_ids = array_keys( $_GET['sort'] );
1008
-						$sort_directions = array_values( $_GET['sort'] );
1006
+						$sort_field_ids = array_keys( $_GET[ 'sort' ] );
1007
+						$sort_directions = array_values( $_GET[ 'sort' ] );
1009 1008
 					} else {
1010 1009
 						$sort_field_ids = $view_setting_sort_field_ids;
1011 1010
 						$sort_directions = $view_setting_sort_directions;
@@ -1013,7 +1012,7 @@  discard block
 block discarded – undo
1013 1012
 
1014 1013
 					$skip_first = false;
1015 1014
 
1016
-					foreach ( (array) $sort_field_ids as $key => $sort_field_id ) {
1015
+					foreach ( (array)$sort_field_ids as $key => $sort_field_id ) {
1017 1016
 
1018 1017
 						if ( ! $skip_first && ! $has_sort_query_param ) {
1019 1018
 							$skip_first = true; // Skip the first one, it's already in the query
@@ -1043,15 +1042,15 @@  discard block
 block discarded – undo
1043 1042
 
1044 1043
 					$merged_time = false;
1045 1044
 
1046
-					foreach ( $q['order'] as $oid => $order ) {
1047
-						if ( $order[0] instanceof \GF_Query_Column ) {
1048
-							$column = $order[0];
1049
-						} else if ( $order[0] instanceof \GF_Query_Call ) {
1050
-							if ( count( $order[0]->columns ) != 1 || ! $order[0]->columns[0] instanceof \GF_Query_Column ) {
1045
+					foreach ( $q[ 'order' ] as $oid => $order ) {
1046
+						if ( $order[ 0 ] instanceof \GF_Query_Column ) {
1047
+							$column = $order[ 0 ];
1048
+						} else if ( $order[ 0 ] instanceof \GF_Query_Call ) {
1049
+							if ( count( $order[ 0 ]->columns ) != 1 || ! $order[ 0 ]->columns[ 0 ] instanceof \GF_Query_Column ) {
1051 1050
 								$orders[ $oid ] = $order;
1052 1051
 								continue; // Need something that resembles a single sort
1053 1052
 							}
1054
-							$column = $order[0]->columns[0];
1053
+							$column = $order[ 0 ]->columns[ 0 ];
1055 1054
 						}
1056 1055
 
1057 1056
 						if ( ( ! $field = \GFAPI::get_field( $column->source, $column->field_id ) ) || $field->type !== 'time' ) {
@@ -1065,7 +1064,7 @@  discard block
 block discarded – undo
1065 1064
 
1066 1065
 						$orders[ $oid ] = array(
1067 1066
 							new \GV\Mocks\GF_Query_Call_TIMESORT( 'timesort', array( $column, $sql ) ),
1068
-							$order[1] // Mock it!
1067
+							$order[ 1 ] // Mock it!
1069 1068
 						);
1070 1069
 
1071 1070
 						$merged_time = true;
@@ -1076,15 +1075,15 @@  discard block
 block discarded – undo
1076 1075
 						 * ORDER again.
1077 1076
 						 */
1078 1077
 						if ( ! empty( $orders ) && $_orders = $query->_order_generate( $orders ) ) {
1079
-							$sql['order'] = 'ORDER BY ' . implode( ', ', $_orders );
1078
+							$sql[ 'order' ] = 'ORDER BY ' . implode( ', ', $_orders );
1080 1079
 						}
1081 1080
 					}
1082 1081
 
1083 1082
 					return $sql;
1084 1083
 				} );
1085 1084
 
1086
-				$query->limit( $parameters['paging']['page_size'] )
1087
-					->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) );
1085
+				$query->limit( $parameters[ 'paging' ][ 'page_size' ] )
1086
+					->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) );
1088 1087
 
1089 1088
 				/**
1090 1089
 				 * Any joins?
@@ -1107,7 +1106,7 @@  discard block
 block discarded – undo
1107 1106
 
1108 1107
 							$query_parameters = $query->_introspect();
1109 1108
 
1110
-							$query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) );
1109
+							$query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) );
1111 1110
 						}
1112 1111
 
1113 1112
 						/**
@@ -1141,7 +1140,7 @@  discard block
 block discarded – undo
1141 1140
 						}
1142 1141
 
1143 1142
 						$q = $query->_introspect();
1144
-						$query->where( \GF_Query_Condition::_and( $q['where'], $condition ) );
1143
+						$query->where( \GF_Query_Condition::_and( $q[ 'where' ], $condition ) );
1145 1144
 
1146 1145
 						if ( $this->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
1147 1146
 
@@ -1166,7 +1165,7 @@  discard block
 block discarded – undo
1166 1165
 
1167 1166
 							$query_parameters = $query->_introspect();
1168 1167
 
1169
-							$query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) );
1168
+							$query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) );
1170 1169
 						}
1171 1170
 					}
1172 1171
 
@@ -1190,7 +1189,7 @@  discard block
 block discarded – undo
1190 1189
 							$conditions = array();
1191 1190
 
1192 1191
 							foreach ( $condition->expressions as $_condition ) {
1193
-								$conditions[] = $recurse( $_condition, $fields, $recurse );
1192
+								$conditions[ ] = $recurse( $_condition, $fields, $recurse );
1194 1193
 							}
1195 1194
 
1196 1195
 							return call_user_func_array(
@@ -1219,10 +1218,10 @@  discard block
 block discarded – undo
1219 1218
 						$q = new $query_class( $form_id );
1220 1219
 
1221 1220
 						// Copy the WHERE clauses but substitute the field_ids to the respective ones
1222
-						$q->where( $where_union_substitute( $query_parameters['where'], $fields, $where_union_substitute ) );
1221
+						$q->where( $where_union_substitute( $query_parameters[ 'where' ], $fields, $where_union_substitute ) );
1223 1222
 
1224 1223
 						// Copy the ORDER clause and substitute the field_ids to the respective ones
1225
-						foreach ( $query_parameters['order'] as $order ) {
1224
+						foreach ( $query_parameters[ 'order' ] as $order ) {
1226 1225
 							list( $column, $_order ) = $order;
1227 1226
 
1228 1227
 							if ( $column && $column instanceof \GF_Query_Column ) {
@@ -1236,15 +1235,15 @@  discard block
 block discarded – undo
1236 1235
 
1237 1236
 						add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( &$unions_sql ) {
1238 1237
 							// Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
1239
-							$select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] );
1238
+							$select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] );
1240 1239
 
1241 1240
 							// Record the SQL
1242
-							$unions_sql[] = array(
1241
+							$unions_sql[ ] = array(
1243 1242
 								// Remove columns, we'll rebuild them
1244 1243
 								'select'  => preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $select ),
1245
-								'from'    => $sql['from'],
1246
-								'join'    => $sql['join'],
1247
-								'where'   => $sql['where'],
1244
+								'from'    => $sql[ 'from' ],
1245
+								'join'    => $sql[ 'join' ],
1246
+								'where'   => $sql[ 'where' ],
1248 1247
 								// Remove order and limit
1249 1248
 							);
1250 1249
 
@@ -1261,11 +1260,11 @@  discard block
 block discarded – undo
1261 1260
 
1262 1261
 					add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( $unions_sql ) {
1263 1262
 						// Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
1264
-						$sql['select'] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] );
1263
+						$sql[ 'select' ] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] );
1265 1264
 
1266 1265
 						// Remove columns, we'll rebuild them
1267
-						preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql['select'], $select_match );
1268
-						$sql['select'] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql['select'] );
1266
+						preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql[ 'select' ], $select_match );
1267
+						$sql[ 'select' ] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql[ 'select' ] );
1269 1268
 
1270 1269
 						$unions = array();
1271 1270
 
@@ -1276,30 +1275,30 @@  discard block
 block discarded – undo
1276 1275
 						};
1277 1276
 
1278 1277
 						// Add all the order columns into the selects, so we can order by the whole union group
1279
-						preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql['order'], $order_matches );
1278
+						preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql[ 'order' ], $order_matches );
1280 1279
 
1281 1280
 						$columns = array(
1282
-							sprintf( '%s AS %s', $select_match[1], $column_to_alias( $select_match[1] ) )
1281
+							sprintf( '%s AS %s', $select_match[ 1 ], $column_to_alias( $select_match[ 1 ] ) )
1283 1282
 						);
1284 1283
 
1285 1284
 						foreach ( array_slice( $order_matches, 1 ) as $match ) {
1286
-							$columns[] = sprintf( '%s AS %s', $match[0], $column_to_alias( $match[0] ) );
1285
+							$columns[ ] = sprintf( '%s AS %s', $match[ 0 ], $column_to_alias( $match[ 0 ] ) );
1287 1286
 
1288 1287
 							// Rewrite the order columns to the shared aliases
1289
-							$sql['order'] = str_replace( $match[0], $column_to_alias( $match[0] ), $sql['order'] );
1288
+							$sql[ 'order' ] = str_replace( $match[ 0 ], $column_to_alias( $match[ 0 ] ), $sql[ 'order' ] );
1290 1289
 						}
1291 1290
 
1292 1291
 						$columns = array_unique( $columns );
1293 1292
 
1294 1293
 						// Add the columns to every UNION
1295 1294
 						foreach ( $unions_sql as $union_sql ) {
1296
-							$union_sql['select'] .= implode( ', ', $columns );
1297
-							$unions []= implode( ' ', $union_sql );
1295
+							$union_sql[ 'select' ] .= implode( ', ', $columns );
1296
+							$unions [ ] = implode( ' ', $union_sql );
1298 1297
 						}
1299 1298
 
1300 1299
 						// Add the columns to the main SELECT, but only grab the entry id column
1301
-						$sql['select'] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql['select'] . implode( ', ', $columns );
1302
-						$sql['order'] = implode( ' ', $unions ) . ') AS u ' . $sql['order'];
1300
+						$sql[ 'select' ] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql[ 'select' ] . implode( ', ', $columns );
1301
+						$sql[ 'order' ] = implode( ' ', $unions ) . ') AS u ' . $sql[ 'order' ];
1303 1302
 
1304 1303
 						return $sql;
1305 1304
 					} );
@@ -1344,20 +1343,20 @@  discard block
 block discarded – undo
1344 1343
 				} );
1345 1344
 			} else {
1346 1345
 				$entries = $this->form->entries
1347
-					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) )
1346
+					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) )
1348 1347
 					->offset( $this->settings->get( 'offset' ) )
1349
-					->limit( $parameters['paging']['page_size'] )
1348
+					->limit( $parameters[ 'paging' ][ 'page_size' ] )
1350 1349
 					->page( $page );
1351 1350
 
1352
-				if ( ! empty( $parameters['sorting'] ) && is_array( $parameters['sorting'] && ! isset( $parameters['sorting']['key'] ) ) ) {
1351
+				if ( ! empty( $parameters[ 'sorting' ] ) && is_array( $parameters[ 'sorting' ] && ! isset( $parameters[ 'sorting' ][ 'key' ] ) ) ) {
1353 1352
 					// Pluck off multisort arrays
1354
-					$parameters['sorting'] = $parameters['sorting'][0];
1353
+					$parameters[ 'sorting' ] = $parameters[ 'sorting' ][ 0 ];
1355 1354
 				}
1356 1355
 
1357
-				if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) {
1356
+				if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) {
1358 1357
 					$field = new \GV\Field();
1359
-					$field->ID = $parameters['sorting']['key'];
1360
-					$direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
1358
+					$field->ID = $parameters[ 'sorting' ][ 'key' ];
1359
+					$direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
1361 1360
 					$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) );
1362 1361
 				}
1363 1362
 			}
@@ -1432,7 +1431,7 @@  discard block
 block discarded – undo
1432 1431
 		$allowed = $headers = array();
1433 1432
 
1434 1433
 		foreach ( $view->fields->by_position( "directory_*" )->by_visible( $view )->all() as $id => $field ) {
1435
-			$allowed[] = $field;
1434
+			$allowed[ ] = $field;
1436 1435
 		}
1437 1436
 
1438 1437
 		$renderer = new Field_Renderer();
@@ -1454,17 +1453,17 @@  discard block
 block discarded – undo
1454 1453
 			} );
1455 1454
 
1456 1455
 			foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) {
1457
-				$allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
1456
+				$allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
1458 1457
 			}
1459 1458
 
1460 1459
 			foreach ( $allowed as $field ) {
1461 1460
 				$source = is_numeric( $field->ID ) ? $view->form : new \GV\Internal_Source();
1462 1461
 
1463
-				$return[] = strip_tags( $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' ) );
1462
+				$return[ ] = strip_tags( $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' ) );
1464 1463
 
1465 1464
 				if ( ! $headers_done ) {
1466 1465
 					$label = $field->get_label( $view, $source, $entry );
1467
-					$headers[] = $label ? $label : $field->ID;
1466
+					$headers[ ] = $label ? $label : $field->ID;
1468 1467
 				}
1469 1468
 			}
1470 1469
 
Please login to merge, or discard this patch.