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

Version Description

Fixed: Bug in submissions

Download this release

Release Info

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

Code changes from version 1.8.3 to 1.8.4

Files changed (6) hide show
  1. admin/models/FMModelSubmissions_fm.php +11 -2
  2. admin/views/FMViewSubmissions_fm.php +1 -0
  3. form-maker.php +2 -2
  4. framework/WDW_FM_Library.php +2 -0
  5. frontend/models/FMModelForm_maker.php +1 -1
  6. readme.txt +4 -1
admin/models/FMModelSubmissions_fm.php CHANGED
@@ -67,6 +67,9 @@ class FMModelSubmissions_fm {
67
  $sorted_label_names_original = array();
68
  $where_labels = array();
69
  $where2 = array();
 
 
 
70
  $order_by = ((isset($_POST['order_by']) && esc_html(stripslashes($_POST['order_by'])) != '') ? esc_html(stripslashes($_POST['order_by'])) : 'group_id');
71
  $asc_or_desc = ((isset($_POST['asc_or_desc']) && $_POST['asc_or_desc'] == 'desc') ? 'desc' : 'asc');
72
  $limit = ((isset($_POST['page_number'])) ? ((int) $_POST['page_number'] - 1) * 20 : 0);
@@ -207,7 +210,13 @@ class FMModelSubmissions_fm {
207
  $query = str_replace('SELECT t.group_id', 'SELECT count(t.group_id)', $join);
208
  }
209
  $total = $wpdb->get_var($query);
210
- $query = $join . ' ' . $orderby . ' limit ' . $limit . ', 20 ';
 
 
 
 
 
 
211
  $results = $wpdb->get_results($query);
212
  for ($i = 0; $i < count($results); $i++) {
213
  array_push($rows_ord, $results[$i]->group_id);
@@ -222,7 +231,7 @@ class FMModelSubmissions_fm {
222
  $rows = $wpdb->get_results($query);
223
  $group_ids = $rows_ord;
224
  $lists['total'] = $total;
225
- $lists['limit'] = (int) ($limit / 20 + 1);
226
  $where_choices = $where;
227
  array_push($labels_parameters, $sorted_labels_id);
228
  array_push($labels_parameters, $sorted_label_types);
67
  $sorted_label_names_original = array();
68
  $where_labels = array();
69
  $where2 = array();
70
+
71
+ $pagination_clicked = (isset($_POST['pagination_clicked']) && $_POST['pagination_clicked'] == '1' ? '1' : '0');
72
+
73
  $order_by = ((isset($_POST['order_by']) && esc_html(stripslashes($_POST['order_by'])) != '') ? esc_html(stripslashes($_POST['order_by'])) : 'group_id');
74
  $asc_or_desc = ((isset($_POST['asc_or_desc']) && $_POST['asc_or_desc'] == 'desc') ? 'desc' : 'asc');
75
  $limit = ((isset($_POST['page_number'])) ? ((int) $_POST['page_number'] - 1) * 20 : 0);
210
  $query = str_replace('SELECT t.group_id', 'SELECT count(t.group_id)', $join);
211
  }
212
  $total = $wpdb->get_var($query);
213
+
214
+ $query_sub_count = "SELECT count(distinct group_id) from ".$wpdb->prefix."formmaker_submits";
215
+ $sub_count = (int)$wpdb->get_var($query_sub_count);
216
+
217
+ $limit1 = (int)$total < $sub_count && !$pagination_clicked ? 0 : $limit;
218
+
219
+ $query = $join . ' ' . $orderby . ' limit ' . $limit1 . ', 20 ';
220
  $results = $wpdb->get_results($query);
221
  for ($i = 0; $i < count($results); $i++) {
222
  array_push($rows_ord, $results[$i]->group_id);
231
  $rows = $wpdb->get_results($query);
232
  $group_ids = $rows_ord;
233
  $lists['total'] = $total;
234
+ $lists['limit'] = (int) ($limit1 / 20 + 1);
235
  $where_choices = $where;
236
  array_push($labels_parameters, $sorted_labels_id);
237
  array_push($labels_parameters, $sorted_label_types);
admin/views/FMViewSubmissions_fm.php CHANGED
@@ -357,6 +357,7 @@ class FMViewSubmissions_fm {
357
  </button>
358
  <?php WDW_FM_Library::html_page_nav($lists['total'], $lists['limit'], 'admin_form'); ?>
359
  <?php } ?>
 
360
  </div>
361
  </div>
362
  <div class="fm-clear"></div>
357
  </button>
358
  <?php WDW_FM_Library::html_page_nav($lists['total'], $lists['limit'], 'admin_form'); ?>
359
  <?php } ?>
360
+ <input type="hidden" name="pagination_clicked" id="pagination_clicked" value=""/>
361
  </div>
362
  </div>
363
  <div class="fm-clear"></div>
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.8.3
7
  * Author: WebDorado
8
  * Author URI: https://web-dorado.com/
9
  * License: GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
@@ -269,7 +269,7 @@ function register_fmemailverification_cpt(){
269
  // Activate plugin.
270
  function form_maker_activate() {
271
  $version = get_option("wd_form_maker_version");
272
- $new_version = '1.8.3';
273
  global $wpdb;
274
  if (!$version) {
275
  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.8.4
7
  * Author: WebDorado
8
  * Author URI: https://web-dorado.com/
9
  * License: GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
269
  // Activate plugin.
270
  function form_maker_activate() {
271
  $version = get_option("wd_form_maker_version");
272
+ $new_version = '1.8.4';
273
  global $wpdb;
274
  if (!$version) {
275
  add_option("wd_form_maker_version", $new_version, '', 'no');
framework/WDW_FM_Library.php CHANGED
@@ -199,6 +199,7 @@ class WDW_FM_Library {
199
  default:
200
  document.getElementById('page_number').value = 1;
201
  }
 
202
  document.getElementById('<?php echo $form_id; ?>').submit();
203
  }
204
  function check_enter_key(e) {
@@ -210,6 +211,7 @@ class WDW_FM_Library {
210
  else {
211
  document.getElementById('page_number').value = jQuery('#current_page').val();
212
  }
 
213
  document.getElementById('<?php echo $form_id; ?>').submit();
214
  }
215
  return true;
199
  default:
200
  document.getElementById('page_number').value = 1;
201
  }
202
+ jQuery('#pagination_clicked').val('1');
203
  document.getElementById('<?php echo $form_id; ?>').submit();
204
  }
205
  function check_enter_key(e) {
211
  else {
212
  document.getElementById('page_number').value = jQuery('#current_page').val();
213
  }
214
+ jQuery('#pagination_clicked').val('1');
215
  document.getElementById('<?php echo $form_id; ?>').submit();
216
  }
217
  return true;
frontend/models/FMModelForm_maker.php CHANGED
@@ -1455,7 +1455,7 @@ class FMModelForm_maker {
1455
  return false;
1456
  }
1457
  $str = '';
1458
- if ($form->checkout_mode == "production") {
1459
  $str .= "https://www.paypal.com/cgi-bin/webscr?";
1460
  }
1461
  else {
1455
  return false;
1456
  }
1457
  $str = '';
1458
+ if ($form->checkout_mode==1 || $form->checkout_mode == "production") {
1459
  $str .= "https://www.paypal.com/cgi-bin/webscr?";
1460
  }
1461
  else {
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: https://web-dorado.com/products/wordpress-form.html
4
  Tags: form, forms, form builder, form maker, form manager, form plugin, form with recaptcha, forms plugin, multiple forms, paypal form, survey form, feedback form, feedback forms, contact form,contact form plugin, contact form builder, form creator, email form, secure form, web form, form to email, contact forms, custom forms, form widget, captcha form, wordpress contact form ,recaptcha contact form, form creation, contact form with auto reply, widget contact form, builder, feedback, contacts form plugin , custom contact form, contact us form, formular, formulario, admin, captcha, contact, database, email, javascript, jquery, page, plugin, survey, widget, custom form, forms creator, input, validation, send copy, form with captcha , pdf
5
  Requires at least: 3.4
6
  Tested up to: 4.4
7
- Stable tag: 1.8.3
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -300,6 +300,9 @@ The Form Maker (Pro version) has simple PayPal integration. This allows the user
300
 
301
  == Changelog ==
302
 
 
 
 
303
  = 1.8.3 =
304
  Changed: Backend design
305
 
4
  Tags: form, forms, form builder, form maker, form manager, form plugin, form with recaptcha, forms plugin, multiple forms, paypal form, survey form, feedback form, feedback forms, contact form,contact form plugin, contact form builder, form creator, email form, secure form, web form, form to email, contact forms, custom forms, form widget, captcha form, wordpress contact form ,recaptcha contact form, form creation, contact form with auto reply, widget contact form, builder, feedback, contacts form plugin , custom contact form, contact us form, formular, formulario, admin, captcha, contact, database, email, javascript, jquery, page, plugin, survey, widget, custom form, forms creator, input, validation, send copy, form with captcha , pdf
5
  Requires at least: 3.4
6
  Tested up to: 4.4
7
+ Stable tag: 1.8.4
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
300
 
301
  == Changelog ==
302
 
303
+ = 1.8.4 =
304
+ Fixed: Bug in submissions
305
+
306
  = 1.8.3 =
307
  Changed: Backend design
308