@@ -124,8 +124,8 @@ discard block |
||
| 124 | 124 | |
| 125 | 125 | $form = false; |
| 126 | 126 | |
| 127 | - if( $entry ) { |
|
| 128 | - $form = GFAPI::get_form( $entry['form_id'] ); |
|
| 127 | + if ( $entry ) { |
|
| 128 | + $form = GFAPI::get_form( $entry[ 'form_id' ] ); |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | return $form; |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | } |
| 202 | 202 | } |
| 203 | 203 | |
| 204 | - return (bool) $has_transaction_data; |
|
| 204 | + return (bool)$has_transaction_data; |
|
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | /** |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | |
| 240 | 240 | $results = GFAPI::get_entries( intval( $form_id ), $search_criteria, null, $paging ); |
| 241 | 241 | |
| 242 | - $result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null; |
|
| 242 | + $result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null; |
|
| 243 | 243 | |
| 244 | 244 | return $result; |
| 245 | 245 | } |
@@ -259,13 +259,13 @@ discard block |
||
| 259 | 259 | * |
| 260 | 260 | * @return array Empty array if GFAPI class isn't available or no forms. Otherwise, the array of Forms |
| 261 | 261 | */ |
| 262 | - public static function get_forms( $active = true, $trash = false, $order_by = 'id', $order = 'ASC' ) { |
|
| 262 | + public static function get_forms( $active = true, $trash = false, $order_by = 'id', $order = 'ASC' ) { |
|
| 263 | 263 | $forms = array(); |
| 264 | 264 | if ( ! class_exists( 'GFAPI' ) ) { |
| 265 | 265 | return array(); |
| 266 | 266 | } |
| 267 | 267 | |
| 268 | - if( 'any' === $active ) { |
|
| 268 | + if ( 'any' === $active ) { |
|
| 269 | 269 | $active_forms = GFAPI::get_forms( true, $trash ); |
| 270 | 270 | $inactive_forms = GFAPI::get_forms( false, $trash ); |
| 271 | 271 | $forms = array_merge( array_filter( $active_forms ), array_filter( $inactive_forms ) ); |
@@ -297,9 +297,9 @@ discard block |
||
| 297 | 297 | $has_post_fields = false; |
| 298 | 298 | |
| 299 | 299 | if ( $form ) { |
| 300 | - foreach ( $form['fields'] as $field ) { |
|
| 301 | - if ( $include_parent_field || empty( $field['inputs'] ) ) { |
|
| 302 | - $fields["{$field['id']}"] = array( |
|
| 300 | + foreach ( $form[ 'fields' ] as $field ) { |
|
| 301 | + if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) { |
|
| 302 | + $fields[ "{$field[ 'id' ]}" ] = array( |
|
| 303 | 303 | 'label' => \GV\Utils::get( $field, 'label' ), |
| 304 | 304 | 'parent' => null, |
| 305 | 305 | 'type' => \GV\Utils::get( $field, 'type' ), |
@@ -308,10 +308,10 @@ discard block |
||
| 308 | 308 | ); |
| 309 | 309 | } |
| 310 | 310 | |
| 311 | - if ( $add_default_properties && ! empty( $field['inputs'] ) ) { |
|
| 312 | - foreach ( $field['inputs'] as $input ) { |
|
| 311 | + if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) { |
|
| 312 | + foreach ( $field[ 'inputs' ] as $input ) { |
|
| 313 | 313 | |
| 314 | - if( ! empty( $input['isHidden'] ) ) { |
|
| 314 | + if ( ! empty( $input[ 'isHidden' ] ) ) { |
|
| 315 | 315 | continue; |
| 316 | 316 | } |
| 317 | 317 | |
@@ -319,10 +319,10 @@ discard block |
||
| 319 | 319 | * @hack |
| 320 | 320 | * In case of email/email confirmation, the input for email has the same id as the parent field |
| 321 | 321 | */ |
| 322 | - if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) { |
|
| 322 | + if ( 'email' === $field[ 'type' ] && false === strpos( $input[ 'id' ], '.' ) ) { |
|
| 323 | 323 | continue; |
| 324 | 324 | } |
| 325 | - $fields["{$input['id']}"] = array( |
|
| 325 | + $fields[ "{$input[ 'id' ]}" ] = array( |
|
| 326 | 326 | 'label' => \GV\Utils::get( $input, 'label' ), |
| 327 | 327 | 'customLabel' => \GV\Utils::get( $input, 'customLabel' ), |
| 328 | 328 | 'parent' => $field, |
@@ -334,7 +334,7 @@ discard block |
||
| 334 | 334 | } |
| 335 | 335 | |
| 336 | 336 | |
| 337 | - if( GFCommon::is_product_field( $field['type'] ) ){ |
|
| 337 | + if ( GFCommon::is_product_field( $field[ 'type' ] ) ) { |
|
| 338 | 338 | $has_product_fields = true; |
| 339 | 339 | } |
| 340 | 340 | |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | * @since 1.7 |
| 349 | 349 | */ |
| 350 | 350 | if ( $has_post_fields ) { |
| 351 | - $fields['post_id'] = array( |
|
| 351 | + $fields[ 'post_id' ] = array( |
|
| 352 | 352 | 'label' => __( 'Post ID', 'gravityview' ), |
| 353 | 353 | 'type' => 'post_id', |
| 354 | 354 | ); |
@@ -361,11 +361,11 @@ discard block |
||
| 361 | 361 | foreach ( $payment_fields as $payment_field ) { |
| 362 | 362 | |
| 363 | 363 | // Either the field exists ($fields['shipping']) or the form explicitly contains a `shipping` field with numeric key |
| 364 | - if( isset( $fields["{$payment_field->name}"] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) { |
|
| 364 | + if ( isset( $fields[ "{$payment_field->name}" ] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) { |
|
| 365 | 365 | continue; |
| 366 | 366 | } |
| 367 | 367 | |
| 368 | - $fields["{$payment_field->name}"] = array( |
|
| 368 | + $fields[ "{$payment_field->name}" ] = array( |
|
| 369 | 369 | 'label' => $payment_field->label, |
| 370 | 370 | 'desc' => $payment_field->description, |
| 371 | 371 | 'type' => $payment_field->name, |
@@ -397,9 +397,9 @@ discard block |
||
| 397 | 397 | |
| 398 | 398 | $fields = array(); |
| 399 | 399 | |
| 400 | - foreach ( $extra_fields as $key => $field ){ |
|
| 401 | - if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) { |
|
| 402 | - $fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' ); |
|
| 400 | + foreach ( $extra_fields as $key => $field ) { |
|
| 401 | + if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) { |
|
| 402 | + $fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' ); |
|
| 403 | 403 | } |
| 404 | 404 | } |
| 405 | 405 | |
@@ -439,33 +439,33 @@ discard block |
||
| 439 | 439 | 'search_criteria' => null, |
| 440 | 440 | 'sorting' => null, |
| 441 | 441 | 'paging' => null, |
| 442 | - 'cache' => (isset( $passed_criteria['cache'] ) ? (bool) $passed_criteria['cache'] : true), |
|
| 442 | + 'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? (bool)$passed_criteria[ 'cache' ] : true ), |
|
| 443 | 443 | 'context_view_id' => null, |
| 444 | 444 | ); |
| 445 | 445 | |
| 446 | 446 | $criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults ); |
| 447 | 447 | |
| 448 | - if ( ! empty( $criteria['search_criteria']['field_filters'] ) && is_array( $criteria['search_criteria']['field_filters'] ) ) { |
|
| 449 | - foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) { |
|
| 448 | + if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) && is_array( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) { |
|
| 449 | + foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) { |
|
| 450 | 450 | |
| 451 | 451 | if ( ! is_array( $filter ) ) { |
| 452 | 452 | continue; |
| 453 | 453 | } |
| 454 | 454 | |
| 455 | 455 | // By default, we want searches to be wildcard for each field. |
| 456 | - $filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator']; |
|
| 456 | + $filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ]; |
|
| 457 | 457 | |
| 458 | 458 | /** |
| 459 | 459 | * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc) |
| 460 | 460 | * @param string $operator Existing search operator |
| 461 | 461 | * @param array $filter array with `key`, `value`, `operator`, `type` keys |
| 462 | 462 | */ |
| 463 | - $filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter ); |
|
| 463 | + $filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter ); |
|
| 464 | 464 | } |
| 465 | 465 | |
| 466 | 466 | // don't send just the [mode] without any field filter. |
| 467 | - if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) { |
|
| 468 | - unset( $criteria['search_criteria']['field_filters']['mode'] ); |
|
| 467 | + if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) { |
|
| 468 | + unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] ); |
|
| 469 | 469 | } |
| 470 | 470 | |
| 471 | 471 | } |
@@ -476,33 +476,33 @@ discard block |
||
| 476 | 476 | * Prepare date formats to be in Gravity Forms DB format; |
| 477 | 477 | * $passed_criteria may include date formats incompatible with Gravity Forms. |
| 478 | 478 | */ |
| 479 | - foreach ( array('start_date', 'end_date' ) as $key ) { |
|
| 479 | + foreach ( array( 'start_date', 'end_date' ) as $key ) { |
|
| 480 | 480 | |
| 481 | - if ( ! empty( $criteria['search_criteria'][ $key ] ) ) { |
|
| 481 | + if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) { |
|
| 482 | 482 | |
| 483 | 483 | // Use date_create instead of new DateTime so it returns false if invalid date format. |
| 484 | - $date = date_create( $criteria['search_criteria'][ $key ] ); |
|
| 484 | + $date = date_create( $criteria[ 'search_criteria' ][ $key ] ); |
|
| 485 | 485 | |
| 486 | 486 | if ( $date ) { |
| 487 | 487 | // Gravity Forms wants dates in the `Y-m-d H:i:s` format. |
| 488 | - $criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' ); |
|
| 488 | + $criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' ); |
|
| 489 | 489 | } else { |
| 490 | - gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria['search_criteria'][ $key ] ) ); |
|
| 490 | + gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria[ 'search_criteria' ][ $key ] ) ); |
|
| 491 | 491 | |
| 492 | 492 | // If it's an invalid date, unset it. Gravity Forms freaks out otherwise. |
| 493 | - unset( $criteria['search_criteria'][ $key ] ); |
|
| 493 | + unset( $criteria[ 'search_criteria' ][ $key ] ); |
|
| 494 | 494 | } |
| 495 | 495 | } |
| 496 | 496 | } |
| 497 | 497 | |
| 498 | - if ( empty( $criteria['context_view_id'] ) ) { |
|
| 498 | + if ( empty( $criteria[ 'context_view_id' ] ) ) { |
|
| 499 | 499 | // Calculate the context view id and send it to the advanced filter |
| 500 | 500 | if ( GravityView_frontend::getInstance()->getSingleEntry() ) { |
| 501 | - $criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id(); |
|
| 501 | + $criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id(); |
|
| 502 | 502 | } else if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance() && GravityView_View_Data::getInstance()->has_multiple_views() ) { |
| 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 ( 'delete' === GFForms::get( 'action' ) ) { |
| 505 | - $criteria['context_view_id'] = isset( $_GET['view_id'] ) ? intval( $_GET['view_id'] ) : null; |
|
| 505 | + $criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? intval( $_GET[ 'view_id' ] ) : null; |
|
| 506 | 506 | } |
| 507 | 507 | } |
| 508 | 508 | |
@@ -512,7 +512,7 @@ discard block |
||
| 512 | 512 | * @param array $form_ids Forms to search |
| 513 | 513 | * @param int $view_id ID of the view being used to search |
| 514 | 514 | */ |
| 515 | - $criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] ); |
|
| 515 | + $criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] ); |
|
| 516 | 516 | |
| 517 | 517 | return (array)$criteria; |
| 518 | 518 | } |
@@ -546,7 +546,7 @@ discard block |
||
| 546 | 546 | /** Reduce # of database calls */ |
| 547 | 547 | add_filter( 'gform_is_encrypted_field', '__return_false' ); |
| 548 | 548 | |
| 549 | - if ( ! empty( $criteria['cache'] ) ) { |
|
| 549 | + if ( ! empty( $criteria[ 'cache' ] ) ) { |
|
| 550 | 550 | |
| 551 | 551 | $Cache = new GravityView_Cache( $form_ids, $criteria ); |
| 552 | 552 | |
@@ -554,7 +554,7 @@ discard block |
||
| 554 | 554 | |
| 555 | 555 | // Still update the total count when using cached results |
| 556 | 556 | if ( ! is_null( $total ) ) { |
| 557 | - $total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] ); |
|
| 557 | + $total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] ); |
|
| 558 | 558 | } |
| 559 | 559 | |
| 560 | 560 | $return = $entries; |
@@ -576,9 +576,9 @@ discard block |
||
| 576 | 576 | $entries = apply_filters_ref_array( 'gravityview_before_get_entries', array( null, $criteria, $passed_criteria, &$total ) ); |
| 577 | 577 | |
| 578 | 578 | // No entries returned from gravityview_before_get_entries |
| 579 | - if( is_null( $entries ) ) { |
|
| 579 | + if ( is_null( $entries ) ) { |
|
| 580 | 580 | |
| 581 | - $entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total ); |
|
| 581 | + $entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total ); |
|
| 582 | 582 | |
| 583 | 583 | if ( is_wp_error( $entries ) ) { |
| 584 | 584 | gravityview()->log->error( '{error}', array( 'error' => $entries->get_error_message(), 'data' => $entries ) ); |
@@ -589,7 +589,7 @@ discard block |
||
| 589 | 589 | } |
| 590 | 590 | } |
| 591 | 591 | |
| 592 | - if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) { |
|
| 592 | + if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) { |
|
| 593 | 593 | |
| 594 | 594 | // Cache results |
| 595 | 595 | $Cache->set( $entries, 'entries' ); |
@@ -702,18 +702,18 @@ discard block |
||
| 702 | 702 | $check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry, $view ); |
| 703 | 703 | |
| 704 | 704 | // Is the entry allowed |
| 705 | - if( $check_entry_display ) { |
|
| 705 | + if ( $check_entry_display ) { |
|
| 706 | 706 | |
| 707 | 707 | $gvid = \GV\Utils::_GET( 'gvid' ); |
| 708 | 708 | |
| 709 | - if( $gvid ) { |
|
| 709 | + if ( $gvid ) { |
|
| 710 | 710 | $view = \GV\View::by_id( $gvid ); |
| 711 | 711 | } |
| 712 | 712 | |
| 713 | 713 | $entry = self::check_entry_display( $entry, $view ); |
| 714 | 714 | } |
| 715 | 715 | |
| 716 | - if( is_wp_error( $entry ) ) { |
|
| 716 | + if ( is_wp_error( $entry ) ) { |
|
| 717 | 717 | gravityview()->log->error( '{error}', array( 'error' => $entry->get_error_message() ) ); |
| 718 | 718 | return false; |
| 719 | 719 | } |
@@ -747,12 +747,12 @@ discard block |
||
| 747 | 747 | |
| 748 | 748 | $value = false; |
| 749 | 749 | |
| 750 | - if( 'context' === $val1 ) { |
|
| 750 | + if ( 'context' === $val1 ) { |
|
| 751 | 751 | |
| 752 | 752 | $matching_contexts = array( $val2 ); |
| 753 | 753 | |
| 754 | 754 | // We allow for non-standard contexts. |
| 755 | - switch( $val2 ) { |
|
| 755 | + switch ( $val2 ) { |
|
| 756 | 756 | // Check for either single or edit |
| 757 | 757 | case 'singular': |
| 758 | 758 | $matching_contexts = array( 'single', 'edit' ); |
@@ -795,18 +795,18 @@ discard block |
||
| 795 | 795 | $json_val_1 = json_decode( $val1, true ); |
| 796 | 796 | $json_val_2 = json_decode( $val2, true ); |
| 797 | 797 | |
| 798 | - if( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) { |
|
| 798 | + if ( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) { |
|
| 799 | 799 | |
| 800 | 800 | $json_in = false; |
| 801 | - $json_val_1 = $json_val_1 ? (array) $json_val_1 : array( $val1 ); |
|
| 802 | - $json_val_2 = $json_val_2 ? (array) $json_val_2 : array( $val2 ); |
|
| 801 | + $json_val_1 = $json_val_1 ? (array)$json_val_1 : array( $val1 ); |
|
| 802 | + $json_val_2 = $json_val_2 ? (array)$json_val_2 : array( $val2 ); |
|
| 803 | 803 | |
| 804 | 804 | // For JSON, we want to compare as "in" or "not in" rather than "contains" |
| 805 | 805 | foreach ( $json_val_1 as $item_1 ) { |
| 806 | 806 | foreach ( $json_val_2 as $item_2 ) { |
| 807 | 807 | $json_in = self::matches_operation( $item_1, $item_2, 'is' ); |
| 808 | 808 | |
| 809 | - if( $json_in ) { |
|
| 809 | + if ( $json_in ) { |
|
| 810 | 810 | break 2; |
| 811 | 811 | } |
| 812 | 812 | } |
@@ -857,10 +857,10 @@ discard block |
||
| 857 | 857 | public static function check_entry_display( $entry, $view = null ) { |
| 858 | 858 | |
| 859 | 859 | if ( ! $entry || is_wp_error( $entry ) ) { |
| 860 | - return new WP_Error('entry_not_found', 'Entry was not found.', $entry ); |
|
| 860 | + return new WP_Error( 'entry_not_found', 'Entry was not found.', $entry ); |
|
| 861 | 861 | } |
| 862 | 862 | |
| 863 | - if ( empty( $entry['form_id'] ) ) { |
|
| 863 | + if ( empty( $entry[ 'form_id' ] ) ) { |
|
| 864 | 864 | return new WP_Error( 'form_id_not_set', '[apply_filters_to_entry] Entry is empty!', $entry ); |
| 865 | 865 | } |
| 866 | 866 | |
@@ -875,19 +875,19 @@ discard block |
||
| 875 | 875 | |
| 876 | 876 | $_gvid = \GV\Utils::_GET( 'gvid' ); |
| 877 | 877 | |
| 878 | - if ( $_gvid && $view->ID !== (int) $_gvid ) { |
|
| 878 | + if ( $_gvid && $view->ID !== (int)$_gvid ) { |
|
| 879 | 879 | return new WP_Error( 'view_id_not_match_gvid', 'View does not match passed $_GET["gvid"].', $view->ID ); |
| 880 | 880 | } |
| 881 | 881 | |
| 882 | 882 | $view_form_id = $view->form->ID; |
| 883 | 883 | |
| 884 | 884 | if ( $view->joins ) { |
| 885 | - if ( in_array( (int) $entry['form_id'], array_keys( $view::get_joined_forms( $view->ID ) ), true ) ) { |
|
| 886 | - $view_form_id = $entry['form_id']; |
|
| 885 | + if ( in_array( (int)$entry[ 'form_id' ], array_keys( $view::get_joined_forms( $view->ID ) ), true ) ) { |
|
| 886 | + $view_form_id = $entry[ 'form_id' ]; |
|
| 887 | 887 | } |
| 888 | 888 | } |
| 889 | 889 | |
| 890 | - if ( (int) $view_form_id !== (int) $entry['form_id'] ) { |
|
| 890 | + if ( (int)$view_form_id !== (int)$entry[ 'form_id' ] ) { |
|
| 891 | 891 | return new WP_Error( 'view_id_not_match', 'View form source does not match entry form source ID.', $entry ); |
| 892 | 892 | } |
| 893 | 893 | |
@@ -895,13 +895,13 @@ discard block |
||
| 895 | 895 | * Check whether the entry is in the entries subset by running a modified query. |
| 896 | 896 | */ |
| 897 | 897 | add_action( 'gravityview/view/query', $entry_subset_callback = function( &$query, $view, $request ) use ( $entry, $view_form_id ) { |
| 898 | - $_tmp_query = new \GF_Query( $view_form_id, array( |
|
| 898 | + $_tmp_query = new \GF_Query( $view_form_id, array( |
|
| 899 | 899 | 'field_filters' => array( |
| 900 | 900 | 'mode' => 'all', |
| 901 | 901 | array( |
| 902 | 902 | 'key' => 'id', |
| 903 | 903 | 'operation' => 'is', |
| 904 | - 'value' => $entry['id'] |
|
| 904 | + 'value' => $entry[ 'id' ] |
|
| 905 | 905 | ) |
| 906 | 906 | ) |
| 907 | 907 | ) ); |
@@ -911,14 +911,14 @@ discard block |
||
| 911 | 911 | /** @type \GF_Query $query */ |
| 912 | 912 | $query_parts = $query->_introspect(); |
| 913 | 913 | |
| 914 | - $query->where( \GF_Query_Condition::_and( $_tmp_query_parts['where'], $query_parts['where'] ) ); |
|
| 914 | + $query->where( \GF_Query_Condition::_and( $_tmp_query_parts[ 'where' ], $query_parts[ 'where' ] ) ); |
|
| 915 | 915 | |
| 916 | 916 | }, 10, 3 ); |
| 917 | 917 | |
| 918 | 918 | // Prevent page offset from being applied to the single entry query; it's used to return to the referring page number |
| 919 | 919 | add_filter( 'gravityview_search_criteria', $remove_pagenum = function( $criteria ) { |
| 920 | 920 | |
| 921 | - $criteria['paging'] = array( |
|
| 921 | + $criteria[ 'paging' ] = array( |
|
| 922 | 922 | 'offset' => 0, |
| 923 | 923 | 'page_size' => 25 |
| 924 | 924 | ); |
@@ -937,20 +937,20 @@ discard block |
||
| 937 | 937 | } |
| 938 | 938 | |
| 939 | 939 | // This entry is on a View with joins |
| 940 | - if ( $entries[0]->is_multi() ) { |
|
| 940 | + if ( $entries[ 0 ]->is_multi() ) { |
|
| 941 | 941 | |
| 942 | 942 | $multi_entry_ids = array(); |
| 943 | 943 | |
| 944 | - foreach ( $entries[0]->entries as $multi_entry ) { |
|
| 945 | - $multi_entry_ids[] = (int) $multi_entry->ID; |
|
| 944 | + foreach ( $entries[ 0 ]->entries as $multi_entry ) { |
|
| 945 | + $multi_entry_ids[ ] = (int)$multi_entry->ID; |
|
| 946 | 946 | } |
| 947 | 947 | |
| 948 | - if ( ! in_array( (int) $entry['id'], $multi_entry_ids, true ) ) { |
|
| 948 | + if ( ! in_array( (int)$entry[ 'id' ], $multi_entry_ids, true ) ) { |
|
| 949 | 949 | remove_action( 'gravityview/view/query', $entry_subset_callback ); |
| 950 | 950 | return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' ); |
| 951 | 951 | } |
| 952 | 952 | |
| 953 | - } elseif ( (int) $entries[0]->ID !== (int) $entry['id'] ) { |
|
| 953 | + } elseif ( (int)$entries[ 0 ]->ID !== (int)$entry[ 'id' ] ) { |
|
| 954 | 954 | remove_action( 'gravityview/view/query', $entry_subset_callback ); |
| 955 | 955 | return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' ); |
| 956 | 956 | } |
@@ -995,18 +995,18 @@ discard block |
||
| 995 | 995 | * Gravity Forms code to adjust date to locally-configured Time Zone |
| 996 | 996 | * @see GFCommon::format_date() for original code |
| 997 | 997 | */ |
| 998 | - $date_gmt_time = mysql2date( 'G', $date_string ); |
|
| 998 | + $date_gmt_time = mysql2date( 'G', $date_string ); |
|
| 999 | 999 | $date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time ); |
| 1000 | 1000 | |
| 1001 | - $format = \GV\Utils::get( $atts, 'format' ); |
|
| 1002 | - $is_human = ! empty( $atts['human'] ); |
|
| 1003 | - $is_diff = ! empty( $atts['diff'] ); |
|
| 1004 | - $is_raw = ! empty( $atts['raw'] ); |
|
| 1005 | - $is_timestamp = ! empty( $atts['timestamp'] ); |
|
| 1006 | - $include_time = ! empty( $atts['time'] ); |
|
| 1001 | + $format = \GV\Utils::get( $atts, 'format' ); |
|
| 1002 | + $is_human = ! empty( $atts[ 'human' ] ); |
|
| 1003 | + $is_diff = ! empty( $atts[ 'diff' ] ); |
|
| 1004 | + $is_raw = ! empty( $atts[ 'raw' ] ); |
|
| 1005 | + $is_timestamp = ! empty( $atts[ 'timestamp' ] ); |
|
| 1006 | + $include_time = ! empty( $atts[ 'time' ] ); |
|
| 1007 | 1007 | |
| 1008 | 1008 | // If we're using time diff, we want to have a different default format |
| 1009 | - if( empty( $format ) ) { |
|
| 1009 | + if ( empty( $format ) ) { |
|
| 1010 | 1010 | /* translators: %s: relative time from now, used for generic date comparisons. "1 day ago", or "20 seconds ago" */ |
| 1011 | 1011 | $format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' ); |
| 1012 | 1012 | } |
@@ -1014,7 +1014,7 @@ discard block |
||
| 1014 | 1014 | // If raw was specified, don't modify the stored value |
| 1015 | 1015 | if ( $is_raw ) { |
| 1016 | 1016 | $formatted_date = $date_string; |
| 1017 | - } elseif( $is_timestamp ) { |
|
| 1017 | + } elseif ( $is_timestamp ) { |
|
| 1018 | 1018 | $formatted_date = $date_local_timestamp; |
| 1019 | 1019 | } elseif ( $is_diff ) { |
| 1020 | 1020 | $formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) ); |
@@ -1047,7 +1047,7 @@ discard block |
||
| 1047 | 1047 | |
| 1048 | 1048 | $label = \GV\Utils::get( $field, 'label' ); |
| 1049 | 1049 | |
| 1050 | - if( floor( $field_id ) !== floatval( $field_id ) ) { |
|
| 1050 | + if ( floor( $field_id ) !== floatval( $field_id ) ) { |
|
| 1051 | 1051 | $label = GFFormsModel::get_choice_text( $field, $field_value, $field_id ); |
| 1052 | 1052 | } |
| 1053 | 1053 | |
@@ -1074,7 +1074,7 @@ discard block |
||
| 1074 | 1074 | $form = GFAPI::get_form( $form ); |
| 1075 | 1075 | } |
| 1076 | 1076 | |
| 1077 | - if ( class_exists( 'GFFormsModel' ) ){ |
|
| 1077 | + if ( class_exists( 'GFFormsModel' ) ) { |
|
| 1078 | 1078 | return GFFormsModel::get_field( $form, $field_id ); |
| 1079 | 1079 | } else { |
| 1080 | 1080 | return null; |
@@ -1121,19 +1121,19 @@ discard block |
||
| 1121 | 1121 | $shortcodes = array(); |
| 1122 | 1122 | |
| 1123 | 1123 | preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER ); |
| 1124 | - if ( empty( $matches ) ){ |
|
| 1124 | + if ( empty( $matches ) ) { |
|
| 1125 | 1125 | return false; |
| 1126 | 1126 | } |
| 1127 | 1127 | |
| 1128 | 1128 | foreach ( $matches as $shortcode ) { |
| 1129 | - if ( $tag === $shortcode[2] ) { |
|
| 1129 | + if ( $tag === $shortcode[ 2 ] ) { |
|
| 1130 | 1130 | |
| 1131 | 1131 | // Changed this to $shortcode instead of true so we get the parsed atts. |
| 1132 | - $shortcodes[] = $shortcode; |
|
| 1132 | + $shortcodes[ ] = $shortcode; |
|
| 1133 | 1133 | |
| 1134 | - } else if ( isset( $shortcode[5] ) && $results = self::has_shortcode_r( $shortcode[5], $tag ) ) { |
|
| 1135 | - foreach( $results as $result ) { |
|
| 1136 | - $shortcodes[] = $result; |
|
| 1134 | + } else if ( isset( $shortcode[ 5 ] ) && $results = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) { |
|
| 1135 | + foreach ( $results as $result ) { |
|
| 1136 | + $shortcodes[ ] = $result; |
|
| 1137 | 1137 | } |
| 1138 | 1138 | } |
| 1139 | 1139 | } |
@@ -1165,7 +1165,7 @@ discard block |
||
| 1165 | 1165 | 'post_type' => 'gravityview', |
| 1166 | 1166 | 'posts_per_page' => 100, |
| 1167 | 1167 | 'meta_key' => '_gravityview_form_id', |
| 1168 | - 'meta_value' => (int) $form_id, |
|
| 1168 | + 'meta_value' => (int)$form_id, |
|
| 1169 | 1169 | ); |
| 1170 | 1170 | $args = wp_parse_args( $args, $defaults ); |
| 1171 | 1171 | $views = get_posts( $args ); |
@@ -1177,21 +1177,21 @@ discard block |
||
| 1177 | 1177 | |
| 1178 | 1178 | $data = unserialize( $view->meta_value ); |
| 1179 | 1179 | |
| 1180 | - if( ! $data || ! is_array( $data ) ) { |
|
| 1180 | + if ( ! $data || ! is_array( $data ) ) { |
|
| 1181 | 1181 | continue; |
| 1182 | 1182 | } |
| 1183 | 1183 | |
| 1184 | 1184 | foreach ( $data as $datum ) { |
| 1185 | - if ( ! empty( $datum[2] ) && (int) $datum[2] === (int) $form_id ) { |
|
| 1186 | - $joined_forms[] = $view->post_id; |
|
| 1185 | + if ( ! empty( $datum[ 2 ] ) && (int)$datum[ 2 ] === (int)$form_id ) { |
|
| 1186 | + $joined_forms[ ] = $view->post_id; |
|
| 1187 | 1187 | } |
| 1188 | 1188 | } |
| 1189 | 1189 | } |
| 1190 | 1190 | |
| 1191 | 1191 | if ( $joined_forms ) { |
| 1192 | - $joined_args = array( |
|
| 1192 | + $joined_args = array( |
|
| 1193 | 1193 | 'post_type' => 'gravityview', |
| 1194 | - 'posts_per_page' => $args['posts_per_page'], |
|
| 1194 | + 'posts_per_page' => $args[ 'posts_per_page' ], |
|
| 1195 | 1195 | 'post__in' => $joined_forms, |
| 1196 | 1196 | ); |
| 1197 | 1197 | $views = array_merge( $views, get_posts( $joined_args ) ); |
@@ -1347,7 +1347,7 @@ discard block |
||
| 1347 | 1347 | |
| 1348 | 1348 | $directory_widgets = wp_parse_args( $view_widgets, $defaults ); |
| 1349 | 1349 | |
| 1350 | - if( $json_decode ) { |
|
| 1350 | + if ( $json_decode ) { |
|
| 1351 | 1351 | $directory_widgets = gv_map_deep( $directory_widgets, 'gv_maybe_json_decode' ); |
| 1352 | 1352 | } |
| 1353 | 1353 | |
@@ -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 | |
@@ -1418,16 +1418,16 @@ discard block |
||
| 1418 | 1418 | $blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL ); |
| 1419 | 1419 | |
| 1420 | 1420 | // TODO: Convert to using array_filter |
| 1421 | - foreach( $fields as $id => $field ) { |
|
| 1421 | + foreach ( $fields as $id => $field ) { |
|
| 1422 | 1422 | |
| 1423 | - if( in_array( $field['type'], $blacklist_field_types ) ) { |
|
| 1423 | + if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) { |
|
| 1424 | 1424 | unset( $fields[ $id ] ); |
| 1425 | 1425 | } |
| 1426 | 1426 | |
| 1427 | 1427 | /** |
| 1428 | 1428 | * Merge date and time subfields. |
| 1429 | 1429 | */ |
| 1430 | - if ( in_array( $field['type'], array( 'date', 'time' ) ) && ! empty( $field['parent'] ) ) { |
|
| 1430 | + if ( in_array( $field[ 'type' ], array( 'date', 'time' ) ) && ! empty( $field[ 'parent' ] ) ) { |
|
| 1431 | 1431 | $fields[ intval( $id ) ] = array( |
| 1432 | 1432 | 'label' => \GV\Utils::get( $field, 'parent/label' ), |
| 1433 | 1433 | 'parent' => null, |
@@ -1477,14 +1477,14 @@ discard block |
||
| 1477 | 1477 | * @param int|array $field field key or field array |
| 1478 | 1478 | * @return boolean |
| 1479 | 1479 | */ |
| 1480 | - public static function is_field_numeric( $form = null, $field = '' ) { |
|
| 1480 | + public static function is_field_numeric( $form = null, $field = '' ) { |
|
| 1481 | 1481 | |
| 1482 | 1482 | if ( ! is_array( $form ) && ! is_array( $field ) ) { |
| 1483 | 1483 | $form = self::get_form( $form ); |
| 1484 | 1484 | } |
| 1485 | 1485 | |
| 1486 | 1486 | // If entry meta, it's a string. Otherwise, numeric |
| 1487 | - if( ! is_numeric( $field ) && is_string( $field ) ) { |
|
| 1487 | + if ( ! is_numeric( $field ) && is_string( $field ) ) { |
|
| 1488 | 1488 | $type = $field; |
| 1489 | 1489 | } else { |
| 1490 | 1490 | $type = self::get_field_type( $form, $field ); |
@@ -1498,9 +1498,9 @@ discard block |
||
| 1498 | 1498 | $numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) ); |
| 1499 | 1499 | |
| 1500 | 1500 | // Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true |
| 1501 | - if( $gv_field = GravityView_Fields::get( $type ) ) { |
|
| 1502 | - if( true === $gv_field->is_numeric ) { |
|
| 1503 | - $numeric_types[] = $gv_field->is_numeric; |
|
| 1501 | + if ( $gv_field = GravityView_Fields::get( $type ) ) { |
|
| 1502 | + if ( true === $gv_field->is_numeric ) { |
|
| 1503 | + $numeric_types[ ] = $gv_field->is_numeric; |
|
| 1504 | 1504 | } |
| 1505 | 1505 | } |
| 1506 | 1506 | |
@@ -1651,18 +1651,18 @@ discard block |
||
| 1651 | 1651 | $final_atts = array_filter( $final_atts ); |
| 1652 | 1652 | |
| 1653 | 1653 | // If the href wasn't passed as an attribute, use the value passed to the function |
| 1654 | - if ( empty( $final_atts['href'] ) && ! empty( $href ) ) { |
|
| 1655 | - $final_atts['href'] = $href; |
|
| 1654 | + if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) { |
|
| 1655 | + $final_atts[ 'href' ] = $href; |
|
| 1656 | 1656 | } |
| 1657 | 1657 | |
| 1658 | - $final_atts['href'] = esc_url_raw( $href ); |
|
| 1658 | + $final_atts[ 'href' ] = esc_url_raw( $href ); |
|
| 1659 | 1659 | |
| 1660 | 1660 | /** |
| 1661 | 1661 | * Fix potential security issue with target=_blank |
| 1662 | 1662 | * @see https://dev.to/ben/the-targetblank-vulnerability-by-example |
| 1663 | 1663 | */ |
| 1664 | - if( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) { |
|
| 1665 | - $final_atts['rel'] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' ); |
|
| 1664 | + if ( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) { |
|
| 1665 | + $final_atts[ 'rel' ] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' ); |
|
| 1666 | 1666 | } |
| 1667 | 1667 | |
| 1668 | 1668 | // Sort the attributes alphabetically, to help testing |
@@ -1674,7 +1674,7 @@ discard block |
||
| 1674 | 1674 | $output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) ); |
| 1675 | 1675 | } |
| 1676 | 1676 | |
| 1677 | - if( '' !== $output ) { |
|
| 1677 | + if ( '' !== $output ) { |
|
| 1678 | 1678 | $output = '<a' . $output . '>' . $anchor_text . '</a>'; |
| 1679 | 1679 | } |
| 1680 | 1680 | |
@@ -1701,7 +1701,7 @@ discard block |
||
| 1701 | 1701 | if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) { |
| 1702 | 1702 | $merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value ); |
| 1703 | 1703 | } else if ( is_numeric( $key ) && isset( $merged[ $key ] ) ) { |
| 1704 | - $merged[] = $value; |
|
| 1704 | + $merged[ ] = $value; |
|
| 1705 | 1705 | } else { |
| 1706 | 1706 | $merged[ $key ] = $value; |
| 1707 | 1707 | } |
@@ -1734,7 +1734,7 @@ discard block |
||
| 1734 | 1734 | * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..) |
| 1735 | 1735 | * @param array $settings Settings array, with `number` key defining the # of users to display |
| 1736 | 1736 | */ |
| 1737 | - $get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) ); |
|
| 1737 | + $get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) ); |
|
| 1738 | 1738 | |
| 1739 | 1739 | return get_users( $get_users_settings ); |
| 1740 | 1740 | } |
@@ -1754,11 +1754,11 @@ discard block |
||
| 1754 | 1754 | public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) { |
| 1755 | 1755 | |
| 1756 | 1756 | // If $cap is defined, only show notice if user has capability |
| 1757 | - if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) { |
|
| 1757 | + if ( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) { |
|
| 1758 | 1758 | return ''; |
| 1759 | 1759 | } |
| 1760 | 1760 | |
| 1761 | - return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>'; |
|
| 1761 | + return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>'; |
|
| 1762 | 1762 | } |
| 1763 | 1763 | |
| 1764 | 1764 | /** |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | * @return \GV\Field The field implementation from configuration (\GV\GF_Field, \GV\Internal_Field). |
| 167 | 167 | */ |
| 168 | 168 | public static function from_configuration( $configuration ) { |
| 169 | - if ( empty( $configuration['id'] ) ) { |
|
| 169 | + if ( empty( $configuration[ 'id' ] ) ) { |
|
| 170 | 170 | $field = new self(); |
| 171 | 171 | gravityview()->log->error( 'Trying to get field from configuration without a field ID.', array( 'data' => $configuration ) ); |
| 172 | 172 | $field->update_configuration( $configuration ); |
@@ -179,8 +179,8 @@ discard block |
||
| 179 | 179 | } else { |
| 180 | 180 | $trace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS ); |
| 181 | 181 | } |
| 182 | - $trace = $trace[1]; |
|
| 183 | - if ( $trace['function'] == 'from_configuration' && $trace['class'] == __CLASS__ ) { |
|
| 182 | + $trace = $trace[ 1 ]; |
|
| 183 | + if ( $trace[ 'function' ] == 'from_configuration' && $trace[ 'class' ] == __CLASS__ ) { |
|
| 184 | 184 | $field = new self(); |
| 185 | 185 | gravityview()->log->error( 'Infinite loop protection tripped. Returning default class here.' ); |
| 186 | 186 | $field->update_configuration( $configuration ); |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | } |
| 189 | 189 | |
| 190 | 190 | /** @type \GV\GF_Field|\GV\Internal_Field $field_class Determine the field implementation to use, and try to use. */ |
| 191 | - $field_class = is_numeric( $configuration['id'] ) ? '\GV\GF_Field' : '\GV\Internal_Field'; |
|
| 191 | + $field_class = is_numeric( $configuration[ 'id' ] ) ? '\GV\GF_Field' : '\GV\Internal_Field'; |
|
| 192 | 192 | |
| 193 | 193 | /** |
| 194 | 194 | * @filter `gravityview/field/class` Filter the field class about to be created from the configuration. |
@@ -227,24 +227,24 @@ discard block |
||
| 227 | 227 | public function update_configuration( $configuration ) { |
| 228 | 228 | $configuration = wp_parse_args( $configuration, $this->as_configuration() ); |
| 229 | 229 | |
| 230 | - if ( $this->ID != $configuration['id'] ) { |
|
| 230 | + if ( $this->ID != $configuration[ 'id' ] ) { |
|
| 231 | 231 | /** Smelling trouble here... */ |
| 232 | 232 | gravityview()->log->warning( 'ID is being changed for {field_class} instance, but implementation is not. Use ::from_configuration instead', array( 'field_class', __CLASS__ ) ); |
| 233 | 233 | } |
| 234 | 234 | |
| 235 | - $this->ID = $configuration['id']; |
|
| 236 | - $this->label = $configuration['label']; |
|
| 237 | - $this->show_label = $configuration['show_label'] == '1'; |
|
| 238 | - $this->custom_label = $configuration['custom_label']; |
|
| 239 | - $this->custom_class = $configuration['custom_class']; |
|
| 240 | - $this->cap = $configuration['only_loggedin'] == '1' ? $configuration['only_loggedin_cap'] : ''; |
|
| 241 | - $this->search_filter = $configuration['search_filter'] == '1'; |
|
| 242 | - $this->show_as_link = $configuration['show_as_link'] == '1'; |
|
| 235 | + $this->ID = $configuration[ 'id' ]; |
|
| 236 | + $this->label = $configuration[ 'label' ]; |
|
| 237 | + $this->show_label = $configuration[ 'show_label' ] == '1'; |
|
| 238 | + $this->custom_label = $configuration[ 'custom_label' ]; |
|
| 239 | + $this->custom_class = $configuration[ 'custom_class' ]; |
|
| 240 | + $this->cap = $configuration[ 'only_loggedin' ] == '1' ? $configuration[ 'only_loggedin_cap' ] : ''; |
|
| 241 | + $this->search_filter = $configuration[ 'search_filter' ] == '1'; |
|
| 242 | + $this->show_as_link = $configuration[ 'show_as_link' ] == '1'; |
|
| 243 | 243 | |
| 244 | 244 | /** Shared among all field types (sort of). */ |
| 245 | 245 | $shared_configuration_keys = array( |
| 246 | 246 | 'id', 'label', 'show_label', 'custom_label', 'custom_class', |
| 247 | - 'only_loggedin' ,'only_loggedin_cap', 'search_filter', 'show_as_link', |
|
| 247 | + 'only_loggedin', 'only_loggedin_cap', 'search_filter', 'show_as_link', |
|
| 248 | 248 | ); |
| 249 | 249 | |
| 250 | 250 | /** Everything else goes into the properties for now. @todo subclasses! */ |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | |
| 274 | 274 | /** A custom label is available. */ |
| 275 | 275 | if ( ! empty( $this->custom_label ) ) { |
| 276 | - return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ? : null : null, $entry ? $entry->as_entry() : null ); |
|
| 276 | + return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ?: null : null, $entry ? $entry->as_entry() : null ); |
|
| 277 | 277 | } |
| 278 | 278 | |
| 279 | 279 | return ''; |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | * @return mixed|null The value for the given configuration key, null if doesn't exist. |
| 360 | 360 | */ |
| 361 | 361 | public function __get( $key ) { |
| 362 | - switch( $key ) { |
|
| 362 | + switch ( $key ) { |
|
| 363 | 363 | default: |
| 364 | 364 | if ( isset( $this->configuration[ $key ] ) ) { |
| 365 | 365 | return $this->configuration[ $key ]; |
@@ -377,7 +377,7 @@ discard block |
||
| 377 | 377 | * @return boolean Whether this $key is set or not. |
| 378 | 378 | */ |
| 379 | 379 | public function __isset( $key ) { |
| 380 | - switch( $key ) { |
|
| 380 | + switch ( $key ) { |
|
| 381 | 381 | default: |
| 382 | 382 | return isset( $this->configuration[ $key ] ); |
| 383 | 383 | } |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | $supports = array( 'title', 'revisions' ); |
| 126 | 126 | |
| 127 | 127 | if ( $is_hierarchical ) { |
| 128 | - $supports[] = 'page-attributes'; |
|
| 128 | + $supports[ ] = 'page-attributes'; |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | /** |
@@ -227,11 +227,11 @@ discard block |
||
| 227 | 227 | $rule = array( sprintf( '%s/([^/]+)/csv/?', $slug ), 'index.php?gravityview=$matches[1]&csv=1', 'top' ); |
| 228 | 228 | |
| 229 | 229 | add_filter( 'query_vars', function( $query_vars ) { |
| 230 | - $query_vars[] = 'csv'; |
|
| 230 | + $query_vars[ ] = 'csv'; |
|
| 231 | 231 | return $query_vars; |
| 232 | 232 | } ); |
| 233 | 233 | |
| 234 | - if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[0] ] ) ) { |
|
| 234 | + if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[ 0 ] ] ) ) { |
|
| 235 | 235 | call_user_func_array( 'add_rewrite_rule', $rule ); |
| 236 | 236 | } |
| 237 | 237 | } |
@@ -308,13 +308,13 @@ discard block |
||
| 308 | 308 | return $content; |
| 309 | 309 | } |
| 310 | 310 | |
| 311 | - $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID ); |
|
| 311 | + $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID ); |
|
| 312 | 312 | |
| 313 | 313 | /** |
| 314 | 314 | * Editing a single entry. |
| 315 | 315 | */ |
| 316 | 316 | if ( $entry = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ) ) { |
| 317 | - if ( $entry['status'] != 'active' ) { |
|
| 317 | + if ( $entry[ 'status' ] != 'active' ) { |
|
| 318 | 318 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
| 319 | 319 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 320 | 320 | } |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
| 328 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 328 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 329 | 329 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
| 330 | 330 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 331 | 331 | } |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | |
| 349 | 349 | foreach ( $entryset as $e ) { |
| 350 | 350 | |
| 351 | - if ( 'active' !== $e['status'] ) { |
|
| 351 | + if ( 'active' !== $e[ 'status' ] ) { |
|
| 352 | 352 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) ); |
| 353 | 353 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 354 | 354 | } |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | } |
| 360 | 360 | |
| 361 | 361 | if ( $show_only_approved && ! $is_admin_and_can_view ) { |
| 362 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 362 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 363 | 363 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) ); |
| 364 | 364 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 365 | 365 | } |
@@ -534,7 +534,7 @@ discard block |
||
| 534 | 534 | $join_column = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field::by_id( $join_column ); |
| 535 | 535 | $join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field::by_id( $join_on_column ); |
| 536 | 536 | |
| 537 | - $joins [] = new Join( $join, $join_column, $join_on, $join_on_column ); |
|
| 537 | + $joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column ); |
|
| 538 | 538 | } |
| 539 | 539 | |
| 540 | 540 | return $joins; |
@@ -624,13 +624,13 @@ discard block |
||
| 624 | 624 | } |
| 625 | 625 | |
| 626 | 626 | foreach ( $_fields as $field ) { |
| 627 | - if ( ! empty( $field['unions'] ) ) { |
|
| 628 | - foreach ( $field['unions'] as $form_id => $field_id ) { |
|
| 627 | + if ( ! empty( $field[ 'unions' ] ) ) { |
|
| 628 | + foreach ( $field[ 'unions' ] as $form_id => $field_id ) { |
|
| 629 | 629 | if ( ! isset( $unions[ $form_id ] ) ) { |
| 630 | 630 | $unions[ $form_id ] = array(); |
| 631 | 631 | } |
| 632 | 632 | |
| 633 | - $unions[ $form_id ][ $field['id'] ] = |
|
| 633 | + $unions[ $form_id ][ $field[ 'id' ] ] = |
|
| 634 | 634 | is_numeric( $field_id ) ? \GV\GF_Field::by_id( \GV\GF_Form::by_id( $form_id ), $field_id ) : \GV\Internal_Field::by_id( $field_id ); |
| 635 | 635 | } |
| 636 | 636 | } |
@@ -685,7 +685,7 @@ discard block |
||
| 685 | 685 | if ( ! $view->form ) { |
| 686 | 686 | gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array( |
| 687 | 687 | 'view_id' => $view->ID, |
| 688 | - 'form_id' => $view->_gravityview_form_id ? : 0, |
|
| 688 | + 'form_id' => $view->_gravityview_form_id ?: 0, |
|
| 689 | 689 | ) ); |
| 690 | 690 | } |
| 691 | 691 | |
@@ -924,11 +924,11 @@ discard block |
||
| 924 | 924 | * Remove multiple sorting before calling legacy filters. |
| 925 | 925 | * This allows us to fake it till we make it. |
| 926 | 926 | */ |
| 927 | - if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) { |
|
| 927 | + if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) { |
|
| 928 | 928 | $has_multisort = true; |
| 929 | - $parameters['sort_field'] = reset( $parameters['sort_field'] ); |
|
| 930 | - if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) { |
|
| 931 | - $parameters['sort_direction'] = reset( $parameters['sort_direction'] ); |
|
| 929 | + $parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] ); |
|
| 930 | + if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) { |
|
| 931 | + $parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] ); |
|
| 932 | 932 | } |
| 933 | 933 | } |
| 934 | 934 | |
@@ -937,31 +937,30 @@ discard block |
||
| 937 | 937 | */ |
| 938 | 938 | $parameters = \GravityView_frontend::get_view_entries_parameters( $parameters, $this->form->ID ); |
| 939 | 939 | |
| 940 | - $parameters['context_view_id'] = $this->ID; |
|
| 940 | + $parameters[ 'context_view_id' ] = $this->ID; |
|
| 941 | 941 | $parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID ); |
| 942 | 942 | |
| 943 | 943 | if ( ! is_array( $parameters ) ) { |
| 944 | 944 | $parameters = array(); |
| 945 | 945 | } |
| 946 | 946 | |
| 947 | - if ( ! is_array( $parameters['search_criteria'] ) ) { |
|
| 948 | - $parameters['search_criteria'] = array(); |
|
| 947 | + if ( ! is_array( $parameters[ 'search_criteria' ] ) ) { |
|
| 948 | + $parameters[ 'search_criteria' ] = array(); |
|
| 949 | 949 | } |
| 950 | 950 | |
| 951 | - if ( ( ! isset( $parameters['search_criteria']['field_filters'] ) ) || ( ! is_array( $parameters['search_criteria']['field_filters'] ) ) ) { |
|
| 952 | - $parameters['search_criteria']['field_filters'] = array(); |
|
| 951 | + if ( ( ! isset( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) || ( ! is_array( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) ) { |
|
| 952 | + $parameters[ 'search_criteria' ][ 'field_filters' ] = array(); |
|
| 953 | 953 | } |
| 954 | 954 | |
| 955 | 955 | if ( $request instanceof REST\Request ) { |
| 956 | 956 | $atts = $this->settings->as_atts(); |
| 957 | 957 | $paging_parameters = wp_parse_args( $request->get_paging(), array( |
| 958 | - 'paging' => array( 'page_size' => $atts['page_size'] ), |
|
| 958 | + 'paging' => array( 'page_size' => $atts[ 'page_size' ] ), |
|
| 959 | 959 | ) ); |
| 960 | - $parameters['paging'] = $paging_parameters['paging']; |
|
| 960 | + $parameters[ 'paging' ] = $paging_parameters[ 'paging' ]; |
|
| 961 | 961 | } |
| 962 | 962 | |
| 963 | - $page = Utils::get( $parameters['paging'], 'current_page' ) ? |
|
| 964 | - : ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / \GV\Utils::get( $parameters, 'paging/page_size', 25 ) ) + 1 ); |
|
| 963 | + $page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / \GV\Utils::get( $parameters, 'paging/page_size', 25 ) ) + 1 ); |
|
| 965 | 964 | |
| 966 | 965 | /** |
| 967 | 966 | * Cleanup duplicate field_filter parameters to simplify the query. |
@@ -969,14 +968,14 @@ discard block |
||
| 969 | 968 | $unique_field_filters = array(); |
| 970 | 969 | foreach ( Utils::get( $parameters, 'search_criteria/field_filters', array() ) as $key => $filter ) { |
| 971 | 970 | if ( 'mode' === $key ) { |
| 972 | - $unique_field_filters['mode'] = $filter; |
|
| 971 | + $unique_field_filters[ 'mode' ] = $filter; |
|
| 973 | 972 | } else if ( ! in_array( $filter, $unique_field_filters ) ) { |
| 974 | - $unique_field_filters[] = $filter; |
|
| 973 | + $unique_field_filters[ ] = $filter; |
|
| 975 | 974 | } |
| 976 | 975 | } |
| 977 | - $parameters['search_criteria']['field_filters'] = $unique_field_filters; |
|
| 976 | + $parameters[ 'search_criteria' ][ 'field_filters' ] = $unique_field_filters; |
|
| 978 | 977 | |
| 979 | - if ( ! empty( $parameters['search_criteria']['field_filters'] ) ) { |
|
| 978 | + if ( ! empty( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) { |
|
| 980 | 979 | gravityview()->log->notice( 'search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.' ); |
| 981 | 980 | } |
| 982 | 981 | |
@@ -985,7 +984,7 @@ discard block |
||
| 985 | 984 | $query_class = $this->get_query_class(); |
| 986 | 985 | |
| 987 | 986 | /** @type \GF_Query $query */ |
| 988 | - $query = new $query_class( $this->form->ID, $parameters['search_criteria'], Utils::get( $parameters, 'sorting' ) ); |
|
| 987 | + $query = new $query_class( $this->form->ID, $parameters[ 'search_criteria' ], Utils::get( $parameters, 'sorting' ) ); |
|
| 989 | 988 | |
| 990 | 989 | /** |
| 991 | 990 | * Apply multisort. |
@@ -996,15 +995,15 @@ discard block |
||
| 996 | 995 | $view_setting_sort_field_ids = \GV\Utils::get( $atts, 'sort_field', array() ); |
| 997 | 996 | $view_setting_sort_directions = \GV\Utils::get( $atts, 'sort_direction', array() ); |
| 998 | 997 | |
| 999 | - $has_sort_query_param = ! empty( $_GET['sort'] ) && is_array( $_GET['sort'] ); |
|
| 998 | + $has_sort_query_param = ! empty( $_GET[ 'sort' ] ) && is_array( $_GET[ 'sort' ] ); |
|
| 1000 | 999 | |
| 1001 | - if( $has_sort_query_param ) { |
|
| 1002 | - $has_sort_query_param = array_filter( array_values( $_GET['sort'] ) ); |
|
| 1000 | + if ( $has_sort_query_param ) { |
|
| 1001 | + $has_sort_query_param = array_filter( array_values( $_GET[ 'sort' ] ) ); |
|
| 1003 | 1002 | } |
| 1004 | 1003 | |
| 1005 | 1004 | if ( $this->settings->get( 'sort_columns' ) && $has_sort_query_param ) { |
| 1006 | - $sort_field_ids = array_keys( $_GET['sort'] ); |
|
| 1007 | - $sort_directions = array_values( $_GET['sort'] ); |
|
| 1005 | + $sort_field_ids = array_keys( $_GET[ 'sort' ] ); |
|
| 1006 | + $sort_directions = array_values( $_GET[ 'sort' ] ); |
|
| 1008 | 1007 | } else { |
| 1009 | 1008 | $sort_field_ids = $view_setting_sort_field_ids; |
| 1010 | 1009 | $sort_directions = $view_setting_sort_directions; |
@@ -1012,7 +1011,7 @@ discard block |
||
| 1012 | 1011 | |
| 1013 | 1012 | $skip_first = false; |
| 1014 | 1013 | |
| 1015 | - foreach ( (array) $sort_field_ids as $key => $sort_field_id ) { |
|
| 1014 | + foreach ( (array)$sort_field_ids as $key => $sort_field_id ) { |
|
| 1016 | 1015 | |
| 1017 | 1016 | if ( ! $skip_first && ! $has_sort_query_param ) { |
| 1018 | 1017 | $skip_first = true; // Skip the first one, it's already in the query |
@@ -1042,15 +1041,15 @@ discard block |
||
| 1042 | 1041 | |
| 1043 | 1042 | $merged_time = false; |
| 1044 | 1043 | |
| 1045 | - foreach ( $q['order'] as $oid => $order ) { |
|
| 1046 | - if ( $order[0] instanceof \GF_Query_Column ) { |
|
| 1047 | - $column = $order[0]; |
|
| 1048 | - } else if ( $order[0] instanceof \GF_Query_Call ) { |
|
| 1049 | - if ( count( $order[0]->columns ) != 1 || ! $order[0]->columns[0] instanceof \GF_Query_Column ) { |
|
| 1044 | + foreach ( $q[ 'order' ] as $oid => $order ) { |
|
| 1045 | + if ( $order[ 0 ] instanceof \GF_Query_Column ) { |
|
| 1046 | + $column = $order[ 0 ]; |
|
| 1047 | + } else if ( $order[ 0 ] instanceof \GF_Query_Call ) { |
|
| 1048 | + if ( count( $order[ 0 ]->columns ) != 1 || ! $order[ 0 ]->columns[ 0 ] instanceof \GF_Query_Column ) { |
|
| 1050 | 1049 | $orders[ $oid ] = $order; |
| 1051 | 1050 | continue; // Need something that resembles a single sort |
| 1052 | 1051 | } |
| 1053 | - $column = $order[0]->columns[0]; |
|
| 1052 | + $column = $order[ 0 ]->columns[ 0 ]; |
|
| 1054 | 1053 | } |
| 1055 | 1054 | |
| 1056 | 1055 | if ( ( ! $field = \GFAPI::get_field( $column->source, $column->field_id ) ) || $field->type !== 'time' ) { |
@@ -1064,7 +1063,7 @@ discard block |
||
| 1064 | 1063 | |
| 1065 | 1064 | $orders[ $oid ] = array( |
| 1066 | 1065 | new \GV\Mocks\GF_Query_Call_TIMESORT( 'timesort', array( $column, $sql ) ), |
| 1067 | - $order[1] // Mock it! |
|
| 1066 | + $order[ 1 ] // Mock it! |
|
| 1068 | 1067 | ); |
| 1069 | 1068 | |
| 1070 | 1069 | $merged_time = true; |
@@ -1075,15 +1074,15 @@ discard block |
||
| 1075 | 1074 | * ORDER again. |
| 1076 | 1075 | */ |
| 1077 | 1076 | if ( ! empty( $orders ) && $_orders = $query->_order_generate( $orders ) ) { |
| 1078 | - $sql['order'] = 'ORDER BY ' . implode( ', ', $_orders ); |
|
| 1077 | + $sql[ 'order' ] = 'ORDER BY ' . implode( ', ', $_orders ); |
|
| 1079 | 1078 | } |
| 1080 | 1079 | } |
| 1081 | 1080 | |
| 1082 | 1081 | return $sql; |
| 1083 | 1082 | } ); |
| 1084 | 1083 | |
| 1085 | - $query->limit( $parameters['paging']['page_size'] ) |
|
| 1086 | - ->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) ); |
|
| 1084 | + $query->limit( $parameters[ 'paging' ][ 'page_size' ] ) |
|
| 1085 | + ->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) ); |
|
| 1087 | 1086 | |
| 1088 | 1087 | /** |
| 1089 | 1088 | * Any joins? |
@@ -1106,7 +1105,7 @@ discard block |
||
| 1106 | 1105 | |
| 1107 | 1106 | $query_parameters = $query->_introspect(); |
| 1108 | 1107 | |
| 1109 | - $query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) ); |
|
| 1108 | + $query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) ); |
|
| 1110 | 1109 | } |
| 1111 | 1110 | |
| 1112 | 1111 | /** |
@@ -1140,7 +1139,7 @@ discard block |
||
| 1140 | 1139 | } |
| 1141 | 1140 | |
| 1142 | 1141 | $q = $query->_introspect(); |
| 1143 | - $query->where( \GF_Query_Condition::_and( $q['where'], $condition ) ); |
|
| 1142 | + $query->where( \GF_Query_Condition::_and( $q[ 'where' ], $condition ) ); |
|
| 1144 | 1143 | |
| 1145 | 1144 | if ( $this->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
| 1146 | 1145 | |
@@ -1165,7 +1164,7 @@ discard block |
||
| 1165 | 1164 | |
| 1166 | 1165 | $query_parameters = $query->_introspect(); |
| 1167 | 1166 | |
| 1168 | - $query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) ); |
|
| 1167 | + $query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) ); |
|
| 1169 | 1168 | } |
| 1170 | 1169 | } |
| 1171 | 1170 | |
@@ -1189,7 +1188,7 @@ discard block |
||
| 1189 | 1188 | $conditions = array(); |
| 1190 | 1189 | |
| 1191 | 1190 | foreach ( $condition->expressions as $_condition ) { |
| 1192 | - $conditions[] = $recurse( $_condition, $fields, $recurse ); |
|
| 1191 | + $conditions[ ] = $recurse( $_condition, $fields, $recurse ); |
|
| 1193 | 1192 | } |
| 1194 | 1193 | |
| 1195 | 1194 | return call_user_func_array( |
@@ -1218,10 +1217,10 @@ discard block |
||
| 1218 | 1217 | $q = new $query_class( $form_id ); |
| 1219 | 1218 | |
| 1220 | 1219 | // Copy the WHERE clauses but substitute the field_ids to the respective ones |
| 1221 | - $q->where( $where_union_substitute( $query_parameters['where'], $fields, $where_union_substitute ) ); |
|
| 1220 | + $q->where( $where_union_substitute( $query_parameters[ 'where' ], $fields, $where_union_substitute ) ); |
|
| 1222 | 1221 | |
| 1223 | 1222 | // Copy the ORDER clause and substitute the field_ids to the respective ones |
| 1224 | - foreach ( $query_parameters['order'] as $order ) { |
|
| 1223 | + foreach ( $query_parameters[ 'order' ] as $order ) { |
|
| 1225 | 1224 | list( $column, $_order ) = $order; |
| 1226 | 1225 | |
| 1227 | 1226 | if ( $column && $column instanceof \GF_Query_Column ) { |
@@ -1235,15 +1234,15 @@ discard block |
||
| 1235 | 1234 | |
| 1236 | 1235 | add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( &$unions_sql ) { |
| 1237 | 1236 | // Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses |
| 1238 | - $select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] ); |
|
| 1237 | + $select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] ); |
|
| 1239 | 1238 | |
| 1240 | 1239 | // Record the SQL |
| 1241 | - $unions_sql[] = array( |
|
| 1240 | + $unions_sql[ ] = array( |
|
| 1242 | 1241 | // Remove columns, we'll rebuild them |
| 1243 | 1242 | 'select' => preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $select ), |
| 1244 | - 'from' => $sql['from'], |
|
| 1245 | - 'join' => $sql['join'], |
|
| 1246 | - 'where' => $sql['where'], |
|
| 1243 | + 'from' => $sql[ 'from' ], |
|
| 1244 | + 'join' => $sql[ 'join' ], |
|
| 1245 | + 'where' => $sql[ 'where' ], |
|
| 1247 | 1246 | // Remove order and limit |
| 1248 | 1247 | ); |
| 1249 | 1248 | |
@@ -1260,11 +1259,11 @@ discard block |
||
| 1260 | 1259 | |
| 1261 | 1260 | add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( $unions_sql ) { |
| 1262 | 1261 | // Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses |
| 1263 | - $sql['select'] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] ); |
|
| 1262 | + $sql[ 'select' ] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] ); |
|
| 1264 | 1263 | |
| 1265 | 1264 | // Remove columns, we'll rebuild them |
| 1266 | - preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql['select'], $select_match ); |
|
| 1267 | - $sql['select'] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql['select'] ); |
|
| 1265 | + preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql[ 'select' ], $select_match ); |
|
| 1266 | + $sql[ 'select' ] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql[ 'select' ] ); |
|
| 1268 | 1267 | |
| 1269 | 1268 | $unions = array(); |
| 1270 | 1269 | |
@@ -1275,30 +1274,30 @@ discard block |
||
| 1275 | 1274 | }; |
| 1276 | 1275 | |
| 1277 | 1276 | // Add all the order columns into the selects, so we can order by the whole union group |
| 1278 | - preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql['order'], $order_matches ); |
|
| 1277 | + preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql[ 'order' ], $order_matches ); |
|
| 1279 | 1278 | |
| 1280 | 1279 | $columns = array( |
| 1281 | - sprintf( '%s AS %s', $select_match[1], $column_to_alias( $select_match[1] ) ) |
|
| 1280 | + sprintf( '%s AS %s', $select_match[ 1 ], $column_to_alias( $select_match[ 1 ] ) ) |
|
| 1282 | 1281 | ); |
| 1283 | 1282 | |
| 1284 | 1283 | foreach ( array_slice( $order_matches, 1 ) as $match ) { |
| 1285 | - $columns[] = sprintf( '%s AS %s', $match[0], $column_to_alias( $match[0] ) ); |
|
| 1284 | + $columns[ ] = sprintf( '%s AS %s', $match[ 0 ], $column_to_alias( $match[ 0 ] ) ); |
|
| 1286 | 1285 | |
| 1287 | 1286 | // Rewrite the order columns to the shared aliases |
| 1288 | - $sql['order'] = str_replace( $match[0], $column_to_alias( $match[0] ), $sql['order'] ); |
|
| 1287 | + $sql[ 'order' ] = str_replace( $match[ 0 ], $column_to_alias( $match[ 0 ] ), $sql[ 'order' ] ); |
|
| 1289 | 1288 | } |
| 1290 | 1289 | |
| 1291 | 1290 | $columns = array_unique( $columns ); |
| 1292 | 1291 | |
| 1293 | 1292 | // Add the columns to every UNION |
| 1294 | 1293 | foreach ( $unions_sql as $union_sql ) { |
| 1295 | - $union_sql['select'] .= implode( ', ', $columns ); |
|
| 1296 | - $unions []= implode( ' ', $union_sql ); |
|
| 1294 | + $union_sql[ 'select' ] .= implode( ', ', $columns ); |
|
| 1295 | + $unions [ ] = implode( ' ', $union_sql ); |
|
| 1297 | 1296 | } |
| 1298 | 1297 | |
| 1299 | 1298 | // Add the columns to the main SELECT, but only grab the entry id column |
| 1300 | - $sql['select'] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql['select'] . implode( ', ', $columns ); |
|
| 1301 | - $sql['order'] = implode( ' ', $unions ) . ') AS u ' . $sql['order']; |
|
| 1299 | + $sql[ 'select' ] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql[ 'select' ] . implode( ', ', $columns ); |
|
| 1300 | + $sql[ 'order' ] = implode( ' ', $unions ) . ') AS u ' . $sql[ 'order' ]; |
|
| 1302 | 1301 | |
| 1303 | 1302 | return $sql; |
| 1304 | 1303 | } ); |
@@ -1343,20 +1342,20 @@ discard block |
||
| 1343 | 1342 | } ); |
| 1344 | 1343 | } else { |
| 1345 | 1344 | $entries = $this->form->entries |
| 1346 | - ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) ) |
|
| 1345 | + ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) ) |
|
| 1347 | 1346 | ->offset( $this->settings->get( 'offset' ) ) |
| 1348 | - ->limit( $parameters['paging']['page_size'] ) |
|
| 1347 | + ->limit( $parameters[ 'paging' ][ 'page_size' ] ) |
|
| 1349 | 1348 | ->page( $page ); |
| 1350 | 1349 | |
| 1351 | - if ( ! empty( $parameters['sorting'] ) && is_array( $parameters['sorting'] && ! isset( $parameters['sorting']['key'] ) ) ) { |
|
| 1350 | + if ( ! empty( $parameters[ 'sorting' ] ) && is_array( $parameters[ 'sorting' ] && ! isset( $parameters[ 'sorting' ][ 'key' ] ) ) ) { |
|
| 1352 | 1351 | // Pluck off multisort arrays |
| 1353 | - $parameters['sorting'] = $parameters['sorting'][0]; |
|
| 1352 | + $parameters[ 'sorting' ] = $parameters[ 'sorting' ][ 0 ]; |
|
| 1354 | 1353 | } |
| 1355 | 1354 | |
| 1356 | - if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) { |
|
| 1355 | + if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) { |
|
| 1357 | 1356 | $field = new \GV\Field(); |
| 1358 | - $field->ID = $parameters['sorting']['key']; |
|
| 1359 | - $direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
| 1357 | + $field->ID = $parameters[ 'sorting' ][ 'key' ]; |
|
| 1358 | + $direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
| 1360 | 1359 | $entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) ); |
| 1361 | 1360 | } |
| 1362 | 1361 | } |
@@ -1431,7 +1430,7 @@ discard block |
||
| 1431 | 1430 | $allowed = $headers = array(); |
| 1432 | 1431 | |
| 1433 | 1432 | foreach ( $view->fields->by_position( "directory_*" )->by_visible( $view )->all() as $id => $field ) { |
| 1434 | - $allowed[] = $field; |
|
| 1433 | + $allowed[ ] = $field; |
|
| 1435 | 1434 | } |
| 1436 | 1435 | |
| 1437 | 1436 | $renderer = new Field_Renderer(); |
@@ -1453,17 +1452,17 @@ discard block |
||
| 1453 | 1452 | } ); |
| 1454 | 1453 | |
| 1455 | 1454 | foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) { |
| 1456 | - $allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id ); |
|
| 1455 | + $allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id ); |
|
| 1457 | 1456 | } |
| 1458 | 1457 | |
| 1459 | 1458 | foreach ( $allowed as $field ) { |
| 1460 | 1459 | $source = is_numeric( $field->ID ) ? $view->form : new \GV\Internal_Source(); |
| 1461 | 1460 | |
| 1462 | - $return[] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' ); |
|
| 1461 | + $return[ ] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' ); |
|
| 1463 | 1462 | |
| 1464 | 1463 | if ( ! $headers_done ) { |
| 1465 | 1464 | $label = $field->get_label( $view, $source, $entry ); |
| 1466 | - $headers[] = $label ? $label : $field->ID; |
|
| 1465 | + $headers[ ] = $label ? $label : $field->ID; |
|
| 1467 | 1466 | } |
| 1468 | 1467 | } |
| 1469 | 1468 | |
@@ -49,11 +49,11 @@ discard block |
||
| 49 | 49 | |
| 50 | 50 | $post_types = get_post_types(); |
| 51 | 51 | |
| 52 | - foreach( $post_types as $post_type ) { |
|
| 52 | + foreach ( $post_types as $post_type ) { |
|
| 53 | 53 | $post_type_rewrite = get_post_type_object( $post_type )->rewrite; |
| 54 | 54 | |
| 55 | 55 | if ( $slug = \GV\Utils::get( $post_type_rewrite, 'slug' ) ) { |
| 56 | - $reserved_slugs[] = $slug; |
|
| 56 | + $reserved_slugs[ ] = $slug; |
|
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | |
@@ -89,8 +89,7 @@ discard block |
||
| 89 | 89 | $tab = __( 'Edit Entry', 'gravityview' ); |
| 90 | 90 | $context = 'edit'; |
| 91 | 91 | break; |
| 92 | - case ( $gravityview->request->is_entry( $gravityview->view->form ? $gravityview->view->form->ID : 0 ) ): |
|
| 93 | - $tab = __( 'Single Entry', 'gravityview' ); |
|
| 92 | + case ( $gravityview->request->is_entry( $gravityview->view->form ? $gravityview->view->form->ID : 0 ) ) : $tab = __( 'Single Entry', 'gravityview' ); |
|
| 94 | 93 | $context = 'single'; |
| 95 | 94 | break; |
| 96 | 95 | default: |
@@ -110,7 +109,7 @@ discard block |
||
| 110 | 109 | $action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab ); |
| 111 | 110 | $message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' ); |
| 112 | 111 | |
| 113 | - $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 ) ) ); |
|
| 112 | + $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 ) ) ); |
|
| 114 | 113 | $output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message ); |
| 115 | 114 | |
| 116 | 115 | echo \GVCommon::generate_notice( $output . $image, 'gv-warning warning', 'edit_gravityview', $gravityview->view->ID ); |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | function load() { |
| 136 | 136 | |
| 137 | 137 | /** @define "GRAVITYVIEW_DIR" "../../../" */ |
| 138 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' ); |
|
| 138 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' ); |
|
| 139 | 139 | |
| 140 | 140 | // Don't display an embedded form when editing an entry |
| 141 | 141 | add_action( 'wp_head', array( $this, 'prevent_render_form' ) ); |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | add_action( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 ); |
| 146 | 146 | add_action( 'admin_init', array( $this, 'prevent_maybe_process_form' ), 8 ); |
| 147 | 147 | |
| 148 | - add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') ); |
|
| 148 | + add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) ); |
|
| 149 | 149 | |
| 150 | 150 | add_action( 'gravityview_edit_entry', array( $this, 'init' ), 10, 4 ); |
| 151 | 151 | |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 ); |
| 157 | 157 | |
| 158 | 158 | // Add fields expected by GFFormDisplay::validate() |
| 159 | - add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') ); |
|
| 159 | + add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) ); |
|
| 160 | 160 | |
| 161 | 161 | // Fix multiselect value for GF 2.2 |
| 162 | 162 | add_filter( 'gravityview/edit_entry/field_value_multiselect', array( $this, 'fix_multiselect_value_serialization' ), 10, 3 ); |
@@ -173,8 +173,8 @@ discard block |
||
| 173 | 173 | * @return void |
| 174 | 174 | */ |
| 175 | 175 | public function prevent_render_form() { |
| 176 | - if( $this->is_edit_entry() ) { |
|
| 177 | - if( 'wp_head' === current_filter() ) { |
|
| 176 | + if ( $this->is_edit_entry() ) { |
|
| 177 | + if ( 'wp_head' === current_filter() ) { |
|
| 178 | 178 | add_filter( 'gform_shortcode_form', '__return_empty_string' ); |
| 179 | 179 | } else { |
| 180 | 180 | remove_filter( 'gform_shortcode_form', '__return_empty_string' ); |
@@ -189,17 +189,17 @@ discard block |
||
| 189 | 189 | */ |
| 190 | 190 | public function prevent_maybe_process_form() { |
| 191 | 191 | |
| 192 | - if( ! $this->is_edit_entry_submission() ) { |
|
| 192 | + if ( ! $this->is_edit_entry_submission() ) { |
|
| 193 | 193 | return; |
| 194 | 194 | } |
| 195 | 195 | |
| 196 | 196 | gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] Removing GFForms::maybe_process_form() action.' ); |
| 197 | 197 | |
| 198 | - remove_action( 'wp', array( 'RGForms', 'maybe_process_form'), 9 ); |
|
| 199 | - remove_action( 'wp', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
| 198 | + remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 ); |
|
| 199 | + remove_action( 'wp', array( 'GFForms', 'maybe_process_form' ), 9 ); |
|
| 200 | 200 | |
| 201 | - remove_action( 'admin_init', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
| 202 | - remove_action( 'admin_init', array( 'RGForms', 'maybe_process_form'), 9 ); |
|
| 201 | + remove_action( 'admin_init', array( 'GFForms', 'maybe_process_form' ), 9 ); |
|
| 202 | + remove_action( 'admin_init', array( 'RGForms', 'maybe_process_form' ), 9 ); |
|
| 203 | 203 | } |
| 204 | 204 | |
| 205 | 205 | /** |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | |
| 211 | 211 | $is_edit_entry = |
| 212 | 212 | ( GravityView_frontend::is_single_entry() || gravityview()->request->is_entry() ) |
| 213 | - && ( ! empty( $_GET['edit'] ) ); |
|
| 213 | + && ( ! empty( $_GET[ 'edit' ] ) ); |
|
| 214 | 214 | |
| 215 | 215 | return ( $is_edit_entry || $this->is_edit_entry_submission() ); |
| 216 | 216 | } |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | * @return boolean |
| 222 | 222 | */ |
| 223 | 223 | public function is_edit_entry_submission() { |
| 224 | - return !empty( $_POST[ self::$nonce_field ] ); |
|
| 224 | + return ! empty( $_POST[ self::$nonce_field ] ); |
|
| 225 | 225 | } |
| 226 | 226 | |
| 227 | 227 | /** |
@@ -234,16 +234,16 @@ discard block |
||
| 234 | 234 | |
| 235 | 235 | |
| 236 | 236 | $entries = $gravityview_view->getEntries(); |
| 237 | - self::$original_entry = $entries[0]; |
|
| 238 | - $this->entry = $entries[0]; |
|
| 237 | + self::$original_entry = $entries[ 0 ]; |
|
| 238 | + $this->entry = $entries[ 0 ]; |
|
| 239 | 239 | |
| 240 | - self::$original_form = GFAPI::get_form( $this->entry['form_id'] ); |
|
| 240 | + self::$original_form = GFAPI::get_form( $this->entry[ 'form_id' ] ); |
|
| 241 | 241 | $this->form = $gravityview_view->getForm(); |
| 242 | - $this->form_id = $this->entry['form_id']; |
|
| 242 | + $this->form_id = $this->entry[ 'form_id' ]; |
|
| 243 | 243 | $this->view_id = $gravityview_view->getViewId(); |
| 244 | 244 | $this->post_id = \GV\Utils::get( $post, 'ID', null ); |
| 245 | 245 | |
| 246 | - self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] ); |
|
| 246 | + self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] ); |
|
| 247 | 247 | } |
| 248 | 248 | |
| 249 | 249 | |
@@ -302,9 +302,9 @@ discard block |
||
| 302 | 302 | private function print_scripts() { |
| 303 | 303 | $gravityview_view = GravityView_View::getInstance(); |
| 304 | 304 | |
| 305 | - wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
| 305 | + wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
| 306 | 306 | |
| 307 | - GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false); |
|
| 307 | + GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false ); |
|
| 308 | 308 | |
| 309 | 309 | wp_localize_script( 'gravityview-fe-view', 'gvGlobals', array( 'cookiepath' => COOKIEPATH ) ); |
| 310 | 310 | |
@@ -320,19 +320,19 @@ discard block |
||
| 320 | 320 | */ |
| 321 | 321 | private function process_save( $gv_data ) { |
| 322 | 322 | |
| 323 | - if ( empty( $_POST ) || ! isset( $_POST['lid'] ) ) { |
|
| 323 | + if ( empty( $_POST ) || ! isset( $_POST[ 'lid' ] ) ) { |
|
| 324 | 324 | return; |
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | // Make sure the entry, view, and form IDs are all correct |
| 328 | 328 | $valid = $this->verify_nonce(); |
| 329 | 329 | |
| 330 | - if ( !$valid ) { |
|
| 330 | + if ( ! $valid ) { |
|
| 331 | 331 | gravityview()->log->error( 'Nonce validation failed.' ); |
| 332 | 332 | return; |
| 333 | 333 | } |
| 334 | 334 | |
| 335 | - if ( $this->entry['id'] !== $_POST['lid'] ) { |
|
| 335 | + if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) { |
|
| 336 | 336 | gravityview()->log->error( 'Entry ID did not match posted entry ID.' ); |
| 337 | 337 | return; |
| 338 | 338 | } |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | |
| 344 | 344 | $this->validate(); |
| 345 | 345 | |
| 346 | - if( $this->is_valid ) { |
|
| 346 | + if ( $this->is_valid ) { |
|
| 347 | 347 | |
| 348 | 348 | gravityview()->log->debug( 'Submission is valid.' ); |
| 349 | 349 | |
@@ -355,15 +355,15 @@ discard block |
||
| 355 | 355 | /** |
| 356 | 356 | * @hack to avoid the capability validation of the method save_lead for GF 1.9+ |
| 357 | 357 | */ |
| 358 | - unset( $_GET['page'] ); |
|
| 358 | + unset( $_GET[ 'page' ] ); |
|
| 359 | 359 | |
| 360 | - $date_created = $this->entry['date_created']; |
|
| 360 | + $date_created = $this->entry[ 'date_created' ]; |
|
| 361 | 361 | |
| 362 | 362 | /** |
| 363 | 363 | * @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead() |
| 364 | 364 | * @since 1.17.2 |
| 365 | 365 | */ |
| 366 | - unset( $this->entry['date_created'] ); |
|
| 366 | + unset( $this->entry[ 'date_created' ] ); |
|
| 367 | 367 | |
| 368 | 368 | /** |
| 369 | 369 | * @action `gravityview/edit_entry/before_update` Perform an action before the entry has been updated using Edit Entry |
@@ -373,14 +373,14 @@ discard block |
||
| 373 | 373 | * @param GravityView_Edit_Entry_Render $this This object |
| 374 | 374 | * @param GravityView_View_Data $gv_data The View data |
| 375 | 375 | */ |
| 376 | - do_action( 'gravityview/edit_entry/before_update', $form, $this->entry['id'], $this, $gv_data ); |
|
| 376 | + do_action( 'gravityview/edit_entry/before_update', $form, $this->entry[ 'id' ], $this, $gv_data ); |
|
| 377 | 377 | |
| 378 | 378 | GFFormsModel::save_lead( $form, $this->entry ); |
| 379 | 379 | |
| 380 | 380 | // Delete the values for hidden inputs |
| 381 | 381 | $this->unset_hidden_field_values(); |
| 382 | 382 | |
| 383 | - $this->entry['date_created'] = $date_created; |
|
| 383 | + $this->entry[ 'date_created' ] = $date_created; |
|
| 384 | 384 | |
| 385 | 385 | // Process calculation fields |
| 386 | 386 | $this->update_calculation_fields(); |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | * @param GravityView_Edit_Entry_Render $this This object |
| 406 | 406 | * @param GravityView_View_Data $gv_data The View data |
| 407 | 407 | */ |
| 408 | - do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this, $gv_data ); |
|
| 408 | + do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this, $gv_data ); |
|
| 409 | 409 | |
| 410 | 410 | } else { |
| 411 | 411 | gravityview()->log->error( 'Submission is NOT valid.', array( 'entry' => $this->entry ) ); |
@@ -441,10 +441,10 @@ discard block |
||
| 441 | 441 | |
| 442 | 442 | if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) { |
| 443 | 443 | $entry_meta_table = GFFormsModel::get_entry_meta_table_name(); |
| 444 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) ); |
|
| 444 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry[ 'id' ] ) ); |
|
| 445 | 445 | } else { |
| 446 | 446 | $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
| 447 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
|
| 447 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) ); |
|
| 448 | 448 | } |
| 449 | 449 | |
| 450 | 450 | foreach ( $this->entry as $input_id => $field_value ) { |
@@ -462,11 +462,11 @@ discard block |
||
| 462 | 462 | |
| 463 | 463 | $empty_value = $field->get_value_save_entry( |
| 464 | 464 | is_array( $field->get_entry_inputs() ) ? array() : '', |
| 465 | - $this->form, '', $this->entry['id'], $this->entry |
|
| 465 | + $this->form, '', $this->entry[ 'id' ], $this->entry |
|
| 466 | 466 | ); |
| 467 | 467 | |
| 468 | 468 | if ( $field->has_calculation() ) { |
| 469 | - $this->unset_hidden_calculations[] = $field->id; // Unset |
|
| 469 | + $this->unset_hidden_calculations[ ] = $field->id; // Unset |
|
| 470 | 470 | $empty_value = ''; |
| 471 | 471 | } |
| 472 | 472 | |
@@ -495,7 +495,7 @@ discard block |
||
| 495 | 495 | private function preset_approval_fields() { |
| 496 | 496 | $has_approved_field = false; |
| 497 | 497 | |
| 498 | - foreach ( self::$original_form['fields'] as $field ) { |
|
| 498 | + foreach ( self::$original_form[ 'fields' ] as $field ) { |
|
| 499 | 499 | if ( $field->gravityview_approved ) { |
| 500 | 500 | $has_approved_field = true; |
| 501 | 501 | break; |
@@ -508,7 +508,7 @@ discard block |
||
| 508 | 508 | |
| 509 | 509 | $is_field_hidden = true; |
| 510 | 510 | |
| 511 | - foreach ( $this->form['fields'] as $field ) { |
|
| 511 | + foreach ( $this->form[ 'fields' ] as $field ) { |
|
| 512 | 512 | if ( $field->gravityview_approved ) { |
| 513 | 513 | $is_field_hidden = false; |
| 514 | 514 | break; |
@@ -533,7 +533,7 @@ discard block |
||
| 533 | 533 | |
| 534 | 534 | remove_filter( 'gravityview/approve_entries/update_unapproved_meta', array( $this, 'prevent_update_unapproved_meta' ), 9 ); |
| 535 | 535 | |
| 536 | - if ( ! $value = gform_get_meta( $entry['id'], 'is_approved' ) ) { |
|
| 536 | + if ( ! $value = gform_get_meta( $entry[ 'id' ], 'is_approved' ) ) { |
|
| 537 | 537 | |
| 538 | 538 | $value = GravityView_Entry_Approval_Status::UNAPPROVED; |
| 539 | 539 | |
@@ -598,7 +598,7 @@ discard block |
||
| 598 | 598 | } |
| 599 | 599 | |
| 600 | 600 | /** No file is being uploaded. */ |
| 601 | - if ( empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 601 | + if ( empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
| 602 | 602 | /** So return the original upload, with $value as backup (it can be empty during edit form rendering) */ |
| 603 | 603 | return rgar( $entry, $input_id, $value ); |
| 604 | 604 | } |
@@ -616,11 +616,11 @@ discard block |
||
| 616 | 616 | * @return mixed |
| 617 | 617 | */ |
| 618 | 618 | public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) { |
| 619 | - if( ! $this->is_edit_entry() ) { |
|
| 619 | + if ( ! $this->is_edit_entry() ) { |
|
| 620 | 620 | return $plupload_init; |
| 621 | 621 | } |
| 622 | 622 | |
| 623 | - $plupload_init['gf_vars']['max_files'] = 0; |
|
| 623 | + $plupload_init[ 'gf_vars' ][ 'max_files' ] = 0; |
|
| 624 | 624 | |
| 625 | 625 | return $plupload_init; |
| 626 | 626 | } |
@@ -635,26 +635,26 @@ discard block |
||
| 635 | 635 | $form = $this->filter_conditional_logic( $this->form ); |
| 636 | 636 | |
| 637 | 637 | /** @type GF_Field $field */ |
| 638 | - foreach( $form['fields'] as $k => &$field ) { |
|
| 638 | + foreach ( $form[ 'fields' ] as $k => &$field ) { |
|
| 639 | 639 | |
| 640 | 640 | /** |
| 641 | 641 | * Remove the fields with calculation formulas before save to avoid conflicts with GF logic |
| 642 | 642 | * @since 1.16.3 |
| 643 | 643 | */ |
| 644 | - if( $field->has_calculation() ) { |
|
| 645 | - unset( $form['fields'][ $k ] ); |
|
| 644 | + if ( $field->has_calculation() ) { |
|
| 645 | + unset( $form[ 'fields' ][ $k ] ); |
|
| 646 | 646 | } |
| 647 | 647 | |
| 648 | 648 | $field->adminOnly = false; |
| 649 | 649 | |
| 650 | - if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
| 651 | - foreach( $field->inputs as $key => $input ) { |
|
| 652 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
| 650 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
| 651 | + foreach ( $field->inputs as $key => $input ) { |
|
| 652 | + $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ]; |
|
| 653 | 653 | } |
| 654 | 654 | } |
| 655 | 655 | } |
| 656 | 656 | |
| 657 | - $form['fields'] = array_values( $form['fields'] ); |
|
| 657 | + $form[ 'fields' ] = array_values( $form[ 'fields' ] ); |
|
| 658 | 658 | |
| 659 | 659 | return $form; |
| 660 | 660 | } |
@@ -666,14 +666,14 @@ discard block |
||
| 666 | 666 | $update = false; |
| 667 | 667 | |
| 668 | 668 | // get the most up to date entry values |
| 669 | - $entry = GFAPI::get_entry( $this->entry['id'] ); |
|
| 669 | + $entry = GFAPI::get_entry( $this->entry[ 'id' ] ); |
|
| 670 | 670 | |
| 671 | 671 | if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) { |
| 672 | 672 | $entry_meta_table = GFFormsModel::get_entry_meta_table_name(); |
| 673 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry['id'] ) ); |
|
| 673 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry[ 'id' ] ) ); |
|
| 674 | 674 | } else { |
| 675 | 675 | $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
| 676 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry['id'] ) ); |
|
| 676 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry[ 'id' ] ) ); |
|
| 677 | 677 | } |
| 678 | 678 | |
| 679 | 679 | |
@@ -690,24 +690,24 @@ discard block |
||
| 690 | 690 | $inputs = $field->get_entry_inputs(); |
| 691 | 691 | if ( is_array( $inputs ) ) { |
| 692 | 692 | foreach ( $inputs as $input ) { |
| 693 | - list( $field_id, $input_id ) = rgexplode( '.', $input['id'], 2 ); |
|
| 693 | + list( $field_id, $input_id ) = rgexplode( '.', $input[ 'id' ], 2 ); |
|
| 694 | 694 | |
| 695 | 695 | if ( 'product' === $field->type ) { |
| 696 | - $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
| 696 | + $input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] ); |
|
| 697 | 697 | |
| 698 | 698 | // Only allow quantity to be set if it's allowed to be edited |
| 699 | 699 | if ( in_array( $field_id, $allowed_fields ) && $input_id == 3 ) { |
| 700 | 700 | } else { // otherwise set to what it previously was |
| 701 | - $_POST[ $input_name ] = $entry[ $input['id'] ]; |
|
| 701 | + $_POST[ $input_name ] = $entry[ $input[ 'id' ] ]; |
|
| 702 | 702 | } |
| 703 | 703 | } else { |
| 704 | 704 | // Set to what it previously was if it's not editable |
| 705 | 705 | if ( ! in_array( $field_id, $allowed_fields ) ) { |
| 706 | - $_POST[ $input_name ] = $entry[ $input['id'] ]; |
|
| 706 | + $_POST[ $input_name ] = $entry[ $input[ 'id' ] ]; |
|
| 707 | 707 | } |
| 708 | 708 | } |
| 709 | 709 | |
| 710 | - GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] ); |
|
| 710 | + GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input[ 'id' ] ); |
|
| 711 | 711 | } |
| 712 | 712 | } else { |
| 713 | 713 | // Set to what it previously was if it's not editable |
@@ -747,19 +747,19 @@ discard block |
||
| 747 | 747 | |
| 748 | 748 | $input_name = 'input_' . $field_id; |
| 749 | 749 | |
| 750 | - if ( !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 750 | + if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
| 751 | 751 | |
| 752 | 752 | // We have a new image |
| 753 | 753 | |
| 754 | - $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
|
| 754 | + $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] ); |
|
| 755 | 755 | |
| 756 | 756 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
| 757 | 757 | $ary = stripslashes_deep( $ary ); |
| 758 | 758 | $img_url = \GV\Utils::get( $ary, 0 ); |
| 759 | 759 | |
| 760 | - $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
|
| 761 | - $img_caption = count( $ary ) > 2 ? $ary[2] : ''; |
|
| 762 | - $img_description = count( $ary ) > 3 ? $ary[3] : ''; |
|
| 760 | + $img_title = count( $ary ) > 1 ? $ary[ 1 ] : ''; |
|
| 761 | + $img_caption = count( $ary ) > 2 ? $ary[ 2 ] : ''; |
|
| 762 | + $img_description = count( $ary ) > 3 ? $ary[ 3 ] : ''; |
|
| 763 | 763 | |
| 764 | 764 | $image_meta = array( |
| 765 | 765 | 'post_excerpt' => $img_caption, |
@@ -768,7 +768,7 @@ discard block |
||
| 768 | 768 | |
| 769 | 769 | //adding title only if it is not empty. It will default to the file name if it is not in the array |
| 770 | 770 | if ( ! empty( $img_title ) ) { |
| 771 | - $image_meta['post_title'] = $img_title; |
|
| 771 | + $image_meta[ 'post_title' ] = $img_title; |
|
| 772 | 772 | } |
| 773 | 773 | |
| 774 | 774 | /** |
@@ -826,15 +826,15 @@ discard block |
||
| 826 | 826 | */ |
| 827 | 827 | private function maybe_update_post_fields( $form ) { |
| 828 | 828 | |
| 829 | - if( empty( $this->entry['post_id'] ) ) { |
|
| 829 | + if ( empty( $this->entry[ 'post_id' ] ) ) { |
|
| 830 | 830 | gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
| 831 | 831 | return; |
| 832 | 832 | } |
| 833 | 833 | |
| 834 | - $post_id = $this->entry['post_id']; |
|
| 834 | + $post_id = $this->entry[ 'post_id' ]; |
|
| 835 | 835 | |
| 836 | 836 | // Security check |
| 837 | - if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
| 837 | + if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
| 838 | 838 | gravityview()->log->error( 'The current user does not have the ability to edit Post #{post_id}', array( 'post_id' => $post_id ) ); |
| 839 | 839 | return; |
| 840 | 840 | } |
@@ -847,25 +847,25 @@ discard block |
||
| 847 | 847 | |
| 848 | 848 | $field = RGFormsModel::get_field( $form, $field_id ); |
| 849 | 849 | |
| 850 | - if( ! $field ) { |
|
| 850 | + if ( ! $field ) { |
|
| 851 | 851 | continue; |
| 852 | 852 | } |
| 853 | 853 | |
| 854 | - if( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
| 854 | + if ( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
| 855 | 855 | |
| 856 | 856 | // Get the value of the field, including $_POSTed value |
| 857 | 857 | $value = RGFormsModel::get_field_value( $field ); |
| 858 | 858 | |
| 859 | 859 | // Use temporary entry variable, to make values available to fill_post_template() and update_post_image() |
| 860 | 860 | $entry_tmp = $this->entry; |
| 861 | - $entry_tmp["{$field_id}"] = $value; |
|
| 861 | + $entry_tmp[ "{$field_id}" ] = $value; |
|
| 862 | 862 | |
| 863 | - switch( $field->type ) { |
|
| 863 | + switch ( $field->type ) { |
|
| 864 | 864 | |
| 865 | 865 | case 'post_title': |
| 866 | 866 | $post_title = $value; |
| 867 | 867 | if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
| 868 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
| 868 | + $post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp ); |
|
| 869 | 869 | } |
| 870 | 870 | $updated_post->post_title = $post_title; |
| 871 | 871 | $updated_post->post_name = $post_title; |
@@ -875,7 +875,7 @@ discard block |
||
| 875 | 875 | case 'post_content': |
| 876 | 876 | $post_content = $value; |
| 877 | 877 | if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
| 878 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
| 878 | + $post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true ); |
|
| 879 | 879 | } |
| 880 | 880 | $updated_post->post_content = $post_content; |
| 881 | 881 | unset( $post_content ); |
@@ -893,11 +893,11 @@ discard block |
||
| 893 | 893 | $value = $value[ $field_id ]; |
| 894 | 894 | } |
| 895 | 895 | |
| 896 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
| 896 | + if ( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
| 897 | 897 | $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
| 898 | 898 | } |
| 899 | 899 | |
| 900 | - $value = $field->get_value_save_entry( $value, $form, '', $this->entry['id'], $this->entry ); |
|
| 900 | + $value = $field->get_value_save_entry( $value, $form, '', $this->entry[ 'id' ], $this->entry ); |
|
| 901 | 901 | |
| 902 | 902 | update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
| 903 | 903 | break; |
@@ -909,7 +909,7 @@ discard block |
||
| 909 | 909 | } |
| 910 | 910 | |
| 911 | 911 | // update entry after |
| 912 | - $this->entry["{$field_id}"] = $value; |
|
| 912 | + $this->entry[ "{$field_id}" ] = $value; |
|
| 913 | 913 | |
| 914 | 914 | $update_entry = true; |
| 915 | 915 | |
@@ -918,11 +918,11 @@ discard block |
||
| 918 | 918 | |
| 919 | 919 | } |
| 920 | 920 | |
| 921 | - if( $update_entry ) { |
|
| 921 | + if ( $update_entry ) { |
|
| 922 | 922 | |
| 923 | 923 | $return_entry = GFAPI::update_entry( $this->entry ); |
| 924 | 924 | |
| 925 | - if( is_wp_error( $return_entry ) ) { |
|
| 925 | + if ( is_wp_error( $return_entry ) ) { |
|
| 926 | 926 | gravityview()->log->error( 'Updating the entry post fields failed', array( 'data' => array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) ) ); |
| 927 | 927 | } else { |
| 928 | 928 | gravityview()->log->debug( 'Updating the entry post fields for post #{post_id} succeeded', array( 'post_id' => $post_id ) ); |
@@ -932,7 +932,7 @@ discard block |
||
| 932 | 932 | |
| 933 | 933 | $return_post = wp_update_post( $updated_post, true ); |
| 934 | 934 | |
| 935 | - if( is_wp_error( $return_post ) ) { |
|
| 935 | + if ( is_wp_error( $return_post ) ) { |
|
| 936 | 936 | $return_post->add_data( $updated_post, '$updated_post' ); |
| 937 | 937 | gravityview()->log->error( 'Updating the post content failed', array( 'data' => compact( 'updated_post', 'return_post' ) ) ); |
| 938 | 938 | } else { |
@@ -966,7 +966,7 @@ discard block |
||
| 966 | 966 | $output = GFCommon::replace_variables( $output, $form, $entry, false, false, false ); |
| 967 | 967 | |
| 968 | 968 | // replace conditional shortcodes |
| 969 | - if( $do_shortcode ) { |
|
| 969 | + if ( $do_shortcode ) { |
|
| 970 | 970 | $output = do_shortcode( $output ); |
| 971 | 971 | } |
| 972 | 972 | |
@@ -985,19 +985,19 @@ discard block |
||
| 985 | 985 | */ |
| 986 | 986 | private function after_update() { |
| 987 | 987 | |
| 988 | - do_action( 'gform_after_update_entry', self::$original_form, $this->entry['id'], self::$original_entry ); |
|
| 989 | - do_action( "gform_after_update_entry_{$this->form['id']}", self::$original_form, $this->entry['id'], self::$original_entry ); |
|
| 988 | + do_action( 'gform_after_update_entry', self::$original_form, $this->entry[ 'id' ], self::$original_entry ); |
|
| 989 | + do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", self::$original_form, $this->entry[ 'id' ], self::$original_entry ); |
|
| 990 | 990 | |
| 991 | 991 | // Re-define the entry now that we've updated it. |
| 992 | - $entry = RGFormsModel::get_lead( $this->entry['id'] ); |
|
| 992 | + $entry = RGFormsModel::get_lead( $this->entry[ 'id' ] ); |
|
| 993 | 993 | |
| 994 | 994 | $entry = GFFormsModel::set_entry_meta( $entry, self::$original_form ); |
| 995 | 995 | |
| 996 | 996 | if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '<' ) ) { |
| 997 | 997 | // We need to clear the cache because Gravity Forms caches the field values, which |
| 998 | 998 | // we have just updated. |
| 999 | - foreach ($this->form['fields'] as $key => $field) { |
|
| 1000 | - GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id ); |
|
| 999 | + foreach ( $this->form[ 'fields' ] as $key => $field ) { |
|
| 1000 | + GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id ); |
|
| 1001 | 1001 | } |
| 1002 | 1002 | } |
| 1003 | 1003 | |
@@ -1007,11 +1007,11 @@ discard block |
||
| 1007 | 1007 | * @since develop |
| 1008 | 1008 | */ |
| 1009 | 1009 | if ( $allowed_feeds = $this->view->settings->get( 'edit_feeds', array() ) ) { |
| 1010 | - $feeds = GFAPI::get_feeds( null, $entry['form_id'] ); |
|
| 1010 | + $feeds = GFAPI::get_feeds( null, $entry[ 'form_id' ] ); |
|
| 1011 | 1011 | if ( ! is_wp_error( $feeds ) ) { |
| 1012 | 1012 | $registered_feeds = array(); |
| 1013 | 1013 | foreach ( GFAddOn::get_registered_addons() as $registered_feed ) { |
| 1014 | - if ( is_subclass_of( $registered_feed, 'GFFeedAddOn' ) ) { |
|
| 1014 | + if ( is_subclass_of( $registered_feed, 'GFFeedAddOn' ) ) { |
|
| 1015 | 1015 | if ( method_exists( $registered_feed, 'get_instance' ) ) { |
| 1016 | 1016 | $registered_feed = call_user_func( array( $registered_feed, 'get_instance' ) ); |
| 1017 | 1017 | $registered_feeds[ $registered_feed->get_slug() ] = $registered_feed; |
@@ -1019,8 +1019,8 @@ discard block |
||
| 1019 | 1019 | } |
| 1020 | 1020 | } |
| 1021 | 1021 | foreach ( $feeds as $feed ) { |
| 1022 | - if ( in_array( $feed['id'], $allowed_feeds ) ) { |
|
| 1023 | - if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed['addon_slug'] ) ) { |
|
| 1022 | + if ( in_array( $feed[ 'id' ], $allowed_feeds ) ) { |
|
| 1023 | + if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed[ 'addon_slug' ] ) ) { |
|
| 1024 | 1024 | $returned_entry = $feed_object->process_feed( $feed, $entry, self::$original_form ); |
| 1025 | 1025 | if ( is_array( $returned_entry ) && rgar( $returned_entry, 'id' ) ) { |
| 1026 | 1026 | $entry = $returned_entry; |
@@ -1048,9 +1048,9 @@ discard block |
||
| 1048 | 1048 | |
| 1049 | 1049 | $view = \GV\View::by_id( $this->view_id ); |
| 1050 | 1050 | |
| 1051 | - if( $view->settings->get( 'edit_locking' ) ) { |
|
| 1051 | + if ( $view->settings->get( 'edit_locking' ) ) { |
|
| 1052 | 1052 | $locking = new GravityView_Edit_Entry_Locking(); |
| 1053 | - $locking->maybe_lock_object( $this->entry['id'] ); |
|
| 1053 | + $locking->maybe_lock_object( $this->entry[ 'id' ] ); |
|
| 1054 | 1054 | } |
| 1055 | 1055 | |
| 1056 | 1056 | ?> |
@@ -1063,7 +1063,7 @@ discard block |
||
| 1063 | 1063 | |
| 1064 | 1064 | <div class="gv-edit-entry-wrapper"><?php |
| 1065 | 1065 | |
| 1066 | - $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this ); |
|
| 1066 | + $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this ); |
|
| 1067 | 1067 | |
| 1068 | 1068 | /** |
| 1069 | 1069 | * Fixes weird wpautop() issue |
@@ -1079,7 +1079,7 @@ discard block |
||
| 1079 | 1079 | * @param string $edit_entry_title Modify the "Edit Entry" title |
| 1080 | 1080 | * @param GravityView_Edit_Entry_Render $this This object |
| 1081 | 1081 | */ |
| 1082 | - $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
| 1082 | + $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this ); |
|
| 1083 | 1083 | |
| 1084 | 1084 | echo esc_attr( $edit_entry_title ); |
| 1085 | 1085 | ?></span> |
@@ -1145,18 +1145,18 @@ discard block |
||
| 1145 | 1145 | */ |
| 1146 | 1146 | $labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id ); |
| 1147 | 1147 | |
| 1148 | - $this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels['submit']; |
|
| 1148 | + $this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels[ 'submit' ]; |
|
| 1149 | 1149 | } |
| 1150 | 1150 | |
| 1151 | 1151 | $back_link = remove_query_arg( array( 'page', 'view', 'edit' ) ); |
| 1152 | 1152 | |
| 1153 | - if( ! $this->is_valid ){ |
|
| 1153 | + if ( ! $this->is_valid ) { |
|
| 1154 | 1154 | |
| 1155 | 1155 | // Keeping this compatible with Gravity Forms. |
| 1156 | - $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>"; |
|
| 1157 | - $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form); |
|
| 1156 | + $validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>"; |
|
| 1157 | + $message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form ); |
|
| 1158 | 1158 | |
| 1159 | - echo GVCommon::generate_notice( $message , 'gv-error' ); |
|
| 1159 | + echo GVCommon::generate_notice( $message, 'gv-error' ); |
|
| 1160 | 1160 | |
| 1161 | 1161 | } elseif ( false === $this->is_paged_submitted ) { |
| 1162 | 1162 | // Paged form that hasn't been submitted on the last page yet |
@@ -1169,7 +1169,7 @@ discard block |
||
| 1169 | 1169 | * @param int $view_id View ID |
| 1170 | 1170 | * @param array $entry Gravity Forms entry array |
| 1171 | 1171 | */ |
| 1172 | - $message = apply_filters( 'gravityview/edit_entry/page/success', $entry_updated_message , $this->view_id, $this->entry ); |
|
| 1172 | + $message = apply_filters( 'gravityview/edit_entry/page/success', $entry_updated_message, $this->view_id, $this->entry ); |
|
| 1173 | 1173 | |
| 1174 | 1174 | echo GVCommon::generate_notice( $message ); |
| 1175 | 1175 | } else { |
@@ -1181,23 +1181,23 @@ discard block |
||
| 1181 | 1181 | |
| 1182 | 1182 | case '0': |
| 1183 | 1183 | $redirect_url = $back_link; |
| 1184 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' ); |
|
| 1184 | + $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', '</a>' ); |
|
| 1185 | 1185 | break; |
| 1186 | 1186 | |
| 1187 | 1187 | case '1': |
| 1188 | 1188 | $redirect_url = $directory_link = GravityView_API::directory_link(); |
| 1189 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' ); |
|
| 1189 | + $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' ); |
|
| 1190 | 1190 | break; |
| 1191 | 1191 | |
| 1192 | 1192 | case '2': |
| 1193 | 1193 | $redirect_url = $edit_redirect_url; |
| 1194 | 1194 | $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' ); |
| 1195 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' ); |
|
| 1195 | + $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' ); |
|
| 1196 | 1196 | break; |
| 1197 | 1197 | |
| 1198 | 1198 | case '': |
| 1199 | 1199 | default: |
| 1200 | - $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' ); |
|
| 1200 | + $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . esc_url( $back_link ) . '">', '</a>' ); |
|
| 1201 | 1201 | break; |
| 1202 | 1202 | } |
| 1203 | 1203 | |
@@ -1213,7 +1213,7 @@ discard block |
||
| 1213 | 1213 | * @param array $entry Gravity Forms entry array |
| 1214 | 1214 | * @param string $back_link URL to return to the original entry. @since 1.6 |
| 1215 | 1215 | */ |
| 1216 | - $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link ); |
|
| 1216 | + $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link ); |
|
| 1217 | 1217 | |
| 1218 | 1218 | echo GVCommon::generate_notice( $message ); |
| 1219 | 1219 | } |
@@ -1237,8 +1237,8 @@ discard block |
||
| 1237 | 1237 | */ |
| 1238 | 1238 | do_action( 'gravityview/edit-entry/render/before', $this ); |
| 1239 | 1239 | |
| 1240 | - add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 ); |
|
| 1241 | - add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') ); |
|
| 1240 | + add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 ); |
|
| 1241 | + add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
|
| 1242 | 1242 | add_filter( 'gform_next_button', array( $this, 'render_form_buttons' ) ); |
| 1243 | 1243 | add_filter( 'gform_previous_button', array( $this, 'render_form_buttons' ) ); |
| 1244 | 1244 | add_filter( 'gform_disable_view_counter', '__return_true' ); |
@@ -1247,14 +1247,14 @@ discard block |
||
| 1247 | 1247 | add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 ); |
| 1248 | 1248 | |
| 1249 | 1249 | // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin. |
| 1250 | - unset( $_GET['page'] ); |
|
| 1250 | + unset( $_GET[ 'page' ] ); |
|
| 1251 | 1251 | |
| 1252 | 1252 | $this->show_next_button = false; |
| 1253 | 1253 | $this->show_previous_button = false; |
| 1254 | 1254 | |
| 1255 | 1255 | // TODO: Verify multiple-page forms |
| 1256 | 1256 | if ( GFCommon::has_pages( $this->form ) && apply_filters( 'gravityview/features/paged-edit', false ) ) { |
| 1257 | - if ( intval( $page_number = \GV\Utils::_POST( 'gform_source_page_number_' . $this->form['id'], 0 ) ) ) { |
|
| 1257 | + if ( intval( $page_number = \GV\Utils::_POST( 'gform_source_page_number_' . $this->form[ 'id' ], 0 ) ) ) { |
|
| 1258 | 1258 | |
| 1259 | 1259 | $labels = array( |
| 1260 | 1260 | 'cancel' => __( 'Cancel', 'gravityview' ), |
@@ -1273,20 +1273,20 @@ discard block |
||
| 1273 | 1273 | */ |
| 1274 | 1274 | $labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id ); |
| 1275 | 1275 | |
| 1276 | - GFFormDisplay::$submission[ $this->form['id'] ][ 'form' ] = $this->form; |
|
| 1277 | - GFFormDisplay::$submission[ $this->form['id'] ][ 'is_valid' ] = true; |
|
| 1276 | + GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'form' ] = $this->form; |
|
| 1277 | + GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'is_valid' ] = true; |
|
| 1278 | 1278 | |
| 1279 | - if ( \GV\Utils::_POST( 'save' ) === $labels['next'] ) { |
|
| 1279 | + if ( \GV\Utils::_POST( 'save' ) === $labels[ 'next' ] ) { |
|
| 1280 | 1280 | $last_page = \GFFormDisplay::get_max_page_number( $this->form ); |
| 1281 | 1281 | |
| 1282 | 1282 | while ( ++$page_number < $last_page && RGFormsModel::is_page_hidden( $this->form, $page_number, \GV\Utils::_POST( 'gform_field_values' ) ) ) { |
| 1283 | 1283 | } // Advance to next visible page |
| 1284 | - } elseif ( \GV\Utils::_POST( 'save' ) === $labels['previous'] ) { |
|
| 1284 | + } elseif ( \GV\Utils::_POST( 'save' ) === $labels[ 'previous' ] ) { |
|
| 1285 | 1285 | while ( --$page_number > 1 && RGFormsModel::is_page_hidden( $this->form, $page_number, \GV\Utils::_POST( 'gform_field_values' ) ) ) { |
| 1286 | 1286 | } // Advance to next visible page |
| 1287 | 1287 | } |
| 1288 | 1288 | |
| 1289 | - GFFormDisplay::$submission[ $this->form['id'] ]['page_number'] = $page_number; |
|
| 1289 | + GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'page_number' ] = $page_number; |
|
| 1290 | 1290 | } |
| 1291 | 1291 | |
| 1292 | 1292 | if ( ( $page_number = intval( $page_number ) ) < 2 ) { |
@@ -1312,7 +1312,7 @@ discard block |
||
| 1312 | 1312 | |
| 1313 | 1313 | ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic |
| 1314 | 1314 | |
| 1315 | - $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry ); |
|
| 1315 | + $html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry ); |
|
| 1316 | 1316 | |
| 1317 | 1317 | ob_get_clean(); |
| 1318 | 1318 | |
@@ -1340,7 +1340,7 @@ discard block |
||
| 1340 | 1340 | * @return string |
| 1341 | 1341 | */ |
| 1342 | 1342 | public function render_form_buttons() { |
| 1343 | - return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this ); |
|
| 1343 | + return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this ); |
|
| 1344 | 1344 | } |
| 1345 | 1345 | |
| 1346 | 1346 | |
@@ -1359,15 +1359,15 @@ discard block |
||
| 1359 | 1359 | */ |
| 1360 | 1360 | public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) { |
| 1361 | 1361 | |
| 1362 | - if( $form['id'] != $this->form_id ) { |
|
| 1362 | + if ( $form[ 'id' ] != $this->form_id ) { |
|
| 1363 | 1363 | return $form; |
| 1364 | 1364 | } |
| 1365 | 1365 | |
| 1366 | 1366 | // In case we have validated the form, use it to inject the validation results into the form render |
| 1367 | - if( isset( $this->form_after_validation ) && $this->form_after_validation['id'] === $form['id'] ) { |
|
| 1367 | + if ( isset( $this->form_after_validation ) && $this->form_after_validation[ 'id' ] === $form[ 'id' ] ) { |
|
| 1368 | 1368 | $form = $this->form_after_validation; |
| 1369 | 1369 | } else { |
| 1370 | - $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
| 1370 | + $form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
| 1371 | 1371 | } |
| 1372 | 1372 | |
| 1373 | 1373 | $form = $this->filter_conditional_logic( $form ); |
@@ -1375,8 +1375,8 @@ discard block |
||
| 1375 | 1375 | $form = $this->prefill_conditional_logic( $form ); |
| 1376 | 1376 | |
| 1377 | 1377 | // for now we don't support Save and Continue feature. |
| 1378 | - if( ! self::$supports_save_and_continue ) { |
|
| 1379 | - unset( $form['save'] ); |
|
| 1378 | + if ( ! self::$supports_save_and_continue ) { |
|
| 1379 | + unset( $form[ 'save' ] ); |
|
| 1380 | 1380 | } |
| 1381 | 1381 | |
| 1382 | 1382 | $form = $this->unselect_default_values( $form ); |
@@ -1399,31 +1399,31 @@ discard block |
||
| 1399 | 1399 | */ |
| 1400 | 1400 | public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) { |
| 1401 | 1401 | |
| 1402 | - if( ! GFCommon::is_post_field( $field ) ) { |
|
| 1402 | + if ( ! GFCommon::is_post_field( $field ) ) { |
|
| 1403 | 1403 | return $field_content; |
| 1404 | 1404 | } |
| 1405 | 1405 | |
| 1406 | 1406 | $message = null; |
| 1407 | 1407 | |
| 1408 | 1408 | // First, make sure they have the capability to edit the post. |
| 1409 | - if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
| 1409 | + if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) { |
|
| 1410 | 1410 | |
| 1411 | 1411 | /** |
| 1412 | 1412 | * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
| 1413 | 1413 | * @param string $message The existing "You don't have permission..." text |
| 1414 | 1414 | */ |
| 1415 | - $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
| 1415 | + $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don’t have permission to edit this post.', 'gravityview' ) ); |
|
| 1416 | 1416 | |
| 1417 | - } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
| 1417 | + } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) { |
|
| 1418 | 1418 | /** |
| 1419 | 1419 | * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
| 1420 | 1420 | * @param string $message The existing "This field is not editable; the post no longer exists." text |
| 1421 | 1421 | */ |
| 1422 | - $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
| 1422 | + $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
| 1423 | 1423 | } |
| 1424 | 1424 | |
| 1425 | - if( $message ) { |
|
| 1426 | - $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
| 1425 | + if ( $message ) { |
|
| 1426 | + $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
| 1427 | 1427 | } |
| 1428 | 1428 | |
| 1429 | 1429 | return $field_content; |
@@ -1447,8 +1447,8 @@ discard block |
||
| 1447 | 1447 | |
| 1448 | 1448 | // If the form has been submitted, then we don't need to pre-fill the values, |
| 1449 | 1449 | // Except for fileupload type and when a field input is overridden- run always!! |
| 1450 | - if( |
|
| 1451 | - ( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
| 1450 | + if ( |
|
| 1451 | + ( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
| 1452 | 1452 | && false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) |
| 1453 | 1453 | && ! GFCommon::is_product_field( $field->type ) |
| 1454 | 1454 | || ! empty( $field_content ) |
@@ -1468,7 +1468,7 @@ discard block |
||
| 1468 | 1468 | $return = null; |
| 1469 | 1469 | |
| 1470 | 1470 | /** @var GravityView_Field $gv_field */ |
| 1471 | - if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
| 1471 | + if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
| 1472 | 1472 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
| 1473 | 1473 | } else { |
| 1474 | 1474 | $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
@@ -1477,7 +1477,7 @@ discard block |
||
| 1477 | 1477 | // If there was output, it's an error |
| 1478 | 1478 | $warnings = ob_get_clean(); |
| 1479 | 1479 | |
| 1480 | - if( !empty( $warnings ) ) { |
|
| 1480 | + if ( ! empty( $warnings ) ) { |
|
| 1481 | 1481 | gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
| 1482 | 1482 | } |
| 1483 | 1483 | |
@@ -1502,7 +1502,7 @@ discard block |
||
| 1502 | 1502 | $override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field ); |
| 1503 | 1503 | |
| 1504 | 1504 | // We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs) |
| 1505 | - if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
| 1505 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
| 1506 | 1506 | |
| 1507 | 1507 | $field_value = array(); |
| 1508 | 1508 | |
@@ -1511,10 +1511,10 @@ discard block |
||
| 1511 | 1511 | |
| 1512 | 1512 | foreach ( (array)$field->inputs as $input ) { |
| 1513 | 1513 | |
| 1514 | - $input_id = strval( $input['id'] ); |
|
| 1514 | + $input_id = strval( $input[ 'id' ] ); |
|
| 1515 | 1515 | |
| 1516 | 1516 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
| 1517 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
| 1517 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
| 1518 | 1518 | $allow_pre_populated = false; |
| 1519 | 1519 | } |
| 1520 | 1520 | |
@@ -1522,7 +1522,7 @@ discard block |
||
| 1522 | 1522 | |
| 1523 | 1523 | $pre_value = $field->get_value_submission( array(), false ); |
| 1524 | 1524 | |
| 1525 | - $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
| 1525 | + $field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
| 1526 | 1526 | |
| 1527 | 1527 | } else { |
| 1528 | 1528 | |
@@ -1533,13 +1533,13 @@ discard block |
||
| 1533 | 1533 | |
| 1534 | 1534 | // saved field entry value (if empty, fallback to the pre-populated value, if exists) |
| 1535 | 1535 | // or pre-populated value if not empty and set to override saved value |
| 1536 | - $field_value = isset( $this->entry[ $id ] ) && ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value; |
|
| 1536 | + $field_value = isset( $this->entry[ $id ] ) && ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value; |
|
| 1537 | 1537 | |
| 1538 | 1538 | // in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs. |
| 1539 | - if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
|
| 1539 | + if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) { |
|
| 1540 | 1540 | $categories = array(); |
| 1541 | 1541 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
| 1542 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
| 1542 | + $categories[ ] = GFCommon::format_post_category( $cat_string, true ); |
|
| 1543 | 1543 | } |
| 1544 | 1544 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
| 1545 | 1545 | } |
@@ -1567,7 +1567,7 @@ discard block |
||
| 1567 | 1567 | * @param GF_Field $field Gravity Forms field object |
| 1568 | 1568 | * @param GravityView_Edit_Entry_Render $this Current object |
| 1569 | 1569 | */ |
| 1570 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
| 1570 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field, $this ); |
|
| 1571 | 1571 | |
| 1572 | 1572 | return $field_value; |
| 1573 | 1573 | } |
@@ -1584,12 +1584,12 @@ discard block |
||
| 1584 | 1584 | */ |
| 1585 | 1585 | public function gform_pre_validation( $form ) { |
| 1586 | 1586 | |
| 1587 | - if( ! $this->verify_nonce() ) { |
|
| 1587 | + if ( ! $this->verify_nonce() ) { |
|
| 1588 | 1588 | return $form; |
| 1589 | 1589 | } |
| 1590 | 1590 | |
| 1591 | 1591 | // Fix PHP warning regarding undefined index. |
| 1592 | - foreach ( $form['fields'] as &$field) { |
|
| 1592 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 1593 | 1593 | |
| 1594 | 1594 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
| 1595 | 1595 | // expects certain field array items to be set. |
@@ -1597,7 +1597,7 @@ discard block |
||
| 1597 | 1597 | $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
| 1598 | 1598 | } |
| 1599 | 1599 | |
| 1600 | - switch( RGFormsModel::get_input_type( $field ) ) { |
|
| 1600 | + switch ( RGFormsModel::get_input_type( $field ) ) { |
|
| 1601 | 1601 | |
| 1602 | 1602 | /** |
| 1603 | 1603 | * this whole fileupload hack is because in the admin, Gravity Forms simply doesn't update any fileupload field if it's empty, but it DOES in the frontend. |
@@ -1611,26 +1611,26 @@ discard block |
||
| 1611 | 1611 | // Set the previous value |
| 1612 | 1612 | $entry = $this->get_entry(); |
| 1613 | 1613 | |
| 1614 | - $input_name = 'input_'.$field->id; |
|
| 1615 | - $form_id = $form['id']; |
|
| 1614 | + $input_name = 'input_' . $field->id; |
|
| 1615 | + $form_id = $form[ 'id' ]; |
|
| 1616 | 1616 | |
| 1617 | 1617 | $value = NULL; |
| 1618 | 1618 | |
| 1619 | 1619 | // Use the previous entry value as the default. |
| 1620 | - if( isset( $entry[ $field->id ] ) ) { |
|
| 1620 | + if ( isset( $entry[ $field->id ] ) ) { |
|
| 1621 | 1621 | $value = $entry[ $field->id ]; |
| 1622 | 1622 | } |
| 1623 | 1623 | |
| 1624 | 1624 | // If this is a single upload file |
| 1625 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 1626 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
| 1627 | - $value = $file_path['url']; |
|
| 1625 | + if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
| 1626 | + $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] ); |
|
| 1627 | + $value = $file_path[ 'url' ]; |
|
| 1628 | 1628 | |
| 1629 | 1629 | } else { |
| 1630 | 1630 | |
| 1631 | 1631 | // Fix PHP warning on line 1498 of form_display.php for post_image fields |
| 1632 | 1632 | // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
| 1633 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
| 1633 | + $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' ); |
|
| 1634 | 1634 | |
| 1635 | 1635 | } |
| 1636 | 1636 | |
@@ -1638,10 +1638,10 @@ discard block |
||
| 1638 | 1638 | |
| 1639 | 1639 | // If there are fresh uploads, process and merge them. |
| 1640 | 1640 | // Otherwise, use the passed values, which should be json-encoded array of URLs |
| 1641 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
| 1641 | + if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) { |
|
| 1642 | 1642 | $value = empty( $value ) ? '[]' : $value; |
| 1643 | 1643 | $value = stripslashes_deep( $value ); |
| 1644 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
| 1644 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() ); |
|
| 1645 | 1645 | } |
| 1646 | 1646 | |
| 1647 | 1647 | } else { |
@@ -1659,8 +1659,8 @@ discard block |
||
| 1659 | 1659 | |
| 1660 | 1660 | case 'number': |
| 1661 | 1661 | // Fix "undefined index" issue at line 1286 in form_display.php |
| 1662 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
| 1663 | - $_POST['input_'.$field->id ] = NULL; |
|
| 1662 | + if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) { |
|
| 1663 | + $_POST[ 'input_' . $field->id ] = NULL; |
|
| 1664 | 1664 | } |
| 1665 | 1665 | break; |
| 1666 | 1666 | } |
@@ -1697,7 +1697,7 @@ discard block |
||
| 1697 | 1697 | * You can enter whatever you want! |
| 1698 | 1698 | * We try validating, and customize the results using `self::custom_validation()` |
| 1699 | 1699 | */ |
| 1700 | - add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4); |
|
| 1700 | + add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 ); |
|
| 1701 | 1701 | |
| 1702 | 1702 | // Needed by the validate funtion |
| 1703 | 1703 | $failed_validation_page = NULL; |
@@ -1705,14 +1705,14 @@ discard block |
||
| 1705 | 1705 | |
| 1706 | 1706 | // Prevent entry limit from running when editing an entry, also |
| 1707 | 1707 | // prevent form scheduling from preventing editing |
| 1708 | - unset( $this->form['limitEntries'], $this->form['scheduleForm'] ); |
|
| 1708 | + unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] ); |
|
| 1709 | 1709 | |
| 1710 | 1710 | // Hide fields depending on Edit Entry settings |
| 1711 | - $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
| 1711 | + $this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
| 1712 | 1712 | |
| 1713 | 1713 | $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page ); |
| 1714 | 1714 | |
| 1715 | - remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
| 1715 | + remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
| 1716 | 1716 | } |
| 1717 | 1717 | |
| 1718 | 1718 | |
@@ -1740,7 +1740,7 @@ discard block |
||
| 1740 | 1740 | |
| 1741 | 1741 | $gv_valid = true; |
| 1742 | 1742 | |
| 1743 | - foreach ( $validation_results['form']['fields'] as $key => &$field ) { |
|
| 1743 | + foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) { |
|
| 1744 | 1744 | |
| 1745 | 1745 | $value = RGFormsModel::get_field_value( $field ); |
| 1746 | 1746 | $field_type = RGFormsModel::get_input_type( $field ); |
@@ -1753,22 +1753,22 @@ discard block |
||
| 1753 | 1753 | case 'post_image': |
| 1754 | 1754 | |
| 1755 | 1755 | // in case nothing is uploaded but there are already files saved |
| 1756 | - if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
| 1756 | + if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) { |
|
| 1757 | 1757 | $field->failed_validation = false; |
| 1758 | 1758 | unset( $field->validation_message ); |
| 1759 | 1759 | } |
| 1760 | 1760 | |
| 1761 | 1761 | // validate if multi file upload reached max number of files [maxFiles] => 2 |
| 1762 | - if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
| 1762 | + if ( \GV\Utils::get( $field, 'maxFiles' ) && \GV\Utils::get( $field, 'multipleFiles' ) ) { |
|
| 1763 | 1763 | |
| 1764 | 1764 | $input_name = 'input_' . $field->id; |
| 1765 | 1765 | //uploaded |
| 1766 | - $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
| 1766 | + $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array(); |
|
| 1767 | 1767 | |
| 1768 | 1768 | //existent |
| 1769 | 1769 | $entry = $this->get_entry(); |
| 1770 | 1770 | $value = NULL; |
| 1771 | - if( isset( $entry[ $field->id ] ) ) { |
|
| 1771 | + if ( isset( $entry[ $field->id ] ) ) { |
|
| 1772 | 1772 | $value = json_decode( $entry[ $field->id ], true ); |
| 1773 | 1773 | } |
| 1774 | 1774 | |
@@ -1776,13 +1776,13 @@ discard block |
||
| 1776 | 1776 | $count_files = ( is_array( $file_names ) ? count( $file_names ) : 0 ) + |
| 1777 | 1777 | ( is_array( $value ) ? count( $value ) : 0 ); |
| 1778 | 1778 | |
| 1779 | - if( $count_files > $field->maxFiles ) { |
|
| 1779 | + if ( $count_files > $field->maxFiles ) { |
|
| 1780 | 1780 | $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
| 1781 | 1781 | $field->failed_validation = 1; |
| 1782 | 1782 | $gv_valid = false; |
| 1783 | 1783 | |
| 1784 | 1784 | // in case of error make sure the newest upload files are removed from the upload input |
| 1785 | - GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
| 1785 | + GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null; |
|
| 1786 | 1786 | } |
| 1787 | 1787 | |
| 1788 | 1788 | } |
@@ -1793,7 +1793,7 @@ discard block |
||
| 1793 | 1793 | } |
| 1794 | 1794 | |
| 1795 | 1795 | // This field has failed validation. |
| 1796 | - if( !empty( $field->failed_validation ) ) { |
|
| 1796 | + if ( ! empty( $field->failed_validation ) ) { |
|
| 1797 | 1797 | |
| 1798 | 1798 | gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'data' => array( 'field' => $field, 'value' => $value ) ) ); |
| 1799 | 1799 | |
@@ -1811,19 +1811,19 @@ discard block |
||
| 1811 | 1811 | } |
| 1812 | 1812 | |
| 1813 | 1813 | // You can't continue inside a switch, so we do it after. |
| 1814 | - if( empty( $field->failed_validation ) ) { |
|
| 1814 | + if ( empty( $field->failed_validation ) ) { |
|
| 1815 | 1815 | continue; |
| 1816 | 1816 | } |
| 1817 | 1817 | |
| 1818 | 1818 | // checks if the No Duplicates option is not validating entry against itself, since |
| 1819 | 1819 | // we're editing a stored entry, it would also assume it's a duplicate. |
| 1820 | - if( !empty( $field->noDuplicates ) ) { |
|
| 1820 | + if ( ! empty( $field->noDuplicates ) ) { |
|
| 1821 | 1821 | |
| 1822 | 1822 | $entry = $this->get_entry(); |
| 1823 | 1823 | |
| 1824 | 1824 | // If the value of the entry is the same as the stored value |
| 1825 | 1825 | // Then we can assume it's not a duplicate, it's the same. |
| 1826 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
| 1826 | + if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
| 1827 | 1827 | //if value submitted was not changed, then don't validate |
| 1828 | 1828 | $field->failed_validation = false; |
| 1829 | 1829 | |
@@ -1836,7 +1836,7 @@ discard block |
||
| 1836 | 1836 | } |
| 1837 | 1837 | |
| 1838 | 1838 | // if here then probably we are facing the validation 'At least one field must be filled out' |
| 1839 | - if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
| 1839 | + if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
| 1840 | 1840 | unset( $field->validation_message ); |
| 1841 | 1841 | $field->validation_message = false; |
| 1842 | 1842 | continue; |
@@ -1848,12 +1848,12 @@ discard block |
||
| 1848 | 1848 | |
| 1849 | 1849 | } |
| 1850 | 1850 | |
| 1851 | - $validation_results['is_valid'] = $gv_valid; |
|
| 1851 | + $validation_results[ 'is_valid' ] = $gv_valid; |
|
| 1852 | 1852 | |
| 1853 | 1853 | gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Validation results.', array( 'data' => $validation_results ) ); |
| 1854 | 1854 | |
| 1855 | 1855 | // We'll need this result when rendering the form ( on GFFormDisplay::get_form ) |
| 1856 | - $this->form_after_validation = $validation_results['form']; |
|
| 1856 | + $this->form_after_validation = $validation_results[ 'form' ]; |
|
| 1857 | 1857 | |
| 1858 | 1858 | return $validation_results; |
| 1859 | 1859 | } |
@@ -1866,7 +1866,7 @@ discard block |
||
| 1866 | 1866 | */ |
| 1867 | 1867 | public function get_entry() { |
| 1868 | 1868 | |
| 1869 | - if( empty( $this->entry ) ) { |
|
| 1869 | + if ( empty( $this->entry ) ) { |
|
| 1870 | 1870 | // Get the database value of the entry that's being edited |
| 1871 | 1871 | $this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() ); |
| 1872 | 1872 | } |
@@ -1898,10 +1898,10 @@ discard block |
||
| 1898 | 1898 | } |
| 1899 | 1899 | |
| 1900 | 1900 | // If edit tab not yet configured, show all fields |
| 1901 | - $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL; |
|
| 1901 | + $edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL; |
|
| 1902 | 1902 | |
| 1903 | 1903 | // Hide fields depending on admin settings |
| 1904 | - $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
|
| 1904 | + $fields = $this->filter_fields( $form[ 'fields' ], $edit_fields ); |
|
| 1905 | 1905 | |
| 1906 | 1906 | // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
| 1907 | 1907 | $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
@@ -1934,7 +1934,7 @@ discard block |
||
| 1934 | 1934 | */ |
| 1935 | 1935 | private function filter_fields( $fields, $configured_fields ) { |
| 1936 | 1936 | |
| 1937 | - if( empty( $fields ) || !is_array( $fields ) ) { |
|
| 1937 | + if ( empty( $fields ) || ! is_array( $fields ) ) { |
|
| 1938 | 1938 | return $fields; |
| 1939 | 1939 | } |
| 1940 | 1940 | |
@@ -1951,12 +1951,12 @@ discard block |
||
| 1951 | 1951 | |
| 1952 | 1952 | // Remove the fields that have calculation properties and keep them to be used later |
| 1953 | 1953 | // @since 1.16.2 |
| 1954 | - if( $field->has_calculation() ) { |
|
| 1955 | - $this->fields_with_calculation[] = $field; |
|
| 1954 | + if ( $field->has_calculation() ) { |
|
| 1955 | + $this->fields_with_calculation[ ] = $field; |
|
| 1956 | 1956 | // don't remove the calculation fields on form render. |
| 1957 | 1957 | } |
| 1958 | 1958 | |
| 1959 | - if( in_array( $field->type, $field_type_blacklist ) ) { |
|
| 1959 | + if ( in_array( $field->type, $field_type_blacklist ) ) { |
|
| 1960 | 1960 | unset( $fields[ $key ] ); |
| 1961 | 1961 | } |
| 1962 | 1962 | } |
@@ -1986,7 +1986,7 @@ discard block |
||
| 1986 | 1986 | continue; // Never include when no fields are configured |
| 1987 | 1987 | } |
| 1988 | 1988 | |
| 1989 | - $out_fields[] = $field; |
|
| 1989 | + $out_fields[ ] = $field; |
|
| 1990 | 1990 | } |
| 1991 | 1991 | |
| 1992 | 1992 | return array_values( $out_fields ); |
@@ -1997,8 +1997,8 @@ discard block |
||
| 1997 | 1997 | |
| 1998 | 1998 | /** @var GF_Field $field */ |
| 1999 | 1999 | foreach ( $fields as $field ) { |
| 2000 | - if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
| 2001 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
| 2000 | + if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
| 2001 | + $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field ); |
|
| 2002 | 2002 | break; |
| 2003 | 2003 | } |
| 2004 | 2004 | |
@@ -2021,14 +2021,14 @@ discard block |
||
| 2021 | 2021 | |
| 2022 | 2022 | $return_field = $field; |
| 2023 | 2023 | |
| 2024 | - if( empty( $field_setting['show_label'] ) ) { |
|
| 2024 | + if ( empty( $field_setting[ 'show_label' ] ) ) { |
|
| 2025 | 2025 | $return_field->label = ''; |
| 2026 | - } elseif ( !empty( $field_setting['custom_label'] ) ) { |
|
| 2027 | - $return_field->label = $field_setting['custom_label']; |
|
| 2026 | + } elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) { |
|
| 2027 | + $return_field->label = $field_setting[ 'custom_label' ]; |
|
| 2028 | 2028 | } |
| 2029 | 2029 | |
| 2030 | - if( !empty( $field_setting['custom_class'] ) ) { |
|
| 2031 | - $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] ); |
|
| 2030 | + if ( ! empty( $field_setting[ 'custom_class' ] ) ) { |
|
| 2031 | + $return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] ); |
|
| 2032 | 2032 | } |
| 2033 | 2033 | |
| 2034 | 2034 | /** |
@@ -2066,16 +2066,16 @@ discard block |
||
| 2066 | 2066 | */ |
| 2067 | 2067 | $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
| 2068 | 2068 | |
| 2069 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
| 2070 | - foreach( $fields as $k => $field ) { |
|
| 2071 | - if( $field->adminOnly ) { |
|
| 2069 | + if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) { |
|
| 2070 | + foreach ( $fields as $k => $field ) { |
|
| 2071 | + if ( $field->adminOnly ) { |
|
| 2072 | 2072 | unset( $fields[ $k ] ); |
| 2073 | 2073 | } |
| 2074 | 2074 | } |
| 2075 | 2075 | return array_values( $fields ); |
| 2076 | 2076 | } |
| 2077 | 2077 | |
| 2078 | - foreach( $fields as &$field ) { |
|
| 2078 | + foreach ( $fields as &$field ) { |
|
| 2079 | 2079 | $field->adminOnly = false; |
| 2080 | 2080 | } |
| 2081 | 2081 | |
@@ -2096,7 +2096,7 @@ discard block |
||
| 2096 | 2096 | */ |
| 2097 | 2097 | private function unselect_default_values( $form ) { |
| 2098 | 2098 | |
| 2099 | - foreach ( $form['fields'] as &$field ) { |
|
| 2099 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 2100 | 2100 | |
| 2101 | 2101 | if ( empty( $field->choices ) ) { |
| 2102 | 2102 | continue; |
@@ -2104,7 +2104,7 @@ discard block |
||
| 2104 | 2104 | |
| 2105 | 2105 | foreach ( $field->choices as &$choice ) { |
| 2106 | 2106 | if ( \GV\Utils::get( $choice, 'isSelected' ) ) { |
| 2107 | - $choice['isSelected'] = false; |
|
| 2107 | + $choice[ 'isSelected' ] = false; |
|
| 2108 | 2108 | } |
| 2109 | 2109 | } |
| 2110 | 2110 | } |
@@ -2129,22 +2129,22 @@ discard block |
||
| 2129 | 2129 | */ |
| 2130 | 2130 | function prefill_conditional_logic( $form ) { |
| 2131 | 2131 | |
| 2132 | - if( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
| 2132 | + if ( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
| 2133 | 2133 | return $form; |
| 2134 | 2134 | } |
| 2135 | 2135 | |
| 2136 | 2136 | // Have Conditional Logic pre-fill fields as if the data were default values |
| 2137 | 2137 | /** @var GF_Field $field */ |
| 2138 | - foreach ( $form['fields'] as &$field ) { |
|
| 2138 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 2139 | 2139 | |
| 2140 | - if( 'checkbox' === $field->type ) { |
|
| 2140 | + if ( 'checkbox' === $field->type ) { |
|
| 2141 | 2141 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
| 2142 | - $input_id = $input['id']; |
|
| 2142 | + $input_id = $input[ 'id' ]; |
|
| 2143 | 2143 | $choice = $field->choices[ $key ]; |
| 2144 | 2144 | $value = \GV\Utils::get( $this->entry, $input_id ); |
| 2145 | 2145 | $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
| 2146 | - if( $match ) { |
|
| 2147 | - $field->choices[ $key ]['isSelected'] = true; |
|
| 2146 | + if ( $match ) { |
|
| 2147 | + $field->choices[ $key ][ 'isSelected' ] = true; |
|
| 2148 | 2148 | } |
| 2149 | 2149 | } |
| 2150 | 2150 | } else { |
@@ -2152,15 +2152,15 @@ discard block |
||
| 2152 | 2152 | // We need to run through each field to set the default values |
| 2153 | 2153 | foreach ( $this->entry as $field_id => $field_value ) { |
| 2154 | 2154 | |
| 2155 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
| 2155 | + if ( floatval( $field_id ) === floatval( $field->id ) ) { |
|
| 2156 | 2156 | |
| 2157 | - if( 'list' === $field->type ) { |
|
| 2157 | + if ( 'list' === $field->type ) { |
|
| 2158 | 2158 | $list_rows = maybe_unserialize( $field_value ); |
| 2159 | 2159 | |
| 2160 | 2160 | $list_field_value = array(); |
| 2161 | - foreach ( (array) $list_rows as $row ) { |
|
| 2162 | - foreach ( (array) $row as $column ) { |
|
| 2163 | - $list_field_value[] = $column; |
|
| 2161 | + foreach ( (array)$list_rows as $row ) { |
|
| 2162 | + foreach ( (array)$row as $column ) { |
|
| 2163 | + $list_field_value[ ] = $column; |
|
| 2164 | 2164 | } |
| 2165 | 2165 | } |
| 2166 | 2166 | |
@@ -2193,32 +2193,32 @@ discard block |
||
| 2193 | 2193 | * @see https://github.com/gravityview/GravityView/issues/840 |
| 2194 | 2194 | * @since develop |
| 2195 | 2195 | */ |
| 2196 | - $the_form = GFAPI::get_form( $form['id'] ); |
|
| 2196 | + $the_form = GFAPI::get_form( $form[ 'id' ] ); |
|
| 2197 | 2197 | $editable_ids = array(); |
| 2198 | - foreach ( $form['fields'] as $field ) { |
|
| 2199 | - $editable_ids[] = $field['id']; // wp_list_pluck is destructive in this context |
|
| 2198 | + foreach ( $form[ 'fields' ] as $field ) { |
|
| 2199 | + $editable_ids[ ] = $field[ 'id' ]; // wp_list_pluck is destructive in this context |
|
| 2200 | 2200 | } |
| 2201 | 2201 | $remove_conditions_rule = array(); |
| 2202 | - foreach ( $the_form['fields'] as $field ) { |
|
| 2203 | - if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic['rules'] ) ) { |
|
| 2204 | - foreach ( $field->conditionalLogic['rules'] as $i => $rule ) { |
|
| 2205 | - if ( ! in_array( $rule['fieldId'], $editable_ids ) ) { |
|
| 2202 | + foreach ( $the_form[ 'fields' ] as $field ) { |
|
| 2203 | + if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic[ 'rules' ] ) ) { |
|
| 2204 | + foreach ( $field->conditionalLogic[ 'rules' ] as $i => $rule ) { |
|
| 2205 | + if ( ! in_array( $rule[ 'fieldId' ], $editable_ids ) ) { |
|
| 2206 | 2206 | /** |
| 2207 | 2207 | * This conditional field is not editable in this View. |
| 2208 | 2208 | * We need to remove the rule, but only if it matches. |
| 2209 | 2209 | */ |
| 2210 | - if ( $_field = GFAPI::get_field( $the_form, $rule['fieldId'] ) ) { |
|
| 2210 | + if ( $_field = GFAPI::get_field( $the_form, $rule[ 'fieldId' ] ) ) { |
|
| 2211 | 2211 | $value = $_field->get_value_export( $this->entry ); |
| 2212 | - } elseif ( isset( $this->entry[ $rule['fieldId'] ] ) ) { |
|
| 2213 | - $value = $this->entry[ $rule['fieldId'] ]; |
|
| 2212 | + } elseif ( isset( $this->entry[ $rule[ 'fieldId' ] ] ) ) { |
|
| 2213 | + $value = $this->entry[ $rule[ 'fieldId' ] ]; |
|
| 2214 | 2214 | } else { |
| 2215 | - $value = gform_get_meta( $this->entry['id'], $rule['fieldId'] ); |
|
| 2215 | + $value = gform_get_meta( $this->entry[ 'id' ], $rule[ 'fieldId' ] ); |
|
| 2216 | 2216 | } |
| 2217 | 2217 | |
| 2218 | - $match = GFFormsModel::matches_operation( $value, $rule['value'], $rule['operator'] ); |
|
| 2218 | + $match = GFFormsModel::matches_operation( $value, $rule[ 'value' ], $rule[ 'operator' ] ); |
|
| 2219 | 2219 | |
| 2220 | 2220 | if ( $match ) { |
| 2221 | - $remove_conditions_rule[] = array( $field['id'], $i ); |
|
| 2221 | + $remove_conditions_rule[ ] = array( $field[ 'id' ], $i ); |
|
| 2222 | 2222 | } |
| 2223 | 2223 | } |
| 2224 | 2224 | } |
@@ -2226,21 +2226,21 @@ discard block |
||
| 2226 | 2226 | } |
| 2227 | 2227 | |
| 2228 | 2228 | if ( $remove_conditions_rule ) { |
| 2229 | - foreach ( $form['fields'] as &$field ) { |
|
| 2229 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 2230 | 2230 | foreach ( $remove_conditions_rule as $_remove_conditions_r ) { |
| 2231 | 2231 | |
| 2232 | 2232 | list( $rule_field_id, $rule_i ) = $_remove_conditions_r; |
| 2233 | 2233 | |
| 2234 | - if ( $field['id'] == $rule_field_id ) { |
|
| 2235 | - unset( $field->conditionalLogic['rules'][ $rule_i ] ); |
|
| 2236 | - gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field['id'] ) ); |
|
| 2234 | + if ( $field[ 'id' ] == $rule_field_id ) { |
|
| 2235 | + unset( $field->conditionalLogic[ 'rules' ][ $rule_i ] ); |
|
| 2236 | + gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field[ 'id' ] ) ); |
|
| 2237 | 2237 | } |
| 2238 | 2238 | } |
| 2239 | 2239 | } |
| 2240 | 2240 | } |
| 2241 | 2241 | |
| 2242 | 2242 | /** Normalize the indices... */ |
| 2243 | - $form['fields'] = array_values( $form['fields'] ); |
|
| 2243 | + $form[ 'fields' ] = array_values( $form[ 'fields' ] ); |
|
| 2244 | 2244 | |
| 2245 | 2245 | /** |
| 2246 | 2246 | * @filter `gravityview/edit_entry/conditional_logic` Should the Edit Entry form use Gravity Forms conditional logic showing/hiding of fields? |
@@ -2250,16 +2250,16 @@ discard block |
||
| 2250 | 2250 | */ |
| 2251 | 2251 | $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form ); |
| 2252 | 2252 | |
| 2253 | - if( $use_conditional_logic ) { |
|
| 2253 | + if ( $use_conditional_logic ) { |
|
| 2254 | 2254 | return $form; |
| 2255 | 2255 | } |
| 2256 | 2256 | |
| 2257 | - foreach( $form['fields'] as &$field ) { |
|
| 2257 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 2258 | 2258 | /* @var GF_Field $field */ |
| 2259 | 2259 | $field->conditionalLogic = null; |
| 2260 | 2260 | } |
| 2261 | 2261 | |
| 2262 | - unset( $form['button']['conditionalLogic'] ); |
|
| 2262 | + unset( $form[ 'button' ][ 'conditionalLogic' ] ); |
|
| 2263 | 2263 | |
| 2264 | 2264 | return $form; |
| 2265 | 2265 | |
@@ -2276,7 +2276,7 @@ discard block |
||
| 2276 | 2276 | */ |
| 2277 | 2277 | public function manage_conditional_logic( $has_conditional_logic, $form ) { |
| 2278 | 2278 | |
| 2279 | - if( ! $this->is_edit_entry() ) { |
|
| 2279 | + if ( ! $this->is_edit_entry() ) { |
|
| 2280 | 2280 | return $has_conditional_logic; |
| 2281 | 2281 | } |
| 2282 | 2282 | |
@@ -2308,44 +2308,44 @@ discard block |
||
| 2308 | 2308 | * 2. There are two entries embedded using oEmbed |
| 2309 | 2309 | * 3. One of the entries has just been saved |
| 2310 | 2310 | */ |
| 2311 | - if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) { |
|
| 2311 | + if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) { |
|
| 2312 | 2312 | |
| 2313 | 2313 | $error = true; |
| 2314 | 2314 | |
| 2315 | 2315 | } |
| 2316 | 2316 | |
| 2317 | - if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) { |
|
| 2317 | + if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) { |
|
| 2318 | 2318 | |
| 2319 | 2319 | $error = true; |
| 2320 | 2320 | |
| 2321 | - } elseif( ! $this->verify_nonce() ) { |
|
| 2321 | + } elseif ( ! $this->verify_nonce() ) { |
|
| 2322 | 2322 | |
| 2323 | 2323 | /** |
| 2324 | 2324 | * If the Entry is embedded, there may be two entries on the same page. |
| 2325 | 2325 | * If that's the case, and one is being edited, the other should fail gracefully and not display an error. |
| 2326 | 2326 | */ |
| 2327 | - if( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
| 2327 | + if ( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
| 2328 | 2328 | $error = true; |
| 2329 | 2329 | } else { |
| 2330 | - $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview'); |
|
| 2330 | + $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' ); |
|
| 2331 | 2331 | } |
| 2332 | 2332 | |
| 2333 | 2333 | } |
| 2334 | 2334 | |
| 2335 | - if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
| 2336 | - $error = __( 'You do not have permission to edit this entry.', 'gravityview'); |
|
| 2335 | + if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
| 2336 | + $error = __( 'You do not have permission to edit this entry.', 'gravityview' ); |
|
| 2337 | 2337 | } |
| 2338 | 2338 | |
| 2339 | - if( $this->entry['status'] === 'trash' ) { |
|
| 2340 | - $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
| 2339 | + if ( $this->entry[ 'status' ] === 'trash' ) { |
|
| 2340 | + $error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
| 2341 | 2341 | } |
| 2342 | 2342 | |
| 2343 | 2343 | // No errors; everything's fine here! |
| 2344 | - if( empty( $error ) ) { |
|
| 2344 | + if ( empty( $error ) ) { |
|
| 2345 | 2345 | return true; |
| 2346 | 2346 | } |
| 2347 | 2347 | |
| 2348 | - if( $echo && $error !== true ) { |
|
| 2348 | + if ( $echo && $error !== true ) { |
|
| 2349 | 2349 | |
| 2350 | 2350 | $error = esc_html( $error ); |
| 2351 | 2351 | |
@@ -2353,10 +2353,10 @@ discard block |
||
| 2353 | 2353 | * @since 1.9 |
| 2354 | 2354 | */ |
| 2355 | 2355 | if ( ! empty( $this->entry ) ) { |
| 2356 | - $error .= ' ' . gravityview_get_link( '#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) ); |
|
| 2356 | + $error .= ' ' . gravityview_get_link( '#', _x( 'Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) ); |
|
| 2357 | 2357 | } |
| 2358 | 2358 | |
| 2359 | - echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
|
| 2359 | + echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' ); |
|
| 2360 | 2360 | } |
| 2361 | 2361 | |
| 2362 | 2362 | gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
@@ -2376,17 +2376,17 @@ discard block |
||
| 2376 | 2376 | |
| 2377 | 2377 | $error = NULL; |
| 2378 | 2378 | |
| 2379 | - if( ! $this->check_user_cap_edit_field( $field ) ) { |
|
| 2380 | - $error = __( 'You do not have permission to edit this field.', 'gravityview'); |
|
| 2379 | + if ( ! $this->check_user_cap_edit_field( $field ) ) { |
|
| 2380 | + $error = __( 'You do not have permission to edit this field.', 'gravityview' ); |
|
| 2381 | 2381 | } |
| 2382 | 2382 | |
| 2383 | 2383 | // No errors; everything's fine here! |
| 2384 | - if( empty( $error ) ) { |
|
| 2384 | + if ( empty( $error ) ) { |
|
| 2385 | 2385 | return true; |
| 2386 | 2386 | } |
| 2387 | 2387 | |
| 2388 | - if( $echo ) { |
|
| 2389 | - echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error'); |
|
| 2388 | + if ( $echo ) { |
|
| 2389 | + echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' ); |
|
| 2390 | 2390 | } |
| 2391 | 2391 | |
| 2392 | 2392 | gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
@@ -2407,14 +2407,14 @@ discard block |
||
| 2407 | 2407 | private function check_user_cap_edit_field( $field ) { |
| 2408 | 2408 | |
| 2409 | 2409 | // If they can edit any entries (as defined in Gravity Forms), we're good. |
| 2410 | - if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
| 2410 | + if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
| 2411 | 2411 | return true; |
| 2412 | 2412 | } |
| 2413 | 2413 | |
| 2414 | - $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false; |
|
| 2414 | + $field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false; |
|
| 2415 | 2415 | |
| 2416 | - if( $field_cap ) { |
|
| 2417 | - return GVCommon::has_cap( $field['allow_edit_cap'] ); |
|
| 2416 | + if ( $field_cap ) { |
|
| 2417 | + return GVCommon::has_cap( $field[ 'allow_edit_cap' ] ); |
|
| 2418 | 2418 | } |
| 2419 | 2419 | |
| 2420 | 2420 | return false; |
@@ -2428,17 +2428,17 @@ discard block |
||
| 2428 | 2428 | public function verify_nonce() { |
| 2429 | 2429 | |
| 2430 | 2430 | // Verify form submitted for editing single |
| 2431 | - if( $this->is_edit_entry_submission() ) { |
|
| 2431 | + if ( $this->is_edit_entry_submission() ) { |
|
| 2432 | 2432 | $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field ); |
| 2433 | 2433 | } |
| 2434 | 2434 | |
| 2435 | 2435 | // Verify |
| 2436 | - else if( ! $this->is_edit_entry() ) { |
|
| 2436 | + else if ( ! $this->is_edit_entry() ) { |
|
| 2437 | 2437 | $valid = false; |
| 2438 | 2438 | } |
| 2439 | 2439 | |
| 2440 | 2440 | else { |
| 2441 | - $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key ); |
|
| 2441 | + $valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ); |
|
| 2442 | 2442 | } |
| 2443 | 2443 | |
| 2444 | 2444 | /** |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
| 42 | 42 | |
| 43 | - unset ( $field_options['search_filter'], $field_options['show_as_link'], $field_options['new_window'] ); |
|
| 43 | + unset ( $field_options[ 'search_filter' ], $field_options[ 'show_as_link' ], $field_options[ 'new_window' ] ); |
|
| 44 | 44 | |
| 45 | 45 | $new_fields = array( |
| 46 | 46 | 'content' => array( |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | ); |
| 76 | 76 | |
| 77 | 77 | if ( 'edit' === $context ) { |
| 78 | - unset( $field_options['custom_label'], $field_options['show_label'], $field_options['allow_edit_cap'], $new_fields['wpautop'], $new_fields['oembed'] ); |
|
| 78 | + unset( $field_options[ 'custom_label' ], $field_options[ 'show_label' ], $field_options[ 'allow_edit_cap' ], $new_fields[ 'wpautop' ], $new_fields[ 'oembed' ] ); |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | return $new_fields + $field_options; |
@@ -109,9 +109,9 @@ discard block |
||
| 109 | 109 | |
| 110 | 110 | // Loop through the configured Edit Entry fields and add Custom Content fields if there are any |
| 111 | 111 | // TODO: Make this available to other custom GV field types |
| 112 | - foreach ( (array) $edit_fields as $edit_field ) { |
|
| 112 | + foreach ( (array)$edit_fields as $edit_field ) { |
|
| 113 | 113 | |
| 114 | - if( 'custom' === \GV\Utils::get( $edit_field, 'id') ) { |
|
| 114 | + if ( 'custom' === \GV\Utils::get( $edit_field, 'id' ) ) { |
|
| 115 | 115 | |
| 116 | 116 | $field_data = array( |
| 117 | 117 | 'label' => \GV\Utils::get( $edit_field, 'custom_label' ), |
@@ -124,13 +124,13 @@ discard block |
||
| 124 | 124 | $field_data[ $key ] = GravityView_Merge_Tags::replace_variables( $field_datum, $form, $entry->as_entry(), false, false ); |
| 125 | 125 | } |
| 126 | 126 | |
| 127 | - $field_data['cssClass'] = \GV\Utils::get( $edit_field, 'custom_class' ); |
|
| 127 | + $field_data[ 'cssClass' ] = \GV\Utils::get( $edit_field, 'custom_class' ); |
|
| 128 | 128 | |
| 129 | - $new_fields[] = new GF_Field_HTML( $field_data ); |
|
| 129 | + $new_fields[ ] = new GF_Field_HTML( $field_data ); |
|
| 130 | 130 | |
| 131 | 131 | } else { |
| 132 | - if( isset( $fields[ $i ] ) ) { |
|
| 133 | - $new_fields[] = $fields[ $i ]; |
|
| 132 | + if ( isset( $fields[ $i ] ) ) { |
|
| 133 | + $new_fields[ ] = $fields[ $i ]; |
|
| 134 | 134 | } |
| 135 | 135 | $i++; |
| 136 | 136 | } |
@@ -29,9 +29,9 @@ discard block |
||
| 29 | 29 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
| 30 | 30 | |
| 31 | 31 | // It makes no sense to use this as the link. |
| 32 | - unset( $field_options['show_as_link'] ); |
|
| 32 | + unset( $field_options[ 'show_as_link' ] ); |
|
| 33 | 33 | |
| 34 | - if( 'edit' === $context ) { |
|
| 34 | + if ( 'edit' === $context ) { |
|
| 35 | 35 | return $field_options; |
| 36 | 36 | } |
| 37 | 37 | |
@@ -39,12 +39,12 @@ discard block |
||
| 39 | 39 | * Set default to opening in new links for back-compatibility with Version 1.5.1 |
| 40 | 40 | * @link https://github.com/gravityview/GravityView/commit/e12e76e2d032754227728d41e65103042d4f75ec |
| 41 | 41 | */ |
| 42 | - $field_options['new_window']['value'] = true; |
|
| 42 | + $field_options[ 'new_window' ][ 'value' ] = true; |
|
| 43 | 43 | |
| 44 | 44 | /** |
| 45 | 45 | * @since 1.8 |
| 46 | 46 | */ |
| 47 | - $field_options['anchor_text'] = array( |
|
| 47 | + $field_options[ 'anchor_text' ] = array( |
|
| 48 | 48 | 'type' => 'text', |
| 49 | 49 | 'label' => __( 'Link Text:', 'gravityview' ), |
| 50 | 50 | 'desc' => __( 'Define custom link text. Leave blank to display the URL', 'gravityview' ), |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | 'merge_tags' => 'force', |
| 53 | 53 | ); |
| 54 | 54 | |
| 55 | - $field_options['truncatelink'] = array( |
|
| 55 | + $field_options[ 'truncatelink' ] = array( |
|
| 56 | 56 | 'type' => 'checkbox', |
| 57 | 57 | 'value' => true, |
| 58 | 58 | 'label' => __( 'Shorten Link Display', 'gravityview' ), |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | public function __construct() { |
| 27 | 27 | $this->label = esc_html__( 'Other Entries', 'gravityview' ); |
| 28 | - $this->description = esc_html__('Display other entries created by the entry creator.', 'gravityview'); |
|
| 28 | + $this->description = esc_html__( 'Display other entries created by the entry creator.', 'gravityview' ); |
|
| 29 | 29 | parent::__construct(); |
| 30 | 30 | } |
| 31 | 31 | |
@@ -35,32 +35,32 @@ discard block |
||
| 35 | 35 | */ |
| 36 | 36 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
| 37 | 37 | |
| 38 | - if( 'edit' === $context ) { |
|
| 38 | + if ( 'edit' === $context ) { |
|
| 39 | 39 | return $field_options; |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | // No "Link to single entry"; all the items will be links to entries! |
| 43 | - unset( $field_options['show_as_link'] ); |
|
| 43 | + unset( $field_options[ 'show_as_link' ] ); |
|
| 44 | 44 | |
| 45 | 45 | $new_options = array(); |
| 46 | 46 | |
| 47 | - $new_options['link_format'] = array( |
|
| 47 | + $new_options[ 'link_format' ] = array( |
|
| 48 | 48 | 'type' => 'text', |
| 49 | 49 | 'label' => __( 'Entry link text (required)', 'gravityview' ), |
| 50 | - 'value' => __('Entry #{entry_id}', 'gravityview'), |
|
| 50 | + 'value' => __( 'Entry #{entry_id}', 'gravityview' ), |
|
| 51 | 51 | 'merge_tags' => 'force', |
| 52 | 52 | ); |
| 53 | 53 | |
| 54 | - $new_options['after_link'] = array( |
|
| 54 | + $new_options[ 'after_link' ] = array( |
|
| 55 | 55 | 'type' => 'textarea', |
| 56 | 56 | 'label' => __( 'Text or HTML to display after the link (optional)', 'gravityview' ), |
| 57 | - 'desc' => __('This content will be displayed below each entry link.', 'gravityview'), |
|
| 57 | + 'desc' => __( 'This content will be displayed below each entry link.', 'gravityview' ), |
|
| 58 | 58 | 'value' => '', |
| 59 | 59 | 'merge_tags' => 'force', |
| 60 | 60 | 'class' => 'widefat code', |
| 61 | 61 | ); |
| 62 | 62 | |
| 63 | - $new_options['page_size'] = array( |
|
| 63 | + $new_options[ 'page_size' ] = array( |
|
| 64 | 64 | 'type' => 'number', |
| 65 | 65 | 'label' => __( 'Entries to Display', 'gravityview' ), |
| 66 | 66 | 'desc' => __( 'What is the maximum number of entries that should be shown?', 'gravityview' ) . ' ' . sprintf( _x( 'Set to %s for no maximum.', '%s replaced with a formatted 0', 'gravityview' ), '<code>0</code>' ), |
@@ -69,14 +69,14 @@ discard block |
||
| 69 | 69 | 'min' => 0, |
| 70 | 70 | ); |
| 71 | 71 | |
| 72 | - $new_options['no_entries_hide'] = array( |
|
| 72 | + $new_options[ 'no_entries_hide' ] = array( |
|
| 73 | 73 | 'type' => 'checkbox', |
| 74 | 74 | 'label' => __( 'Hide if no entries', 'gravityview' ), |
| 75 | 75 | 'desc' => __( 'Don\'t display this field if the entry creator has no other entries', 'gravityview' ), |
| 76 | 76 | 'value' => false, |
| 77 | 77 | ); |
| 78 | 78 | |
| 79 | - $new_options['no_entries_text'] = array( |
|
| 79 | + $new_options[ 'no_entries_text' ] = array( |
|
| 80 | 80 | 'type' => 'text', |
| 81 | 81 | 'label' => __( 'No Entries Text', 'gravityview' ), |
| 82 | 82 | 'desc' => __( 'The text that is shown if the entry creator has no other entries (and "Hide if no entries" is disabled).', 'gravityview' ), |
@@ -110,11 +110,11 @@ discard block |
||
| 110 | 110 | foreach ( $filters as $filter ) { |
| 111 | 111 | foreach ( $wp_filter[ $filter ] as $priority => $callbacks ) { |
| 112 | 112 | foreach ( $callbacks as $id => $callback ) { |
| 113 | - if ( ! is_array( $callback['function'] ) ) { |
|
| 113 | + if ( ! is_array( $callback[ 'function' ] ) ) { |
|
| 114 | 114 | continue; |
| 115 | 115 | } |
| 116 | - if ( $callback['function'][0] instanceof \GV\Widget ) { |
|
| 117 | - $remove[] = array( $filter, $priority, $id ); |
|
| 116 | + if ( $callback[ 'function' ][ 0 ] instanceof \GV\Widget ) { |
|
| 117 | + $remove[ ] = array( $filter, $priority, $id ); |
|
| 118 | 118 | } |
| 119 | 119 | } |
| 120 | 120 | } |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | |
| 123 | 123 | foreach ( $remove as $r ) { |
| 124 | 124 | list( $filter, $priority, $id ) = $r; |
| 125 | - $removed[] = array( $filter, $priority, $id, $wp_filter[ $filter ]->callbacks[ $priority ][ $id ] ); |
|
| 125 | + $removed[ ] = array( $filter, $priority, $id, $wp_filter[ $filter ]->callbacks[ $priority ][ $id ] ); |
|
| 126 | 126 | unset( $wp_filter[ $filter ]->callbacks[ $priority ][ $id ] ); |
| 127 | 127 | } |
| 128 | 128 | |
@@ -146,10 +146,10 @@ discard block |
||
| 146 | 146 | public function filter_entries( $search_criteria, $form_id = null, $args = array(), $force_search_criteria = false ) { |
| 147 | 147 | $context = $this->context; |
| 148 | 148 | |
| 149 | - $created_by = $context->entry['created_by']; |
|
| 149 | + $created_by = $context->entry[ 'created_by' ]; |
|
| 150 | 150 | |
| 151 | 151 | /** Filter entries by approved and created_by. */ |
| 152 | - $search_criteria['field_filters'][] = array( |
|
| 152 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
| 153 | 153 | 'key' => 'created_by', |
| 154 | 154 | 'value' => $created_by, |
| 155 | 155 | 'operator' => 'is' |
@@ -169,14 +169,14 @@ discard block |
||
| 169 | 169 | $criteria = apply_filters( 'gravityview/field/other_entries/criteria', $search_criteria, $context->view->settings->as_atts(), $context->view->form->ID, $context ); |
| 170 | 170 | |
| 171 | 171 | /** Force mode all and filter out our own entry. */ |
| 172 | - $search_criteria['field_filters']['mode'] = 'all'; |
|
| 173 | - $search_criteria['field_filters'][] = array( |
|
| 172 | + $search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; |
|
| 173 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
| 174 | 174 | 'key' => 'id', |
| 175 | 175 | 'value' => $context->entry->ID, |
| 176 | 176 | 'operator' => 'isnot' |
| 177 | 177 | ); |
| 178 | 178 | |
| 179 | - $search_criteria['paging']['page_size'] = $context->field->page_size ? : 10; |
|
| 179 | + $search_criteria[ 'paging' ][ 'page_size' ] = $context->field->page_size ?: 10; |
|
| 180 | 180 | |
| 181 | 181 | return $search_criteria; |
| 182 | 182 | } |
@@ -52,13 +52,13 @@ discard block |
||
| 52 | 52 | function update_priority() { |
| 53 | 53 | global $wp_meta_boxes; |
| 54 | 54 | |
| 55 | - if ( ! empty( $wp_meta_boxes['gravityview'] ) ) { |
|
| 55 | + if ( ! empty( $wp_meta_boxes[ 'gravityview' ] ) ) { |
|
| 56 | 56 | foreach ( array( 'high', 'core', 'low' ) as $position ) { |
| 57 | - if ( isset( $wp_meta_boxes['gravityview']['normal'][ $position ] ) ) { |
|
| 58 | - foreach ( $wp_meta_boxes['gravityview']['normal'][ $position ] as $key => $meta_box ) { |
|
| 57 | + if ( isset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] ) ) { |
|
| 58 | + foreach ( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] as $key => $meta_box ) { |
|
| 59 | 59 | if ( ! preg_match( '/^gravityview_/ism', $key ) ) { |
| 60 | - $wp_meta_boxes['gravityview']['advanced'][ $position ][ $key ] = $meta_box; |
|
| 61 | - unset( $wp_meta_boxes['gravityview']['normal'][ $position ][ $key ] ); |
|
| 60 | + $wp_meta_boxes[ 'gravityview' ][ 'advanced' ][ $position ][ $key ] = $meta_box; |
|
| 61 | + unset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ][ $key ] ); |
|
| 62 | 62 | } |
| 63 | 63 | } |
| 64 | 64 | } |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | |
| 192 | 192 | foreach ( $metaboxes as $m ) { |
| 193 | 193 | |
| 194 | - $tab = new GravityView_Metabox_Tab( $m['id'], $m['title'], $m['file'], $m['icon-class'], $m['callback'], $m['callback_args'] ); |
|
| 194 | + $tab = new GravityView_Metabox_Tab( $m[ 'id' ], $m[ 'title' ], $m[ 'file' ], $m[ 'icon-class' ], $m[ 'callback' ], $m[ 'callback_args' ] ); |
|
| 195 | 195 | |
| 196 | 196 | GravityView_Metabox_Tabs::add( $tab ); |
| 197 | 197 | |
@@ -261,13 +261,13 @@ discard block |
||
| 261 | 261 | |
| 262 | 262 | $form = gravityview_get_form( $curr_form ); |
| 263 | 263 | |
| 264 | - $get_id_backup = isset( $_GET['id'] ) ? $_GET['id'] : null; |
|
| 264 | + $get_id_backup = isset( $_GET[ 'id' ] ) ? $_GET[ 'id' ] : null; |
|
| 265 | 265 | |
| 266 | - if ( isset( $form['id'] ) ) { |
|
| 266 | + if ( isset( $form[ 'id' ] ) ) { |
|
| 267 | 267 | $form_script = 'var form = ' . GFCommon::json_encode( $form ) . ';'; |
| 268 | 268 | |
| 269 | 269 | // The `gf_vars()` method needs a $_GET[id] variable set with the form ID. |
| 270 | - $_GET['id'] = $form['id']; |
|
| 270 | + $_GET[ 'id' ] = $form[ 'id' ]; |
|
| 271 | 271 | |
| 272 | 272 | } else { |
| 273 | 273 | $form_script = 'var form = new Form();'; |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | $output = '<script type="text/javascript" data-gv-merge-tags="1">' . $form_script . "\n" . GFCommon::gf_vars( false ) . '</script>'; |
| 277 | 277 | |
| 278 | 278 | // Restore previous $_GET setting |
| 279 | - $_GET['id'] = $get_id_backup; |
|
| 279 | + $_GET[ 'id' ] = $get_id_backup; |
|
| 280 | 280 | |
| 281 | 281 | return $output; |
| 282 | 282 | } |