@@ -10,12 +10,12 @@ discard block |
||
10 | 10 | $search_field = $gravityview_view->search_field; |
11 | 11 | |
12 | 12 | // Make sure that there are choices to display |
13 | -if( empty( $search_field['choices'] ) ) { |
|
13 | +if ( empty( $search_field[ 'choices' ] ) ) { |
|
14 | 14 | gravityview()->log->debug( 'search-field-multiselect.php - No choices for field' ); |
15 | 15 | return; |
16 | 16 | } |
17 | 17 | |
18 | -$gf_field = GFAPI::get_field( $gravityview_view->getForm(), $search_field['key'] ); |
|
18 | +$gf_field = GFAPI::get_field( $gravityview_view->getForm(), $search_field[ 'key' ] ); |
|
19 | 19 | |
20 | 20 | /** |
21 | 21 | * @filter `gravityview/extension/search/select_default` Define the text for the default option in a select (multi or single dropdown) |
@@ -23,19 +23,19 @@ discard block |
||
23 | 23 | * @param string $default_option Default: `—` (—) |
24 | 24 | * @param string $field_type Field type: "select" or "multiselect" |
25 | 25 | */ |
26 | -$default_option = apply_filters('gravityview/extension/search/select_default', \GV\Utils::get( $gf_field, 'placeholder', '—' ), 'multiselect' ); |
|
26 | +$default_option = apply_filters( 'gravityview/extension/search/select_default', \GV\Utils::get( $gf_field, 'placeholder', '—' ), 'multiselect' ); |
|
27 | 27 | |
28 | 28 | ?> |
29 | 29 | <div class="gv-search-box gv-search-field-multiselect"> |
30 | - <?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?> |
|
31 | - <label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label> |
|
30 | + <?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?> |
|
31 | + <label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label> |
|
32 | 32 | <?php } ?> |
33 | 33 | <p> |
34 | - <select name="<?php echo esc_attr( $search_field['name'] ); ?>[]" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" multiple> |
|
35 | - <option value="" <?php gv_selected( '', $search_field['value'], true ); ?>><?php echo esc_html( $default_option ); ?></option> |
|
34 | + <select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>[]" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>" multiple> |
|
35 | + <option value="" <?php gv_selected( '', $search_field[ 'value' ], true ); ?>><?php echo esc_html( $default_option ); ?></option> |
|
36 | 36 | <?php |
37 | - foreach( $search_field['choices'] as $choice ) : ?> |
|
38 | - <option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php gv_selected( $choice['value'], $search_field['value'], true ); ?>><?php echo esc_html( $choice['text'] ); ?></option> |
|
37 | + foreach ( $search_field[ 'choices' ] as $choice ) : ?> |
|
38 | + <option value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" <?php gv_selected( $choice[ 'value' ], $search_field[ 'value' ], true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option> |
|
39 | 39 | <?php endforeach; ?> |
40 | 40 | </select> |
41 | 41 | </p> |
@@ -10,17 +10,17 @@ discard block |
||
10 | 10 | $search_field = $gravityview_view->search_field; |
11 | 11 | |
12 | 12 | // Make sure that there are choices to display |
13 | -if( empty( $search_field['choices'] ) ) { |
|
13 | +if ( empty( $search_field[ 'choices' ] ) ) { |
|
14 | 14 | gravityview()->log->debug( 'search-field-select.php - No choices for field' ); |
15 | 15 | return; |
16 | 16 | } |
17 | 17 | |
18 | -if( is_array( $search_field['value'] ) ) { |
|
18 | +if ( is_array( $search_field[ 'value' ] ) ) { |
|
19 | 19 | gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' ); |
20 | - $search_field['value'] = reset( $search_field['value'] ); |
|
20 | + $search_field[ 'value' ] = reset( $search_field[ 'value' ] ); |
|
21 | 21 | } |
22 | 22 | |
23 | -$gf_field = GFAPI::get_field( $gravityview_view->getForm(), $search_field['key'] ); |
|
23 | +$gf_field = GFAPI::get_field( $gravityview_view->getForm(), $search_field[ 'key' ] ); |
|
24 | 24 | |
25 | 25 | /** |
26 | 26 | * @filter `gravityview/extension/search/select_default` Define the text for the default option in a select (multi or single dropdown) |
@@ -28,26 +28,26 @@ discard block |
||
28 | 28 | * @param string $default_option Default: `—` (—) |
29 | 29 | * @param string $field_type Field type: "select" or "multiselect" |
30 | 30 | */ |
31 | -$default_option = apply_filters('gravityview/extension/search/select_default', \GV\Utils::get( $gf_field, 'placeholder', '—' ), 'select' ); |
|
31 | +$default_option = apply_filters( 'gravityview/extension/search/select_default', \GV\Utils::get( $gf_field, 'placeholder', '—' ), 'select' ); |
|
32 | 32 | |
33 | 33 | ?> |
34 | 34 | <div class="gv-search-box gv-search-field-select"> |
35 | - <?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?> |
|
36 | - <label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label> |
|
35 | + <?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?> |
|
36 | + <label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label> |
|
37 | 37 | <?php } ?> |
38 | 38 | <p> |
39 | - <select name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"> |
|
40 | - <option value="" <?php gv_selected( '', $search_field['value'], true ); ?>><?php echo esc_html( $default_option ); ?></option> |
|
39 | + <select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"> |
|
40 | + <option value="" <?php gv_selected( '', $search_field[ 'value' ], true ); ?>><?php echo esc_html( $default_option ); ?></option> |
|
41 | 41 | <?php |
42 | - foreach( $search_field['choices'] as $choice ) { ?> |
|
43 | - <?php if ( is_array( $choice['value'] ) ) { ?> |
|
44 | - <optgroup label="<?php echo esc_attr( $choice['text'] ); ?>"> |
|
45 | - <?php foreach ( $choice['value'] as $subchoice ): ?> |
|
46 | - <option value="<?php echo esc_attr( $subchoice['value'] ); ?>"><?php echo esc_html( $subchoice['text'] ); ?></option> |
|
42 | + foreach ( $search_field[ 'choices' ] as $choice ) { ?> |
|
43 | + <?php if ( is_array( $choice[ 'value' ] ) ) { ?> |
|
44 | + <optgroup label="<?php echo esc_attr( $choice[ 'text' ] ); ?>"> |
|
45 | + <?php foreach ( $choice[ 'value' ] as $subchoice ): ?> |
|
46 | + <option value="<?php echo esc_attr( $subchoice[ 'value' ] ); ?>"><?php echo esc_html( $subchoice[ 'text' ] ); ?></option> |
|
47 | 47 | <?php endforeach; ?> |
48 | 48 | </optgroup> |
49 | 49 | <?php } else { ?> |
50 | - <option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $search_field['value'] ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option> |
|
50 | + <option value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" <?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $search_field[ 'value' ] ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option> |
|
51 | 51 | <?php } ?> |
52 | 52 | <?php } ?> |
53 | 53 | </select> |