@@ -61,12 +61,12 @@ discard block |
||
| 61 | 61 | if ( is_array( $sub_field ) ) { |
| 62 | 62 | $sub_field = wp_parse_args( $sub_field, $defaults ); |
| 63 | 63 | $sub_field['name'] = $name; |
| 64 | - $this->sub_fields[ $name ] = $sub_field; |
|
| 64 | + $this->sub_fields[$name] = $sub_field; |
|
| 65 | 65 | continue; |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | if ( is_string( $sub_field ) ) { |
| 69 | - $this->sub_fields[ $name ] = wp_parse_args( |
|
| 69 | + $this->sub_fields[$name] = wp_parse_args( |
|
| 70 | 70 | array( |
| 71 | 71 | 'name' => $name, |
| 72 | 72 | 'label' => $sub_field, |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | */ |
| 90 | 90 | public function set_aria_invalid_error( &$shortcode_atts, $args ) { |
| 91 | 91 | foreach ( $this->get_sub_fields() as $sub_field ) { |
| 92 | - $shortcode_atts[ 'aria-invalid-' . $sub_field['name'] ] = isset( $args['errors'][ 'field' . $this->field_id . '-' . $sub_field['name'] ] ) ? 'true' : 'false'; |
|
| 92 | + $shortcode_atts['aria-invalid-' . $sub_field['name']] = isset( $args['errors']['field' . $this->field_id . '-' . $sub_field['name']] ) ? 'true' : 'false'; |
|
| 93 | 93 | } |
| 94 | 94 | } |
| 95 | 95 | |
@@ -135,9 +135,9 @@ discard block |
||
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | if ( is_string( $option ) ) { |
| 138 | - $extra_options[ $key . '_' . $option ] = ''; |
|
| 138 | + $extra_options[$key . '_' . $option] = ''; |
|
| 139 | 139 | } elseif ( ! empty( $option['name'] ) ) { |
| 140 | - $extra_options[ $key . '_' . $option['name'] ] = ''; |
|
| 140 | + $extra_options[$key . '_' . $option['name']] = ''; |
|
| 141 | 141 | } |
| 142 | 142 | } |
| 143 | 143 | } |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | foreach ( $this->sub_fields as $name => $sub_field ) { |
| 164 | 164 | $sub_field['name'] = $name; |
| 165 | 165 | $wrapper_classes = 'frm_grid_container frm_sub_field_options frm_sub_field_options-' . $sub_field['name']; |
| 166 | - if ( ! isset( $processed_sub_fields[ $name ] ) ) { |
|
| 166 | + if ( ! isset( $processed_sub_fields[$name] ) ) { |
|
| 167 | 167 | // Options for this subfield should be hidden. |
| 168 | 168 | $wrapper_classes .= ' frm_hidden'; |
| 169 | 169 | } |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | $default_value = array(); |
| 194 | 194 | |
| 195 | 195 | foreach ( $this->sub_fields as $name => $sub_field ) { |
| 196 | - $default_value[ $name ] = ''; |
|
| 196 | + $default_value[$name] = ''; |
|
| 197 | 197 | } |
| 198 | 198 | |
| 199 | 199 | return $default_value; |
@@ -375,8 +375,8 @@ discard block |
||
| 375 | 375 | // Placeholder. |
| 376 | 376 | if ( in_array( 'placeholder', $sub_field['options'], true ) ) { |
| 377 | 377 | $placeholders = FrmField::get_option( $field, 'placeholder' ); |
| 378 | - if ( ! empty( $placeholders[ $sub_field['name'] ] ) ) { |
|
| 379 | - $field['placeholder'] = $placeholders[ $sub_field['name'] ]; |
|
| 378 | + if ( ! empty( $placeholders[$sub_field['name']] ) ) { |
|
| 379 | + $field['placeholder'] = $placeholders[$sub_field['name']]; |
|
| 380 | 380 | } |
| 381 | 381 | } |
| 382 | 382 | |
@@ -437,9 +437,9 @@ discard block |
||
| 437 | 437 | |
| 438 | 438 | // Validate not empty. |
| 439 | 439 | foreach ( $sub_fields as $name => $sub_field ) { |
| 440 | - if ( empty( $sub_field['optional'] ) && empty( $args['value'][ $name ] ) ) { |
|
| 441 | - $errors[ 'field' . $args['id'] . '-' . $name ] = ''; |
|
| 442 | - $errors[ 'field' . $args['id'] ] = $blank_msg; |
|
| 440 | + if ( empty( $sub_field['optional'] ) && empty( $args['value'][$name] ) ) { |
|
| 441 | + $errors['field' . $args['id'] . '-' . $name] = ''; |
|
| 442 | + $errors['field' . $args['id']] = $blank_msg; |
|
| 443 | 443 | } |
| 444 | 444 | } |
| 445 | 445 | |
@@ -458,7 +458,7 @@ discard block |
||
| 458 | 458 | $field_key = $this->field->field_key ?? $this->field['field_key']; |
| 459 | 459 | $sub_fields = $this->get_processed_sub_fields(); |
| 460 | 460 | foreach ( $sub_fields as $name => $sub_field ) { |
| 461 | - $headings[ $field_id . '_' . $name ] = $field_name . ' (' . $field_key . ') - ' . $sub_field['label']; |
|
| 461 | + $headings[$field_id . '_' . $name] = $field_name . ' (' . $field_key . ') - ' . $sub_field['label']; |
|
| 462 | 462 | } |
| 463 | 463 | |
| 464 | 464 | return $headings; |
@@ -521,9 +521,9 @@ discard block |
||
| 521 | 521 | 'value' => '', |
| 522 | 522 | ); |
| 523 | 523 | |
| 524 | - if ( ! empty( $args['field']['value'][ $sub_field['name'] ] ) ) { |
|
| 525 | - $attrs['value'] = $args['field']['value'][ $sub_field['name'] ]; |
|
| 526 | - $attrs['data-frmval'] = $args['field']['value'][ $sub_field['name'] ]; |
|
| 524 | + if ( ! empty( $args['field']['value'][$sub_field['name']] ) ) { |
|
| 525 | + $attrs['value'] = $args['field']['value'][$sub_field['name']]; |
|
| 526 | + $attrs['data-frmval'] = $args['field']['value'][$sub_field['name']]; |
|
| 527 | 527 | } |
| 528 | 528 | if ( empty( $args['remove_names'] ) ) { |
| 529 | 529 | $attrs['name'] = $args['field_name'] . '[' . $sub_field['name'] . ']'; |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | $sub_field_class = "frm_form_field form-field frm_form_subfield-{$name} {$sub_field['wrapper_classes']}"; |
| 42 | 42 | $sub_field_desc = FrmField::get_option( $field, $name . '_desc' ); |
| 43 | 43 | |
| 44 | - if ( isset( $errors[ 'field' . $field_id . '-' . $name ] ) ) { |
|
| 44 | + if ( isset( $errors['field' . $field_id . '-' . $name] ) ) { |
|
| 45 | 45 | $sub_field_class .= ' frm_blank_field'; |
| 46 | 46 | } |
| 47 | 47 | ?> |
@@ -70,9 +70,9 @@ discard block |
||
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | // Don't show individual field errors when there is a combo field error. |
| 73 | - if ( ! empty( $errors ) && isset( $errors[ 'field' . $field_id . '-' . $name ] ) && ! isset( $errors[ 'field' . $field_id ] ) ) { |
|
| 73 | + if ( ! empty( $errors ) && isset( $errors['field' . $field_id . '-' . $name] ) && ! isset( $errors['field' . $field_id] ) ) { |
|
| 74 | 74 | ?> |
| 75 | - <div class="frm_error" role="alert"><?php echo esc_html( $errors[ 'field' . $field_id . '-' . $name ] ); ?></div> |
|
| 75 | + <div class="frm_error" role="alert"><?php echo esc_html( $errors['field' . $field_id . '-' . $name] ); ?></div> |
|
| 76 | 76 | <?php } ?> |
| 77 | 77 | </div> |
| 78 | 78 | <?php |
@@ -68,19 +68,19 @@ discard block |
||
| 68 | 68 | $result = array(); |
| 69 | 69 | |
| 70 | 70 | foreach ( $names as $name ) { |
| 71 | - if ( empty( $this->sub_fields[ $name ] ) ) { |
|
| 71 | + if ( empty( $this->sub_fields[$name] ) ) { |
|
| 72 | 72 | continue; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - if ( ! isset( $this->sub_fields[ $name ]['wrapper_classes'] ) ) { |
|
| 76 | - $this->sub_fields[ $name ]['wrapper_classes'] = $col_class; |
|
| 77 | - } elseif ( is_array( $this->sub_fields[ $name ]['wrapper_classes'] ) ) { |
|
| 78 | - $this->sub_fields[ $name ]['wrapper_classes'] = implode( ' ', $this->sub_fields[ $name ]['wrapper_classes'] ) . ' ' . $col_class; |
|
| 75 | + if ( ! isset( $this->sub_fields[$name]['wrapper_classes'] ) ) { |
|
| 76 | + $this->sub_fields[$name]['wrapper_classes'] = $col_class; |
|
| 77 | + } elseif ( is_array( $this->sub_fields[$name]['wrapper_classes'] ) ) { |
|
| 78 | + $this->sub_fields[$name]['wrapper_classes'] = implode( ' ', $this->sub_fields[$name]['wrapper_classes'] ) . ' ' . $col_class; |
|
| 79 | 79 | } else { |
| 80 | - $this->sub_fields[ $name ]['wrapper_classes'] .= ' ' . $col_class; |
|
| 80 | + $this->sub_fields[$name]['wrapper_classes'] .= ' ' . $col_class; |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | - $result[ $name ] = $this->sub_fields[ $name ]; |
|
| 83 | + $result[$name] = $this->sub_fields[$name]; |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | return $result; |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | |
| 112 | 112 | // Default desc. |
| 113 | 113 | foreach ( $this->sub_fields as $name => $sub_field ) { |
| 114 | - $extra_options[ $name . '_desc' ] = $sub_field['label']; |
|
| 114 | + $extra_options[$name . '_desc'] = $sub_field['label']; |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | return $extra_options; |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | $name_layout = $this->get_name_layout(); |
| 151 | 151 | |
| 152 | 152 | if ( ! empty( $atts['show'] ) ) { |
| 153 | - return $value[ $atts['show'] ] ?? ''; |
|
| 153 | + return $value[$atts['show']] ?? ''; |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | $value = wp_parse_args( |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | $args['sub_fields'] = $this->sub_fields; |
| 231 | 231 | |
| 232 | 232 | foreach ( $hidden_fields as $name => $hidden_field ) { |
| 233 | - $args['sub_fields'][ $name ]['wrapper_classes'] .= ' frm_hidden'; |
|
| 233 | + $args['sub_fields'][$name]['wrapper_classes'] .= ' frm_hidden'; |
|
| 234 | 234 | } |
| 235 | 235 | } |
| 236 | 236 | } |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | public static function track_first_name_field( $fields ) { |
| 314 | 314 | foreach ( $fields as $field ) { |
| 315 | 315 | if ( 'name' === $field->type ) { |
| 316 | - self::$first_name_field_ids[ $field->form_id ] = $field->id; |
|
| 316 | + self::$first_name_field_ids[$field->form_id] = $field->id; |
|
| 317 | 317 | return; |
| 318 | 318 | } |
| 319 | 319 | } |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | $attrs = parent::get_sub_field_input_attrs( $sub_field, $args ); |
| 333 | 333 | |
| 334 | 334 | $form_id = (int) ( is_array( $args['field'] ) ? $args['field']['form_id'] : $args['field']->form_id ); |
| 335 | - if ( ! self::$first_name_field_ids || empty( self::$first_name_field_ids[ $form_id ] ) ) { |
|
| 335 | + if ( ! self::$first_name_field_ids || empty( self::$first_name_field_ids[$form_id] ) ) { |
|
| 336 | 336 | return $attrs; |
| 337 | 337 | } |
| 338 | 338 | |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | |
| 345 | 345 | $field_id = (int) ( is_array( $args['field'] ) ? $args['field']['id'] : $args['field']->id ); |
| 346 | 346 | |
| 347 | - if ( intval( self::$first_name_field_ids[ $form_id ] ) === $field_id ) { |
|
| 347 | + if ( intval( self::$first_name_field_ids[$form_id] ) === $field_id ) { |
|
| 348 | 348 | if ( 'first' === $sub_field['name'] ) { |
| 349 | 349 | $attrs['autocomplete'] = 'given-name'; |
| 350 | 350 | } elseif ( 'last' === $sub_field['name'] ) { |