|
@@ -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
|
} |
|
@@ -278,13 +278,13 @@ discard block |
|
|
block discarded – undo |
|
278
|
278
|
return $content; |
|
279
|
279
|
} |
|
280
|
280
|
|
|
281
|
|
- $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID ); |
|
|
281
|
+ $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID ); |
|
282
|
282
|
|
|
283
|
283
|
/** |
|
284
|
284
|
* Editing a single entry. |
|
285
|
285
|
*/ |
|
286
|
286
|
if ( $entry = $request->is_edit_entry() ) { |
|
287
|
|
- if ( $entry['status'] != 'active' ) { |
|
|
287
|
+ if ( $entry[ 'status' ] != 'active' ) { |
|
288
|
288
|
gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
|
289
|
289
|
return __( 'You are not allowed to view this content.', 'gravityview' ); |
|
290
|
290
|
} |
|
@@ -295,7 +295,7 @@ discard block |
|
|
block discarded – undo |
|
295
|
295
|
} |
|
296
|
296
|
|
|
297
|
297
|
if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
|
298
|
|
- if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
|
298
|
+ if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
299
|
299
|
gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
|
300
|
300
|
return __( 'You are not allowed to view this content.', 'gravityview' ); |
|
301
|
301
|
} |
|
@@ -308,7 +308,7 @@ discard block |
|
|
block discarded – undo |
|
308
|
308
|
* Viewing a single entry. |
|
309
|
309
|
*/ |
|
310
|
310
|
} else if ( $entry = $request->is_entry() ) { |
|
311
|
|
- if ( $entry['status'] != 'active' ) { |
|
|
311
|
+ if ( $entry[ 'status' ] != 'active' ) { |
|
312
|
312
|
gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
|
313
|
313
|
return __( 'You are not allowed to view this content.', 'gravityview' ); |
|
314
|
314
|
} |
|
@@ -319,7 +319,7 @@ discard block |
|
|
block discarded – undo |
|
319
|
319
|
} |
|
320
|
320
|
|
|
321
|
321
|
if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
|
322
|
|
- if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
|
322
|
+ if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
323
|
323
|
gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
|
324
|
324
|
return __( 'You are not allowed to view this content.', 'gravityview' ); |
|
325
|
325
|
} |
|
@@ -327,7 +327,7 @@ discard block |
|
|
block discarded – undo |
|
327
|
327
|
|
|
328
|
328
|
$error = \GVCommon::check_entry_display( $entry->as_entry() ); |
|
329
|
329
|
|
|
330
|
|
- if( is_wp_error( $error ) ) { |
|
|
330
|
+ if ( is_wp_error( $error ) ) { |
|
331
|
331
|
gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing: {message}', array( 'entry_id' => $entry->ID, 'message' => $error->get_error_message() ) ); |
|
332
|
332
|
return __( 'You are not allowed to view this content.', 'gravityview' ); |
|
333
|
333
|
} |
|
@@ -485,7 +485,7 @@ discard block |
|
|
block discarded – undo |
|
485
|
485
|
$join_column = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field( $join_column ); |
|
486
|
486
|
$join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field( $join_on_column ); |
|
487
|
487
|
|
|
488
|
|
- $joins [] = new Join( $join, $join_column, $join_on, $join_on_column ); |
|
|
488
|
+ $joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column ); |
|
489
|
489
|
} |
|
490
|
490
|
|
|
491
|
491
|
return $joins; |
|
@@ -527,10 +527,10 @@ discard block |
|
|
block discarded – undo |
|
527
|
527
|
|
|
528
|
528
|
list( $join, $join_column, $join_on, $join_on_column ) = $meta; |
|
529
|
529
|
|
|
530
|
|
- $forms_ids [] = GF_Form::by_id( $join_on ); |
|
|
530
|
+ $forms_ids [ ] = GF_Form::by_id( $join_on ); |
|
531
|
531
|
} |
|
532
|
532
|
|
|
533
|
|
- return ( !empty( $forms_ids) ) ? $forms_ids : null; |
|
|
533
|
+ return ( ! empty( $forms_ids ) ) ? $forms_ids : null; |
|
534
|
534
|
} |
|
535
|
535
|
|
|
536
|
536
|
/** |
|
@@ -561,7 +561,7 @@ discard block |
|
|
block discarded – undo |
|
561
|
561
|
if ( ! $view->form ) { |
|
562
|
562
|
gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array( |
|
563
|
563
|
'view_id' => $view->ID, |
|
564
|
|
- 'form_id' => $view->_gravityview_form_id ? : 0, |
|
|
564
|
+ 'form_id' => $view->_gravityview_form_id ?: 0, |
|
565
|
565
|
) ); |
|
566
|
566
|
} |
|
567
|
567
|
|
|
@@ -787,28 +787,27 @@ discard block |
|
|
block discarded – undo |
|
787
|
787
|
* @todo: Stop using _frontend and use something like $request->get_search_criteria() instead |
|
788
|
788
|
*/ |
|
789
|
789
|
$parameters = \GravityView_frontend::get_view_entries_parameters( $this->settings->as_atts(), $this->form->ID ); |
|
790
|
|
- $parameters['context_view_id'] = $this->ID; |
|
|
790
|
+ $parameters[ 'context_view_id' ] = $this->ID; |
|
791
|
791
|
$parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID ); |
|
792
|
792
|
|
|
793
|
793
|
if ( $request instanceof REST\Request ) { |
|
794
|
794
|
$atts = $this->settings->as_atts(); |
|
795
|
795
|
$paging_parameters = wp_parse_args( $request->get_paging(), array( |
|
796
|
|
- 'paging' => array( 'page_size' => $atts['page_size'] ), |
|
|
796
|
+ 'paging' => array( 'page_size' => $atts[ 'page_size' ] ), |
|
797
|
797
|
) ); |
|
798
|
|
- $parameters['paging'] = $paging_parameters['paging']; |
|
|
798
|
+ $parameters[ 'paging' ] = $paging_parameters[ 'paging' ]; |
|
799
|
799
|
} |
|
800
|
800
|
|
|
801
|
|
- $page = Utils::get( $parameters['paging'], 'current_page' ) ? |
|
802
|
|
- : ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 ); |
|
|
801
|
+ $page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 ); |
|
803
|
802
|
|
|
804
|
803
|
if ( gravityview()->plugin->supports( Plugin::FEATURE_GFQUERY ) ) { |
|
805
|
804
|
/** |
|
806
|
805
|
* New \GF_Query stuff :) |
|
807
|
806
|
*/ |
|
808
|
|
- $query = new \GF_Query( $this->form->ID, $parameters['search_criteria'], $parameters['sorting'] ); |
|
|
807
|
+ $query = new \GF_Query( $this->form->ID, $parameters[ 'search_criteria' ], $parameters[ 'sorting' ] ); |
|
809
|
808
|
|
|
810
|
|
- $query->limit( $parameters['paging']['page_size'] ) |
|
811
|
|
- ->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) ); |
|
|
809
|
+ $query->limit( $parameters[ 'paging' ][ 'page_size' ] ) |
|
|
810
|
+ ->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) ); |
|
812
|
811
|
|
|
813
|
812
|
/** |
|
814
|
813
|
* Any joins? |
|
@@ -848,15 +847,15 @@ discard block |
|
|
block discarded – undo |
|
848
|
847
|
} ); |
|
849
|
848
|
} else { |
|
850
|
849
|
$entries = $this->form->entries |
|
851
|
|
- ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) ) |
|
|
850
|
+ ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) ) |
|
852
|
851
|
->offset( $this->settings->get( 'offset' ) ) |
|
853
|
|
- ->limit( $parameters['paging']['page_size'] ) |
|
|
852
|
+ ->limit( $parameters[ 'paging' ][ 'page_size' ] ) |
|
854
|
853
|
->page( $page ); |
|
855
|
854
|
|
|
856
|
|
- if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) { |
|
|
855
|
+ if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) { |
|
857
|
856
|
$field = new \GV\Field(); |
|
858
|
|
- $field->ID = $parameters['sorting']['key']; |
|
859
|
|
- $direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
|
857
|
+ $field->ID = $parameters[ 'sorting' ][ 'key' ]; |
|
|
858
|
+ $direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
860
|
859
|
$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) ); |
|
861
|
860
|
} |
|
862
|
861
|
} |
|
@@ -927,7 +926,7 @@ discard block |
|
|
block discarded – undo |
|
927
|
926
|
$allowed = $headers = array(); |
|
928
|
927
|
|
|
929
|
928
|
foreach ( $view->fields->by_position( "directory_*" )->by_visible()->all() as $field ) { |
|
930
|
|
- $allowed[] = $field->ID; |
|
|
929
|
+ $allowed[ ] = $field->ID; |
|
931
|
930
|
} |
|
932
|
931
|
|
|
933
|
932
|
$renderer = new Field_Renderer(); |