| @@ -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,12 +273,10 @@ | ||
| 293 | 273 | } |
| 294 | 274 | } |
| 295 | 275 | |
| 296 | 276 | // Keep other options after bulk update. |
| 297 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 298 | - if ( ! empty( $field['field_options']['other'] ) ) { | |
| 277 | + if ( isset( $field['field_options']['other'] ) && $field['field_options']['other'] == true ) { | |
| 299 | 278 | $other_array = array(); |
| 300 | - | |
| 301 | 279 | foreach ( $field['options'] as $opt_key => $opt ) { |
| 302 | 280 | if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) { |
| 303 | 281 | $other_array[ $opt_key ] = $opt; |
| 304 | 282 | } |
| @@ -303,10 +281,9 @@ | ||
| 303 | 281 | $other_array[ $opt_key ] = $opt; |
| 304 | 282 | } |
| 305 | 283 | unset( $opt_key, $opt ); |
| 306 | 284 | } |
| 307 | - | |
| 308 | - if ( $other_array ) { | |
| 285 | + if ( ! empty( $other_array ) ) { | |
| 309 | 286 | $opts = array_merge( $opts, $other_array ); |
| 310 | 287 | } |
| 311 | 288 | } |
| 312 | 289 | |
| @@ -320,9 +297,8 @@ | ||
| 320 | 297 | /** |
| 321 | 298 | * @since 4.0 |
| 322 | 299 | * |
| 323 | 300 | * @param array $atts - Includes field array, field_obj, display array, values array. |
| 324 | - * | |
| 325 | 301 | * @return void |
| 326 | 302 | */ |
| 327 | 303 | public static function load_single_field_settings( $atts ) { |
| 328 | 304 | $field = $atts['field']; |
| @@ -348,9 +324,9 @@ | ||
| 348 | 324 | if ( ! isset( $all_field_types[ $field['type'] ] ) ) { |
| 349 | 325 | // Add fallback for an add-on field type that has been deactivated. |
| 350 | 326 | $all_field_types[ $field['type'] ] = array( |
| 351 | 327 | 'name' => ucfirst( $field['type'] ), |
| 352 | - 'icon' => 'frmfont frm_pencil_icon', | |
| 328 | + 'icon' => 'frm_icon_font frm_pencil_icon', | |
| 353 | 329 | ); |
| 354 | 330 | } elseif ( ! is_array( $all_field_types[ $field['type'] ] ) ) { |
| 355 | 331 | // Fallback for fields added in a more basic way. |
| 356 | 332 | FrmFormsHelper::prepare_field_type( $all_field_types[ $field['type'] ] ); |
| @@ -356,9 +332,8 @@ | ||
| 356 | 332 | FrmFormsHelper::prepare_field_type( $all_field_types[ $field['type'] ] ); |
| 357 | 333 | } |
| 358 | 334 | |
| 359 | 335 | $type_name = $all_field_types[ $field['type'] ]['name']; |
| 360 | - | |
| 361 | 336 | if ( $field['type'] === 'divider' && FrmField::is_option_true( $field, 'repeat' ) ) { |
| 362 | 337 | $type_name = $all_field_types['divider|repeat']['name']; |
| 363 | 338 | } |
| 364 | 339 | |
| @@ -391,9 +366,8 @@ | ||
| 391 | 366 | * @since 4.0 |
| 392 | 367 | * |
| 393 | 368 | * @param array $field |
| 394 | 369 | * @param array $atts |
| 395 | - * | |
| 396 | 370 | * @return array |
| 397 | 371 | */ |
| 398 | 372 | private static function default_value_types( $field, $atts ) { |
| 399 | 373 | $types = array( |
| @@ -398,33 +372,31 @@ | ||
| 398 | 372 | private static function default_value_types( $field, $atts ) { |
| 399 | 373 | $types = array( |
| 400 | 374 | 'default_value' => array( |
| 401 | 375 | 'class' => '', |
| 402 | - 'icon' => 'frmfont frm_text2_icon', | |
| 403 | - 'title' => __( 'Default Value', 'formidable' ), | |
| 376 | + 'icon' => 'frm_icon_font frm_text2_icon', | |
| 377 | + 'title' => __( 'Default Value (Text)', 'formidable' ), | |
| 404 | 378 | 'data' => array( |
| 405 | 379 | 'frmshow' => '#default-value-for-', |
| 406 | 380 | ), |
| 407 | 381 | ), |
| 408 | 382 | 'calc' => array( |
| 409 | - 'class' => 'frm_show_upgrade frm_noallow', | |
| 410 | - 'title' => __( 'Calculate Value', 'formidable' ), | |
| 411 | - 'icon' => 'frmfont frm_calculator_icon', | |
| 412 | - '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( | |
| 413 | 387 | 'medium' => 'calculations', |
| 414 | 388 | 'upgrade' => __( 'Calculator forms', 'formidable' ), |
| 415 | 389 | ), |
| 416 | - 'tooltip' => __( 'Automatically calculate the value of this field based on values from other fields.', 'formidable' ), | |
| 417 | 390 | ), |
| 418 | 391 | 'get_values_field' => array( |
| 419 | - 'class' => 'frm_show_upgrade frm_noallow', | |
| 420 | - 'title' => __( 'Lookup', 'formidable' ), | |
| 421 | - 'icon' => 'frmfont frm_search_icon', | |
| 422 | - '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( | |
| 423 | 396 | 'medium' => 'lookup', |
| 424 | 397 | 'upgrade' => __( 'Lookup fields', 'formidable' ), |
| 425 | 398 | ), |
| 426 | - 'tooltip' => __( 'Dynamically retrieve the value of this field from a lookup field.', 'formidable' ), | |
| 427 | 399 | ), |
| 428 | 400 | ); |
| 429 | 401 | |
| 430 | 402 | $types = apply_filters( 'frm_default_value_types', $types, $atts ); |
| @@ -432,13 +404,11 @@ | ||
| 432 | 404 | // Set active class. |
| 433 | 405 | $settings = array_keys( $types ); |
| 434 | 406 | $active = 'default_value'; |
| 435 | 407 | |
| 436 | - if ( FrmAppHelper::pro_is_connected() ) { | |
| 437 | - foreach ( $settings as $type ) { | |
| 438 | - if ( ! empty( $field[ $type ] ) ) { | |
| 439 | - $active = $type; | |
| 440 | - } | |
| 408 | + foreach ( $settings as $type ) { | |
| 409 | + if ( ! empty( $field[ $type ] ) ) { | |
| 410 | + $active = $type; | |
| 441 | 411 | } |
| 442 | 412 | } |
| 443 | 413 | |
| 444 | 414 | $types[ $active ]['class'] .= ' current'; |
| @@ -448,9 +418,8 @@ | ||
| 448 | 418 | } |
| 449 | 419 | |
| 450 | 420 | /** |
| 451 | 421 | * @param string $type |
| 452 | - * | |
| 453 | 422 | * @return string |
| 454 | 423 | */ |
| 455 | 424 | public static function change_type( $type ) { |
| 456 | 425 | $type_switch = array( |
| @@ -460,9 +429,8 @@ | ||
| 460 | 429 | 'rte' => 'textarea', |
| 461 | 430 | 'website' => 'url', |
| 462 | 431 | 'image' => 'url', |
| 463 | 432 | ); |
| 464 | - | |
| 465 | 433 | if ( isset( $type_switch[ $type ] ) ) { |
| 466 | 434 | $type = $type_switch[ $type ]; |
| 467 | 435 | } |
| 468 | 436 | |
| @@ -470,9 +438,13 @@ | ||
| 470 | 438 | // We want to keep credit_card types as credit card types for Stripe Lite. |
| 471 | 439 | // The credit_card key is set for backward compatibility. |
| 472 | 440 | unset( $pro_fields['credit_card'] ); |
| 473 | 441 | |
| 474 | - 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; | |
| 475 | 447 | } |
| 476 | 448 | |
| 477 | 449 | /** |
| 478 | 450 | * @param array $settings |
| @@ -497,9 +469,8 @@ | ||
| 497 | 469 | * @since 3.0 |
| 498 | 470 | * |
| 499 | 471 | * @param array $field Field data. |
| 500 | 472 | * @param bool $is_hidden Whether the format option should be hidden. |
| 501 | - * | |
| 502 | 473 | * @return void |
| 503 | 474 | */ |
| 504 | 475 | public static function show_format_option( $field, $is_hidden = false ) { |
| 505 | 476 | $attributes = array( |
| @@ -513,14 +484,8 @@ | ||
| 513 | 484 | |
| 514 | 485 | include FrmAppHelper::plugin_path() . '/classes/views/frm-fields/back-end/value-format.php'; |
| 515 | 486 | } |
| 516 | 487 | |
| 517 | - /** | |
| 518 | - * @param array $field | |
| 519 | - * @param bool $echo | |
| 520 | - * | |
| 521 | - * @return string | |
| 522 | - */ | |
| 523 | 488 | public static function input_html( $field, $echo = true ) { |
| 524 | 489 | $class = array(); |
| 525 | 490 | self::add_input_classes( $field, $class ); |
| 526 | 491 | |
| @@ -549,9 +514,8 @@ | ||
| 549 | 514 | |
| 550 | 515 | /** |
| 551 | 516 | * @param array $field |
| 552 | 517 | * @param array $class |
| 553 | - * | |
| 554 | 518 | * @return void |
| 555 | 519 | */ |
| 556 | 520 | private static function add_input_classes( $field, array &$class ) { |
| 557 | 521 | if ( ! empty( $field['input_class'] ) ) { |
| @@ -569,9 +533,8 @@ | ||
| 569 | 533 | |
| 570 | 534 | /** |
| 571 | 535 | * @param array $field |
| 572 | 536 | * @param array $add_html |
| 573 | - * | |
| 574 | 537 | * @return void |
| 575 | 538 | */ |
| 576 | 539 | private static function add_html_size( $field, array &$add_html ) { |
| 577 | 540 | $size_fields = array( |
| @@ -604,9 +567,8 @@ | ||
| 604 | 567 | |
| 605 | 568 | /** |
| 606 | 569 | * @param array $field |
| 607 | 570 | * @param array $add_html |
| 608 | - * | |
| 609 | 571 | * @return void |
| 610 | 572 | */ |
| 611 | 573 | private static function add_html_cols( $field, array &$add_html ) { |
| 612 | 574 | if ( ! in_array( $field['type'], array( 'textarea', 'rte' ), true ) ) { |
| @@ -620,9 +582,9 @@ | ||
| 620 | 582 | 'rem' => 0.444, |
| 621 | 583 | 'em' => 0.544, |
| 622 | 584 | ); |
| 623 | 585 | |
| 624 | - // Include "col" for valid html | |
| 586 | + // include "col" for valid html | |
| 625 | 587 | $unit = trim( preg_replace( '/[0-9]+/', '', $field['size'] ) ); |
| 626 | 588 | |
| 627 | 589 | if ( ! isset( $calc[ $unit ] ) ) { |
| 628 | 590 | return; |
| @@ -627,9 +589,10 @@ | ||
| 627 | 589 | if ( ! isset( $calc[ $unit ] ) ) { |
| 628 | 590 | return; |
| 629 | 591 | } |
| 630 | 592 | |
| 631 | - $size = (float) str_replace( $unit, '', $field['size'] ) / $calc[ $unit ]; | |
| 593 | + $size = (float) str_replace( $unit, '', $field['size'] ) / $calc[ $unit ]; | |
| 594 | + | |
| 632 | 595 | $add_html['cols'] = 'cols="' . absint( $size ) . '"'; |
| 633 | 596 | } |
| 634 | 597 | |
| 635 | 598 | /** |
| @@ -634,9 +597,8 @@ | ||
| 634 | 597 | |
| 635 | 598 | /** |
| 636 | 599 | * @param array $field |
| 637 | 600 | * @param array $add_html |
| 638 | - * | |
| 639 | 601 | * @return void |
| 640 | 602 | */ |
| 641 | 603 | private static function add_html_length( $field, array &$add_html ) { |
| 642 | 604 | // Check for max setting and if this field accepts maxlength. |
| @@ -662,13 +624,11 @@ | ||
| 662 | 624 | /** |
| 663 | 625 | * @param array $field |
| 664 | 626 | * @param array $add_html |
| 665 | 627 | * @param array $class |
| 666 | - * | |
| 667 | 628 | * @return void |
| 668 | 629 | */ |
| 669 | 630 | private static function add_html_placeholder( $field, array &$add_html, array &$class ) { |
| 670 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 671 | 631 | if ( $field['default_value'] != '' ) { |
| 672 | 632 | if ( is_array( $field['default_value'] ) ) { |
| 673 | 633 | $add_html['data-frmval'] = 'data-frmval="' . esc_attr( json_encode( $field['default_value'] ) ) . '"'; |
| 674 | 634 | } else { |
| @@ -676,12 +636,10 @@ | ||
| 676 | 636 | } |
| 677 | 637 | } |
| 678 | 638 | |
| 679 | 639 | $field['placeholder'] = self::prepare_placeholder( $field ); |
| 680 | - | |
| 681 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 682 | 640 | if ( $field['placeholder'] == '' || is_array( $field['placeholder'] ) ) { |
| 683 | - // Don't include a json placeholder | |
| 641 | + // don't include a json placeholder | |
| 684 | 642 | return; |
| 685 | 643 | } |
| 686 | 644 | |
| 687 | 645 | self::add_placeholder_to_input( $field, $add_html ); |
| @@ -692,13 +650,14 @@ | ||
| 692 | 650 | * |
| 693 | 651 | * @since 5.4 This doesn't call `FrmFieldsController::get_default_value_from_name()` anymore. |
| 694 | 652 | * |
| 695 | 653 | * @param array $field Field array. |
| 696 | - * | |
| 697 | 654 | * @return string |
| 698 | 655 | */ |
| 699 | 656 | private static function prepare_placeholder( $field ) { |
| 700 | - return $field['placeholder'] ?? ''; | |
| 657 | + $placeholder = isset( $field['placeholder'] ) ? $field['placeholder'] : ''; | |
| 658 | + | |
| 659 | + return $placeholder; | |
| 701 | 660 | } |
| 702 | 661 | |
| 703 | 662 | /** |
| 704 | 663 | * If the label position is "inside", |
| @@ -719,17 +678,13 @@ | ||
| 719 | 678 | * Maybe add a blank placeholder option before any options |
| 720 | 679 | * in a dropdown. |
| 721 | 680 | * |
| 722 | 681 | * @since 4.04 |
| 723 | - * | |
| 724 | - * @param array|object $field | |
| 725 | - * | |
| 726 | 682 | * @return bool True if placeholder was added. |
| 727 | 683 | */ |
| 728 | 684 | public static function add_placeholder_to_select( $field ) { |
| 729 | 685 | $placeholder = FrmField::get_option( $field, 'placeholder' ); |
| 730 | - | |
| 731 | - if ( ! $placeholder ) { | |
| 686 | + if ( empty( $placeholder ) ) { | |
| 732 | 687 | $placeholder = self::get_default_value_from_name( $field ); |
| 733 | 688 | } |
| 734 | 689 | |
| 735 | 690 | $use_placeholder = $placeholder; |
| @@ -736,9 +691,8 @@ | ||
| 736 | 691 | $autocomplete = FrmField::get_option( $field, 'autocom' ); |
| 737 | 692 | |
| 738 | 693 | if ( $autocomplete ) { |
| 739 | 694 | $use_chosen = ! is_callable( 'FrmProAppHelper::use_chosen_js' ) || FrmProAppHelper::use_chosen_js(); |
| 740 | - | |
| 741 | 695 | if ( $use_chosen ) { |
| 742 | 696 | $use_placeholder = ''; |
| 743 | 697 | } |
| 744 | 698 | } |
| @@ -761,9 +715,8 @@ | ||
| 761 | 715 | * Use HTML5 placeholder with js fallback. |
| 762 | 716 | * |
| 763 | 717 | * @param array $field |
| 764 | 718 | * @param array $add_html |
| 765 | - * | |
| 766 | 719 | * @return void |
| 767 | 720 | */ |
| 768 | 721 | private static function add_placeholder_to_input( $field, &$add_html ) { |
| 769 | 722 | if ( FrmFieldsHelper::is_placeholder_field_type( $field['type'] ) ) { |
| @@ -773,13 +726,11 @@ | ||
| 773 | 726 | |
| 774 | 727 | /** |
| 775 | 728 | * @param array $field |
| 776 | 729 | * @param array $add_html |
| 777 | - * | |
| 778 | 730 | * @return void |
| 779 | 731 | */ |
| 780 | 732 | private static function add_frmval_to_input( $field, &$add_html ) { |
| 781 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 782 | 733 | if ( $field['placeholder'] != '' ) { |
| 783 | 734 | $add_html['data-frmval'] = 'data-frmval="' . esc_attr( $field['placeholder'] ) . '"'; |
| 784 | 735 | |
| 785 | 736 | if ( 'select' === $field['type'] ) { |
| @@ -786,20 +737,13 @@ | ||
| 786 | 737 | $add_html['data-frmplaceholder'] = 'data-frmplaceholder="' . esc_attr( $field['placeholder'] ) . '"'; |
| 787 | 738 | } |
| 788 | 739 | } |
| 789 | 740 | |
| 790 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 791 | 741 | if ( $field['default_value'] != '' ) { |
| 792 | 742 | $add_html['data-frmval'] = 'data-frmval="' . esc_attr( $field['default_value'] ) . '"'; |
| 793 | 743 | } |
| 794 | 744 | } |
| 795 | 745 | |
| 796 | - /** | |
| 797 | - * @param array $field | |
| 798 | - * @param array $add_html | |
| 799 | - * | |
| 800 | - * @return void | |
| 801 | - */ | |
| 802 | 746 | private static function add_validation_messages( $field, array &$add_html ) { |
| 803 | 747 | $field_validation_messages_status = self::get_validation_data_attribute_visibility_info( $field ); |
| 804 | 748 | |
| 805 | 749 | if ( FrmField::is_required( $field ) && ! empty( $field_validation_messages_status['data-reqmsg'] ) ) { |
| @@ -823,9 +767,8 @@ | ||
| 823 | 767 | * |
| 824 | 768 | * @since 6.9 |
| 825 | 769 | * |
| 826 | 770 | * @param array|object $field |
| 827 | - * | |
| 828 | 771 | * @return array |
| 829 | 772 | */ |
| 830 | 773 | private static function get_validation_data_attribute_visibility_info( $field ) { |
| 831 | 774 | if ( FrmField::get_field_type( $field ) === 'hidden' ) { |
| @@ -855,26 +798,21 @@ | ||
| 855 | 798 | * @since 5.0.03 |
| 856 | 799 | * |
| 857 | 800 | * @param array $field |
| 858 | 801 | * @param array $add_html |
| 859 | - * | |
| 860 | 802 | * @return void |
| 861 | 803 | */ |
| 862 | 804 | private static function maybe_add_error_html_for_js_validation( $field, array &$add_html ) { |
| 863 | 805 | $form = self::get_form_for_js_validation( $field ); |
| 864 | - | |
| 865 | 806 | if ( false === $form ) { |
| 866 | 807 | return; |
| 867 | 808 | } |
| 868 | 809 | |
| 869 | 810 | $error_body = self::pull_custom_error_body_from_custom_html( $form, $field ); |
| 870 | - | |
| 871 | - if ( false === $error_body ) { | |
| 872 | - return; | |
| 811 | + if ( false !== $error_body ) { | |
| 812 | + $error_body = urlencode( $error_body ); | |
| 813 | + $add_html['data-error-html'] = 'data-error-html="' . esc_attr( $error_body ) . '"'; | |
| 873 | 814 | } |
| 874 | - | |
| 875 | - $error_body = urlencode( $error_body ); | |
| 876 | - $add_html['data-error-html'] = 'data-error-html="' . esc_attr( $error_body ) . '"'; | |
| 877 | 815 | } |
| 878 | 816 | |
| 879 | 817 | /** |
| 880 | 818 | * @since 5.0.03 |
| @@ -879,24 +817,20 @@ | ||
| 879 | 817 | /** |
| 880 | 818 | * @since 5.0.03 |
| 881 | 819 | * |
| 882 | 820 | * @param array $field |
| 883 | - * | |
| 884 | 821 | * @return false|stdClass false if there is no form object found with JS validation active. |
| 885 | 822 | */ |
| 886 | 823 | private static function get_form_for_js_validation( $field ) { |
| 887 | 824 | global $frm_vars; |
| 888 | - | |
| 889 | 825 | if ( ! empty( $frm_vars['js_validate_forms'] ) ) { |
| 890 | 826 | if ( isset( $frm_vars['js_validate_forms'][ $field['form_id'] ] ) ) { |
| 891 | 827 | return $frm_vars['js_validate_forms'][ $field['form_id'] ]; |
| 892 | 828 | } |
| 893 | - | |
| 894 | 829 | if ( ! empty( $field['parent_form_id'] ) && isset( $frm_vars['js_validate_forms'][ $field['parent_form_id'] ] ) ) { |
| 895 | 830 | return $frm_vars['js_validate_forms'][ $field['parent_form_id'] ]; |
| 896 | 831 | } |
| 897 | 832 | } |
| 898 | - | |
| 899 | 833 | return false; |
| 900 | 834 | } |
| 901 | 835 | |
| 902 | 836 | /** |
| @@ -902,9 +836,8 @@ | ||
| 902 | 836 | /** |
| 903 | 837 | * @param stdClass $form |
| 904 | 838 | * @param array $field |
| 905 | 839 | * @param array $errors |
| 906 | - * | |
| 907 | 840 | * @return false|string |
| 908 | 841 | */ |
| 909 | 842 | public static function pull_custom_error_body_from_custom_html( $form, $field, $errors = array() ) { |
| 910 | 843 | if ( empty( $field['custom_html'] ) ) { |
| @@ -912,16 +845,15 @@ | ||
| 912 | 845 | } |
| 913 | 846 | |
| 914 | 847 | $custom_html = $field['custom_html']; |
| 915 | 848 | $custom_html = apply_filters( 'frm_before_replace_shortcodes', $custom_html, $field, $errors, $form ); |
| 916 | - $start = strpos( $custom_html, '[if error]' ); | |
| 917 | 849 | |
| 850 | + $start = strpos( $custom_html, '[if error]' ); | |
| 918 | 851 | if ( false === $start ) { |
| 919 | 852 | return false; |
| 920 | 853 | } |
| 921 | 854 | |
| 922 | 855 | $end = strpos( $custom_html, '[/if error]' ); |
| 923 | - | |
| 924 | 856 | if ( false === $end || $end < $start ) { |
| 925 | 857 | return false; |
| 926 | 858 | } |
| 927 | 859 | |
| @@ -932,9 +864,13 @@ | ||
| 932 | 864 | '<div class="frm_error">[error]</div>', |
| 933 | 865 | '<div class="frm_error" role="alert">[error]</div>', |
| 934 | 866 | ); |
| 935 | 867 | |
| 936 | - return in_array( $error_body, $default_html, true ) ? false : $error_body; | |
| 868 | + if ( in_array( $error_body, $default_html, true ) ) { | |
| 869 | + return false; | |
| 870 | + } | |
| 871 | + | |
| 872 | + return $error_body; | |
| 937 | 873 | } |
| 938 | 874 | |
| 939 | 875 | /** |
| 940 | 876 | * If 'required' is added to a conditionally hidden field, the form won't |
| @@ -941,16 +877,13 @@ | ||
| 941 | 877 | * submit in many browsers. Check to make sure the javascript to conditionally |
| 942 | 878 | * remove it is present if needed. |
| 943 | 879 | * |
| 944 | 880 | * @since 3.06.01 |
| 945 | - * | |
| 946 | 881 | * @param array $field |
| 947 | 882 | * @param array $add_html |
| 948 | - * | |
| 949 | 883 | * @return void |
| 950 | 884 | */ |
| 951 | 885 | private static function maybe_add_html_required( $field, array &$add_html ) { |
| 952 | - // phpcs:disable Generic.WhiteSpace.ScopeIndent | |
| 953 | 886 | $excluded_field_types = |
| 954 | 887 | FrmField::is_radio( $field ) || |
| 955 | 888 | FrmField::is_checkbox( $field ) || |
| 956 | 889 | FrmField::is_field_type( $field, 'file' ) || |
| @@ -955,9 +888,8 @@ | ||
| 955 | 888 | FrmField::is_checkbox( $field ) || |
| 956 | 889 | FrmField::is_field_type( $field, 'file' ) || |
| 957 | 890 | FrmField::is_field_type( $field, 'nps' ) || |
| 958 | 891 | FrmField::is_field_type( $field, 'scale' ); |
| 959 | - // phpcs:enable Generic.WhiteSpace.ScopeIndent | |
| 960 | 892 | |
| 961 | 893 | if ( $excluded_field_types ) { |
| 962 | 894 | return; |
| 963 | 895 | } |
| @@ -967,9 +899,8 @@ | ||
| 967 | 899 | |
| 968 | 900 | /** |
| 969 | 901 | * @param array $field |
| 970 | 902 | * @param array $add_html |
| 971 | - * | |
| 972 | 903 | * @return void |
| 973 | 904 | */ |
| 974 | 905 | private static function add_shortcodes_to_html( $field, array &$add_html ) { |
| 975 | 906 | if ( FrmField::is_option_empty( $field, 'shortcodes' ) ) { |
| @@ -980,11 +911,10 @@ | ||
| 980 | 911 | unset( $field['shortcodes']['autocomplete'] ); |
| 981 | 912 | } |
| 982 | 913 | |
| 983 | 914 | foreach ( $field['shortcodes'] as $k => $v ) { |
| 984 | - if ( isset( $field['subfield_name'] ) && str_starts_with( $k, 'aria-invalid' ) ) { | |
| 915 | + if ( isset( $field['subfield_name'] ) && 0 === strpos( $k, 'aria-invalid' ) ) { | |
| 985 | 916 | $subfield_name = $field['subfield_name']; |
| 986 | - | |
| 987 | 917 | if ( ! isset( $field['shortcodes'][ 'aria-invalid-' . $subfield_name ] ) ) { |
| 988 | 918 | continue; |
| 989 | 919 | } |
| 990 | 920 | // Change the key to the correct aria-invalid value so that $add_html is set correctly for the current subfield of a combo field. |
| @@ -991,14 +921,13 @@ | ||
| 991 | 921 | $k = 'aria-invalid'; |
| 992 | 922 | $v = $field['shortcodes'][ 'aria-invalid-' . $subfield_name ]; |
| 993 | 923 | unset( $field['shortcodes'][ 'aria-invalid-' . $subfield_name ] ); |
| 994 | 924 | } |
| 995 | - | |
| 996 | 925 | if ( 'opt' === $k || ! self::should_allow_input_attribute( $k ) ) { |
| 997 | 926 | continue; |
| 998 | 927 | } |
| 999 | 928 | |
| 1000 | - if ( is_numeric( $k ) && str_contains( $v, '=' ) ) { | |
| 929 | + if ( is_numeric( $k ) && strpos( $v, '=' ) ) { | |
| 1001 | 930 | $add_html[] = $v; |
| 1002 | 931 | } elseif ( ! empty( $k ) && isset( $add_html[ $k ] ) ) { |
| 1003 | 932 | $add_html[ $k ] = str_replace( $k . '="', $k . '="' . $v, $add_html[ $k ] ); |
| 1004 | 933 | } else { |
| @@ -1014,9 +943,8 @@ | ||
| 1014 | 943 | * |
| 1015 | 944 | * @since 6.11.2 |
| 1016 | 945 | * |
| 1017 | 946 | * @param string $key The option key. |
| 1018 | - * | |
| 1019 | 947 | * @return bool |
| 1020 | 948 | */ |
| 1021 | 949 | private static function should_allow_input_attribute( $key ) { |
| 1022 | 950 | if ( ! FrmAppHelper::should_never_allow_unfiltered_html() ) { |
| @@ -1031,9 +959,8 @@ | ||
| 1031 | 959 | * @since 3.0 |
| 1032 | 960 | * |
| 1033 | 961 | * @param array $field |
| 1034 | 962 | * @param array $add_html |
| 1035 | - * | |
| 1036 | 963 | * @return void |
| 1037 | 964 | */ |
| 1038 | 965 | private static function add_pattern_attribute( $field, array &$add_html ) { |
| 1039 | 966 | $format_value = FrmField::get_option( $field, 'format' ); |
| @@ -1039,31 +966,22 @@ | ||
| 1039 | 966 | $format_value = FrmField::get_option( $field, 'format' ); |
| 1040 | 967 | $has_format = $format_value && ! FrmCurrencyHelper::is_currency_format( $format_value ); |
| 1041 | 968 | $format_field = FrmField::is_field_type( $field, 'text' ); |
| 1042 | 969 | |
| 1043 | - if ( $field['type'] !== 'phone' && ( ! $has_format || ! $format_field ) ) { | |
| 1044 | - return; | |
| 970 | + if ( $field['type'] === 'phone' || ( $has_format && $format_field ) ) { | |
| 971 | + $format = FrmEntryValidate::phone_format( $field ); | |
| 972 | + $format = substr( $format, 2, - 1 ); | |
| 973 | + | |
| 974 | + $add_html['pattern'] = 'pattern="' . esc_attr( $format ) . '"'; | |
| 1045 | 975 | } |
| 1046 | - | |
| 1047 | - $format = FrmEntryValidate::phone_format( $field ); | |
| 1048 | - $format = substr( $format, 2, - 1 ); | |
| 1049 | - | |
| 1050 | - $add_html['pattern'] = 'pattern="' . esc_attr( $format ) . '"'; | |
| 1051 | 976 | } |
| 1052 | 977 | |
| 1053 | - /** | |
| 1054 | - * @param mixed $opt | |
| 1055 | - * @param mixed $opt_key | |
| 1056 | - * @param array|object $field | |
| 1057 | - * | |
| 1058 | - * @return mixed | |
| 1059 | - */ | |
| 1060 | 978 | public static function check_value( $opt, $opt_key, $field ) { |
| 1061 | 979 | if ( is_array( $opt ) ) { |
| 1062 | 980 | if ( FrmField::is_option_true( $field, 'separate_value' ) ) { |
| 1063 | - $opt = $opt['value'] ?? $opt['label'] ?? reset( $opt ); | |
| 981 | + $opt = isset( $opt['value'] ) ? $opt['value'] : ( isset( $opt['label'] ) ? $opt['label'] : reset( $opt ) ); | |
| 1064 | 982 | } else { |
| 1065 | - $opt = $opt['label'] ?? reset( $opt ); | |
| 983 | + $opt = isset( $opt['label'] ) ? $opt['label'] : reset( $opt ); | |
| 1066 | 984 | } |
| 1067 | 985 | } |
| 1068 | 986 | |
| 1069 | 987 | return $opt; |
| @@ -1068,13 +986,12 @@ | ||
| 1068 | 986 | |
| 1069 | 987 | return $opt; |
| 1070 | 988 | } |
| 1071 | 989 | |
| 1072 | - /** | |
| 1073 | - * @param mixed $opt | |
| 1074 | - * | |
| 1075 | - * @return mixed | |
| 1076 | - */ | |
| 1077 | 990 | public static function check_label( $opt ) { |
| 1078 | - return is_array( $opt ) ? ( $opt['label'] ?? reset( $opt ) ) : $opt; | |
| 991 | + if ( is_array( $opt ) ) { | |
| 992 | + $opt = isset( $opt['label'] ) ? $opt['label'] : reset( $opt ); | |
| 993 | + } | |
| 994 | + | |
| 995 | + return $opt; | |
| 1079 | 996 | } |
| 1080 | 997 | } |
