@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | * |
228 | 228 | * |
229 | 229 | * |
230 | - * @param null $view_id |
|
230 | + * @param string $view_id |
|
231 | 231 | */ |
232 | 232 | public function set_context_view_id( $view_id = null ) { |
233 | 233 | $multiple_views = $this->getGvOutputData() && $this->getGvOutputData()->has_multiple_views(); |
@@ -865,7 +865,7 @@ discard block |
||
865 | 865 | * |
866 | 866 | * @uses gravityview_get_entries() |
867 | 867 | * @access public |
868 | - * @param array $args\n |
|
868 | + * @param array $args |
|
869 | 869 | * - $id - View id |
870 | 870 | * - $page_size - Page |
871 | 871 | * - $sort_field - form field id to sort |
@@ -994,7 +994,6 @@ discard block |
||
994 | 994 | * @since 1.19.5 |
995 | 995 | * |
996 | 996 | * @param $args |
997 | - * @param int $form_id |
|
998 | 997 | */ |
999 | 998 | public static function get_search_criteria_paging( $args ) { |
1000 | 999 | |
@@ -1416,7 +1415,7 @@ discard block |
||
1416 | 1415 | /** |
1417 | 1416 | * Checks if field (column) is sortable |
1418 | 1417 | * |
1419 | - * @param string $field Field settings |
|
1418 | + * @param string $field_id Field settings |
|
1420 | 1419 | * @param array $form Gravity Forms form array |
1421 | 1420 | * |
1422 | 1421 | * @since 1.7 |
@@ -450,7 +450,7 @@ discard block |
||
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 | |
@@ -1127,7 +1127,7 @@ discard block |
||
1127 | 1127 | */ |
1128 | 1128 | $address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id ); |
1129 | 1129 | |
1130 | - switch( strtolower( $address_part ) ){ |
|
1130 | + switch( strtolower( $address_part ) ) { |
|
1131 | 1131 | case 'street': |
1132 | 1132 | $sort_field_id .= '.1'; |
1133 | 1133 | break; |
@@ -1207,7 +1207,7 @@ discard block |
||
1207 | 1207 | */ |
1208 | 1208 | $single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry ); |
1209 | 1209 | |
1210 | - if ( empty( $single_entry ) ){ |
|
1210 | + if ( empty( $single_entry ) ) { |
|
1211 | 1211 | return false; |
1212 | 1212 | } else { |
1213 | 1213 | return $single_entry; |
@@ -85,9 +85,9 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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( |
@@ -1041,11 +1041,11 @@ discard block |
||
1041 | 1041 | public static function updateViewSorting( $args, $form_id ) { |
1042 | 1042 | $sorting = array(); |
1043 | 1043 | |
1044 | - $has_values = isset( $_GET['sort'] ); |
|
1044 | + $has_values = isset( $_GET[ 'sort' ] ); |
|
1045 | 1045 | |
1046 | - if ( $has_values && is_array( $_GET['sort'] ) ) { |
|
1047 | - $sorts = array_keys( $_GET['sort'] ); |
|
1048 | - $dirs = array_values( $_GET['sort'] ); |
|
1046 | + if ( $has_values && is_array( $_GET[ 'sort' ] ) ) { |
|
1047 | + $sorts = array_keys( $_GET[ 'sort' ] ); |
|
1048 | + $dirs = array_values( $_GET[ 'sort' ] ); |
|
1049 | 1049 | |
1050 | 1050 | if ( $has_values = array_filter( $dirs ) ) { |
1051 | 1051 | $sort_field_id = end( $sorts ); |
@@ -1054,11 +1054,11 @@ discard block |
||
1054 | 1054 | } |
1055 | 1055 | |
1056 | 1056 | if ( ! isset( $sort_field_id ) ) { |
1057 | - $sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : \GV\Utils::get( $args, 'sort_field' ); |
|
1057 | + $sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : \GV\Utils::get( $args, 'sort_field' ); |
|
1058 | 1058 | } |
1059 | 1059 | |
1060 | 1060 | if ( ! isset( $sort_direction ) ) { |
1061 | - $sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : \GV\Utils::get( $args, 'sort_direction' ); |
|
1061 | + $sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : \GV\Utils::get( $args, 'sort_direction' ); |
|
1062 | 1062 | } |
1063 | 1063 | |
1064 | 1064 | if ( is_array( $sort_field_id ) ) { |
@@ -1090,10 +1090,10 @@ discard block |
||
1090 | 1090 | $form = GFAPI::get_form( $form_id ); |
1091 | 1091 | |
1092 | 1092 | // Get the first GF_Field field ID, set as the key for entry randomization |
1093 | - if ( ! empty( $form['fields'] ) ) { |
|
1093 | + if ( ! empty( $form[ 'fields' ] ) ) { |
|
1094 | 1094 | |
1095 | 1095 | /** @var GF_Field $field */ |
1096 | - foreach ( $form['fields'] as $field ) { |
|
1096 | + foreach ( $form[ 'fields' ] as $field ) { |
|
1097 | 1097 | if ( ! is_a( $field, 'GF_Field' ) ) { |
1098 | 1098 | continue; |
1099 | 1099 | } |
@@ -1138,7 +1138,7 @@ discard block |
||
1138 | 1138 | if ( is_array( $sort_field_id ) ) { |
1139 | 1139 | $modified_ids = array(); |
1140 | 1140 | foreach ( $sort_field_id as $_sort_field_id ) { |
1141 | - $modified_ids []= self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id ); |
|
1141 | + $modified_ids [ ] = self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id ); |
|
1142 | 1142 | } |
1143 | 1143 | return $modified_ids; |
1144 | 1144 | } |
@@ -1147,11 +1147,11 @@ discard block |
||
1147 | 1147 | |
1148 | 1148 | $sort_field = GFFormsModel::get_field( $form, $sort_field_id ); |
1149 | 1149 | |
1150 | - if( ! $sort_field ) { |
|
1150 | + if ( ! $sort_field ) { |
|
1151 | 1151 | return $sort_field_id; |
1152 | 1152 | } |
1153 | 1153 | |
1154 | - switch ( $sort_field['type'] ) { |
|
1154 | + switch ( $sort_field[ 'type' ] ) { |
|
1155 | 1155 | |
1156 | 1156 | case 'address': |
1157 | 1157 | // Sorting by full address |
@@ -1168,7 +1168,7 @@ discard block |
||
1168 | 1168 | */ |
1169 | 1169 | $address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id ); |
1170 | 1170 | |
1171 | - switch( strtolower( $address_part ) ){ |
|
1171 | + switch ( strtolower( $address_part ) ) { |
|
1172 | 1172 | case 'street': |
1173 | 1173 | $sort_field_id .= '.1'; |
1174 | 1174 | break; |
@@ -1241,7 +1241,7 @@ discard block |
||
1241 | 1241 | if ( ! class_exists( '\GV\Entry' ) ) { |
1242 | 1242 | |
1243 | 1243 | // Not using gravityview()->log->error(), since that may not exist yet either! |
1244 | - do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary() ); |
|
1244 | + do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary() ); |
|
1245 | 1245 | |
1246 | 1246 | return null; |
1247 | 1247 | } |
@@ -1258,7 +1258,7 @@ discard block |
||
1258 | 1258 | */ |
1259 | 1259 | $single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry ); |
1260 | 1260 | |
1261 | - if ( empty( $single_entry ) ){ |
|
1261 | + if ( empty( $single_entry ) ) { |
|
1262 | 1262 | return false; |
1263 | 1263 | } else { |
1264 | 1264 | return $single_entry; |
@@ -1280,7 +1280,7 @@ discard block |
||
1280 | 1280 | $views = $this->getGvOutputData()->get_views(); |
1281 | 1281 | |
1282 | 1282 | foreach ( $views as $view_id => $data ) { |
1283 | - $view = \GV\View::by_id( $data['id'] ); |
|
1283 | + $view = \GV\View::by_id( $data[ 'id' ] ); |
|
1284 | 1284 | $view_id = $view->ID; |
1285 | 1285 | $template_id = gravityview_get_template_id( $view->ID ); |
1286 | 1286 | $data = $view->as_data(); |
@@ -1289,7 +1289,7 @@ discard block |
||
1289 | 1289 | * Don't enqueue the scripts or styles if it's not going to be displayed. |
1290 | 1290 | * @since 1.15 |
1291 | 1291 | */ |
1292 | - if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) { |
|
1292 | + if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) { |
|
1293 | 1293 | continue; |
1294 | 1294 | } |
1295 | 1295 | |
@@ -1306,13 +1306,13 @@ discard block |
||
1306 | 1306 | * @filter `gravity_view_lightbox_script` Override the lightbox script to enqueue. Default: `thickbox` |
1307 | 1307 | * @param string $script_slug If you want to use a different lightbox script, return the name of it here. |
1308 | 1308 | */ |
1309 | - $js_dependencies[] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' ); |
|
1309 | + $js_dependencies[ ] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' ); |
|
1310 | 1310 | |
1311 | 1311 | /** |
1312 | 1312 | * @filter `gravity_view_lightbox_style` Modify the lightbox CSS slug. Default: `thickbox` |
1313 | 1313 | * @param string $script_slug If you want to use a different lightbox script, return the name of its CSS file here. |
1314 | 1314 | */ |
1315 | - $css_dependencies[] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' ); |
|
1315 | + $css_dependencies[ ] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' ); |
|
1316 | 1316 | } |
1317 | 1317 | |
1318 | 1318 | /** |
@@ -1320,19 +1320,19 @@ discard block |
||
1320 | 1320 | * @see https://github.com/katzwebservices/GravityView/issues/536 |
1321 | 1321 | * @since 1.15 |
1322 | 1322 | */ |
1323 | - if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) { |
|
1324 | - $css_dependencies[] = 'dashicons'; |
|
1323 | + if ( gravityview_view_has_single_checkbox_or_radio( $data[ 'form' ], $data[ 'fields' ] ) ) { |
|
1324 | + $css_dependencies[ ] = 'dashicons'; |
|
1325 | 1325 | } |
1326 | 1326 | |
1327 | 1327 | wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true ); |
1328 | 1328 | |
1329 | 1329 | $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
1330 | 1330 | |
1331 | - 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 ); |
|
1331 | + 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 ); |
|
1332 | 1332 | |
1333 | 1333 | wp_enqueue_script( 'gravityview-fe-view' ); |
1334 | 1334 | |
1335 | - if ( ! empty( $data['atts']['sort_columns'] ) ) { |
|
1335 | + if ( ! empty( $data[ 'atts' ][ 'sort_columns' ] ) ) { |
|
1336 | 1336 | wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' ); |
1337 | 1337 | } |
1338 | 1338 | |
@@ -1395,7 +1395,7 @@ discard block |
||
1395 | 1395 | public static function add_style( $template_id ) { |
1396 | 1396 | |
1397 | 1397 | if ( ! empty( $template_id ) && wp_style_is( 'gravityview_style_' . $template_id, 'registered' ) ) { |
1398 | - gravityview()->log->debug( 'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) ); |
|
1398 | + gravityview()->log->debug( 'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) ); |
|
1399 | 1399 | wp_enqueue_style( 'gravityview_style_' . $template_id ); |
1400 | 1400 | } elseif ( empty( $template_id ) ) { |
1401 | 1401 | gravityview()->log->error( 'Cannot add template style; template_id is empty' ); |
@@ -1426,11 +1426,11 @@ discard block |
||
1426 | 1426 | * Not a table-based template; don't add sort icons |
1427 | 1427 | * @since 1.12 |
1428 | 1428 | */ |
1429 | - if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) { |
|
1429 | + if ( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) { |
|
1430 | 1430 | return $label; |
1431 | 1431 | } |
1432 | 1432 | |
1433 | - if ( ! $this->is_field_sortable( $field['id'], $form ) ) { |
|
1433 | + if ( ! $this->is_field_sortable( $field[ 'id' ], $form ) ) { |
|
1434 | 1434 | return $label; |
1435 | 1435 | } |
1436 | 1436 | |
@@ -1438,29 +1438,29 @@ discard block |
||
1438 | 1438 | |
1439 | 1439 | $class = 'gv-sort'; |
1440 | 1440 | |
1441 | - $sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] ); |
|
1441 | + $sort_field_id = self::_override_sorting_id_by_field_type( $field[ 'id' ], $form[ 'id' ] ); |
|
1442 | 1442 | |
1443 | 1443 | $sort_args = array( |
1444 | - 'sort' => $field['id'], |
|
1444 | + 'sort' => $field[ 'id' ], |
|
1445 | 1445 | 'dir' => 'asc', |
1446 | 1446 | ); |
1447 | 1447 | |
1448 | - if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) { |
|
1448 | + if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) { |
|
1449 | 1449 | //toggle sorting direction. |
1450 | - if ( 'asc' === $sorting['direction'] ) { |
|
1451 | - $sort_args['dir'] = 'desc'; |
|
1450 | + if ( 'asc' === $sorting[ 'direction' ] ) { |
|
1451 | + $sort_args[ 'dir' ] = 'desc'; |
|
1452 | 1452 | $class .= ' gv-icon-sort-desc'; |
1453 | 1453 | } else { |
1454 | - $sort_args['dir'] = 'asc'; |
|
1454 | + $sort_args[ 'dir' ] = 'asc'; |
|
1455 | 1455 | $class .= ' gv-icon-sort-asc'; |
1456 | 1456 | } |
1457 | 1457 | } else { |
1458 | 1458 | $class .= ' gv-icon-caret-up-down'; |
1459 | 1459 | } |
1460 | 1460 | |
1461 | - $url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) ); |
|
1461 | + $url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) ); |
|
1462 | 1462 | |
1463 | - return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a> '. $label; |
|
1463 | + return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a> ' . $label; |
|
1464 | 1464 | |
1465 | 1465 | } |
1466 | 1466 | |
@@ -1478,7 +1478,7 @@ discard block |
||
1478 | 1478 | |
1479 | 1479 | $field_type = $field_id; |
1480 | 1480 | |
1481 | - if( is_numeric( $field_id ) ) { |
|
1481 | + if ( is_numeric( $field_id ) ) { |
|
1482 | 1482 | $field = GFFormsModel::get_field( $form, $field_id ); |
1483 | 1483 | $field_type = $field ? $field->type : $field_id; |
1484 | 1484 | } |
@@ -1501,7 +1501,7 @@ discard block |
||
1501 | 1501 | return false; |
1502 | 1502 | } |
1503 | 1503 | |
1504 | - return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) ); |
|
1504 | + return apply_filters( "gravityview/sortable/formfield_{$form[ 'id' ]}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) ); |
|
1505 | 1505 | |
1506 | 1506 | } |
1507 | 1507 |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | * @param GF_Field|false $field |
185 | 185 | * @param string $value |
186 | 186 | * |
187 | - * @return mixed|string |
|
187 | + * @return string |
|
188 | 188 | */ |
189 | 189 | private static function maybe_urlencode( $field = false, $value = '' ) { |
190 | 190 | |
@@ -349,7 +349,7 @@ discard block |
||
349 | 349 | * @param bool $url_encode Whether to URL-encode output |
350 | 350 | * @param bool $esc_html Whether to apply `esc_html()` to output |
351 | 351 | * |
352 | - * @return mixed |
|
352 | + * @return string |
|
353 | 353 | */ |
354 | 354 | public static function replace_gv_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) { |
355 | 355 |
@@ -52,14 +52,14 @@ discard block |
||
52 | 52 | // matching regex => the value is the method to call to replace the value. |
53 | 53 | $gv_modifiers = array( |
54 | 54 | 'maxwords:(\d+)' => 'modifier_maxwords', /** @see modifier_maxwords */ |
55 | - 'timestamp' => 'modifier_timestamp', /** @see modifier_timestamp */ |
|
55 | + 'timestamp' => 'modifier_timestamp', /** @see modifier_timestamp */ |
|
56 | 56 | 'explode' => 'modifier_explode', /** @see modifier_explode */ |
57 | 57 | |
58 | 58 | /** @see modifier_strings */ |
59 | 59 | 'urlencode' => 'modifier_strings', |
60 | 60 | 'wpautop' => 'modifier_strings', |
61 | - 'esc_html' => 'modifier_strings', |
|
62 | - 'sanitize_html_class' => 'modifier_strings', |
|
61 | + 'esc_html' => 'modifier_strings', |
|
62 | + 'sanitize_html_class' => 'modifier_strings', |
|
63 | 63 | 'sanitize_title' => 'modifier_strings', |
64 | 64 | 'strtolower' => 'modifier_strings', |
65 | 65 | 'strtoupper' => 'modifier_strings', |
@@ -457,7 +457,7 @@ discard block |
||
457 | 457 | |
458 | 458 | $atts = array( |
459 | 459 | 'format' => self::get_format_from_modifiers( $exploded, false ), |
460 | - 'human' => in_array( 'human', $exploded ), // {date_created:human} |
|
460 | + 'human' => in_array( 'human', $exploded ), // {date_created:human} |
|
461 | 461 | 'diff' => in_array( 'diff', $exploded ), // {date_created:diff} |
462 | 462 | 'raw' => in_array( 'raw', $exploded ), // {date_created:raw} |
463 | 463 | 'timestamp' => in_array( 'timestamp', $exploded ), // {date_created:timestamp} |
@@ -78,12 +78,12 @@ discard block |
||
78 | 78 | |
79 | 79 | $non_gv_modifiers = array_diff( $modifiers, array_keys( $gv_modifiers ) ); |
80 | 80 | |
81 | - $return = $field->get_value_merge_tag( $value, '', array( 'currency' => '' ), array(), implode( '', $non_gv_modifiers ), $raw_value, false, false, 'text', false); |
|
81 | + $return = $field->get_value_merge_tag( $value, '', array( 'currency' => '' ), array(), implode( '', $non_gv_modifiers ), $raw_value, false, false, 'text', false ); |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | foreach ( $modifiers as $passed_modifier ) { |
85 | 85 | |
86 | - foreach( $gv_modifiers as $gv_modifier => $method ) { |
|
86 | + foreach ( $gv_modifiers as $gv_modifier => $method ) { |
|
87 | 87 | |
88 | 88 | // Uses ^ to only match the first modifier, to enforce same order as passed by GF |
89 | 89 | preg_match( '/^' . $gv_modifier . '/ism', $passed_modifier, $matches ); |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | */ |
133 | 133 | private static function modifier_timestamp( $raw_value, $matches ) { |
134 | 134 | |
135 | - if( empty( $matches[0] ) ) { |
|
135 | + if ( empty( $matches[ 0 ] ) ) { |
|
136 | 136 | return $raw_value; |
137 | 137 | } |
138 | 138 | |
@@ -161,11 +161,11 @@ discard block |
||
161 | 161 | */ |
162 | 162 | private static function modifier_maxwords( $raw_value, $matches, $field = null ) { |
163 | 163 | |
164 | - if( ! is_string( $raw_value ) || empty( $matches[1] ) || ! function_exists( 'wp_trim_words' ) ) { |
|
164 | + if ( ! is_string( $raw_value ) || empty( $matches[ 1 ] ) || ! function_exists( 'wp_trim_words' ) ) { |
|
165 | 165 | return $raw_value; |
166 | 166 | } |
167 | 167 | |
168 | - $max = intval( $matches[1] ); |
|
168 | + $max = intval( $matches[ 1 ] ); |
|
169 | 169 | |
170 | 170 | $more_placeholder = '[GVMORE]'; |
171 | 171 | |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | private static function modifier_explode( $raw_value, $matches, $value, $field = null ) { |
235 | 235 | |
236 | 236 | // For JSON-encoded arrays |
237 | - if( $json_array = json_decode( $raw_value, true ) ) { |
|
237 | + if ( $json_array = json_decode( $raw_value, true ) ) { |
|
238 | 238 | return implode( ' ', $json_array ); |
239 | 239 | } |
240 | 240 | |
@@ -255,13 +255,13 @@ discard block |
||
255 | 255 | */ |
256 | 256 | private static function modifier_strings( $raw_value, $matches, $value = '', $field = null ) { |
257 | 257 | |
258 | - if( empty( $matches[0] ) ) { |
|
258 | + if ( empty( $matches[ 0 ] ) ) { |
|
259 | 259 | return $raw_value; |
260 | 260 | } |
261 | 261 | |
262 | 262 | $return = $raw_value; |
263 | 263 | |
264 | - switch( $matches[0] ) { |
|
264 | + switch ( $matches[ 0 ] ) { |
|
265 | 265 | case 'urlencode': |
266 | 266 | $return = urlencode( $raw_value ); |
267 | 267 | break; |
@@ -343,9 +343,9 @@ discard block |
||
343 | 343 | * @internal Fixed $form['title'] in Gravity Forms |
344 | 344 | * @see https://github.com/gravityforms/gravityforms/pull/27/files |
345 | 345 | */ |
346 | - $form['title'] = isset( $form['title'] ) ? $form['title'] : ''; |
|
347 | - $form['id'] = isset( $form['id'] ) ? $form['id'] : ''; |
|
348 | - $form['fields'] = isset( $form['fields'] ) ? $form['fields'] : array(); |
|
346 | + $form[ 'title' ] = isset( $form[ 'title' ] ) ? $form[ 'title' ] : ''; |
|
347 | + $form[ 'id' ] = isset( $form[ 'id' ] ) ? $form[ 'id' ] : ''; |
|
348 | + $form[ 'fields' ] = isset( $form[ 'fields' ] ) ? $form[ 'fields' ] : array(); |
|
349 | 349 | |
350 | 350 | return GFCommon::replace_variables( $text, $form, $entry, $url_encode, $esc_html, $nl2br, $format, $aux_data ); |
351 | 351 | } |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | // Is there is {gv_entry_link} or {gv_entry_link:[post id]} or {gv_entry_link:[post id]:[action]} merge tag? |
407 | 407 | preg_match_all( "/{gv_entry_link(?:\:(\d+)\:?(.*?))?}/ism", $original_text, $matches, PREG_SET_ORDER ); |
408 | 408 | |
409 | - if( empty( $matches ) ) { |
|
409 | + if ( empty( $matches ) ) { |
|
410 | 410 | return $original_text; |
411 | 411 | } |
412 | 412 | |
@@ -427,18 +427,18 @@ discard block |
||
427 | 427 | * } |
428 | 428 | */ |
429 | 429 | foreach ( $matches as $match ) { |
430 | - $full_tag = $match[0]; |
|
430 | + $full_tag = $match[ 0 ]; |
|
431 | 431 | |
432 | 432 | $link_args = array( |
433 | 433 | 'return' => 'url', |
434 | - 'entry_id' => $entry['id'], |
|
434 | + 'entry_id' => $entry[ 'id' ], |
|
435 | 435 | 'post_id' => \GV\Utils::get( $match, 1, null ), |
436 | 436 | 'action' => \GV\Utils::get( $match, 2, 'read' ), |
437 | 437 | ); |
438 | 438 | |
439 | 439 | $entry_link = $Shortcode->read_shortcode( $link_args, null, 'gv_entry_link_merge_tag' ); |
440 | 440 | |
441 | - if( $url_encode ) { |
|
441 | + if ( $url_encode ) { |
|
442 | 442 | $entry_link = urlencode( $entry_link ); |
443 | 443 | } |
444 | 444 | |
@@ -475,7 +475,7 @@ discard block |
||
475 | 475 | 'diff' => in_array( 'diff', $exploded ), // {date_created:diff} |
476 | 476 | 'raw' => in_array( 'raw', $exploded ), // {date_created:raw} |
477 | 477 | 'timestamp' => in_array( 'timestamp', $exploded ), // {date_created:timestamp} |
478 | - 'time' => in_array( 'time', $exploded ), // {date_created:time} |
|
478 | + 'time' => in_array( 'time', $exploded ), // {date_created:time} |
|
479 | 479 | ); |
480 | 480 | |
481 | 481 | $formatted_date = GVCommon::format_date( $date_created, $atts ); |
@@ -552,8 +552,8 @@ discard block |
||
552 | 552 | return $original_text; |
553 | 553 | } |
554 | 554 | |
555 | - foreach ( (array) $matches as $match ) { |
|
556 | - $full_tag = $match[0]; |
|
555 | + foreach ( (array)$matches as $match ) { |
|
556 | + $full_tag = $match[ 0 ]; |
|
557 | 557 | $modifier = \GV\Utils::get( $match, 2, 'permalink' ); |
558 | 558 | |
559 | 559 | $replacement = false; |
@@ -571,7 +571,7 @@ discard block |
||
571 | 571 | $replacement = esc_html( $replacement ); |
572 | 572 | } |
573 | 573 | |
574 | - if( $url_encode ) { |
|
574 | + if ( $url_encode ) { |
|
575 | 575 | $replacement = urlencode( $replacement ); |
576 | 576 | } |
577 | 577 | |
@@ -611,14 +611,14 @@ discard block |
||
611 | 611 | preg_match_all( "/{get:(.*?)}/ism", $text, $matches, PREG_SET_ORDER ); |
612 | 612 | |
613 | 613 | // If there are no matches OR the Entry `created_by` isn't set or is 0 (no user) |
614 | - if( empty( $matches ) ) { |
|
614 | + if ( empty( $matches ) ) { |
|
615 | 615 | return $text; |
616 | 616 | } |
617 | 617 | |
618 | 618 | foreach ( $matches as $match ) { |
619 | 619 | |
620 | - $full_tag = $match[0]; |
|
621 | - $property = $match[1]; |
|
620 | + $full_tag = $match[ 0 ]; |
|
621 | + $property = $match[ 1 ]; |
|
622 | 622 | |
623 | 623 | $value = stripslashes_deep( \GV\Utils::_GET( $property ) ); |
624 | 624 | |
@@ -642,7 +642,7 @@ discard block |
||
642 | 642 | * @since 1.15 |
643 | 643 | * @param bool $esc_html Whether to esc_html() the value. Default: `true` |
644 | 644 | */ |
645 | - $esc_html = apply_filters('gravityview/merge_tags/get/esc_html/' . $property, true ); |
|
645 | + $esc_html = apply_filters( 'gravityview/merge_tags/get/esc_html/' . $property, true ); |
|
646 | 646 | |
647 | 647 | $value = $esc_html ? esc_html( $value ) : $value; |
648 | 648 | |
@@ -653,7 +653,7 @@ discard block |
||
653 | 653 | * @param[in] array $form Gravity Forms form array |
654 | 654 | * @param[in] array $entry Entry array |
655 | 655 | */ |
656 | - $value = apply_filters('gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry ); |
|
656 | + $value = apply_filters( 'gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry ); |
|
657 | 657 | |
658 | 658 | $text = str_replace( $full_tag, $value, $text ); |
659 | 659 | } |
@@ -9,7 +9,6 @@ |
||
9 | 9 | */ |
10 | 10 | class GV_License_Handler extends \GV\License_Handler { |
11 | 11 | /** |
12 | - * @param \GV\Addon_Settings $GFAddOn |
|
13 | 12 | * |
14 | 13 | * @deprecated Use \GV\License_Handler::get instead |
15 | 14 | * |
@@ -219,6 +219,9 @@ discard block |
||
219 | 219 | |
220 | 220 | } |
221 | 221 | |
222 | + /** |
|
223 | + * @param string $key |
|
224 | + */ |
|
222 | 225 | public function getCurrentFieldSetting( $key ) { |
223 | 226 | $settings = $this->getCurrentField('field_settings'); |
224 | 227 | |
@@ -725,6 +728,7 @@ discard block |
||
725 | 728 | * |
726 | 729 | * @inheritdoc |
727 | 730 | * @see Gamajo_Template_Loader::locate_template() |
731 | + * @param string $template_names |
|
728 | 732 | * @return null|string NULL: Template not found; String: path to template |
729 | 733 | */ |
730 | 734 | function locate_template( $template_names, $load = false, $require_once = true ) { |
@@ -328,34 +328,34 @@ discard block |
||
328 | 328 | } |
329 | 329 | |
330 | 330 | /** |
331 | - * Get the fields for a specific context |
|
332 | - * |
|
333 | - * @since 1.19.2 |
|
334 | - * |
|
331 | + * Get the fields for a specific context |
|
332 | + * |
|
333 | + * @since 1.19.2 |
|
334 | + * |
|
335 | 335 | * @param string $context [Optional] "directory", "single", or "edit" |
336 | 336 | * |
337 | 337 | * @return array Array of GravityView field layout configurations |
338 | 338 | */ |
339 | 339 | public function getContextFields( $context = '' ) { |
340 | 340 | |
341 | - if( '' === $context ) { |
|
342 | - $context = $this->getContext(); |
|
343 | - } |
|
341 | + if( '' === $context ) { |
|
342 | + $context = $this->getContext(); |
|
343 | + } |
|
344 | 344 | |
345 | 345 | $fields = $this->getFields(); |
346 | 346 | |
347 | - foreach ( (array) $fields as $key => $context_fields ) { |
|
347 | + foreach ( (array) $fields as $key => $context_fields ) { |
|
348 | 348 | |
349 | - // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against |
|
350 | - $matches = explode( '_', $key ); |
|
349 | + // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against |
|
350 | + $matches = explode( '_', $key ); |
|
351 | 351 | |
352 | - if( isset( $matches[0] ) && $matches[0] === $context ) { |
|
353 | - return $context_fields; |
|
354 | - } |
|
355 | - } |
|
352 | + if( isset( $matches[0] ) && $matches[0] === $context ) { |
|
353 | + return $context_fields; |
|
354 | + } |
|
355 | + } |
|
356 | 356 | |
357 | 357 | return array(); |
358 | - } |
|
358 | + } |
|
359 | 359 | |
360 | 360 | /** |
361 | 361 | * @param array $fields |
@@ -448,10 +448,10 @@ discard block |
||
448 | 448 | */ |
449 | 449 | public function getPaging() { |
450 | 450 | |
451 | - $default_params = array( |
|
452 | - 'offset' => 0, |
|
453 | - 'page_size' => 20, |
|
454 | - ); |
|
451 | + $default_params = array( |
|
452 | + 'offset' => 0, |
|
453 | + 'page_size' => 20, |
|
454 | + ); |
|
455 | 455 | |
456 | 456 | return wp_parse_args( $this->paging, $default_params ); |
457 | 457 | } |
@@ -508,10 +508,10 @@ discard block |
||
508 | 508 | public function getSorting() { |
509 | 509 | |
510 | 510 | $defaults_params = array( |
511 | - 'sort_field' => 'date_created', |
|
512 | - 'sort_direction' => 'ASC', |
|
513 | - 'is_numeric' => false, |
|
514 | - ); |
|
511 | + 'sort_field' => 'date_created', |
|
512 | + 'sort_direction' => 'ASC', |
|
513 | + 'is_numeric' => false, |
|
514 | + ); |
|
515 | 515 | |
516 | 516 | return wp_parse_args( $this->sorting, $defaults_params ); |
517 | 517 | } |
@@ -837,7 +837,7 @@ discard block |
||
837 | 837 | */ |
838 | 838 | public function render_widget_hooks( $view_id_or_context ) { |
839 | 839 | |
840 | - /** |
|
840 | + /** |
|
841 | 841 | * @deprecated Numeric argument is deprecated. Pass a \GV\Template_Context instead. |
842 | 842 | */ |
843 | 843 | if ( is_numeric( $view_id_or_context ) ) { |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | die; |
17 | 17 | } |
18 | 18 | |
19 | -if( ! class_exists( '\GV\Gamajo_Template_Loader' ) ) { |
|
19 | +if ( ! class_exists( '\GV\Gamajo_Template_Loader' ) ) { |
|
20 | 20 | require( GRAVITYVIEW_DIR . 'future/lib/class-gamajo-template-loader.php' ); |
21 | 21 | } |
22 | 22 | |
@@ -157,8 +157,8 @@ discard block |
||
157 | 157 | 'atts' => NULL, |
158 | 158 | ) ); |
159 | 159 | |
160 | - foreach ($atts as $key => $value) { |
|
161 | - if( is_null( $value ) ) { |
|
160 | + foreach ( $atts as $key => $value ) { |
|
161 | + if ( is_null( $value ) ) { |
|
162 | 162 | continue; |
163 | 163 | } |
164 | 164 | $this->{$key} = $value; |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | */ |
189 | 189 | static function getInstance( $passed_post = NULL ) { |
190 | 190 | |
191 | - if( empty( self::$instance ) ) { |
|
191 | + if ( empty( self::$instance ) ) { |
|
192 | 192 | self::$instance = new self( $passed_post ); |
193 | 193 | } |
194 | 194 | |
@@ -201,8 +201,8 @@ discard block |
||
201 | 201 | */ |
202 | 202 | public function getCurrentField( $key = NULL ) { |
203 | 203 | |
204 | - if( !empty( $key ) ) { |
|
205 | - if( isset( $this->_current_field[ $key ] ) ) { |
|
204 | + if ( ! empty( $key ) ) { |
|
205 | + if ( isset( $this->_current_field[ $key ] ) ) { |
|
206 | 206 | return $this->_current_field[ $key ]; |
207 | 207 | } |
208 | 208 | return NULL; |
@@ -213,16 +213,16 @@ discard block |
||
213 | 213 | |
214 | 214 | public function setCurrentFieldSetting( $key, $value ) { |
215 | 215 | |
216 | - if( !empty( $this->_current_field ) ) { |
|
217 | - $this->_current_field['field_settings'][ $key ] = $value; |
|
216 | + if ( ! empty( $this->_current_field ) ) { |
|
217 | + $this->_current_field[ 'field_settings' ][ $key ] = $value; |
|
218 | 218 | } |
219 | 219 | |
220 | 220 | } |
221 | 221 | |
222 | 222 | public function getCurrentFieldSetting( $key ) { |
223 | - $settings = $this->getCurrentField('field_settings'); |
|
223 | + $settings = $this->getCurrentField( 'field_settings' ); |
|
224 | 224 | |
225 | - if( $settings && !empty( $settings[ $key ] ) ) { |
|
225 | + if ( $settings && ! empty( $settings[ $key ] ) ) { |
|
226 | 226 | return $settings[ $key ]; |
227 | 227 | } |
228 | 228 | |
@@ -253,8 +253,8 @@ discard block |
||
253 | 253 | */ |
254 | 254 | public function getAtts( $key = NULL ) { |
255 | 255 | |
256 | - if( !empty( $key ) ) { |
|
257 | - if( isset( $this->atts[ $key ] ) ) { |
|
256 | + if ( ! empty( $key ) ) { |
|
257 | + if ( isset( $this->atts[ $key ] ) ) { |
|
258 | 258 | return $this->atts[ $key ]; |
259 | 259 | } |
260 | 260 | return NULL; |
@@ -320,7 +320,7 @@ discard block |
||
320 | 320 | |
321 | 321 | $fields = empty( $this->fields ) ? NULL : $this->fields; |
322 | 322 | |
323 | - if( $fields && !empty( $key ) ) { |
|
323 | + if ( $fields && ! empty( $key ) ) { |
|
324 | 324 | $fields = isset( $fields[ $key ] ) ? $fields[ $key ] : NULL; |
325 | 325 | } |
326 | 326 | |
@@ -338,18 +338,18 @@ discard block |
||
338 | 338 | */ |
339 | 339 | public function getContextFields( $context = '' ) { |
340 | 340 | |
341 | - if( '' === $context ) { |
|
341 | + if ( '' === $context ) { |
|
342 | 342 | $context = $this->getContext(); |
343 | 343 | } |
344 | 344 | |
345 | 345 | $fields = $this->getFields(); |
346 | 346 | |
347 | - foreach ( (array) $fields as $key => $context_fields ) { |
|
347 | + foreach ( (array)$fields as $key => $context_fields ) { |
|
348 | 348 | |
349 | 349 | // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against |
350 | 350 | $matches = explode( '_', $key ); |
351 | 351 | |
352 | - if( isset( $matches[0] ) && $matches[0] === $context ) { |
|
352 | + if ( isset( $matches[ 0 ] ) && $matches[ 0 ] === $context ) { |
|
353 | 353 | return $context_fields; |
354 | 354 | } |
355 | 355 | } |
@@ -370,8 +370,8 @@ discard block |
||
370 | 370 | */ |
371 | 371 | public function getField( $key ) { |
372 | 372 | |
373 | - if( !empty( $key ) ) { |
|
374 | - if( isset( $this->fields[ $key ] ) ) { |
|
373 | + if ( ! empty( $key ) ) { |
|
374 | + if ( isset( $this->fields[ $key ] ) ) { |
|
375 | 375 | return $this->fields[ $key ]; |
376 | 376 | } |
377 | 377 | } |
@@ -477,8 +477,8 @@ discard block |
||
477 | 477 | public function getPaginationCounts() { |
478 | 478 | |
479 | 479 | $paging = $this->getPaging(); |
480 | - $offset = $paging['offset']; |
|
481 | - $page_size = $paging['page_size']; |
|
480 | + $offset = $paging[ 'offset' ]; |
|
481 | + $page_size = $paging[ 'page_size' ]; |
|
482 | 482 | $total = $this->getTotalEntries(); |
483 | 483 | |
484 | 484 | if ( empty( $total ) ) { |
@@ -499,7 +499,7 @@ discard block |
||
499 | 499 | */ |
500 | 500 | list( $first, $last, $total ) = apply_filters( 'gravityview_pagination_counts', array( $first, $last, $total ) ); |
501 | 501 | |
502 | - return array( 'first' => (int) $first, 'last' => (int) $last, 'total' => (int) $total ); |
|
502 | + return array( 'first' => (int)$first, 'last' => (int)$last, 'total' => (int)$total ); |
|
503 | 503 | } |
504 | 504 | |
505 | 505 | /** |
@@ -595,16 +595,16 @@ discard block |
||
595 | 595 | */ |
596 | 596 | public function getCurrentEntry() { |
597 | 597 | |
598 | - if( in_array( $this->getContext(), array( 'edit', 'single') ) ) { |
|
598 | + if ( in_array( $this->getContext(), array( 'edit', 'single' ) ) ) { |
|
599 | 599 | $entries = $this->getEntries(); |
600 | - $entry = $entries[0]; |
|
600 | + $entry = $entries[ 0 ]; |
|
601 | 601 | } else { |
602 | 602 | $entry = $this->_current_entry; |
603 | 603 | } |
604 | 604 | |
605 | 605 | /** @since 1.16 Fixes DataTables empty entry issue */ |
606 | - if ( empty( $entry ) && ! empty( $this->_current_field['entry'] ) ) { |
|
607 | - $entry = $this->_current_field['entry']; |
|
606 | + if ( empty( $entry ) && ! empty( $this->_current_field[ 'entry' ] ) ) { |
|
607 | + $entry = $this->_current_field[ 'entry' ]; |
|
608 | 608 | } |
609 | 609 | |
610 | 610 | return $entry; |
@@ -644,7 +644,7 @@ discard block |
||
644 | 644 | public function renderZone( $zone = '', $atts = array(), $echo = true ) { |
645 | 645 | |
646 | 646 | if ( empty( $zone ) ) { |
647 | - gravityview()->log->error( 'No zone defined.'); |
|
647 | + gravityview()->log->error( 'No zone defined.' ); |
|
648 | 648 | return NULL; |
649 | 649 | } |
650 | 650 | |
@@ -653,16 +653,16 @@ discard block |
||
653 | 653 | 'context' => $this->getContext(), |
654 | 654 | 'entry' => $this->getCurrentEntry(), |
655 | 655 | 'form' => $this->getForm(), |
656 | - 'hide_empty' => $this->getAtts('hide_empty'), |
|
656 | + 'hide_empty' => $this->getAtts( 'hide_empty' ), |
|
657 | 657 | ); |
658 | 658 | |
659 | 659 | $final_atts = wp_parse_args( $atts, $defaults ); |
660 | 660 | |
661 | 661 | $output = ''; |
662 | 662 | |
663 | - $final_atts['zone_id'] = "{$final_atts['context']}_{$final_atts['slug']}-{$zone}"; |
|
663 | + $final_atts[ 'zone_id' ] = "{$final_atts[ 'context' ]}_{$final_atts[ 'slug' ]}-{$zone}"; |
|
664 | 664 | |
665 | - $fields = $this->getField( $final_atts['zone_id'] ); |
|
665 | + $fields = $this->getField( $final_atts[ 'zone_id' ] ); |
|
666 | 666 | |
667 | 667 | // Backward compatibility |
668 | 668 | if ( 'table' === $this->getTemplatePartSlug() ) { |
@@ -672,19 +672,19 @@ discard block |
||
672 | 672 | * @param \GravityView_View $this |
673 | 673 | * @deprecated Use `gravityview/template/table/fields` |
674 | 674 | */ |
675 | - $fields = apply_filters("gravityview_table_cells", $fields, $this ); |
|
675 | + $fields = apply_filters( "gravityview_table_cells", $fields, $this ); |
|
676 | 676 | } |
677 | 677 | |
678 | 678 | if ( empty( $fields ) ) { |
679 | 679 | |
680 | - gravityview()->log->error( 'Empty zone configuration for {zone_id}.', array( 'zone_id' => $final_atts['zone_id'] ) ); |
|
680 | + gravityview()->log->error( 'Empty zone configuration for {zone_id}.', array( 'zone_id' => $final_atts[ 'zone_id' ] ) ); |
|
681 | 681 | |
682 | 682 | return NULL; |
683 | 683 | } |
684 | 684 | |
685 | 685 | $field_output = ''; |
686 | 686 | foreach ( $fields as $field ) { |
687 | - $final_atts['field'] = $field; |
|
687 | + $final_atts[ 'field' ] = $field; |
|
688 | 688 | |
689 | 689 | $field_output .= gravityview_field_output( $final_atts ); |
690 | 690 | } |
@@ -701,17 +701,17 @@ discard block |
||
701 | 701 | return NULL; |
702 | 702 | } |
703 | 703 | |
704 | - if( !empty( $final_atts['wrapper_class'] ) ) { |
|
705 | - $output .= '<div class="'.gravityview_sanitize_html_class( $final_atts['wrapper_class'] ).'">'; |
|
704 | + if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) { |
|
705 | + $output .= '<div class="' . gravityview_sanitize_html_class( $final_atts[ 'wrapper_class' ] ) . '">'; |
|
706 | 706 | } |
707 | 707 | |
708 | 708 | $output .= $field_output; |
709 | 709 | |
710 | - if( !empty( $final_atts['wrapper_class'] ) ) { |
|
710 | + if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) { |
|
711 | 711 | $output .= '</div>'; |
712 | 712 | } |
713 | 713 | |
714 | - if( $echo ) { |
|
714 | + if ( $echo ) { |
|
715 | 715 | echo $output; |
716 | 716 | } |
717 | 717 | |
@@ -729,7 +729,7 @@ discard block |
||
729 | 729 | */ |
730 | 730 | function locate_template( $template_names, $load = false, $require_once = true ) { |
731 | 731 | |
732 | - if( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) { |
|
732 | + if ( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) { |
|
733 | 733 | |
734 | 734 | $located = $this->located_templates[ $template_names ]; |
735 | 735 | |
@@ -738,7 +738,7 @@ discard block |
||
738 | 738 | // Set $load to always false so we handle it here. |
739 | 739 | $located = parent::locate_template( $template_names, false, $require_once ); |
740 | 740 | |
741 | - if( is_string( $template_names ) ) { |
|
741 | + if ( is_string( $template_names ) ) { |
|
742 | 742 | $this->located_templates[ $template_names ] = $located; |
743 | 743 | } |
744 | 744 | } |
@@ -756,7 +756,7 @@ discard block |
||
756 | 756 | * @return mixed|null The stored data. |
757 | 757 | */ |
758 | 758 | public function __get( $name ) { |
759 | - if( isset( $this->{$name} ) ) { |
|
759 | + if ( isset( $this->{$name} ) ) { |
|
760 | 760 | return $this->{$name}; |
761 | 761 | } else { |
762 | 762 | return NULL; |
@@ -785,17 +785,17 @@ discard block |
||
785 | 785 | $additional = array(); |
786 | 786 | |
787 | 787 | // form-19-table-body.php |
788 | - $additional[] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name ); |
|
788 | + $additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name ); |
|
789 | 789 | |
790 | - if( $view_id = $this->getViewId() ) { |
|
790 | + if ( $view_id = $this->getViewId() ) { |
|
791 | 791 | // view-3-table-body.php |
792 | - $additional[] = sprintf( 'view-%d-%s-%s.php', $view_id, $slug, $name ); |
|
792 | + $additional[ ] = sprintf( 'view-%d-%s-%s.php', $view_id, $slug, $name ); |
|
793 | 793 | } |
794 | 794 | |
795 | - if( $this->getPostId() ) { |
|
795 | + if ( $this->getPostId() ) { |
|
796 | 796 | |
797 | 797 | // page-19-table-body.php |
798 | - $additional[] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name ); |
|
798 | + $additional[ ] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name ); |
|
799 | 799 | } |
800 | 800 | |
801 | 801 | // Combine with existing table-body.php and table.php |
@@ -817,7 +817,7 @@ discard block |
||
817 | 817 | |
818 | 818 | gravityview()->log->debug( 'Rendering Template File: {path}', array( 'path' => $template_file ) ); |
819 | 819 | |
820 | - if( !empty( $template_file) ) { |
|
820 | + if ( ! empty( $template_file ) ) { |
|
821 | 821 | |
822 | 822 | if ( $require_once ) { |
823 | 823 | require_once( $template_file ); |
@@ -892,7 +892,7 @@ discard block |
||
892 | 892 | |
893 | 893 | // Prevent being called twice |
894 | 894 | if ( did_action( "gravityview/widgets/$zone/{$view->ID}/rendered" ) ) { |
895 | - gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone.'_'.$view->ID.'_widgets' ) ); |
|
895 | + gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone . '_' . $view->ID . '_widgets' ) ); |
|
896 | 896 | return; |
897 | 897 | } |
898 | 898 | |
@@ -914,7 +914,7 @@ discard block |
||
914 | 914 | * @param string $zone Current widget zone, either `header` or `footer` |
915 | 915 | * @param array $widgets Array of widget configurations for the current zone, as set by `gravityview_get_current_view_data()['widgets']` |
916 | 916 | */ |
917 | - $css_class = apply_filters('gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() ); |
|
917 | + $css_class = apply_filters( 'gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() ); |
|
918 | 918 | |
919 | 919 | $css_class = gravityview_sanitize_html_class( $css_class ); |
920 | 920 | |
@@ -922,15 +922,15 @@ discard block |
||
922 | 922 | ?> |
923 | 923 | <div class="<?php echo $css_class; ?>"> |
924 | 924 | <?php |
925 | - foreach( $rows as $row ) { |
|
926 | - foreach( $row as $col => $areas ) { |
|
925 | + foreach ( $rows as $row ) { |
|
926 | + foreach ( $row as $col => $areas ) { |
|
927 | 927 | $column = ( $col == '2-2' ) ? '1-2 gv-right' : "$col gv-left"; |
928 | 928 | ?> |
929 | 929 | <div class="gv-grid-col-<?php echo esc_attr( $column ); ?>"> |
930 | 930 | <?php |
931 | 931 | if ( ! empty( $areas ) ) { |
932 | 932 | foreach ( $areas as $area ) { |
933 | - foreach ( $widgets->by_position( $zone . '_' . $area['areaid'] )->all() as $widget ) { |
|
933 | + foreach ( $widgets->by_position( $zone . '_' . $area[ 'areaid' ] )->all() as $widget ) { |
|
934 | 934 | do_action( sprintf( 'gravityview/widgets/%s/render', $widget->get_widget_id() ), $widget->configuration->all(), null, $view_id_or_context ); |
935 | 935 | } |
936 | 936 | } |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | * |
59 | 59 | * @see GVCommon::get_form_fields() |
60 | 60 | * @access public |
61 | - * @param string|array $form_id (default: '') or $form object |
|
61 | + * @param string|array $form (default: '') or $form object |
|
62 | 62 | * @return array |
63 | 63 | */ |
64 | 64 | function gravityview_get_form_fields( $form = '', $add_default_properties = false, $include_parent_field = true ) { |
@@ -108,7 +108,6 @@ discard block |
||
108 | 108 | * Since 1.4, supports custom entry slugs. The way that GravityView fetches an entry based on the custom slug is by searching `gravityview_unique_id` meta. The `$entry_slug` is fetched by getting the current query var set by `is_single_entry()` |
109 | 109 | * |
110 | 110 | * @access public |
111 | - * @param mixed $entry_id |
|
112 | 111 | * @param boolean $force_allow_ids Force the get_entry() method to allow passed entry IDs, even if the `gravityview_custom_entry_slug_allow_id` filter returns false. |
113 | 112 | * @param boolean $check_entry_display Check whether the entry is visible for the current View configuration. Default: true {@since 1.14} |
114 | 113 | * @return array|boolean |
@@ -202,7 +201,6 @@ discard block |
||
202 | 201 | * |
203 | 202 | * @see GravityView_Template::template_id |
204 | 203 | * |
205 | - * @param int $view_id The ID of the View to get the layout of |
|
206 | 204 | * |
207 | 205 | * @return string GravityView_Template::template_id value. Empty string if not. |
208 | 206 | */ |
@@ -333,8 +333,8 @@ discard block |
||
333 | 333 | * @param mixed $field_id Field ID or Field array |
334 | 334 | * @return string field type |
335 | 335 | */ |
336 | -function gravityview_get_field_type( $form = null , $field_id = '' ) { |
|
337 | - return GVCommon::get_field_type( $form, $field_id ); |
|
336 | +function gravityview_get_field_type( $form = null, $field_id = '' ) { |
|
337 | + return GVCommon::get_field_type( $form, $field_id ); |
|
338 | 338 | } |
339 | 339 | |
340 | 340 | |
@@ -347,8 +347,8 @@ discard block |
||
347 | 347 | * @return string HTML of the output. Empty string if $view_id is empty. |
348 | 348 | */ |
349 | 349 | function get_gravityview( $view_id = '', $atts = array() ) { |
350 | - if( !empty( $view_id ) ) { |
|
351 | - $atts['id'] = $view_id; |
|
350 | + if ( ! empty( $view_id ) ) { |
|
351 | + $atts[ 'id' ] = $view_id; |
|
352 | 352 | $args = wp_parse_args( $atts, \GV\View_Settings::defaults() ); |
353 | 353 | $GravityView_frontend = GravityView_frontend::getInstance(); |
354 | 354 | $GravityView_frontend->setGvOutputData( GravityView_View_Data::getInstance( $view_id ) ); |
@@ -391,19 +391,19 @@ discard block |
||
391 | 391 | */ |
392 | 392 | function gravityview_view_has_single_checkbox_or_radio( $form, $view_fields ) { |
393 | 393 | |
394 | - if( class_exists('GFFormsModel') && $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) { |
|
394 | + if ( class_exists( 'GFFormsModel' ) && $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) { |
|
395 | 395 | |
396 | 396 | /** @var GF_Field_Radio|GF_Field_Checkbox $form_field */ |
397 | - foreach( $form_fields as $form_field ) { |
|
397 | + foreach ( $form_fields as $form_field ) { |
|
398 | 398 | $field_id = $form_field->id; |
399 | - foreach( $view_fields as $zone ) { |
|
399 | + foreach ( $view_fields as $zone ) { |
|
400 | 400 | |
401 | 401 | // ACF compatibility; ACF-added fields aren't arrays |
402 | 402 | if ( ! is_array( $zone ) ) { continue; } |
403 | 403 | |
404 | - foreach( $zone as $field ) { |
|
404 | + foreach ( $zone as $field ) { |
|
405 | 405 | // If it's an input, not the parent and the parent ID matches a checkbox or radio |
406 | - if( ( strpos( $field['id'], '.' ) > 0 ) && floor( $field['id'] ) === floor( $field_id ) ) { |
|
406 | + if ( ( strpos( $field[ 'id' ], '.' ) > 0 ) && floor( $field[ 'id' ] ) === floor( $field_id ) ) { |
|
407 | 407 | return true; |
408 | 408 | } |
409 | 409 | } |
@@ -45,7 +45,6 @@ discard block |
||
45 | 45 | * Trick the GF fileupload field to render with the proper HTML ID to enable the plupload JS to work properly |
46 | 46 | * |
47 | 47 | * @param array $form The Form Object currently being processed. |
48 | - * @param string|array $value The field value. From default/dynamic population, $_POST, or a resumed incomplete submission. |
|
49 | 48 | * @param null|array $entry Null or the Entry Object currently being edited. |
50 | 49 | * @param GF_Field_FileUpload $field Gravity Forms field |
51 | 50 | * |
@@ -74,6 +73,7 @@ discard block |
||
74 | 73 | * |
75 | 74 | * @since 2.0 |
76 | 75 | * @param \GV\Template_Context The context. |
76 | + * @param GV\Template_Context $context |
|
77 | 77 | * |
78 | 78 | * @return array Array of file output, with `file_path` and `html` keys (see comments above) |
79 | 79 | */ |
@@ -24,21 +24,21 @@ discard block |
||
24 | 24 | |
25 | 25 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
26 | 26 | |
27 | - unset( $field_options['search_filter'] ); |
|
27 | + unset( $field_options[ 'search_filter' ] ); |
|
28 | 28 | |
29 | - if( 'edit' === $context ) { |
|
29 | + if ( 'edit' === $context ) { |
|
30 | 30 | return $field_options; |
31 | 31 | } |
32 | 32 | |
33 | - $add_options['link_to_file'] = array( |
|
33 | + $add_options[ 'link_to_file' ] = array( |
|
34 | 34 | 'type' => 'checkbox', |
35 | 35 | 'label' => __( 'Display as a Link:', 'gravityview' ), |
36 | - 'desc' => __('Display the uploaded files as links, rather than embedded content.', 'gravityview'), |
|
36 | + 'desc' => __( 'Display the uploaded files as links, rather than embedded content.', 'gravityview' ), |
|
37 | 37 | 'value' => false, |
38 | 38 | 'merge_tags' => false, |
39 | 39 | ); |
40 | 40 | |
41 | - $add_options['image_width'] = array( |
|
41 | + $add_options[ 'image_width' ] = array( |
|
42 | 42 | 'type' => 'text', |
43 | 43 | 'label' => __( 'Custom Width:', 'gravityview' ), |
44 | 44 | 'desc' => __( 'Override the default image width (250).', 'gravityview' ), |
@@ -127,14 +127,14 @@ discard block |
||
127 | 127 | $base_id = null; |
128 | 128 | |
129 | 129 | $is_single = gravityview_get_context() === 'single'; |
130 | - $lightbox = ! empty( $gravityview_view->atts['lightbox'] ); |
|
130 | + $lightbox = ! empty( $gravityview_view->atts[ 'lightbox' ] ); |
|
131 | 131 | $field_compat = $gravityview_view->getCurrentField(); |
132 | 132 | } |
133 | 133 | |
134 | 134 | $output_arr = array(); |
135 | 135 | |
136 | 136 | // Get an array of file paths for the field. |
137 | - $file_paths = \GV\Utils::get( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value ); |
|
137 | + $file_paths = \GV\Utils::get( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value ); |
|
138 | 138 | |
139 | 139 | // The $value JSON was probably truncated; let's check lead_detail_long. |
140 | 140 | if ( ! is_array( $file_paths ) ) { |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | $rendered = null; |
154 | 154 | |
155 | 155 | // If the site is HTTPS, use HTTPS |
156 | - if ( function_exists('set_url_scheme') ) { |
|
156 | + if ( function_exists( 'set_url_scheme' ) ) { |
|
157 | 157 | $file_path = set_url_scheme( $file_path ); |
158 | 158 | } |
159 | 159 | |
@@ -164,8 +164,8 @@ discard block |
||
164 | 164 | $file_path_info = pathinfo( $file_path ); |
165 | 165 | |
166 | 166 | // If pathinfo() gave us the extension of the file, run the switch statement using that. |
167 | - $extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] ); |
|
168 | - $basename = $file_path_info['basename']; |
|
167 | + $extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] ); |
|
168 | + $basename = $file_path_info[ 'basename' ]; |
|
169 | 169 | |
170 | 170 | // Get the secure download URL |
171 | 171 | $is_secure = false; |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | */ |
203 | 203 | $audio_settings = apply_filters( 'gravityview_audio_settings', array( |
204 | 204 | 'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension |
205 | - 'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id'] |
|
205 | + 'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ] |
|
206 | 206 | ), $context ); |
207 | 207 | |
208 | 208 | /** |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | */ |
239 | 239 | $video_settings = apply_filters( 'gravityview_video_settings', array( |
240 | 240 | 'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension |
241 | - 'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id'] |
|
241 | + 'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ] |
|
242 | 242 | ), $context ); |
243 | 243 | |
244 | 244 | /** |
@@ -271,13 +271,13 @@ discard block |
||
271 | 271 | $width = \GV\Utils::get( $field_settings, 'image_width', 250 ); |
272 | 272 | $image_atts = array( |
273 | 273 | 'src' => $file_path, |
274 | - 'class' => 'gv-image gv-field-id-' . $field_settings['id'], |
|
275 | - 'alt' => $field_settings['label'], |
|
276 | - 'width' => ( $is_single ? null : ( $width ? $width: 250 ) ) |
|
274 | + 'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ], |
|
275 | + 'alt' => $field_settings[ 'label' ], |
|
276 | + 'width' => ( $is_single ? null : ( $width ? $width : 250 ) ) |
|
277 | 277 | ); |
278 | 278 | |
279 | 279 | if ( $is_secure ) { |
280 | - $image_atts['validate_src'] = false; |
|
280 | + $image_atts[ 'validate_src' ] = false; |
|
281 | 281 | } |
282 | 282 | |
283 | 283 | /** |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | |
293 | 293 | $image = new GravityView_Image( $image_atts ); |
294 | 294 | |
295 | - $entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry ); |
|
295 | + $entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry ); |
|
296 | 296 | |
297 | 297 | /** |
298 | 298 | * @filter `gravityview/fields/fileupload/allow_insecure_lightbox` Allow insecure links to be shown for the lighbox. |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | */ |
304 | 304 | $override_security = apply_filters( 'gravityview/fields/fileupload/allow_insecure_lightbox', false, $file_path, $field_settings, $context ); |
305 | 305 | |
306 | - if ( $lightbox && empty( $field_settings['show_as_link'] ) && ( ! $is_secure || $override_security ) ) { |
|
306 | + if ( $lightbox && empty( $field_settings[ 'show_as_link' ] ) && ( ! $is_secure || $override_security ) ) { |
|
307 | 307 | $lightbox_link_atts = array( |
308 | 308 | 'rel' => sprintf( "%s-%s", $gv_class, $entry_slug ), |
309 | 309 | 'class' => 'thickbox', |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | $lightbox_link_atts = apply_filters( 'gravityview/fields/fileupload/link_atts', $lightbox_link_atts, $field_compat, $context ); |
313 | 313 | |
314 | 314 | if ( $override_security ) { |
315 | - $image_atts['src'] = $insecure_file_path; |
|
315 | + $image_atts[ 'src' ] = $insecure_file_path; |
|
316 | 316 | $image = new GravityView_Image( $image_atts ); |
317 | 317 | $file_path = $insecure_file_path; |
318 | 318 | // :( a kitten died somewhere |
@@ -324,7 +324,7 @@ discard block |
||
324 | 324 | } |
325 | 325 | |
326 | 326 | // Show as link should render the image regardless. |
327 | - if ( ! empty( $field_settings['show_as_link'] ) ) { |
|
327 | + if ( ! empty( $field_settings[ 'show_as_link' ] ) ) { |
|
328 | 328 | $text = $rendered; |
329 | 329 | } |
330 | 330 | } |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | $disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', false, $field_compat, $context ); |
342 | 342 | |
343 | 343 | // Output textualized content where |
344 | - if ( ! $disable_wrapped_link && ( ! empty( $field_settings['link_to_file'] ) || ! empty( $field_settings['show_as_link'] ) ) ) { |
|
344 | + if ( ! $disable_wrapped_link && ( ! empty( $field_settings[ 'link_to_file' ] ) || ! empty( $field_settings[ 'show_as_link' ] ) ) ) { |
|
345 | 345 | /** |
346 | 346 | * Modify the link text (defaults to the file name) |
347 | 347 | * |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | */ |
355 | 355 | $content = apply_filters( 'gravityview/fields/fileupload/link_content', $text, $field_compat, $context ); |
356 | 356 | |
357 | - if ( empty( $field_settings['show_as_link'] ) ) { |
|
357 | + if ( empty( $field_settings[ 'show_as_link' ] ) ) { |
|
358 | 358 | /** |
359 | 359 | * @filter `gravityview/fields/fileupload/link_atts` Modify the link attributes for a file upload field |
360 | 360 | * @param array|string $link_atts Array or attributes string |
@@ -370,7 +370,7 @@ discard block |
||
370 | 370 | $content = empty( $rendered ) ? $text : $rendered; |
371 | 371 | } |
372 | 372 | |
373 | - $output_arr[] = array( |
|
373 | + $output_arr[ ] = array( |
|
374 | 374 | 'file_path' => $file_path, |
375 | 375 | 'content' => $content |
376 | 376 | ); |
@@ -72,7 +72,7 @@ |
||
72 | 72 | * |
73 | 73 | * @param mixed $value The value in. |
74 | 74 | * |
75 | - * @return mixed The value out. |
|
75 | + * @return string The value out. |
|
76 | 76 | */ |
77 | 77 | public function get_value( $value ) { |
78 | 78 | return $this->get_string_from_value( $value ); |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | public function get_content( $output, $entry = array(), $field_settings = array(), $field = array() ) { |
61 | 61 | |
62 | 62 | /** Overridden by a template. */ |
63 | - if( ! empty( $field['field_path'] ) ) { return $output; } |
|
63 | + if ( ! empty( $field[ 'field_path' ] ) ) { return $output; } |
|
64 | 64 | |
65 | 65 | return $this->get_string_from_value( $output ); |
66 | 66 | } |
@@ -92,11 +92,11 @@ discard block |
||
92 | 92 | switch ( intval( $value ) ) { |
93 | 93 | case self::NOT_FULFILLED: |
94 | 94 | default: |
95 | - $return = __('Not Fulfilled', 'gravityview'); |
|
95 | + $return = __( 'Not Fulfilled', 'gravityview' ); |
|
96 | 96 | break; |
97 | 97 | |
98 | 98 | case self::FULFILLED: |
99 | - $return = __('Fulfilled', 'gravityview'); |
|
99 | + $return = __( 'Fulfilled', 'gravityview' ); |
|
100 | 100 | break; |
101 | 101 | } |
102 | 102 | |
@@ -116,13 +116,13 @@ discard block |
||
116 | 116 | * |
117 | 117 | * @return string Original text if {is_fulfilled} isn't found. Otherwise, "Not Fulfilled" or "Fulfilled" |
118 | 118 | */ |
119 | - public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) { |
|
119 | + public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) { |
|
120 | 120 | |
121 | 121 | $return = $text; |
122 | 122 | |
123 | 123 | foreach ( $matches as $match ) { |
124 | 124 | |
125 | - $full_tag = $match[0]; |
|
125 | + $full_tag = $match[ 0 ]; |
|
126 | 126 | |
127 | 127 | $fulfilled = \GV\Utils::get( $entry, 'is_fulfilled' ); |
128 | 128 |
@@ -69,7 +69,7 @@ |
||
69 | 69 | * @param \GV\Entry $entry The entry. |
70 | 70 | * @param \GV\Request $request The request context. |
71 | 71 | * |
72 | - * @return mixed $value The filtered value. |
|
72 | + * @return string $value The filtered value. |
|
73 | 73 | */ |
74 | 74 | public function get_value( $value, $field, $view, $source, $entry, $request ) { |
75 | 75 | return $this->get_content( $value, $entry->as_entry(), $field->as_configuration() ); |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | public function get_content( $output = '', $entry = array(), $field_settings = array(), $field = array() ) { |
50 | 50 | |
51 | 51 | /** Overridden by a template. */ |
52 | - if( ! empty( $field['field_path'] ) ) { return $output; } |
|
52 | + if ( ! empty( $field[ 'field_path' ] ) ) { return $output; } |
|
53 | 53 | |
54 | 54 | $amount = \GV\Utils::get( $entry, 'payment_amount' ); |
55 | 55 | $return = GFCommon::to_money( $amount, \GV\Utils::get( $entry, 'currency' ) ); |
@@ -88,14 +88,14 @@ discard block |
||
88 | 88 | * |
89 | 89 | * @return string Original text if {date_created} isn't found. Otherwise, replaced text. |
90 | 90 | */ |
91 | - public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) { |
|
91 | + public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) { |
|
92 | 92 | |
93 | 93 | $return = $text; |
94 | 94 | |
95 | 95 | foreach ( $matches as $match ) { |
96 | 96 | |
97 | - $full_tag = $match[0]; |
|
98 | - $modifier = isset( $match[1] ) ? $match[1] : false; |
|
97 | + $full_tag = $match[ 0 ]; |
|
98 | + $modifier = isset( $match[ 1 ] ) ? $match[ 1 ] : false; |
|
99 | 99 | |
100 | 100 | $amount = \GV\Utils::get( $entry, 'payment_amount' ); |
101 | 101 |
@@ -2,7 +2,9 @@ |
||
2 | 2 | namespace GV; |
3 | 3 | |
4 | 4 | // Exit if accessed directly |
5 | -if ( ! defined( 'ABSPATH' ) ) exit; |
|
5 | +if ( ! defined( 'ABSPATH' ) ) { |
|
6 | + exit; |
|
7 | +} |
|
6 | 8 | |
7 | 9 | /** |
8 | 10 | * Allows plugins to use their own update API. |
@@ -78,7 +78,7 @@ |
||
78 | 78 | * @uses api_request() |
79 | 79 | * |
80 | 80 | * @param array $_transient_data Update array build by WordPress. |
81 | - * @return array Modified update array with custom plugin data. |
|
81 | + * @return \stdClass Modified update array with custom plugin data. |
|
82 | 82 | */ |
83 | 83 | public function check_update( $_transient_data ) { |
84 | 84 |
@@ -40,10 +40,10 @@ discard block |
||
40 | 40 | $this->api_data = $_api_data; |
41 | 41 | $this->name = plugin_basename( $_plugin_file ); |
42 | 42 | $this->slug = basename( $_plugin_file, '.php' ); |
43 | - $this->version = $_api_data['version']; |
|
44 | - $this->wp_override = isset( $_api_data['wp_override'] ) ? (bool) $_api_data['wp_override'] : false; |
|
45 | - $this->beta = ! empty( $this->api_data['beta'] ) ? true : false; |
|
46 | - $this->cache_key = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) ); |
|
43 | + $this->version = $_api_data[ 'version' ]; |
|
44 | + $this->wp_override = isset( $_api_data[ 'wp_override' ] ) ? (bool)$_api_data[ 'wp_override' ] : false; |
|
45 | + $this->beta = ! empty( $this->api_data[ 'beta' ] ) ? true : false; |
|
46 | + $this->cache_key = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) ); |
|
47 | 47 | |
48 | 48 | $edd_plugin_data[ $this->slug ] = $this->api_data; |
49 | 49 | |
@@ -147,11 +147,11 @@ discard block |
||
147 | 147 | return; |
148 | 148 | } |
149 | 149 | |
150 | - if( ! current_user_can( 'update_plugins' ) ) { |
|
150 | + if ( ! current_user_can( 'update_plugins' ) ) { |
|
151 | 151 | return; |
152 | 152 | } |
153 | 153 | |
154 | - if( ! is_multisite() ) { |
|
154 | + if ( ! is_multisite() ) { |
|
155 | 155 | return; |
156 | 156 | } |
157 | 157 | |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | '<a target="_blank" class="thickbox" href="' . esc_url( $changelog_link ) . '">', |
248 | 248 | esc_html( $version_info->new_version ), |
249 | 249 | '</a>', |
250 | - '<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) .'">', |
|
250 | + '<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) . '">', |
|
251 | 251 | '</a>' |
252 | 252 | ); |
253 | 253 | } |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | ) |
293 | 293 | ); |
294 | 294 | |
295 | - $cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) ); |
|
295 | + $cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) ); |
|
296 | 296 | |
297 | 297 | // Get the transient where we store the api request for this plugin for 24 hours |
298 | 298 | $edd_api_request_transient = $this->get_cached_version_info( $cache_key ); |
@@ -333,7 +333,7 @@ discard block |
||
333 | 333 | $_data->contributors = $this->convert_object_to_array( $_data->contributors ); |
334 | 334 | } |
335 | 335 | |
336 | - if( ! isset( $_data->plugin ) ) { |
|
336 | + if ( ! isset( $_data->plugin ) ) { |
|
337 | 337 | $_data->plugin = $this->name; |
338 | 338 | } |
339 | 339 | |
@@ -372,7 +372,7 @@ discard block |
||
372 | 372 | |
373 | 373 | $verify_ssl = $this->verify_ssl(); |
374 | 374 | if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) { |
375 | - $args['sslverify'] = $verify_ssl; |
|
375 | + $args[ 'sslverify' ] = $verify_ssl; |
|
376 | 376 | } |
377 | 377 | return $args; |
378 | 378 | |
@@ -400,9 +400,9 @@ discard block |
||
400 | 400 | if ( ! is_array( $edd_plugin_url_available ) || ! isset( $edd_plugin_url_available[ $store_hash ] ) ) { |
401 | 401 | $test_url_parts = parse_url( $this->api_url ); |
402 | 402 | |
403 | - $scheme = ! empty( $test_url_parts['scheme'] ) ? $test_url_parts['scheme'] : 'http'; |
|
404 | - $host = ! empty( $test_url_parts['host'] ) ? $test_url_parts['host'] : ''; |
|
405 | - $port = ! empty( $test_url_parts['port'] ) ? ':' . $test_url_parts['port'] : ''; |
|
403 | + $scheme = ! empty( $test_url_parts[ 'scheme' ] ) ? $test_url_parts[ 'scheme' ] : 'http'; |
|
404 | + $host = ! empty( $test_url_parts[ 'host' ] ) ? $test_url_parts[ 'host' ] : ''; |
|
405 | + $port = ! empty( $test_url_parts[ 'port' ] ) ? ':' . $test_url_parts[ 'port' ] : ''; |
|
406 | 406 | |
407 | 407 | if ( empty( $host ) ) { |
408 | 408 | $edd_plugin_url_available[ $store_hash ] = false; |
@@ -419,27 +419,27 @@ discard block |
||
419 | 419 | |
420 | 420 | $data = array_merge( $this->api_data, $_data ); |
421 | 421 | |
422 | - if ( $data['slug'] != $this->slug ) { |
|
422 | + if ( $data[ 'slug' ] != $this->slug ) { |
|
423 | 423 | return; |
424 | 424 | } |
425 | 425 | |
426 | - if( $this->api_url == trailingslashit ( home_url() ) ) { |
|
426 | + if ( $this->api_url == trailingslashit( home_url() ) ) { |
|
427 | 427 | return false; // Don't allow a plugin to ping itself |
428 | 428 | } |
429 | 429 | |
430 | 430 | $api_params = array( |
431 | 431 | 'edd_action' => 'get_version', |
432 | - 'license' => ! empty( $data['license'] ) ? $data['license'] : '', |
|
433 | - 'item_name' => isset( $data['item_name'] ) ? $data['item_name'] : false, |
|
434 | - 'item_id' => isset( $data['item_id'] ) ? $data['item_id'] : false, |
|
435 | - 'version' => isset( $data['version'] ) ? $data['version'] : false, |
|
436 | - 'slug' => $data['slug'], |
|
437 | - 'author' => $data['author'], |
|
432 | + 'license' => ! empty( $data[ 'license' ] ) ? $data[ 'license' ] : '', |
|
433 | + 'item_name' => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false, |
|
434 | + 'item_id' => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false, |
|
435 | + 'version' => isset( $data[ 'version' ] ) ? $data[ 'version' ] : false, |
|
436 | + 'slug' => $data[ 'slug' ], |
|
437 | + 'author' => $data[ 'author' ], |
|
438 | 438 | 'url' => home_url(), |
439 | - 'beta' => ! empty( $data['beta'] ), |
|
439 | + 'beta' => ! empty( $data[ 'beta' ] ), |
|
440 | 440 | ); |
441 | 441 | |
442 | - $request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) ); |
|
442 | + $request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) ); |
|
443 | 443 | |
444 | 444 | if ( ! is_wp_error( $request ) ) { |
445 | 445 | $request = json_decode( wp_remote_retrieve_body( $request ) ); |
@@ -459,9 +459,9 @@ discard block |
||
459 | 459 | $request->icons = maybe_unserialize( $request->icons ); |
460 | 460 | } |
461 | 461 | |
462 | - if( ! empty( $request->sections ) ) { |
|
463 | - foreach( $request->sections as $key => $section ) { |
|
464 | - $request->$key = (array) $section; |
|
462 | + if ( ! empty( $request->sections ) ) { |
|
463 | + foreach ( $request->sections as $key => $section ) { |
|
464 | + $request->$key = (array)$section; |
|
465 | 465 | } |
466 | 466 | } |
467 | 467 | |
@@ -472,37 +472,37 @@ discard block |
||
472 | 472 | |
473 | 473 | global $edd_plugin_data; |
474 | 474 | |
475 | - if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) { |
|
475 | + if ( empty( $_REQUEST[ 'edd_sl_action' ] ) || 'view_plugin_changelog' != $_REQUEST[ 'edd_sl_action' ] ) { |
|
476 | 476 | return; |
477 | 477 | } |
478 | 478 | |
479 | - if( empty( $_REQUEST['plugin'] ) ) { |
|
479 | + if ( empty( $_REQUEST[ 'plugin' ] ) ) { |
|
480 | 480 | return; |
481 | 481 | } |
482 | 482 | |
483 | - if( empty( $_REQUEST['slug'] ) ) { |
|
483 | + if ( empty( $_REQUEST[ 'slug' ] ) ) { |
|
484 | 484 | return; |
485 | 485 | } |
486 | 486 | |
487 | - if( ! current_user_can( 'update_plugins' ) ) { |
|
487 | + if ( ! current_user_can( 'update_plugins' ) ) { |
|
488 | 488 | wp_die( __( 'You do not have permission to install plugin updates', 'gravityview' ), __( 'Error', 'gravityview' ), array( 'response' => 403 ) ); |
489 | 489 | } |
490 | 490 | |
491 | - $data = $edd_plugin_data[ $_REQUEST['slug'] ]; |
|
492 | - $beta = ! empty( $data['beta'] ) ? true : false; |
|
493 | - $cache_key = md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_' . $beta . '_version_info' ); |
|
491 | + $data = $edd_plugin_data[ $_REQUEST[ 'slug' ] ]; |
|
492 | + $beta = ! empty( $data[ 'beta' ] ) ? true : false; |
|
493 | + $cache_key = md5( 'edd_plugin_' . sanitize_key( $_REQUEST[ 'plugin' ] ) . '_' . $beta . '_version_info' ); |
|
494 | 494 | $version_info = $this->get_cached_version_info( $cache_key ); |
495 | 495 | |
496 | - if( false === $version_info ) { |
|
496 | + if ( false === $version_info ) { |
|
497 | 497 | |
498 | 498 | $api_params = array( |
499 | 499 | 'edd_action' => 'get_version', |
500 | - 'item_name' => isset( $data['item_name'] ) ? $data['item_name'] : false, |
|
501 | - 'item_id' => isset( $data['item_id'] ) ? $data['item_id'] : false, |
|
502 | - 'slug' => $_REQUEST['slug'], |
|
503 | - 'author' => $data['author'], |
|
500 | + 'item_name' => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false, |
|
501 | + 'item_id' => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false, |
|
502 | + 'slug' => $_REQUEST[ 'slug' ], |
|
503 | + 'author' => $data[ 'author' ], |
|
504 | 504 | 'url' => home_url(), |
505 | - 'beta' => ! empty( $data['beta'] ) |
|
505 | + 'beta' => ! empty( $data[ 'beta' ] ) |
|
506 | 506 | ); |
507 | 507 | |
508 | 508 | $verify_ssl = $this->verify_ssl(); |
@@ -519,9 +519,9 @@ discard block |
||
519 | 519 | $version_info = false; |
520 | 520 | } |
521 | 521 | |
522 | - if( ! empty( $version_info ) ) { |
|
523 | - foreach( $version_info->sections as $key => $section ) { |
|
524 | - $version_info->$key = (array) $section; |
|
522 | + if ( ! empty( $version_info ) ) { |
|
523 | + foreach ( $version_info->sections as $key => $section ) { |
|
524 | + $version_info->$key = (array)$section; |
|
525 | 525 | } |
526 | 526 | } |
527 | 527 | |
@@ -529,8 +529,8 @@ discard block |
||
529 | 529 | |
530 | 530 | } |
531 | 531 | |
532 | - if( ! empty( $version_info ) && isset( $version_info->sections['changelog'] ) ) { |
|
533 | - echo '<div style="background:#fff;padding:10px;">' . $version_info->sections['changelog'] . '</div>'; |
|
532 | + if ( ! empty( $version_info ) && isset( $version_info->sections[ 'changelog' ] ) ) { |
|
533 | + echo '<div style="background:#fff;padding:10px;">' . $version_info->sections[ 'changelog' ] . '</div>'; |
|
534 | 534 | } |
535 | 535 | |
536 | 536 | exit; |
@@ -538,29 +538,29 @@ discard block |
||
538 | 538 | |
539 | 539 | public function get_cached_version_info( $cache_key = '' ) { |
540 | 540 | |
541 | - if( empty( $cache_key ) ) { |
|
541 | + if ( empty( $cache_key ) ) { |
|
542 | 542 | $cache_key = $this->cache_key; |
543 | 543 | } |
544 | 544 | |
545 | 545 | $cache = get_option( $cache_key ); |
546 | 546 | |
547 | - if( empty( $cache['timeout'] ) || time() > $cache['timeout'] ) { |
|
547 | + if ( empty( $cache[ 'timeout' ] ) || time() > $cache[ 'timeout' ] ) { |
|
548 | 548 | return false; // Cache is expired |
549 | 549 | } |
550 | 550 | |
551 | 551 | // We need to turn the icons into an array, thanks to WP Core forcing these into an object at some point. |
552 | - $cache['value'] = json_decode( $cache['value'] ); |
|
553 | - if ( ! empty( $cache['value']->icons ) ) { |
|
554 | - $cache['value']->icons = (array) $cache['value']->icons; |
|
552 | + $cache[ 'value' ] = json_decode( $cache[ 'value' ] ); |
|
553 | + if ( ! empty( $cache[ 'value' ]->icons ) ) { |
|
554 | + $cache[ 'value' ]->icons = (array)$cache[ 'value' ]->icons; |
|
555 | 555 | } |
556 | 556 | |
557 | - return $cache['value']; |
|
557 | + return $cache[ 'value' ]; |
|
558 | 558 | |
559 | 559 | } |
560 | 560 | |
561 | 561 | public function set_version_info_cache( $value = '', $cache_key = '' ) { |
562 | 562 | |
563 | - if( empty( $cache_key ) ) { |
|
563 | + if ( empty( $cache_key ) ) { |
|
564 | 564 | $cache_key = $this->cache_key; |
565 | 565 | } |
566 | 566 | |
@@ -580,7 +580,7 @@ discard block |
||
580 | 580 | * @return bool |
581 | 581 | */ |
582 | 582 | private function verify_ssl() { |
583 | - return (bool) apply_filters( 'edd_sl_api_request_verify_ssl', true, $this ); |
|
583 | + return (bool)apply_filters( 'edd_sl_api_request_verify_ssl', true, $this ); |
|
584 | 584 | } |
585 | 585 | |
586 | 586 | } |