Form Maker by WD – user-friendly drag & drop Form Builder plugin - Version 1.9.11

Version Description

Changed: Filters now apply to CSV and XML export

Download this release

Release Info

Developer webdorado
Plugin Icon 128x128 Form Maker by WD – user-friendly drag & drop Form Builder plugin
Version 1.9.11
Comparing to
See all releases

Code changes from version 1.9.10 to 1.9.11

Files changed (5) hide show
  1. admin/models/FMModelGenerete_csv.php +15 -5
  2. admin/models/FMModelGenerete_xml.php +13 -6
  3. admin/views/FMViewSubmissions_fm.php +7 -2
  4. form-maker.php +2 -2
  5. readme.txt +4 -1
admin/models/FMModelGenerete_csv.php CHANGED
@@ -25,12 +25,17 @@ class FMModelGenerete_csv {
25
  $group_id_s = array();
26
  $form_id = (int)$_REQUEST['form_id'];
27
  $limitstart = (int)$_REQUEST['limitstart'];
28
-
 
 
29
  $paypal_info_fields = array('currency', 'ord_last_modified', 'status', 'full_name', 'fax', 'mobile_phone', 'email', 'phone', 'address', 'paypal_info', 'ipn', 'tax', 'shipping');
30
  $paypal_info_labels = array( 'Currency', 'Last modified', 'Status', 'Full Name', 'Fax', 'Mobile phone', 'Email', 'Phone', 'Address', 'Paypal info', 'IPN', 'Tax', 'Shipping');
31
 
32
- $query = $wpdb->prepare("SELECT distinct group_id FROM " . $wpdb->prefix . "formmaker_submits where form_id=%d", $form_id);
33
- $group_id_s = $wpdb->get_col($query);
 
 
 
34
 
35
  $query = $wpdb->prepare("SELECT distinct element_label FROM " . $wpdb->prefix . "formmaker_submits where form_id=%d",$form_id);
36
  $labels = $wpdb->get_col($query);
@@ -72,8 +77,13 @@ class FMModelGenerete_csv {
72
  $m = count($sorted_labels);
73
  $wpdb->query("SET SESSION group_concat_max_len = 1000000");
74
 
75
- $query = $wpdb->prepare("SELECT group_id, ip, date, user_id_wd, GROUP_CONCAT( element_label SEPARATOR ',') as element_label, GROUP_CONCAT( element_value SEPARATOR '*:*el_value*:*') as element_value FROM " . $wpdb->prefix . "formmaker_submits where form_id= %d GROUP BY group_id ORDER BY date ASC limit %d, %d", $form_id, $limitstart, 1000);
76
- $rows = $wpdb->get_results($query, OBJECT_K);
 
 
 
 
 
77
 
78
  $data = array();
79
  $group_id_s_count = $limitstart + 1000 < count($group_id_s) ? $limitstart + 1000 : count($group_id_s);
25
  $group_id_s = array();
26
  $form_id = (int)$_REQUEST['form_id'];
27
  $limitstart = (int)$_REQUEST['limitstart'];
28
+ $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');
32
  $paypal_info_labels = array( 'Currency', 'Last modified', 'Status', 'Full Name', 'Fax', 'Mobile phone', 'Email', 'Phone', 'Address', 'Paypal info', 'IPN', 'Tax', 'Shipping');
33
 
34
+ if($search_labels){
35
+ $query = $wpdb->prepare("SELECT distinct group_id FROM " . $wpdb->prefix . "formmaker_submits where form_id=%d and group_id IN(".$search_labels.")", $form_id);
36
+ $group_id_s = $wpdb->get_col($query);
37
+ }
38
+
39
 
40
  $query = $wpdb->prepare("SELECT distinct element_label FROM " . $wpdb->prefix . "formmaker_submits where form_id=%d",$form_id);
41
  $labels = $wpdb->get_col($query);
77
  $m = count($sorted_labels);
78
  $wpdb->query("SET SESSION group_concat_max_len = 1000000");
79
 
80
+ $rows = array();
81
+
82
+ if($search_labels){
83
+ $query = $wpdb->prepare("SELECT group_id, ip, date, user_id_wd, GROUP_CONCAT( element_label SEPARATOR ',') as element_label, GROUP_CONCAT( element_value SEPARATOR '*:*el_value*:*') as element_value FROM " . $wpdb->prefix . "formmaker_submits where form_id= %d and group_id IN (".$search_labels.") GROUP BY group_id ORDER BY date ASC limit %d, %d", $form_id, $limitstart, 1000);
84
+ $rows = $wpdb->get_results($query, OBJECT_K);
85
+ }
86
+
87
 
88
  $data = array();
89
  $group_id_s_count = $limitstart + 1000 < count($group_id_s) ? $limitstart + 1000 : count($group_id_s);
admin/models/FMModelGenerete_xml.php CHANGED
@@ -26,13 +26,16 @@ class FMModelGenerete_xml {
26
  $group_id_s = array();
27
  $form_id = (int)$_REQUEST['form_id'];
28
  $limitstart = (int)$_REQUEST['limitstart'];
 
29
 
30
  $paypal_info_fields = array('currency', 'ord_last_modified', 'status', 'full_name', 'fax', 'mobile_phone', 'email', 'phone', 'address', 'paypal_info', 'ipn', 'tax', 'shipping');
31
  $paypal_info_labels = array( 'Currency', 'Last modified', 'Status', 'Full Name', 'Fax', 'Mobile phone', 'Email', 'Phone', 'Address', 'Paypal info', 'IPN', 'Tax', 'Shipping');
32
 
33
- $query = $wpdb->prepare("SELECT distinct group_id FROM " . $wpdb->prefix . "formmaker_submits where form_id=%d", $form_id);
34
- $group_id_s = $wpdb->get_col($query);
35
-
 
 
36
  $query = $wpdb->prepare("SELECT distinct element_label FROM " . $wpdb->prefix . "formmaker_submits where form_id=%d",$form_id);
37
  $labels = $wpdb->get_col($query);
38
 
@@ -72,9 +75,13 @@ class FMModelGenerete_xml {
72
 
73
  $m = count($sorted_labels);
74
 
75
- $query = $wpdb->prepare("SELECT group_id, ip, date, user_id_wd, GROUP_CONCAT( element_label SEPARATOR ',') as element_label, GROUP_CONCAT( element_value SEPARATOR '*:*el_value*:*') as element_value FROM " . $wpdb->prefix . "formmaker_submits where form_id= %d GROUP BY group_id ORDER BY date ASC limit %d, %d", $form_id, $limitstart, 1000);
76
- $rows = $wpdb->get_results($query, OBJECT_K);
77
-
 
 
 
 
78
  $data = array();
79
  $group_id_s_count = $limitstart + 1000 < count($group_id_s) ? $limitstart + 1000 : count($group_id_s);
80
 
26
  $group_id_s = array();
27
  $form_id = (int)$_REQUEST['form_id'];
28
  $limitstart = (int)$_REQUEST['limitstart'];
29
+ $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');
33
 
34
+ if($search_labels){
35
+ $query = $wpdb->prepare("SELECT distinct group_id FROM " . $wpdb->prefix . "formmaker_submits where form_id=%d and group_id IN(".$search_labels.")", $form_id);
36
+ $group_id_s = $wpdb->get_col($query);
37
+ }
38
+
39
  $query = $wpdb->prepare("SELECT distinct element_label FROM " . $wpdb->prefix . "formmaker_submits where form_id=%d",$form_id);
40
  $labels = $wpdb->get_col($query);
41
 
75
 
76
  $m = count($sorted_labels);
77
 
78
+ $rows = array();
79
+
80
+ if($search_labels){
81
+ $query = $wpdb->prepare("SELECT group_id, ip, date, user_id_wd, GROUP_CONCAT( element_label SEPARATOR ',') as element_label, GROUP_CONCAT( element_value SEPARATOR '*:*el_value*:*') as element_value FROM " . $wpdb->prefix . "formmaker_submits where form_id= %d and group_id IN(".$search_labels.") GROUP BY group_id ORDER BY date ASC limit %d, %d", $form_id, $limitstart, 1000);
82
+ $rows = $wpdb->get_results($query, OBJECT_K);
83
+ }
84
+
85
  $data = array();
86
  $group_id_s_count = $limitstart + 1000 < count($group_id_s) ? $limitstart + 1000 : count($group_id_s);
87
 
admin/views/FMViewSubmissions_fm.php CHANGED
@@ -82,9 +82,14 @@ class FMViewSubmissions_fm {
82
  max: <?php echo $subs_count; ?>
83
  });
84
 
 
 
 
 
 
85
  jQuery.ajax({
86
  type: "POST",
87
- url:"<?php echo add_query_arg(array('form_id' => $form_id, 'send_header' => 0), admin_url('admin-ajax.php')); ?>&action=generete_"+type+"&limitstart="+limit,
88
  beforeSend: function() {
89
  if(<?php echo $subs_count; ?> >= 1000 )
90
  jQuery('.fm_modal').show();
@@ -116,7 +121,7 @@ class FMViewSubmissions_fm {
116
  progressbarValue.css({
117
  "color": '#444',
118
  });
119
- 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;
120
  }
121
  }
122
  });
82
  max: <?php echo $subs_count; ?>
83
  });
84
 
85
+ var search_labels = [];
86
+ jQuery('td.submitid_fc a').each(function(index, value) {
87
+ search_labels.push(parseInt(jQuery(this).html()));
88
+ });
89
+
90
  jQuery.ajax({
91
  type: "POST",
92
+ url:"<?php echo add_query_arg(array('form_id' => $form_id, 'send_header' => 0), admin_url('admin-ajax.php')); ?>&action=generete_"+type+"&limitstart="+limit+"&search_labels="+search_labels.join(','),
93
  beforeSend: function() {
94
  if(<?php echo $subs_count; ?> >= 1000 )
95
  jQuery('.fm_modal').show();
121
  progressbarValue.css({
122
  "color": '#444',
123
  });
124
+ 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+"&search_labels="+search_labels.join(',');
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.10
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.10';
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.11
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.11';
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.10
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.10 =
319
  Fixed: Bug on "Advanced Layout"
320
 
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.11
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.11 =
319
+ Changed: Filters now apply to CSV and XML export
320
+
321
  = 1.9.10 =
322
  Fixed: Bug on "Advanced Layout"
323