| @@ -18,10 +18,9 @@ | ||
| 18 | 18 | |
| 19 | 19 | // Javascript may be included in some field settings. |
| 20 | 20 | // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized |
| 21 | 21 | $fields = isset( $_POST['field'] ) ? wp_unslash( $_POST['field'] ) : array(); |
| 22 | - | |
| 23 | - if ( ! $fields ) { | |
| 22 | + if ( empty( $fields ) ) { | |
| 24 | 23 | wp_die(); |
| 25 | 24 | } |
| 26 | 25 | |
| 27 | 26 | $_GET['page'] = 'formidable'; |
| @@ -34,11 +33,10 @@ | ||
| 34 | 33 | |
| 35 | 34 | foreach ( $fields as $field ) { |
| 36 | 35 | $field = htmlspecialchars_decode( nl2br( $field ) ); |
| 37 | 36 | $field = json_decode( $field ); |
| 38 | - | |
| 39 | 37 | if ( ! isset( $field->id ) || ! is_numeric( $field->id ) ) { |
| 40 | - // This field may have already been loaded | |
| 38 | + // this field may have already been loaded | |
| 41 | 39 | continue; |
| 42 | 40 | } |
| 43 | 41 | |
| 44 | 42 | if ( ! isset( $field->value ) ) { |
| @@ -49,10 +47,11 @@ | ||
| 49 | 47 | $field->default_value = json_decode( json_encode( $field->default_value ), true ); |
| 50 | 48 | |
| 51 | 49 | ob_start(); |
| 52 | 50 | self::load_single_field( $field, $values ); |
| 53 | - $field_html[ absint( $field->id ) ] = ob_get_clean(); | |
| 54 | - }//end foreach | |
| 51 | + $field_html[ absint( $field->id ) ] = ob_get_contents(); | |
| 52 | + ob_end_clean(); | |
| 53 | + } | |
| 55 | 54 | |
| 56 | 55 | echo json_encode( $field_html ); |
| 57 | 56 | |
| 58 | 57 | wp_die(); |
| @@ -64,17 +63,16 @@ | ||
| 64 | 63 | public static function create() { |
| 65 | 64 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 66 | 65 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 67 | 66 | |
| 68 | - $field_type = FrmAppHelper::get_post_param( 'field_type', '', 'sanitize_text_field' ); | |
| 69 | - $form_id = FrmAppHelper::get_post_param( 'form_id', 0, 'absint' ); | |
| 70 | - $field_options = FrmAppHelper::get_post_param( 'field_options', array(), 'wp_kses_post' ); | |
| 67 | + $field_type = FrmAppHelper::get_post_param( 'field_type', '', 'sanitize_text_field' ); | |
| 68 | + $form_id = FrmAppHelper::get_post_param( 'form_id', 0, 'absint' ); | |
| 71 | 69 | |
| 72 | 70 | do_action( 'frm_before_create_field', $field_type, $form_id ); |
| 73 | 71 | |
| 74 | - $field = self::include_new_field( $field_type, $form_id, $field_options ); | |
| 72 | + $field = self::include_new_field( $field_type, $form_id ); | |
| 75 | 73 | |
| 76 | - // This hook will allow for multiple fields to be added at once | |
| 74 | + // this hook will allow for multiple fields to be added at once | |
| 77 | 75 | do_action( 'frm_after_field_created', $field, $form_id ); |
| 78 | 76 | |
| 79 | 77 | wp_die(); |
| 80 | 78 | } |
| @@ -83,19 +81,14 @@ | ||
| 83 | 81 | * Set up and create a new field |
| 84 | 82 | * |
| 85 | 83 | * @param string $field_type |
| 86 | 84 | * @param int $form_id |
| 87 | - * @param array $field_options | |
| 88 | 85 | * |
| 89 | 86 | * @return array|false |
| 90 | 87 | */ |
| 91 | - public static function include_new_field( $field_type, $form_id, $field_options = array() ) { | |
| 88 | + public static function include_new_field( $field_type, $form_id ) { | |
| 92 | 89 | $field_values = FrmFieldsHelper::setup_new_vars( $field_type, $form_id ); |
| 93 | 90 | |
| 94 | - if ( $field_options ) { | |
| 95 | - $field_values['field_options'] = array_merge( $field_values['field_options'], $field_options ); | |
| 96 | - } | |
| 97 | - | |
| 98 | 91 | // When a new field is added to the form, flag it as draft and hide it from the front-end. |
| 99 | 92 | $field_values['field_options']['draft'] = 1; |
| 100 | 93 | |
| 101 | 94 | /** |
| @@ -107,15 +100,15 @@ | ||
| 107 | 100 | if ( ! $field_id ) { |
| 108 | 101 | return false; |
| 109 | 102 | } |
| 110 | 103 | |
| 111 | - $field = self::get_field_array_from_id( $field_id ); | |
| 104 | + $field = self::get_field_array_from_id( $field_id ); | |
| 105 | + | |
| 112 | 106 | $values = array(); |
| 113 | - | |
| 114 | 107 | if ( FrmAppHelper::pro_is_installed() ) { |
| 115 | 108 | $values['post_type'] = FrmProFormsHelper::post_type( $form_id ); |
| 116 | - $parent_form_id = FrmDb::get_var( 'frm_forms', array( 'id' => $form_id ), 'parent_form_id' ); | |
| 117 | 109 | |
| 110 | + $parent_form_id = FrmDb::get_var( 'frm_forms', array( 'id' => $form_id ), 'parent_form_id' ); | |
| 118 | 111 | if ( $parent_form_id ) { |
| 119 | 112 | $field['parent_form_id'] = $parent_form_id; |
| 120 | 113 | } |
| 121 | 114 | } |
| @@ -128,10 +121,11 @@ | ||
| 128 | 121 | public static function duplicate() { |
| 129 | 122 | FrmAppHelper::permission_check( 'frm_edit_forms' ); |
| 130 | 123 | check_ajax_referer( 'frm_ajax', 'nonce' ); |
| 131 | 124 | |
| 132 | - $field_id = FrmAppHelper::get_post_param( 'field_id', 0, 'absint' ); | |
| 133 | - $form_id = FrmAppHelper::get_post_param( 'form_id', 0, 'absint' ); | |
| 125 | + $field_id = FrmAppHelper::get_post_param( 'field_id', 0, 'absint' ); | |
| 126 | + $form_id = FrmAppHelper::get_post_param( 'form_id', 0, 'absint' ); | |
| 127 | + | |
| 134 | 128 | $new_field = FrmField::duplicate_single_field( $field_id, $form_id ); |
| 135 | 129 | |
| 136 | 130 | if ( is_array( $new_field ) && ! empty( $new_field['field_id'] ) ) { |
| 137 | 131 | self::load_single_field( $new_field['field_id'], $new_field['values'] ); |
| @@ -148,8 +142,9 @@ | ||
| 148 | 142 | * @return array |
| 149 | 143 | */ |
| 150 | 144 | public static function get_field_array_from_id( $field_id ) { |
| 151 | 145 | $field = FrmField::getOne( $field_id ); |
| 146 | + | |
| 152 | 147 | return FrmFieldsHelper::setup_edit_vars( $field ); |
| 153 | 148 | } |
| 154 | 149 | |
| 155 | 150 | /** |
| @@ -154,13 +149,11 @@ | ||
| 154 | 149 | |
| 155 | 150 | /** |
| 156 | 151 | * @since 3.0 |
| 157 | 152 | * |
| 158 | - * @param array|int|object|string $field_object | |
| 159 | - * @param array $values | |
| 160 | - * @param int $form_id | |
| 161 | - * | |
| 162 | - * @return void | |
| 153 | + * @param array|int|object $field_object | |
| 154 | + * @param array $values | |
| 155 | + * @param int $form_id | |
| 163 | 156 | */ |
| 164 | 157 | public static function load_single_field( $field_object, $values, $form_id = 0 ) { |
| 165 | 158 | global $frm_vars; |
| 166 | 159 | $frm_vars['is_admin'] = true; |
| @@ -171,10 +164,11 @@ | ||
| 171 | 164 | $field = $field_object; |
| 172 | 165 | $field_object = FrmField::getOne( $field['id'] ); |
| 173 | 166 | } |
| 174 | 167 | |
| 175 | - $field_obj = FrmFieldFactory::get_field_factory( $field_object ); | |
| 176 | - $display = self::display_field_options( array(), $field_obj ); | |
| 168 | + $field_obj = FrmFieldFactory::get_field_factory( $field_object ); | |
| 169 | + $display = self::display_field_options( array(), $field_obj ); | |
| 170 | + | |
| 177 | 171 | $ajax_loading = ! empty( $values['ajax_load'] ); |
| 178 | 172 | $ajax_this_field = isset( $values['count'] ) && $values['count'] > 10 && ! in_array( $field_object->type, array( 'divider', 'end_divider' ), true ); |
| 179 | 173 | |
| 180 | 174 | if ( $ajax_loading && $ajax_this_field ) { |
| @@ -183,23 +177,12 @@ | ||
| 183 | 177 | return; |
| 184 | 178 | } |
| 185 | 179 | |
| 186 | 180 | if ( ! isset( $field ) && is_object( $field_object ) ) { |
| 187 | - $field_object->parent_form_id = $values['id'] ?? $field_object->form_id; | |
| 181 | + $field_object->parent_form_id = isset( $values['id'] ) ? $values['id'] : $field_object->form_id; | |
| 188 | 182 | $field = FrmFieldsHelper::setup_edit_vars( $field_object ); |
| 189 | 183 | } |
| 190 | 184 | |
| 191 | - /** | |
| 192 | - * Filter for adding extra attributes to the field container. | |
| 193 | - * | |
| 194 | - * @since 6.23 | |
| 195 | - * | |
| 196 | - * @param array $extra_field_attributes | |
| 197 | - * @param array $field | |
| 198 | - * @param array $display | |
| 199 | - */ | |
| 200 | - $extra_field_attributes = apply_filters( 'frm_field_container_extra_attributes', array(), $field, $display ); | |
| 201 | - | |
| 202 | 185 | $li_classes = self::get_classes_for_builder_field( $field, $display, $field_obj ); |
| 203 | 186 | $li_classes .= ' ui-state-default widgets-holder-wrap'; |
| 204 | 187 | |
| 205 | 188 | require FrmAppHelper::plugin_path() . '/classes/views/frm-forms/add_field.php'; |
| @@ -210,9 +193,8 @@ | ||
| 210 | 193 | * |
| 211 | 194 | * @param array $field |
| 212 | 195 | * @param array $display |
| 213 | 196 | * @param FrmFieldType $field_info |
| 214 | - * | |
| 215 | 197 | * @return string |
| 216 | 198 | */ |
| 217 | 199 | private static function get_classes_for_builder_field( $field, $display, $field_info ) { |
| 218 | 200 | $li_classes = $field_info->form_builder_classes( $display['type'] ); |
| @@ -224,9 +206,9 @@ | ||
| 224 | 206 | |
| 225 | 207 | $li_classes .= 'frmend'; |
| 226 | 208 | |
| 227 | 209 | if ( $field ) { |
| 228 | - return apply_filters( 'frm_build_field_class', $li_classes, $field ); | |
| 210 | + $li_classes = apply_filters( 'frm_build_field_class', $li_classes, $field ); | |
| 229 | 211 | } |
| 230 | 212 | |
| 231 | 213 | return $li_classes; |
| 232 | 214 | } |
| @@ -260,9 +242,8 @@ | ||
| 260 | 242 | * |
| 261 | 243 | * @since 6.8.4 |
| 262 | 244 | * |
| 263 | 245 | * @param array $bulk_edit_types |
| 264 | - * | |
| 265 | 246 | * @return array |
| 266 | 247 | */ |
| 267 | 248 | $bulk_edit_types = apply_filters( 'frm_bulk_edit_field_types', $bulk_edit_types ); |
| 268 | 249 | |
| @@ -270,19 +251,18 @@ | ||
| 270 | 251 | return; |
| 271 | 252 | } |
| 272 | 253 | |
| 273 | 254 | $field = FrmFieldsHelper::setup_edit_vars( $field ); |
| 255 | + $opts = FrmAppHelper::get_param( 'opts', '', 'post', 'wp_kses_post' ); | |
| 256 | + $opts = explode( "\n", rtrim( $opts, "\n" ) ); | |
| 257 | + $opts = array_map( 'trim', $opts ); | |
| 274 | 258 | |
| 275 | - $opts = FrmAppHelper::get_param( 'opts', '', 'post', 'wp_kses_post' ); | |
| 276 | - $opts = explode( "\n", rtrim( $opts, "\n" ) ); | |
| 277 | - $opts = array_map( 'trim', $opts ); | |
| 278 | - | |
| 279 | 259 | $separate = FrmAppHelper::get_param( 'separate', '', 'post', 'sanitize_text_field' ); |
| 280 | 260 | $field['separate_value'] = $separate === 'true'; |
| 281 | 261 | |
| 282 | 262 | if ( $field['separate_value'] ) { |
| 283 | 263 | foreach ( $opts as $opt_key => $opt ) { |
| 284 | - if ( str_contains( $opt, '|' ) ) { | |
| 264 | + if ( strpos( $opt, '|' ) !== false ) { | |
| 285 | 265 | $vals = explode( '|', $opt ); |
| 286 | 266 | $opts[ $opt_key ] = array( |
| 287 | 267 | 'label' => trim( $vals[0] ), |
| 288 | 268 | 'value' => trim( $vals[1] ), |
| @@ -293,11 +273,10 @@ | ||
| 293 | 273 | } |
| 294 | 274 | } |
| 295 | 275 | |
| 296 | 276 | // Keep other options after bulk update. |
| 297 | - if ( ! empty( $field['field_options']['other'] ) ) { | |
| 277 | + if ( isset( $field['field_options']['other'] ) && $field['field_options']['other'] == true ) { | |
| 298 | 278 | $other_array = array(); |
| 299 | - | |
| 300 | 279 | foreach ( $field['options'] as $opt_key => $opt ) { |
| 301 | 280 | if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) { |
| 302 | 281 | $other_array[ $opt_key ] = $opt; |
| 303 | 282 | } |
| @@ -302,10 +281,9 @@ | ||
| 302 | 281 | $other_array[ $opt_key ] = $opt; |
| 303 | 282 | } |
| 304 | 283 | unset( $opt_key, $opt ); |
| 305 | 284 | } |
| 306 | - | |
| 307 | - if ( $other_array ) { | |
| 285 | + if ( ! empty( $other_array ) ) { | |
| 308 | 286 | $opts = array_merge( $opts, $other_array ); |
| 309 | 287 | } |
| 310 | 288 | } |
| 311 | 289 | |
| @@ -319,9 +297,8 @@ | ||
| 319 | 297 | /** |
| 320 | 298 | * @since 4.0 |
| 321 | 299 | * |
| 322 | 300 | * @param array $atts - Includes field array, field_obj, display array, values array. |
| 323 | - * | |
| 324 | 301 | * @return void |
| 325 | 302 | */ |
| 326 | 303 | public static function load_single_field_settings( $atts ) { |
| 327 | 304 | $field = $atts['field']; |
| @@ -347,9 +324,9 @@ | ||
| 347 | 324 | if ( ! isset( $all_field_types[ $field['type'] ] ) ) { |
| 348 | 325 | // Add fallback for an add-on field type that has been deactivated. |
| 349 | 326 | $all_field_types[ $field['type'] ] = array( |
| 350 | 327 | 'name' => ucfirst( $field['type'] ), |
| 351 | - 'icon' => 'frmfont frm_pencil_icon', | |
| 328 | + 'icon' => 'frm_icon_font frm_pencil_icon', | |
| 352 | 329 | ); |
| 353 | 330 | } elseif ( ! is_array( $all_field_types[ $field['type'] ] ) ) { |
| 354 | 331 | // Fallback for fields added in a more basic way. |
| 355 | 332 | FrmFormsHelper::prepare_field_type( $all_field_types[ $field['type'] ] ); |
| @@ -355,9 +332,8 @@ | ||
| 355 | 332 | FrmFormsHelper::prepare_field_type( $all_field_types[ $field['type'] ] ); |
| 356 | 333 | } |
| 357 | 334 | |
| 358 | 335 | $type_name = $all_field_types[ $field['type'] ]['name']; |
| 359 | - | |
| 360 | 336 | if ( $field['type'] === 'divider' && FrmField::is_option_true( $field, 'repeat' ) ) { |
| 361 | 337 | $type_name = $all_field_types['divider|repeat']['name']; |
| 362 | 338 | } |
| 363 | 339 | |
| @@ -390,9 +366,8 @@ | ||
| 390 | 366 | * @since 4.0 |
| 391 | 367 | * |
| 392 | 368 | * @param array $field |
| 393 | 369 | * @param array $atts |
| 394 | - * | |
| 395 | 370 | * @return array |
| 396 | 371 | */ |
| 397 | 372 | private static function default_value_types( $field, $atts ) { |
| 398 | 373 | $types = array( |
| @@ -397,33 +372,31 @@ | ||
| 397 | 372 | private static function default_value_types( $field, $atts ) { |
| 398 | 373 | $types = array( |
| 399 | 374 | 'default_value' => array( |
| 400 | 375 | 'class' => '', |
| 401 | - 'icon' => 'frmfont frm_text2_icon', | |
| 402 | - 'title' => __( 'Default Value', 'formidable' ), | |
| 376 | + 'icon' => 'frm_icon_font frm_text2_icon', | |
| 377 | + 'title' => __( 'Default Value (Text)', 'formidable' ), | |
| 403 | 378 | 'data' => array( |
| 404 | 379 | 'frmshow' => '#default-value-for-', |
| 405 | 380 | ), |
| 406 | 381 | ), |
| 407 | 382 | 'calc' => array( |
| 408 | - 'class' => 'frm_show_upgrade frm_noallow', | |
| 409 | - 'title' => __( 'Calculate Value', 'formidable' ), | |
| 410 | - 'icon' => 'frmfont frm_calculator_icon', | |
| 411 | - 'data' => array( | |
| 383 | + 'class' => 'frm_show_upgrade frm_noallow', | |
| 384 | + 'title' => __( 'Default Value (Calculation)', 'formidable' ), | |
| 385 | + 'icon' => 'frm_icon_font frm_calculator_icon', | |
| 386 | + 'data' => array( | |
| 412 | 387 | 'medium' => 'calculations', |
| 413 | 388 | 'upgrade' => __( 'Calculator forms', 'formidable' ), |
| 414 | 389 | ), |
| 415 | - 'tooltip' => __( 'Automatically calculate the value of this field based on values from other fields.', 'formidable' ), | |
| 416 | 390 | ), |
| 417 | 391 | 'get_values_field' => array( |
| 418 | - 'class' => 'frm_show_upgrade frm_noallow', | |
| 419 | - 'title' => __( 'Lookup', 'formidable' ), | |
| 420 | - 'icon' => 'frmfont frm_search_icon', | |
| 421 | - 'data' => array( | |
| 392 | + 'class' => 'frm_show_upgrade frm_noallow', | |
| 393 | + 'title' => __( 'Default Value (Lookup)', 'formidable' ), | |
| 394 | + 'icon' => 'frm_icon_font frm_search_icon', | |
| 395 | + 'data' => array( | |
| 422 | 396 | 'medium' => 'lookup', |
| 423 | 397 | 'upgrade' => __( 'Lookup fields', 'formidable' ), |
| 424 | 398 | ), |
| 425 | - 'tooltip' => __( 'Dynamically retrieve the value of this field from a lookup field.', 'formidable' ), | |
| 426 | 399 | ), |
| 427 | 400 | ); |
| 428 | 401 | |
| 429 | 402 | $types = apply_filters( 'frm_default_value_types', $types, $atts ); |
| @@ -431,13 +404,11 @@ | ||
| 431 | 404 | // Set active class. |
| 432 | 405 | $settings = array_keys( $types ); |
| 433 | 406 | $active = 'default_value'; |
| 434 | 407 | |
| 435 | - if ( FrmAppHelper::pro_is_connected() ) { | |
| 436 | - foreach ( $settings as $type ) { | |
| 437 | - if ( ! empty( $field[ $type ] ) ) { | |
| 438 | - $active = $type; | |
| 439 | - } | |
| 408 | + foreach ( $settings as $type ) { | |
| 409 | + if ( ! empty( $field[ $type ] ) ) { | |
| 410 | + $active = $type; | |
| 440 | 411 | } |
| 441 | 412 | } |
| 442 | 413 | |
| 443 | 414 | $types[ $active ]['class'] .= ' current'; |
| @@ -447,9 +418,8 @@ | ||
| 447 | 418 | } |
| 448 | 419 | |
| 449 | 420 | /** |
| 450 | 421 | * @param string $type |
| 451 | - * | |
| 452 | 422 | * @return string |
| 453 | 423 | */ |
| 454 | 424 | public static function change_type( $type ) { |
| 455 | 425 | $type_switch = array( |
| @@ -459,9 +429,8 @@ | ||
| 459 | 429 | 'rte' => 'textarea', |
| 460 | 430 | 'website' => 'url', |
| 461 | 431 | 'image' => 'url', |
| 462 | 432 | ); |
| 463 | - | |
| 464 | 433 | if ( isset( $type_switch[ $type ] ) ) { |
| 465 | 434 | $type = $type_switch[ $type ]; |
| 466 | 435 | } |
| 467 | 436 | |
| @@ -469,9 +438,13 @@ | ||
| 469 | 438 | // We want to keep credit_card types as credit card types for Stripe Lite. |
| 470 | 439 | // The credit_card key is set for backward compatibility. |
| 471 | 440 | unset( $pro_fields['credit_card'] ); |
| 472 | 441 | |
| 473 | - return array_key_exists( $type, $pro_fields ) ? 'text' : $type; | |
| 442 | + if ( array_key_exists( $type, $pro_fields ) ) { | |
| 443 | + $type = 'text'; | |
| 444 | + } | |
| 445 | + | |
| 446 | + return $type; | |
| 474 | 447 | } |
| 475 | 448 | |
| 476 | 449 | /** |
| 477 | 450 | * @param array $settings |
| @@ -494,20 +467,17 @@ | ||
| 494 | 467 | * Display the format option |
| 495 | 468 | * |
| 496 | 469 | * @since 3.0 |
| 497 | 470 | * |
| 498 | - * @param array $field Field data. | |
| 499 | - * @param bool $is_hidden Whether the format option should be hidden. | |
| 500 | - * | |
| 471 | + * @param array $field | |
| 501 | 472 | * @return void |
| 502 | 473 | */ |
| 503 | - public static function show_format_option( $field, $is_hidden = false ) { | |
| 504 | - $attributes = array( | |
| 505 | - 'class' => 'frm-has-modal', | |
| 506 | - 'id' => 'frm-field-format-custom-' . $field['id'], | |
| 507 | - ); | |
| 474 | + public static function show_format_option( $field ) { | |
| 475 | + $attributes = array(); | |
| 476 | + $attributes['class'] = 'frm-has-modal'; | |
| 508 | 477 | |
| 509 | - if ( $is_hidden ) { | |
| 478 | + if ( 'phone' === $field['type'] ) { | |
| 479 | + $attributes['id'] = 'frm-phone-field-custom-format-' . $field['id']; | |
| 510 | 480 | $attributes['class'] .= ' frm_hidden'; |
| 511 | 481 | } |
| 512 | 482 | |
| 513 | 483 | include FrmAppHelper::plugin_path() . '/classes/views/frm-fields/back-end/value-format.php'; |
| @@ -512,14 +482,8 @@ | ||
| 512 | 482 | |
| 513 | 483 | include FrmAppHelper::plugin_path() . '/classes/views/frm-fields/back-end/value-format.php'; |
| 514 | 484 | } |
| 515 | 485 | |
| 516 | - /** | |
| 517 | - * @param array $field | |
| 518 | - * @param bool $echo | |
| 519 | - * | |
| 520 | - * @return string | |
| 521 | - */ | |
| 522 | 486 | public static function input_html( $field, $echo = true ) { |
| 523 | 487 | $class = array(); |
| 524 | 488 | self::add_input_classes( $field, $class ); |
| 525 | 489 | |
| @@ -548,9 +512,8 @@ | ||
| 548 | 512 | |
| 549 | 513 | /** |
| 550 | 514 | * @param array $field |
| 551 | 515 | * @param array $class |
| 552 | - * | |
| 553 | 516 | * @return void |
| 554 | 517 | */ |
| 555 | 518 | private static function add_input_classes( $field, array &$class ) { |
| 556 | 519 | if ( ! empty( $field['input_class'] ) ) { |
| @@ -568,9 +531,8 @@ | ||
| 568 | 531 | |
| 569 | 532 | /** |
| 570 | 533 | * @param array $field |
| 571 | 534 | * @param array $add_html |
| 572 | - * | |
| 573 | 535 | * @return void |
| 574 | 536 | */ |
| 575 | 537 | private static function add_html_size( $field, array &$add_html ) { |
| 576 | 538 | $size_fields = array( |
| @@ -603,9 +565,8 @@ | ||
| 603 | 565 | |
| 604 | 566 | /** |
| 605 | 567 | * @param array $field |
| 606 | 568 | * @param array $add_html |
| 607 | - * | |
| 608 | 569 | * @return void |
| 609 | 570 | */ |
| 610 | 571 | private static function add_html_cols( $field, array &$add_html ) { |
| 611 | 572 | if ( ! in_array( $field['type'], array( 'textarea', 'rte' ), true ) ) { |
| @@ -619,9 +580,9 @@ | ||
| 619 | 580 | 'rem' => 0.444, |
| 620 | 581 | 'em' => 0.544, |
| 621 | 582 | ); |
| 622 | 583 | |
| 623 | - // Include "col" for valid html | |
| 584 | + // include "col" for valid html | |
| 624 | 585 | $unit = trim( preg_replace( '/[0-9]+/', '', $field['size'] ) ); |
| 625 | 586 | |
| 626 | 587 | if ( ! isset( $calc[ $unit ] ) ) { |
| 627 | 588 | return; |
| @@ -626,9 +587,10 @@ | ||
| 626 | 587 | if ( ! isset( $calc[ $unit ] ) ) { |
| 627 | 588 | return; |
| 628 | 589 | } |
| 629 | 590 | |
| 630 | - $size = (float) str_replace( $unit, '', $field['size'] ) / $calc[ $unit ]; | |
| 591 | + $size = (float) str_replace( $unit, '', $field['size'] ) / $calc[ $unit ]; | |
| 592 | + | |
| 631 | 593 | $add_html['cols'] = 'cols="' . absint( $size ) . '"'; |
| 632 | 594 | } |
| 633 | 595 | |
| 634 | 596 | /** |
| @@ -633,9 +595,8 @@ | ||
| 633 | 595 | |
| 634 | 596 | /** |
| 635 | 597 | * @param array $field |
| 636 | 598 | * @param array $add_html |
| 637 | - * | |
| 638 | 599 | * @return void |
| 639 | 600 | */ |
| 640 | 601 | private static function add_html_length( $field, array &$add_html ) { |
| 641 | 602 | // Check for max setting and if this field accepts maxlength. |
| @@ -661,13 +622,11 @@ | ||
| 661 | 622 | /** |
| 662 | 623 | * @param array $field |
| 663 | 624 | * @param array $add_html |
| 664 | 625 | * @param array $class |
| 665 | - * | |
| 666 | 626 | * @return void |
| 667 | 627 | */ |
| 668 | 628 | private static function add_html_placeholder( $field, array &$add_html, array &$class ) { |
| 669 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 670 | 629 | if ( $field['default_value'] != '' ) { |
| 671 | 630 | if ( is_array( $field['default_value'] ) ) { |
| 672 | 631 | $add_html['data-frmval'] = 'data-frmval="' . esc_attr( json_encode( $field['default_value'] ) ) . '"'; |
| 673 | 632 | } else { |
| @@ -675,12 +634,10 @@ | ||
| 675 | 634 | } |
| 676 | 635 | } |
| 677 | 636 | |
| 678 | 637 | $field['placeholder'] = self::prepare_placeholder( $field ); |
| 679 | - | |
| 680 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 681 | 638 | if ( $field['placeholder'] == '' || is_array( $field['placeholder'] ) ) { |
| 682 | - // Don't include a json placeholder | |
| 639 | + // don't include a json placeholder | |
| 683 | 640 | return; |
| 684 | 641 | } |
| 685 | 642 | |
| 686 | 643 | self::add_placeholder_to_input( $field, $add_html ); |
| @@ -691,13 +648,14 @@ | ||
| 691 | 648 | * |
| 692 | 649 | * @since 5.4 This doesn't call `FrmFieldsController::get_default_value_from_name()` anymore. |
| 693 | 650 | * |
| 694 | 651 | * @param array $field Field array. |
| 695 | - * | |
| 696 | 652 | * @return string |
| 697 | 653 | */ |
| 698 | 654 | private static function prepare_placeholder( $field ) { |
| 699 | - return $field['placeholder'] ?? ''; | |
| 655 | + $placeholder = isset( $field['placeholder'] ) ? $field['placeholder'] : ''; | |
| 656 | + | |
| 657 | + return $placeholder; | |
| 700 | 658 | } |
| 701 | 659 | |
| 702 | 660 | /** |
| 703 | 661 | * If the label position is "inside", |
| @@ -718,17 +676,13 @@ | ||
| 718 | 676 | * Maybe add a blank placeholder option before any options |
| 719 | 677 | * in a dropdown. |
| 720 | 678 | * |
| 721 | 679 | * @since 4.04 |
| 722 | - * | |
| 723 | - * @param array|object $field | |
| 724 | - * | |
| 725 | 680 | * @return bool True if placeholder was added. |
| 726 | 681 | */ |
| 727 | 682 | public static function add_placeholder_to_select( $field ) { |
| 728 | 683 | $placeholder = FrmField::get_option( $field, 'placeholder' ); |
| 729 | - | |
| 730 | - if ( ! $placeholder ) { | |
| 684 | + if ( empty( $placeholder ) ) { | |
| 731 | 685 | $placeholder = self::get_default_value_from_name( $field ); |
| 732 | 686 | } |
| 733 | 687 | |
| 734 | 688 | $use_placeholder = $placeholder; |
| @@ -735,9 +689,8 @@ | ||
| 735 | 689 | $autocomplete = FrmField::get_option( $field, 'autocom' ); |
| 736 | 690 | |
| 737 | 691 | if ( $autocomplete ) { |
| 738 | 692 | $use_chosen = ! is_callable( 'FrmProAppHelper::use_chosen_js' ) || FrmProAppHelper::use_chosen_js(); |
| 739 | - | |
| 740 | 693 | if ( $use_chosen ) { |
| 741 | 694 | $use_placeholder = ''; |
| 742 | 695 | } |
| 743 | 696 | } |
| @@ -748,8 +701,13 @@ | ||
| 748 | 701 | 'value' => '', |
| 749 | 702 | 'data-placeholder' => 'true', |
| 750 | 703 | ); |
| 751 | 704 | |
| 705 | + if ( $autocomplete && empty( $use_chosen ) ) { | |
| 706 | + // This is required for Slim Select. | |
| 707 | + $placeholder_attributes['data-placeholder'] = 'true'; | |
| 708 | + } | |
| 709 | + | |
| 752 | 710 | FrmHtmlHelper::echo_dropdown_option( $use_placeholder, false, $placeholder_attributes ); |
| 753 | 711 | return true; |
| 754 | 712 | } |
| 755 | 713 | |
| @@ -760,9 +718,8 @@ | ||
| 760 | 718 | * Use HTML5 placeholder with js fallback. |
| 761 | 719 | * |
| 762 | 720 | * @param array $field |
| 763 | 721 | * @param array $add_html |
| 764 | - * | |
| 765 | 722 | * @return void |
| 766 | 723 | */ |
| 767 | 724 | private static function add_placeholder_to_input( $field, &$add_html ) { |
| 768 | 725 | if ( FrmFieldsHelper::is_placeholder_field_type( $field['type'] ) ) { |
| @@ -772,13 +729,11 @@ | ||
| 772 | 729 | |
| 773 | 730 | /** |
| 774 | 731 | * @param array $field |
| 775 | 732 | * @param array $add_html |
| 776 | - * | |
| 777 | 733 | * @return void |
| 778 | 734 | */ |
| 779 | 735 | private static function add_frmval_to_input( $field, &$add_html ) { |
| 780 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 781 | 736 | if ( $field['placeholder'] != '' ) { |
| 782 | 737 | $add_html['data-frmval'] = 'data-frmval="' . esc_attr( $field['placeholder'] ) . '"'; |
| 783 | 738 | |
| 784 | 739 | if ( 'select' === $field['type'] ) { |
| @@ -785,20 +740,13 @@ | ||
| 785 | 740 | $add_html['data-frmplaceholder'] = 'data-frmplaceholder="' . esc_attr( $field['placeholder'] ) . '"'; |
| 786 | 741 | } |
| 787 | 742 | } |
| 788 | 743 | |
| 789 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 790 | 744 | if ( $field['default_value'] != '' ) { |
| 791 | 745 | $add_html['data-frmval'] = 'data-frmval="' . esc_attr( $field['default_value'] ) . '"'; |
| 792 | 746 | } |
| 793 | 747 | } |
| 794 | 748 | |
| 795 | - /** | |
| 796 | - * @param array $field | |
| 797 | - * @param array $add_html | |
| 798 | - * | |
| 799 | - * @return void | |
| 800 | - */ | |
| 801 | 749 | private static function add_validation_messages( $field, array &$add_html ) { |
| 802 | 750 | $field_validation_messages_status = self::get_validation_data_attribute_visibility_info( $field ); |
| 803 | 751 | |
| 804 | 752 | if ( FrmField::is_required( $field ) && ! empty( $field_validation_messages_status['data-reqmsg'] ) ) { |
| @@ -822,9 +770,8 @@ | ||
| 822 | 770 | * |
| 823 | 771 | * @since 6.9 |
| 824 | 772 | * |
| 825 | 773 | * @param array|object $field |
| 826 | - * | |
| 827 | 774 | * @return array |
| 828 | 775 | */ |
| 829 | 776 | private static function get_validation_data_attribute_visibility_info( $field ) { |
| 830 | 777 | if ( FrmField::get_field_type( $field ) === 'hidden' ) { |
| @@ -854,26 +801,21 @@ | ||
| 854 | 801 | * @since 5.0.03 |
| 855 | 802 | * |
| 856 | 803 | * @param array $field |
| 857 | 804 | * @param array $add_html |
| 858 | - * | |
| 859 | 805 | * @return void |
| 860 | 806 | */ |
| 861 | 807 | private static function maybe_add_error_html_for_js_validation( $field, array &$add_html ) { |
| 862 | 808 | $form = self::get_form_for_js_validation( $field ); |
| 863 | - | |
| 864 | 809 | if ( false === $form ) { |
| 865 | 810 | return; |
| 866 | 811 | } |
| 867 | 812 | |
| 868 | 813 | $error_body = self::pull_custom_error_body_from_custom_html( $form, $field ); |
| 869 | - | |
| 870 | - if ( false === $error_body ) { | |
| 871 | - return; | |
| 814 | + if ( false !== $error_body ) { | |
| 815 | + $error_body = urlencode( $error_body ); | |
| 816 | + $add_html['data-error-html'] = 'data-error-html="' . esc_attr( $error_body ) . '"'; | |
| 872 | 817 | } |
| 873 | - | |
| 874 | - $error_body = urlencode( $error_body ); | |
| 875 | - $add_html['data-error-html'] = 'data-error-html="' . esc_attr( $error_body ) . '"'; | |
| 876 | 818 | } |
| 877 | 819 | |
| 878 | 820 | /** |
| 879 | 821 | * @since 5.0.03 |
| @@ -878,24 +820,20 @@ | ||
| 878 | 820 | /** |
| 879 | 821 | * @since 5.0.03 |
| 880 | 822 | * |
| 881 | 823 | * @param array $field |
| 882 | - * | |
| 883 | 824 | * @return false|stdClass false if there is no form object found with JS validation active. |
| 884 | 825 | */ |
| 885 | 826 | private static function get_form_for_js_validation( $field ) { |
| 886 | 827 | global $frm_vars; |
| 887 | - | |
| 888 | 828 | if ( ! empty( $frm_vars['js_validate_forms'] ) ) { |
| 889 | 829 | if ( isset( $frm_vars['js_validate_forms'][ $field['form_id'] ] ) ) { |
| 890 | 830 | return $frm_vars['js_validate_forms'][ $field['form_id'] ]; |
| 891 | 831 | } |
| 892 | - | |
| 893 | 832 | if ( ! empty( $field['parent_form_id'] ) && isset( $frm_vars['js_validate_forms'][ $field['parent_form_id'] ] ) ) { |
| 894 | 833 | return $frm_vars['js_validate_forms'][ $field['parent_form_id'] ]; |
| 895 | 834 | } |
| 896 | 835 | } |
| 897 | - | |
| 898 | 836 | return false; |
| 899 | 837 | } |
| 900 | 838 | |
| 901 | 839 | /** |
| @@ -901,9 +839,8 @@ | ||
| 901 | 839 | /** |
| 902 | 840 | * @param stdClass $form |
| 903 | 841 | * @param array $field |
| 904 | 842 | * @param array $errors |
| 905 | - * | |
| 906 | 843 | * @return false|string |
| 907 | 844 | */ |
| 908 | 845 | public static function pull_custom_error_body_from_custom_html( $form, $field, $errors = array() ) { |
| 909 | 846 | if ( empty( $field['custom_html'] ) ) { |
| @@ -911,16 +848,15 @@ | ||
| 911 | 848 | } |
| 912 | 849 | |
| 913 | 850 | $custom_html = $field['custom_html']; |
| 914 | 851 | $custom_html = apply_filters( 'frm_before_replace_shortcodes', $custom_html, $field, $errors, $form ); |
| 915 | - $start = strpos( $custom_html, '[if error]' ); | |
| 916 | 852 | |
| 853 | + $start = strpos( $custom_html, '[if error]' ); | |
| 917 | 854 | if ( false === $start ) { |
| 918 | 855 | return false; |
| 919 | 856 | } |
| 920 | 857 | |
| 921 | 858 | $end = strpos( $custom_html, '[/if error]' ); |
| 922 | - | |
| 923 | 859 | if ( false === $end || $end < $start ) { |
| 924 | 860 | return false; |
| 925 | 861 | } |
| 926 | 862 | |
| @@ -931,9 +867,13 @@ | ||
| 931 | 867 | '<div class="frm_error">[error]</div>', |
| 932 | 868 | '<div class="frm_error" role="alert">[error]</div>', |
| 933 | 869 | ); |
| 934 | 870 | |
| 935 | - return in_array( $error_body, $default_html, true ) ? false : $error_body; | |
| 871 | + if ( in_array( $error_body, $default_html, true ) ) { | |
| 872 | + return false; | |
| 873 | + } | |
| 874 | + | |
| 875 | + return $error_body; | |
| 936 | 876 | } |
| 937 | 877 | |
| 938 | 878 | /** |
| 939 | 879 | * If 'required' is added to a conditionally hidden field, the form won't |
| @@ -940,16 +880,13 @@ | ||
| 940 | 880 | * submit in many browsers. Check to make sure the javascript to conditionally |
| 941 | 881 | * remove it is present if needed. |
| 942 | 882 | * |
| 943 | 883 | * @since 3.06.01 |
| 944 | - * | |
| 945 | 884 | * @param array $field |
| 946 | 885 | * @param array $add_html |
| 947 | - * | |
| 948 | 886 | * @return void |
| 949 | 887 | */ |
| 950 | 888 | private static function maybe_add_html_required( $field, array &$add_html ) { |
| 951 | - // phpcs:disable Generic.WhiteSpace.ScopeIndent | |
| 952 | 889 | $excluded_field_types = |
| 953 | 890 | FrmField::is_radio( $field ) || |
| 954 | 891 | FrmField::is_checkbox( $field ) || |
| 955 | 892 | FrmField::is_field_type( $field, 'file' ) || |
| @@ -954,9 +891,8 @@ | ||
| 954 | 891 | FrmField::is_checkbox( $field ) || |
| 955 | 892 | FrmField::is_field_type( $field, 'file' ) || |
| 956 | 893 | FrmField::is_field_type( $field, 'nps' ) || |
| 957 | 894 | FrmField::is_field_type( $field, 'scale' ); |
| 958 | - // phpcs:enable Generic.WhiteSpace.ScopeIndent | |
| 959 | 895 | |
| 960 | 896 | if ( $excluded_field_types ) { |
| 961 | 897 | return; |
| 962 | 898 | } |
| @@ -966,9 +902,8 @@ | ||
| 966 | 902 | |
| 967 | 903 | /** |
| 968 | 904 | * @param array $field |
| 969 | 905 | * @param array $add_html |
| 970 | - * | |
| 971 | 906 | * @return void |
| 972 | 907 | */ |
| 973 | 908 | private static function add_shortcodes_to_html( $field, array &$add_html ) { |
| 974 | 909 | if ( FrmField::is_option_empty( $field, 'shortcodes' ) ) { |
| @@ -979,25 +914,13 @@ | ||
| 979 | 914 | unset( $field['shortcodes']['autocomplete'] ); |
| 980 | 915 | } |
| 981 | 916 | |
| 982 | 917 | foreach ( $field['shortcodes'] as $k => $v ) { |
| 983 | - if ( isset( $field['subfield_name'] ) && str_starts_with( $k, 'aria-invalid' ) ) { | |
| 984 | - $subfield_name = $field['subfield_name']; | |
| 985 | - | |
| 986 | - if ( ! isset( $field['shortcodes'][ 'aria-invalid-' . $subfield_name ] ) ) { | |
| 987 | - continue; | |
| 988 | - } | |
| 989 | - // Change the key to the correct aria-invalid value so that $add_html is set correctly for the current subfield of a combo field. | |
| 990 | - $k = 'aria-invalid'; | |
| 991 | - $v = $field['shortcodes'][ 'aria-invalid-' . $subfield_name ]; | |
| 992 | - unset( $field['shortcodes'][ 'aria-invalid-' . $subfield_name ] ); | |
| 993 | - } | |
| 994 | - | |
| 995 | 918 | if ( 'opt' === $k || ! self::should_allow_input_attribute( $k ) ) { |
| 996 | 919 | continue; |
| 997 | 920 | } |
| 998 | 921 | |
| 999 | - if ( is_numeric( $k ) && str_contains( $v, '=' ) ) { | |
| 922 | + if ( is_numeric( $k ) && strpos( $v, '=' ) ) { | |
| 1000 | 923 | $add_html[] = $v; |
| 1001 | 924 | } elseif ( ! empty( $k ) && isset( $add_html[ $k ] ) ) { |
| 1002 | 925 | $add_html[ $k ] = str_replace( $k . '="', $k . '="' . $v, $add_html[ $k ] ); |
| 1003 | 926 | } else { |
| @@ -1004,9 +927,9 @@ | ||
| 1004 | 927 | $add_html[ $k ] = $k . '="' . esc_attr( $v ) . '"'; |
| 1005 | 928 | } |
| 1006 | 929 | |
| 1007 | 930 | unset( $k, $v ); |
| 1008 | - }//end foreach | |
| 931 | + } | |
| 1009 | 932 | } |
| 1010 | 933 | |
| 1011 | 934 | /** |
| 1012 | 935 | * Disallow possibly unsafe attributees (that trigger JavaScript) when unasfe HTML is not allowed. |
| @@ -1013,9 +936,8 @@ | ||
| 1013 | 936 | * |
| 1014 | 937 | * @since 6.11.2 |
| 1015 | 938 | * |
| 1016 | 939 | * @param string $key The option key. |
| 1017 | - * | |
| 1018 | 940 | * @return bool |
| 1019 | 941 | */ |
| 1020 | 942 | private static function should_allow_input_attribute( $key ) { |
| 1021 | 943 | if ( ! FrmAppHelper::should_never_allow_unfiltered_html() ) { |
| @@ -1030,39 +952,28 @@ | ||
| 1030 | 952 | * @since 3.0 |
| 1031 | 953 | * |
| 1032 | 954 | * @param array $field |
| 1033 | 955 | * @param array $add_html |
| 1034 | - * | |
| 1035 | 956 | * @return void |
| 1036 | 957 | */ |
| 1037 | 958 | private static function add_pattern_attribute( $field, array &$add_html ) { |
| 1038 | - $format_value = FrmField::get_option( $field, 'format' ); | |
| 1039 | - $has_format = $format_value && ! FrmCurrencyHelper::is_currency_format( $format_value ); | |
| 959 | + $has_format = FrmField::is_option_true_in_array( $field, 'format' ); | |
| 1040 | 960 | $format_field = FrmField::is_field_type( $field, 'text' ); |
| 1041 | 961 | |
| 1042 | - if ( $field['type'] !== 'phone' && ( ! $has_format || ! $format_field ) ) { | |
| 1043 | - return; | |
| 962 | + if ( $field['type'] === 'phone' || ( $has_format && $format_field ) ) { | |
| 963 | + $format = FrmEntryValidate::phone_format( $field ); | |
| 964 | + $format = substr( $format, 2, - 1 ); | |
| 965 | + | |
| 966 | + $add_html['pattern'] = 'pattern="' . esc_attr( $format ) . '"'; | |
| 1044 | 967 | } |
| 1045 | - | |
| 1046 | - $format = FrmEntryValidate::phone_format( $field ); | |
| 1047 | - $format = substr( $format, 2, - 1 ); | |
| 1048 | - | |
| 1049 | - $add_html['pattern'] = 'pattern="' . esc_attr( $format ) . '"'; | |
| 1050 | 968 | } |
| 1051 | 969 | |
| 1052 | - /** | |
| 1053 | - * @param mixed $opt | |
| 1054 | - * @param mixed $opt_key | |
| 1055 | - * @param array|object $field | |
| 1056 | - * | |
| 1057 | - * @return mixed | |
| 1058 | - */ | |
| 1059 | 970 | public static function check_value( $opt, $opt_key, $field ) { |
| 1060 | 971 | if ( is_array( $opt ) ) { |
| 1061 | 972 | if ( FrmField::is_option_true( $field, 'separate_value' ) ) { |
| 1062 | - $opt = $opt['value'] ?? $opt['label'] ?? reset( $opt ); | |
| 973 | + $opt = isset( $opt['value'] ) ? $opt['value'] : ( isset( $opt['label'] ) ? $opt['label'] : reset( $opt ) ); | |
| 1063 | 974 | } else { |
| 1064 | - $opt = $opt['label'] ?? reset( $opt ); | |
| 975 | + $opt = isset( $opt['label'] ) ? $opt['label'] : reset( $opt ); | |
| 1065 | 976 | } |
| 1066 | 977 | } |
| 1067 | 978 | |
| 1068 | 979 | return $opt; |
| @@ -1067,13 +978,12 @@ | ||
| 1067 | 978 | |
| 1068 | 979 | return $opt; |
| 1069 | 980 | } |
| 1070 | 981 | |
| 1071 | - /** | |
| 1072 | - * @param mixed $opt | |
| 1073 | - * | |
| 1074 | - * @return mixed | |
| 1075 | - */ | |
| 1076 | 982 | public static function check_label( $opt ) { |
| 1077 | - return is_array( $opt ) ? ( $opt['label'] ?? reset( $opt ) ) : $opt; | |
| 983 | + if ( is_array( $opt ) ) { | |
| 984 | + $opt = isset( $opt['label'] ) ? $opt['label'] : reset( $opt ); | |
| 985 | + } | |
| 986 | + | |
| 987 | + return $opt; | |
| 1078 | 988 | } |
| 1079 | 989 | } |
