Skip to content

Commit 1095cce

Browse files
avonvilleavonville
committed
Fixes #61 in Pro repo
1 parent 794a6ae commit 1095cce

File tree

3 files changed

+133
-133
lines changed

3 files changed

+133
-133
lines changed

‎includes/fields/class-field-checkbox.php‎

Lines changed: 131 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,131 @@
1-
<?php
2-
3-
/**
4-
* Text Field Class
5-
*/
6-
class WeForms_Form_Field_Checkbox extends WeForms_Field_Contract {
7-
8-
public function __construct() {
9-
$this->name = __( 'Checkbox', 'weforms' );
10-
$this->input_type = 'checkbox_field';
11-
$this->icon = 'check-square-o';
12-
}
13-
14-
/**
15-
* Render the text field
16-
*
17-
* @param array $field_settings
18-
* @param int $form_id
19-
*
20-
* @return void
21-
*/
22-
public function render( $field_settings, $form_id ) {
23-
$selected = !empty( $field_settings['selected'] ) ? $field_settings['selected'] : []; ?>
24-
<li <?php $this->print_list_attributes( $field_settings ); ?>>
25-
<?php $this->print_label( $field_settings, $form_id ); ?>
26-
27-
<?php do_action( 'weforms_checkbox_field_after_label', $field_settings ); ?>
28-
<div class="wpuf-fields" data-required="<?php echo esc_attr( $field_settings['required'] ) ?>" data-type="radio">
29-
30-
<?php
31-
if ( $field_settings['options'] && count( $field_settings['options'] ) > 0 ) {
32-
foreach ( $field_settings['options'] as $value => $option ) {
33-
?>
34-
<label <?php echo $field_settings['inline'] == 'yes' ? 'class="wpuf-checkbox-inline"' : 'class="wpuf-checkbox-block"'; ?>>
35-
<input type="checkbox" class="<?php echo 'wpuf_' . esc_attr( $field_settings['name'] ). '_'. esc_attr($form_id); ?>" name="<?php echo esc_attr( $field_settings['name'] ); ?>[]" value="<?php echo esc_attr( $value ); ?>"<?php echo in_array( $value, $selected ) ? ' checked="checked"' : ''; ?> />
36-
<?php echo $option; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
37-
</label>
38-
<?php
39-
}
40-
} ?>
41-
42-
<?php $this->help_text( $field_settings ); ?>
43-
44-
</div>
45-
</li>
46-
<?php
47-
}
48-
49-
/**
50-
* Get field options setting
51-
*
52-
* @return array
53-
*/
54-
public function get_options_settings() {
55-
$default_options = $this->get_default_option_settings( true, [ 'width' ] );
56-
$dropdown_options = [
57-
$this->get_default_option_dropdown_settings( true ),
58-
59-
[
60-
'name' => 'inline',
61-
'title' => __( 'Show in inline list', 'weforms' ),
62-
'type' => 'radio',
63-
'options' => [
64-
'yes' => __( 'Yes', 'weforms' ),
65-
'no' => __( 'No', 'weforms' ),
66-
],
67-
'default' => 'no',
68-
'inline' => true,
69-
'section' => 'advanced',
70-
'priority' => 23,
71-
'help_text' => __( 'Show this option in an inline list', 'weforms' ),
72-
],
73-
];
74-
75-
$dropdown_options = apply_filters( 'weforms_checkbox_field_option_settings', $dropdown_options );
76-
77-
return array_merge( $default_options, $dropdown_options );
78-
}
79-
80-
/**
81-
* Get the field props
82-
*
83-
* @return array
84-
*/
85-
public function get_field_props() {
86-
$defaults = $this->default_attributes();
87-
$props = [
88-
'selected' => [],
89-
'inline' => 'no',
90-
'options' => [ 'Option' => __( 'Option', 'weforms' ) ],
91-
];
92-
93-
$props = apply_filters( 'weforms_checkbox_field_props', $props );
94-
95-
return array_merge( $defaults, $props );
96-
}
97-
98-
/**
99-
* Prepare entry
100-
*
101-
* @param $field
102-
*
103-
* @return mixed
104-
*/
105-
public function prepare_entry( $field, $args = [] ) {
106-
if( empty( $_POST['_wpnonce'] ) ) {
107-
wp_send_json_error( __( 'Unauthorized operation', 'weforms' ) );
108-
}
109-
110-
if ( ! wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['_wpnonce'] ) ), 'wpuf_form_add' ) ) {
111-
wp_send_json_error( __( 'Unauthorized operation', 'weforms' ) );
112-
}
113-
114-
$args = ! empty( $args ) ? $args : weforms_clean( $_POST );
115-
$entry_value = ( is_array( $args[ $field[ 'name' ] ] ) && $args[ $field[ 'name' ] ] ) ? $args[ $field[ 'name' ] ] : array();
116-
117-
if ( $entry_value ) {
118-
$new_val = [];
119-
120-
foreach ( $entry_value as $option_key ) {
121-
$new_val[] = isset( $field['options'][$option_key] ) ? $field['options'][$option_key] : $option_key;
122-
}
123-
124-
$entry_value = implode( WeForms::$field_separator, $new_val );
125-
} else {
126-
$entry_value = '';
127-
}
128-
129-
return $entry_value;
130-
}
131-
}
1+
<?php
2+
3+
/**
4+
* Text Field Class
5+
*/
6+
class WeForms_Form_Field_Checkbox extends WeForms_Field_Contract {
7+
8+
public function __construct() {
9+
$this->name = __( 'Checkbox', 'weforms' );
10+
$this->input_type = 'checkbox_field';
11+
$this->icon = 'check-square-o';
12+
}
13+
14+
/**
15+
* Render the text field
16+
*
17+
* @param array $field_settings
18+
* @param int $form_id
19+
*
20+
* @return void
21+
*/
22+
public function render( $field_settings, $form_id ) {
23+
$selected = !empty( $field_settings['selected'] ) ? $field_settings['selected'] : []; ?>
24+
<li <?php $this->print_list_attributes( $field_settings ); ?>>
25+
<?php $this->print_label( $field_settings, $form_id ); ?>
26+
27+
<?php do_action( 'weforms_checkbox_field_after_label', $field_settings ); ?>
28+
<div class="wpuf-fields" data-required="<?php echo esc_attr( $field_settings['required'] ) ?>" data-type="radio">
29+
30+
<?php
31+
if ( $field_settings['options'] && count( $field_settings['options'] ) > 0 ) {
32+
foreach ( $field_settings['options'] as $value => $option ) {
33+
?>
34+
<label <?php echo $field_settings['inline'] == 'yes' ? 'class="wpuf-checkbox-inline"' : 'class="wpuf-checkbox-block"'; ?>>
35+
<input type="checkbox" class="<?php echo 'wpuf_' . esc_attr( $field_settings['name'] ). '_'. esc_attr($form_id); ?>" name="<?php echo esc_attr( $field_settings['name'] ); ?>[]" value="<?php echo esc_attr( $value ); ?>"<?php echo in_array( $value, $selected ) ? ' checked="checked"' : ''; ?> />
36+
<?php echo $option; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
37+
</label>
38+
<?php
39+
}
40+
} ?>
41+
42+
<?php $this->help_text( $field_settings ); ?>
43+
44+
</div>
45+
</li>
46+
<?php
47+
}
48+
49+
/**
50+
* Get field options setting
51+
*
52+
* @return array
53+
*/
54+
public function get_options_settings() {
55+
$default_options = $this->get_default_option_settings( true, [ 'width' ] );
56+
$dropdown_options = [
57+
$this->get_default_option_dropdown_settings( true ),
58+
59+
[
60+
'name' => 'inline',
61+
'title' => __( 'Show in inline list', 'weforms' ),
62+
'type' => 'radio',
63+
'options' => [
64+
'yes' => __( 'Yes', 'weforms' ),
65+
'no' => __( 'No', 'weforms' ),
66+
],
67+
'default' => 'no',
68+
'inline' => true,
69+
'section' => 'advanced',
70+
'priority' => 23,
71+
'help_text' => __( 'Show this option in an inline list', 'weforms' ),
72+
],
73+
];
74+
75+
$dropdown_options = apply_filters( 'weforms_checkbox_field_option_settings', $dropdown_options );
76+
77+
return array_merge( $default_options, $dropdown_options );
78+
}
79+
80+
/**
81+
* Get the field props
82+
*
83+
* @return array
84+
*/
85+
public function get_field_props() {
86+
$defaults = $this->default_attributes();
87+
$props = [
88+
'selected' => [],
89+
'inline' => 'no',
90+
'options' => [ 'Option' => __( 'Option', 'weforms' ) ],
91+
];
92+
93+
$props = apply_filters( 'weforms_checkbox_field_props', $props );
94+
95+
return array_merge( $defaults, $props );
96+
}
97+
98+
/**
99+
* Prepare entry
100+
*
101+
* @param $field
102+
*
103+
* @return mixed
104+
*/
105+
public function prepare_entry( $field, $args = [] ) {
106+
if( empty( $_POST['_wpnonce'] ) ) {
107+
wp_send_json_error( __( 'Unauthorized operation', 'weforms' ) );
108+
}
109+
110+
if ( ! wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['_wpnonce'] ) ), 'wpuf_form_add' ) ) {
111+
wp_send_json_error( __( 'Unauthorized operation', 'weforms' ) );
112+
}
113+
114+
$args = ! empty( $args ) ? $args : weforms_clean( $_POST );
115+
$entry_value = ( is_array( $args[ $field[ 'name' ] ] ) && $args[ $field[ 'name' ] ] ) ? $args[ $field[ 'name' ] ] : array();
116+
117+
if ( $entry_value ) {
118+
$new_val = [];
119+
120+
foreach ( $entry_value as $option_key ) {
121+
$new_val[] = isset( $field['options'][$option_key] ) ? $field['options'][$option_key] . ' , ' . $option_key : $option_key;
122+
}
123+
124+
$entry_value = implode( WeForms::$field_separator, $new_val );
125+
} else {
126+
$entry_value = '';
127+
}
128+
129+
return $entry_value;
130+
}
131+
}

‎includes/fields/class-field-multidropdown.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public function prepare_entry( $field, $args = [] ) {
9393
$new_val = [];
9494

9595
foreach ( $entry_value as $option_key ) {
96-
$new_val[] = isset( $field['options'][$option_key] ) ? $field['options'][$option_key] : $option_key;
96+
$new_val[] = isset( $field['options'][$option_key] ) ? $field['options'][$option_key] . ' , ' . $option_key : $option_key;
9797
}
9898

9999
$entry_value = implode( WeForms::$field_separator, $new_val );

‎includes/fields/class-field-radio.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,6 @@ public function prepare_entry( $field, $args = [] ) {
119119
$args = ! empty( $args ) ? $args : weforms_clean( $_POST );
120120
$val = $args[$field['name']];
121121

122-
return isset( $field['options'][$val] ) ? $field['options'][$val] : $val;
122+
return isset( $field['options'][$val] ) ? $field['options'][$val] . ' , ' . $val : $val;
123123
}
124124
}

0 commit comments

Comments
 (0)