Merge pull request #169 from BoldGrid/1.6.14-rc1

1.6.14 release

Author: avonville

README.md

@@ -4,7 +4,7 @@
 **Requires at least:** 5.0  
 **Requires PHP:** 7.2  
 **Tested up to:** 5.9  
-**Stable tag:** 1.6.13  
+**Stable tag:** 1.6.14  
 **License:** GPLv2 or later  
 **License URI:** https://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -237,6 +237,15 @@ weForms is the most beginner friendly and fastest WordPress contact form plugin
 
 ## Changelog ##
 
+### Version 1.6.14 (29 June, 2022) ###
+* **Update:** Bumped grunt version to 1.5.3.
+* **Update:** Bumped simple-get version to 3.1.1.
+* **Update:** Bumped minimist version to 1.2.6.
+* **Update:** Bumped follow-redirects version to 1.14.8.
+* **Update:** Updated default submit button text.
+* **Update:** Updated fields compatbility with Crio Theme for "use theme CSS".
+* **Fix:** Fixed CSS compatbility issues with "use theme CSS" feature.
+
 ### Version 1.6.13 (02 March, 2022) ###
 * **Fix:** Fixes placeholders being blank on the frontend.
 * **Fix:** Fixes issue setting multiple field tag in notification body.

assets/js/spa-app.js

@@ -1,6 +1,30 @@
 'use strict';
 
-var _typeof13 = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+var _typeof17 = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+var _typeof16 = typeof Symbol === "function" && _typeof17(Symbol.iterator) === "symbol" ? function (obj) {
+    return typeof obj === "undefined" ? "undefined" : _typeof17(obj);
+} : function (obj) {
+    return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj === "undefined" ? "undefined" : _typeof17(obj);
+};
+
+var _typeof15 = typeof Symbol === "function" && _typeof16(Symbol.iterator) === "symbol" ? function (obj) {
+    return typeof obj === "undefined" ? "undefined" : _typeof16(obj);
+} : function (obj) {
+    return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj === "undefined" ? "undefined" : _typeof16(obj);
+};
+
+var _typeof14 = typeof Symbol === "function" && _typeof15(Symbol.iterator) === "symbol" ? function (obj) {
+    return typeof obj === "undefined" ? "undefined" : _typeof15(obj);
+} : function (obj) {
+    return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj === "undefined" ? "undefined" : _typeof15(obj);
+};
+
+var _typeof13 = typeof Symbol === "function" && _typeof14(Symbol.iterator) === "symbol" ? function (obj) {
+    return typeof obj === "undefined" ? "undefined" : _typeof14(obj);
+} : function (obj) {
+    return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj === "undefined" ? "undefined" : _typeof14(obj);
+};
 
 var _typeof12 = typeof Symbol === "function" && _typeof13(Symbol.iterator) === "symbol" ? function (obj) {
     return typeof obj === "undefined" ? "undefined" : _typeof13(obj);

assets/js/spa-app.min.js

@@ -268,7 +268,6 @@ ul.wpuf-form li .wpuf-fields a.file-selector {
   -moz-border-radius: 3px;
   border-radius: 3px;
   background: #fafafa;
-  color: #23282d;
   box-shadow: 0 1px 0 #cccccc;
   vertical-align: top;
   cursor: pointer;

assets/wpuf/css/frontend-forms.css

@@ -110,6 +110,8 @@ public function save_form() {
 
         if ( isset( $post_data['settings'] ) ) {
             $settings = (array) json_decode( $post_data['settings'] );
+            $settings['message'] = sanitize_text_field( $settings['message'] );
+            error_log(print_r($settings, true));
         } else {
             $settings = isset( $form_data['wpuf_settings'] ) ? $form_data['wpuf_settings'] : [];
         }

includes/class-ajax.php

@@ -67,7 +67,9 @@ public function render_form( $form, $atts ) {
         $show_credit      = weforms_get_settings( 'credit', false );
         $formid           = 'weforms-' . $form->id;
         $use_theme_css    = isset( $form_settings['use_theme_css'] ) ? $form_settings['use_theme_css'] : 'wpuf-style';
-
+        // if ( $use_theme_css === $form_settings['use_theme_css'] ) {
+        //     wp_dequeue_style( 'weforms-css' );
+        // }
         if ( isset( $atts['modal'] ) && 'true' == $atts['modal'] ) {
             wp_enqueue_script( 'weforms-modal-js', WEFORMS_ASSET_URI . '/modal/jquery.modal.js', [ 'jquery', 'weforms-form' ], false, false );
             wp_enqueue_style( 'weforms_modal_styles', WEFORMS_ASSET_URI . '/modal/jquery.modal.css' );

includes/class-frontend-form.php

@@ -20,16 +20,16 @@ public function __construct() {
      * @return void
      */
     public function render( $field_settings, $form_id ) {
+        $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';
         $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'] ); ?>" 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(
+                <div id="wpuf-<?php echo esc_attr( $unique_id ); ?>-upload-container" data-style="<?php echo esc_attr( $use_theme_css ); ?>">
+                    <div class="wpuf-attachment-upload-filelist"  data-style="<?php echo esc_attr( $use_theme_css ); ?>" 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-style="<?php echo esc_attr( $use_theme_css ); ?>" 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>
-
                         <ul class="wpuf-attachment-list thumbnails"></ul>
                     </div>
                 </div><!-- .container -->

includes/fields/class-field-image.php

@@ -2,9 +2,9 @@
 # This file is distributed under the GPL2 or later.
 msgid ""
 msgstr ""
-"Project-Id-Version: weForms 1.6.13\n"
+"Project-Id-Version: weForms 1.6.14\n"
 "Report-Msgid-Bugs-To: https://wedevs.com/contact/\n"
-"POT-Creation-Date: 2022-02-25 17:26:40+00:00\n"
+"POT-Creation-Date: 2022-06-28 23:22:30+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -837,10 +837,10 @@ msgstr ""
 #: includes/fields/class-field-name.php:213
 #: includes/fields/class-field-radio.php:113
 #: includes/fields/class-field-radio.php:117
-#: includes/fields/class-field-text.php:142
-#: includes/fields/class-field-text.php:146
-#: includes/fields/class-field-textarea.php:138
-#: includes/fields/class-field-textarea.php:142
+#: includes/fields/class-field-text.php:143
+#: includes/fields/class-field-text.php:147
+#: includes/fields/class-field-textarea.php:139
+#: includes/fields/class-field-textarea.php:143
 #: includes/fields/class-field-url.php:98
 #: includes/fields/class-field-url.php:102
 msgid "Unauthorized operation"
@@ -1381,7 +1381,7 @@ msgstr ""
 
 #: includes/api/class-weforms-entries-controller.php:136
 #: includes/api/class-weforms-entries-controller.php:193
-#: includes/class-ajax.php:660 includes/class-ajax.php:687
+#: includes/class-ajax.php:662 includes/class-ajax.php:689
 msgid "No entry ids provided!"
 msgstr ""
 
@@ -1455,13 +1455,13 @@ msgid "Fields  deleted successfully "
 msgstr ""
 
 #: includes/api/class-weforms-forms-controller.php:245
-#: includes/class-ajax.php:519 includes/class-ajax.php:524
+#: includes/class-ajax.php:521 includes/class-ajax.php:526
 msgid "No form fields found!"
 msgstr ""
 
 #: includes/api/class-weforms-forms-controller.php:251
-#: includes/class-ajax.php:846 includes/class-ajax.php:855
-#: includes/class-ajax.php:896 includes/class-ajax.php:911
+#: includes/class-ajax.php:848 includes/class-ajax.php:857
+#: includes/class-ajax.php:898 includes/class-ajax.php:913
 msgid "reCAPTCHA validation failed"
 msgstr ""
 
@@ -1526,7 +1526,7 @@ msgstr ""
 
 #: includes/api/class-weforms-forms-controller.php:797
 #: includes/api/class-weforms-forms-controller.php:822
-#: includes/class-ajax.php:346
+#: includes/class-ajax.php:348
 msgid "Could not create the form"
 msgstr ""
 
@@ -1551,7 +1551,7 @@ msgid "Unable to delete form"
 msgstr ""
 
 #: includes/api/class-weforms-forms-controller.php:1099
-#: includes/class-ajax.php:305
+#: includes/class-ajax.php:307
 msgid "No form ids provided!"
 msgstr ""
 
@@ -1560,22 +1560,22 @@ msgid "form  deleted successfully "
 msgstr ""
 
 #: includes/api/class-weforms-forms-controller.php:1235
-#: includes/class-ajax.php:1140
+#: includes/class-ajax.php:1142
 msgid "No file found to import."
 msgstr ""
 
 #: includes/api/class-weforms-forms-controller.php:1249
-#: includes/class-ajax.php:1153
+#: includes/class-ajax.php:1155
 msgid "The forms have been imported successfully!"
 msgstr ""
 
 #: includes/api/class-weforms-forms-controller.php:1257
-#: includes/class-ajax.php:1155
+#: includes/class-ajax.php:1157
 msgid "Something went wrong importing the file."
 msgstr ""
 
 #: includes/api/class-weforms-forms-controller.php:1260
-#: includes/class-ajax.php:1158
+#: includes/class-ajax.php:1160
 msgid "Invalid file or file size too big."
 msgstr ""
 
@@ -1601,7 +1601,7 @@ msgid "data not exist"
 msgstr ""
 
 #: includes/api/class-weforms-log-controller.php:85
-#: includes/class-ajax.php:1199
+#: includes/class-ajax.php:1201
 msgid "ago"
 msgstr ""
 
@@ -1637,19 +1637,19 @@ msgstr ""
 msgid "Invalid form id"
 msgstr ""
 
-#: includes/class-ajax.php:261
+#: includes/class-ajax.php:263
 msgid "Please provide a form name"
 msgstr ""
 
-#: includes/class-ajax.php:289 includes/class-ajax.php:444
+#: includes/class-ajax.php:291 includes/class-ajax.php:446
 msgid "No form id provided!"
 msgstr ""
 
-#: includes/class-ajax.php:733
+#: includes/class-ajax.php:735
 msgid "\"%s\" field requires a unique entry and \"%s\" has already been used."
 msgstr ""
 
-#: includes/class-ajax.php:744
+#: includes/class-ajax.php:746
 msgid "No form field was found."
 msgstr ""
 
@@ -1749,7 +1749,7 @@ msgstr ""
 msgid "The form couldn't be found."
 msgstr ""
 
-#: includes/class-frontend-form.php:133
+#: includes/class-frontend-form.php:135
 msgid "Open Form"
 msgstr ""
 
@@ -2060,13 +2060,13 @@ msgid "Email Address"
 msgstr ""
 
 #: includes/fields/class-field-email.php:70
-#: includes/fields/class-field-text.php:104
+#: includes/fields/class-field-text.php:105
 #: includes/fields/class-field-url.php:65
 msgid "Unique Values Only"
 msgstr ""
 
 #: includes/fields/class-field-email.php:75
-#: includes/fields/class-field-text.php:109
+#: includes/fields/class-field-text.php:110
 #: includes/fields/class-field-url.php:70
 msgid ""
 "Select this option to limit user input to unique values only. This will "
@@ -2454,9 +2454,15 @@ msgid "Thanks for contacting us! We will get in touch with you shortly."
 msgstr ""
 
 #: includes/functions.php:1103
-#: includes/importer/class-importer-abstract.php:901
-#: includes/importer/class-importer-gf.php:274
-msgid "Submit Query"
+#: includes/templates/class-template-admission-form.php:135
+#: includes/templates/class-template-bug-report.php:180
+#: includes/templates/class-template-comment-and-rating.php:56
+#: includes/templates/class-template-employee-information.php:241
+#: includes/templates/class-template-polling-form.php:47
+#: includes/templates/class-template-product-order-form.php:140
+#: includes/templates/class-template-restaurant-reservation.php:111
+#: includes/templates/class-template-to-do-list.php:70
+msgid "Submit"
 msgstr ""
 
 #: includes/functions.php:1119
@@ -2555,6 +2561,11 @@ msgstr[1] ""
 msgid "You are not allowed."
 msgstr ""
 
+#: includes/importer/class-importer-abstract.php:901
+#: includes/importer/class-importer-gf.php:274
+msgid "Submit Query"
+msgstr ""
+
 #: includes/integrations/erp/class-integration-erp.php:13
 msgid "WP ERP"
 msgstr ""
@@ -2671,17 +2682,6 @@ msgstr ""
 msgid "Payment Method"
 msgstr ""
 
-#: includes/templates/class-template-admission-form.php:135
-#: includes/templates/class-template-bug-report.php:180
-#: includes/templates/class-template-comment-and-rating.php:56
-#: includes/templates/class-template-employee-information.php:241
-#: includes/templates/class-template-polling-form.php:47
-#: includes/templates/class-template-product-order-form.php:140
-#: includes/templates/class-template-restaurant-reservation.php:111
-#: includes/templates/class-template-to-do-list.php:70
-msgid "Submit"
-msgstr ""
-
 #: includes/templates/class-template-blank.php:12
 msgid "Blank Form"
 msgstr ""

languages/weforms.pot

@@ -1,7 +1,7 @@
 {
   "name": "weForms",
   "author": "BoldGrid",
-  "version": "1.6.13",
+  "version": "1.6.14",
   "license": "GPL-2.0",
   "repository": {
     "type": "git",