gravityview /
GravityView
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | 'type' => 'radio', |
| 65 | 65 | 'full_width' => true, |
| 66 | 66 | 'label' => esc_html__( 'Search Mode', 'gravityview' ), |
| 67 | - 'desc' => __('Should search results match all search fields, or any?', 'gravityview'), |
|
| 67 | + 'desc' => __( 'Should search results match all search fields, or any?', 'gravityview' ), |
|
| 68 | 68 | 'value' => 'any', |
| 69 | 69 | 'class' => 'hide-if-js', |
| 70 | 70 | 'options' => array( |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | // admin - add scripts - run at 1100 to make sure GravityView_Admin_Views::add_scripts_and_styles() runs first at 999 |
| 85 | 85 | add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 1100 ); |
| 86 | - add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') ); |
|
| 86 | + add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) ); |
|
| 87 | 87 | add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) ); |
| 88 | 88 | |
| 89 | 89 | // ajax - get the searchable fields |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | $script_min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; |
| 226 | 226 | $script_source = empty( $script_min ) ? '/source' : ''; |
| 227 | 227 | |
| 228 | - wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js'.$script_source.'/admin-search-widget'.$script_min.'.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), \GV\Plugin::$version ); |
|
| 228 | + wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js' . $script_source . '/admin-search-widget' . $script_min . '.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), \GV\Plugin::$version ); |
|
| 229 | 229 | |
| 230 | 230 | wp_localize_script( 'gravityview_searchwidget_admin', 'gvSearchVar', array( |
| 231 | 231 | 'nonce' => wp_create_nonce( 'gravityview_ajaxsearchwidget' ), |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | * @return array Scripts allowed in no-conflict mode, plus the search widget script |
| 248 | 248 | */ |
| 249 | 249 | public function register_no_conflict( $allowed ) { |
| 250 | - $allowed[] = 'gravityview_searchwidget_admin'; |
|
| 250 | + $allowed[ ] = 'gravityview_searchwidget_admin'; |
|
| 251 | 251 | return $allowed; |
| 252 | 252 | } |
| 253 | 253 | |
@@ -259,24 +259,24 @@ discard block |
||
| 259 | 259 | */ |
| 260 | 260 | public static function get_searchable_fields() { |
| 261 | 261 | |
| 262 | - if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxsearchwidget' ) ) { |
|
| 262 | + if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxsearchwidget' ) ) { |
|
| 263 | 263 | exit( '0' ); |
| 264 | 264 | } |
| 265 | 265 | |
| 266 | 266 | $form = ''; |
| 267 | 267 | |
| 268 | 268 | // Fetch the form for the current View |
| 269 | - if ( ! empty( $_POST['view_id'] ) ) { |
|
| 269 | + if ( ! empty( $_POST[ 'view_id' ] ) ) { |
|
| 270 | 270 | |
| 271 | - $form = gravityview_get_form_id( $_POST['view_id'] ); |
|
| 271 | + $form = gravityview_get_form_id( $_POST[ 'view_id' ] ); |
|
| 272 | 272 | |
| 273 | - } elseif ( ! empty( $_POST['formid'] ) ) { |
|
| 273 | + } elseif ( ! empty( $_POST[ 'formid' ] ) ) { |
|
| 274 | 274 | |
| 275 | - $form = (int) $_POST['formid']; |
|
| 275 | + $form = (int)$_POST[ 'formid' ]; |
|
| 276 | 276 | |
| 277 | - } elseif ( ! empty( $_POST['template_id'] ) && class_exists( 'GravityView_Ajax' ) ) { |
|
| 277 | + } elseif ( ! empty( $_POST[ 'template_id' ] ) && class_exists( 'GravityView_Ajax' ) ) { |
|
| 278 | 278 | |
| 279 | - $form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] ); |
|
| 279 | + $form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] ); |
|
| 280 | 280 | |
| 281 | 281 | } |
| 282 | 282 | |
@@ -326,14 +326,14 @@ discard block |
||
| 326 | 326 | ); |
| 327 | 327 | |
| 328 | 328 | if ( gravityview()->plugin->supports( \GV\Plugin::FEATURE_GFQUERY ) ) { |
| 329 | - $custom_fields['is_approved'] = array( |
|
| 329 | + $custom_fields[ 'is_approved' ] = array( |
|
| 330 | 330 | 'text' => esc_html__( 'Approval Status', 'gravityview' ), |
| 331 | 331 | 'type' => 'multi', |
| 332 | 332 | ); |
| 333 | 333 | } |
| 334 | 334 | |
| 335 | - foreach( $custom_fields as $custom_field_key => $custom_field ) { |
|
| 336 | - $output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field['type'], self::get_field_label( array('field' => $custom_field_key ) ), $custom_field['text'] ); |
|
| 335 | + foreach ( $custom_fields as $custom_field_key => $custom_field ) { |
|
| 336 | + $output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field[ 'type' ], self::get_field_label( array( 'field' => $custom_field_key ) ), $custom_field[ 'text' ] ); |
|
| 337 | 337 | } |
| 338 | 338 | |
| 339 | 339 | // Get fields with sub-inputs and no parent |
@@ -355,13 +355,13 @@ discard block |
||
| 355 | 355 | |
| 356 | 356 | foreach ( $fields as $id => $field ) { |
| 357 | 357 | |
| 358 | - if ( in_array( $field['type'], $blacklist_field_types ) ) { |
|
| 358 | + if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) { |
|
| 359 | 359 | continue; |
| 360 | 360 | } |
| 361 | 361 | |
| 362 | - $types = self::get_search_input_types( $id, $field['type'] ); |
|
| 362 | + $types = self::get_search_input_types( $id, $field[ 'type' ] ); |
|
| 363 | 363 | |
| 364 | - $output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'data-inputtypes="'. esc_attr( $types ) .'">'. esc_html( $field['label'] ) .'</option>'; |
|
| 364 | + $output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . 'data-inputtypes="' . esc_attr( $types ) . '">' . esc_html( $field[ 'label' ] ) . '</option>'; |
|
| 365 | 365 | } |
| 366 | 366 | } |
| 367 | 367 | |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | public static function get_search_input_types( $field_id = '', $field_type = null ) { |
| 385 | 385 | |
| 386 | 386 | // @todo - This needs to be improved - many fields have . including products and addresses |
| 387 | - if ( false !== strpos( (string) $field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) { |
|
| 387 | + if ( false !== strpos( (string)$field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) { |
|
| 388 | 388 | $input_type = 'boolean'; // on/off checkbox |
| 389 | 389 | } elseif ( in_array( $field_type, array( 'checkbox', 'post_category', 'multiselect' ) ) ) { |
| 390 | 390 | $input_type = 'multi'; //multiselect |
@@ -430,19 +430,19 @@ discard block |
||
| 430 | 430 | $post_id = 0; |
| 431 | 431 | |
| 432 | 432 | // We're in the WordPress Widget context, and an overriding post ID has been set. |
| 433 | - if ( ! empty( $widget_args['post_id'] ) ) { |
|
| 434 | - $post_id = absint( $widget_args['post_id'] ); |
|
| 433 | + if ( ! empty( $widget_args[ 'post_id' ] ) ) { |
|
| 434 | + $post_id = absint( $widget_args[ 'post_id' ] ); |
|
| 435 | 435 | } |
| 436 | 436 | // We're in the WordPress Widget context, and the base View ID should be used |
| 437 | - else if ( ! empty( $widget_args['view_id'] ) ) { |
|
| 438 | - $post_id = absint( $widget_args['view_id'] ); |
|
| 437 | + else if ( ! empty( $widget_args[ 'view_id' ] ) ) { |
|
| 438 | + $post_id = absint( $widget_args[ 'view_id' ] ); |
|
| 439 | 439 | } |
| 440 | 440 | |
| 441 | 441 | $args = gravityview_get_permalink_query_args( $post_id ); |
| 442 | 442 | |
| 443 | 443 | // Add hidden fields to the search form |
| 444 | 444 | foreach ( $args as $key => $value ) { |
| 445 | - $search_fields[] = array( |
|
| 445 | + $search_fields[ ] = array( |
|
| 446 | 446 | 'name' => $key, |
| 447 | 447 | 'input' => 'hidden', |
| 448 | 448 | 'value' => $value, |
@@ -481,28 +481,28 @@ discard block |
||
| 481 | 481 | /** |
| 482 | 482 | * Include the sidebar Widgets. |
| 483 | 483 | */ |
| 484 | - $widgets = (array) get_option( 'widget_gravityview_search', array() ); |
|
| 484 | + $widgets = (array)get_option( 'widget_gravityview_search', array() ); |
|
| 485 | 485 | |
| 486 | 486 | foreach ( $widgets as $widget ) { |
| 487 | - if ( ! empty( $widget['view_id'] ) && $widget['view_id'] == $view->ID ) { |
|
| 488 | - if( $_fields = json_decode( $widget['search_fields'], true ) ) { |
|
| 487 | + if ( ! empty( $widget[ 'view_id' ] ) && $widget[ 'view_id' ] == $view->ID ) { |
|
| 488 | + if ( $_fields = json_decode( $widget[ 'search_fields' ], true ) ) { |
|
| 489 | 489 | foreach ( $_fields as $field ) { |
| 490 | - if ( empty( $field['form_id'] ) ) { |
|
| 491 | - $field['form_id'] = $view->form ? $view->form->ID : 0; |
|
| 490 | + if ( empty( $field[ 'form_id' ] ) ) { |
|
| 491 | + $field[ 'form_id' ] = $view->form ? $view->form->ID : 0; |
|
| 492 | 492 | } |
| 493 | - $searchable_fields[] = $with_full_field ? $field : $field['field']; |
|
| 493 | + $searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ]; |
|
| 494 | 494 | } |
| 495 | 495 | } |
| 496 | 496 | } |
| 497 | 497 | } |
| 498 | 498 | |
| 499 | 499 | foreach ( $view->widgets->by_id( $this->get_widget_id() )->all() as $widget ) { |
| 500 | - if( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) { |
|
| 500 | + if ( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) { |
|
| 501 | 501 | foreach ( $_fields as $field ) { |
| 502 | - if ( empty( $field['form_id'] ) ) { |
|
| 503 | - $field['form_id'] = $view->form ? $view->form->ID : 0; |
|
| 502 | + if ( empty( $field[ 'form_id' ] ) ) { |
|
| 503 | + $field[ 'form_id' ] = $view->form ? $view->form->ID : 0; |
|
| 504 | 504 | } |
| 505 | - $searchable_fields[] = $with_full_field ? $field : $field['field']; |
|
| 505 | + $searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ]; |
|
| 506 | 506 | } |
| 507 | 507 | } |
| 508 | 508 | } |
@@ -540,7 +540,7 @@ discard block |
||
| 540 | 540 | return $search_criteria; // Return the original criteria, GF_Query modification kicks in later |
| 541 | 541 | } |
| 542 | 542 | |
| 543 | - if( 'post' === $this->search_method ) { |
|
| 543 | + if ( 'post' === $this->search_method ) { |
|
| 544 | 544 | $get = $_POST; |
| 545 | 545 | } else { |
| 546 | 546 | $get = $_GET; |
@@ -559,7 +559,7 @@ discard block |
||
| 559 | 559 | $get = gv_map_deep( $get, 'rawurldecode' ); |
| 560 | 560 | |
| 561 | 561 | // Make sure array key is set up |
| 562 | - $search_criteria['field_filters'] = \GV\Utils::get( $search_criteria, 'field_filters', array() ); |
|
| 562 | + $search_criteria[ 'field_filters' ] = \GV\Utils::get( $search_criteria, 'field_filters', array() ); |
|
| 563 | 563 | |
| 564 | 564 | $searchable_fields = $this->get_view_searchable_fields( $view ); |
| 565 | 565 | $searchable_field_objects = $this->get_view_searchable_fields( $view, true ); |
@@ -579,9 +579,9 @@ discard block |
||
| 579 | 579 | $trim_search_value = apply_filters( 'gravityview/search-trim-input', true ); |
| 580 | 580 | |
| 581 | 581 | // add free search |
| 582 | - if ( isset( $get['gv_search'] ) && '' !== $get['gv_search'] && in_array( 'search_all', $searchable_fields ) ) { |
|
| 582 | + if ( isset( $get[ 'gv_search' ] ) && '' !== $get[ 'gv_search' ] && in_array( 'search_all', $searchable_fields ) ) { |
|
| 583 | 583 | |
| 584 | - $search_all_value = $trim_search_value ? trim( $get['gv_search'] ) : $get['gv_search']; |
|
| 584 | + $search_all_value = $trim_search_value ? trim( $get[ 'gv_search' ] ) : $get[ 'gv_search' ]; |
|
| 585 | 585 | |
| 586 | 586 | if ( $split_words ) { |
| 587 | 587 | // Search for a piece |
@@ -597,7 +597,7 @@ discard block |
||
| 597 | 597 | } |
| 598 | 598 | |
| 599 | 599 | foreach ( $words as $word ) { |
| 600 | - $search_criteria['field_filters'][] = array( |
|
| 600 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
| 601 | 601 | 'key' => null, // The field ID to search |
| 602 | 602 | 'value' => $word, // The value to search |
| 603 | 603 | 'operator' => 'contains', // What to search in. Options: `is` or `contains` |
@@ -610,14 +610,14 @@ discard block |
||
| 610 | 610 | /** |
| 611 | 611 | * Get and normalize the dates according to the input format. |
| 612 | 612 | */ |
| 613 | - if ( $curr_start = ! empty( $get['gv_start'] ) ? $get['gv_start'] : '' ) { |
|
| 614 | - if( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) { |
|
| 613 | + if ( $curr_start = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_start' ] : '' ) { |
|
| 614 | + if ( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) { |
|
| 615 | 615 | $curr_start = $curr_start_date->format( 'Y-m-d' ); |
| 616 | 616 | } |
| 617 | 617 | } |
| 618 | 618 | |
| 619 | - if ( $curr_end = ! empty( $get['gv_start'] ) ? ( ! empty( $get['gv_end'] ) ? $get['gv_end'] : '' ) : '' ) { |
|
| 620 | - if( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) { |
|
| 619 | + if ( $curr_end = ! empty( $get[ 'gv_start' ] ) ? ( ! empty( $get[ 'gv_end' ] ) ? $get[ 'gv_end' ] : '' ) : '' ) { |
|
| 620 | + if ( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) { |
|
| 621 | 621 | $curr_end = $curr_end_date->format( 'Y-m-d' ); |
| 622 | 622 | } |
| 623 | 623 | } |
@@ -652,22 +652,22 @@ discard block |
||
| 652 | 652 | */ |
| 653 | 653 | if ( ! empty( $curr_start ) ) { |
| 654 | 654 | $curr_start = date( 'Y-m-d H:i:s', strtotime( $curr_start ) ); |
| 655 | - $search_criteria['start_date'] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start; |
|
| 655 | + $search_criteria[ 'start_date' ] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start; |
|
| 656 | 656 | } |
| 657 | 657 | |
| 658 | 658 | if ( ! empty( $curr_end ) ) { |
| 659 | 659 | // Fast-forward 24 hour on the end time |
| 660 | 660 | $curr_end = date( 'Y-m-d H:i:s', strtotime( $curr_end ) + DAY_IN_SECONDS ); |
| 661 | - $search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end; |
|
| 662 | - if ( strpos( $search_criteria['end_date'], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056 |
|
| 663 | - $search_criteria['end_date'] = date( 'Y-m-d H:i:s', strtotime( $search_criteria['end_date'] ) - 1 ); |
|
| 661 | + $search_criteria[ 'end_date' ] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end; |
|
| 662 | + if ( strpos( $search_criteria[ 'end_date' ], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056 |
|
| 663 | + $search_criteria[ 'end_date' ] = date( 'Y-m-d H:i:s', strtotime( $search_criteria[ 'end_date' ] ) - 1 ); |
|
| 664 | 664 | } |
| 665 | 665 | } |
| 666 | 666 | } |
| 667 | 667 | |
| 668 | 668 | // search for a specific entry ID |
| 669 | 669 | if ( ! empty( $get[ 'gv_id' ] ) && in_array( 'entry_id', $searchable_fields ) ) { |
| 670 | - $search_criteria['field_filters'][] = array( |
|
| 670 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
| 671 | 671 | 'key' => 'id', |
| 672 | 672 | 'value' => absint( $get[ 'gv_id' ] ), |
| 673 | 673 | 'operator' => $this->get_operator( $get, 'gv_id', array( '=' ), '=' ), |
@@ -676,15 +676,15 @@ discard block |
||
| 676 | 676 | |
| 677 | 677 | // search for a specific Created_by ID |
| 678 | 678 | if ( ! empty( $get[ 'gv_by' ] ) && in_array( 'created_by', $searchable_fields ) ) { |
| 679 | - $search_criteria['field_filters'][] = array( |
|
| 679 | + $search_criteria[ 'field_filters' ][ ] = array( |
|
| 680 | 680 | 'key' => 'created_by', |
| 681 | - 'value' => $get['gv_by'], |
|
| 681 | + 'value' => $get[ 'gv_by' ], |
|
| 682 | 682 | 'operator' => $this->get_operator( $get, 'gv_by', array( '=' ), '=' ), |
| 683 | 683 | ); |
| 684 | 684 | } |
| 685 | 685 | |
| 686 | 686 | // Get search mode passed in URL |
| 687 | - $mode = isset( $get['mode'] ) && in_array( $get['mode'], array( 'any', 'all' ) ) ? $get['mode'] : 'any'; |
|
| 687 | + $mode = isset( $get[ 'mode' ] ) && in_array( $get[ 'mode' ], array( 'any', 'all' ) ) ? $get[ 'mode' ] : 'any'; |
|
| 688 | 688 | |
| 689 | 689 | // get the other search filters |
| 690 | 690 | foreach ( $get as $key => $value ) { |
@@ -693,7 +693,7 @@ discard block |
||
| 693 | 693 | $value = is_array( $value ) ? array_map( 'trim', $value ) : trim( $value ); |
| 694 | 694 | } |
| 695 | 695 | |
| 696 | - if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[0], false, false ) ) ) { |
|
| 696 | + if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[ 0 ], false, false ) ) ) { |
|
| 697 | 697 | continue; // Not a filter, or empty |
| 698 | 698 | } |
| 699 | 699 | |
@@ -707,21 +707,21 @@ discard block |
||
| 707 | 707 | continue; |
| 708 | 708 | } |
| 709 | 709 | |
| 710 | - if ( ! isset( $filter['operator'] ) ) { |
|
| 711 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' ); |
|
| 710 | + if ( ! isset( $filter[ 'operator' ] ) ) { |
|
| 711 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' ); |
|
| 712 | 712 | } |
| 713 | 713 | |
| 714 | - if ( isset( $filter[0]['value'] ) ) { |
|
| 715 | - $filter[0]['value'] = $trim_search_value ? trim( $filter[0]['value'] ) : $filter[0]['value']; |
|
| 714 | + if ( isset( $filter[ 0 ][ 'value' ] ) ) { |
|
| 715 | + $filter[ 0 ][ 'value' ] = $trim_search_value ? trim( $filter[ 0 ][ 'value' ] ) : $filter[ 0 ][ 'value' ]; |
|
| 716 | 716 | |
| 717 | - $search_criteria['field_filters'] = array_merge( $search_criteria['field_filters'], $filter ); |
|
| 717 | + $search_criteria[ 'field_filters' ] = array_merge( $search_criteria[ 'field_filters' ], $filter ); |
|
| 718 | 718 | |
| 719 | 719 | // if date range type, set search mode to ALL |
| 720 | - if ( ! empty( $filter[0]['operator'] ) && in_array( $filter[0]['operator'], array( '>=', '<=', '>', '<' ) ) ) { |
|
| 720 | + if ( ! empty( $filter[ 0 ][ 'operator' ] ) && in_array( $filter[ 0 ][ 'operator' ], array( '>=', '<=', '>', '<' ) ) ) { |
|
| 721 | 721 | $mode = 'all'; |
| 722 | 722 | } |
| 723 | - } elseif( !empty( $filter ) ) { |
|
| 724 | - $search_criteria['field_filters'][] = $filter; |
|
| 723 | + } elseif ( ! empty( $filter ) ) { |
|
| 724 | + $search_criteria[ 'field_filters' ][ ] = $filter; |
|
| 725 | 725 | } |
| 726 | 726 | } |
| 727 | 727 | |
@@ -730,7 +730,7 @@ discard block |
||
| 730 | 730 | * @since 1.5.1 |
| 731 | 731 | * @param[out,in] string $mode Search mode (`any` vs `all`) |
| 732 | 732 | */ |
| 733 | - $search_criteria['field_filters']['mode'] = apply_filters( 'gravityview/search/mode', $mode ); |
|
| 733 | + $search_criteria[ 'field_filters' ][ 'mode' ] = apply_filters( 'gravityview/search/mode', $mode ); |
|
| 734 | 734 | |
| 735 | 735 | gravityview()->log->debug( 'Returned Search Criteria: ', array( 'data' => $search_criteria ) ); |
| 736 | 736 | |
@@ -764,19 +764,19 @@ discard block |
||
| 764 | 764 | |
| 765 | 765 | $query_class = $view->get_query_class(); |
| 766 | 766 | |
| 767 | - if ( empty( $search_criteria['field_filters'] ) ) { |
|
| 767 | + if ( empty( $search_criteria[ 'field_filters' ] ) ) { |
|
| 768 | 768 | return; |
| 769 | 769 | } |
| 770 | 770 | |
| 771 | 771 | $widgets = $view->widgets->by_id( $this->widget_id ); |
| 772 | 772 | if ( $widgets->count() ) { |
| 773 | 773 | $widgets = $widgets->all(); |
| 774 | - $widget = $widgets[0]; |
|
| 774 | + $widget = $widgets[ 0 ]; |
|
| 775 | 775 | |
| 776 | 776 | $search_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ); |
| 777 | 777 | |
| 778 | - foreach ( (array) $search_fields as $search_field ) { |
|
| 779 | - if ( 'created_by' === $search_field['field'] && 'input_text' === $search_field['input'] ) { |
|
| 778 | + foreach ( (array)$search_fields as $search_field ) { |
|
| 779 | + if ( 'created_by' === $search_field[ 'field' ] && 'input_text' === $search_field[ 'input' ] ) { |
|
| 780 | 780 | $created_by_text_mode = true; |
| 781 | 781 | } |
| 782 | 782 | } |
@@ -785,7 +785,7 @@ discard block |
||
| 785 | 785 | $extra_conditions = array(); |
| 786 | 786 | $mode = 'any'; |
| 787 | 787 | |
| 788 | - foreach ( $search_criteria['field_filters'] as &$filter ) { |
|
| 788 | + foreach ( $search_criteria[ 'field_filters' ] as &$filter ) { |
|
| 789 | 789 | if ( ! is_array( $filter ) ) { |
| 790 | 790 | if ( in_array( strtolower( $filter ), array( 'any', 'all' ) ) ) { |
| 791 | 791 | $mode = $filter; |
@@ -794,13 +794,13 @@ discard block |
||
| 794 | 794 | } |
| 795 | 795 | |
| 796 | 796 | // Construct a manual query for unapproved statuses |
| 797 | - if ( 'is_approved' === $filter['key'] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array) $filter['value'] ) ) { |
|
| 798 | - $_tmp_query = new $query_class( $view->form->ID, array( |
|
| 797 | + if ( 'is_approved' === $filter[ 'key' ] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array)$filter[ 'value' ] ) ) { |
|
| 798 | + $_tmp_query = new $query_class( $view->form->ID, array( |
|
| 799 | 799 | 'field_filters' => array( |
| 800 | 800 | array( |
| 801 | 801 | 'operator' => 'in', |
| 802 | 802 | 'key' => 'is_approved', |
| 803 | - 'value' => (array) $filter['value'], |
|
| 803 | + 'value' => (array)$filter[ 'value' ], |
|
| 804 | 804 | ), |
| 805 | 805 | array( |
| 806 | 806 | 'operator' => 'is', |
@@ -812,30 +812,30 @@ discard block |
||
| 812 | 812 | ) ); |
| 813 | 813 | $_tmp_query_parts = $_tmp_query->_introspect(); |
| 814 | 814 | |
| 815 | - $extra_conditions[] = $_tmp_query_parts['where']; |
|
| 815 | + $extra_conditions[ ] = $_tmp_query_parts[ 'where' ]; |
|
| 816 | 816 | |
| 817 | 817 | $filter = false; |
| 818 | 818 | continue; |
| 819 | 819 | } |
| 820 | 820 | |
| 821 | 821 | // Construct manual query for text mode creator search |
| 822 | - if ( 'created_by' === $filter['key'] && ! empty( $created_by_text_mode ) ) { |
|
| 823 | - $extra_conditions[] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view ); |
|
| 822 | + if ( 'created_by' === $filter[ 'key' ] && ! empty( $created_by_text_mode ) ) { |
|
| 823 | + $extra_conditions[ ] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view ); |
|
| 824 | 824 | $filter = false; |
| 825 | 825 | continue; |
| 826 | 826 | } |
| 827 | 827 | |
| 828 | 828 | // By default, we want searches to be wildcard for each field. |
| 829 | - $filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator']; |
|
| 829 | + $filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ]; |
|
| 830 | 830 | |
| 831 | 831 | // For multichoice, let's have an in (OR) search. |
| 832 | - if ( is_array( $filter['value'] ) ) { |
|
| 833 | - $filter['operator'] = 'in'; // @todo what about in contains (OR LIKE chains)? |
|
| 832 | + if ( is_array( $filter[ 'value' ] ) ) { |
|
| 833 | + $filter[ 'operator' ] = 'in'; // @todo what about in contains (OR LIKE chains)? |
|
| 834 | 834 | } |
| 835 | 835 | |
| 836 | 836 | // Default form with joins functionality |
| 837 | - if ( empty( $filter['form_id'] ) ) { |
|
| 838 | - $filter['form_id'] = $view->form ? $view->form->ID : 0; |
|
| 837 | + if ( empty( $filter[ 'form_id' ] ) ) { |
|
| 838 | + $filter[ 'form_id' ] = $view->form ? $view->form->ID : 0; |
|
| 839 | 839 | } |
| 840 | 840 | |
| 841 | 841 | /** |
@@ -845,28 +845,28 @@ discard block |
||
| 845 | 845 | * @since develop |
| 846 | 846 | * @param \GV\View $view The View we're operating on. |
| 847 | 847 | */ |
| 848 | - $filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter, $view ); |
|
| 848 | + $filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter, $view ); |
|
| 849 | 849 | } |
| 850 | 850 | |
| 851 | - if ( ! empty( $search_criteria['start_date'] ) || ! empty( $search_criteria['end_date'] ) ) { |
|
| 851 | + if ( ! empty( $search_criteria[ 'start_date' ] ) || ! empty( $search_criteria[ 'end_date' ] ) ) { |
|
| 852 | 852 | $date_criteria = array(); |
| 853 | 853 | |
| 854 | - if ( isset( $search_criteria['start_date'] ) ) { |
|
| 855 | - $date_criteria['start_date'] = $search_criteria['start_date']; |
|
| 854 | + if ( isset( $search_criteria[ 'start_date' ] ) ) { |
|
| 855 | + $date_criteria[ 'start_date' ] = $search_criteria[ 'start_date' ]; |
|
| 856 | 856 | } |
| 857 | 857 | |
| 858 | - if ( isset( $search_criteria['end_date'] ) ) { |
|
| 859 | - $date_criteria['end_date'] = $search_criteria['end_date']; |
|
| 858 | + if ( isset( $search_criteria[ 'end_date' ] ) ) { |
|
| 859 | + $date_criteria[ 'end_date' ] = $search_criteria[ 'end_date' ]; |
|
| 860 | 860 | } |
| 861 | 861 | |
| 862 | 862 | $_tmp_query = new $query_class( $view->form->ID, $date_criteria ); |
| 863 | 863 | $_tmp_query_parts = $_tmp_query->_introspect(); |
| 864 | - $extra_conditions[] = $_tmp_query_parts['where']; |
|
| 864 | + $extra_conditions[ ] = $_tmp_query_parts[ 'where' ]; |
|
| 865 | 865 | } |
| 866 | 866 | |
| 867 | 867 | $search_conditions = array(); |
| 868 | 868 | |
| 869 | - if ( $filters = array_filter( $search_criteria['field_filters'] ) ) { |
|
| 869 | + if ( $filters = array_filter( $search_criteria[ 'field_filters' ] ) ) { |
|
| 870 | 870 | foreach ( $filters as &$filter ) { |
| 871 | 871 | if ( ! is_array( $filter ) ) { |
| 872 | 872 | continue; |
@@ -878,12 +878,12 @@ discard block |
||
| 878 | 878 | * code by reusing what's inside GF_Query already as they |
| 879 | 879 | * take care of many small things like forcing numeric, etc. |
| 880 | 880 | */ |
| 881 | - $_tmp_query = new $query_class( $filter['form_id'], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) ); |
|
| 881 | + $_tmp_query = new $query_class( $filter[ 'form_id' ], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) ); |
|
| 882 | 882 | $_tmp_query_parts = $_tmp_query->_introspect(); |
| 883 | - $search_condition = $_tmp_query_parts['where']; |
|
| 883 | + $search_condition = $_tmp_query_parts[ 'where' ]; |
|
| 884 | 884 | |
| 885 | - if ( empty( $filter['key'] ) && $search_condition->expressions ) { |
|
| 886 | - $search_conditions[] = $search_condition; |
|
| 885 | + if ( empty( $filter[ 'key' ] ) && $search_condition->expressions ) { |
|
| 886 | + $search_conditions[ ] = $search_condition; |
|
| 887 | 887 | } else { |
| 888 | 888 | $left = $search_condition->left; |
| 889 | 889 | $alias = $query->_alias( $left->field_id, $left->source, $left->is_entry_column() ? 't' : 'm' ); |
@@ -893,7 +893,7 @@ discard block |
||
| 893 | 893 | $on = $_join->join_on; |
| 894 | 894 | $join = $_join->join; |
| 895 | 895 | |
| 896 | - $search_conditions[] = GF_Query_Condition::_or( |
|
| 896 | + $search_conditions[ ] = GF_Query_Condition::_or( |
|
| 897 | 897 | // Join |
| 898 | 898 | new GF_Query_Condition( |
| 899 | 899 | new GF_Query_Column( GF_Query_Column::META, $join->ID, $query->_alias( GF_Query_Column::META, $join->ID, 'm' ) ), |
@@ -909,7 +909,7 @@ discard block |
||
| 909 | 909 | ); |
| 910 | 910 | } |
| 911 | 911 | } else { |
| 912 | - $search_conditions[] = new GF_Query_Condition( |
|
| 912 | + $search_conditions[ ] = new GF_Query_Condition( |
|
| 913 | 913 | new GF_Query_Column( $left->field_id, $left->source, $alias ), |
| 914 | 914 | $search_condition->operator, |
| 915 | 915 | $search_condition->right |
@@ -931,7 +931,7 @@ discard block |
||
| 931 | 931 | /** |
| 932 | 932 | * Combine the parts as a new WHERE clause. |
| 933 | 933 | */ |
| 934 | - $where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts['where'] ), $search_conditions, $extra_conditions ) ); |
|
| 934 | + $where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts[ 'where' ] ), $search_conditions, $extra_conditions ) ); |
|
| 935 | 935 | $query->where( $where ); |
| 936 | 936 | } |
| 937 | 937 | |
@@ -954,7 +954,7 @@ discard block |
||
| 954 | 954 | $field_id = str_replace( 'filter_', '', $key ); |
| 955 | 955 | |
| 956 | 956 | // calculates field_id, removing 'filter_' and for '_' for advanced fields ( like name or checkbox ) |
| 957 | - if ( preg_match('/^[0-9_]+$/ism', $field_id ) ) { |
|
| 957 | + if ( preg_match( '/^[0-9_]+$/ism', $field_id ) ) { |
|
| 958 | 958 | $field_id = str_replace( '_', '.', $field_id ); |
| 959 | 959 | } |
| 960 | 960 | |
@@ -1011,7 +1011,7 @@ discard block |
||
| 1011 | 1011 | // form is in searchable fields |
| 1012 | 1012 | $found = false; |
| 1013 | 1013 | foreach ( $searchable_fields as $field ) { |
| 1014 | - if ( $field_id == $field['field'] && $form->ID == $field['form_id'] ) { |
|
| 1014 | + if ( $field_id == $field[ 'field' ] && $form->ID == $field[ 'form_id' ] ) { |
|
| 1015 | 1015 | $found = true; |
| 1016 | 1016 | break; |
| 1017 | 1017 | } |
@@ -1051,7 +1051,7 @@ discard block |
||
| 1051 | 1051 | |
| 1052 | 1052 | case 'select': |
| 1053 | 1053 | case 'radio': |
| 1054 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1054 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1055 | 1055 | break; |
| 1056 | 1056 | |
| 1057 | 1057 | case 'post_category': |
@@ -1065,7 +1065,7 @@ discard block |
||
| 1065 | 1065 | |
| 1066 | 1066 | foreach ( $value as $val ) { |
| 1067 | 1067 | $cat = get_term( $val, 'category' ); |
| 1068 | - $filter[] = array( |
|
| 1068 | + $filter[ ] = array( |
|
| 1069 | 1069 | 'key' => $field_id, |
| 1070 | 1070 | 'value' => esc_attr( $cat->name ) . ':' . $val, |
| 1071 | 1071 | 'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ), |
@@ -1084,7 +1084,7 @@ discard block |
||
| 1084 | 1084 | $filter = array(); |
| 1085 | 1085 | |
| 1086 | 1086 | foreach ( $value as $val ) { |
| 1087 | - $filter[] = array( 'key' => $field_id, 'value' => $val ); |
|
| 1087 | + $filter[ ] = array( 'key' => $field_id, 'value' => $val ); |
|
| 1088 | 1088 | } |
| 1089 | 1089 | |
| 1090 | 1090 | break; |
@@ -1093,9 +1093,9 @@ discard block |
||
| 1093 | 1093 | // convert checkbox on/off into the correct search filter |
| 1094 | 1094 | if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field->inputs ) && ! empty( $form_field->choices ) ) { |
| 1095 | 1095 | foreach ( $form_field->inputs as $k => $input ) { |
| 1096 | - if ( $input['id'] == $field_id ) { |
|
| 1097 | - $filter['value'] = $form_field->choices[ $k ]['value']; |
|
| 1098 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1096 | + if ( $input[ 'id' ] == $field_id ) { |
|
| 1097 | + $filter[ 'value' ] = $form_field->choices[ $k ][ 'value' ]; |
|
| 1098 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1099 | 1099 | break; |
| 1100 | 1100 | } |
| 1101 | 1101 | } |
@@ -1105,7 +1105,7 @@ discard block |
||
| 1105 | 1105 | $filter = array(); |
| 1106 | 1106 | |
| 1107 | 1107 | foreach ( $value as $val ) { |
| 1108 | - $filter[] = array( |
|
| 1108 | + $filter[ ] = array( |
|
| 1109 | 1109 | 'key' => $field_id, |
| 1110 | 1110 | 'value' => $val, |
| 1111 | 1111 | 'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ), |
@@ -1126,9 +1126,9 @@ discard block |
||
| 1126 | 1126 | foreach ( $words as $word ) { |
| 1127 | 1127 | if ( ! empty( $word ) && strlen( $word ) > 1 ) { |
| 1128 | 1128 | // Keep the same key for each filter |
| 1129 | - $filter['value'] = $word; |
|
| 1129 | + $filter[ 'value' ] = $word; |
|
| 1130 | 1130 | // Add a search for the value |
| 1131 | - $filters[] = $filter; |
|
| 1131 | + $filters[ ] = $filter; |
|
| 1132 | 1132 | } |
| 1133 | 1133 | } |
| 1134 | 1134 | |
@@ -1142,19 +1142,19 @@ discard block |
||
| 1142 | 1142 | |
| 1143 | 1143 | foreach ( $searchable_fields as $searchable_field ) { |
| 1144 | 1144 | |
| 1145 | - if( $form_field->ID !== $searchable_field['field'] ) { |
|
| 1145 | + if ( $form_field->ID !== $searchable_field[ 'field' ] ) { |
|
| 1146 | 1146 | continue; |
| 1147 | 1147 | } |
| 1148 | 1148 | |
| 1149 | 1149 | // Only exact-match dropdowns, not text search |
| 1150 | - if( in_array( $searchable_field['input'], array( 'text', 'search' ), true ) ) { |
|
| 1150 | + if ( in_array( $searchable_field[ 'input' ], array( 'text', 'search' ), true ) ) { |
|
| 1151 | 1151 | continue; |
| 1152 | 1152 | } |
| 1153 | 1153 | |
| 1154 | 1154 | $input_id = gravityview_get_input_id_from_id( $form_field->ID ); |
| 1155 | 1155 | |
| 1156 | 1156 | if ( 4 === $input_id ) { |
| 1157 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1157 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1158 | 1158 | }; |
| 1159 | 1159 | } |
| 1160 | 1160 | } |
@@ -1182,12 +1182,12 @@ discard block |
||
| 1182 | 1182 | * @since 1.16.3 |
| 1183 | 1183 | * Safeguard until GF implements '<=' operator |
| 1184 | 1184 | */ |
| 1185 | - if( !GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) { |
|
| 1185 | + if ( ! GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) { |
|
| 1186 | 1186 | $operator = '<'; |
| 1187 | 1187 | $date = date( 'Y-m-d', strtotime( self::get_formatted_date( $date, 'Y-m-d', $date_format ) . ' +1 day' ) ); |
| 1188 | 1188 | } |
| 1189 | 1189 | |
| 1190 | - $filter[] = array( |
|
| 1190 | + $filter[ ] = array( |
|
| 1191 | 1191 | 'key' => $field_id, |
| 1192 | 1192 | 'value' => self::get_formatted_date( $date, 'Y-m-d', $date_format ), |
| 1193 | 1193 | 'operator' => $this->get_operator( $get, $key, array( $operator ), $operator ), |
@@ -1195,12 +1195,12 @@ discard block |
||
| 1195 | 1195 | } |
| 1196 | 1196 | } else { |
| 1197 | 1197 | $date = $value; |
| 1198 | - $filter['value'] = self::get_formatted_date( $date, 'Y-m-d', $date_format ); |
|
| 1199 | - $filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1198 | + $filter[ 'value' ] = self::get_formatted_date( $date, 'Y-m-d', $date_format ); |
|
| 1199 | + $filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' ); |
|
| 1200 | 1200 | } |
| 1201 | 1201 | |
| 1202 | - if ('payment_date' === $key) { |
|
| 1203 | - $filter['operator'] = 'contains'; |
|
| 1202 | + if ( 'payment_date' === $key ) { |
|
| 1203 | + $filter[ 'operator' ] = 'contains'; |
|
| 1204 | 1204 | } |
| 1205 | 1205 | |
| 1206 | 1206 | break; |
@@ -1229,7 +1229,7 @@ discard block |
||
| 1229 | 1229 | 'ymd_dot' => 'Y.m.d', |
| 1230 | 1230 | ); |
| 1231 | 1231 | |
| 1232 | - if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ){ |
|
| 1232 | + if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ) { |
|
| 1233 | 1233 | $format = $datepicker[ $field->dateFormat ]; |
| 1234 | 1234 | } |
| 1235 | 1235 | |
@@ -1266,7 +1266,7 @@ discard block |
||
| 1266 | 1266 | public function add_template_path( $file_paths ) { |
| 1267 | 1267 | |
| 1268 | 1268 | // Index 100 is the default GravityView template path. |
| 1269 | - $file_paths[102] = self::$file . 'templates/'; |
|
| 1269 | + $file_paths[ 102 ] = self::$file . 'templates/'; |
|
| 1270 | 1270 | |
| 1271 | 1271 | return $file_paths; |
| 1272 | 1272 | } |
@@ -1285,7 +1285,7 @@ discard block |
||
| 1285 | 1285 | $has_date = false; |
| 1286 | 1286 | |
| 1287 | 1287 | foreach ( $search_fields as $k => $field ) { |
| 1288 | - if ( in_array( $field['input'], array( 'date', 'date_range', 'entry_date' ) ) ) { |
|
| 1288 | + if ( in_array( $field[ 'input' ], array( 'date', 'date_range', 'entry_date' ) ) ) { |
|
| 1289 | 1289 | $has_date = true; |
| 1290 | 1290 | break; |
| 1291 | 1291 | } |
@@ -1314,7 +1314,7 @@ discard block |
||
| 1314 | 1314 | $view = \GV\View::by_id( $gravityview_view->view_id ); |
| 1315 | 1315 | |
| 1316 | 1316 | // get configured search fields |
| 1317 | - $search_fields = ! empty( $widget_args['search_fields'] ) ? json_decode( $widget_args['search_fields'], true ) : ''; |
|
| 1317 | + $search_fields = ! empty( $widget_args[ 'search_fields' ] ) ? json_decode( $widget_args[ 'search_fields' ], true ) : ''; |
|
| 1318 | 1318 | |
| 1319 | 1319 | if ( empty( $search_fields ) || ! is_array( $search_fields ) ) { |
| 1320 | 1320 | gravityview()->log->debug( 'No search fields configured for widget:', array( 'data' => $widget_args ) ); |
@@ -1328,40 +1328,40 @@ discard block |
||
| 1328 | 1328 | |
| 1329 | 1329 | $updated_field = $this->get_search_filter_details( $updated_field, $context ); |
| 1330 | 1330 | |
| 1331 | - switch ( $field['field'] ) { |
|
| 1331 | + switch ( $field[ 'field' ] ) { |
|
| 1332 | 1332 | |
| 1333 | 1333 | case 'search_all': |
| 1334 | - $updated_field['key'] = 'search_all'; |
|
| 1335 | - $updated_field['input'] = 'search_all'; |
|
| 1336 | - $updated_field['value'] = $this->rgget_or_rgpost( 'gv_search' ); |
|
| 1334 | + $updated_field[ 'key' ] = 'search_all'; |
|
| 1335 | + $updated_field[ 'input' ] = 'search_all'; |
|
| 1336 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_search' ); |
|
| 1337 | 1337 | break; |
| 1338 | 1338 | |
| 1339 | 1339 | case 'entry_date': |
| 1340 | - $updated_field['key'] = 'entry_date'; |
|
| 1341 | - $updated_field['input'] = 'entry_date'; |
|
| 1342 | - $updated_field['value'] = array( |
|
| 1340 | + $updated_field[ 'key' ] = 'entry_date'; |
|
| 1341 | + $updated_field[ 'input' ] = 'entry_date'; |
|
| 1342 | + $updated_field[ 'value' ] = array( |
|
| 1343 | 1343 | 'start' => $this->rgget_or_rgpost( 'gv_start' ), |
| 1344 | 1344 | 'end' => $this->rgget_or_rgpost( 'gv_end' ), |
| 1345 | 1345 | ); |
| 1346 | 1346 | break; |
| 1347 | 1347 | |
| 1348 | 1348 | case 'entry_id': |
| 1349 | - $updated_field['key'] = 'entry_id'; |
|
| 1350 | - $updated_field['input'] = 'entry_id'; |
|
| 1351 | - $updated_field['value'] = $this->rgget_or_rgpost( 'gv_id' ); |
|
| 1349 | + $updated_field[ 'key' ] = 'entry_id'; |
|
| 1350 | + $updated_field[ 'input' ] = 'entry_id'; |
|
| 1351 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_id' ); |
|
| 1352 | 1352 | break; |
| 1353 | 1353 | |
| 1354 | 1354 | case 'created_by': |
| 1355 | - $updated_field['key'] = 'created_by'; |
|
| 1356 | - $updated_field['name'] = 'gv_by'; |
|
| 1357 | - $updated_field['value'] = $this->rgget_or_rgpost( 'gv_by' ); |
|
| 1358 | - $updated_field['choices'] = self::get_created_by_choices( $view ); |
|
| 1355 | + $updated_field[ 'key' ] = 'created_by'; |
|
| 1356 | + $updated_field[ 'name' ] = 'gv_by'; |
|
| 1357 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_by' ); |
|
| 1358 | + $updated_field[ 'choices' ] = self::get_created_by_choices( $view ); |
|
| 1359 | 1359 | break; |
| 1360 | 1360 | |
| 1361 | 1361 | case 'is_approved': |
| 1362 | - $updated_field['key'] = 'is_approved'; |
|
| 1363 | - $updated_field['value'] = $this->rgget_or_rgpost( 'filter_is_approved' ); |
|
| 1364 | - $updated_field['choices'] = self::get_is_approved_choices(); |
|
| 1362 | + $updated_field[ 'key' ] = 'is_approved'; |
|
| 1363 | + $updated_field[ 'value' ] = $this->rgget_or_rgpost( 'filter_is_approved' ); |
|
| 1364 | + $updated_field[ 'choices' ] = self::get_is_approved_choices(); |
|
| 1365 | 1365 | break; |
| 1366 | 1366 | } |
| 1367 | 1367 | |
@@ -1382,16 +1382,16 @@ discard block |
||
| 1382 | 1382 | |
| 1383 | 1383 | $gravityview_view->permalink_fields = $this->add_no_permalink_fields( array(), $this, $widget_args ); |
| 1384 | 1384 | |
| 1385 | - $gravityview_view->search_layout = ! empty( $widget_args['search_layout'] ) ? $widget_args['search_layout'] : 'horizontal'; |
|
| 1385 | + $gravityview_view->search_layout = ! empty( $widget_args[ 'search_layout' ] ) ? $widget_args[ 'search_layout' ] : 'horizontal'; |
|
| 1386 | 1386 | |
| 1387 | 1387 | /** @since 1.14 */ |
| 1388 | - $gravityview_view->search_mode = ! empty( $widget_args['search_mode'] ) ? $widget_args['search_mode'] : 'any'; |
|
| 1388 | + $gravityview_view->search_mode = ! empty( $widget_args[ 'search_mode' ] ) ? $widget_args[ 'search_mode' ] : 'any'; |
|
| 1389 | 1389 | |
| 1390 | - $custom_class = ! empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : ''; |
|
| 1390 | + $custom_class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : ''; |
|
| 1391 | 1391 | |
| 1392 | 1392 | $gravityview_view->search_class = self::get_search_class( $custom_class ); |
| 1393 | 1393 | |
| 1394 | - $gravityview_view->search_clear = ! empty( $widget_args['search_clear'] ) ? $widget_args['search_clear'] : false; |
|
| 1394 | + $gravityview_view->search_clear = ! empty( $widget_args[ 'search_clear' ] ) ? $widget_args[ 'search_clear' ] : false; |
|
| 1395 | 1395 | |
| 1396 | 1396 | if ( $this->has_date_field( $search_fields ) ) { |
| 1397 | 1397 | // enqueue datepicker stuff only if needed! |
@@ -1413,10 +1413,10 @@ discard block |
||
| 1413 | 1413 | public static function get_search_class( $custom_class = '' ) { |
| 1414 | 1414 | $gravityview_view = GravityView_View::getInstance(); |
| 1415 | 1415 | |
| 1416 | - $search_class = 'gv-search-'.$gravityview_view->search_layout; |
|
| 1416 | + $search_class = 'gv-search-' . $gravityview_view->search_layout; |
|
| 1417 | 1417 | |
| 1418 | - if ( ! empty( $custom_class ) ) { |
|
| 1419 | - $search_class .= ' '.$custom_class; |
|
| 1418 | + if ( ! empty( $custom_class ) ) { |
|
| 1419 | + $search_class .= ' ' . $custom_class; |
|
| 1420 | 1420 | } |
| 1421 | 1421 | |
| 1422 | 1422 | /** |
@@ -1467,9 +1467,9 @@ discard block |
||
| 1467 | 1467 | |
| 1468 | 1468 | if ( ! $label ) { |
| 1469 | 1469 | |
| 1470 | - $label = isset( $form_field['label'] ) ? $form_field['label'] : ''; |
|
| 1470 | + $label = isset( $form_field[ 'label' ] ) ? $form_field[ 'label' ] : ''; |
|
| 1471 | 1471 | |
| 1472 | - switch( $field['field'] ) { |
|
| 1472 | + switch ( $field[ 'field' ] ) { |
|
| 1473 | 1473 | case 'search_all': |
| 1474 | 1474 | $label = __( 'Search Entries:', 'gravityview' ); |
| 1475 | 1475 | break; |
@@ -1481,10 +1481,10 @@ discard block |
||
| 1481 | 1481 | break; |
| 1482 | 1482 | default: |
| 1483 | 1483 | // If this is a field input, not a field |
| 1484 | - if ( strpos( $field['field'], '.' ) > 0 && ! empty( $form_field['inputs'] ) ) { |
|
| 1484 | + if ( strpos( $field[ 'field' ], '.' ) > 0 && ! empty( $form_field[ 'inputs' ] ) ) { |
|
| 1485 | 1485 | |
| 1486 | 1486 | // Get the label for the field in question, which returns an array |
| 1487 | - $items = wp_list_filter( $form_field['inputs'], array( 'id' => $field['field'] ) ); |
|
| 1487 | + $items = wp_list_filter( $form_field[ 'inputs' ], array( 'id' => $field[ 'field' ] ) ); |
|
| 1488 | 1488 | |
| 1489 | 1489 | // Get the item with the `label` key |
| 1490 | 1490 | $values = wp_list_pluck( $items, 'label' ); |
@@ -1525,13 +1525,13 @@ discard block |
||
| 1525 | 1525 | $form = $gravityview_view->getForm(); |
| 1526 | 1526 | |
| 1527 | 1527 | // for advanced field ids (eg, first name / last name ) |
| 1528 | - $name = 'filter_' . str_replace( '.', '_', $field['field'] ); |
|
| 1528 | + $name = 'filter_' . str_replace( '.', '_', $field[ 'field' ] ); |
|
| 1529 | 1529 | |
| 1530 | 1530 | // get searched value from $_GET/$_POST (string or array) |
| 1531 | 1531 | $value = $this->rgget_or_rgpost( $name ); |
| 1532 | 1532 | |
| 1533 | 1533 | // get form field details |
| 1534 | - $form_field = gravityview_get_field( $form, $field['field'] ); |
|
| 1534 | + $form_field = gravityview_get_field( $form, $field[ 'field' ] ); |
|
| 1535 | 1535 | |
| 1536 | 1536 | $form_field_type = \GV\Utils::get( $form_field, 'type' ); |
| 1537 | 1537 | |
@@ -1545,17 +1545,17 @@ discard block |
||
| 1545 | 1545 | ); |
| 1546 | 1546 | |
| 1547 | 1547 | // collect choices |
| 1548 | - if ( 'post_category' === $form_field_type && ! empty( $form_field['displayAllCategories'] ) && empty( $form_field['choices'] ) ) { |
|
| 1549 | - $filter['choices'] = gravityview_get_terms_choices(); |
|
| 1550 | - } elseif ( ! empty( $form_field['choices'] ) ) { |
|
| 1551 | - $filter['choices'] = $form_field['choices']; |
|
| 1548 | + if ( 'post_category' === $form_field_type && ! empty( $form_field[ 'displayAllCategories' ] ) && empty( $form_field[ 'choices' ] ) ) { |
|
| 1549 | + $filter[ 'choices' ] = gravityview_get_terms_choices(); |
|
| 1550 | + } elseif ( ! empty( $form_field[ 'choices' ] ) ) { |
|
| 1551 | + $filter[ 'choices' ] = $form_field[ 'choices' ]; |
|
| 1552 | 1552 | } |
| 1553 | 1553 | |
| 1554 | - if ( 'date_range' === $field['input'] && empty( $value ) ) { |
|
| 1555 | - $filter['value'] = array( 'start' => '', 'end' => '' ); |
|
| 1554 | + if ( 'date_range' === $field[ 'input' ] && empty( $value ) ) { |
|
| 1555 | + $filter[ 'value' ] = array( 'start' => '', 'end' => '' ); |
|
| 1556 | 1556 | } |
| 1557 | 1557 | |
| 1558 | - if ( ! empty( $filter['choices'] ) ) { |
|
| 1558 | + if ( ! empty( $filter[ 'choices' ] ) ) { |
|
| 1559 | 1559 | /** |
| 1560 | 1560 | * @filter `gravityview/search/sieve_choices` Only output used choices for this field. |
| 1561 | 1561 | * @param[in,out] bool Yes or no. |
@@ -1563,7 +1563,7 @@ discard block |
||
| 1563 | 1563 | * @param \GV\Context The context. |
| 1564 | 1564 | */ |
| 1565 | 1565 | if ( apply_filters( 'gravityview/search/sieve_choices', false, $field, $context ) ) { |
| 1566 | - $filter['choices'] = $this->sieve_filter_choices( $filter, $context ); |
|
| 1566 | + $filter[ 'choices' ] = $this->sieve_filter_choices( $filter, $context ); |
|
| 1567 | 1567 | } |
| 1568 | 1568 | } |
| 1569 | 1569 | |
@@ -1592,11 +1592,11 @@ discard block |
||
| 1592 | 1592 | * @return array The filter choices. |
| 1593 | 1593 | */ |
| 1594 | 1594 | private function sieve_filter_choices( $filter, $context ) { |
| 1595 | - if ( empty( $filter['key'] ) || empty( $filter['choices'] ) ) { |
|
| 1595 | + if ( empty( $filter[ 'key' ] ) || empty( $filter[ 'choices' ] ) ) { |
|
| 1596 | 1596 | return $filter; // @todo Populate plugins might give us empty choices |
| 1597 | 1597 | } |
| 1598 | 1598 | |
| 1599 | - if ( ! is_numeric( $filter['key'] ) ) { |
|
| 1599 | + if ( ! is_numeric( $filter[ 'key' ] ) ) { |
|
| 1600 | 1600 | return $filter; |
| 1601 | 1601 | } |
| 1602 | 1602 | |
@@ -1606,29 +1606,29 @@ discard block |
||
| 1606 | 1606 | |
| 1607 | 1607 | $table = GFFormsModel::get_entry_meta_table_name(); |
| 1608 | 1608 | |
| 1609 | - $key_like = $wpdb->esc_like( $filter['key'] ) . '.%'; |
|
| 1609 | + $key_like = $wpdb->esc_like( $filter[ 'key' ] ) . '.%'; |
|
| 1610 | 1610 | |
| 1611 | 1611 | switch ( \GV\Utils::get( $filter, 'type' ) ): |
| 1612 | 1612 | case 'post_category': |
| 1613 | 1613 | $choices = $wpdb->get_col( $wpdb->prepare( |
| 1614 | 1614 | "SELECT DISTINCT SUBSTRING_INDEX(meta_value, ':', 1) FROM $table WHERE (meta_key LIKE %s OR meta_key = %d) AND form_id = %d", |
| 1615 | - $key_like, $filter['key'], $form_id |
|
| 1615 | + $key_like, $filter[ 'key' ], $form_id |
|
| 1616 | 1616 | ) ); |
| 1617 | 1617 | break; |
| 1618 | 1618 | default: |
| 1619 | 1619 | $choices = $wpdb->get_col( $wpdb->prepare( |
| 1620 | 1620 | "SELECT DISTINCT meta_value FROM $table WHERE (meta_key LIKE %s OR meta_key = %d) AND form_id = %d", |
| 1621 | - $key_like, $filter['key'], $form_id |
|
| 1621 | + $key_like, $filter[ 'key' ], $form_id |
|
| 1622 | 1622 | ) ); |
| 1623 | 1623 | |
| 1624 | - if ( ( $field = gravityview_get_field( $form_id, $filter['key'] ) ) && 'json' === $field->storageType ) { |
|
| 1624 | + if ( ( $field = gravityview_get_field( $form_id, $filter[ 'key' ] ) ) && 'json' === $field->storageType ) { |
|
| 1625 | 1625 | $choices = array_map( 'json_decode', $choices ); |
| 1626 | 1626 | $_choices_array = array(); |
| 1627 | 1627 | foreach ( $choices as $choice ) { |
| 1628 | 1628 | if ( is_array( $choice ) ) { |
| 1629 | 1629 | $_choices_array = array_merge( $_choices_array, $choice ); |
| 1630 | 1630 | } else { |
| 1631 | - $_choices_array []= $choice; |
|
| 1631 | + $_choices_array [ ] = $choice; |
|
| 1632 | 1632 | } |
| 1633 | 1633 | } |
| 1634 | 1634 | $choices = array_unique( $_choices_array ); |
@@ -1638,9 +1638,9 @@ discard block |
||
| 1638 | 1638 | endswitch; |
| 1639 | 1639 | |
| 1640 | 1640 | $filter_choices = array(); |
| 1641 | - foreach ( $filter['choices'] as $choice ) { |
|
| 1642 | - if ( in_array( $choice['text'], $choices, true ) || in_array( $choice['value'], $choices, true ) ) { |
|
| 1643 | - $filter_choices[] = $choice; |
|
| 1641 | + foreach ( $filter[ 'choices' ] as $choice ) { |
|
| 1642 | + if ( in_array( $choice[ 'text' ], $choices, true ) || in_array( $choice[ 'value' ], $choices, true ) ) { |
|
| 1643 | + $filter_choices[ ] = $choice; |
|
| 1644 | 1644 | } |
| 1645 | 1645 | } |
| 1646 | 1646 | |
@@ -1675,7 +1675,7 @@ discard block |
||
| 1675 | 1675 | * @param \GV\View $view The view. |
| 1676 | 1676 | */ |
| 1677 | 1677 | $text = apply_filters( 'gravityview/search/created_by/text', $user->display_name, $user, $view ); |
| 1678 | - $choices[] = array( |
|
| 1678 | + $choices[ ] = array( |
|
| 1679 | 1679 | 'value' => $user->ID, |
| 1680 | 1680 | 'text' => $text, |
| 1681 | 1681 | ); |
@@ -1695,9 +1695,9 @@ discard block |
||
| 1695 | 1695 | |
| 1696 | 1696 | $choices = array(); |
| 1697 | 1697 | foreach ( GravityView_Entry_Approval_Status::get_all() as $status ) { |
| 1698 | - $choices[] = array( |
|
| 1699 | - 'value' => $status['value'], |
|
| 1700 | - 'text' => $status['label'], |
|
| 1698 | + $choices[ ] = array( |
|
| 1699 | + 'value' => $status[ 'value' ], |
|
| 1700 | + 'text' => $status[ 'label' ], |
|
| 1701 | 1701 | ); |
| 1702 | 1702 | } |
| 1703 | 1703 | |
@@ -1749,7 +1749,7 @@ discard block |
||
| 1749 | 1749 | */ |
| 1750 | 1750 | public function add_datepicker_js_dependency( $js_dependencies ) { |
| 1751 | 1751 | |
| 1752 | - $js_dependencies[] = 'jquery-ui-datepicker'; |
|
| 1752 | + $js_dependencies[ ] = 'jquery-ui-datepicker'; |
|
| 1753 | 1753 | |
| 1754 | 1754 | return $js_dependencies; |
| 1755 | 1755 | } |
@@ -1793,7 +1793,7 @@ discard block |
||
| 1793 | 1793 | 'isRTL' => is_rtl(), |
| 1794 | 1794 | ), $view_data ); |
| 1795 | 1795 | |
| 1796 | - $localizations['datepicker'] = $datepicker_settings; |
|
| 1796 | + $localizations[ 'datepicker' ] = $datepicker_settings; |
|
| 1797 | 1797 | |
| 1798 | 1798 | return $localizations; |
| 1799 | 1799 | |
@@ -1820,7 +1820,7 @@ discard block |
||
| 1820 | 1820 | * @return void |
| 1821 | 1821 | */ |
| 1822 | 1822 | private function maybe_enqueue_flexibility() { |
| 1823 | - if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/MSIE [8-9]/', $_SERVER['HTTP_USER_AGENT'] ) ) { |
|
| 1823 | + if ( isset( $_SERVER[ 'HTTP_USER_AGENT' ] ) && preg_match( '/MSIE [8-9]/', $_SERVER[ 'HTTP_USER_AGENT' ] ) ) { |
|
| 1824 | 1824 | wp_enqueue_script( 'gv-flexibility' ); |
| 1825 | 1825 | } |
| 1826 | 1826 | } |
@@ -1842,7 +1842,7 @@ discard block |
||
| 1842 | 1842 | add_filter( 'gravityview_js_localization', array( $this, 'add_datepicker_localization' ), 10, 2 ); |
| 1843 | 1843 | |
| 1844 | 1844 | $scheme = is_ssl() ? 'https://' : 'http://'; |
| 1845 | - wp_enqueue_style( 'jquery-ui-datepicker', $scheme.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' ); |
|
| 1845 | + wp_enqueue_style( 'jquery-ui-datepicker', $scheme . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' ); |
|
| 1846 | 1846 | |
| 1847 | 1847 | /** |
| 1848 | 1848 | * @filter `gravityview_search_datepicker_class` |
@@ -1921,7 +1921,7 @@ discard block |
||
| 1921 | 1921 | public function add_preview_inputs() { |
| 1922 | 1922 | global $wp; |
| 1923 | 1923 | |
| 1924 | - if ( ! is_preview() || ! current_user_can( 'publish_gravityviews') ) { |
|
| 1924 | + if ( ! is_preview() || ! current_user_can( 'publish_gravityviews' ) ) { |
|
| 1925 | 1925 | return; |
| 1926 | 1926 | } |
| 1927 | 1927 | |
@@ -1973,7 +1973,7 @@ discard block |
||
| 1973 | 1973 | */ |
| 1974 | 1974 | class GravityView_Widget_Search_Author_GF_Query_Condition extends \GF_Query_Condition { |
| 1975 | 1975 | public function __construct( $filter, $view ) { |
| 1976 | - $this->value = $filter['value']; |
|
| 1976 | + $this->value = $filter[ 'value' ]; |
|
| 1977 | 1977 | $this->view = $view; |
| 1978 | 1978 | } |
| 1979 | 1979 | |
@@ -2005,11 +2005,11 @@ discard block |
||
| 2005 | 2005 | $conditions = array(); |
| 2006 | 2006 | |
| 2007 | 2007 | foreach ( $user_fields as $user_field ) { |
| 2008 | - $conditions[] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) . '%' ); |
|
| 2008 | + $conditions[ ] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) . '%' ); |
|
| 2009 | 2009 | } |
| 2010 | 2010 | |
| 2011 | 2011 | foreach ( $user_meta_fields as $meta_field ) { |
| 2012 | - $conditions[] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) . '%' ); |
|
| 2012 | + $conditions[ ] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) . '%' ); |
|
| 2013 | 2013 | } |
| 2014 | 2014 | |
| 2015 | 2015 | $conditions = '(' . implode( ' OR ', $conditions ) . ')'; |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | * |
| 271 | 271 | * Verify permissions. Check expected $_POST. Parse args, then send to process_delete_notes |
| 272 | 272 | * |
| 273 | - * @since 1.17 |
|
| 273 | + * @since 1.17 |
|
| 274 | 274 | * |
| 275 | 275 | * @see process_delete_notes |
| 276 | 276 | * |
@@ -423,7 +423,7 @@ discard block |
||
| 423 | 423 | 'subject-label' => __( 'Subject', 'gravityview' ), |
| 424 | 424 | 'subject' => __( 'Email subject', 'gravityview' ), |
| 425 | 425 | 'default-email-subject' => __( 'New entry note', 'gravityview' ), |
| 426 | - 'email-footer' => __( 'This note was sent from {url}', 'gravityview' ), |
|
| 426 | + 'email-footer' => __( 'This note was sent from {url}', 'gravityview' ), |
|
| 427 | 427 | 'also-email' => __( 'Also email this note to', 'gravityview' ), |
| 428 | 428 | 'error-add-note' => __( 'There was an error adding the note.', 'gravityview' ), |
| 429 | 429 | 'error-invalid' => __( 'The request was invalid. Refresh the page and try again.', 'gravityview' ), |
@@ -493,11 +493,11 @@ discard block |
||
| 493 | 493 | |
| 494 | 494 | if ( $context instanceof \GV\Template_Context ) { |
| 495 | 495 | |
| 496 | - ob_start(); |
|
| 497 | - $context->template->get_template_part( 'note', 'detail', true ); |
|
| 498 | - $note_detail_html = ob_get_clean(); |
|
| 496 | + ob_start(); |
|
| 497 | + $context->template->get_template_part( 'note', 'detail', true ); |
|
| 498 | + $note_detail_html = ob_get_clean(); |
|
| 499 | 499 | |
| 500 | - ob_start(); |
|
| 500 | + ob_start(); |
|
| 501 | 501 | $context->template->get_template_part( 'note', $note_row_template, true ); |
| 502 | 502 | $note_row = ob_get_clean(); |
| 503 | 503 | } else { |
@@ -756,7 +756,7 @@ discard block |
||
| 756 | 756 | 'gv-note-to-custom' => '', |
| 757 | 757 | 'gv-note-subject' => '', |
| 758 | 758 | 'gv-note-content' => '', |
| 759 | - 'current-url' => '', |
|
| 759 | + 'current-url' => '', |
|
| 760 | 760 | ); |
| 761 | 761 | |
| 762 | 762 | $current_user = wp_get_current_user(); |
@@ -808,9 +808,9 @@ discard block |
||
| 808 | 808 | $message .= $this->get_email_footer( $email_footer, $is_html, $email_data ); |
| 809 | 809 | |
| 810 | 810 | /** |
| 811 | - * @filter `gravityview/field/notes/wpautop_email` Should the message content have paragraphs added automatically, if using HTML message format |
|
| 811 | + * @filter `gravityview/field/notes/wpautop_email` Should the message content have paragraphs added automatically, if using HTML message format |
|
| 812 | 812 | * @since 1.18 |
| 813 | - * @param bool $wpautop_email True: Apply wpautop() to the email message if using; False: Leave as entered (Default: true) |
|
| 813 | + * @param bool $wpautop_email True: Apply wpautop() to the email message if using; False: Leave as entered (Default: true) |
|
| 814 | 814 | */ |
| 815 | 815 | $wpautop_email = apply_filters( 'gravityview/field/notes/wpautop_email', true ); |
| 816 | 816 | |
@@ -830,12 +830,12 @@ discard block |
||
| 830 | 830 | } |
| 831 | 831 | |
| 832 | 832 | /** |
| 833 | - * Get the footer for Entry Note emails |
|
| 834 | - * |
|
| 835 | - * `{url}` is replaced by the URL of the page where the note form was embedded |
|
| 836 | - * |
|
| 837 | - * @since 1.18 |
|
| 838 | - * @see GravityView_Field_Notes::strings The default value of $message_footer is set here, with the key 'email-footer' |
|
| 833 | + * Get the footer for Entry Note emails |
|
| 834 | + * |
|
| 835 | + * `{url}` is replaced by the URL of the page where the note form was embedded |
|
| 836 | + * |
|
| 837 | + * @since 1.18 |
|
| 838 | + * @see GravityView_Field_Notes::strings The default value of $message_footer is set here, with the key 'email-footer' |
|
| 839 | 839 | * |
| 840 | 840 | * @param string $email_footer The message footer value |
| 841 | 841 | * @param bool $is_html True: Email is being sent as HTML; False: sent as text |
@@ -844,10 +844,10 @@ discard block |
||
| 844 | 844 | */ |
| 845 | 845 | private function get_email_footer( $email_footer = '', $is_html = true, $email_data = array() ) { |
| 846 | 846 | |
| 847 | - $output = ''; |
|
| 847 | + $output = ''; |
|
| 848 | 848 | |
| 849 | 849 | if( ! empty( $email_footer ) ) { |
| 850 | - $url = \GV\Utils::get( $email_data, 'current-url' ); |
|
| 850 | + $url = \GV\Utils::get( $email_data, 'current-url' ); |
|
| 851 | 851 | $url = html_entity_decode( $url ); |
| 852 | 852 | $url = site_url( $url ); |
| 853 | 853 | |
@@ -63,19 +63,19 @@ discard block |
||
| 63 | 63 | |
| 64 | 64 | add_shortcode( 'gv_note_add', array( 'GravityView_Field_Notes', 'get_add_note_part' ) ); |
| 65 | 65 | |
| 66 | - add_action( 'wp', array( $this, 'maybe_delete_notes'), 1000 ); |
|
| 67 | - add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes') ); |
|
| 68 | - add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes') ); |
|
| 66 | + add_action( 'wp', array( $this, 'maybe_delete_notes' ), 1000 ); |
|
| 67 | + add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes' ) ); |
|
| 68 | + add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes' ) ); |
|
| 69 | 69 | |
| 70 | - add_action( 'wp', array( $this, 'maybe_add_note'), 1000 ); |
|
| 71 | - add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note') ); |
|
| 72 | - add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note') ); |
|
| 70 | + add_action( 'wp', array( $this, 'maybe_add_note' ), 1000 ); |
|
| 71 | + add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note' ) ); |
|
| 72 | + add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note' ) ); |
|
| 73 | 73 | |
| 74 | 74 | // add template path to check for field |
| 75 | 75 | add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) ); |
| 76 | 76 | add_filter( 'gravityview/template/fields_template_paths', array( $this, 'add_template_path' ) ); |
| 77 | 77 | |
| 78 | - add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') ); |
|
| 78 | + add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) ); |
|
| 79 | 79 | add_action( 'gravityview/field/notes/scripts', array( $this, 'enqueue_scripts' ) ); |
| 80 | 80 | |
| 81 | 81 | add_filter( 'gravityview_entry_default_fields', array( $this, 'add_entry_default_field' ), 10, 3 ); |
@@ -97,8 +97,8 @@ discard block |
||
| 97 | 97 | */ |
| 98 | 98 | public function add_entry_default_field( $entry_default_fields, $form, $zone ) { |
| 99 | 99 | |
| 100 | - if( in_array( $zone, array( 'directory', 'single' ) ) ) { |
|
| 101 | - $entry_default_fields['notes'] = array( |
|
| 100 | + if ( in_array( $zone, array( 'directory', 'single' ) ) ) { |
|
| 101 | + $entry_default_fields[ 'notes' ] = array( |
|
| 102 | 102 | 'label' => __( 'Entry Notes', 'gravityview' ), |
| 103 | 103 | 'type' => 'notes', |
| 104 | 104 | 'desc' => __( 'Display, add, and delete notes for an entry.', 'gravityview' ), |
@@ -131,23 +131,23 @@ discard block |
||
| 131 | 131 | public function enqueue_scripts() { |
| 132 | 132 | global $wp_actions; |
| 133 | 133 | |
| 134 | - if( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) { |
|
| 134 | + if ( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) { |
|
| 135 | 135 | wp_enqueue_style( 'gravityview-notes' ); |
| 136 | 136 | wp_enqueue_script( 'gravityview-notes' ); |
| 137 | 137 | } |
| 138 | 138 | |
| 139 | - if( ! wp_script_is( 'gravityview-notes', 'done' ) ) { |
|
| 139 | + if ( ! wp_script_is( 'gravityview-notes', 'done' ) ) { |
|
| 140 | 140 | |
| 141 | 141 | $strings = self::strings(); |
| 142 | 142 | |
| 143 | 143 | wp_localize_script( 'gravityview-notes', 'GVNotes', array( |
| 144 | 144 | 'ajaxurl' => admin_url( 'admin-ajax.php' ), |
| 145 | 145 | 'text' => array( |
| 146 | - 'processing' => $strings['processing'], |
|
| 147 | - 'delete_confirm' => $strings['delete-confirm'], |
|
| 148 | - 'note_added' => $strings['added-note'], |
|
| 149 | - 'error_invalid' => $strings['error-invalid'], |
|
| 150 | - 'error_empty_note' => $strings['error-empty-note'], |
|
| 146 | + 'processing' => $strings[ 'processing' ], |
|
| 147 | + 'delete_confirm' => $strings[ 'delete-confirm' ], |
|
| 148 | + 'note_added' => $strings[ 'added-note' ], |
|
| 149 | + 'error_invalid' => $strings[ 'error-invalid' ], |
|
| 150 | + 'error_empty_note' => $strings[ 'error-empty-note' ], |
|
| 151 | 151 | ), |
| 152 | 152 | ) ); |
| 153 | 153 | } |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | * @return void |
| 164 | 164 | */ |
| 165 | 165 | function maybe_add_note() { |
| 166 | - if ( ! isset( $_POST['action'] ) || 'gv_note_add' !== $_POST['action'] ) { |
|
| 166 | + if ( ! isset( $_POST[ 'action' ] ) || 'gv_note_add' !== $_POST[ 'action' ] ) { |
|
| 167 | 167 | return; |
| 168 | 168 | } |
| 169 | 169 | |
@@ -176,12 +176,12 @@ discard block |
||
| 176 | 176 | $post = wp_unslash( $_POST ); |
| 177 | 177 | |
| 178 | 178 | if ( $this->doing_ajax ) { |
| 179 | - parse_str( $post['data'], $data ); |
|
| 179 | + parse_str( $post[ 'data' ], $data ); |
|
| 180 | 180 | } else { |
| 181 | 181 | $data = $post; |
| 182 | 182 | } |
| 183 | 183 | |
| 184 | - $this->process_add_note( (array) $data ); |
|
| 184 | + $this->process_add_note( (array)$data ); |
|
| 185 | 185 | } |
| 186 | 186 | |
| 187 | 187 | /** |
@@ -207,23 +207,23 @@ discard block |
||
| 207 | 207 | $error = false; |
| 208 | 208 | $success = false; |
| 209 | 209 | |
| 210 | - if( empty( $data['entry-slug'] ) ) { |
|
| 210 | + if ( empty( $data[ 'entry-slug' ] ) ) { |
|
| 211 | 211 | |
| 212 | - $error = self::strings('error-invalid'); |
|
| 212 | + $error = self::strings( 'error-invalid' ); |
|
| 213 | 213 | gravityview()->log->error( 'The note is missing an Entry ID.' ); |
| 214 | 214 | |
| 215 | 215 | } else { |
| 216 | 216 | |
| 217 | - $valid = wp_verify_nonce( $data['gv_note_add'], 'gv_note_add_' . $data['entry-slug'] ); |
|
| 217 | + $valid = wp_verify_nonce( $data[ 'gv_note_add' ], 'gv_note_add_' . $data[ 'entry-slug' ] ); |
|
| 218 | 218 | |
| 219 | 219 | $has_cap = GVCommon::has_cap( 'gravityview_add_entry_notes' ); |
| 220 | 220 | |
| 221 | - if( ! $has_cap ) { |
|
| 221 | + if ( ! $has_cap ) { |
|
| 222 | 222 | $error = self::strings( 'error-cap-add' ); |
| 223 | 223 | gravityview()->log->error( 'Adding a note failed: the user does not have the "gravityview_add_entry_notes" capability.' ); |
| 224 | 224 | } elseif ( $valid ) { |
| 225 | 225 | |
| 226 | - $entry = gravityview_get_entry( $data['entry-slug'], true, false ); |
|
| 226 | + $entry = gravityview_get_entry( $data[ 'entry-slug' ], true, false ); |
|
| 227 | 227 | |
| 228 | 228 | $added = $this->add_note( $entry, $data ); |
| 229 | 229 | |
@@ -241,22 +241,22 @@ discard block |
||
| 241 | 241 | $this->maybe_send_entry_notes( $note, $entry, $data ); |
| 242 | 242 | |
| 243 | 243 | if ( $note ) { |
| 244 | - $success = self::display_note( $note, ! empty( $data['show-delete'] ) ); |
|
| 244 | + $success = self::display_note( $note, ! empty( $data[ 'show-delete' ] ) ); |
|
| 245 | 245 | gravityview()->log->debug( 'The note was successfully created', array( 'data' => compact( 'note', 'data' ) ) ); |
| 246 | 246 | } else { |
| 247 | - $error = self::strings('error-add-note'); |
|
| 247 | + $error = self::strings( 'error-add-note' ); |
|
| 248 | 248 | gravityview()->log->error( 'The note was not successfully created', array( 'data' => compact( 'note', 'data' ) ) ); |
| 249 | 249 | } |
| 250 | 250 | } |
| 251 | 251 | } else { |
| 252 | - $error = self::strings('error-invalid'); |
|
| 252 | + $error = self::strings( 'error-invalid' ); |
|
| 253 | 253 | gravityview()->log->error( 'Nonce validation failed; the note was not created' ); |
| 254 | 254 | } |
| 255 | 255 | } |
| 256 | 256 | |
| 257 | 257 | |
| 258 | - if( $this->doing_ajax ) { |
|
| 259 | - if( $success ) { |
|
| 258 | + if ( $this->doing_ajax ) { |
|
| 259 | + if ( $success ) { |
|
| 260 | 260 | wp_send_json_success( array( 'html' => $success ) ); |
| 261 | 261 | } else { |
| 262 | 262 | $error = $error ? $error : self::strings( 'error-invalid' ); |
@@ -282,11 +282,11 @@ discard block |
||
| 282 | 282 | return; |
| 283 | 283 | } |
| 284 | 284 | |
| 285 | - if ( isset( $_POST['action'] ) && 'gv_delete_notes' === $_POST['action'] ) { |
|
| 285 | + if ( isset( $_POST[ 'action' ] ) && 'gv_delete_notes' === $_POST[ 'action' ] ) { |
|
| 286 | 286 | |
| 287 | 287 | $post = wp_unslash( $_POST ); |
| 288 | 288 | if ( $this->doing_ajax ) { |
| 289 | - parse_str( $post['data'], $data ); |
|
| 289 | + parse_str( $post[ 'data' ], $data ); |
|
| 290 | 290 | } else { |
| 291 | 291 | $data = $post; |
| 292 | 292 | } |
@@ -317,18 +317,18 @@ discard block |
||
| 317 | 317 | */ |
| 318 | 318 | function process_delete_notes( $data ) { |
| 319 | 319 | |
| 320 | - $valid = wp_verify_nonce( $data['gv_delete_notes'], 'gv_delete_notes_' . $data['entry-slug'] ); |
|
| 320 | + $valid = wp_verify_nonce( $data[ 'gv_delete_notes' ], 'gv_delete_notes_' . $data[ 'entry-slug' ] ); |
|
| 321 | 321 | $has_cap = GVCommon::has_cap( 'gravityview_delete_entry_notes' ); |
| 322 | 322 | $success = false; |
| 323 | 323 | |
| 324 | 324 | if ( $valid && $has_cap ) { |
| 325 | - GravityView_Entry_Notes::delete_notes( $data['note'] ); |
|
| 325 | + GravityView_Entry_Notes::delete_notes( $data[ 'note' ] ); |
|
| 326 | 326 | $success = true; |
| 327 | 327 | } |
| 328 | 328 | |
| 329 | - if( $this->doing_ajax ) { |
|
| 329 | + if ( $this->doing_ajax ) { |
|
| 330 | 330 | |
| 331 | - if( $success ) { |
|
| 331 | + if ( $success ) { |
|
| 332 | 332 | wp_send_json_success(); |
| 333 | 333 | } else { |
| 334 | 334 | if ( ! $valid ) { |
@@ -361,13 +361,13 @@ discard block |
||
| 361 | 361 | |
| 362 | 362 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
| 363 | 363 | |
| 364 | - unset( $field_options['show_as_link'] ); |
|
| 364 | + unset( $field_options[ 'show_as_link' ] ); |
|
| 365 | 365 | |
| 366 | 366 | $notes_options = array( |
| 367 | 367 | 'notes' => array( |
| 368 | 368 | 'type' => 'checkboxes', |
| 369 | - 'label' => __('Note Settings', 'gravityview'), |
|
| 370 | - 'desc' => sprintf( _x('Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ), |
|
| 369 | + 'label' => __( 'Note Settings', 'gravityview' ), |
|
| 370 | + 'desc' => sprintf( _x( 'Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ), |
|
| 371 | 371 | 'options' => array( |
| 372 | 372 | 'view' => array( |
| 373 | 373 | 'label' => __( 'Display notes?', 'gravityview' ), |
@@ -419,7 +419,7 @@ discard block |
||
| 419 | 419 | 'processing' => __( 'Processing…', 'gravityview' ), |
| 420 | 420 | 'other-email' => __( 'Other email address', 'gravityview' ), |
| 421 | 421 | 'email-label' => __( 'Email address', 'gravityview' ), |
| 422 | - 'email-placeholder' => _x('[email protected]', 'Example email address used as a placeholder', 'gravityview'), |
|
| 422 | + 'email-placeholder' => _x( '[email protected]', 'Example email address used as a placeholder', 'gravityview' ), |
|
| 423 | 423 | 'subject-label' => __( 'Subject', 'gravityview' ), |
| 424 | 424 | 'subject' => __( 'Email subject', 'gravityview' ), |
| 425 | 425 | 'default-email-subject' => __( 'New entry note', 'gravityview' ), |
@@ -439,7 +439,7 @@ discard block |
||
| 439 | 439 | */ |
| 440 | 440 | $strings = gv_map_deep( apply_filters( 'gravityview/field/notes/strings', $strings ), 'esc_html' ); |
| 441 | 441 | |
| 442 | - if( $key ) { |
|
| 442 | + if ( $key ) { |
|
| 443 | 443 | return isset( $strings[ $key ] ) ? $strings[ $key ] : ''; |
| 444 | 444 | } |
| 445 | 445 | |
@@ -461,7 +461,7 @@ discard block |
||
| 461 | 461 | */ |
| 462 | 462 | static public function display_note( $note, $show_delete = false, $context = null ) { |
| 463 | 463 | |
| 464 | - if( ! is_object( $note ) ) { |
|
| 464 | + if ( ! is_object( $note ) ) { |
|
| 465 | 465 | return ''; |
| 466 | 466 | } |
| 467 | 467 | |
@@ -516,7 +516,7 @@ discard block |
||
| 516 | 516 | } |
| 517 | 517 | |
| 518 | 518 | $replacements = array( |
| 519 | - '{note_id}' => $note_content['note_id'], |
|
| 519 | + '{note_id}' => $note_content[ 'note_id' ], |
|
| 520 | 520 | '{row_class}' => 'gv-note', |
| 521 | 521 | '{note_detail}' => $note_detail_html |
| 522 | 522 | ); |
@@ -548,13 +548,13 @@ discard block |
||
| 548 | 548 | |
| 549 | 549 | $user_data = get_userdata( $current_user->ID ); |
| 550 | 550 | |
| 551 | - $note_content = trim( $data['gv-note-content'] ); |
|
| 551 | + $note_content = trim( $data[ 'gv-note-content' ] ); |
|
| 552 | 552 | |
| 553 | - if( empty( $note_content ) ) { |
|
| 553 | + if ( empty( $note_content ) ) { |
|
| 554 | 554 | return new WP_Error( 'gv-add-note-empty', __( 'The note is empty.', 'gravityview' ) ); |
| 555 | 555 | } |
| 556 | 556 | |
| 557 | - $return = GravityView_Entry_Notes::add_note( $entry['id'], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' ); |
|
| 557 | + $return = GravityView_Entry_Notes::add_note( $entry[ 'id' ], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' ); |
|
| 558 | 558 | |
| 559 | 559 | return $return; |
| 560 | 560 | } |
@@ -574,7 +574,7 @@ discard block |
||
| 574 | 574 | |
| 575 | 575 | $atts = shortcode_atts( array( 'entry' => null ), $atts ); |
| 576 | 576 | |
| 577 | - if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
| 577 | + if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) { |
|
| 578 | 578 | gravityview()->log->error( 'User does not have permission to add entry notes ("gravityview_add_entry_notes").' ); |
| 579 | 579 | return ''; |
| 580 | 580 | } |
@@ -596,8 +596,8 @@ discard block |
||
| 596 | 596 | |
| 597 | 597 | $visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' ); |
| 598 | 598 | |
| 599 | - if ( $atts['entry'] ) { |
|
| 600 | - $entry = GFAPI::get_entry( $atts['entry'] ); |
|
| 599 | + if ( $atts[ 'entry' ] ) { |
|
| 600 | + $entry = GFAPI::get_entry( $atts[ 'entry' ] ); |
|
| 601 | 601 | } |
| 602 | 602 | |
| 603 | 603 | if ( ! isset( $entry ) || ! $entry ) { |
@@ -615,14 +615,14 @@ discard block |
||
| 615 | 615 | |
| 616 | 616 | // Only generate the dropdown if the field settings allow it |
| 617 | 617 | $email_fields = ''; |
| 618 | - if( ! empty( $visibility_settings['email'] ) ) { |
|
| 618 | + if ( ! empty( $visibility_settings[ 'email' ] ) ) { |
|
| 619 | 619 | $email_fields = self::get_note_email_fields( $entry_slug ); |
| 620 | 620 | } |
| 621 | 621 | |
| 622 | 622 | $add_note_html = str_replace( '{entry_slug}', $entry_slug, $add_note_html ); |
| 623 | 623 | $add_note_html = str_replace( '{nonce_field}', $nonce_field, $add_note_html ); |
| 624 | - $add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings['delete'] ) ? 0 : $visibility_settings['delete'] ), $add_note_html ); |
|
| 625 | - $add_note_html = str_replace( '{email_fields}', $email_fields, $add_note_html ); |
|
| 624 | + $add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings[ 'delete' ] ) ? 0 : $visibility_settings[ 'delete' ] ), $add_note_html ); |
|
| 625 | + $add_note_html = str_replace( '{email_fields}', $email_fields, $add_note_html ); |
|
| 626 | 626 | $add_note_html = str_replace( '{url}', esc_url_raw( add_query_arg( array() ) ), $add_note_html ); |
| 627 | 627 | |
| 628 | 628 | return $add_note_html; |
@@ -647,8 +647,8 @@ discard block |
||
| 647 | 647 | $note_emails = array(); |
| 648 | 648 | |
| 649 | 649 | foreach ( $email_fields as $email_field ) { |
| 650 | - if ( ! empty( $entry["{$email_field->id}"] ) && is_email( $entry["{$email_field->id}"] ) ) { |
|
| 651 | - $note_emails[] = $entry["{$email_field->id}"]; |
|
| 650 | + if ( ! empty( $entry[ "{$email_field->id}" ] ) && is_email( $entry[ "{$email_field->id}" ] ) ) { |
|
| 651 | + $note_emails[ ] = $entry[ "{$email_field->id}" ]; |
|
| 652 | 652 | } |
| 653 | 653 | } |
| 654 | 654 | |
@@ -660,7 +660,7 @@ discard block |
||
| 660 | 660 | */ |
| 661 | 661 | $note_emails = apply_filters( 'gravityview/field/notes/emails', $note_emails, $entry ); |
| 662 | 662 | |
| 663 | - return (array) $note_emails; |
|
| 663 | + return (array)$note_emails; |
|
| 664 | 664 | } |
| 665 | 665 | |
| 666 | 666 | /** |
@@ -676,7 +676,7 @@ discard block |
||
| 676 | 676 | */ |
| 677 | 677 | private static function get_note_email_fields( $entry_slug = '' ) { |
| 678 | 678 | |
| 679 | - if( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) { |
|
| 679 | + if ( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) { |
|
| 680 | 680 | gravityview()->log->error( 'User does not have permission to email entry notes ("gravityview_email_entry_notes").' ); |
| 681 | 681 | return ''; |
| 682 | 682 | } |
@@ -698,27 +698,27 @@ discard block |
||
| 698 | 698 | |
| 699 | 699 | if ( ! empty( $note_emails ) || $include_custom ) { ?> |
| 700 | 700 | <div class="gv-note-email-container"> |
| 701 | - <label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings['also-email']; ?></label> |
|
| 701 | + <label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings[ 'also-email' ]; ?></label> |
|
| 702 | 702 | <select class="gv-note-email-to" name="gv-note-to" id="gv-note-email-to-<?php echo $entry_slug_esc; ?>"> |
| 703 | - <option value=""><?php echo $strings['also-email']; ?></option> |
|
| 703 | + <option value=""><?php echo $strings[ 'also-email' ]; ?></option> |
|
| 704 | 704 | <?php foreach ( $note_emails as $email ) { |
| 705 | 705 | ?> |
| 706 | 706 | <option value="<?php echo esc_attr( $email ); ?>"><?php echo esc_html( $email ); ?></option> |
| 707 | 707 | <?php } |
| 708 | - if( $include_custom ) { ?> |
|
| 709 | - <option value="custom"><?php echo self::strings('other-email'); ?></option> |
|
| 708 | + if ( $include_custom ) { ?> |
|
| 709 | + <option value="custom"><?php echo self::strings( 'other-email' ); ?></option> |
|
| 710 | 710 | <?php } ?> |
| 711 | 711 | </select> |
| 712 | 712 | <fieldset class="gv-note-to-container"> |
| 713 | - <?php if( $include_custom ) { ?> |
|
| 713 | + <?php if ( $include_custom ) { ?> |
|
| 714 | 714 | <div class='gv-note-to-custom-container'> |
| 715 | - <label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings['email-label']; ?></label> |
|
| 716 | - <input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings['email-placeholder']; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" /> |
|
| 715 | + <label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'email-label' ]; ?></label> |
|
| 716 | + <input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings[ 'email-placeholder' ]; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" /> |
|
| 717 | 717 | </div> |
| 718 | 718 | <?php } ?> |
| 719 | 719 | <div class='gv-note-subject-container'> |
| 720 | - <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings['subject-label']; ?></label> |
|
| 721 | - <input type="text" name="gv-note-subject" placeholder="<?php echo $strings['subject']; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" /> |
|
| 720 | + <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'subject-label' ]; ?></label> |
|
| 721 | + <input type="text" name="gv-note-subject" placeholder="<?php echo $strings[ 'subject' ]; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" /> |
|
| 722 | 722 | </div> |
| 723 | 723 | </fieldset> |
| 724 | 724 | </div> |
@@ -741,7 +741,7 @@ discard block |
||
| 741 | 741 | */ |
| 742 | 742 | private function maybe_send_entry_notes( $note = false, $entry, $data ) { |
| 743 | 743 | |
| 744 | - if( ! $note || ! GVCommon::has_cap('gravityview_email_entry_notes') ) { |
|
| 744 | + if ( ! $note || ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) { |
|
| 745 | 745 | gravityview()->log->debug( 'User doesn\'t have "gravityview_email_entry_notes" cap, or $note is empty', array( 'data' => $note ) ); |
| 746 | 746 | return; |
| 747 | 747 | } |
@@ -749,7 +749,7 @@ discard block |
||
| 749 | 749 | gravityview()->log->debug( '$data', array( 'data' => $data ) ); |
| 750 | 750 | |
| 751 | 751 | //emailing notes if configured |
| 752 | - if ( ! empty( $data['gv-note-to'] ) ) { |
|
| 752 | + if ( ! empty( $data[ 'gv-note-to' ] ) ) { |
|
| 753 | 753 | |
| 754 | 754 | $default_data = array( |
| 755 | 755 | 'gv-note-to' => '', |
@@ -759,11 +759,11 @@ discard block |
||
| 759 | 759 | 'current-url' => '', |
| 760 | 760 | ); |
| 761 | 761 | |
| 762 | - $current_user = wp_get_current_user(); |
|
| 762 | + $current_user = wp_get_current_user(); |
|
| 763 | 763 | $email_data = wp_parse_args( $data, $default_data ); |
| 764 | 764 | |
| 765 | - $from = $current_user->user_email; |
|
| 766 | - $to = $email_data['gv-note-to']; |
|
| 765 | + $from = $current_user->user_email; |
|
| 766 | + $to = $email_data[ 'gv-note-to' ]; |
|
| 767 | 767 | |
| 768 | 768 | /** |
| 769 | 769 | * Documented in get_note_email_fields |
@@ -771,8 +771,8 @@ discard block |
||
| 771 | 771 | */ |
| 772 | 772 | $include_custom = apply_filters( 'gravityview/field/notes/custom-email', true ); |
| 773 | 773 | |
| 774 | - if( 'custom' === $to && $include_custom ) { |
|
| 775 | - $to = $email_data['gv-note-to-custom']; |
|
| 774 | + if ( 'custom' === $to && $include_custom ) { |
|
| 775 | + $to = $email_data[ 'gv-note-to-custom' ]; |
|
| 776 | 776 | gravityview()->log->debug( 'Sending note to a custom email address: {to}' . array( 'to' => $to ) ); |
| 777 | 777 | } |
| 778 | 778 | |
@@ -783,13 +783,13 @@ discard block |
||
| 783 | 783 | |
| 784 | 784 | $bcc = false; |
| 785 | 785 | $reply_to = $from; |
| 786 | - $subject = trim( $email_data['gv-note-subject'] ); |
|
| 786 | + $subject = trim( $email_data[ 'gv-note-subject' ] ); |
|
| 787 | 787 | |
| 788 | 788 | // We use empty() here because GF uses empty to check against, too. `0` isn't a valid subject to GF |
| 789 | 789 | $subject = empty( $subject ) ? self::strings( 'default-email-subject' ) : $subject; |
| 790 | - $message = $email_data['gv-note-content']; |
|
| 790 | + $message = $email_data[ 'gv-note-content' ]; |
|
| 791 | 791 | $email_footer = self::strings( 'email-footer' ); |
| 792 | - $from_name = $current_user->display_name; |
|
| 792 | + $from_name = $current_user->display_name; |
|
| 793 | 793 | $message_format = 'html'; |
| 794 | 794 | |
| 795 | 795 | /** |
@@ -820,7 +820,7 @@ discard block |
||
| 820 | 820 | |
| 821 | 821 | GVCommon::send_email( $from, $to, $bcc, $reply_to, $subject, $message, $from_name, $message_format, '', $entry, false ); |
| 822 | 822 | |
| 823 | - $form = isset( $entry['form_id'] ) ? GFAPI::get_form( $entry['form_id'] ) : array(); |
|
| 823 | + $form = isset( $entry[ 'form_id' ] ) ? GFAPI::get_form( $entry[ 'form_id' ] ) : array(); |
|
| 824 | 824 | |
| 825 | 825 | /** |
| 826 | 826 | * @see https://www.gravityhelp.com/documentation/article/10146-2/ It's here for compatibility with Gravity Forms |
@@ -846,7 +846,7 @@ discard block |
||
| 846 | 846 | |
| 847 | 847 | $output = ''; |
| 848 | 848 | |
| 849 | - if( ! empty( $email_footer ) ) { |
|
| 849 | + if ( ! empty( $email_footer ) ) { |
|
| 850 | 850 | $url = \GV\Utils::get( $email_data, 'current-url' ); |
| 851 | 851 | $url = html_entity_decode( $url ); |
| 852 | 852 | $url = site_url( $url ); |
