Completed
Pull Request — master (#1147)
by Zack
20:25 queued 16:19
created
future/includes/class-gv-view.php 1 patch
Spacing   +25 added lines, -26 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 		$supports = array( 'title', 'revisions' );
109 109
 
110 110
 		if ( $is_hierarchical ) {
111
-			$supports[] = 'page-attributes';
111
+			$supports[ ] = 'page-attributes';
112 112
 		}
113 113
 
114 114
 		/**
@@ -210,11 +210,11 @@  discard block
 block discarded – undo
210 210
 		$rule = array( sprintf( '%s/([^/]+)/csv/?', $slug ), 'index.php?gravityview=$matches[1]&csv=1', 'top' );
211 211
 
212 212
 		add_filter( 'query_vars', function( $query_vars ) { 
213
-			$query_vars[] = 'csv';
213
+			$query_vars[ ] = 'csv';
214 214
 			return $query_vars;
215 215
 		} );
216 216
 
217
-		if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[0] ] ) ) {
217
+		if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[ 0 ] ] ) ) {
218 218
 			call_user_func_array( 'add_rewrite_rule', $rule );
219 219
 		}
220 220
 	}
@@ -282,13 +282,13 @@  discard block
 block discarded – undo
282 282
 			return $content;
283 283
 		}
284 284
 
285
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
285
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
286 286
 
287 287
 		/**
288 288
 		 * Editing a single entry.
289 289
 		 */
290 290
 		if ( $entry = $request->is_edit_entry() ) {
291
-			if ( $entry['status'] != 'active' ) {
291
+			if ( $entry[ 'status' ] != 'active' ) {
292 292
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
293 293
 				return __( 'You are not allowed to view this content.', 'gravityview' );
294 294
 			}
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
 			}
300 300
 
301 301
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
302
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
302
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
303 303
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
304 304
 					return __( 'You are not allowed to view this content.', 'gravityview' );
305 305
 				}
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
 		 * Viewing a single entry.
313 313
 		 */
314 314
 		} else if ( $entry = $request->is_entry() ) {
315
-			if ( $entry['status'] != 'active' ) {
315
+			if ( $entry[ 'status' ] != 'active' ) {
316 316
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
317 317
 				return __( 'You are not allowed to view this content.', 'gravityview' );
318 318
 			}
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
 			}
324 324
 
325 325
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
326
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
326
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
327 327
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
328 328
 					return __( 'You are not allowed to view this content.', 'gravityview' );
329 329
 				}
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
 
332 332
 			$error = \GVCommon::check_entry_display( $entry->as_entry() );
333 333
 
334
-			if( is_wp_error( $error ) ) {
334
+			if ( is_wp_error( $error ) ) {
335 335
 				gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing: {message}', array( 'entry_id' => $entry->ID, 'message' => $error->get_error_message() ) );
336 336
 				return __( 'You are not allowed to view this content.', 'gravityview' );
337 337
 			}
@@ -489,7 +489,7 @@  discard block
 block discarded – undo
489 489
 			$join_column    = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field( $join_column );
490 490
 			$join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field( $join_on_column );
491 491
 
492
-			$joins [] = new Join( $join, $join_column, $join_on, $join_on_column );
492
+			$joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column );
493 493
 		}
494 494
 
495 495
 		return $joins;
@@ -531,10 +531,10 @@  discard block
 block discarded – undo
531 531
 
532 532
 			list( $join, $join_column, $join_on, $join_on_column ) = $meta;
533 533
 
534
-			$forms_ids [] = GF_Form::by_id( $join_on );
534
+			$forms_ids [ ] = GF_Form::by_id( $join_on );
535 535
 		}
536 536
 
537
-		return ( !empty( $forms_ids) ) ? $forms_ids : null;
537
+		return ( ! empty( $forms_ids ) ) ? $forms_ids : null;
538 538
 	}
539 539
 
540 540
 	/**
@@ -565,7 +565,7 @@  discard block
 block discarded – undo
565 565
 		if ( ! $view->form ) {
566 566
 			gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array(
567 567
 				'view_id' => $view->ID,
568
-				'form_id' => $view->_gravityview_form_id ? : 0,
568
+				'form_id' => $view->_gravityview_form_id ?: 0,
569 569
 			) );
570 570
 		}
571 571
 
@@ -791,28 +791,27 @@  discard block
 block discarded – undo
791 791
 			 * @todo: Stop using _frontend and use something like $request->get_search_criteria() instead
792 792
 			 */
793 793
 			$parameters = \GravityView_frontend::get_view_entries_parameters( $this->settings->as_atts(), $this->form->ID );
794
-			$parameters['context_view_id'] = $this->ID;
794
+			$parameters[ 'context_view_id' ] = $this->ID;
795 795
 			$parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID );
796 796
 
797 797
 			if ( $request instanceof REST\Request ) {
798 798
 				$atts = $this->settings->as_atts();
799 799
 				$paging_parameters = wp_parse_args( $request->get_paging(), array(
800
-						'paging' => array( 'page_size' => $atts['page_size'] ),
800
+						'paging' => array( 'page_size' => $atts[ 'page_size' ] ),
801 801
 					) );
802
-				$parameters['paging'] = $paging_parameters['paging'];
802
+				$parameters[ 'paging' ] = $paging_parameters[ 'paging' ];
803 803
 			}
804 804
 
805
-			$page = Utils::get( $parameters['paging'], 'current_page' ) ?
806
-				: ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 );
805
+			$page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 );
807 806
 
808 807
 			if ( gravityview()->plugin->supports( Plugin::FEATURE_GFQUERY ) ) {
809 808
 				/**
810 809
 				 * New \GF_Query stuff :)
811 810
 				 */
812
-				$query = new \GF_Query( $this->form->ID, $parameters['search_criteria'], $parameters['sorting'] );
811
+				$query = new \GF_Query( $this->form->ID, $parameters[ 'search_criteria' ], $parameters[ 'sorting' ] );
813 812
 
814
-				$query->limit( $parameters['paging']['page_size'] )
815
-					->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) );
813
+				$query->limit( $parameters[ 'paging' ][ 'page_size' ] )
814
+					->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) );
816 815
 
817 816
 				/**
818 817
 				 * Any joins?
@@ -852,15 +851,15 @@  discard block
 block discarded – undo
852 851
 				} );
853 852
 			} else {
854 853
 				$entries = $this->form->entries
855
-					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) )
854
+					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) )
856 855
 					->offset( $this->settings->get( 'offset' ) )
857
-					->limit( $parameters['paging']['page_size'] )
856
+					->limit( $parameters[ 'paging' ][ 'page_size' ] )
858 857
 					->page( $page );
859 858
 
860
-				if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) {
859
+				if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) {
861 860
 					$field = new \GV\Field();
862
-					$field->ID = $parameters['sorting']['key'];
863
-					$direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
861
+					$field->ID = $parameters[ 'sorting' ][ 'key' ];
862
+					$direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
864 863
 					$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) );
865 864
 				}
866 865
 			}
Please login to merge, or discard this patch.