|
@@ -85,10 +85,10 @@ 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( 'render_block', array( $this, 'detect_views_in_block_content' ) ); |
|
90
|
90
|
add_filter( 'parse_query', array( $this, 'parse_query_fix_frontpage' ), 10 ); |
|
91
|
|
- add_action( 'template_redirect', array( $this, 'set_entry_data'), 1 ); |
|
|
91
|
+ add_action( 'template_redirect', array( $this, 'set_entry_data' ), 1 ); |
|
92
|
92
|
|
|
93
|
93
|
// Enqueue scripts and styles after GravityView_Template::register_styles() |
|
94
|
94
|
add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 20 ); |
|
@@ -235,18 +235,18 @@ discard block |
|
|
block discarded – undo |
|
235
|
235
|
|
|
236
|
236
|
if ( ! empty( $view_id ) ) { |
|
237
|
237
|
|
|
238
|
|
- $this->context_view_id = (int) $view_id; |
|
|
238
|
+ $this->context_view_id = (int)$view_id; |
|
239
|
239
|
|
|
240
|
|
- } elseif ( isset( $_GET['gvid'] ) && $multiple_views ) { |
|
|
240
|
+ } elseif ( isset( $_GET[ 'gvid' ] ) && $multiple_views ) { |
|
241
|
241
|
/** |
|
242
|
242
|
* used on a has_multiple_views context |
|
243
|
243
|
* @see GravityView_API::entry_link |
|
244
|
244
|
*/ |
|
245
|
|
- $this->context_view_id = (int) $_GET['gvid']; |
|
|
245
|
+ $this->context_view_id = (int)$_GET[ 'gvid' ]; |
|
246
|
246
|
|
|
247
|
247
|
} elseif ( ! $multiple_views ) { |
|
248
|
248
|
$array_keys = array_keys( $this->getGvOutputData()->get_views() ); |
|
249
|
|
- $this->context_view_id = (int) array_pop( $array_keys ); |
|
|
249
|
+ $this->context_view_id = (int)array_pop( $array_keys ); |
|
250
|
250
|
unset( $array_keys ); |
|
251
|
251
|
} |
|
252
|
252
|
|
|
@@ -279,25 +279,25 @@ discard block |
|
|
block discarded – undo |
|
279
|
279
|
global $wp_rewrite; |
|
280
|
280
|
|
|
281
|
281
|
$is_front_page = ( $query->is_home || $query->is_page ); |
|
282
|
|
- $show_on_front = ( 'page' === get_option('show_on_front') ); |
|
283
|
|
- $front_page_id = get_option('page_on_front'); |
|
|
282
|
+ $show_on_front = ( 'page' === get_option( 'show_on_front' ) ); |
|
|
283
|
+ $front_page_id = get_option( 'page_on_front' ); |
|
284
|
284
|
|
|
285
|
|
- if ( $is_front_page && $show_on_front && $front_page_id ) { |
|
|
285
|
+ if ( $is_front_page && $show_on_front && $front_page_id ) { |
|
286
|
286
|
|
|
287
|
287
|
// Force to be an array, potentially a query string ( entry=16 ) |
|
288
|
288
|
$_query = wp_parse_args( $query->query ); |
|
289
|
289
|
|
|
290
|
290
|
// pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename. |
|
291
|
|
- if ( isset( $_query['pagename'] ) && '' === $_query['pagename'] ) { |
|
292
|
|
- unset( $_query['pagename'] ); |
|
|
291
|
+ if ( isset( $_query[ 'pagename' ] ) && '' === $_query[ 'pagename' ] ) { |
|
|
292
|
+ unset( $_query[ 'pagename' ] ); |
|
293
|
293
|
} |
|
294
|
294
|
|
|
295
|
295
|
// this is where will break from core wordpress |
|
296
|
296
|
/** @internal Don't use this filter; it will be unnecessary soon - it's just a patch for specific use case */ |
|
297
|
297
|
$ignore = apply_filters( 'gravityview/internal/ignored_endpoints', array( 'preview', 'page', 'paged', 'cpage' ), $query ); |
|
298
|
298
|
$endpoints = \GV\Utils::get( $wp_rewrite, 'endpoints' ); |
|
299
|
|
- foreach ( (array) $endpoints as $endpoint ) { |
|
300
|
|
- $ignore[] = $endpoint[1]; |
|
|
299
|
+ foreach ( (array)$endpoints as $endpoint ) { |
|
|
300
|
+ $ignore[ ] = $endpoint[ 1 ]; |
|
301
|
301
|
} |
|
302
|
302
|
unset( $endpoints ); |
|
303
|
303
|
|
|
@@ -307,21 +307,21 @@ discard block |
|
|
block discarded – undo |
|
307
|
307
|
// - The query includes keys that are associated with registered endpoints. `entry`, for example. |
|
308
|
308
|
if ( empty( $_query ) || ! array_diff( array_keys( $_query ), $ignore ) ) { |
|
309
|
309
|
|
|
310
|
|
- $qv =& $query->query_vars; |
|
|
310
|
+ $qv = & $query->query_vars; |
|
311
|
311
|
|
|
312
|
312
|
// Prevent redirect when on the single entry endpoint |
|
313
|
|
- if( self::is_single_entry() ) { |
|
|
313
|
+ if ( self::is_single_entry() ) { |
|
314
|
314
|
add_filter( 'redirect_canonical', '__return_false' ); |
|
315
|
315
|
} |
|
316
|
316
|
|
|
317
|
317
|
$query->is_page = true; |
|
318
|
318
|
$query->is_home = false; |
|
319
|
|
- $qv['page_id'] = $front_page_id; |
|
|
319
|
+ $qv[ 'page_id' ] = $front_page_id; |
|
320
|
320
|
|
|
321
|
321
|
// Correct <!--nextpage--> for page_on_front |
|
322
|
|
- if ( ! empty( $qv['paged'] ) ) { |
|
323
|
|
- $qv['page'] = $qv['paged']; |
|
324
|
|
- unset( $qv['paged'] ); |
|
|
322
|
+ if ( ! empty( $qv[ 'paged' ] ) ) { |
|
|
323
|
+ $qv[ 'page' ] = $qv[ 'paged' ]; |
|
|
324
|
+ unset( $qv[ 'paged' ] ); |
|
325
|
325
|
} |
|
326
|
326
|
} |
|
327
|
327
|
|
|
@@ -383,11 +383,11 @@ discard block |
|
|
block discarded – undo |
|
383
|
383
|
$blocks = parse_blocks( $post_content ); |
|
384
|
384
|
|
|
385
|
385
|
foreach ( $blocks as $block ) { |
|
386
|
|
- if ( empty( $block['attrs']['ref'] ) ) { |
|
|
386
|
+ if ( empty( $block[ 'attrs' ][ 'ref' ] ) ) { |
|
387
|
387
|
continue; |
|
388
|
388
|
} |
|
389
|
389
|
|
|
390
|
|
- $block_post = get_post( $block['attrs']['ref'] ); |
|
|
390
|
+ $block_post = get_post( $block[ 'attrs' ][ 'ref' ] ); |
|
391
|
391
|
|
|
392
|
392
|
if ( $block_post ) { |
|
393
|
393
|
$post_content .= $block_post->post_content; |
|
@@ -440,7 +440,7 @@ discard block |
|
|
block discarded – undo |
|
440
|
440
|
|
|
441
|
441
|
$search_method = GravityView_Widget_Search::getInstance()->get_search_method(); |
|
442
|
442
|
|
|
443
|
|
- if( 'post' === $search_method ) { |
|
|
443
|
+ if ( 'post' === $search_method ) { |
|
444
|
444
|
$get = $_POST; |
|
445
|
445
|
} else { |
|
446
|
446
|
$get = $_GET; |
|
@@ -492,7 +492,7 @@ discard block |
|
|
block discarded – undo |
|
492
|
492
|
$gventry = gravityview()->request->is_entry(); |
|
493
|
493
|
|
|
494
|
494
|
// If this is the directory view, return. |
|
495
|
|
- if( ! $gventry ) { |
|
|
495
|
+ if ( ! $gventry ) { |
|
496
|
496
|
return $passed_title; |
|
497
|
497
|
} |
|
498
|
498
|
|
|
@@ -510,19 +510,19 @@ discard block |
|
|
block discarded – undo |
|
510
|
510
|
} |
|
511
|
511
|
|
|
512
|
512
|
// WooCommerce doesn't $post_id |
|
513
|
|
- if ( empty( $passed_post_id ) ) { |
|
|
513
|
+ if ( empty( $passed_post_id ) ) { |
|
514
|
514
|
return $passed_title; |
|
515
|
515
|
} |
|
516
|
516
|
|
|
517
|
517
|
// Don't modify the title for anything other than the current view/post. |
|
518
|
518
|
// This is true for embedded shortcodes and Views. |
|
519
|
|
- if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) { |
|
|
519
|
+ if ( is_object( $post ) && (int)$post->ID !== (int)$passed_post_id ) { |
|
520
|
520
|
return $passed_title; |
|
521
|
521
|
} |
|
522
|
522
|
|
|
523
|
523
|
$view = gravityview()->request->is_view(); |
|
524
|
524
|
|
|
525
|
|
- if( $view ) { |
|
|
525
|
+ if ( $view ) { |
|
526
|
526
|
return $this->_get_single_entry_title( $view, $entry, $passed_title ); |
|
527
|
527
|
} |
|
528
|
528
|
|
|
@@ -545,7 +545,7 @@ discard block |
|
|
block discarded – undo |
|
545
|
545
|
$view_collection = \GV\View_Collection::from_post( $post ); |
|
546
|
546
|
|
|
547
|
547
|
// We have multiple Views, but no gvid...this isn't valid security |
|
548
|
|
- if( 1 < $view_collection->count() ) { |
|
|
548
|
+ if ( 1 < $view_collection->count() ) { |
|
549
|
549
|
return $passed_title; |
|
550
|
550
|
} |
|
551
|
551
|
|
|
@@ -579,18 +579,18 @@ discard block |
|
|
block discarded – undo |
|
579
|
579
|
*/ |
|
580
|
580
|
$check_entry_display = apply_filters( 'gravityview/single/title/check_entry_display', true, $entry, $view ); |
|
581
|
581
|
|
|
582
|
|
- if( $check_entry_display ) { |
|
|
582
|
+ if ( $check_entry_display ) { |
|
583
|
583
|
|
|
584
|
584
|
$check_display = GVCommon::check_entry_display( $entry, $view ); |
|
585
|
585
|
|
|
586
|
|
- if( is_wp_error( $check_display ) ) { |
|
|
586
|
+ if ( is_wp_error( $check_display ) ) { |
|
587
|
587
|
return $passed_title; |
|
588
|
588
|
} |
|
589
|
589
|
} |
|
590
|
590
|
|
|
591
|
591
|
$title = $view->settings->get( 'single_title', $passed_title ); |
|
592
|
592
|
|
|
593
|
|
- $form = GVCommon::get_form( $entry['form_id'] ); |
|
|
593
|
+ $form = GVCommon::get_form( $entry[ 'form_id' ] ); |
|
594
|
594
|
|
|
595
|
595
|
// We are allowing HTML in the fields, so no escaping the output |
|
596
|
596
|
$title = GravityView_API::replace_variables( $title, $form, $entry ); |
|
@@ -661,7 +661,7 @@ discard block |
|
|
block discarded – undo |
|
661
|
661
|
|
|
662
|
662
|
$context = GravityView_View::getInstance()->getContext(); |
|
663
|
663
|
|
|
664
|
|
- switch( $context ) { |
|
|
664
|
+ switch ( $context ) { |
|
665
|
665
|
case 'directory': |
|
666
|
666
|
$tab = __( 'Multiple Entries', 'gravityview' ); |
|
667
|
667
|
break; |
|
@@ -675,12 +675,12 @@ discard block |
|
|
block discarded – undo |
|
675
|
675
|
} |
|
676
|
676
|
|
|
677
|
677
|
|
|
678
|
|
- $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 ); |
|
|
678
|
+ $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 ); |
|
679
|
679
|
$edit_link = admin_url( sprintf( 'post.php?post=%d&action=edit#%s-view', $view_id, $context ) ); |
|
680
|
|
- $action_text = sprintf( esc_html__('Add fields to %s', 'gravityview' ), $tab ); |
|
|
680
|
+ $action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab ); |
|
681
|
681
|
$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' ); |
|
682
|
682
|
|
|
683
|
|
- $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 ) ) ); |
|
|
683
|
+ $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 ) ) ); |
|
684
|
684
|
$output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message ); |
|
685
|
685
|
|
|
686
|
686
|
echo GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $view_id ); |
|
@@ -727,7 +727,7 @@ discard block |
|
|
block discarded – undo |
|
727
|
727
|
$direct_access = apply_filters( 'gravityview_direct_access', true, $view->ID ); |
|
728
|
728
|
$embed_only = $view->settings->get( 'embed_only' ); |
|
729
|
729
|
|
|
730
|
|
- if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) { |
|
|
730
|
+ if ( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) { |
|
731
|
731
|
return __( 'You are not allowed to view this content.', 'gravityview' ); |
|
732
|
732
|
} |
|
733
|
733
|
|
|
@@ -774,7 +774,7 @@ discard block |
|
|
block discarded – undo |
|
774
|
774
|
$datetime_format = 'Y-m-d H:i:s'; |
|
775
|
775
|
$search_is_outside_view_bounds = false; |
|
776
|
776
|
|
|
777
|
|
- if( ! empty( $search_criteria[ $key ] ) ) { |
|
|
777
|
+ if ( ! empty( $search_criteria[ $key ] ) ) { |
|
778
|
778
|
|
|
779
|
779
|
$search_date = strtotime( $search_criteria[ $key ], GFCommon::get_local_timestamp() ); |
|
780
|
780
|
|
|
@@ -802,14 +802,14 @@ discard block |
|
|
block discarded – undo |
|
802
|
802
|
if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) { |
|
803
|
803
|
|
|
804
|
804
|
// Then we override the search and re-set the start date |
|
805
|
|
- $return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true ); |
|
|
805
|
+ $return_search_criteria[ $key ] = date_i18n( $datetime_format, $date, true ); |
|
806
|
806
|
} |
|
807
|
807
|
} |
|
808
|
808
|
} |
|
809
|
809
|
|
|
810
|
|
- if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) { |
|
|
810
|
+ if ( isset( $return_search_criteria[ 'start_date' ] ) && isset( $return_search_criteria[ 'end_date' ] ) ) { |
|
811
|
811
|
// The start date is AFTER the end date. This will result in no results, but let's not force the issue. |
|
812
|
|
- if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) { |
|
|
812
|
+ if ( strtotime( $return_search_criteria[ 'start_date' ] ) > strtotime( $return_search_criteria[ 'end_date' ] ) ) { |
|
813
|
813
|
gravityview()->log->error( 'Invalid search: the start date is after the end date.', array( 'data' => $return_search_criteria ) ); |
|
814
|
814
|
} |
|
815
|
815
|
} |
|
@@ -828,19 +828,19 @@ discard block |
|
|
block discarded – undo |
|
828
|
828
|
public static function process_search_only_approved( $args, $search_criteria ) { |
|
829
|
829
|
|
|
830
|
830
|
/** @since 1.19 */ |
|
831
|
|
- if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) { |
|
|
831
|
+ if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) { |
|
832
|
832
|
gravityview()->log->debug( 'User can moderate entries; showing all approval statuses' ); |
|
833
|
833
|
return $search_criteria; |
|
834
|
834
|
} |
|
835
|
835
|
|
|
836
|
|
- if ( ! empty( $args['show_only_approved'] ) ) { |
|
|
836
|
+ if ( ! empty( $args[ 'show_only_approved' ] ) ) { |
|
837
|
837
|
|
|
838
|
|
- $search_criteria['field_filters'][] = array( |
|
|
838
|
+ $search_criteria[ 'field_filters' ][ ] = array( |
|
839
|
839
|
'key' => GravityView_Entry_Approval::meta_key, |
|
840
|
840
|
'value' => GravityView_Entry_Approval_Status::APPROVED |
|
841
|
841
|
); |
|
842
|
842
|
|
|
843
|
|
- $search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met |
|
|
843
|
+ $search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; // force all the criterias to be met |
|
844
|
844
|
|
|
845
|
845
|
gravityview()->log->debug( '[process_search_only_approved] Search Criteria if show only approved: ', array( 'data' => $search_criteria ) ); |
|
846
|
846
|
} |
|
@@ -867,18 +867,18 @@ discard block |
|
|
block discarded – undo |
|
867
|
867
|
*/ |
|
868
|
868
|
public static function is_entry_approved( $entry, $args = array() ) { |
|
869
|
869
|
|
|
870
|
|
- if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) { |
|
|
870
|
+ if ( empty( $entry[ 'id' ] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args[ 'show_only_approved' ] ) ) { |
|
871
|
871
|
// is implicitly approved if entry is null or View settings doesn't require to check for approval |
|
872
|
872
|
return true; |
|
873
|
873
|
} |
|
874
|
874
|
|
|
875
|
875
|
/** @since 1.19 */ |
|
876
|
|
- if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) { |
|
|
876
|
+ if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) { |
|
877
|
877
|
gravityview()->log->debug( 'User can moderate entries, so entry is approved for viewing' ); |
|
878
|
878
|
return true; |
|
879
|
879
|
} |
|
880
|
880
|
|
|
881
|
|
- $is_approved = gform_get_meta( $entry['id'], GravityView_Entry_Approval::meta_key ); |
|
|
881
|
+ $is_approved = gform_get_meta( $entry[ 'id' ], GravityView_Entry_Approval::meta_key ); |
|
882
|
882
|
|
|
883
|
883
|
return GravityView_Entry_Approval_Status::is_approved( $is_approved ); |
|
884
|
884
|
} |
|
@@ -902,7 +902,7 @@ discard block |
|
|
block discarded – undo |
|
902
|
902
|
* Compatibility with filters hooking in `gravityview_search_criteria` instead of `gravityview_fe_search_criteria`. |
|
903
|
903
|
*/ |
|
904
|
904
|
$criteria = apply_filters( 'gravityview_search_criteria', array(), array( $form_id ), \GV\Utils::get( $args, 'id' ) ); |
|
905
|
|
- $search_criteria = isset( $criteria['search_criteria'] ) ? $criteria['search_criteria'] : array( 'field_filters' => array() ); |
|
|
905
|
+ $search_criteria = isset( $criteria[ 'search_criteria' ] ) ? $criteria[ 'search_criteria' ] : array( 'field_filters' => array() ); |
|
906
|
906
|
|
|
907
|
907
|
/** |
|
908
|
908
|
* @filter `gravityview_fe_search_criteria` Modify the search criteria |
|
@@ -922,29 +922,29 @@ discard block |
|
|
block discarded – undo |
|
922
|
922
|
gravityview()->log->debug( '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', array( 'data' =>$search_criteria ) ); |
|
923
|
923
|
|
|
924
|
924
|
// implicity search |
|
925
|
|
- if ( ! empty( $args['search_value'] ) ) { |
|
|
925
|
+ if ( ! empty( $args[ 'search_value' ] ) ) { |
|
926
|
926
|
|
|
927
|
927
|
// Search operator options. Options: `is` or `contains` |
|
928
|
|
- $operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains'; |
|
|
928
|
+ $operator = ! empty( $args[ 'search_operator' ] ) && in_array( $args[ 'search_operator' ], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args[ 'search_operator' ] : 'contains'; |
|
929
|
929
|
|
|
930
|
|
- $search_criteria['field_filters'][] = array( |
|
|
930
|
+ $search_criteria[ 'field_filters' ][ ] = array( |
|
931
|
931
|
'key' => \GV\Utils::_GET( 'search_field', \GV\Utils::get( $args, 'search_field' ) ), // The field ID to search |
|
932
|
|
- 'value' => _wp_specialchars( $args['search_value'] ), // The value to search. Encode ampersands but not quotes. |
|
|
932
|
+ 'value' => _wp_specialchars( $args[ 'search_value' ] ), // The value to search. Encode ampersands but not quotes. |
|
933
|
933
|
'operator' => $operator, |
|
934
|
934
|
); |
|
935
|
935
|
|
|
936
|
936
|
// Lock search mode to "all" with implicit presearch filter. |
|
937
|
|
- $search_criteria['field_filters']['mode'] = 'all'; |
|
|
937
|
+ $search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; |
|
938
|
938
|
} |
|
939
|
939
|
|
|
940
|
|
- if( $search_criteria !== $original_search_criteria ) { |
|
|
940
|
+ if ( $search_criteria !== $original_search_criteria ) { |
|
941
|
941
|
gravityview()->log->debug( '[get_search_criteria] Search Criteria after implicity search: ', array( 'data' => $search_criteria ) ); |
|
942
|
942
|
} |
|
943
|
943
|
|
|
944
|
944
|
// Handle setting date range |
|
945
|
945
|
$search_criteria = self::process_search_dates( $args, $search_criteria ); |
|
946
|
946
|
|
|
947
|
|
- if( $search_criteria !== $original_search_criteria ) { |
|
|
947
|
+ if ( $search_criteria !== $original_search_criteria ) { |
|
948
|
948
|
gravityview()->log->debug( '[get_search_criteria] Search Criteria after date params: ', array( 'data' => $search_criteria ) ); |
|
949
|
949
|
} |
|
950
|
950
|
|
|
@@ -955,7 +955,7 @@ discard block |
|
|
block discarded – undo |
|
955
|
955
|
* @filter `gravityview_status` Modify entry status requirements to be included in search results. |
|
956
|
956
|
* @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash` |
|
957
|
957
|
*/ |
|
958
|
|
- $search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args ); |
|
|
958
|
+ $search_criteria[ 'status' ] = apply_filters( 'gravityview_status', 'active', $args ); |
|
959
|
959
|
|
|
960
|
960
|
return $search_criteria; |
|
961
|
961
|
} |
|
@@ -1067,7 +1067,7 @@ discard block |
|
|
block discarded – undo |
|
1067
|
1067
|
'search_criteria' => $search_criteria, |
|
1068
|
1068
|
'sorting' => self::updateViewSorting( $args, $form_id ), |
|
1069
|
1069
|
'paging' => $paging, |
|
1070
|
|
- 'cache' => isset( $args['cache'] ) ? $args['cache'] : true, |
|
|
1070
|
+ 'cache' => isset( $args[ 'cache' ] ) ? $args[ 'cache' ] : true, |
|
1071
|
1071
|
); |
|
1072
|
1072
|
|
|
1073
|
1073
|
/** |
|
@@ -1092,7 +1092,7 @@ discard block |
|
|
block discarded – undo |
|
1092
|
1092
|
* @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys. |
|
1093
|
1093
|
* @param array $args View configuration args. |
|
1094
|
1094
|
*/ |
|
1095
|
|
- $parameters = apply_filters( 'gravityview_get_entries_'.\GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id ); |
|
|
1095
|
+ $parameters = apply_filters( 'gravityview_get_entries_' . \GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id ); |
|
1096
|
1096
|
|
|
1097
|
1097
|
gravityview()->log->debug( '$parameters passed to gravityview_get_entries(): ', array( 'data' => $parameters ) ); |
|
1098
|
1098
|
|
|
@@ -1117,17 +1117,17 @@ discard block |
|
|
block discarded – undo |
|
1117
|
1117
|
$default_page_size = apply_filters( 'gravityview_default_page_size', 25 ); |
|
1118
|
1118
|
|
|
1119
|
1119
|
// Paging & offset |
|
1120
|
|
- $page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : $default_page_size; |
|
|
1120
|
+ $page_size = ! empty( $args[ 'page_size' ] ) ? intval( $args[ 'page_size' ] ) : $default_page_size; |
|
1121
|
1121
|
|
|
1122
|
1122
|
if ( -1 === $page_size ) { |
|
1123
|
1123
|
$page_size = PHP_INT_MAX; |
|
1124
|
1124
|
} |
|
1125
|
1125
|
|
|
1126
|
|
- $curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] ); |
|
|
1126
|
+ $curr_page = empty( $_GET[ 'pagenum' ] ) ? 1 : intval( $_GET[ 'pagenum' ] ); |
|
1127
|
1127
|
$offset = ( $curr_page - 1 ) * $page_size; |
|
1128
|
1128
|
|
|
1129
|
|
- if ( ! empty( $args['offset'] ) ) { |
|
1130
|
|
- $offset += intval( $args['offset'] ); |
|
|
1129
|
+ if ( ! empty( $args[ 'offset' ] ) ) { |
|
|
1130
|
+ $offset += intval( $args[ 'offset' ] ); |
|
1131
|
1131
|
} |
|
1132
|
1132
|
|
|
1133
|
1133
|
$paging = array( |
|
@@ -1152,11 +1152,11 @@ discard block |
|
|
block discarded – undo |
|
1152
|
1152
|
public static function updateViewSorting( $args, $form_id ) { |
|
1153
|
1153
|
$sorting = array(); |
|
1154
|
1154
|
|
|
1155
|
|
- $has_values = isset( $_GET['sort'] ); |
|
|
1155
|
+ $has_values = isset( $_GET[ 'sort' ] ); |
|
1156
|
1156
|
|
|
1157
|
|
- if ( $has_values && is_array( $_GET['sort'] ) ) { |
|
1158
|
|
- $sorts = array_keys( $_GET['sort'] ); |
|
1159
|
|
- $dirs = array_values( $_GET['sort'] ); |
|
|
1157
|
+ if ( $has_values && is_array( $_GET[ 'sort' ] ) ) { |
|
|
1158
|
+ $sorts = array_keys( $_GET[ 'sort' ] ); |
|
|
1159
|
+ $dirs = array_values( $_GET[ 'sort' ] ); |
|
1160
|
1160
|
|
|
1161
|
1161
|
if ( $has_values = array_filter( $dirs ) ) { |
|
1162
|
1162
|
$sort_field_id = end( $sorts ); |
|
@@ -1165,11 +1165,11 @@ discard block |
|
|
block discarded – undo |
|
1165
|
1165
|
} |
|
1166
|
1166
|
|
|
1167
|
1167
|
if ( ! isset( $sort_field_id ) ) { |
|
1168
|
|
- $sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : \GV\Utils::get( $args, 'sort_field' ); |
|
|
1168
|
+ $sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : \GV\Utils::get( $args, 'sort_field' ); |
|
1169
|
1169
|
} |
|
1170
|
1170
|
|
|
1171
|
1171
|
if ( ! isset( $sort_direction ) ) { |
|
1172
|
|
- $sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : \GV\Utils::get( $args, 'sort_direction' ); |
|
|
1172
|
+ $sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : \GV\Utils::get( $args, 'sort_direction' ); |
|
1173
|
1173
|
} |
|
1174
|
1174
|
|
|
1175
|
1175
|
if ( is_array( $sort_field_id ) ) { |
|
@@ -1201,10 +1201,10 @@ discard block |
|
|
block discarded – undo |
|
1201
|
1201
|
$form = GFAPI::get_form( $form_id ); |
|
1202
|
1202
|
|
|
1203
|
1203
|
// Get the first GF_Field field ID, set as the key for entry randomization |
|
1204
|
|
- if ( ! empty( $form['fields'] ) ) { |
|
|
1204
|
+ if ( ! empty( $form[ 'fields' ] ) ) { |
|
1205
|
1205
|
|
|
1206
|
1206
|
/** @var GF_Field $field */ |
|
1207
|
|
- foreach ( $form['fields'] as $field ) { |
|
|
1207
|
+ foreach ( $form[ 'fields' ] as $field ) { |
|
1208
|
1208
|
if ( ! is_a( $field, 'GF_Field' ) ) { |
|
1209
|
1209
|
continue; |
|
1210
|
1210
|
} |
|
@@ -1249,7 +1249,7 @@ discard block |
|
|
block discarded – undo |
|
1249
|
1249
|
if ( is_array( $sort_field_id ) ) { |
|
1250
|
1250
|
$modified_ids = array(); |
|
1251
|
1251
|
foreach ( $sort_field_id as $_sort_field_id ) { |
|
1252
|
|
- $modified_ids []= self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id ); |
|
|
1252
|
+ $modified_ids [ ] = self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id ); |
|
1253
|
1253
|
} |
|
1254
|
1254
|
return $modified_ids; |
|
1255
|
1255
|
} |
|
@@ -1258,11 +1258,11 @@ discard block |
|
|
block discarded – undo |
|
1258
|
1258
|
|
|
1259
|
1259
|
$sort_field = GFFormsModel::get_field( $form, $sort_field_id ); |
|
1260
|
1260
|
|
|
1261
|
|
- if( ! $sort_field ) { |
|
|
1261
|
+ if ( ! $sort_field ) { |
|
1262
|
1262
|
return $sort_field_id; |
|
1263
|
1263
|
} |
|
1264
|
1264
|
|
|
1265
|
|
- switch ( $sort_field['type'] ) { |
|
|
1265
|
+ switch ( $sort_field[ 'type' ] ) { |
|
1266
|
1266
|
|
|
1267
|
1267
|
case 'address': |
|
1268
|
1268
|
// Sorting by full address |
|
@@ -1279,7 +1279,7 @@ discard block |
|
|
block discarded – undo |
|
1279
|
1279
|
*/ |
|
1280
|
1280
|
$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id ); |
|
1281
|
1281
|
|
|
1282
|
|
- switch( strtolower( $address_part ) ){ |
|
|
1282
|
+ switch ( strtolower( $address_part ) ) { |
|
1283
|
1283
|
case 'street': |
|
1284
|
1284
|
$sort_field_id .= '.1'; |
|
1285
|
1285
|
break; |
|
@@ -1352,7 +1352,7 @@ discard block |
|
|
block discarded – undo |
|
1352
|
1352
|
if ( ! class_exists( '\GV\Entry' ) ) { |
|
1353
|
1353
|
|
|
1354
|
1354
|
// Not using gravityview()->log->error(), since that may not exist yet either! |
|
1355
|
|
- do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary() ); |
|
|
1355
|
+ do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary() ); |
|
1356
|
1356
|
|
|
1357
|
1357
|
return null; |
|
1358
|
1358
|
} |
|
@@ -1369,7 +1369,7 @@ discard block |
|
|
block discarded – undo |
|
1369
|
1369
|
*/ |
|
1370
|
1370
|
$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry ); |
|
1371
|
1371
|
|
|
1372
|
|
- if ( empty( $single_entry ) ){ |
|
|
1372
|
+ if ( empty( $single_entry ) ) { |
|
1373
|
1373
|
return false; |
|
1374
|
1374
|
} else { |
|
1375
|
1375
|
return $single_entry; |
|
@@ -1390,7 +1390,7 @@ discard block |
|
|
block discarded – undo |
|
1390
|
1390
|
$views = $this->getGvOutputData()->get_views(); |
|
1391
|
1391
|
|
|
1392
|
1392
|
foreach ( $views as $view_id => $data ) { |
|
1393
|
|
- $view = \GV\View::by_id( $data['id'] ); |
|
|
1393
|
+ $view = \GV\View::by_id( $data[ 'id' ] ); |
|
1394
|
1394
|
$view_id = $view->ID; |
|
1395
|
1395
|
$template_id = gravityview_get_template_id( $view->ID ); |
|
1396
|
1396
|
$data = $view->as_data(); |
|
@@ -1399,7 +1399,7 @@ discard block |
|
|
block discarded – undo |
|
1399
|
1399
|
* Don't enqueue the scripts or styles if it's not going to be displayed. |
|
1400
|
1400
|
* @since 1.15 |
|
1401
|
1401
|
*/ |
|
1402
|
|
- if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) { |
|
|
1402
|
+ if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) { |
|
1403
|
1403
|
continue; |
|
1404
|
1404
|
} |
|
1405
|
1405
|
|
|
@@ -1428,7 +1428,7 @@ discard block |
|
|
block discarded – undo |
|
1428
|
1428
|
* @param \GV\View The View. |
|
1429
|
1429
|
*/ |
|
1430
|
1430
|
$js_dependency = apply_filters( 'gravityview_lightbox_script', $js_dependency, $view ); |
|
1431
|
|
- $js_dependencies[] = $js_dependency; |
|
|
1431
|
+ $js_dependencies[ ] = $js_dependency; |
|
1432
|
1432
|
|
|
1433
|
1433
|
/** |
|
1434
|
1434
|
* @filter `gravity_view_lightbox_style` Modify the lightbox CSS slug. Default: `thickbox` |
|
@@ -1444,7 +1444,7 @@ discard block |
|
|
block discarded – undo |
|
1444
|
1444
|
* @param \GV\View The View. |
|
1445
|
1445
|
*/ |
|
1446
|
1446
|
$css_dependency = apply_filters( 'gravityview_lightbox_style', $css_dependency, $view ); |
|
1447
|
|
- $css_dependencies[] = $css_dependency; |
|
|
1447
|
+ $css_dependencies[ ] = $css_dependency; |
|
1448
|
1448
|
} |
|
1449
|
1449
|
|
|
1450
|
1450
|
/** |
|
@@ -1452,19 +1452,19 @@ discard block |
|
|
block discarded – undo |
|
1452
|
1452
|
* @see https://github.com/katzwebservices/GravityView/issues/536 |
|
1453
|
1453
|
* @since 1.15 |
|
1454
|
1454
|
*/ |
|
1455
|
|
- if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) { |
|
1456
|
|
- $css_dependencies[] = 'dashicons'; |
|
|
1455
|
+ if ( gravityview_view_has_single_checkbox_or_radio( $data[ 'form' ], $data[ 'fields' ] ) ) { |
|
|
1456
|
+ $css_dependencies[ ] = 'dashicons'; |
|
1457
|
1457
|
} |
|
1458
|
1458
|
|
|
1459
|
1459
|
wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true ); |
|
1460
|
1460
|
|
|
1461
|
1461
|
$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
|
1462
|
1462
|
|
|
1463
|
|
- 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 ); |
|
|
1463
|
+ 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 ); |
|
1464
|
1464
|
|
|
1465
|
1465
|
wp_enqueue_script( 'gravityview-fe-view' ); |
|
1466
|
1466
|
|
|
1467
|
|
- if ( ! empty( $data['atts']['sort_columns'] ) ) { |
|
|
1467
|
+ if ( ! empty( $data[ 'atts' ][ 'sort_columns' ] ) ) { |
|
1468
|
1468
|
wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' ); |
|
1469
|
1469
|
} |
|
1470
|
1470
|
|
|
@@ -1527,7 +1527,7 @@ discard block |
|
|
block discarded – undo |
|
1527
|
1527
|
public static function add_style( $template_id ) { |
|
1528
|
1528
|
|
|
1529
|
1529
|
if ( ! empty( $template_id ) && wp_style_is( 'gravityview_style_' . $template_id, 'registered' ) ) { |
|
1530
|
|
- gravityview()->log->debug( 'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) ); |
|
|
1530
|
+ gravityview()->log->debug( 'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) ); |
|
1531
|
1531
|
wp_enqueue_style( 'gravityview_style_' . $template_id ); |
|
1532
|
1532
|
} elseif ( empty( $template_id ) ) { |
|
1533
|
1533
|
gravityview()->log->error( 'Cannot add template style; template_id is empty' ); |
|
@@ -1558,11 +1558,11 @@ discard block |
|
|
block discarded – undo |
|
1558
|
1558
|
* Not a table-based template; don't add sort icons |
|
1559
|
1559
|
* @since 1.12 |
|
1560
|
1560
|
*/ |
|
1561
|
|
- if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) { |
|
|
1561
|
+ if ( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) { |
|
1562
|
1562
|
return $label; |
|
1563
|
1563
|
} |
|
1564
|
1564
|
|
|
1565
|
|
- if ( ! $this->is_field_sortable( $field['id'], $form ) ) { |
|
|
1565
|
+ if ( ! $this->is_field_sortable( $field[ 'id' ], $form ) ) { |
|
1566
|
1566
|
return $label; |
|
1567
|
1567
|
} |
|
1568
|
1568
|
|
|
@@ -1570,29 +1570,29 @@ discard block |
|
|
block discarded – undo |
|
1570
|
1570
|
|
|
1571
|
1571
|
$class = 'gv-sort'; |
|
1572
|
1572
|
|
|
1573
|
|
- $sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] ); |
|
|
1573
|
+ $sort_field_id = self::_override_sorting_id_by_field_type( $field[ 'id' ], $form[ 'id' ] ); |
|
1574
|
1574
|
|
|
1575
|
1575
|
$sort_args = array( |
|
1576
|
|
- 'sort' => $field['id'], |
|
|
1576
|
+ 'sort' => $field[ 'id' ], |
|
1577
|
1577
|
'dir' => 'asc', |
|
1578
|
1578
|
); |
|
1579
|
1579
|
|
|
1580
|
|
- if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) { |
|
|
1580
|
+ if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) { |
|
1581
|
1581
|
//toggle sorting direction. |
|
1582
|
|
- if ( 'asc' === $sorting['direction'] ) { |
|
1583
|
|
- $sort_args['dir'] = 'desc'; |
|
|
1582
|
+ if ( 'asc' === $sorting[ 'direction' ] ) { |
|
|
1583
|
+ $sort_args[ 'dir' ] = 'desc'; |
|
1584
|
1584
|
$class .= ' gv-icon-sort-desc'; |
|
1585
|
1585
|
} else { |
|
1586
|
|
- $sort_args['dir'] = 'asc'; |
|
|
1586
|
+ $sort_args[ 'dir' ] = 'asc'; |
|
1587
|
1587
|
$class .= ' gv-icon-sort-asc'; |
|
1588
|
1588
|
} |
|
1589
|
1589
|
} else { |
|
1590
|
1590
|
$class .= ' gv-icon-caret-up-down'; |
|
1591
|
1591
|
} |
|
1592
|
1592
|
|
|
1593
|
|
- $url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) ); |
|
|
1593
|
+ $url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) ); |
|
1594
|
1594
|
|
|
1595
|
|
- return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a> '. $label; |
|
|
1595
|
+ return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a> ' . $label; |
|
1596
|
1596
|
|
|
1597
|
1597
|
} |
|
1598
|
1598
|
|
|
@@ -1610,7 +1610,7 @@ discard block |
|
|
block discarded – undo |
|
1610
|
1610
|
|
|
1611
|
1611
|
$field_type = $field_id; |
|
1612
|
1612
|
|
|
1613
|
|
- if( is_numeric( $field_id ) ) { |
|
|
1613
|
+ if ( is_numeric( $field_id ) ) { |
|
1614
|
1614
|
$field = GFFormsModel::get_field( $form, $field_id ); |
|
1615
|
1615
|
$field_type = $field ? $field->type : $field_id; |
|
1616
|
1616
|
} |
|
@@ -1633,7 +1633,7 @@ discard block |
|
|
block discarded – undo |
|
1633
|
1633
|
return false; |
|
1634
|
1634
|
} |
|
1635
|
1635
|
|
|
1636
|
|
- return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) ); |
|
|
1636
|
+ return apply_filters( "gravityview/sortable/formfield_{$form[ 'id' ]}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) ); |
|
1637
|
1637
|
|
|
1638
|
1638
|
} |
|
1639
|
1639
|
|