Version Description
Added: New Global option "Use an alternative version of JS code on front-end:". Checking this box fixes JS conflicts with some themes, that alter inline JS.
Download this release
Release Info
| Developer | webdorado |
| Plugin | |
| Version | 1.10.2 |
| Comparing to | |
| See all releases | |
Code changes from version 1.10.1 to 1.10.2
- admin/controllers/FMControllerGoptions_fm.php +3 -2
- admin/views/FMViewGoptions_fm.php +10 -0
- form-maker.php +17 -12
- readme.txt +3 -1
admin/controllers/FMControllerGoptions_fm.php
CHANGED
|
@@ -52,8 +52,9 @@ class FMControllerGoptions_fm {
|
|
| 52 |
$public_key = (isset($_POST['public_key']) ? esc_html(stripslashes( $_POST['public_key'])) : '');
|
| 53 |
$private_key = (isset($_POST['private_key']) ? esc_html(stripslashes( $_POST['private_key'])) : '');
|
| 54 |
$csv_delimiter = (isset($_POST['csv_delimiter']) && $_POST['csv_delimiter']!='' ? esc_html(stripslashes( $_POST['csv_delimiter'])) : ',');
|
| 55 |
-
|
| 56 |
-
|
|
|
|
| 57 |
}
|
| 58 |
|
| 59 |
|
| 52 |
$public_key = (isset($_POST['public_key']) ? esc_html(stripslashes( $_POST['public_key'])) : '');
|
| 53 |
$private_key = (isset($_POST['private_key']) ? esc_html(stripslashes( $_POST['private_key'])) : '');
|
| 54 |
$csv_delimiter = (isset($_POST['csv_delimiter']) && $_POST['csv_delimiter']!='' ? esc_html(stripslashes( $_POST['csv_delimiter'])) : ',');
|
| 55 |
+
$fm_shortcode = (isset($_POST['fm_shortcode']) ? "old" : '');
|
| 56 |
+
$map_key = (isset($_POST['map_key']) ? esc_html(stripslashes( $_POST['map_key'])) : '');
|
| 57 |
+
update_option('fm_settings', array('public_key' => $public_key, 'private_key' => $private_key, 'csv_delimiter' => $csv_delimiter, 'map_key' => $map_key, 'fm_shortcode' => $fm_shortcode));
|
| 58 |
}
|
| 59 |
|
| 60 |
|
admin/views/FMViewGoptions_fm.php
CHANGED
|
@@ -26,6 +26,7 @@ class FMViewGoptions_fm {
|
|
| 26 |
$public_key = isset($fm_settings['public_key']) ? $fm_settings['public_key'] : '';
|
| 27 |
$private_key = isset($fm_settings['private_key']) ? $fm_settings['private_key'] : '';
|
| 28 |
$csv_delimiter = isset($fm_settings['csv_delimiter']) ? $fm_settings['csv_delimiter'] : ',';
|
|
|
|
| 29 |
$map_key = isset($fm_settings['map_key']) ? $fm_settings['map_key'] : '';
|
| 30 |
?>
|
| 31 |
<div class="fm-user-manual">
|
|
@@ -98,6 +99,15 @@ class FMViewGoptions_fm {
|
|
| 98 |
<input type="text" id="csv_delimiter" name="csv_delimiter" value="<?php echo $csv_delimiter; ?>" style="width:50px;" />
|
| 99 |
</td>
|
| 100 |
</tr>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 101 |
</tbody>
|
| 102 |
</table>
|
| 103 |
<input type="hidden" id="task" name="task" value=""/>
|
| 26 |
$public_key = isset($fm_settings['public_key']) ? $fm_settings['public_key'] : '';
|
| 27 |
$private_key = isset($fm_settings['private_key']) ? $fm_settings['private_key'] : '';
|
| 28 |
$csv_delimiter = isset($fm_settings['csv_delimiter']) ? $fm_settings['csv_delimiter'] : ',';
|
| 29 |
+
$fm_shortcode = isset($fm_settings['fm_shortcode']) ? $fm_settings['fm_shortcode'] : '';
|
| 30 |
$map_key = isset($fm_settings['map_key']) ? $fm_settings['map_key'] : '';
|
| 31 |
?>
|
| 32 |
<div class="fm-user-manual">
|
| 99 |
<input type="text" id="csv_delimiter" name="csv_delimiter" value="<?php echo $csv_delimiter; ?>" style="width:50px;" />
|
| 100 |
</td>
|
| 101 |
</tr>
|
| 102 |
+
<tr>
|
| 103 |
+
<td style="vertical-align: top; width: 200px;">
|
| 104 |
+
<label for="fm_shortcode">Use alternative version of JS code on front-end:</label>
|
| 105 |
+
</td>
|
| 106 |
+
<td style="padding: 6px 0 0 3px">
|
| 107 |
+
<input style="vertical-align:top;" type="checkbox" id="fm_shortcode" name="fm_shortcode" <?php if($fm_shortcode) echo "checked ='checked'" ?>/>
|
| 108 |
+
<div style="width:250px; display: inline-block; padding: 0 5px; color:red">Check this box only if you are getting JavaScript errors while trying to submit the form.</div>
|
| 109 |
+
</td>
|
| 110 |
+
</tr>
|
| 111 |
</tbody>
|
| 112 |
</table>
|
| 113 |
<input type="hidden" id="task" name="task" value=""/>
|
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.10.
|
| 7 |
* Author: WebDorado
|
| 8 |
* Author URI: https://web-dorado.com/
|
| 9 |
* License: GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
|
|
@@ -187,16 +187,20 @@ function fm_output_buffer() {
|
|
| 187 |
add_shortcode('Form', 'fm_shortcode');
|
| 188 |
|
| 189 |
function fm_shortcode($attrs) {
|
| 190 |
-
|
| 191 |
-
|
| 192 |
-
$new_shortcode
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 193 |
}
|
| 194 |
-
$new_shortcode .= ']';
|
| 195 |
-
return $new_shortcode;
|
| 196 |
-
*/
|
| 197 |
-
ob_start();
|
| 198 |
-
FM_front_end_main($attrs);
|
| 199 |
-
return str_replace(array("\r\n", "\n", "\r"), '', ob_get_clean());
|
| 200 |
}
|
| 201 |
|
| 202 |
function FM_front_end_main($params) {
|
|
@@ -241,7 +245,8 @@ function Form_maker_fornt_end_main($content) {
|
|
| 241 |
}
|
| 242 |
return $content;
|
| 243 |
}
|
| 244 |
-
|
|
|
|
| 245 |
|
| 246 |
// Add the Form Maker button to editor.
|
| 247 |
add_action('wp_ajax_formmakerwindow', 'form_maker_ajax');
|
|
@@ -272,7 +277,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.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.10.2
|
| 7 |
* Author: WebDorado
|
| 8 |
* Author URI: https://web-dorado.com/
|
| 9 |
* License: GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
|
| 187 |
add_shortcode('Form', 'fm_shortcode');
|
| 188 |
|
| 189 |
function fm_shortcode($attrs) {
|
| 190 |
+
$fm_shortcode = isset(get_option('fm_settings')['fm_shortcode']) ? get_option('fm_settings')['fm_shortcode'] : '';
|
| 191 |
+
if($fm_shortcode){
|
| 192 |
+
$new_shortcode = '[Form';
|
| 193 |
+
foreach ($attrs as $key=>$value) {
|
| 194 |
+
$new_shortcode .= ' ' . $key . '="' . $value . '"';
|
| 195 |
+
}
|
| 196 |
+
$new_shortcode .= ']';
|
| 197 |
+
return $new_shortcode;
|
| 198 |
+
}
|
| 199 |
+
else{
|
| 200 |
+
ob_start();
|
| 201 |
+
FM_front_end_main($attrs);
|
| 202 |
+
return str_replace(array("\r\n", "\n", "\r"), '', ob_get_clean());
|
| 203 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 204 |
}
|
| 205 |
|
| 206 |
function FM_front_end_main($params) {
|
| 245 |
}
|
| 246 |
return $content;
|
| 247 |
}
|
| 248 |
+
if(isset(get_option('fm_settings')['fm_shortcode']) && get_option('fm_settings')['fm_shortcode']!= '')
|
| 249 |
+
add_filter('the_content', 'Form_maker_fornt_end_main', 5000);
|
| 250 |
|
| 251 |
// Add the Form Maker button to editor.
|
| 252 |
add_action('wp_ajax_formmakerwindow', 'form_maker_ajax');
|
| 277 |
// Activate plugin.
|
| 278 |
function form_maker_activate() {
|
| 279 |
$version = get_option("wd_form_maker_version");
|
| 280 |
+
$new_version = '1.10.2';
|
| 281 |
global $wpdb;
|
| 282 |
if (!$version) {
|
| 283 |
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.7
|
| 7 |
-
Stable tag: 1.10.
|
| 8 |
License: GPLv2 or later
|
| 9 |
License URI: http://www.gnu.org/licenses/gpl-2.0.html
|
| 10 |
|
|
@@ -314,6 +314,8 @@ Form Maker uses phone and number field types, which are verified and do not acce
|
|
| 314 |
Email field should be used since it verifies that an entry format fulfills example@example.com format.
|
| 315 |
|
| 316 |
== Changelog ==
|
|
|
|
|
|
|
| 317 |
|
| 318 |
= 1.10.1 =
|
| 319 |
Added: Verified emails list in csv, xml files
|
| 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.7
|
| 7 |
+
Stable tag: 1.10.2
|
| 8 |
License: GPLv2 or later
|
| 9 |
License URI: http://www.gnu.org/licenses/gpl-2.0.html
|
| 10 |
|
| 314 |
Email field should be used since it verifies that an entry format fulfills example@example.com format.
|
| 315 |
|
| 316 |
== Changelog ==
|
| 317 |
+
= 1.10.2 =
|
| 318 |
+
Added: New Global option "Use an alternative version of JS code on front-end:". Checking this box fixes JS conflicts with some themes, that alter inline JS.
|
| 319 |
|
| 320 |
= 1.10.1 =
|
| 321 |
Added: Verified emails list in csv, xml files
|
