Commit 083f2c72 authored by Kevin Stover's avatar Kevin Stover

Merge branch 'release/v2.6.1'

parents 119c9b13 497439a6
# Ninja Forms # Ninja Forms
[Contributors](https://github.com/wpninjas/ninja-forms/graphs/contributors) [Contributors](https://github.com/wpninjas/ninja-forms/graphs/contributors)
Tags: form, forms, contact form, custom form, form builder, form creator, form manager, form creation, contact forms, custom forms, forms builder, forms creator, forms manager, forms creation, form administration, Tags: form, forms, contact form, custom form, form builder, form creator, form manager, form creation, contact forms, custom forms, forms builder, forms creator, forms manager, forms creation, form administration,
Requires at least: 3.6 Requires at least: 3.6
Tested up to: 3.8.1 Tested up to: 3.8.1
Stable tag: 2.5.1 Stable tag: 2.6.1
License: GPLv2 or later License: GPLv2 or later
Forms created with a simple drag and drop interface. Contact forms, Email collection forms, or any other form you want on your WordPress site. Forms created with a simple drag and drop interface. Contact forms, Email collection forms, or any other form you want on your WordPress site.
...@@ -11,9 +12,8 @@ Forms created with a simple drag and drop interface. Contact forms, Email collec ...@@ -11,9 +12,8 @@ Forms created with a simple drag and drop interface. Contact forms, Email collec
## Description ## Description
Ninja Forms is the ultimate FREE form creation solution for WordPress. Build WordPress Forms within minutes using Ninja Forms powerful forms creation page. It allows you to easily and quickly design complex forms through a drag and drop interface and absolutely no code. But for you developers it has a ton of hooks and filters so you can do absolutely anything with this powerful form building framework. Ninja Forms is the ultimate FREE form creation solution for WordPress. Build WordPress Forms within minutes using Ninja Forms powerful forms creation page. It allows you to easily and quickly design complex forms through a drag and drop interface and absolutely no code. But for you developers it has a ton of hooks and filters so you can do absolutely anything with this powerful form building framework.
This review of Ninja Forms was done by Pippin Williamson: This [review of Ninja Forms](http://www.youtube.com/watch?v=hVfPmKzqYpk) was done by Pippin Williamson:
[youtube http://www.youtube.com/watch?v=hVfPmKzqYpk]
Here are just a few of the things you will find in Ninja Forms: Here are just a few of the things you will find in Ninja Forms:
...@@ -81,4 +81,4 @@ For help and video tutorials, please visit our website: [Ninja Forms Documentati ...@@ -81,4 +81,4 @@ For help and video tutorials, please visit our website: [Ninja Forms Documentati
## Requested Features ## Requested Features
If you have any feature requests, please feel free to visit [ninjaforms.com](http://ninjaforms.com) and let us know about it. If you have any feature requests, please feel free to visit [ninjaforms.com](http://ninjaforms.com) and let us know about it.
\ No newline at end of file
...@@ -121,8 +121,10 @@ function ninja_forms_edit_field_el_output($field_id, $type, $label = '', $name = ...@@ -121,8 +121,10 @@ function ninja_forms_edit_field_el_output($field_id, $type, $label = '', $name =
update_option( 'ninja_forms_settings', $plugin_settings ); update_option( 'ninja_forms_settings', $plugin_settings );
} }
$args = apply_filters( 'ninja_forms_edit_field_rte', array() ); $editor_id = str_replace( '[', '-', $name );
wp_editor( $value, $name, $args ); $editor_id = str_replace( ']', '-', $editor_id );
$args = apply_filters( 'ninja_forms_edit_field_rte', array( 'textarea_name' => $name ) );
wp_editor( $value, $editor_id, $args );
break; break;
} }
......
...@@ -85,6 +85,10 @@ ...@@ -85,6 +85,10 @@
<td><?php _e('PHP Post Max Size','ninja-forms' ); ?>:</td> <td><?php _e('PHP Post Max Size','ninja-forms' ); ?>:</td>
<td><?php echo size_format( ninja_forms_letters_to_numbers( ini_get('post_max_size') ) ); ?></td> <td><?php echo size_format( ninja_forms_letters_to_numbers( ini_get('post_max_size') ) ); ?></td>
</tr> </tr>
<tr>
<td><?php _e('Max Input Nesting Level','ninja-forms' ); ?>:</td>
<td><?php echo ini_get('max_input_nesting_level'); ?></td>
</tr>
<tr> <tr>
<td><?php _e('PHP Time Limit','ninja-forms' ); ?>:</td> <td><?php _e('PHP Time Limit','ninja-forms' ); ?>:</td>
<td><?php echo ini_get('max_execution_time'); ?></td> <td><?php echo ini_get('max_execution_time'); ?></td>
......
...@@ -97,11 +97,6 @@ function ninja_forms_page_append_check(){ ...@@ -97,11 +97,6 @@ function ninja_forms_page_append_check(){
add_action('wp_head', 'ninja_forms_page_append_check'); add_action('wp_head', 'ninja_forms_page_append_check');
function remove_bad_br_tags($content) {
$content = str_ireplace( '</label><br />', '</label>', $content );
return $content;
}
function ninja_forms_append_to_page($content){ function ninja_forms_append_to_page($content){
global $ninja_forms_append_page_form_id; global $ninja_forms_append_page_form_id;
$form = ''; $form = '';
...@@ -113,8 +108,6 @@ function ninja_forms_append_to_page($content){ ...@@ -113,8 +108,6 @@ function ninja_forms_append_to_page($content){
$form = ninja_forms_return_echo('ninja_forms_display_form', $ninja_forms_append_page_form_id); $form = ninja_forms_return_echo('ninja_forms_display_form', $ninja_forms_append_page_form_id);
} }
$content .= $form; $content .= $form;
//add_filter( 'the_content', 'remove_bad_br_tags', 99 );
//remove_filter( 'the_content', 'wpautop' );
return $content; return $content;
} }
......
...@@ -1158,9 +1158,30 @@ class Ninja_Forms_Processing { ...@@ -1158,9 +1158,30 @@ class Ninja_Forms_Processing {
}else{ }else{
$number = str_replace( ' ', '', $this->data['extra']['_credit_card_number'] ); $number = str_replace( ' ', '', $this->data['extra']['_credit_card_number'] );
$credit_card['number'] = $number; $credit_card['number'] = $number;
$credit_card['cvc'] = $this->data['extra']['_credit_card_cvc'];
$credit_card['name'] = $this->data['extra']['_credit_card_name']; if(isset( $this->data['extra']['_credit_card_cvc'] )){
$credit_card['expires'] = $this->data['extra']['_credit_card_expires'];
$credit_card['cvc'] = $this->data['extra']['_credit_card_cvc'];
}
if(isset( $this->data['extra']['_credit_card_name'] )){
$credit_card['name'] = $this->data['extra']['_credit_card_name'];
}
//$credit_card['expires'] = $this->data['extra']['_credit_card_expires'];
if(isset( $this->data['extra']['_credit_card_expires_month'] )){
$credit_card['expires'] = $this->data['extra']['_credit_card_expires_month']
. '/' . $this->data['extra']['_credit_card_expires_year'];
$credit_card['expires_month'] = $this->data['extra']['_credit_card_expires_month'];
$credit_card['expires_year'] = $this->data['extra']['_credit_card_expires_year'];
}
return $credit_card; return $credit_card;
} }
} }
......
...@@ -197,7 +197,7 @@ function ninja_forms_register_field_country(){ ...@@ -197,7 +197,7 @@ function ninja_forms_register_field_country(){
__( 'Sao Tome And Principe', 'ninja-forms' ) => 'ST', __( 'Sao Tome And Principe', 'ninja-forms' ) => 'ST',
__( 'Saudi Arabia', 'ninja-forms' ) => 'SA', __( 'Saudi Arabia', 'ninja-forms' ) => 'SA',
__( 'Senegal', 'ninja-forms' ) => 'SN', __( 'Senegal', 'ninja-forms' ) => 'SN',
__( 'Serbia', 'ninja-forms' ) => 'SR', __( 'Serbia', 'ninja-forms' ) => 'RS',
__( 'Seychelles', 'ninja-forms' ) => 'SC', __( 'Seychelles', 'ninja-forms' ) => 'SC',
__( 'Sierra Leone', 'ninja-forms' ) => 'SL', __( 'Sierra Leone', 'ninja-forms' ) => 'SL',
__( 'Singapore', 'ninja-forms' ) => 'SG', __( 'Singapore', 'ninja-forms' ) => 'SG',
......
...@@ -83,6 +83,9 @@ function ninja_forms_field_credit_card_display( $field_id, $data ) { ...@@ -83,6 +83,9 @@ function ninja_forms_field_credit_card_display( $field_id, $data ) {
$field_class = ninja_forms_get_field_class( $field_id ); $field_class = ninja_forms_get_field_class( $field_id );
$post_field = apply_filters( 'ninja_forms_post_credit_card_field', false ); $post_field = apply_filters( 'ninja_forms_post_credit_card_field', false );
$desc_pos = apply_filters( 'ninja_forms_credit_card_field_desc_pos', 'after_label' ); $desc_pos = apply_filters( 'ninja_forms_credit_card_field_desc_pos', 'after_label' );
$hide_cc_fields = apply_filters( 'ninja_forms_hide_cc_field', array() );
if( !in_array( 'number' , $hide_cc_fields ) ){
?> ?>
<div class="ninja-forms-credit-card-number label-<?php echo $label_pos; ?> field-wrap"> <!-- Open Credit Card Wrap --> <div class="ninja-forms-credit-card-number label-<?php echo $label_pos; ?> field-wrap"> <!-- Open Credit Card Wrap -->
<?php <?php
...@@ -132,6 +135,12 @@ function ninja_forms_field_credit_card_display( $field_id, $data ) { ...@@ -132,6 +135,12 @@ function ninja_forms_field_credit_card_display( $field_id, $data ) {
} }
?> ?>
</div> </div>
<?php
}
if( !in_array( 'cvc' , $hide_cc_fields ) ){
?>
<div class="ninja-forms-credit-card-cvc label-<?php echo $label_pos; ?> field-wrap"> <!-- [open_cvc_wrap] --> <div class="ninja-forms-credit-card-cvc label-<?php echo $label_pos; ?> field-wrap"> <!-- [open_cvc_wrap] -->
<?php <?php
if ( $desc_pos == 'before_label' or $desc_pos == 'before_everything' ) { if ( $desc_pos == 'before_label' or $desc_pos == 'before_everything' ) {
...@@ -181,6 +190,13 @@ function ninja_forms_field_credit_card_display( $field_id, $data ) { ...@@ -181,6 +190,13 @@ function ninja_forms_field_credit_card_display( $field_id, $data ) {
} }
?> ?>
</div> </div>
<?php
}
if( !in_array( 'name' , $hide_cc_fields ) ){
?>
<div class="ninja-forms-credit-card-name label-<?php echo $label_pos; ?> field-wrap"> <!-- [open_nameoncard_wrap] --> <div class="ninja-forms-credit-card-name label-<?php echo $label_pos; ?> field-wrap"> <!-- [open_nameoncard_wrap] -->
<?php <?php
if ( $desc_pos == 'before_label' or $desc_pos == 'before_everything' ) { if ( $desc_pos == 'before_label' or $desc_pos == 'before_everything' ) {
...@@ -230,6 +246,13 @@ function ninja_forms_field_credit_card_display( $field_id, $data ) { ...@@ -230,6 +246,13 @@ function ninja_forms_field_credit_card_display( $field_id, $data ) {
} }
?> ?>
</div> </div>
<?php
}
if( !in_array( 'expires' , $hide_cc_fields ) ){
?>
<div class="ninja-forms-credit-card-exp-month label-<?php echo $label_pos; ?> field-wrap"> <!-- [open_expires_wrap] --> <div class="ninja-forms-credit-card-exp-month label-<?php echo $label_pos; ?> field-wrap"> <!-- [open_expires_wrap] -->
<?php <?php
if ( $desc_pos == 'before_label' or $desc_pos == 'before_everything' ) { if ( $desc_pos == 'before_label' or $desc_pos == 'before_everything' ) {
...@@ -278,8 +301,8 @@ function ninja_forms_field_credit_card_display( $field_id, $data ) { ...@@ -278,8 +301,8 @@ function ninja_forms_field_credit_card_display( $field_id, $data ) {
} }
} }
?> ?>
</div> <!-- [close_exp_year_wrap] --> </div> <!-- [close_exp_month_wrap] -->
<div class="ninja-forms-credit-card-exp-year label-<?php echo $label_pos; ?> field-wrap"> <!-- [open_expires_wrap] --> <div class="ninja-forms-credit-card-exp-year label-<?php echo $label_pos; ?> field-wrap"> <!-- [open_exp_year_wrap] -->
<?php <?php
if ( $desc_pos == 'before_label' or $desc_pos == 'before_everything' ) { if ( $desc_pos == 'before_label' or $desc_pos == 'before_everything' ) {
?> ?>
...@@ -329,6 +352,7 @@ function ninja_forms_field_credit_card_display( $field_id, $data ) { ...@@ -329,6 +352,7 @@ function ninja_forms_field_credit_card_display( $field_id, $data ) {
?> ?>
</div> <!-- [close_exp_month_wrap] --> </div> <!-- [close_exp_month_wrap] -->
<?php <?php
}
} }
/* /*
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
Plugin Name: Ninja Forms Plugin Name: Ninja Forms
Plugin URI: http://ninjaforms.com/ Plugin URI: http://ninjaforms.com/
Description: Ninja Forms is a webform builder with unparalleled ease of use and features. Description: Ninja Forms is a webform builder with unparalleled ease of use and features.
Version: 2.6 Version: 2.6.1
Author: The WP Ninjas Author: The WP Ninjas
Author URI: http://ninjaforms.com Author URI: http://ninjaforms.com
Text Domain: ninja-forms Text Domain: ninja-forms
...@@ -54,7 +54,7 @@ global $wpdb, $wp_version; ...@@ -54,7 +54,7 @@ global $wpdb, $wp_version;
define("NINJA_FORMS_DIR", WP_PLUGIN_DIR."/".basename( dirname( __FILE__ ) ) ); define("NINJA_FORMS_DIR", WP_PLUGIN_DIR."/".basename( dirname( __FILE__ ) ) );
define("NINJA_FORMS_URL", plugins_url()."/".basename( dirname( __FILE__ ) ) ); define("NINJA_FORMS_URL", plugins_url()."/".basename( dirname( __FILE__ ) ) );
define("NINJA_FORMS_VERSION", "2.6"); define("NINJA_FORMS_VERSION", "2.6.1");
define("NINJA_FORMS_TABLE_NAME", $wpdb->prefix . "ninja_forms"); define("NINJA_FORMS_TABLE_NAME", $wpdb->prefix . "ninja_forms");
define("NINJA_FORMS_FIELDS_TABLE_NAME", $wpdb->prefix . "ninja_forms_fields"); define("NINJA_FORMS_FIELDS_TABLE_NAME", $wpdb->prefix . "ninja_forms_fields");
define("NINJA_FORMS_FAV_FIELDS_TABLE_NAME", $wpdb->prefix . "ninja_forms_fav_fields"); define("NINJA_FORMS_FAV_FIELDS_TABLE_NAME", $wpdb->prefix . "ninja_forms_fav_fields");
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
Contributors: kstover, jameslaws, daveshine, mordauk, bftrick, helgatheviking Contributors: kstover, jameslaws, daveshine, mordauk, bftrick, helgatheviking
Tags: form, forms, contact form, custom form, form builder, form creator, form manager, form creation, contact forms, custom forms, forms builder, forms creator, forms manager, forms creation, form administration, Tags: form, forms, contact form, custom form, form builder, form creator, form manager, form creation, contact forms, custom forms, forms builder, forms creator, forms manager, forms creation, form administration,
Requires at least: 3.6 Requires at least: 3.6
Tested up to: 3.8.1 Tested up to: 3.9
Stable tag: 2.6 Stable tag: 2.6.1
License: GPLv2 or later License: GPLv2 or later
Forms created with a simple drag and drop interface. Contact forms, Email collection forms, or any other form you want on your WordPress site. Forms created with a simple drag and drop interface. Contact forms, Email collection forms, or any other form you want on your WordPress site.
...@@ -76,20 +76,18 @@ For help and video tutorials, please visit our website: [Ninja Forms Documentati ...@@ -76,20 +76,18 @@ For help and video tutorials, please visit our website: [Ninja Forms Documentati
== Upgrade Notice == == Upgrade Notice ==
= 2.6 = = 2.6.1 =
*Changes:* *Changes:*
* The "Processing Message" above the form has been removed in favour of changing the text of the submit button and disabling it. * Modified the call to wp_editor on the Field Settings tab so that it is compatible with WordPress 3.9.
* This change in processing notification will make it easier for users to see that a submission is being processed and prevent them from clicking the "submit" button again. * Added more security to prevent forms from being spammed.
* Updated the label of the "Processing" label to make it clearer. * Added additional items to the system status page.
* Added a credit card field that can be enabled by extensions that need to use it.
*Bugs:* *Bugs:*
* Fixed a bug introduced in version 2.5.3 which prevented Sessions from starting properly on some server setups. * Fixed a php notice that could occur when using the inside label position.
* Fixed some PHP warnings/notices. * Calc fields that use advanced equations should now function properly when referencing other advanced calculation fields.
* List items should now properly escape html when displayed.
== Requested Features == == Requested Features ==
...@@ -97,6 +95,19 @@ If you have any feature requests, please feel free to visit [ninjaforms.com](htt ...@@ -97,6 +95,19 @@ If you have any feature requests, please feel free to visit [ninjaforms.com](htt
== Changelog == == Changelog ==
= 2.6.1 =
*Changes:*
* Modified the call to wp_editor on the Field Settings tab so that it is compatible with WordPress 3.9.
* Added more security to prevent forms from being spammed.
* Added additional items to the system status page.
*Bugs:*
* Fixed a php notice that could occur when using the inside label position.
* Calc fields that use advanced equations should now function properly when referencing other advanced calculation fields.
= 2.6 = = 2.6 =
*Changes:* *Changes:*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment