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

Version Description

Fixed: Minor bugs
Added: Email verification custom post

Download this release

Release Info

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

Code changes from version 1.7.57 to 1.7.58

Files changed (15) hide show
  1. admin/controllers/FMControllerManage_fm.php +3 -2
  2. admin/models/FMModelBlocked_ips_fm.php +3 -3
  3. admin/models/FMModelManage_fm.php +3 -3
  4. admin/models/FMModelSubmissions_fm.php +1 -1
  5. admin/models/FMModelThemes_fm.php +3 -4
  6. admin/models/FMModelUninstall_fm.php +1 -0
  7. admin/views/FMViewBlocked_ips_fm.php +5 -4
  8. admin/views/FMViewFormmakerwdmathcaptcha.php +7 -1
  9. admin/views/FMViewManage_fm.php +6 -5
  10. admin/views/FMViewSubmissions_fm.php +9 -9
  11. admin/views/FMViewThemes_fm.php +6 -5
  12. form-maker.php +30 -3
  13. frontend/views/FMViewForm_maker.php +3 -1
  14. js/formmaker_div_free.js +22 -2
  15. readme.txt +5 -1
admin/controllers/FMControllerManage_fm.php CHANGED
@@ -436,17 +436,18 @@ function before_reset() {
436
  $article_id = 0;
437
  }
438
 
439
- $mail_verification_post_id = (int)$wpdb->get_var($wpdb->prepare('SELECT mail_verification_post_id FROM ' . $wpdb->prefix . 'formmaker WHERE id="%d"', $id));
440
  if($mail_verify) {
441
  $email_verification_post = array(
442
  'post_title' => 'Email Verification',
443
  'post_content' => '[email_verification]',
444
  'post_status' => 'publish',
445
  'post_author' => 1,
 
446
  );
447
 
448
  if(!$mail_verification_post_id || get_post( $mail_verification_post_id )===NULL)
449
- $mail_verification_post_id = wp_insert_post( $email_verification_post, $wp_error );
450
  }
451
 
452
  $save = $wpdb->update($wpdb->prefix . 'formmaker', array(
436
  $article_id = 0;
437
  }
438
 
439
+ $mail_verification_post_id = (int)$wpdb->get_var('SELECT mail_verification_post_id FROM ' . $wpdb->prefix . 'formmaker WHERE mail_verification_post_id!=0');
440
  if($mail_verify) {
441
  $email_verification_post = array(
442
  'post_title' => 'Email Verification',
443
  'post_content' => '[email_verification]',
444
  'post_status' => 'publish',
445
  'post_author' => 1,
446
+ 'post_type' => 'fmemailverification',
447
  );
448
 
449
  if(!$mail_verification_post_id || get_post( $mail_verification_post_id )===NULL)
450
+ $mail_verification_post_id = wp_insert_post( $email_verification_post );
451
  }
452
 
453
  $save = $wpdb->update($wpdb->prefix . 'formmaker', array(
admin/models/FMModelBlocked_ips_fm.php CHANGED
@@ -21,9 +21,9 @@ class FMModelBlocked_ips_fm {
21
  public function get_rows_data() {
22
  global $wpdb;
23
  $where = ((isset($_POST['search_value']) && (esc_html($_POST['search_value']) != '')) ? 'WHERE `ip` LIKE "%' . esc_html($_POST['search_value']) . '%"' : '');
24
- $asc_or_desc = ((isset($_POST['asc_or_desc']) && ($_POST['asc_or_desc'] == 'asc' || $_POST['asc_or_desc'] == 'desc')) ? esc_html($_POST['asc_or_desc']) : 'asc');
25
- $order_by = ((isset($_POST['order_by']) && esc_html(stripslashes($_POST['order_by'])) != '') ? esc_html(stripslashes($_POST['order_by'])) : 'id');
26
- $order_by_array = array('id', 'ip');
27
  $order_by = in_array($order_by, $order_by_array) ? $order_by : 'id';
28
  $order_by = ' ORDER BY `' . $order_by . '` ' . $asc_or_desc;
29
  if (isset($_POST['page_number']) && $_POST['page_number']) {
21
  public function get_rows_data() {
22
  global $wpdb;
23
  $where = ((isset($_POST['search_value']) && (esc_html($_POST['search_value']) != '')) ? 'WHERE `ip` LIKE "%' . esc_html($_POST['search_value']) . '%"' : '');
24
+ $asc_or_desc = ((isset($_POST['asc_or_desc']) && $_POST['asc_or_desc'] == 'desc') ? 'desc' : 'asc');
25
+ $order_by_array = array('id', 'ip');
26
+ $order_by = isset($_POST['order_by']) && in_array(esc_html(stripslashes($_POST['order_by'])), $order_by_array) ? esc_html(stripslashes($_POST['order_by'])) : 'id';
27
  $order_by = in_array($order_by, $order_by_array) ? $order_by : 'id';
28
  $order_by = ' ORDER BY `' . $order_by . '` ' . $asc_or_desc;
29
  if (isset($_POST['page_number']) && $_POST['page_number']) {
admin/models/FMModelManage_fm.php CHANGED
@@ -22,9 +22,9 @@ class FMModelManage_fm {
22
  global $wpdb;
23
  $where = 'WHERE `id` NOT IN (' . (get_option('contact_form_forms', '') != '' ? get_option('contact_form_forms') : 0) . ')';
24
  $where .= ((isset($_POST['search_value']) && (esc_html($_POST['search_value']) != '')) ? ' AND title LIKE "%' . esc_html($_POST['search_value']) . '%"' : '');
25
- $asc_or_desc = ((isset($_POST['asc_or_desc']) && ($_POST['asc_or_desc'] == 'asc' || $_POST['asc_or_desc'] == 'desc')) ? esc_html($_POST['asc_or_desc']) : 'asc');
26
- $order_by = ((isset($_POST['order_by']) && esc_html(stripslashes($_POST['order_by'])) != '') ? esc_html(stripslashes($_POST['order_by'])) : 'id');
27
- $order_by_array = array('id', 'title', 'mail');
28
  $order_by = in_array($order_by, $order_by_array) ? $order_by : 'id';
29
  $order_by = ' ORDER BY `' . $order_by . '` ' . $asc_or_desc;
30
  if (isset($_POST['page_number']) && $_POST['page_number']) {
22
  global $wpdb;
23
  $where = 'WHERE `id` NOT IN (' . (get_option('contact_form_forms', '') != '' ? get_option('contact_form_forms') : 0) . ')';
24
  $where .= ((isset($_POST['search_value']) && (esc_html($_POST['search_value']) != '')) ? ' AND title LIKE "%' . esc_html($_POST['search_value']) . '%"' : '');
25
+ $asc_or_desc = ((isset($_POST['asc_or_desc']) && $_POST['asc_or_desc'] == 'desc') ? 'desc' : 'asc');
26
+ $order_by_array = array('id', 'title', 'mail');
27
+ $order_by = isset($_POST['order_by']) && in_array(esc_html(stripslashes($_POST['order_by'])), $order_by_array) ? esc_html(stripslashes($_POST['order_by'])) : 'id';
28
  $order_by = in_array($order_by, $order_by_array) ? $order_by : 'id';
29
  $order_by = ' ORDER BY `' . $order_by . '` ' . $asc_or_desc;
30
  if (isset($_POST['page_number']) && $_POST['page_number']) {
admin/models/FMModelSubmissions_fm.php CHANGED
@@ -68,7 +68,7 @@ class FMModelSubmissions_fm {
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'] == 'asc' || $_POST['asc_or_desc'] == 'desc')) ? esc_html($_POST['asc_or_desc']) : 'asc');
72
  $limit = ((isset($_POST['page_number'])) ? ((int) $_POST['page_number'] - 1) * 20 : 0);
73
  $lists['hide_label_list'] = ((isset($_POST['hide_label_list'])) ? esc_html(stripslashes($_POST['hide_label_list'])) : '');
74
  $lists['startdate'] = ((isset($_POST['startdate'])) ? esc_html(stripslashes($_POST['startdate'])) : '');
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);
73
  $lists['hide_label_list'] = ((isset($_POST['hide_label_list'])) ? esc_html(stripslashes($_POST['hide_label_list'])) : '');
74
  $lists['startdate'] = ((isset($_POST['startdate'])) ? esc_html(stripslashes($_POST['startdate'])) : '');
admin/models/FMModelThemes_fm.php CHANGED
@@ -21,10 +21,9 @@ class FMModelThemes_fm {
21
  public function get_rows_data() {
22
  global $wpdb;
23
  $where = ((isset($_POST['search_value']) && (esc_html($_POST['search_value']) != '')) ? 'WHERE title LIKE "%' . esc_html($_POST['search_value']) . '%"' : '');
24
- $asc_or_desc = ((isset($_POST['asc_or_desc']) && ($_POST['asc_or_desc'] == 'asc' || $_POST['asc_or_desc'] == 'desc')) ? esc_html($_POST['asc_or_desc']) : 'asc');
25
- $order_by = ((isset($_POST['order_by']) && esc_html(stripslashes($_POST['order_by'])) != '') ? esc_html(stripslashes($_POST['order_by'])) : 'id');
26
- $order_by_array = array('id', 'title', 'default');
27
- $order_by = in_array($order_by, $order_by_array) ? $order_by : 'id';
28
  $order_by = ' ORDER BY `' . $order_by . '` ' . $asc_or_desc;
29
  if (isset($_POST['page_number']) && $_POST['page_number']) {
30
  $limit = ((int) $_POST['page_number'] - 1) * 20;
21
  public function get_rows_data() {
22
  global $wpdb;
23
  $where = ((isset($_POST['search_value']) && (esc_html($_POST['search_value']) != '')) ? 'WHERE title LIKE "%' . esc_html($_POST['search_value']) . '%"' : '');
24
+ $asc_or_desc = ((isset($_POST['asc_or_desc']) && $_POST['asc_or_desc'] == 'desc') ? 'desc' : 'asc');
25
+ $order_by_array = array('id', 'title', 'default');
26
+ $order_by = isset($_POST['order_by']) && in_array(esc_html(stripslashes($_POST['order_by'])), $order_by_array) ? esc_html(stripslashes($_POST['order_by'])) : 'id';
 
27
  $order_by = ' ORDER BY `' . $order_by . '` ' . $asc_or_desc;
28
  if (isset($_POST['page_number']) && $_POST['page_number']) {
29
  $limit = ((int) $_POST['page_number'] - 1) * 20;
admin/models/FMModelUninstall_fm.php CHANGED
@@ -38,6 +38,7 @@ class FMModelUninstall_fm {
38
  delete_option('contact_form_forms');
39
  delete_option("wd_form_maker_version");
40
  delete_option('formmaker_cureent_version');
 
41
  delete_option('form_maker_pro_active');
42
  }
43
  }
38
  delete_option('contact_form_forms');
39
  delete_option("wd_form_maker_version");
40
  delete_option('formmaker_cureent_version');
41
+ delete_option('fm_emailverification');
42
  delete_option('form_maker_pro_active');
43
  }
44
  }
admin/views/FMViewBlocked_ips_fm.php CHANGED
@@ -26,8 +26,9 @@ class FMViewBlocked_ips_fm {
26
  $rows_data = $this->model->get_rows_data();
27
  $page_nav = $this->model->page_nav();
28
  $search_value = ((isset($_POST['search_value'])) ? esc_html(stripslashes($_POST['search_value'])) : '');
29
- $asc_or_desc = ((isset($_POST['asc_or_desc'])) ? esc_html(stripslashes($_POST['asc_or_desc'])) : 'desc');
30
- $order_by = (isset($_POST['order_by']) ? esc_html(stripslashes($_POST['order_by'])) : 'id');
 
31
  $order_class = 'manage-column column-title sorted ' . $asc_or_desc;
32
  $ids_string = '';
33
  ?>
@@ -68,14 +69,14 @@ class FMViewBlocked_ips_fm {
68
  <th class="table_small_col <?php if ($order_by == 'id') {echo $order_class;} ?>">
69
  <a onclick="spider_set_input_value('task', '');
70
  spider_set_input_value('order_by', 'id');
71
- spider_set_input_value('asc_or_desc', '<?php echo ((isset($_POST['asc_or_desc']) && isset($_POST['order_by']) && (esc_html(stripslashes($_POST['order_by'])) == 'id') && esc_html(stripslashes($_POST['asc_or_desc'])) == 'asc') ? 'desc' : 'asc'); ?>');
72
  spider_form_submit(event, 'blocked_ips')" href="">
73
  <span>ID</span><span class="sorting-indicator"></span></th>
74
  </a>
75
  <th class="<?php if ($order_by == 'ip') {echo $order_class;} ?>">
76
  <a onclick="spider_set_input_value('task', '');
77
  spider_set_input_value('order_by', 'ip');
78
- spider_set_input_value('asc_or_desc', '<?php echo ((isset($_POST['asc_or_desc']) && isset($_POST['order_by']) && (esc_html(stripslashes($_POST['order_by'])) == 'ip') && esc_html(stripslashes($_POST['asc_or_desc'])) == 'asc') ? 'desc' : 'asc'); ?>');
79
  spider_form_submit(event, 'blocked_ips')" href="">
80
  <span>IP</span><span class="sorting-indicator"></span>
81
  </a>
26
  $rows_data = $this->model->get_rows_data();
27
  $page_nav = $this->model->page_nav();
28
  $search_value = ((isset($_POST['search_value'])) ? esc_html(stripslashes($_POST['search_value'])) : '');
29
+ $asc_or_desc = ((isset($_POST['asc_or_desc']) && $_POST['asc_or_desc'] == 'desc') ? 'desc' : 'asc');
30
+ $order_by_array = array('id', 'ip');
31
+ $order_by = isset($_POST['order_by']) && in_array(esc_html(stripslashes($_POST['order_by'])), $order_by_array) ? esc_html(stripslashes($_POST['order_by'])) : 'id';
32
  $order_class = 'manage-column column-title sorted ' . $asc_or_desc;
33
  $ids_string = '';
34
  ?>
69
  <th class="table_small_col <?php if ($order_by == 'id') {echo $order_class;} ?>">
70
  <a onclick="spider_set_input_value('task', '');
71
  spider_set_input_value('order_by', 'id');
72
+ spider_set_input_value('asc_or_desc', '<?php echo (($order_by == 'id' && $asc_or_desc == 'asc') ? 'desc' : 'asc'); ?>');
73
  spider_form_submit(event, 'blocked_ips')" href="">
74
  <span>ID</span><span class="sorting-indicator"></span></th>
75
  </a>
76
  <th class="<?php if ($order_by == 'ip') {echo $order_class;} ?>">
77
  <a onclick="spider_set_input_value('task', '');
78
  spider_set_input_value('order_by', 'ip');
79
+ spider_set_input_value('asc_or_desc', '<?php echo (($order_by == 'ip' && $asc_or_desc == 'asc') ? 'desc' : 'asc'); ?>');
80
  spider_form_submit(event, 'blocked_ips')" href="">
81
  <span>IP</span><span class="sorting-indicator"></span>
82
  </a>
admin/views/FMViewFormmakerwdmathcaptcha.php CHANGED
@@ -28,7 +28,7 @@ class FMViewFormmakerwdmathcaptcha {
28
  $r2 = (isset($_GET["r2"]) ? (int) $_GET["r2"] : 0);
29
  $rrr = (isset($_GET["rrr"]) ? (int) $_GET["rrr"] : 0);
30
  $randNum = 0 + $r2 + $rrr;
31
- $operations_count = (isset($_GET["operations_count"]) ? (int) $_GET["operations_count"] : 2);
32
  $operations = (isset($_GET["operations"]) ? str_replace('@', '+', $_GET["operations"]) : '+,-');
33
  $operations = preg_replace('/\s+/', '', $operations);
34
  $cap_width = 2*($operations_count+1) * 20 + 10;
@@ -71,7 +71,13 @@ class FMViewFormmakerwdmathcaptcha {
71
  private function code_generic($_length, $_operations) {
72
  $cap = '';
73
  $dig = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
 
74
  $operations_array = array_filter(explode(',', $_operations));
 
 
 
 
 
75
  for($k=0; $k <= $_length; $k++) {
76
  if(substr($cap, -1) == '/' ) {
77
  $operations_array = array_diff($operations_array, array('/'));
28
  $r2 = (isset($_GET["r2"]) ? (int) $_GET["r2"] : 0);
29
  $rrr = (isset($_GET["rrr"]) ? (int) $_GET["rrr"] : 0);
30
  $randNum = 0 + $r2 + $rrr;
31
+ $operations_count = ((isset($_GET["operations_count"]) && (int)$_GET["operations_count"]) ? ((int)$_GET["operations_count"] > 5 ? 5 : (int)$_GET["operations_count"]) : 1);
32
  $operations = (isset($_GET["operations"]) ? str_replace('@', '+', $_GET["operations"]) : '+,-');
33
  $operations = preg_replace('/\s+/', '', $operations);
34
  $cap_width = 2*($operations_count+1) * 20 + 10;
71
  private function code_generic($_length, $_operations) {
72
  $cap = '';
73
  $dig = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
74
+ $valid_oprations = array('+', '-', '*', '/');
75
  $operations_array = array_filter(explode(',', $_operations));
76
+ foreach($operations_array as $key => $operation) {
77
+ if(!in_array($operation, $valid_oprations))
78
+ unset($operations_array[$key]);
79
+ }
80
+
81
  for($k=0; $k <= $_length; $k++) {
82
  if(substr($cap, -1) == '/' ) {
83
  $operations_array = array_diff($operations_array, array('/'));
admin/views/FMViewManage_fm.php CHANGED
@@ -27,8 +27,9 @@ class FMViewManage_fm {
27
  $page_nav = $this->model->page_nav();
28
  $search_value = ((isset($_POST['search_value'])) ? esc_html($_POST['search_value']) : '');
29
  $search_select_value = ((isset($_POST['search_select_value'])) ? (int) $_POST['search_select_value'] : 0);
30
- $asc_or_desc = ((isset($_POST['asc_or_desc'])) ? esc_html($_POST['asc_or_desc']) : 'asc');
31
- $order_by = (isset($_POST['order_by']) ? esc_html($_POST['order_by']) : 'id');
 
32
  $order_class = 'manage-column column-title sorted ' . $asc_or_desc;
33
  $ids_string = '';
34
 
@@ -64,21 +65,21 @@ class FMViewManage_fm {
64
  <th class="table_small_col <?php if ($order_by == 'id') { echo $order_class; } ?>">
65
  <a onclick="spider_set_input_value('task', '');
66
  spider_set_input_value('order_by', 'id');
67
- spider_set_input_value('asc_or_desc', '<?php echo ((isset($_POST['asc_or_desc']) && isset($_POST['order_by']) && (esc_html($_POST['order_by']) == 'id') && esc_html($_POST['asc_or_desc']) == 'asc') ? 'desc' : 'asc'); ?>');
68
  spider_form_submit(event, 'manage_form')" href="">
69
  <span>ID</span><span class="sorting-indicator"></span></a>
70
  </th>
71
  <th class="<?php if ($order_by == 'title') { echo $order_class; } ?>">
72
  <a onclick="spider_set_input_value('task', '');
73
  spider_set_input_value('order_by', 'title');
74
- spider_set_input_value('asc_or_desc', '<?php echo ((isset($_POST['asc_or_desc']) && isset($_POST['order_by']) && (esc_html($_POST['order_by']) == 'title') && esc_html($_POST['asc_or_desc']) == 'asc') ? 'desc' : 'asc'); ?>');
75
  spider_form_submit(event, 'manage_form')" href="">
76
  <span>Title</span><span class="sorting-indicator"></span></a>
77
  </th>
78
  <th class="<?php if ($order_by == 'mail') { echo $order_class; } ?>">
79
  <a onclick="spider_set_input_value('task', '');
80
  spider_set_input_value('order_by', 'mail');
81
- spider_set_input_value('asc_or_desc', '<?php echo ((isset($_POST['asc_or_desc']) && isset($_POST['order_by']) && (esc_html($_POST['order_by']) == 'mail') && esc_html($_POST['asc_or_desc']) == 'asc') ? 'desc' : 'asc'); ?>');
82
  spider_form_submit(event, 'manage_form')" href="">
83
  <span>Email to send submissions to</span><span class="sorting-indicator"></span></a>
84
  </th>
27
  $page_nav = $this->model->page_nav();
28
  $search_value = ((isset($_POST['search_value'])) ? esc_html($_POST['search_value']) : '');
29
  $search_select_value = ((isset($_POST['search_select_value'])) ? (int) $_POST['search_select_value'] : 0);
30
+ $asc_or_desc = ((isset($_POST['asc_or_desc']) && $_POST['asc_or_desc'] == 'desc') ? 'desc' : 'asc');
31
+ $order_by_array = array('id', 'title', 'mail');
32
+ $order_by = isset($_POST['order_by']) && in_array(esc_html(stripslashes($_POST['order_by'])), $order_by_array) ? esc_html(stripslashes($_POST['order_by'])) : 'id';
33
  $order_class = 'manage-column column-title sorted ' . $asc_or_desc;
34
  $ids_string = '';
35
 
65
  <th class="table_small_col <?php if ($order_by == 'id') { echo $order_class; } ?>">
66
  <a onclick="spider_set_input_value('task', '');
67
  spider_set_input_value('order_by', 'id');
68
+ spider_set_input_value('asc_or_desc', '<?php echo (($order_by == 'id' && $asc_or_desc == 'asc') ? 'desc' : 'asc'); ?>');
69
  spider_form_submit(event, 'manage_form')" href="">
70
  <span>ID</span><span class="sorting-indicator"></span></a>
71
  </th>
72
  <th class="<?php if ($order_by == 'title') { echo $order_class; } ?>">
73
  <a onclick="spider_set_input_value('task', '');
74
  spider_set_input_value('order_by', 'title');
75
+ spider_set_input_value('asc_or_desc', '<?php echo (($order_by == 'title' && $asc_or_desc == 'asc') ? 'desc' : 'asc'); ?>');
76
  spider_form_submit(event, 'manage_form')" href="">
77
  <span>Title</span><span class="sorting-indicator"></span></a>
78
  </th>
79
  <th class="<?php if ($order_by == 'mail') { echo $order_class; } ?>">
80
  <a onclick="spider_set_input_value('task', '');
81
  spider_set_input_value('order_by', 'mail');
82
+ spider_set_input_value('asc_or_desc', '<?php echo (($order_by == 'mail' && $asc_or_desc == 'asc') ? 'desc' : 'asc'); ?>');
83
  spider_form_submit(event, 'manage_form')" href="">
84
  <span>Email to send submissions to</span><span class="sorting-indicator"></span></a>
85
  </th>
admin/views/FMViewSubmissions_fm.php CHANGED
@@ -35,8 +35,8 @@ class FMViewSubmissions_fm {
35
  $rows = ((isset($labels_parameters[5])) ? $labels_parameters[5] : NULL);
36
  $group_ids = ((isset($labels_parameters[6])) ? $labels_parameters[6] : NULL);
37
  $where_choices = $labels_parameters[7];
38
- $order_by = (isset($_POST['order_by']) ? esc_html(stripslashes($_POST['order_by'])) : 'group_id');
39
- $asc_or_desc = ((isset($_POST['asc_or_desc'])) ? esc_html(stripslashes($_POST['asc_or_desc'])) : 'desc');
40
  $style_id = $this->model->hide_or_not($lists['hide_label_list'], '@submitid@');
41
  $style_date = $this->model->hide_or_not($lists['hide_label_list'], '@submitdate@');
42
  $style_ip = $this->model->hide_or_not($lists['hide_label_list'], '@submitterip@');
@@ -293,7 +293,7 @@ class FMViewSubmissions_fm {
293
  <th scope="col" id="cb" class="manage-column column-cb check-column table_small_col sub-align form_check"><input id="check_all" type="checkbox"></th>
294
  <th scope="col" id="submitid_fc" class="table_small_col sub-align submitid_fc <?php if ($order_by == "group_id") echo $oder_class; else echo $oder_class_default; ?>" <?php echo $style_id;?>>
295
  <a href="" class="sub_id" onclick="spider_set_input_value('order_by', 'group_id');
296
- spider_set_input_value('asc_or_desc', '<?php echo ((isset($_POST['asc_or_desc']) && isset($_POST['order_by']) && (esc_html(stripslashes($_POST['order_by'])) == 'group_id') && esc_html(stripslashes($_POST['asc_or_desc'])) == 'asc') ? 'desc' : 'asc'); ?>');
297
  spider_form_submit(event, 'admin_form')">
298
  <span>ID</span>
299
  <span class="sorting-indicator" style="margin-top: 8px;"></span>
@@ -303,7 +303,7 @@ class FMViewSubmissions_fm {
303
  <th class="table_small_col sub-align">Delete</th>
304
  <th scope="col" id="submitdate_fc" class="table_large_col submitdate_fc <?php if ($order_by == "date") echo $oder_class; else echo $oder_class_default; ?>" <?php echo $style_date;?>>
305
  <a href="" onclick="spider_set_input_value('order_by', 'date');
306
- spider_set_input_value('asc_or_desc', '<?php echo ((isset($_POST['asc_or_desc']) && isset($_POST['order_by']) && (esc_html(stripslashes($_POST['order_by'])) == 'date') && esc_html(stripslashes($_POST['asc_or_desc'])) == 'asc') ? 'desc' : 'asc'); ?>');
307
  spider_form_submit(event, 'admin_form')">
308
  <span>Submit date</span>
309
  <span class="sorting-indicator"></span>
@@ -311,7 +311,7 @@ class FMViewSubmissions_fm {
311
  </th>
312
  <th scope="col" id="submitterip_fc" class="table_medium_col_uncenter submitterip_fc <?php if ($order_by == "ip")echo $oder_class; else echo $oder_class_default; ?>" <?php echo $style_ip;?>>
313
  <a href="" onclick="spider_set_input_value('order_by', 'ip');
314
- spider_set_input_value('asc_or_desc', '<?php echo ((isset($_POST['asc_or_desc']) && isset($_POST['order_by']) && (esc_html(stripslashes($_POST['order_by'])) == 'ip') && esc_html(stripslashes($_POST['asc_or_desc'])) == 'asc') ? 'desc' : 'asc'); ?>');
315
  spider_form_submit(event, 'admin_form')">
316
  <span>Submitter's IP</span>
317
  <span class="sorting-indicator"></span>
@@ -320,7 +320,7 @@ class FMViewSubmissions_fm {
320
 
321
  <th scope="col" id="submitterusername_fc" class="table_medium_col_uncenter submitterusername_fc <?php if ($order_by == "display_name")echo $oder_class; else echo $oder_class_default; ?>" <?php echo $style_username;?>>
322
  <a href="" onclick="spider_set_input_value('order_by', 'display_name');
323
- spider_set_input_value('asc_or_desc', '<?php echo ((isset($_POST['asc_or_desc']) && isset($_POST['order_by']) && (esc_html(stripslashes($_POST['order_by'])) == 'display_name') && esc_html(stripslashes($_POST['asc_or_desc'])) == 'asc') ? 'desc' : 'asc'); ?>');
324
  spider_form_submit(event, 'admin_form')">
325
  <span>Submitter's Username</span>
326
  <span class="sorting-indicator"></span>
@@ -329,7 +329,7 @@ class FMViewSubmissions_fm {
329
 
330
  <th scope="col" id="submitteremail_fc" class="table_medium_col_uncenter submitteremail_fc <?php if ($order_by == "user_email")echo $oder_class; else echo $oder_class_default; ?>" <?php echo $style_useremail ;?>>
331
  <a href="" onclick="spider_set_input_value('order_by', 'user_email');
332
- spider_set_input_value('asc_or_desc', '<?php echo ((isset($_POST['asc_or_desc']) && isset($_POST['order_by']) && (esc_html(stripslashes($_POST['order_by'])) == 'user_email') && esc_html(stripslashes($_POST['asc_or_desc'])) == 'asc') ? 'desc' : 'asc'); ?>');
333
  spider_form_submit(event, 'admin_form')">
334
  <span>Submitter's Email Address</span>
335
  <span class="sorting-indicator"></span>
@@ -347,7 +347,7 @@ class FMViewSubmissions_fm {
347
  ?>
348
  <th <?php echo $styleStr; ?> id="<?php echo $sorted_labels_id[$i] . '_fc'; ?>" class="table_large_col <?php echo $sorted_labels_id[$i] . '_fc'; if ($order_by == $sorted_labels_id[$i] . "_field") echo $oder_class . '"';else echo $oder_class_default . '"'; ?>">
349
  <a href="" onclick="spider_set_input_value('order_by', '<?php echo $sorted_labels_id[$i] . '_field'; ?>');
350
- spider_set_input_value('asc_or_desc', '<?php echo ((isset($_POST['asc_or_desc']) && isset($_POST['order_by']) && (esc_html(stripslashes($_POST['order_by'])) == $sorted_labels_id[$i] . '_field') && esc_html(stripslashes($_POST['asc_or_desc'])) == 'asc') ? 'desc' : 'asc'); ?>');
351
  spider_form_submit(event, 'admin_form')">
352
  <span><?php echo $field_title; ?></span>
353
  <span class="sorting-indicator"></span>
@@ -360,7 +360,7 @@ class FMViewSubmissions_fm {
360
  ?>
361
  <th <?php echo $styleStr; ?> id="<?php echo $sorted_labels_id[$i] . '_fc';?>" class="<?php echo ($sorted_label_types[$i] == 'type_mark_map' || $sorted_label_types[$i] == 'type_matrix') ? 'table_large_col ' : ''; echo $sorted_labels_id[$i] . '_fc'; if ($order_by == $sorted_labels_id[$i] . "_field") echo $oder_class . '"';else echo $oder_class_default . '"'; ?>">
362
  <a href="" onclick="spider_set_input_value('order_by', '<?php echo $sorted_labels_id[$i] . '_field'; ?>');
363
- spider_set_input_value('asc_or_desc', '<?php echo ((isset($_POST['asc_or_desc']) && isset($_POST['order_by']) && (esc_html(stripslashes($_POST['order_by'])) == $sorted_labels_id[$i] . '_field') && esc_html(stripslashes($_POST['asc_or_desc'])) == 'asc') ? 'desc' : 'asc'); ?>');
364
  spider_form_submit(event, 'admin_form')">
365
  <span><?php echo $field_title; ?></span>
366
  <span class="sorting-indicator"></span>
35
  $rows = ((isset($labels_parameters[5])) ? $labels_parameters[5] : NULL);
36
  $group_ids = ((isset($labels_parameters[6])) ? $labels_parameters[6] : NULL);
37
  $where_choices = $labels_parameters[7];
38
+ $order_by = (isset($_POST['order_by']) ? esc_html(stripslashes($_POST['order_by'])) : 'group_id');
39
+ $asc_or_desc = ((isset($_POST['asc_or_desc']) && $_POST['asc_or_desc'] == 'desc') ? 'desc' : 'asc');
40
  $style_id = $this->model->hide_or_not($lists['hide_label_list'], '@submitid@');
41
  $style_date = $this->model->hide_or_not($lists['hide_label_list'], '@submitdate@');
42
  $style_ip = $this->model->hide_or_not($lists['hide_label_list'], '@submitterip@');
293
  <th scope="col" id="cb" class="manage-column column-cb check-column table_small_col sub-align form_check"><input id="check_all" type="checkbox"></th>
294
  <th scope="col" id="submitid_fc" class="table_small_col sub-align submitid_fc <?php if ($order_by == "group_id") echo $oder_class; else echo $oder_class_default; ?>" <?php echo $style_id;?>>
295
  <a href="" class="sub_id" onclick="spider_set_input_value('order_by', 'group_id');
296
+ spider_set_input_value('asc_or_desc', '<?php echo (($order_by == 'group_id' && $asc_or_desc == 'asc') ? 'desc' : 'asc'); ?>');
297
  spider_form_submit(event, 'admin_form')">
298
  <span>ID</span>
299
  <span class="sorting-indicator" style="margin-top: 8px;"></span>
303
  <th class="table_small_col sub-align">Delete</th>
304
  <th scope="col" id="submitdate_fc" class="table_large_col submitdate_fc <?php if ($order_by == "date") echo $oder_class; else echo $oder_class_default; ?>" <?php echo $style_date;?>>
305
  <a href="" onclick="spider_set_input_value('order_by', 'date');
306
+ spider_set_input_value('asc_or_desc', '<?php echo (($order_by == 'date' && $asc_or_desc == 'asc') ? 'desc' : 'asc'); ?>');
307
  spider_form_submit(event, 'admin_form')">
308
  <span>Submit date</span>
309
  <span class="sorting-indicator"></span>
311
  </th>
312
  <th scope="col" id="submitterip_fc" class="table_medium_col_uncenter submitterip_fc <?php if ($order_by == "ip")echo $oder_class; else echo $oder_class_default; ?>" <?php echo $style_ip;?>>
313
  <a href="" onclick="spider_set_input_value('order_by', 'ip');
314
+ spider_set_input_value('asc_or_desc', '<?php echo (($order_by == 'ip' && $asc_or_desc == 'asc') ? 'desc' : 'asc'); ?>');
315
  spider_form_submit(event, 'admin_form')">
316
  <span>Submitter's IP</span>
317
  <span class="sorting-indicator"></span>
320
 
321
  <th scope="col" id="submitterusername_fc" class="table_medium_col_uncenter submitterusername_fc <?php if ($order_by == "display_name")echo $oder_class; else echo $oder_class_default; ?>" <?php echo $style_username;?>>
322
  <a href="" onclick="spider_set_input_value('order_by', 'display_name');
323
+ spider_set_input_value('asc_or_desc', '<?php echo (($order_by == 'display_name' && $asc_or_desc == 'asc') ? 'desc' : 'asc'); ?>');
324
  spider_form_submit(event, 'admin_form')">
325
  <span>Submitter's Username</span>
326
  <span class="sorting-indicator"></span>
329
 
330
  <th scope="col" id="submitteremail_fc" class="table_medium_col_uncenter submitteremail_fc <?php if ($order_by == "user_email")echo $oder_class; else echo $oder_class_default; ?>" <?php echo $style_useremail ;?>>
331
  <a href="" onclick="spider_set_input_value('order_by', 'user_email');
332
+ spider_set_input_value('asc_or_desc', '<?php echo (($order_by == 'user_email' && $asc_or_desc == 'asc') ? 'desc' : 'asc'); ?>');
333
  spider_form_submit(event, 'admin_form')">
334
  <span>Submitter's Email Address</span>
335
  <span class="sorting-indicator"></span>
347
  ?>
348
  <th <?php echo $styleStr; ?> id="<?php echo $sorted_labels_id[$i] . '_fc'; ?>" class="table_large_col <?php echo $sorted_labels_id[$i] . '_fc'; if ($order_by == $sorted_labels_id[$i] . "_field") echo $oder_class . '"';else echo $oder_class_default . '"'; ?>">
349
  <a href="" onclick="spider_set_input_value('order_by', '<?php echo $sorted_labels_id[$i] . '_field'; ?>');
350
+ spider_set_input_value('asc_or_desc', '<?php echo (($order_by == $sorted_labels_id[$i] . '_field' && $asc_or_desc == 'asc') ? 'desc' : 'asc'); ?>');
351
  spider_form_submit(event, 'admin_form')">
352
  <span><?php echo $field_title; ?></span>
353
  <span class="sorting-indicator"></span>
360
  ?>
361
  <th <?php echo $styleStr; ?> id="<?php echo $sorted_labels_id[$i] . '_fc';?>" class="<?php echo ($sorted_label_types[$i] == 'type_mark_map' || $sorted_label_types[$i] == 'type_matrix') ? 'table_large_col ' : ''; echo $sorted_labels_id[$i] . '_fc'; if ($order_by == $sorted_labels_id[$i] . "_field") echo $oder_class . '"';else echo $oder_class_default . '"'; ?>">
362
  <a href="" onclick="spider_set_input_value('order_by', '<?php echo $sorted_labels_id[$i] . '_field'; ?>');
363
+ spider_set_input_value('asc_or_desc', '<?php echo (($order_by == $sorted_labels_id[$i] . '_field' && $asc_or_desc == 'asc') ? 'desc' : 'asc'); ?>');
364
  spider_form_submit(event, 'admin_form')">
365
  <span><?php echo $field_title; ?></span>
366
  <span class="sorting-indicator"></span>
admin/views/FMViewThemes_fm.php CHANGED
@@ -27,8 +27,9 @@ class FMViewThemes_fm {
27
  $page_nav = $this->model->page_nav();
28
  $search_value = ((isset($_POST['search_value'])) ? esc_html($_POST['search_value']) : '');
29
  $search_select_value = ((isset($_POST['search_select_value'])) ? (int)$_POST['search_select_value'] : 0);
30
- $asc_or_desc = ((isset($_POST['asc_or_desc'])) ? esc_html($_POST['asc_or_desc']) : 'asc');
31
- $order_by = (isset($_POST['order_by']) ? esc_html($_POST['order_by']) : 'id');
 
32
  $order_class = 'manage-column column-title sorted ' . $asc_or_desc;
33
  $ids_string = '';
34
  ?>
@@ -70,21 +71,21 @@ class FMViewThemes_fm {
70
  <th class="table_small_col <?php if ($order_by == 'id') { echo $order_class; } ?>">
71
  <a onclick="spider_set_input_value('task', '');
72
  spider_set_input_value('order_by', 'id');
73
- spider_set_input_value('asc_or_desc', '<?php echo ((isset($_POST['asc_or_desc']) && isset($_POST['order_by']) && (esc_html($_POST['order_by']) == 'id') && esc_html($_POST['asc_or_desc']) == 'asc') ? 'desc' : 'asc'); ?>');
74
  spider_form_submit(event, 'themes_form')" href="">
75
  <span>ID</span><span class="sorting-indicator"></span></a>
76
  </th>
77
  <th class="<?php if ($order_by == 'title') { echo $order_class; } ?>">
78
  <a onclick="spider_set_input_value('task', '');
79
  spider_set_input_value('order_by', 'title');
80
- spider_set_input_value('asc_or_desc', '<?php echo ((isset($_POST['asc_or_desc']) && isset($_POST['order_by']) && (esc_html($_POST['order_by']) == 'title') && esc_html($_POST['asc_or_desc']) == 'asc') ? 'desc' : 'asc'); ?>');
81
  spider_form_submit(event, 'themes_form')" href="">
82
  <span>Title</span><span class="sorting-indicator"></span></a>
83
  </th>
84
  <th class="table_big_col <?php if ($order_by == 'default') { echo $order_class; } ?>">
85
  <a onclick="spider_set_input_value('task', '');
86
  spider_set_input_value('order_by', 'default');
87
- spider_set_input_value('asc_or_desc', '<?php echo ((isset($_POST['asc_or_desc']) && isset($_POST['order_by']) && (esc_html($_POST['order_by']) == 'default') && esc_html($_POST['asc_or_desc']) == 'asc') ? 'desc' : 'asc'); ?>');
88
  spider_form_submit(event, 'themes_form')" href="">
89
  <span>Default</span><span class="sorting-indicator"></span></a>
90
  </th>
27
  $page_nav = $this->model->page_nav();
28
  $search_value = ((isset($_POST['search_value'])) ? esc_html($_POST['search_value']) : '');
29
  $search_select_value = ((isset($_POST['search_select_value'])) ? (int)$_POST['search_select_value'] : 0);
30
+ $asc_or_desc = ((isset($_POST['asc_or_desc']) && $_POST['asc_or_desc'] == 'desc') ? 'desc' : 'asc');
31
+ $order_by_array = array('id', 'title', 'default');
32
+ $order_by = isset($_POST['order_by']) && in_array(esc_html(stripslashes($_POST['order_by'])), $order_by_array) ? esc_html(stripslashes($_POST['order_by'])) : 'id';
33
  $order_class = 'manage-column column-title sorted ' . $asc_or_desc;
34
  $ids_string = '';
35
  ?>
71
  <th class="table_small_col <?php if ($order_by == 'id') { echo $order_class; } ?>">
72
  <a onclick="spider_set_input_value('task', '');
73
  spider_set_input_value('order_by', 'id');
74
+ spider_set_input_value('asc_or_desc', '<?php echo (($order_by == 'id' && $asc_or_desc == 'asc') ? 'desc' : 'asc'); ?>');
75
  spider_form_submit(event, 'themes_form')" href="">
76
  <span>ID</span><span class="sorting-indicator"></span></a>
77
  </th>
78
  <th class="<?php if ($order_by == 'title') { echo $order_class; } ?>">
79
  <a onclick="spider_set_input_value('task', '');
80
  spider_set_input_value('order_by', 'title');
81
+ spider_set_input_value('asc_or_desc', '<?php echo (($order_by == 'title' && $asc_or_desc == 'asc') ? 'desc' : 'asc'); ?>');
82
  spider_form_submit(event, 'themes_form')" href="">
83
  <span>Title</span><span class="sorting-indicator"></span></a>
84
  </th>
85
  <th class="table_big_col <?php if ($order_by == 'default') { echo $order_class; } ?>">
86
  <a onclick="spider_set_input_value('task', '');
87
  spider_set_input_value('order_by', 'default');
88
+ spider_set_input_value('asc_or_desc', '<?php echo (($order_by == 'default' && $asc_or_desc == 'asc') ? 'desc' : 'asc'); ?>');
89
  spider_form_submit(event, 'themes_form')" href="">
90
  <span>Default</span><span class="sorting-indicator"></span></a>
91
  </th>
form-maker.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: Form Maker
4
  * Plugin URI: http://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.7.57
7
  * Author: WebDorado
8
  * Author URI: http://web-dorado.com/
9
  * License: GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
@@ -243,13 +243,28 @@ if (class_exists('WP_Widget')) {
243
  add_action('widgets_init', create_function('', 'return register_widget("FMControllerWidget");'));
244
  }
245
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
246
  // Activate plugin.
247
  function form_maker_activate() {
248
  $version = get_option("wd_form_maker_version");
249
- $new_version = '1.7.57';
 
250
  if (!$version) {
251
  add_option("wd_form_maker_version", $new_version, '', 'no');
252
- global $wpdb;
253
  if ($wpdb->get_var("SHOW TABLES LIKE '" . $wpdb->prefix . "formmaker'") == $wpdb->prefix . "formmaker") {
254
  require_once WD_FM_DIR . "/form_maker_update.php";
255
  form_maker_update_until_mvc();
@@ -264,8 +279,10 @@ function form_maker_activate() {
264
  'post_content' => '[email_verification]',
265
  'post_status' => 'publish',
266
  'post_author' => 1,
 
267
  );
268
  $mail_verification_post_id = wp_insert_post( $email_verification_post );
 
269
  $wpdb->update($wpdb->prefix . "formmaker", array(
270
  'mail_verification_post_id' => $mail_verification_post_id,
271
  ), array('id' => 1), array(
@@ -275,6 +292,16 @@ function form_maker_activate() {
275
  }
276
  elseif (version_compare($version, $new_version, '<')) {
277
  require_once WD_FM_DIR . "/form_maker_update.php";
 
 
 
 
 
 
 
 
 
 
278
  form_maker_update($version);
279
  update_option("wd_form_maker_version", $new_version);
280
  }
3
  * Plugin Name: Form Maker
4
  * Plugin URI: http://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.7.58
7
  * Author: WebDorado
8
  * Author URI: http://web-dorado.com/
9
  * License: GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
243
  add_action('widgets_init', create_function('', 'return register_widget("FMControllerWidget");'));
244
  }
245
 
246
+ // Register fmemailverification post type
247
+ add_action('init', 'register_fmemailverification_cpt');
248
+ function register_fmemailverification_cpt(){
249
+ $args = array(
250
+ 'public' => true,
251
+ 'label' => 'FM Email Verification'
252
+ );
253
+
254
+ register_post_type( 'fmemailverification', $args );
255
+ if(!get_option('fm_emailverification')) {
256
+ flush_rewrite_rules();
257
+ add_option('fm_emailverification', true);
258
+ }
259
+ }
260
+
261
  // Activate plugin.
262
  function form_maker_activate() {
263
  $version = get_option("wd_form_maker_version");
264
+ $new_version = '1.7.58';
265
+ global $wpdb;
266
  if (!$version) {
267
  add_option("wd_form_maker_version", $new_version, '', 'no');
 
268
  if ($wpdb->get_var("SHOW TABLES LIKE '" . $wpdb->prefix . "formmaker'") == $wpdb->prefix . "formmaker") {
269
  require_once WD_FM_DIR . "/form_maker_update.php";
270
  form_maker_update_until_mvc();
279
  'post_content' => '[email_verification]',
280
  'post_status' => 'publish',
281
  'post_author' => 1,
282
+ 'post_type' => 'fmemailverification',
283
  );
284
  $mail_verification_post_id = wp_insert_post( $email_verification_post );
285
+
286
  $wpdb->update($wpdb->prefix . "formmaker", array(
287
  'mail_verification_post_id' => $mail_verification_post_id,
288
  ), array('id' => 1), array(
292
  }
293
  elseif (version_compare($version, $new_version, '<')) {
294
  require_once WD_FM_DIR . "/form_maker_update.php";
295
+ $mail_verification_post_ids = $wpdb->get_results($wpdb->prepare('SELECT mail_verification_post_id FROM ' . $wpdb->prefix . 'formmaker WHERE mail_verification_post_id!=0'));
296
+ if($mail_verification_post_ids)
297
+ foreach($mail_verification_post_ids as $mail_verification_post_id) {
298
+ $update_email_ver_post_type = array(
299
+ 'ID' => (int)$mail_verification_post_id->mail_verification_post_id,
300
+ 'post_type' => 'fmemailverification',
301
+ );
302
+
303
+ wp_update_post( $update_email_ver_post_type );
304
+ }
305
  form_maker_update($version);
306
  update_option("wd_form_maker_version", $new_version);
307
  }
frontend/views/FMViewForm_maker.php CHANGED
@@ -25,6 +25,7 @@ class FMViewForm_maker {
25
  public function display($id) {
26
  $current_url=htmlentities($_SERVER['REQUEST_URI']);
27
  $form_maker_front_end = "";
 
28
  $result = $this->model->showform($id);
29
  if (!$result) {
30
  return;
@@ -91,7 +92,7 @@ class FMViewForm_maker {
91
  }
92
  $article = $row->article_id;
93
 
94
- $form_maker_front_end .= '<script type="text/javascript">' . $row->javascript . '</script>';
95
  $new_form_theme = explode('{', $form_theme);
96
  $count_after_explod_theme = count($new_form_theme);
97
  for ($i = 0; $i < $count_after_explod_theme; $i++) {
@@ -109,6 +110,7 @@ class FMViewForm_maker {
109
  $body_or_classes_implode[$i] = implode('}', $body_or_classes[$i]);
110
  }
111
  $form_theme = implode('{', $body_or_classes_implode);
 
112
  $form_maker_front_end .= '<style>' . str_replace('[SITE_ROOT]', WD_FM_URL, $form_theme) . '</style>';
113
  wp_print_scripts('main' . (($old == false || ($old == true && $row->form=='')) ? '_div' : '') . '_front_end', WD_FM_URL . '/js/main' . (($old == false || ($old == true && $row->form=='')) ? '_div' : '') . '_front_end.js?ver='. get_option("wd_form_maker_version"));
114
 
25
  public function display($id) {
26
  $current_url=htmlentities($_SERVER['REQUEST_URI']);
27
  $form_maker_front_end = "";
28
+ $pattern = '/\/\/(.+)(\r\n|\r|\n)/';
29
  $result = $this->model->showform($id);
30
  if (!$result) {
31
  return;
92
  }
93
  $article = $row->article_id;
94
 
95
+ $form_maker_front_end .= '<script type="text/javascript">' . preg_replace($pattern, ' ', $row->javascript) . '</script>';
96
  $new_form_theme = explode('{', $form_theme);
97
  $count_after_explod_theme = count($new_form_theme);
98
  for ($i = 0; $i < $count_after_explod_theme; $i++) {
110
  $body_or_classes_implode[$i] = implode('}', $body_or_classes[$i]);
111
  }
112
  $form_theme = implode('{', $body_or_classes_implode);
113
+ $form_theme = preg_replace($pattern, ' ', $form_theme);
114
  $form_maker_front_end .= '<style>' . str_replace('[SITE_ROOT]', WD_FM_URL, $form_theme) . '</style>';
115
  wp_print_scripts('main' . (($old == false || ($old == true && $row->form=='')) ? '_div' : '') . '_front_end', WD_FM_URL . '/js/main' . (($old == false || ($old == true && $row->form=='')) ? '_div' : '') . '_front_end.js?ver='. get_option("wd_form_maker_version"));
116
 
js/formmaker_div_free.js CHANGED
@@ -1820,7 +1820,24 @@ function check_isnum_3_10(e)
1820
  return false;
1821
  return true;
1822
  }
 
 
 
 
 
 
 
 
 
1823
 
 
 
 
 
 
 
 
 
1824
  function set_sel_am_pm(select_)
1825
  {
1826
  if(select_.options[0].selected)
@@ -23674,6 +23691,7 @@ function type_arithmetic_captcha(i,w_field_label, w_field_label_size, w_field_la
23674
  el_operations.setAttribute("id", "el_operations");
23675
  el_operations.setAttribute("type", "text");
23676
  el_operations.setAttribute("value", w_operations);
 
23677
  el_operations.setAttribute("onChange", "change_arithmetic_captcha(this.value, 'operations')");
23678
 
23679
  var el_size_label = document.createElement('label');
@@ -23685,9 +23703,11 @@ function type_arithmetic_captcha(i,w_field_label, w_field_label_size, w_field_la
23685
  el_oper_count.setAttribute("type", "text");
23686
  el_oper_count.setAttribute("value", w_count);
23687
  el_oper_count.setAttribute("name", "el_oper_count");
23688
- el_oper_count.setAttribute("onKeyPress", "return check_isnum(event)");
23689
  el_oper_count.setAttribute("onKeyUp", "change_arithmetic_captcha(this.value, 'oper_count')");
23690
 
 
 
23691
  var el_size_captcha_label = document.createElement('label');
23692
  el_size_captcha_label.setAttribute("for", "el_captcha_input_size");
23693
  el_size_captcha_label.innerHTML = "Captcha input size";
@@ -23816,6 +23836,7 @@ function type_arithmetic_captcha(i,w_field_label, w_field_label_size, w_field_la
23816
 
23817
  edit_main_td3.appendChild(el_size_label);
23818
  edit_main_td3_1.appendChild(el_oper_count);
 
23819
 
23820
  edit_main_td8.appendChild(el_size_captcha_label);
23821
  edit_main_td8_1.appendChild(el_size_captcha_input);
@@ -23961,7 +23982,6 @@ function type_arithmetic_captcha(i,w_field_label, w_field_label_size, w_field_la
23961
  refresh_attr(i, 'type_arithmetic_captcha');
23962
  }
23963
 
23964
-
23965
  function type_map(i, w_center_x, w_center_y, w_long, w_lat, w_zoom, w_width, w_height, w_class, w_info, w_attr_name, w_attr_value){
23966
  document.getElementById("element_type").value="type_map";
23967
  delete_last_child();
1820
  return false;
1821
  return true;
1822
  }
1823
+ function check_isnum_less_then_5(e)
1824
+ {
1825
+ var chCode1 = e.which || e.keyCode;
1826
+ if (chCode1 > 31 && (chCode1 < 49 || chCode1 > 57))
1827
+ return false;
1828
+ else if((document.getElementById('el_oper_count').value+(chCode1-48))>5)
1829
+ return false;
1830
+ return true;
1831
+ }
1832
 
1833
+ function check_is_operation_valid(e)
1834
+ {
1835
+ var chCode1 = e.which || e.keyCode;
1836
+ if (chCode1 == 46 || chCode1 < 42 || chCode1 > 47)
1837
+ return false;
1838
+
1839
+ return true;
1840
+ }
1841
  function set_sel_am_pm(select_)
1842
  {
1843
  if(select_.options[0].selected)
23691
  el_operations.setAttribute("id", "el_operations");
23692
  el_operations.setAttribute("type", "text");
23693
  el_operations.setAttribute("value", w_operations);
23694
+ el_operations.setAttribute("onKeyPress", "return check_is_operation_valid(event)");
23695
  el_operations.setAttribute("onChange", "change_arithmetic_captcha(this.value, 'operations')");
23696
 
23697
  var el_size_label = document.createElement('label');
23703
  el_oper_count.setAttribute("type", "text");
23704
  el_oper_count.setAttribute("value", w_count);
23705
  el_oper_count.setAttribute("name", "el_oper_count");
23706
+ el_oper_count.setAttribute("onKeyPress", "return check_isnum_less_then_5(event)");
23707
  el_oper_count.setAttribute("onKeyUp", "change_arithmetic_captcha(this.value, 'oper_count')");
23708
 
23709
+ Digits = document.createTextNode("Digits (1 - 5)");
23710
+
23711
  var el_size_captcha_label = document.createElement('label');
23712
  el_size_captcha_label.setAttribute("for", "el_captcha_input_size");
23713
  el_size_captcha_label.innerHTML = "Captcha input size";
23836
 
23837
  edit_main_td3.appendChild(el_size_label);
23838
  edit_main_td3_1.appendChild(el_oper_count);
23839
+ edit_main_td3_1.appendChild(Digits);
23840
 
23841
  edit_main_td8.appendChild(el_size_captcha_label);
23842
  edit_main_td8_1.appendChild(el_size_captcha_input);
23982
  refresh_attr(i, 'type_arithmetic_captcha');
23983
  }
23984
 
 
23985
  function type_map(i, w_center_x, w_center_y, w_long, w_lat, w_zoom, w_width, w_height, w_class, w_info, w_attr_name, w_attr_value){
23986
  document.getElementById("element_type").value="type_map";
23987
  delete_last_child();
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: http://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
5
  Requires at least: 3.4
6
  Tested up to: 4.2
7
- Stable tag: 1.7.57
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -279,6 +279,10 @@ The Form Maker (Pro version) has simple PayPal integration. This allows the user
279
 
280
  == Changelog ==
281
 
 
 
 
 
282
  = 1.7.57 =
283
  Fixed: Security issue
284
 
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
5
  Requires at least: 3.4
6
  Tested up to: 4.2
7
+ Stable tag: 1.7.58
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
279
 
280
  == Changelog ==
281
 
282
+ = 1.7.58 =
283
+ Fixed: Minor bugs
284
+ Added: Email verification custom post
285
+
286
  = 1.7.57 =
287
  Fixed: Security issue
288