Added data-style to all fields

Author: avonville

includes/class-form.php

@@ -373,9 +373,9 @@ public function entries() {
     /**
      * When a user is editing their form they may change a fields name.
      * This method will loop through existing entries to match the new field names.
-     * 
+     *
      * @since 1.6.9
-     * 
+     *
      * @param int $form_id
      * @param array $form_fields
      */
@@ -386,23 +386,22 @@ public function maybe_update_entries( $form_fields ) {
             $updated_fields = $this->rename_field( $old, $new );
         }
      }
-    
+
     /**
      * When a user is editing their form they may change a fields name.
      * This method will loop through all fields that have changed.
-     * 
+     *
      * @since 1.6.9
-     * 
+     *
      * @param int $form_id
      * @param array $form_fields
-     * 
+     *
      * @return array
      */
     public function get_changed_fields( $form_fields ) {
         $changed_fields = array();
         foreach ( $form_fields as $field ) {
             $org_field = $field['original_name'];
-            error_log("Org Field" . " = " . print_r($org_field,1));
             // All form fields should have an original name.
             if ( empty( $field['original_name'] ) ) {
                 continue;
@@ -420,20 +419,20 @@ public function get_changed_fields( $form_fields ) {
     /**
      * When a user changes the field names of a form, the existing entries will need updated.
      * This method will loop through the existing entries and update them will the new names.
-     * 
+     *
      * @since 1.6.9
-     * 
+     *
      * @param int $form_id
      * @param array $form_fields
-     * 
+     *
      * @return array
      */
     public function rename_field ( $old, $new ) {
         global $wpdb;
 
         $entries  = weforms_get_form_entries( $this->id );
 
-        foreach ( $entries as $entry ) {            
+        foreach ( $entries as $entry ) {
             $entry_id    = $entry->id;
             $values      = weforms_get_entry_meta( $entry_id );
             $update_keys = $wpdb->update( $wpdb->weforms_entrymeta, array( 'meta_key' => $new ), array( 'meta_key' => $old, 'weforms_entry_id' => $entry_id ) );

includes/fields/class-field-checkbox.php

@@ -20,13 +20,12 @@ public function __construct() {
      * @return void
      */
     public function render( $field_settings, $form_id ) {
-        $selected = !empty( $field_settings['selected'] ) ? $field_settings['selected'] : []; ?>
+        $use_theme_css = isset( $form_settings['use_theme_css'] ) ? $form_settings['use_theme_css'] : 'wpuf-style';
+        $selected      = !empty( $field_settings['selected'] ) ? $field_settings['selected'] : []; ?>
         <li <?php $this->print_list_attributes( $field_settings ); ?>>
             <?php $this->print_label( $field_settings, $form_id ); ?>
-
             <?php do_action( 'weforms_checkbox_field_after_label', $field_settings ); ?>
-            <div class="wpuf-fields" data-required="<?php echo esc_attr( $field_settings['required'] ) ?>" data-type="radio">
-
+            <div class="wpuf-fields" data-required="<?php echo esc_attr( $field_settings['required'] ) ?>" data-type="radio" data-style="<?php echo esc_attr( $use_theme_css ); ?>">
                 <?php
                 if ( $field_settings['options'] && count( $field_settings['options'] ) > 0 ) {
                     foreach ( $field_settings['options'] as $value => $option ) {

includes/fields/class-field-column.php

@@ -22,14 +22,15 @@ public function __construct() {
      * @return void
      */
     public function render( $field_settings, $form_id, $type = 'post', $post_id = null ) {
-        $i            = 1;
-        $columns      = $field_settings['columns'];
-        $columns_size = $field_settings['inner_columns_size'];
-        $column_space = $field_settings['column_space'];
-        $inner_fields = $field_settings['inner_fields'];
-        $atts         = []; ?>
+        $use_theme_css = isset( $form_settings['use_theme_css'] ) ? $form_settings['use_theme_css'] : 'wpuf-style';
+        $i             = 1;
+        $columns       = $field_settings['columns'];
+        $columns_size  = $field_settings['inner_columns_size'];
+        $column_space  = $field_settings['column_space'];
+        $inner_fields  = $field_settings['inner_fields'];
+        $atts          = []; ?>
         <li class="wpuf-el">
-            <div class="wpuf-field-columns <?php echo 'has-columns-' . esc_attr( $columns ); ?>">
+            <div class="wpuf-field-columns <?php echo 'has-columns-' . esc_attr( $columns ); ?>" data-style="<?php echo esc_attr( $use_theme_css ); ?>">
                 <div class="wpuf-column-field-inner-columns">
                     <div class="wpuf-column">
                         <?php while ( $i <= $columns ) { ?>

includes/fields/class-field-date.php

@@ -20,12 +20,25 @@ public function __construct() {
      * @return void
      */
     public function render( $field_settings, $form_id ) {
-        $value = ''; ?>
+        $use_theme_css = isset( $form_settings['use_theme_css'] ) ? $form_settings['use_theme_css'] : 'wpuf-style';
+        $value         = '';
+        ?>
         <li <?php $this->print_list_attributes( $field_settings ); ?>>
             <?php $this->print_label( $field_settings ); ?>
 
             <div class="wpuf-fields">
-                <input id="wpuf-date-<?php echo esc_attr( $field_settings['name'] ); ?>" type="text" <?php echo esc_attr( $field_settings['enforce_format'] !== 'yes' ) ? '' : 'readonly'; ?>  class="datepicker <?php echo ' wpuf_'.esc_attr( $field_settings['name'] ).'_'. esc_attr($form_id); ?>" data-required="<?php echo esc_attr($field_settings['required']) ?>" data-type="text" name="<?php echo esc_attr( $field_settings['name'] ); ?>" placeholder="<?php echo esc_attr( $field_settings['format'] ); ?>" value="<?php echo esc_attr( $value ) ?>" size="30" />
+                <input
+                    id="wpuf-date-<?php echo esc_attr( $field_settings['name'] ); ?>"
+                    type="text" <?php echo esc_attr( $field_settings['enforce_format'] !== 'yes' ) ? '' : 'readonly'; ?>
+                    class="datepicker <?php echo ' wpuf_'.esc_attr( $field_settings['name'] ).'_'. esc_attr($form_id); ?>"
+                    data-required="<?php echo esc_attr($field_settings['required']) ?>"
+                    data-type="text"
+                    data-style="<?php echo esc_attr( $use_theme_css ); ?>"
+                    name="<?php echo esc_attr( $field_settings['name'] ); ?>"
+                    placeholder="<?php echo esc_attr( $field_settings['format'] ); ?>"
+                    value="<?php echo esc_attr( $value ) ?>"
+                    size="30"
+                />
                 <?php $this->help_text( $field_settings ); ?>
             </div>
         </li>

includes/fields/class-field-dropdown.php

@@ -20,8 +20,9 @@ public function __construct() {
      * @return void
      */
     public function render( $field_settings, $form_id ) {
-        $selected  = isset( $field_settings['selected'] ) ? $field_settings['selected'] : '';
-        $name      = $field_settings['name']; ?>
+        $use_theme_css = isset( $form_settings['use_theme_css'] ) ? $form_settings['use_theme_css'] : 'wpuf-style';
+        $selected      = isset( $field_settings['selected'] ) ? $field_settings['selected'] : '';
+        $name          = $field_settings['name']; ?>
         <li <?php $this->print_list_attributes( $field_settings ); ?>>
             <?php $this->print_label( $field_settings, $form_id ); ?>
 
@@ -33,12 +34,12 @@ class="<?php echo 'wpuf_'. esc_attr( $field_settings['name'] ) .'_'. esc_attr( $
                     id="<?php echo esc_attr( $field_settings['name'] ) . '_' . esc_attr( $form_id ); ?>"
                     name="<?php echo esc_attr( $name ); ?>"
                     data-required="<?php echo esc_attr( $field_settings['required'] ) ?>"
-                    data-type="select">
-
+                    data-type="select"
+                    data-style="<?php echo esc_attr( $use_theme_css ); ?>"
+                >
                     <?php if ( !empty( $field_settings['first'] ) ) { ?>
                         <option value=""><?php echo esc_attr( $field_settings['first'] ); ?></option>
                     <?php } ?>
-
                     <?php
                     if ( $field_settings['options'] && count( $field_settings['options'] ) > 0 ) {
                         foreach ($field_settings['options'] as $value => $option) {

includes/fields/class-field-email.php

@@ -25,8 +25,9 @@ public function render( $field_settings, $form_id ) {
         if ( isset( $field_settings['auto_populate'] ) && $field_settings['auto_populate'] == 'yes' && is_user_logged_in() ) {
             return;
         }
-
-        $value = $field_settings['default']; ?>
+        $form_settings = weforms()->form->get( $form_id )->get_settings();
+        $use_theme_css = isset( $form_settings['use_theme_css'] ) ? $form_settings['use_theme_css'] : 'wpuf-style';
+        $value         = $field_settings['default']; ?>
         <li <?php $this->print_list_attributes( $field_settings ); ?>>
             <?php $this->print_label( $field_settings, $form_id ); ?>
 
@@ -38,6 +39,7 @@ class="email <?php echo ' wpuf_'. esc_attr( $field_settings['name'] ).'_'. esc_a
                     data-duplicate="<?php echo isset( $field_settings['duplicate'] ) ? esc_attr( $field_settings['duplicate'] ) : 'no'; ?>"
                     data-required="<?php echo esc_attr( $field_settings['required'] ) ?>"
                     data-type="email"
+                    data-style="<?php echo esc_attr( $use_theme_css ); ?>"
                     name="<?php echo esc_attr( $field_settings['name'] ); ?>"
                     placeholder="<?php echo esc_attr( $field_settings['placeholder'] ); ?>"
                     value="<?php echo esc_attr( $value ); ?>"

includes/fields/class-field-html.php

@@ -20,9 +20,10 @@ public function __construct() {
      * @return void
      */
     public function render( $field_settings, $form_id ) {
+        $use_theme_css    = isset( $form_settings['use_theme_css'] ) ? $form_settings['use_theme_css'] : 'wpuf-style';
         ?>
         <li <?php $this->print_list_attributes( $field_settings ); ?>>
-            <div class="wpuf-fields <?php echo 'html_' . esc_attr( $form_id ); ?><?php echo ' wpuf_'. esc_attr( $field_settings['name'] ).'_'. esc_attr( $form_id ); ?>">
+            <div class="wpuf-fields <?php echo 'html_' . esc_attr( $form_id ); ?><?php echo ' wpuf_'. esc_attr( $field_settings['name'] ).'_'. esc_attr( $form_id ); ?>" data-style="<?php echo esc_attr( $use_theme_css ); ?>">
                 <?php echo $field_settings['html']; // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped ?>
             </div>
 

includes/fields/class-field-image.php

@@ -20,13 +20,13 @@ public function __construct() {
      * @return void
      */
     public function render( $field_settings, $form_id ) {
+        $use_theme_css    = isset( $form_settings['use_theme_css'] ) ? $form_settings['use_theme_css'] : 'wpuf-style';
         $unique_id = sprintf( '%s-%d', $field_settings['name'], $form_id ); ?>
         <li <?php $this->print_list_attributes( $field_settings ); ?>>
             <?php $this->print_label( $field_settings, $form_id ); ?>
-
             <div class="wpuf-fields">
                 <div id="wpuf-<?php echo esc_attr( $unique_id ); ?>-upload-container">
-                    <div class="wpuf-attachment-upload-filelist" data-type="file" data-required="<?php echo esc_attr( $field_settings['required'] ); ?>">
+                    <div class="wpuf-attachment-upload-filelist" data-type="file" data-required="<?php echo esc_attr( $field_settings['required'] ); ?>" data-style="<?php echo esc_attr( $use_theme_css ); ?>">
                         <a id="wpuf-<?php echo esc_attr( $unique_id ); ?>-pickfiles" data-form_id="<?php echo esc_attr( $form_id ); ?>" class="button file-selector <?php echo ' wpuf_' . esc_attr( $field_settings['name'] ) . '_' . esc_attr(
                             $form_id); ?>" href="#"><?php echo esc_attr ( $field_settings['button_label'] ); ?></a>
 

includes/fields/class-field-multidropdown.php

@@ -20,16 +20,26 @@ public function __construct() {
      * @return void
      */
     public function render( $field_settings, $form_id ) {
-        $selected = isset( $field_settings['selected'] ) ? $field_settings['selected'] : '';
-        $selected = is_array( $selected ) ? $selected : [];
-        $name     = $field_settings['name'] . '[]'; ?>
+        $use_theme_css = isset( $form_settings['use_theme_css'] ) ? $form_settings['use_theme_css'] : 'wpuf-style';
+        $selected      = isset( $field_settings['selected'] ) ? $field_settings['selected'] : '';
+        $selected      = is_array( $selected ) ? $selected : [];
+        $name          = $field_settings['name'] . '[]'; ?>
         <li <?php $this->print_list_attributes( $field_settings ); ?>>
             <?php $this->print_label( $field_settings, $form_id ); ?>
 
             <?php do_action( 'weforms_multidropdown_field_after_label', $field_settings ); ?>
 
             <div class="wpuf-fields">
-                <select multiple="multiple" class="multiselect <?php echo 'wpuf_'. esc_attr( $field_settings['name'] ) .'_'. esc_attr( $form_id ); ?>" id="<?php echo esc_attr($field_settings['name']) . '_' . esc_attr($form_id); ?>" name="<?php echo esc_attr($name); ?>" mulitple="multiple" data-required="<?php echo esc_attr($field_settings['required']) ?>" data-type="multiselect">
+                <select
+                    multiple="multiple"
+                    class="multiselect <?php echo 'wpuf_'. esc_attr( $field_settings['name'] ) .'_'. esc_attr( $form_id ); ?>"
+                    id="<?php echo esc_attr($field_settings['name']) . '_' . esc_attr($form_id); ?>"
+                    name="<?php echo esc_attr($name); ?>"
+                    mulitple="multiple"
+                    data-required="<?php echo esc_attr($field_settings['required']) ?>"
+                    data-type="multiselect"
+                    data-style="<?php echo esc_attr( $use_theme_css ); ?>"
+                >
 
                     <?php if ( !empty( $field_settings['first'] ) ) { ?>
                         <option value=""><?php echo esc_attr($field_settings['first']); ?></option>

includes/fields/class-field-name.php

@@ -24,12 +24,16 @@ public function render( $field_settings, $form_id ) {
         // let's not show the name field if user choose to auto populate for logged users
         if ( isset( $field_settings['auto_populate'] ) && $field_settings['auto_populate'] == 'yes' && is_user_logged_in() ) {
             return;
-        } ?>
+        }
+        $form_settings = weforms()->form->get( $form_id )->get_settings();
+
+        $use_theme_css    = isset( $form_settings['use_theme_css'] ) ? $form_settings['use_theme_css'] : 'wpuf-style';
+        ?>
         <li <?php $this->print_list_attributes( $field_settings ); ?>>
             <?php $this->print_label( $field_settings, $form_id ); ?>
 
             <div class="wpuf-fields">
-                <div class="wpuf-name-field-wrap format-<?php echo esc_attr( $field_settings['format'] ); ?>">
+                <div class="wpuf-name-field-wrap format-<?php echo esc_attr( $field_settings['format'] ); ?>" data-style="<?php echo esc_attr( $use_theme_css ); ?>">
                     <div class="wpuf-name-field-first-name">
                         <input
                             name="<?php echo esc_attr( $field_settings['name'] ) ?>[first]"
@@ -39,11 +43,12 @@ public function render( $field_settings, $form_id ) {
                             size="40"
                             data-required="<?php echo esc_attr( $field_settings['required'] ) ?>"
                             data-type="text"
+                            data-style="<?php echo esc_attr( $use_theme_css ); ?>"
                             class="textfield wpuf_<?php echo esc_attr( $field_settings['name'] ); ?>_<?php echo esc_attr( $form_id); ?>"
                             autocomplete="given-name"
                         >
                         <?php if ( ! $field_settings['hide_subs'] ) : ?>
-                            <label class="wpuf-form-sub-label"><?php esc_html_e( 'First', 'weforms' ); ?></label>
+                            <label class="wpuf-form-sub-label" data-style="<?php echo esc_attr( $use_theme_css ); ?>"><?php esc_html_e( 'First', 'weforms' ); ?></label>
                         <?php endif; ?>
                     </div>
 
@@ -56,9 +61,10 @@ class="textfield wpuf_<?php echo esc_attr( $field_settings['name'] ); ?>_<?php e
                                 value="<?php echo esc_attr( $field_settings['middle_name']['default'] ); ?>"
                                 size="40"
                                 autocomplete="additional-name"
+                                data-style="<?php echo esc_attr( $use_theme_css ); ?>"
                             >
                             <?php if ( ! $field_settings['hide_subs'] ) : ?>
-                                <label class="wpuf-form-sub-label"><?php esc_html_e( 'Middle', 'weforms' ); ?></label>
+                                <label class="wpuf-form-sub-label" data-style="<?php echo esc_attr( $use_theme_css ); ?>"><?php esc_html_e( 'Middle', 'weforms' ); ?></label>
                             <?php endif; ?>
                         </div>
                     <?php } else { ?>
@@ -73,9 +79,10 @@ class="textfield wpuf_<?php echo esc_attr( $field_settings['name'] ); ?>_<?php e
                             value="<?php echo esc_attr( $field_settings['last_name']['default'] ); ?>"
                             size="40"
                             autocomplete="family-name"
+                            data-style="<?php echo esc_attr( $use_theme_css ); ?>"
                         >
                         <?php if ( ! $field_settings['hide_subs'] ) : ?>
-                            <label class="wpuf-form-sub-label"><?php esc_html_e( 'Last', 'weforms' ); ?></label>
+                            <label class="wpuf-form-sub-label" data-style="<?php echo esc_attr( $use_theme_css ); ?>"><?php esc_html_e( 'Last', 'weforms' ); ?></label>
                         <?php endif; ?>
                     </div>
                 </div>