|
@@ -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
|
} |
|
@@ -283,13 +283,13 @@ discard block |
|
|
block discarded – undo |
|
283
|
283
|
return $content; |
|
284
|
284
|
} |
|
285
|
285
|
|
|
286
|
|
- $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID ); |
|
|
286
|
+ $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID ); |
|
287
|
287
|
|
|
288
|
288
|
/** |
|
289
|
289
|
* Editing a single entry. |
|
290
|
290
|
*/ |
|
291
|
291
|
if ( $entry = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ) ) { |
|
292
|
|
- if ( $entry['status'] != 'active' ) { |
|
|
292
|
+ if ( $entry[ 'status' ] != 'active' ) { |
|
293
|
293
|
gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
|
294
|
294
|
return __( 'You are not allowed to view this content.', 'gravityview' ); |
|
295
|
295
|
} |
|
@@ -300,7 +300,7 @@ discard block |
|
|
block discarded – undo |
|
300
|
300
|
} |
|
301
|
301
|
|
|
302
|
302
|
if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
|
303
|
|
- if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
|
303
|
+ if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
304
|
304
|
gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
|
305
|
305
|
return __( 'You are not allowed to view this content.', 'gravityview' ); |
|
306
|
306
|
} |
|
@@ -323,7 +323,7 @@ discard block |
|
|
block discarded – undo |
|
323
|
323
|
|
|
324
|
324
|
foreach ( $entryset as $e ) { |
|
325
|
325
|
|
|
326
|
|
- if ( 'active' !== $e['status'] ) { |
|
|
326
|
+ if ( 'active' !== $e[ 'status' ] ) { |
|
327
|
327
|
gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) ); |
|
328
|
328
|
return __( 'You are not allowed to view this content.', 'gravityview' ); |
|
329
|
329
|
} |
|
@@ -334,7 +334,7 @@ discard block |
|
|
block discarded – undo |
|
334
|
334
|
} |
|
335
|
335
|
|
|
336
|
336
|
if ( $show_only_approved && ! $is_admin_and_can_view ) { |
|
337
|
|
- if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
|
337
|
+ if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
338
|
338
|
gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) ); |
|
339
|
339
|
return __( 'You are not allowed to view this content.', 'gravityview' ); |
|
340
|
340
|
} |
|
@@ -509,7 +509,7 @@ discard block |
|
|
block discarded – undo |
|
509
|
509
|
$join_column = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field::by_id( $join_column ); |
|
510
|
510
|
$join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field::by_id( $join_on_column ); |
|
511
|
511
|
|
|
512
|
|
- $joins [] = new Join( $join, $join_column, $join_on, $join_on_column ); |
|
|
512
|
+ $joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column ); |
|
513
|
513
|
} |
|
514
|
514
|
|
|
515
|
515
|
return $joins; |
|
@@ -556,7 +556,7 @@ discard block |
|
|
block discarded – undo |
|
556
|
556
|
|
|
557
|
557
|
list( $join, $join_column, $join_on, $join_on_column ) = $meta; |
|
558
|
558
|
|
|
559
|
|
- $forms[] = GF_Form::by_id( $join_on ); |
|
|
559
|
+ $forms[ ] = GF_Form::by_id( $join_on ); |
|
560
|
560
|
} |
|
561
|
561
|
|
|
562
|
562
|
return $forms; |
|
@@ -597,7 +597,7 @@ discard block |
|
|
block discarded – undo |
|
597
|
597
|
if ( ! $view->form ) { |
|
598
|
598
|
gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array( |
|
599
|
599
|
'view_id' => $view->ID, |
|
600
|
|
- 'form_id' => $view->_gravityview_form_id ? : 0, |
|
|
600
|
+ 'form_id' => $view->_gravityview_form_id ?: 0, |
|
601
|
601
|
) ); |
|
602
|
602
|
} |
|
603
|
603
|
|
|
@@ -830,34 +830,33 @@ discard block |
|
|
block discarded – undo |
|
830
|
830
|
* @todo: Stop using _frontend and use something like $request->get_search_criteria() instead |
|
831
|
831
|
*/ |
|
832
|
832
|
$parameters = \GravityView_frontend::get_view_entries_parameters( $this->settings->as_atts(), $this->form->ID ); |
|
833
|
|
- $parameters['context_view_id'] = $this->ID; |
|
|
833
|
+ $parameters[ 'context_view_id' ] = $this->ID; |
|
834
|
834
|
$parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID ); |
|
835
|
835
|
|
|
836
|
836
|
if ( $request instanceof REST\Request ) { |
|
837
|
837
|
$atts = $this->settings->as_atts(); |
|
838
|
838
|
$paging_parameters = wp_parse_args( $request->get_paging(), array( |
|
839
|
|
- 'paging' => array( 'page_size' => $atts['page_size'] ), |
|
|
839
|
+ 'paging' => array( 'page_size' => $atts[ 'page_size' ] ), |
|
840
|
840
|
) ); |
|
841
|
|
- $parameters['paging'] = $paging_parameters['paging']; |
|
|
841
|
+ $parameters[ 'paging' ] = $paging_parameters[ 'paging' ]; |
|
842
|
842
|
} |
|
843
|
843
|
|
|
844
|
|
- $page = Utils::get( $parameters['paging'], 'current_page' ) ? |
|
845
|
|
- : ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 ); |
|
|
844
|
+ $page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 ); |
|
846
|
845
|
|
|
847
|
846
|
/** |
|
848
|
847
|
* Cleanup duplicate field_filter parameters to simplify the query. |
|
849
|
848
|
*/ |
|
850
|
849
|
$unique_field_filters = array(); |
|
851
|
|
- foreach ( $parameters['search_criteria']['field_filters'] as $key => $filter ) { |
|
|
850
|
+ foreach ( $parameters[ 'search_criteria' ][ 'field_filters' ] as $key => $filter ) { |
|
852
|
851
|
if ( 'mode' === $key ) { |
|
853
|
|
- $unique_field_filters['mode'] = $filter; |
|
|
852
|
+ $unique_field_filters[ 'mode' ] = $filter; |
|
854
|
853
|
} else if ( ! in_array( $filter, $unique_field_filters ) ) { |
|
855
|
|
- $unique_field_filters[] = $filter; |
|
|
854
|
+ $unique_field_filters[ ] = $filter; |
|
856
|
855
|
} |
|
857
|
856
|
} |
|
858
|
|
- $parameters['search_criteria']['field_filters'] = $unique_field_filters; |
|
|
857
|
+ $parameters[ 'search_criteria' ][ 'field_filters' ] = $unique_field_filters; |
|
859
|
858
|
|
|
860
|
|
- if ( ! empty( $parameters['search_criteria']['field_filters'] ) ) { |
|
|
859
|
+ if ( ! empty( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) { |
|
861
|
860
|
gravityview()->log->notice( 'search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.' ); |
|
862
|
861
|
} |
|
863
|
862
|
|
|
@@ -865,10 +864,10 @@ discard block |
|
|
block discarded – undo |
|
865
|
864
|
/** |
|
866
|
865
|
* New \GF_Query stuff :) |
|
867
|
866
|
*/ |
|
868
|
|
- $query = new \GF_Query( $this->form->ID, $parameters['search_criteria'], $parameters['sorting'] ); |
|
|
867
|
+ $query = new \GF_Query( $this->form->ID, $parameters[ 'search_criteria' ], $parameters[ 'sorting' ] ); |
|
869
|
868
|
|
|
870
|
|
- $query->limit( $parameters['paging']['page_size'] ) |
|
871
|
|
- ->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) ); |
|
|
869
|
+ $query->limit( $parameters[ 'paging' ][ 'page_size' ] ) |
|
|
870
|
+ ->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) ); |
|
872
|
871
|
|
|
873
|
872
|
/** |
|
874
|
873
|
* Any joins? |
|
@@ -910,15 +909,15 @@ discard block |
|
|
block discarded – undo |
|
910
|
909
|
} ); |
|
911
|
910
|
} else { |
|
912
|
911
|
$entries = $this->form->entries |
|
913
|
|
- ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) ) |
|
|
912
|
+ ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) ) |
|
914
|
913
|
->offset( $this->settings->get( 'offset' ) ) |
|
915
|
|
- ->limit( $parameters['paging']['page_size'] ) |
|
|
914
|
+ ->limit( $parameters[ 'paging' ][ 'page_size' ] ) |
|
916
|
915
|
->page( $page ); |
|
917
|
916
|
|
|
918
|
|
- if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) { |
|
|
917
|
+ if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) { |
|
919
|
918
|
$field = new \GV\Field(); |
|
920
|
|
- $field->ID = $parameters['sorting']['key']; |
|
921
|
|
- $direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
|
919
|
+ $field->ID = $parameters[ 'sorting' ][ 'key' ]; |
|
|
920
|
+ $direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
922
|
921
|
$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) ); |
|
923
|
922
|
} |
|
924
|
923
|
} |