Completed
Pull Request — master (#1147)
by Zack
20:25 queued 16:19
created
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.