@@ -125,8 +125,8 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | $form = false; |
| 127 | 127 | |
| 128 | - if( $entry ) { |
|
| 129 | - $form = GFAPI::get_form( $entry['form_id'] ); |
|
| 128 | + if ( $entry ) { |
|
| 129 | + $form = GFAPI::get_form( $entry[ 'form_id' ] ); |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | return $form; |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | } |
| 203 | 203 | } |
| 204 | 204 | |
| 205 | - return (bool) $has_transaction_data; |
|
| 205 | + return (bool)$has_transaction_data; |
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | /** |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | |
| 241 | 241 | $results = GFAPI::get_entries( intval( $form_id ), $search_criteria, null, $paging ); |
| 242 | 242 | |
| 243 | - $result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null; |
|
| 243 | + $result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null; |
|
| 244 | 244 | |
| 245 | 245 | return $result; |
| 246 | 246 | } |
@@ -260,13 +260,13 @@ discard block |
||
| 260 | 260 | * |
| 261 | 261 | * @return array Empty array if GFAPI class isn't available or no forms. Otherwise, the array of Forms |
| 262 | 262 | */ |
| 263 | - public static function get_forms( $active = true, $trash = false, $order_by = 'date_created', $order = 'ASC' ) { |
|
| 263 | + public static function get_forms( $active = true, $trash = false, $order_by = 'date_created', $order = 'ASC' ) { |
|
| 264 | 264 | $forms = array(); |
| 265 | 265 | if ( ! class_exists( 'GFAPI' ) ) { |
| 266 | 266 | return array(); |
| 267 | 267 | } |
| 268 | 268 | |
| 269 | - if( 'any' === $active ) { |
|
| 269 | + if ( 'any' === $active ) { |
|
| 270 | 270 | $active_forms = GFAPI::get_forms( true, $trash ); |
| 271 | 271 | $inactive_forms = GFAPI::get_forms( false, $trash ); |
| 272 | 272 | $forms = array_merge( array_filter( $active_forms ), array_filter( $inactive_forms ) ); |
@@ -299,9 +299,9 @@ discard block |
||
| 299 | 299 | $has_post_fields = false; |
| 300 | 300 | |
| 301 | 301 | if ( $form ) { |
| 302 | - foreach ( $form['fields'] as $field ) { |
|
| 303 | - if ( $include_parent_field || empty( $field['inputs'] ) ) { |
|
| 304 | - $fields["{$field['id']}"] = array( |
|
| 302 | + foreach ( $form[ 'fields' ] as $field ) { |
|
| 303 | + if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) { |
|
| 304 | + $fields[ "{$field[ 'id' ]}" ] = array( |
|
| 305 | 305 | 'label' => \GV\Utils::get( $field, 'label' ), |
| 306 | 306 | 'parent' => null, |
| 307 | 307 | 'type' => \GV\Utils::get( $field, 'type' ), |
@@ -310,10 +310,10 @@ discard block |
||
| 310 | 310 | ); |
| 311 | 311 | } |
| 312 | 312 | |
| 313 | - if ( $add_default_properties && ! empty( $field['inputs'] ) ) { |
|
| 314 | - foreach ( $field['inputs'] as $input ) { |
|
| 313 | + if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) { |
|
| 314 | + foreach ( $field[ 'inputs' ] as $input ) { |
|
| 315 | 315 | |
| 316 | - if( ! empty( $input['isHidden'] ) ) { |
|
| 316 | + if ( ! empty( $input[ 'isHidden' ] ) ) { |
|
| 317 | 317 | continue; |
| 318 | 318 | } |
| 319 | 319 | |
@@ -321,10 +321,10 @@ discard block |
||
| 321 | 321 | * @hack |
| 322 | 322 | * In case of email/email confirmation, the input for email has the same id as the parent field |
| 323 | 323 | */ |
| 324 | - if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) { |
|
| 324 | + if ( 'email' === $field[ 'type' ] && false === strpos( $input[ 'id' ], '.' ) ) { |
|
| 325 | 325 | continue; |
| 326 | 326 | } |
| 327 | - $fields["{$input['id']}"] = array( |
|
| 327 | + $fields[ "{$input[ 'id' ]}" ] = array( |
|
| 328 | 328 | 'label' => \GV\Utils::get( $input, 'label' ), |
| 329 | 329 | 'customLabel' => \GV\Utils::get( $input, 'customLabel' ), |
| 330 | 330 | 'parent' => $field, |
@@ -336,7 +336,7 @@ discard block |
||
| 336 | 336 | } |
| 337 | 337 | |
| 338 | 338 | |
| 339 | - if( GFCommon::is_product_field( $field['type'] ) ){ |
|
| 339 | + if ( GFCommon::is_product_field( $field[ 'type' ] ) ) { |
|
| 340 | 340 | $has_product_fields = true; |
| 341 | 341 | } |
| 342 | 342 | |
@@ -350,7 +350,7 @@ discard block |
||
| 350 | 350 | * @since 1.7 |
| 351 | 351 | */ |
| 352 | 352 | if ( $has_post_fields ) { |
| 353 | - $fields['post_id'] = array( |
|
| 353 | + $fields[ 'post_id' ] = array( |
|
| 354 | 354 | 'label' => __( 'Post ID', 'gravityview' ), |
| 355 | 355 | 'type' => 'post_id', |
| 356 | 356 | ); |
@@ -363,11 +363,11 @@ discard block |
||
| 363 | 363 | foreach ( $payment_fields as $payment_field ) { |
| 364 | 364 | |
| 365 | 365 | // Either the field exists ($fields['shipping']) or the form explicitly contains a `shipping` field with numeric key |
| 366 | - if( isset( $fields["{$payment_field->name}"] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) { |
|
| 366 | + if ( isset( $fields[ "{$payment_field->name}" ] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) { |
|
| 367 | 367 | continue; |
| 368 | 368 | } |
| 369 | 369 | |
| 370 | - $fields["{$payment_field->name}"] = array( |
|
| 370 | + $fields[ "{$payment_field->name}" ] = array( |
|
| 371 | 371 | 'label' => $payment_field->label, |
| 372 | 372 | 'desc' => $payment_field->description, |
| 373 | 373 | 'type' => $payment_field->name, |
@@ -399,9 +399,9 @@ discard block |
||
| 399 | 399 | |
| 400 | 400 | $fields = array(); |
| 401 | 401 | |
| 402 | - foreach ( $extra_fields as $key => $field ){ |
|
| 403 | - if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) { |
|
| 404 | - $fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' ); |
|
| 402 | + foreach ( $extra_fields as $key => $field ) { |
|
| 403 | + if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) { |
|
| 404 | + $fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' ); |
|
| 405 | 405 | } |
| 406 | 406 | } |
| 407 | 407 | |
@@ -441,33 +441,33 @@ discard block |
||
| 441 | 441 | 'search_criteria' => null, |
| 442 | 442 | 'sorting' => null, |
| 443 | 443 | 'paging' => null, |
| 444 | - 'cache' => (isset( $passed_criteria['cache'] ) ? (bool) $passed_criteria['cache'] : true), |
|
| 444 | + 'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? (bool)$passed_criteria[ 'cache' ] : true ), |
|
| 445 | 445 | 'context_view_id' => null, |
| 446 | 446 | ); |
| 447 | 447 | |
| 448 | 448 | $criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults ); |
| 449 | 449 | |
| 450 | - if ( ! empty( $criteria['search_criteria']['field_filters'] ) && is_array( $criteria['search_criteria']['field_filters'] ) ) { |
|
| 451 | - foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) { |
|
| 450 | + if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) && is_array( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) { |
|
| 451 | + foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) { |
|
| 452 | 452 | |
| 453 | 453 | if ( ! is_array( $filter ) ) { |
| 454 | 454 | continue; |
| 455 | 455 | } |
| 456 | 456 | |
| 457 | 457 | // By default, we want searches to be wildcard for each field. |
| 458 | - $filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator']; |
|
| 458 | + $filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ]; |
|
| 459 | 459 | |
| 460 | 460 | /** |
| 461 | 461 | * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc) |
| 462 | 462 | * @param string $operator Existing search operator |
| 463 | 463 | * @param array $filter array with `key`, `value`, `operator`, `type` keys |
| 464 | 464 | */ |
| 465 | - $filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter ); |
|
| 465 | + $filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter ); |
|
| 466 | 466 | } |
| 467 | 467 | |
| 468 | 468 | // don't send just the [mode] without any field filter. |
| 469 | - if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) { |
|
| 470 | - unset( $criteria['search_criteria']['field_filters']['mode'] ); |
|
| 469 | + if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) { |
|
| 470 | + unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] ); |
|
| 471 | 471 | } |
| 472 | 472 | |
| 473 | 473 | } |
@@ -478,33 +478,33 @@ discard block |
||
| 478 | 478 | * Prepare date formats to be in Gravity Forms DB format; |
| 479 | 479 | * $passed_criteria may include date formats incompatible with Gravity Forms. |
| 480 | 480 | */ |
| 481 | - foreach ( array('start_date', 'end_date' ) as $key ) { |
|
| 481 | + foreach ( array( 'start_date', 'end_date' ) as $key ) { |
|
| 482 | 482 | |
| 483 | - if ( ! empty( $criteria['search_criteria'][ $key ] ) ) { |
|
| 483 | + if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) { |
|
| 484 | 484 | |
| 485 | 485 | // Use date_create instead of new DateTime so it returns false if invalid date format. |
| 486 | - $date = date_create( $criteria['search_criteria'][ $key ] ); |
|
| 486 | + $date = date_create( $criteria[ 'search_criteria' ][ $key ] ); |
|
| 487 | 487 | |
| 488 | 488 | if ( $date ) { |
| 489 | 489 | // Gravity Forms wants dates in the `Y-m-d H:i:s` format. |
| 490 | - $criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' ); |
|
| 490 | + $criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' ); |
|
| 491 | 491 | } else { |
| 492 | - gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria['search_criteria'][ $key ] ) ); |
|
| 492 | + gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria[ 'search_criteria' ][ $key ] ) ); |
|
| 493 | 493 | |
| 494 | 494 | // If it's an invalid date, unset it. Gravity Forms freaks out otherwise. |
| 495 | - unset( $criteria['search_criteria'][ $key ] ); |
|
| 495 | + unset( $criteria[ 'search_criteria' ][ $key ] ); |
|
| 496 | 496 | } |
| 497 | 497 | } |
| 498 | 498 | } |
| 499 | 499 | |
| 500 | - if ( empty( $criteria['context_view_id'] ) ) { |
|
| 500 | + if ( empty( $criteria[ 'context_view_id' ] ) ) { |
|
| 501 | 501 | // Calculate the context view id and send it to the advanced filter |
| 502 | 502 | if ( GravityView_frontend::getInstance()->getSingleEntry() ) { |
| 503 | - $criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id(); |
|
| 503 | + $criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id(); |
|
| 504 | 504 | } else if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance() && GravityView_View_Data::getInstance()->has_multiple_views() ) { |
| 505 | - $criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id(); |
|
| 505 | + $criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id(); |
|
| 506 | 506 | } else if ( 'delete' === GFForms::get( 'action' ) ) { |
| 507 | - $criteria['context_view_id'] = isset( $_GET['view_id'] ) ? intval( $_GET['view_id'] ) : null; |
|
| 507 | + $criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? intval( $_GET[ 'view_id' ] ) : null; |
|
| 508 | 508 | } |
| 509 | 509 | } |
| 510 | 510 | |
@@ -514,7 +514,7 @@ discard block |
||
| 514 | 514 | * @param array $form_ids Forms to search |
| 515 | 515 | * @param int $view_id ID of the view being used to search |
| 516 | 516 | */ |
| 517 | - $criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] ); |
|
| 517 | + $criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] ); |
|
| 518 | 518 | |
| 519 | 519 | return (array)$criteria; |
| 520 | 520 | } |
@@ -549,7 +549,7 @@ discard block |
||
| 549 | 549 | /** Reduce # of database calls */ |
| 550 | 550 | add_filter( 'gform_is_encrypted_field', '__return_false' ); |
| 551 | 551 | |
| 552 | - if ( ! empty( $criteria['cache'] ) ) { |
|
| 552 | + if ( ! empty( $criteria[ 'cache' ] ) ) { |
|
| 553 | 553 | |
| 554 | 554 | $Cache = new GravityView_Cache( $form_ids, $criteria ); |
| 555 | 555 | |
@@ -557,7 +557,7 @@ discard block |
||
| 557 | 557 | |
| 558 | 558 | // Still update the total count when using cached results |
| 559 | 559 | if ( ! is_null( $total ) ) { |
| 560 | - $total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] ); |
|
| 560 | + $total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] ); |
|
| 561 | 561 | } |
| 562 | 562 | |
| 563 | 563 | $return = $entries; |
@@ -579,9 +579,9 @@ discard block |
||
| 579 | 579 | $entries = apply_filters_ref_array( 'gravityview_before_get_entries', array( null, $criteria, $passed_criteria, &$total ) ); |
| 580 | 580 | |
| 581 | 581 | // No entries returned from gravityview_before_get_entries |
| 582 | - if( is_null( $entries ) ) { |
|
| 582 | + if ( is_null( $entries ) ) { |
|
| 583 | 583 | |
| 584 | - $entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total ); |
|
| 584 | + $entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total ); |
|
| 585 | 585 | |
| 586 | 586 | if ( is_wp_error( $entries ) ) { |
| 587 | 587 | gravityview()->log->error( '{error}', array( 'error' => $entries->get_error_message(), 'data' => $entries ) ); |
@@ -592,7 +592,7 @@ discard block |
||
| 592 | 592 | } |
| 593 | 593 | } |
| 594 | 594 | |
| 595 | - if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) { |
|
| 595 | + if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) { |
|
| 596 | 596 | |
| 597 | 597 | // Cache results |
| 598 | 598 | $Cache->set( $entries, 'entries' ); |
@@ -706,11 +706,11 @@ discard block |
||
| 706 | 706 | $check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry, $view ); |
| 707 | 707 | |
| 708 | 708 | // Is the entry allowed |
| 709 | - if( $check_entry_display ) { |
|
| 709 | + if ( $check_entry_display ) { |
|
| 710 | 710 | $entry = self::check_entry_display( $entry, $view ); |
| 711 | 711 | } |
| 712 | 712 | |
| 713 | - if( is_wp_error( $entry ) ) { |
|
| 713 | + if ( is_wp_error( $entry ) ) { |
|
| 714 | 714 | gravityview()->log->error( '{error}', array( 'error' => $entry->get_error_message() ) ); |
| 715 | 715 | return false; |
| 716 | 716 | } |
@@ -744,12 +744,12 @@ discard block |
||
| 744 | 744 | |
| 745 | 745 | $value = false; |
| 746 | 746 | |
| 747 | - if( 'context' === $val1 ) { |
|
| 747 | + if ( 'context' === $val1 ) { |
|
| 748 | 748 | |
| 749 | 749 | $matching_contexts = array( $val2 ); |
| 750 | 750 | |
| 751 | 751 | // We allow for non-standard contexts. |
| 752 | - switch( $val2 ) { |
|
| 752 | + switch ( $val2 ) { |
|
| 753 | 753 | // Check for either single or edit |
| 754 | 754 | case 'singular': |
| 755 | 755 | $matching_contexts = array( 'single', 'edit' ); |
@@ -792,18 +792,18 @@ discard block |
||
| 792 | 792 | $json_val_1 = json_decode( $val1, true ); |
| 793 | 793 | $json_val_2 = json_decode( $val2, true ); |
| 794 | 794 | |
| 795 | - if( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) { |
|
| 795 | + if ( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) { |
|
| 796 | 796 | |
| 797 | 797 | $json_in = false; |
| 798 | - $json_val_1 = $json_val_1 ? (array) $json_val_1 : array( $val1 ); |
|
| 799 | - $json_val_2 = $json_val_2 ? (array) $json_val_2 : array( $val2 ); |
|
| 798 | + $json_val_1 = $json_val_1 ? (array)$json_val_1 : array( $val1 ); |
|
| 799 | + $json_val_2 = $json_val_2 ? (array)$json_val_2 : array( $val2 ); |
|
| 800 | 800 | |
| 801 | 801 | // For JSON, we want to compare as "in" or "not in" rather than "contains" |
| 802 | 802 | foreach ( $json_val_1 as $item_1 ) { |
| 803 | 803 | foreach ( $json_val_2 as $item_2 ) { |
| 804 | 804 | $json_in = self::matches_operation( $item_1, $item_2, 'is' ); |
| 805 | 805 | |
| 806 | - if( $json_in ) { |
|
| 806 | + if ( $json_in ) { |
|
| 807 | 807 | break 2; |
| 808 | 808 | } |
| 809 | 809 | } |
@@ -854,10 +854,10 @@ discard block |
||
| 854 | 854 | public static function check_entry_display( $entry, $view = null ) { |
| 855 | 855 | |
| 856 | 856 | if ( ! $entry || is_wp_error( $entry ) ) { |
| 857 | - return new WP_Error('entry_not_found', 'Entry was not found.', $entry ); |
|
| 857 | + return new WP_Error( 'entry_not_found', 'Entry was not found.', $entry ); |
|
| 858 | 858 | } |
| 859 | 859 | |
| 860 | - if ( empty( $entry['form_id'] ) ) { |
|
| 860 | + if ( empty( $entry[ 'form_id' ] ) ) { |
|
| 861 | 861 | return new WP_Error( 'form_id_not_set', '[apply_filters_to_entry] Entry is empty!', $entry ); |
| 862 | 862 | } |
| 863 | 863 | |
@@ -872,19 +872,19 @@ discard block |
||
| 872 | 872 | |
| 873 | 873 | $_gvid = \GV\Utils::_GET( 'gvid' ); |
| 874 | 874 | |
| 875 | - if ( $_gvid && $view->ID !== (int) $_gvid ) { |
|
| 875 | + if ( $_gvid && $view->ID !== (int)$_gvid ) { |
|
| 876 | 876 | return new WP_Error( 'view_id_not_match_gvid', 'View does not match passed $_GET["gvid"].', $view->ID ); |
| 877 | 877 | } |
| 878 | 878 | |
| 879 | 879 | $view_form_id = $view->form->ID; |
| 880 | 880 | |
| 881 | 881 | if ( $view->joins ) { |
| 882 | - if ( in_array( (int) $entry['form_id'], array_keys( $view::get_joined_forms( $view->ID ) ), true ) ) { |
|
| 883 | - $view_form_id = $entry['form_id']; |
|
| 882 | + if ( in_array( (int)$entry[ 'form_id' ], array_keys( $view::get_joined_forms( $view->ID ) ), true ) ) { |
|
| 883 | + $view_form_id = $entry[ 'form_id' ]; |
|
| 884 | 884 | } |
| 885 | 885 | } |
| 886 | 886 | |
| 887 | - if ( (int) $view_form_id !== (int) $entry['form_id'] ) { |
|
| 887 | + if ( (int)$view_form_id !== (int)$entry[ 'form_id' ] ) { |
|
| 888 | 888 | return new WP_Error( 'view_id_not_match', 'View form source does not match entry form source ID.', $entry ); |
| 889 | 889 | } |
| 890 | 890 | |
@@ -892,13 +892,13 @@ discard block |
||
| 892 | 892 | * Check whether the entry is in the entries subset by running a modified query. |
| 893 | 893 | */ |
| 894 | 894 | add_action( 'gravityview/view/query', $entry_subset_callback = function( &$query, $view, $request ) use ( $entry, $view_form_id ) { |
| 895 | - $_tmp_query = new \GF_Query( $view_form_id, array( |
|
| 895 | + $_tmp_query = new \GF_Query( $view_form_id, array( |
|
| 896 | 896 | 'field_filters' => array( |
| 897 | 897 | 'mode' => 'all', |
| 898 | 898 | array( |
| 899 | 899 | 'key' => 'id', |
| 900 | 900 | 'operation' => 'is', |
| 901 | - 'value' => $entry['id'] |
|
| 901 | + 'value' => $entry[ 'id' ] |
|
| 902 | 902 | ) |
| 903 | 903 | ) |
| 904 | 904 | ) ); |
@@ -908,14 +908,14 @@ discard block |
||
| 908 | 908 | /** @var \GF_Query $query */ |
| 909 | 909 | $query_parts = $query->_introspect(); |
| 910 | 910 | |
| 911 | - $query->where( \GF_Query_Condition::_and( $_tmp_query_parts['where'], $query_parts['where'] ) ); |
|
| 911 | + $query->where( \GF_Query_Condition::_and( $_tmp_query_parts[ 'where' ], $query_parts[ 'where' ] ) ); |
|
| 912 | 912 | |
| 913 | 913 | }, 10, 3 ); |
| 914 | 914 | |
| 915 | 915 | // Prevent page offset from being applied to the single entry query; it's used to return to the referring page number |
| 916 | 916 | add_filter( 'gravityview_search_criteria', $remove_pagenum = function( $criteria ) { |
| 917 | 917 | |
| 918 | - $criteria['paging'] = array( |
|
| 918 | + $criteria[ 'paging' ] = array( |
|
| 919 | 919 | 'offset' => 0, |
| 920 | 920 | 'page_size' => 25 |
| 921 | 921 | ); |
@@ -934,20 +934,20 @@ discard block |
||
| 934 | 934 | } |
| 935 | 935 | |
| 936 | 936 | // This entry is on a View with joins |
| 937 | - if ( $entries[0]->is_multi() ) { |
|
| 937 | + if ( $entries[ 0 ]->is_multi() ) { |
|
| 938 | 938 | |
| 939 | 939 | $multi_entry_ids = array(); |
| 940 | 940 | |
| 941 | - foreach ( $entries[0]->entries as $multi_entry ) { |
|
| 942 | - $multi_entry_ids[] = (int) $multi_entry->ID; |
|
| 941 | + foreach ( $entries[ 0 ]->entries as $multi_entry ) { |
|
| 942 | + $multi_entry_ids[ ] = (int)$multi_entry->ID; |
|
| 943 | 943 | } |
| 944 | 944 | |
| 945 | - if ( ! in_array( (int) $entry['id'], $multi_entry_ids, true ) ) { |
|
| 945 | + if ( ! in_array( (int)$entry[ 'id' ], $multi_entry_ids, true ) ) { |
|
| 946 | 946 | remove_action( 'gravityview/view/query', $entry_subset_callback ); |
| 947 | 947 | return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' ); |
| 948 | 948 | } |
| 949 | 949 | |
| 950 | - } elseif ( (int) $entries[0]->ID !== (int) $entry['id'] ) { |
|
| 950 | + } elseif ( (int)$entries[ 0 ]->ID !== (int)$entry[ 'id' ] ) { |
|
| 951 | 951 | remove_action( 'gravityview/view/query', $entry_subset_callback ); |
| 952 | 952 | return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' ); |
| 953 | 953 | } |
@@ -992,18 +992,18 @@ discard block |
||
| 992 | 992 | * Gravity Forms code to adjust date to locally-configured Time Zone |
| 993 | 993 | * @see GFCommon::format_date() for original code |
| 994 | 994 | */ |
| 995 | - $date_gmt_time = mysql2date( 'G', $date_string ); |
|
| 995 | + $date_gmt_time = mysql2date( 'G', $date_string ); |
|
| 996 | 996 | $date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time ); |
| 997 | 997 | |
| 998 | - $format = \GV\Utils::get( $atts, 'format' ); |
|
| 999 | - $is_human = ! empty( $atts['human'] ); |
|
| 1000 | - $is_diff = ! empty( $atts['diff'] ); |
|
| 1001 | - $is_raw = ! empty( $atts['raw'] ); |
|
| 1002 | - $is_timestamp = ! empty( $atts['timestamp'] ); |
|
| 1003 | - $include_time = ! empty( $atts['time'] ); |
|
| 998 | + $format = \GV\Utils::get( $atts, 'format' ); |
|
| 999 | + $is_human = ! empty( $atts[ 'human' ] ); |
|
| 1000 | + $is_diff = ! empty( $atts[ 'diff' ] ); |
|
| 1001 | + $is_raw = ! empty( $atts[ 'raw' ] ); |
|
| 1002 | + $is_timestamp = ! empty( $atts[ 'timestamp' ] ); |
|
| 1003 | + $include_time = ! empty( $atts[ 'time' ] ); |
|
| 1004 | 1004 | |
| 1005 | 1005 | // If we're using time diff, we want to have a different default format |
| 1006 | - if( empty( $format ) ) { |
|
| 1006 | + if ( empty( $format ) ) { |
|
| 1007 | 1007 | /* translators: %s: relative time from now, used for generic date comparisons. "1 day ago", or "20 seconds ago" */ |
| 1008 | 1008 | $format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' ); |
| 1009 | 1009 | } |
@@ -1011,7 +1011,7 @@ discard block |
||
| 1011 | 1011 | // If raw was specified, don't modify the stored value |
| 1012 | 1012 | if ( $is_raw ) { |
| 1013 | 1013 | $formatted_date = $date_string; |
| 1014 | - } elseif( $is_timestamp ) { |
|
| 1014 | + } elseif ( $is_timestamp ) { |
|
| 1015 | 1015 | $formatted_date = $date_local_timestamp; |
| 1016 | 1016 | } elseif ( $is_diff ) { |
| 1017 | 1017 | $formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) ); |
@@ -1045,7 +1045,7 @@ discard block |
||
| 1045 | 1045 | |
| 1046 | 1046 | $label = \GV\Utils::get( $field, 'label' ); |
| 1047 | 1047 | |
| 1048 | - if( floor( $field_id ) !== floatval( $field_id ) ) { |
|
| 1048 | + if ( floor( $field_id ) !== floatval( $field_id ) ) { |
|
| 1049 | 1049 | $label = GFFormsModel::get_choice_text( $field, $field_value, $field_id ); |
| 1050 | 1050 | } |
| 1051 | 1051 | |
@@ -1073,7 +1073,7 @@ discard block |
||
| 1073 | 1073 | $form = GFAPI::get_form( $form ); |
| 1074 | 1074 | } |
| 1075 | 1075 | |
| 1076 | - if ( class_exists( 'GFFormsModel' ) ){ |
|
| 1076 | + if ( class_exists( 'GFFormsModel' ) ) { |
|
| 1077 | 1077 | return GFFormsModel::get_field( $form, $field_id ); |
| 1078 | 1078 | } else { |
| 1079 | 1079 | return null; |
@@ -1120,19 +1120,19 @@ discard block |
||
| 1120 | 1120 | $shortcodes = array(); |
| 1121 | 1121 | |
| 1122 | 1122 | preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER ); |
| 1123 | - if ( empty( $matches ) ){ |
|
| 1123 | + if ( empty( $matches ) ) { |
|
| 1124 | 1124 | return false; |
| 1125 | 1125 | } |
| 1126 | 1126 | |
| 1127 | 1127 | foreach ( $matches as $shortcode ) { |
| 1128 | - if ( $tag === $shortcode[2] ) { |
|
| 1128 | + if ( $tag === $shortcode[ 2 ] ) { |
|
| 1129 | 1129 | |
| 1130 | 1130 | // Changed this to $shortcode instead of true so we get the parsed atts. |
| 1131 | - $shortcodes[] = $shortcode; |
|
| 1131 | + $shortcodes[ ] = $shortcode; |
|
| 1132 | 1132 | |
| 1133 | - } else if ( isset( $shortcode[5] ) && $results = self::has_shortcode_r( $shortcode[5], $tag ) ) { |
|
| 1134 | - foreach( $results as $result ) { |
|
| 1135 | - $shortcodes[] = $result; |
|
| 1133 | + } else if ( isset( $shortcode[ 5 ] ) && $results = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) { |
|
| 1134 | + foreach ( $results as $result ) { |
|
| 1135 | + $shortcodes[ ] = $result; |
|
| 1136 | 1136 | } |
| 1137 | 1137 | } |
| 1138 | 1138 | } |
@@ -1164,7 +1164,7 @@ discard block |
||
| 1164 | 1164 | 'post_type' => 'gravityview', |
| 1165 | 1165 | 'posts_per_page' => 100, |
| 1166 | 1166 | 'meta_key' => '_gravityview_form_id', |
| 1167 | - 'meta_value' => (int) $form_id, |
|
| 1167 | + 'meta_value' => (int)$form_id, |
|
| 1168 | 1168 | ); |
| 1169 | 1169 | $args = wp_parse_args( $args, $defaults ); |
| 1170 | 1170 | $views = get_posts( $args ); |
@@ -1176,21 +1176,21 @@ discard block |
||
| 1176 | 1176 | |
| 1177 | 1177 | $data = unserialize( $view->meta_value ); |
| 1178 | 1178 | |
| 1179 | - if( ! $data || ! is_array( $data ) ) { |
|
| 1179 | + if ( ! $data || ! is_array( $data ) ) { |
|
| 1180 | 1180 | continue; |
| 1181 | 1181 | } |
| 1182 | 1182 | |
| 1183 | 1183 | foreach ( $data as $datum ) { |
| 1184 | - if ( ! empty( $datum[2] ) && (int) $datum[2] === (int) $form_id ) { |
|
| 1185 | - $joined_forms[] = $view->post_id; |
|
| 1184 | + if ( ! empty( $datum[ 2 ] ) && (int)$datum[ 2 ] === (int)$form_id ) { |
|
| 1185 | + $joined_forms[ ] = $view->post_id; |
|
| 1186 | 1186 | } |
| 1187 | 1187 | } |
| 1188 | 1188 | } |
| 1189 | 1189 | |
| 1190 | 1190 | if ( $joined_forms ) { |
| 1191 | - $joined_args = array( |
|
| 1191 | + $joined_args = array( |
|
| 1192 | 1192 | 'post_type' => 'gravityview', |
| 1193 | - 'posts_per_page' => $args['posts_per_page'], |
|
| 1193 | + 'posts_per_page' => $args[ 'posts_per_page' ], |
|
| 1194 | 1194 | 'post__in' => $joined_forms, |
| 1195 | 1195 | ); |
| 1196 | 1196 | $views = array_merge( $views, get_posts( $joined_args ) ); |
@@ -1346,7 +1346,7 @@ discard block |
||
| 1346 | 1346 | |
| 1347 | 1347 | $directory_widgets = wp_parse_args( $view_widgets, $defaults ); |
| 1348 | 1348 | |
| 1349 | - if( $json_decode ) { |
|
| 1349 | + if ( $json_decode ) { |
|
| 1350 | 1350 | $directory_widgets = gv_map_deep( $directory_widgets, 'gv_maybe_json_decode' ); |
| 1351 | 1351 | } |
| 1352 | 1352 | |
@@ -1362,7 +1362,7 @@ discard block |
||
| 1362 | 1362 | * @return string html |
| 1363 | 1363 | */ |
| 1364 | 1364 | public static function get_sortable_fields( $formid, $current = '' ) { |
| 1365 | - $output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default', 'gravityview' ) .'</option>'; |
|
| 1365 | + $output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default', 'gravityview' ) . '</option>'; |
|
| 1366 | 1366 | |
| 1367 | 1367 | if ( empty( $formid ) ) { |
| 1368 | 1368 | return $output; |
@@ -1375,11 +1375,11 @@ discard block |
||
| 1375 | 1375 | $blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null ); |
| 1376 | 1376 | |
| 1377 | 1377 | foreach ( $fields as $id => $field ) { |
| 1378 | - if ( in_array( $field['type'], $blacklist_field_types ) ) { |
|
| 1378 | + if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) { |
|
| 1379 | 1379 | continue; |
| 1380 | 1380 | } |
| 1381 | 1381 | |
| 1382 | - $output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>'; |
|
| 1382 | + $output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . '>' . esc_attr( $field[ 'label' ] ) . '</option>'; |
|
| 1383 | 1383 | } |
| 1384 | 1384 | } |
| 1385 | 1385 | |
@@ -1414,16 +1414,16 @@ discard block |
||
| 1414 | 1414 | $blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL ); |
| 1415 | 1415 | |
| 1416 | 1416 | // TODO: Convert to using array_filter |
| 1417 | - foreach( $fields as $id => $field ) { |
|
| 1417 | + foreach ( $fields as $id => $field ) { |
|
| 1418 | 1418 | |
| 1419 | - if( in_array( $field['type'], $blacklist_field_types ) ) { |
|
| 1419 | + if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) { |
|
| 1420 | 1420 | unset( $fields[ $id ] ); |
| 1421 | 1421 | } |
| 1422 | 1422 | |
| 1423 | 1423 | /** |
| 1424 | 1424 | * Merge date and time subfields. |
| 1425 | 1425 | */ |
| 1426 | - if ( in_array( $field['type'], array( 'date', 'time' ) ) && ! empty( $field['parent'] ) ) { |
|
| 1426 | + if ( in_array( $field[ 'type' ], array( 'date', 'time' ) ) && ! empty( $field[ 'parent' ] ) ) { |
|
| 1427 | 1427 | $fields[ intval( $id ) ] = array( |
| 1428 | 1428 | 'label' => \GV\Utils::get( $field, 'parent/label' ), |
| 1429 | 1429 | 'parent' => null, |
@@ -1473,14 +1473,14 @@ discard block |
||
| 1473 | 1473 | * @param int|array $field field key or field array |
| 1474 | 1474 | * @return boolean |
| 1475 | 1475 | */ |
| 1476 | - public static function is_field_numeric( $form = null, $field = '' ) { |
|
| 1476 | + public static function is_field_numeric( $form = null, $field = '' ) { |
|
| 1477 | 1477 | |
| 1478 | 1478 | if ( ! is_array( $form ) && ! is_array( $field ) ) { |
| 1479 | 1479 | $form = self::get_form( $form ); |
| 1480 | 1480 | } |
| 1481 | 1481 | |
| 1482 | 1482 | // If entry meta, it's a string. Otherwise, numeric |
| 1483 | - if( ! is_numeric( $field ) && is_string( $field ) ) { |
|
| 1483 | + if ( ! is_numeric( $field ) && is_string( $field ) ) { |
|
| 1484 | 1484 | $type = $field; |
| 1485 | 1485 | } else { |
| 1486 | 1486 | $type = self::get_field_type( $form, $field ); |
@@ -1494,9 +1494,9 @@ discard block |
||
| 1494 | 1494 | $numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) ); |
| 1495 | 1495 | |
| 1496 | 1496 | // Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true |
| 1497 | - if( $gv_field = GravityView_Fields::get( $type ) ) { |
|
| 1498 | - if( true === $gv_field->is_numeric ) { |
|
| 1499 | - $numeric_types[] = $gv_field->is_numeric; |
|
| 1497 | + if ( $gv_field = GravityView_Fields::get( $type ) ) { |
|
| 1498 | + if ( true === $gv_field->is_numeric ) { |
|
| 1499 | + $numeric_types[ ] = $gv_field->is_numeric; |
|
| 1500 | 1500 | } |
| 1501 | 1501 | } |
| 1502 | 1502 | |
@@ -1646,18 +1646,18 @@ discard block |
||
| 1646 | 1646 | $final_atts = array_filter( $final_atts ); |
| 1647 | 1647 | |
| 1648 | 1648 | // If the href wasn't passed as an attribute, use the value passed to the function |
| 1649 | - if ( empty( $final_atts['href'] ) && ! empty( $href ) ) { |
|
| 1650 | - $final_atts['href'] = $href; |
|
| 1649 | + if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) { |
|
| 1650 | + $final_atts[ 'href' ] = $href; |
|
| 1651 | 1651 | } |
| 1652 | 1652 | |
| 1653 | - $final_atts['href'] = esc_url_raw( $href ); |
|
| 1653 | + $final_atts[ 'href' ] = esc_url_raw( $href ); |
|
| 1654 | 1654 | |
| 1655 | 1655 | /** |
| 1656 | 1656 | * Fix potential security issue with target=_blank |
| 1657 | 1657 | * @see https://dev.to/ben/the-targetblank-vulnerability-by-example |
| 1658 | 1658 | */ |
| 1659 | - if( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) { |
|
| 1660 | - $final_atts['rel'] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' ); |
|
| 1659 | + if ( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) { |
|
| 1660 | + $final_atts[ 'rel' ] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' ); |
|
| 1661 | 1661 | } |
| 1662 | 1662 | |
| 1663 | 1663 | // Sort the attributes alphabetically, to help testing |
@@ -1669,7 +1669,7 @@ discard block |
||
| 1669 | 1669 | $output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) ); |
| 1670 | 1670 | } |
| 1671 | 1671 | |
| 1672 | - if( '' !== $output ) { |
|
| 1672 | + if ( '' !== $output ) { |
|
| 1673 | 1673 | $output = '<a' . $output . '>' . $anchor_text . '</a>'; |
| 1674 | 1674 | } |
| 1675 | 1675 | |
@@ -1696,7 +1696,7 @@ discard block |
||
| 1696 | 1696 | if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) { |
| 1697 | 1697 | $merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value ); |
| 1698 | 1698 | } else if ( is_numeric( $key ) && isset( $merged[ $key ] ) ) { |
| 1699 | - $merged[] = $value; |
|
| 1699 | + $merged[ ] = $value; |
|
| 1700 | 1700 | } else { |
| 1701 | 1701 | $merged[ $key ] = $value; |
| 1702 | 1702 | } |
@@ -1729,7 +1729,7 @@ discard block |
||
| 1729 | 1729 | * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..) |
| 1730 | 1730 | * @param array $settings Settings array, with `number` key defining the # of users to display |
| 1731 | 1731 | */ |
| 1732 | - $get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) ); |
|
| 1732 | + $get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) ); |
|
| 1733 | 1733 | |
| 1734 | 1734 | return get_users( $get_users_settings ); |
| 1735 | 1735 | } |
@@ -1749,11 +1749,11 @@ discard block |
||
| 1749 | 1749 | public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) { |
| 1750 | 1750 | |
| 1751 | 1751 | // If $cap is defined, only show notice if user has capability |
| 1752 | - if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) { |
|
| 1752 | + if ( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) { |
|
| 1753 | 1753 | return ''; |
| 1754 | 1754 | } |
| 1755 | 1755 | |
| 1756 | - return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>'; |
|
| 1756 | + return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>'; |
|
| 1757 | 1757 | } |
| 1758 | 1758 | |
| 1759 | 1759 | /** |