|
@@ -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 ); |
|
@@ -236,12 +236,12 @@ discard block |
|
|
block discarded – undo |
|
236
|
236
|
|
|
237
|
237
|
$this->context_view_id = $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 = $_GET['gvid']; |
|
|
244
|
+ $this->context_view_id = $_GET[ 'gvid' ]; |
|
245
|
245
|
|
|
246
|
246
|
} elseif ( ! $multiple_views ) { |
|
247
|
247
|
$array_keys = array_keys( $this->getGvOutputData()->get_views() ); |
|
@@ -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; |
|
@@ -443,20 +443,20 @@ discard block |
|
|
block discarded – undo |
|
443
|
443
|
* @param boolean $in_the_loop Whether to apply the filter to the menu title and the meta tag <title> - outside the loop |
|
444
|
444
|
* @param array $entry Current entry |
|
445
|
445
|
*/ |
|
446
|
|
- $apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop' , in_the_loop(), $entry ); |
|
|
446
|
+ $apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop', in_the_loop(), $entry ); |
|
447
|
447
|
|
|
448
|
448
|
if ( ! $apply_outside_loop ) { |
|
449
|
449
|
return $title; |
|
450
|
450
|
} |
|
451
|
451
|
|
|
452
|
452
|
// User reported WooCommerce doesn't pass two args. |
|
453
|
|
- if ( empty( $passed_post_id ) ) { |
|
|
453
|
+ if ( empty( $passed_post_id ) ) { |
|
454
|
454
|
return $title; |
|
455
|
455
|
} |
|
456
|
456
|
|
|
457
|
457
|
// Don't modify the title for anything other than the current view/post. |
|
458
|
458
|
// This is true for embedded shortcodes and Views. |
|
459
|
|
- if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) { |
|
|
459
|
+ if ( is_object( $post ) && (int)$post->ID !== (int)$passed_post_id ) { |
|
460
|
460
|
return $title; |
|
461
|
461
|
} |
|
462
|
462
|
|
|
@@ -468,7 +468,7 @@ discard block |
|
|
block discarded – undo |
|
468
|
468
|
$view_meta = $this->getGvOutputData()->get_view( $context_view_id ); |
|
469
|
469
|
} else { |
|
470
|
470
|
foreach ( $this->getGvOutputData()->get_views() as $view_id => $view_data ) { |
|
471
|
|
- if ( intval( $view_data['form_id'] ) === intval( $entry['form_id'] ) ) { |
|
|
471
|
+ if ( intval( $view_data[ 'form_id' ] ) === intval( $entry[ 'form_id' ] ) ) { |
|
472
|
472
|
$view_meta = $view_data; |
|
473
|
473
|
break; |
|
474
|
474
|
} |
|
@@ -476,12 +476,12 @@ discard block |
|
|
block discarded – undo |
|
476
|
476
|
} |
|
477
|
477
|
|
|
478
|
478
|
/** Deprecated stuff in the future. See the branch above. */ |
|
479
|
|
- if ( ! empty( $view_meta['atts']['single_title'] ) ) { |
|
|
479
|
+ if ( ! empty( $view_meta[ 'atts' ][ 'single_title' ] ) ) { |
|
480
|
480
|
|
|
481
|
|
- $title = $view_meta['atts']['single_title']; |
|
|
481
|
+ $title = $view_meta[ 'atts' ][ 'single_title' ]; |
|
482
|
482
|
|
|
483
|
483
|
// We are allowing HTML in the fields, so no escaping the output |
|
484
|
|
- $title = GravityView_API::replace_variables( $title, $view_meta['form'], $entry ); |
|
|
484
|
+ $title = GravityView_API::replace_variables( $title, $view_meta[ 'form' ], $entry ); |
|
485
|
485
|
|
|
486
|
486
|
$title = do_shortcode( $title ); |
|
487
|
487
|
} |
|
@@ -552,7 +552,7 @@ discard block |
|
|
block discarded – undo |
|
552
|
552
|
|
|
553
|
553
|
$context = GravityView_View::getInstance()->getContext(); |
|
554
|
554
|
|
|
555
|
|
- switch( $context ) { |
|
|
555
|
+ switch ( $context ) { |
|
556
|
556
|
case 'directory': |
|
557
|
557
|
$tab = __( 'Multiple Entries', 'gravityview' ); |
|
558
|
558
|
break; |
|
@@ -566,12 +566,12 @@ discard block |
|
|
block discarded – undo |
|
566
|
566
|
} |
|
567
|
567
|
|
|
568
|
568
|
|
|
569
|
|
- $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 ); |
|
|
569
|
+ $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 ); |
|
570
|
570
|
$edit_link = admin_url( sprintf( 'post.php?post=%d&action=edit#%s-view', $view_id, $context ) ); |
|
571
|
|
- $action_text = sprintf( esc_html__('Add fields to %s', 'gravityview' ), $tab ); |
|
|
571
|
+ $action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab ); |
|
572
|
572
|
$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' ); |
|
573
|
573
|
|
|
574
|
|
- $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 ) ) ); |
|
|
574
|
+ $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 ) ) ); |
|
575
|
575
|
$output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message ); |
|
576
|
576
|
|
|
577
|
577
|
echo GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $view_id ); |
|
@@ -619,7 +619,7 @@ discard block |
|
|
block discarded – undo |
|
619
|
619
|
$direct_access = apply_filters( 'gravityview_direct_access', true, $view->ID ); |
|
620
|
620
|
$embed_only = $view->settings->get( 'embed_only' ); |
|
621
|
621
|
|
|
622
|
|
- if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) { |
|
|
622
|
+ if ( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) { |
|
623
|
623
|
return __( 'You are not allowed to view this content.', 'gravityview' ); |
|
624
|
624
|
} |
|
625
|
625
|
|
|
@@ -666,7 +666,7 @@ discard block |
|
|
block discarded – undo |
|
666
|
666
|
$datetime_format = 'Y-m-d H:i:s'; |
|
667
|
667
|
$search_is_outside_view_bounds = false; |
|
668
|
668
|
|
|
669
|
|
- if( ! empty( $search_criteria[ $key ] ) ) { |
|
|
669
|
+ if ( ! empty( $search_criteria[ $key ] ) ) { |
|
670
|
670
|
|
|
671
|
671
|
$search_date = strtotime( $search_criteria[ $key ] ); |
|
672
|
672
|
|
|
@@ -694,14 +694,14 @@ discard block |
|
|
block discarded – undo |
|
694
|
694
|
if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) { |
|
695
|
695
|
|
|
696
|
696
|
// Then we override the search and re-set the start date |
|
697
|
|
- $return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true ); |
|
|
697
|
+ $return_search_criteria[ $key ] = date_i18n( $datetime_format, $date, true ); |
|
698
|
698
|
} |
|
699
|
699
|
} |
|
700
|
700
|
} |
|
701
|
701
|
|
|
702
|
|
- if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) { |
|
|
702
|
+ if ( isset( $return_search_criteria[ 'start_date' ] ) && isset( $return_search_criteria[ 'end_date' ] ) ) { |
|
703
|
703
|
// The start date is AFTER the end date. This will result in no results, but let's not force the issue. |
|
704
|
|
- if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) { |
|
|
704
|
+ if ( strtotime( $return_search_criteria[ 'start_date' ] ) > strtotime( $return_search_criteria[ 'end_date' ] ) ) { |
|
705
|
705
|
gravityview()->log->error( 'Invalid search: the start date is after the end date.', array( 'data' => $return_search_criteria ) ); |
|
706
|
706
|
} |
|
707
|
707
|
} |
|
@@ -720,19 +720,19 @@ discard block |
|
|
block discarded – undo |
|
720
|
720
|
public static function process_search_only_approved( $args, $search_criteria ) { |
|
721
|
721
|
|
|
722
|
722
|
/** @since 1.19 */ |
|
723
|
|
- if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) { |
|
|
723
|
+ if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) { |
|
724
|
724
|
gravityview()->log->debug( 'User can moderate entries; showing all approval statuses' ); |
|
725
|
725
|
return $search_criteria; |
|
726
|
726
|
} |
|
727
|
727
|
|
|
728
|
|
- if ( ! empty( $args['show_only_approved'] ) ) { |
|
|
728
|
+ if ( ! empty( $args[ 'show_only_approved' ] ) ) { |
|
729
|
729
|
|
|
730
|
|
- $search_criteria['field_filters'][] = array( |
|
|
730
|
+ $search_criteria[ 'field_filters' ][ ] = array( |
|
731
|
731
|
'key' => GravityView_Entry_Approval::meta_key, |
|
732
|
732
|
'value' => GravityView_Entry_Approval_Status::APPROVED |
|
733
|
733
|
); |
|
734
|
734
|
|
|
735
|
|
- $search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met |
|
|
735
|
+ $search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; // force all the criterias to be met |
|
736
|
736
|
|
|
737
|
737
|
gravityview()->log->debug( '[process_search_only_approved] Search Criteria if show only approved: ', array( 'data' => $search_criteria ) ); |
|
738
|
738
|
} |
|
@@ -759,18 +759,18 @@ discard block |
|
|
block discarded – undo |
|
759
|
759
|
*/ |
|
760
|
760
|
public static function is_entry_approved( $entry, $args = array() ) { |
|
761
|
761
|
|
|
762
|
|
- if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) { |
|
|
762
|
+ if ( empty( $entry[ 'id' ] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args[ 'show_only_approved' ] ) ) { |
|
763
|
763
|
// is implicitly approved if entry is null or View settings doesn't require to check for approval |
|
764
|
764
|
return true; |
|
765
|
765
|
} |
|
766
|
766
|
|
|
767
|
767
|
/** @since 1.19 */ |
|
768
|
|
- if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) { |
|
|
768
|
+ if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) { |
|
769
|
769
|
gravityview()->log->debug( 'User can moderate entries, so entry is approved for viewing' ); |
|
770
|
770
|
return true; |
|
771
|
771
|
} |
|
772
|
772
|
|
|
773
|
|
- $is_approved = gform_get_meta( $entry['id'], GravityView_Entry_Approval::meta_key ); |
|
|
773
|
+ $is_approved = gform_get_meta( $entry[ 'id' ], GravityView_Entry_Approval::meta_key ); |
|
774
|
774
|
|
|
775
|
775
|
return GravityView_Entry_Approval_Status::is_approved( $is_approved ); |
|
776
|
776
|
} |
|
@@ -794,7 +794,7 @@ discard block |
|
|
block discarded – undo |
|
794
|
794
|
* Compatibility with filters hooking in `gravityview_search_criteria` instead of `gravityview_fe_search_criteria`. |
|
795
|
795
|
*/ |
|
796
|
796
|
$criteria = apply_filters( 'gravityview_search_criteria', array(), array( $form_id ), \GV\Utils::get( $args, 'id' ) ); |
|
797
|
|
- $search_criteria = isset( $criteria['search_criteria'] ) ? $criteria['search_criteria'] : array( 'field_filters' => array() ); |
|
|
797
|
+ $search_criteria = isset( $criteria[ 'search_criteria' ] ) ? $criteria[ 'search_criteria' ] : array( 'field_filters' => array() ); |
|
798
|
798
|
|
|
799
|
799
|
/** |
|
800
|
800
|
* @filter `gravityview_fe_search_criteria` Modify the search criteria |
|
@@ -810,29 +810,29 @@ discard block |
|
|
block discarded – undo |
|
810
|
810
|
gravityview()->log->debug( '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', array( 'data' =>$search_criteria ) ); |
|
811
|
811
|
|
|
812
|
812
|
// implicity search |
|
813
|
|
- if ( ! empty( $args['search_value'] ) ) { |
|
|
813
|
+ if ( ! empty( $args[ 'search_value' ] ) ) { |
|
814
|
814
|
|
|
815
|
815
|
// Search operator options. Options: `is` or `contains` |
|
816
|
|
- $operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains'; |
|
|
816
|
+ $operator = ! empty( $args[ 'search_operator' ] ) && in_array( $args[ 'search_operator' ], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args[ 'search_operator' ] : 'contains'; |
|
817
|
817
|
|
|
818
|
|
- $search_criteria['field_filters'][] = array( |
|
|
818
|
+ $search_criteria[ 'field_filters' ][ ] = array( |
|
819
|
819
|
'key' => \GV\Utils::_GET( 'search_field', \GV\Utils::get( $args, 'search_field' ) ), // The field ID to search |
|
820
|
|
- 'value' => _wp_specialchars( $args['search_value'] ), // The value to search. Encode ampersands but not quotes. |
|
|
820
|
+ 'value' => _wp_specialchars( $args[ 'search_value' ] ), // The value to search. Encode ampersands but not quotes. |
|
821
|
821
|
'operator' => $operator, |
|
822
|
822
|
); |
|
823
|
823
|
|
|
824
|
824
|
// Lock search mode to "all" with implicit presearch filter. |
|
825
|
|
- $search_criteria['field_filters']['mode'] = 'all'; |
|
|
825
|
+ $search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; |
|
826
|
826
|
} |
|
827
|
827
|
|
|
828
|
|
- if( $search_criteria !== $original_search_criteria ) { |
|
|
828
|
+ if ( $search_criteria !== $original_search_criteria ) { |
|
829
|
829
|
gravityview()->log->debug( '[get_search_criteria] Search Criteria after implicity search: ', array( 'data' => $search_criteria ) ); |
|
830
|
830
|
} |
|
831
|
831
|
|
|
832
|
832
|
// Handle setting date range |
|
833
|
833
|
$search_criteria = self::process_search_dates( $args, $search_criteria ); |
|
834
|
834
|
|
|
835
|
|
- if( $search_criteria !== $original_search_criteria ) { |
|
|
835
|
+ if ( $search_criteria !== $original_search_criteria ) { |
|
836
|
836
|
gravityview()->log->debug( '[get_search_criteria] Search Criteria after date params: ', array( 'data' => $search_criteria ) ); |
|
837
|
837
|
} |
|
838
|
838
|
|
|
@@ -843,7 +843,7 @@ discard block |
|
|
block discarded – undo |
|
843
|
843
|
* @filter `gravityview_status` Modify entry status requirements to be included in search results. |
|
844
|
844
|
* @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash` |
|
845
|
845
|
*/ |
|
846
|
|
- $search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args ); |
|
|
846
|
+ $search_criteria[ 'status' ] = apply_filters( 'gravityview_status', 'active', $args ); |
|
847
|
847
|
|
|
848
|
848
|
return $search_criteria; |
|
849
|
849
|
} |
|
@@ -956,7 +956,7 @@ discard block |
|
|
block discarded – undo |
|
956
|
956
|
'search_criteria' => $search_criteria, |
|
957
|
957
|
'sorting' => self::updateViewSorting( $args, $form_id ), |
|
958
|
958
|
'paging' => $paging, |
|
959
|
|
- 'cache' => isset( $args['cache'] ) ? $args['cache'] : true, |
|
|
959
|
+ 'cache' => isset( $args[ 'cache' ] ) ? $args[ 'cache' ] : true, |
|
960
|
960
|
); |
|
961
|
961
|
|
|
962
|
962
|
/** |
|
@@ -981,7 +981,7 @@ discard block |
|
|
block discarded – undo |
|
981
|
981
|
* @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys. |
|
982
|
982
|
* @param array $args View configuration args. |
|
983
|
983
|
*/ |
|
984
|
|
- $parameters = apply_filters( 'gravityview_get_entries_'.\GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id ); |
|
|
984
|
+ $parameters = apply_filters( 'gravityview_get_entries_' . \GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id ); |
|
985
|
985
|
|
|
986
|
986
|
gravityview()->log->debug( '$parameters passed to gravityview_get_entries(): ', array( 'data' => $parameters ) ); |
|
987
|
987
|
|
|
@@ -1006,17 +1006,17 @@ discard block |
|
|
block discarded – undo |
|
1006
|
1006
|
$default_page_size = apply_filters( 'gravityview_default_page_size', 25 ); |
|
1007
|
1007
|
|
|
1008
|
1008
|
// Paging & offset |
|
1009
|
|
- $page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : $default_page_size; |
|
|
1009
|
+ $page_size = ! empty( $args[ 'page_size' ] ) ? intval( $args[ 'page_size' ] ) : $default_page_size; |
|
1010
|
1010
|
|
|
1011
|
1011
|
if ( -1 === $page_size ) { |
|
1012
|
1012
|
$page_size = PHP_INT_MAX; |
|
1013
|
1013
|
} |
|
1014
|
1014
|
|
|
1015
|
|
- $curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] ); |
|
|
1015
|
+ $curr_page = empty( $_GET[ 'pagenum' ] ) ? 1 : intval( $_GET[ 'pagenum' ] ); |
|
1016
|
1016
|
$offset = ( $curr_page - 1 ) * $page_size; |
|
1017
|
1017
|
|
|
1018
|
|
- if ( ! empty( $args['offset'] ) ) { |
|
1019
|
|
- $offset += intval( $args['offset'] ); |
|
|
1018
|
+ if ( ! empty( $args[ 'offset' ] ) ) { |
|
|
1019
|
+ $offset += intval( $args[ 'offset' ] ); |
|
1020
|
1020
|
} |
|
1021
|
1021
|
|
|
1022
|
1022
|
$paging = array( |
|
@@ -1040,8 +1040,8 @@ discard block |
|
|
block discarded – undo |
|
1040
|
1040
|
*/ |
|
1041
|
1041
|
public static function updateViewSorting( $args, $form_id ) { |
|
1042
|
1042
|
$sorting = array(); |
|
1043
|
|
- $sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : \GV\Utils::get( $args, 'sort_field' ); |
|
1044
|
|
- $sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : \GV\Utils::get( $args, 'sort_direction' ); |
|
|
1043
|
+ $sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : \GV\Utils::get( $args, 'sort_field' ); |
|
|
1044
|
+ $sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : \GV\Utils::get( $args, 'sort_direction' ); |
|
1045
|
1045
|
|
|
1046
|
1046
|
if ( is_array( $sort_field_id ) ) { |
|
1047
|
1047
|
$sort_field_id = array_pop( $sort_field_id ); |
|
@@ -1072,10 +1072,10 @@ discard block |
|
|
block discarded – undo |
|
1072
|
1072
|
$form = GFAPI::get_form( $form_id ); |
|
1073
|
1073
|
|
|
1074
|
1074
|
// Get the first GF_Field field ID, set as the key for entry randomization |
|
1075
|
|
- if ( ! empty( $form['fields'] ) ) { |
|
|
1075
|
+ if ( ! empty( $form[ 'fields' ] ) ) { |
|
1076
|
1076
|
|
|
1077
|
1077
|
/** @var GF_Field $field */ |
|
1078
|
|
- foreach ( $form['fields'] as $field ) { |
|
|
1078
|
+ foreach ( $form[ 'fields' ] as $field ) { |
|
1079
|
1079
|
if ( ! is_a( $field, 'GF_Field' ) ) { |
|
1080
|
1080
|
continue; |
|
1081
|
1081
|
} |
|
@@ -1120,7 +1120,7 @@ discard block |
|
|
block discarded – undo |
|
1120
|
1120
|
if ( is_array( $sort_field_id ) ) { |
|
1121
|
1121
|
$modified_ids = array(); |
|
1122
|
1122
|
foreach ( $sort_field_id as $_sort_field_id ) { |
|
1123
|
|
- $modified_ids []= self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id ); |
|
|
1123
|
+ $modified_ids [ ] = self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id ); |
|
1124
|
1124
|
} |
|
1125
|
1125
|
return $modified_ids; |
|
1126
|
1126
|
} |
|
@@ -1129,11 +1129,11 @@ discard block |
|
|
block discarded – undo |
|
1129
|
1129
|
|
|
1130
|
1130
|
$sort_field = GFFormsModel::get_field( $form, $sort_field_id ); |
|
1131
|
1131
|
|
|
1132
|
|
- if( ! $sort_field ) { |
|
|
1132
|
+ if ( ! $sort_field ) { |
|
1133
|
1133
|
return $sort_field_id; |
|
1134
|
1134
|
} |
|
1135
|
1135
|
|
|
1136
|
|
- switch ( $sort_field['type'] ) { |
|
|
1136
|
+ switch ( $sort_field[ 'type' ] ) { |
|
1137
|
1137
|
|
|
1138
|
1138
|
case 'address': |
|
1139
|
1139
|
// Sorting by full address |
|
@@ -1150,7 +1150,7 @@ discard block |
|
|
block discarded – undo |
|
1150
|
1150
|
*/ |
|
1151
|
1151
|
$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id ); |
|
1152
|
1152
|
|
|
1153
|
|
- switch( strtolower( $address_part ) ){ |
|
|
1153
|
+ switch ( strtolower( $address_part ) ) { |
|
1154
|
1154
|
case 'street': |
|
1155
|
1155
|
$sort_field_id .= '.1'; |
|
1156
|
1156
|
break; |
|
@@ -1230,7 +1230,7 @@ discard block |
|
|
block discarded – undo |
|
1230
|
1230
|
*/ |
|
1231
|
1231
|
$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry ); |
|
1232
|
1232
|
|
|
1233
|
|
- if ( empty( $single_entry ) ){ |
|
|
1233
|
+ if ( empty( $single_entry ) ) { |
|
1234
|
1234
|
return false; |
|
1235
|
1235
|
} else { |
|
1236
|
1236
|
return $single_entry; |
|
@@ -1252,7 +1252,7 @@ discard block |
|
|
block discarded – undo |
|
1252
|
1252
|
$views = $this->getGvOutputData()->get_views(); |
|
1253
|
1253
|
|
|
1254
|
1254
|
foreach ( $views as $view_id => $data ) { |
|
1255
|
|
- $view = \GV\View::by_id( $data['id'] ); |
|
|
1255
|
+ $view = \GV\View::by_id( $data[ 'id' ] ); |
|
1256
|
1256
|
$view_id = $view->ID; |
|
1257
|
1257
|
$template_id = gravityview_get_template_id( $view->ID ); |
|
1258
|
1258
|
$data = $view->as_data(); |
|
@@ -1261,7 +1261,7 @@ discard block |
|
|
block discarded – undo |
|
1261
|
1261
|
* Don't enqueue the scripts or styles if it's not going to be displayed. |
|
1262
|
1262
|
* @since 1.15 |
|
1263
|
1263
|
*/ |
|
1264
|
|
- if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) { |
|
|
1264
|
+ if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) { |
|
1265
|
1265
|
continue; |
|
1266
|
1266
|
} |
|
1267
|
1267
|
|
|
@@ -1278,13 +1278,13 @@ discard block |
|
|
block discarded – undo |
|
1278
|
1278
|
* @filter `gravity_view_lightbox_script` Override the lightbox script to enqueue. Default: `thickbox` |
|
1279
|
1279
|
* @param string $script_slug If you want to use a different lightbox script, return the name of it here. |
|
1280
|
1280
|
*/ |
|
1281
|
|
- $js_dependencies[] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' ); |
|
|
1281
|
+ $js_dependencies[ ] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' ); |
|
1282
|
1282
|
|
|
1283
|
1283
|
/** |
|
1284
|
1284
|
* @filter `gravity_view_lightbox_style` Modify the lightbox CSS slug. Default: `thickbox` |
|
1285
|
1285
|
* @param string $script_slug If you want to use a different lightbox script, return the name of its CSS file here. |
|
1286
|
1286
|
*/ |
|
1287
|
|
- $css_dependencies[] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' ); |
|
|
1287
|
+ $css_dependencies[ ] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' ); |
|
1288
|
1288
|
} |
|
1289
|
1289
|
|
|
1290
|
1290
|
/** |
|
@@ -1292,19 +1292,19 @@ discard block |
|
|
block discarded – undo |
|
1292
|
1292
|
* @see https://github.com/katzwebservices/GravityView/issues/536 |
|
1293
|
1293
|
* @since 1.15 |
|
1294
|
1294
|
*/ |
|
1295
|
|
- if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) { |
|
1296
|
|
- $css_dependencies[] = 'dashicons'; |
|
|
1295
|
+ if ( gravityview_view_has_single_checkbox_or_radio( $data[ 'form' ], $data[ 'fields' ] ) ) { |
|
|
1296
|
+ $css_dependencies[ ] = 'dashicons'; |
|
1297
|
1297
|
} |
|
1298
|
1298
|
|
|
1299
|
1299
|
wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true ); |
|
1300
|
1300
|
|
|
1301
|
1301
|
$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
|
1302
|
1302
|
|
|
1303
|
|
- 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 ); |
|
|
1303
|
+ 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 ); |
|
1304
|
1304
|
|
|
1305
|
1305
|
wp_enqueue_script( 'gravityview-fe-view' ); |
|
1306
|
1306
|
|
|
1307
|
|
- if ( ! empty( $data['atts']['sort_columns'] ) ) { |
|
|
1307
|
+ if ( ! empty( $data[ 'atts' ][ 'sort_columns' ] ) ) { |
|
1308
|
1308
|
wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' ); |
|
1309
|
1309
|
} |
|
1310
|
1310
|
|
|
@@ -1367,7 +1367,7 @@ discard block |
|
|
block discarded – undo |
|
1367
|
1367
|
public static function add_style( $template_id ) { |
|
1368
|
1368
|
|
|
1369
|
1369
|
if ( ! empty( $template_id ) && wp_style_is( 'gravityview_style_' . $template_id, 'registered' ) ) { |
|
1370
|
|
- gravityview()->log->debug( 'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) ); |
|
|
1370
|
+ gravityview()->log->debug( 'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) ); |
|
1371
|
1371
|
wp_enqueue_style( 'gravityview_style_' . $template_id ); |
|
1372
|
1372
|
} elseif ( empty( $template_id ) ) { |
|
1373
|
1373
|
gravityview()->log->error( 'Cannot add template style; template_id is empty' ); |
|
@@ -1398,11 +1398,11 @@ discard block |
|
|
block discarded – undo |
|
1398
|
1398
|
* Not a table-based template; don't add sort icons |
|
1399
|
1399
|
* @since 1.12 |
|
1400
|
1400
|
*/ |
|
1401
|
|
- if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) { |
|
|
1401
|
+ if ( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) { |
|
1402
|
1402
|
return $label; |
|
1403
|
1403
|
} |
|
1404
|
1404
|
|
|
1405
|
|
- if ( ! $this->is_field_sortable( $field['id'], $form ) ) { |
|
|
1405
|
+ if ( ! $this->is_field_sortable( $field[ 'id' ], $form ) ) { |
|
1406
|
1406
|
return $label; |
|
1407
|
1407
|
} |
|
1408
|
1408
|
|
|
@@ -1410,29 +1410,29 @@ discard block |
|
|
block discarded – undo |
|
1410
|
1410
|
|
|
1411
|
1411
|
$class = 'gv-sort'; |
|
1412
|
1412
|
|
|
1413
|
|
- $sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] ); |
|
|
1413
|
+ $sort_field_id = self::_override_sorting_id_by_field_type( $field[ 'id' ], $form[ 'id' ] ); |
|
1414
|
1414
|
|
|
1415
|
1415
|
$sort_args = array( |
|
1416
|
|
- 'sort' => $field['id'], |
|
|
1416
|
+ 'sort' => $field[ 'id' ], |
|
1417
|
1417
|
'dir' => 'asc', |
|
1418
|
1418
|
); |
|
1419
|
1419
|
|
|
1420
|
|
- if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) { |
|
|
1420
|
+ if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) { |
|
1421
|
1421
|
//toggle sorting direction. |
|
1422
|
|
- if ( 'asc' === $sorting['direction'] ) { |
|
1423
|
|
- $sort_args['dir'] = 'desc'; |
|
|
1422
|
+ if ( 'asc' === $sorting[ 'direction' ] ) { |
|
|
1423
|
+ $sort_args[ 'dir' ] = 'desc'; |
|
1424
|
1424
|
$class .= ' gv-icon-sort-desc'; |
|
1425
|
1425
|
} else { |
|
1426
|
|
- $sort_args['dir'] = 'asc'; |
|
|
1426
|
+ $sort_args[ 'dir' ] = 'asc'; |
|
1427
|
1427
|
$class .= ' gv-icon-sort-asc'; |
|
1428
|
1428
|
} |
|
1429
|
1429
|
} else { |
|
1430
|
1430
|
$class .= ' gv-icon-caret-up-down'; |
|
1431
|
1431
|
} |
|
1432
|
1432
|
|
|
1433
|
|
- $url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) ); |
|
|
1433
|
+ $url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) ); |
|
1434
|
1434
|
|
|
1435
|
|
- return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a> '. $label; |
|
|
1435
|
+ return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a> ' . $label; |
|
1436
|
1436
|
|
|
1437
|
1437
|
} |
|
1438
|
1438
|
|
|
@@ -1450,7 +1450,7 @@ discard block |
|
|
block discarded – undo |
|
1450
|
1450
|
|
|
1451
|
1451
|
$field_type = $field_id; |
|
1452
|
1452
|
|
|
1453
|
|
- if( is_numeric( $field_id ) ) { |
|
|
1453
|
+ if ( is_numeric( $field_id ) ) { |
|
1454
|
1454
|
$field = GFFormsModel::get_field( $form, $field_id ); |
|
1455
|
1455
|
$field_type = $field ? $field->type : $field_id; |
|
1456
|
1456
|
} |
|
@@ -1473,7 +1473,7 @@ discard block |
|
|
block discarded – undo |
|
1473
|
1473
|
return false; |
|
1474
|
1474
|
} |
|
1475
|
1475
|
|
|
1476
|
|
- return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) ); |
|
|
1476
|
+ return apply_filters( "gravityview/sortable/formfield_{$form[ 'id' ]}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) ); |
|
1477
|
1477
|
|
|
1478
|
1478
|
} |
|
1479
|
1479
|
|