|
@@ -85,9 +85,9 @@ 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( 'parse_query', array( $this, 'parse_query_fix_frontpage' ), 10 ); |
|
90
|
|
- add_action( 'template_redirect', array( $this, 'set_entry_data'), 1 ); |
|
|
90
|
+ add_action( 'template_redirect', array( $this, 'set_entry_data' ), 1 ); |
|
91
|
91
|
|
|
92
|
92
|
// Enqueue scripts and styles after GravityView_Template::register_styles() |
|
93
|
93
|
add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 20 ); |
|
@@ -234,18 +234,18 @@ discard block |
|
|
block discarded – undo |
|
234
|
234
|
|
|
235
|
235
|
if ( ! empty( $view_id ) ) { |
|
236
|
236
|
|
|
237
|
|
- $this->context_view_id = (int) $view_id; |
|
|
237
|
+ $this->context_view_id = (int)$view_id; |
|
238
|
238
|
|
|
239
|
|
- } elseif ( isset( $_GET['gvid'] ) && $multiple_views ) { |
|
|
239
|
+ } elseif ( isset( $_GET[ 'gvid' ] ) && $multiple_views ) { |
|
240
|
240
|
/** |
|
241
|
241
|
* used on a has_multiple_views context |
|
242
|
242
|
* @see GravityView_API::entry_link |
|
243
|
243
|
*/ |
|
244
|
|
- $this->context_view_id = (int) $_GET['gvid']; |
|
|
244
|
+ $this->context_view_id = (int)$_GET[ 'gvid' ]; |
|
245
|
245
|
|
|
246
|
246
|
} elseif ( ! $multiple_views ) { |
|
247
|
247
|
$array_keys = array_keys( $this->getGvOutputData()->get_views() ); |
|
248
|
|
- $this->context_view_id = (int) array_pop( $array_keys ); |
|
|
248
|
+ $this->context_view_id = (int)array_pop( $array_keys ); |
|
249
|
249
|
unset( $array_keys ); |
|
250
|
250
|
} |
|
251
|
251
|
|
|
@@ -278,25 +278,25 @@ discard block |
|
|
block discarded – undo |
|
278
|
278
|
global $wp_rewrite; |
|
279
|
279
|
|
|
280
|
280
|
$is_front_page = ( $query->is_home || $query->is_page ); |
|
281
|
|
- $show_on_front = ( 'page' === get_option('show_on_front') ); |
|
282
|
|
- $front_page_id = get_option('page_on_front'); |
|
|
281
|
+ $show_on_front = ( 'page' === get_option( 'show_on_front' ) ); |
|
|
282
|
+ $front_page_id = get_option( 'page_on_front' ); |
|
283
|
283
|
|
|
284
|
|
- if ( $is_front_page && $show_on_front && $front_page_id ) { |
|
|
284
|
+ if ( $is_front_page && $show_on_front && $front_page_id ) { |
|
285
|
285
|
|
|
286
|
286
|
// Force to be an array, potentially a query string ( entry=16 ) |
|
287
|
287
|
$_query = wp_parse_args( $query->query ); |
|
288
|
288
|
|
|
289
|
289
|
// pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename. |
|
290
|
|
- if ( isset( $_query['pagename'] ) && '' === $_query['pagename'] ) { |
|
291
|
|
- unset( $_query['pagename'] ); |
|
|
290
|
+ if ( isset( $_query[ 'pagename' ] ) && '' === $_query[ 'pagename' ] ) { |
|
|
291
|
+ unset( $_query[ 'pagename' ] ); |
|
292
|
292
|
} |
|
293
|
293
|
|
|
294
|
294
|
// this is where will break from core wordpress |
|
295
|
295
|
/** @internal Don't use this filter; it will be unnecessary soon - it's just a patch for specific use case */ |
|
296
|
296
|
$ignore = apply_filters( 'gravityview/internal/ignored_endpoints', array( 'preview', 'page', 'paged', 'cpage' ), $query ); |
|
297
|
297
|
$endpoints = \GV\Utils::get( $wp_rewrite, 'endpoints' ); |
|
298
|
|
- foreach ( (array) $endpoints as $endpoint ) { |
|
299
|
|
- $ignore[] = $endpoint[1]; |
|
|
298
|
+ foreach ( (array)$endpoints as $endpoint ) { |
|
|
299
|
+ $ignore[ ] = $endpoint[ 1 ]; |
|
300
|
300
|
} |
|
301
|
301
|
unset( $endpoints ); |
|
302
|
302
|
|
|
@@ -306,21 +306,21 @@ discard block |
|
|
block discarded – undo |
|
306
|
306
|
// - The query includes keys that are associated with registered endpoints. `entry`, for example. |
|
307
|
307
|
if ( empty( $_query ) || ! array_diff( array_keys( $_query ), $ignore ) ) { |
|
308
|
308
|
|
|
309
|
|
- $qv =& $query->query_vars; |
|
|
309
|
+ $qv = & $query->query_vars; |
|
310
|
310
|
|
|
311
|
311
|
// Prevent redirect when on the single entry endpoint |
|
312
|
|
- if( self::is_single_entry() ) { |
|
|
312
|
+ if ( self::is_single_entry() ) { |
|
313
|
313
|
add_filter( 'redirect_canonical', '__return_false' ); |
|
314
|
314
|
} |
|
315
|
315
|
|
|
316
|
316
|
$query->is_page = true; |
|
317
|
317
|
$query->is_home = false; |
|
318
|
|
- $qv['page_id'] = $front_page_id; |
|
|
318
|
+ $qv[ 'page_id' ] = $front_page_id; |
|
319
|
319
|
|
|
320
|
320
|
// Correct <!--nextpage--> for page_on_front |
|
321
|
|
- if ( ! empty( $qv['paged'] ) ) { |
|
322
|
|
- $qv['page'] = $qv['paged']; |
|
323
|
|
- unset( $qv['paged'] ); |
|
|
321
|
+ if ( ! empty( $qv[ 'paged' ] ) ) { |
|
|
322
|
+ $qv[ 'page' ] = $qv[ 'paged' ]; |
|
|
323
|
+ unset( $qv[ 'paged' ] ); |
|
324
|
324
|
} |
|
325
|
325
|
} |
|
326
|
326
|
|
|
@@ -350,7 +350,7 @@ discard block |
|
|
block discarded – undo |
|
350
|
350
|
|
|
351
|
351
|
$this->setIsGravityviewPostType( get_post_type( $post ) === 'gravityview' ); |
|
352
|
352
|
|
|
353
|
|
- $post_id = $this->getPostId() ? $this->getPostId() : (isset( $post ) ? $post->ID : null ); |
|
|
353
|
+ $post_id = $this->getPostId() ? $this->getPostId() : ( isset( $post ) ? $post->ID : null ); |
|
354
|
354
|
$this->setPostId( $post_id ); |
|
355
|
355
|
$post_has_shortcode = ! empty( $post->post_content ) ? gravityview_has_shortcode_r( $post->post_content, 'gravityview' ) : false; |
|
356
|
356
|
$this->setPostHasShortcode( $this->isGravityviewPostType() ? null : ! empty( $post_has_shortcode ) ); |
|
@@ -386,7 +386,7 @@ discard block |
|
|
block discarded – undo |
|
386
|
386
|
|
|
387
|
387
|
$search_method = GravityView_Widget_Search::getInstance()->get_search_method(); |
|
388
|
388
|
|
|
389
|
|
- if( 'post' === $search_method ) { |
|
|
389
|
+ if ( 'post' === $search_method ) { |
|
390
|
390
|
$get = $_POST; |
|
391
|
391
|
} else { |
|
392
|
392
|
$get = $_GET; |
|
@@ -438,7 +438,7 @@ discard block |
|
|
block discarded – undo |
|
438
|
438
|
$gventry = gravityview()->request->is_entry(); |
|
439
|
439
|
|
|
440
|
440
|
// If this is the directory view, return. |
|
441
|
|
- if( ! $gventry ) { |
|
|
441
|
+ if ( ! $gventry ) { |
|
442
|
442
|
return $passed_title; |
|
443
|
443
|
} |
|
444
|
444
|
|
|
@@ -456,19 +456,19 @@ discard block |
|
|
block discarded – undo |
|
456
|
456
|
} |
|
457
|
457
|
|
|
458
|
458
|
// WooCommerce doesn't $post_id |
|
459
|
|
- if ( empty( $passed_post_id ) ) { |
|
|
459
|
+ if ( empty( $passed_post_id ) ) { |
|
460
|
460
|
return $passed_title; |
|
461
|
461
|
} |
|
462
|
462
|
|
|
463
|
463
|
// Don't modify the title for anything other than the current view/post. |
|
464
|
464
|
// This is true for embedded shortcodes and Views. |
|
465
|
|
- if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) { |
|
|
465
|
+ if ( is_object( $post ) && (int)$post->ID !== (int)$passed_post_id ) { |
|
466
|
466
|
return $passed_title; |
|
467
|
467
|
} |
|
468
|
468
|
|
|
469
|
469
|
$view = gravityview()->request->is_view(); |
|
470
|
470
|
|
|
471
|
|
- if( $view ) { |
|
|
471
|
+ if ( $view ) { |
|
472
|
472
|
return $this->_get_single_entry_title( $view, $entry, $passed_title ); |
|
473
|
473
|
} |
|
474
|
474
|
|
|
@@ -491,7 +491,7 @@ discard block |
|
|
block discarded – undo |
|
491
|
491
|
$view_collection = \GV\View_Collection::from_post( $post ); |
|
492
|
492
|
|
|
493
|
493
|
// We have multiple Views, but no gvid...this isn't valid security |
|
494
|
|
- if( 1 < $view_collection->count() ) { |
|
|
494
|
+ if ( 1 < $view_collection->count() ) { |
|
495
|
495
|
return $passed_title; |
|
496
|
496
|
} |
|
497
|
497
|
|
|
@@ -525,18 +525,18 @@ discard block |
|
|
block discarded – undo |
|
525
|
525
|
*/ |
|
526
|
526
|
$check_entry_display = apply_filters( 'gravityview/single/title/check_entry_display', true, $entry, $view ); |
|
527
|
527
|
|
|
528
|
|
- if( $check_entry_display ) { |
|
|
528
|
+ if ( $check_entry_display ) { |
|
529
|
529
|
|
|
530
|
530
|
$check_display = GVCommon::check_entry_display( $entry, $view ); |
|
531
|
531
|
|
|
532
|
|
- if( is_wp_error( $check_display ) ) { |
|
|
532
|
+ if ( is_wp_error( $check_display ) ) { |
|
533
|
533
|
return $passed_title; |
|
534
|
534
|
} |
|
535
|
535
|
} |
|
536
|
536
|
|
|
537
|
537
|
$title = $view->settings->get( 'single_title', $passed_title ); |
|
538
|
538
|
|
|
539
|
|
- $form = GVCommon::get_form( $entry['form_id'] ); |
|
|
539
|
+ $form = GVCommon::get_form( $entry[ 'form_id' ] ); |
|
540
|
540
|
|
|
541
|
541
|
// We are allowing HTML in the fields, so no escaping the output |
|
542
|
542
|
$title = GravityView_API::replace_variables( $title, $form, $entry ); |
|
@@ -607,7 +607,7 @@ discard block |
|
|
block discarded – undo |
|
607
|
607
|
|
|
608
|
608
|
$context = GravityView_View::getInstance()->getContext(); |
|
609
|
609
|
|
|
610
|
|
- switch( $context ) { |
|
|
610
|
+ switch ( $context ) { |
|
611
|
611
|
case 'directory': |
|
612
|
612
|
$tab = __( 'Multiple Entries', 'gravityview' ); |
|
613
|
613
|
break; |
|
@@ -621,12 +621,12 @@ discard block |
|
|
block discarded – undo |
|
621
|
621
|
} |
|
622
|
622
|
|
|
623
|
623
|
|
|
624
|
|
- $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 ); |
|
|
624
|
+ $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 ); |
|
625
|
625
|
$edit_link = admin_url( sprintf( 'post.php?post=%d&action=edit#%s-view', $view_id, $context ) ); |
|
626
|
|
- $action_text = sprintf( esc_html__('Add fields to %s', 'gravityview' ), $tab ); |
|
|
626
|
+ $action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab ); |
|
627
|
627
|
$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' ); |
|
628
|
628
|
|
|
629
|
|
- $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 ) ) ); |
|
|
629
|
+ $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 ) ) ); |
|
630
|
630
|
$output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message ); |
|
631
|
631
|
|
|
632
|
632
|
echo GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $view_id ); |
|
@@ -673,7 +673,7 @@ discard block |
|
|
block discarded – undo |
|
673
|
673
|
$direct_access = apply_filters( 'gravityview_direct_access', true, $view->ID ); |
|
674
|
674
|
$embed_only = $view->settings->get( 'embed_only' ); |
|
675
|
675
|
|
|
676
|
|
- if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) { |
|
|
676
|
+ if ( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) { |
|
677
|
677
|
return __( 'You are not allowed to view this content.', 'gravityview' ); |
|
678
|
678
|
} |
|
679
|
679
|
|
|
@@ -708,7 +708,7 @@ discard block |
|
|
block discarded – undo |
|
708
|
708
|
if ( ! empty( $args[ $key ] ) ) { |
|
709
|
709
|
|
|
710
|
710
|
// Get a timestamp and see if it's a valid date format |
|
711
|
|
- $date = GFCommon::get_gmt_timestamp( strtotime($args[$key]) ); |
|
|
711
|
+ $date = GFCommon::get_gmt_timestamp( strtotime( $args[ $key ] ) ); |
|
712
|
712
|
|
|
713
|
713
|
// The date was invalid |
|
714
|
714
|
if ( empty( $date ) ) { |
|
@@ -720,9 +720,9 @@ discard block |
|
|
block discarded – undo |
|
720
|
720
|
$datetime_format = 'Y-m-d H:i:s'; |
|
721
|
721
|
$search_is_outside_view_bounds = false; |
|
722
|
722
|
|
|
723
|
|
- if( ! empty( $search_criteria[ $key ] ) ) { |
|
|
723
|
+ if ( ! empty( $search_criteria[ $key ] ) ) { |
|
724
|
724
|
|
|
725
|
|
- $search_date = GFCommon::get_gmt_timestamp( strtotime( $search_criteria[ $key ] )); |
|
|
725
|
+ $search_date = GFCommon::get_gmt_timestamp( strtotime( $search_criteria[ $key ] ) ); |
|
726
|
726
|
|
|
727
|
727
|
// The search is for entries before the start date defined by the settings |
|
728
|
728
|
switch ( $key ) { |
|
@@ -748,14 +748,14 @@ discard block |
|
|
block discarded – undo |
|
748
|
748
|
if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) { |
|
749
|
749
|
|
|
750
|
750
|
// Then we override the search and re-set the start date |
|
751
|
|
- $return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true ); |
|
|
751
|
+ $return_search_criteria[ $key ] = date_i18n( $datetime_format, $date, true ); |
|
752
|
752
|
} |
|
753
|
753
|
} |
|
754
|
754
|
} |
|
755
|
755
|
|
|
756
|
|
- if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) { |
|
|
756
|
+ if ( isset( $return_search_criteria[ 'start_date' ] ) && isset( $return_search_criteria[ 'end_date' ] ) ) { |
|
757
|
757
|
// The start date is AFTER the end date. This will result in no results, but let's not force the issue. |
|
758
|
|
- if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) { |
|
|
758
|
+ if ( strtotime( $return_search_criteria[ 'start_date' ] ) > strtotime( $return_search_criteria[ 'end_date' ] ) ) { |
|
759
|
759
|
gravityview()->log->error( 'Invalid search: the start date is after the end date.', array( 'data' => $return_search_criteria ) ); |
|
760
|
760
|
} |
|
761
|
761
|
} |
|
@@ -774,19 +774,19 @@ discard block |
|
|
block discarded – undo |
|
774
|
774
|
public static function process_search_only_approved( $args, $search_criteria ) { |
|
775
|
775
|
|
|
776
|
776
|
/** @since 1.19 */ |
|
777
|
|
- if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) { |
|
|
777
|
+ if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) { |
|
778
|
778
|
gravityview()->log->debug( 'User can moderate entries; showing all approval statuses' ); |
|
779
|
779
|
return $search_criteria; |
|
780
|
780
|
} |
|
781
|
781
|
|
|
782
|
|
- if ( ! empty( $args['show_only_approved'] ) ) { |
|
|
782
|
+ if ( ! empty( $args[ 'show_only_approved' ] ) ) { |
|
783
|
783
|
|
|
784
|
|
- $search_criteria['field_filters'][] = array( |
|
|
784
|
+ $search_criteria[ 'field_filters' ][ ] = array( |
|
785
|
785
|
'key' => GravityView_Entry_Approval::meta_key, |
|
786
|
786
|
'value' => GravityView_Entry_Approval_Status::APPROVED |
|
787
|
787
|
); |
|
788
|
788
|
|
|
789
|
|
- $search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met |
|
|
789
|
+ $search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; // force all the criterias to be met |
|
790
|
790
|
|
|
791
|
791
|
gravityview()->log->debug( '[process_search_only_approved] Search Criteria if show only approved: ', array( 'data' => $search_criteria ) ); |
|
792
|
792
|
} |
|
@@ -813,18 +813,18 @@ discard block |
|
|
block discarded – undo |
|
813
|
813
|
*/ |
|
814
|
814
|
public static function is_entry_approved( $entry, $args = array() ) { |
|
815
|
815
|
|
|
816
|
|
- if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) { |
|
|
816
|
+ if ( empty( $entry[ 'id' ] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args[ 'show_only_approved' ] ) ) { |
|
817
|
817
|
// is implicitly approved if entry is null or View settings doesn't require to check for approval |
|
818
|
818
|
return true; |
|
819
|
819
|
} |
|
820
|
820
|
|
|
821
|
821
|
/** @since 1.19 */ |
|
822
|
|
- if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) { |
|
|
822
|
+ if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) { |
|
823
|
823
|
gravityview()->log->debug( 'User can moderate entries, so entry is approved for viewing' ); |
|
824
|
824
|
return true; |
|
825
|
825
|
} |
|
826
|
826
|
|
|
827
|
|
- $is_approved = gform_get_meta( $entry['id'], GravityView_Entry_Approval::meta_key ); |
|
|
827
|
+ $is_approved = gform_get_meta( $entry[ 'id' ], GravityView_Entry_Approval::meta_key ); |
|
828
|
828
|
|
|
829
|
829
|
return GravityView_Entry_Approval_Status::is_approved( $is_approved ); |
|
830
|
830
|
} |
|
@@ -848,7 +848,7 @@ discard block |
|
|
block discarded – undo |
|
848
|
848
|
* Compatibility with filters hooking in `gravityview_search_criteria` instead of `gravityview_fe_search_criteria`. |
|
849
|
849
|
*/ |
|
850
|
850
|
$criteria = apply_filters( 'gravityview_search_criteria', array(), array( $form_id ), \GV\Utils::get( $args, 'id' ) ); |
|
851
|
|
- $search_criteria = isset( $criteria['search_criteria'] ) ? $criteria['search_criteria'] : array( 'field_filters' => array() ); |
|
|
851
|
+ $search_criteria = isset( $criteria[ 'search_criteria' ] ) ? $criteria[ 'search_criteria' ] : array( 'field_filters' => array() ); |
|
852
|
852
|
|
|
853
|
853
|
/** |
|
854
|
854
|
* @filter `gravityview_fe_search_criteria` Modify the search criteria |
|
@@ -868,29 +868,29 @@ discard block |
|
|
block discarded – undo |
|
868
|
868
|
gravityview()->log->debug( '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', array( 'data' =>$search_criteria ) ); |
|
869
|
869
|
|
|
870
|
870
|
// implicity search |
|
871
|
|
- if ( ! empty( $args['search_value'] ) ) { |
|
|
871
|
+ if ( ! empty( $args[ 'search_value' ] ) ) { |
|
872
|
872
|
|
|
873
|
873
|
// Search operator options. Options: `is` or `contains` |
|
874
|
|
- $operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains'; |
|
|
874
|
+ $operator = ! empty( $args[ 'search_operator' ] ) && in_array( $args[ 'search_operator' ], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args[ 'search_operator' ] : 'contains'; |
|
875
|
875
|
|
|
876
|
|
- $search_criteria['field_filters'][] = array( |
|
|
876
|
+ $search_criteria[ 'field_filters' ][ ] = array( |
|
877
|
877
|
'key' => \GV\Utils::_GET( 'search_field', \GV\Utils::get( $args, 'search_field' ) ), // The field ID to search |
|
878
|
|
- 'value' => _wp_specialchars( $args['search_value'] ), // The value to search. Encode ampersands but not quotes. |
|
|
878
|
+ 'value' => _wp_specialchars( $args[ 'search_value' ] ), // The value to search. Encode ampersands but not quotes. |
|
879
|
879
|
'operator' => $operator, |
|
880
|
880
|
); |
|
881
|
881
|
|
|
882
|
882
|
// Lock search mode to "all" with implicit presearch filter. |
|
883
|
|
- $search_criteria['field_filters']['mode'] = 'all'; |
|
|
883
|
+ $search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; |
|
884
|
884
|
} |
|
885
|
885
|
|
|
886
|
|
- if( $search_criteria !== $original_search_criteria ) { |
|
|
886
|
+ if ( $search_criteria !== $original_search_criteria ) { |
|
887
|
887
|
gravityview()->log->debug( '[get_search_criteria] Search Criteria after implicity search: ', array( 'data' => $search_criteria ) ); |
|
888
|
888
|
} |
|
889
|
889
|
|
|
890
|
890
|
// Handle setting date range |
|
891
|
891
|
$search_criteria = self::process_search_dates( $args, $search_criteria ); |
|
892
|
892
|
|
|
893
|
|
- if( $search_criteria !== $original_search_criteria ) { |
|
|
893
|
+ if ( $search_criteria !== $original_search_criteria ) { |
|
894
|
894
|
gravityview()->log->debug( '[get_search_criteria] Search Criteria after date params: ', array( 'data' => $search_criteria ) ); |
|
895
|
895
|
} |
|
896
|
896
|
|
|
@@ -901,7 +901,7 @@ discard block |
|
|
block discarded – undo |
|
901
|
901
|
* @filter `gravityview_status` Modify entry status requirements to be included in search results. |
|
902
|
902
|
* @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash` |
|
903
|
903
|
*/ |
|
904
|
|
- $search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args ); |
|
|
904
|
+ $search_criteria[ 'status' ] = apply_filters( 'gravityview_status', 'active', $args ); |
|
905
|
905
|
|
|
906
|
906
|
return $search_criteria; |
|
907
|
907
|
} |
|
@@ -1013,7 +1013,7 @@ discard block |
|
|
block discarded – undo |
|
1013
|
1013
|
'search_criteria' => $search_criteria, |
|
1014
|
1014
|
'sorting' => self::updateViewSorting( $args, $form_id ), |
|
1015
|
1015
|
'paging' => $paging, |
|
1016
|
|
- 'cache' => isset( $args['cache'] ) ? $args['cache'] : true, |
|
|
1016
|
+ 'cache' => isset( $args[ 'cache' ] ) ? $args[ 'cache' ] : true, |
|
1017
|
1017
|
); |
|
1018
|
1018
|
|
|
1019
|
1019
|
/** |
|
@@ -1038,7 +1038,7 @@ discard block |
|
|
block discarded – undo |
|
1038
|
1038
|
* @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys. |
|
1039
|
1039
|
* @param array $args View configuration args. |
|
1040
|
1040
|
*/ |
|
1041
|
|
- $parameters = apply_filters( 'gravityview_get_entries_'.\GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id ); |
|
|
1041
|
+ $parameters = apply_filters( 'gravityview_get_entries_' . \GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id ); |
|
1042
|
1042
|
|
|
1043
|
1043
|
gravityview()->log->debug( '$parameters passed to gravityview_get_entries(): ', array( 'data' => $parameters ) ); |
|
1044
|
1044
|
|
|
@@ -1063,17 +1063,17 @@ discard block |
|
|
block discarded – undo |
|
1063
|
1063
|
$default_page_size = apply_filters( 'gravityview_default_page_size', 25 ); |
|
1064
|
1064
|
|
|
1065
|
1065
|
// Paging & offset |
|
1066
|
|
- $page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : $default_page_size; |
|
|
1066
|
+ $page_size = ! empty( $args[ 'page_size' ] ) ? intval( $args[ 'page_size' ] ) : $default_page_size; |
|
1067
|
1067
|
|
|
1068
|
1068
|
if ( -1 === $page_size ) { |
|
1069
|
1069
|
$page_size = PHP_INT_MAX; |
|
1070
|
1070
|
} |
|
1071
|
1071
|
|
|
1072
|
|
- $curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] ); |
|
|
1072
|
+ $curr_page = empty( $_GET[ 'pagenum' ] ) ? 1 : intval( $_GET[ 'pagenum' ] ); |
|
1073
|
1073
|
$offset = ( $curr_page - 1 ) * $page_size; |
|
1074
|
1074
|
|
|
1075
|
|
- if ( ! empty( $args['offset'] ) ) { |
|
1076
|
|
- $offset += intval( $args['offset'] ); |
|
|
1075
|
+ if ( ! empty( $args[ 'offset' ] ) ) { |
|
|
1076
|
+ $offset += intval( $args[ 'offset' ] ); |
|
1077
|
1077
|
} |
|
1078
|
1078
|
|
|
1079
|
1079
|
$paging = array( |
|
@@ -1098,11 +1098,11 @@ discard block |
|
|
block discarded – undo |
|
1098
|
1098
|
public static function updateViewSorting( $args, $form_id ) { |
|
1099
|
1099
|
$sorting = array(); |
|
1100
|
1100
|
|
|
1101
|
|
- $has_values = isset( $_GET['sort'] ); |
|
|
1101
|
+ $has_values = isset( $_GET[ 'sort' ] ); |
|
1102
|
1102
|
|
|
1103
|
|
- if ( $has_values && is_array( $_GET['sort'] ) ) { |
|
1104
|
|
- $sorts = array_keys( $_GET['sort'] ); |
|
1105
|
|
- $dirs = array_values( $_GET['sort'] ); |
|
|
1103
|
+ if ( $has_values && is_array( $_GET[ 'sort' ] ) ) { |
|
|
1104
|
+ $sorts = array_keys( $_GET[ 'sort' ] ); |
|
|
1105
|
+ $dirs = array_values( $_GET[ 'sort' ] ); |
|
1106
|
1106
|
|
|
1107
|
1107
|
if ( $has_values = array_filter( $dirs ) ) { |
|
1108
|
1108
|
$sort_field_id = end( $sorts ); |
|
@@ -1111,11 +1111,11 @@ discard block |
|
|
block discarded – undo |
|
1111
|
1111
|
} |
|
1112
|
1112
|
|
|
1113
|
1113
|
if ( ! isset( $sort_field_id ) ) { |
|
1114
|
|
- $sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : \GV\Utils::get( $args, 'sort_field' ); |
|
|
1114
|
+ $sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : \GV\Utils::get( $args, 'sort_field' ); |
|
1115
|
1115
|
} |
|
1116
|
1116
|
|
|
1117
|
1117
|
if ( ! isset( $sort_direction ) ) { |
|
1118
|
|
- $sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : \GV\Utils::get( $args, 'sort_direction' ); |
|
|
1118
|
+ $sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : \GV\Utils::get( $args, 'sort_direction' ); |
|
1119
|
1119
|
} |
|
1120
|
1120
|
|
|
1121
|
1121
|
if ( is_array( $sort_field_id ) ) { |
|
@@ -1147,10 +1147,10 @@ discard block |
|
|
block discarded – undo |
|
1147
|
1147
|
$form = GFAPI::get_form( $form_id ); |
|
1148
|
1148
|
|
|
1149
|
1149
|
// Get the first GF_Field field ID, set as the key for entry randomization |
|
1150
|
|
- if ( ! empty( $form['fields'] ) ) { |
|
|
1150
|
+ if ( ! empty( $form[ 'fields' ] ) ) { |
|
1151
|
1151
|
|
|
1152
|
1152
|
/** @var GF_Field $field */ |
|
1153
|
|
- foreach ( $form['fields'] as $field ) { |
|
|
1153
|
+ foreach ( $form[ 'fields' ] as $field ) { |
|
1154
|
1154
|
if ( ! is_a( $field, 'GF_Field' ) ) { |
|
1155
|
1155
|
continue; |
|
1156
|
1156
|
} |
|
@@ -1195,7 +1195,7 @@ discard block |
|
|
block discarded – undo |
|
1195
|
1195
|
if ( is_array( $sort_field_id ) ) { |
|
1196
|
1196
|
$modified_ids = array(); |
|
1197
|
1197
|
foreach ( $sort_field_id as $_sort_field_id ) { |
|
1198
|
|
- $modified_ids []= self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id ); |
|
|
1198
|
+ $modified_ids [ ] = self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id ); |
|
1199
|
1199
|
} |
|
1200
|
1200
|
return $modified_ids; |
|
1201
|
1201
|
} |
|
@@ -1204,11 +1204,11 @@ discard block |
|
|
block discarded – undo |
|
1204
|
1204
|
|
|
1205
|
1205
|
$sort_field = GFFormsModel::get_field( $form, $sort_field_id ); |
|
1206
|
1206
|
|
|
1207
|
|
- if( ! $sort_field ) { |
|
|
1207
|
+ if ( ! $sort_field ) { |
|
1208
|
1208
|
return $sort_field_id; |
|
1209
|
1209
|
} |
|
1210
|
1210
|
|
|
1211
|
|
- switch ( $sort_field['type'] ) { |
|
|
1211
|
+ switch ( $sort_field[ 'type' ] ) { |
|
1212
|
1212
|
|
|
1213
|
1213
|
case 'address': |
|
1214
|
1214
|
// Sorting by full address |
|
@@ -1225,7 +1225,7 @@ discard block |
|
|
block discarded – undo |
|
1225
|
1225
|
*/ |
|
1226
|
1226
|
$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id ); |
|
1227
|
1227
|
|
|
1228
|
|
- switch( strtolower( $address_part ) ){ |
|
|
1228
|
+ switch ( strtolower( $address_part ) ) { |
|
1229
|
1229
|
case 'street': |
|
1230
|
1230
|
$sort_field_id .= '.1'; |
|
1231
|
1231
|
break; |
|
@@ -1298,7 +1298,7 @@ discard block |
|
|
block discarded – undo |
|
1298
|
1298
|
if ( ! class_exists( '\GV\Entry' ) ) { |
|
1299
|
1299
|
|
|
1300
|
1300
|
// Not using gravityview()->log->error(), since that may not exist yet either! |
|
1301
|
|
- do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary() ); |
|
|
1301
|
+ do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary() ); |
|
1302
|
1302
|
|
|
1303
|
1303
|
return null; |
|
1304
|
1304
|
} |
|
@@ -1315,7 +1315,7 @@ discard block |
|
|
block discarded – undo |
|
1315
|
1315
|
*/ |
|
1316
|
1316
|
$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry ); |
|
1317
|
1317
|
|
|
1318
|
|
- if ( empty( $single_entry ) ){ |
|
|
1318
|
+ if ( empty( $single_entry ) ) { |
|
1319
|
1319
|
return false; |
|
1320
|
1320
|
} else { |
|
1321
|
1321
|
return $single_entry; |
|
@@ -1336,7 +1336,7 @@ discard block |
|
|
block discarded – undo |
|
1336
|
1336
|
$views = $this->getGvOutputData()->get_views(); |
|
1337
|
1337
|
|
|
1338
|
1338
|
foreach ( $views as $view_id => $data ) { |
|
1339
|
|
- $view = \GV\View::by_id( $data['id'] ); |
|
|
1339
|
+ $view = \GV\View::by_id( $data[ 'id' ] ); |
|
1340
|
1340
|
$view_id = $view->ID; |
|
1341
|
1341
|
$template_id = gravityview_get_template_id( $view->ID ); |
|
1342
|
1342
|
$data = $view->as_data(); |
|
@@ -1345,7 +1345,7 @@ discard block |
|
|
block discarded – undo |
|
1345
|
1345
|
* Don't enqueue the scripts or styles if it's not going to be displayed. |
|
1346
|
1346
|
* @since 1.15 |
|
1347
|
1347
|
*/ |
|
1348
|
|
- if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) { |
|
|
1348
|
+ if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) { |
|
1349
|
1349
|
continue; |
|
1350
|
1350
|
} |
|
1351
|
1351
|
|
|
@@ -1378,7 +1378,7 @@ discard block |
|
|
block discarded – undo |
|
1378
|
1378
|
* @param \GV\View The View. |
|
1379
|
1379
|
*/ |
|
1380
|
1380
|
apply_filters( 'gravityview_lightbox_script', $js_dependency, $view ); |
|
1381
|
|
- $js_dependencies[] = $js_dependency; |
|
|
1381
|
+ $js_dependencies[ ] = $js_dependency; |
|
1382
|
1382
|
|
|
1383
|
1383
|
if ( ! empty( $wp_filter[ 'gravity_view_lightbox_style' ] ) ) { |
|
1384
|
1384
|
gravityview()->log->warning( 'gravity_view_lightbox_style filter is deprecated use gravityview_lightbox_style instead' ); |
|
@@ -1398,7 +1398,7 @@ discard block |
|
|
block discarded – undo |
|
1398
|
1398
|
* @param \GV\View The View. |
|
1399
|
1399
|
*/ |
|
1400
|
1400
|
$css_dependency = apply_filters( 'gravityview_lightbox_style', $css_dependency, $view ); |
|
1401
|
|
- $css_dependencies[] = $css_dependency; |
|
|
1401
|
+ $css_dependencies[ ] = $css_dependency; |
|
1402
|
1402
|
} |
|
1403
|
1403
|
|
|
1404
|
1404
|
/** |
|
@@ -1406,19 +1406,19 @@ discard block |
|
|
block discarded – undo |
|
1406
|
1406
|
* @see https://github.com/katzwebservices/GravityView/issues/536 |
|
1407
|
1407
|
* @since 1.15 |
|
1408
|
1408
|
*/ |
|
1409
|
|
- if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) { |
|
1410
|
|
- $css_dependencies[] = 'dashicons'; |
|
|
1409
|
+ if ( gravityview_view_has_single_checkbox_or_radio( $data[ 'form' ], $data[ 'fields' ] ) ) { |
|
|
1410
|
+ $css_dependencies[ ] = 'dashicons'; |
|
1411
|
1411
|
} |
|
1412
|
1412
|
|
|
1413
|
1413
|
wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true ); |
|
1414
|
1414
|
|
|
1415
|
1415
|
$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
|
1416
|
1416
|
|
|
1417
|
|
- 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 ); |
|
|
1417
|
+ 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 ); |
|
1418
|
1418
|
|
|
1419
|
1419
|
wp_enqueue_script( 'gravityview-fe-view' ); |
|
1420
|
1420
|
|
|
1421
|
|
- if ( ! empty( $data['atts']['sort_columns'] ) ) { |
|
|
1421
|
+ if ( ! empty( $data[ 'atts' ][ 'sort_columns' ] ) ) { |
|
1422
|
1422
|
wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' ); |
|
1423
|
1423
|
} |
|
1424
|
1424
|
|
|
@@ -1481,7 +1481,7 @@ discard block |
|
|
block discarded – undo |
|
1481
|
1481
|
public static function add_style( $template_id ) { |
|
1482
|
1482
|
|
|
1483
|
1483
|
if ( ! empty( $template_id ) && wp_style_is( 'gravityview_style_' . $template_id, 'registered' ) ) { |
|
1484
|
|
- gravityview()->log->debug( 'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) ); |
|
|
1484
|
+ gravityview()->log->debug( 'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) ); |
|
1485
|
1485
|
wp_enqueue_style( 'gravityview_style_' . $template_id ); |
|
1486
|
1486
|
} elseif ( empty( $template_id ) ) { |
|
1487
|
1487
|
gravityview()->log->error( 'Cannot add template style; template_id is empty' ); |
|
@@ -1512,11 +1512,11 @@ discard block |
|
|
block discarded – undo |
|
1512
|
1512
|
* Not a table-based template; don't add sort icons |
|
1513
|
1513
|
* @since 1.12 |
|
1514
|
1514
|
*/ |
|
1515
|
|
- if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) { |
|
|
1515
|
+ if ( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) { |
|
1516
|
1516
|
return $label; |
|
1517
|
1517
|
} |
|
1518
|
1518
|
|
|
1519
|
|
- if ( ! $this->is_field_sortable( $field['id'], $form ) ) { |
|
|
1519
|
+ if ( ! $this->is_field_sortable( $field[ 'id' ], $form ) ) { |
|
1520
|
1520
|
return $label; |
|
1521
|
1521
|
} |
|
1522
|
1522
|
|
|
@@ -1524,29 +1524,29 @@ discard block |
|
|
block discarded – undo |
|
1524
|
1524
|
|
|
1525
|
1525
|
$class = 'gv-sort'; |
|
1526
|
1526
|
|
|
1527
|
|
- $sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] ); |
|
|
1527
|
+ $sort_field_id = self::_override_sorting_id_by_field_type( $field[ 'id' ], $form[ 'id' ] ); |
|
1528
|
1528
|
|
|
1529
|
1529
|
$sort_args = array( |
|
1530
|
|
- 'sort' => $field['id'], |
|
|
1530
|
+ 'sort' => $field[ 'id' ], |
|
1531
|
1531
|
'dir' => 'asc', |
|
1532
|
1532
|
); |
|
1533
|
1533
|
|
|
1534
|
|
- if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) { |
|
|
1534
|
+ if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) { |
|
1535
|
1535
|
//toggle sorting direction. |
|
1536
|
|
- if ( 'asc' === $sorting['direction'] ) { |
|
1537
|
|
- $sort_args['dir'] = 'desc'; |
|
|
1536
|
+ if ( 'asc' === $sorting[ 'direction' ] ) { |
|
|
1537
|
+ $sort_args[ 'dir' ] = 'desc'; |
|
1538
|
1538
|
$class .= ' gv-icon-sort-desc'; |
|
1539
|
1539
|
} else { |
|
1540
|
|
- $sort_args['dir'] = 'asc'; |
|
|
1540
|
+ $sort_args[ 'dir' ] = 'asc'; |
|
1541
|
1541
|
$class .= ' gv-icon-sort-asc'; |
|
1542
|
1542
|
} |
|
1543
|
1543
|
} else { |
|
1544
|
1544
|
$class .= ' gv-icon-caret-up-down'; |
|
1545
|
1545
|
} |
|
1546
|
1546
|
|
|
1547
|
|
- $url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) ); |
|
|
1547
|
+ $url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) ); |
|
1548
|
1548
|
|
|
1549
|
|
- return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a> '. $label; |
|
|
1549
|
+ return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a> ' . $label; |
|
1550
|
1550
|
|
|
1551
|
1551
|
} |
|
1552
|
1552
|
|
|
@@ -1564,7 +1564,7 @@ discard block |
|
|
block discarded – undo |
|
1564
|
1564
|
|
|
1565
|
1565
|
$field_type = $field_id; |
|
1566
|
1566
|
|
|
1567
|
|
- if( is_numeric( $field_id ) ) { |
|
|
1567
|
+ if ( is_numeric( $field_id ) ) { |
|
1568
|
1568
|
$field = GFFormsModel::get_field( $form, $field_id ); |
|
1569
|
1569
|
$field_type = $field ? $field->type : $field_id; |
|
1570
|
1570
|
} |
|
@@ -1587,7 +1587,7 @@ discard block |
|
|
block discarded – undo |
|
1587
|
1587
|
return false; |
|
1588
|
1588
|
} |
|
1589
|
1589
|
|
|
1590
|
|
- return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) ); |
|
|
1590
|
+ return apply_filters( "gravityview/sortable/formfield_{$form[ 'id' ]}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) ); |
|
1591
|
1591
|
|
|
1592
|
1592
|
} |
|
1593
|
1593
|
|