| @@ -20,21 +20,8 @@ | ||
| 20 | 20 | ?> |
| 21 | 21 | </h3> |
| 22 | 22 | |
| 23 | 23 | <div class="frm_grid_container frm-collapse-me"> |
| 24 | - <?php | |
| 25 | - if ( $field['type'] === 'captcha' && ! FrmFieldCaptcha::should_show_captcha() ) { | |
| 26 | - ?> | |
| 27 | - <div class="frm_warning_style frm-with-icon"> | |
| 28 | - <?php FrmAppHelper::icon_by_class( 'frm_icon_font frm_alert_icon', array( 'style' => 'width:24px' ) ); ?> | |
| 29 | - <span> | |
| 30 | - <?php | |
| 31 | - /* translators: %1$s: Link HTML, %2$s: End link */ | |
| 32 | - printf( esc_html__( 'Captchas will not be used until the Site and Secret Keys are %1$sset up%2$s.', 'formidable' ), '<a href="?page=formidable-settings" target="_blank">', '</a>' ); | |
| 33 | - ?> | |
| 34 | - </span> | |
| 35 | - </div> | |
| 36 | - <?php } ?> | |
| 37 | 24 | <?php if ( $display['label'] ) { ?> |
| 38 | 25 | <p> |
| 39 | 26 | <label for="frm_name_<?php echo esc_attr( $field['id'] ); ?>"> |
| 40 | 27 | <?php echo esc_html( apply_filters( 'frm_builder_field_label', __( 'Field Label', 'formidable' ), $field ) ); ?> |
| @@ -112,25 +99,15 @@ | ||
| 112 | 99 | if ( $display['clear_on_focus'] ) { |
| 113 | 100 | do_action( 'frm_extra_field_display_options', $field ); |
| 114 | 101 | } |
| 115 | 102 | |
| 116 | -/** | |
| 117 | - * Fires after printing the primary options section of field. | |
| 118 | - * | |
| 119 | - * @since 5.0.04 Added `$display` and `$values`. | |
| 120 | - * | |
| 121 | - * @param array $field Field data. | |
| 122 | - * @param FrmFieldType $field_obj Field type object. | |
| 123 | - * @param array $display Display data. | |
| 124 | - * @param array $values Field values. | |
| 125 | - */ | |
| 126 | -do_action( 'frm_before_field_options', $field, compact( 'field_obj', 'display', 'values' ) ); | |
| 103 | +do_action( 'frm_before_field_options', $field ); | |
| 127 | 104 | |
| 128 | 105 | ?> |
| 129 | 106 | |
| 130 | 107 | <h3 class="frm-collapsed"> |
| 131 | 108 | <?php esc_html_e( 'Advanced', 'formidable' ); ?> |
| 132 | - <?php FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) ); ?> | |
| 109 | + <i class="frm_icon_font frm_arrowdown6_icon"></i> | |
| 133 | 110 | </h3> |
| 134 | 111 | <div class="frm_grid_container frm-collapse-me"> |
| 135 | 112 | |
| 136 | 113 | <?php if ( $display['default'] ) { ?> |
| @@ -150,9 +127,48 @@ | ||
| 150 | 127 | </a> |
| 151 | 128 | <?php } ?> |
| 152 | 129 | </span> |
| 153 | 130 | <?php } ?> |
| 154 | - <?php $field_obj->show_default_value_setting( $field, $field_obj, $default_value_types, $display ); ?> | |
| 131 | + | |
| 132 | + <p class="frm-has-modal default-value-section-<?php echo esc_attr( $field['id'] . ( isset( $default_value_types['default_value']['current'] ) ? '' : ' frm_hidden' ) ); ?>" id="default-value-for-<?php echo esc_attr( $field['id'] ); ?>"> | |
| 133 | + <label for="frm_default_value_<?php echo esc_attr( $field['id'] ); ?>"> | |
| 134 | + <?php esc_html_e( 'Default Value', 'formidable' ); ?> | |
| 135 | + </label> | |
| 136 | + <span class="frm-with-right-icon"> | |
| 137 | + <?php | |
| 138 | + $special_default = ( isset( $field['post_field'] ) && $field['post_field'] === 'post_category' ) || $field['type'] === 'data'; | |
| 139 | + FrmAppHelper::icon_by_class( | |
| 140 | + 'frm_icon_font frm_more_horiz_solid_icon frm-show-inline-modal', | |
| 141 | + array( | |
| 142 | + 'data-open' => $special_default ? 'frm-tax-box-' . $field['id'] : 'frm-smart-values-box', | |
| 143 | + 'title' => esc_attr__( 'Toggle Options', 'formidable' ), | |
| 144 | + ) | |
| 145 | + ); | |
| 146 | + unset( $special_default ); | |
| 147 | + | |
| 148 | + if ( isset( $display['default_value'] ) && $display['default_value'] ) { | |
| 149 | + $default_name = 'field_options[dyn_default_value_' . $field['id'] . ']'; | |
| 150 | + $default_value = isset( $field['dyn_default_value'] ) ? $field['dyn_default_value'] : ''; | |
| 151 | + } else { | |
| 152 | + $default_name = 'default_value_' . $field['id']; | |
| 153 | + $default_value = $field['default_value']; | |
| 154 | + } | |
| 155 | + $field_obj->default_value_to_string( $default_value ); | |
| 156 | + | |
| 157 | + if ( $display['type'] === 'textarea' || $display['type'] === 'rte' ) { | |
| 158 | + ?> | |
| 159 | + <textarea name="<?php echo esc_attr( $default_name ); ?>" class="default-value-field" id="frm_default_value_<?php echo esc_attr( $field['id'] ); ?>" rows="3" data-changeme="field_<?php echo esc_attr( $field['field_key'] ); ?>"><?php | |
| 160 | + echo FrmAppHelper::esc_textarea( $default_value ); // WPCS: XSS ok. | |
| 161 | + ?></textarea> | |
| 162 | + <?php | |
| 163 | + } else { | |
| 164 | + ?> | |
| 165 | + <input type="text" name="<?php echo esc_attr( $default_name ); ?>" value="<?php echo esc_attr( $default_value ); ?>" id="frm_default_value_<?php echo esc_attr( $field['id'] ); ?>" class="default-value-field" data-changeme="field_<?php echo esc_attr( $field['field_key'] ); ?>" data-changeatt="value" data-sep="<?php echo esc_attr( $field_obj->displayed_field_type( $field ) ? ',' : '' ); ?>" /> | |
| 166 | + <?php | |
| 167 | + } | |
| 168 | + ?> | |
| 169 | + </span> | |
| 170 | + </p> | |
| 155 | 171 | <?php do_action( 'frm_default_value_setting', compact( 'field', 'display', 'default_value_types' ) ); ?> |
| 156 | 172 | </div> |
| 157 | 173 | <?php } ?> |
| 158 | 174 | |
| @@ -166,9 +182,9 @@ | ||
| 166 | 182 | <?php |
| 167 | 183 | if ( $display['type'] === 'textarea' || $display['type'] === 'rte' ) { |
| 168 | 184 | ?> |
| 169 | 185 | <textarea name="field_options[placeholder_<?php echo esc_attr( $field['id'] ); ?>]" id="frm_placeholder_<?php echo esc_attr( $field['id'] ); ?>" rows="3" data-changeme="field_<?php echo esc_attr( $field['field_key'] ); ?>" data-changeatt="placeholder"><?php |
| 170 | - echo FrmAppHelper::esc_textarea( $field['placeholder'] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 186 | + echo FrmAppHelper::esc_textarea( $field['placeholder'] ); // WPCS: XSS ok. | |
| 171 | 187 | ?></textarea> |
| 172 | 188 | <?php |
| 173 | 189 | } else { |
| 174 | 190 | ?> |
| @@ -199,9 +215,9 @@ | ||
| 199 | 215 | </label> |
| 200 | 216 | </p> |
| 201 | 217 | <?php } ?> |
| 202 | 218 | |
| 203 | - <?php if ( $display['captcha_size'] && $frm_settings->re_type !== 'invisible' && $frm_settings->active_captcha === 'recaptcha' ) { ?> | |
| 219 | + <?php if ( $display['captcha_size'] && $frm_settings->re_type !== 'invisible' ) { ?> | |
| 204 | 220 | <p class="frm6 frm_first frm_form_field"> |
| 205 | 221 | <label for="field_options_captcha_size_<?php echo esc_attr( $field['id'] ); ?>" class="frm_help" title="<?php esc_attr_e( 'Set the size of the captcha field. The compact option is best if your form is in a small area.', 'formidable' ); ?>"> |
| 206 | 222 | <?php esc_html_e( 'ReCaptcha Type', 'formidable' ); ?> |
| 207 | 223 | </label> |
| @@ -287,9 +303,9 @@ | ||
| 287 | 303 | </label> |
| 288 | 304 | <select name="field_options[type_<?php echo esc_attr( $field['id'] ); ?>]" id="field_options_type_<?php echo esc_attr( $field['id'] ); ?>"> |
| 289 | 305 | <?php foreach ( $field_types as $fkey => $ftype ) { ?> |
| 290 | 306 | <option value="<?php echo esc_attr( $fkey ); ?>" <?php echo ( $fkey === $field['type'] ) ? ' selected="selected"' : ''; ?> <?php echo array_key_exists( $fkey, $disabled_fields ) ? 'disabled="disabled"' : ''; ?>> |
| 291 | - <?php echo esc_html( is_array( $ftype ) ? $ftype['name'] : $ftype ); ?> | |
| 307 | + <?php echo esc_html( is_array( $ftype ) ? $ftype['name'] : $ftype ); ?> | |
| 292 | 308 | </option> |
| 293 | 309 | <?php |
| 294 | 310 | unset( $fkey, $ftype ); |
| 295 | 311 | } |
| @@ -299,9 +315,9 @@ | ||
| 299 | 315 | <?php } else { ?> |
| 300 | 316 | <input type="hidden" id="field_options_type_<?php echo esc_attr( $field['id'] ); ?>" value="<?php echo esc_attr( $field['type'] ); ?>" /> |
| 301 | 317 | <?php } ?> |
| 302 | 318 | |
| 303 | - <table class="form-table frm-mt-0"> | |
| 319 | + <table class="form-table frm_no_top_margin"> | |
| 304 | 320 | <?php $field_obj->show_options( $field, $display, $values ); ?> |
| 305 | 321 | <?php do_action( 'frm_field_options_form', $field, $display, $values ); ?> |
| 306 | 322 | </table> |
| 307 | 323 | </div> |
| @@ -307,15 +323,15 @@ | ||
| 307 | 323 | </div> |
| 308 | 324 | |
| 309 | 325 | <?php if ( $display['required'] || $display['invalid'] || $display['unique'] || $display['conf_field'] ) { ?> |
| 310 | 326 | <?php |
| 311 | - $hidden_invalid = FrmField::is_field_type( $field, 'text' ) && ! FrmField::is_option_true( $field, 'format' ) && FrmField::is_option_empty( $field, 'max' ); | |
| 327 | + $hidden_invalid = FrmField::is_field_type( $field, 'text' ) && ! FrmField::is_option_true( $field, 'format' ); | |
| 312 | 328 | $has_validation = ( ( $display['invalid'] && ! $hidden_invalid ) || $field['required'] || FrmField::is_option_true( $field, 'unique' ) || FrmField::is_option_true( $field, 'conf_field' ) ); |
| 313 | 329 | ?> |
| 314 | 330 | <div class="frm_validation_msg <?php echo esc_attr( $has_validation ? '' : 'frm_hidden' ); ?>"> |
| 315 | 331 | <h3 class="frm-collapsed"> |
| 316 | 332 | <?php esc_html_e( 'Validation Messages', 'formidable' ); ?> |
| 317 | - <?php FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) ); ?> | |
| 333 | + <i class="frm_icon_font frm_arrowdown6_icon"></i> | |
| 318 | 334 | </h3> |
| 319 | 335 | |
| 320 | 336 | <div class="frm_validation_box frm-collapse-me"> |
| 321 | 337 | <?php if ( $display['required'] ) { ?> |
