Version Description
Fixed: Bug on CSV and XML export
Download this release
Release Info
Developer | webdorado |
Plugin | Form Maker by WD – user-friendly drag & drop Form Builder plugin |
Version | 1.9.14 |
Comparing to | |
See all releases |
Code changes from version 1.9.13 to 1.9.14
- admin/models/FMModelGenerete_csv.php +1 -2
- admin/models/FMModelGenerete_xml.php +1 -2
- admin/views/FMViewSubmissions_fm.php +44 -43
- form-maker.php +2 -2
- readme.txt +4 -1
admin/models/FMModelGenerete_csv.php
CHANGED
@@ -25,8 +25,7 @@ class FMModelGenerete_csv {
|
|
25 |
$group_id_s = array();
|
26 |
$form_id = (int)$_REQUEST['form_id'];
|
27 |
$limitstart = (int)$_REQUEST['limitstart'];
|
28 |
-
$search_labels = isset($_REQUEST['search_labels']) ? $_REQUEST['search_labels'] :
|
29 |
-
$search_labels = implode(",",$search_labels);
|
30 |
|
31 |
|
32 |
$paypal_info_fields = array('currency', 'ord_last_modified', 'status', 'full_name', 'fax', 'mobile_phone', 'email', 'phone', 'address', 'paypal_info', 'ipn', 'tax', 'shipping');
|
25 |
$group_id_s = array();
|
26 |
$form_id = (int)$_REQUEST['form_id'];
|
27 |
$limitstart = (int)$_REQUEST['limitstart'];
|
28 |
+
$search_labels = isset($_REQUEST['search_labels']) ? $_REQUEST['search_labels'] : '';
|
|
|
29 |
|
30 |
|
31 |
$paypal_info_fields = array('currency', 'ord_last_modified', 'status', 'full_name', 'fax', 'mobile_phone', 'email', 'phone', 'address', 'paypal_info', 'ipn', 'tax', 'shipping');
|
admin/models/FMModelGenerete_xml.php
CHANGED
@@ -26,8 +26,7 @@ class FMModelGenerete_xml {
|
|
26 |
$group_id_s = array();
|
27 |
$form_id = (int)$_REQUEST['form_id'];
|
28 |
$limitstart = (int)$_REQUEST['limitstart'];
|
29 |
-
$search_labels = isset($_REQUEST['search_labels']) ? $_REQUEST['search_labels'] :
|
30 |
-
$search_labels = implode(",",$search_labels);
|
31 |
|
32 |
$paypal_info_fields = array('currency', 'ord_last_modified', 'status', 'full_name', 'fax', 'mobile_phone', 'email', 'phone', 'address', 'paypal_info', 'ipn', 'tax', 'shipping');
|
33 |
$paypal_info_labels = array( 'Currency', 'Last modified', 'Status', 'Full Name', 'Fax', 'Mobile phone', 'Email', 'Phone', 'Address', 'Paypal info', 'IPN', 'Tax', 'Shipping');
|
26 |
$group_id_s = array();
|
27 |
$form_id = (int)$_REQUEST['form_id'];
|
28 |
$limitstart = (int)$_REQUEST['limitstart'];
|
29 |
+
$search_labels = isset($_REQUEST['search_labels']) ? $_REQUEST['search_labels'] : '';
|
|
|
30 |
|
31 |
$paypal_info_fields = array('currency', 'ord_last_modified', 'status', 'full_name', 'fax', 'mobile_phone', 'email', 'phone', 'address', 'paypal_info', 'ipn', 'tax', 'shipping');
|
32 |
$paypal_info_labels = array( 'Currency', 'Last modified', 'Status', 'Full Name', 'Fax', 'Mobile phone', 'Email', 'Phone', 'Address', 'Paypal info', 'IPN', 'Tax', 'Shipping');
|
admin/views/FMViewSubmissions_fm.php
CHANGED
@@ -38,7 +38,7 @@ class FMViewSubmissions_fm {
|
|
38 |
$rows = ((isset($labels_parameters[5])) ? $labels_parameters[5] : NULL);
|
39 |
$group_ids = ((isset($labels_parameters[6])) ? $labels_parameters[6] : NULL);
|
40 |
$where_choices = $labels_parameters[7];
|
41 |
-
$searched_ids = $labels_parameters[8];
|
42 |
|
43 |
$order_by = (isset($_POST['order_by']) ? esc_html(stripslashes($_POST['order_by'])) : 'group_id');
|
44 |
$asc_or_desc = ((isset($_POST['asc_or_desc']) && $_POST['asc_or_desc'] == 'asc') ? 'asc' : 'desc');
|
@@ -78,49 +78,50 @@ class FMViewSubmissions_fm {
|
|
78 |
?>
|
79 |
<script type="text/javascript">
|
80 |
function export_submissions(type, limit) {
|
81 |
-
|
82 |
-
|
83 |
-
|
84 |
-
|
85 |
-
|
86 |
-
|
87 |
-
|
88 |
-
|
89 |
-
|
90 |
-
|
91 |
-
|
92 |
-
|
93 |
-
|
94 |
-
|
95 |
success: function(data) {
|
96 |
-
|
97 |
-
|
98 |
-
|
99 |
-
|
100 |
-
|
101 |
-
|
102 |
-
|
103 |
-
|
104 |
-
|
105 |
-
|
106 |
-
|
107 |
-
|
108 |
-
|
109 |
-
|
110 |
-
|
111 |
-
|
112 |
-
|
113 |
-
|
114 |
-
|
115 |
-
|
116 |
-
|
117 |
-
|
118 |
-
|
119 |
-
|
120 |
-
|
121 |
-
|
122 |
-
|
123 |
-
|
|
|
124 |
}
|
125 |
});
|
126 |
}
|
38 |
$rows = ((isset($labels_parameters[5])) ? $labels_parameters[5] : NULL);
|
39 |
$group_ids = ((isset($labels_parameters[6])) ? $labels_parameters[6] : NULL);
|
40 |
$where_choices = $labels_parameters[7];
|
41 |
+
$searched_ids = $labels_parameters[8] ? implode(',', $labels_parameters[8]) : '';
|
42 |
|
43 |
$order_by = (isset($_POST['order_by']) ? esc_html(stripslashes($_POST['order_by'])) : 'group_id');
|
44 |
$asc_or_desc = ((isset($_POST['asc_or_desc']) && $_POST['asc_or_desc'] == 'asc') ? 'asc' : 'desc');
|
78 |
?>
|
79 |
<script type="text/javascript">
|
80 |
function export_submissions(type, limit) {
|
81 |
+
var progressbar = jQuery( "#fm-progressbar" );
|
82 |
+
var progressLabel = jQuery( ".fm-progress-label" );
|
83 |
+
progressbar.progressbar({
|
84 |
+
max: <?php echo $subs_count; ?>
|
85 |
+
});
|
86 |
+
|
87 |
+
jQuery.ajax({
|
88 |
+
type: "POST",
|
89 |
+
url:"<?php echo add_query_arg(array('form_id' => $form_id, 'send_header' => 0), admin_url('admin-ajax.php')); ?>&action=generete_"+type+"&limitstart="+limit,
|
90 |
+
data: {search_labels : '<?php echo $searched_ids; ?>'},
|
91 |
+
beforeSend: function() {
|
92 |
+
if(<?php echo $subs_count; ?> >= 1000 )
|
93 |
+
jQuery('.fm_modal').show();
|
94 |
+
},
|
95 |
success: function(data) {
|
96 |
+
if(limit < <?php echo $subs_count; ?>) {
|
97 |
+
limit += 1000;
|
98 |
+
export_submissions(type, limit);
|
99 |
+
progressbar.progressbar( "value", limit);
|
100 |
+
loaded_percent = Math.round((progressbar.progressbar( "value" ) * 100)/ parseInt(<?php echo $subs_count; ?>));
|
101 |
+
progressLabel.text( loaded_percent + ' %');
|
102 |
+
progressbarValue = progressbar.find( ".fm-progress-label" );
|
103 |
+
if( loaded_percent >= 46 ) {
|
104 |
+
progressbarValue.css({
|
105 |
+
"color": '#fff',
|
106 |
+
});
|
107 |
+
}
|
108 |
+
else {
|
109 |
+
progressbarValue.css({
|
110 |
+
"color": '#444',
|
111 |
+
});
|
112 |
+
}
|
113 |
+
}
|
114 |
+
else{
|
115 |
+
jQuery('.fm_modal').hide();
|
116 |
+
progressbar.progressbar( "value", 0);
|
117 |
+
progressLabel.text( 'Loading ...' );
|
118 |
+
progressbarValue = progressbar.find( ".fm-progress-label" );
|
119 |
+
progressbarValue.css({
|
120 |
+
"color": '#444',
|
121 |
+
});
|
122 |
+
window.location = "<?php echo add_query_arg(array('form_id' => $form_id, 'send_header' => 1), admin_url('admin-ajax.php')); ?>&action=generete_"+type+"&limitstart="+limit;
|
123 |
+
}
|
124 |
+
|
125 |
}
|
126 |
});
|
127 |
}
|
form-maker.php
CHANGED
@@ -3,7 +3,7 @@
|
|
3 |
* Plugin Name: Form Maker
|
4 |
* Plugin URI: https://web-dorado.com/products/form-maker-wordpress.html
|
5 |
* Description: This plugin is a modern and advanced tool for easy and fast creating of a WordPress Form. The backend interface is intuitive and user friendly which allows users far from scripting and programming to create WordPress Forms.
|
6 |
-
* Version: 1.9.
|
7 |
* Author: WebDorado
|
8 |
* Author URI: https://web-dorado.com/
|
9 |
* License: GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
|
@@ -272,7 +272,7 @@ function register_fmemailverification_cpt(){
|
|
272 |
// Activate plugin.
|
273 |
function form_maker_activate() {
|
274 |
$version = get_option("wd_form_maker_version");
|
275 |
-
$new_version = '1.9.
|
276 |
global $wpdb;
|
277 |
if (!$version) {
|
278 |
add_option("wd_form_maker_version", $new_version, '', 'no');
|
3 |
* Plugin Name: Form Maker
|
4 |
* Plugin URI: https://web-dorado.com/products/form-maker-wordpress.html
|
5 |
* Description: This plugin is a modern and advanced tool for easy and fast creating of a WordPress Form. The backend interface is intuitive and user friendly which allows users far from scripting and programming to create WordPress Forms.
|
6 |
+
* Version: 1.9.14
|
7 |
* Author: WebDorado
|
8 |
* Author URI: https://web-dorado.com/
|
9 |
* License: GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
|
272 |
// Activate plugin.
|
273 |
function form_maker_activate() {
|
274 |
$version = get_option("wd_form_maker_version");
|
275 |
+
$new_version = '1.9.14';
|
276 |
global $wpdb;
|
277 |
if (!$version) {
|
278 |
add_option("wd_form_maker_version", $new_version, '', 'no');
|
readme.txt
CHANGED
@@ -4,7 +4,7 @@ Donate link: https://web-dorado.com/products/wordpress-form.html
|
|
4 |
Tags: captcha, contact, contact form, contact forms, custom form, email, feedback, form, form builder, form manager, forms, survey
|
5 |
Requires at least: 3.4
|
6 |
Tested up to: 4.6
|
7 |
-
Stable tag: 1.9.
|
8 |
License: GPLv2 or later
|
9 |
License URI: http://www.gnu.org/licenses/gpl-2.0.html
|
10 |
|
@@ -315,6 +315,9 @@ Email field should be used since it verifies that an entry format fulfills examp
|
|
315 |
|
316 |
== Changelog ==
|
317 |
|
|
|
|
|
|
|
318 |
= 1.9.13 =
|
319 |
Fixed: Bug on Field label position (Left/Top)
|
320 |
Fixed: JS error on IE 11 and Microsoft Edge
|
4 |
Tags: captcha, contact, contact form, contact forms, custom form, email, feedback, form, form builder, form manager, forms, survey
|
5 |
Requires at least: 3.4
|
6 |
Tested up to: 4.6
|
7 |
+
Stable tag: 1.9.14
|
8 |
License: GPLv2 or later
|
9 |
License URI: http://www.gnu.org/licenses/gpl-2.0.html
|
10 |
|
315 |
|
316 |
== Changelog ==
|
317 |
|
318 |
+
= 1.9.14 =
|
319 |
+
Fixed: Bug on CSV and XML export
|
320 |
+
|
321 |
= 1.9.13 =
|
322 |
Fixed: Bug on Field label position (Left/Top)
|
323 |
Fixed: JS error on IE 11 and Microsoft Edge
|