@@ -505,8 +505,8 @@ discard block |
||
505 | 505 | */ |
506 | 506 | private function get_php_version() { |
507 | 507 | |
508 | - return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] ) ? |
|
509 | - $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion(); |
|
508 | + return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] ) ? |
|
509 | + $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] : phpversion(); |
|
510 | 510 | } |
511 | 511 | |
512 | 512 | /** |
@@ -518,8 +518,8 @@ discard block |
||
518 | 518 | */ |
519 | 519 | private function get_wordpress_version() { |
520 | 520 | |
521 | - return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] ) ? |
|
522 | - $GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] : $GLOBALS['wp_version']; |
|
521 | + return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] ) ? |
|
522 | + $GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] : $GLOBALS[ 'wp_version' ]; |
|
523 | 523 | } |
524 | 524 | |
525 | 525 | /** |
@@ -531,14 +531,14 @@ discard block |
||
531 | 531 | */ |
532 | 532 | private function get_gravityforms_version() { |
533 | 533 | |
534 | - if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE'] ) ) { |
|
534 | + if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE' ] ) ) { |
|
535 | 535 | gravityview()->log->error( 'Gravity Forms is inactive or not installed.' ); |
536 | 536 | |
537 | 537 | return null; |
538 | 538 | } |
539 | 539 | |
540 | - return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] ) ? |
|
541 | - $GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] : \GFCommon::$version; |
|
540 | + return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] ) ? |
|
541 | + $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] : \GFCommon::$version; |
|
542 | 542 | } |
543 | 543 | |
544 | 544 | /** |
@@ -584,7 +584,7 @@ discard block |
||
584 | 584 | $items = get_posts( array( |
585 | 585 | 'post_type' => 'gravityview', |
586 | 586 | 'post_status' => 'any', |
587 | - 'numberposts' => - 1, |
|
587 | + 'numberposts' => -1, |
|
588 | 588 | 'fields' => 'ids', |
589 | 589 | ) ); |
590 | 590 | |
@@ -598,9 +598,9 @@ discard block |
||
598 | 598 | $tables = array(); |
599 | 599 | |
600 | 600 | if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) { |
601 | - $tables [] = \GFFormsModel::get_entry_meta_table_name(); |
|
601 | + $tables [ ] = \GFFormsModel::get_entry_meta_table_name(); |
|
602 | 602 | } elseif ( ! $this->is_GF_25() ) { |
603 | - $tables [] = \GFFormsModel::get_lead_meta_table_name(); |
|
603 | + $tables [ ] = \GFFormsModel::get_lead_meta_table_name(); |
|
604 | 604 | } |
605 | 605 | |
606 | 606 | foreach ( $tables as $meta_table ) { |
@@ -619,9 +619,9 @@ discard block |
||
619 | 619 | $tables = array(); |
620 | 620 | |
621 | 621 | if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_notes_table_name' ) ) { |
622 | - $tables[] = \GFFormsModel::get_entry_notes_table_name(); |
|
622 | + $tables[ ] = \GFFormsModel::get_entry_notes_table_name(); |
|
623 | 623 | } elseif ( ! $this->is_GF_25() ) { |
624 | - $tables[] = \GFFormsModel::get_lead_notes_table_name(); |
|
624 | + $tables[ ] = \GFFormsModel::get_lead_notes_table_name(); |
|
625 | 625 | } |
626 | 626 | |
627 | 627 | $disapproved = __( 'Disapproved the Entry for GravityView', 'gravityview' ); |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | |
31 | 31 | $is_table_layout = preg_match( '/table/ism', $template_id ); |
32 | 32 | |
33 | - if( 'field' === $field_type ) { |
|
33 | + if ( 'field' === $field_type ) { |
|
34 | 34 | |
35 | 35 | // Default options - fields |
36 | 36 | $field_options = array( |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | 'custom_class' => array( |
50 | 50 | 'type' => 'text', |
51 | 51 | 'label' => __( 'Custom CSS Class:', 'gravityview' ), |
52 | - 'desc' => __( 'This class will be added to the field container', 'gravityview'), |
|
52 | + 'desc' => __( 'This class will be added to the field container', 'gravityview' ), |
|
53 | 53 | 'value' => '', |
54 | 54 | 'merge_tags' => true, |
55 | 55 | 'tooltip' => 'gv_css_merge_tags', |
@@ -70,11 +70,11 @@ discard block |
||
70 | 70 | ); |
71 | 71 | |
72 | 72 | // Match Table as well as DataTables |
73 | - if( $is_table_layout && 'directory' === $context ) { |
|
74 | - $field_options['width'] = array( |
|
73 | + if ( $is_table_layout && 'directory' === $context ) { |
|
74 | + $field_options[ 'width' ] = array( |
|
75 | 75 | 'type' => 'number', |
76 | - 'label' => __('Percent Width', 'gravityview'), |
|
77 | - 'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview'), |
|
76 | + 'label' => __( 'Percent Width', 'gravityview' ), |
|
77 | + 'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview' ), |
|
78 | 78 | 'class' => 'code widefat', |
79 | 79 | 'value' => '', |
80 | 80 | ); |
@@ -129,8 +129,8 @@ discard block |
||
129 | 129 | 'manage_options' => __( 'Administrator', 'gravityview' ), |
130 | 130 | ); |
131 | 131 | |
132 | - if( is_multisite() ) { |
|
133 | - $select_cap_choices['manage_network'] = __('Multisite Super Admin', 'gravityview' ); |
|
132 | + if ( is_multisite() ) { |
|
133 | + $select_cap_choices[ 'manage_network' ] = __( 'Multisite Super Admin', 'gravityview' ); |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | /** |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | * @param string $context Optional. What context are we in? Example: `single` or `directory` |
144 | 144 | * @param string $input_type Optional. (textarea, list, select, etc.) |
145 | 145 | */ |
146 | - $select_cap_choices = apply_filters('gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type ); |
|
146 | + $select_cap_choices = apply_filters( 'gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type ); |
|
147 | 147 | |
148 | 148 | return $select_cap_choices; |
149 | 149 | } |
@@ -170,27 +170,27 @@ discard block |
||
170 | 170 | */ |
171 | 171 | public static function render_field_options( $form_id, $field_type, $template_id, $field_id, $field_label, $area, $input_type = NULL, $uniqid = '', $current = '', $context = 'single', $item = array() ) { |
172 | 172 | |
173 | - if( empty( $uniqid ) ) { |
|
173 | + if ( empty( $uniqid ) ) { |
|
174 | 174 | //generate a unique field id |
175 | - $uniqid = uniqid('', false); |
|
175 | + $uniqid = uniqid( '', false ); |
|
176 | 176 | } |
177 | 177 | |
178 | 178 | // get field/widget options |
179 | 179 | $options = self::get_default_field_options( $field_type, $template_id, $field_id, $context, $input_type, $form_id ); |
180 | 180 | |
181 | 181 | // two different post arrays, depending of the field type |
182 | - $name_prefix = $field_type .'s' .'['. $area .']['. $uniqid .']'; |
|
182 | + $name_prefix = $field_type . 's' . '[' . $area . '][' . $uniqid . ']'; |
|
183 | 183 | |
184 | 184 | // build output |
185 | 185 | $output = ''; |
186 | - $output .= '<input type="hidden" class="field-key" name="'. $name_prefix .'[id]" value="'. esc_attr( $field_id ) .'">'; |
|
187 | - $output .= '<input type="hidden" class="field-label" name="'. $name_prefix .'[label]" value="'. esc_attr( $field_label ) .'">'; |
|
186 | + $output .= '<input type="hidden" class="field-key" name="' . $name_prefix . '[id]" value="' . esc_attr( $field_id ) . '">'; |
|
187 | + $output .= '<input type="hidden" class="field-label" name="' . $name_prefix . '[label]" value="' . esc_attr( $field_label ) . '">'; |
|
188 | 188 | if ( $form_id ) { |
189 | - $output .= '<input type="hidden" class="field-form-id" name="'. $name_prefix .'[form_id]" value="'. esc_attr( $form_id ) .'">'; |
|
189 | + $output .= '<input type="hidden" class="field-form-id" name="' . $name_prefix . '[form_id]" value="' . esc_attr( $form_id ) . '">'; |
|
190 | 190 | } |
191 | 191 | |
192 | 192 | // If there are no options, return what we got. |
193 | - if(empty($options)) { |
|
193 | + if ( empty( $options ) ) { |
|
194 | 194 | |
195 | 195 | // This is here for checking if the output is empty in render_label() |
196 | 196 | $output .= '<!-- No Options -->'; |
@@ -198,33 +198,33 @@ discard block |
||
198 | 198 | return $output; |
199 | 199 | } |
200 | 200 | |
201 | - $output .= '<div class="gv-dialog-options" title="'. esc_attr( sprintf( __( 'Options: %s', 'gravityview' ) , strip_tags( html_entity_decode( $field_label ) ) ) ) .'">'; |
|
201 | + $output .= '<div class="gv-dialog-options" title="' . esc_attr( sprintf( __( 'Options: %s', 'gravityview' ), strip_tags( html_entity_decode( $field_label ) ) ) ) . '">'; |
|
202 | 202 | |
203 | 203 | /** |
204 | 204 | * @since 1.8 |
205 | 205 | */ |
206 | - if( !empty( $item['subtitle'] ) ) { |
|
207 | - $output .= '<div class="subtitle">' . $item['subtitle'] . '</div>'; |
|
206 | + if ( ! empty( $item[ 'subtitle' ] ) ) { |
|
207 | + $output .= '<div class="subtitle">' . $item[ 'subtitle' ] . '</div>'; |
|
208 | 208 | } |
209 | 209 | |
210 | - foreach( $options as $key => $option ) { |
|
210 | + foreach ( $options as $key => $option ) { |
|
211 | 211 | |
212 | 212 | $value = isset( $current[ $key ] ) ? $current[ $key ] : NULL; |
213 | 213 | |
214 | - $field_output = self::render_field_option( $name_prefix . '['. $key .']' , $option, $value); |
|
214 | + $field_output = self::render_field_option( $name_prefix . '[' . $key . ']', $option, $value ); |
|
215 | 215 | |
216 | 216 | // The setting is empty |
217 | - if( empty( $field_output ) ) { |
|
217 | + if ( empty( $field_output ) ) { |
|
218 | 218 | continue; |
219 | 219 | } |
220 | 220 | |
221 | - switch( $option['type'] ) { |
|
221 | + switch ( $option[ 'type' ] ) { |
|
222 | 222 | // Hide hidden fields |
223 | 223 | case 'hidden': |
224 | - $output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . ' screen-reader-text">'. $field_output . '</div>'; |
|
224 | + $output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . ' screen-reader-text">' . $field_output . '</div>'; |
|
225 | 225 | break; |
226 | 226 | default: |
227 | - $output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . '">'. $field_output .'</div>'; |
|
227 | + $output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . '">' . $field_output . '</div>'; |
|
228 | 228 | } |
229 | 229 | } |
230 | 230 | |
@@ -253,17 +253,17 @@ discard block |
||
253 | 253 | * @deprecated setting index 'default' was replaced by 'value' |
254 | 254 | * @see GravityView_FieldType::get_field_defaults |
255 | 255 | */ |
256 | - if( !empty( $option['default'] ) && empty( $option['value'] ) ) { |
|
257 | - $option['value'] = $option['default']; |
|
258 | - _deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting '. $name .' details' ); |
|
256 | + if ( ! empty( $option[ 'default' ] ) && empty( $option[ 'value' ] ) ) { |
|
257 | + $option[ 'value' ] = $option[ 'default' ]; |
|
258 | + _deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting ' . $name . ' details' ); |
|
259 | 259 | } |
260 | 260 | |
261 | 261 | // prepare to render option field type |
262 | - if( isset( $option['type'] ) ) { |
|
262 | + if ( isset( $option[ 'type' ] ) ) { |
|
263 | 263 | |
264 | 264 | $type_class = self::load_type_class( $option ); |
265 | 265 | |
266 | - if( class_exists( $type_class ) ) { |
|
266 | + if ( class_exists( $type_class ) ) { |
|
267 | 267 | |
268 | 268 | /** @type GravityView_FieldType $render_type */ |
269 | 269 | $render_type = new $type_class( $name, $option, $curr_value ); |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | * @param[in,out] string $output field class name |
281 | 281 | * @param[in] array $option option field data |
282 | 282 | */ |
283 | - $output = apply_filters( "gravityview/option/output/{$option['type']}" , $output, $option ); |
|
283 | + $output = apply_filters( "gravityview/option/output/{$option[ 'type' ]}", $output, $option ); |
|
284 | 284 | } |
285 | 285 | |
286 | 286 | } // isset option[type] |
@@ -315,27 +315,27 @@ discard block |
||
315 | 315 | * @deprecated setting index 'name' was replaced by 'label' |
316 | 316 | * @see GravityView_FieldType::get_field_defaults |
317 | 317 | */ |
318 | - if( isset( $setting['name'] ) && empty( $setting['label'] ) ) { |
|
319 | - $setting['label'] = $setting['name']; |
|
320 | - _deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting '. $key .' details' ); |
|
318 | + if ( isset( $setting[ 'name' ] ) && empty( $setting[ 'label' ] ) ) { |
|
319 | + $setting[ 'label' ] = $setting[ 'name' ]; |
|
320 | + _deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting ' . $key . ' details' ); |
|
321 | 321 | } |
322 | 322 | |
323 | 323 | $name = esc_attr( sprintf( $name, $key ) ); |
324 | - $setting['id'] = esc_attr( sprintf( $id, $key ) ); |
|
325 | - $setting['tooltip'] = 'gv_' . $key; |
|
324 | + $setting[ 'id' ] = esc_attr( sprintf( $id, $key ) ); |
|
325 | + $setting[ 'tooltip' ] = 'gv_' . $key; |
|
326 | 326 | |
327 | 327 | // Use default if current setting isn't set. |
328 | - $curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting['value']; |
|
328 | + $curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting[ 'value' ]; |
|
329 | 329 | |
330 | 330 | // default setting type = text |
331 | - $setting['type'] = empty( $setting['type'] ) ? 'text' : $setting['type']; |
|
331 | + $setting[ 'type' ] = empty( $setting[ 'type' ] ) ? 'text' : $setting[ 'type' ]; |
|
332 | 332 | |
333 | 333 | // merge tags |
334 | - if( !isset( $setting['merge_tags'] ) ) { |
|
335 | - if( $setting['type'] === 'text' ) { |
|
336 | - $setting['merge_tags'] = true; |
|
334 | + if ( ! isset( $setting[ 'merge_tags' ] ) ) { |
|
335 | + if ( $setting[ 'type' ] === 'text' ) { |
|
336 | + $setting[ 'merge_tags' ] = true; |
|
337 | 337 | } else { |
338 | - $setting['merge_tags'] = false; |
|
338 | + $setting[ 'merge_tags' ] = false; |
|
339 | 339 | } |
340 | 340 | } |
341 | 341 | |
@@ -343,7 +343,7 @@ discard block |
||
343 | 343 | |
344 | 344 | // render the setting |
345 | 345 | $type_class = self::load_type_class( $setting ); |
346 | - if( class_exists( $type_class ) ) { |
|
346 | + if ( class_exists( $type_class ) ) { |
|
347 | 347 | /** @type GravityView_FieldType $render_type */ |
348 | 348 | $render_type = new $type_class( $name, $setting, $curr_value ); |
349 | 349 | ob_start(); |
@@ -352,25 +352,25 @@ discard block |
||
352 | 352 | } |
353 | 353 | |
354 | 354 | // Check if setting is specific for a template |
355 | - if( !empty( $setting['show_in_template'] ) ) { |
|
356 | - if( !is_array( $setting['show_in_template'] ) ) { |
|
357 | - $setting['show_in_template'] = array( $setting['show_in_template'] ); |
|
355 | + if ( ! empty( $setting[ 'show_in_template' ] ) ) { |
|
356 | + if ( ! is_array( $setting[ 'show_in_template' ] ) ) { |
|
357 | + $setting[ 'show_in_template' ] = array( $setting[ 'show_in_template' ] ); |
|
358 | 358 | } |
359 | - $show_if = ' data-show-if="'. implode( ' ', $setting['show_in_template'] ).'"'; |
|
359 | + $show_if = ' data-show-if="' . implode( ' ', $setting[ 'show_in_template' ] ) . '"'; |
|
360 | 360 | } else { |
361 | 361 | $show_if = ''; |
362 | 362 | } |
363 | 363 | |
364 | - if( ! empty( $setting['requires'] ) ) { |
|
365 | - $show_if .= sprintf( ' data-requires="%s"', $setting['requires'] ); |
|
364 | + if ( ! empty( $setting[ 'requires' ] ) ) { |
|
365 | + $show_if .= sprintf( ' data-requires="%s"', $setting[ 'requires' ] ); |
|
366 | 366 | } |
367 | 367 | |
368 | - if( ! empty( $setting['requires_not'] ) ) { |
|
369 | - $show_if .= sprintf( ' data-requires-not="%s"', $setting['requires_not'] ); |
|
368 | + if ( ! empty( $setting[ 'requires_not' ] ) ) { |
|
369 | + $show_if .= sprintf( ' data-requires-not="%s"', $setting[ 'requires_not' ] ); |
|
370 | 370 | } |
371 | 371 | |
372 | 372 | // output |
373 | - echo '<tr style="vertical-align: top;" '. $show_if .'>' . $output . '</tr>'; |
|
373 | + echo '<tr style="vertical-align: top;" ' . $show_if . '>' . $output . '</tr>'; |
|
374 | 374 | |
375 | 375 | } |
376 | 376 | |
@@ -382,7 +382,7 @@ discard block |
||
382 | 382 | */ |
383 | 383 | public static function load_type_class( $field = NULL ) { |
384 | 384 | |
385 | - if( empty( $field['type'] ) ) { |
|
385 | + if ( empty( $field[ 'type' ] ) ) { |
|
386 | 386 | return NULL; |
387 | 387 | } |
388 | 388 | |
@@ -391,9 +391,9 @@ discard block |
||
391 | 391 | * @param string $class_suffix field class suffix; `GravityView_FieldType_{$class_suffix}` |
392 | 392 | * @param array $field field data |
393 | 393 | */ |
394 | - $type_class = apply_filters( "gravityview/setting/class/{$field['type']}", 'GravityView_FieldType_' . $field['type'], $field ); |
|
394 | + $type_class = apply_filters( "gravityview/setting/class/{$field[ 'type' ]}", 'GravityView_FieldType_' . $field[ 'type' ], $field ); |
|
395 | 395 | |
396 | - if( class_exists( $type_class ) ) { |
|
396 | + if ( class_exists( $type_class ) ) { |
|
397 | 397 | return $type_class; |
398 | 398 | } |
399 | 399 | |
@@ -402,9 +402,9 @@ discard block |
||
402 | 402 | * @param string $field_type_include_path field class file path |
403 | 403 | * @param array $field field data |
404 | 404 | */ |
405 | - $class_file = apply_filters( "gravityview/setting/class_file/{$field['type']}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field['type']}.php", $field ); |
|
405 | + $class_file = apply_filters( "gravityview/setting/class_file/{$field[ 'type' ]}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field[ 'type' ]}.php", $field ); |
|
406 | 406 | |
407 | - if( $class_file && file_exists( $class_file ) ) { |
|
407 | + if ( $class_file && file_exists( $class_file ) ) { |
|
408 | 408 | require_once( $class_file ); |
409 | 409 | } |
410 | 410 | |
@@ -426,8 +426,8 @@ discard block |
||
426 | 426 | |
427 | 427 | _deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_checkbox::render_input' ); |
428 | 428 | |
429 | - $output = '<input name="'. esc_attr( $name ) .'" type="hidden" value="0">'; |
|
430 | - $output .= '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="checkbox" value="1" '. checked( $current, '1', false ) .' >'; |
|
429 | + $output = '<input name="' . esc_attr( $name ) . '" type="hidden" value="0">'; |
|
430 | + $output .= '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="checkbox" value="1" ' . checked( $current, '1', false ) . ' >'; |
|
431 | 431 | |
432 | 432 | return $output; |
433 | 433 | } |
@@ -447,22 +447,22 @@ discard block |
||
447 | 447 | _deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_text::render_input' ); |
448 | 448 | |
449 | 449 | // Show the merge tags if the field is a list view |
450 | - $is_list = ( preg_match( '/_list-/ism', $name )); |
|
450 | + $is_list = ( preg_match( '/_list-/ism', $name ) ); |
|
451 | 451 | |
452 | 452 | // Or is a single entry view |
453 | - $is_single = ( preg_match( '/single_/ism', $name )); |
|
453 | + $is_single = ( preg_match( '/single_/ism', $name ) ); |
|
454 | 454 | $show = ( $is_single || $is_list ); |
455 | 455 | |
456 | 456 | $class = ''; |
457 | 457 | // and $add_merge_tags is not false |
458 | - if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) { |
|
458 | + if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) { |
|
459 | 459 | $class = 'merge-tag-support mt-position-right mt-hide_all_fields '; |
460 | 460 | } |
461 | 461 | |
462 | - $class .= !empty( $args['class'] ) ? $args['class'] : 'widefat'; |
|
463 | - $type = !empty( $args['type'] ) ? $args['type'] : 'text'; |
|
462 | + $class .= ! empty( $args[ 'class' ] ) ? $args[ 'class' ] : 'widefat'; |
|
463 | + $type = ! empty( $args[ 'type' ] ) ? $args[ 'type' ] : 'text'; |
|
464 | 464 | |
465 | - return '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="'.esc_attr($type).'" value="'. esc_attr( $current ) .'" class="'.esc_attr( $class ).'">'; |
|
465 | + return '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="' . esc_attr( $type ) . '" value="' . esc_attr( $current ) . '" class="' . esc_attr( $class ) . '">'; |
|
466 | 466 | } |
467 | 467 | |
468 | 468 | /** |
@@ -479,21 +479,21 @@ discard block |
||
479 | 479 | _deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_textarea::render_input' ); |
480 | 480 | |
481 | 481 | // Show the merge tags if the field is a list view |
482 | - $is_list = ( preg_match( '/_list-/ism', $name )); |
|
482 | + $is_list = ( preg_match( '/_list-/ism', $name ) ); |
|
483 | 483 | |
484 | 484 | // Or is a single entry view |
485 | - $is_single = ( preg_match( '/single_/ism', $name )); |
|
485 | + $is_single = ( preg_match( '/single_/ism', $name ) ); |
|
486 | 486 | $show = ( $is_single || $is_list ); |
487 | 487 | |
488 | 488 | $class = ''; |
489 | 489 | // and $add_merge_tags is not false |
490 | - if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) { |
|
490 | + if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) { |
|
491 | 491 | $class = 'merge-tag-support mt-position-right mt-hide_all_fields '; |
492 | 492 | } |
493 | 493 | |
494 | - $class .= !empty( $args['class'] ) ? 'widefat '.$args['class'] : 'widefat'; |
|
494 | + $class .= ! empty( $args[ 'class' ] ) ? 'widefat ' . $args[ 'class' ] : 'widefat'; |
|
495 | 495 | |
496 | - return '<textarea name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" class="'.esc_attr( $class ).'">'. esc_textarea( $current ) .'</textarea>'; |
|
496 | + return '<textarea name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class ) . '">' . esc_textarea( $current ) . '</textarea>'; |
|
497 | 497 | } |
498 | 498 | |
499 | 499 | /** |
@@ -509,9 +509,9 @@ discard block |
||
509 | 509 | |
510 | 510 | _deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_select::render_input' ); |
511 | 511 | |
512 | - $output = '<select name="'. $name .'" id="'. $id .'">'; |
|
513 | - foreach( $choices as $value => $label ) { |
|
514 | - $output .= '<option value="'. esc_attr( $value ) .'" '. selected( $value, $current, false ) .'>'. esc_html( $label ) .'</option>'; |
|
512 | + $output = '<select name="' . $name . '" id="' . $id . '">'; |
|
513 | + foreach ( $choices as $value => $label ) { |
|
514 | + $output .= '<option value="' . esc_attr( $value ) . '" ' . selected( $value, $current, false ) . '>' . esc_html( $label ) . '</option>'; |
|
515 | 515 | } |
516 | 516 | $output .= '</select>'; |
517 | 517 |
@@ -50,13 +50,13 @@ discard block |
||
50 | 50 | * |
51 | 51 | * @return array Blacklist, with "total" added. If not edit context, original field blacklist. Otherwise, blacklist including total. |
52 | 52 | */ |
53 | - public function add_to_blacklist( $blacklist = array(), $context = NULL ){ |
|
53 | + public function add_to_blacklist( $blacklist = array(), $context = NULL ) { |
|
54 | 54 | |
55 | - if( empty( $context ) || $context !== 'edit' ) { |
|
55 | + if ( empty( $context ) || $context !== 'edit' ) { |
|
56 | 56 | return $blacklist; |
57 | 57 | } |
58 | 58 | |
59 | - $blacklist[] = 'total'; |
|
59 | + $blacklist[ ] = 'total'; |
|
60 | 60 | |
61 | 61 | return $blacklist; |
62 | 62 | } |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | */ |
75 | 75 | function edit_entry_recalculate_totals( $form = array(), $entry_id = 0, $Edit_Entry_Render = null ) { |
76 | 76 | |
77 | - $original_form = GFAPI::get_form( $form['id'] ); |
|
77 | + $original_form = GFAPI::get_form( $form[ 'id' ] ); |
|
78 | 78 | |
79 | 79 | $total_fields = GFCommon::get_fields_by_type( $original_form, 'total' ); |
80 | 80 | |
@@ -85,12 +85,12 @@ discard block |
||
85 | 85 | |
86 | 86 | /** @type GF_Field_Total $total_field */ |
87 | 87 | foreach ( $total_fields as $total_field ) { |
88 | - $entry["{$total_field->id}"] = GFCommon::get_order_total( $original_form, $entry ); |
|
88 | + $entry[ "{$total_field->id}" ] = GFCommon::get_order_total( $original_form, $entry ); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | $return_entry = GFAPI::update_entry( $entry ); |
92 | 92 | |
93 | - if( is_wp_error( $return_entry ) ) { |
|
93 | + if ( is_wp_error( $return_entry ) ) { |
|
94 | 94 | gravityview()->log->error( 'Updating the entry total fields failed', array( 'data' => $return_entry ) ); |
95 | 95 | } else { |
96 | 96 | gravityview()->log->debug( 'Updating the entry total fields succeeded' ); |
@@ -62,8 +62,8 @@ discard block |
||
62 | 62 | continue; |
63 | 63 | } |
64 | 64 | |
65 | - $field_id = intval( floor( $search_field['key'] ) ); |
|
66 | - $input_id = gravityview_get_input_id_from_id( $search_field['key'] ); |
|
65 | + $field_id = intval( floor( $search_field[ 'key' ] ) ); |
|
66 | + $input_id = gravityview_get_input_id_from_id( $search_field[ 'key' ] ); |
|
67 | 67 | $form = GravityView_View::getInstance()->getForm(); |
68 | 68 | |
69 | 69 | /** @type GF_Field_Address $address_field */ |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | $choices = array(); |
73 | 73 | |
74 | 74 | $method_name = 'get_choices_' . self::get_input_type_from_input_id( $input_id ); |
75 | - if( method_exists( $this, $method_name ) ) { |
|
75 | + if ( method_exists( $this, $method_name ) ) { |
|
76 | 76 | /** |
77 | 77 | * @uses GravityView_Field_Address::get_choices_country() |
78 | 78 | * @uses GravityView_Field_Address::get_choices_state() |
@@ -80,12 +80,12 @@ discard block |
||
80 | 80 | $choices = $this->{$method_name}( $address_field, $form ); |
81 | 81 | } |
82 | 82 | |
83 | - if( ! empty( $choices ) ) { |
|
84 | - $search_field['choices'] = $choices; |
|
85 | - $search_field['type'] = \GV\Utils::get( $search_field, 'input'); |
|
83 | + if ( ! empty( $choices ) ) { |
|
84 | + $search_field[ 'choices' ] = $choices; |
|
85 | + $search_field[ 'type' ] = \GV\Utils::get( $search_field, 'input' ); |
|
86 | 86 | } else { |
87 | - $search_field['type'] = 'text'; |
|
88 | - $search_field['input'] = 'input_text'; |
|
87 | + $search_field[ 'type' ] = 'text'; |
|
88 | + $search_field[ 'input' ] = 'input_text'; |
|
89 | 89 | } |
90 | 90 | } |
91 | 91 | |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | $country_choices = array(); |
111 | 111 | |
112 | 112 | foreach ( $countries as $key => $country ) { |
113 | - $country_choices[] = array( |
|
113 | + $country_choices[ ] = array( |
|
114 | 114 | 'value' => $country, |
115 | 115 | 'text' => $country, |
116 | 116 | ); |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | */ |
136 | 136 | private function get_choices_state( $address_field, $form ) { |
137 | 137 | |
138 | - $address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form['id'] ) : $address_field->addressType; |
|
138 | + $address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form[ 'id' ] ) : $address_field->addressType; |
|
139 | 139 | |
140 | 140 | $state_choices = array(); |
141 | 141 | |
@@ -147,8 +147,8 @@ discard block |
||
147 | 147 | $states = GFCommon::get_canadian_provinces(); |
148 | 148 | break; |
149 | 149 | default: |
150 | - $address_types = $address_field->get_address_types( $form['id'] ); |
|
151 | - $states = empty( $address_types[ $address_type ]['states'] ) ? array() : $address_types[ $address_type ]['states']; |
|
150 | + $address_types = $address_field->get_address_types( $form[ 'id' ] ); |
|
151 | + $states = empty( $address_types[ $address_type ][ 'states' ] ) ? array() : $address_types[ $address_type ][ 'states' ]; |
|
152 | 152 | break; |
153 | 153 | } |
154 | 154 | |
@@ -157,19 +157,19 @@ discard block |
||
157 | 157 | $state_subchoices = array(); |
158 | 158 | |
159 | 159 | foreach ( $state as $key => $substate ) { |
160 | - $state_subchoices[] = array( |
|
160 | + $state_subchoices[ ] = array( |
|
161 | 161 | 'value' => is_numeric( $key ) ? $substate : $key, |
162 | 162 | 'text' => $substate, |
163 | 163 | ); |
164 | 164 | } |
165 | 165 | |
166 | - $state_choices[] = array( |
|
166 | + $state_choices[ ] = array( |
|
167 | 167 | 'text' => $key, |
168 | 168 | 'value' => $state_subchoices, |
169 | 169 | ); |
170 | 170 | |
171 | 171 | } else { |
172 | - $state_choices[] = array( |
|
172 | + $state_choices[ ] = array( |
|
173 | 173 | 'value' => is_numeric( $key ) ? $state : $key, |
174 | 174 | 'text' => $state, |
175 | 175 | ); |
@@ -193,13 +193,13 @@ discard block |
||
193 | 193 | // Use the same inputs as the "text" input type allows |
194 | 194 | $text_inputs = \GV\Utils::get( $input_types, 'text' ); |
195 | 195 | |
196 | - $input_types['street'] = $text_inputs; |
|
197 | - $input_types['street2'] = $text_inputs; |
|
198 | - $input_types['city'] = $text_inputs; |
|
196 | + $input_types[ 'street' ] = $text_inputs; |
|
197 | + $input_types[ 'street2' ] = $text_inputs; |
|
198 | + $input_types[ 'city' ] = $text_inputs; |
|
199 | 199 | |
200 | - $input_types['state'] = array( 'select', 'radio', 'link' ) + $text_inputs; |
|
201 | - $input_types['zip'] = array( 'input_text' ); |
|
202 | - $input_types['country'] = array( 'select', 'radio', 'link' ) + $text_inputs; |
|
200 | + $input_types[ 'state' ] = array( 'select', 'radio', 'link' ) + $text_inputs; |
|
201 | + $input_types[ 'zip' ] = array( 'input_text' ); |
|
202 | + $input_types[ 'country' ] = array( 'select', 'radio', 'link' ) + $text_inputs; |
|
203 | 203 | |
204 | 204 | return $input_types; |
205 | 205 | } |
@@ -220,12 +220,12 @@ discard block |
||
220 | 220 | // Is this search field for an input (eg: 4.2) or the whole address field (eg: 4)? |
221 | 221 | $input_id = gravityview_get_input_id_from_id( $field_id ); |
222 | 222 | |
223 | - if( 'address' !== $field_type && $input_id ) { |
|
223 | + if ( 'address' !== $field_type && $input_id ) { |
|
224 | 224 | return $input_type; |
225 | 225 | } |
226 | 226 | |
227 | 227 | // If the input ID matches an expected address input, set to that. Otherwise, keep existing input type. |
228 | - if( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) { |
|
228 | + if ( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) { |
|
229 | 229 | $input_type = $address_field_name; |
230 | 230 | } |
231 | 231 | |
@@ -273,20 +273,20 @@ discard block |
||
273 | 273 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
274 | 274 | |
275 | 275 | // If this is NOT the full address field, return default options. |
276 | - if( floor( $field_id ) !== floatval( $field_id ) ) { |
|
276 | + if ( floor( $field_id ) !== floatval( $field_id ) ) { |
|
277 | 277 | return $field_options; |
278 | 278 | } |
279 | 279 | |
280 | - if( 'edit' === $context ) { |
|
280 | + if ( 'edit' === $context ) { |
|
281 | 281 | return $field_options; |
282 | 282 | } |
283 | 283 | |
284 | 284 | $add_options = array(); |
285 | 285 | |
286 | - $add_options['show_map_link'] = array( |
|
286 | + $add_options[ 'show_map_link' ] = array( |
|
287 | 287 | 'type' => 'checkbox', |
288 | 288 | 'label' => __( 'Show Map Link:', 'gravityview' ), |
289 | - 'desc' => __('Display a "Map It" link below the address', 'gravityview'), |
|
289 | + 'desc' => __( 'Display a "Map It" link below the address', 'gravityview' ), |
|
290 | 290 | 'value' => true, |
291 | 291 | 'merge_tags' => false, |
292 | 292 | ); |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | function edit_entry_fix_hidden_fields( $fields ) { |
50 | 50 | |
51 | 51 | /** @type GF_Field $field */ |
52 | - foreach( $fields as &$field ) { |
|
52 | + foreach ( $fields as &$field ) { |
|
53 | 53 | |
54 | 54 | if ( 'hidden' === $field->type ) { |
55 | 55 | |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | */ |
63 | 63 | $reveal_hidden_field = apply_filters( 'gravityview/edit_entry/reveal_hidden_field', false, $field ); |
64 | 64 | |
65 | - if( ! $reveal_hidden_field ) { |
|
65 | + if ( ! $reveal_hidden_field ) { |
|
66 | 66 | continue; |
67 | 67 | } |
68 | 68 |
@@ -50,7 +50,7 @@ |
||
50 | 50 | public function edit_entry_fix_uid_fields( $fields ) { |
51 | 51 | |
52 | 52 | /** @type \GF_Field $field */ |
53 | - foreach( $fields as &$field ) { |
|
53 | + foreach ( $fields as &$field ) { |
|
54 | 54 | if ( 'uid' === $field->type ) { |
55 | 55 | |
56 | 56 | // Replace GF_Field with GF_Field_Text, copying all the data from $field |
@@ -124,8 +124,8 @@ discard block |
||
124 | 124 | |
125 | 125 | $form = false; |
126 | 126 | |
127 | - if( $entry ) { |
|
128 | - $form = GFAPI::get_form( $entry['form_id'] ); |
|
127 | + if ( $entry ) { |
|
128 | + $form = GFAPI::get_form( $entry[ 'form_id' ] ); |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | return $form; |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | } |
202 | 202 | } |
203 | 203 | |
204 | - return (bool) $has_transaction_data; |
|
204 | + return (bool)$has_transaction_data; |
|
205 | 205 | } |
206 | 206 | |
207 | 207 | /** |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | |
240 | 240 | $results = GFAPI::get_entries( intval( $form_id ), $search_criteria, null, $paging ); |
241 | 241 | |
242 | - $result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null; |
|
242 | + $result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null; |
|
243 | 243 | |
244 | 244 | return $result; |
245 | 245 | } |
@@ -259,13 +259,13 @@ discard block |
||
259 | 259 | * |
260 | 260 | * @return array Empty array if GFAPI class isn't available or no forms. Otherwise, the array of Forms |
261 | 261 | */ |
262 | - public static function get_forms( $active = true, $trash = false, $order_by = 'id', $order = 'ASC' ) { |
|
262 | + public static function get_forms( $active = true, $trash = false, $order_by = 'id', $order = 'ASC' ) { |
|
263 | 263 | $forms = array(); |
264 | 264 | if ( ! class_exists( 'GFAPI' ) ) { |
265 | 265 | return array(); |
266 | 266 | } |
267 | 267 | |
268 | - if( 'any' === $active ) { |
|
268 | + if ( 'any' === $active ) { |
|
269 | 269 | $active_forms = GFAPI::get_forms( true, $trash ); |
270 | 270 | $inactive_forms = GFAPI::get_forms( false, $trash ); |
271 | 271 | $forms = array_merge( array_filter( $active_forms ), array_filter( $inactive_forms ) ); |
@@ -297,9 +297,9 @@ discard block |
||
297 | 297 | $has_post_fields = false; |
298 | 298 | |
299 | 299 | if ( $form ) { |
300 | - foreach ( $form['fields'] as $field ) { |
|
301 | - if ( $include_parent_field || empty( $field['inputs'] ) ) { |
|
302 | - $fields["{$field['id']}"] = array( |
|
300 | + foreach ( $form[ 'fields' ] as $field ) { |
|
301 | + if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) { |
|
302 | + $fields[ "{$field[ 'id' ]}" ] = array( |
|
303 | 303 | 'label' => \GV\Utils::get( $field, 'label' ), |
304 | 304 | 'parent' => null, |
305 | 305 | 'type' => \GV\Utils::get( $field, 'type' ), |
@@ -308,10 +308,10 @@ discard block |
||
308 | 308 | ); |
309 | 309 | } |
310 | 310 | |
311 | - if ( $add_default_properties && ! empty( $field['inputs'] ) ) { |
|
312 | - foreach ( $field['inputs'] as $input ) { |
|
311 | + if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) { |
|
312 | + foreach ( $field[ 'inputs' ] as $input ) { |
|
313 | 313 | |
314 | - if( ! empty( $input['isHidden'] ) ) { |
|
314 | + if ( ! empty( $input[ 'isHidden' ] ) ) { |
|
315 | 315 | continue; |
316 | 316 | } |
317 | 317 | |
@@ -319,10 +319,10 @@ discard block |
||
319 | 319 | * @hack |
320 | 320 | * In case of email/email confirmation, the input for email has the same id as the parent field |
321 | 321 | */ |
322 | - if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) { |
|
322 | + if ( 'email' === $field[ 'type' ] && false === strpos( $input[ 'id' ], '.' ) ) { |
|
323 | 323 | continue; |
324 | 324 | } |
325 | - $fields["{$input['id']}"] = array( |
|
325 | + $fields[ "{$input[ 'id' ]}" ] = array( |
|
326 | 326 | 'label' => \GV\Utils::get( $input, 'label' ), |
327 | 327 | 'customLabel' => \GV\Utils::get( $input, 'customLabel' ), |
328 | 328 | 'parent' => $field, |
@@ -334,7 +334,7 @@ discard block |
||
334 | 334 | } |
335 | 335 | |
336 | 336 | |
337 | - if( GFCommon::is_product_field( $field['type'] ) ){ |
|
337 | + if ( GFCommon::is_product_field( $field[ 'type' ] ) ) { |
|
338 | 338 | $has_product_fields = true; |
339 | 339 | } |
340 | 340 | |
@@ -348,7 +348,7 @@ discard block |
||
348 | 348 | * @since 1.7 |
349 | 349 | */ |
350 | 350 | if ( $has_post_fields ) { |
351 | - $fields['post_id'] = array( |
|
351 | + $fields[ 'post_id' ] = array( |
|
352 | 352 | 'label' => __( 'Post ID', 'gravityview' ), |
353 | 353 | 'type' => 'post_id', |
354 | 354 | ); |
@@ -361,11 +361,11 @@ discard block |
||
361 | 361 | foreach ( $payment_fields as $payment_field ) { |
362 | 362 | |
363 | 363 | // Either the field exists ($fields['shipping']) or the form explicitly contains a `shipping` field with numeric key |
364 | - if( isset( $fields["{$payment_field->name}"] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) { |
|
364 | + if ( isset( $fields[ "{$payment_field->name}" ] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) { |
|
365 | 365 | continue; |
366 | 366 | } |
367 | 367 | |
368 | - $fields["{$payment_field->name}"] = array( |
|
368 | + $fields[ "{$payment_field->name}" ] = array( |
|
369 | 369 | 'label' => $payment_field->label, |
370 | 370 | 'desc' => $payment_field->description, |
371 | 371 | 'type' => $payment_field->name, |
@@ -397,9 +397,9 @@ discard block |
||
397 | 397 | |
398 | 398 | $fields = array(); |
399 | 399 | |
400 | - foreach ( $extra_fields as $key => $field ){ |
|
401 | - if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) { |
|
402 | - $fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' ); |
|
400 | + foreach ( $extra_fields as $key => $field ) { |
|
401 | + if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) { |
|
402 | + $fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' ); |
|
403 | 403 | } |
404 | 404 | } |
405 | 405 | |
@@ -439,33 +439,33 @@ discard block |
||
439 | 439 | 'search_criteria' => null, |
440 | 440 | 'sorting' => null, |
441 | 441 | 'paging' => null, |
442 | - 'cache' => (isset( $passed_criteria['cache'] ) ? (bool) $passed_criteria['cache'] : true), |
|
442 | + 'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? (bool)$passed_criteria[ 'cache' ] : true ), |
|
443 | 443 | 'context_view_id' => null, |
444 | 444 | ); |
445 | 445 | |
446 | 446 | $criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults ); |
447 | 447 | |
448 | - if ( ! empty( $criteria['search_criteria']['field_filters'] ) && is_array( $criteria['search_criteria']['field_filters'] ) ) { |
|
449 | - foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) { |
|
448 | + if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) && is_array( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) { |
|
449 | + foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) { |
|
450 | 450 | |
451 | 451 | if ( ! is_array( $filter ) ) { |
452 | 452 | continue; |
453 | 453 | } |
454 | 454 | |
455 | 455 | // By default, we want searches to be wildcard for each field. |
456 | - $filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator']; |
|
456 | + $filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ]; |
|
457 | 457 | |
458 | 458 | /** |
459 | 459 | * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc) |
460 | 460 | * @param string $operator Existing search operator |
461 | 461 | * @param array $filter array with `key`, `value`, `operator`, `type` keys |
462 | 462 | */ |
463 | - $filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter ); |
|
463 | + $filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter ); |
|
464 | 464 | } |
465 | 465 | |
466 | 466 | // don't send just the [mode] without any field filter. |
467 | - if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) { |
|
468 | - unset( $criteria['search_criteria']['field_filters']['mode'] ); |
|
467 | + if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) { |
|
468 | + unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] ); |
|
469 | 469 | } |
470 | 470 | |
471 | 471 | } |
@@ -476,33 +476,33 @@ discard block |
||
476 | 476 | * Prepare date formats to be in Gravity Forms DB format; |
477 | 477 | * $passed_criteria may include date formats incompatible with Gravity Forms. |
478 | 478 | */ |
479 | - foreach ( array('start_date', 'end_date' ) as $key ) { |
|
479 | + foreach ( array( 'start_date', 'end_date' ) as $key ) { |
|
480 | 480 | |
481 | - if ( ! empty( $criteria['search_criteria'][ $key ] ) ) { |
|
481 | + if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) { |
|
482 | 482 | |
483 | 483 | // Use date_create instead of new DateTime so it returns false if invalid date format. |
484 | - $date = date_create( $criteria['search_criteria'][ $key ] ); |
|
484 | + $date = date_create( $criteria[ 'search_criteria' ][ $key ] ); |
|
485 | 485 | |
486 | 486 | if ( $date ) { |
487 | 487 | // Gravity Forms wants dates in the `Y-m-d H:i:s` format. |
488 | - $criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' ); |
|
488 | + $criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' ); |
|
489 | 489 | } else { |
490 | - gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria['search_criteria'][ $key ] ) ); |
|
490 | + gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria[ 'search_criteria' ][ $key ] ) ); |
|
491 | 491 | |
492 | 492 | // If it's an invalid date, unset it. Gravity Forms freaks out otherwise. |
493 | - unset( $criteria['search_criteria'][ $key ] ); |
|
493 | + unset( $criteria[ 'search_criteria' ][ $key ] ); |
|
494 | 494 | } |
495 | 495 | } |
496 | 496 | } |
497 | 497 | |
498 | - if ( empty( $criteria['context_view_id'] ) ) { |
|
498 | + if ( empty( $criteria[ 'context_view_id' ] ) ) { |
|
499 | 499 | // Calculate the context view id and send it to the advanced filter |
500 | 500 | if ( GravityView_frontend::getInstance()->getSingleEntry() ) { |
501 | - $criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id(); |
|
501 | + $criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id(); |
|
502 | 502 | } else if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance() && GravityView_View_Data::getInstance()->has_multiple_views() ) { |
503 | - $criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id(); |
|
503 | + $criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id(); |
|
504 | 504 | } else if ( 'delete' === GFForms::get( 'action' ) ) { |
505 | - $criteria['context_view_id'] = isset( $_GET['view_id'] ) ? intval( $_GET['view_id'] ) : null; |
|
505 | + $criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? intval( $_GET[ 'view_id' ] ) : null; |
|
506 | 506 | } |
507 | 507 | } |
508 | 508 | |
@@ -512,7 +512,7 @@ discard block |
||
512 | 512 | * @param array $form_ids Forms to search |
513 | 513 | * @param int $view_id ID of the view being used to search |
514 | 514 | */ |
515 | - $criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] ); |
|
515 | + $criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] ); |
|
516 | 516 | |
517 | 517 | return (array)$criteria; |
518 | 518 | } |
@@ -546,7 +546,7 @@ discard block |
||
546 | 546 | /** Reduce # of database calls */ |
547 | 547 | add_filter( 'gform_is_encrypted_field', '__return_false' ); |
548 | 548 | |
549 | - if ( ! empty( $criteria['cache'] ) ) { |
|
549 | + if ( ! empty( $criteria[ 'cache' ] ) ) { |
|
550 | 550 | |
551 | 551 | $Cache = new GravityView_Cache( $form_ids, $criteria ); |
552 | 552 | |
@@ -554,7 +554,7 @@ discard block |
||
554 | 554 | |
555 | 555 | // Still update the total count when using cached results |
556 | 556 | if ( ! is_null( $total ) ) { |
557 | - $total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] ); |
|
557 | + $total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] ); |
|
558 | 558 | } |
559 | 559 | |
560 | 560 | $return = $entries; |
@@ -576,9 +576,9 @@ discard block |
||
576 | 576 | $entries = apply_filters_ref_array( 'gravityview_before_get_entries', array( null, $criteria, $passed_criteria, &$total ) ); |
577 | 577 | |
578 | 578 | // No entries returned from gravityview_before_get_entries |
579 | - if( is_null( $entries ) ) { |
|
579 | + if ( is_null( $entries ) ) { |
|
580 | 580 | |
581 | - $entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total ); |
|
581 | + $entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total ); |
|
582 | 582 | |
583 | 583 | if ( is_wp_error( $entries ) ) { |
584 | 584 | gravityview()->log->error( '{error}', array( 'error' => $entries->get_error_message(), 'data' => $entries ) ); |
@@ -589,7 +589,7 @@ discard block |
||
589 | 589 | } |
590 | 590 | } |
591 | 591 | |
592 | - if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) { |
|
592 | + if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) { |
|
593 | 593 | |
594 | 594 | // Cache results |
595 | 595 | $Cache->set( $entries, 'entries' ); |
@@ -702,18 +702,18 @@ discard block |
||
702 | 702 | $check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry, $view ); |
703 | 703 | |
704 | 704 | // Is the entry allowed |
705 | - if( $check_entry_display ) { |
|
705 | + if ( $check_entry_display ) { |
|
706 | 706 | |
707 | 707 | $gvid = \GV\Utils::_GET( 'gvid' ); |
708 | 708 | |
709 | - if( $gvid ) { |
|
709 | + if ( $gvid ) { |
|
710 | 710 | $view = \GV\View::by_id( $gvid ); |
711 | 711 | } |
712 | 712 | |
713 | 713 | $entry = self::check_entry_display( $entry, $view ); |
714 | 714 | } |
715 | 715 | |
716 | - if( is_wp_error( $entry ) ) { |
|
716 | + if ( is_wp_error( $entry ) ) { |
|
717 | 717 | gravityview()->log->error( '{error}', array( 'error' => $entry->get_error_message() ) ); |
718 | 718 | return false; |
719 | 719 | } |
@@ -747,12 +747,12 @@ discard block |
||
747 | 747 | |
748 | 748 | $value = false; |
749 | 749 | |
750 | - if( 'context' === $val1 ) { |
|
750 | + if ( 'context' === $val1 ) { |
|
751 | 751 | |
752 | 752 | $matching_contexts = array( $val2 ); |
753 | 753 | |
754 | 754 | // We allow for non-standard contexts. |
755 | - switch( $val2 ) { |
|
755 | + switch ( $val2 ) { |
|
756 | 756 | // Check for either single or edit |
757 | 757 | case 'singular': |
758 | 758 | $matching_contexts = array( 'single', 'edit' ); |
@@ -795,18 +795,18 @@ discard block |
||
795 | 795 | $json_val_1 = json_decode( $val1, true ); |
796 | 796 | $json_val_2 = json_decode( $val2, true ); |
797 | 797 | |
798 | - if( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) { |
|
798 | + if ( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) { |
|
799 | 799 | |
800 | 800 | $json_in = false; |
801 | - $json_val_1 = $json_val_1 ? (array) $json_val_1 : array( $val1 ); |
|
802 | - $json_val_2 = $json_val_2 ? (array) $json_val_2 : array( $val2 ); |
|
801 | + $json_val_1 = $json_val_1 ? (array)$json_val_1 : array( $val1 ); |
|
802 | + $json_val_2 = $json_val_2 ? (array)$json_val_2 : array( $val2 ); |
|
803 | 803 | |
804 | 804 | // For JSON, we want to compare as "in" or "not in" rather than "contains" |
805 | 805 | foreach ( $json_val_1 as $item_1 ) { |
806 | 806 | foreach ( $json_val_2 as $item_2 ) { |
807 | 807 | $json_in = self::matches_operation( $item_1, $item_2, 'is' ); |
808 | 808 | |
809 | - if( $json_in ) { |
|
809 | + if ( $json_in ) { |
|
810 | 810 | break 2; |
811 | 811 | } |
812 | 812 | } |
@@ -857,10 +857,10 @@ discard block |
||
857 | 857 | public static function check_entry_display( $entry, $view = null ) { |
858 | 858 | |
859 | 859 | if ( ! $entry || is_wp_error( $entry ) ) { |
860 | - return new WP_Error('entry_not_found', 'Entry was not found.', $entry ); |
|
860 | + return new WP_Error( 'entry_not_found', 'Entry was not found.', $entry ); |
|
861 | 861 | } |
862 | 862 | |
863 | - if ( empty( $entry['form_id'] ) ) { |
|
863 | + if ( empty( $entry[ 'form_id' ] ) ) { |
|
864 | 864 | return new WP_Error( 'form_id_not_set', '[apply_filters_to_entry] Entry is empty!', $entry ); |
865 | 865 | } |
866 | 866 | |
@@ -875,19 +875,19 @@ discard block |
||
875 | 875 | |
876 | 876 | $_gvid = \GV\Utils::_GET( 'gvid' ); |
877 | 877 | |
878 | - if ( $_gvid && $view->ID !== (int) $_gvid ) { |
|
878 | + if ( $_gvid && $view->ID !== (int)$_gvid ) { |
|
879 | 879 | return new WP_Error( 'view_id_not_match_gvid', 'View does not match passed $_GET["gvid"].', $view->ID ); |
880 | 880 | } |
881 | 881 | |
882 | 882 | $view_form_id = $view->form->ID; |
883 | 883 | |
884 | 884 | if ( $view->joins ) { |
885 | - if ( in_array( (int) $entry['form_id'], array_keys( $view::get_joined_forms( $view->ID ) ), true ) ) { |
|
886 | - $view_form_id = $entry['form_id']; |
|
885 | + if ( in_array( (int)$entry[ 'form_id' ], array_keys( $view::get_joined_forms( $view->ID ) ), true ) ) { |
|
886 | + $view_form_id = $entry[ 'form_id' ]; |
|
887 | 887 | } |
888 | 888 | } |
889 | 889 | |
890 | - if ( (int) $view_form_id !== (int) $entry['form_id'] ) { |
|
890 | + if ( (int)$view_form_id !== (int)$entry[ 'form_id' ] ) { |
|
891 | 891 | return new WP_Error( 'view_id_not_match', 'View form source does not match entry form source ID.', $entry ); |
892 | 892 | } |
893 | 893 | |
@@ -895,13 +895,13 @@ discard block |
||
895 | 895 | * Check whether the entry is in the entries subset by running a modified query. |
896 | 896 | */ |
897 | 897 | add_action( 'gravityview/view/query', $entry_subset_callback = function( &$query, $view, $request ) use ( $entry, $view_form_id ) { |
898 | - $_tmp_query = new \GF_Query( $view_form_id, array( |
|
898 | + $_tmp_query = new \GF_Query( $view_form_id, array( |
|
899 | 899 | 'field_filters' => array( |
900 | 900 | 'mode' => 'all', |
901 | 901 | array( |
902 | 902 | 'key' => 'id', |
903 | 903 | 'operation' => 'is', |
904 | - 'value' => $entry['id'] |
|
904 | + 'value' => $entry[ 'id' ] |
|
905 | 905 | ) |
906 | 906 | ) |
907 | 907 | ) ); |
@@ -911,14 +911,14 @@ discard block |
||
911 | 911 | /** @type \GF_Query $query */ |
912 | 912 | $query_parts = $query->_introspect(); |
913 | 913 | |
914 | - $query->where( \GF_Query_Condition::_and( $_tmp_query_parts['where'], $query_parts['where'] ) ); |
|
914 | + $query->where( \GF_Query_Condition::_and( $_tmp_query_parts[ 'where' ], $query_parts[ 'where' ] ) ); |
|
915 | 915 | |
916 | 916 | }, 10, 3 ); |
917 | 917 | |
918 | 918 | // Prevent page offset from being applied to the single entry query; it's used to return to the referring page number |
919 | 919 | add_filter( 'gravityview_search_criteria', $remove_pagenum = function( $criteria ) { |
920 | 920 | |
921 | - $criteria['paging'] = array( |
|
921 | + $criteria[ 'paging' ] = array( |
|
922 | 922 | 'offset' => 0, |
923 | 923 | 'page_size' => 25 |
924 | 924 | ); |
@@ -937,20 +937,20 @@ discard block |
||
937 | 937 | } |
938 | 938 | |
939 | 939 | // This entry is on a View with joins |
940 | - if ( $entries[0]->is_multi() ) { |
|
940 | + if ( $entries[ 0 ]->is_multi() ) { |
|
941 | 941 | |
942 | 942 | $multi_entry_ids = array(); |
943 | 943 | |
944 | - foreach ( $entries[0]->entries as $multi_entry ) { |
|
945 | - $multi_entry_ids[] = (int) $multi_entry->ID; |
|
944 | + foreach ( $entries[ 0 ]->entries as $multi_entry ) { |
|
945 | + $multi_entry_ids[ ] = (int)$multi_entry->ID; |
|
946 | 946 | } |
947 | 947 | |
948 | - if ( ! in_array( (int) $entry['id'], $multi_entry_ids, true ) ) { |
|
948 | + if ( ! in_array( (int)$entry[ 'id' ], $multi_entry_ids, true ) ) { |
|
949 | 949 | remove_action( 'gravityview/view/query', $entry_subset_callback ); |
950 | 950 | return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' ); |
951 | 951 | } |
952 | 952 | |
953 | - } elseif ( (int) $entries[0]->ID !== (int) $entry['id'] ) { |
|
953 | + } elseif ( (int)$entries[ 0 ]->ID !== (int)$entry[ 'id' ] ) { |
|
954 | 954 | remove_action( 'gravityview/view/query', $entry_subset_callback ); |
955 | 955 | return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' ); |
956 | 956 | } |
@@ -995,18 +995,18 @@ discard block |
||
995 | 995 | * Gravity Forms code to adjust date to locally-configured Time Zone |
996 | 996 | * @see GFCommon::format_date() for original code |
997 | 997 | */ |
998 | - $date_gmt_time = mysql2date( 'G', $date_string ); |
|
998 | + $date_gmt_time = mysql2date( 'G', $date_string ); |
|
999 | 999 | $date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time ); |
1000 | 1000 | |
1001 | - $format = \GV\Utils::get( $atts, 'format' ); |
|
1002 | - $is_human = ! empty( $atts['human'] ); |
|
1003 | - $is_diff = ! empty( $atts['diff'] ); |
|
1004 | - $is_raw = ! empty( $atts['raw'] ); |
|
1005 | - $is_timestamp = ! empty( $atts['timestamp'] ); |
|
1006 | - $include_time = ! empty( $atts['time'] ); |
|
1001 | + $format = \GV\Utils::get( $atts, 'format' ); |
|
1002 | + $is_human = ! empty( $atts[ 'human' ] ); |
|
1003 | + $is_diff = ! empty( $atts[ 'diff' ] ); |
|
1004 | + $is_raw = ! empty( $atts[ 'raw' ] ); |
|
1005 | + $is_timestamp = ! empty( $atts[ 'timestamp' ] ); |
|
1006 | + $include_time = ! empty( $atts[ 'time' ] ); |
|
1007 | 1007 | |
1008 | 1008 | // If we're using time diff, we want to have a different default format |
1009 | - if( empty( $format ) ) { |
|
1009 | + if ( empty( $format ) ) { |
|
1010 | 1010 | /* translators: %s: relative time from now, used for generic date comparisons. "1 day ago", or "20 seconds ago" */ |
1011 | 1011 | $format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' ); |
1012 | 1012 | } |
@@ -1014,7 +1014,7 @@ discard block |
||
1014 | 1014 | // If raw was specified, don't modify the stored value |
1015 | 1015 | if ( $is_raw ) { |
1016 | 1016 | $formatted_date = $date_string; |
1017 | - } elseif( $is_timestamp ) { |
|
1017 | + } elseif ( $is_timestamp ) { |
|
1018 | 1018 | $formatted_date = $date_local_timestamp; |
1019 | 1019 | } elseif ( $is_diff ) { |
1020 | 1020 | $formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) ); |
@@ -1047,7 +1047,7 @@ discard block |
||
1047 | 1047 | |
1048 | 1048 | $label = \GV\Utils::get( $field, 'label' ); |
1049 | 1049 | |
1050 | - if( floor( $field_id ) !== floatval( $field_id ) ) { |
|
1050 | + if ( floor( $field_id ) !== floatval( $field_id ) ) { |
|
1051 | 1051 | $label = GFFormsModel::get_choice_text( $field, $field_value, $field_id ); |
1052 | 1052 | } |
1053 | 1053 | |
@@ -1074,7 +1074,7 @@ discard block |
||
1074 | 1074 | $form = GFAPI::get_form( $form ); |
1075 | 1075 | } |
1076 | 1076 | |
1077 | - if ( class_exists( 'GFFormsModel' ) ){ |
|
1077 | + if ( class_exists( 'GFFormsModel' ) ) { |
|
1078 | 1078 | return GFFormsModel::get_field( $form, $field_id ); |
1079 | 1079 | } else { |
1080 | 1080 | return null; |
@@ -1121,19 +1121,19 @@ discard block |
||
1121 | 1121 | $shortcodes = array(); |
1122 | 1122 | |
1123 | 1123 | preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER ); |
1124 | - if ( empty( $matches ) ){ |
|
1124 | + if ( empty( $matches ) ) { |
|
1125 | 1125 | return false; |
1126 | 1126 | } |
1127 | 1127 | |
1128 | 1128 | foreach ( $matches as $shortcode ) { |
1129 | - if ( $tag === $shortcode[2] ) { |
|
1129 | + if ( $tag === $shortcode[ 2 ] ) { |
|
1130 | 1130 | |
1131 | 1131 | // Changed this to $shortcode instead of true so we get the parsed atts. |
1132 | - $shortcodes[] = $shortcode; |
|
1132 | + $shortcodes[ ] = $shortcode; |
|
1133 | 1133 | |
1134 | - } else if ( isset( $shortcode[5] ) && $results = self::has_shortcode_r( $shortcode[5], $tag ) ) { |
|
1135 | - foreach( $results as $result ) { |
|
1136 | - $shortcodes[] = $result; |
|
1134 | + } else if ( isset( $shortcode[ 5 ] ) && $results = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) { |
|
1135 | + foreach ( $results as $result ) { |
|
1136 | + $shortcodes[ ] = $result; |
|
1137 | 1137 | } |
1138 | 1138 | } |
1139 | 1139 | } |
@@ -1165,7 +1165,7 @@ discard block |
||
1165 | 1165 | 'post_type' => 'gravityview', |
1166 | 1166 | 'posts_per_page' => 100, |
1167 | 1167 | 'meta_key' => '_gravityview_form_id', |
1168 | - 'meta_value' => (int) $form_id, |
|
1168 | + 'meta_value' => (int)$form_id, |
|
1169 | 1169 | ); |
1170 | 1170 | $args = wp_parse_args( $args, $defaults ); |
1171 | 1171 | $views = get_posts( $args ); |
@@ -1177,21 +1177,21 @@ discard block |
||
1177 | 1177 | |
1178 | 1178 | $data = unserialize( $view->meta_value ); |
1179 | 1179 | |
1180 | - if( ! $data || ! is_array( $data ) ) { |
|
1180 | + if ( ! $data || ! is_array( $data ) ) { |
|
1181 | 1181 | continue; |
1182 | 1182 | } |
1183 | 1183 | |
1184 | 1184 | foreach ( $data as $datum ) { |
1185 | - if ( ! empty( $datum[2] ) && (int) $datum[2] === (int) $form_id ) { |
|
1186 | - $joined_forms[] = $view->post_id; |
|
1185 | + if ( ! empty( $datum[ 2 ] ) && (int)$datum[ 2 ] === (int)$form_id ) { |
|
1186 | + $joined_forms[ ] = $view->post_id; |
|
1187 | 1187 | } |
1188 | 1188 | } |
1189 | 1189 | } |
1190 | 1190 | |
1191 | 1191 | if ( $joined_forms ) { |
1192 | - $joined_args = array( |
|
1192 | + $joined_args = array( |
|
1193 | 1193 | 'post_type' => 'gravityview', |
1194 | - 'posts_per_page' => $args['posts_per_page'], |
|
1194 | + 'posts_per_page' => $args[ 'posts_per_page' ], |
|
1195 | 1195 | 'post__in' => $joined_forms, |
1196 | 1196 | ); |
1197 | 1197 | $views = array_merge( $views, get_posts( $joined_args ) ); |
@@ -1347,7 +1347,7 @@ discard block |
||
1347 | 1347 | |
1348 | 1348 | $directory_widgets = wp_parse_args( $view_widgets, $defaults ); |
1349 | 1349 | |
1350 | - if( $json_decode ) { |
|
1350 | + if ( $json_decode ) { |
|
1351 | 1351 | $directory_widgets = gv_map_deep( $directory_widgets, 'gv_maybe_json_decode' ); |
1352 | 1352 | } |
1353 | 1353 | |
@@ -1362,7 +1362,7 @@ discard block |
||
1362 | 1362 | * @return string html |
1363 | 1363 | */ |
1364 | 1364 | public static function get_sortable_fields( $formid, $current = '' ) { |
1365 | - $output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default', 'gravityview' ) .'</option>'; |
|
1365 | + $output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default', 'gravityview' ) . '</option>'; |
|
1366 | 1366 | |
1367 | 1367 | if ( empty( $formid ) ) { |
1368 | 1368 | return $output; |
@@ -1375,11 +1375,11 @@ discard block |
||
1375 | 1375 | $blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null ); |
1376 | 1376 | |
1377 | 1377 | foreach ( $fields as $id => $field ) { |
1378 | - if ( in_array( $field['type'], $blacklist_field_types ) ) { |
|
1378 | + if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) { |
|
1379 | 1379 | continue; |
1380 | 1380 | } |
1381 | 1381 | |
1382 | - $output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>'; |
|
1382 | + $output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . '>' . esc_attr( $field[ 'label' ] ) . '</option>'; |
|
1383 | 1383 | } |
1384 | 1384 | } |
1385 | 1385 | |
@@ -1418,16 +1418,16 @@ discard block |
||
1418 | 1418 | $blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL ); |
1419 | 1419 | |
1420 | 1420 | // TODO: Convert to using array_filter |
1421 | - foreach( $fields as $id => $field ) { |
|
1421 | + foreach ( $fields as $id => $field ) { |
|
1422 | 1422 | |
1423 | - if( in_array( $field['type'], $blacklist_field_types ) ) { |
|
1423 | + if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) { |
|
1424 | 1424 | unset( $fields[ $id ] ); |
1425 | 1425 | } |
1426 | 1426 | |
1427 | 1427 | /** |
1428 | 1428 | * Merge date and time subfields. |
1429 | 1429 | */ |
1430 | - if ( in_array( $field['type'], array( 'date', 'time' ) ) && ! empty( $field['parent'] ) ) { |
|
1430 | + if ( in_array( $field[ 'type' ], array( 'date', 'time' ) ) && ! empty( $field[ 'parent' ] ) ) { |
|
1431 | 1431 | $fields[ intval( $id ) ] = array( |
1432 | 1432 | 'label' => \GV\Utils::get( $field, 'parent/label' ), |
1433 | 1433 | 'parent' => null, |
@@ -1477,14 +1477,14 @@ discard block |
||
1477 | 1477 | * @param int|array $field field key or field array |
1478 | 1478 | * @return boolean |
1479 | 1479 | */ |
1480 | - public static function is_field_numeric( $form = null, $field = '' ) { |
|
1480 | + public static function is_field_numeric( $form = null, $field = '' ) { |
|
1481 | 1481 | |
1482 | 1482 | if ( ! is_array( $form ) && ! is_array( $field ) ) { |
1483 | 1483 | $form = self::get_form( $form ); |
1484 | 1484 | } |
1485 | 1485 | |
1486 | 1486 | // If entry meta, it's a string. Otherwise, numeric |
1487 | - if( ! is_numeric( $field ) && is_string( $field ) ) { |
|
1487 | + if ( ! is_numeric( $field ) && is_string( $field ) ) { |
|
1488 | 1488 | $type = $field; |
1489 | 1489 | } else { |
1490 | 1490 | $type = self::get_field_type( $form, $field ); |
@@ -1498,9 +1498,9 @@ discard block |
||
1498 | 1498 | $numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) ); |
1499 | 1499 | |
1500 | 1500 | // Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true |
1501 | - if( $gv_field = GravityView_Fields::get( $type ) ) { |
|
1502 | - if( true === $gv_field->is_numeric ) { |
|
1503 | - $numeric_types[] = $gv_field->is_numeric; |
|
1501 | + if ( $gv_field = GravityView_Fields::get( $type ) ) { |
|
1502 | + if ( true === $gv_field->is_numeric ) { |
|
1503 | + $numeric_types[ ] = $gv_field->is_numeric; |
|
1504 | 1504 | } |
1505 | 1505 | } |
1506 | 1506 | |
@@ -1651,18 +1651,18 @@ discard block |
||
1651 | 1651 | $final_atts = array_filter( $final_atts ); |
1652 | 1652 | |
1653 | 1653 | // If the href wasn't passed as an attribute, use the value passed to the function |
1654 | - if ( empty( $final_atts['href'] ) && ! empty( $href ) ) { |
|
1655 | - $final_atts['href'] = $href; |
|
1654 | + if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) { |
|
1655 | + $final_atts[ 'href' ] = $href; |
|
1656 | 1656 | } |
1657 | 1657 | |
1658 | - $final_atts['href'] = esc_url_raw( $href ); |
|
1658 | + $final_atts[ 'href' ] = esc_url_raw( $href ); |
|
1659 | 1659 | |
1660 | 1660 | /** |
1661 | 1661 | * Fix potential security issue with target=_blank |
1662 | 1662 | * @see https://dev.to/ben/the-targetblank-vulnerability-by-example |
1663 | 1663 | */ |
1664 | - if( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) { |
|
1665 | - $final_atts['rel'] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' ); |
|
1664 | + if ( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) { |
|
1665 | + $final_atts[ 'rel' ] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' ); |
|
1666 | 1666 | } |
1667 | 1667 | |
1668 | 1668 | // Sort the attributes alphabetically, to help testing |
@@ -1674,7 +1674,7 @@ discard block |
||
1674 | 1674 | $output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) ); |
1675 | 1675 | } |
1676 | 1676 | |
1677 | - if( '' !== $output ) { |
|
1677 | + if ( '' !== $output ) { |
|
1678 | 1678 | $output = '<a' . $output . '>' . $anchor_text . '</a>'; |
1679 | 1679 | } |
1680 | 1680 | |
@@ -1701,7 +1701,7 @@ discard block |
||
1701 | 1701 | if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) { |
1702 | 1702 | $merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value ); |
1703 | 1703 | } else if ( is_numeric( $key ) && isset( $merged[ $key ] ) ) { |
1704 | - $merged[] = $value; |
|
1704 | + $merged[ ] = $value; |
|
1705 | 1705 | } else { |
1706 | 1706 | $merged[ $key ] = $value; |
1707 | 1707 | } |
@@ -1734,7 +1734,7 @@ discard block |
||
1734 | 1734 | * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..) |
1735 | 1735 | * @param array $settings Settings array, with `number` key defining the # of users to display |
1736 | 1736 | */ |
1737 | - $get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) ); |
|
1737 | + $get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) ); |
|
1738 | 1738 | |
1739 | 1739 | return get_users( $get_users_settings ); |
1740 | 1740 | } |
@@ -1754,11 +1754,11 @@ discard block |
||
1754 | 1754 | public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) { |
1755 | 1755 | |
1756 | 1756 | // If $cap is defined, only show notice if user has capability |
1757 | - if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) { |
|
1757 | + if ( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) { |
|
1758 | 1758 | return ''; |
1759 | 1759 | } |
1760 | 1760 | |
1761 | - return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>'; |
|
1761 | + return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>'; |
|
1762 | 1762 | } |
1763 | 1763 | |
1764 | 1764 | /** |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | * @return \GV\Field The field implementation from configuration (\GV\GF_Field, \GV\Internal_Field). |
167 | 167 | */ |
168 | 168 | public static function from_configuration( $configuration ) { |
169 | - if ( empty( $configuration['id'] ) ) { |
|
169 | + if ( empty( $configuration[ 'id' ] ) ) { |
|
170 | 170 | $field = new self(); |
171 | 171 | gravityview()->log->error( 'Trying to get field from configuration without a field ID.', array( 'data' => $configuration ) ); |
172 | 172 | $field->update_configuration( $configuration ); |
@@ -179,8 +179,8 @@ discard block |
||
179 | 179 | } else { |
180 | 180 | $trace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS ); |
181 | 181 | } |
182 | - $trace = $trace[1]; |
|
183 | - if ( $trace['function'] == 'from_configuration' && $trace['class'] == __CLASS__ ) { |
|
182 | + $trace = $trace[ 1 ]; |
|
183 | + if ( $trace[ 'function' ] == 'from_configuration' && $trace[ 'class' ] == __CLASS__ ) { |
|
184 | 184 | $field = new self(); |
185 | 185 | gravityview()->log->error( 'Infinite loop protection tripped. Returning default class here.' ); |
186 | 186 | $field->update_configuration( $configuration ); |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | } |
189 | 189 | |
190 | 190 | /** @type \GV\GF_Field|\GV\Internal_Field $field_class Determine the field implementation to use, and try to use. */ |
191 | - $field_class = is_numeric( $configuration['id'] ) ? '\GV\GF_Field' : '\GV\Internal_Field'; |
|
191 | + $field_class = is_numeric( $configuration[ 'id' ] ) ? '\GV\GF_Field' : '\GV\Internal_Field'; |
|
192 | 192 | |
193 | 193 | /** |
194 | 194 | * @filter `gravityview/field/class` Filter the field class about to be created from the configuration. |
@@ -227,24 +227,24 @@ discard block |
||
227 | 227 | public function update_configuration( $configuration ) { |
228 | 228 | $configuration = wp_parse_args( $configuration, $this->as_configuration() ); |
229 | 229 | |
230 | - if ( $this->ID != $configuration['id'] ) { |
|
230 | + if ( $this->ID != $configuration[ 'id' ] ) { |
|
231 | 231 | /** Smelling trouble here... */ |
232 | 232 | gravityview()->log->warning( 'ID is being changed for {field_class} instance, but implementation is not. Use ::from_configuration instead', array( 'field_class', __CLASS__ ) ); |
233 | 233 | } |
234 | 234 | |
235 | - $this->ID = $configuration['id']; |
|
236 | - $this->label = $configuration['label']; |
|
237 | - $this->show_label = $configuration['show_label'] == '1'; |
|
238 | - $this->custom_label = $configuration['custom_label']; |
|
239 | - $this->custom_class = $configuration['custom_class']; |
|
240 | - $this->cap = $configuration['only_loggedin'] == '1' ? $configuration['only_loggedin_cap'] : ''; |
|
241 | - $this->search_filter = $configuration['search_filter'] == '1'; |
|
242 | - $this->show_as_link = $configuration['show_as_link'] == '1'; |
|
235 | + $this->ID = $configuration[ 'id' ]; |
|
236 | + $this->label = $configuration[ 'label' ]; |
|
237 | + $this->show_label = $configuration[ 'show_label' ] == '1'; |
|
238 | + $this->custom_label = $configuration[ 'custom_label' ]; |
|
239 | + $this->custom_class = $configuration[ 'custom_class' ]; |
|
240 | + $this->cap = $configuration[ 'only_loggedin' ] == '1' ? $configuration[ 'only_loggedin_cap' ] : ''; |
|
241 | + $this->search_filter = $configuration[ 'search_filter' ] == '1'; |
|
242 | + $this->show_as_link = $configuration[ 'show_as_link' ] == '1'; |
|
243 | 243 | |
244 | 244 | /** Shared among all field types (sort of). */ |
245 | 245 | $shared_configuration_keys = array( |
246 | 246 | 'id', 'label', 'show_label', 'custom_label', 'custom_class', |
247 | - 'only_loggedin' ,'only_loggedin_cap', 'search_filter', 'show_as_link', |
|
247 | + 'only_loggedin', 'only_loggedin_cap', 'search_filter', 'show_as_link', |
|
248 | 248 | ); |
249 | 249 | |
250 | 250 | /** Everything else goes into the properties for now. @todo subclasses! */ |
@@ -273,7 +273,7 @@ discard block |
||
273 | 273 | |
274 | 274 | /** A custom label is available. */ |
275 | 275 | if ( ! empty( $this->custom_label ) ) { |
276 | - return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ? : null : null, $entry ? $entry->as_entry() : null ); |
|
276 | + return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ?: null : null, $entry ? $entry->as_entry() : null ); |
|
277 | 277 | } |
278 | 278 | |
279 | 279 | return ''; |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | * @return mixed|null The value for the given configuration key, null if doesn't exist. |
360 | 360 | */ |
361 | 361 | public function __get( $key ) { |
362 | - switch( $key ) { |
|
362 | + switch ( $key ) { |
|
363 | 363 | default: |
364 | 364 | if ( isset( $this->configuration[ $key ] ) ) { |
365 | 365 | return $this->configuration[ $key ]; |
@@ -377,7 +377,7 @@ discard block |
||
377 | 377 | * @return boolean Whether this $key is set or not. |
378 | 378 | */ |
379 | 379 | public function __isset( $key ) { |
380 | - switch( $key ) { |
|
380 | + switch ( $key ) { |
|
381 | 381 | default: |
382 | 382 | return isset( $this->configuration[ $key ] ); |
383 | 383 | } |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | $supports = array( 'title', 'revisions' ); |
126 | 126 | |
127 | 127 | if ( $is_hierarchical ) { |
128 | - $supports[] = 'page-attributes'; |
|
128 | + $supports[ ] = 'page-attributes'; |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | /** |
@@ -227,11 +227,11 @@ discard block |
||
227 | 227 | $rule = array( sprintf( '%s/([^/]+)/csv/?', $slug ), 'index.php?gravityview=$matches[1]&csv=1', 'top' ); |
228 | 228 | |
229 | 229 | add_filter( 'query_vars', function( $query_vars ) { |
230 | - $query_vars[] = 'csv'; |
|
230 | + $query_vars[ ] = 'csv'; |
|
231 | 231 | return $query_vars; |
232 | 232 | } ); |
233 | 233 | |
234 | - if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[0] ] ) ) { |
|
234 | + if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[ 0 ] ] ) ) { |
|
235 | 235 | call_user_func_array( 'add_rewrite_rule', $rule ); |
236 | 236 | } |
237 | 237 | } |
@@ -308,13 +308,13 @@ discard block |
||
308 | 308 | return $content; |
309 | 309 | } |
310 | 310 | |
311 | - $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID ); |
|
311 | + $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID ); |
|
312 | 312 | |
313 | 313 | /** |
314 | 314 | * Editing a single entry. |
315 | 315 | */ |
316 | 316 | if ( $entry = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ) ) { |
317 | - if ( $entry['status'] != 'active' ) { |
|
317 | + if ( $entry[ 'status' ] != 'active' ) { |
|
318 | 318 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
319 | 319 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
320 | 320 | } |
@@ -325,7 +325,7 @@ discard block |
||
325 | 325 | } |
326 | 326 | |
327 | 327 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
328 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
328 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
329 | 329 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
330 | 330 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
331 | 331 | } |
@@ -348,7 +348,7 @@ discard block |
||
348 | 348 | |
349 | 349 | foreach ( $entryset as $e ) { |
350 | 350 | |
351 | - if ( 'active' !== $e['status'] ) { |
|
351 | + if ( 'active' !== $e[ 'status' ] ) { |
|
352 | 352 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) ); |
353 | 353 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
354 | 354 | } |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | } |
360 | 360 | |
361 | 361 | if ( $show_only_approved && ! $is_admin_and_can_view ) { |
362 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
362 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
363 | 363 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) ); |
364 | 364 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
365 | 365 | } |
@@ -534,7 +534,7 @@ discard block |
||
534 | 534 | $join_column = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field::by_id( $join_column ); |
535 | 535 | $join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field::by_id( $join_on_column ); |
536 | 536 | |
537 | - $joins [] = new Join( $join, $join_column, $join_on, $join_on_column ); |
|
537 | + $joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column ); |
|
538 | 538 | } |
539 | 539 | |
540 | 540 | return $joins; |
@@ -624,13 +624,13 @@ discard block |
||
624 | 624 | } |
625 | 625 | |
626 | 626 | foreach ( $_fields as $field ) { |
627 | - if ( ! empty( $field['unions'] ) ) { |
|
628 | - foreach ( $field['unions'] as $form_id => $field_id ) { |
|
627 | + if ( ! empty( $field[ 'unions' ] ) ) { |
|
628 | + foreach ( $field[ 'unions' ] as $form_id => $field_id ) { |
|
629 | 629 | if ( ! isset( $unions[ $form_id ] ) ) { |
630 | 630 | $unions[ $form_id ] = array(); |
631 | 631 | } |
632 | 632 | |
633 | - $unions[ $form_id ][ $field['id'] ] = |
|
633 | + $unions[ $form_id ][ $field[ 'id' ] ] = |
|
634 | 634 | is_numeric( $field_id ) ? \GV\GF_Field::by_id( \GV\GF_Form::by_id( $form_id ), $field_id ) : \GV\Internal_Field::by_id( $field_id ); |
635 | 635 | } |
636 | 636 | } |
@@ -685,7 +685,7 @@ discard block |
||
685 | 685 | if ( ! $view->form ) { |
686 | 686 | gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array( |
687 | 687 | 'view_id' => $view->ID, |
688 | - 'form_id' => $view->_gravityview_form_id ? : 0, |
|
688 | + 'form_id' => $view->_gravityview_form_id ?: 0, |
|
689 | 689 | ) ); |
690 | 690 | } |
691 | 691 | |
@@ -924,11 +924,11 @@ discard block |
||
924 | 924 | * Remove multiple sorting before calling legacy filters. |
925 | 925 | * This allows us to fake it till we make it. |
926 | 926 | */ |
927 | - if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) { |
|
927 | + if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) { |
|
928 | 928 | $has_multisort = true; |
929 | - $parameters['sort_field'] = reset( $parameters['sort_field'] ); |
|
930 | - if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) { |
|
931 | - $parameters['sort_direction'] = reset( $parameters['sort_direction'] ); |
|
929 | + $parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] ); |
|
930 | + if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) { |
|
931 | + $parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] ); |
|
932 | 932 | } |
933 | 933 | } |
934 | 934 | |
@@ -937,31 +937,30 @@ discard block |
||
937 | 937 | */ |
938 | 938 | $parameters = \GravityView_frontend::get_view_entries_parameters( $parameters, $this->form->ID ); |
939 | 939 | |
940 | - $parameters['context_view_id'] = $this->ID; |
|
940 | + $parameters[ 'context_view_id' ] = $this->ID; |
|
941 | 941 | $parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID ); |
942 | 942 | |
943 | 943 | if ( ! is_array( $parameters ) ) { |
944 | 944 | $parameters = array(); |
945 | 945 | } |
946 | 946 | |
947 | - if ( ! is_array( $parameters['search_criteria'] ) ) { |
|
948 | - $parameters['search_criteria'] = array(); |
|
947 | + if ( ! is_array( $parameters[ 'search_criteria' ] ) ) { |
|
948 | + $parameters[ 'search_criteria' ] = array(); |
|
949 | 949 | } |
950 | 950 | |
951 | - if ( ( ! isset( $parameters['search_criteria']['field_filters'] ) ) || ( ! is_array( $parameters['search_criteria']['field_filters'] ) ) ) { |
|
952 | - $parameters['search_criteria']['field_filters'] = array(); |
|
951 | + if ( ( ! isset( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) || ( ! is_array( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) ) { |
|
952 | + $parameters[ 'search_criteria' ][ 'field_filters' ] = array(); |
|
953 | 953 | } |
954 | 954 | |
955 | 955 | if ( $request instanceof REST\Request ) { |
956 | 956 | $atts = $this->settings->as_atts(); |
957 | 957 | $paging_parameters = wp_parse_args( $request->get_paging(), array( |
958 | - 'paging' => array( 'page_size' => $atts['page_size'] ), |
|
958 | + 'paging' => array( 'page_size' => $atts[ 'page_size' ] ), |
|
959 | 959 | ) ); |
960 | - $parameters['paging'] = $paging_parameters['paging']; |
|
960 | + $parameters[ 'paging' ] = $paging_parameters[ 'paging' ]; |
|
961 | 961 | } |
962 | 962 | |
963 | - $page = Utils::get( $parameters['paging'], 'current_page' ) ? |
|
964 | - : ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / \GV\Utils::get( $parameters, 'paging/page_size', 25 ) ) + 1 ); |
|
963 | + $page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / \GV\Utils::get( $parameters, 'paging/page_size', 25 ) ) + 1 ); |
|
965 | 964 | |
966 | 965 | /** |
967 | 966 | * Cleanup duplicate field_filter parameters to simplify the query. |
@@ -969,14 +968,14 @@ discard block |
||
969 | 968 | $unique_field_filters = array(); |
970 | 969 | foreach ( Utils::get( $parameters, 'search_criteria/field_filters', array() ) as $key => $filter ) { |
971 | 970 | if ( 'mode' === $key ) { |
972 | - $unique_field_filters['mode'] = $filter; |
|
971 | + $unique_field_filters[ 'mode' ] = $filter; |
|
973 | 972 | } else if ( ! in_array( $filter, $unique_field_filters ) ) { |
974 | - $unique_field_filters[] = $filter; |
|
973 | + $unique_field_filters[ ] = $filter; |
|
975 | 974 | } |
976 | 975 | } |
977 | - $parameters['search_criteria']['field_filters'] = $unique_field_filters; |
|
976 | + $parameters[ 'search_criteria' ][ 'field_filters' ] = $unique_field_filters; |
|
978 | 977 | |
979 | - if ( ! empty( $parameters['search_criteria']['field_filters'] ) ) { |
|
978 | + if ( ! empty( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) { |
|
980 | 979 | gravityview()->log->notice( 'search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.' ); |
981 | 980 | } |
982 | 981 | |
@@ -985,7 +984,7 @@ discard block |
||
985 | 984 | $query_class = $this->get_query_class(); |
986 | 985 | |
987 | 986 | /** @type \GF_Query $query */ |
988 | - $query = new $query_class( $this->form->ID, $parameters['search_criteria'], Utils::get( $parameters, 'sorting' ) ); |
|
987 | + $query = new $query_class( $this->form->ID, $parameters[ 'search_criteria' ], Utils::get( $parameters, 'sorting' ) ); |
|
989 | 988 | |
990 | 989 | /** |
991 | 990 | * Apply multisort. |
@@ -996,15 +995,15 @@ discard block |
||
996 | 995 | $view_setting_sort_field_ids = \GV\Utils::get( $atts, 'sort_field', array() ); |
997 | 996 | $view_setting_sort_directions = \GV\Utils::get( $atts, 'sort_direction', array() ); |
998 | 997 | |
999 | - $has_sort_query_param = ! empty( $_GET['sort'] ) && is_array( $_GET['sort'] ); |
|
998 | + $has_sort_query_param = ! empty( $_GET[ 'sort' ] ) && is_array( $_GET[ 'sort' ] ); |
|
1000 | 999 | |
1001 | - if( $has_sort_query_param ) { |
|
1002 | - $has_sort_query_param = array_filter( array_values( $_GET['sort'] ) ); |
|
1000 | + if ( $has_sort_query_param ) { |
|
1001 | + $has_sort_query_param = array_filter( array_values( $_GET[ 'sort' ] ) ); |
|
1003 | 1002 | } |
1004 | 1003 | |
1005 | 1004 | if ( $this->settings->get( 'sort_columns' ) && $has_sort_query_param ) { |
1006 | - $sort_field_ids = array_keys( $_GET['sort'] ); |
|
1007 | - $sort_directions = array_values( $_GET['sort'] ); |
|
1005 | + $sort_field_ids = array_keys( $_GET[ 'sort' ] ); |
|
1006 | + $sort_directions = array_values( $_GET[ 'sort' ] ); |
|
1008 | 1007 | } else { |
1009 | 1008 | $sort_field_ids = $view_setting_sort_field_ids; |
1010 | 1009 | $sort_directions = $view_setting_sort_directions; |
@@ -1012,7 +1011,7 @@ discard block |
||
1012 | 1011 | |
1013 | 1012 | $skip_first = false; |
1014 | 1013 | |
1015 | - foreach ( (array) $sort_field_ids as $key => $sort_field_id ) { |
|
1014 | + foreach ( (array)$sort_field_ids as $key => $sort_field_id ) { |
|
1016 | 1015 | |
1017 | 1016 | if ( ! $skip_first && ! $has_sort_query_param ) { |
1018 | 1017 | $skip_first = true; // Skip the first one, it's already in the query |
@@ -1042,15 +1041,15 @@ discard block |
||
1042 | 1041 | |
1043 | 1042 | $merged_time = false; |
1044 | 1043 | |
1045 | - foreach ( $q['order'] as $oid => $order ) { |
|
1046 | - if ( $order[0] instanceof \GF_Query_Column ) { |
|
1047 | - $column = $order[0]; |
|
1048 | - } else if ( $order[0] instanceof \GF_Query_Call ) { |
|
1049 | - if ( count( $order[0]->columns ) != 1 || ! $order[0]->columns[0] instanceof \GF_Query_Column ) { |
|
1044 | + foreach ( $q[ 'order' ] as $oid => $order ) { |
|
1045 | + if ( $order[ 0 ] instanceof \GF_Query_Column ) { |
|
1046 | + $column = $order[ 0 ]; |
|
1047 | + } else if ( $order[ 0 ] instanceof \GF_Query_Call ) { |
|
1048 | + if ( count( $order[ 0 ]->columns ) != 1 || ! $order[ 0 ]->columns[ 0 ] instanceof \GF_Query_Column ) { |
|
1050 | 1049 | $orders[ $oid ] = $order; |
1051 | 1050 | continue; // Need something that resembles a single sort |
1052 | 1051 | } |
1053 | - $column = $order[0]->columns[0]; |
|
1052 | + $column = $order[ 0 ]->columns[ 0 ]; |
|
1054 | 1053 | } |
1055 | 1054 | |
1056 | 1055 | if ( ( ! $field = \GFAPI::get_field( $column->source, $column->field_id ) ) || $field->type !== 'time' ) { |
@@ -1064,7 +1063,7 @@ discard block |
||
1064 | 1063 | |
1065 | 1064 | $orders[ $oid ] = array( |
1066 | 1065 | new \GV\Mocks\GF_Query_Call_TIMESORT( 'timesort', array( $column, $sql ) ), |
1067 | - $order[1] // Mock it! |
|
1066 | + $order[ 1 ] // Mock it! |
|
1068 | 1067 | ); |
1069 | 1068 | |
1070 | 1069 | $merged_time = true; |
@@ -1075,15 +1074,15 @@ discard block |
||
1075 | 1074 | * ORDER again. |
1076 | 1075 | */ |
1077 | 1076 | if ( ! empty( $orders ) && $_orders = $query->_order_generate( $orders ) ) { |
1078 | - $sql['order'] = 'ORDER BY ' . implode( ', ', $_orders ); |
|
1077 | + $sql[ 'order' ] = 'ORDER BY ' . implode( ', ', $_orders ); |
|
1079 | 1078 | } |
1080 | 1079 | } |
1081 | 1080 | |
1082 | 1081 | return $sql; |
1083 | 1082 | } ); |
1084 | 1083 | |
1085 | - $query->limit( $parameters['paging']['page_size'] ) |
|
1086 | - ->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) ); |
|
1084 | + $query->limit( $parameters[ 'paging' ][ 'page_size' ] ) |
|
1085 | + ->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) ); |
|
1087 | 1086 | |
1088 | 1087 | /** |
1089 | 1088 | * Any joins? |
@@ -1106,7 +1105,7 @@ discard block |
||
1106 | 1105 | |
1107 | 1106 | $query_parameters = $query->_introspect(); |
1108 | 1107 | |
1109 | - $query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) ); |
|
1108 | + $query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) ); |
|
1110 | 1109 | } |
1111 | 1110 | |
1112 | 1111 | /** |
@@ -1140,7 +1139,7 @@ discard block |
||
1140 | 1139 | } |
1141 | 1140 | |
1142 | 1141 | $q = $query->_introspect(); |
1143 | - $query->where( \GF_Query_Condition::_and( $q['where'], $condition ) ); |
|
1142 | + $query->where( \GF_Query_Condition::_and( $q[ 'where' ], $condition ) ); |
|
1144 | 1143 | |
1145 | 1144 | if ( $this->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
1146 | 1145 | |
@@ -1165,7 +1164,7 @@ discard block |
||
1165 | 1164 | |
1166 | 1165 | $query_parameters = $query->_introspect(); |
1167 | 1166 | |
1168 | - $query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) ); |
|
1167 | + $query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) ); |
|
1169 | 1168 | } |
1170 | 1169 | } |
1171 | 1170 | |
@@ -1189,7 +1188,7 @@ discard block |
||
1189 | 1188 | $conditions = array(); |
1190 | 1189 | |
1191 | 1190 | foreach ( $condition->expressions as $_condition ) { |
1192 | - $conditions[] = $recurse( $_condition, $fields, $recurse ); |
|
1191 | + $conditions[ ] = $recurse( $_condition, $fields, $recurse ); |
|
1193 | 1192 | } |
1194 | 1193 | |
1195 | 1194 | return call_user_func_array( |
@@ -1218,10 +1217,10 @@ discard block |
||
1218 | 1217 | $q = new $query_class( $form_id ); |
1219 | 1218 | |
1220 | 1219 | // Copy the WHERE clauses but substitute the field_ids to the respective ones |
1221 | - $q->where( $where_union_substitute( $query_parameters['where'], $fields, $where_union_substitute ) ); |
|
1220 | + $q->where( $where_union_substitute( $query_parameters[ 'where' ], $fields, $where_union_substitute ) ); |
|
1222 | 1221 | |
1223 | 1222 | // Copy the ORDER clause and substitute the field_ids to the respective ones |
1224 | - foreach ( $query_parameters['order'] as $order ) { |
|
1223 | + foreach ( $query_parameters[ 'order' ] as $order ) { |
|
1225 | 1224 | list( $column, $_order ) = $order; |
1226 | 1225 | |
1227 | 1226 | if ( $column && $column instanceof \GF_Query_Column ) { |
@@ -1235,15 +1234,15 @@ discard block |
||
1235 | 1234 | |
1236 | 1235 | add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( &$unions_sql ) { |
1237 | 1236 | // Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses |
1238 | - $select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] ); |
|
1237 | + $select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] ); |
|
1239 | 1238 | |
1240 | 1239 | // Record the SQL |
1241 | - $unions_sql[] = array( |
|
1240 | + $unions_sql[ ] = array( |
|
1242 | 1241 | // Remove columns, we'll rebuild them |
1243 | 1242 | 'select' => preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $select ), |
1244 | - 'from' => $sql['from'], |
|
1245 | - 'join' => $sql['join'], |
|
1246 | - 'where' => $sql['where'], |
|
1243 | + 'from' => $sql[ 'from' ], |
|
1244 | + 'join' => $sql[ 'join' ], |
|
1245 | + 'where' => $sql[ 'where' ], |
|
1247 | 1246 | // Remove order and limit |
1248 | 1247 | ); |
1249 | 1248 | |
@@ -1260,11 +1259,11 @@ discard block |
||
1260 | 1259 | |
1261 | 1260 | add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( $unions_sql ) { |
1262 | 1261 | // Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses |
1263 | - $sql['select'] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] ); |
|
1262 | + $sql[ 'select' ] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] ); |
|
1264 | 1263 | |
1265 | 1264 | // Remove columns, we'll rebuild them |
1266 | - preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql['select'], $select_match ); |
|
1267 | - $sql['select'] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql['select'] ); |
|
1265 | + preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql[ 'select' ], $select_match ); |
|
1266 | + $sql[ 'select' ] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql[ 'select' ] ); |
|
1268 | 1267 | |
1269 | 1268 | $unions = array(); |
1270 | 1269 | |
@@ -1275,30 +1274,30 @@ discard block |
||
1275 | 1274 | }; |
1276 | 1275 | |
1277 | 1276 | // Add all the order columns into the selects, so we can order by the whole union group |
1278 | - preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql['order'], $order_matches ); |
|
1277 | + preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql[ 'order' ], $order_matches ); |
|
1279 | 1278 | |
1280 | 1279 | $columns = array( |
1281 | - sprintf( '%s AS %s', $select_match[1], $column_to_alias( $select_match[1] ) ) |
|
1280 | + sprintf( '%s AS %s', $select_match[ 1 ], $column_to_alias( $select_match[ 1 ] ) ) |
|
1282 | 1281 | ); |
1283 | 1282 | |
1284 | 1283 | foreach ( array_slice( $order_matches, 1 ) as $match ) { |
1285 | - $columns[] = sprintf( '%s AS %s', $match[0], $column_to_alias( $match[0] ) ); |
|
1284 | + $columns[ ] = sprintf( '%s AS %s', $match[ 0 ], $column_to_alias( $match[ 0 ] ) ); |
|
1286 | 1285 | |
1287 | 1286 | // Rewrite the order columns to the shared aliases |
1288 | - $sql['order'] = str_replace( $match[0], $column_to_alias( $match[0] ), $sql['order'] ); |
|
1287 | + $sql[ 'order' ] = str_replace( $match[ 0 ], $column_to_alias( $match[ 0 ] ), $sql[ 'order' ] ); |
|
1289 | 1288 | } |
1290 | 1289 | |
1291 | 1290 | $columns = array_unique( $columns ); |
1292 | 1291 | |
1293 | 1292 | // Add the columns to every UNION |
1294 | 1293 | foreach ( $unions_sql as $union_sql ) { |
1295 | - $union_sql['select'] .= implode( ', ', $columns ); |
|
1296 | - $unions []= implode( ' ', $union_sql ); |
|
1294 | + $union_sql[ 'select' ] .= implode( ', ', $columns ); |
|
1295 | + $unions [ ] = implode( ' ', $union_sql ); |
|
1297 | 1296 | } |
1298 | 1297 | |
1299 | 1298 | // Add the columns to the main SELECT, but only grab the entry id column |
1300 | - $sql['select'] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql['select'] . implode( ', ', $columns ); |
|
1301 | - $sql['order'] = implode( ' ', $unions ) . ') AS u ' . $sql['order']; |
|
1299 | + $sql[ 'select' ] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql[ 'select' ] . implode( ', ', $columns ); |
|
1300 | + $sql[ 'order' ] = implode( ' ', $unions ) . ') AS u ' . $sql[ 'order' ]; |
|
1302 | 1301 | |
1303 | 1302 | return $sql; |
1304 | 1303 | } ); |
@@ -1343,20 +1342,20 @@ discard block |
||
1343 | 1342 | } ); |
1344 | 1343 | } else { |
1345 | 1344 | $entries = $this->form->entries |
1346 | - ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) ) |
|
1345 | + ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) ) |
|
1347 | 1346 | ->offset( $this->settings->get( 'offset' ) ) |
1348 | - ->limit( $parameters['paging']['page_size'] ) |
|
1347 | + ->limit( $parameters[ 'paging' ][ 'page_size' ] ) |
|
1349 | 1348 | ->page( $page ); |
1350 | 1349 | |
1351 | - if ( ! empty( $parameters['sorting'] ) && is_array( $parameters['sorting'] && ! isset( $parameters['sorting']['key'] ) ) ) { |
|
1350 | + if ( ! empty( $parameters[ 'sorting' ] ) && is_array( $parameters[ 'sorting' ] && ! isset( $parameters[ 'sorting' ][ 'key' ] ) ) ) { |
|
1352 | 1351 | // Pluck off multisort arrays |
1353 | - $parameters['sorting'] = $parameters['sorting'][0]; |
|
1352 | + $parameters[ 'sorting' ] = $parameters[ 'sorting' ][ 0 ]; |
|
1354 | 1353 | } |
1355 | 1354 | |
1356 | - if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) { |
|
1355 | + if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) { |
|
1357 | 1356 | $field = new \GV\Field(); |
1358 | - $field->ID = $parameters['sorting']['key']; |
|
1359 | - $direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
1357 | + $field->ID = $parameters[ 'sorting' ][ 'key' ]; |
|
1358 | + $direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
1360 | 1359 | $entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) ); |
1361 | 1360 | } |
1362 | 1361 | } |
@@ -1431,7 +1430,7 @@ discard block |
||
1431 | 1430 | $allowed = $headers = array(); |
1432 | 1431 | |
1433 | 1432 | foreach ( $view->fields->by_position( "directory_*" )->by_visible( $view )->all() as $id => $field ) { |
1434 | - $allowed[] = $field; |
|
1433 | + $allowed[ ] = $field; |
|
1435 | 1434 | } |
1436 | 1435 | |
1437 | 1436 | $renderer = new Field_Renderer(); |
@@ -1453,17 +1452,17 @@ discard block |
||
1453 | 1452 | } ); |
1454 | 1453 | |
1455 | 1454 | foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) { |
1456 | - $allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id ); |
|
1455 | + $allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id ); |
|
1457 | 1456 | } |
1458 | 1457 | |
1459 | 1458 | foreach ( $allowed as $field ) { |
1460 | 1459 | $source = is_numeric( $field->ID ) ? $view->form : new \GV\Internal_Source(); |
1461 | 1460 | |
1462 | - $return[] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' ); |
|
1461 | + $return[ ] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' ); |
|
1463 | 1462 | |
1464 | 1463 | if ( ! $headers_done ) { |
1465 | 1464 | $label = $field->get_label( $view, $source, $entry ); |
1466 | - $headers[] = $label ? $label : $field->ID; |
|
1465 | + $headers[ ] = $label ? $label : $field->ID; |
|
1467 | 1466 | } |
1468 | 1467 | } |
1469 | 1468 |