@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | /** |
82 | 82 | * @see RGFormsModel::update_lead_property() Trigger when any entry property changes |
83 | 83 | */ |
84 | - foreach( $this->lead_db_columns as $column ) { |
|
84 | + foreach ( $this->lead_db_columns as $column ) { |
|
85 | 85 | add_action( 'gform_update_' . $column, array( $this, 'entry_status_changed' ), 10, 3 ); |
86 | 86 | } |
87 | 87 | |
@@ -114,9 +114,9 @@ discard block |
||
114 | 114 | return; |
115 | 115 | } |
116 | 116 | |
117 | - gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{lead_id} was deleted', array( 'form_id' => $entry['form_id'], 'entry_id' => $lead_id, 'data' => array( 'value' => $property_value, 'previous' => $previous_value ) ) ); |
|
117 | + gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{lead_id} was deleted', array( 'form_id' => $entry[ 'form_id' ], 'entry_id' => $lead_id, 'data' => array( 'value' => $property_value, 'previous' => $previous_value ) ) ); |
|
118 | 118 | |
119 | - $this->blacklist_add( $entry['form_id'] ); |
|
119 | + $this->blacklist_add( $entry[ 'form_id' ] ); |
|
120 | 120 | } |
121 | 121 | |
122 | 122 | /** |
@@ -129,9 +129,9 @@ discard block |
||
129 | 129 | */ |
130 | 130 | public function entry_updated( $form, $lead_id ) { |
131 | 131 | |
132 | - gravityview()->log->debug(' adding form {form_id} to blacklist because entry #{entry_id} was updated', array( 'form_id' => $form['id'], 'entry_id' => $lead_id ) ); |
|
132 | + gravityview()->log->debug( ' adding form {form_id} to blacklist because entry #{entry_id} was updated', array( 'form_id' => $form[ 'id' ], 'entry_id' => $lead_id ) ); |
|
133 | 133 | |
134 | - $this->blacklist_add( $form['id'] ); |
|
134 | + $this->blacklist_add( $form[ 'id' ] ); |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | /** |
@@ -146,9 +146,9 @@ discard block |
||
146 | 146 | */ |
147 | 147 | public function entry_created( $entry, $form ) { |
148 | 148 | |
149 | - gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was created', array( 'form_id' => $form['id'], 'entry_id' => $entry['id'] ) ); |
|
149 | + gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was created', array( 'form_id' => $form[ 'id' ], 'entry_id' => $entry[ 'id' ] ) ); |
|
150 | 150 | |
151 | - $this->blacklist_add( $form['id'] ); |
|
151 | + $this->blacklist_add( $form[ 'id' ] ); |
|
152 | 152 | } |
153 | 153 | |
154 | 154 | /** |
@@ -164,9 +164,9 @@ discard block |
||
164 | 164 | return; |
165 | 165 | } |
166 | 166 | |
167 | - gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was added', array( 'form_id' => $form['id'], 'entry_id' => $entry['id'] ) ); |
|
167 | + gravityview()->log->debug( 'adding form {form_id} to blacklist because entry #{entry_id} was added', array( 'form_id' => $form[ 'id' ], 'entry_id' => $entry[ 'id' ] ) ); |
|
168 | 168 | |
169 | - $this->blacklist_add( $form['id'] ); |
|
169 | + $this->blacklist_add( $form[ 'id' ] ); |
|
170 | 170 | } |
171 | 171 | |
172 | 172 | /** |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | // Normally just one form, but supports multiple forms |
186 | 186 | // |
187 | 187 | // Array of IDs 12, 5, 14 would result in `f:12-f:5-f:14` |
188 | - $forms = 'f:' . implode( '-f:', (array) $form_ids ); |
|
188 | + $forms = 'f:' . implode( '-f:', (array)$form_ids ); |
|
189 | 189 | |
190 | 190 | // Prefix for transient keys |
191 | 191 | // Now the prefix would be: `gv-cache-f:12-f:5-f:14-` |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | ) ) ); |
243 | 243 | |
244 | 244 | // Add the passed form IDs |
245 | - $blacklist = array_merge( (array) $blacklist, $form_ids ); |
|
245 | + $blacklist = array_merge( (array)$blacklist, $form_ids ); |
|
246 | 246 | |
247 | 247 | // Don't duplicate |
248 | 248 | $blacklist = array_unique( $blacklist ); |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | |
266 | 266 | $blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() ); |
267 | 267 | |
268 | - $updated_list = array_diff( $blacklist, (array) $form_ids ); |
|
268 | + $updated_list = array_diff( $blacklist, (array)$form_ids ); |
|
269 | 269 | |
270 | 270 | gravityview()->log->debug( 'Removing form IDs from cache blacklist', array( 'data' => array( |
271 | 271 | '$form_ids' => $form_ids, |
@@ -298,7 +298,7 @@ discard block |
||
298 | 298 | return false; |
299 | 299 | } |
300 | 300 | |
301 | - foreach ( (array) $form_ids as $form_id ) { |
|
301 | + foreach ( (array)$form_ids as $form_id ) { |
|
302 | 302 | |
303 | 303 | if ( in_array( $form_id, $blacklist ) ) { |
304 | 304 | |
@@ -370,7 +370,7 @@ discard block |
||
370 | 370 | * @filter `gravityview_cache_time_{$filter_name}` Modify the cache time for a type of cache |
371 | 371 | * @param int $time_in_seconds Default: `DAY_IN_SECONDS` |
372 | 372 | */ |
373 | - $cache_time = (int) apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS ); |
|
373 | + $cache_time = (int)apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS ); |
|
374 | 374 | |
375 | 375 | gravityview()->log->debug( 'Setting cache with transient key {key} for {cache_time} seconds', array( 'key' => $this->key, 'cache_time' => $cache_time ) ); |
376 | 376 | |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | return; |
407 | 407 | } |
408 | 408 | |
409 | - foreach ( (array) $form_ids as $form_id ) { |
|
409 | + foreach ( (array)$form_ids as $form_id ) { |
|
410 | 410 | |
411 | 411 | $key = '_transient_gv-cache-'; |
412 | 412 | |
@@ -522,7 +522,7 @@ discard block |
||
522 | 522 | public function use_cache() { |
523 | 523 | |
524 | 524 | // Exit early if debugging (unless running PHPUnit) |
525 | - if ( defined( 'WP_DEBUG' ) && WP_DEBUG && ! ( defined('DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) ) { |
|
525 | + if ( defined( 'WP_DEBUG' ) && WP_DEBUG && ! ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) ) { |
|
526 | 526 | return apply_filters( 'gravityview_use_cache', false, $this ); |
527 | 527 | } |
528 | 528 | |
@@ -530,7 +530,7 @@ discard block |
||
530 | 530 | |
531 | 531 | if ( GVCommon::has_cap( 'edit_gravityviews' ) ) { |
532 | 532 | |
533 | - if ( isset( $_GET['cache'] ) || isset( $_GET['nocache'] ) ) { |
|
533 | + if ( isset( $_GET[ 'cache' ] ) || isset( $_GET[ 'nocache' ] ) ) { |
|
534 | 534 | |
535 | 535 | gravityview()->log->debug( 'Not using cache: ?cache or ?nocache is in the URL' ); |
536 | 536 | |
@@ -557,7 +557,7 @@ discard block |
||
557 | 557 | */ |
558 | 558 | $use_cache = apply_filters( 'gravityview_use_cache', $use_cache, $this ); |
559 | 559 | |
560 | - return (boolean) $use_cache; |
|
560 | + return (boolean)$use_cache; |
|
561 | 561 | } |
562 | 562 | |
563 | 563 | } |
@@ -151,11 +151,11 @@ discard block |
||
151 | 151 | do_action( 'gravityview/template/list/body/before', $context ); |
152 | 152 | |
153 | 153 | /** |
154 | - * @action `gravityview_list_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows. |
|
155 | - * @deprecated Use `gravityview/template/list/body/before` |
|
156 | - * @since 1.0.7 |
|
157 | - * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
158 | - */ |
|
154 | + * @action `gravityview_list_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows. |
|
155 | + * @deprecated Use `gravityview/template/list/body/before` |
|
156 | + * @since 1.0.7 |
|
157 | + * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
158 | + */ |
|
159 | 159 | do_action( 'gravityview_list_body_before', \GravityView_View::getInstance() /** ugh! */ ); |
160 | 160 | } |
161 | 161 | |
@@ -177,11 +177,11 @@ discard block |
||
177 | 177 | do_action( 'gravityview/template/list/body/after', $context ); |
178 | 178 | |
179 | 179 | /** |
180 | - * @action `gravityview_list_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows. |
|
181 | - * @deprecated Use `gravityview/template/list/body/after` |
|
182 | - * @since 1.0.7 |
|
183 | - * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
184 | - */ |
|
180 | + * @action `gravityview_list_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows. |
|
181 | + * @deprecated Use `gravityview/template/list/body/after` |
|
182 | + * @since 1.0.7 |
|
183 | + * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
184 | + */ |
|
185 | 185 | do_action( 'gravityview_list_body_after', \GravityView_View::getInstance() /** ugh! */ ); |
186 | 186 | } |
187 | 187 | |
@@ -212,11 +212,11 @@ discard block |
||
212 | 212 | $zone = str_replace( '/', '_', $zone ); |
213 | 213 | |
214 | 214 | /** |
215 | - * @action `gravityview_list_entry_$zone_before` Inside the `entry`, before any rows are rendered. Can be used to insert additional rows. |
|
216 | - * @deprecated Use `gravityview/template/list/entry/$zone/before` |
|
217 | - * @since 1.0.7 |
|
218 | - * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
219 | - */ |
|
215 | + * @action `gravityview_list_entry_$zone_before` Inside the `entry`, before any rows are rendered. Can be used to insert additional rows. |
|
216 | + * @deprecated Use `gravityview/template/list/entry/$zone/before` |
|
217 | + * @since 1.0.7 |
|
218 | + * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
219 | + */ |
|
220 | 220 | do_action( sprintf( 'gravityview_list_entry%sbefore', $zone ), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */ ); |
221 | 221 | } |
222 | 222 | |
@@ -247,11 +247,11 @@ discard block |
||
247 | 247 | $zone = str_replace( '/', '_', $zone ); |
248 | 248 | |
249 | 249 | /** |
250 | - * @action `gravityview_list_entry_$zone_after` Inside the `entry`, after any rows are rendered. Can be used to insert additional rows. |
|
251 | - * @deprecated Use `gravityview/template/list/entry/after` |
|
252 | - * @since 1.0.7 |
|
253 | - * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
254 | - */ |
|
250 | + * @action `gravityview_list_entry_$zone_after` Inside the `entry`, after any rows are rendered. Can be used to insert additional rows. |
|
251 | + * @deprecated Use `gravityview/template/list/entry/after` |
|
252 | + * @since 1.0.7 |
|
253 | + * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
254 | + */ |
|
255 | 255 | do_action( sprintf( 'gravityview_list_entry%safter', $zone ), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */ ); |
256 | 256 | } |
257 | 257 | } |
@@ -29,9 +29,9 @@ discard block |
||
29 | 29 | public function the_field( \GV\Field $field, \GV\Entry $entry, $extras = null ) { |
30 | 30 | $form = $this->view->form; |
31 | 31 | |
32 | - if ( isset( $this->view->unions[ $entry['form_id'] ] ) ) { |
|
33 | - if ( isset( $this->view->unions[ $entry['form_id'] ][ $field->ID ] ) ) { |
|
34 | - $field = $this->view->unions[ $entry['form_id'] ][ $field->ID ]; |
|
32 | + if ( isset( $this->view->unions[ $entry[ 'form_id' ] ] ) ) { |
|
33 | + if ( isset( $this->view->unions[ $entry[ 'form_id' ] ][ $field->ID ] ) ) { |
|
34 | + $field = $this->view->unions[ $entry[ 'form_id' ] ][ $field->ID ]; |
|
35 | 35 | } elseif ( ! $field instanceof Internal_Field ) { |
36 | 36 | $field = Internal_Field::from_configuration( array( 'id' => 'custom' ) ); |
37 | 37 | } |
@@ -81,13 +81,13 @@ discard block |
||
81 | 81 | $hide_empty = apply_filters( 'gravityview/render/hide-empty-zone', Utils::get( $extras, 'hide_empty', $this->view->settings->get( 'hide_empty', false ) ), $context ); |
82 | 82 | |
83 | 83 | if ( is_numeric( $field->ID ) ) { |
84 | - $extras['field'] = $field->as_configuration(); |
|
84 | + $extras[ 'field' ] = $field->as_configuration(); |
|
85 | 85 | } |
86 | 86 | |
87 | - $extras['entry'] = $entry->as_entry(); |
|
88 | - $extras['hide_empty'] = $hide_empty; |
|
89 | - $extras['label'] = $label; |
|
90 | - $extras['value'] = $value; |
|
87 | + $extras[ 'entry' ] = $entry->as_entry(); |
|
88 | + $extras[ 'hide_empty' ] = $hide_empty; |
|
89 | + $extras[ 'label' ] = $label; |
|
90 | + $extras[ 'value' ] = $value; |
|
91 | 91 | |
92 | 92 | return \gravityview_field_output( $extras, $context ); |
93 | 93 | } |
@@ -195,7 +195,6 @@ discard block |
||
195 | 195 | * |
196 | 196 | * @deprecated 2.0.7 |
197 | 197 | * |
198 | - * @param array $handles Array of meta keys to check for existence of shortcodes |
|
199 | 198 | * @param int $post_id The ID being checked by GravityView |
200 | 199 | * |
201 | 200 | * @return array Meta key array, merged with existing meta keys |
@@ -209,7 +208,6 @@ discard block |
||
209 | 208 | * |
210 | 209 | * @since 2.0.7 |
211 | 210 | * |
212 | - * @param array $handles Array of meta keys to check for existence of shortcodes |
|
213 | 211 | * @param \WP_Post $post The ID being checked by GravityView |
214 | 212 | * |
215 | 213 | * @return array Meta key array, merged with existing meta keys |
@@ -110,9 +110,9 @@ discard block |
||
110 | 110 | private function maybe_add_hooks() { |
111 | 111 | $class_exists = $this->class_name && class_exists( $this->class_name ); |
112 | 112 | $function_exists = $this->function_name && function_exists( $this->function_name ); |
113 | - $constant_defined = $this->constant_name && defined("{$this->constant_name}"); |
|
113 | + $constant_defined = $this->constant_name && defined( "{$this->constant_name}" ); |
|
114 | 114 | |
115 | - if( $class_exists || $function_exists || $constant_defined ) { |
|
115 | + if ( $class_exists || $function_exists || $constant_defined ) { |
|
116 | 116 | $this->add_hooks(); |
117 | 117 | } |
118 | 118 | } |
@@ -124,23 +124,23 @@ discard block |
||
124 | 124 | */ |
125 | 125 | protected function add_hooks() { |
126 | 126 | |
127 | - if( $this->meta_keys ) { |
|
127 | + if ( $this->meta_keys ) { |
|
128 | 128 | add_filter( 'gravityview/data/parse/meta_keys', array( $this, 'merge_meta_keys' ), 10, 2 ); |
129 | 129 | } |
130 | 130 | |
131 | - if( $this->content_meta_keys ) { |
|
131 | + if ( $this->content_meta_keys ) { |
|
132 | 132 | add_filter( 'gravityview/view_collection/from_post/meta_keys', array( $this, 'merge_content_meta_keys' ), 10, 3 ); |
133 | 133 | } |
134 | 134 | |
135 | - if( $this->script_handles ) { |
|
135 | + if ( $this->script_handles ) { |
|
136 | 136 | add_filter( 'gravityview_noconflict_scripts', array( $this, 'merge_noconflict_scripts' ) ); |
137 | 137 | } |
138 | 138 | |
139 | - if( $this->style_handles ) { |
|
139 | + if ( $this->style_handles ) { |
|
140 | 140 | add_filter( 'gravityview_noconflict_styles', array( $this, 'merge_noconflict_styles' ) ); |
141 | 141 | } |
142 | 142 | |
143 | - if( $this->post_type_support ) { |
|
143 | + if ( $this->post_type_support ) { |
|
144 | 144 | add_filter( 'gravityview_post_type_support', array( $this, 'merge_post_type_support' ), 10, 2 ); |
145 | 145 | } |
146 | 146 | } |
@@ -39,19 +39,19 @@ discard block |
||
39 | 39 | */ |
40 | 40 | function merge_content_meta_keys( $meta_keys = array(), $post = null, & $views = null ) { |
41 | 41 | |
42 | - if( empty( $post->panels_data ) || empty( $post->panels_data['widgets'] ) ) { |
|
42 | + if ( empty( $post->panels_data ) || empty( $post->panels_data[ 'widgets' ] ) ) { |
|
43 | 43 | return $meta_keys; |
44 | 44 | } |
45 | 45 | |
46 | - foreach ( (array) $post->panels_data['widgets'] as $widget ) { |
|
46 | + foreach ( (array)$post->panels_data[ 'widgets' ] as $widget ) { |
|
47 | 47 | |
48 | 48 | $views->merge( \GV\View_Collection::from_content( \GV\Utils::get( $widget, 'text' ) ) ); |
49 | 49 | |
50 | - if ( empty( $widget['tabs'] ) || ! is_array( $widget['tabs'] ) ) { |
|
50 | + if ( empty( $widget[ 'tabs' ] ) || ! is_array( $widget[ 'tabs' ] ) ) { |
|
51 | 51 | continue; |
52 | 52 | } |
53 | 53 | |
54 | - foreach ( $widget['tabs'] as $tab ) { |
|
54 | + foreach ( $widget[ 'tabs' ] as $tab ) { |
|
55 | 55 | |
56 | 56 | // Livemesh Tabs |
57 | 57 | $backup = \GV\Utils::get( $tab, 'tab_content' ); |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | // SiteOrigin Tabs |
60 | 60 | $content = \GV\Utils::get( $tab, 'content_text', $backup ); |
61 | 61 | |
62 | - if( $content ) { |
|
62 | + if ( $content ) { |
|
63 | 63 | $views->merge( \GV\View_Collection::from_content( $content ) ); |
64 | 64 | } |
65 | 65 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | |
56 | 56 | $acf_keys = get_field_objects( $post->ID, array( 'load_value' => false ) ); |
57 | 57 | |
58 | - if( $acf_keys ) { |
|
58 | + if ( $acf_keys ) { |
|
59 | 59 | return array_merge( array_keys( $acf_keys ), $meta_keys ); |
60 | 60 | } |
61 | 61 | |
@@ -70,9 +70,9 @@ discard block |
||
70 | 70 | * @return void |
71 | 71 | */ |
72 | 72 | private function fix_posted_fields() { |
73 | - if( is_admin() && isset( $_POST['action'] ) && isset( $_POST['post_type'] ) ) { |
|
74 | - if( 'editpost' === $_POST['action'] && 'gravityview' === $_POST['post_type'] ) { |
|
75 | - $_POST['fields'] = _gravityview_process_posted_fields(); |
|
73 | + if ( is_admin() && isset( $_POST[ 'action' ] ) && isset( $_POST[ 'post_type' ] ) ) { |
|
74 | + if ( 'editpost' === $_POST[ 'action' ] && 'gravityview' === $_POST[ 'post_type' ] ) { |
|
75 | + $_POST[ 'fields' ] = _gravityview_process_posted_fields(); |
|
76 | 76 | } |
77 | 77 | } |
78 | 78 | } |
@@ -24,9 +24,8 @@ |
||
24 | 24 | /** |
25 | 25 | * Get a \GV\Field by Field ID for this data source. |
26 | 26 | * |
27 | - * @param int $field_id The internal field ID (custom content, etc.) |
|
28 | 27 | * |
29 | - * @return \GV\Field|null The requested field or null if not found. |
|
28 | + * @return null|Internal_Field The requested field or null if not found. |
|
30 | 29 | */ |
31 | 30 | public static function get_field( /** varargs */ ) { |
32 | 31 | $args = func_get_args(); |
@@ -29,12 +29,12 @@ |
||
29 | 29 | */ |
30 | 30 | public static function from_configuration( $configuration ) { |
31 | 31 | |
32 | - if ( empty( $configuration['id'] ) || ! is_string( $configuration['id'] ) ) { |
|
32 | + if ( empty( $configuration[ 'id' ] ) || ! is_string( $configuration[ 'id' ] ) ) { |
|
33 | 33 | gravityview()->log->error( 'Invalid configuration[id] supplied.' ); |
34 | 34 | return null; |
35 | 35 | } |
36 | 36 | |
37 | - $field = self::by_id( $configuration['id'] ); |
|
37 | + $field = self::by_id( $configuration[ 'id' ] ); |
|
38 | 38 | |
39 | 39 | $field->update_configuration( $configuration ); |
40 | 40 |
@@ -53,7 +53,6 @@ discard block |
||
53 | 53 | * Columns are able to be added to View layouts, but not separately searched! |
54 | 54 | * |
55 | 55 | * @param array $fields |
56 | - * @param int $form_id |
|
57 | 56 | * |
58 | 57 | * @return array |
59 | 58 | */ |
@@ -133,7 +132,7 @@ discard block |
||
133 | 132 | * |
134 | 133 | * @param GF_Field_List $field Gravity Forms field |
135 | 134 | * @param string|array $field_value Serialized or unserialized array value for the field |
136 | - * @param int|string $column_id The numeric key of the column (0-index) or the label of the column |
|
135 | + * @param integer $column_id The numeric key of the column (0-index) or the label of the column |
|
137 | 136 | * @param string $format If set to 'raw', return an array of values for the column. Otherwise, allow Gravity Forms to render using `html` or `text` |
138 | 137 | * |
139 | 138 | * @return array|string|null Returns null if the $field_value passed wasn't an array or serialized array |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | public function remove_columns_from_searchable_fields( $fields ) { |
61 | 61 | |
62 | 62 | foreach ( $fields as $key => $field ) { |
63 | - if ( isset( $field['parent'] ) && $field['parent'] instanceof \GF_Field_List ) { |
|
63 | + if ( isset( $field[ 'parent' ] ) && $field[ 'parent' ] instanceof \GF_Field_List ) { |
|
64 | 64 | unset( $fields[ $key ] ); |
65 | 65 | } |
66 | 66 | } |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | // Add the list columns |
87 | 87 | foreach ( $list_fields as $list_field ) { |
88 | 88 | |
89 | - if( empty( $list_field->enableColumns ) ) { |
|
89 | + if ( empty( $list_field->enableColumns ) ) { |
|
90 | 90 | continue; |
91 | 91 | } |
92 | 92 | |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | } |
108 | 108 | |
109 | 109 | // If there are columns, add them under the parent field |
110 | - if( ! empty( $list_columns ) ) { |
|
110 | + if ( ! empty( $list_columns ) ) { |
|
111 | 111 | |
112 | 112 | $index = array_search( $list_field->id, array_keys( $fields ) ) + 1; |
113 | 113 | |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | * Merge the $list_columns into the $fields array at $index |
116 | 116 | * @see https://stackoverflow.com/a/1783125 |
117 | 117 | */ |
118 | - $fields = array_slice( $fields, 0, $index, true) + $list_columns + array_slice( $fields, $index, null, true); |
|
118 | + $fields = array_slice( $fields, 0, $index, true ) + $list_columns + array_slice( $fields, $index, null, true ); |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | unset( $list_columns, $index, $input_id ); |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | |
143 | 143 | $list_rows = maybe_unserialize( $field_value ); |
144 | 144 | |
145 | - if( ! is_array( $list_rows ) ) { |
|
145 | + if ( ! is_array( $list_rows ) ) { |
|
146 | 146 | gravityview()->log->error( '$field_value did not unserialize', array( 'data' => $field_value ) ); |
147 | 147 | return null; |
148 | 148 | } |
@@ -152,18 +152,18 @@ discard block |
||
152 | 152 | // Each list row |
153 | 153 | foreach ( $list_rows as $list_row ) { |
154 | 154 | $current_column = 0; |
155 | - foreach ( (array) $list_row as $column_key => $column_value ) { |
|
155 | + foreach ( (array)$list_row as $column_key => $column_value ) { |
|
156 | 156 | |
157 | 157 | // If the label of the column matches $column_id, or the numeric key value matches, add the value |
158 | - if( (string)$column_key === (string)$column_id || ( is_numeric( $column_id ) && (int)$column_id === $current_column ) ) { |
|
159 | - $column_values[] = $column_value; |
|
158 | + if ( (string)$column_key === (string)$column_id || ( is_numeric( $column_id ) && (int)$column_id === $current_column ) ) { |
|
159 | + $column_values[ ] = $column_value; |
|
160 | 160 | } |
161 | 161 | $current_column++; |
162 | 162 | } |
163 | 163 | } |
164 | 164 | |
165 | 165 | // Return the array of values |
166 | - if( 'raw' === $format ) { |
|
166 | + if ( 'raw' === $format ) { |
|
167 | 167 | return $column_values; |
168 | 168 | } |
169 | 169 | // Return the Gravity Forms Field output |
@@ -186,22 +186,22 @@ discard block |
||
186 | 186 | */ |
187 | 187 | public function _filter_field_label( $label, $field, $form, $entry ) { |
188 | 188 | |
189 | - $field_object = RGFormsModel::get_field( $form, $field['id'] ); |
|
189 | + $field_object = RGFormsModel::get_field( $form, $field[ 'id' ] ); |
|
190 | 190 | |
191 | 191 | // Not a list field |
192 | - if( ! $field_object || 'list' !== $field_object->type ) { |
|
192 | + if ( ! $field_object || 'list' !== $field_object->type ) { |
|
193 | 193 | return $label; |
194 | 194 | } |
195 | 195 | |
196 | 196 | // Custom label is defined, so use it |
197 | - if( ! empty( $field['custom_label'] ) ) { |
|
197 | + if ( ! empty( $field[ 'custom_label' ] ) ) { |
|
198 | 198 | return $label; |
199 | 199 | } |
200 | 200 | |
201 | - $column_id = gravityview_get_input_id_from_id( $field['id'] ); |
|
201 | + $column_id = gravityview_get_input_id_from_id( $field[ 'id' ] ); |
|
202 | 202 | |
203 | 203 | // Parent field, not column field |
204 | - if( false === $column_id ) { |
|
204 | + if ( false === $column_id ) { |
|
205 | 205 | return $label; |
206 | 206 | } |
207 | 207 | |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | public static function get_column_label( GF_Field_List $field, $column_id, $backup_label = '' ) { |
223 | 223 | |
224 | 224 | // Doesn't have columns enabled |
225 | - if( ! isset( $field->choices ) || ! $field->enableColumns ) { |
|
225 | + if ( ! isset( $field->choices ) || ! $field->enableColumns ) { |
|
226 | 226 | return $backup_label; |
227 | 227 | } |
228 | 228 |
@@ -603,7 +603,8 @@ discard block |
||
603 | 603 | // Fast-forward 24 hour on the end time |
604 | 604 | $curr_end = date( 'Y-m-d H:i:s', strtotime( $curr_end ) + DAY_IN_SECONDS ); |
605 | 605 | $search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end; |
606 | - if ( strpos( $search_criteria['end_date'], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056 |
|
606 | + if ( strpos( $search_criteria['end_date'], '00:00:00' ) ) { |
|
607 | +// See https://github.com/gravityview/GravityView/issues/1056 |
|
607 | 608 | $search_criteria['end_date'] = date( 'Y-m-d H:i:s', strtotime( $search_criteria['end_date'] ) - 1 ); |
608 | 609 | } |
609 | 610 | } |
@@ -874,7 +875,7 @@ discard block |
||
874 | 875 | 'ymd_dot' => 'Y.m.d', |
875 | 876 | ); |
876 | 877 | |
877 | - if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ){ |
|
878 | + if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ) { |
|
878 | 879 | $format = $datepicker[ $field->dateFormat ]; |
879 | 880 | } |
880 | 881 |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | /** |
247 | 247 | * Add admin script to the no-conflict scripts whitelist |
248 | 248 | * @param array $allowed Scripts allowed in no-conflict mode |
249 | - * @return array Scripts allowed in no-conflict mode, plus the search widget script |
|
249 | + * @return string[] Scripts allowed in no-conflict mode, plus the search widget script |
|
250 | 250 | */ |
251 | 251 | public function register_no_conflict( $allowed ) { |
252 | 252 | $allowed[] = 'gravityview_searchwidget_admin'; |
@@ -420,6 +420,7 @@ discard block |
||
420 | 420 | * Display hidden fields to add support for sites using Default permalink structure |
421 | 421 | * |
422 | 422 | * @since 1.8 |
423 | + * @param GravityView_Widget_Search $object |
|
423 | 424 | * @return array Search fields, modified if not using permalinks |
424 | 425 | */ |
425 | 426 | public function add_no_permalink_fields( $search_fields, $object, $widget_args = array() ) { |
@@ -729,7 +730,6 @@ discard block |
||
729 | 730 | * Dropin for the legacy flat filters when \GF_Query is available. |
730 | 731 | * |
731 | 732 | * @param \GF_Query $query The current query object reference |
732 | - * @param \GV\View $this The current view object |
|
733 | 733 | * @param \GV\Request $request The request object |
734 | 734 | */ |
735 | 735 | public function gf_query_filter( &$query, $view, $request ) { |
@@ -1428,7 +1428,7 @@ discard block |
||
1428 | 1428 | /** |
1429 | 1429 | * Get the label for a search form field |
1430 | 1430 | * @param array $field Field setting as sent by the GV configuration - has `field`, `input` (input type), and `label` keys |
1431 | - * @param array $form_field Form field data, as fetched by `gravityview_get_field()` |
|
1431 | + * @param GF_Field|null $form_field Form field data, as fetched by `gravityview_get_field()` |
|
1432 | 1432 | * @return string Label for the search form |
1433 | 1433 | */ |
1434 | 1434 | private static function get_field_label( $field, $form_field = array() ) { |
@@ -1486,7 +1486,7 @@ discard block |
||
1486 | 1486 | * @param array $field |
1487 | 1487 | * @param \GV\Context $context |
1488 | 1488 | * |
1489 | - * @return array |
|
1489 | + * @return GV\View |
|
1490 | 1490 | */ |
1491 | 1491 | private function get_search_filter_details( $field, $context ) { |
1492 | 1492 | |
@@ -1634,7 +1634,7 @@ discard block |
||
1634 | 1634 | /** |
1635 | 1635 | * Require the datepicker script for the frontend GV script |
1636 | 1636 | * @param array $js_dependencies Array of existing required scripts for the fe-views.js script |
1637 | - * @return array Array required scripts, with `jquery-ui-datepicker` added |
|
1637 | + * @return string[] Array required scripts, with `jquery-ui-datepicker` added |
|
1638 | 1638 | */ |
1639 | 1639 | public function add_datepicker_js_dependency( $js_dependencies ) { |
1640 | 1640 | |
@@ -1646,7 +1646,7 @@ discard block |
||
1646 | 1646 | /** |
1647 | 1647 | * Modify the array passed to wp_localize_script() |
1648 | 1648 | * |
1649 | - * @param array $js_localization The data padded to the Javascript file |
|
1649 | + * @param array $localizations The data padded to the Javascript file |
|
1650 | 1650 | * @param array $view_data View data array with View settings |
1651 | 1651 | * |
1652 | 1652 | * @return array |
@@ -1826,7 +1826,7 @@ discard block |
||
1826 | 1826 | * |
1827 | 1827 | * @param array $get Where to look for the operator. |
1828 | 1828 | * @param string $key The filter key to look for. |
1829 | - * @param array $allowed The allowed operators (whitelist). |
|
1829 | + * @param string[] $allowed The allowed operators (whitelist). |
|
1830 | 1830 | * @param string $default The default operator. |
1831 | 1831 | * |
1832 | 1832 | * @return string The operator. |
@@ -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 ) . ')'; |